summaryrefslogtreecommitdiff
path: root/constants/pinball_game_constants.asm
diff options
context:
space:
mode:
authorchaos-lord <dd4791.mariokarter@hotmail.co.uk>2017-07-22 14:34:06 +0100
committerchaos-lord <dd4791.mariokarter@hotmail.co.uk>2017-07-22 14:34:06 +0100
commit66d35475b68ad4f15675041e63d2d1c368dca5fc (patch)
tree8d799dc48460747e55e46a847603d28c3f3c5b1e /constants/pinball_game_constants.asm
parent99e03500f7ca7df7fed0d8e296cf576958c349d9 (diff)
gave special collision constant their own file
Diffstat (limited to 'constants/pinball_game_constants.asm')
-rw-r--r--constants/pinball_game_constants.asm20
1 files changed, 1 insertions, 19 deletions
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
+