diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-07-10 19:04:07 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-07-10 19:04:07 -0700 |
| commit | b458d6eb81002def4f8f4aeb3d3cc9c8300b4489 (patch) | |
| tree | 5fdc9ed96700ba61d9b069688940588bc9821466 /engine/pinball_game/object_collision | |
| parent | f78e1e05dbd00a23da8bb97683fc686eb28a83b9 (diff) | |
Finish labeling vertical_screen_transition.asm and related
Diffstat (limited to 'engine/pinball_game/object_collision')
3 files changed, 8 insertions, 8 deletions
diff --git a/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm b/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm index c9ac09d..835cf57 100644 --- a/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm +++ b/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm @@ -1334,7 +1334,7 @@ UpdateBonusMultiplierRailing_BlueField: ; 0x1d51b ret
ShowBonusMultiplierMessage_BlueField: ; 0x1d5bf
- ld a, [wd5ca]
+ ld a, [wBottomTextEnabled]
and a
ret nz
ld a, [wd613]
@@ -2621,7 +2621,7 @@ DoSlotLogic_BlueField: ; 0x1e830 ld [wBonusStageSlotRewardActive], a
ld a, $1
ld [wd495], a
- ld [wd4ae], a
+ ld [wMoveToNextScreenState], a
ld a, [wd498]
ld c, a
ld b, $0
diff --git a/engine/pinball_game/object_collision/gengar_bonus_resolve_collision.asm b/engine/pinball_game/object_collision/gengar_bonus_resolve_collision.asm index c1c9f78..b89c105 100644 --- a/engine/pinball_game/object_collision/gengar_bonus_resolve_collision.asm +++ b/engine/pinball_game/object_collision/gengar_bonus_resolve_collision.asm @@ -885,9 +885,9 @@ Func_1894c: ; 0x1894c inc a
ld [wBallYPos + 1], a
.asm_18973
- ld a, [wd7a0]
+ ld a, [wUpperTiltPixelsOffset]
dec a
- ld [wd7a0], a
+ ld [wUpperTiltPixelsOffset], a
ld a, $1
ld [wUpperTiltPushing], a
ret
@@ -907,9 +907,9 @@ Func_1894c: ; 0x1894c jr z, .asm_189a5
dec a
ld [wd6a5], a
- ld a, [wd7a0]
+ ld a, [wUpperTiltPixelsOffset]
inc a
- ld [wd7a0], a
+ ld [wUpperTiltPixelsOffset], a
ret
.asm_189a5
diff --git a/engine/pinball_game/object_collision/red_stage_resolve_collision.asm b/engine/pinball_game/object_collision/red_stage_resolve_collision.asm index dcd080b..3f9a248 100644 --- a/engine/pinball_game/object_collision/red_stage_resolve_collision.asm +++ b/engine/pinball_game/object_collision/red_stage_resolve_collision.asm @@ -2067,7 +2067,7 @@ DoSlotLogic_RedField: ; 0x16352 ld [wBonusStageSlotRewardActive], a
ld a, $1
ld [wd495], a
- ld [wd4ae], a
+ ld [wMoveToNextScreenState], a
ld a, [wd498]
ld c, a
ld b, $0
@@ -2839,7 +2839,7 @@ UpdateBonusMultiplierRailing_RedField: ; 0x16e51 ret
ShowBonusMultiplierMessage_RedField: ; 0x16ef5
- ld a, [wd5ca]
+ ld a, [wBottomTextEnabled]
and a
ret nz
ld a, [wd613]
|