diff --git a/events.asm b/events.asm index b4c4dbe..257ac68 100644 --- a/events.asm +++ b/events.asm @@ -42,6 +42,7 @@ RTL !RNG_ITEM_LOCK_IN = "$7F5090" OnNewFile: REP #$20 ; set 16-bit accumulator + LDA.l LinkStartingRupees : STA $7EF362 : STA $7EF360 LDA.l StartingTime : STA $7EF454 LDA.l StartingTime+2 : STA $7EF454+2 SEP #$20 ; set 8-bit accumulator diff --git a/hooks.asm b/hooks.asm index a8016bc..2cc20d9 100644 --- a/hooks.asm +++ b/hooks.asm @@ -253,14 +253,14 @@ org $0DE6F4 ; <- 6E6F4 - equipment.asm : 1474 (BCC .lacksAbility) db #$80 ; BRA org $0DE81A ; <- 6E81A - equipment.asm : 1597 (STA $00) RTS -org $0DE7B9 ; <- 6E7B9 - equipment.asm : 1548 (LDA.w #$16D0) -LDA.w #$1590 -org $0DE7CF ; <- 6E7CF - equipment.asm : 1554 (LDA.w #$16C8) -LDA.w #$1588 -org $0DE7E5 ; <- 6E7E5 - equipment.asm : 1560 (LDA.w #$16D8) -LDA.w #$1598 -org $0DECEB ; <- 6ECEB - equipment.asm : 1946 (LDA.w #$16E0) -LDA.w #$15A0 +org $0DE7B9 ; <- 6E7B9 - equipment.asm : 1548 (LDA.w #$16D0 : STA $00) +JSL.l DrawGlovesInMenuLocation : NOP +org $0DE7CF ; <- 6E7CF - equipment.asm : 1554 (LDA.w #$16C8 : STA $00) +JSL.l DrawBootsInMenuLocation : NOP +org $0DE7E5 ; <- 6E7E5 - equipment.asm : 1560 (LDA.w #$16D8 : STA $00) +JSL.l DrawFlippersInMenuLocation : NOP +org $0DECEB ; <- 6ECEB - equipment.asm : 1946 (LDA.w #$16E0 : STA $00) +JSL.l DrawMoonPearlInMenuLocation : NOP ;-------------------------------------------------------------------------------- ;org $0DE9D8 ; <- 6E9D8 - equipment.asm : 1635 (LDA $E860, X : STA $12EA, X) ;BRA DrawProgressIcons_initPendantDiagram_notext diff --git a/pendantcrystalhud.asm b/pendantcrystalhud.asm index be8d535..852d893 100644 --- a/pendantcrystalhud.asm +++ b/pendantcrystalhud.asm @@ -174,6 +174,38 @@ RTL ;$388 = Turtle Rock ;$389 = Ganon's Tower ;-------------------------------------------------------------------------------- +DrawBootsInMenuLocation: + LDA.l HUDDungeonItems : BNE + + LDA.w #$1608 : STA $00 + RTL + + + LDA.w #$1588 : STA $00 +RTL +;-------------------------------------------------------------------------------- +DrawGlovesInMenuLocation: + LDA.l HUDDungeonItems : BNE + + LDA.w #$1610 : STA $00 + RTL + + + LDA.w #$1590 : STA $00 +RTL +;-------------------------------------------------------------------------------- +DrawFlippersInMenuLocation: + LDA.l HUDDungeonItems : BNE + + LDA.w #$1618 : STA $00 + RTL + + + LDA.w #$1598 : STA $00 +RTL +;-------------------------------------------------------------------------------- +DrawMoonPearlInMenuLocation: + LDA.l HUDDungeonItems : BNE + + LDA.w #$1620 : STA $00 + RTL + + + LDA.w #$15A0 : STA $00 +RTL +;-------------------------------------------------------------------------------- DrawHUDDungeonItems: LDA.l HUDDungeonItems : BNE + : RTL : + diff --git a/tables.asm b/tables.asm index dbfac39..56b07cf 100644 --- a/tables.asm +++ b/tables.asm @@ -173,7 +173,11 @@ db #$00 ; #$00 = Off (default) - #$01 = On ;-------------------------------------------------------------------------------- org $308045 ; PC 0x180045 HUDDungeonItems: -db #$FF ; display ----dcba a: Small Keys, b: Big Key, c: Map, d: Compass +db #$00 ; display ----dcba a: Small Keys, b: Big Key, c: Map, d: Compass +;-------------------------------------------------------------------------------- +org $308046 ; PC 0x180046 Link's starting equipment +LinkStartingRupees: +dw #$0000 ;-------------------------------------------------------------------------------- org $308080 ; PC 0x180080 Upgrade5BombsRefill: