Extract g_MemcardPortMask data

Xeeynamo · Dec 12, 2023 · 9da90d5 · 9da90d5
1 parent 4e839a4
commit 9da90d5
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 18 deletions.
diff --git a/config/splat.hd.dra.yaml b/config/splat.hd.dra.yaml
@@ -34,7 +34,7 @@ segments:
       - [0x160, .data, play]
       - [0x240, .data, loading]
       - [0x248, .data, 47BB8]
-      - [0x510, data]
+      - [0x510, .data, save_mgr_pre]
       - [0x518, palette, memcard_0]
       - [0x538, palette, memcard_1]
       - [0x558, palette, memcard_2]

diff --git a/config/splat.us.dra.yaml b/config/splat.us.dra.yaml
@@ -34,7 +34,7 @@ segments:
       - [0x160, .data, play]
       - [0x240, .data, loading]
       - [0x248, .data, 47BB8]
-      - [0x510, data]
+      - [0x510, .data, save_mgr_pre]
       - [0x518, palette, memcard_0]
       - [0x538, palette, memcard_1]
       - [0x558, palette, memcard_2]

diff --git a/config/splat.us.stsel.yaml b/config/splat.us.stsel.yaml
@@ -31,6 +31,7 @@ segments:
     subsegments:
       - [0x0, .data, 2C048]
       - [0x3A8, data]
+      - [0x8DC, .data, save_mgr_pre]
       - [0x8E4, palette, memcard_0]
       - [0x904, palette, memcard_1]
       - [0x924, palette, memcard_2]

diff --git a/config/symbols.hd.dra.txt b/config/symbols.hd.dra.txt
@@ -1,4 +1,3 @@
-g_UnkMemcardPort = 0x800A0510;
 D_800A21B8 = 0x800A2178;
 D_800A2438 = 0x800A23F8;
 D_800A243C = 0x800A23FC;

diff --git a/config/symbols.us.dra.txt b/config/symbols.us.dra.txt
@@ -1,4 +1,3 @@
-g_UnkMemcardPort = 0x800A0510;
 c_chPlaystationButtons = 0x800A2D70;
 c_chShoulderButtons = 0x800A2D74;
 MenuContextData = 0x800A2E00;

diff --git a/config/symbols.us.stsel.txt b/config/symbols.us.stsel.txt
@@ -1,7 +1,6 @@
 g_SpriteBanks = 0x8018059C;
 g_Cluts = 0x8018070C;
 g_EntityGfxs = 0x80180760;
-g_UnkMemcardPort = 0x801808DC;
 g_StreamWidth = 0x8018B2FC;
 g_StreamHeight = 0x8018B300;
 PrintFileSelectPlaceName = 0x801AD134;

diff --git a/include/memcard.h b/include/memcard.h
@@ -26,5 +26,8 @@ typedef struct {
 
 extern MemcardInfo g_MemcardInfo[2];
 extern s32 g_MemcardBlockRead;
+extern s32 g_MemcardPortMask[];
+extern u16 g_saveIconPal0[0x10][0x10];
+extern u8* g_saveIconTexture[0x10];
 
 #endif
diff --git a/src/dra/dra.h b/src/dra/dra.h
@@ -372,9 +372,6 @@ extern u16 g_ButtonMask[];
 extern u8 g_StageSelectOrder[];
 extern u16 D_800A04CC[];
 extern u32 D_800A04F8;
-extern s32 g_UnkMemcardPort[];
-extern u16 g_saveIconPal0[0x10][0x10];
-extern u8* g_saveIconTexture[0x10];
 extern s16 D_800A21B8[0x20];
 extern s32 D_800A2438;
 extern u8 D_800A243C[];

diff --git a/src/dra/save_mgr_pre.c b/src/dra/save_mgr_pre.c
@@ -0,0 +1,2 @@
+#include "dra.h"
+#include "../save_mgr_pre.h"
diff --git a/src/save_mgr.h b/src/save_mgr.h
@@ -279,13 +279,13 @@ s32 func_800E9880(s32 nPort, s32 nCard) {
             break;
 
         case 3:
-            D_8006C3AC &= g_UnkMemcardPort[nPort];
+            D_8006C3AC &= g_MemcardPortMask[nPort];
             memcard->unk258 = -1;
             g_MemcardStep = 4;
             break;
 
         case 4:
-            D_8006C3AC &= g_UnkMemcardPort[nPort];
+            D_8006C3AC &= g_MemcardPortMask[nPort];
             memcard->unk258 = 2;
             _clear_event_x();
             _card_clear(channel);
@@ -294,7 +294,7 @@ s32 func_800E9880(s32 nPort, s32 nCard) {
             break;
 
         case 2:
-            D_8006C3AC &= g_UnkMemcardPort[nPort];
+            D_8006C3AC &= g_MemcardPortMask[nPort];
             memcard->unk258 = -3;
             g_MemcardStep = 4;
             break;
@@ -319,19 +319,19 @@ s32 func_800E9880(s32 nPort, s32 nCard) {
             break;
 
         case 3:
-            D_8006C3AC &= g_UnkMemcardPort[nPort];
+            D_8006C3AC &= g_MemcardPortMask[nPort];
             memcard->unk258 = -1;
             g_MemcardStep++;
             break;
 
         case 4:
-            D_8006C3AC &= g_UnkMemcardPort[nPort];
+            D_8006C3AC &= g_MemcardPortMask[nPort];
             memcard->unk258 = -2;
             g_MemcardStep++;
             break;
 
         case 2:
-            D_8006C3AC &= g_UnkMemcardPort[nPort];
+            D_8006C3AC &= g_MemcardPortMask[nPort];
             memcard->unk258 = -3;
             g_MemcardStep++;
             break;
@@ -481,7 +481,7 @@ s32 MemcardFormat(s32 nPort, s32 nCard) {
     char savePath[0x8];
     s32 ret;
 
-    D_8006C3AC &= g_UnkMemcardPort[nPort];
+    D_8006C3AC &= g_MemcardPortMask[nPort];
     sprintf(savePath, "bu%1d%1d:", nPort, nCard);
     _clear_event_x();
     format(savePath);

diff --git a/src/save_mgr_pre.h b/src/save_mgr_pre.h
@@ -0,0 +1,3 @@
+#include "memcard.h"
+
+s32 g_MemcardPortMask[] = {-2, -3};
diff --git a/src/st/sel/2D260.c b/src/st/sel/2D260.c
@@ -1,4 +1,5 @@
 #include "sel.h"
+#include "memcard.h"
 
 typedef enum {
     Tips_Generic,

diff --git a/src/st/sel/save_mgr_pre.c b/src/st/sel/save_mgr_pre.c
@@ -0,0 +1,2 @@
+#include "sel.h"
+#include "../../save_mgr_pre.h"
diff --git a/src/st/sel/sel.h b/src/st/sel/sel.h
@@ -122,9 +122,6 @@ extern u8 D_80180564[];
 extern u8 D_80180578[];
 extern u8 D_80180580[];
 extern const char* D_801808D0[];
-extern s32 g_UnkMemcardPort[2];
-extern u16 g_saveIconPal0[0x10][0x10];
-extern u8* g_saveIconTexture[];
 extern s8 D_801823A0[]; // on-screen keyboard
 extern RECT D_80182584;
 extern RECT D_8018258C;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#include "memcard.h"

		s32 g_MemcardPortMask[] = {-2, -3};
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#include "sel.h"
		#include "../../save_mgr_pre.h"