diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-07-02 14:29:50 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-07-02 14:29:50 -0500 |
| commit | d96ff8f4adfb760db788deffa75a335ad1873ba3 (patch) | |
| tree | 473392860dc6b0604f4cfec24f7c22dcd00a41d0 /engine | |
| parent | 6f610f7b80ba0047ac1116cccaa1bda957aeb620 (diff) | |
Label some more catch em mode and timer stuff
Diffstat (limited to 'engine')
8 files changed, 11 insertions, 11 deletions
diff --git a/engine/pinball_game.asm b/engine/pinball_game.asm index 9dc8901..08e821c 100755 --- a/engine/pinball_game.asm +++ b/engine/pinball_game.asm @@ -156,7 +156,7 @@ GameScreenFunction_HandleBallPhysics: ; 0xd909 call Func_dc7c
call Func_dcb4
.asm_d9e9
- ld a, [wd57d]
+ ld a, [wTimerActive]
and a
callba nz, Func_86a4
ld a, [wd4ae]
diff --git a/engine/pinball_game/ball_loss/ball_loss_blue_field.asm b/engine/pinball_game/ball_loss/ball_loss_blue_field.asm index 074d2a5..6d84ff9 100755 --- a/engine/pinball_game/ball_loss/ball_loss_blue_field.asm +++ b/engine/pinball_game/ball_loss/ball_loss_blue_field.asm @@ -71,7 +71,7 @@ Func_ded6: ; 0xded6 ld a, [wSpecialMode]
and a
jr nz, .asm_deec
- callba Func_10157
+ callba ConcludeCatchEmMode
ret
.asm_deec
diff --git a/engine/pinball_game/ball_loss/ball_loss_meowth_bonus.asm b/engine/pinball_game/ball_loss/ball_loss_meowth_bonus.asm index c5366c8..601bfe2 100755 --- a/engine/pinball_game/ball_loss/ball_loss_meowth_bonus.asm +++ b/engine/pinball_game/ball_loss/ball_loss_meowth_bonus.asm @@ -36,7 +36,7 @@ HandleBallLossMeowthBonus: ; 0xdfe2 .asm_e025
xor a
ld [wd57e], a
- ld [wd57d], a
+ ld [wTimerActive], a
xor a
ld [wd495], a
ld a, $1
diff --git a/engine/pinball_game/ball_loss/ball_loss_red_field.asm b/engine/pinball_game/ball_loss/ball_loss_red_field.asm index 27906b5..4097151 100755 --- a/engine/pinball_game/ball_loss/ball_loss_red_field.asm +++ b/engine/pinball_game/ball_loss/ball_loss_red_field.asm @@ -71,7 +71,7 @@ Func_ddfd: ; 0xddfd ld a, [wSpecialMode]
and a
jr nz, .asm_de14
- callba Func_10157
+ callba ConcludeCatchEmMode
jr .asm_de40
.asm_de14
diff --git a/engine/pinball_game/ball_loss/ball_loss_seel_bonus.asm b/engine/pinball_game/ball_loss/ball_loss_seel_bonus.asm index 7db2efe..f1b22ae 100755 --- a/engine/pinball_game/ball_loss/ball_loss_seel_bonus.asm +++ b/engine/pinball_game/ball_loss/ball_loss_seel_bonus.asm @@ -35,8 +35,8 @@ HandleBallLossSeelBonus: ; 0xe08b lb de, $00, $02
call PlaySoundEffect
xor a
- ld [wd57d], a
- ld [wd57d], a
+ ld [wTimerActive], a
+ ld [wTimerActive], a ; duplicate instruction
ld [wd495], a
ld a, $1
ld [wd496], a
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 34bc6e8..6d983bd 100755 --- a/engine/pinball_game/draw_sprites/draw_red_field_sprites.asm +++ b/engine/pinball_game/draw_sprites/draw_red_field_sprites.asm @@ -26,7 +26,7 @@ DrawSpritesRedFieldBottom: ; 0x1757e ret
DrawTimer: ; 0x175a4
- ld a, [wd57d]
+ ld a, [wTimerActive]
and a
ret z
ld a, [hGameBoyColorFlag]
diff --git a/engine/pinball_game/load_stage_data/load_red_field.asm b/engine/pinball_game/load_stage_data/load_red_field.asm index f663109..3e2c1aa 100755 --- a/engine/pinball_game/load_stage_data/load_red_field.asm +++ b/engine/pinball_game/load_stage_data/load_red_field.asm @@ -29,7 +29,7 @@ _LoadStageDataRedFieldBottom: ; 0x1401c ret
Func_1404a: ; 0x1404a
- ld a, [wd57d]
+ ld a, [wTimerActive]
and a
ret z
ld a, [hGameBoyColorFlag]
diff --git a/engine/pinball_game/timer.asm b/engine/pinball_game/timer.asm index 1200877..49afcee 100755 --- a/engine/pinball_game/timer.asm +++ b/engine/pinball_game/timer.asm @@ -12,7 +12,7 @@ StartTimer: ; 0x867d ld [wd57e], a
ld [wd57f], a
ld a, $1
- ld [wd57d], a
+ ld [wTimerActive], a
ld a, $1
ld [wd580], a
callba Func_1404a
@@ -52,7 +52,7 @@ Func_86a4: ; 0x86a4 ld [hl], a
ret
-Func_86d2: ; 0x86d2
+StopTimer: ; 0x86d2
xor a
- ld [wd57d], a
+ ld [wTimerActive], a
ret
|