build fixes with latest spimdisasm (big thanks to Anghelo)

parappadev · Feb 1, 2025 · c8cf0e0 · c8cf0e0
1 parent 18eccc2
commit c8cf0e0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/config/symbol_addrs.txt b/config/symbol_addrs.txt
@@ -2029,3 +2029,6 @@ strcpy                              = 0x00171aa0; // type:func
 
 // ee/gcc/src/newlib/libc/machine/r5900/strlen.S
 strlen                              = 0x00171bb4; // type:func
+
+// -- Temoporary symbols --
+D_003938F8                          = 0x003938f8; // type:s32
diff --git a/src/menu/p3mc.c b/src/menu/p3mc.c
@@ -112,8 +112,6 @@ INCLUDE_ASM("menu/p3mc", _P3MC_ASC2SJIS);
 
 INCLUDE_ASM("menu/p3mc", _P3MC_UserName_ASC2SJIS);
 
-INCLUDE_RODATA("menu/p3mc", D_003961C0);
-
 INCLUDE_ASM("menu/p3mc", _P3MC_SetBrowsInfo);
 
 INCLUDE_ASM("menu/p3mc", _P3MC_mainfile_chk);
@@ -292,6 +290,12 @@ INCLUDE_ASM("menu/p3mc", P3MC_GetUserCheck);
 
 INCLUDE_ASM("menu/p3mc", P3MC_AddUser);
 
+INCLUDE_RODATA("menu/p3mc", D_00396420);
+
+INCLUDE_RODATA("menu/p3mc", D_00396448);
+
+INCLUDE_RODATA("menu/p3mc", D_00396470);
+
 INCLUDE_ASM("menu/p3mc", _P3MC_AddUserBroken);
 
 INCLUDE_ASM("menu/p3mc", P3MC_SortUser);
@@ -354,14 +358,6 @@ void P3MC_OpeningCheckEnd(void) {
     pUChkWork = NULL;
 }
 
-INCLUDE_RODATA("menu/p3mc", D_00396420);
-
-INCLUDE_RODATA("menu/p3mc", D_00396448);
-
-INCLUDE_RODATA("menu/p3mc", D_00396470);
-
-INCLUDE_RODATA("menu/p3mc", D_00396498);
-
 INCLUDE_ASM("menu/p3mc", P3MC_OpeningCheck);
 
 #if 1