ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-28 08:28:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

weather forms fixes and config

Browse Source
This commit is contained in:
Sneed69 2022-05-22 01:44:51 +03:00 committed by sneed
parent 6be8151981
commit d0a2be9630
9 changed files with 139 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/macros/battle_script.inc
View File

@ -1186,11 +1186,11 @@
.byte 0xe5 .byte 0xe5
.endm .endm
.macro docastformchangeanimation .macro doweatherformchangeanimation
.byte 0xe6 .byte 0xe6
.endm .endm
.macro trycastformdatachange .macro tryweatherformdatachange
.byte 0xe7 .byte 0xe7
.endm .endm

12
data/battle_anim_scripts.s
View File

@ -796,7 +796,7 @@ gBattleAnims_StatusConditions::
.align 2 .align 2
gBattleAnims_General:: gBattleAnims_General::
.4byte General_CastformChange @ B_ANIM_CASTFORM_CHANGE .4byte General_WeatherFormChange @ B_ANIM_CASTFORM_CHANGE
.4byte General_StatsChange @ B_ANIM_STATS_CHANGE .4byte General_StatsChange @ B_ANIM_STATS_CHANGE
.4byte General_SubstituteFade @ B_ANIM_SUBSTITUTE_FADE .4byte General_SubstituteFade @ B_ANIM_SUBSTITUTE_FADE
.4byte General_SubstituteAppear @ B_ANIM_SUBSTITUTE_APPEAR .4byte General_SubstituteAppear @ B_ANIM_SUBSTITUTE_APPEAR
@ -24152,11 +24152,11 @@ Status_Nightmare:
Status_Powder: Status_Powder:
end end
General_CastformChange: General_WeatherFormChange:
createvisualtask AnimTask_IsMonInvisible, 2 createvisualtask AnimTask_IsMonInvisible, 2
jumpreteq TRUE, CastformChangeSkipAnim jumpreteq TRUE, WeatherFormChangeSkipAnim
goto CastformChangeContinue goto WeatherFormChangeContinue
CastformChangeContinue: WeatherFormChangeContinue:
monbg ANIM_ATTACKER monbg ANIM_ATTACKER
playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER
waitplaysewithpan SE_M_MINIMIZE, SOUND_PAN_ATTACKER, 48 waitplaysewithpan SE_M_MINIMIZE, SOUND_PAN_ATTACKER, 48
@ -24164,7 +24164,7 @@ CastformChangeContinue:
waitforvisualfinish waitforvisualfinish
clearmonbg ANIM_ATTACKER clearmonbg ANIM_ATTACKER
end end
CastformChangeSkipAnim: WeatherFormChangeSkipAnim:
createvisualtask AnimTask_CastformGfxDataChange, 2, 1 createvisualtask AnimTask_CastformGfxDataChange, 2, 1
end end

27
data/battle_scripts_1.s
View File

