Merge branch 'master' into master

events.asm

@@ -78,6 +78,12 @@ OnAga2Defeated:
 	JSL.l Dungeon_SaveRoomData_justKeys ; thing we wrote over, make sure this is first
 	JML.l IncrementAgahnim2Sword
 ;--------------------------------------------------------------------------------
+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
@@ -145,8 +151,16 @@ 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
+		STZ $047A ; EG
+		STZ $0B08 : STZ $0B09 ; arc variable
+		STZ $0CFB ; enemies killed (pull trees)
+		STZ $0CFC ; times taken damage (pull trees)
+		STZ $0FC7 : STZ $0FC8 : STZ $0FC9 : STZ $0FCA : STZ $0FCB : STZ $0FCC : STZ $0FCD ; prize packs
+		LDA #$00 : STA $7EC011 ; mosaic
+		JSL InitRNGPointerTable ; boss RNG
 	PLP : PLX
 RTL
 ;--------------------------------------------------------------------------------