From 3f32c4b57a09fcdc1e9b89911de5caa6efff42a1 Mon Sep 17 00:00:00 2001 From: chaos-lord Date: Wed, 19 Jul 2017 20:38:47 +0100 Subject: Special collision ID constant added, applied to catch evo and map mode --- constants/pinball_game_constants.asm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'constants') 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 -- cgit v1.2.3 From 76c86ff35e401760a334c489f099598525a75952 Mon Sep 17 00:00:00 2001 From: chaos-lord Date: Thu, 20 Jul 2017 22:55:54 +0100 Subject: fixed typo --- constants/pinball_game_constants.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'constants') diff --git a/constants/pinball_game_constants.asm b/constants/pinball_game_constants.asm index 2624ae6..477ed82 100644 --- a/constants/pinball_game_constants.asm +++ b/constants/pinball_game_constants.asm @@ -27,7 +27,7 @@ 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_PSYDUCK EQU 8 SPECIAL_COLLISION_BALL_UPGRADE EQU 11 SPECIAL_COLLISION_SPINNER EQU 12 SPECIAL_COLLISION_SLOT_HOLE EQU 13 -- cgit v1.2.3 From 99e03500f7ca7df7fed0d8e296cf576958c349d9 Mon Sep 17 00:00:00 2001 From: chaos-lord Date: Fri, 21 Jul 2017 22:02:06 +0100 Subject: Added the last 2 special mode collision consts --- constants/pinball_game_constants.asm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'constants') diff --git a/constants/pinball_game_constants.asm b/constants/pinball_game_constants.asm index 477ed82..76570c8 100644 --- a/constants/pinball_game_constants.asm +++ b/constants/pinball_game_constants.asm @@ -28,6 +28,8 @@ 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 -- cgit v1.2.3 From 66d35475b68ad4f15675041e63d2d1c368dca5fc Mon Sep 17 00:00:00 2001 From: chaos-lord Date: Sat, 22 Jul 2017 14:34:06 +0100 Subject: gave special collision constant their own file --- constants/pinball_game_constants.asm | 20 +------------------- constants/special_collision_constants.asm | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 19 deletions(-) create mode 100644 constants/special_collision_constants.asm (limited to 'constants') 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 -- cgit v1.2.3