@ -6511,11 +6511,9 @@ BattleScript_LearnMoveReturn::
BattleScript_RainContinuesOrEnds:: BattleScript_RainContinuesOrEnds::
printfromtable gRainContinuesStringIds printfromtable gRainContinuesStringIds
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_RAIN_STOPPED, BattleScript_RainEnds jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_RAIN_STOPPED, BattleScript_RainContinuesOrEndsEnd
playanimation BS_ATTACKER, B_ANIM_RAIN_CONTINUES playanimation BS_ATTACKER, B_ANIM_RAIN_CONTINUES
end2 BattleScript_RainContinuesOrEndsEnd::
BattleScript_RainEnds::
call BattleScript_WeatherFormChanges
end2 end2
BattleScript_DamagingWeatherContinues:: BattleScript_DamagingWeatherContinues::
@ -6554,7 +6552,6 @@ BattleScript_DamagingWeatherContinuesEnd::
BattleScript_SandStormHailEnds:: BattleScript_SandStormHailEnds::
printfromtable gSandStormHailEndStringIds printfromtable gSandStormHailEndStringIds
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
call BattleScript_WeatherFormChanges
end2 end2
BattleScript_SunlightContinues:: BattleScript_SunlightContinues::
@ -6566,7 +6563,6 @@ BattleScript_SunlightContinues::
BattleScript_SunlightFaded:: BattleScript_SunlightFaded::
printstring STRINGID_SUNLIGHTFADED printstring STRINGID_SUNLIGHTFADED
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
call BattleScript_WeatherFormChanges
end2 end2
BattleScript_OverworldWeatherStarts:: BattleScript_OverworldWeatherStarts::
@ -8167,19 +8163,28 @@ BattleScript_ShedSkinActivates::
BattleScript_WeatherFormChanges:: BattleScript_WeatherFormChanges::
setbyte sBATTLER, 0 setbyte sBATTLER, 0
BattleScript_WeatherFormChangesLoop:: BattleScript_WeatherFormChangesLoop::
trycastformdatachange tryweatherformdatachange
addbyte sBATTLER, 1 addbyte sBATTLER, 1
jumpifbytenotequal sBATTLER, gBattlersCount, BattleScript_WeatherFormChangesLoop jumpifbytenotequal sBATTLER, gBattlersCount, BattleScript_WeatherFormChangesLoop
return return
BattleScript_CastformChange:: BattleScript_WeatherFormChange::
call BattleScript_DoCastformChange call BattleScript_DoWeatherFormChange
end3 end3
BattleScript_DoCastformChange:: BattleScript_DoWeatherFormChange::
copybyte gBattlerAbility, sBATTLER copybyte gBattlerAbility, sBATTLER
jumpifspecies BS_SCRIPTING, SPECIES_CASTFORM, BattleScript_DoWeatherFormChange_ForecastCheck
BattleScript_DoWeatherFormChange_FlowerGiftCheck:
jumpifability BS_SCRIPTING, ABILITY_FLOWER_GIFT, BattleScript_DoWeatherFormChange_PopUp
goto BattleScript_DoWeatherFormChange_AfterPopUp
BattleScript_DoWeatherFormChange_ForecastCheck:
jumpifability BS_SCRIPTING, ABILITY_FORECAST, BattleScript_DoWeatherFormChange_PopUp
goto BattleScript_DoWeatherFormChange_AfterPopUp
BattleScript_DoWeatherFormChange_PopUp:
call BattleScript_AbilityPopUp call BattleScript_AbilityPopUp
docastformchangeanimation BattleScript_DoWeatherFormChange_AfterPopUp:
doweatherformchangeanimation
waitstate waitstate
printstring STRINGID_PKMNTRANSFORMED printstring STRINGID_PKMNTRANSFORMED
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG

2
include/battle_scripts.h
View File

@ -151,7 +151,7 @@ extern const u8 BattleScript_SandstreamActivates[];
extern const u8 BattleScript_ShedSkinActivates[]; extern const u8 BattleScript_ShedSkinActivates[];
extern const u8 BattleScript_WeatherFormChanges[]; extern const u8 BattleScript_WeatherFormChanges[];
extern const u8 BattleScript_WeatherFormChangesLoop[]; extern const u8 BattleScript_WeatherFormChangesLoop[];
extern const u8 BattleScript_CastformChange[]; extern const u8 BattleScript_WeatherFormChange[];
extern const u8 BattleScript_IntimidateActivatesEnd3[]; extern const u8 BattleScript_IntimidateActivatesEnd3[];
extern const u8 BattleScript_IntimidateActivates[]; extern const u8 BattleScript_IntimidateActivates[];
extern const u8 BattleScript_DroughtActivates[]; extern const u8 BattleScript_DroughtActivates[];

2
include/battle_util.h
View File

@ -16,7 +16,7 @@
#define ABILITYEFFECT_MOVE_END_ATTACKER 4 #define ABILITYEFFECT_MOVE_END_ATTACKER 4
#define ABILITYEFFECT_MOVE_END 5 #define ABILITYEFFECT_MOVE_END 5
#define ABILITYEFFECT_IMMUNITY 6 #define ABILITYEFFECT_IMMUNITY 6
#define ABILITYEFFECT_FORECAST 7 #define ABILITYEFFECT_WEATHER_FORM 7
#define ABILITYEFFECT_SYNCHRONIZE 8 #define ABILITYEFFECT_SYNCHRONIZE 8
#define ABILITYEFFECT_ATK_SYNCHRONIZE 9 #define ABILITYEFFECT_ATK_SYNCHRONIZE 9
#define ABILITYEFFECT_INTIMIDATE1 10 #define ABILITYEFFECT_INTIMIDATE1 10

1
include/constants/battle_config.h
View File

