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

Remove trailing whitespace (#6968)

Browse Source
This commit is contained in:
Eduardo Quezada 2025-05-23 16:33:12 -04:00 committed by GitHub
parent c50ebf17d0
commit 17e570407e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
28 changed files with 79 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/field_effect_scripts.s
View File

@ -81,7 +81,7 @@ gFieldEffectScriptPointers::
.4byte gFieldEffectScript_TracksSpot @ FLDEFF_TRACKS_SPOT
.4byte gFieldEffectScript_CaveDust @ FLDEFF_CAVE_DUST
.4byte gFieldEffectScript_Defog @ FLDEFF_DEFOG
gFieldEffectScript_ExclamationMarkIcon1::
field_eff_callnative FldEff_ExclamationMarkIcon
field_eff_end

2
docs/STYLEGUIDE.md
View File

@ -202,7 +202,7 @@ if (runTasks) // correct
if (runTasks != 0) // incorrect
RunTasks();
if (!PlayerIsOutside()) // correct
RemoveSunglasses();

4
docs/team_procedures/expansion_versions.md
View File

@ -139,7 +139,7 @@ If the changelog you're making is for a minor version (Eg. 1.3.0), make sure to
#define EXPANSION_VERSION_MAJOR 1
#define EXPANSION_VERSION_MINOR 2
#define EXPANSION_VERSION_PATCH 3
// FALSE if this this version of Expansion is not a tagged commit, i.e.
// it contains unreleased changes.
-#define EXPANSION_TAGGED_RELEASE FALSE
@ -164,7 +164,7 @@ If the changelog you're making is for a minor version (Eg. 1.3.0), make sure to
#define EXPANSION_VERSION_MINOR 2
- #define EXPANSION_VERSION_PATCH 3
+ #define EXPANSION_VERSION_PATCH 4
// FALSE if this this version of Expansion is not a tagged commit, i.e.
// it contains unreleased changes.
-#define EXPANSION_TAGGED_RELEASE TRUE

18
docs/team_procedures/scope.md
View File

@ -5,9 +5,9 @@ This document is a guide for contributors and Senate to decide if a feature is w
# Definitions
* **Showdown Supported (SS)**: A core series game who's metagame can be played on Showdown.
* Includes every [core series game](https://bulbapedia.bulbagarden.net/wiki/Core_series#List_of_core_series_games) except Pokémon Legends: Arceus.
* Includes every [core series game](https://bulbapedia.bulbagarden.net/wiki/Core_series#List_of_core_series_games) except Pokémon Legends: Arceus.
* Does not include [spin-off games](https://bulbapedia.bulbagarden.net/wiki/Spin-off_Pokémon_games) such as Pokémon Colosseum, Pokémon XD, Pokémon Trozei!, etc.
* **Base Expansion Version**: "A .gba file built from an unmodified `master` or `upcoming` branch of `pokeemerald-expansion`.
* **Base Expansion Version**: "A .gba file built from an unmodified `master` or `upcoming` branch of `pokeemerald-expansion`.
* **Vanilla Emerald Version**: A .gba file built from an unmodified `master` branch of pret's `pokeemerald`.
# Guidelines
@ -19,14 +19,14 @@ A pull request meets the scope criteria if:
## In Scope Categories
1. **SS Species**: Adds Species that have appeared in a Showdown-supported title. Includes follower sprites for all defined species including battle-only ones (ie. Megas)
2. **SS Moves**: Adds Moves and Move Animations that have appeared in a Showdown-supported title
3. **SS Abilities**: Adds Abilities that have appeared in a Showdown-supported title
4. **SS Items**: Adds Items that have appeared in a Showdown-supported title
2. **SS Moves**: Adds Moves and Move Animations that have appeared in a Showdown-supported title
3. **SS Abilities**: Adds Abilities that have appeared in a Showdown-supported title
4. **SS Items**: Adds Items that have appeared in a Showdown-supported title
5. **SS Gimmicks**: Adds Gimmicks that have appeared in a Showdown-supported title (Dynamax, Mega Evolution, etc.)
6. **SS Battle Types**: Adds Special Battle Types that have appeared in a Showdown-supported title (Triple battles, etc.)
7. **SS Battle Mechanics**: Adds mechanical battle changes that have appeared in a Showdown-supported title, and allow developers to choose which generation suits them where applicable
8. **Battle AI Behaviour**: Improvements towards the capability of a human competitive player, and unique or interesting behaviours otherwise
9. **Base Link Compatibility**: The ability for two Base Expansion Version's to connect, trade, and battle one another
9. **Base Link Compatibility**: The ability for two Base Expansion Version's to connect, trade, and battle one another
10. **SS Overworld Features**: Add overworld changes / additions from Showdown-supported Pokémon titles (followers, raids, sideways stairs, etc.)
11. **SS Menu Features**: Add menu changes / additions from Showdown-supported Pokémon titles (type effectivness indicator, PC functions, etc.)
12. **Speed Up**: Optimize code to run more efficiently, take up less space, and work better overall to improves the developer and / or player experience
@ -41,7 +41,7 @@ A pull request meets the scope criteria if:
3. **Non-SS Abilities**: Adds Abilities that have NOT appeared in a Showdown-supported title
4. **Non-SS Items**: Adds Items that have NOT appeared in a Showdown-supported title
5. **Non-SS Gimmicks**: Adds Gimmicks that have NOT appeared in a Showdown-supported title (Showdown's Other Metagames, etc.)
6. **Non-SS Battle Types**: Adds Special Battle Types that have NOT appeared in a Showdown-supported title
6. **Non-SS Battle Types**: Adds Special Battle Types that have NOT appeared in a Showdown-supported title
7. **Overworld Maps**: Adds overworld maps from either Showdown-supported titles or non-Showdown-supported titles
8. **Duplicate UIs**: Adds additional user interface that covers the same functionality of an existing feature (HGSS Pokédex, BW Summary Screen, etc.)
9. **Vanilla Link Compatibility**: The ability for Base Expansion Version and Vanilla Emerald Version to connect, trade, and battle one another
@ -50,8 +50,8 @@ A pull request meets the scope criteria if:
Pull Requests that fall into this category are not in scope by default and should be brought up to maintainers, who will discuss and vote as to whether or not the feature is considered in scope. Considerations for acceptance may include invasiveness of implementation, popularity, ease of maintenance, etc.
1. **Developer Ease of Use**: Lowers barrier of entry for developers to use existing behavior
2. **Fangame Features**: Adds a popular feature from other fangames
1. **Developer Ease of Use**: Lowers barrier of entry for developers to use existing behavior
2. **Fangame Features**: Adds a popular feature from other fangames
3. **Popular Non-SS Features**: Exceptions can be made for uniquely popular or requested features (Drowsy, PLA Legend Plate, etc.)
4. **External Program**: External programs like poryscript, porymoves, etc.
5. **Intergenerational Feature Compatibility**: Addresses limitations and issues resulting from including all generational behaviours in a GBA native title, and extrapolation of features no longer supported by GameFreak

6
docs/tutorials/how_to_code_entry.md
View File

@ -46,9 +46,9 @@ void GetCodeFeedback(void)
gSpecialVar_Result = 1;
+ else if (!StringCompare(gStringVar2, sText_CaughtEmAll))
+ {
+ // TODO
+ // TODO
+ gSpecialVar_Result = 2;
+ }
+ }
else
gSpecialVar_Result = 0;
}
@ -71,7 +71,7 @@ void GetCodeFeedback(void)
+ GetSetPokedexFlag(i + 1, FLAG_SET_CAUGHT);
+ }
gSpecialVar_Result = 2;
}
}
else
gSpecialVar_Result = 0;
}

