pc: support more systems

Author: PedroHLC

.editorconfig

@@ -0,0 +1,21 @@
+root = true
+
+[*]
+insert_final_newline = false
+trim_trailing_whitespace = true
+charset = utf-8
+
+[*.{nix,md,MD,sh}]
+insert_final_newline = true
+end_of_line = lf
+indent_style = space
+indent_size = 2
+
+[*.{c,C,h,H}]
+indent_style = tab
+indent_size = 4
+
+[Makefile]
+insert_final_newline = true
+end_of_line = lf
+indent_style = tab

.gitignore

@@ -25,7 +25,7 @@ offset.txt
 comport.txt
 gcc_out.txt
 overlay.ld
-Makefile
+rebuild_PC/result
 
 # Version tracker
 tools/updater/.version

decompile/General/232/232_35_AH_MaskHint_Update.c

@@ -15,7 +15,7 @@ void DECOMP_AH_MaskHint_Update()
 			sdata->AkuAkuHintState++;
 			break;
 
-		case 1:
+		case 1: {
 			int absSpeedApprox = d->speedApprox;
 			if(absSpeedApprox < 0) absSpeedApprox = -absSpeedApprox;
 			if(absSpeedApprox > 0x31) return;
@@ -65,7 +65,7 @@ void DECOMP_AH_MaskHint_Update()
 			D232.maskWarppadDelayFrames = FPS_DOUBLE(60);
 
 			sdata->AkuAkuHintState++;
-			break;
+			} break;
 
 		case 2:
 
@@ -189,7 +189,7 @@ void DECOMP_AH_MaskHint_Update()
 			// stay here forever stuck
 			break;
 
-		case 4:
+		case 4: {
 			int lngIndex = 0;
 			int boolFound = 0;
 			short* ptrLngID = &D232.hintMenu_lngIndexArr[0];
@@ -270,7 +270,7 @@ void DECOMP_AH_MaskHint_Update()
 				// show map again
 				gGT->hudFlags &= ~(0x10);
 			}
-			break;
+			} break;
 
 		case 5:
 

decompile/General/GHOST/GhostReplay_ThTick.c

@@ -316,7 +316,7 @@ void DECOMP_GhostReplay_ThTick(struct Thread *t)
 		tape->packetID++;
         break;
 
-      case 0x81: // Animation
+      case 0x81: { // Animation
         int numAnimFrames = DECOMP_INSTANCE_GetNumAnimFrames(inst, buffer[1]);
         inst->animIndex = (numAnimFrames < 1) ? 0 : buffer[1];
         inst->animFrame = (buffer[2] == 0 || numAnimFrames <= buffer[2])
@@ -333,7 +333,7 @@ void DECOMP_GhostReplay_ThTick(struct Thread *t)
 		#endif
 
         buffer += 3;
-        break;
+        } break;
 
       case 0x82: // Boost
         if (

decompile/General/MAIN/MainDB_GetClipSize.c

@@ -1,6 +1,6 @@
 #include <common.h>
 
-u_int DECOMP_MainDB_GetClipSize(u_int levelID, int numPlyrCurrGame)
+int DECOMP_MainDB_GetClipSize(u_int levelID, int numPlyrCurrGame)
 {
 	if(levelID == PAPU_PYRAMID || levelID == POLAR_PASS)
 		if (2 < numPlyrCurrGame)

decompile/General/MEMPACK/MEMPACK_Init.c

@@ -1,4 +1,5 @@
 #include <common.h>
+#include <inttypes.h>
 
 #ifdef REBUILD_PC
 // with 8mb expansion, we have bonus PrimMem
@@ -23,6 +24,11 @@ void DECOMP_MEMPACK_Init(int ramSize)
 	// Visual Studio -> Properties -> Linker -> Advanced -> 
 	// Base Address, Randomized Base Address, Fixed Base Address
 	ptrMempack->start = &memory[0];
+	printf(
+		"[CTR] Where does memory starts? (%s) %" PRIu32 "\n",
+		(ptrMempack->start < 0x01000000 ? "GOOD" : "BAD"),
+		ptrMempack->start
+	);
 	memset(memory, 0, 8*1024*1024);
 
 	ptrMempack->endOfAllocator = &memory[8*1024*1024 - 4];

decompile/General/RaceFlag/RaceFlag_t11_GetOT.c

@@ -1,13 +1,13 @@
 #include <common.h>
 
-int DECOMP_RaceFlag_GetOT(void)
+u_int* DECOMP_RaceFlag_GetOT(void)
 {
     short sVar1;
     int iVar2;
     struct GameTracker* gGT = sdata->gGT;
 
-	int* otDrawFirst_FarthestDepth;
-	int* otDrawLast_ClosestDepth;
+	u_int* otDrawFirst_FarthestDepth;
+	u_int* otDrawLast_ClosestDepth;
 
 	otDrawFirst_FarthestDepth = &gGT->pushBuffer[0].ptrOT[0x3FF];
 	otDrawLast_ClosestDepth = gGT->otSwapchainDB[gGT->swapchainIndex];
@@ -93,4 +93,4 @@ int DECOMP_RaceFlag_GetOT(void)
     }
 
     return otDrawLast_ClosestDepth;
-}
+}

