summaryrefslogtreecommitdiff
path: root/linker_scripts/code_script.txt
diff options
context:
space:
mode:
authorDerek Hensley <hensley.derek58@gmail.com>2021-06-15 16:14:10 -0700
committerGitHub <noreply@github.com>2021-06-15 19:14:10 -0400
commit52d36d7373f94ce5f4b14d9461b5fedc65601888 (patch)
tree057f0325475072e6d02715e6c15ff289715c01a0 /linker_scripts/code_script.txt
parentcbe2d5a24ae4a3414c588ff9c18bcfc4e9da1bb9 (diff)
ovl_Obj_Hsstump NON_MATCHING matched (#185)
* Everything matches but func_80BDABCC * Better names, still stuck on func_80BDABCC * Some cleanup * Add param macros and document not matching * format * PR suggestions * Bring over data to c file * Retry Jenkins * Retry Jenkins take 2 * PR suggestions for comments * PR comments * Matched ObjHsStump_Appear
Diffstat (limited to 'linker_scripts/code_script.txt')
-rw-r--r--linker_scripts/code_script.txt6
1 files changed, 1 insertions, 5 deletions
diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt
index 101819ecd..b9131b2ae 100644
--- a/linker_scripts/code_script.txt
+++ b/linker_scripts/code_script.txt
@@ -8247,11 +8247,7 @@ SECTIONS
build/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.o(.text)
build/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.o(.data)
build/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump.o(.rodata)
- #ifdef NON_MATCHING
- build/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump_overlay.o(.ovl)
- #else
- build/asm/overlays/ovl_Obj_HsStump_rodata.o(.rodata)
- #endif
+ build/src/overlays/actors/ovl_Obj_HsStump/z_obj_hsstump_overlay.o(.ovl)
}
SegmentEnd = .;
SegmentSize = SegmentEnd - SegmentStart;