fixed various problems

2 files changed, 160 insertions, 158 deletions

diff --git a/src/data/pokemon/cry_ids.h b/src/data/pokemon/cry_ids.h
index 1b42af55f..450657cd0 100644
--- a/src/data/pokemon/cry_ids.h
+++ b/src/data/pokemon/cry_ids.h
@@ -1,138 +1,140 @@
-static const u16 sSpeciesIdToCryId[] =
+#define HOENN_MON_SPECIES_START 277
+
+static const u16 sHoennSpeciesIdToCryId[] =
 {
-    [SPECIES_TREECKO - 277] = 273,
-    [SPECIES_GROVYLE - 277] = 274,
-    [SPECIES_SCEPTILE - 277] = 275,
-    [SPECIES_TORCHIC - 277] = 270,
-    [SPECIES_COMBUSKEN - 277] = 271,
-    [SPECIES_BLAZIKEN - 277] = 272,
-    [SPECIES_MUDKIP - 277] = 276,
-    [SPECIES_MARSHTOMP - 277] = 277,
-    [SPECIES_SWAMPERT - 277] = 278,
-    [SPECIES_POOCHYENA - 277] = 359,
-    [SPECIES_MIGHTYENA - 277] = 360,
-    [SPECIES_ZIGZAGOON - 277] = 378,
-    [SPECIES_LINOONE - 277] = 375,
-    [SPECIES_WURMPLE - 277] = 290,
-    [SPECIES_SILCOON - 277] = 291,
-    [SPECIES_BEAUTIFLY - 277] = 292,
-    [SPECIES_CASCOON - 277] = 293,
-    [SPECIES_DUSTOX - 277] = 294,
-    [SPECIES_LOTAD - 277] = 283,
-    [SPECIES_LOMBRE - 277] = 284,
-    [SPECIES_LUDICOLO - 277] = 285,
-    [SPECIES_SEEDOT - 277] = 286,
-    [SPECIES_NUZLEAF - 277] = 287,
-    [SPECIES_SHIFTRY - 277] = 288,
-    [SPECIES_NINCADA - 277] = 301,
-    [SPECIES_NINJASK - 277] = 302,
-    [SPECIES_SHEDINJA - 277] = 303,
-    [SPECIES_TAILLOW - 277] = 266,
-    [SPECIES_SWELLOW - 277] = 267,
-    [SPECIES_SHROOMISH - 277] = 374,
-    [SPECIES_BRELOOM - 277] = 373,
-    [SPECIES_SPINDA - 277] = 269,
-    [SPECIES_WINGULL - 277] = 280,
-    [SPECIES_PELIPPER - 277] = 279,
-    [SPECIES_SURSKIT - 277] = 310,
-    [SPECIES_MASQUERAIN - 277] = 311,
-    [SPECIES_WAILMER - 277] = 377,
-    [SPECIES_WAILORD - 277] = 381,
-    [SPECIES_SKITTY - 277] = 312,
-    [SPECIES_DELCATTY - 277] = 313,
-    [SPECIES_KECLEON - 277] = 251,
-    [SPECIES_BALTOY - 277] = 329,
-    [SPECIES_CLAYDOL - 277] = 330,
-    [SPECIES_NOSEPASS - 277] = 306,
-    [SPECIES_TORKOAL - 277] = 253,
-    [SPECIES_SABLEYE - 277] = 362,
-    [SPECIES_BARBOACH - 277] = 318,
-    [SPECIES_WHISCASH - 277] = 319,
-    [SPECIES_LUVDISC - 277] = 368,
-    [SPECIES_CORPHISH - 277] = 320,
-    [SPECIES_CRAWDAUNT - 277] = 321,
-    [SPECIES_FEEBAS - 277] = 333,
-    [SPECIES_MILOTIC - 277] = 334,
-    [SPECIES_CARVANHA - 277] = 289,
-    [SPECIES_SHARPEDO - 277] = 260,
-    [SPECIES_TRAPINCH - 277] = 324,
-    [SPECIES_VIBRAVA - 277] = 325,
-    [SPECIES_FLYGON - 277] = 326,
-    [SPECIES_MAKUHITA - 277] = 304,
-    [SPECIES_HARIYAMA - 277] = 305,
-    [SPECIES_ELECTRIKE - 277] = 254,
-    [SPECIES_MANECTRIC - 277] = 255,
-    [SPECIES_NUMEL - 277] = 316,
-    [SPECIES_CAMERUPT - 277] = 317,
-    [SPECIES_SPHEAL - 277] = 338,
-    [SPECIES_SEALEO - 277] = 339,
-    [SPECIES_WALREIN - 277] = 340,
-    [SPECIES_CACNEA - 277] = 327,
-    [SPECIES_CACTURNE - 277] = 328,
-    [SPECIES_SNORUNT - 277] = 383,
-    [SPECIES_GLALIE - 277] = 307,
-    [SPECIES_LUNATONE - 277] = 331,
-    [SPECIES_SOLROCK - 277] = 332,
-    [SPECIES_AZURILL - 277] = 262,
-    [SPECIES_SPOINK - 277] = 322,
-    [SPECIES_GRUMPIG - 277] = 323,
-    [SPECIES_PLUSLE - 277] = 308,
-    [SPECIES_MINUN - 277] = 309,
-    [SPECIES_MAWILE - 277] = 363,
-    [SPECIES_MEDITITE - 277] = 336,
-    [SPECIES_MEDICHAM - 277] = 337,
-    [SPECIES_SWABLU - 277] = 263,
-    [SPECIES_ALTARIA - 277] = 264,
-    [SPECIES_WYNAUT - 277] = 258,
-    [SPECIES_DUSKULL - 277] = 256,
-    [SPECIES_DUSCLOPS - 277] = 361,
-    [SPECIES_ROSELIA - 277] = 252,
-    [SPECIES_SLAKOTH - 277] = 298,
-    [SPECIES_VIGOROTH - 277] = 299,
-    [SPECIES_SLAKING - 277] = 300,
-    [SPECIES_GULPIN - 277] = 314,
-    [SPECIES_SWALOT - 277] = 315,
-    [SPECIES_TROPIUS - 277] = 376,
-    [SPECIES_WHISMUR - 277] = 382,
-    [SPECIES_LOUDRED - 277] = 380,
-    [SPECIES_EXPLOUD - 277] = 379,
-    [SPECIES_CLAMPERL - 277] = 341,
-    [SPECIES_HUNTAIL - 277] = 342,
-    [SPECIES_GOREBYSS - 277] = 343,
-    [SPECIES_ABSOL - 277] = 335,
-    [SPECIES_SHUPPET - 277] = 282,
-    [SPECIES_BANETTE - 277] = 281,
-    [SPECIES_SEVIPER - 277] = 259,
-    [SPECIES_ZANGOOSE - 277] = 261,
-    [SPECIES_RELICANTH - 277] = 367,
-    [SPECIES_ARON - 277] = 364,
-    [SPECIES_LAIRON - 277] = 365,
-    [SPECIES_AGGRON - 277] = 366,
-    [SPECIES_CASTFORM - 277] = 356,
-    [SPECIES_VOLBEAT - 277] = 357,
-    [SPECIES_ILLUMISE - 277] = 358,
-    [SPECIES_LILEEP - 277] = 344,
-    [SPECIES_CRADILY - 277] = 345,
-    [SPECIES_ANORITH - 277] = 346,
-    [SPECIES_ARMALDO - 277] = 347,
-    [SPECIES_RALTS - 277] = 295,
-    [SPECIES_KIRLIA - 277] = 296,
-    [SPECIES_GARDEVOIR - 277] = 297,
-    [SPECIES_BAGON - 277] = 351,
-    [SPECIES_SHELGON - 277] = 352,
-    [SPECIES_SALAMENCE - 277] = 372,
-    [SPECIES_BELDUM - 277] = 348,
-    [SPECIES_METANG - 277] = 349,
-    [SPECIES_METAGROSS - 277] = 350,
-    [SPECIES_REGIROCK - 277] = 353,
-    [SPECIES_REGICE - 277] = 354,
-    [SPECIES_REGISTEEL - 277] = 355,
-    [SPECIES_KYOGRE - 277] = 370,
-    [SPECIES_GROUDON - 277] = 369,
-    [SPECIES_RAYQUAZA - 277] = 371,
-    [SPECIES_LATIAS - 277] = 257,
-    [SPECIES_LATIOS - 277] = 384,
-    [SPECIES_JIRACHI - 277] = 385,
-    [SPECIES_DEOXYS - 277] = 386,
-    [SPECIES_CHIMECHO - 277] = 387,
+    [SPECIES_TREECKO - HOENN_MON_SPECIES_START] = 273,
+    [SPECIES_GROVYLE - HOENN_MON_SPECIES_START] = 274,
+    [SPECIES_SCEPTILE - HOENN_MON_SPECIES_START] = 275,
+    [SPECIES_TORCHIC - HOENN_MON_SPECIES_START] = 270,
+    [SPECIES_COMBUSKEN - HOENN_MON_SPECIES_START] = 271,
+    [SPECIES_BLAZIKEN - HOENN_MON_SPECIES_START] = 272,
+    [SPECIES_MUDKIP - HOENN_MON_SPECIES_START] = 276,
+    [SPECIES_MARSHTOMP - HOENN_MON_SPECIES_START] = 277,
+    [SPECIES_SWAMPERT - HOENN_MON_SPECIES_START] = 278,
+    [SPECIES_POOCHYENA - HOENN_MON_SPECIES_START] = 359,
+    [SPECIES_MIGHTYENA - HOENN_MON_SPECIES_START] = 360,
+    [SPECIES_ZIGZAGOON - HOENN_MON_SPECIES_START] = 378,
+    [SPECIES_LINOONE - HOENN_MON_SPECIES_START] = 375,
+    [SPECIES_WURMPLE - HOENN_MON_SPECIES_START] = 290,
+    [SPECIES_SILCOON - HOENN_MON_SPECIES_START] = 291,
+    [SPECIES_BEAUTIFLY - HOENN_MON_SPECIES_START] = 292,
+    [SPECIES_CASCOON - HOENN_MON_SPECIES_START] = 293,
+    [SPECIES_DUSTOX - HOENN_MON_SPECIES_START] = 294,
+    [SPECIES_LOTAD - HOENN_MON_SPECIES_START] = 283,
+    [SPECIES_LOMBRE - HOENN_MON_SPECIES_START] = 284,
+    [SPECIES_LUDICOLO - HOENN_MON_SPECIES_START] = 285,
+    [SPECIES_SEEDOT - HOENN_MON_SPECIES_START] = 286,
+    [SPECIES_NUZLEAF - HOENN_MON_SPECIES_START] = 287,
+    [SPECIES_SHIFTRY - HOENN_MON_SPECIES_START] = 288,
+    [SPECIES_NINCADA - HOENN_MON_SPECIES_START] = 301,
+    [SPECIES_NINJASK - HOENN_MON_SPECIES_START] = 302,
+    [SPECIES_SHEDINJA - HOENN_MON_SPECIES_START] = 303,
+    [SPECIES_TAILLOW - HOENN_MON_SPECIES_START] = 266,
+    [SPECIES_SWELLOW - HOENN_MON_SPECIES_START] = 267,
+    [SPECIES_SHROOMISH - HOENN_MON_SPECIES_START] = 374,
+    [SPECIES_BRELOOM - HOENN_MON_SPECIES_START] = 373,
+    [SPECIES_SPINDA - HOENN_MON_SPECIES_START] = 269,
+    [SPECIES_WINGULL - HOENN_MON_SPECIES_START] = 280,
+    [SPECIES_PELIPPER - HOENN_MON_SPECIES_START] = 279,
+    [SPECIES_SURSKIT - HOENN_MON_SPECIES_START] = 310,
+    [SPECIES_MASQUERAIN - HOENN_MON_SPECIES_START] = 311,
+    [SPECIES_WAILMER - HOENN_MON_SPECIES_START] = 377,
+    [SPECIES_WAILORD - HOENN_MON_SPECIES_START] = 381,
+    [SPECIES_SKITTY - HOENN_MON_SPECIES_START] = 312,
+    [SPECIES_DELCATTY - HOENN_MON_SPECIES_START] = 313,
+    [SPECIES_KECLEON - HOENN_MON_SPECIES_START] = 251,
+    [SPECIES_BALTOY - HOENN_MON_SPECIES_START] = 329,
+    [SPECIES_CLAYDOL - HOENN_MON_SPECIES_START] = 330,
+    [SPECIES_NOSEPASS - HOENN_MON_SPECIES_START] = 306,
+    [SPECIES_TORKOAL - HOENN_MON_SPECIES_START] = 253,
+    [SPECIES_SABLEYE - HOENN_MON_SPECIES_START] = 362,
+    [SPECIES_BARBOACH - HOENN_MON_SPECIES_START] = 318,
+    [SPECIES_WHISCASH - HOENN_MON_SPECIES_START] = 319,
+    [SPECIES_LUVDISC - HOENN_MON_SPECIES_START] = 368,
+    [SPECIES_CORPHISH - HOENN_MON_SPECIES_START] = 320,
+    [SPECIES_CRAWDAUNT - HOENN_MON_SPECIES_START] = 321,
+    [SPECIES_FEEBAS - HOENN_MON_SPECIES_START] = 333,
+    [SPECIES_MILOTIC - HOENN_MON_SPECIES_START] = 334,
+    [SPECIES_CARVANHA - HOENN_MON_SPECIES_START] = 289,
+    [SPECIES_SHARPEDO - HOENN_MON_SPECIES_START] = 260,
+    [SPECIES_TRAPINCH - HOENN_MON_SPECIES_START] = 324,
+    [SPECIES_VIBRAVA - HOENN_MON_SPECIES_START] = 325,
+    [SPECIES_FLYGON - HOENN_MON_SPECIES_START] = 326,
+    [SPECIES_MAKUHITA - HOENN_MON_SPECIES_START] = 304,
+    [SPECIES_HARIYAMA - HOENN_MON_SPECIES_START] = 305,
+    [SPECIES_ELECTRIKE - HOENN_MON_SPECIES_START] = 254,
+    [SPECIES_MANECTRIC - HOENN_MON_SPECIES_START] = 255,
+    [SPECIES_NUMEL - HOENN_MON_SPECIES_START] = 316,
+    [SPECIES_CAMERUPT - HOENN_MON_SPECIES_START] = 317,
+    [SPECIES_SPHEAL - HOENN_MON_SPECIES_START] = 338,
+    [SPECIES_SEALEO - HOENN_MON_SPECIES_START] = 339,
+    [SPECIES_WALREIN - HOENN_MON_SPECIES_START] = 340,
+    [SPECIES_CACNEA - HOENN_MON_SPECIES_START] = 327,
+    [SPECIES_CACTURNE - HOENN_MON_SPECIES_START] = 328,
+    [SPECIES_SNORUNT - HOENN_MON_SPECIES_START] = 383,
+    [SPECIES_GLALIE - HOENN_MON_SPECIES_START] = 307,
+    [SPECIES_LUNATONE - HOENN_MON_SPECIES_START] = 331,
+    [SPECIES_SOLROCK - HOENN_MON_SPECIES_START] = 332,
+    [SPECIES_AZURILL - HOENN_MON_SPECIES_START] = 262,
+    [SPECIES_SPOINK - HOENN_MON_SPECIES_START] = 322,
+    [SPECIES_GRUMPIG - HOENN_MON_SPECIES_START] = 323,
+    [SPECIES_PLUSLE - HOENN_MON_SPECIES_START] = 308,
+    [SPECIES_MINUN - HOENN_MON_SPECIES_START] = 309,
+    [SPECIES_MAWILE - HOENN_MON_SPECIES_START] = 363,
+    [SPECIES_MEDITITE - HOENN_MON_SPECIES_START] = 336,
+    [SPECIES_MEDICHAM - HOENN_MON_SPECIES_START] = 337,
+    [SPECIES_SWABLU - HOENN_MON_SPECIES_START] = 263,
+    [SPECIES_ALTARIA - HOENN_MON_SPECIES_START] = 264,
+    [SPECIES_WYNAUT - HOENN_MON_SPECIES_START] = 258,
+    [SPECIES_DUSKULL - HOENN_MON_SPECIES_START] = 256,
+    [SPECIES_DUSCLOPS - HOENN_MON_SPECIES_START] = 361,
+    [SPECIES_ROSELIA - HOENN_MON_SPECIES_START] = 252,
+    [SPECIES_SLAKOTH - HOENN_MON_SPECIES_START] = 298,
+    [SPECIES_VIGOROTH - HOENN_MON_SPECIES_START] = 299,
+    [SPECIES_SLAKING - HOENN_MON_SPECIES_START] = 300,
+    [SPECIES_GULPIN - HOENN_MON_SPECIES_START] = 314,
+    [SPECIES_SWALOT - HOENN_MON_SPECIES_START] = 315,
+    [SPECIES_TROPIUS - HOENN_MON_SPECIES_START] = 376,
+    [SPECIES_WHISMUR - HOENN_MON_SPECIES_START] = 382,
+    [SPECIES_LOUDRED - HOENN_MON_SPECIES_START] = 380,
+    [SPECIES_EXPLOUD - HOENN_MON_SPECIES_START] = 379,
+    [SPECIES_CLAMPERL - HOENN_MON_SPECIES_START] = 341,
+    [SPECIES_HUNTAIL - HOENN_MON_SPECIES_START] = 342,
+    [SPECIES_GOREBYSS - HOENN_MON_SPECIES_START] = 343,
+    [SPECIES_ABSOL - HOENN_MON_SPECIES_START] = 335,
+    [SPECIES_SHUPPET - HOENN_MON_SPECIES_START] = 282,
+    [SPECIES_BANETTE - HOENN_MON_SPECIES_START] = 281,
+    [SPECIES_SEVIPER - HOENN_MON_SPECIES_START] = 259,
+    [SPECIES_ZANGOOSE - HOENN_MON_SPECIES_START] = 261,
+    [SPECIES_RELICANTH - HOENN_MON_SPECIES_START] = 367,
+    [SPECIES_ARON - HOENN_MON_SPECIES_START] = 364,
+    [SPECIES_LAIRON - HOENN_MON_SPECIES_START] = 365,
+    [SPECIES_AGGRON - HOENN_MON_SPECIES_START] = 366,
+    [SPECIES_CASTFORM - HOENN_MON_SPECIES_START] = 356,
+    [SPECIES_VOLBEAT - HOENN_MON_SPECIES_START] = 357,
+    [SPECIES_ILLUMISE - HOENN_MON_SPECIES_START] = 358,
+    [SPECIES_LILEEP - HOENN_MON_SPECIES_START] = 344,
+    [SPECIES_CRADILY - HOENN_MON_SPECIES_START] = 345,
+    [SPECIES_ANORITH - HOENN_MON_SPECIES_START] = 346,
+    [SPECIES_ARMALDO - HOENN_MON_SPECIES_START] = 347,
+    [SPECIES_RALTS - HOENN_MON_SPECIES_START] = 295,
+    [SPECIES_KIRLIA - HOENN_MON_SPECIES_START] = 296,
+    [SPECIES_GARDEVOIR - HOENN_MON_SPECIES_START] = 297,
+    [SPECIES_BAGON - HOENN_MON_SPECIES_START] = 351,
+    [SPECIES_SHELGON - HOENN_MON_SPECIES_START] = 352,
+    [SPECIES_SALAMENCE - HOENN_MON_SPECIES_START] = 372,
+    [SPECIES_BELDUM - HOENN_MON_SPECIES_START] = 348,
+    [SPECIES_METANG - HOENN_MON_SPECIES_START] = 349,
+    [SPECIES_METAGROSS - HOENN_MON_SPECIES_START] = 350,
+    [SPECIES_REGIROCK - HOENN_MON_SPECIES_START] = 353,
+    [SPECIES_REGICE - HOENN_MON_SPECIES_START] = 354,
+    [SPECIES_REGISTEEL - HOENN_MON_SPECIES_START] = 355,
+    [SPECIES_KYOGRE - HOENN_MON_SPECIES_START] = 370,
+    [SPECIES_GROUDON - HOENN_MON_SPECIES_START] = 369,
+    [SPECIES_RAYQUAZA - HOENN_MON_SPECIES_START] = 371,
+    [SPECIES_LATIAS - HOENN_MON_SPECIES_START] = 257,
+    [SPECIES_LATIOS - HOENN_MON_SPECIES_START] = 384,
+    [SPECIES_JIRACHI - HOENN_MON_SPECIES_START] = 385,
+    [SPECIES_DEOXYS - HOENN_MON_SPECIES_START] = 386,
+    [SPECIES_CHIMECHO - HOENN_MON_SPECIES_START] = 387,
 };
