Label more load_stage_data routines

11 files changed, 98 insertions, 98 deletions

diff --git a/engine/pinball_game/load_stage_data/load_blue_field.asm b/engine/pinball_game/load_stage_data/load_blue_field.asm
index 901cbaf..c7abaea 100644
--- a/engine/pinball_game/load_stage_data/load_blue_field.asm
+++ b/engine/pinball_game/load_stage_data/load_blue_field.asm
@@ -1,9 +1,9 @@
 _LoadStageDataBlueFieldTop: ; 0x1c165

 	call LoadPinballUpgradeTriggersGraphics_BlueField

 	call UpdateSpinnerChargeGraphics_BlueField

-	call Func_1c3ee

+	call LoadEvolutionTrinketGraphics_BlueField

 	call LoadSlotCaveCoverGraphics_BlueField

-	callba Func_142fc

+	callba LoadBallGraphics

 	ld a, $1

 	ld [wBlueStageForceFieldGfxNeedsLoading], a

 	call UpdateForceFieldGraphics

@@ -13,18 +13,18 @@ _LoadStageDataBlueFieldTop: ; 0x1c165
 

 _LoadStageDataBlueFieldBottom: ; 0x1c191

 	call Func_1c1db

-	call Func_1c4b6

+	call LoadBillboardGraphics_BlueField

 	call Func_1c2cb

 	call LoadCAVELightsGraphics_BlueField

-	call Func_1c43c

+	call LoadBillboardStatusBarGraphics_BlueField

 	call Func_1c305

-	call Func_1c3ee

+	call LoadEvolutionTrinketGraphics_BlueField

 	callba LoadAgainTextGraphics

 	callba DrawBallSaverIcon

-	call Func_1c235

-	call Func_1c21e

+	call LoadPsyduckOrPoliwagGraphics

+	call LoadBonusMultiplierRailingGraphics_BlueField

 	call LoadSlotCaveCoverGraphics_BlueField

-	callba Func_142fc

+	callba LoadBallGraphics

 	callba LoadTimerGraphics

 	call Func_1c203

 	ret

@@ -61,19 +61,19 @@ Func_1c203: ; 0x1c203
 	ld [wd4c7], a

 	ret

 

-Func_1c21e: ; 0x1c21e

+LoadBonusMultiplierRailingGraphics_BlueField: ; 0x1c21e

 	ld a, $ff

 	ld [wd60e], a

 	ld [wd60f], a

 	ld a, [wBonusMultiplierTensDigit]

-	call LoadBonusMultiplierRailingGraphics_BlueField

+	call _LoadBonusMultiplierRailingGraphics_BlueField

 	ld a, [wBonusMultiplierOnesDigit]

 	add $14

-	call LoadBonusMultiplierRailingGraphics_BlueField

+	call _LoadBonusMultiplierRailingGraphics_BlueField

 	ret

 

-Func_1c235: ; 0x1c235

-	ld a, [wLeftMapMoveDiglettAnimationCounter]

+LoadPsyduckOrPoliwagGraphics: ; 0x1c235

+	ld a, [wLeftMapMovePoliwagAnimationCounter]

 	and a

 	jr z, .asm_1c249

 	ld a, $54

@@ -86,7 +86,7 @@ Func_1c235: ; 0x1c235
 .asm_1c249

 	xor a

 .asm_1c24a

-	call LoadPsyduckOrPoliwagGraphics

+	call _LoadPsyduckOrPoliwagGraphics

 	ld a, [wLeftMapMoveCounter]

 	call LoadPsyduckOrPoliwagNumberGraphics

 	ld a, [hGameBoyColorFlag]

@@ -107,7 +107,7 @@ Func_1c235: ; 0x1c235
 	ld a, $8

 .asm_1c269

 	call LoadPsyduckOrPoliwagNumberGraphics

-	ld a, [wRightMapMoveDiglettFrame]

+	ld a, [wRightMapMovePsyduckFrame]

 	and a

 	jr z, .asm_1c295

 	ld a, $52

@@ -134,7 +134,7 @@ Func_1c235: ; 0x1c235
 .asm_1c295

 	ld a, $2

 .asm_1c297

-	call LoadPsyduckOrPoliwagGraphics

+	call _LoadPsyduckOrPoliwagGraphics

 	ld a, [wRightMapMoveCounter]

 	add $4

 	call LoadPsyduckOrPoliwagNumberGraphics

