diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-07-02 14:07:59 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-07-02 14:16:38 -0500 |
| commit | 6f610f7b80ba0047ac1116cccaa1bda957aeb620 (patch) | |
| tree | e45a8e03a3d6a5556ce30e3e852dabd663cef60f /engine | |
| parent | 6f1c899fb4df1d87aa1af573776935422fad9449 (diff) | |
Add SPECIAL_MODE constants
Diffstat (limited to 'engine')
5 files changed, 11 insertions, 11 deletions
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 c9bdf10..074d2a5 100755 --- a/engine/pinball_game/ball_loss/ball_loss_blue_field.asm +++ b/engine/pinball_game/ball_loss/ball_loss_blue_field.asm @@ -75,7 +75,7 @@ Func_ded6: ; 0xded6 ret
.asm_deec
- cp $1
+ cp SPECIAL_MODE_CATCHEM
jr nz, .asm_df05
ld a, $0
ld [wd604], a
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 6889022..27906b5 100755 --- a/engine/pinball_game/ball_loss/ball_loss_red_field.asm +++ b/engine/pinball_game/ball_loss/ball_loss_red_field.asm @@ -75,7 +75,7 @@ Func_ddfd: ; 0xddfd jr .asm_de40
.asm_de14
- cp $1
+ cp SPECIAL_MODE_CATCHEM
jr nz, .asm_de2d
xor a
ld [wd604], 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 558a71c..34bc6e8 100755 --- a/engine/pinball_game/draw_sprites/draw_red_field_sprites.asm +++ b/engine/pinball_game/draw_sprites/draw_red_field_sprites.asm @@ -102,7 +102,7 @@ DrawTimerDigit: ; 0x17627 Func_1762f: ; 0x1762f
lb de, $60, $0c
ld a, [wCurrentStage]
- cp $6
+ cp STAGE_BLUE_FIELD_BOTTOM + 1
ret nc
lb de, $00, $00
bit 0, a
diff --git a/engine/pinball_game/load_stage_data/load_blue_field.asm b/engine/pinball_game/load_stage_data/load_blue_field.asm index f6e2f2f..1fc97b0 100755 --- a/engine/pinball_game/load_stage_data/load_blue_field.asm +++ b/engine/pinball_game/load_stage_data/load_blue_field.asm @@ -211,7 +211,7 @@ Func_1c305: ; 0x1c305 and a
ret z
ld a, [wSpecialMode]
- cp $2
+ cp SPECIAL_MODE_EVOLUTION
ret z
ld a, [wd5c6]
and a
@@ -318,7 +318,7 @@ Func_1c3ee: ; 0x1c3ee and a
ret z
ld a, [wSpecialMode]
- cp $1
+ cp SPECIAL_MODE_CATCHEM
ret nz
ld a, [wd554]
cp $3
@@ -366,7 +366,7 @@ Func_1c43c: ; 0x1c43c ret
.asm_1c450
- cp $1
+ cp SPECIAL_MODE_CATCHEM
jr nz, .asm_1c458
call Func_1c47d
ret
@@ -454,7 +454,7 @@ Func_1c4b6: ; 0x1c4b6 .asm_1c4f0
ld a, [wSpecialMode]
- cp $2
+ cp SPECIAL_MODE_EVOLUTION
ret nz
ld a, [wd54d]
cp $3
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 5a58a75..f663109 100755 --- a/engine/pinball_game/load_stage_data/load_red_field.asm +++ b/engine/pinball_game/load_stage_data/load_red_field.asm @@ -160,7 +160,7 @@ Func_1414b: ; 0x1414b and a
ret z
ld a, [wSpecialMode]
- cp $2
+ cp SPECIAL_MODE_EVOLUTION
ret z
ld a, [wd5c6]
and a
@@ -267,7 +267,7 @@ Func_14234: ; 0x14234 and a
ret z
ld a, [wSpecialMode]
- cp $1
+ cp SPECIAL_MODE_CATCHEM
ret nz
ld a, [wd554]
cp $3
@@ -315,7 +315,7 @@ Func_14282: ; 0x14282 ret
.asm_14296
- cp $1
+ cp SPECIAL_MODE_CATCHEM
jr nz, .asm_1429e
call Func_142c3
ret
@@ -460,7 +460,7 @@ Func_14377: ; 0x14377 .asm_143b1
ld a, [wSpecialMode]
- cp $2
+ cp SPECIAL_MODE_EVOLUTION
ret nz
ld a, [wd54d]
cp $3
|