`submenu_ovl`, 3 NON_EQUIVALENTs and 2 NON_MATCHINGs (#88)

* C file

* func_8085DA28_jp, func_8085DA9C_jp

* func_8085D638_jp

* func_8085D358_jp, func_8085D500_jp, func_8085D674_jp

* bleh

* func_8085BAC0_jp

* func_8085D128_jp

* Rename many functions

* mSM_move_menu

* a

* func_8085D43C_jp

* mSM_set_char_matrix

* mSM_cbuf_copy draft

* mSM_cbuf_copy NON_EQUIVALENT

* func_8085C20C_jp draft

* match func_8085C20C_jp

* cleanup unc_8085C20C_jp

* func_8085C7A4_jp ok, func_8085C7B8_jp NON_EQUIVALENT

* mSM_draw_mail NON_MATCHING

* func_8085D094_jp

* mSM_set_other_seg mSM_set_before_menu_proc

* meh

* mSM_move_Move

* migrate data

* move submenu overlays to the submenu folder and make headers for them

* name some files based on rodata strings

* name functions from known submenu overlays

* mSM_move_chg_base

* mSM_menu_ovl_init NON_MATCHING

* migrate bss

* mSM_menu_ovl_init

* SubmenuProgramId

* mSM_save_before_func

* mSM_return_func NON_EQUIVALENT

* some cleanup

* rename lots of data

* kinda format

* more cleanup

* symbolize remaining stuff

* format

* Kinda fix whatever is going on with Game_Play_unk_0110

* mroecleanup

* name known overlays

* tag_program_dlftbl, hand_program_dlftbl, haniwa_program_dlftbl

* format

* flag defines

11 files changed, 134 insertions, 67 deletions

diff --git a/include/6BFE60.h b/include/6BFE60.h
index 328c3fc..917d622 100644
--- a/include/6BFE60.h
+++ b/include/6BFE60.h
@@ -4,6 +4,8 @@
 #include "ultra64.h"
 #include "unk.h"
 
+struct struct_func_8085CE18_jp_arg4;
+
 typedef struct mMl {
     /* 0x00 */ UNK_TYPE1 unk_00[0xA4];
 } mMl; // size = 0xA4
@@ -30,7 +32,7 @@ void mMl_clear_mail(mMl* arg0);
 // void mMl_set_mail_name_npcinfo();
 // void mMl_get_npcinfo_from_mail_name();
 // void mMl_hunt_for_send_address();
-// void func_8009C89C_jp();
+UNK_TYPE mMl_check_send_mail(struct struct_func_8085CE18_jp_arg4* arg0);
 // void func_8009C8C0_jp();
 
 #endif
diff --git a/include/6E0F50.h b/include/6E0F50.h
index 1b06680..bd456a5 100644
--- a/include/6E0F50.h
+++ b/include/6E0F50.h
@@ -3,6 +3,7 @@
 
 #include "ultra64.h"
 
+struct GraphicsContext;
 struct Game_Play;
 
 // void func_800BD2B0_jp();
@@ -34,7 +35,7 @@ Gfx* func_800BD7C0_jp(Gfx* gfx);
 // void func_800BD9FC_jp();
 // void func_800BDA20_jp();
 // void two_tex_scroll();
-void DisplayList_initialize(GraphicsContext* gfxCtx, u8 arg1, u8 arg2, u8 arg3, struct Game_Play* game_play);
+void DisplayList_initialize(struct GraphicsContext* gfxCtx, u8 arg1, u8 arg2, u8 arg3, struct Game_Play* game_play);
 void fade_rgba8888_draw(Gfx** gfx, s32 arg1);
 // void func_800BE030_jp();
 // void fade_black_draw();
@@ -44,7 +45,7 @@ Gfx *func_800BE12C_jp(Gfx *gfx, s32 arg1, s32 arg2, s32 arg3, s32 arg4);
 // void func_800BE184_jp();
 // void func_800BE1D4_jp();
 // void func_800BE27C_jp();
-// void func_800BE320_jp();
+Gfx* func_800BE320_jp(Gfx*, s32, s32, s32, s32, s32, s32, s32, s32, s32);
 // void func_800BE4F8_jp();
 
 #endif
diff --git a/include/6E9650.h b/include/6E9650.h
index 3683dfc..4cf3823 100644
--- a/include/6E9650.h
+++ b/include/6E9650.h
@@ -4,7 +4,7 @@
 #include "ultra64.h"
 
 struct Game_Play;
-struct Game_Play_unk_0110;
+struct Game_Play_unk_0110_unk_0000;
 
 // void func_800C59B0_jp();
 // void func_800C5A08_jp();
@@ -19,14 +19,14 @@ struct Game_Play_unk_0110;
 // void func_800C5E10_jp();
 // void func_800C5EA0_jp();
 // void func_800C5F0C_jp();
-void mSc_dmacopy_data_bank(struct Game_Play_unk_0110* arg0);
-s32 mSc_bank_regist_check(struct Game_Play_unk_0110* arg0, s16 arg1);
-void func_800C6144_jp(struct Game_Play_unk_0110* arg0, s16 arg1);
+void mSc_dmacopy_data_bank(struct Game_Play_unk_0110_unk_0000* arg0);
+s32 mSc_bank_regist_check(struct Game_Play_unk_0110_unk_0000* arg0, s16 arg1);
+void func_800C6144_jp(struct Game_Play_unk_0110_unk_0000* arg0, s16 arg1);
 void mSc_regist_initial_exchange_bank(struct Game_Play* game_play);
 // void func_800C62C4_jp();
-void mSc_dmacopy_all_exchange_bank(struct Game_Play_unk_0110* arg0);
-void mSc_data_bank_ct(struct Game_Play* game_play, struct Game_Play_unk_0110* arg1);
-void mSc_decide_exchange_bank(struct Game_Play_unk_0110* arg0);
+void mSc_dmacopy_all_exchange_bank(struct Game_Play_unk_0110_unk_0000* arg0);
+void mSc_data_bank_ct(struct Game_Play* game_play, struct Game_Play_unk_0110_unk_0000* arg1);
+void mSc_decide_exchange_bank(struct Game_Play_unk_0110_unk_0000* arg0);
 // void func_800C6690_jp();
 void Scene_ct(struct Game_Play* game_play, void* arg1);
 // void func_800C6960_jp();
diff --git a/include/PreRender.h b/include/PreRender.h
index a681087..48d9c39 100644
--- a/include/PreRender.h
+++ b/include/PreRender.h
@@ -2,18 +2,23 @@
 #define PRE_RENDER_H
 
 #include "ultra64.h"
+#include "unk.h"
 
 typedef struct ListAlloc {
     /* 0x0 */ struct ListAlloc* prev;
     /* 0x4 */ struct ListAlloc* next;
 } ListAlloc; // size = 0x8
 
-typedef struct {
-    /* 0x00 */ char unk00[0x10];
+typedef struct PreRender {
+    /* 0x00 */ u16 unk_00;
+    /* 0x02 */ u16 unk_02;
+    /* 0x04 */ u16 unk_04;
+    /* 0x04 */ u16 unk_06;
+    /* 0x08 */ UNK_TYPE1 unk_08[0x8];
     /* 0x10 */ UNK_PTR unk_10;
     /* 0x14 */ UNK_PTR unk_14;
     /* 0x18 */ UNK_PTR unk_18;
-    /* 0x1C */ char unk1C[0x34];
+    /* 0x1C */ UNK_TYPE1 unk_1C[0x34];
 } PreRender; // size = 0x50
 
 // void wallpaper_draw1();
@@ -29,7 +34,7 @@ void PreRender_cleanup(PreRender* render);
 // void PreRender_TransBuffer1();
 // void PreRender_TransBuffer2();
 // void PreRender_ShowCoveredge();
-// void PreRender_CopyRGBC();
+void PreRender_CopyRGBC(PreRender* render, Gfx** gfxP, s32 arg2, s32 arg3);
 // void PreRender_saveZBuffer();
 void PreRender_saveFrameBuffer(PreRender* render, Gfx** gfx);
 void PreRender_saveCVG(PreRender* render, Gfx** gfx);
diff --git a/include/m_common_data.h b/include/m_common_data.h
index 20ffd95..9e74dda 100644
--- a/include/m_common_data.h
+++ b/include/m_common_data.h
@@ -16,7 +16,7 @@
 struct Actor;
 struct ActorOverlay;
 struct struct_801161E8_jp;
-struct Game_Play_unk_0110;
+struct Game_Play_unk_0110_unk_0000;
 struct CommonData_unk_1004C_unk_14_arg0;
 struct Game_Play;
 struct struct_809AEFA4;
@@ -39,9 +39,9 @@ typedef UNK_RET (*CommonData_unk_1004C_unk_D0)(void);
 
 typedef UNK_RET (*CommonData_unk_1004C_unk_E4)(void);
 
-typedef UNK_RET (*CommonData_unk_1004C_unk_EC)(struct Game_Play_unk_0110*, s16, s16);
-typedef UNK_RET (*CommonData_unk_1004C_unk_F0)(struct Game_Play_unk_0110*, struct Actor*);
-typedef s32 (*CommonData_unk_1004C_unk_F4)(struct Game_Play_unk_0110*, struct Actor*);
+typedef UNK_RET (*CommonData_unk_1004C_unk_EC)(struct Game_Play_unk_0110_unk_0000*, s16, s16);
+typedef UNK_RET (*CommonData_unk_1004C_unk_F0)(struct Game_Play_unk_0110_unk_0000*, struct Actor*);
+typedef s32 (*CommonData_unk_1004C_unk_F4)(struct Game_Play_unk_0110_unk_0000*, struct Actor*);
 
 typedef UNK_RET (*CommonData_unk_1004C_unk_118)(struct Actor*);
 
diff --git a/include/m_submenu.h b/include/m_submenu.h
index 622a95f..fcf3fe6 100644
--- a/include/m_submenu.h
+++ b/include/m_submenu.h
@@ -9,7 +9,8 @@
 #include "unk.h"
 
 struct Game_Play;
-struct mSM;
+struct Submenu;
+struct struct_8085E9B0;
 
 typedef enum mSMMoveProcIndex {
     /* 0 */ MSM_MOVE_PROC_WAIT,
@@ -40,13 +41,38 @@ typedef enum InventoryItemList {
     /* 16 */ INVENTORY_ITEM_LIST_MAX
 } InventoryItemList;
 
-typedef void (*mSM_unk_30)(struct mSM*);
-typedef void (*mSM_unk_34)(struct mSM*, struct Game_Play*);
+typedef enum SubmenuProgramId {
+    /*  0 */ SUBMENU_PROGRAM_0, // inventory, NONE? DEFAULT?
+    /*  1 */ SUBMENU_PROGRAM_1, // inventory
+    /*  2 */ SUBMENU_PROGRAM_2,
+    /*  3 */ SUBMENU_PROGRAM_3,
+    /*  4 */ SUBMENU_PROGRAM_LEDIT,
+    /*  5 */ SUBMENU_PROGRAM_MAP,
+    /*  6 */ SUBMENU_PROGRAM_6,
+    /*  7 */ SUBMENU_PROGRAM_7,
+    /*  8 */ SUBMENU_PROGRAM_8,
+    /*  9 */ SUBMENU_PROGRAM_9,
+    /* 10 */ SUBMENU_PROGRAM_10,
+    /* 11 */ SUBMENU_PROGRAM_11,
+    /* 12 */ SUBMENU_PROGRAM_BOARD,
+    /* 13 */ SUBMENU_PROGRAM_13,
+    /* 14 */ SUBMENU_PROGRAM_14,
+    /* 15 */ SUBMENU_PROGRAM_15,
+    /* 16 */ SUBMENU_PROGRAM_16,
+    /* 17 */ SUBMENU_PROGRAM_17,
+    /* 18 */ SUBMENU_PROGRAM_18,
+    /* 19 */ SUBMENU_PROGRAM_19,
+    /* 20 */ SUBMENU_PROGRAM_CATALOG,
+    /* 21 */ SUBMENU_PROGRAM_MAX,
+} SubmenuProgramId;
 
-typedef struct mSM {
+typedef void (*SubmenuMoveFunc)(struct Submenu*);
+typedef void (*SubmenuDrawFunc)(struct Submenu*, struct Game_Play*);
+
+typedef struct Submenu {
     /* 0x00 */ s32 unk_00;
-    /* 0x04 */ s32 unk_04;
-    /* 0x08 */ UNK_TYPE1 unk_08[0x4];
+    /* 0x04 */ SubmenuProgramId programId;
+    /* 0x08 */ SubmenuProgramId unk_08;
     /* 0x0C */ mSMMoveProcIndex moveProcIndex;
     /* 0x10 */ s32 unk_10;
     /* 0x14 */ s32 unk_14;
@@ -55,9 +81,9 @@ typedef struct mSM {
     /* 0x20 */ s32 unk_20;
     /* 0x24 */ void* linkedAllocStart;
     /* 0x28 */ void* linkedAllocEnd;
-    /* 0x2C */ UNK_TYPE1 unk_2C[0x4];
-    /* 0x30 */ mSM_unk_30 play; // name based on mSM_move_Play, consider renaming
-    /* 0x34 */ mSM_unk_34 draw;
+    /* 0x2C */ struct struct_8085E9B0* unk_2C;
+    /* 0x30 */ SubmenuMoveFunc move;
+    /* 0x34 */ SubmenuDrawFunc draw;
     /* 0x38 */ mMl mail;
     /* 0xDC */ u8 unk_DC;
     /* 0xDD */ u8 unk_DD;
@@ -67,26 +93,26 @@ typedef struct mSM {
     /* 0xE2 */ u8 unk_E2;
     /* 0xE3 */ u8 unk_E3;
     /* 0xE4 */ Vec3f unk_E4;
-} mSM; // size = 0xF0
+} Submenu; // size = 0xF0
 
 s32 SubmenuArea_IsPlayer(void);
 
-void* mSM_ovlptr_dllcnv(void* vram, mSM* submenu);
+void* mSM_ovlptr_dllcnv(void* vram, Submenu* submenu);
 
 void mSM_submenu_ovlptr_init(struct Game_Play* game_play);
-void mSM_submenu_ovlptr_cleanup(mSM* submenu);
+void mSM_submenu_ovlptr_cleanup(Submenu* submenu);
 
-void load_player(mSM* submenu);
-void mSM_submenu_ct(mSM* submenu);
-void mSM_submenu_dt(mSM* arg0);
+void load_player(Submenu* submenu);
+void mSM_submenu_ct(Submenu* submenu);
+void mSM_submenu_dt(Submenu* submenu);
 
-void mSM_open_submenu(mSM* submenu, s32 arg1, s32 arg2, s32 arg3);
-void mSM_open_submenu_new(mSM* submenu, s32 arg1, s32 arg2, s32 arg3, s32 arg4);
-void mSM_open_submenu_new2(mSM* submenu, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5);
+void mSM_open_submenu(Submenu* submenu, SubmenuProgramId programId, s32 arg2, s32 arg3);
+void mSM_open_submenu_new(Submenu* submenu, SubmenuProgramId programId, s32 arg2, s32 arg3, s32 arg4);
+void mSM_open_submenu_new2(Submenu* submenu, SubmenuProgramId programId, s32 arg2, s32 arg3, s32 arg4, s32 arg5);
 
 void mSM_submenu_ctrl(struct Game_Play* game_play);
-void mSM_submenu_move(mSM* submenu);
-void mSM_submenu_draw(mSM* submenu, struct Game_Play* game_play);
+void mSM_submenu_move(Submenu* submenu);
+void mSM_submenu_draw(Submenu* submenu, struct Game_Play* game_play);
 
 u32 mSM_check_open_inventory_itemlist(InventoryItemList itemlist, s32 arg1) ;
 
diff --git a/include/m_view.h b/include/m_view.h
index c3afa87..177232c 100644
--- a/include/m_view.h
+++ b/include/m_view.h
@@ -2,19 +2,27 @@
 #define M_VIEW_H
 
 #include "ultra64.h"
+#include "z64math.h"
+#include "unk.h"
 
 struct Game_Play;
 struct GraphicsContext;
 
 typedef struct Game_Play1938 {
-    /* 0x000 */ char unk000[0x28];
+    /* 0x000 */ UNK_TYPE1 unk_000[0x8];
+    /* 0x008 */ s32 unk_008;
+    /* 0x00C */ s32 unk_00C;
+    /* 0x010 */ s32 unk_010;
+    /* 0x018 */ s32 unk_014;
+    /* 0x01C */ UNK_TYPE1 unk_018[0x10];
     /* 0x028 */ Vec3f unk_028;
-    /* 0x034 */ char unk034[0x2C];
+    /* 0x034 */ UNK_TYPE1 unk_034[0x1C];
+    /* 0x050 */ Vp vp;
     /* 0x060 */ Mtx unk_060;
     /* 0x0A0 */ Mtx unk_0A0;
-    /* 0x0E0 */ char unk0E0[0x40];
+    /* 0x0E0 */ UNK_TYPE1 unk_0E0[0x40];
     /* 0x120 */ s32 unk_120;
-    /* 0x124 */ char unk124[0x4];
+    /* 0x124 */ UNK_TYPE1 unk_124[0x4];
 } Game_Play1938; // size = 0x128
 
 typedef struct ScissorViewArg1 {
diff --git a/include/segment_symbols.h b/include/segment_symbols.h
index 2574a90..15eac21 100644
--- a/include/segment_symbols.h
+++ b/include/segment_symbols.h
@@ -66,17 +66,32 @@ DECLARE_SEGMENT(code);
 DECLARE_SEGMENT(submenu_ovl);
 DECLARE_SEGMENT(player_actor);
 
+DECLARE_SEGMENT(tag_ovl);
+DECLARE_SEGMENT(hand_ovl);
+DECLARE_SEGMENT(haniwaPortrait_ovl);
+DECLARE_SEGMENT(inventory_ovl);
+DECLARE_SEGMENT(ovl__00789B60);
+DECLARE_SEGMENT(ovl__0078A560);
+DECLARE_SEGMENT(ovl__0078AE30);
+DECLARE_SEGMENT(ledit_ovl);
+DECLARE_SEGMENT(ovl__0078CB80);
+DECLARE_SEGMENT(board_ovl);
 DECLARE_SEGMENT(ovl__00792700);
+DECLARE_SEGMENT(ovl__00794380);
+DECLARE_SEGMENT(map_ovl);
+DECLARE_SEGMENT(ovl__00797A50);
+DECLARE_SEGMENT(ovl__00799580);
 DECLARE_SEGMENT(ovl__0079A290);
+DECLARE_SEGMENT(ovl__0079B120);
+DECLARE_SEGMENT(ovl__0079C020);
+DECLARE_SEGMENT(ovl__0079DA50);
 DECLARE_SEGMENT(ovl__0079E430);
 DECLARE_SEGMENT(ovl__0079F810);
-DECLARE_SEGMENT(ovl__00777AE0);
-DECLARE_SEGMENT(ovl__007829E0);
-DECLARE_SEGMENT(ovl__00785700);
-DECLARE_SEGMENT(ovl__007908A0);
-DECLARE_SEGMENT(ovl__0078CB80);
-DECLARE_SEGMENT(ovl__00799580);
-DECLARE_SEGMENT(ovl__007A28F0);
+DECLARE_SEGMENT(ovl__007A10E0);
+DECLARE_SEGMENT(catalog_ovl);
+
+
+DECLARE_SEGMENT(segment_00A58000);
 
 
 #endif
diff --git a/include/sys_matrix.h b/include/sys_matrix.h
index 2791bf0..21b0e6d 100644
--- a/include/sys_matrix.h
+++ b/include/sys_matrix.h
@@ -50,4 +50,6 @@ void suMtxMakeSRT(Mtx* mtx, f32 scaleX, f32 scaleY, f32 scaleZ, s16 rotX, s16 ro
 void suMtxMakeSRT_ZXY(Mtx* mtx, f32 scaleX, f32 scaleY, f32 scaleZ, s16 rotX, s16 rotY, s16 rotZ, f32 translateX,
                       f32 translateY, f32 translateZ);
 
+extern Mtx Mtx_clear;
+
 #endif
diff --git a/include/tables/dmatables/dmadata_table_jp.h b/include/tables/dmatables/dmadata_table_jp.h
index 3dd018a..eef8c1e 100644
--- a/include/tables/dmatables/dmadata_table_jp.h
+++ b/include/tables/dmatables/dmadata_table_jp.h
@@ -34,32 +34,32 @@ DEFINE_DMA_ENTRY(ovl_prenmi, "ovl_prenmi")
 DEFINE_DMA_ENTRY(ovl_prenmi_reloc, "ovl_prenmi_reloc")
 DEFINE_DMA_ENTRY(submenu_ovl, "submenu_ovl")
 DEFINE_DMA_ENTRY(ovl_submenu_reloc, "ovl_submenu_reloc")
-DEFINE_DMA_ENTRY(ovl__00777AE0, "ovl__00777AE0")
-DEFINE_DMA_ENTRY(ovl__00777AE0_reloc, "ovl__00777AE0_reloc")
-DEFINE_DMA_ENTRY(ovl__007829E0, "ovl__007829E0")
-DEFINE_DMA_ENTRY(ovl__007829E0_reloc, "ovl__007829E0_reloc")
-DEFINE_DMA_ENTRY(ovl__00784FC0, "ovl__00784FC0")
-DEFINE_DMA_ENTRY(ovl__00784FC0_reloc, "ovl__00784FC0_reloc")
-DEFINE_DMA_ENTRY(ovl__00785700, "ovl__00785700")
-DEFINE_DMA_ENTRY(ovl__00785700_reloc, "ovl__00785700_reloc")
+DEFINE_DMA_ENTRY(tag_ovl, "tag_ovl")
+DEFINE_DMA_ENTRY(tag_ovl_reloc, "tag_ovl_reloc")
+DEFINE_DMA_ENTRY(hand_ovl, "hand_ovl")
+DEFINE_DMA_ENTRY(hand_ovl_reloc, "hand_ovl_reloc")
+DEFINE_DMA_ENTRY(haniwaPortrait_ovl, "haniwaPortrait_ovl")
+DEFINE_DMA_ENTRY(haniwaPortrait_ovl_reloc, "haniwaPortrait_ovl_reloc")
+DEFINE_DMA_ENTRY(inventory_ovl, "inventory_ovl")
+DEFINE_DMA_ENTRY(inventory_ovl_reloc, "inventory_ovl_reloc")
 DEFINE_DMA_ENTRY(ovl__00789B60, "ovl__00789B60")
 DEFINE_DMA_ENTRY(ovl__00789B60_reloc, "ovl__00789B60_reloc")
 DEFINE_DMA_ENTRY(ovl__0078A560, "ovl__0078A560")
 DEFINE_DMA_ENTRY(ovl__0078A560_reloc, "ovl__0078A560_reloc")
 DEFINE_DMA_ENTRY(ovl__0078AE30, "ovl__0078AE30")
 DEFINE_DMA_ENTRY(ovl__0078AE30_reloc, "ovl__0078AE30_reloc")
-DEFINE_DMA_ENTRY(ovl__0078BFB0, "ovl__0078BFB0")
-DEFINE_DMA_ENTRY(ovl__0078BFB0_reloc, "ovl__0078BFB0_reloc")
+DEFINE_DMA_ENTRY(ledit_ovl, "ledit_ovl")
+DEFINE_DMA_ENTRY(ledit_ovl_reloc, "ledit_ovl_reloc")
 DEFINE_DMA_ENTRY(ovl__0078CB80, "ovl__0078CB80")
 DEFINE_DMA_ENTRY(ovl__0078CB80_reloc, "ovl__0078CB80_reloc")
-DEFINE_DMA_ENTRY(ovl__007908A0, "ovl__007908A0")
-DEFINE_DMA_ENTRY(ovl__007908A0_reloc, "ovl__007908A0_reloc")
+DEFINE_DMA_ENTRY(board_ovl, "board_ovl")
+DEFINE_DMA_ENTRY(board_ovl_reloc, "board_ovl_reloc")
 DEFINE_DMA_ENTRY(ovl__00792700, "ovl__00792700")
 DEFINE_DMA_ENTRY(ovl__00792700_reloc, "ovl__00792700_reloc")
 DEFINE_DMA_ENTRY(ovl__00794380, "ovl__00794380")
 DEFINE_DMA_ENTRY(ovl__00794380_reloc, "ovl__00794380_reloc")
-DEFINE_DMA_ENTRY(ovl__00795350, "ovl__00795350")
-DEFINE_DMA_ENTRY(ovl__00795350_reloc, "ovl__00795350_reloc")
+DEFINE_DMA_ENTRY(map_ovl, "map_ovl")
+DEFINE_DMA_ENTRY(map_ovl_reloc, "map_ovl_reloc")
 DEFINE_DMA_ENTRY(ovl__00797A50, "ovl__00797A50")
 DEFINE_DMA_ENTRY(ovl__00797A50_reloc, "ovl__00797A50_reloc")
 DEFINE_DMA_ENTRY(ovl__00799580, "ovl__00799580")
@@ -78,8 +78,8 @@ DEFINE_DMA_ENTRY(ovl__0079F810, "ovl__0079F810")
 DEFINE_DMA_ENTRY(ovl__0079F810_reloc, "ovl__0079F810_reloc")
 DEFINE_DMA_ENTRY(ovl__007A10E0, "ovl__007A10E0")
 DEFINE_DMA_ENTRY(ovl__007A10E0_reloc, "ovl__007A10E0_reloc")
-DEFINE_DMA_ENTRY(ovl__007A28F0, "ovl__007A28F0")
-DEFINE_DMA_ENTRY(ovl__007A28F0_reloc, "ovl__007A28F0_reloc")
+DEFINE_DMA_ENTRY(catalog_ovl, "catalog_ovl")
+DEFINE_DMA_ENTRY(catalog_ovl_reloc, "catalog_ovl_reloc")
 DEFINE_DMA_ENTRY(player_actor, "player_actor")
 DEFINE_DMA_ENTRY(player_actor_reloc, "player_actor_reloc")
 DEFINE_DMA_ENTRY(ovl__007DE050, "ovl__007DE050")
diff --git a/include/unknown_structs.h b/include/unknown_structs.h
index 3249db9..1e18d21 100644
--- a/include/unknown_structs.h
+++ b/include/unknown_structs.h
@@ -24,14 +24,22 @@ typedef struct CommonData_unk_1004C_unk_14_arg0 {
     /* 0x04 */ UNK_TYPE1 unk_04[0x60];
 } CommonData_unk_1004C_unk_14_arg0; // size >= 0x64, maybe less, guessed from stack usage
 
-typedef struct Game_Play_unk_0110 {
+typedef struct Game_Play_unk_0110_unk_0000 {
     /* 0x00 */ s16 unk_00;
     /* 0x02 */ UNK_TYPE1 unk_02[0x2];
     /* 0x04 */ void* segment;
     /* 0x08 */ UNK_TYPE1 unk_08[0x48];
     /* 0x50 */ s16 unk_50;
     /* 0x52 */ UNK_TYPE1 unk_52[0x2];
-} Game_Play_unk_0110; // size = 0x54
+} Game_Play_unk_0110_unk_0000; // size = 0x54
+
+typedef struct Game_Play_unk_0110 {
+    /* 0x0000 */ Game_Play_unk_0110_unk_0000 unk_0000[UNK_SIZE];
+    /* 0x0054 */ UNK_TYPE1 unk_0054[0x17A8];
+    /* 0x17FC */ s32 unk_17FC;
+    /* 0x1800 */ UNK_TYPE1 unk_1800[0x18];
+    /* 0x1818 */ void* unk_1818;
+} Game_Play_unk_0110; // size >= 0x181C
 
 typedef struct struct_809AEFA4 {
     /* 0x00 */ UNK_PTR unk_0;