@@ -160,7 +160,7 @@ Func_1c235: ; 0x1c235
 

 .asm_1c2bd

 	ld a, $6

-	call LoadPsyduckOrPoliwagGraphics

+	call _LoadPsyduckOrPoliwagGraphics

 	ld a, [wRightMapMoveCounter]

 	add $4

 	call LoadPsyduckOrPoliwagNumberGraphics

@@ -313,7 +313,7 @@ Func_1c3ca: ; 0x1c3ca
 	callba nz, Func_102bc

 	ret

 

-Func_1c3ee: ; 0x1c3ee

+LoadEvolutionTrinketGraphics_BlueField: ; 0x1c3ee

 	ld a, [wInSpecialMode]

 	and a

 	ret z

@@ -353,7 +353,7 @@ Func_1c3ee: ; 0x1c3ee
 	call FarCopyCGBPals

 	ret

 

-Func_1c43c: ; 0x1c43c

+LoadBillboardStatusBarGraphics_BlueField: ; 0x1c43c

 	ld a, [wInSpecialMode]

 	and a

 	jr z, .asm_1c458

@@ -428,7 +428,7 @@ Func_1c491: ; 0x1c491
 	pop bc

 	ret

 

-Func_1c4b6: ; 0x1c4b6

+LoadBillboardGraphics_BlueField: ; 0x1c4b6

 	ld a, [wInSpecialMode]

 	and a

 	jr nz, .asm_1c4f0

diff --git a/engine/pinball_game/load_stage_data/load_diglett_bonus.asm b/engine/pinball_game/load_stage_data/load_diglett_bonus.asm
index 712f2f6..c910eda 100644
--- a/engine/pinball_game/load_stage_data/load_diglett_bonus.asm
+++ b/engine/pinball_game/load_stage_data/load_diglett_bonus.asm
@@ -1,5 +1,5 @@
 _LoadStageDataDiglettBonus: ; 0x19a76

-	callba Func_142fc

+	callba LoadBallGraphics

 	call LoadFlippersPalette

 	ld a, [wLoadingSavedGame]

 	and a

diff --git a/engine/pinball_game/load_stage_data/load_gengar_bonus.asm b/engine/pinball_game/load_stage_data/load_gengar_bonus.asm
index 1582db3..334110e 100644
--- a/engine/pinball_game/load_stage_data/load_gengar_bonus.asm
+++ b/engine/pinball_game/load_stage_data/load_gengar_bonus.asm
@@ -1,5 +1,5 @@
 _LoadStageDataGengarBonus: ; 0x1818b

-	callba Func_142fc

+	callba LoadBallGraphics

 	call LoadFlippersPalette

 	call Func_18d72

 	ld a, [wLoadingSavedGame]

diff --git a/engine/pinball_game/load_stage_data/load_meowth_bonus.asm b/engine/pinball_game/load_stage_data/load_meowth_bonus.asm
index fd53f2a..1f0aa9c 100644
--- a/engine/pinball_game/load_stage_data/load_meowth_bonus.asm
+++ b/engine/pinball_game/load_stage_data/load_meowth_bonus.asm
@@ -1,5 +1,5 @@
 _LoadStageDataMeowthBonus: ; 0x24128

-	callba Func_142fc

+	callba LoadBallGraphics

 	call LoadFlippersPalette

 	callba Func_24fa3

 	call Func_24516

diff --git a/engine/pinball_game/load_stage_data/load_mewtwo_bonus.asm b/engine/pinball_game/load_stage_data/load_mewtwo_bonus.asm
index a96ca52..e89a55d 100644
--- a/engine/pinball_game/load_stage_data/load_mewtwo_bonus.asm
+++ b/engine/pinball_game/load_stage_data/load_mewtwo_bonus.asm
@@ -1,5 +1,5 @@
 _LoadStageDataMewtwoBonus: ; 0x19310

-	callba Func_142fc

+	callba LoadBallGraphics

 	call LoadFlippersPalette

 	callba LoadTimerGraphics

 	ld a, [wLoadingSavedGame]

diff --git a/engine/pinball_game/load_stage_data/load_red_field.asm b/engine/pinball_game/load_stage_data/load_red_field.asm
index 89d1ed2..7a802d2 100644
--- a/engine/pinball_game/load_stage_data/load_red_field.asm
+++ b/engine/pinball_game/load_stage_data/load_red_field.asm
@@ -4,27 +4,27 @@ _LoadStageDataRedFieldTop: ; 0x14000
 	call LoadPinballUpgradeTriggersGraphics_RedField

 	call LoadStaryuGraphics_Top

 	call UpdateSpinnerChargeGraphics_RedField