4
src/battle_controllers.c
View File

@ -3158,7 +3158,7 @@ bool32 TryShinyAnimAfterMonAnimUtil(u32 battler)
if (gSprites[gBattlerSpriteIds[battler]].callback != SpriteCallbackDummy
|| gSprites[gBattlerSpriteIds[battler]].x2 != 0)
return FALSE;
if (!gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim)
{
TryShinyAnimation(battler, GetBattlerMon(battler));
@ -3200,7 +3200,7 @@ bool32 SwitchIn_HandleSoundAndEndUtil(u32 battler)
{
if (gBattleSpritesDataPtr->healthBoxesData[battler].specialAnimActive || IsCryPlayingOrClearCrySongs())
return FALSE;
if (gSprites[gBattlerSpriteIds[battler]].callback != SpriteCallbackDummy
&& gSprites[gBattlerSpriteIds[battler]].callback != SpriteCallbackDummy_2
&& GetBattlerSide(battler) == B_SIDE_OPPONENT)

2
src/battle_message.c
View File

@ -3189,7 +3189,7 @@ static void IllusionNickHack(u32 battler, u32 partyId, u8 *dst)
id = GetIllusionMonPartyId(gEnemyParty, mon, partnerMon);
}
if (id != PARTY_SIZE)
GetMonData(&gEnemyParty[id], MON_DATA_NICKNAME, dst);
else

2
src/battle_setup.c
View File

@ -580,7 +580,7 @@ static void CB2_EndWildBattle(void)
{
CpuFill16(0, (void *)(BG_PLTT), BG_PLTT_SIZE);
ResetOamRange(0, 128);
if (IsNPCFollowerWildBattle())
{
RestorePartyAfterFollowerNPCBattle();

4
src/battle_terastal.c
View File

@ -63,10 +63,10 @@ void ApplyBattlerVisualsForTeraAnim(u32 battler)
bool32 CanTerastallize(u32 battler)
{
enum ItemHoldEffect holdEffect = GetBattlerHoldEffect(battler, FALSE);
if (gBattleMons[battler].status2 & STATUS2_TRANSFORMED && GET_BASE_SPECIES_ID(gBattleMons[battler].species) == SPECIES_TERAPAGOS)
return FALSE;
// Prevents Zigzagoon from terastalizing in vanilla.
if (gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE && !IsOnPlayerSide(battler))
return FALSE;

12
src/battle_transition.c
View File

@ -2376,7 +2376,7 @@ static bool8 Mugshot_StartOpponentSlide(struct Task *task)
sTransitionData->BG0HOFS_Upper += 8;
SetTrainerPicSlideDirection(task->tOpponentSpriteAId, 0);
if (TRAINER_BATTLE_PARAM.opponentB != TRAINER_NONE && gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
if (TRAINER_BATTLE_PARAM.opponentB != TRAINER_NONE && gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
{
SetTrainerPicSlideDirection(task->tOpponentSpriteBId, 0);
}
@ -2391,7 +2391,7 @@ static bool8 Mugshot_StartOpponentSlide(struct Task *task)
PlaySE(SE_MUGSHOT);
if (TRAINER_BATTLE_PARAM.opponentB != TRAINER_NONE && gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
if (TRAINER_BATTLE_PARAM.opponentB != TRAINER_NONE && gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
{
IncrementTrainerPicState(task->tOpponentSpriteBId);
}
@ -2589,8 +2589,8 @@ static void Mugshots_CreateTrainerPics(struct Task *task)
s16 opponentBRotationScales = 0;
gReservedSpritePaletteCount = 10;
if (TRAINER_BATTLE_PARAM.opponentB != TRAINER_NONE && gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
{
if (TRAINER_BATTLE_PARAM.opponentB != TRAINER_NONE && gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
{
task->tOpponentSpriteBId = CreateTrainerSprite(trainerBPicId,
gTrainerSprites[trainerBPicId].mugshotCoords.x - 240,
gTrainerSprites[trainerBPicId].mugshotCoords.y + 42,
@ -2605,12 +2605,12 @@ static void Mugshots_CreateTrainerPics(struct Task *task)
opponentBRotationScales = gTrainerSprites[trainerBPicId].mugshotRotation;
SetOamMatrixRotationScaling(opponentSpriteB->oam.matrixNum, opponentBRotationScales, opponentBRotationScales, 0);
}
task->tOpponentSpriteAId = CreateTrainerSprite(trainerAPicId,
gTrainerSprites[trainerAPicId].mugshotCoords.x - 32,
gTrainerSprites[trainerAPicId].mugshotCoords.y + 42,
0, NULL);
gReservedSpritePaletteCount = 12;
if (gPartnerTrainerId != TRAINER_PARTNER(PARTNER_NONE) && gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER)
{

2
src/datetime.c
View File

@ -44,7 +44,7 @@ void DateTime_AddDays(struct DateTime *dateTime, u32 days)
void DateTime_AddHours(struct DateTime *dateTime, u32 hours)
{
u32 days = 0;
dateTime->hour += hours;
while (dateTime->hour >= HOURS_PER_DAY)
{

8
src/dexnav.c
View File

@ -1737,7 +1737,7 @@ static bool8 CapturedAllLandMons(u32 headerId)
u16 i, species;
int count = 0;
enum TimeOfDay timeOfDay = GetTimeOfDayForEncounters(headerId, WILD_AREA_LAND);
const struct WildPokemonInfo *landMonsInfo = gWildMonHeaders[headerId].encounterTypes[timeOfDay].landMonsInfo;
if (landMonsInfo != NULL)
@ -1807,7 +1807,7 @@ static bool8 CapturedAllHiddenMons(u32 headerId)
enum TimeOfDay timeOfDay = GetTimeOfDayForEncounters(headerId, WILD_AREA_HIDDEN);
const struct WildPokemonInfo *hiddenMonsInfo = gWildMonHeaders[headerId].encounterTypes[timeOfDay].hiddenMonsInfo;
if (hiddenMonsInfo != NULL)
{
for (i = 0; i < HIDDEN_WILD_COUNT; ++i)
@ -1959,7 +1959,7 @@ static void DexNavLoadEncounterData(void)
const struct WildPokemonInfo *waterMonsInfo = gWildMonHeaders[headerId].encounterTypes[timeOfDay].waterMonsInfo;
timeOfDay = GetTimeOfDayForEncounters(headerId, WILD_AREA_HIDDEN);
const struct WildPokemonInfo *hiddenMonsInfo = gWildMonHeaders[headerId].encounterTypes[timeOfDay].hiddenMonsInfo;
// nop struct data
memset(sDexNavUiDataPtr->landSpecies, 0, sizeof(sDexNavUiDataPtr->landSpecies));
memset(sDexNavUiDataPtr->waterSpecies, 0, sizeof(sDexNavUiDataPtr->waterSpecies));
@ -2534,7 +2534,7 @@ bool8 TryFindHiddenPokemon(void)
enum EncounterType environment;
u8 taskId;
enum TimeOfDay timeOfDay = GetTimeOfDayForEncounters(headerId, WILD_AREA_HIDDEN);
const struct WildPokemonInfo *hiddenMonsInfo = gWildMonHeaders[headerId].encounterTypes[timeOfDay].hiddenMonsInfo;
bool8 isHiddenMon = FALSE;

16
src/evolution_scene.c
View File

@ -560,7 +560,7 @@ static void CreateShedinja(u32 preEvoSpecies, u32 postEvoSpecies, struct Pokemon
{
s32 j;
struct Pokemon *shedinja = &gPlayerParty[gPlayerPartyCount];
CopyMon(&gPlayerParty[gPlayerPartyCount], mon, sizeof(struct Pokemon));
SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_SPECIES, &evolutions[i].targetSpecies);
SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_NICKNAME, GetSpeciesName(evolutions[i].targetSpecies));
@ -571,22 +571,22 @@ static void CreateShedinja(u32 preEvoSpecies, u32 postEvoSpecies, struct Pokemon
SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_POKEBALL, &ball);
RemoveBagItem(ball, 1);
}
for (j = MON_DATA_COOL_RIBBON; j < MON_DATA_COOL_RIBBON + CONTEST_CATEGORIES_COUNT; j++)
SetMonData(&gPlayerParty[gPlayerPartyCount], j, &data);
for (j = MON_DATA_CHAMPION_RIBBON; j <= MON_DATA_WORLD_RIBBON; j++)
SetMonData(&gPlayerParty[gPlayerPartyCount], j, &data);
SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_STATUS, &data);
data = MAIL_NONE;
SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_MAIL, &data);
CalculateMonStats(&gPlayerParty[gPlayerPartyCount]);
CalculatePlayerPartyCount();
GetSetPokedexFlag(SpeciesToNationalPokedexNum(evolutions[i].targetSpecies), FLAG_SET_SEEN);
GetSetPokedexFlag(SpeciesToNationalPokedexNum(evolutions[i].targetSpecies), FLAG_SET_CAUGHT);
if (GetMonData(shedinja, MON_DATA_SPECIES) == SPECIES_SHEDINJA
&& GetMonData(shedinja, MON_DATA_LANGUAGE) == LANGUAGE_JAPANESE
&& GetMonData(mon, MON_DATA_SPECIES) == SPECIES_NINJASK)
@ -825,12 +825,12 @@ static void Task_EvolutionScene(u8 taskId)
{
StopMapMusic();
Overworld_PlaySpecialMapMusic();
}
if (!gTasks[taskId].tEvoWasStopped)
CreateShedinja(gTasks[taskId].tPreEvoSpecies, gTasks[taskId].tPostEvoSpecies, mon);
DestroyTask(taskId);
FreeMonSpritesGfx();
FREE_AND_SET_NULL(sEvoStructPtr);

6
src/field_control_avatar.c
View File

@ -226,13 +226,13 @@ int ProcessPlayerFieldInput(struct FieldInput *input)
ShowStartMenu();
return TRUE;
}
if (input->tookStep && TryFindHiddenPokemon())
return TRUE;
if (input->pressedSelectButton && UseRegisteredKeyItemOnField() == TRUE)
return TRUE;
if (input->pressedRButton && TryStartDexNavSearch())
return TRUE;

6
src/field_effect_helpers.c
View File

@ -1045,7 +1045,7 @@ u32 FldEff_ShakingGrass(void)
sprite->oam.priority = gFieldEffectArguments[3];
sprite->sWaitFldEff = FLDEFF_SHAKING_GRASS;
}
return spriteId;
}
@ -1062,7 +1062,7 @@ u32 FldEff_ShakingGrass2(void)
sprite->oam.priority = gFieldEffectArguments[3];
sprite->sWaitFldEff = FLDEFF_SHAKING_LONG_GRASS;
}
return spriteId;
}
@ -1095,7 +1095,7 @@ u32 FldEff_WaterSurfacing(void)
sprite->oam.priority = gFieldEffectArguments[3];
sprite->sWaitFldEff = FLDEFF_WATER_SURFACING;
}
return spriteId;
}

8
src/follower_npc.c
View File

@ -137,7 +137,7 @@ const u8 *GetFollowerNPCScriptPointer(void)
#if FNPC_ENABLE_NPC_FOLLOWERS
if (PlayerHasFollowerNPC())
return gSaveBlock3Ptr->NPCfollower.script;
#endif
return NULL;
}
@ -735,7 +735,7 @@ u32 DetermineFollowerNPCState(struct ObjectEvent *follower, u32 state, u32 direc
follower->facingDirectionLocked = TRUE;
newState = delayedState + (direction -1);
}
}
// Clear ice tile stuff.
follower->disableAnim = FALSE;
@ -1543,7 +1543,7 @@ void Task_MoveNPCFollowerAfterForcedMovement(u8 taskId)
// Lock follower facing direction for muddy slope.
if (follower->currentMetatileBehavior == MB_MUDDY_SLOPE)
follower->facingDirectionLocked = TRUE;
if (TryDoMetatileBehaviorForcedMovement() == 0)
gTasks[taskId].tState = NPC_INTO_PLAYER;
@ -1576,7 +1576,7 @@ void Task_MoveNPCFollowerAfterForcedMovement(u8 taskId)
void Task_HideNPCFollowerAfterMovementFinish(u8 taskId)
{
struct ObjectEvent *npcFollower = &gObjectEvents[GetFollowerNPCObjectId()];
if (ObjectEventClearHeldMovementIfFinished(npcFollower) != 0)
{
HideNPCFollower();

2
src/item_use.c
View File

@ -282,7 +282,7 @@ static void ItemUseOnFieldCB_Bike(u8 taskId)
GetOnOffBike(PLAYER_AVATAR_FLAG_MACH_BIKE);
else // ACRO_BIKE
GetOnOffBike(PLAYER_AVATAR_FLAG_ACRO_BIKE);
FollowerNPC_HandleBike();
ScriptUnfreezeObjectEvents();
UnlockPlayerFieldControls();

2
src/pokedex_area_screen.c
View File

@ -921,7 +921,7 @@ static void Task_HandlePokedexAreaScreenInput(u8 taskId)
ClearAreaWindowLabel(DEX_AREA_LABEL_AREA_UNKNOWN);
RemoveAllWindowsOnBg(LABEL_WINDOW_BG);
}
sPokedexAreaScreen->screenSwitchState[0] = gTasks[taskId].data[1];
ResetPokedexAreaMapBg();
DestroyTask(taskId);

6
src/pokedex_plus_hgss.c
View File

@ -6513,7 +6513,7 @@ static void PrintEvolutionTargetSpeciesAndMethod(u8 taskId, u16 species, u8 dept
u32 speciesNameWidthInChars = GetSpeciesNameWidthInChars(GetSpeciesName(targetSpecies));
u32 speciesNameCharWidth = GetFontAttribute(GetSpeciesNameFontId(speciesNameWidthInChars), FONTATTR_MAX_LETTER_WIDTH);
u32 speciesNameWidth = (speciesNameWidthInChars * speciesNameCharWidth);
u32 base_x_offset = speciesNameWidth + base_x + depth_offset; // for evo method info
u32 maxScreenWidth = 230 - base_x_offset;
@ -6588,7 +6588,7 @@ static void PrintEvolutionTargetSpeciesAndMethod(u8 taskId, u16 species, u8 dept
{
StringAppend(gStringVar4, COMPOUND_STRING(", "));
}
switch((enum EvolutionConditions)evolutions[i].params[j].condition)
{
// Gen 2
@ -6802,7 +6802,7 @@ static void PrintEvolutionTargetSpeciesAndMethod(u8 taskId, u16 species, u8 dept
StringAppend(gStringVar4, COMPOUND_STRING("."));
BreakStringAutomatic(gStringVar4, maxScreenWidth, MAX_EVO_METHOD_LINES, fontId, HIDE_SCROLL_PROMPT);
PrintInfoScreenTextSmall(gStringVar4, fontId, base_x_offset, base_y + base_y_offset*(*depth_i) + numLines); //Print actual instructions
(*depth_i)++;

2
src/rtc.c
View File

@ -454,7 +454,7 @@ enum Weekday GetDayOfWeek(void)
return dateTime.dayOfWeek;
}
enum TimeOfDay TryIncrementTimeOfDay(enum TimeOfDay timeOfDay)
{
return timeOfDay == TIME_NIGHT ? TIME_MORNING : timeOfDay + 1;

20
src/scrcmd.c
View File

@ -907,7 +907,7 @@ bool8 ScrCmd_gettime(struct ScriptContext *ctx)
bool8 ScrCmd_gettimeofday(struct ScriptContext *ctx)
{
Script_RequestEffects(SCREFF_V1);
gSpecialVar_0x8000 = GetTimeOfDay();
return FALSE;
}
@ -2421,7 +2421,7 @@ bool8 ScrCmd_updatecoinsbox(struct ScriptContext *ctx)
bool8 ScrCmd_trainerbattle(struct ScriptContext *ctx)
{
Script_RequestEffects(SCREFF_V1 | SCREFF_TRAINERBATTLE);
TrainerBattleLoadArgs(ctx->scriptPtr);
ctx->scriptPtr = BattleSetup_ConfigureTrainerBattle(ctx->scriptPtr);
return FALSE;
@ -3173,7 +3173,7 @@ bool8 ScrCmd_addtime(struct ScriptContext *ctx)
u32 minutes = ScriptReadWord(ctx);
Script_RequestEffects(SCREFF_V1 | SCREFF_SAVE);
FakeRtc_AdvanceTimeBy(days, hours, minutes, 0);
return FALSE;
@ -3184,7 +3184,7 @@ bool8 ScrCmd_adddays(struct ScriptContext *ctx)
u32 days = ScriptReadWord(ctx);
Script_RequestEffects(SCREFF_V1 | SCREFF_SAVE);
FakeRtc_AdvanceTimeBy(days, 0, 0, 0);
return FALSE;
@ -3195,7 +3195,7 @@ bool8 ScrCmd_addhours(struct ScriptContext *ctx)
u32 hours = ScriptReadWord(ctx);
Script_RequestEffects(SCREFF_V1 | SCREFF_SAVE);
FakeRtc_AdvanceTimeBy(0, hours, 0, 0);
return FALSE;
@ -3206,7 +3206,7 @@ bool8 ScrCmd_addminutes(struct ScriptContext *ctx)
u32 minutes = ScriptReadWord(ctx);
Script_RequestEffects(SCREFF_V1 | SCREFF_SAVE);
FakeRtc_AdvanceTimeBy(0, 0, minutes, 0);
return FALSE;
@ -3218,7 +3218,7 @@ bool8 ScrCmd_fwdtime(struct ScriptContext *ctx)
u32 minutes = ScriptReadWord(ctx);
Script_RequestEffects(SCREFF_V1 | SCREFF_SAVE);
FakeRtc_ForwardTimeTo(hours, minutes, 0);
return FALSE;
@ -3227,12 +3227,12 @@ bool8 ScrCmd_fwdtime(struct ScriptContext *ctx)
bool8 ScrCmd_fwdweekday(struct ScriptContext *ctx)
{
struct SiiRtcInfo *rtc = FakeRtc_GetCurrentTime();
u32 weekdayTarget = ScriptReadWord(ctx);
u32 daysToAdd = ((weekdayTarget - rtc->dayOfWeek) + WEEKDAY_COUNT) % WEEKDAY_COUNT;
Script_RequestEffects(SCREFF_V1 | SCREFF_SAVE);
FakeRtc_AdvanceTimeBy(daysToAdd, 0, 0, 0);
return FALSE;
}

2
src/wild_encounter.c
View File

@ -924,7 +924,7 @@ bool8 SweetScentWildEncounter(void)
if (MetatileBehavior_IsLandWildEncounter(MapGridGetMetatileBehaviorAt(x, y)) == TRUE)
{
timeOfDay = GetTimeOfDayForEncounters(headerId, WILD_AREA_LAND);
if (gWildMonHeaders[headerId].encounterTypes[timeOfDay].landMonsInfo == NULL)
return FALSE;

6
test/battle/ability/moody.c
View File

@ -4,7 +4,7 @@
SINGLE_BATTLE_TEST("Moody randomly raises the user's Attack, Defense, Sp. Atk, Sp. Def, or Speed by two stages")
{
u32 config, statsNum;
PARAMETRIZE { config = GEN_8; statsNum = NUM_STATS; }
PARAMETRIZE { config = GEN_7; statsNum = NUM_BATTLE_STATS; }
@ -29,7 +29,7 @@ SINGLE_BATTLE_TEST("Moody randomly raises the user's Attack, Defense, Sp. Atk, S
SINGLE_BATTLE_TEST("Moody randomly lowers the user's Attack, Defense, Sp. Atk, Sp. Def, or Speed by one stage")
{
u32 config, statsNum;
PARAMETRIZE { config = GEN_8; statsNum = NUM_STATS; }
PARAMETRIZE { config = GEN_7; statsNum = NUM_BATTLE_STATS; }
@ -54,7 +54,7 @@ SINGLE_BATTLE_TEST("Moody randomly lowers the user's Attack, Defense, Sp. Atk, S
SINGLE_BATTLE_TEST("Moody randomly raises the holder's Attack, Defense, Sp. Atk, Sp. Def, or Speed by two stages and lowers a different stat by one stage")
{
u32 config, statsNum;
PARAMETRIZE { config = GEN_8; statsNum = NUM_STATS; }
PARAMETRIZE { config = GEN_7; statsNum = NUM_BATTLE_STATS; }

2
test/battle/ability/steam_engine.c
View File

@ -7,7 +7,7 @@ SINGLE_BATTLE_TEST("Steam Engine raises speed when hit by a Fire or Water move")
PARAMETRIZE { move = MOVE_EMBER; }
PARAMETRIZE { move = MOVE_WATER_GUN; }
GIVEN {
PLAYER(SPECIES_COALOSSAL) { Ability(ABILITY_STEAM_ENGINE); }
OPPONENT(SPECIES_WOBBUFFET);

8
test/battle/ai/ai_doubles.c
View File

@ -132,7 +132,7 @@ AI_DOUBLE_BATTLE_TEST("AI will choose Bulldoze if it triggers its ally's ability
ASSUME(GetMoveType(MOVE_BULLDOZE) == TYPE_GROUND);
ASSUME(MoveHasAdditionalEffect(MOVE_BULLDOZE, MOVE_EFFECT_SPD_MINUS_1));
u32 species, ability, currentHP;
u32 species, ability, currentHP;
PARAMETRIZE { species = SPECIES_KINGAMBIT; ability = ABILITY_DEFIANT; currentHP = 400; }
PARAMETRIZE { species = SPECIES_SHUCKLE; ability = ABILITY_CONTRARY; currentHP = 400; }
@ -206,7 +206,7 @@ AI_DOUBLE_BATTLE_TEST("AI will choose Earthquake if it kills one opposing mon an
u32 currentHP;
PARAMETRIZE { currentHP = 1; }
PARAMETRIZE { currentHP = 200; }
GIVEN {
ASSUME(GetMoveTarget(MOVE_EARTHQUAKE) == MOVE_TARGET_FOES_AND_ALLY);
AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT);
@ -288,7 +288,7 @@ AI_DOUBLE_BATTLE_TEST("AI will only explode and kill everything on the field wit
ASSUME(GetMoveTarget(MOVE_EXPLOSION) == MOVE_TARGET_FOES_AND_ALLY);
ASSUME(GetMoveEffect(MOVE_EXPLOSION) == EFFECT_EXPLOSION);
u32 aiFlags;
u32 aiFlags;
PARAMETRIZE { aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT; }
PARAMETRIZE { aiFlags = AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT | AI_FLAG_RISKY; }
@ -332,7 +332,7 @@ AI_DOUBLE_BATTLE_TEST("AI sees corresponding absorbing abilities on partners")
PARAMETRIZE { species = SPECIES_SHELLOS; ability = ABILITY_STORM_DRAIN; move = MOVE_SURF; }
PARAMETRIZE { species = SPECIES_UNOWN; ability = ABILITY_LEVITATE; move = MOVE_EARTHQUAKE; }
PARAMETRIZE { species = SPECIES_ORTHWORM; ability = ABILITY_EARTH_EATER; move = MOVE_EARTHQUAKE; }
GIVEN {
ASSUME(GetMoveTarget(MOVE_DISCHARGE) == MOVE_TARGET_FOES_AND_ALLY);
AI_FLAGS(AI_FLAG_CHECK_BAD_MOVE | AI_FLAG_CHECK_VIABILITY | AI_FLAG_TRY_TO_FAINT | AI_FLAG_HP_AWARE);

2
test/battle/hold_effect/seeds.c
View File

@ -11,7 +11,7 @@ ASSUMPTIONS
ASSUME(gItemsInfo[ITEM_MISTY_SEED].holdEffectParam == HOLD_EFFECT_PARAM_MISTY_TERRAIN);
ASSUME(gItemsInfo[ITEM_PSYCHIC_SEED].holdEffect == HOLD_EFFECT_SEEDS);
ASSUME(gItemsInfo[ITEM_PSYCHIC_SEED].holdEffectParam == HOLD_EFFECT_PARAM_PSYCHIC_TERRAIN);
}
SINGLE_BATTLE_TEST("Electric Seed raises the holder's Defense on Electric Terrain")

2
test/battle/move_effect/pursuit.c
View File

@ -606,7 +606,7 @@ SINGLE_BATTLE_TEST("Pursuit attacks a switching foe and switchin is correctly st
case 4:
SEND_IN_MESSAGE("Venipede");
break;
}
}
}
}

2
test/battle/move_effect/roar.c
View File

@ -78,7 +78,7 @@ SINGLE_BATTLE_TEST("Roar fails against target with Guard Dog")
} WHEN {
TURN { MOVE(player, MOVE_ROAR); }
} SCENE {
NONE_OF {
NONE_OF {
ANIMATION(ANIM_TYPE_MOVE, MOVE_ROAR, player);
MESSAGE("The opposing Charmander was dragged out!");
}