gave special collision constant their own file

3 files changed, 21 insertions, 19 deletions

diff --git a/constants.asm b/constants.asm
index b4349bc..dc5fc1f 100644
--- a/constants.asm
+++ b/constants.asm
@@ -16,3 +16,4 @@ INCLUDE "constants/song_constants.asm"
 INCLUDE "constants/sound_effect_constants.asm"
 INCLUDE "constants/species_constants.asm"
 INCLUDE "constants/stage_constants.asm"
+INCLUDE "constants/special_collision_constants.asm"
\ No newline at end of file
diff --git a/constants/pinball_game_constants.asm b/constants/pinball_game_constants.asm
index 76570c8..2531d8d 100644
--- a/constants/pinball_game_constants.asm
+++ b/constants/pinball_game_constants.asm
@@ -16,22 +16,4 @@ 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_PSYDUCK EQU 8

-SPECIAL_COLLISION_LEFT_BONUS_MULTIPLIER EQU 9

-SPECIAL_COLLISION_RIGHT_BONUS_MULTIPLIER EQU 10

-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/constants/special_collision_constants.asm b/constants/special_collision_constants.asm
new file mode 100644
index 0000000..556f6a2
--- /dev/null
+++ b/constants/special_collision_constants.asm
@@ -0,0 +1,19 @@
+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_PSYDUCK EQU 8
+SPECIAL_COLLISION_LEFT_BONUS_MULTIPLIER EQU 9
+SPECIAL_COLLISION_RIGHT_BONUS_MULTIPLIER EQU 10
+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
\ No newline at end of file