progress

olsongleb · Apr 1, 2024 · 4070098 · 4070098
1 parent 8d41827
commit 4070098
Show file tree

Hide file tree

Showing 75 changed files with 392 additions and 390 deletions.
diff --git a/decompile/General/224/224_Full.c b/decompile/General/224/224_Full.c
@@ -50,7 +50,7 @@ void DECOMP_TT_EndEvent_DrawMenu(void)
         if ((unknownFlags_1d44 & 0x8000000) == 0)
         {
 			// between 1001 and 1018, frame counter is paused until &0x10,
-			// that's 15 frames between lerp high score off-screen, and showing MenuBox
+			// that's 15 frames between lerp high score off-screen, and showing Menu
             if ((framesSinceRaceEnded < FPS_DOUBLE(1018)) && ((sdata->menuReadyToPass & 0x10) != 0)) goto AddStuff;
             if (framesSinceRaceEnded < FPS_DOUBLE(1001)) goto AddStuff;
         }
@@ -243,7 +243,7 @@ void DECOMP_TT_EndEvent_DrawMenu(void)
 	// if not showing menu yet
 	if ((sdata->menuReadyToPass & 1) == 0)
 	{
-		// start showing menubox
+		// start showing menu
 		sdata->menuReadyToPass = sdata->menuReadyToPass & 0xffffffef | 1;
 
 		sdata->flags_timeTrialEndOfRace = 0;

diff --git a/decompile/General/230/230_31_MM_MenuProc_Main.c b/decompile/General/230/230_31_MM_MenuProc_Main.c
@@ -134,7 +134,7 @@ void DECOMP_MM_MenuProc_Main(struct RectMenu *mainMenu)
     gGT->gameMode1 |= ADVENTURE_MODE;
     gGT->gameMode2 &= ~(CHEAT_WUMPA | CHEAT_MASK | CHEAT_TURBO | CHEAT_ENGINE | CHEAT_BOMBS);
 
-    // menubox for new/load
+    // menu for new/load
     mainMenu->ptrNextBox_InHierarchy = &D230.menuAdventure;
     mainMenu->state |= DRAW_NEXT_MENU_IN_HIERARCHY;
     return;
@@ -170,7 +170,7 @@ void DECOMP_MM_MenuProc_Main(struct RectMenu *mainMenu)
     // set game mode to Arcade Mode
     gGT->gameMode1 |= ARCADE_MODE;
 
-    // set next menuBox
+    // set next menu
     mainMenu->ptrNextBox_InHierarchy = &D230.menuRaceType;
     mainMenu->state |= DRAW_NEXT_MENU_IN_HIERARCHY;
     return;
@@ -179,7 +179,7 @@ void DECOMP_MM_MenuProc_Main(struct RectMenu *mainMenu)
   // Versus
   if (choose == 0x4f)
   {
-    // next menuBox is choosing single+cup
+    // next menu is choosing single+cup
     mainMenu->ptrNextBox_InHierarchy = &D230.menuRaceType;
     mainMenu->state |= DRAW_NEXT_MENU_IN_HIERARCHY;
     return;
@@ -193,7 +193,7 @@ void DECOMP_MM_MenuProc_Main(struct RectMenu *mainMenu)
     // set game mode to Battle Mode
     gGT->gameMode1 |= BATTLE_MODE;
 
-    // set next menuBox to 2P,3P,4P
+    // set next menu to 2P,3P,4P
     mainMenu->ptrNextBox_InHierarchy = &D230.menuPlayers2P3P4P;
     mainMenu->state |= DRAW_NEXT_MENU_IN_HIERARCHY;
     return;

diff --git a/decompile/General/230/230_37_MM_MenuProc_SingleCup.c b/decompile/General/230/230_37_MM_MenuProc_SingleCup.c
@@ -33,15 +33,15 @@ void DECOMP_MM_MenuProc_SingleCup(struct RectMenu* menu)
     // if mode is Arcade
     if ((gGT->gameMode1 & ARCADE_MODE) != 0) 
     {
-  	  // set next menuBox to 1P+2P select
+  	  // set next menu to 1P+2P select
       menu->ptrNextBox_InHierarchy = &D230.menuPlayers1P2P;
       D230.characterSelect_transitionState = 1;
       return;
     }
 
     // if mode is VS
 
-    // set next menuBox to 2P+3P+4P (vs or battle)
+    // set next menu to 2P+3P+4P (vs or battle)
     menu->ptrNextBox_InHierarchy = &D230.menuPlayers2P3P4P;
     D230.characterSelect_transitionState = 2;
   }

diff --git a/decompile/General/230/230_39_MM_AdvNewLoad_GetMenuPtr.c b/decompile/General/230/230_39_MM_AdvNewLoad_GetMenuPtr.c
@@ -2,6 +2,6 @@
 
 struct RectMenu* DECOMP_MM_AdvNewLoad_GetMenuPtr(void)
 {
-  // menubox for new/load
+  // menu for new/load
   return &D230.menuAdventure;
 }
diff --git a/decompile/General/230/230_56_MM_TrackSelect_MenuProc.c b/decompile/General/230/230_56_MM_TrackSelect_MenuProc.c
@@ -114,7 +114,7 @@ void DECOMP_MM_TrackSelect_MenuProc(struct RectMenu* menu)
 #endif
 				}
 
