fox load symbols

sonicdcer · Oct 31, 2024 · 1c379b4 · 1c379b4
1 parent 73bdda0
commit 1c379b4
Show file tree

Hide file tree

Showing 4 changed files with 94 additions and 68 deletions.
diff --git a/linker_scripts/eu/rev0/symbol_addrs.txt b/linker_scripts/eu/rev0/symbol_addrs.txt
@@ -11,8 +11,8 @@ func_80002F64 = 0x80002F64;
 func_80003008 = 0x80003008;
 Lib_InitPerspective = 0x800031EC;
 func_80003334 = 0x80003334;
-func_80003460 = 0x80003460;
-func_800035A0 = 0x800035A0;
+Lib_DmaRead = 0x80003460;
+Lib_FillScreen = 0x800035A0;
 func_800036A0 = 0x800036A0;
 func_800037FC = 0x800037FC;
 func_8000397C = 0x8000397C;
@@ -371,7 +371,7 @@ AudioThread_ResetAudioHeap = 0x8001EE5C;
 AudioThread_PreNMIReset = 0x8001EED0;
 AudioThread_Init = 0x8001EF0C;
 osDriveRomInit = 0x8001EF30;
-func_8001EF40 = 0x8001EF40;
+Mio0_Decompress = 0x8001EF40;
 func_8001EFE0 = 0x8001EFE0;
 func_8001FAB0 = 0x8001FAB0;
 func_8001FAD4 = 0x8001FAD4;
@@ -838,9 +838,9 @@ func_80057484 = 0x80057484;
 func_80057794 = 0x80057794;
 func_80057844 = 0x80057844;
 func_80057C80 = 0x80057C80;
-Load_TextLanguage = 0x80058B10;
-func_80058BD8 = 0x80058BD8;
-func_80058EA4 = 0x80058EA4;
+Load_RomFile = 0x80058B10;
+Load_SceneFiles = 0x80058BD8;
+Load_SceneSetup = 0x80058EA4;
 func_80059428 = 0x80059428;
 Load_SetTextLanguage = 0x80059470;
 func_80059530 = 0x80059530;
@@ -1992,34 +1992,34 @@ D_800CAF94 = 0x800CAF94;
 D_800CAF98 = 0x800CAF98;
 D_800CAF9C = 0x800CAF9C;
 D_800CAFAC = 0x800CAFAC;
-D_800CAFC0 = 0x800CAFC0;
-D_800CAFC4 = 0x800CAFC4;
-D_800CB05C = 0x800CB05C;
-D_800CB3EC = 0x800CB3EC;
-D_800CB484 = 0x800CB484;
-D_800CB64C = 0x800CB64C;
-D_800CB814 = 0x800CB814;
-D_800CB8AC = 0x800CB8AC;
-D_800CB944 = 0x800CB944;
-D_800CBA74 = 0x800CBA74;
-D_800CBE04 = 0x800CBE04;
-D_800CBF34 = 0x800CBF34;
-D_800CBFCC = 0x800CBFCC;
-D_800CC064 = 0x800CC064;
-D_800CC0FC = 0x800CC0FC;
-D_800CC22C = 0x800CC22C;
-D_800CC2C4 = 0x800CC2C4;
-D_800CC35C = 0x800CC35C;
-D_800CC3F4 = 0x800CC3F4;
-D_800CC48C = 0x800CC48C;
-D_800CC524 = 0x800CC524;
-D_800CC5BC = 0x800CC5BC;
-D_800CC6EC = 0x800CC6EC;
-D_800CC784 = 0x800CC784;
-D_800CC81C = 0x800CC81C;
-D_800CC8B4 = 0x800CC8B4;
-D_800CC9E4 = 0x800CC9E4;
-D_800CCA7C = 0x800CCA7C;
+sFillTimer = 0x800CAFC0;
+sNoOvl_Logo = 0x800CAFC4;
+sOvlending_Ending = 0x800CB05C;
+sOvlmenu_Title = 0x800CB3EC;
+sOvlmenu_Option = 0x800CB484;
+sOvlmenu_Map = 0x800CB64C;
+sOvlmenu_GameOver = 0x800CB814;
+sOvli1_Corneria = 0x800CB8AC;
+sOvli2_Meteo = 0x800CB944;
+sOvli5_Titania = 0x800CBA74;
+sOvli2_SectorX = 0x800CBE04;
+sOvli4_SectorZ = 0x800CBF34;
+sOvli3_Aquas = 0x800CBFCC;
+sOvli3_Area6 = 0x800CC064;
+sOvli4_Fortuna = 0x800CC0FC;
+sOvli3_Unk4 = 0x800CC22C;
+sOvli6_SectorY = 0x800CC2C4;
+sOvli3_Solar = 0x800CC35C;
+sOvli3_Zoness = 0x800CC3F4;
+sOvli1_Venom1 = 0x800CC48C;
+sOvli6_Andross = 0x800CC524;
+sOvli6_Venom2 = 0x800CC5BC;
+sOvli2_Setup20 = 0x800CC6EC;
+sOvli4_Bolse = 0x800CC784;
+sOvli4_Katina = 0x800CC81C;
+sOvli5_Macbeth = 0x800CC8B4;
+sOvli1_Training = 0x800CC9E4;
+sOvli2_Versus = 0x800CCA7C;
 D_800CCC44 = 0x800CCC44; //size:0x98
 D_800CCCDC = 0x800CCCDC;
 D_800CCCE0 = 0x800CCCE0;
