labelled collision handlers

2 files changed, 32 insertions, 32 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 fd5992c..e2ac723 100644
--- a/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm
@@ -19,7 +19,7 @@ ResolveBlueFieldTopGameObjectCollisions: ; 0x1c715
 	call UpdateMapMoveCounters_BlueFieldTop

 	callba ShowExtraBallMessage

 	ld a, $0

-	callba Func_10000

+	callba CheckSpecialModeColision

 	ret

 

 ResolveBlueFieldBottomGameObjectCollisions: ; 0x1c769

@@ -44,7 +44,7 @@ ResolveBlueFieldBottomGameObjectCollisions: ; 0x1c769
 	call UpdateMapMoveCounters_BlueFieldBottom

 	callba ShowExtraBallMessage

 	ld a, $0

-	callba Func_10000

+	callba CheckSpecialModeColision

 	ret

 

 InitBlueFieldCollisionAttributes: ; 0x1c7c7

@@ -339,7 +339,7 @@ ResolveShellderCollision: ; 0x1c9c1
 	sub $3

 	ld [wWhichAnimatedShellder], a

 	ld a, $4

-	callba Func_10000

+	callba CheckSpecialModeColision

 	ld bc, FiveHundredPoints

 	callba AddBigBCD6FromQueueWithBallMultiplier

 	ret

@@ -398,7 +398,7 @@ ResolveBlueStageSpinnerCollision: ; 0x1ca5f
 	ld a, b

 	ld [wd50c], a

 	ld a, $c

-	callba Func_10000

+	callba CheckSpecialModeColision

 	; fall through

 

 UpdateBlueStageSpinner: ; 0x1ca85

@@ -659,7 +659,7 @@ HandleSecondaryLeftAlleyTrigger_BlueField: ; 0x1d010
 	xor a

 	ld [wLeftAlleyTrigger], a

 	ld a, $1

-	callba Func_10000

+	callba CheckSpecialModeColision

 	ret c

 	ld a, [wLeftAlleyCount]

 	cp $3

@@ -688,7 +688,7 @@ HandleSecondaryRightAlleyTrigger_BlueField: ; 0x1d047
 	xor a

 	ld [wRightAlleyTrigger], a

 	ld a, $2

-	callba Func_10000

+	callba CheckSpecialModeColision

 	ret c

 	ld a, [wRightAlleyCount]

 	cp $3

@@ -1003,7 +1003,7 @@ ResolveSlowpokeCollision: ; 0x1d216
 	cp $0

 	jr nz, .asm_1d2f8

 	ld a, $f

-	callba Func_10000

+	callba CheckSpecialModeColision

 .asm_1d2f8

 	xor a

 	ld [wd642], a

@@ -1122,7 +1122,7 @@ ResolveCloysterCollision: ; 0x1d32d
 	lb de, $00, $06

 	call PlaySoundEffect

 	ld a, $e

-	callba Func_10000

+	callba CheckSpecialModeColision

 	xor a

 	ld [wBlueFieldForceFieldFrameCounter], a

 	ld [wBlueFieldForceFieldSecondsCounter], a

@@ -1176,7 +1176,7 @@ ResolveBonusMultiplierCollision_BlueField: ; 0x1d438
 	ld a, $3c

 	ld [wBonusMultiplierRailingEndLightDuration], a

 	ld a, $9

-	callba Func_10000

+	callba CheckSpecialModeColision

 	ld a, [wd610]

 	cp $3

 	jp nz, asm_1d4fa

@@ -1203,7 +1203,7 @@ ResolveBonusMultiplierCollision_BlueField: ; 0x1d438
 	ld a, $1e

 	ld [wBonusMultiplierRailingEndLightDuration], a

 	ld a, $a

-	callba Func_10000

+	callba CheckSpecialModeColision

 	ld a, [wd611]

 	cp $3

 	jr nz, asm_1d4fa

@@ -1539,7 +1539,7 @@ ResolvePsyduckPoliwagCollision: ; 0x1dbd2
 	ld a, [wLeftMapMoveCounter]

 	cp $3

 	ld a, $7

