From 50a7c1c48d65e4586b9d1f2c12ded2c2fbd45a2e Mon Sep 17 00:00:00 2001 From: rozlette Date: Wed, 26 Feb 2020 21:17:29 -0600 Subject: [PATCH] Add ovl_Obj_Mure --- include/variables.h | 3 +++ linker_scripts/code_script.txt | 7 +++++-- tables/files.txt | 2 +- tables/objects.txt | 1 + tables/variables.txt | 3 +++ tools/extract_rom.py | 3 +-- undef.txt | 2 -- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/include/variables.h b/include/variables.h index 08051f2717..0a8f9d583c 100644 --- a/include/variables.h +++ b/include/variables.h @@ -7359,6 +7359,9 @@ extern u32 bgF40FliftOverlayRelocations[22]; // D_808D7874 extern u32 bgF40FliftOverlayInfoOffset; // D_808D78CC extern UNK_TYPE1 D_808D8760; // D_808D8760 extern UNK_TYPE1 D_808D8780; // D_808D8780 +extern OverlayBlockSizes objMureOverlayInfo; // D_808D8800 +extern u32 objMureOverlayRelocations[71]; // D_808D8814 +extern u32 objMureOverlayInfoOffset; // D_808D893C extern UNK_TYPE1 D_808DB9C0; // D_808DB9C0 extern UNK_TYPE1 D_808DB9E0; // D_808DB9E0 extern UNK_PTR D_808DBA0C; // D_808DBA0C diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt index 5d2ff64412..8f90cd1a8b 100644 --- a/linker_scripts/code_script.txt +++ b/linker_scripts/code_script.txt @@ -933,8 +933,11 @@ SECTIONS build/asm/ovl_Bg_F40_Flift_data.o(.text) } - . += 0x1070; /* TODO we are skipping a file that we don't currently disassemble */ - func_808D78D0 = 0x808D78D0; + ovl_Obj_Mure : + { + build/asm/ovl_Obj_Mure_0x808D78D0.o(.text) + build/asm/ovl_Obj_Mure_data.o(.text) + } ovl_En_Sw : { diff --git a/tables/files.txt b/tables/files.txt index 574024c202..623d914bae 100644 --- a/tables/files.txt +++ b/tables/files.txt @@ -66,7 +66,7 @@ ('decomp/', 'ovl_En_Floormas', 0x808D0680, ((0x808D3880, 0x808D3E1F),),()), ('decomp/', 'ovl_En_Rd', 0x808D3E20, ((0x808D70C0, 0x808D754F),),()), ('decomp/', 'ovl_Bg_F40_Flift', 0x808D7550, ((0x808D7810, 0x808D78CF),),()), -# ('decomp/', 'ovl_Obj_Mure', 0x808D78D0, ((0x808D8760, 0x808D893F),),()), # TODO figure this one out + ('decomp/', 'ovl_Obj_Mure', 0x808D78D0, ((0x808D8760, 0x808D893F),),()), # TODO figure this one out ('decomp/', 'ovl_En_Sw', 0x808D8940, ((0x808DB9C0, 0x808DBE7F),),()), ('decomp/', 'ovl_Object_Kankyo', 0x808DBE80, ((0x808DE320, 0x808DE5AF),),((0x808DE5B0,0x808DE5BF),)), ('decomp/', 'ovl_En_Horse_Link_Child', 0x808DE5C0, ((0x808DFEA0, 0x808E019F),),()), diff --git a/tables/objects.txt b/tables/objects.txt index 4fda891679..332dcd62be 100644 --- a/tables/objects.txt +++ b/tables/objects.txt @@ -536,6 +536,7 @@ 0x808D3880:"ovl_En_Floormas_data", 0x808D70C0:"ovl_En_Rd_data", 0x808D7810:"ovl_Bg_F40_Flift_data", + 0x808D8760:"ovl_Obj_Mure_data", 0x808DB9C0:"ovl_En_Sw_data", 0x808DE320:"ovl_Object_Kankyo_data", 0x808DFEA0:"ovl_En_Horse_Link_Child_data", diff --git a/tables/variables.txt b/tables/variables.txt index 75ed40ff9a..d8825519c9 100644 --- a/tables/variables.txt +++ b/tables/variables.txt @@ -7501,6 +7501,9 @@ 0x808D78CC:("bgF40FliftOverlayInfoOffset","u32","",0x4), 0x808D8760:("D_808D8760","UNK_TYPE1","",0x1), 0x808D8780:("D_808D8780","UNK_TYPE1","",0x1), + 0x808D8800:("objMureOverlayInfo","OverlayBlockSizes","",0x14), + 0x808D8814:("objMureOverlayRelocations","u32","[71]",0x11c), + 0x808D893C:("objMureOverlayInfoOffset","u32","",0x4), 0x808DB9C0:("D_808DB9C0","UNK_TYPE1","",0x1), 0x808DB9E0:("D_808DB9E0","UNK_TYPE1","",0x1), 0x808DBA0C:("D_808DBA0C","UNK_PTR","",0x4), diff --git a/tools/extract_rom.py b/tools/extract_rom.py index 1d41084ff8..6e4f56ccb7 100644 --- a/tools/extract_rom.py +++ b/tools/extract_rom.py @@ -103,8 +103,7 @@ FILE_NAMES = { 92:'ovl_En_Floormas', 93:'ovl_En_Rd', 94:'ovl_Bg_F40_Flift', - 95:'ovl_Bg_Heavy_Block', - # ovl_Obj_Mure? In JP + 95:'ovl_Obj_Mure', 96:'ovl_En_Sw', 97:'ovl_Object_Kankyo', 98:'ovl_En_Horse_Link_Child', diff --git a/undef.txt b/undef.txt index f22e0ee2c9..9e114bac85 100644 --- a/undef.txt +++ b/undef.txt @@ -912,8 +912,6 @@ D_808CC250 = ovl_En_Minideath_bss_start + 0x00000000; D_808CC254 = ovl_En_Minideath_bss_start + 0x00000004; D_808CC258 = ovl_En_Minideath_bss_start + 0x00000008; D_808CC25C = ovl_En_Minideath_bss_start + 0x0000000C; -D_808D8760 = 0x808D8760; -D_808D8780 = 0x808D8780; D_808DE5B0 = ovl_Object_Kankyo_bss_start + 0x00000000; D_809101B0 = ovl_En_Fishing_bss_start + 0x00000000; D_809101B4 = ovl_En_Fishing_bss_start + 0x00000004;