diff options
| -rw-r--r-- | constants/pinball_game_constants.asm | 2 | ||||
| -rw-r--r-- | engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm | 4 | ||||
| -rw-r--r-- | engine/pinball_game/evolution_mode/evolution_mode_red_field.asm | 8 |
3 files changed, 8 insertions, 6 deletions
diff --git a/constants/pinball_game_constants.asm b/constants/pinball_game_constants.asm index 477ed82..76570c8 100644 --- a/constants/pinball_game_constants.asm +++ b/constants/pinball_game_constants.asm @@ -28,6 +28,8 @@ SPECIAL_COLLISION_LEFT_DIGLETT EQU 7 SPECIAL_COLLISION_POLIWAG EQU 7
SPECIAL_COLLISION_RIGHT_DIGLETT EQU 8
SPECIAL_COLLISION_PSYDUCK EQU 8
+SPECIAL_COLLISION_LEFT_BONUS_MULTIPLIER EQU 9
+SPECIAL_COLLISION_RIGHT_BONUS_MULTIPLIER EQU 10
SPECIAL_COLLISION_BALL_UPGRADE EQU 11
SPECIAL_COLLISION_SPINNER EQU 12
SPECIAL_COLLISION_SLOT_HOLE EQU 13
diff --git a/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm b/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm index 0e4ba19..3370e79 100644 --- a/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm +++ b/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm @@ -12,9 +12,9 @@ HandleBlueEvoModeCollision: ; 0x20bae jp z, Func_20ea6
cp SPECIAL_COLLISION_PSYDUCK
jp z, Func_20ec7
- cp $9
+ cp SPECIAL_COLLISION_LEFT_BONUS_MULTIPLIER
jp z, Func_20ee8
- cp $a
+ cp SPECIAL_COLLISION_RIGHT_BONUS_MULTIPLIER
jp z, Func_20f09
cp SPECIAL_COLLISION_BALL_UPGRADE
jp z, Func_20f2a
diff --git a/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm b/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm index 08278dc..219cb38 100644 --- a/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm +++ b/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm @@ -12,9 +12,9 @@ HandleRedEvoModeCollision: ; 0x20581 jp z, Func_208a8 ;diglett
cp SPECIAL_COLLISION_RIGHT_DIGLETT
jp z, Func_208c9 ;diglett
- cp $9
+ cp SPECIAL_COLLISION_LEFT_BONUS_MULTIPLIER
jp z, Func_208ea ;right rail?
- cp $a
+ cp SPECIAL_COLLISION_RIGHT_BONUS_MULTIPLIER
jp z, Func_2090b ;right rail?
cp SPECIAL_COLLISION_BALL_UPGRADE
jp z, Func_2092c
@@ -269,10 +269,10 @@ Func_2080f: ; 0x2080f ld bc, $0001
ld de, $5000
call AddBCDEToJackpot
- ld a, [wd551]
+ ld a, [wd551] ;if ??? is not zero, ret c
and a
jr nz, .asm_20837
- ld a, [wIndicatorStates + 9]
+ ld a, [wIndicatorStates + 9] ;if indicator is z, ret
and a
jr z, .asm_20837
xor a
|