diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2021-05-23 01:36:21 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-22 11:36:21 -0400 |
| commit | cf3eb3b2e19bb60ec9d93b04a57127585e8ac6df (patch) | |
| tree | 146df6c153a719c117a5cb9f72ad0bcd6b374e54 /linker_scripts | |
| parent | f4687fbbe76b4699e7cfd8315fb83cd00b666e3a (diff) | |
Ovl_En_Fg OK (#133)
* En_Fg Frogs 9/18 decompiled
* En_Fg Frogs One Non-Matching
* documentation and cleanup
* final matched function
* code_script
* whitespace
* Fixed some mistakes, EnFg_UpdateDust no longer matches?
* fixed nonmatching
* Minor fixes and documentation
* PR suggestions
* Fixed genericHeader rename to common
* Fix Warnings
* PR Good Documentation Suggestions
* update names
* more pr suggestions
Co-authored-by: Jared Collette <jcollette@4000v-udp25-l.eng.unimelb.edu.au>
Co-authored-by: engineer124 <engineer124enginer124@gmail.com>
Diffstat (limited to 'linker_scripts')
| -rw-r--r-- | linker_scripts/code_script.txt | 4 | ||||
| -rw-r--r-- | linker_scripts/object_script.txt | 20 |
2 files changed, 21 insertions, 3 deletions
diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt index ea5ba3c72..03f8f83f9 100644 --- a/linker_scripts/code_script.txt +++ b/linker_scripts/code_script.txt @@ -4379,9 +4379,9 @@ SECTIONS ovl_En_Fg : AT(RomLocation) { build/src/overlays/actors/ovl_En_Fg/z_en_fg.o(.text) - build/asm/overlays/ovl_En_Fg_data.o(.data) + build/src/overlays/actors/ovl_En_Fg/z_en_fg.o(.data) build/src/overlays/actors/ovl_En_Fg/z_en_fg.o(.rodata) - build/asm/overlays/ovl_En_Fg_rodata.o(.rodata) + build/src/overlays/actors/ovl_En_Fg/z_en_fg_overlay.o(.ovl) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; diff --git a/linker_scripts/object_script.txt b/linker_scripts/object_script.txt index 5e02b39d5..73233ae5f 100644 --- a/linker_scripts/object_script.txt +++ b/linker_scripts/object_script.txt @@ -1,3 +1,4 @@ +/* gameplay_keep */ D_040008D0 = 0x040008D0; D_04029CB0 = 0x04029CB0; D_04029CF0 = 0x04029CF0; @@ -25,6 +26,14 @@ D_04076BC0 = 0x04076BC0; D_04075A40 = 0x04075A40; D_04077480 = 0x04077480; D_04075B30 = 0x04075B30; +D_0408DBE0 = 0x0408DBE0; +D_0408DFE0 = 0x0408DFE0; +D_0408E3E0 = 0x0408E3E0; +D_0408E7E0 = 0x0408E7E0; +D_0408EBE0 = 0x0408EBE0; +D_0408EFE0 = 0x0408EFE0; +D_0408F3E0 = 0x0408F3E0; +D_0408F7E0 = 0x0408F7E0; /* gameplay_dangeon_keep */ D_05018090 = 0x05018090; @@ -246,6 +255,15 @@ D_06000958 = 0x06000958; /* z_en_jc_mato */ D_06000390 = 0x06000390; +/* z_en_fg */ +D_06001534 = 0x06001534; +D_060011C0 = 0x060011C0; +D_060007BC = 0x060007BC; +D_060059A0 = 0x060059A0; +D_0600B328 = 0x0600B328; +D_0600B338 = 0x0600B338; +D_0600B538 = 0x0600B538; + /* z_bg_ladder */ D_060000A0 = 0x060000A0; D_060001D8 = 0x060001D8; @@ -265,4 +283,4 @@ D_04089070 = 0x04089070; /* z_obj_moon_stone */ D_06001C60 = 0x06001C60; D_06000D78 = 0x06000D78; -D_06000C80 = 0x06000C80;
\ No newline at end of file +D_06000C80 = 0x06000C80; |