Fix some variable prefixes

lhsazevedo · Apr 14, 2024 · 599ead4 · 599ead4
1 parent 3cb2dc5
commit 599ead4
Show file tree

Hide file tree

Showing 30 changed files with 305 additions and 283 deletions.
diff --git a/src/012f44.c b/src/012f44.c
@@ -401,8 +401,8 @@ extern Uint32 var_8c1ba292;
 extern Uint32 var_8c1ba291;
 extern int var_8c227da8;
 extern task_load_8c014338;
-extern memblkSource_8c0fcd48;
-extern memblkSource_8c0fcd4c;
+extern var_memblkSource_8c0fcd48;
+extern var_memblkSource_8c0fcd4c;
 extern var_queuesAreInitialized_8c157a60;
 extern init_8c03bfa8;
 
@@ -618,8 +618,8 @@ void task_8c013388(Task *task, void *state) {
                 var_8c1bc450 = (Float) var_loadedFooNjm_8c1bc448->nbFrame - 1;
 
                 resetQueues_8c011f6c();
-                requestDat_8c011182("\\SOUND", "manatee.drv", &memblkSource_8c0fcd48);
-                requestDat_8c011182("\\SOUND", "bus.mlt", &memblkSource_8c0fcd4c);
+                requestDat_8c011182("\\SOUND", "manatee.drv", &var_memblkSource_8c0fcd48);
+                requestDat_8c011182("\\SOUND", "bus.mlt", &var_memblkSource_8c0fcd4c);
                 resetUknPvmBool_8c014322();
                 processQueues_8c011fe0(&nop_8c011120, 0, 0, 0, &setUknPvmBool_8c014330);
             }

diff --git a/src/015ab8_title.c b/src/015ab8_title.c
@@ -12,7 +12,7 @@ extern Bool getUknPvmBool_8c01432a();
 extern void freeQueues_8c011f7e();
 extern void FUN_8c01940e();
 extern void push_fadein_8c022a9c();
-extern SDMIDI midiHandles_8c0fcd28[7];
+extern SDMIDI var_midiHandles_8c0fcd28[7];
 extern Bool isFading_8c226568;
 extern void drawSprite_8c014f54(ResourceGroup *r4, int r5, float fr4, float fr5, float fr6);
 extern void push_fadeout_8c022b60();
@@ -48,7 +48,7 @@ void task_title_8c015ab8(Task* task, void *state) {
         && menuState_8c1bc7a8.state_0x18 <= TITLE_STATE_0X0C_FLAG_REVEAL) { /* 8c015af6 */
             if (peripheral_8c1ba35c[0].press & PDD_DGT_ST) { /* 8c015afa */
                 /* 8c015b00 */
-                sdMidiPlay(midiHandles_8c0fcd28[0], 1, 0, 0);
+                sdMidiPlay(var_midiHandles_8c0fcd28[0], 1, 0, 0);
 
                 peripheral_8c1ba35c[0].press = 0;
                 menuState_8c1bc7a8.state_0x18 = TITLE_STATE_0X0E_PRESS_START;
@@ -209,7 +209,7 @@ void task_title_8c015ab8(Task* task, void *state) {
                 peripheral_8c1ba35c[0].press & (PDD_DGT_TA | PDD_DGT_ST)
                 || FUN_8c019550(saveNames_8c044d50, 3)
             ) {
-                sdMidiPlay(midiHandles_8c0fcd28[0], 1, 0, 0);
+                sdMidiPlay(var_midiHandles_8c0fcd28[0], 1, 0, 0);
                 menuState_8c1bc7a8.state_0x18 = TITLE_STATE_0X09_VMU_WARNING_FADE_OUT;
                 LOG_DEBUG(("[TITLE] State changed: 0X09_VMU_WARNING_FADE_OUT\n"));
                 push_fadeout_8c022b60(10);
@@ -325,7 +325,7 @@ void task_title_8c015ab8(Task* task, void *state) {
                 FUN_8c010bae(0);
                 FUN_8c010bae(1);
 
-                sdMidiPlay(midiHandles_8c0fcd28[0], 1, 0, 0);
+                sdMidiPlay(var_midiHandles_8c0fcd28[0], 1, 0, 0);
 
                 menuState_8c1bc7a8.state_0x18 = TITLE_STATE_0X0F_START_PRESSED;
                 LOG_DEBUG(("[TITLE] State changed: 0X0F_START_PRESSED\n"));

diff --git a/src/016c58.c b/src/016c58.c
@@ -3,7 +3,7 @@
 #include <shinobi.h>
 #include <sg_sd.h>
 
-extern SDMIDI midiHandles_8c0fcd28[7];
+extern SDMIDI var_midiHandles_8c0fcd28[7];
 extern PDS_PERIPHERAL peripheral_8c1ba35c[2];
 
 int cycleOptionAndPlaySound_8c016c58(int *currentOption, int optionCount)
@@ -23,7 +23,7 @@ int cycleOptionAndPlaySound_8c016c58(int *currentOption, int optionCount)
         return 0;
     }
 
-    sdMidiPlay(midiHandles_8c0fcd28[0], 1, 3, 0);
+    sdMidiPlay(var_midiHandles_8c0fcd28[0], 1, 3, 0);
     *currentOption = newOption;
     return 1;
 }
@@ -32,23 +32,23 @@ int processNavInputAndPlaySound_8c016caa(int* param_1) {
     if (*param_1 == 0) {
         if (peripheral_8c1ba35c[0].press & PDD_DGT_KR) {
             *param_1 = 1;
-            sdMidiPlay(midiHandles_8c0fcd28[0], 1, 3, 0);
+            sdMidiPlay(var_midiHandles_8c0fcd28[0], 1, 3, 0);
         }
     } else if (peripheral_8c1ba35c[0].press & PDD_DGT_KL) {
         *param_1 = 0;
-        sdMidiPlay(midiHandles_8c0fcd28[0], 1, 3, 0);
+        sdMidiPlay(var_midiHandles_8c0fcd28[0], 1, 3, 0);
     }
 
     if (peripheral_8c1ba35c[0].press & PDD_DGT_TA) {
         if (!*param_1) {
-            sdMidiPlay(midiHandles_8c0fcd28[0], 1, 0, 0);
+            sdMidiPlay(var_midiHandles_8c0fcd28[0], 1, 0, 0);
             return 1;
         } else {
-            sdMidiPlay(midiHandles_8c0fcd28[0], 1, 1, 0);
+            sdMidiPlay(var_midiHandles_8c0fcd28[0], 1, 1, 0);
             return 2;
         }
     } else if (peripheral_8c1ba35c[0].press & PDD_DGT_TB) {
-        sdMidiPlay(midiHandles_8c0fcd28[0], 1, 1, 0);
+        sdMidiPlay(var_midiHandles_8c0fcd28[0], 1, 1, 0);
         return 2;
     }