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

Species Simplifier™ - Part 1 (#3544)

Browse Source 
Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
This commit is contained in:
Eduardo Quezada D'Ottone 2023-11-09 11:43:35 -03:00 committed by GitHub
parent 96361a85e0
commit b29538f23d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 7450 additions and 8496 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/data/pokemon/form_species_table_pointers.h
View File

@ -684,8 +684,12 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
[SPECIES_LAPRAS_GIGANTAMAX] = sLaprasFormSpeciesIdTable,
[SPECIES_EEVEE_GIGANTAMAX] = sEeveeFormSpeciesIdTable,
[SPECIES_SNORLAX_GIGANTAMAX] = sSnorlaxFormSpeciesIdTable,
#if P_GEN_5_POKEMON == TRUE
[SPECIES_GARBODOR_GIGANTAMAX] = sGarbodorFormSpeciesIdTable,
#endif
#if P_GEN_7_POKEMON == TRUE
[SPECIES_MELMETAL_GIGANTAMAX] = sMelmetalFormSpeciesIdTable,
#endif
[SPECIES_RILLABOOM_GIGANTAMAX] = sRillaboomFormSpeciesIdTable,
[SPECIES_CINDERACE_GIGANTAMAX] = sCinderaceFormSpeciesIdTable,
[SPECIES_INTELEON_GIGANTAMAX] = sInteleonFormSpeciesIdTable,

5
src/data/pokemon/form_species_tables.h
View File

@ -1105,14 +1105,15 @@ static const u16 sMagearnaFormSpeciesIdTable[] = {
SPECIES_MAGEARNA_ORIGINAL_COLOR,
FORM_SPECIES_END,
};
#endif
#if P_GEN_8_POKEMON == TRUE
static const u16 sMelmetalFormSpeciesIdTable[] = {
SPECIES_MELMETAL,
SPECIES_MELMETAL_GIGANTAMAX,
FORM_SPECIES_END,
};
#endif
#if P_GEN_8_POKEMON == TRUE
static const u16 sRillaboomFormSpeciesIdTable[] = {
SPECIES_RILLABOOM,

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

@ -1540,8 +1540,12 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_LAPRAS_GIGANTAMAX] = sLaprasLevelUpLearnset,
[SPECIES_EEVEE_GIGANTAMAX] = sEeveeLevelUpLearnset,
[SPECIES_SNORLAX_GIGANTAMAX] = sSnorlaxLevelUpLearnset,
#if P_GEN_5_POKEMON == TRUE
[SPECIES_GARBODOR_GIGANTAMAX] = sGarbodorLevelUpLearnset,
#endif
#if P_GEN_7_POKEMON == TRUE
[SPECIES_MELMETAL_GIGANTAMAX] = sMelmetalLevelUpLearnset,
#endif
[SPECIES_RILLABOOM_GIGANTAMAX] = sRillaboomLevelUpLearnset,
[SPECIES_CINDERACE_GIGANTAMAX] = sCinderaceLevelUpLearnset,
[SPECIES_INTELEON_GIGANTAMAX] = sInteleonLevelUpLearnset,

15927
src/data/pokemon/species_info.h
View File

File diff suppressed because it is too large Load Diff

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

@ -1540,8 +1540,12 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] =
[SPECIES_LAPRAS_GIGANTAMAX] = sLaprasTeachableLearnset,
[SPECIES_EEVEE_GIGANTAMAX] = sEeveeTeachableLearnset,
[SPECIES_SNORLAX_GIGANTAMAX] = sSnorlaxTeachableLearnset,
#if P_GEN_5_POKEMON == TRUE
[SPECIES_GARBODOR_GIGANTAMAX] = sGarbodorTeachableLearnset,
#endif
#if P_GEN_7_POKEMON == TRUE
[SPECIES_MELMETAL_GIGANTAMAX] = sMelmetalTeachableLearnset,
#endif
[SPECIES_RILLABOOM_GIGANTAMAX] = sRillaboomTeachableLearnset,
[SPECIES_CINDERACE_GIGANTAMAX] = sCinderaceTeachableLearnset,
[SPECIES_INTELEON_GIGANTAMAX] = sInteleonTeachableLearnset,

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

@ -1102,7 +1102,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES + 1] =
SPECIES_SPRITE(GOODRA_HISUIAN, gMonBackPic_GoodraHisuian),
SPECIES_SPRITE(AVALUGG_HISUIAN, gMonBackPic_AvaluggHisuian),
#endif
#if P_GEN_8_POKEMON == TRUE
#if P_GEN_7_POKEMON == TRUE
SPECIES_SPRITE(DECIDUEYE_HISUIAN, gMonBackPic_DecidueyeHisuian),
#endif