Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

review comments addressed

Browse Source
This commit is contained in:
AlexOn1ine 2025-02-28 22:42:53 +01:00
parent 0a333dbdc8
commit 134d1e79c7
4 changed files with 300 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/battle.h
View File

@ -286,7 +286,7 @@ struct FieldTimer
struct WishFutureKnock
{
u8 futureSightCounter[MAX_BATTLERS_COUNT];
u16 futureSightCounter[MAX_BATTLERS_COUNT];
u8 futureSightBattlerIndex[MAX_BATTLERS_COUNT];
u8 futureSightPartyIndex[MAX_BATTLERS_COUNT];
u16 futureSightMove[MAX_BATTLERS_COUNT];

2
include/battle_util.h
View File

@ -173,7 +173,7 @@ enum SleepClauseBlock
void HandleAction_ThrowBall(void);
u32 GetCurrentBattleWeather(void);
u32 EndOrContinueWeather(void);
bool32 EndOrContinueWeather(void);
bool32 IsAffectedByFollowMe(u32 battlerAtk, u32 defSide, u32 move);
bool32 HandleMoveTargetRedirection(void);
void HandleAction_UseMove(void);

418
src/battle_end_turn.c
View File

File diff suppressed because it is too large Load Diff

10
src/battle_util.c
View File

@ -217,12 +217,12 @@ u32 GetCurrentBattleWeather(void)
return currBattleWeather;
}
u32 EndOrContinueWeather(void)
bool32 EndOrContinueWeather(void)
{
u32 currBattleWeather = GetCurrentBattleWeather();
if (currBattleWeather == 0xFF)
return 1;
return FALSE;
if (gWishFutureKnock.weatherDuration > 0 && --gWishFutureKnock.weatherDuration == 0)
{
@ -231,17 +231,17 @@ u32 EndOrContinueWeather(void)
gDisableStructs[battler].weatherAbilityDone = FALSE;
gBattleCommunication[MULTISTRING_CHOOSER] = sBattleWeatherInfo[currBattleWeather].endMessage;
BattleScriptExecute(BattleScript_WeatherFaded);
return 1;
return TRUE;
}
else
{
gBattleCommunication[MULTISTRING_CHOOSER] = sBattleWeatherInfo[currBattleWeather].continuesMessage;
gBattleScripting.animArg1 = sBattleWeatherInfo[currBattleWeather].animation;
BattleScriptExecute(BattleScript_WeatherContinues);
return 1;
return TRUE;
}
return 0;
return FALSE;
}
static u32 CalcBeatUpPower(void)