diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2021-07-19 16:26:47 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-19 19:26:47 -0400 |
| commit | 594a3ceaffa055dd015dd878dbe6bcf124567f9d (patch) | |
| tree | d5aa405caf2354d5653c6b8ba5504bf8a05ff258 /linker_scripts | |
| parent | b5c931e432c079f02e7373bf4a8e5130d2df981b (diff) | |
Ovl_En_Fsn Ok and Documented (#204)
* First decomp pass: Matched everything w/ data
* Minor cleanup of func_80AE2F78
* Documented
* Format
* Some cleanup and PR suggestions
* Format
* Add the word player to a few functions to specify it is the player trying to buy
* Add controller macros
* Move common shopkeeper defines
* name unk274 and add note to unk27A
* Remove macros and just use flag defines
* Convert Controller Macros to take globalCtx
* Fix merge conflicts
Diffstat (limited to 'linker_scripts')
| -rw-r--r-- | linker_scripts/code_script.txt | 4 | ||||
| -rw-r--r-- | linker_scripts/object_script.txt | 23 |
2 files changed, 25 insertions, 2 deletions
diff --git a/linker_scripts/code_script.txt b/linker_scripts/code_script.txt index 91ed4ee52..1b9f99f45 100644 --- a/linker_scripts/code_script.txt +++ b/linker_scripts/code_script.txt @@ -6119,9 +6119,9 @@ SECTIONS ovl_En_Fsn : AT(RomLocation) { build/src/overlays/actors/ovl_En_Fsn/z_en_fsn.o(.text) - build/asm/overlays/ovl_En_Fsn_data.o(.data) + build/src/overlays/actors/ovl_En_Fsn/z_en_fsn.o(.data) build/src/overlays/actors/ovl_En_Fsn/z_en_fsn.o(.rodata) - build/asm/overlays/ovl_En_Fsn_rodata.o(.rodata) + build/src/overlays/actors/ovl_En_Fsn/z_en_fsn_overlay.o(.ovl) } SegmentEnd = .; SegmentSize = SegmentEnd - SegmentStart; diff --git a/linker_scripts/object_script.txt b/linker_scripts/object_script.txt index e1af6574a..896e0ddcb 100644 --- a/linker_scripts/object_script.txt +++ b/linker_scripts/object_script.txt @@ -43,6 +43,9 @@ D_0408EBE0 = 0x0408EBE0; D_0408EFE0 = 0x0408EFE0; D_0408F3E0 = 0x0408F3E0; D_0408F7E0 = 0x0408F7E0; +D_0401F740 = 0x0401F740; +D_0401F7C0 = 0x0401F7C0; +D_0401F8C0 = 0x0401F8C0; /* gameplay_dangeon_keep (segment 05) */ @@ -288,6 +291,26 @@ D_060018B8 = 0x060018B8; D_0600017C = 0x0600017C; D_06001678 = 0x06001678; +/* z_en_fsn */ +D_06012C34 = 0x06012C34; +D_06013320 = 0x06013320; +D_060131FC = 0x060131FC; +D_0600C58C = 0x0600C58C; +D_0600E3EC = 0x0600E3EC; +D_0600F00C = 0x0600F00C; +D_0600CB3C = 0x0600CB3C; +D_0600D354 = 0x0600D354; +D_060138B0 = 0x060138B0; +D_0601430C = 0x0601430C; +D_0600B9D8 = 0x0600B9D8; +D_0600C26C = 0x0600C26C; +D_0600DE34 = 0x0600DE34; +D_06005BC0 = 0x06005BC0; +D_06006D40 = 0x06006D40; +D_06007140 = 0x06007140; +D_0600F180 = 0x0600F180; +D_0600F218 = 0x0600F218; + /* z_en_ginko_man */ object_ginko_skeleton = 0x0600C240; object_ginko_limb15_dlist = 0x0600B1D8; |