diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2021-07-28 19:46:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-28 22:46:26 -0400 |
| commit | 231386fd00e3a48170041f2c802b9bb21bdc3ab8 (patch) | |
| tree | 3b527a82e3d4a22274dbd7c77013af0c0a7c8edb /linker_scripts | |
| parent | 37fc242e228feb32f408234d6664bcf6ec949406 (diff) | |
ovl_en_trt Ok and Documented (#225)
* First pass: Matched everything but func_80A8E26C
* Matched func_80A8E26C
* Documented
* Cleanup
* Some renames
* Update EnTrt struct
* Move init chain out of the function
* Change unreferenced rodata implementation
* Texture stuff
* PR suggestions from other PRs that apply here
* Fix syntax error and other cleanup
* add cutscene state enum
* PR suggestions except color
* Update src/overlays/actors/ovl_En_Trt/z_en_trt.c
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
* Update src/overlays/actors/ovl_En_Trt/z_en_trt.c
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
* Update src/overlays/actors/ovl_En_Trt/z_en_trt.c
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
* Better bitflags
* Fix
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 | 16 |
2 files changed, 18 insertions, 3 deletions
diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt index 415a3b823..9e6bd03fd 100644 --- a/linker_scripts/code_script.txt +++ b/linker_scripts/code_script.txt @@ -5251,10 +5251,9 @@ SECTIONS ovl_En_Trt : AT(RomLocation) { build/src/overlays/actors/ovl_En_Trt/z_en_trt.o(.text) - build/asm/overlays/ovl_En_Trt_data.o(.data) + build/src/overlays/actors/ovl_En_Trt/z_en_trt.o(.data) build/src/overlays/actors/ovl_En_Trt/z_en_trt.o(.rodata) - build/asm/overlays/ovl_En_Trt_rodata.o(.rodata) - build/asm/overlays/ovl_En_Trt_late_rodata.o(.rodata) + build/src/overlays/actors/ovl_En_Trt/z_en_trt_overlay.o(.ovl) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; diff --git a/linker_scripts/object_script.txt b/linker_scripts/object_script.txt index 2e12e7e8b..92e5b51ca 100644 --- a/linker_scripts/object_script.txt +++ b/linker_scripts/object_script.txt @@ -691,6 +691,22 @@ D_0600B894 = 0x0600B894; D_0600BC08 = 0x0600BC08; D_0600C880 = 0x0600C880; +/* z_en_trt */ +D_0600FEF0 = 0x0600FEF0; +D_0600FD34 = 0x0600FD34; +D_0600DE68 = 0x0600DE68; +D_06002224 = 0x06002224; +D_06001EF4 = 0x06001EF4; +D_060030EC = 0x060030EC; +D_0600D52C = 0x0600D52C; +D_06002CB0 = 0x06002CB0; +D_0600EE98 = 0x0600EE98; +D_06003D78 = 0x06003D78; +D_06000A44 = 0x06000A44; +D_0600B0B8 = 0x0600B0B8; +D_0600B8B8 = 0x0600B8B8; +D_0600C0B8 = 0x0600C0B8; + /* z_en_warp_uzu */ D_06000EC0 = 0x06000EC0; |