Unify handling of bomb colors in bomb-only mode

This commit is contained in:
2021-11-07 00:28:28 -07:00
parent 0c6ba20470
commit 2b241b2340
4 changed files with 60 additions and 6 deletions

View File

@@ -261,6 +261,22 @@ AllowBombingBarrier:
.no_disable_projectiles
RTL
;--------------------------------------------------------------------------------
DrawBombInMenu:
JSL LoadBombCount16 : AND.w #$00FF : BEQ .noBombs
LDA SpecialWeapons : AND.w #$00FF : CMP.w #$0001 : BNE .vanillaBombs
LDA.l !BOMB_LEVEL : AND.w #$00FF : BEQ .noBombs : STA $02
LDA.w #$FC51 : STA $04
BRA .done
.vanillaBombs
LDA.w #$0001 : STA $02
LDA.w #$F699 : STA $04
BRA .done
.noBombs
LDA.w #$0000 : STA $02
LDA.w #$F699 : STA $04
.done
RTL
;--------------------------------------------------------------------------------
DrawSwordInMenu:
LDA SpecialWeapons : AND.w #$00FF : CMP.w #$0001 : BEQ .bombSword
LDA $7EF359 : AND.w #$00FF : CMP.w #$00FF : BEQ .noSword
@@ -277,6 +293,15 @@ DrawSwordInMenu:
LDA.w #$FC51 : STA $04
RTL
;--------------------------------------------------------------------------------
DrawBombInYBox:
CPX.w #$0004 : BNE .done
LDA SpecialWeapons : AND.w #$00FF : CMP.w #$0001 : BNE .vanilla
LDA !BOMB_LEVEL : AND.w #$00FF : CLC : ADC.w #$00B7 : BRA .done
.vanilla
LDA.w #$0001
.done
RTL
;--------------------------------------------------------------------------------
BombIcon:
dw $207F, $207F, $3C88, $3C89, $2C88, $2C89, $2488, $2489, $2888, $2889,$2888, $2889
DrawBombOnHud:
@@ -294,6 +319,17 @@ DrawBombOnHud:
.regularBombs
RTL
;--------------------------------------------------------------------------------
BombSpriteColor:
db $04, $08, $04, $02, $0A, $0A
SetBombSpriteColor:
PHX
LDA.l !BOMB_LEVEL
TAX
LDA.l BombSpriteColor, X
STA $0B
PLX
RTL
;--------------------------------------------------------------------------------
StoreSwordDamage:
LDA.l SpecialWeapons : CMP #$02 : BEQ +
LDA.l $06ED39, X : RTL