Import menu data

Xeeynamo · Dec 12, 2023 · fb8e9d5 · fb8e9d5
1 parent b851d5e
commit fb8e9d5
Show file tree

Hide file tree

Showing 11 changed files with 141 additions and 114 deletions.
diff --git a/config/splat.hd.dra.yaml b/config/splat.hd.dra.yaml
@@ -77,7 +77,7 @@ segments:
       - [0x2BB8, .data, 5087C] # D_800A2C0C, D_800A2D44
       - [0x2CF4, .data, menu] # array of strings
       - [0x2D1C, .data, menu] # HD exclusive array of strings
-      - [0x2D88, data]
+      - [0x2D88, .data, menu]
       - [0x2ED0, .data, 5D6C4]
       - [0x2EF8, data]
       - [0xCFDC, .data, 6D59C]

diff --git a/config/splat.us.dra.yaml b/config/splat.us.dra.yaml
@@ -76,7 +76,6 @@ segments:
       - [0x2BC0, .data, 5087C] # D_800A2BC0
       - [0x2C0C, .data, 5087C] # D_800A2C0C, D_800A2D44
       - [0x2D48, .data, menu]
-      - [0x2D70, data]
       - [0x2EC0, .data, 5D6C4]
       - [0x2EE8, data]
       - [0x3C40, data]

diff --git a/config/symbols.hd.dra.txt b/config/symbols.hd.dra.txt
@@ -5,12 +5,7 @@ D_800A245C = 0x800A241C;
 D_800A297C = 0x800A293C;
 D_800A2BC0 = 0x800A2B6C;
 D_800A2D44 = 0x800A2CF0;
-c_chPlaystationButtons = 0x800A2D88;
-c_chShoulderButtons = 0x800A2D8C;
-D_800A2D7C = 0x800A2D94;
-D_800A2D80 = 0x800A2D98;
-D_800A2D98 = 0x800A2DA8;
-MenuContextData = 0x800A2E10;
+D_800A2DEC = 0x800A2DFC;
 D_800A2EE8 = 0x800A2EF8;
 D_800A2EED = 0x800A2EFD;
 D_800A2EF8 = 0x800A2F08;

diff --git a/config/symbols.us.dra.txt b/config/symbols.us.dra.txt
@@ -1,6 +1,3 @@
-c_chPlaystationButtons = 0x800A2D70;
-c_chShoulderButtons = 0x800A2D74;
-MenuContextData = 0x800A2E00;
 g_CheatCodes = 0x800A300C;
 g_JosephsCloak = 0x800A37DC;
 g_JosephsCloak_liningLight = 0x800A37DE;

diff --git a/include/game.h b/include/game.h
@@ -508,16 +508,6 @@ typedef struct {
 } MenuContext; // size = 0x1E
 #define SIZEOF_MENUCONTEXT (0x1E)
 
-// Struct for table of values to intitialize MenuContext structs
-typedef struct {
-    /* 0x00 */ s16 cursorX;
-    /* 0x02 */ s16 cursorY;
-    /* 0x04 */ s16 cursorW;
-    /* 0x06 */ s16 cursorH;
-    /* 0x08 */ s16 otIdx;
-    /* 0x0A */ s16 padding;
-} MenuContextInit; // size = 0x1C
-
 typedef struct {
     /* 0x0 */ u8 tileLayoutId;
     /* 0x1 */ u8 tilesetId;

diff --git a/include/unkstruct.h b/include/unkstruct.h
@@ -88,12 +88,6 @@ typedef struct Unkstruct_80128BBC {
     /* 0x04 */ Unkstruct_80128BBC_Sub unk04[4];
 } Unkstruct_80128BBC;
 
-typedef struct Unkstruct_800A2D98 {
-    /* 0x0 */ s32 equipTypeFilter;
-    /* 0x4 */ s32 unk4;
-    /* 0x8 */ s32 unk8;
-} Unkstruct_800A2D98;
-
 typedef struct {
     /* 0x00 */ s32 unk0;
     /* 0x04 */ s32 unk4;

diff --git a/src/dra/dra.h b/src/dra/dra.h
@@ -373,14 +373,6 @@ extern u8 g_StageSelectOrder[];
 extern u16 D_800A04CC[];
 extern u32 D_800A04F8;
 extern s32 D_800A2438;
-extern RoomBossTeleport D_800A297C[];
-extern u8 D_800A2D7C[3];
-extern u8 D_800A2D80[0x10];
-extern u8 c_chPlaystationButtons[];
-extern u8 c_chShoulderButtons[];
-extern RECT D_800A2D90;
-extern Unkstruct_800A2D98 D_800A2D98[];
-extern MenuContextInit MenuContextData[];
 extern u8 D_800A2EE8[];
 extern u8 D_800A2EED;
 extern u8 D_800A2EF8[];
@@ -614,7 +606,7 @@ extern RoomLoadDefHolder D_801375BC;
 extern s32 D_801375C0;
 extern s32 D_801375C4;
 extern s32 D_801375C8;
-extern s32 D_801375CC;
+extern ItemTypes D_801375CC;
 extern s32 D_801375D0;
 extern s32 D_801375D4;
 extern s32* D_801375D8;