-				// passthrough MenuBox for the function
+				// passthrough Menu for the function
 				// QueueLoadTrack
 				sdata->ptrDesiredMenu = &data.menuQueueLoadTrack;
 

diff --git a/decompile/General/230/230_59_MM_CupSelect_MenuProc.c b/decompile/General/230/230_59_MM_CupSelect_MenuProc.c
@@ -74,7 +74,7 @@ void DECOMP_MM_CupSelect_MenuProc(struct RectMenu* menu)
                         gGT->cup.points[i] = 0;
                     }
 
-                    // passthrough MenuBox for the function
+                    // passthrough Menu for the function
                     sdata->ptrDesiredMenu = &data.menuQueueLoadTrack;
 
                     // set current level

diff --git a/decompile/General/230/230_63_MM_Battle_MenuProc.c b/decompile/General/230/230_63_MM_Battle_MenuProc.c
@@ -80,7 +80,7 @@ void DECOMP_MM_Battle_MenuProc(struct RectMenu* unused)
                     // if starting race
                     if (D230.battle_postTransition_boolStart != 0)
                     {
-                        // passthrough MenuBox for funcPtr "QueueLoadTrack"
+                        // passthrough Menu for funcPtr "QueueLoadTrack"
                         sdata->ptrDesiredMenu = &data.menuQueueLoadTrack;
                         return;
                     }

diff --git a/decompile/General/230/230_70_MM_ResetAllMenus.c b/decompile/General/230/230_70_MM_ResetAllMenus.c
@@ -6,7 +6,7 @@ void DECOMP_MM_ResetAllMenus(void)
     {
         struct RectMenu* menu = D230.arrayMenuPtrs[i];
 
-        // Close menubox
+        // Close menu
         menu->state |= 8;
         menu->state &= ~(ONLY_DRAW_TITLE | DRAW_NEXT_MENU_IN_HIERARCHY);
 

diff --git a/decompile/General/232/232_12_AH_SaveObj_ThTick.c b/decompile/General/232/232_12_AH_SaveObj_ThTick.c
@@ -142,7 +142,7 @@ void DECOMP_AH_SaveObj_ThTick(struct Thread* t)
                         SelectProfile_GetTrackID();
 #endif
 
-                        // enable menubox for green load/save screen
+                        // enable menu for green load/save screen
                         DECOMP_RECTMENU_Show(&data.menuGreenLoadSave);
                     }
 
@@ -153,7 +153,7 @@ void DECOMP_AH_SaveObj_ThTick(struct Thread* t)
                             // if you aren't already returning to player
                             ((uVar6 & 0x400) == 0) &&
 
