diff --git a/events.asm b/events.asm
index 1a4467d..9c4c156 100644
--- a/events.asm
+++ b/events.asm
@@ -34,6 +34,11 @@ OnDungeonExit:
 	PLP : PLA
 RTL
 ;--------------------------------------------------------------------------------
+OnAga2Defeated:
+	JSL.l Dungeon_SaveRoomData_justKeys ; thing we wrote over, make sure this is first
+	JSL.l IncrementAgahnim2Sword
+RTL
+;--------------------------------------------------------------------------------
 !RNG_ITEM_LOCK_IN = "$7F5090"
 OnFileLoad:
 	LDA !FRESH_FILE_MARKER : BNE +
diff --git a/hooks.asm b/hooks.asm
index 6cfa8d0..200363c 100644
--- a/hooks.asm
+++ b/hooks.asm
@@ -233,7 +233,7 @@ JSL.l CalculateCapeUsage
 ; Misc Stats
 ;--------------------------------------------------------------------------------
 org $029E2E ; <- 11E2E - module_ganon_emerges.asm : 59 (JSL Dungeon_SaveRoomData.justKeys)
-JSL.l IncrementAgahnim2Sword
+JSL.l OnAga2Defeated
 ;--------------------------------------------------------------------------------
 org $0DDBDE ; <- 6DBDE - headsup_display.asm : 105 (DEC A : BPL .subtractRupees)
 JSL.l IncrementSpentRupees
diff --git a/stats.asm b/stats.asm
index 9884e68..6e0cd8c 100644
--- a/stats.asm
+++ b/stats.asm
@@ -214,7 +214,6 @@ DecrementSmallKeys:
 RTL
 ;--------------------------------------------------------------------------------
 IncrementAgahnim2Sword:
-	JSL.l Dungeon_SaveRoomData_justKeys ; thing we wrote over
 	PHA
 		LDA !LOCK_STATS : BNE +
 			JSL AddInventory_incrementBossSwordLong