summaryrefslogtreecommitdiff
path: root/linker_scripts/code_script.txt
diff options
context:
space:
mode:
authorDerek Hensley <hensley.derek58@gmail.com>2021-07-28 19:46:26 -0700
committerGitHub <noreply@github.com>2021-07-28 22:46:26 -0400
commit231386fd00e3a48170041f2c802b9bb21bdc3ab8 (patch)
tree3b527a82e3d4a22274dbd7c77013af0c0a7c8edb /linker_scripts/code_script.txt
parent37fc242e228feb32f408234d6664bcf6ec949406 (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/code_script.txt')
-rw-r--r--linker_scripts/code_script.txt5
1 files changed, 2 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;