Changed type1 and type2 to be consistent (#2021)

* Changed type1 and type2 in gBattleMons to match gSpeciesInfo * Changed monType1 and monType2 to monTypes to match gSpeciesInfo
2024-08-06 22:44:03 -07:00
parent 9a3c6d072b
commit 312749dd31
10 changed files with 56 additions and 58 deletions
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -276,8 +276,7 @@ struct BattlePokemon
    /*0x17*/ u32 abilityNum:1;
    /*0x18*/ s8 statStages[NUM_BATTLE_STATS];
    /*0x20*/ u8 ability;
-    /*0x21*/ u8 type1;
-    /*0x22*/ u8 type2;
+    /*0x21*/ u8 types[2];
    /*0x23*/ u8 unknown;
    /*0x24*/ u8 pp[MAX_MON_MOVES];
    /*0x28*/ u16 hp;