diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-07-22 08:47:15 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-22 08:47:15 -0700 |
| commit | 91b1835a20eadfce06e4c389548522e5560ef23f (patch) | |
| tree | 8d799dc48460747e55e46a847603d28c3f3c5b1e /constants | |
| parent | f56a2fc512cfd0ff348f255a913bdeab29476893 (diff) | |
| parent | 66d35475b68ad4f15675041e63d2d1c368dca5fc (diff) | |
Merge pull request #24 from TwitchPlaysPokemon/chaos_requests
Chaos requests
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/pinball_game_constants.asm | 2 | ||||
| -rw-r--r-- | constants/special_collision_constants.asm | 19 |
2 files changed, 21 insertions, 0 deletions
diff --git a/constants/pinball_game_constants.asm b/constants/pinball_game_constants.asm index f50ba26..2531d8d 100644 --- a/constants/pinball_game_constants.asm +++ b/constants/pinball_game_constants.asm @@ -15,3 +15,5 @@ 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)
+
+
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 |