diff options
| author | Parker Burnett <burnettparker@gmail.com> | 2021-06-10 07:55:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-10 07:55:21 -0400 |
| commit | aae3c6f89565bf94659d66432d1dfd9ec92f8d7f (patch) | |
| tree | 47659af3eafd66aeedd3096b4046b4d5582dda47 /linker_scripts | |
| parent | 9102481fc2da8ffd4f1f7620ad18c4ed30d2927e (diff) | |
Obj_ghaka OK (#171)
* getting ghaka started
* two more matching funcs
* functions all match, but no OK...yet....
* some clean up stuff
* uhhh lets try this?
* fixing save context stuff
* z_obj_ghaka OK
* fixing small changes
* adding in new suggestions
* fixing error
Diffstat (limited to 'linker_scripts')
| -rw-r--r-- | linker_scripts/code_script.txt | 4 | ||||
| -rw-r--r-- | linker_scripts/object_script.txt | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt index c754affba..aaecd06d9 100644 --- a/linker_scripts/code_script.txt +++ b/linker_scripts/code_script.txt @@ -6843,9 +6843,9 @@ SECTIONS ovl_Obj_Ghaka : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.o(.text) - build/asm/overlays/ovl_Obj_Ghaka_data.o(.data) + build/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.o(.data) build/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.o(.rodata) - build/asm/overlays/ovl_Obj_Ghaka_rodata.o(.rodata) + build/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka_overlay.o(.ovl) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; diff --git a/linker_scripts/object_script.txt b/linker_scripts/object_script.txt index 25114fea8..b34e252b8 100644 --- a/linker_scripts/object_script.txt +++ b/linker_scripts/object_script.txt @@ -389,8 +389,13 @@ D_06001C60 = 0x06001C60; D_06000D78 = 0x06000D78; D_06000C80 = 0x06000C80; +/* z_obj_ghaka */ +D_06001A20 = 0x06001A20; +D_06001980 = 0x06001980; +D_06003CD0 = 0x06003CD0; + /* z_obj_kibako */ D_05007890 = 0x05007890; D_05007980 = 0x05007980; D_06001180 = 0x06001180; -D_06001A70 = 0x06001A70;
\ No newline at end of file +D_06001A70 = 0x06001A70; |