diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-07-02 17:45:36 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-07-02 17:45:36 -0500 |
| commit | 4bcfa81438e15c6c2fbec2ab9f5ea8943887b53d (patch) | |
| tree | 067997ea966918579164982ccd1da64fabff31fc /engine/pinball_game/object_collision | |
| parent | 88c6c4a96a46beea4087b0ab6f1e9cfafa1f2906 (diff) | |
Label wCurBonusMultiplier and move bonus multplier logic into separate file
Diffstat (limited to 'engine/pinball_game/object_collision')
| -rwxr-xr-x | engine/pinball_game/object_collision/blue_stage_resolve_collision.asm | 12 | ||||
| -rwxr-xr-x | engine/pinball_game/object_collision/red_stage_resolve_collision.asm | 14 |
2 files changed, 13 insertions, 13 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 056f0fe..3fa4406 100755 --- a/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm +++ b/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm @@ -1692,7 +1692,7 @@ Func_1d133: ; 0x1d133 jr nc, .asm_1d185
ld c, $a
call Func_e55
- callba z, Func_30164
+ callba z, IncrementBonusMultiplier
.asm_1d185
lb de, $16, $10
call PlaySoundEffect
@@ -1838,7 +1838,7 @@ ResolveSlowpokeCollision: ; 0x1d216 ret nc
ld c, $19
call Func_e55
- callba z, Func_30164
+ callba z, IncrementBonusMultiplier
ret
.asm_1d2b6
@@ -1960,7 +1960,7 @@ ResolveCloysterCollision: ; 0x1d32d ret nc
ld c, $19
call Func_e55
- callba z, Func_30164
+ callba z, IncrementBonusMultiplier
ret
.asm_1d3cb
@@ -2091,7 +2091,7 @@ ResolveBlueStageBonusMultiplierCollision: ; 0x1d438 jr nc, .asm_1d4e9
ld c, $19
call Func_e55
- callba z, Func_30164
+ callba z, IncrementBonusMultiplier
.asm_1d4e9
ld a, [wd60c]
ld [wd614], a
@@ -3903,7 +3903,7 @@ Func_1ddc7: ; 0x1ddc7 jr nc, .asm_1dde4
ld c, $a
call Func_e55
- callba z, Func_30164
+ callba z, IncrementBonusMultiplier
.asm_1dde4
xor a
ld [wd55a], a
@@ -3919,7 +3919,7 @@ Func_1ddf4: ; 0x1ddf4 jr nc, .asm_1de11
ld c, $a
call Func_e55
- callba z, Func_30164
+ callba z, IncrementBonusMultiplier
.asm_1de11
ld a, $1
ld [wd55a], a
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 94d195d..b4328c5 100755 --- a/engine/pinball_game/object_collision/red_stage_resolve_collision.asm +++ b/engine/pinball_game/object_collision/red_stage_resolve_collision.asm @@ -132,7 +132,7 @@ BgTileData_1472f: Func_14733: ; 0x14733
ld c, $0
- ld a, [wd49b]
+ ld a, [wCurBonusMultiplier]
and a
jr z, .asm_1473d
ld c, $1
@@ -146,7 +146,7 @@ Func_14733: ; 0x14733 Func_14746: ; 0x14746
ld c, $0
- ld a, [wd49b]
+ ld a, [wCurBonusMultiplier]
and a
jr z, .asm_14750
ld c, $2
@@ -426,7 +426,7 @@ Func_14920: ; 0x14920 jr nc, .asm_14937
ld c, $a
call Func_e55
- callba z, Func_30164
+ callba z, IncrementBonusMultiplier
.asm_14937
ld a, $1
ld [wd55a], a
@@ -439,7 +439,7 @@ Func_14947: ; 0x14947 jr nc, .asm_1495e
ld c, $a
call Func_e55
- callba z, Func_30164
+ callba z, IncrementBonusMultiplier
.asm_1495e
xor a
ld [wd55a], a
@@ -4505,7 +4505,7 @@ ResolveBellsproutCollision: ; 0x15e93 ret nc
ld c, $19
call Func_e55
- callba z, Func_30164
+ callba z, IncrementBonusMultiplier
ret
.asm_15f35
@@ -5674,7 +5674,7 @@ Func_1669e: ; 0x1669e jr nc, .asm_166f0
ld c, $a
call Func_e55
- callba z, Func_30164
+ callba z, IncrementBonusMultiplier
.asm_166f0
lb de, $16, $10
call PlaySoundEffect
@@ -7105,7 +7105,7 @@ ResolveRedStageBonusMultiplierCollision: ; 016d9d jr nc, .asm_16e24
ld c, $19
call Func_e55
- callba z, Func_30164
+ callba z, IncrementBonusMultiplier
.asm_16e24
ld a, [wd60c]
ld [wd614], a
|