diff options
| author | EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> | 2021-07-05 22:47:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-05 17:47:55 -0400 |
| commit | 0e51bf35a169f3f73c7fb7e9f31f6ccafb4ebb25 (patch) | |
| tree | 796919621cb1129f64b6db3024208efe10c68ddd /linker_scripts/code_script.txt | |
| parent | e57fb5780d488786895e6cb0c6e872255986d045 (diff) | |
EnFirefly OK and mostly documented (#194)
* Data imported, 8/30 functions done
* OK
* Delete ASM references, add SFX
* Named functions
* more naming
* Type the nop ActorFunc correctly
* A couple more bits of documentation
* Sorted object_script
* Merge remote-tracking branch 'upstream/master' into Firefly
* format
* Update other includes
* Review suggestions
* Review changes; named Actor_Noop
* Format
Diffstat (limited to 'linker_scripts/code_script.txt')
| -rw-r--r-- | linker_scripts/code_script.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt index 0157765ac..cfb4bf1af 100644 --- a/linker_scripts/code_script.txt +++ b/linker_scripts/code_script.txt @@ -985,9 +985,9 @@ SECTIONS ovl_En_Firefly : AT(RomLocation) { build/src/overlays/actors/ovl_En_Firefly/z_en_firefly.o(.text) - build/asm/overlays/ovl_En_Firefly_data.o(.data) + build/src/overlays/actors/ovl_En_Firefly/z_en_firefly.o(.data) build/src/overlays/actors/ovl_En_Firefly/z_en_firefly.o(.rodata) - build/asm/overlays/ovl_En_Firefly_rodata.o(.rodata) + build/src/overlays/actors/ovl_En_Firefly/z_en_firefly_overlay.o(.ovl) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; |