diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2021-05-18 23:01:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-18 23:01:48 -0400 |
| commit | f3dc829456fb09c977264c01001e86487ef1e72f (patch) | |
| tree | 1b8d71f9e5c18425f0cf78d5653e31b6f0487be6 /linker_scripts | |
| parent | 4d6d9c27a4f2a349a8c9dfcbff5dd866f4cdc9de (diff) | |
`ovl_Eff_Dust` OK (#136)
* some easy functions
Signed-off-by: Angie <angheloalf95@gmail.com>
* init is cursed
Signed-off-by: Angie <angheloalf95@gmail.com>
* func_80919230 is weird
Signed-off-by: Angie <angheloalf95@gmail.com>
* I'm dumb
Signed-off-by: Angie <angheloalf95@gmail.com>
* func_80919768 nonmatching
Signed-off-by: Angie <angheloalf95@gmail.com>
* everything is wrong
Signed-off-by: Angie <angheloalf95@gmail.com>
* This thing still doesn't want to match
Signed-off-by: Angie <angheloalf95@gmail.com>
* improved a bit
Signed-off-by: Angie <angheloalf95@gmail.com>
* a bit of renaming, but it still doesn't work
Signed-off-by: Angie <angheloalf95@gmail.com>
* almost matching
* func_80919768 ok
* func_809199FC ok
* init was dumb
* add enum and other minor changes
* run format
Diffstat (limited to 'linker_scripts')
| -rw-r--r-- | linker_scripts/code_script.txt | 4 | ||||
| -rw-r--r-- | linker_scripts/object_script.txt | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt index c48f66b7d..a3afc53ba 100644 --- a/linker_scripts/code_script.txt +++ b/linker_scripts/code_script.txt @@ -1923,9 +1923,9 @@ SECTIONS ovl_Eff_Dust : AT(RomLocation) { build/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.o(.text) - build/asm/overlays/ovl_Eff_Dust_data.o(.data) + build/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.o(.data) build/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.o(.rodata) - build/asm/overlays/ovl_Eff_Dust_rodata.o(.rodata) + build/src/overlays/actors/ovl_Eff_Dust/z_eff_dust_overlay.o(.ovl) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; diff --git a/linker_scripts/object_script.txt b/linker_scripts/object_script.txt index d63e4a532..42b8acad8 100644 --- a/linker_scripts/object_script.txt +++ b/linker_scripts/object_script.txt @@ -203,6 +203,9 @@ D_06009278 = 0x06009278; D_06012B70 = 0x06012B70; D_06013EA8 = 0x06013EA8; +/* z_eff_dust */ +D_04054A90 = 0x04054A90; + /* z_obj_visiblock */ D_06000AD0 = 0x06000AD0; D_06000140 = 0x06000140; |