Add back some of the stuff from #35

config/splat.dra.yaml

@@ -25,6 +25,8 @@ segments:
     subalign: 4
     subsegments:
       - [0x0, rodata]
+      - [0x518, rodata]
+      - [0x1F18, rodata]
       - [0x2BC0, rodata]
       - [0x7730, rodata]
       - [0x8900, rodata]

config/symbols.txt

@@ -1110,6 +1110,24 @@ D_800ACD88 = 0x800ACD88;
 D_800ACD90 = 0x800ACD90;
 rect = 0x800ACD98;
 c_backbufferClear = 0x800ACDA0;
+g_saveIconPalette = 0x800A0518;
+g_saveIcon0 = 0x800A0718;
+g_saveIcon1 = 0x800A0898;
+g_saveIcon2 = 0x800A0A18;
+g_saveIcon3 = 0x800A0B98;
+g_saveIcon4 = 0x800A0D18;
+g_saveIcon5 = 0x800A0E98;
+g_saveIcon6 = 0x800A1018;
+g_saveIcon7 = 0x800A1198;
+g_saveIcon8 = 0x800A1318;
+g_saveIcon9 = 0x800A1498;
+g_saveIcon10 = 0x800A1618;
+g_saveIcon11 = 0x800A1798;
+g_saveIcon12 = 0x800A1918;
+g_saveIcon13 = 0x800A1A98;
+g_saveIcon14 = 0x800A1C18;
+g_saveIcon15 = 0x800A1D98;
+g_saveIconTexture = 0x800A1F18;
 aPbav = 0x800B107C;
 aPbav_0 = 0x800B407C;
 aPbav_2 = 0x800B607C;
@@ -1341,6 +1359,8 @@ ClearBackbuffer = 0x800E44EC;
 nullsub_9 = 0x800E7384;
 InitializePads = 0x800E8DF0;
 ReadPads = 0x800E8E48;
+GetSavePalette = 0x800E9BA4;
+GetSaveIcon = 0x800E9BDC;
 SetRoomForegroundLayer = 0x800ED774;
 SetRoomBackgroundLayer = 0x800ED90C;
 LoadRoomLayer = 0x800ED9F4;

include/dra.h

@@ -667,8 +667,8 @@ extern s32 D_80098850;
 extern void (*D_800A0004)(); // TODO pointer to 0x50 array of functions
 extern s32 D_800A04EC;
 extern s32 D_800A0510[];
-extern u16 D_800A0518[0x10][0x10];
-extern u32 D_800A1F18[0x10];
+extern u16 g_saveIconPalette[0x10][0x10];
+extern u8* g_saveIconTexture[0x10];
 extern s32 D_800A2438;
 extern u8 D_800A2EE8[];
 extern u8 D_800A2EED;

src/dra/42398.c

@@ -838,31 +838,25 @@ s32 func_800E9B18(s32 arg0, s32 arg1) {
     return ret;
 }
 
-// https://decomp.me/scratch/kHOQh match with struct
-
-void func_800E9BA4(u16* arg0, s32 arg1) {
+void GetSavePalette(u16* dst, s32 palIdx) {
+    const ColorCount = 16;
     s32 i;
-    u16* var_v1 = D_800A0518[0];
+    u16* src = g_saveIconPalette[0];
 
-    var_v1 = D_800A0518[arg1];
-
-    for (i = 0; i < 16; i++) {
-        *arg0 = *var_v1;
-        var_v1++;
-        arg0++;
+    src = g_saveIconPalette[palIdx];
+    for (i = 0; i < ColorCount; i++) {
+        *dst++ = *src++;
     }
 }
 
-void func_800E9BDC(u8* arg0, s32 arg1) {
+void GetSaveIcon(u8* dst, s32 iconIdx) {
+    const IconSize = 384;
     s32 i;
-    u8* var_a1;
+    u8* src;
 
-    var_a1 = (u8*)D_800A1F18[arg1];
-
-    for (i = 0; i < 384; i++) {
-        *arg0 = *var_a1;
-        var_a1++;
-        arg0++;
+    src = g_saveIconTexture[iconIdx];
+    for (i = 0; i < IconSize; i++) {
+        *dst++ = *src++;
     }
 }