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

Dusk Ball config

Browse Source
This commit is contained in:
Eduardo Quezada 2020-10-17 02:41:02 -03:00
parent ce3b877666
commit 6f246bb0c7
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

@ -26,5 +26,6 @@
#define P_REPEAT_BALL_MODIFIER GEN_7 // In Gen7+, Net Ball's catch multiplier is x3.5 instead of x3. #define P_REPEAT_BALL_MODIFIER GEN_7 // In Gen7+, Net Ball's catch multiplier is x3.5 instead of x3.
#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.
#endif // GUARD_CONSTANTS_ITEM_CONFIG_H #endif // GUARD_CONSTANTS_ITEM_CONFIG_H

4
src/battle_script_commands.c
View File

@ -9916,7 +9916,11 @@ static void Cmd_handleballthrow(void)
case ITEM_DUSK_BALL: case ITEM_DUSK_BALL:
RtcCalcLocalTime(); RtcCalcLocalTime();
if ((gLocalTime.hours >= 20 && gLocalTime.hours <= 3) || gMapHeader.cave || gMapHeader.mapType == MAP_TYPE_UNDERGROUND) if ((gLocalTime.hours >= 20 && gLocalTime.hours <= 3) || gMapHeader.cave || gMapHeader.mapType == MAP_TYPE_UNDERGROUND)
#if P_DUSK_BALL_MODIFIER >= GEN_7
ballMultiplier = 30; ballMultiplier = 30;
#else
ballMultiplier = 35;
#endif
break; break;
} }
} }