diff options
| author | kyleburnette <kyle@kyleburnette.com> | 2021-06-15 15:32:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-15 18:32:59 -0400 |
| commit | 80752e1107c13670373bc2a58f77e9b8a89f63e5 (patch) | |
| tree | 39ea65ab19fbc7ab3155516d6dd1ae5aa2b0accb /linker_scripts | |
| parent | 74e418f24f70626761b7a466b150dcea06febea5 (diff) | |
iknv_obj ok (#183)
* iknv_obj ok
* Documented a few more functions and updated type enum
* Added engineer's changes
* Changed negations at engineer's request (casts required)
* Changed negations at engineer's request (casts required)
* Got rid of extra parentheses
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
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, 9 insertions, 2 deletions
diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt index 61a0dfad3..c7e7dadec 100644 --- a/linker_scripts/code_script.txt +++ b/linker_scripts/code_script.txt @@ -8217,9 +8217,9 @@ SECTIONS ovl_Bg_Iknv_Obj : AT(RomLocation) { build/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.o(.text) - build/asm/overlays/ovl_Bg_Iknv_Obj_data.o(.data) + build/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.o(.data) build/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj.o(.rodata) - build/asm/overlays/ovl_Bg_Iknv_Obj_rodata.o(.rodata) + build/src/overlays/actors/ovl_Bg_Iknv_Obj/z_bg_iknv_obj_overlay.o(.ovl) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; diff --git a/linker_scripts/object_script.txt b/linker_scripts/object_script.txt index 4c72dfd7e..115167394 100644 --- a/linker_scripts/object_script.txt +++ b/linker_scripts/object_script.txt @@ -228,6 +228,13 @@ D_06000C20 = 0x6000C20; D_06000420 = 0x6000420; D_06001420 = 0x6001420; +/* z_bg_iknv_obj */ +D_060119D4 = 0x060119D4; +D_06012CA4 = 0x06012CA4; +D_06011880 = 0x06011880; +D_060129C8 = 0x060129C8; +D_06013058 = 0x06013058; + /* z_obj_kepn_koya */ D_0600805C = 0x0600805C; D_06003478 = 0x06003478; |