-	callba Func_10000

+	callba CheckSpecialModeColision

 	ld a, $2

 	ld [wPoliwagState], a

 	ld a, $78

@@ -1576,7 +1576,7 @@ ResolvePsyduckPoliwagCollision: ; 0x1dbd2
 	ld a, [wRightMapMoveCounter]

 	cp $3

 	ld a, $8

-	callba Func_10000

+	callba CheckSpecialModeColision

 	ld a, [wRightMapMoveCounter]

 	cp $3

 	ccf

@@ -2043,7 +2043,7 @@ ResolveBallUpgradeTriggersCollision_BlueField: ; 0x1e356
 	ld [wLeftAlleyTrigger], a

 	ld [wSecondaryLeftAlleyTrigger], a

 	ld a, $b

-	callba Func_10000

+	callba CheckSpecialModeColision

 	ld a, [wWhichPinballUpgradeTriggerId]

 	sub $13

 	ld c, a

@@ -2594,7 +2594,7 @@ DoSlotLogic_BlueField: ; 0x1e830
 	xor a

 	ld [wIndicatorStates + 4], a

 	ld a, $d

-	callba Func_10000

+	callba CheckSpecialModeColision

 	jr nc, .asm_1e84b

 	ld a, $1

 	ld [wPinballIsVisible], 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 df0118b..7d9774e 100644
--- a/engine/pinball_game/object_collision/red_stage_resolve_collision.asm
+++ b/engine/pinball_game/object_collision/red_stage_resolve_collision.asm
@@ -18,7 +18,7 @@ ResolveRedFieldTopGameObjectCollisions: ; 0x1460e
 	call UpdateMapMoveCounters_RedFieldTop

 	callba ShowExtraBallMessage

 	ld a, $0

-	callba Func_10000

+	callba CheckSpecialModeColision

 	ret

 

 ResolveRedFieldBottomGameObjectCollisions: ; 0x14652

@@ -43,7 +43,7 @@ ResolveRedFieldBottomGameObjectCollisions: ; 0x14652
 	call UpdatePokeballs_RedField

 	callba ShowExtraBallMessage

 	ld a, $0

-	callba Func_10000

+	callba CheckSpecialModeColision

 	ret

 

 UpdateBallSaver: ; 0x146a2

@@ -259,7 +259,7 @@ ResolveDiglettCollision: ; 0x147aa
 	add $4

 	call LoadDiglettNumberGraphics

 	ld a, $8

-	callba Func_10000

+	callba CheckSpecialModeColision

 	ld a, [wRightMapMoveCounter]

 	cp $3

 	call z, HitRightDiglett3Times

@@ -275,7 +275,7 @@ ResolveDiglettCollision: ; 0x147aa
 	ld a, [wLeftMapMoveCounter]

 	call LoadDiglettNumberGraphics

 	ld a, $7

-	callba Func_10000

+	callba CheckSpecialModeColision

 	ld a, [wLeftMapMoveCounter]

 	cp $3

 	call z, HitLeftDiglett3Times

@@ -566,7 +566,7 @@ ResolveVoltorbCollision: ; 0x14d85
 	sub $3

 	ld [wWhichAnimatedVoltorb], a

 	ld a, $4

-	callba Func_10000

+	callba CheckSpecialModeColision

 	ld bc, FiveHundredPoints

 	callba AddBigBCD6FromQueueWithBallMultiplier

 	ret

@@ -613,7 +613,7 @@ ResolveRedStageSpinnerCollision: ; 0x14dea
 	ld a, b

 	ld [wd50c], a

 	ld a, $c

-	callba Func_10000

+	callba CheckSpecialModeColision

 	; fall through

 

 UpdateRedStageSpinner: ; 0x14e10

@@ -937,7 +937,7 @@ ResolveBallUpgradeTriggersCollision_RedField: ; 0x1535d
 	ld [wSecondaryLeftAlleyTrigger], a

 	call UpdateFieldStructures_RedField

 	ld a, $b

