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

Introduce ability pop-up define

Browse source
This commit is contained in:
DizzyEggg 2018-11-03 10:51:51 +01:00
parent 68d94ad316
commit 52a68f6f1c
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/constants/battle_config.h
View file

@ -13,5 +13,6 @@
#define B_GALE_WINGS GEN_6 // Gen7 requires full hp.
#define B_SOUND_SUBSTITUTE GEN_6 // Starting from gen6 sound moves bypass Substitute.
#define B_EXP_CATCH GEN_6 // Starting from gen6, pokemon get experience from catching.
#define B_ABILITY_POP_UP GEN_6 // Starting from gen5, the pokemon abilities are displayed in a pop-up, when they activate in battle.
#endif // GUARD_CONSTANTS_BATTLE_CONFIG_H

4
src/battle_interface.c
View file

@ -26,6 +26,7 @@
#include "data2.h"
#include "battle_debug.h"
#include "malloc.h"
#include "constants/battle_config.h"
struct TestingBar
{
@ -3110,6 +3111,9 @@ void CreateAbilityPopUp(u8 battlerId, u32 ability, bool32 isDoubleBattle)
const s16 (*coords)[2];
u8 spriteId1, spriteId2, battlerPosition, taskId;
if (B_ABILITY_POP_UP < GEN_5)
return;
if (!gBattleStruct->activeAbilityPopUps)
{
LoadSpriteSheet(&sSpriteSheet_AbilityPopUp);