-	call Func_14234

+	call LoadEvolutionTrinketGraphics_RedField

 	call LoadSlotCaveCoverGraphics_RedField

-	call Func_142fc

+	call LoadBallGraphics

 	call LoadTimerGraphics

 	ret

 

 _LoadStageDataRedFieldBottom: ; 0x1401c

 	call Func_14091

-	call Func_14377

+	call LoadBillboardGraphics_RedField

 	call ClearAllRedIndicators

 	call LoadCAVELightsGraphics_RedField

-	call Func_14282

+	call LoadBillboardStatusBarGraphics_RedField

 	call Func_1414b

-	call Func_14234

+	call LoadEvolutionTrinketGraphics_RedField

 	call LoadAgainTextGraphics

 	call DrawBallSaverIcon

-	call Func_140f9

+	call LoadDiglettGraphics

 	call LoadStaryuGraphics_Bottom

-	call Func_140e2

+	call LoadBonusMultiplierRailingGraphics_RedField

 	call LoadSlotCaveCoverGraphics_RedField

-	call Func_142fc

+	call LoadBallGraphics

 	call LoadTimerGraphics

 	ret

 

@@ -98,18 +98,18 @@ Func_14091: ; 0x14091
 	call LoadFieldStructureGraphics_RedField

 	ret

 

-Func_140e2: ; 0x140e2

+LoadBonusMultiplierRailingGraphics_RedField: ; 0x140e2

 	ld a, $ff

 	ld [wd60e], a

 	ld [wd60f], a

 	ld a, [wBonusMultiplierTensDigit]

-	call LoadBonusMultiplierRailingGraphics_RedField

+	call _LoadBonusMultiplierRailingGraphics_RedField

 	ld a, [wBonusMultiplierOnesDigit]

 	add $14

-	call LoadBonusMultiplierRailingGraphics_RedField

+	call _LoadBonusMultiplierRailingGraphics_RedField

 	ret

 

-Func_140f9: ; 0x140f9

+LoadDiglettGraphics: ; 0x140f9

 	ld a, [wLeftDiglettAnimationController]

 	and a

 	jr z, .asm_1410c ;skip ??? if wLeftDiglettAnimationController = 0

@@ -120,7 +120,7 @@ Func_140f9: ; 0x140f9
 	ld [wStageCollisionMap + $103], a ;load into the collision map?

 	ld a, $2

 .asm_1410c

-	call LoadDiglettGraphics

+	call _LoadDiglettGraphics

 	ld a, [wLeftMapMoveCounter]

 	call LoadDiglettNumberGraphics

 	ld a, [wRightDiglettAnimationController]

@@ -133,7 +133,7 @@ Func_140f9: ; 0x140f9
 	ld a, $2

 .asm_14127

 	add $3

-	call LoadDiglettGraphics

+	call _LoadDiglettGraphics

 	ld a, [wRightMapMoveCounter]

 	add $4

 	call LoadDiglettNumberGraphics

@@ -262,7 +262,7 @@ Func_14210: ; 0x14210
 	callba nz, Func_102bc

 	ret

 

-Func_14234: ; 0x14234

+LoadEvolutionTrinketGraphics_RedField: ; 0x14234

 	ld a, [wInSpecialMode]

 	and a

 	ret z

@@ -302,7 +302,7 @@ Func_14234: ; 0x14234
 	call FarCopyCGBPals

 	ret

 

-Func_14282: ; 0x14282

+LoadBillboardStatusBarGraphics_RedField: ; 0x14282

 	ld a, [wInSpecialMode]

 	and a

 	jr z, .asm_1429e

@@ -377,22 +377,22 @@ Func_142d7: ; 0x142d7
 	pop bc

 	ret

 

-Func_142fc: ; 0x142fc

+LoadBallGraphics: ; 0x142fc

 	ld a, [wd4c8]

 	and a

-	jr nz, .asm_1430e

+	jr nz, .miniBall

 	callba LoadBallGfx

-	jr .asm_14328

+	jr .loadBallPalette

 

-.asm_1430e

+.miniBall

 	cp $1

-	jr nz, .asm_1431e