@@ -2526,7 +2526,7 @@ D_80138E30 = 0x80138E30;
 gVIsPerFrame = 0x80138E34;
 D_80138E38 = 0x80138E38;
 D_80138E3C = 0x80138E3C;
-D_80138E3D = 0x80138E3D;
+gStopTasks = 0x80138E3D;
 D_80138E40 = 0x80138E40;
 D_80138E41 = 0x80138E41;
 D_80138E42 = 0x80138E42;

diff --git a/srceu/engine/fox_load.c b/srceu/engine/fox_load.c
@@ -2,7 +2,7 @@
 
 /* Had to comment these out because the rom didn't match */
 #if 0
-u8 D_800CAFC0 = 3;
+u8 sFillTimer = 3;
 
 #include "fox_load_inits.c"
 
@@ -26,14 +26,40 @@ Scene D_800CCC44 = {
 };
 #endif
 
-#pragma GLOBAL_ASM("asm/eu/rev0/nonmatchings/engine/fox_load/Load_TextLanguage.s")
+// No difference
+#pragma GLOBAL_ASM("asm/eu/rev0/nonmatchings/engine/fox_load/Load_RomFile.s")
 
-#pragma GLOBAL_ASM("asm/eu/rev0/nonmatchings/engine/fox_load/func_80058BD8.s")
+// No difference
+#pragma GLOBAL_ASM("asm/eu/rev0/nonmatchings/engine/fox_load/Load_SceneFiles.s")
 
-#pragma GLOBAL_ASM("asm/eu/rev0/nonmatchings/engine/fox_load/func_80058EA4.s")
+// No difference
+#pragma GLOBAL_ASM("asm/eu/rev0/nonmatchings/engine/fox_load/Load_SceneSetup.s")
 
 #pragma GLOBAL_ASM("asm/eu/rev0/nonmatchings/engine/fox_load/func_80059428.s")
+// https://decomp.me/scratch/vQ0WZ (matching)
+/*
+void func_80059428(void) {
+    if (gStopTasks != 1) {
+        Lib_DmaRead(dma_table_ROM_START, gDmaTable, audio_seq_ROM_START - dma_table_ROM_START);
+    }
+}
+*/
 
 #pragma GLOBAL_ASM("asm/eu/rev0/nonmatchings/engine/fox_load/Load_SetTextLanguage.s")
 
