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

changed B_WEATHER_FORM_SUPPRESS config to preproc

Browse Source
This commit is contained in:
AgustinGDLV 2023-05-16 20:34:16 -07:00
parent b269cc6906
commit 7b08713707
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/battle_script_commands.c
View File

@ -16605,14 +16605,15 @@ void BS_ItemRestorePP(void)
void BS_TryRevertWeatherForm(void) void BS_TryRevertWeatherForm(void)
{ {
NATIVE_ARGS(); NATIVE_ARGS();
if (B_WEATHER_FORM_SUPPRESS >= GEN_5 #if B_WEATHER_FORM_SUPPRESS >= GEN_5
&& TryBattleFormChange(gBattlerTarget, FORM_CHANGE_BATTLE_WEATHER)) if (TryBattleFormChange(gBattlerTarget, FORM_CHANGE_BATTLE_WEATHER))
{ {
gBattleScripting.battler = gBattlerTarget; gBattleScripting.battler = gBattlerTarget;
BattleScriptPush(cmd->nextInstr); BattleScriptPush(cmd->nextInstr);
gBattlescriptCurrInstr = BattleScript_TargetFormChangeWithStringNoPopup; gBattlescriptCurrInstr = BattleScript_TargetFormChangeWithStringNoPopup;
return; return;
} }
#endif
gBattlescriptCurrInstr = cmd->nextInstr; gBattlescriptCurrInstr = cmd->nextInstr;
} }