-                            // if there's no MenuBox active
+                            // if there's no Menu active
                             (sdata->ptrActiveMenu == NULL))
                         {
                             // toggle flag to return, this either snaps back

diff --git a/decompile/General/233/233_37_39_CS_Garage.c b/decompile/General/233/233_37_39_CS_Garage.c
@@ -423,7 +423,7 @@ void DECOMP_CS_Garage_MenuProc(void)
 				// if pressed X twice quickly
                 if (gGarage.boolSelected == 1)
                 {
-                    // set desiredMenuBox to OSK (on-screen keyboard)
+                    // set desiredMenu to OSK (on-screen keyboard)
                     sdata->ptrDesiredMenu = &data.menuSubmitName;
 
                     data.characterIDs[0] = sdata->advCharSelectIndex_curr;
@@ -525,7 +525,7 @@ void DECOMP_CS_Garage_MenuProc(void)
 				((gGT->gameMode2 & GARAGE_OSK) != 0)
 		  )
 		{
-			// set desiredMenuBox to OSK (on-screen keyboard)
+			// set desiredMenu to OSK (on-screen keyboard)
 			sdata->ptrDesiredMenu = &data.menuSubmitName;
 
 			data.characterIDs[0] = sdata->advCharSelectIndex_curr;

diff --git a/decompile/General/MAIN/MainFreeze_MenuPtrDefault.c b/decompile/General/MAIN/MainFreeze_MenuPtrDefault.c
@@ -49,7 +49,7 @@ void DECOMP_MainFreeze_MenuPtrDefault(struct RectMenu* menu)
 	// stringID 14: "OPTIONS"
 	if (stringID == 14)
 	{
-		// Set MenuBox to Options
+		// Set Menu to Options
 		sdata->ptrDesiredMenu = &data.menuRacingWheelConfig;
 
 		data.menuRacingWheelConfig.rowSelected = 8;
@@ -60,15 +60,15 @@ void DECOMP_MainFreeze_MenuPtrDefault(struct RectMenu* menu)
 	// stringID 12: "UKA UKA HINTS"
 	if (stringID == 11 || stringID == 12)
 	{
-		// Set MenuBox to Hints
+		// Set Menu to Hints
 		sdata->ptrDesiredMenu = &D232.menuHintMenu; // in 232
 		return;
 	}
 
 	// stringID 3: "QUIT"
 	if (stringID == 3)
 	{
-		// Set MenuBox to Quit
+		// Set Menu to Quit
 		sdata->ptrDesiredMenu = &data.menuQuit;
 		data.menuQuit.rowSelected = 1;
 		return;
@@ -77,7 +77,7 @@ void DECOMP_MainFreeze_MenuPtrDefault(struct RectMenu* menu)
 	// must wait 5 frames until next pause
 	gGT->cooldownFromUnpauseUntilPause = 5;
 
-	// hide MenuBox
+	// hide Menu
 	DECOMP_RECTMENU_Hide(menu);
 
 	// get rid of pause flag

diff --git a/decompile/General/MAIN/MainFreeze_MenuPtrOptions.c b/decompile/General/MAIN/MainFreeze_MenuPtrOptions.c
@@ -31,10 +31,10 @@ void DECOMP_MainFreeze_MenuPtrOptions(struct RectMenu* menu)
 	RECT volumeSliderBarOutline;
 	short volumeSliderTriangle [8];
 
-	// extra menubox details
+	// extra menu details
 	RECT glowingcursor;
 	RECT titleSeparatorLine;
-	RECT menuBoxBG;
+	RECT menuBG;
 
 	short local_70;
 	u_short menuRowsNegativePaddingCopy;
@@ -451,11 +451,11 @@ void DECOMP_MainFreeze_MenuPtrOptions(struct RectMenu* menu)
 	titleSeparatorLine.h = 2;
 	RECTMENU_DrawOuterRect_Edge(&titleSeparatorLine, (u_int)&sdata->battleSetup_Color_UI_1, 0x20, (u_long *)(sdata->gGT->backBuffer->otMem).startPlusFour);
 
-	menuBoxBG.x = 0x38;
-	menuBoxBG.w = 400;
-	menuBoxBG.h = 0x87 - menuRowsNegativePaddingCopy;
-	menuBoxBG.y = menuRowsNegativePadding_halved_again + 0x14;
-	RECTMENU_DrawInnerRect(&menuBoxBG, 4, (u_long *)(sdata->gGT->backBuffer->otMem).startPlusFour);
+	menuBG.x = 0x38;
+	menuBG.w = 400;
+	menuBG.h = 0x87 - menuRowsNegativePaddingCopy;
+	menuBG.y = menuRowsNegativePadding_halved_again + 0x14;
+	RECTMENU_DrawInnerRect(&menuBG, 4, (u_long *)(sdata->gGT->backBuffer->otMem).startPlusFour);
 
 	if ((local_70 != 0) || ((sdata->AnyPlayerTap & (BTN_TRIANGLE | BTN_START | BTN_SQUARE_one)) != 0))
 	{

diff --git a/decompile/General/MAIN/MainFreeze_MenuPtrOptions_Rewrite.c b/decompile/General/MAIN/MainFreeze_MenuPtrOptions_Rewrite.c
@@ -174,7 +174,7 @@ force_inline void DISPLAYRECTMENU_MainFreeze_MenuPtrOptions(struct RectMenu* men
 	// note: multitap only works if it's connected to the P1 slot
 	int isMultitap = (sdata->gGamepads->slotBuffer[0].controllerData == (PAD_ID_MULTITAP << 4));
 
-	// a menubox row is 10 pixels
+	// a menu row is 10 pixels
 	int menuRowsNegativePadding = gamepad->menuRowsToRemove * 10;
 
 	int analogRowPosY = 0;
@@ -378,14 +378,14 @@ force_inline void DISPLAYRECTMENU_MainFreeze_MenuPtrOptions(struct RectMenu* men
 	};
 	RECTMENU_DrawOuterRect_Edge(&titleSeparatorLine, (u_int)&sdata->battleSetup_Color_UI_1, 0x20, (u_long *)(sdata->gGT->backBuffer->otMem).startPlusFour);
 
-	RECT menuBoxBG =
+	RECT menuBG =
 	{
 		.x = 56,
 		.y = (menuRowsNegativePadding / 2) + 20,
 		.w = 400,
 		.h = 135 - menuRowsNegativePadding
 	};
-	RECTMENU_DrawInnerRect(&menuBoxBG, 4, (u_long *)(sdata->gGT->backBuffer->otMem).startPlusFour);
+	RECTMENU_DrawInnerRect(&menuBG, 4, (u_long *)(sdata->gGT->backBuffer->otMem).startPlusFour);
 }
 
 void DECOMP_MainFreeze_MenuPtrOptions(struct RectMenu* menu)

diff --git a/decompile/General/RECTMENU/RECTMENU_DrawSelf.c b/decompile/General/RECTMENU/RECTMENU_DrawSelf.c
@@ -1,6 +1,6 @@
 #include <common.h>
 
-void DECOMP_RECTMENU_DrawSelf(struct RectMenu* menu, int posX, short posY, short menuboxWidth)
+void DECOMP_RECTMENU_DrawSelf(struct RectMenu* menu, int posX, short posY, short menuWidth)
 {
     u_short textFlags;
     u_int state;
@@ -17,7 +17,7 @@ void DECOMP_RECTMENU_DrawSelf(struct RectMenu* menu, int posX, short posY, short
     RECT background;
     RECT borders;
     short local_60;
-    short menuboxHeight;
+    short menuHeight;
     short offsetY;
     short local_50;
     short local_48;
@@ -72,19 +72,19 @@ void DECOMP_RECTMENU_DrawSelf(struct RectMenu* menu, int posX, short posY, short
 
     state = menu->state;
 
-    menu->width = menuboxWidth;
+    menu->width = menuWidth;
     menu->state &= 0xfffffff7;
     menu->height = local_60;
 
     if ((state & 2) != 0)
     {
-        menuboxHeight = 0;
-        DECOMP_RECTMENU_GetHeight(menu, &menuboxHeight, 1);
-        local_38 = (short)(-menuboxHeight/2);
+        menuHeight = 0;
+        DECOMP_RECTMENU_GetHeight(menu, &menuHeight, 1);
+        local_38 = (short)(-menuHeight/2);
     }
     if ((state & 1) != 0)
     {
-        local_40 = (short)(-menuboxWidth/2);
+        local_40 = (short)(-menuWidth/2);
     }
     sVar6 = 0;
     row = &menu->rows[0];
@@ -111,15 +111,15 @@ void DECOMP_RECTMENU_DrawSelf(struct RectMenu* menu, int posX, short posY, short
         {
             uVar5 = uVar8 | 0x8000;
             titleString = sdata->lngStrings[index];
-            offsetX = (short)(posX + menu->posX_prev + (menuboxWidth/2));
+            offsetX = (short)(posX + menu->posX_prev + (menuWidth/2));
         }
         DECOMP_DecalFont_DrawLine(titleString, offsetX, posY_prev, sVar4, uVar5);
         posY_prev = local_48 + posY_prev + 6;
     }
 
     if (row->stringIndex != -1)
     {
-        local_30 = (menuboxWidth/2) + 1;
+        local_30 = (menuWidth/2) + 1;
         local_2c = posX_prev;
         do
         {
@@ -189,7 +189,7 @@ void DECOMP_RECTMENU_DrawSelf(struct RectMenu* menu, int posX, short posY, short
         {
             rgb = &sdata->menuRowHighlight_Green;
         }
-        background.w = menuboxWidth;
+        background.w = menuWidth;
 
         DECOMP_CTR_Box_DrawClearBox(
             &background, rgb, 1, 
@@ -200,7 +200,7 @@ void DECOMP_RECTMENU_DrawSelf(struct RectMenu* menu, int posX, short posY, short
     {
         DECOMP_RECTMENU_DrawSelf(menu->ptrNextBox_InHierarchy,
                          posX + menu->posX_prev,
-                         local_38 + offsetY + menu->posY_prev + sVar7 + 0xc, menuboxWidth);
+                         local_38 + offsetY + menu->posY_prev + sVar7 + 0xc, menuWidth);
     }
     posX_prev = menu->posX_prev;
     posY_prev = menu->posY_prev;
@@ -212,7 +212,7 @@ void DECOMP_RECTMENU_DrawSelf(struct RectMenu* menu, int posX, short posY, short
     {
         borders.h = sVar7 + 8;
     }
-    borders.w = menuboxWidth + 0xc;
+    borders.w = menuWidth + 0xc;
     borders.y = local_38 + offsetY + posY_prev - 4;
     borders.x = local_40 + posX + posX_prev - 6;
     DECOMP_RECTMENU_DrawFullRect(menu, &borders);