ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-22 04:04:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Quick Ball config.

Browse Source
This commit is contained in:
Eduardo Quezada 2020-10-17 02:44:09 -03:00
parent 6f246bb0c7
commit e320e6f7ff
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/constants/item_config.h
View File

@ -27,5 +27,6 @@
#define P_TIMER_BALL_MODIFIER GEN_7 // In Gen5+, Timer Ball's effectiveness increases by x0.3 per turn instead of x0.1 #define P_TIMER_BALL_MODIFIER GEN_7 // In Gen5+, Timer Ball's effectiveness increases by x0.3 per turn instead of x0.1
#define P_DIVE_BALL_MODIFIER GEN_3 // In Gen4+, Dive Ball's effectiveness increases by when Surfing or Fishing. #define P_DIVE_BALL_MODIFIER GEN_3 // In Gen4+, Dive Ball's effectiveness increases by when Surfing or Fishing.
#define P_DUSK_BALL_MODIFIER GEN_7 // In Gen7+, Net Ball's catch multiplier is x3 instead of x3.5. #define P_DUSK_BALL_MODIFIER GEN_7 // In Gen7+, Net Ball's catch multiplier is x3 instead of x3.5.
#define P_QUICK_BALL_MODIFIER GEN_7 // In Gen5+, Quick Ball's catch multiplier is x5 instead of x4.
#endif // GUARD_CONSTANTS_ITEM_CONFIG_H #endif // GUARD_CONSTANTS_ITEM_CONFIG_H

6
src/battle_script_commands.c
View File

@ -9911,7 +9911,11 @@ static void Cmd_handleballthrow(void)
break; break;
case ITEM_QUICK_BALL: case ITEM_QUICK_BALL:
if (gBattleResults.battleTurnCounter == 0) if (gBattleResults.battleTurnCounter == 0)
ballMultiplier = 40; #if P_QUICK_BALL_MODIFIER >= GEN_5
ballMultiplier = 50;
#else
ballMultiplier = 40;
#endif
break; break;
case ITEM_DUSK_BALL: case ITEM_DUSK_BALL:
RtcCalcLocalTime(); RtcCalcLocalTime();