+// https://decomp.me/scratch/pCmOV
+/*
+void Load_SetTextLanguage(void) {
+    if (gStopTasks != 1) {
+        switch (D_8017AACB) {
+        case 0:
+            Load_RomFile(&ast_radio_en_ROM_START, &D_fr_8017B230,(u32) &ast_radio_fr_ROM_START -
+(u32)&ast_radio_en_ROM_START); break; case 1: Load_RomFile(&ast_radio_fr_ROM_START, &D_fr_8017B230,
+(u32)&ast_radio_fr_ROM_END - (u32)&ast_radio_fr_ROM_START); break; case 2: Load_RomFile(&ast_radio_de_ROM_START,
+&D_fr_8017B230, (u32)&ast_radio_de_ROM_END - (u32)&ast_radio_de_ROM_START); break;
+        }
+    }
+}
+*/
+
 #pragma GLOBAL_ASM("asm/eu/rev0/nonmatchings/engine/fox_load/D_800D7350.s")
diff --git a/srceu/engine/fox_load_inits.c b/srceu/engine/fox_load_inits.c
@@ -1,6 +1,6 @@
 #include "sf64dma.h"
 
-Scene D_800CAFC4[1] = {
+Scene sNoOvl_Logo[1] = {
     { NO_OVERLAY,
       { /* 1 */ NO_SEGMENT,
         /* 2 */ NO_SEGMENT,
@@ -19,7 +19,7 @@ Scene D_800CAFC4[1] = {
         /* F */ ROM_SEGMENT(ast_logo) } },
 };
 
-Scene D_800CB05C[6] = {
+Scene sOvlending_Ending[6] = {
     { OVERLAY_OFFSETS(ovl_ending),
       { /* 1 */ NO_SEGMENT,
         /* 2 */ NO_SEGMENT,
@@ -118,7 +118,7 @@ Scene D_800CB05C[6] = {
         /* F */ NO_SEGMENT } },
 };
 
-Scene D_800CB3EC[1] = {
+Scene sOvlmenu_Title[1] = {
     { OVERLAY_OFFSETS(ovl_menu),
       { /* 1 */ NO_SEGMENT,
         /* 2 */ NO_SEGMENT,
@@ -137,7 +137,7 @@ Scene D_800CB3EC[1] = {
         /* F */ NO_SEGMENT } },
 };
 
-Scene D_800CB484[3] = {
+Scene sOvlmenu_Option[3] = {
     { OVERLAY_OFFSETS(ovl_menu),
       { /* 1 */ NO_SEGMENT,
         /* 2 */ NO_SEGMENT,
@@ -188,7 +188,7 @@ Scene D_800CB484[3] = {
         /* F */ NO_SEGMENT } },
 };
 
-Scene D_800CB64C[3] = {
+Scene sOvlmenu_Map[3] = {
     { OVERLAY_OFFSETS(ovl_menu),
       { /* 1 */ NO_SEGMENT,
         /* 2 */ NO_SEGMENT,
@@ -239,7 +239,7 @@ Scene D_800CB64C[3] = {
         /* F */ NO_SEGMENT } },
 };
 
-Scene D_800CB814[1] = {
+Scene sOvlmenu_GameOver[1] = {
     { OVERLAY_OFFSETS(ovl_menu),
       { /* 1 */ NO_SEGMENT,
         /* 2 */ NO_SEGMENT,
@@ -258,7 +258,7 @@ Scene D_800CB814[1] = {
         /* F */ NO_SEGMENT } },
 };
 
-Scene D_800CB8AC[1] = {
+Scene sOvli1_Corneria[1] = {
     { OVERLAY_OFFSETS(ovl_i1),
       { /* 1 */ ROM_SEGMENT(ast_common),
         /* 2 */ ROM_SEGMENT(ast_bg_planet),
@@ -277,7 +277,7 @@ Scene D_800CB8AC[1] = {
         /* F */ NO_SEGMENT } },
 };
 
-Scene D_800CB944[2] = {
+Scene sOvli2_Meteo[2] = {
     { OVERLAY_OFFSETS(ovl_i2),
       { /* 1 */ ROM_SEGMENT(ast_common),
         /* 2 */ ROM_SEGMENT(ast_bg_space),
@@ -312,7 +312,7 @@ Scene D_800CB944[2] = {
         /* F */ NO_SEGMENT } },
 };
 
-Scene D_800CBA74[6] = {
+Scene sOvli5_Titania[6] = {
     { OVERLAY_OFFSETS(ovl_i5),
       { /* 1 */ ROM_SEGMENT(ast_common),
         /* 2 */ ROM_SEGMENT(ast_bg_planet),
@@ -411,7 +411,7 @@ Scene D_800CBA74[6] = {
         /* F */ NO_SEGMENT } },
 };
 
-Scene D_800CBE04[2] = {
+Scene sOvli2_SectorX[2] = {
     { OVERLAY_OFFSETS(ovl_i2),
       { /* 1 */ ROM_SEGMENT(ast_common),
         /* 2 */ ROM_SEGMENT(ast_bg_space),
@@ -446,7 +446,7 @@ Scene D_800CBE04[2] = {
         /* F */ NO_SEGMENT } },
 };
 
-Scene D_800CBF34[1] = {
+Scene sOvli4_SectorZ[1] = {
     { OVERLAY_OFFSETS(ovl_i4),
       { /* 1 */ ROM_SEGMENT(ast_common),
         /* 2 */ ROM_SEGMENT(ast_bg_space),
@@ -465,7 +465,7 @@ Scene D_800CBF34[1] = {
         /* F */ NO_SEGMENT } },
 };
 
-Scene D_800CBFCC[1] = {
+Scene sOvli3_Aquas[1] = {
     { OVERLAY_OFFSETS(ovl_i3),
       { /* 1 */ ROM_SEGMENT(ast_common),
         /* 2 */ ROM_SEGMENT(ast_bg_planet),
@@ -484,7 +484,7 @@ Scene D_800CBFCC[1] = {
         /* F */ NO_SEGMENT } },
 };
 
-Scene D_800CC064[1] = {
+Scene sOvli3_Area6[1] = {
     { OVERLAY_OFFSETS(ovl_i3),
       { /* 1 */ ROM_SEGMENT(ast_common),
         /* 2 */ ROM_SEGMENT(ast_bg_space),
@@ -503,7 +503,7 @@ Scene D_800CC064[1] = {
         /* F */ NO_SEGMENT } },
 };
 
-Scene D_800CC0FC[2] = {
+Scene sOvli4_Fortuna[2] = {
     { OVERLAY_OFFSETS(ovl_i4),
       { /* 1 */ ROM_SEGMENT(ast_common),
         /* 2 */ ROM_SEGMENT(ast_bg_planet),
@@ -538,7 +538,7 @@ Scene D_800CC0FC[2] = {
         /* F */ NO_SEGMENT } },
 };
 
-Scene D_800CC22C[1] = {
+Scene sOvli3_Unk4[1] = {
     { OVERLAY_OFFSETS(ovl_i3),
       { /* 1 */ ROM_SEGMENT(ast_common),
         /* 2 */ ROM_SEGMENT(ast_bg_space),
@@ -557,7 +557,7 @@ Scene D_800CC22C[1] = {
         /* F */ NO_SEGMENT } },
 };
 
-Scene D_800CC2C4[1] = {
+Scene sOvli6_SectorY[1] = {
     { OVERLAY_OFFSETS(ovl_i6),
       { /* 1 */ ROM_SEGMENT(ast_common),
         /* 2 */ ROM_SEGMENT(ast_bg_space),
@@ -576,7 +576,7 @@ Scene D_800CC2C4[1] = {
         /* F */ NO_SEGMENT } },
 };
 
-Scene D_800CC35C[1] = {
+Scene sOvli3_Solar[1] = {
     { OVERLAY_OFFSETS(ovl_i3),
       { /* 1 */ ROM_SEGMENT(ast_common),
         /* 2 */ ROM_SEGMENT(ast_bg_planet),
@@ -595,7 +595,7 @@ Scene D_800CC35C[1] = {
         /* F */ NO_SEGMENT } },
 };
 
-Scene D_800CC3F4[1] = {
+Scene sOvli3_Zoness[1] = {
     { OVERLAY_OFFSETS(ovl_i3),
       { /* 1 */ ROM_SEGMENT(ast_common),
         /* 2 */ ROM_SEGMENT(ast_bg_planet),
@@ -614,7 +614,7 @@ Scene D_800CC3F4[1] = {
         /* F */ NO_SEGMENT } },
 };
 
-Scene D_800CC48C[1] = {
+Scene sOvli1_Venom1[1] = {
     { OVERLAY_OFFSETS(ovl_i1),
       { /* 1 */ ROM_SEGMENT(ast_common),
         /* 2 */ ROM_SEGMENT(ast_bg_planet),
@@ -633,7 +633,7 @@ Scene D_800CC48C[1] = {
         /* F */ NO_SEGMENT } },
 };
 
-Scene D_800CC524[1] = {
+Scene sOvli6_Andross[1] = {
     { OVERLAY_OFFSETS(ovl_i6),
       { /* 1 */ ROM_SEGMENT(ast_common),
         /* 2 */ ROM_SEGMENT(ast_bg_planet),
@@ -652,7 +652,7 @@ Scene D_800CC524[1] = {
         /* F */ NO_SEGMENT } },
 };
 
-Scene D_800CC5BC[2] = {
+Scene sOvli6_Venom2[2] = {
     { OVERLAY_OFFSETS(ovl_i6),
       { /* 1 */ ROM_SEGMENT(ast_common),
         /* 2 */ ROM_SEGMENT(ast_bg_planet),
@@ -687,7 +687,7 @@ Scene D_800CC5BC[2] = {
         /* F */ NO_SEGMENT } },
 };
 
-Scene D_800CC6EC[1] = {
+Scene sOvli2_Setup20[1] = {
     { OVERLAY_OFFSETS(ovl_i2),
       { /* 1 */ ROM_SEGMENT(ast_common),
         /* 2 */ ROM_SEGMENT(ast_bg_planet),
@@ -706,7 +706,7 @@ Scene D_800CC6EC[1] = {
         /* F */ NO_SEGMENT } },
 };
 
-Scene D_800CC784[1] = {
+Scene sOvli4_Bolse[1] = {
     { OVERLAY_OFFSETS(ovl_i4),
       { /* 1 */ ROM_SEGMENT(ast_common),
         /* 2 */ ROM_SEGMENT(ast_bg_space),
@@ -725,7 +725,7 @@ Scene D_800CC784[1] = {
         /* F */ ROM_SEGMENT(ast_star_wolf) } },
 };
 
-Scene D_800CC81C[1] = {
+Scene sOvli4_Katina[1] = {
     { OVERLAY_OFFSETS(ovl_i4),
       { /* 1 */ ROM_SEGMENT(ast_common),
         /* 2 */ ROM_SEGMENT(ast_bg_planet),
@@ -744,7 +744,7 @@ Scene D_800CC81C[1] = {
         /* F */ ROM_SEGMENT(ast_star_wolf) } },
 };
 
-Scene D_800CC8B4[2] = {
+Scene sOvli5_Macbeth[2] = {
     { OVERLAY_OFFSETS(ovl_i5),
       { /* 1 */ ROM_SEGMENT(ast_common),
         /* 2 */ ROM_SEGMENT(ast_bg_planet),
@@ -779,7 +779,7 @@ Scene D_800CC8B4[2] = {
         /* F */ NO_SEGMENT } },
 };
 
-Scene D_800CC9E4[1] = {
+Scene sOvli1_Training[1] = {
     { OVERLAY_OFFSETS(ovl_i1),
       { /* 1 */ ROM_SEGMENT(ast_common),
         /* 2 */ ROM_SEGMENT(ast_bg_planet),
@@ -798,7 +798,7 @@ Scene D_800CC9E4[1] = {
         /* F */ ROM_SEGMENT(ast_star_wolf) } },
 };
 
-Scene D_800CCA7C[2] = {
+Scene sOvli2_Versus[2] = {
     { OVERLAY_OFFSETS(ovl_i2),
       { /* 1 */ ROM_SEGMENT(ast_common),
         /* 2 */ ROM_SEGMENT(ast_bg_planet),