From 594a3ceaffa055dd015dd878dbe6bcf124567f9d Mon Sep 17 00:00:00 2001 From: Derek Hensley Date: Mon, 19 Jul 2021 16:26:47 -0700 Subject: 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 --- linker_scripts/code_script.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'linker_scripts/code_script.txt') 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; -- cgit v1.2.3