diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2021-07-24 23:07:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-25 02:07:19 -0400 |
| commit | ade921a2c00f8835c1e78b09a684d347f362fc1e (patch) | |
| tree | 77896934afd88123120f5a38a8aaf00a693b97c4 /linker_scripts/code_script.txt | |
| parent | b23a6f15399872dd0a84ba1fd6a40ff4ab81156f (diff) | |
ovl_en_suttari OK (#219)
* Decomp pass
* Fix merge conflict'
* Convert damage table to new format
* Cleanup function declarations
* Some cleanup
* Cleanup and minor docs
* Add Header and Scene stuff
* More light docs and cleanup
* Rename one more function
* Remove duplicate macro
* PR suggestions except naviActor change
* Change navi to tatl
* Update include/functions.h
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Suttari/z_en_suttari.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Suttari/z_en_suttari.c
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
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 f42228056..47eafe463 100644 --- a/linker_scripts/code_script.txt +++ b/linker_scripts/code_script.txt @@ -7684,9 +7684,9 @@ SECTIONS ovl_En_Suttari : AT(RomLocation) { build/src/overlays/actors/ovl_En_Suttari/z_en_suttari.o(.text) - build/asm/overlays/ovl_En_Suttari_data.o(.data) + build/src/overlays/actors/ovl_En_Suttari/z_en_suttari.o(.data) build/src/overlays/actors/ovl_En_Suttari/z_en_suttari.o(.rodata) - build/asm/overlays/ovl_En_Suttari_rodata.o(.rodata) + build/src/overlays/actors/ovl_En_Suttari/z_en_suttari_overlay.o(.ovl) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; |