Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-29 05:18:30 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixes Booster Energy timing activation + Clean up (#7175)

Browse Source 
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
This commit is contained in:
Alex
2025-06-25 18:20:55 +02:00
committed by GitHub
parent f8551830c9
commit 7d7ffd58ae
10 changed files with 144 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/battle.h
View File

@@ -128,7 +128,7 @@ struct DisableStruct
u8 usedProteanLibero:1;
u8 flashFireBoosted:1;
u16 overwrittenAbility; // abilities overwritten during battle (keep separate from battle history in case of switching)
u8 boosterEnergyActivates:1;
u8 boosterEnergyActivated:1;
u8 roostActive:1;
u8 unburdenActive:1;
u8 neutralizingGas:1;

3
include/battle_util.h
View File

@@ -264,7 +264,7 @@ u32 GetProtectType(enum ProtectMethod method);
bool32 CanBattlerEscape(u32 battler); // no ability check
void BattleScriptExecute(const u8 *BS_ptr);
void BattleScriptPushCursorAndCallback(const u8 *BS_ptr);
u32 ItemBattleEffects(enum ItemCaseId, u32 battler, bool32 moveTurn);
u32 ItemBattleEffects(enum ItemCaseId, u32 battler);
void ClearVariousBattlerFlags(u32 battler);
void HandleAction_RunBattleScript(void);
u32 SetRandomTarget(u32 battler);
@@ -396,5 +396,6 @@ void UpdateStallMons(void);
bool32 TryRestoreHPBerries(u32 battler, enum ItemCaseId caseId);
u32 GetMonVolatile(u32 battler, enum Volatile volatile);
void SetMonVolatile(u32 battler, enum Volatile volatile, u32 newValue);
u32 TryBoosterEnergy(u32 battler, u32 ability, enum ItemCaseId caseID);
#endif // GUARD_BATTLE_UTIL_H

7
include/constants/battle_script_commands.h
View File

@@ -306,4 +306,11 @@ enum StatusTrigger
TRIGGER_ON_PROTECT,
};
enum TriggerOnFieldStatus
{
ON_ANY,
ON_TERRAIN,
ON_WEATHER,
};
#endif // GUARD_CONSTANTS_BATTLE_SCRIPT_COMMANDS_H