Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into gen_8_mon_data

This commit is contained in:
ultima-soul 2020-12-16 13:28:42 -08:00
commit ad67068f7e
2 changed files with 2 additions and 2 deletions

View file

@ -82,4 +82,4 @@
#define ABILITIES_COUNT 78
#endif // GUARD_CONSTANTS_ABILITIES_H
#endif // GUARD_CONSTANTS_ABILITIES_H

View file

@ -1866,7 +1866,7 @@ static const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] =
[SPECIES_WEEDLE - 1] = 0x46,
[SPECIES_KAKUNA - 1] = 0x20,
[SPECIES_BEEDRILL - 1] = 0x02,
[SPECIES_PIDGEY - 1] = 0x47,
[SPECIES_PIDGEY - 1] = 0x17,
[SPECIES_PIDGEOTTO - 1] = 0x17,
[SPECIES_PIDGEOT - 1] = 0x29,
[SPECIES_RATTATA - 1] = 0x43,