+	jr nz, .superMiniBall

 	callba LoadMiniBallGfx

-	jr .asm_14328

+	jr .loadBallPalette

 

-.asm_1431e

+.superMiniBall

 	callba LoadSuperMiniPinballGfx

-.asm_14328

+.loadBallPalette

 	ld a, [hGameBoyColorFlag]

 	and a

 	ret z

@@ -434,7 +434,7 @@ Func_142fc: ; 0x142fc
 	call FarCopyCGBPals

 	ret

 

-Func_14377: ; 0x14377

+LoadBillboardGraphics_RedField: ; 0x14377

 	ld a, [wInSpecialMode]

 	and a

 	jr nz, .asm_143b1

diff --git a/engine/pinball_game/load_stage_data/load_seel_bonus.asm b/engine/pinball_game/load_stage_data/load_seel_bonus.asm
index ab3fca4..97f93a2 100644
--- a/engine/pinball_game/load_stage_data/load_seel_bonus.asm
+++ b/engine/pinball_game/load_stage_data/load_seel_bonus.asm
@@ -1,5 +1,5 @@
 _LoadStageDataSeelBonus: ; 0x25b97

-	callba Func_142fc

+	callba LoadBallGraphics

 	call LoadFlippersPalette

 	callba Func_262f4

 	call Func_25d0e

diff --git a/engine/pinball_game/map_move.asm b/engine/pinball_game/map_move.asm
index 6a2eead..4c30211 100755
--- a/engine/pinball_game/map_move.asm
+++ b/engine/pinball_game/map_move.asm
@@ -106,9 +106,9 @@ Func_311b4: ; 0x311b4
 

 .asm_311e2

 	ld a, $2

-	callba LoadDiglettGraphics

+	callba _LoadDiglettGraphics

 	ld a, $5

-	callba LoadDiglettGraphics

+	callba _LoadDiglettGraphics

 	ld a, $6a

 	ld [wStageCollisionMap + $f0], a

 	ld a, $6b

@@ -264,7 +264,7 @@ Func_31326: ; 0x31326
 	ld [wIndicatorStates + 3], a

 	ld [wIndicatorStates + 4], a

 	ld a, $3

-	callba LoadPsyduckOrPoliwagGraphics

+	callba _LoadPsyduckOrPoliwagGraphics

 	jr .asm_31382

 

 .asm_3134c

@@ -276,9 +276,9 @@ Func_31326: ; 0x31326
 	ld [wIndicatorStates + 2], a

 	ld [wIndicatorStates + 4], a

 	ld a, $1

-	callba LoadPsyduckOrPoliwagGraphics

+	callba _LoadPsyduckOrPoliwagGraphics

 	ld a, $6

-	callba LoadPsyduckOrPoliwagGraphics

+	callba _LoadPsyduckOrPoliwagGraphics

 	ld a, $7

 	callba LoadPsyduckOrPoliwagNumberGraphics

 .asm_31382

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

diff --git a/engine/pinball_game/slot.asm b/engine/pinball_game/slot.asm
index deba41b..232afcf 100644
--- a/engine/pinball_game/slot.asm
+++ b/engine/pinball_game/slot.asm
@@ -487,12 +487,12 @@ Func_f154: ; 0xf154
 	ld a, [wCurrentStage]

 	call CallInFollowingTable

 CallTable_f15a: ; 0xf15a

-	padded_dab LoadBonusMultiplierRailingGraphics_RedField

-	padded_dab LoadBonusMultiplierRailingGraphics_RedField

-	padded_dab LoadBonusMultiplierRailingGraphics_RedField

-	padded_dab LoadBonusMultiplierRailingGraphics_RedField

-	padded_dab LoadBonusMultiplierRailingGraphics_BlueField

-	padded_dab LoadBonusMultiplierRailingGraphics_BlueField

+	padded_dab _LoadBonusMultiplierRailingGraphics_RedField

+	padded_dab _LoadBonusMultiplierRailingGraphics_RedField

+	padded_dab _LoadBonusMultiplierRailingGraphics_RedField

+	padded_dab _LoadBonusMultiplierRailingGraphics_RedField

+	padded_dab _LoadBonusMultiplierRailingGraphics_BlueField

+	padded_dab _LoadBonusMultiplierRailingGraphics_BlueField

 

 SlotRewardGoToBonusStage: ; 0xf172

 	ld a, $1