diff options
| author | kyleburnette <kyle@kyleburnette.com> | 2021-07-13 19:13:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-13 22:13:33 -0400 |
| commit | 1d350f1bad1d01fd6ab739f99877669cb1cf416f (patch) | |
| tree | 5bcec78cbfecc70ff0a9deb8910b56aba37682a5 /linker_scripts | |
| parent | afad253fa80221a48ceb0e42e5a66cdc2651e69c (diff) | |
En_Guruguru OK and partially documented (#203)
* En_Guruguru OK and partially documented
* Renamed texture arrays
* Made text ID array static
* Made most of the suggested changes
Diffstat (limited to 'linker_scripts')
| -rw-r--r-- | linker_scripts/code_script.txt | 4 | ||||
| -rw-r--r-- | linker_scripts/object_script.txt | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt index b0e931bfe..f92cefd08 100644 --- a/linker_scripts/code_script.txt +++ b/linker_scripts/code_script.txt @@ -7937,9 +7937,9 @@ SECTIONS ovl_En_Guruguru : AT(RomLocation) { build/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.o(.text) - build/asm/overlays/ovl_En_Guruguru_data.o(.data) + build/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.o(.data) build/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.o(.rodata) - build/asm/overlays/ovl_En_Guruguru_rodata.o(.rodata) + build/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru_overlay.o(.ovl) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; diff --git a/linker_scripts/object_script.txt b/linker_scripts/object_script.txt index 28d90d970..f2a18694e 100644 --- a/linker_scripts/object_script.txt +++ b/linker_scripts/object_script.txt @@ -291,6 +291,15 @@ object_ginko_floorsmacking_anim = 0x060008C0; object_ginko_amazed_anim = 0x06004A7C; object_ginko_advertising_anim = 0x06000AC4; +/* z_en_guruguru */ +D_06006C90 = 0x06006C90; +D_06000B04 = 0x06000B04; +D_0600057C = 0x0600057C; +D_06005F20 = 0x06005F20; +D_06006320 = 0x06006320; +D_06006720 = 0x06006720; +D_06006920 = 0x06006920; + /* z_en_in */ D_06014EA8 = 0x06014EA8; D_06015E38 = 0x06015E38; |