diff --git a/hooks.asm b/hooks.asm index 3685f0a..b1be009 100644 --- a/hooks.asm +++ b/hooks.asm @@ -1380,6 +1380,17 @@ org $0DDFC8 JSR.w RebuildHUD_update org $0DDB88 ; Don't rebuild HUD twice on icon refresh NOP #3 ; Not sure why this is here +;-------------------------------------------------------------------------------- +org $07A205 +JSL.l RebuildHUD_update_long +org $0AEF62 +JSL.l RebuildHUD_update_long +;-------------------------------------------------------------------------------- +org $0DFFE1 +RebuildHUD_update_long: +JSR.w RebuildHUD_update : RTL +warnpc $0E8000 + ;================================================================================ ; 300 Rupee NPC ;-------------------------------------------------------------------------------- diff --git a/newhud.asm b/newhud.asm index 876c408..0c47f23 100644 --- a/newhud.asm +++ b/newhud.asm @@ -147,10 +147,11 @@ NewHUD_DrawPrizeIcon: REP #$10 SEP #$20 LDA.b GameMode - CMP.b #$12 - BEQ .no_prize - - LDA.w DungeonID + CMP.b #$12 : BEQ .no_prize + CMP.b #$0E : BEQ + + LDA.w UpdateHUD : BEQ NewHUD_DrawItemCounter + + + LDA.w DungeonID CMP.b #$1A : BCS .no_prize CMP.b #$04 : BCC .no_prize CMP.b #$08 : BNE .dungeon diff --git a/pendantcrystalhud.asm b/pendantcrystalhud.asm index 39d0b19..d1e83cd 100644 --- a/pendantcrystalhud.asm +++ b/pendantcrystalhud.asm @@ -172,7 +172,6 @@ RaiseHudMenu: RTL ;================================================================================ CheckCloseItemMenu: - INC.w UpdateHUD LDA.l MenuCollapse : BNE + LDA.b Joy1A_New : AND.b #$10 : RTL + @@ -690,3 +689,4 @@ RestoreMenu_SetSubModule: + LDA.b #$03 : STA.w SubModuleInterface RTL +;------------------------------------------------------------------------------- diff --git a/retro.asm b/retro.asm index 3e03d5f..5752b98 100644 --- a/retro.asm +++ b/retro.asm @@ -19,7 +19,6 @@ StoreBombCount: PLA : STA.l BombsEquipment RTL SearchForEquippedItem: - INC.w UpdateHUD LDA.l InfiniteBombs : BEQ + LDA.b #$01 : LDX.b #$00 : RTL +