let's dev 2/22/18

fixed problem with arrows sometimes not shooting
updates for infinite ammo switches
finished arrows
finished bombs
started magic
This commit is contained in:
Karkat
2018-02-22 00:12:45 -05:00
parent a39377b448
commit 84b8301fb4
6 changed files with 134 additions and 5 deletions

View File

@@ -241,8 +241,13 @@ RTL
;$388 = Turtle Rock
;$389 = Ganon's Tower
;--------------------------------------------------------------------------------
!INFINITE_ARROWS = "$7F50C8"
DrawArrowTens:
PHA : LDA.l ArrowMode : AND.w #$00FF : BNE +
LDA !INFINITE_ARROWS : AND.w #$00FF : BEQ .finite
.infinite
PLA : LDA.w #$2431 : STA $7EC760 : RTL
.finite
PLA : STA $7EC760 : RTL
+
PLA
@@ -250,11 +255,39 @@ RTL
;--------------------------------------------------------------------------------
DrawArrowOnes:
PHA : LDA.l ArrowMode : AND.w #$00FF : BNE +
LDA !INFINITE_ARROWS : AND.w #$00FF : BEQ .finite
.infinite
PLA : LDA.w #$2432 : STA $7EC762 : RTL
.finite
PLA : STA $7EC762 : RTL
+
PLA
RTL
;--------------------------------------------------------------------------------
;--------------------------------------------------------------------------------
!INFINITE_BOMBS = "$7F50C9"
DrawBombTens:
PHA ;;; LDA.l ArrowMode : AND.w #$00FF : BNE +
LDA !INFINITE_BOMBS : AND.w #$00FF : BEQ .finite
.infinite
PLA : LDA.w #$2431 : STA $7EC75A : RTL
.finite
PLA : STA $7EC75A : RTL
+
PLA
RTL
;--------------------------------------------------------------------------------
DrawBombOnes:
PHA ;;; LDA.l ArrowMode : AND.w #$00FF : BNE +
LDA !INFINITE_BOMBS : AND.w #$00FF : BEQ .finite
.infinite
PLA : LDA.w #$2432 : STA $7EC75C : RTL
.finite
PLA : STA $7EC75C : RTL
+
PLA
RTL
;--------------------------------------------------------------------------------
DrawBootsInMenuLocation:
LDA.l HUDDungeonItems : BNE +
LDA.w #$1608 : STA $00
@@ -263,6 +296,46 @@ DrawBootsInMenuLocation:
LDA.w #$1588 : STA $00
RTL
;--------------------------------------------------------------------------------
!INFINITE_MAGIC = "$7F50CA"
!DrawMagicMeter_mp_tilemap = "$0DFE0F"
DrawMagicMeter:
LDA !INFINITE_MAGIC : BNE + : BRL .green : +
LDX.w #$0080 ; load full magic meter graphics
LDA $1A : AND.w #$000C : LSR #2
BEQ .red
CMP.w #0001 : BEQ .yellow
CMP.w #0002 : BNE + : BRL .green : +
.blue
LDA !DrawMagicMeter_mp_tilemap+0, X : AND.w #$EFFF : STA $7EC746
LDA !DrawMagicMeter_mp_tilemap+2, X : AND.w #$EFFF : STA $7EC786
LDA !DrawMagicMeter_mp_tilemap+4, X : AND.w #$EFFF : STA $7EC7C6
LDA !DrawMagicMeter_mp_tilemap+6, X : AND.w #$EFFF : STA $7EC806
RTL
.red
LDA !DrawMagicMeter_mp_tilemap+0, X : AND.w #$E7FF : STA $7EC746
LDA !DrawMagicMeter_mp_tilemap+2, X : AND.w #$E7FF : STA $7EC786
LDA !DrawMagicMeter_mp_tilemap+4, X : AND.w #$E7FF : STA $7EC7C6
LDA !DrawMagicMeter_mp_tilemap+6, X : AND.w #$E7FF : STA $7EC806
RTL
.yellow
LDA !DrawMagicMeter_mp_tilemap+0, X : AND.w #$EBFF : STA $7EC746
LDA !DrawMagicMeter_mp_tilemap+2, X : AND.w #$EBFF : STA $7EC786
LDA !DrawMagicMeter_mp_tilemap+4, X : AND.w #$EBFF : STA $7EC7C6
LDA !DrawMagicMeter_mp_tilemap+6, X : AND.w #$EBFF : STA $7EC806
RTL
.orange
LDA !DrawMagicMeter_mp_tilemap+0, X : AND.w #$E3FF : STA $7EC746
LDA !DrawMagicMeter_mp_tilemap+2, X : AND.w #$E3FF : STA $7EC786
LDA !DrawMagicMeter_mp_tilemap+4, X : AND.w #$E3FF : STA $7EC7C6
LDA !DrawMagicMeter_mp_tilemap+6, X : AND.w #$E3FF : STA $7EC806
RTL
.green
LDA !DrawMagicMeter_mp_tilemap+0, X : STA $7EC746
LDA !DrawMagicMeter_mp_tilemap+2, X : STA $7EC786
LDA !DrawMagicMeter_mp_tilemap+4, X : STA $7EC7C6
LDA !DrawMagicMeter_mp_tilemap+6, X : STA $7EC806
RTL
;--------------------------------------------------------------------------------
DrawGlovesInMenuLocation:
LDA.l HUDDungeonItems : BNE +
LDA.w #$1610 : STA $00