diff --git a/src/pokemon.c b/src/pokemon.c
index f1ab79d65..84ef2fb63 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -1563,8 +1563,8 @@ const struct SpriteTemplate gUnknown_825DF50[] =
 
 static const u8 sSecretBaseFacilityClasses[][5] = 
 {
-    { 0x58, 0x58, 0x58, 0x58, 0x58 },
-    { 0x58, 0x58, 0x58, 0x58, 0x58 },
+    { FACILITY_CLASS_YOUNGSTER_2, FACILITY_CLASS_YOUNGSTER_2, FACILITY_CLASS_YOUNGSTER_2, FACILITY_CLASS_YOUNGSTER_2, FACILITY_CLASS_YOUNGSTER_2 },
+    { FACILITY_CLASS_YOUNGSTER_2, FACILITY_CLASS_YOUNGSTER_2, FACILITY_CLASS_YOUNGSTER_2, FACILITY_CLASS_YOUNGSTER_2, FACILITY_CLASS_YOUNGSTER_2 },
 };
 
 static const u8 sGetMonDataEVConstants[] = 
@@ -2675,25 +2675,25 @@ u8 GetGenderFromSpeciesAndPersonality(u16 species, u32 personality)
 
 void SetMultiuseSpriteTemplateToPokemon(u16 speciesTag, u8 battlerPosition)
 {
-    if(gMonSpritesGfxPtr != NULL)
+    if (gMonSpritesGfxPtr != NULL)
     {
-        if(battlerPosition >= 4)
+        if (battlerPosition >= 4)
             battlerPosition = 0;
 
         gMultiuseSpriteTemplate = gMonSpritesGfxPtr->templates[battlerPosition];
     }
     else
     {
-        if(sOakSpeechNidoranResources)
+        if (sOakSpeechNidoranResources)
         {
-            if(battlerPosition >= (s8)sOakSpeechNidoranResources->battlePosition) // why a cast?!? changing the unk0_2 type to s8 causes extra shifts, but a cast is the correct fix. why, compiler?
+            if (battlerPosition >= (s8)sOakSpeechNidoranResources->battlePosition) // why a cast?!? changing the unk0_2 type to s8 causes extra shifts, but a cast is the correct fix. why, compiler?
                 battlerPosition = 0;
 
             gMultiuseSpriteTemplate = sOakSpeechNidoranResources->templates[battlerPosition];
         }
         else
         {
-            if(battlerPosition >= 4)
+            if (battlerPosition >= 4)
                 battlerPosition = 0;
 
             gMultiuseSpriteTemplate = gUnknown_825DEF0[battlerPosition];
@@ -2706,7 +2706,7 @@ void SetMultiuseSpriteTemplateToPokemon(u16 speciesTag, u8 battlerPosition)
 void SetMultiuseSpriteTemplateToTrainerBack(u16 trainerSpriteId, u8 battlerPosition)
 {
     gMultiuseSpriteTemplate.paletteTag = trainerSpriteId;
-    if(battlerPosition == B_POSITION_PLAYER_LEFT || battlerPosition == B_POSITION_PLAYER_RIGHT)
+    if (battlerPosition == B_POSITION_PLAYER_LEFT || battlerPosition == B_POSITION_PLAYER_RIGHT)
     {
         gMultiuseSpriteTemplate = gUnknown_825DF50[trainerSpriteId];
         gMultiuseSpriteTemplate.anims = gTrainerBackAnimsPtrTable[trainerSpriteId];
@@ -4835,7 +4835,7 @@ bool8 PokemonUseItemEffects2(struct Pokemon *pkmn, u16 item, u8 partyIndex, u8 m
                         r4 = CalculatePPWithBonus(GetMonData(pkmn, MON_DATA_MOVE1 + moveIndex, NULL), GetMonData(pkmn, MON_DATA_PP_BONUSES, NULL), moveIndex);
                         if (data < 3)
                         {
-                            if(r4 <= 4)
+                            if (r4 <= 4)
                                 break;
                             /*
                             
@@ -5944,7 +5944,7 @@ _08042BD8:\n\
 
 static bool8 sub_8042BE8(struct Pokemon *mon, u32 unused, u32 healMask, u8 battleId)
 {
-    if((GetMonData(mon, MON_DATA_STATUS, NULL) & healMask) != 0)
+    if ((GetMonData(mon, MON_DATA_STATUS, NULL) & healMask) != 0)
         return TRUE;
     else
         return FALSE;
@@ -6263,15 +6263,15 @@ static u16 HoennPokedexNumToSpecies(u16 var)
 {
     u16 species;
 
-    if(!var)
+    if (!var)
         return 0;
 
     species = 0;
 
-    while(species < POKEMON_SLOTS_NUMBER - 1 && sSpeciesToHoennPokedexNum[species] != var)
+    while (species < POKEMON_SLOTS_NUMBER - 1 && sSpeciesToHoennPokedexNum[species] != var)
         species++;
 
-    if(species == POKEMON_SLOTS_NUMBER - 1)
+    if (species == POKEMON_SLOTS_NUMBER - 1)
         return 0;
 
     return species + 1;
@@ -6345,7 +6345,7 @@ u16 SpeciesToCryId(u16 species)
     if (species <= SPECIES_OLD_UNOWN_Z - 1)
         return SPECIES_UNOWN - 1;
 
-    return sSpeciesIdToCryId[species - ((SPECIES_OLD_UNOWN_Z + 1) - 1)];
+    return sHoennSpeciesIdToCryId[species - ((SPECIES_OLD_UNOWN_Z + 1) - 1)];
 }
 
 static void sub_8043338(u16 species, u32 personality, u8 *dest)
@@ -6764,9 +6764,9 @@ bool8 TryIncrementMonLevel(struct Pokemon *mon)
     u8 newLevel = level + 1;
     u32 exp = GetMonData(mon, MON_DATA_EXP, NULL);
 
-    if(level < 100)
+    if (level < 100)
     {
-        if(exp > gExperienceTables[gBaseStats[species].growthRate][newLevel])
+        if (exp > gExperienceTables[gBaseStats[species].growthRate][newLevel])
         {
             SetMonData(mon, MON_DATA_LEVEL, &newLevel);
             SetMonExpWithMaxLevelCheck(mon, species, newLevel, exp);
@@ -6907,19 +6907,19 @@ u16 sub_8043F90(u16 species)
 void ClearBattleMonForms(void)
 {
     int i;
-    for(i = 0; i < 4; i++)
+    for (i = 0; i < 4; i++)
         gBattleMonForms[i] = 0;
 }
 
 static u16 GetMUS_ForBattle(void)
 {
-    if(gBattleTypeFlags & 0x1000)
+    if (gBattleTypeFlags & 0x1000)
         return 0x12A;
-    if(gBattleTypeFlags & 0x4000)
+    if (gBattleTypeFlags & 0x4000)
         return 0x10A;
-    if(gBattleTypeFlags & 0x2)
+    if (gBattleTypeFlags & 0x2)
         return 0x10A;
-    if(gBattleTypeFlags & 0x8)
+    if (gBattleTypeFlags & 0x8)
     {
         switch (gTrainers[gTrainerBattleOpponent_A].trainerClass)
         {
@@ -7149,7 +7149,7 @@ u8 GetPlayerPartyHighestLevel(void)
     u8 level, monLevel;
 
     level = 1;
-    for(slot = 0; slot < PARTY_SIZE; ++slot)
+    for (slot = 0; slot < PARTY_SIZE; ++slot)
     {
         if (GetMonData(&gPlayerParty[slot], MON_DATA_SANITY_HAS_SPECIES, NULL) == 1 && !GetMonData(&gPlayerParty[slot], MON_DATA_SANITY_IS_EGG, NULL))
         {