@ -190,6 +190,7 @@
#define B_SYNCHRONIZE_TOXIC GEN_8 // In Gen5+, if a Pokémon with Synchronize is badly poisoned, the opponent will also become badly poisoned. Previously, the opponent would become regular poisoned. #define B_SYNCHRONIZE_TOXIC GEN_8 // In Gen5+, if a Pokémon with Synchronize is badly poisoned, the opponent will also become badly poisoned. Previously, the opponent would become regular poisoned.
#define B_UPDATED_INTIMIDATE GEN_8 // In Gen8, Intimidate doesn't work on opponents with the Inner Focus, Scrappy, Own Tempo or Oblivious abilities. It also activates Rattled. #define B_UPDATED_INTIMIDATE GEN_8 // In Gen8, Intimidate doesn't work on opponents with the Inner Focus, Scrappy, Own Tempo or Oblivious abilities. It also activates Rattled.
#define B_OBLIVIOUS_TAUNT GEN_7 // In Gen6+, Pokémon with Oblivious can't be taunted. #define B_OBLIVIOUS_TAUNT GEN_7 // In Gen6+, Pokémon with Oblivious can't be taunted.
#define B_WEATHER_FORMS GEN_5 // In Gen5+, Castform and Cherrim revert to their base form upon losing their respective ability. Cherrim needs Flower Gift to swap forms.
// Item settings // Item settings
#define B_HP_BERRIES GEN_7 // In Gen4+, berries which restore hp activate immediately after HP drops to half. In Gen3, the effect occurs at the end of the turn. #define B_HP_BERRIES GEN_7 // In Gen4+, berries which restore hp activate immediately after HP drops to half. In Gen3, the effect occurs at the end of the turn.

5
include/constants/battle_script_commands.h
View File

@ -310,8 +310,9 @@
#define MOVEEND_PICKPOCKET 27 #define MOVEEND_PICKPOCKET 27
#define MOVEEND_DANCER 28 #define MOVEEND_DANCER 28
#define MOVEEND_EMERGENCY_EXIT 29 #define MOVEEND_EMERGENCY_EXIT 29
#define MOVEEND_CLEAR_BITS 30 #define MOVEEND_WEATHER_FORM 30
#define MOVEEND_COUNT 31 #define MOVEEND_CLEAR_BITS 31
#define MOVEEND_COUNT 32
// switch cases // switch cases
#define B_SWITCH_NORMAL 0 #define B_SWITCH_NORMAL 0

40
src/battle_script_commands.c
View File

