diff options
| author | kyleburnette <kyle@kyleburnette.com> | 2021-04-07 15:08:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-07 18:08:19 -0400 |
| commit | 50d0bbe0876f213dd6ad3441230b988a6c145c25 (patch) | |
| tree | be69360935faf227803f10e8f2f774c534e64051 /linker_scripts | |
| parent | d2c181a0a99430cd9893b022bd179cffc11dbbba (diff) | |
dm_sa OK (#88)
* initial dm_sa work
* more dmsa work
* dm_sa OK
* Changed char arrays in header to be UNK_TYPE1
* Made all of roz's suggested changes
* merge
Diffstat (limited to 'linker_scripts')
| -rw-r--r-- | linker_scripts/code_script.txt | 5 | ||||
| -rw-r--r-- | linker_scripts/object_script.txt | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt index 3c70e2e23..1e079687a 100644 --- a/linker_scripts/code_script.txt +++ b/linker_scripts/code_script.txt @@ -2465,7 +2465,6 @@ SECTIONS build/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.o(.text) build/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.o(.data) build/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.o(.rodata) - build/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.o(.rodata) build/src/overlays/actors/ovl_Obj_Hana/z_obj_hana_overlay.o(.ovl) } SegmentEnd = .; @@ -4342,9 +4341,9 @@ SECTIONS ovl_Dm_Sa : AT(RomLocation) { build/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.o(.text) - build/asm/overlays/ovl_Dm_Sa_data.o(.data) + build/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.o(.data) build/src/overlays/actors/ovl_Dm_Sa/z_dm_sa.o(.rodata) - build/asm/overlays/ovl_Dm_Sa_rodata.o(.rodata) + build/src/overlays/actors/ovl_Dm_Sa/z_dm_sa_overlay.o(.ovl) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; diff --git a/linker_scripts/object_script.txt b/linker_scripts/object_script.txt index e8cc65923..6f5e676a1 100644 --- a/linker_scripts/object_script.txt +++ b/linker_scripts/object_script.txt @@ -123,6 +123,10 @@ D_0600A490 = 0x0600A490; D_06000040 = 0x06000040; D_060024F0 = 0x060024F0; +/* z_dm_sa */ +D_06013328 = 0x06013328; +D_0600CC94 = 0x0600CC94; + /* bg_ikana_shutter */ D_06000F28 = 0x06000F28; D_06000CE8 = 0x06000CE8; |