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/code_script.txt | |
| 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/code_script.txt')
| -rw-r--r-- | linker_scripts/code_script.txt | 4 |
1 files changed, 2 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; |