diff options
| author | Isghj <42048411+isghj5@users.noreply.github.com> | 2021-03-24 01:58:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-24 03:58:25 -0500 |
| commit | e64d4d8bf27c55e64819afb9cfa8d993a1e5c246 (patch) | |
| tree | ad4285ba1c751c4307fec0a381ec7690a793f57c /linker_scripts/code_script.txt | |
| parent | 1a2e6d7ffe675de5409067e902de0f7ff87449dd (diff) | |
EnPoFusen: OK (#69)
* EnPoFusen: OK
EnPoFusen: WIP
EnPoFusen: init is matched
* EnPoFusen: requested changes
* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.h
Co-authored-by: Rozelette <Rozelette@users.noreply.github.com>
* EnPoFusen: forgot I renamed a function to check diff, changed back
* EnPoFusen: Bad search and replace
* EnPoFusen: really bad search replace
* EnPoFusen: ColliderInit and requested changes
* Functions: renamed func_800B8EC8 to Audio_PlayActorSound2
Co-authored-by: isghj8 <isghj8@gmail.com>
Co-authored-by: Rozelette <Rozelette@users.noreply.github.com>
Diffstat (limited to 'linker_scripts/code_script.txt')
| -rw-r--r-- | linker_scripts/code_script.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt index 590a774d7..d9c4e61c3 100644 --- a/linker_scripts/code_script.txt +++ b/linker_scripts/code_script.txt @@ -5553,9 +5553,9 @@ SECTIONS ovl_En_Po_Fusen : AT(RomLocation) { build/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.o(.text) - build/asm/overlays/ovl_En_Po_Fusen_data.o(.data) + build/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.o(.data) build/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen.o(.rodata) - build/asm/overlays/ovl_En_Po_Fusen_rodata.o(.rodata) + build/src/overlays/actors/ovl_En_Po_Fusen/z_en_po_fusen_overlay.o(.ovl) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; @@ -9342,4 +9342,4 @@ SECTIONS SegmentSize = SegmentEnd - SegmentStart; RomLocation += SegmentSize; _ovl_En_RsnSegmentEnd = SegmentEnd; -}
\ No newline at end of file +} |