Label wPikachuSaverSlotRewardActive

6 files changed, 11 insertions, 10 deletions

diff --git a/engine/pinball_game/ball_init/ball_init_blue_field.asm b/engine/pinball_game/ball_init/ball_init_blue_field.asm
index 05a6019..e051c5b 100755
--- a/engine/pinball_game/ball_init/ball_init_blue_field.asm
+++ b/engine/pinball_game/ball_init/ball_init_blue_field.asm
@@ -22,7 +22,7 @@ InitBallBlueField: ; 0x1c08d
 	xor a

 	ld [wd50b], a

 	ld [wd50c], a

-	ld [wd51d], a

+	ld [wPikachuSaverSlotRewardActive], a

 	ld [wd51e], a

 	ld [wPikachuSaverCharge], a

 	ld hl, wd50f

diff --git a/engine/pinball_game/ball_init/ball_init_red_field.asm b/engine/pinball_game/ball_init/ball_init_red_field.asm
index 5837669..8c91b6a 100755
--- a/engine/pinball_game/ball_init/ball_init_red_field.asm
+++ b/engine/pinball_game/ball_init/ball_init_red_field.asm
@@ -31,7 +31,7 @@ InitBallRedField: ; 0x3007d
 	xor a

 	ld [wd50b], a

 	ld [wd50c], a

-	ld [wd51d], a

+	ld [wPikachuSaverSlotRewardActive], a

 	ld [wPikachuSaverCharge], a

 	ld [wd51e], a

 	ld hl, wd50f

diff --git a/engine/pinball_game/draw_sprites/draw_blue_field_sprites.asm b/engine/pinball_game/draw_sprites/draw_blue_field_sprites.asm
index 756971a..78f69af 100755
--- a/engine/pinball_game/draw_sprites/draw_blue_field_sprites.asm
+++ b/engine/pinball_game/draw_sprites/draw_blue_field_sprites.asm
@@ -147,7 +147,7 @@ DrawPikachuSavers_BlueStage: ; 0x1f448
 	ld d, a

 	ld a, [hSCY]

 	ld e, a

-	ld a, [wd51d]

+	ld a, [wPikachuSaverSlotRewardActive]

 	and a

 	ld a, [wd518]

 	jr z, .asm_1f473

diff --git a/engine/pinball_game/draw_sprites/draw_red_field_sprites.asm b/engine/pinball_game/draw_sprites/draw_red_field_sprites.asm
index d56e840..558a71c 100755
--- a/engine/pinball_game/draw_sprites/draw_red_field_sprites.asm
+++ b/engine/pinball_game/draw_sprites/draw_red_field_sprites.asm
@@ -431,7 +431,7 @@ DrawPikachuSavers_RedStage: ; 0x17e08
 	ld d, a

 	ld a, [hSCY]

 	ld e, a

-	ld a, [wd51d]

+	ld a, [wPikachuSaverSlotRewardActive]

 	and a

 	ld a, [wd518]

 	jr z, .asm_17e33

diff --git a/main.asm b/main.asm
index c48b0d8..2b0889c 100755
--- a/main.asm
+++ b/main.asm
@@ -431,7 +431,7 @@ INCLUDE "engine/pinball_game/ball_saver/ball_saver_90.asm"
 
 SlotRewardPikachuSaver: ; 0xef83
 	ld a, $1
-	ld [wd51d], a
+	ld [wPikachuSaverSlotRewardActive], a
 	ld a, MAX_PIKACHU_SAVER_CHARGE
 	ld [wPikachuSaverCharge], a
 	xor a
@@ -9876,7 +9876,7 @@ ResolveRedStagePikachuCollision: ; 0x1660c
 	ld a, [wd51c]
 	and a
 	jr nz, .asm_1667b
-	ld a, [wd51d]
+	ld a, [wPikachuSaverSlotRewardActive]
 	and a
 	jr nz, .asm_16634
 	ld a, [wWhichPikachuId]
@@ -9891,7 +9891,7 @@ ResolveRedStagePikachuCollision: ; 0x1660c
 	ld hl, PikachuSaverAnimationDataBlueStage
 	ld de, wPikachuSaverAnimationFrameCounter
 	call CopyHLToDE
-	ld a, [wd51d]
+	ld a, [wPikachuSaverSlotRewardActive]
 	and a
 	jr nz, .asm_16647
 	xor a
@@ -18648,7 +18648,7 @@ ResolveBlueStagePikachuCollision: ; 0x1d0a1
 	ld a, [wd51c]
 	and a
 	jr nz, .asm_1d110
-	ld a, [wd51d]
+	ld a, [wPikachuSaverSlotRewardActive]
 	and a
 	jr nz, .asm_1d0c9
 	ld a, [wWhichPikachuId]
@@ -18663,7 +18663,7 @@ ResolveBlueStagePikachuCollision: ; 0x1d0a1
 	ld hl, PikachuSaverAnimationDataRedStage
 	ld de, wPikachuSaverAnimationFrameCounter
 	call CopyHLToDE
-	ld a, [wd51d]
+	ld a, [wPikachuSaverSlotRewardActive]
 	and a
 	jr nz, .asm_1d0dc
 	xor a
diff --git a/wram.asm b/wram.asm
index e674948..ec8e644 100755
--- a/wram.asm
+++ b/wram.asm
@@ -632,7 +632,8 @@ wPikachuSaverAnimationFrameIndex:: ; 0xd51b
 wd51c:: ; 0xd51c
 	ds $1
 
-wd51d:: ; 0xd51d
+wPikachuSaverSlotRewardActive:: ; 0xd51d
+; Set to 1 if the Pikachu Saver slot reward is active. 0 otherwise.
 	ds $1
 
 wd51e:: ; 0xd51e