Special collision ID constant added, applied to catch evo and map mode

6 files changed, 62 insertions, 44 deletions

diff --git a/constants/pinball_game_constants.asm b/constants/pinball_game_constants.asm
index fb7152d..240223c 100644
--- a/constants/pinball_game_constants.asm
+++ b/constants/pinball_game_constants.asm
@@ -15,3 +15,21 @@ MAX_BONUS_MULTIPLIER_FIELD_EVENTS EQU 11
 

 MAP_MOVE_FRAMES_COUNTER        EQU  480 ; 8 seconds until the map move counter decrease by 1

 PINBALL_UPGRADE_FRAMES_COUNTER EQU 3600 ; ~1 minute until the pinball type degrades one stage. (e.g. Great Ball -> Pokeball)

+

+SPECIAL_COLLISION_NOTHING EQU 0

+SPECIAL_COLLISION_LEFT_TRIGGER EQU 1

+SPECIAL_COLLISION_RIGHT_TRIGGER EQU 2

+SPECIAL_COLLISION_STARYU_ALLY_TRIGGER EQU 3

+SPECIAL_COLLISION_VOLTORB EQU 4

+SPECIAL_COLLISION_SHELLDER EQU 4

+SPECIAL_COLLISION_BELLSPROUT EQU 5

+SPECIAL_COLLISION_STARYU EQU 6

+SPECIAL_COLLISION_LEFT_DIGLETT EQU 7

+SPECIAL_COLLISION_POLIWAG EQU 7

+SPECIAL_COLLISION_RIGHT_DIGLETT EQU 8

+SPECIAL_COLLISION_PPSYDUCK EQU 8

+SPECIAL_COLLISION_BALL_UPGRADE EQU 11

+SPECIAL_COLLISION_SPINNER EQU 12

+SPECIAL_COLLISION_SLOT_HOLE EQU 13

+SPECIAL_COLLISION_CLOYSTER EQU 14

+SPECIAL_COLLISION_SLOWPOKE EQU 15

diff --git a/engine/pinball_game/catchem_mode/catchem_mode_blue_field.asm b/engine/pinball_game/catchem_mode/catchem_mode_blue_field.asm
index d331b61..6a62d8a 100644
--- a/engine/pinball_game/catchem_mode/catchem_mode_blue_field.asm
+++ b/engine/pinball_game/catchem_mode/catchem_mode_blue_field.asm
@@ -1,14 +1,14 @@
 HandleBlueCatchEmCollision: ; 0x202bc

 	ld a, [wSpecialModeCollisionID]

-	cp $4

+	cp SPECIAL_COLLISION_SHELLDER

 	jp z, Func_204f1

-	cp $c

+	cp SPECIAL_COLLISION_SPINNER

 	jp z, Func_20569

-	cp $f

+	cp SPECIAL_COLLISION_SLOWPOKE

 	jp z, Func_20573

-	cp $e

+	cp SPECIAL_COLLISION_CLOYSTER

 	jp z, Func_2057a

-	cp $0

+	cp SPECIAL_COLLISION_NOTHING

 	jr z, .asm_202d9

 	scf

 	ret

diff --git a/engine/pinball_game/catchem_mode/catchem_mode_red_field.asm b/engine/pinball_game/catchem_mode/catchem_mode_red_field.asm
index 25e9f9f..24f0ac5 100644
--- a/engine/pinball_game/catchem_mode/catchem_mode_red_field.asm
+++ b/engine/pinball_game/catchem_mode/catchem_mode_red_field.asm
@@ -1,12 +1,12 @@
 HandleRedCatchEmCollision: ; 0x20000

 	ld a, [wSpecialModeCollisionID]

-	cp $4

+	cp SPECIAL_COLLISION_VOLTORB

 	jp z, Func_20230 ;if collided with voltorb

-	cp $c

+	cp SPECIAL_COLLISION_SPINNER

 	jp z, Func_202a8

-	cp $5

+	cp SPECIAL_COLLISION_BELLSPROUT

 	jp z, Func_202b2 ;bellsprout

-	cp $0

+	cp SPECIAL_COLLISION_NOTHING

 	jr z, .asm_20018

 	scf

 	ret

diff --git a/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm b/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm
index 5dac074..f582ff4 100644
--- a/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm
+++ b/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm
@@ -1,30 +1,30 @@
 HandleBlueEvoModeCollision: ; 0x20bae

 	ld a, [wSpecialModeCollisionID]

-	cp $4

+	cp SPECIAL_COLLISION_SHELLDER

 	jp z, Func_20e34

-	cp $1

+	cp SPECIAL_COLLISION_LEFT_TRIGGER

 	jp z, Func_21089

-	cp $e

+	cp SPECIAL_COLLISION_CLOYSTER

 	jp z, Func_20e5e

-	cp $f

+	cp SPECIAL_COLLISION_SLOWPOKE

 	jp z, Func_20e82

-	cp $7

+	cp SPECIAL_COLLISION_POLIWAG

 	jp z, Func_20ea6

-	cp $8

