diff options
| author | Parker Burnett <burnettparker@gmail.com> | 2021-07-28 23:22:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-28 23:22:01 -0400 |
| commit | 60ff2079829021dcc80f40171ca2652f3ab1f9ae (patch) | |
| tree | 888a23efb62fe26d30e09a348bd2fceee9b234c6 /linker_scripts | |
| parent | 231386fd00e3a48170041f2c802b9bb21bdc3ab8 (diff) | |
En_pamera is good to go (#222)
* all functions decomped, just need the OK
* ....5 differing words....
* Pamera OK
* addressing PR comments, plus some documenting
* addressing some of the comments
* another small typo...
* wrapping up PR comments
Diffstat (limited to 'linker_scripts')
| -rw-r--r-- | linker_scripts/code_script.txt | 4 | ||||
| -rw-r--r-- | linker_scripts/object_script.txt | 23 |
2 files changed, 25 insertions, 2 deletions
diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt index 9e6bd03fd..c2bdabfee 100644 --- a/linker_scripts/code_script.txt +++ b/linker_scripts/code_script.txt @@ -8228,9 +8228,9 @@ SECTIONS ovl_En_Pamera : AT(RomLocation) { build/src/overlays/actors/ovl_En_Pamera/z_en_pamera.o(.text) - build/asm/overlays/ovl_En_Pamera_data.o(.data) + build/src/overlays/actors/ovl_En_Pamera/z_en_pamera.o(.data) build/src/overlays/actors/ovl_En_Pamera/z_en_pamera.o(.rodata) - build/asm/overlays/ovl_En_Pamera_rodata.o(.rodata) + build/src/overlays/actors/ovl_En_Pamera/z_en_pamera_overlay.o(.ovl) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; diff --git a/linker_scripts/object_script.txt b/linker_scripts/object_script.txt index 92e5b51ca..cc8e1d3fc 100644 --- a/linker_scripts/object_script.txt +++ b/linker_scripts/object_script.txt @@ -599,6 +599,29 @@ D_06005BC0 = 0x06005BC0; D_06006F18 = 0x06006F18; D_06006B18 = 0x06006B18; +/* z_en_pamera */ +D_06008448 = 0x06008448; +D_060005BC = 0x060005BC; +D_06008AE0 = 0x06008AE0; +D_06008E38 = 0x06008E38; +D_0600A844 = 0x0600A844; +D_0600B0C4 = 0x0600B0C4; +D_06009870 = 0x06009870; +D_06009F54 = 0x06009F54; +D_0600B5B0 = 0x0600B5B0; +D_0600BCC4 = 0x0600BCC4; +D_0600D9DC = 0x0600D9DC; +D_0600E16C = 0x0600E16C; +D_0600C9F4 = 0x0600C9F4; +D_0600D0F0 = 0x0600D0F0; +D_060074E8 = 0x060074E8; +D_060078E8 = 0x060078E8; +D_060066E8 = 0x060066E8; +D_06006AE8 = 0x06006AE8; +D_06006EE8 = 0x06006EE8; +D_060072E8 = 0x060072E8; +D_060073E8 = 0x060073E8; + /* z_en_pametfrog */ D_06000994 = 0x06000994; D_06001B08 = 0x06001B08; |