diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2021-07-26 19:27:53 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-26 22:27:53 -0400 |
| commit | c774f880e1b033c53e48fc9b438f84fa47836346 (patch) | |
| tree | 8258f15c9cf9589288a206f9fc27c3ec7e99d00c /linker_scripts | |
| parent | 930d605c5ca2c9b2c753b046cb4860c6edcce586 (diff) | |
ovl_en_ossan OK and documented (#223)
* Lots of progress, some came for OOT WIP
* Some small cleanup
* Fix merge conflict
* Bring over updated z_en_girla.h
* Fix merge error
* some cleanup
* fix msgcontext and add sfx ids
* func_808AAB30 is ugly but it matches
* Cleanup
* More cleanup and matched func_808AA8E8
* Matched last two functions
* Brought over data as a comment
* Figured out data, but not late rodata
* Document EnOssan
* Cleanup
* Added ShopItemIds
* Cleanup
* Switch left and right stick prompts
* Remove testing NON_MATCHING define
* Cleanup
* Add header to .c file
* Adjust header
* Rename InitCutscenes to GetCutscenes
* Cleanup
* Cleanup before merge with upstream
* More cleanup
* Lower case Shopkeeper
* More cleanup
* More general cleaning
* Found the late rodata issue
* Format
* Rename InitalUpdate
* PR suggestions except texture stuff
* Texture stuff
* Rename Texture typedef to UNK_TEXPTR
* One more rename
* Remove * from TexturePtr arrays
* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
* Update src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Derek Hensley <d.hensley@tempered.io>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Diffstat (limited to 'linker_scripts')
| -rw-r--r-- | linker_scripts/code_script.txt | 5 | ||||
| -rw-r--r-- | linker_scripts/object_script.txt | 26 |
2 files changed, 26 insertions, 5 deletions
diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt index 47eafe463..e7a006dd9 100644 --- a/linker_scripts/code_script.txt +++ b/linker_scripts/code_script.txt @@ -1269,10 +1269,9 @@ SECTIONS ovl_En_Ossan : AT(RomLocation) { build/src/overlays/actors/ovl_En_Ossan/z_en_ossan.o(.text) - build/asm/overlays/ovl_En_Ossan_data.o(.data) + build/src/overlays/actors/ovl_En_Ossan/z_en_ossan.o(.data) build/src/overlays/actors/ovl_En_Ossan/z_en_ossan.o(.rodata) - build/asm/overlays/ovl_En_Ossan_rodata.o(.rodata) - build/asm/overlays/ovl_En_Ossan_late_rodata.o(.rodata) + build/src/overlays/actors/ovl_En_Ossan/z_en_ossan_overlay.o(.ovl) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; diff --git a/linker_scripts/object_script.txt b/linker_scripts/object_script.txt index 25c0cc623..892217f32 100644 --- a/linker_scripts/object_script.txt +++ b/linker_scripts/object_script.txt @@ -57,7 +57,6 @@ D_0401F740 = 0x0401F740; D_0401F7C0 = 0x0401F7C0; D_0401F8C0 = 0x0401F8C0; - /* gameplay_dangeon_keep (segment 05) */ D_05018090 = 0x05018090; D_05017EA0 = 0x05017EA0; @@ -171,7 +170,6 @@ D_06000228 = 0x06000228; D_06000A20 = 0x06000A20; D_06000040 = 0x06000040; - /* z_bg_market_step */ D_0601F050 = 0x0601F050; D_06018DA0 = 0x06018DA0; @@ -565,6 +563,30 @@ D_06002530 = 0x06002530; /* z_en_nnh */ D_06001510 = 0x06001510; +/* z_en_ossan */ +D_06013320 = 0x06013320; +D_06012C34 = 0x06012C34; +D_060028A0 = 0x060028A0; +D_06009D34 = 0x06009D34; +D_0600CB3C = 0x0600CB3C; +D_0600DE34 = 0x0600DE34; +D_0600E3EC = 0x0600E3EC; +D_0600C58C = 0x0600C58C; +D_0600F00C = 0x0600F00C; +D_0600B9D8 = 0x0600B9D8; +D_0600C26C = 0x0600C26C; +D_0600D354 = 0x0600D354; +D_060131FC = 0x060131FC; +D_0601430C = 0x0601430C; +D_060138B0 = 0x060138B0; +D_0600A460 = 0x0600A460; +D_06006498 = 0x06006498; +D_06007140 = 0x06007140; +D_06006D40 = 0x06006D40; +D_06005BC0 = 0x06005BC0; +D_06006F18 = 0x06006F18; +D_06006B18 = 0x06006B18; + /* z_en_pametfrog */ D_06000994 = 0x06000994; D_06001B08 = 0x06001B08; |