+	cp SPECIAL_COLLISION_PPSYDUCK

 	jp z, Func_20ec7

 	cp $9

 	jp z, Func_20ee8

 	cp $a

 	jp z, Func_20f09

-	cp $b

+	cp SPECIAL_COLLISION_BALL_UPGRADE

 	jp z, Func_20f2a

-	cp $c

+	cp SPECIAL_COLLISION_SPINNER

 	jp z, Func_20f4b

-	cp $d

+	cp SPECIAL_COLLISION_SLOT_HOLE

 	jp z, Func_2112a

-	cp $2

+	cp SPECIAL_COLLISION_RIGHT_TRIGGER

 	jp z, Func_2105c

-	cp $0

+	cp SPECIAL_COLLISION_NOTHING

 	jr z, .asm_20bf3

 	scf

 	ret

diff --git a/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm b/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm
index 018ea91..a2425ad 100644
--- a/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm
+++ b/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm
@@ -1,32 +1,32 @@
 HandleRedEvoModeCollision: ; 0x20581

 	ld a, [wSpecialModeCollisionID]

-	cp $4

+	cp SPECIAL_COLLISION_VOLTORB

 	jp z, Func_2080f ;voltorb

-	cp $3

+	cp SPECIAL_COLLISION_STARYU_ALLY_TRIGGER

 	jp z, Func_20839

-	cp $5

+	cp SPECIAL_COLLISION_SHELLDER

 	jp z, Func_2085a ;bellsprout

-	cp $6

+	cp SPECIAL_COLLISION_STARYU

 	jp z, Func_20887 ;staryu

-	cp $7

+	cp SPECIAL_COLLISION_LEFT_DIGLETT

 	jp z, Func_208a8 ;diglett

-	cp $8

+	cp SPECIAL_COLLISION_RIGHT_DIGLETT

 	jp z, Func_208c9 ;diglett

 	cp $9

 	jp z, Func_208ea ;right rail?

 	cp $a

 	jp z, Func_2090b ;right rail?

-	cp $b

+	cp SPECIAL_COLLISION_BALL_UPGRADE

 	jp z, Func_2092c

-	cp $c

+	cp SPECIAL_COLLISION_SPINNER

 	jp z, Func_2094d

-	cp $d

+	cp SPECIAL_COLLISION_SLOT_HOLE

 	jp z, Func_20b02

-	cp $2

+	cp SPECIAL_COLLISION_RIGHT_TRIGGER

 	jp z, Func_20a65

-	cp $1

+	cp SPECIAL_COLLISION_LEFT_TRIGGER

 	jp z, Func_20a82

-	cp $0

+	cp SPECIAL_COLLISION_NOTHING

 	jr z, .asm_205cb

 	scf

 	ret

diff --git a/engine/pinball_game/map_move.asm b/engine/pinball_game/map_move.asm
index 888388a..b935243 100755
--- a/engine/pinball_game/map_move.asm
+++ b/engine/pinball_game/map_move.asm
@@ -429,18 +429,18 @@ HandleRedMapModeCollision: ; 0x314ae
 	and a

 	ld a, [wSpecialModeCollisionID]

 	jr z, .asm_314d0

-	cp $1

+	cp SPECIAL_COLLISION_LEFT_TRIGGER

 	jp z, OpenRedMapMoveSlotFromLeft

-	cp $3

+	cp SPECIAL_COLLISION_STARYU_ALLY_TRIGGER

 	jp z, OpenRedMapMoveSlotFromLeft

-	cp $2

+	cp SPECIAL_COLLISION_RIGHT_TRIGGER

 	jp z, OpenRedMapMoveSlotFromRight

-	cp $5

+	cp SPECIAL_COLLISION_BELLSPROUT

 	jp z, OpenRedMapMoveSlotFromRight

-	cp $d

+	cp SPECIAL_COLLISION_SLOT_HOLE

 	jp z, ResolveSucsessfulRedMapMove

 .asm_314d0

-	cp $0

+	cp SPECIAL_COLLISION_NOTHING

 	jr z, .asm_314d6

 	scf

 	ret

@@ -579,18 +579,18 @@ HandleBlueMapModeCollision: ; 0x3161b
 	and a

 	ld a, [wSpecialModeCollisionID]

 	jr z, .asm_3163d

-	cp $1

+	cp SPECIAL_COLLISION_LEFT_TRIGGER

 	jp z, Func_31708

-	cp $f

+	cp SPECIAL_COLLISION_SLOWPOKE

 	jp z, Func_31708

-	cp $2

+	cp SPECIAL_COLLISION_RIGHT_TRIGGER

 	jp z, Func_3172a

-	cp $e

+	cp SPECIAL_COLLISION_CLOYSTER

 	jp z, Func_3172a

-	cp $d

+	cp SPECIAL_COLLISION_SLOT_HOLE

 	jp z, Func_3174c

 .asm_3163d

-	cp $0

+	cp SPECIAL_COLLISION_NOTHING

 	jr z, .asm_31643

 	scf

 	ret