-	callba Func_10000

+	callba CheckSpecialModeColision

 	ld a, [wWhichPinballUpgradeTriggerId]

 	sub $e

 	ld c, a

@@ -1301,7 +1301,7 @@ HandleSecondaryLeftAlleyTrigger_RedField: ; 0x1587c
 	xor a

 	ld [wLeftAlleyTrigger], a

 	ld a, $1

-	callba Func_10000

+	callba CheckSpecialModeColision

 	ret c

 	ld a, [wLeftAlleyCount]

 	cp $3

@@ -1331,7 +1331,7 @@ HandleThirdLeftAlleyTrigger_RedField: ; 0x158c0
 	xor a

 	ld [wLeftAlleyTrigger], a

 	ld a, $1

-	callba Func_10000

+	callba CheckSpecialModeColision

 	ret c

 	ld a, [wLeftAlleyCount]

 	cp $3

@@ -1360,7 +1360,7 @@ HandleSecondaryStaryuAlleyTrigger_RedField: ; 0x15904
 	xor a

 	ld [wSecondaryLeftAlleyTrigger], a

 	ld a, $3

-	callba Func_10000

+	callba CheckSpecialModeColision

 	ret

 

 HandleLeftAlleyTrigger_RedField: ; 0x1591e

@@ -1395,7 +1395,7 @@ HandleSecondaryRightAlleyTrigger_RedField: ; 0x15944
 	xor a

 	ld [wRightAlleyTrigger], a

 	ld a, $2

-	callba Func_10000

+	callba CheckSpecialModeColision

 	ret c

 	ld a, [wRightAlleyCount]

 	cp $3

@@ -1434,7 +1434,7 @@ HandleThirdRightAlleyTrigger_RedField: ; 0x15990
 	xor a

 	ld [wRightAlleyTrigger], a

 	ld a, $2

-	callba Func_10000

+	callba CheckSpecialModeColision

 	ret c

 	ld a, [wRightAlleyCount]

 	cp $3

@@ -1606,7 +1606,7 @@ ResolveBellsproutCollision: ; 0x15e93
 	lb de, $00, $06

 	call PlaySoundEffect

 	ld a, $5

-	callba Func_10000

+	callba CheckSpecialModeColision

 	ret

 

 BellsproutAnimationData: ; 0x15f69

@@ -2040,7 +2040,7 @@ DoSlotLogic_RedField: ; 0x16352
 	xor a

 	ld [wIndicatorStates + 4], a

 	ld a, $d

-	callba Func_10000

+	callba CheckSpecialModeColision

 	jr nc, .asm_1636d

 	ld a, $1

 	ld [wPinballIsVisible], a

@@ -2513,7 +2513,7 @@ ResolveStaryuCollision_Top: ; 0x16781
 	ld [wd503], a

 	call LoadStaryuGraphics_Top

 	ld a, $6

-	callba Func_10000

+	callba CheckSpecialModeColision

 	ret

 

 .asm_167bd

@@ -2562,7 +2562,7 @@ ResolveStaryuCollision_Bottom: ; 0x167ff
 	ld [wd503], a

 	call LoadStaryuGraphics_Bottom

 	ld a, $6

-	callba Func_10000

+	callba CheckSpecialModeColision

 	ret

 

 .noCollision

@@ -2695,7 +2695,7 @@ ResolveRedStageBonusMultiplierCollision: ; 016d9d
 	sub $21

 	jr nz, .hitRightRailing

 	ld a, $9

-	callba Func_10000

+	callba CheckSpecialModeColision

 	ld a, [wd610]

 	cp $3

 	jr nz, .asm_16e35

@@ -2710,7 +2710,7 @@ ResolveRedStageBonusMultiplierCollision: ; 016d9d
 

 .hitRightRailing

 	ld a, $a

-	callba Func_10000

+	callba CheckSpecialModeColision

 	ld a, [wd611]

 	cp $3

 	jr nz, .asm_16e35