decompile/General/RaceFlag/RaceFlag_t13_DrawLoadingString.c

@@ -12,7 +12,7 @@ void DECOMP_RaceFlag_DrawLoadingString(void)
     char *pbVar8;
     int iVar9;
     int iVar10;
-    int uVar11;
+    u_int *uVar11;
     char local_30;
     char local_2f;
 
@@ -49,8 +49,10 @@ void DECOMP_RaceFlag_DrawLoadingString(void)
     iVar10 = 
 		(sdata->RaceFlag_Transition & 0xffff) - 
 		(
-			((iVar3 << 0x10) >> 0x10) - 
-			((iVar3 << 0x10) >> 0x1f) >> 1
+			(
+				((iVar3 << 0x10) >> 0x10) -
+				((iVar3 << 0x10) >> 0x1f)
+			) >> 1
 		);
 
     iVar3 = FPS_HALF(sdata->RaceFlag_LoadingTextAnimFrame);

decompile/General/RaceFlag/RaceFlag_t14_DrawSelf.c

@@ -1,16 +1,16 @@
 #include <common.h>
 
 #ifdef REBUILD_PC
-int scratchpadBuf[0x1000];
+u_int scratchpadBuf[0x1000];
 #endif
 
 force_inline char RaceFlag_CalculateBrightness(u_int sine, u_char darkTile)
 {
 	if (darkTile)
 	{
-		return sine * -55 + 0x140000 >> 0xD;
+		return((sine * -55 + 0x140000) >> 0xD);
 	}
-	return sine * -125 + 0x1fe000 >> 0xD;
+	return((sine * -125 + 0x1fe000) >> 0xD);
 }
 
 void DECOMP_RaceFlag_DrawSelf()
@@ -20,7 +20,7 @@ void DECOMP_RaceFlag_DrawSelf()
 	u_char toggle;
 	short flagPos;
 	u_long *ot;
-	long *scratchpad;
+	u_int *scratchpad;
 	u_int screenlimit;
 	u_int dimensions;
 	int approx[2];
@@ -171,7 +171,7 @@ void DECOMP_RaceFlag_DrawSelf()
 #ifdef REBUILD_PC
 		top = &scratchpadBuf[(toggle * 0x78 / 4) - 1];
 		toggle = toggle ^ 1;
-		bottom = &scratchpadBuf[(toggle * 0x78 / 4) - 0];
+		bottom = &scratchpadBuf[(toggle * 0x78 / 4)];
 #else
 		top = (u_int *)((0x1f800000 + toggle * 0x78) - 4);
 		toggle = toggle ^ 1;
@@ -318,6 +318,7 @@ void DECOMP_RaceFlag_DrawSelf()
 					setRGB1(p, colorLeft, colorLeft, colorLeft);
 					setRGB3(p, colorLeft, colorLeft, colorLeft);
 
+
 					// positions
 					*(int *)&p->x0 = bottom[0];
 					*(int *)&p->x2 = bottom[1];

decompile/General/zGlobal_SDATA.c

@@ -5,6 +5,10 @@
 
 #include <common.h>
 
+#if __GNUC__
+char memcardBytes[0x1680];
+#endif
+
 struct sData sdata_static =
 {
 	.langBufferSize = 0x3F04,
@@ -353,6 +357,9 @@ struct sData sdata_static =
 #if NO_BSS
 	.ptrToMemcardBuffer1 = 0x800992e4,
 	.ptrToMemcardBuffer2 = 0x800992e4,
+#elif __GNUC__
+	.ptrToMemcardBuffer1 = &memcardBytes[0],
+	.ptrToMemcardBuffer2 = &memcardBytes[0],
 #else
 	.ptrToMemcardBuffer1 = &sdata_static.memcardBytes[0],
 	.ptrToMemcardBuffer2 = &sdata_static.memcardBytes[0],