dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix multiline conditional parentheses and indentation

Browse Source
This commit is contained in:
PikalaxALT
2019-10-24 16:37:44 -04:00
parent a18e9c27e1
commit c0f4afeb17
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/field_specials.c
+6 -3
View File
@@ -198,8 +198,9 @@ bool8 Special_PlayerHasGrassPokemonInParty(void)
for (i = 0; i < PARTY_SIZE; i++) for (i = 0; i < PARTY_SIZE; i++)
{ {
pokemon = &gPlayerParty[i]; pokemon = &gPlayerParty[i];
if ( GetMonData(pokemon, MON_DATA_SANITY_HAS_SPECIES) if (GetMonData(pokemon, MON_DATA_SANITY_HAS_SPECIES)
&& !GetMonData(pokemon, MON_DATA_IS_EGG)) && !GetMonData(pokemon, MON_DATA_IS_EGG)
)
{ {
species = GetMonData(pokemon, MON_DATA_SPECIES); species = GetMonData(pokemon, MON_DATA_SPECIES);
if (gBaseStats[species].type1 == TYPE_GRASS || gBaseStats[species].type2 == TYPE_GRASS) if (gBaseStats[species].type1 == TYPE_GRASS || gBaseStats[species].type2 == TYPE_GRASS)
@@ -1582,6 +1583,7 @@ void ChangeBoxPokemonNickname(void)
u8 gender; u8 gender;
u32 personality; u32 personality;
GetBoxMonData(pokemon, MON_DATA_NICKNAME, gStringVar3); GetBoxMonData(pokemon, MON_DATA_NICKNAME, gStringVar3);
GetBoxMonData(pokemon, MON_DATA_NICKNAME, gStringVar2); GetBoxMonData(pokemon, MON_DATA_NICKNAME, gStringVar2);
species = GetBoxMonData(pokemon, MON_DATA_SPECIES, NULL); species = GetBoxMonData(pokemon, MON_DATA_SPECIES, NULL);
@@ -2250,7 +2252,8 @@ bool8 CutMoveRuinValleyCheck(void)
&& gSaveBlock1Ptr->location.mapNum == MAP_NUM(SIX_ISLAND_RUIN_VALLEY) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(SIX_ISLAND_RUIN_VALLEY)
&& gSaveBlock1Ptr->pos.x == 24 && gSaveBlock1Ptr->pos.x == 24
&& gSaveBlock1Ptr->pos.y == 25 && gSaveBlock1Ptr->pos.y == 25
&& GetPlayerFacingDirection() == DIR_NORTH) && GetPlayerFacingDirection() == DIR_NORTH
)
return TRUE; return TRUE;
else else
return FALSE; return FALSE;