@ -537,8 +537,8 @@ static void Cmd_switchoutabilities(void);
static void Cmd_jumpifhasnohp(void); static void Cmd_jumpifhasnohp(void);
static void Cmd_getsecretpowereffect(void); static void Cmd_getsecretpowereffect(void);
static void Cmd_pickup(void); static void Cmd_pickup(void);
static void Cmd_docastformchangeanimation(void); static void Cmd_doweatherformchangeanimation(void);
static void Cmd_trycastformdatachange(void); static void Cmd_tryweatherformdatachange(void);
static void Cmd_settypebasedhalvers(void); static void Cmd_settypebasedhalvers(void);
static void Cmd_jumpifsubstituteblocks(void); static void Cmd_jumpifsubstituteblocks(void);
static void Cmd_tryrecycleitem(void); static void Cmd_tryrecycleitem(void);
@ -796,8 +796,8 @@ void (* const gBattleScriptingCommandsTable[])(void) =
Cmd_jumpifhasnohp, //0xE3 Cmd_jumpifhasnohp, //0xE3
Cmd_getsecretpowereffect, //0xE4 Cmd_getsecretpowereffect, //0xE4
Cmd_pickup, //0xE5 Cmd_pickup, //0xE5
Cmd_docastformchangeanimation, //0xE6 Cmd_doweatherformchangeanimation, //0xE6
Cmd_trycastformdatachange, //0xE7 Cmd_tryweatherformdatachange, //0xE7
Cmd_settypebasedhalvers, //0xE8 Cmd_settypebasedhalvers, //0xE8
Cmd_jumpifsubstituteblocks, //0xE9 Cmd_jumpifsubstituteblocks, //0xE9
Cmd_tryrecycleitem, //0xEA Cmd_tryrecycleitem, //0xEA
@ -5601,6 +5601,30 @@ static void Cmd_moveend(void)
} }
gBattleScripting.moveendState++; gBattleScripting.moveendState++;
break; break;
case MOVEEND_WEATHER_FORM:
for (i = 0; i < MAX_BATTLERS_COUNT; i++)
{
switch (gBattleMons[i].species)
{
case SPECIES_CASTFORM:
case SPECIES_CHERRIM:
#ifdef POKEMON_EXPANSION
case SPECIES_CASTFORM_RAINY:
case SPECIES_CASTFORM_SNOWY:
case SPECIES_CASTFORM_SUNNY:
case SPECIES_CHERRIM_SUNSHINE:
#endif
effect = TryWeatherFormChange(i);
if (effect)
{
BattleScriptPushCursorAndCallback(BattleScript_WeatherFormChange);
gBattleScripting.battler = i;
gBattleStruct->formToChangeInto = effect - 1;
}
}
}
gBattleScripting.moveendState++;
break;
case MOVEEND_CLEAR_BITS: // Clear/Set bits for things like using a move for all targets and all hits. case MOVEEND_CLEAR_BITS: // Clear/Set bits for things like using a move for all targets and all hits.
if (gSpecialStatuses[gBattlerAttacker].instructedChosenTarget) if (gSpecialStatuses[gBattlerAttacker].instructedChosenTarget)
*(gBattleStruct->moveTarget + gBattlerAttacker) = gSpecialStatuses[gBattlerAttacker].instructedChosenTarget & 0x3; *(gBattleStruct->moveTarget + gBattlerAttacker) = gSpecialStatuses[gBattlerAttacker].instructedChosenTarget & 0x3;
@ -6415,7 +6439,7 @@ static void Cmd_switchineffects(void)
|| ItemBattleEffects(ITEMEFFECT_ON_SWITCH_IN, gActiveBattler, FALSE) || ItemBattleEffects(ITEMEFFECT_ON_SWITCH_IN, gActiveBattler, FALSE)
|| AbilityBattleEffects(ABILITYEFFECT_INTIMIDATE2, 0, 0, 0, 0) || AbilityBattleEffects(ABILITYEFFECT_INTIMIDATE2, 0, 0, 0, 0)
|| AbilityBattleEffects(ABILITYEFFECT_TRACE2, 0, 0, 0, 0) || AbilityBattleEffects(ABILITYEFFECT_TRACE2, 0, 0, 0, 0)
|| AbilityBattleEffects(ABILITYEFFECT_FORECAST, 0, 0, 0, 0)) || AbilityBattleEffects(ABILITYEFFECT_WEATHER_FORM, 0, 0, 0, 0))
return; return;
gSideStatuses[GetBattlerSide(gActiveBattler)] &= ~(SIDE_STATUS_SPIKES_DAMAGED | SIDE_STATUS_TOXIC_SPIKES_DAMAGED | SIDE_STATUS_STEALTH_ROCK_DAMAGED | SIDE_STATUS_STICKY_WEB_DAMAGED); gSideStatuses[GetBattlerSide(gActiveBattler)] &= ~(SIDE_STATUS_SPIKES_DAMAGED | SIDE_STATUS_TOXIC_SPIKES_DAMAGED | SIDE_STATUS_STEALTH_ROCK_DAMAGED | SIDE_STATUS_STICKY_WEB_DAMAGED);
@ -13267,7 +13291,7 @@ static void Cmd_pickup(void)
gBattlescriptCurrInstr++; gBattlescriptCurrInstr++;
} }
static void Cmd_docastformchangeanimation(void) static void Cmd_doweatherformchangeanimation(void)
{ {
gActiveBattler = gBattleScripting.battler; gActiveBattler = gBattleScripting.battler;
@ -13280,7 +13304,7 @@ static void Cmd_docastformchangeanimation(void)
gBattlescriptCurrInstr++; gBattlescriptCurrInstr++;
} }
static void Cmd_trycastformdatachange(void) static void Cmd_tryweatherformdatachange(void)
{ {
u8 form; u8 form;
@ -13288,7 +13312,7 @@ static void Cmd_trycastformdatachange(void)
form = TryWeatherFormChange(gBattleScripting.battler); form = TryWeatherFormChange(gBattleScripting.battler);
if (form) if (form)
{ {
BattleScriptPushCursorAndCallback(BattleScript_CastformChange); BattleScriptPushCursorAndCallback(BattleScript_WeatherFormChange);
*(&gBattleStruct->formToChangeInto) = form - 1; *(&gBattleStruct->formToChangeInto) = form - 1;
} }
} }

93
src/battle_util.c
View File

