diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-09-10 11:19:43 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-09-10 11:19:43 -0700 |
| commit | 5c228e8cb1a2df95d019b049bd2b3e3633bc4161 (patch) | |
| tree | bb4bb0fa662438b44b22abbdcd7e9e61c6ce6bd5 /engine/pinball_game/object_collision | |
| parent | 2122a2925f422ea2c59c54d4021c0001f928ec52 (diff) | |
Label more load_stage_data routines
Diffstat (limited to 'engine/pinball_game/object_collision')
| -rw-r--r-- | engine/pinball_game/object_collision/blue_stage_resolve_collision.asm | 48 | ||||
| -rw-r--r-- | engine/pinball_game/object_collision/red_stage_resolve_collision.asm | 26 |
2 files changed, 37 insertions, 37 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 d03ebd9..6b07d73 100644 --- a/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm +++ b/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm @@ -1172,7 +1172,7 @@ ResolveBonusMultiplierCollision_BlueField: ; 0x1d438 .asm_1d45c
ld a, $29
.asm_1d45e
- call LoadBonusMultiplierRailingGraphics_BlueField
+ call _LoadBonusMultiplierRailingGraphics_BlueField
ld a, $3c
ld [wBonusMultiplierRailingEndLightDuration], a
ld a, $9
@@ -1199,7 +1199,7 @@ ResolveBonusMultiplierCollision_BlueField: ; 0x1d438 .asm_1d497
ld a, $2b
.asm_1d499
- call LoadBonusMultiplierRailingGraphics_BlueField
+ call _LoadBonusMultiplierRailingGraphics_BlueField
ld a, $1e
ld [wBonusMultiplierRailingEndLightDuration], a
ld a, $a
@@ -1238,10 +1238,10 @@ asm_1d4fa: ; 0x1d4fa ld bc, TenPoints
callba AddBigBCD6FromQueueWithBallMultiplier
ld a, [wBonusMultiplierTensDigit]
- call LoadBonusMultiplierRailingGraphics_BlueField
+ call _LoadBonusMultiplierRailingGraphics_BlueField
ld a, [wBonusMultiplierOnesDigit]
add $14
- call LoadBonusMultiplierRailingGraphics_BlueField
+ call _LoadBonusMultiplierRailingGraphics_BlueField
ld a, 60
ld [wBonusMultiplierRailingEndLightDuration], a
ret
@@ -1271,10 +1271,10 @@ UpdateBonusMultiplierRailing_BlueField: ; 0x1d51b ld a, [wCurBonusMultiplier]
call GetBCDForNextBonusMultiplier_BlueField
ld a, [wBonusMultiplierTensDigit]
- call LoadBonusMultiplierRailingGraphics_BlueField
+ call _LoadBonusMultiplierRailingGraphics_BlueField
ld a, [wBonusMultiplierOnesDigit]
add $14
- call LoadBonusMultiplierRailingGraphics_BlueField
+ call _LoadBonusMultiplierRailingGraphics_BlueField
ret
.asm_1d559
@@ -1295,14 +1295,14 @@ UpdateBonusMultiplierRailing_BlueField: ; 0x1d51b ld a, [wBonusMultiplierTensDigit]
res 7, a
ld [wBonusMultiplierTensDigit], a
- call LoadBonusMultiplierRailingGraphics_BlueField
+ call _LoadBonusMultiplierRailingGraphics_BlueField
jr .asm_1d58b
.asm_1d580
ld a, [wBonusMultiplierTensDigit]
set 7, a
ld [wBonusMultiplierTensDigit], a
- call LoadBonusMultiplierRailingGraphics_BlueField
+ call _LoadBonusMultiplierRailingGraphics_BlueField
.asm_1d58b
ld a, [wd611]
cp $2
@@ -1322,7 +1322,7 @@ UpdateBonusMultiplierRailing_BlueField: ; 0x1d51b res 7, a
ld [wBonusMultiplierOnesDigit], a
add $14
- call LoadBonusMultiplierRailingGraphics_BlueField
+ call _LoadBonusMultiplierRailingGraphics_BlueField
ret
.asm_1d5b1
@@ -1330,7 +1330,7 @@ UpdateBonusMultiplierRailing_BlueField: ; 0x1d51b set 7, a
ld [wBonusMultiplierOnesDigit], a
add $14
- call LoadBonusMultiplierRailingGraphics_BlueField
+ call _LoadBonusMultiplierRailingGraphics_BlueField
ret
ShowBonusMultiplierMessage_BlueField: ; 0x1d5bf
@@ -1360,7 +1360,7 @@ ShowBonusMultiplierMessage_BlueField: ; 0x1d5bf ld [hl], a
ret
-LoadBonusMultiplierRailingGraphics_BlueField: ; 0x1d5f2
+_LoadBonusMultiplierRailingGraphics_BlueField: ; 0x1d5f2
push af
ld a, [hGameBoyColorFlag]
and a
@@ -1489,16 +1489,16 @@ UpdateBonusMultiplierRailingLight: ; 0x1d692 and a
jr nz, .gameboy
ld a, $1e
- call LoadBonusMultiplierRailingGraphics_BlueField
+ call _LoadBonusMultiplierRailingGraphics_BlueField
ld a, $20
- call LoadBonusMultiplierRailingGraphics_BlueField
+ call _LoadBonusMultiplierRailingGraphics_BlueField
ret
.gameboy
ld a, $2a
- call LoadBonusMultiplierRailingGraphics_BlueField
+ call _LoadBonusMultiplierRailingGraphics_BlueField
ld a, $28
- call LoadBonusMultiplierRailingGraphics_BlueField
+ call _LoadBonusMultiplierRailingGraphics_BlueField
ret
INCLUDE "data/queued_tiledata/blue_field/bonus_multiplier_railings.asm"
@@ -1533,7 +1533,7 @@ ResolvePsyduckPoliwagCollision: ; 0x1dbd2 ld [wStageCollisionMap + $103], a
.skipCollisionMapChange
ld a, $1
- call LoadPsyduckOrPoliwagGraphics
+ call _LoadPsyduckOrPoliwagGraphics
ld a, [wLeftMapMoveCounter]
call LoadPsyduckOrPoliwagNumberGraphics
ld a, [wLeftMapMoveCounter]
@@ -1572,7 +1572,7 @@ ResolvePsyduckPoliwagCollision: ; 0x1dbd2 ld [wStageCollisionMap + $110], a
.asm_1dc5c
ld a, $3
- call LoadPsyduckOrPoliwagGraphics
+ call _LoadPsyduckOrPoliwagGraphics
ld a, [wRightMapMoveCounter]
cp $3
ld a, $8
@@ -1657,7 +1657,7 @@ UpdatePoliwag: ; 0x1dc95 and a
ret nz
ld a, $0
- call LoadPsyduckOrPoliwagGraphics
+ call _LoadPsyduckOrPoliwagGraphics
ld a, [wCurrentStage]
bit 0, a
jr z, .asm_1dd0c
@@ -1676,7 +1676,7 @@ UpdatePoliwag: ; 0x1dc95 ld [wLeftMapMoveCounter], a
call LoadPsyduckOrPoliwagNumberGraphics
ld a, $0
- call LoadPsyduckOrPoliwagGraphics
+ call _LoadPsyduckOrPoliwagGraphics
ld a, $0
ld [wPoliwagState], a
ret
@@ -1701,7 +1701,7 @@ UpdatePsyduck: ; 0x1dd2e .asm_1dd48
ld a, $2
- call LoadPsyduckOrPoliwagGraphics
+ call _LoadPsyduckOrPoliwagGraphics
ld a, $1
ld [wPsyduckState], a
ret
@@ -1712,7 +1712,7 @@ UpdatePsyduck: ; 0x1dd2e call LoadPsyduckOrPoliwagNumberGraphics
ld a, [wRightMapMoveCounter]
add $3
- call LoadPsyduckOrPoliwagGraphics
+ call _LoadPsyduckOrPoliwagGraphics
ld a, $3
ld [wPsyduckState], a
ret
@@ -1745,7 +1745,7 @@ UpdatePsyduck: ; 0x1dd2e .asm_1dd8b
call LoadPsyduckOrPoliwagNumberGraphics
ld a, $2
- call LoadPsyduckOrPoliwagGraphics
+ call _LoadPsyduckOrPoliwagGraphics
ld a, [wCurrentStage]
bit 0, a
jr z, .asm_1dda9
@@ -1765,7 +1765,7 @@ UpdatePsyduck: ; 0x1dd2e ld a, $4
call LoadPsyduckOrPoliwagNumberGraphics
ld a, $2
- call LoadPsyduckOrPoliwagGraphics
+ call _LoadPsyduckOrPoliwagGraphics
ld a, $0
ld [wPsyduckState], a
ret
@@ -1818,7 +1818,7 @@ AddScorePsyduckOrPoliwag: ; 0x1de22 call PlaySoundEffect
ret
-LoadPsyduckOrPoliwagGraphics: ; 0x1de4b
+_LoadPsyduckOrPoliwagGraphics: ; 0x1de4b
ld b, a
ld a, [wCurrentStage]
bit 0, 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 a1a776d..397be8c 100644 --- a/engine/pinball_game/object_collision/red_stage_resolve_collision.asm +++ b/engine/pinball_game/object_collision/red_stage_resolve_collision.asm @@ -254,7 +254,7 @@ ResolveDiglettCollision: ; 0x147aa ld a, $6b
ld [wStageCollisionMap + $110], a
ld a, $5
- call LoadDiglettGraphics
+ call _LoadDiglettGraphics
ld a, [wRightMapMoveCounter]
add $4
call LoadDiglettNumberGraphics
@@ -271,7 +271,7 @@ ResolveDiglettCollision: ; 0x147aa ld a, $67
ld [wStageCollisionMap + $103], a
ld a, $2
- call LoadDiglettGraphics
+ call _LoadDiglettGraphics
ld a, [wLeftMapMoveCounter]
call LoadDiglettNumberGraphics
ld a, $7
@@ -489,7 +489,7 @@ UpdateDiglettAnimations: ; 0x14990 ld a, [wLeftMapMoveDiglettFrame]
xor $1
ld [wLeftMapMoveDiglettFrame], a
- call LoadDiglettGraphics
+ call _LoadDiglettGraphics
.asm_149b6
ld a, [wRightDiglettAnimationController]
and a
@@ -511,7 +511,7 @@ UpdateDiglettAnimations: ; 0x14990 ld [wRightMapMoveDiglettFrame], a
add $3
; fall through
-LoadDiglettGraphics: ; 0x149d9
+_LoadDiglettGraphics: ; 0x149d9
sla a
ld c, a
ld b, $0
@@ -2745,10 +2745,10 @@ ResolveRedStageBonusMultiplierCollision: ; 016d9d ld bc, TenPoints
callba AddBigBCD6FromQueueWithBallMultiplier
ld a, [wBonusMultiplierTensDigit]
- call LoadBonusMultiplierRailingGraphics_RedField
+ call _LoadBonusMultiplierRailingGraphics_RedField
ld a, [wBonusMultiplierOnesDigit]
add $14
- call LoadBonusMultiplierRailingGraphics_RedField
+ call _LoadBonusMultiplierRailingGraphics_RedField
ret
UpdateBonusMultiplierRailing_RedField: ; 0x16e51
@@ -2776,10 +2776,10 @@ UpdateBonusMultiplierRailing_RedField: ; 0x16e51 ld a, [wCurBonusMultiplier]
call GetBCDForNextBonusMultiplier_RedField
ld a, [wBonusMultiplierTensDigit]
- call LoadBonusMultiplierRailingGraphics_RedField
+ call _LoadBonusMultiplierRailingGraphics_RedField
ld a, [wBonusMultiplierOnesDigit]
add $14
- call LoadBonusMultiplierRailingGraphics_RedField
+ call _LoadBonusMultiplierRailingGraphics_RedField
ret
.asm_16e8f
@@ -2800,14 +2800,14 @@ UpdateBonusMultiplierRailing_RedField: ; 0x16e51 ld a, [wBonusMultiplierTensDigit]
res 7, a
ld [wBonusMultiplierTensDigit], a
- call LoadBonusMultiplierRailingGraphics_RedField
+ call _LoadBonusMultiplierRailingGraphics_RedField
jr .asm_16ec1
.asm_16eb6
ld a, [wBonusMultiplierTensDigit]
set 7, a
ld [wBonusMultiplierTensDigit], a
- call LoadBonusMultiplierRailingGraphics_RedField
+ call _LoadBonusMultiplierRailingGraphics_RedField
.asm_16ec1
ld a, [wd611]
cp $2
@@ -2827,7 +2827,7 @@ UpdateBonusMultiplierRailing_RedField: ; 0x16e51 res 7, a
ld [wBonusMultiplierOnesDigit], a
add $14
- call LoadBonusMultiplierRailingGraphics_RedField
+ call _LoadBonusMultiplierRailingGraphics_RedField
ret
.asm_16ee7
@@ -2835,7 +2835,7 @@ UpdateBonusMultiplierRailing_RedField: ; 0x16e51 set 7, a
ld [wBonusMultiplierOnesDigit], a
add $14
- call LoadBonusMultiplierRailingGraphics_RedField
+ call _LoadBonusMultiplierRailingGraphics_RedField
ret
ShowBonusMultiplierMessage_RedField: ; 0x16ef5
@@ -2865,7 +2865,7 @@ ShowBonusMultiplierMessage_RedField: ; 0x16ef5 ld [hl], a
ret
-LoadBonusMultiplierRailingGraphics_RedField: ; 0x16f28
+_LoadBonusMultiplierRailingGraphics_RedField: ; 0x16f28
push af
ld a, [hGameBoyColorFlag]
and a
|
