Merge branch 'master' into Unbound

This commit is contained in:
Skeli
2020-04-17 17:51:18 +03:00

View File

@@ -943,7 +943,7 @@ const u8 gMonIconPaletteIndices[NUM_SPECIES] =
[SPECIES_VIVILLON_TUNDRA] = 0x0,
[SPECIES_ROWLET] = 0x0,
[SPECIES_DARTRIX] = 0x1,
[SPECIES_DECIDUEYE] = 0x0,
[SPECIES_DECIDUEYE] = 0x1,
[SPECIES_LITTEN] = 0x0,
[SPECIES_TORRACAT] = 0x0,
[SPECIES_INCINEROAR] = 0x0,