From 8e2f2b4cdb2b0ea7cc3588710ddb0a71f13eb4d9 Mon Sep 17 00:00:00 2001 From: Derek Hensley Date: Wed, 28 Jul 2021 19:26:40 -0700 Subject: ovl en sob1 OK and Documented (#224) * All but two match * format * Matched the last two functions * Merge updates * Bring data over as a comment * Brought data over * Cleanup and start documenting * Documented * Removed NON_MATCHING define * Actually save the .h file * Format and add items comment * Add comment * Add header to .c file * Cleanup * Rename EnSob1_GetGoodbyeBombShop * Update items comment * Final cleanup * Rename InitialUpdate * PR suggestions except enum for objIndices * Add todo about objIndices index enum * Change char to UNK_TYPE1 for padding * Textures and convert weekEvents to hex * PR suggestions * Format * Cleanup function declaration and add cutscene state enum * Update src/overlays/actors/ovl_En_Sob1/z_en_sob1.c Co-authored-by: Kenix3 * Update src/overlays/actors/ovl_En_Sob1/z_en_sob1.c Co-authored-by: Kenix3 * Update src/overlays/actors/ovl_En_Sob1/z_en_sob1.c Co-authored-by: Kenix3 Co-authored-by: Derek Hensley Co-authored-by: Kenix3 --- linker_scripts/code_script.txt | 5 ++--- linker_scripts/object_script.txt | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) (limited to 'linker_scripts') diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt index a28bb887d..99936f851 100644 --- a/linker_scripts/code_script.txt +++ b/linker_scripts/code_script.txt @@ -4142,10 +4142,9 @@ SECTIONS ovl_En_Sob1 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Sob1/z_en_sob1.o(.text) - build/asm/overlays/ovl_En_Sob1_data.o(.data) + build/src/overlays/actors/ovl_En_Sob1/z_en_sob1.o(.data) build/src/overlays/actors/ovl_En_Sob1/z_en_sob1.o(.rodata) - build/asm/overlays/ovl_En_Sob1_rodata.o(.rodata) - build/asm/overlays/ovl_En_Sob1_late_rodata.o(.rodata) + build/src/overlays/actors/ovl_En_Sob1/z_en_sob1_overlay.o(.ovl) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; diff --git a/linker_scripts/object_script.txt b/linker_scripts/object_script.txt index 37de76346..2e12e7e8b 100644 --- a/linker_scripts/object_script.txt +++ b/linker_scripts/object_script.txt @@ -640,6 +640,21 @@ D_06002C8C = 0x06002C8C; D_060000B4 = 0x060000B4; D_06002BF0 = 0x06002BF0; +/* z_en_sob1 */ +D_06008268 = 0x06008268; +D_0600D208 = 0x0600D208; +D_0600078C = 0x0600078C; +D_06011AC8 = 0x06011AC8; +D_060000FC = 0x060000FC; +D_06000970 = 0x06000970; +D_060087BC = 0x060087BC; +D_060050A0 = 0x060050A0; +D_060058A0 = 0x060058A0; +D_060060A0 = 0x060060A0; +D_06010438 = 0x06010438; +D_06010C38 = 0x06010C38; +D_06011038 = 0x06011038; + /* z_en_suttari */ D_0600C240 = 0x0600C240; D_0600071C = 0x0600071C; -- cgit v1.2.3