@ -2104,6 +2104,7 @@ enum
ENDTURN_ION_DELUGE, ENDTURN_ION_DELUGE,
ENDTURN_FAIRY_LOCK, ENDTURN_FAIRY_LOCK,
ENDTURN_RETALIATE, ENDTURN_RETALIATE,
ENDTURN_WEATHER_FORM,
ENDTURN_FIELD_COUNT, ENDTURN_FIELD_COUNT,
}; };
@ -2551,6 +2552,10 @@ u8 DoFieldEndTurnEffects(void)
gSideTimers[B_SIDE_OPPONENT].retaliateTimer--; gSideTimers[B_SIDE_OPPONENT].retaliateTimer--;
gBattleStruct->turnCountersTracker++; gBattleStruct->turnCountersTracker++;
break; break;
case ENDTURN_WEATHER_FORM:
AbilityBattleEffects(ABILITYEFFECT_WEATHER_FORM, 0, 0, 0, 0);
gBattleStruct->turnCountersTracker++;
break;
case ENDTURN_FIELD_COUNT: case ENDTURN_FIELD_COUNT:
effect++; effect++;
break; break;
@ -3902,21 +3907,49 @@ u8 TryWeatherFormChange(u8 battler)
bool32 weatherEffect = WEATHER_HAS_EFFECT; bool32 weatherEffect = WEATHER_HAS_EFFECT;
u16 holdEffect = GetBattlerHoldEffect(battler, TRUE); u16 holdEffect = GetBattlerHoldEffect(battler, TRUE);
if (gBattleMons[battler].species == SPECIES_CASTFORM) switch (gBattleMons[battler].species)
{ {
case SPECIES_CASTFORM:
#ifdef POKEMON_EXPANSION
case SPECIES_CASTFORM_RAINY:
case SPECIES_CASTFORM_SNOWY:
case SPECIES_CASTFORM_SUNNY:
#endif
#if B_WEATHER_FORMS >= GEN_5
if (gBattleMons[battler].hp == 0)
{
ret = 0; // No change
}
else if (GetBattlerAbility(battler) != ABILITY_FORECAST || !weatherEffect)
{
if (!IS_BATTLER_OF_TYPE(battler, TYPE_NORMAL))
{
SET_BATTLER_TYPE(battler, TYPE_NORMAL);
ret = CASTFORM_NORMAL + 1;
}
else
{
ret = 0; // No change
}
}
#else
if (GetBattlerAbility(battler) != ABILITY_FORECAST || gBattleMons[battler].hp == 0) if (GetBattlerAbility(battler) != ABILITY_FORECAST || gBattleMons[battler].hp == 0)
{ {
ret = 0; // No change ret = 0; // No change
} }
else if (!weatherEffect && !IS_BATTLER_OF_TYPE(battler, TYPE_NORMAL))
{
SET_BATTLER_TYPE(battler, TYPE_NORMAL);
ret = CASTFORM_NORMAL + 1;
}
else if (!weatherEffect) else if (!weatherEffect)
{ {
ret = 0; // No change if (!IS_BATTLER_OF_TYPE(battler, TYPE_NORMAL))
{
SET_BATTLER_TYPE(battler, TYPE_NORMAL);
ret = CASTFORM_NORMAL + 1;
}
else
{
ret = 0; // No change
}
} }
#endif
else if (holdEffect == HOLD_EFFECT_UTILITY_UMBRELLA || (!(gBattleWeather & (B_WEATHER_RAIN | B_WEATHER_SUN | B_WEATHER_HAIL)) && !IS_BATTLER_OF_TYPE(battler, TYPE_NORMAL))) else if (holdEffect == HOLD_EFFECT_UTILITY_UMBRELLA || (!(gBattleWeather & (B_WEATHER_RAIN | B_WEATHER_SUN | B_WEATHER_HAIL)) && !IS_BATTLER_OF_TYPE(battler, TYPE_NORMAL)))
{ {
SET_BATTLER_TYPE(battler, TYPE_NORMAL); SET_BATTLER_TYPE(battler, TYPE_NORMAL);
@ -3937,15 +3970,25 @@ u8 TryWeatherFormChange(u8 battler)
SET_BATTLER_TYPE(battler, TYPE_ICE); SET_BATTLER_TYPE(battler, TYPE_ICE);
ret = CASTFORM_ICE + 1; ret = CASTFORM_ICE + 1;
} }
} break;
else if (gBattleMons[battler].species == SPECIES_CHERRIM) case SPECIES_CHERRIM:
{ #ifdef POKEMON_EXPANSION
if (GetBattlerAbility(battler) != ABILITY_FLOWER_GIFT || gBattleMons[battler].hp == 0) case SPECIES_CHERRIM_SUNSHINE:
#endif
if (gBattleMons[battler].hp == 0)
ret = 0; // No change ret = 0; // No change
#if B_WEATHER_FORMS >= GEN_5
if (GetBattlerAbility(battler) != ABILITY_FLOWER_GIFT)
if (gBattleMonForms[battler] != 0)
ret = CHERRIM_OVERCAST + 1;
else
ret = 0; // No change
#endif
else if (gBattleMonForms[battler] == 0 && weatherEffect && holdEffect != HOLD_EFFECT_UTILITY_UMBRELLA && gBattleWeather & B_WEATHER_SUN) else if (gBattleMonForms[battler] == 0 && weatherEffect && holdEffect != HOLD_EFFECT_UTILITY_UMBRELLA && gBattleWeather & B_WEATHER_SUN)
ret = CHERRIM_SUNSHINE + 1; ret = CHERRIM_SUNSHINE + 1;
else if (gBattleMonForms[battler] != 0 && (!weatherEffect || holdEffect == HOLD_EFFECT_UTILITY_UMBRELLA || !(gBattleWeather & B_WEATHER_SUN))) else if (gBattleMonForms[battler] != 0 && (!weatherEffect || holdEffect == HOLD_EFFECT_UTILITY_UMBRELLA || !(gBattleWeather & B_WEATHER_SUN)))
ret = CHERRIM_OVERCAST + 1; ret = CHERRIM_OVERCAST + 1;
break;
} }
return ret; return ret;
@ -4543,11 +4586,15 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move
} }
break; break;
case ABILITY_FORECAST: case ABILITY_FORECAST:
#if B_WEATHER_FORMS >= GEN_5
case ABILITY_FLOWER_GIFT: case ABILITY_FLOWER_GIFT:
#else
TRY_WEATHER_FORM:
#endif
effect = TryWeatherFormChange(battler); effect = TryWeatherFormChange(battler);
if (effect) if (effect)
{ {
BattleScriptPushCursorAndCallback(BattleScript_CastformChange); BattleScriptPushCursorAndCallback(BattleScript_WeatherFormChange);
*(&gBattleStruct->formToChangeInto) = effect - 1; *(&gBattleStruct->formToChangeInto) = effect - 1;
} }
break; break;
@ -4623,6 +4670,12 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move
effect++; effect++;
} }
break; break;
#if B_WEATHER_FORMS < GEN_5
default:
if (gBattleMons[battler].species == SPECIES_CHERRIM)
goto TRY_WEATHER_FORM;
break;
#endif
} }
break; break;
case ABILITYEFFECT_ENDTURN: // 1 case ABILITYEFFECT_ENDTURN: // 1
@ -5627,20 +5680,28 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u16 ability, u8 special, u16 move
} }
} }
break; break;
case ABILITYEFFECT_FORECAST: // 6 case ABILITYEFFECT_WEATHER_FORM: // 6
for (battler = 0; battler < gBattlersCount; battler++) for (battler = 0; battler < gBattlersCount; battler++)
{ {
u16 battlerAbility = GetBattlerAbility(battler); switch (gBattleMons[battler].species)
if (battlerAbility == ABILITY_FORECAST || battlerAbility == ABILITY_FLOWER_GIFT)
{ {
case SPECIES_CASTFORM:
case SPECIES_CHERRIM:
#ifdef POKEMON_EXPANSION
case SPECIES_CASTFORM_RAINY:
case SPECIES_CASTFORM_SNOWY:
case SPECIES_CASTFORM_SUNNY:
case SPECIES_CHERRIM_SUNSHINE:
#endif
effect = TryWeatherFormChange(battler); effect = TryWeatherFormChange(battler);
if (effect) if (effect)
{ {
BattleScriptPushCursorAndCallback(BattleScript_CastformChange); BattleScriptPushCursorAndCallback(BattleScript_WeatherFormChange);
gBattleScripting.battler = battler; gBattleScripting.battler = battler;
gBattleStruct->formToChangeInto = effect - 1; gBattleStruct->formToChangeInto = effect - 1;
return effect; return effect;
} }
break;
} }
} }
break; break;