From 0c608c1380db82ae7e2d4fa75ee9acc5e2ee04f6 Mon Sep 17 00:00:00 2001
From: Catobat <69204835+Catobat@users.noreply.github.com>
Date: Wed, 16 Dec 2020 19:58:33 +0100
Subject: [PATCH] Fix starting equipment on file select

---
 events.asm | 8 ++++++--
 hooks.asm  | 4 +++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/events.asm b/events.asm
index 4ff5905..412f1af 100644
--- a/events.asm
+++ b/events.asm
@@ -80,6 +80,12 @@ OnAga2Defeated:
 	JSL.l IncrementAgahnim2Sword
 RTL
 ;--------------------------------------------------------------------------------
+OnFileCreation:
+	TAX ; what we wrote over
+	LDA StartingEquipment+$4C : STA $700340+$4C ; copy starting equipment swaps to file select screen
+	LDA StartingEquipment+$4E : STA $700340+$4E
+RTL
+;--------------------------------------------------------------------------------
 !RNG_ITEM_LOCK_IN = "$7F5090"
 OnFileLoad:
 	REP #$10 ; set 16 bit index registers
@@ -147,8 +153,6 @@ OnNewFile:
 		+
 
 		LDA StartingSword : STA $7EF359 ; set starting sword type
-		LDA !INVENTORY_SWAP : STA $70038C ; copy starting equipment swaps to file select screen
-		LDA !INVENTORY_SWAP_2 : STA $70038E
 
 		; reset some values on new file that are otherwise only reset on hard reset
 		STZ $03C4 ; ancilla slot index
diff --git a/hooks.asm b/hooks.asm
index e6c37f1..7c5478f 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -261,7 +261,9 @@ org $0CCE85 ; <- Bank0C.asm : 1953 (LDA $C8 : ASL A : INC #2 : STA $701FFE)
 NOP #4
 ;--------------------------------------------------------------------------------
 org $0CDB4C ; <- Bank0C.asm : 3655 (LDA $C8 : ASL A : INC #2 : STA $701FFE : TAX)
-NOP #4
+JSL OnFileCreation
+NOP
+;Additionally, display inventory swap starting equipment on file select
 ;--------------------------------------------------------------------------------
 org $09F5EA ; <- module_death.asm : 510 (LDA $701FFE : TAX : DEX #2)
 LDA.w #$0002 : NOP