progress

olsongleb · Mar 28, 2024 · fa9fb5e · fa9fb5e
1 parent c2ec329
commit fa9fb5e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 22 deletions.
diff --git a/decompile/General/232/232_23_AH_Map_Main.c b/decompile/General/232/232_23_AH_Map_Main.c
@@ -79,31 +79,15 @@ void DECOMP_AH_Map_Main(void)
 
     DECOMP_AH_Map_HubItems(hubPtrs,&local_1e[0]);
 #endif
-
-#if 1
-	// needs resetting,
-	// register $s0 corrupts in DECOMP_AH_Map_Warppads
-	// if USE_60FPS is enabled. Can be fixed by removing
-	// USE_60FPS or removing call to PlayWarppadSound.
-	// Asm shows sw $s0 $sp(28) and then lw $s0 $sp(4) ???
-	gGT = sdata->gGT;
-	ptrHudData = data.hudStructPtr[0];
-#endif
 
     DECOMP_UI_Map_DrawMap(
-                gGT->ptrIcons[3],
-
-                gGT->ptrIcons[4],
-
-                500,195,
+        gGT->ptrIcons[3],
+        gGT->ptrIcons[4],
 
-				 // pointer to PrimMem struct
-                &gGT->backBuffer->primMem,
+        500,195,
 
-                // pointer to OT memory
-                gGT->tileView_UI.ptrOT,
-
-				1);
+        &gGT->backBuffer->primMem,
+		gGT->tileView_UI.ptrOT, 1);
 
     DECOMP_UI_DrawSlideMeter(ptrHudData[8].x, ptrHudData[8].y, advDriver);
   }

diff --git a/decompile/buildList.txt b/decompile/buildList.txt
@@ -121,7 +121,7 @@ common, 232, AH_Map_HubItems, 0x0, General/232/232_21_AH_Map_HubItems.c
 common, 232, AH_Map_Warppads, 0x0, General/232/232_22_AH_Map_Warppads.c
 common, 232, AH_Map_Main, 0x0, General/232/232_23_AH_Map_Main.c
 common, 232, AH_Pause_Destroy, 0x0, General/232/232_24_AH_Pause_Destroy.c
-//ommon, 232, AH_Pause_Draw, 0x0, General/232/232_25_AH_Pause_Draw.c
+common, 232, AH_Pause_Draw, 0x0, General/232/232_25_AH_Pause_Draw.c
 
 common, 232, AH_HintMenu_MaskPosRot, 0x0, General/232/232_28_AH_HintMenu_MaskPosRot.c