Fix Bow icon

Set dungeon ID to $FF after Aga 2 kill for proper HUD draw

events.asm

@@ -29,19 +29,19 @@ OnPlayerDead:
 RTL
 ;--------------------------------------------------------------------------------
 OnDungeonExit:
-	PHA : PHP
-		SEP #$20 ; set 8-bit accumulator
-		JSL.l SQEGFix
-	PLP : PLA
+        PHA : PHP
+        SEP #$20 ; set 8-bit accumulator
+        JSL.l SQEGFix
+        PLP : PLA
 
-	STA.w DungeonID : STZ.w Map16ChangeIndex ; thing we wrote over
+        STA.w DungeonID : STZ.w Map16ChangeIndex ; thing we wrote over
 
-	PHA : PHP
-		JSL.l HUD_RebuildLong
-                INC.w UpdateHUD
-		JSL.l FloodGateResetInner
-		JSL.l SetSilverBowMode
-	PLP : PLA
+        PHA : PHP
+        JSL.l HUD_RebuildLong
+        INC.w UpdateHUD
+        JSL.l FloodGateResetInner
+        JSL.l SetSilverBowMode
+        PLP : PLA
 RTL
 ;--------------------------------------------------------------------------------
 OnQuit:
@@ -79,6 +79,7 @@ RTL
 ;--------------------------------------------------------------------------------
 OnAga2Defeated:
         JSL.l Dungeon_SaveRoomData_justKeys ; thing we wrote over, make sure this is first
+        LDA.b #$FF : STA.w DungeonID
         LDA.b #$01 : STA.l Aga2Duck
         JML.l IncrementAgahnim2Sword
 ;--------------------------------------------------------------------------------
@@ -195,12 +196,13 @@ OnLinkDamagedFromPitOutdoors:
 	JML.l OHKOTimer ; make sure this is last
 ;--------------------------------------------------------------------------------
 OnOWTransition:
-	JSL.l FloodGateReset
-	JSL.l StatTransitionCounter
-	PHP
-	SEP #$20 ; set 8-bit accumulator
-	LDA.b #$FF : STA.l RNGLockIn ; clear lock-in
-	PLP
+        JSL.l FloodGateReset
+        JSL.l StatTransitionCounter
+        PHP
+        SEP #$20 ; set 8-bit accumulator
+        LDA.b #$FF : STA.l RNGLockIn ; clear lock-in
+        INC.w UpdateHUD
+        PLP
 RTL
 ;--------------------------------------------------------------------------------
 OnLoadDuckMap:

hooks.asm

@@ -368,7 +368,6 @@ STA.l StalfosBombDamage
 ;--------------------------------------------------------------------------------
 org $0AB76E ; <- 5376E - Bank0A.asm : 30 (JSL OverworldMap_InitGfx)
 JSL.l OnLoadDuckMap
-;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Infinite Bombs / Arrows / Magic
@@ -1358,7 +1357,7 @@ JSL.l DrawMagicHeader
 BRA + : NOP #15 : +
 ;--------------------------------------------------------------------------------
 org $0DFB29 ; <- headsup_display.asm : 688 (LDA.b #$86 : STA $7EC71E)
-BRA + : NOP #$1C : +
+BRA + : NOP #$16 : +
 ;--------------------------------------------------------------------------------
 org $01CF67 ; <- CF67 - Bank01.asm : 11625 (STA $7EF36F)
 JSL.l DecrementSmallKeys

newhud.asm

@@ -338,6 +338,7 @@ DrawMapCounts:
 .done
         SEP #$20
 RTS
+
 ;================================================================================
 ; Exits with:
 ;   X - ones place tile

vanillalabels.asm

@@ -70,6 +70,7 @@ AddAncillaLong = $099D04
 Ancilla_CheckIfAlreadyExistsLong = $099D1A
 Sprite_SetSpawnedCoords = $09AE64
 GiveRupeeGift = $09AD58
+Overworld_LoadOverlayAndMap = $0AB96C
 OverworldMap_InitGfx = $0ABA4F
 OverworldMap_DarkWorldTilemap = $0ABA99
 OverworldMap_LoadSprGfx = $0ABAB9