diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2021-07-13 21:49:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-13 21:49:05 -0400 |
| commit | 5fcd494a7aebc025ba9182f7872c6e24ed556bf4 (patch) | |
| tree | 10387ccec1f47cc7c72c25507eb242cbcc32b404 /linker_scripts | |
| parent | 5453731f4e2cadabc518b76ebb1ea9d9d6f366b7 (diff) | |
`ovl_En_Ma4` matched and mostly documented (#199)
* First pass
* limbdraw
* another one
* lots of stuff
* stuff
* big one
* func_80ABEB6C
* The NON_MATCHING that matches in reality
* "Fix" some cases
* Fix merge issues
* fix func_80ABF254
* match a pair
* func_80ABF7C8
* func_80ABE1C4
* func_80ABF354
* func_80ABF534
* Import data
* Limb fixes
* Minor renames
* Fix merge issues
* A few renames
* Rename half the functions
* More renames
* More renaming
* documentation finished
* Format
* fix typo
* whoops
* Fix merge issues
* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.h
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.h
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.h
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
* Update variables names
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
Diffstat (limited to 'linker_scripts')
| -rw-r--r-- | linker_scripts/code_script.txt | 4 | ||||
| -rw-r--r-- | linker_scripts/object_script.txt | 26 |
2 files changed, 28 insertions, 2 deletions
diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt index c173698d1..1ae1c28f6 100644 --- a/linker_scripts/code_script.txt +++ b/linker_scripts/code_script.txt @@ -5618,9 +5618,9 @@ SECTIONS ovl_En_Ma4 : AT(RomLocation) { build/src/overlays/actors/ovl_En_Ma4/z_en_ma4.o(.text) - build/asm/overlays/ovl_En_Ma4_data.o(.data) + build/src/overlays/actors/ovl_En_Ma4/z_en_ma4.o(.data) build/src/overlays/actors/ovl_En_Ma4/z_en_ma4.o(.rodata) - build/asm/overlays/ovl_En_Ma4_rodata.o(.rodata) + build/src/overlays/actors/ovl_En_Ma4/z_en_ma4_overlay.o(.ovl) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; diff --git a/linker_scripts/object_script.txt b/linker_scripts/object_script.txt index 8c060c873..3dfa284a3 100644 --- a/linker_scripts/object_script.txt +++ b/linker_scripts/object_script.txt @@ -437,6 +437,32 @@ D_04048DF0 = 0x04048DF0; D_04057B10 = 0x04057B10; D_04089070 = 0x04089070; +/* z_en_ma4 */ +D_060003B0 = 0x060003B0; +D_06007328 = 0x06007328; +D_06002A8C = 0x06002A8C; +D_06015B7C = 0x06015B7C; +D_06013928 = 0x06013928; +D_0600FFC8 = 0x0600FFC8; +D_060107C8 = 0x060107C8; +D_06010FC8 = 0x06010FC8; +D_060117C8 = 0x060117C8; +D_06011FC8 = 0x06011FC8; +D_060127C8 = 0x060127C8; +D_06012BC8 = 0x06012BC8; +D_06012FC8 = 0x06012FC8; +D_060133C8 = 0x060133C8; +D_06009E58 = 0x06009E58; +D_06002A8C = 0x06002A8C; +D_06018948 = 0x06018948; +D_0601B76C = 0x0601B76C; +D_06007328 = 0x06007328; +D_06014088 = 0x06014088; +D_06015B7C = 0x06015B7C; +D_06007D98 = 0x06007D98; +D_0600852C = 0x0600852C; +D_06008F6C = 0x06008F6C; + /* z_en_toto */ D_06000C80 = 0x06000C80; D_06001324 = 0x06001324; |