From 99e03500f7ca7df7fed0d8e296cf576958c349d9 Mon Sep 17 00:00:00 2001 From: chaos-lord Date: Fri, 21 Jul 2017 22:02:06 +0100 Subject: Added the last 2 special mode collision consts --- engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm | 4 ++-- engine/pinball_game/evolution_mode/evolution_mode_red_field.asm | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'engine') 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 -- cgit v1.2.3