atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2380 from AsparagusEduardo/RHH/pr/feature/bWaitTime

Browse source 
Config for Battle text pause times
This commit is contained in:
ghoulslash 2022-10-07 16:32:29 -04:00 committed by GitHub
commit 1a9f6abe99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/constants/battle.h
View file

@ -401,10 +401,10 @@
#define BATTLE_TERRAIN_COUNT 22
#define B_WAIT_TIME_LONG 64
#define B_WAIT_TIME_MED 48
#define B_WAIT_TIME_SHORT 32
#define B_WAIT_TIME_SHORTEST 16
#define B_WAIT_TIME_LONG (B_WAIT_TIME_MULTIPLIER * 4)
#define B_WAIT_TIME_MED (B_WAIT_TIME_MULTIPLIER * 3)
#define B_WAIT_TIME_SHORT (B_WAIT_TIME_MULTIPLIER * 2)
#define B_WAIT_TIME_SHORTEST (B_WAIT_TIME_MULTIPLIER)
#define CHERRIM_OVERCAST 0
#define CHERRIM_SUNSHINE 1

1
include/constants/battle_config.h
View file

@ -160,6 +160,7 @@
#define B_SHOW_SPLIT_ICON TRUE // If set to TRUE, it will show an icon in the summary showing the move's category split.
#define B_HIDE_HEALTHBOX_IN_ANIMS TRUE // If set to TRUE, hides healthboxes during move animations.
#define B_EXPANDED_MOVE_NAMES FALSE // If set to TRUE, move names are increased from 12 characters to 16 characters.
#define B_WAIT_TIME_MULTIPLIER 16 // This determines how long text pauses in battle last. Vanilla is 16. Lower values result in faster battles.
// Catching settings
#define B_SEMI_INVULNERABLE_CATCH GEN_LATEST // In Gen4+, you cannot throw a ball against a Pokemon that is in a semi-invulnerable state (dig/fly/etc)