diff options
| author | Nick <DJInsomniaPro@gmail.com> | 2021-06-09 17:53:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-09 18:53:36 -0400 |
| commit | 511094337791e042fc16463902a54e2ef8969fa5 (patch) | |
| tree | a3520a494095014046ae40f5551b73fd0a58f302 /linker_scripts | |
| parent | 3ac21daf26586c23158c42e38d79de1b24304bfb (diff) | |
Obj_Kibako OK (#169)
* Clean dist.
* ovl_Obj_Kibako OK
* Run clang-format
* Suggested changes.
* Suggested Changes
* Consistency change.
* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* PLAYER macro
* Suggested Changes
* Suggested Changes
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 | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt index 1a7242341..5d9e02cd1 100644 --- a/linker_scripts/code_script.txt +++ b/linker_scripts/code_script.txt @@ -2059,9 +2059,9 @@ SECTIONS ovl_Obj_Kibako : AT(RomLocation) { build/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.o(.text) - build/asm/overlays/ovl_Obj_Kibako_data.o(.data) + build/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.o(.data) build/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.o(.rodata) - build/asm/overlays/ovl_Obj_Kibako_rodata.o(.rodata) + build/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako_overlay.o(.ovl) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; diff --git a/linker_scripts/object_script.txt b/linker_scripts/object_script.txt index 1367a9315..51ff58a91 100644 --- a/linker_scripts/object_script.txt +++ b/linker_scripts/object_script.txt @@ -379,3 +379,9 @@ D_04089070 = 0x04089070; D_06001C60 = 0x06001C60; D_06000D78 = 0x06000D78; D_06000C80 = 0x06000C80; + +/* z_obj_kibako */ +D_05007890 = 0x05007890; +D_05007980 = 0x05007980; +D_06001180 = 0x06001180; +D_06001A70 = 0x06001A70;
\ No newline at end of file |