Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make sure Tauros-Paldea forms are defined properly without P_GEN_9_POKEMON

Browse Source
This commit is contained in:
leo60228 2023-08-22 18:30:00 -04:00
parent e10acf8b2d
commit 4e8ae5965e
No known key found for this signature in database
GPG Key ID: 6F3EB461799AD95E
5 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sound/cry_tables.inc
View File

@ -2251,9 +2251,6 @@ gCryTable::
cry Cry_Dudunsparce cry Cry_Dudunsparce
@ Gimmighoul @ Gimmighoul
cry Cry_Gimmighoul cry Cry_Gimmighoul
@ Tauros-Paldea
cry Cry_Tauros
cry Cry_Tauros
.else .else
@ Oinkologne @ Oinkologne
cry Cry_Unown cry Cry_Unown
@ -2272,10 +2269,10 @@ gCryTable::
cry Cry_Unown cry Cry_Unown
@ Gimmighoul @ Gimmighoul
cry Cry_Unown cry Cry_Unown
@ Tauros-Paldea
cry Cry_Unown
cry Cry_Unown
.endif .endif
@ Tauros-Paldea
cry Cry_Tauros
cry Cry_Tauros
.align 2 .align 2
gCryTable_Reverse:: gCryTable_Reverse::
@ -4476,9 +4473,6 @@ gCryTable_Reverse::
cry_reverse Cry_Dudunsparce cry_reverse Cry_Dudunsparce
@ Gimmighoul @ Gimmighoul
cry_reverse Cry_Gimmighoul cry_reverse Cry_Gimmighoul
@ Tauros-Paldea
cry_reverse Cry_Tauros
cry_reverse Cry_Tauros
.else .else
@ Oinkologne @ Oinkologne
cry_reverse Cry_Unown cry_reverse Cry_Unown
@ -4497,7 +4491,7 @@ gCryTable_Reverse::
cry_reverse Cry_Unown cry_reverse Cry_Unown
@ Gimmighoul @ Gimmighoul
cry_reverse Cry_Unown cry_reverse Cry_Unown
@ Tauros-Paldea
cry_reverse Cry_Unown
cry_reverse Cry_Unown
.endif .endif
@ Tauros-Paldea
cry_reverse Cry_Tauros
cry_reverse Cry_Tauros

2
src/data/pokemon/level_up_learnset_pointers.h
View File

@ -1463,8 +1463,8 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_DUDUNSPARCE_THREE_SEGMENT] = sDudunsparceLevelUpLearnset, [SPECIES_DUDUNSPARCE_THREE_SEGMENT] = sDudunsparceLevelUpLearnset,
// Gimmighoul // Gimmighoul
[SPECIES_GIMMIGHOUL_ROAMING] = sGimmighoulLevelUpLearnset, [SPECIES_GIMMIGHOUL_ROAMING] = sGimmighoulLevelUpLearnset,
#endif
// Tauros-Paldea // Tauros-Paldea
[SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = sTaurosPaldeanBlazeBreedLevelUpLearnset, [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = sTaurosPaldeanBlazeBreedLevelUpLearnset,
[SPECIES_TAUROS_PALDEAN_AQUA_BREED] = sTaurosPaldeanAquaBreedLevelUpLearnset, [SPECIES_TAUROS_PALDEAN_AQUA_BREED] = sTaurosPaldeanAquaBreedLevelUpLearnset,
#endif
}; };

2
src/data/pokemon/teachable_learnset_pointers.h
View File

@ -1463,8 +1463,8 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] =
[SPECIES_DUDUNSPARCE_THREE_SEGMENT] = sDudunsparceTeachableLearnset, [SPECIES_DUDUNSPARCE_THREE_SEGMENT] = sDudunsparceTeachableLearnset,
// Gimmighoul // Gimmighoul
[SPECIES_GIMMIGHOUL_ROAMING] = sGimmighoulTeachableLearnset, [SPECIES_GIMMIGHOUL_ROAMING] = sGimmighoulTeachableLearnset,
#endif
// Tauros-Paldea // Tauros-Paldea
[SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = sTaurosPaldeanBlazeBreedTeachableLearnset, [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = sTaurosPaldeanBlazeBreedTeachableLearnset,
[SPECIES_TAUROS_PALDEAN_AQUA_BREED] = sTaurosPaldeanAquaBreedTeachableLearnset, [SPECIES_TAUROS_PALDEAN_AQUA_BREED] = sTaurosPaldeanAquaBreedTeachableLearnset,
#endif
}; };

2
src/data/pokemon_graphics/front_pic_anims.h
View File

@ -13277,8 +13277,8 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[NUM_SPECIES + 1] =
[SPECIES_TATSUGIRI_STRETCHY] = sAnims_Tatsugiri, [SPECIES_TATSUGIRI_STRETCHY] = sAnims_Tatsugiri,
[SPECIES_DUDUNSPARCE_THREE_SEGMENT] = sAnims_Dudunsparce, [SPECIES_DUDUNSPARCE_THREE_SEGMENT] = sAnims_Dudunsparce,
[SPECIES_GIMMIGHOUL_ROAMING] = sAnims_Gimmighoul, [SPECIES_GIMMIGHOUL_ROAMING] = sAnims_Gimmighoul,
#endif
[SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = sAnims_TaurosPaldean, [SPECIES_TAUROS_PALDEAN_BLAZE_BREED] = sAnims_TaurosPaldean,
[SPECIES_TAUROS_PALDEAN_AQUA_BREED] = sAnims_TaurosPaldean, [SPECIES_TAUROS_PALDEAN_AQUA_BREED] = sAnims_TaurosPaldean,
#endif
[SPECIES_EGG] = sAnims_Egg, [SPECIES_EGG] = sAnims_Egg,
}; };

2
src/pokemon.c
View File

@ -1810,10 +1810,10 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] =
[SPECIES_DUDUNSPARCE_THREE_SEGMENT - 1] = NATIONAL_DEX_DUDUNSPARCE, [SPECIES_DUDUNSPARCE_THREE_SEGMENT - 1] = NATIONAL_DEX_DUDUNSPARCE,
// Gimmighoul // Gimmighoul
[SPECIES_GIMMIGHOUL_ROAMING - 1] = NATIONAL_DEX_GIMMIGHOUL, [SPECIES_GIMMIGHOUL_ROAMING - 1] = NATIONAL_DEX_GIMMIGHOUL,
#endif
// Tauros-Paldea // Tauros-Paldea
[SPECIES_TAUROS_PALDEAN_BLAZE_BREED - 1] = NATIONAL_DEX_TAUROS, [SPECIES_TAUROS_PALDEAN_BLAZE_BREED - 1] = NATIONAL_DEX_TAUROS,
[SPECIES_TAUROS_PALDEAN_AQUA_BREED - 1] = NATIONAL_DEX_TAUROS, [SPECIES_TAUROS_PALDEAN_AQUA_BREED - 1] = NATIONAL_DEX_TAUROS,
#endif
}; };
// Assigns all Hoenn Dex Indexes to a National Dex Index // Assigns all Hoenn Dex Indexes to a National Dex Index