atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up scrcmd PR (#5511)

Browse source 
Renamed CheckPartyHasSpecie to CheckPartyHasSpecies and cleaned up function calls
This commit is contained in:
Bassoonian 2024-10-12 19:34:05 +02:00 committed by GitHub
parent f810d7d0c0
commit eedeaf1ead
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/field_specials.h
View file

@ -35,6 +35,6 @@ void SetPCBoxToSendMon(u8 boxId);
void PreparePartyForSkyBattle(void); void PreparePartyForSkyBattle(void);
void GetObjectPosition(u16*, u16*, u32, u32); void GetObjectPosition(u16*, u16*, u32, u32);
bool32 CheckObjectAtXY(u32, u32); bool32 CheckObjectAtXY(u32, u32);
bool32 CheckPartyHasSpecie(u32); bool32 CheckPartyHasSpecies(u32);
#endif // GUARD_FIELD_SPECIALS_H #endif // GUARD_FIELD_SPECIALS_H

2
src/field_specials.c
View file

@ -4316,7 +4316,7 @@ bool32 CheckObjectAtXY(u32 x, u32 y)
return FALSE; return FALSE;
} }
bool32 CheckPartyHasSpecie(u32 givenSpecies) bool32 CheckPartyHasSpecies(u32 givenSpecies)
{ {
u32 partyIndex; u32 partyIndex;

2
src/scrcmd.c
View file

@ -2527,7 +2527,7 @@ bool8 Scrcmd_getsetpokedexflag(struct ScriptContext *ctx)
bool8 Scrcmd_checkspecies(struct ScriptContext *ctx) bool8 Scrcmd_checkspecies(struct ScriptContext *ctx)
{ {
u32 givenSpecies = VarGet(ScriptReadHalfword(ctx)); u32 givenSpecies = VarGet(ScriptReadHalfword(ctx));
gSpecialVar_Result = CheckPartyHasSpecie(givenSpecies); gSpecialVar_Result = CheckPartyHasSpecies(givenSpecies);
return FALSE; return FALSE;
} }