diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2017-07-09 13:17:20 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-07-09 13:17:52 -0400 |
commit | 467d4f0026f7c6b8b0cbadd458b5c29c14a6a661 (patch) | |
tree | 6881bc0baae9393f8777f60210092d5b912dd06f /constants | |
parent | c0382daeb5959a0be56fbf46de19873fc3a0bb39 (diff) | |
parent | f1612ae5bfcf3e8e7c250b214883f9ae1abe7fbd (diff) |
Merge branch 'master' of github.com:pret/pokepinball
Diffstat (limited to 'constants')
-rw-r--r-- | constants/pinball_game_constants.asm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/constants/pinball_game_constants.asm b/constants/pinball_game_constants.asm index aad6e43..fb7152d 100644 --- a/constants/pinball_game_constants.asm +++ b/constants/pinball_game_constants.asm @@ -13,4 +13,5 @@ NUM_MEWTWO_COMPLETIONS_FOR_MEW EQU 2 MAX_BONUS_MULTIPLIER EQU 99
MAX_BONUS_MULTIPLIER_FIELD_EVENTS EQU 11
-MAP_MOVE_FRAMES_COUNTER EQU 480 ; 8 seconds until the map move counter decrease by 1
+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)
|