From 8ea060044abafa4d12627802f1be096dbb75d7c1 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Fri, 7 Oct 2022 17:22:29 -0300 Subject: [PATCH] Battle text pauses config --- include/constants/battle.h | 8 ++++---- include/constants/battle_config.h | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/constants/battle.h b/include/constants/battle.h index e2ea128c2..a5af07d98 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -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 diff --git a/include/constants/battle_config.h b/include/constants/battle_config.h index 0a7ba2303..ebdd7dfc8 100644 --- a/include/constants/battle_config.h +++ b/include/constants/battle_config.h @@ -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)