diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2021-07-28 19:26:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-28 22:26:40 -0400 |
| commit | 8e2f2b4cdb2b0ea7cc3588710ddb0a71f13eb4d9 (patch) | |
| tree | 4fa26cc9f21163d58b06dba0186c57de41423279 /linker_scripts | |
| parent | b292647ea29e321649dbb9e52275f345157b16e8 (diff) | |
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 <kenixwhisperwind@gmail.com>
* Update src/overlays/actors/ovl_En_Sob1/z_en_sob1.c
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
* Update src/overlays/actors/ovl_En_Sob1/z_en_sob1.c
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
Co-authored-by: Derek Hensley <d.hensley@tempered.io>
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
Diffstat (limited to 'linker_scripts')
| -rw-r--r-- | linker_scripts/code_script.txt | 5 | ||||
| -rw-r--r-- | linker_scripts/object_script.txt | 15 |
2 files changed, 17 insertions, 3 deletions
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; |