diff options
| author | Zelllll <56516451+Zelllll@users.noreply.github.com> | 2021-04-29 19:46:01 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-29 20:46:01 -0400 |
| commit | fed1b37da1dcab04124f27d32bec98275f7fe3f2 (patch) | |
| tree | 4f586c4797cc4bad964f7df3c11dd5ec654452a7 /linker_scripts | |
| parent | 69d9f32ef3cb54e0e38cc5247afc2024535dc909 (diff) | |
ovl_Bg_Keikoku_Spr OK (#111)
* finish actor
* fix linker
Diffstat (limited to 'linker_scripts')
| -rw-r--r-- | linker_scripts/code_script.txt | 4 | ||||
| -rw-r--r-- | linker_scripts/object_script.txt | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt index 2bbd8cf9f..7e9a08e64 100644 --- a/linker_scripts/code_script.txt +++ b/linker_scripts/code_script.txt @@ -1434,9 +1434,9 @@ SECTIONS ovl_Bg_Keikoku_Spr : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.o(.text) - build/asm/overlays/ovl_Bg_Keikoku_Spr_data.o(.data) + build/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.o(.data) build/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr.o(.rodata) - build/asm/overlays/ovl_Bg_Keikoku_Spr_rodata.o(.rodata) + build/src/overlays/actors/ovl_Bg_Keikoku_Spr/z_bg_keikoku_spr_overlay.o(.ovl) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; diff --git a/linker_scripts/object_script.txt b/linker_scripts/object_script.txt index 7db419f27..a13ae82ee 100644 --- a/linker_scripts/object_script.txt +++ b/linker_scripts/object_script.txt @@ -126,6 +126,14 @@ D_0600A490 = 0x0600A490; D_06000040 = 0x06000040; D_060024F0 = 0x060024F0; +/* z_bg_keikoku_spr */ +D_06000100 = 0x06000100; +D_060001F8 = 0x060001F8; +D_06000300 = 0x06000300; +D_060003F8 = 0x060003F8; +D_06000500 = 0x06000500; +D_060005F8 = 0x060005F8; + /* z_dm_sa */ D_06013328 = 0x06013328; D_0600CC94 = 0x0600CC94; |