From 75ac960365512fc4a6df76efd98d89f41e384b77 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Mon, 22 Aug 2022 17:27:21 -0400 Subject: [PATCH] =?UTF-8?q?Introduced=20P=5FNEW=5FPOKEMON,=20which=20will?= =?UTF-8?q?=20disable=20all=20Gen4+=20Pok=C3=A9mon=20and=20Forms?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/sound_data.s | 2 +- include/constants/battle_config.h | 57 ------ include/constants/pokedex.h | 25 ++- include/constants/pokemon_config.h | 2 + include/constants/species.h | 53 ++++- include/graphics.h | 22 ++ sound/cry_tables.inc | 78 ++++++++ sound/direct_sound_data.inc | 2 + src/data/graphics/pokemon.h | 22 ++ src/data/pokemon/base_stats.h | 5 +- src/data/pokemon/egg_moves.h | 2 + src/data/pokemon/evolution_old.h | 188 ++++++++++++++++++ src/data/pokemon/form_change_table_pointers.h | 2 + src/data/pokemon/form_change_tables.h | 2 + .../pokemon/form_species_table_pointers.h | 10 + src/data/pokemon/form_species_tables.h | 11 +- src/data/pokemon/level_up_learnset_pointers.h | 4 + src/data/pokemon/level_up_learnsets.h | 5 +- src/data/pokemon/pokedex_entries.h | 2 + src/data/pokemon/pokedex_text.h | 2 + src/data/pokemon/tmhm_learnsets.h | 5 +- src/data/pokemon/tutor_learnsets.h | 2 + .../pokemon_graphics/back_pic_coordinates.h | 4 + src/data/pokemon_graphics/back_pic_table.h | 9 +- .../pokemon_graphics/enemy_mon_elevation.h | 4 + src/data/pokemon_graphics/footprint_table.h | 2 + src/data/pokemon_graphics/front_pic_anims.h | 14 +- .../pokemon_graphics/front_pic_coordinates.h | 4 + src/data/pokemon_graphics/front_pic_table.h | 9 +- src/data/pokemon_graphics/palette_table.h | 9 +- .../pokemon_graphics/shiny_palette_table.h | 9 +- src/data/text/species_names.h | 4 + src/pokedex.c | 10 +- src/pokemon.c | 48 +++++ src/pokemon_icon.c | 15 ++ 35 files changed, 558 insertions(+), 86 deletions(-) create mode 100644 src/data/pokemon/evolution_old.h diff --git a/data/sound_data.s b/data/sound_data.s index cd33950e1..1bc299580 100644 --- a/data/sound_data.s +++ b/data/sound_data.s @@ -2,7 +2,7 @@ .include "asm/macros/m4a.inc" .include "asm/macros/music_voice.inc" - + .include "include/constants/pokemon_config.h" .include "sound/voice_groups.inc" .include "sound/keysplit_tables.inc" .include "sound/programmable_wave_data.inc" diff --git a/include/constants/battle_config.h b/include/constants/battle_config.h index ec20fd839..5e9984c55 100644 --- a/include/constants/battle_config.h +++ b/include/constants/battle_config.h @@ -3,63 +3,6 @@ #include "constants/expansion_branches.h" -// // Species with peculiar battle effects. -// #ifndef POKEMON_EXPANSION -// #define SPECIES_DIALGA 0 -// #define SPECIES_PALKIA 0 -// #define SPECIES_GIRATINA 0 -// #define SPECIES_CHERRIM 0 -// #define SPECIES_ARCEUS 0 -// #define SPECIES_SILVALLY 0 -// #define SPECIES_GENESECT 0 -// #define SPECIES_AEGISLASH 0 -// #define SPECIES_AEGISLASH_BLADE 10000 -// #define SPECIES_MIMIKYU 0 -// #define SPECIES_MIMIKYU_BUSTED 10001 -// #define SPECIES_DARMANITAN 0 -// #define SPECIES_DARMANITAN_ZEN_MODE 10002 -// #define SPECIES_MINIOR_CORE_RED 0 -// #define SPECIES_MINIOR 10003 -// #define SPECIES_MINIOR_CORE_BLUE 0 -// #define SPECIES_MINIOR_METEOR_BLUE 10004 -// #define SPECIES_MINIOR_CORE_GREEN 0 -// #define SPECIES_MINIOR_METEOR_GREEN 10005 -// #define SPECIES_MINIOR_CORE_INDIGO 0 -// #define SPECIES_MINIOR_METEOR_INDIGO 10006 -// #define SPECIES_MINIOR_CORE_ORANGE 0 -// #define SPECIES_MINIOR_METEOR_ORANGE 10007 -// #define SPECIES_MINIOR_CORE_VIOLET 0 -// #define SPECIES_MINIOR_METEOR_VIOLET 10008 -// #define SPECIES_MINIOR_CORE_YELLOW 0 -// #define SPECIES_MINIOR_METEOR_YELLOW 10009 -// #define SPECIES_WISHIWASHI 0 -// #define SPECIES_WISHIWASHI_SCHOOL 10010 -// #define SPECIES_ZYGARDE 0 // 50% -// #define SPECIES_ZYGARDE_10 10011 // 10 % -// #define SPECIES_ZYGARDE_COMPLETE 10012 // 100 % -// #define SPECIES_BURMY 0 -// #define SPECIES_BURMY_SANDY_CLOAK 10013 -// #define SPECIES_BURMY_TRASH_CLOAK 10014 -// #define SPECIES_CRAMORANT 0 -// #define SPECIES_CRAMORANT_GORGING 10015 -// #define SPECIES_CRAMORANT_GULPING 10016 -// #define SPECIES_GRENINJA_BATTLE_BOND 0 -// #define SPECIES_GRENINJA_ASH 10017 -// #define SPECIES_HOOPA 0 -// #define SPECIES_HOOPA_UNBOUND 10018 -// #define SPECIES_MELOETTA 0 -// #define SPECIES_MELOETTA_PIROUETTE 10019 -// #define SPECIES_MORPEKO 0 -// #define SPECIES_MORPEKO_HANGRY 10020 -// #define SPECIES_SIRFETCHD 10021 -// #define SPECIES_DARMANITAN_GALARIAN 0 -// #define SPECIES_DARMANITAN_ZEN_MODE_GALARIAN 10022 -// #define SPECIES_HEATMOR 0 -// #define SPECIES_DURANT 0 -// #define SPECIES_CARBINK 0 -// #define SPECIES_MAREANIE 0 -// #endif - #ifndef GEN_3 #define GEN_3 0 #define GEN_4 1 diff --git a/include/constants/pokedex.h b/include/constants/pokedex.h index 8f40f9a7b..f47cc24fe 100644 --- a/include/constants/pokedex.h +++ b/include/constants/pokedex.h @@ -1,7 +1,8 @@ #ifndef GUARD_CONSTANTS_POKEDEX_H #define GUARD_CONSTANTS_POKEDEX_H -// National Pokedex order +#include "constants/pokemon_config.h" +// National Pokedex order. Gen 4+ mons and forms are not disabled by P_NEW_POKEMON to keep pokedex_orders.h clean. enum { NATIONAL_DEX_NONE, // Kanto @@ -915,7 +916,11 @@ enum { #define KANTO_DEX_COUNT NATIONAL_DEX_MEW #define JOHTO_DEX_COUNT NATIONAL_DEX_CELEBI +#if P_NEW_POKEMON == TRUE #define NATIONAL_DEX_COUNT NATIONAL_DEX_CALYREX +#else +#define NATIONAL_DEX_COUNT NATIONAL_DEX_DEOXYS +#endif #define POKEMON_SLOTS_NUMBER (NATIONAL_DEX_COUNT + 1) // Hoenn Pokedex order @@ -952,7 +957,9 @@ enum { HOENN_DEX_RALTS, HOENN_DEX_KIRLIA, HOENN_DEX_GARDEVOIR, +#if P_NEW_POKEMON == TRUE HOENN_DEX_GALLADE, +#endif HOENN_DEX_SURSKIT, HOENN_DEX_MASQUERAIN, HOENN_DEX_SHROOMISH, @@ -982,7 +989,9 @@ enum { HOENN_DEX_GRAVELER, HOENN_DEX_GOLEM, HOENN_DEX_NOSEPASS, +#if P_NEW_POKEMON == TRUE HOENN_DEX_PROBOPASS, +#endif HOENN_DEX_SKITTY, HOENN_DEX_DELCATTY, HOENN_DEX_ZUBAT, @@ -1006,7 +1015,9 @@ enum { HOENN_DEX_MINUN, HOENN_DEX_MAGNEMITE, HOENN_DEX_MAGNETON, +#if P_NEW_POKEMON == TRUE HOENN_DEX_MAGNEZONE, +#endif HOENN_DEX_VOLTORB, HOENN_DEX_ELECTRODE, HOENN_DEX_VOLBEAT, @@ -1017,9 +1028,13 @@ enum { HOENN_DEX_BELLOSSOM, HOENN_DEX_DODUO, HOENN_DEX_DODRIO, +#if P_NEW_POKEMON == TRUE HOENN_DEX_BUDEW, HOENN_DEX_ROSELIA, HOENN_DEX_ROSERADE, +#else + HOENN_DEX_ROSELIA, +#endif HOENN_DEX_GULPIN, HOENN_DEX_SWALOT, HOENN_DEX_CARVANHA, @@ -1075,9 +1090,13 @@ enum { HOENN_DEX_BANETTE, HOENN_DEX_DUSKULL, HOENN_DEX_DUSCLOPS, +#if P_NEW_POKEMON == TRUE HOENN_DEX_DUSKNOIR, HOENN_DEX_TROPIUS, HOENN_DEX_CHINGLING, +#else + HOENN_DEX_TROPIUS, +#endif HOENN_DEX_CHIMECHO, HOENN_DEX_ABSOL, HOENN_DEX_VULPIX, @@ -1098,10 +1117,14 @@ enum { HOENN_DEX_HERACROSS, HOENN_DEX_RHYHORN, HOENN_DEX_RHYDON, +#if P_NEW_POKEMON == TRUE HOENN_DEX_RHYPERIOR, +#endif HOENN_DEX_SNORUNT, HOENN_DEX_GLALIE, +#if P_NEW_POKEMON == TRUE HOENN_DEX_FROSLASS, +#endif HOENN_DEX_SPHEAL, HOENN_DEX_SEALEO, HOENN_DEX_WALREIN, diff --git a/include/constants/pokemon_config.h b/include/constants/pokemon_config.h index 5152423f0..077c02e33 100644 --- a/include/constants/pokemon_config.h +++ b/include/constants/pokemon_config.h @@ -21,6 +21,8 @@ #define P_KADABRA_EVERSTONE GEN_8 // Since Gen 4, Kadabra can evolve even when holding an Everstone. #define P_NIDORAN_M_DITTO_BREED GEN_8 // Since Gen 5, when Nidoran♂ breeds with Ditto it can produce Nidoran♀ offspring. Before, it would only yield male offspring. This change also applies to Volbeat. +#define P_NEW_POKEMON TRUE // Turning this to FALSE will remove all newly added Pokémon and Forms. Only Unown, Castform and Deoxys forms will remain. + #define P_ENABLE_DEBUG TRUE // Enables a debug menu for pokemon sprites and icons, accessed by pressing SELECT in the summary screen. #endif // GUARD_CONSTANTS_POKEMON_CONFIG_H diff --git a/include/constants/species.h b/include/constants/species.h index b8689a32a..5c1ef7a4f 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -1,6 +1,8 @@ #ifndef GUARD_CONSTANTS_SPECIES_H #define GUARD_CONSTANTS_SPECIES_H +#include "constants/pokemon_config.h" + #define SPECIES_NONE 0 #define SPECIES_BULBASAUR 1 #define SPECIES_IVYSAUR 2 @@ -901,8 +903,6 @@ #define SPECIES_SPECTRIER 897 #define SPECIES_CALYREX 898 -#define FORMS_START SPECIES_CALYREX - // Megas #define SPECIES_VENUSAUR_MEGA FORMS_START + 1 #define SPECIES_CHARIZARD_MEGA_X FORMS_START + 2 @@ -1021,6 +1021,7 @@ // Pichu #define SPECIES_PICHU_SPIKY_EARED FORMS_START + 102 +#if P_NEW_POKEMON == TRUE // Unown #define SPECIES_UNOWN_B FORMS_START + 103 #define SPECIES_UNOWN_C FORMS_START + 104 @@ -1060,6 +1061,47 @@ #define SPECIES_DEOXYS_DEFENSE FORMS_START + 134 #define SPECIES_DEOXYS_SPEED FORMS_START + 135 +#else +// Unown +#define SPECIES_UNOWN_B FORMS_START + 1 +#define SPECIES_UNOWN_C FORMS_START + 2 +#define SPECIES_UNOWN_D FORMS_START + 3 +#define SPECIES_UNOWN_E FORMS_START + 4 +#define SPECIES_UNOWN_F FORMS_START + 5 +#define SPECIES_UNOWN_G FORMS_START + 6 +#define SPECIES_UNOWN_H FORMS_START + 7 +#define SPECIES_UNOWN_I FORMS_START + 8 +#define SPECIES_UNOWN_J FORMS_START + 9 +#define SPECIES_UNOWN_K FORMS_START + 10 +#define SPECIES_UNOWN_L FORMS_START + 11 +#define SPECIES_UNOWN_M FORMS_START + 12 +#define SPECIES_UNOWN_N FORMS_START + 13 +#define SPECIES_UNOWN_O FORMS_START + 14 +#define SPECIES_UNOWN_P FORMS_START + 15 +#define SPECIES_UNOWN_Q FORMS_START + 16 +#define SPECIES_UNOWN_R FORMS_START + 17 +#define SPECIES_UNOWN_S FORMS_START + 18 +#define SPECIES_UNOWN_T FORMS_START + 19 +#define SPECIES_UNOWN_U FORMS_START + 20 +#define SPECIES_UNOWN_V FORMS_START + 21 +#define SPECIES_UNOWN_W FORMS_START + 22 +#define SPECIES_UNOWN_X FORMS_START + 23 +#define SPECIES_UNOWN_Y FORMS_START + 24 +#define SPECIES_UNOWN_Z FORMS_START + 25 +#define SPECIES_UNOWN_EMARK FORMS_START + 26 +#define SPECIES_UNOWN_QMARK FORMS_START + 27 + +// Castform +#define SPECIES_CASTFORM_SUNNY FORMS_START + 28 +#define SPECIES_CASTFORM_RAINY FORMS_START + 29 +#define SPECIES_CASTFORM_SNOWY FORMS_START + 30 + +// Deoxys +#define SPECIES_DEOXYS_ATTACK FORMS_START + 31 +#define SPECIES_DEOXYS_DEFENSE FORMS_START + 32 +#define SPECIES_DEOXYS_SPEED FORMS_START + 33 +#endif + // Burmy #define SPECIES_BURMY_SANDY_CLOAK FORMS_START + 136 #define SPECIES_BURMY_TRASH_CLOAK FORMS_START + 137 @@ -1341,7 +1383,14 @@ #define SPECIES_CALYREX_ICE_RIDER FORMS_START + 307 #define SPECIES_CALYREX_SHADOW_RIDER FORMS_START + 308 +#if P_NEW_POKEMON == TRUE +#define FORMS_START SPECIES_CALYREX #define SPECIES_EGG SPECIES_CALYREX_SHADOW_RIDER + 1 +#else +#define FORMS_START SPECIES_DEOXYS +#define SPECIES_EGG SPECIES_DEOXYS_SPEED + 1 +#endif + #define NUM_SPECIES SPECIES_EGG #endif // GUARD_CONSTANTS_SPECIES_H diff --git a/include/graphics.h b/include/graphics.h index 907568c2b..cc96d5eed 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -454,6 +454,7 @@ extern const u32 gMonFrontPic_Groudon[]; extern const u32 gMonFrontPic_Rayquaza[]; extern const u32 gMonFrontPic_Jirachi[]; extern const u32 gMonFrontPic_Deoxys[]; +#if P_NEW_POKEMON == TRUE extern const u32 gMonFrontPic_Turtwig[]; extern const u32 gMonFrontPic_Grotle[]; extern const u32 gMonFrontPic_Torterra[]; @@ -1081,6 +1082,7 @@ extern const u32 gMonFrontPic_PikachuAlolaCap[]; extern const u32 gMonFrontPic_PikachuPartnerCap[]; extern const u32 gMonFrontPic_PikachuWorldCap[]; extern const u32 gMonFrontPic_PichuSpikyEared[]; +#endif extern const u32 gMonFrontPic_UnownB[]; extern const u32 gMonFrontPic_UnownC[]; extern const u32 gMonFrontPic_UnownD[]; @@ -1114,6 +1116,7 @@ extern const u32 gMonFrontPic_CastformSnowy[]; extern const u32 gMonFrontPic_DeoxysAttack[]; extern const u32 gMonFrontPic_DeoxysDefense[]; extern const u32 gMonFrontPic_DeoxysSpeed[]; +#if P_NEW_POKEMON == TRUE extern const u32 gMonFrontPic_BurmySandyCloak[]; extern const u32 gMonFrontPic_BurmyTrashCloak[]; extern const u32 gMonFrontPic_WormadamSandyCloak[]; @@ -1216,6 +1219,7 @@ extern const u32 gMonFrontPic_UrshifuRapidStrikeStyle[]; extern const u32 gMonFrontPic_ZarudeDada[]; extern const u32 gMonFrontPic_CalyrexIceRider[]; extern const u32 gMonFrontPic_CalyrexShadowRider[]; +#endif extern const u32 gMonFrontPic_Egg[]; extern const u32 gMonBackPic_CircledQuestionMark[]; @@ -1607,6 +1611,7 @@ extern const u32 gMonBackPic_Groudon[]; extern const u32 gMonBackPic_Rayquaza[]; extern const u32 gMonBackPic_Jirachi[]; extern const u32 gMonBackPic_Deoxys[]; +#if P_NEW_POKEMON == TRUE extern const u32 gMonBackPic_Turtwig[]; extern const u32 gMonBackPic_Grotle[]; extern const u32 gMonBackPic_Torterra[]; @@ -2233,6 +2238,7 @@ extern const u32 gMonBackPic_PikachuAlolaCap[]; extern const u32 gMonBackPic_PikachuPartnerCap[]; extern const u32 gMonBackPic_PikachuWorldCap[]; extern const u32 gMonBackPic_PichuSpikyEared[]; +#endif extern const u32 gMonBackPic_UnownB[]; extern const u32 gMonBackPic_UnownC[]; extern const u32 gMonBackPic_UnownD[]; @@ -2266,6 +2272,7 @@ extern const u32 gMonBackPic_CastformSnowy[]; extern const u32 gMonBackPic_DeoxysAttack[]; extern const u32 gMonBackPic_DeoxysDefense[]; extern const u32 gMonBackPic_DeoxysSpeed[]; +#if P_NEW_POKEMON == TRUE extern const u32 gMonBackPic_BurmySandyCloak[]; extern const u32 gMonBackPic_BurmyTrashCloak[]; extern const u32 gMonBackPic_WormadamSandyCloak[]; @@ -2368,6 +2375,7 @@ extern const u32 gMonBackPic_UrshifuRapidStrikeStyle[]; extern const u32 gMonBackPic_ZarudeDada[]; extern const u32 gMonBackPic_CalyrexIceRider[]; extern const u32 gMonBackPic_CalyrexShadowRider[]; +#endif extern const u32 gMonPalette_CircledQuestionMark[]; extern const u32 gMonPalette_DoubleQuestionMark[]; @@ -2757,6 +2765,7 @@ extern const u32 gMonPalette_Groudon[]; extern const u32 gMonPalette_Rayquaza[]; extern const u32 gMonPalette_Jirachi[]; extern const u32 gMonPalette_Deoxys[]; +#if P_NEW_POKEMON == TRUE extern const u32 gMonPalette_Turtwig[]; extern const u32 gMonPalette_Grotle[]; extern const u32 gMonPalette_Torterra[]; @@ -3377,12 +3386,14 @@ extern const u32 gMonPalette_PikachuAlolaCap[]; extern const u32 gMonPalette_PikachuPartnerCap[]; extern const u32 gMonPalette_PikachuWorldCap[]; extern const u32 gMonPalette_PichuSpikyEared[]; +#endif extern const u32 gMonPalette_CastformSunny[]; extern const u32 gMonPalette_CastformRainy[]; extern const u32 gMonPalette_CastformSnowy[]; extern const u32 gMonPalette_DeoxysAttack[]; extern const u32 gMonPalette_DeoxysDefense[]; extern const u32 gMonPalette_DeoxysSpeed[]; +#if P_NEW_POKEMON == TRUE extern const u32 gMonPalette_BurmySandyCloak[]; extern const u32 gMonPalette_BurmyTrashCloak[]; extern const u32 gMonPalette_WormadamSandyCloak[]; @@ -3538,6 +3549,7 @@ extern const u32 gMonPalette_UrshifuRapidStrikeStyle[]; extern const u32 gMonPalette_ZarudeDada[]; extern const u32 gMonPalette_CalyrexIceRider[]; extern const u32 gMonPalette_CalyrexShadowRider[]; +#endif extern const u32 gMonPalette_Egg[]; extern const u32 gMonShinyPalette_CircledQuestionMark[]; @@ -3928,6 +3940,7 @@ extern const u32 gMonShinyPalette_Groudon[]; extern const u32 gMonShinyPalette_Rayquaza[]; extern const u32 gMonShinyPalette_Jirachi[]; extern const u32 gMonShinyPalette_Deoxys[]; +#if P_NEW_POKEMON == TRUE extern const u32 gMonShinyPalette_Turtwig[]; extern const u32 gMonShinyPalette_Grotle[]; extern const u32 gMonShinyPalette_Torterra[]; @@ -4549,12 +4562,14 @@ extern const u32 gMonShinyPalette_PikachuAlolaCap[]; extern const u32 gMonShinyPalette_PikachuPartnerCap[]; extern const u32 gMonShinyPalette_PikachuWorldCap[]; extern const u32 gMonShinyPalette_PichuSpikyEared[]; +#endif extern const u32 gMonShinyPalette_CastformSunny[]; extern const u32 gMonShinyPalette_CastformRainy[]; extern const u32 gMonShinyPalette_CastformSnowy[]; extern const u32 gMonShinyPalette_DeoxysAttack[]; extern const u32 gMonShinyPalette_DeoxysDefense[]; extern const u32 gMonShinyPalette_DeoxysSpeed[]; +#if P_NEW_POKEMON == TRUE extern const u32 gMonShinyPalette_BurmySandyCloak[]; extern const u32 gMonShinyPalette_BurmyTrashCloak[]; extern const u32 gMonShinyPalette_WormadamSandyCloak[]; @@ -4704,6 +4719,7 @@ extern const u32 gMonShinyPalette_UrshifuRapidStrikeStyle[]; extern const u32 gMonShinyPalette_ZarudeDada[]; extern const u32 gMonShinyPalette_CalyrexIceRider[]; extern const u32 gMonShinyPalette_CalyrexShadowRider[]; +#endif extern const u8 gMonIcon_QuestionMark[]; extern const u8 gMonIcon_Bulbasaur[]; @@ -5092,6 +5108,7 @@ extern const u8 gMonIcon_Groudon[]; extern const u8 gMonIcon_Rayquaza[]; extern const u8 gMonIcon_Jirachi[]; extern const u8 gMonIcon_Deoxys[]; +#if P_NEW_POKEMON == TRUE extern const u8 gMonIcon_Turtwig[]; extern const u8 gMonIcon_Grotle[]; extern const u8 gMonIcon_Torterra[]; @@ -5709,6 +5726,7 @@ extern const u8 gMonIcon_PikachuKalosCap[]; extern const u8 gMonIcon_PikachuAlolaCap[]; extern const u8 gMonIcon_PikachuPartnerCap[]; extern const u8 gMonIcon_PichuSpikyEared[]; +#endif extern const u8 gMonIcon_UnownB[]; extern const u8 gMonIcon_UnownC[]; extern const u8 gMonIcon_UnownD[]; @@ -5742,6 +5760,7 @@ extern const u8 gMonIcon_CastformSnowy[]; extern const u8 gMonIcon_DeoxysAttack[]; extern const u8 gMonIcon_DeoxysDefense[]; extern const u8 gMonIcon_DeoxysSpeed[]; +#if P_NEW_POKEMON == TRUE extern const u8 gMonIcon_BurmySandyCloak[]; extern const u8 gMonIcon_BurmyTrashCloak[]; extern const u8 gMonIcon_WormadamSandyCloak[]; @@ -5858,6 +5877,7 @@ extern const u8 gMonIcon_EternatusEternamax[]; extern const u8 gMonIcon_ZarudeDada[]; extern const u8 gMonIcon_CalyrexIceRider[]; extern const u8 gMonIcon_CalyrexShadowRider[]; +#endif extern const u8 gMonIcon_Egg[]; extern const u8 gMonFootprint_QuestionMark[]; @@ -6247,6 +6267,7 @@ extern const u8 gMonFootprint_Latios[]; extern const u8 gMonFootprint_Jirachi[]; extern const u8 gMonFootprint_Deoxys[]; extern const u8 gMonFootprint_Chimecho[]; +#if P_NEW_POKEMON == TRUE extern const u8 gMonFootprint_Turtwig[]; extern const u8 gMonFootprint_Grotle[]; extern const u8 gMonFootprint_Torterra[]; @@ -6759,6 +6780,7 @@ extern const u8 gMonFootprint_Regidrago[]; extern const u8 gMonFootprint_Glastrier[]; extern const u8 gMonFootprint_Spectrier[]; extern const u8 gMonFootprint_Calyrex[]; +#endif // trainer sprites extern const u32 gTrainerFrontPic_Hiker[]; diff --git a/sound/cry_tables.inc b/sound/cry_tables.inc index d1b33a637..0fdc9cb50 100644 --- a/sound/cry_tables.inc +++ b/sound/cry_tables.inc @@ -386,6 +386,7 @@ gCryTable:: cry Cry_Rayquaza cry Cry_Jirachi cry Cry_Deoxys +.if P_NEW_POKEMON == TRUE cry Cry_Turtwig cry Cry_Grotle cry Cry_Torterra @@ -1271,6 +1272,44 @@ gCryTable:: @ Calyrex cry Cry_CalyrexIceRider cry Cry_CalyrexShadowRider +.else + @ Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + cry Cry_Unown + @ Castform + cry Cry_Castform + cry Cry_Castform + cry Cry_Castform + @ Deoxys + cry Cry_Deoxys + cry Cry_Deoxys + cry Cry_Deoxys +.endif .align 2 gCryTable_Reverse:: @@ -1660,6 +1699,7 @@ gCryTable_Reverse:: cry_reverse Cry_Rayquaza cry_reverse Cry_Jirachi cry_reverse Cry_Deoxys +.if P_NEW_POKEMON == TRUE cry_reverse Cry_Turtwig cry_reverse Cry_Grotle cry_reverse Cry_Torterra @@ -2545,3 +2585,41 @@ gCryTable_Reverse:: @ Calyrex cry_reverse Cry_CalyrexIceRider cry_reverse Cry_CalyrexShadowRider +.else + @ Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + cry_reverse Cry_Unown + @ Castform + cry_reverse Cry_Castform + cry_reverse Cry_Castform + cry_reverse Cry_Castform + @ Deoxys + cry_reverse Cry_Deoxys + cry_reverse Cry_Deoxys + cry_reverse Cry_Deoxys +.endif diff --git a/sound/direct_sound_data.inc b/sound/direct_sound_data.inc index bddd27423..c177475d6 100644 --- a/sound/direct_sound_data.inc +++ b/sound/direct_sound_data.inc @@ -1930,6 +1930,7 @@ Cry_Jirachi:: Cry_Deoxys:: .incbin "sound/direct_sound_samples/cries/deoxys.bin" +.if P_NEW_POKEMON == TRUE .align 2 Cry_Turtwig:: .incbin "sound/direct_sound_samples/cries/turtwig.bin" @@ -4305,6 +4306,7 @@ Cry_CalyrexIceRider:: .align 2 Cry_CalyrexShadowRider:: .incbin "sound/direct_sound_samples/cries/calyrex_shadow_rider.bin" +.endif .align 2 DirectSoundWaveData_register_noise:: diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 05332ea45..a522ab13f 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -387,6 +387,7 @@ const u32 gMonFrontPic_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/anim_fro const u32 gMonFrontPic_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/anim_front.4bpp.lz"); const u32 gMonFrontPic_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/anim_front.4bpp.lz"); const u32 gMonFrontPic_Deoxys[] = INCBIN_U32("graphics/pokemon/deoxys/anim_front.4bpp.lz"); +#if P_NEW_POKEMON == TRUE const u32 gMonFrontPic_Turtwig[] = INCBIN_U32("graphics/pokemon/turtwig/anim_front.4bpp.lz"); const u32 gMonFrontPic_Grotle[] = INCBIN_U32("graphics/pokemon/grotle/anim_front.4bpp.lz"); const u32 gMonFrontPic_Torterra[] = INCBIN_U32("graphics/pokemon/torterra/anim_front.4bpp.lz"); @@ -1014,6 +1015,7 @@ const u32 gMonFrontPic_PikachuAlolaCap[] = INCBIN_U32("graphics/pokemon/pikachu/ const u32 gMonFrontPic_PikachuPartnerCap[] = INCBIN_U32("graphics/pokemon/pikachu/partner_cap/front.4bpp.lz"); const u32 gMonFrontPic_PikachuWorldCap[] = INCBIN_U32("graphics/pokemon/pikachu/world_cap/front.4bpp.lz"); const u32 gMonFrontPic_PichuSpikyEared[] = INCBIN_U32("graphics/pokemon/pichu/spiky_eared/front.4bpp.lz"); +#endif const u32 gMonFrontPic_UnownB[] = INCBIN_U32("graphics/pokemon/unown/b/anim_front.4bpp.lz"); const u32 gMonFrontPic_UnownC[] = INCBIN_U32("graphics/pokemon/unown/c/anim_front.4bpp.lz"); const u32 gMonFrontPic_UnownD[] = INCBIN_U32("graphics/pokemon/unown/d/anim_front.4bpp.lz"); @@ -1047,6 +1049,7 @@ const u32 gMonFrontPic_CastformSnowy[] = INCBIN_U32("graphics/pokemon/castform/s const u32 gMonFrontPic_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/attack/anim_front.4bpp.lz"); const u32 gMonFrontPic_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/defense/anim_front.4bpp.lz"); const u32 gMonFrontPic_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/speed/anim_front.4bpp.lz"); +#if P_NEW_POKEMON == TRUE const u32 gMonFrontPic_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/burmy/sandy_cloak/anim_front.4bpp.lz"); const u32 gMonFrontPic_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/burmy/trash_cloak/anim_front.4bpp.lz"); const u32 gMonFrontPic_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/wormadam/sandy_cloak/anim_front.4bpp.lz"); @@ -1149,6 +1152,7 @@ const u32 gMonFrontPic_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/ const u32 gMonFrontPic_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/front.4bpp.lz"); const u32 gMonFrontPic_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/front.4bpp.lz"); const u32 gMonFrontPic_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/front.4bpp.lz"); +#endif const u32 gMonFrontPic_Egg[] = INCBIN_U32("graphics/pokemon/egg/anim_front.4bpp.lz"); const u32 gMonBackPic_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/circled/back.4bpp.lz"); @@ -1540,6 +1544,7 @@ const u32 gMonBackPic_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/back.4bpp const u32 gMonBackPic_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/back.4bpp.lz"); const u32 gMonBackPic_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/back.4bpp.lz"); const u32 gMonBackPic_Deoxys[] = INCBIN_U32("graphics/pokemon/deoxys/back.4bpp.lz"); +#if P_NEW_POKEMON == TRUE const u32 gMonBackPic_Turtwig[] = INCBIN_U32("graphics/pokemon/turtwig/back.4bpp.lz"); const u32 gMonBackPic_Grotle[] = INCBIN_U32("graphics/pokemon/grotle/back.4bpp.lz"); const u32 gMonBackPic_Torterra[] = INCBIN_U32("graphics/pokemon/torterra/back.4bpp.lz"); @@ -2166,6 +2171,7 @@ const u32 gMonBackPic_PikachuAlolaCap[] = INCBIN_U32("graphics/pokemon/pikachu/a const u32 gMonBackPic_PikachuPartnerCap[] = INCBIN_U32("graphics/pokemon/pikachu/partner_cap/back.4bpp.lz"); const u32 gMonBackPic_PikachuWorldCap[] = INCBIN_U32("graphics/pokemon/pikachu/world_cap/back.4bpp.lz"); const u32 gMonBackPic_PichuSpikyEared[] = INCBIN_U32("graphics/pokemon/pichu/spiky_eared/back.4bpp.lz"); +#endif const u32 gMonBackPic_UnownB[] = INCBIN_U32("graphics/pokemon/unown/b/back.4bpp.lz"); const u32 gMonBackPic_UnownC[] = INCBIN_U32("graphics/pokemon/unown/c/back.4bpp.lz"); const u32 gMonBackPic_UnownD[] = INCBIN_U32("graphics/pokemon/unown/d/back.4bpp.lz"); @@ -2199,6 +2205,7 @@ const u32 gMonBackPic_CastformSnowy[] = INCBIN_U32("graphics/pokemon/castform/sn const u32 gMonBackPic_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/attack/back.4bpp.lz"); const u32 gMonBackPic_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/defense/back.4bpp.lz"); const u32 gMonBackPic_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/speed/back.4bpp.lz"); +#if P_NEW_POKEMON == TRUE const u32 gMonBackPic_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/burmy/sandy_cloak/back.4bpp.lz"); const u32 gMonBackPic_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/burmy/trash_cloak/back.4bpp.lz"); const u32 gMonBackPic_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/wormadam/sandy_cloak/back.4bpp.lz"); @@ -2301,6 +2308,7 @@ const u32 gMonBackPic_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/u const u32 gMonBackPic_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/back.4bpp.lz"); const u32 gMonBackPic_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/back.4bpp.lz"); const u32 gMonBackPic_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/back.4bpp.lz"); +#endif const u32 gMonPalette_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/circled/normal.gbapal.lz"); const u32 gMonPalette_DoubleQuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/double/normal.gbapal.lz"); @@ -2690,6 +2698,7 @@ const u32 gMonPalette_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/normal.gb const u32 gMonPalette_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/normal.gbapal.lz"); const u32 gMonPalette_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/normal.gbapal.lz"); const u32 gMonPalette_Deoxys[] = INCBIN_U32("graphics/pokemon/deoxys/normal.gbapal.lz"); +#if P_NEW_POKEMON == TRUE const u32 gMonPalette_Turtwig[] = INCBIN_U32("graphics/pokemon/turtwig/normal.gbapal.lz"); const u32 gMonPalette_Grotle[] = INCBIN_U32("graphics/pokemon/grotle/normal.gbapal.lz"); const u32 gMonPalette_Torterra[] = INCBIN_U32("graphics/pokemon/torterra/normal.gbapal.lz"); @@ -3310,12 +3319,14 @@ const u32 gMonPalette_PikachuAlolaCap[] = INCBIN_U32("graphics/pokemon/pikachu/a const u32 gMonPalette_PikachuPartnerCap[] = INCBIN_U32("graphics/pokemon/pikachu/partner_cap/normal.gbapal.lz"); const u32 gMonPalette_PikachuWorldCap[] = INCBIN_U32("graphics/pokemon/pikachu/world_cap/normal.gbapal.lz"); const u32 gMonPalette_PichuSpikyEared[] = INCBIN_U32("graphics/pokemon/pichu/spiky_eared/normal.gbapal.lz"); +#endif const u32 gMonPalette_CastformSunny[] = INCBIN_U32("graphics/pokemon/castform/sunny/normal.gbapal.lz"); const u32 gMonPalette_CastformRainy[] = INCBIN_U32("graphics/pokemon/castform/rainy/normal.gbapal.lz"); const u32 gMonPalette_CastformSnowy[] = INCBIN_U32("graphics/pokemon/castform/snowy/normal.gbapal.lz"); const u32 gMonPalette_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/attack/normal.gbapal.lz"); const u32 gMonPalette_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/defense/normal.gbapal.lz"); const u32 gMonPalette_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/speed/normal.gbapal.lz"); +#if P_NEW_POKEMON == TRUE const u32 gMonPalette_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/burmy/sandy_cloak/normal.gbapal.lz"); const u32 gMonPalette_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/burmy/trash_cloak/normal.gbapal.lz"); const u32 gMonPalette_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/wormadam/sandy_cloak/normal.gbapal.lz"); @@ -3471,6 +3482,7 @@ const u32 gMonPalette_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/pokemon/u const u32 gMonPalette_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/normal.gbapal.lz"); const u32 gMonPalette_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/normal.gbapal.lz"); const u32 gMonPalette_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/normal.gbapal.lz"); +#endif const u32 gMonPalette_Egg[] = INCBIN_U32("graphics/pokemon/egg/normal.gbapal.lz"); const u32 gMonShinyPalette_CircledQuestionMark[] = INCBIN_U32("graphics/pokemon/question_mark/circled/shiny.gbapal.lz"); @@ -3861,6 +3873,7 @@ const u32 gMonShinyPalette_Groudon[] = INCBIN_U32("graphics/pokemon/groudon/shin const u32 gMonShinyPalette_Rayquaza[] = INCBIN_U32("graphics/pokemon/rayquaza/shiny.gbapal.lz"); const u32 gMonShinyPalette_Jirachi[] = INCBIN_U32("graphics/pokemon/jirachi/shiny.gbapal.lz"); const u32 gMonShinyPalette_Deoxys[] = INCBIN_U32("graphics/pokemon/deoxys/shiny.gbapal.lz"); +#if P_NEW_POKEMON == TRUE const u32 gMonShinyPalette_Turtwig[] = INCBIN_U32("graphics/pokemon/turtwig/shiny.gbapal.lz"); const u32 gMonShinyPalette_Grotle[] = INCBIN_U32("graphics/pokemon/grotle/shiny.gbapal.lz"); const u32 gMonShinyPalette_Torterra[] = INCBIN_U32("graphics/pokemon/torterra/shiny.gbapal.lz"); @@ -4481,12 +4494,14 @@ const u32 gMonShinyPalette_PikachuAlolaCap[] = INCBIN_U32("graphics/pokemon/pika const u32 gMonShinyPalette_PikachuPartnerCap[] = INCBIN_U32("graphics/pokemon/pikachu/partner_cap/shiny.gbapal.lz"); const u32 gMonShinyPalette_PikachuWorldCap[] = INCBIN_U32("graphics/pokemon/pikachu/world_cap/shiny.gbapal.lz"); const u32 gMonShinyPalette_PichuSpikyEared[] = INCBIN_U32("graphics/pokemon/pichu/spiky_eared/shiny.gbapal.lz"); +#endif const u32 gMonShinyPalette_CastformSunny[] = INCBIN_U32("graphics/pokemon/castform/sunny/shiny.gbapal.lz"); const u32 gMonShinyPalette_CastformRainy[] = INCBIN_U32("graphics/pokemon/castform/rainy/shiny.gbapal.lz"); const u32 gMonShinyPalette_CastformSnowy[] = INCBIN_U32("graphics/pokemon/castform/snowy/shiny.gbapal.lz"); const u32 gMonShinyPalette_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/attack/shiny.gbapal.lz"); const u32 gMonShinyPalette_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/defense/shiny.gbapal.lz"); const u32 gMonShinyPalette_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/speed/shiny.gbapal.lz"); +#if P_NEW_POKEMON == TRUE const u32 gMonShinyPalette_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/burmy/sandy_cloak/shiny.gbapal.lz"); const u32 gMonShinyPalette_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/burmy/trash_cloak/shiny.gbapal.lz"); const u32 gMonShinyPalette_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/wormadam/sandy_cloak/shiny.gbapal.lz"); @@ -4636,6 +4651,7 @@ const u32 gMonShinyPalette_UrshifuRapidStrikeStyle[] = INCBIN_U32("graphics/poke const u32 gMonShinyPalette_ZarudeDada[] = INCBIN_U32("graphics/pokemon/zarude/dada/shiny.gbapal.lz"); const u32 gMonShinyPalette_CalyrexIceRider[] = INCBIN_U32("graphics/pokemon/calyrex/ice_rider/shiny.gbapal.lz"); const u32 gMonShinyPalette_CalyrexShadowRider[] = INCBIN_U32("graphics/pokemon/calyrex/shadow_rider/shiny.gbapal.lz"); +#endif const u8 gMonIcon_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/icon.4bpp"); const u8 gMonIcon_Bulbasaur[] = INCBIN_U8("graphics/pokemon/bulbasaur/icon.4bpp"); @@ -5024,6 +5040,7 @@ const u8 gMonIcon_Groudon[] = INCBIN_U8("graphics/pokemon/groudon/icon.4bpp"); const u8 gMonIcon_Rayquaza[] = INCBIN_U8("graphics/pokemon/rayquaza/icon.4bpp"); const u8 gMonIcon_Jirachi[] = INCBIN_U8("graphics/pokemon/jirachi/icon.4bpp"); const u8 gMonIcon_Deoxys[] = INCBIN_U8("graphics/pokemon/deoxys/icon.4bpp"); +#if P_NEW_POKEMON == TRUE const u8 gMonIcon_Turtwig[] = INCBIN_U8("graphics/pokemon/turtwig/icon.4bpp"); const u8 gMonIcon_Grotle[] = INCBIN_U8("graphics/pokemon/grotle/icon.4bpp"); const u8 gMonIcon_Torterra[] = INCBIN_U8("graphics/pokemon/torterra/icon.4bpp"); @@ -5641,6 +5658,7 @@ const u8 gMonIcon_PikachuKalosCap[] = INCBIN_U8("graphics/pokemon/pikachu/kalos_ const u8 gMonIcon_PikachuAlolaCap[] = INCBIN_U8("graphics/pokemon/pikachu/alola_cap/icon.4bpp"); const u8 gMonIcon_PikachuPartnerCap[] = INCBIN_U8("graphics/pokemon/pikachu/partner_cap/icon.4bpp"); const u8 gMonIcon_PichuSpikyEared[] = INCBIN_U8("graphics/pokemon/pichu/spiky_eared/icon.4bpp"); +#endif const u8 gMonIcon_UnownB[] = INCBIN_U8("graphics/pokemon/unown/b/icon.4bpp"); const u8 gMonIcon_UnownC[] = INCBIN_U8("graphics/pokemon/unown/c/icon.4bpp"); const u8 gMonIcon_UnownD[] = INCBIN_U8("graphics/pokemon/unown/d/icon.4bpp"); @@ -5674,6 +5692,7 @@ const u8 gMonIcon_CastformSnowy[] = INCBIN_U8("graphics/pokemon/castform/snowy/i const u8 gMonIcon_DeoxysAttack[] = INCBIN_U8("graphics/pokemon/deoxys/attack/icon.4bpp"); const u8 gMonIcon_DeoxysDefense[] = INCBIN_U8("graphics/pokemon/deoxys/defense/icon.4bpp"); const u8 gMonIcon_DeoxysSpeed[] = INCBIN_U8("graphics/pokemon/deoxys/speed/icon.4bpp"); +#if P_NEW_POKEMON == TRUE const u8 gMonIcon_BurmySandyCloak[] = INCBIN_U8("graphics/pokemon/burmy/sandy_cloak/icon.4bpp"); const u8 gMonIcon_BurmyTrashCloak[] = INCBIN_U8("graphics/pokemon/burmy/trash_cloak/icon.4bpp"); const u8 gMonIcon_WormadamSandyCloak[] = INCBIN_U8("graphics/pokemon/wormadam/sandy_cloak/icon.4bpp"); @@ -5790,6 +5809,7 @@ const u8 gMonIcon_EternatusEternamax[] = INCBIN_U8("graphics/pokemon/eternatus/e const u8 gMonIcon_ZarudeDada[] = INCBIN_U8("graphics/pokemon/zarude/dada/icon.4bpp"); const u8 gMonIcon_CalyrexIceRider[] = INCBIN_U8("graphics/pokemon/calyrex/ice_rider/icon.4bpp"); const u8 gMonIcon_CalyrexShadowRider[] = INCBIN_U8("graphics/pokemon/calyrex/shadow_rider/icon.4bpp"); +#endif const u8 gMonIcon_Egg[] = INCBIN_U8("graphics/pokemon/egg/icon.4bpp"); const u8 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/footprint.1bpp"); @@ -6179,6 +6199,7 @@ const u8 gMonFootprint_Latios[] = INCBIN_U8("graphics/pokemon/latios/footprint.1 const u8 gMonFootprint_Jirachi[] = INCBIN_U8("graphics/pokemon/jirachi/footprint.1bpp"); const u8 gMonFootprint_Deoxys[] = INCBIN_U8("graphics/pokemon/deoxys/footprint.1bpp"); const u8 gMonFootprint_Chimecho[] = INCBIN_U8("graphics/pokemon/chimecho/footprint.1bpp"); +#if P_NEW_POKEMON == TRUE const u8 gMonFootprint_Turtwig[] = INCBIN_U8("graphics/pokemon/turtwig/footprint.1bpp"); const u8 gMonFootprint_Grotle[] = INCBIN_U8("graphics/pokemon/grotle/footprint.1bpp"); const u8 gMonFootprint_Torterra[] = INCBIN_U8("graphics/pokemon/torterra/footprint.1bpp"); @@ -6691,3 +6712,4 @@ const u8 gMonFootprint_Regidrago[] = INCBIN_U8("graphics/pokemon/regidrago/footp const u8 gMonFootprint_Glastrier[] = INCBIN_U8("graphics/pokemon/glastrier/footprint.1bpp"); const u8 gMonFootprint_Spectrier[] = INCBIN_U8("graphics/pokemon/spectrier/footprint.1bpp"); const u8 gMonFootprint_Calyrex[] = INCBIN_U8("graphics/pokemon/calyrex/footprint.1bpp"); +#endif diff --git a/src/data/pokemon/base_stats.h b/src/data/pokemon/base_stats.h index 81c8eb575..1157ac23d 100644 --- a/src/data/pokemon/base_stats.h +++ b/src/data/pokemon/base_stats.h @@ -10637,6 +10637,7 @@ const struct BaseStats gBaseStats[] = .flags = FLAG_MYTHICAL, }, +#if P_NEW_POKEMON == TRUE [SPECIES_TURTWIG] = { .baseHP = 55, @@ -24873,7 +24874,7 @@ const struct BaseStats gBaseStats[] = [SPECIES_PIKACHU_WORLD_CAP] = CAP_PIKACHU_BASE_STATS(FLIP), [SPECIES_PICHU_SPIKY_EARED] = PICHU_BASE_STATS(NO_FLIP), - +#endif [SPECIES_UNOWN_B] = UNOWN_BASE_STATS(NO_FLIP), [SPECIES_UNOWN_C] = UNOWN_BASE_STATS(NO_FLIP), [SPECIES_UNOWN_D] = UNOWN_BASE_STATS(NO_FLIP), @@ -24980,6 +24981,7 @@ const struct BaseStats gBaseStats[] = .noFlip = TRUE, }, +#if P_NEW_POKEMON == TRUE [SPECIES_BURMY_SANDY_CLOAK] = BURMY_BASE_STATS(BODY_COLOR_BROWN), [SPECIES_BURMY_TRASH_CLOAK] = BURMY_BASE_STATS(BODY_COLOR_RED), @@ -26082,4 +26084,5 @@ const struct BaseStats gBaseStats[] = .bodyColor = BODY_COLOR_BLACK, .noFlip = FALSE, }, +#endif }; diff --git a/src/data/pokemon/egg_moves.h b/src/data/pokemon/egg_moves.h index 18853e0c8..3a5f3c332 100644 --- a/src/data/pokemon/egg_moves.h +++ b/src/data/pokemon/egg_moves.h @@ -2387,6 +2387,7 @@ const u16 gEggMoves[] = { MOVE_ENDURE, MOVE_DEFENSE_CURL), +#if P_NEW_POKEMON == TRUE egg_moves(TURTWIG, MOVE_WORRY_SEED, MOVE_GROWTH, @@ -4409,6 +4410,7 @@ const u16 gEggMoves[] = { MOVE_FAKE_OUT, MOVE_PSYCHO_SHIFT, MOVE_HEAL_PULSE), +#endif EGG_MOVES_TERMINATOR }; diff --git a/src/data/pokemon/evolution_old.h b/src/data/pokemon/evolution_old.h new file mode 100644 index 000000000..0a604defb --- /dev/null +++ b/src/data/pokemon/evolution_old.h @@ -0,0 +1,188 @@ +const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = +{ + [SPECIES_BULBASAUR] = {{EVO_LEVEL, 16, SPECIES_IVYSAUR}}, + [SPECIES_IVYSAUR] = {{EVO_LEVEL, 32, SPECIES_VENUSAUR}}, + [SPECIES_CHARMANDER] = {{EVO_LEVEL, 16, SPECIES_CHARMELEON}}, + [SPECIES_CHARMELEON] = {{EVO_LEVEL, 36, SPECIES_CHARIZARD}}, + [SPECIES_SQUIRTLE] = {{EVO_LEVEL, 16, SPECIES_WARTORTLE}}, + [SPECIES_WARTORTLE] = {{EVO_LEVEL, 36, SPECIES_BLASTOISE}}, + [SPECIES_CATERPIE] = {{EVO_LEVEL, 7, SPECIES_METAPOD}}, + [SPECIES_METAPOD] = {{EVO_LEVEL, 10, SPECIES_BUTTERFREE}}, + [SPECIES_WEEDLE] = {{EVO_LEVEL, 7, SPECIES_KAKUNA}}, + [SPECIES_KAKUNA] = {{EVO_LEVEL, 10, SPECIES_BEEDRILL}}, + [SPECIES_PIDGEY] = {{EVO_LEVEL, 18, SPECIES_PIDGEOTTO}}, + [SPECIES_PIDGEOTTO] = {{EVO_LEVEL, 36, SPECIES_PIDGEOT}}, + [SPECIES_RATTATA] = {{EVO_LEVEL, 20, SPECIES_RATICATE}}, + [SPECIES_SPEAROW] = {{EVO_LEVEL, 20, SPECIES_FEAROW}}, + [SPECIES_EKANS] = {{EVO_LEVEL, 22, SPECIES_ARBOK}}, + [SPECIES_PIKACHU] = {{EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_RAICHU}}, + [SPECIES_SANDSHREW] = {{EVO_LEVEL, 22, SPECIES_SANDSLASH}}, + [SPECIES_NIDORAN_F] = {{EVO_LEVEL, 16, SPECIES_NIDORINA}}, + [SPECIES_NIDORINA] = {{EVO_ITEM, ITEM_MOON_STONE, SPECIES_NIDOQUEEN}}, + [SPECIES_NIDORAN_M] = {{EVO_LEVEL, 16, SPECIES_NIDORINO}}, + [SPECIES_NIDORINO] = {{EVO_ITEM, ITEM_MOON_STONE, SPECIES_NIDOKING}}, + [SPECIES_CLEFAIRY] = {{EVO_ITEM, ITEM_MOON_STONE, SPECIES_CLEFABLE}}, + [SPECIES_VULPIX] = {{EVO_ITEM, ITEM_FIRE_STONE, SPECIES_NINETALES}}, + [SPECIES_JIGGLYPUFF] = {{EVO_ITEM, ITEM_MOON_STONE, SPECIES_WIGGLYTUFF}}, + [SPECIES_ZUBAT] = {{EVO_LEVEL, 22, SPECIES_GOLBAT}}, + [SPECIES_GOLBAT] = {{EVO_FRIENDSHIP, 0, SPECIES_CROBAT}}, + [SPECIES_ODDISH] = {{EVO_LEVEL, 21, SPECIES_GLOOM}}, + [SPECIES_GLOOM] = {{EVO_ITEM, ITEM_LEAF_STONE, SPECIES_VILEPLUME}, + {EVO_ITEM, ITEM_SUN_STONE, SPECIES_BELLOSSOM}}, + [SPECIES_PARAS] = {{EVO_LEVEL, 24, SPECIES_PARASECT}}, + [SPECIES_VENONAT] = {{EVO_LEVEL, 31, SPECIES_VENOMOTH}}, + [SPECIES_DIGLETT] = {{EVO_LEVEL, 26, SPECIES_DUGTRIO}}, + [SPECIES_MEOWTH] = {{EVO_LEVEL, 28, SPECIES_PERSIAN}}, + [SPECIES_PSYDUCK] = {{EVO_LEVEL, 33, SPECIES_GOLDUCK}}, + [SPECIES_MANKEY] = {{EVO_LEVEL, 28, SPECIES_PRIMEAPE}}, + [SPECIES_GROWLITHE] = {{EVO_ITEM, ITEM_FIRE_STONE, SPECIES_ARCANINE}}, + [SPECIES_POLIWAG] = {{EVO_LEVEL, 25, SPECIES_POLIWHIRL}}, + [SPECIES_POLIWHIRL] = {{EVO_ITEM, ITEM_WATER_STONE, SPECIES_POLIWRATH}, + {EVO_TRADE_ITEM, ITEM_KINGS_ROCK, SPECIES_POLITOED}}, + [SPECIES_ABRA] = {{EVO_LEVEL, 16, SPECIES_KADABRA}}, + [SPECIES_KADABRA] = {{EVO_TRADE, 0, SPECIES_ALAKAZAM}}, + [SPECIES_MACHOP] = {{EVO_LEVEL, 28, SPECIES_MACHOKE}}, + [SPECIES_MACHOKE] = {{EVO_TRADE, 0, SPECIES_MACHAMP}}, + [SPECIES_BELLSPROUT] = {{EVO_LEVEL, 21, SPECIES_WEEPINBELL}}, + [SPECIES_WEEPINBELL] = {{EVO_ITEM, ITEM_LEAF_STONE, SPECIES_VICTREEBEL}}, + [SPECIES_TENTACOOL] = {{EVO_LEVEL, 30, SPECIES_TENTACRUEL}}, + [SPECIES_GEODUDE] = {{EVO_LEVEL, 25, SPECIES_GRAVELER}}, + [SPECIES_GRAVELER] = {{EVO_TRADE, 0, SPECIES_GOLEM}}, + [SPECIES_PONYTA] = {{EVO_LEVEL, 40, SPECIES_RAPIDASH}}, + [SPECIES_SLOWPOKE] = {{EVO_LEVEL, 37, SPECIES_SLOWBRO}, + {EVO_TRADE_ITEM, ITEM_KINGS_ROCK, SPECIES_SLOWKING}}, + [SPECIES_MAGNEMITE] = {{EVO_LEVEL, 30, SPECIES_MAGNETON}}, + [SPECIES_DODUO] = {{EVO_LEVEL, 31, SPECIES_DODRIO}}, + [SPECIES_SEEL] = {{EVO_LEVEL, 34, SPECIES_DEWGONG}}, + [SPECIES_GRIMER] = {{EVO_LEVEL, 38, SPECIES_MUK}}, + [SPECIES_SHELLDER] = {{EVO_ITEM, ITEM_WATER_STONE, SPECIES_CLOYSTER}}, + [SPECIES_GASTLY] = {{EVO_LEVEL, 25, SPECIES_HAUNTER}}, + [SPECIES_HAUNTER] = {{EVO_TRADE, 0, SPECIES_GENGAR}}, + [SPECIES_ONIX] = {{EVO_TRADE_ITEM, ITEM_METAL_COAT, SPECIES_STEELIX}}, + [SPECIES_DROWZEE] = {{EVO_LEVEL, 26, SPECIES_HYPNO}}, + [SPECIES_KRABBY] = {{EVO_LEVEL, 28, SPECIES_KINGLER}}, + [SPECIES_VOLTORB] = {{EVO_LEVEL, 30, SPECIES_ELECTRODE}}, + [SPECIES_EXEGGCUTE] = {{EVO_ITEM, ITEM_LEAF_STONE, SPECIES_EXEGGUTOR}}, + [SPECIES_CUBONE] = {{EVO_LEVEL, 28, SPECIES_MAROWAK}}, + [SPECIES_KOFFING] = {{EVO_LEVEL, 35, SPECIES_WEEZING}}, + [SPECIES_RHYHORN] = {{EVO_LEVEL, 42, SPECIES_RHYDON}}, + [SPECIES_CHANSEY] = {{EVO_FRIENDSHIP, 0, SPECIES_BLISSEY}}, + [SPECIES_HORSEA] = {{EVO_LEVEL, 32, SPECIES_SEADRA}}, + [SPECIES_SEADRA] = {{EVO_TRADE_ITEM, ITEM_DRAGON_SCALE, SPECIES_KINGDRA}}, + [SPECIES_GOLDEEN] = {{EVO_LEVEL, 33, SPECIES_SEAKING}}, + [SPECIES_STARYU] = {{EVO_ITEM, ITEM_WATER_STONE, SPECIES_STARMIE}}, + [SPECIES_SCYTHER] = {{EVO_TRADE_ITEM, ITEM_METAL_COAT, SPECIES_SCIZOR}}, + [SPECIES_MAGIKARP] = {{EVO_LEVEL, 20, SPECIES_GYARADOS}}, + [SPECIES_EEVEE] = {{EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_JOLTEON}, + {EVO_ITEM, ITEM_WATER_STONE, SPECIES_VAPOREON}, + {EVO_ITEM, ITEM_FIRE_STONE, SPECIES_FLAREON}, + {EVO_FRIENDSHIP_DAY, 0, SPECIES_ESPEON}, + {EVO_FRIENDSHIP_NIGHT, 0, SPECIES_UMBREON}}, + [SPECIES_PORYGON] = {{EVO_TRADE_ITEM, ITEM_UPGRADE, SPECIES_PORYGON2}}, + [SPECIES_OMANYTE] = {{EVO_LEVEL, 40, SPECIES_OMASTAR}}, + [SPECIES_KABUTO] = {{EVO_LEVEL, 40, SPECIES_KABUTOPS}}, + [SPECIES_DRATINI] = {{EVO_LEVEL, 30, SPECIES_DRAGONAIR}}, + [SPECIES_DRAGONAIR] = {{EVO_LEVEL, 55, SPECIES_DRAGONITE}}, + [SPECIES_CHIKORITA] = {{EVO_LEVEL, 16, SPECIES_BAYLEEF}}, + [SPECIES_BAYLEEF] = {{EVO_LEVEL, 32, SPECIES_MEGANIUM}}, + [SPECIES_CYNDAQUIL] = {{EVO_LEVEL, 14, SPECIES_QUILAVA}}, + [SPECIES_QUILAVA] = {{EVO_LEVEL, 36, SPECIES_TYPHLOSION}}, + [SPECIES_TOTODILE] = {{EVO_LEVEL, 18, SPECIES_CROCONAW}}, + [SPECIES_CROCONAW] = {{EVO_LEVEL, 30, SPECIES_FERALIGATR}}, + [SPECIES_SENTRET] = {{EVO_LEVEL, 15, SPECIES_FURRET}}, + [SPECIES_HOOTHOOT] = {{EVO_LEVEL, 20, SPECIES_NOCTOWL}}, + [SPECIES_LEDYBA] = {{EVO_LEVEL, 18, SPECIES_LEDIAN}}, + [SPECIES_SPINARAK] = {{EVO_LEVEL, 22, SPECIES_ARIADOS}}, + [SPECIES_CHINCHOU] = {{EVO_LEVEL, 27, SPECIES_LANTURN}}, + [SPECIES_PICHU] = {{EVO_FRIENDSHIP, 0, SPECIES_PIKACHU}}, + [SPECIES_CLEFFA] = {{EVO_FRIENDSHIP, 0, SPECIES_CLEFAIRY}}, + [SPECIES_IGGLYBUFF] = {{EVO_FRIENDSHIP, 0, SPECIES_JIGGLYPUFF}}, + [SPECIES_TOGEPI] = {{EVO_FRIENDSHIP, 0, SPECIES_TOGETIC}}, + [SPECIES_NATU] = {{EVO_LEVEL, 25, SPECIES_XATU}}, + [SPECIES_MAREEP] = {{EVO_LEVEL, 15, SPECIES_FLAAFFY}}, + [SPECIES_FLAAFFY] = {{EVO_LEVEL, 30, SPECIES_AMPHAROS}}, + [SPECIES_MARILL] = {{EVO_LEVEL, 18, SPECIES_AZUMARILL}}, + [SPECIES_HOPPIP] = {{EVO_LEVEL, 18, SPECIES_SKIPLOOM}}, + [SPECIES_SKIPLOOM] = {{EVO_LEVEL, 27, SPECIES_JUMPLUFF}}, + [SPECIES_SUNKERN] = {{EVO_ITEM, ITEM_SUN_STONE, SPECIES_SUNFLORA}}, + [SPECIES_WOOPER] = {{EVO_LEVEL, 20, SPECIES_QUAGSIRE}}, + [SPECIES_PINECO] = {{EVO_LEVEL, 31, SPECIES_FORRETRESS}}, + [SPECIES_SNUBBULL] = {{EVO_LEVEL, 23, SPECIES_GRANBULL}}, + [SPECIES_TEDDIURSA] = {{EVO_LEVEL, 30, SPECIES_URSARING}}, + [SPECIES_SLUGMA] = {{EVO_LEVEL, 38, SPECIES_MAGCARGO}}, + [SPECIES_SWINUB] = {{EVO_LEVEL, 33, SPECIES_PILOSWINE}}, + [SPECIES_REMORAID] = {{EVO_LEVEL, 25, SPECIES_OCTILLERY}}, + [SPECIES_HOUNDOUR] = {{EVO_LEVEL, 24, SPECIES_HOUNDOOM}}, + [SPECIES_PHANPY] = {{EVO_LEVEL, 25, SPECIES_DONPHAN}}, + [SPECIES_TYROGUE] = {{EVO_LEVEL_ATK_LT_DEF, 20, SPECIES_HITMONCHAN}, + {EVO_LEVEL_ATK_GT_DEF, 20, SPECIES_HITMONLEE}, + {EVO_LEVEL_ATK_EQ_DEF, 20, SPECIES_HITMONTOP}}, + [SPECIES_SMOOCHUM] = {{EVO_LEVEL, 30, SPECIES_JYNX}}, + [SPECIES_ELEKID] = {{EVO_LEVEL, 30, SPECIES_ELECTABUZZ}}, + [SPECIES_MAGBY] = {{EVO_LEVEL, 30, SPECIES_MAGMAR}}, + [SPECIES_LARVITAR] = {{EVO_LEVEL, 30, SPECIES_PUPITAR}}, + [SPECIES_PUPITAR] = {{EVO_LEVEL, 55, SPECIES_TYRANITAR}}, + [SPECIES_TREECKO] = {{EVO_LEVEL, 16, SPECIES_GROVYLE}}, + [SPECIES_GROVYLE] = {{EVO_LEVEL, 36, SPECIES_SCEPTILE}}, + [SPECIES_TORCHIC] = {{EVO_LEVEL, 16, SPECIES_COMBUSKEN}}, + [SPECIES_COMBUSKEN] = {{EVO_LEVEL, 36, SPECIES_BLAZIKEN}}, + [SPECIES_MUDKIP] = {{EVO_LEVEL, 16, SPECIES_MARSHTOMP}}, + [SPECIES_MARSHTOMP] = {{EVO_LEVEL, 36, SPECIES_SWAMPERT}}, + [SPECIES_POOCHYENA] = {{EVO_LEVEL, 18, SPECIES_MIGHTYENA}}, + [SPECIES_ZIGZAGOON] = {{EVO_LEVEL, 20, SPECIES_LINOONE}}, + [SPECIES_WURMPLE] = {{EVO_LEVEL_SILCOON, 7, SPECIES_SILCOON}, + {EVO_LEVEL_CASCOON, 7, SPECIES_CASCOON}}, + [SPECIES_SILCOON] = {{EVO_LEVEL, 10, SPECIES_BEAUTIFLY}}, + [SPECIES_CASCOON] = {{EVO_LEVEL, 10, SPECIES_DUSTOX}}, + [SPECIES_LOTAD] = {{EVO_LEVEL, 14, SPECIES_LOMBRE}}, + [SPECIES_LOMBRE] = {{EVO_ITEM, ITEM_WATER_STONE, SPECIES_LUDICOLO}}, + [SPECIES_SEEDOT] = {{EVO_LEVEL, 14, SPECIES_NUZLEAF}}, + [SPECIES_NUZLEAF] = {{EVO_ITEM, ITEM_LEAF_STONE, SPECIES_SHIFTRY}}, + [SPECIES_NINCADA] = {{EVO_LEVEL_NINJASK, 20, SPECIES_NINJASK}, + {EVO_LEVEL_SHEDINJA, 20, SPECIES_SHEDINJA}}, + [SPECIES_TAILLOW] = {{EVO_LEVEL, 22, SPECIES_SWELLOW}}, + [SPECIES_SHROOMISH] = {{EVO_LEVEL, 23, SPECIES_BRELOOM}}, + [SPECIES_WINGULL] = {{EVO_LEVEL, 25, SPECIES_PELIPPER}}, + [SPECIES_SURSKIT] = {{EVO_LEVEL, 22, SPECIES_MASQUERAIN}}, + [SPECIES_WAILMER] = {{EVO_LEVEL, 40, SPECIES_WAILORD}}, + [SPECIES_SKITTY] = {{EVO_ITEM, ITEM_MOON_STONE, SPECIES_DELCATTY}}, + [SPECIES_BALTOY] = {{EVO_LEVEL, 36, SPECIES_CLAYDOL}}, + [SPECIES_BARBOACH] = {{EVO_LEVEL, 30, SPECIES_WHISCASH}}, + [SPECIES_CORPHISH] = {{EVO_LEVEL, 30, SPECIES_CRAWDAUNT}}, + [SPECIES_FEEBAS] = {{EVO_BEAUTY, 170, SPECIES_MILOTIC}, + {EVO_TRADE_ITEM, ITEM_PRISM_SCALE, SPECIES_MILOTIC}}, + [SPECIES_CARVANHA] = {{EVO_LEVEL, 30, SPECIES_SHARPEDO}}, + [SPECIES_TRAPINCH] = {{EVO_LEVEL, 35, SPECIES_VIBRAVA}}, + [SPECIES_VIBRAVA] = {{EVO_LEVEL, 45, SPECIES_FLYGON}}, + [SPECIES_MAKUHITA] = {{EVO_LEVEL, 24, SPECIES_HARIYAMA}}, + [SPECIES_ELECTRIKE] = {{EVO_LEVEL, 26, SPECIES_MANECTRIC}}, + [SPECIES_NUMEL] = {{EVO_LEVEL, 33, SPECIES_CAMERUPT}}, + [SPECIES_SPHEAL] = {{EVO_LEVEL, 32, SPECIES_SEALEO}}, + [SPECIES_SEALEO] = {{EVO_LEVEL, 44, SPECIES_WALREIN}}, + [SPECIES_CACNEA] = {{EVO_LEVEL, 32, SPECIES_CACTURNE}}, + [SPECIES_SNORUNT] = {{EVO_LEVEL, 42, SPECIES_GLALIE}}, + [SPECIES_AZURILL] = {{EVO_FRIENDSHIP, 0, SPECIES_MARILL}}, + [SPECIES_SPOINK] = {{EVO_LEVEL, 32, SPECIES_GRUMPIG}}, + [SPECIES_MEDITITE] = {{EVO_LEVEL, 37, SPECIES_MEDICHAM}}, + [SPECIES_SWABLU] = {{EVO_LEVEL, 35, SPECIES_ALTARIA}}, + [SPECIES_WYNAUT] = {{EVO_LEVEL, 15, SPECIES_WOBBUFFET}}, + [SPECIES_DUSKULL] = {{EVO_LEVEL, 37, SPECIES_DUSCLOPS}}, + [SPECIES_SLAKOTH] = {{EVO_LEVEL, 18, SPECIES_VIGOROTH}}, + [SPECIES_VIGOROTH] = {{EVO_LEVEL, 36, SPECIES_SLAKING}}, + [SPECIES_GULPIN] = {{EVO_LEVEL, 26, SPECIES_SWALOT}}, + [SPECIES_WHISMUR] = {{EVO_LEVEL, 20, SPECIES_LOUDRED}}, + [SPECIES_LOUDRED] = {{EVO_LEVEL, 40, SPECIES_EXPLOUD}}, + [SPECIES_CLAMPERL] = {{EVO_TRADE_ITEM, ITEM_DEEP_SEA_TOOTH, SPECIES_HUNTAIL}, + {EVO_TRADE_ITEM, ITEM_DEEP_SEA_SCALE, SPECIES_GOREBYSS}}, + [SPECIES_SHUPPET] = {{EVO_LEVEL, 37, SPECIES_BANETTE}}, + [SPECIES_ARON] = {{EVO_LEVEL, 32, SPECIES_LAIRON}}, + [SPECIES_LAIRON] = {{EVO_LEVEL, 42, SPECIES_AGGRON}}, + [SPECIES_LILEEP] = {{EVO_LEVEL, 40, SPECIES_CRADILY}}, + [SPECIES_ANORITH] = {{EVO_LEVEL, 40, SPECIES_ARMALDO}}, + [SPECIES_RALTS] = {{EVO_LEVEL, 20, SPECIES_KIRLIA}}, + [SPECIES_KIRLIA] = {{EVO_LEVEL, 30, SPECIES_GARDEVOIR}}, + [SPECIES_BAGON] = {{EVO_LEVEL, 30, SPECIES_SHELGON}}, + [SPECIES_SHELGON] = {{EVO_LEVEL, 50, SPECIES_SALAMENCE}}, + [SPECIES_BELDUM] = {{EVO_LEVEL, 20, SPECIES_METANG}}, + [SPECIES_METANG] = {{EVO_LEVEL, 45, SPECIES_METAGROSS}}, +}; diff --git a/src/data/pokemon/form_change_table_pointers.h b/src/data/pokemon/form_change_table_pointers.h index d40d332ab..3fdbff7a6 100644 --- a/src/data/pokemon/form_change_table_pointers.h +++ b/src/data/pokemon/form_change_table_pointers.h @@ -1,5 +1,6 @@ const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] = { +#if P_NEW_POKEMON == TRUE [SPECIES_GIRATINA] = sGiratinaFormChangeTable, [SPECIES_GIRATINA_ORIGIN] = sGiratinaFormChangeTable, [SPECIES_SHAYMIN] = sShayminFormChangeTable, @@ -59,4 +60,5 @@ const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] = [SPECIES_SILVALLY_ROCK] = sSilvallyFormChangeTable, [SPECIES_SILVALLY_STEEL] = sSilvallyFormChangeTable, [SPECIES_SILVALLY_WATER] = sSilvallyFormChangeTable, +#endif }; diff --git a/src/data/pokemon/form_change_tables.h b/src/data/pokemon/form_change_tables.h index c224a1a02..15cb8cdec 100644 --- a/src/data/pokemon/form_change_tables.h +++ b/src/data/pokemon/form_change_tables.h @@ -43,6 +43,7 @@ FORM_ITEM_USE_TIME: #define DAY 0 #define NIGHT 1 +#if P_NEW_POKEMON == TRUE static const struct FormChange sGiratinaFormChangeTable[] = { {FORM_ITEM_HOLD, SPECIES_GIRATINA, ITEM_NONE}, {FORM_ITEM_HOLD, SPECIES_GIRATINA_ORIGIN, ITEM_GRISEOUS_ORB}, @@ -182,6 +183,7 @@ static const struct FormChange sSilvallyFormChangeTable[] = { {FORM_ITEM_HOLD_ABILITY, SPECIES_SILVALLY_FAIRY, ITEM_FAIRY_MEMORY, ABILITY_RKS_SYSTEM}, {FORM_CHANGE_END}, }; +#endif #undef WHEN_LEARNED #undef WHEN_FORGOTTEN diff --git a/src/data/pokemon/form_species_table_pointers.h b/src/data/pokemon/form_species_table_pointers.h index 7c7c56b0e..60cfadad2 100644 --- a/src/data/pokemon/form_species_table_pointers.h +++ b/src/data/pokemon/form_species_table_pointers.h @@ -1,5 +1,6 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = { +#if P_NEW_POKEMON == TRUE [SPECIES_VENUSAUR] = sVenusaurFormSpeciesIdTable, [SPECIES_CHARIZARD] = sCharizardFormSpeciesIdTable, [SPECIES_BLASTOISE] = sBlastoiseFormSpeciesIdTable, @@ -44,7 +45,9 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_PICHU] = sPichuFormSpeciesIdTable, [SPECIES_AMPHAROS] = sAmpharosFormSpeciesIdTable, [SPECIES_SLOWKING] = sSlowkingFormSpeciesIdTable, +#endif [SPECIES_UNOWN] = sUnownFormSpeciesIdTable, +#if P_NEW_POKEMON == TRUE [SPECIES_STEELIX] = sSteelixFormSpeciesIdTable, [SPECIES_SCIZOR] = sScizorFormSpeciesIdTable, [SPECIES_HERACROSS] = sHeracrossFormSpeciesIdTable, @@ -65,7 +68,9 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_SHARPEDO] = sSharpedoFormSpeciesIdTable, [SPECIES_CAMERUPT] = sCameruptFormSpeciesIdTable, [SPECIES_ALTARIA] = sAltariaFormSpeciesIdTable, +#endif [SPECIES_CASTFORM] = sCastformFormSpeciesIdTable, +#if P_NEW_POKEMON == TRUE [SPECIES_BANETTE] = sBanetteFormSpeciesIdTable, [SPECIES_ABSOL] = sAbsolFormSpeciesIdTable, [SPECIES_GLALIE] = sGlalieFormSpeciesIdTable, @@ -76,7 +81,9 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_KYOGRE] = sKyogreFormSpeciesIdTable, [SPECIES_GROUDON] = sGroudonFormSpeciesIdTable, [SPECIES_RAYQUAZA] = sRayquazaFormSpeciesIdTable, +#endif [SPECIES_DEOXYS] = sDeoxysFormSpeciesIdTable, +#if P_NEW_POKEMON == TRUE [SPECIES_BURMY] = sBurmyFormSpeciesIdTable, [SPECIES_WORMADAM] = sWormadamFormSpeciesIdTable, [SPECIES_CHERRIM] = sCherrimFormSpeciesIdTable, @@ -253,6 +260,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_PIKACHU_WORLD_CAP] = sPikachuFormSpeciesIdTable, // Pichu [SPECIES_PICHU_SPIKY_EARED] = sPichuFormSpeciesIdTable, +#endif // Unown [SPECIES_UNOWN_B] = sUnownFormSpeciesIdTable, [SPECIES_UNOWN_C] = sUnownFormSpeciesIdTable, @@ -289,6 +297,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_DEOXYS_ATTACK] = sDeoxysFormSpeciesIdTable, [SPECIES_DEOXYS_DEFENSE] = sDeoxysFormSpeciesIdTable, [SPECIES_DEOXYS_SPEED] = sDeoxysFormSpeciesIdTable, +#if P_NEW_POKEMON == TRUE // Burmy [SPECIES_BURMY_SANDY_CLOAK] = sBurmyFormSpeciesIdTable, [SPECIES_BURMY_TRASH_CLOAK] = sBurmyFormSpeciesIdTable, @@ -516,4 +525,5 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = // Calyrex [SPECIES_CALYREX_ICE_RIDER] = sCalyrexFormSpeciesIdTable, [SPECIES_CALYREX_SHADOW_RIDER] = sCalyrexFormSpeciesIdTable, +#endif }; diff --git a/src/data/pokemon/form_species_tables.h b/src/data/pokemon/form_species_tables.h index 810da6499..d54426df4 100644 --- a/src/data/pokemon/form_species_tables.h +++ b/src/data/pokemon/form_species_tables.h @@ -1,3 +1,4 @@ +#if P_NEW_POKEMON == TRUE static const u16 sVenusaurFormSpeciesIdTable[] = { SPECIES_VENUSAUR, SPECIES_VENUSAUR_MEGA, @@ -278,6 +279,7 @@ static const u16 sSlowkingFormSpeciesIdTable[] = { SPECIES_SLOWKING_GALARIAN, FORM_SPECIES_END, }; +#endif static const u16 sUnownFormSpeciesIdTable[] = { SPECIES_UNOWN, @@ -311,6 +313,7 @@ static const u16 sUnownFormSpeciesIdTable[] = { FORM_SPECIES_END, }; +#if P_NEW_POKEMON == TRUE static const u16 sSteelixFormSpeciesIdTable[] = { SPECIES_STEELIX, SPECIES_STEELIX_MEGA, @@ -430,7 +433,7 @@ static const u16 sAltariaFormSpeciesIdTable[] = { SPECIES_ALTARIA_MEGA, FORM_SPECIES_END, }; - +#endif static const u16 sCastformFormSpeciesIdTable[] = { SPECIES_CASTFORM, SPECIES_CASTFORM_SUNNY, @@ -439,6 +442,7 @@ static const u16 sCastformFormSpeciesIdTable[] = { FORM_SPECIES_END, }; +#if P_NEW_POKEMON == TRUE static const u16 sBanetteFormSpeciesIdTable[] = { SPECIES_BANETTE, SPECIES_BANETTE_MEGA, @@ -498,7 +502,7 @@ static const u16 sRayquazaFormSpeciesIdTable[] = { SPECIES_RAYQUAZA_MEGA, FORM_SPECIES_END, }; - +#endif static const u16 sDeoxysFormSpeciesIdTable[] = { SPECIES_DEOXYS, SPECIES_DEOXYS_ATTACK, @@ -506,7 +510,7 @@ static const u16 sDeoxysFormSpeciesIdTable[] = { SPECIES_DEOXYS_SPEED, FORM_SPECIES_END, }; - +#if P_NEW_POKEMON == TRUE static const u16 sBurmyFormSpeciesIdTable[] = { SPECIES_BURMY, SPECIES_BURMY_SANDY_CLOAK, @@ -1020,3 +1024,4 @@ static const u16 sCalyrexFormSpeciesIdTable[] = { SPECIES_CALYREX_SHADOW_RIDER, FORM_SPECIES_END, }; +#endif diff --git a/src/data/pokemon/level_up_learnset_pointers.h b/src/data/pokemon/level_up_learnset_pointers.h index 6cd308aa7..52f1e187a 100644 --- a/src/data/pokemon/level_up_learnset_pointers.h +++ b/src/data/pokemon/level_up_learnset_pointers.h @@ -387,6 +387,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_JIRACHI] = sJirachiLevelUpLearnset, [SPECIES_DEOXYS] = sDeoxysLevelUpLearnset, [SPECIES_CHIMECHO] = sChimechoLevelUpLearnset, +#if P_NEW_POKEMON == TRUE [SPECIES_TURTWIG] = sTurtwigLevelUpLearnset, [SPECIES_GROTLE] = sGrotleLevelUpLearnset, [SPECIES_TORTERRA] = sTorterraLevelUpLearnset, @@ -1009,6 +1010,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_PIKACHU_WORLD_CAP] = sPikachuLevelUpLearnset, // Pichu [SPECIES_PICHU_SPIKY_EARED] = sPichuLevelUpLearnset, +#endif // Unown [SPECIES_UNOWN_B] = sUnownLevelUpLearnset, [SPECIES_UNOWN_C] = sUnownLevelUpLearnset, @@ -1045,6 +1047,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_DEOXYS_ATTACK] = sDeoxysAttackLevelUpLearnset, [SPECIES_DEOXYS_DEFENSE] = sDeoxysDefenseLevelUpLearnset, [SPECIES_DEOXYS_SPEED] = sDeoxysSpeedLevelUpLearnset, +#if P_NEW_POKEMON == TRUE // Burmy [SPECIES_BURMY_SANDY_CLOAK] = sBurmyLevelUpLearnset, [SPECIES_BURMY_TRASH_CLOAK] = sBurmyLevelUpLearnset, @@ -1272,4 +1275,5 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = // Calyrex [SPECIES_CALYREX_ICE_RIDER] = sCalyrexIceRiderLevelUpLearnset, [SPECIES_CALYREX_SHADOW_RIDER] = sCalyrexShadowRiderLevelUpLearnset, +#endif }; diff --git a/src/data/pokemon/level_up_learnsets.h b/src/data/pokemon/level_up_learnsets.h index e7c4150cc..42fdc00d9 100644 --- a/src/data/pokemon/level_up_learnsets.h +++ b/src/data/pokemon/level_up_learnsets.h @@ -7903,6 +7903,7 @@ static const struct LevelUpMove sChimechoLevelUpLearnset[] = { LEVEL_UP_END }; +#if P_NEW_POKEMON == TRUE static const struct LevelUpMove sTurtwigLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 5, MOVE_WITHDRAW), @@ -18840,7 +18841,7 @@ static const struct LevelUpMove sStunfiskGalarianLevelUpLearnset[] = { LEVEL_UP_MOVE(55, MOVE_FISSURE), LEVEL_UP_END }; - +#endif static const struct LevelUpMove sDeoxysAttackLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 1, MOVE_WRAP), @@ -18897,6 +18898,7 @@ static const struct LevelUpMove sDeoxysSpeedLevelUpLearnset[] = { LEVEL_UP_END }; +#if P_NEW_POKEMON == TRUE static const struct LevelUpMove sWormadamSandyCloakLevelUpLearnset[] = { //LEVEL_UP_MOVE( 0, MOVE_QUIVER_DANCE), LEVEL_UP_MOVE( 1, MOVE_QUIVER_DANCE), @@ -19247,3 +19249,4 @@ static const struct LevelUpMove sCalyrexShadowRiderLevelUpLearnset[] = { LEVEL_UP_MOVE(88, MOVE_FUTURE_SIGHT), LEVEL_UP_END }; +#endif diff --git a/src/data/pokemon/pokedex_entries.h b/src/data/pokemon/pokedex_entries.h index 6ceff22ee..db228f4c5 100644 --- a/src/data/pokemon/pokedex_entries.h +++ b/src/data/pokemon/pokedex_entries.h @@ -4644,6 +4644,7 @@ const struct PokedexEntry gPokedexEntries[] = .trainerOffset = 2, }, +#if P_NEW_POKEMON == TRUE [NATIONAL_DEX_TURTWIG] = { .categoryName = _("Tiny Leaf"), @@ -10787,4 +10788,5 @@ const struct PokedexEntry gPokedexEntries[] = .trainerScale = 256, .trainerOffset = 0, }, +#endif }; diff --git a/src/data/pokemon/pokedex_text.h b/src/data/pokemon/pokedex_text.h index 15d56ee9d..c91e340c7 100644 --- a/src/data/pokemon/pokedex_text.h +++ b/src/data/pokemon/pokedex_text.h @@ -2320,6 +2320,7 @@ const u8 gChimechoPokedexText[] = _( "themselves using seven different and\n" "distinguishing cries."); +#if P_NEW_POKEMON == TRUE const u8 gTurtwigPokedexText[] = _( "The shell on its back is made of soil. \n" "On a very healthy Turtwig, the shell \n" @@ -5348,3 +5349,4 @@ const u8 gCalyrexPokedexText[] = _( "providing healing and blessings. It\n" "reigned over the Galar region in times\n" "of yore."); +#endif diff --git a/src/data/pokemon/tmhm_learnsets.h b/src/data/pokemon/tmhm_learnsets.h index fd0cb07bc..014e4a598 100644 --- a/src/data/pokemon/tmhm_learnsets.h +++ b/src/data/pokemon/tmhm_learnsets.h @@ -9614,6 +9614,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM06_TOXIC) | TMHM(TM03_WATER_PULSE)), +#if P_NEW_POKEMON == TRUE [SPECIES_TURTWIG] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM09_BULLET_SEED) | TMHM(HM01_CUT) @@ -21117,7 +21118,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM25_THUNDER) | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - +#endif [SPECIES_UNOWN_B] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), [SPECIES_UNOWN_C] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), @@ -21283,6 +21284,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM06_TOXIC) | TMHM(TM03_WATER_PULSE)), +#if P_NEW_POKEMON == TRUE [SPECIES_BURMY_SANDY_CLOAK] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER) | TMHM(TM17_PROTECT)), @@ -24751,4 +24753,5 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM22_SOLAR_BEAM) | TMHM(TM11_SUNNY_DAY) | TMHM(TM12_TAUNT)), +#endif }; diff --git a/src/data/pokemon/tutor_learnsets.h b/src/data/pokemon/tutor_learnsets.h index f6ad5b26e..7d4eb99df 100644 --- a/src/data/pokemon/tutor_learnsets.h +++ b/src/data/pokemon/tutor_learnsets.h @@ -5893,6 +5893,7 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_THUNDER_PUNCH) | TUTOR(MOVE_THUNDER_WAVE)), +#if P_NEW_POKEMON == TRUE [SPECIES_TURTWIG] = TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) | TUTOR(MOVE_DOUBLE_EDGE) | TUTOR(MOVE_ENDURE) @@ -10590,4 +10591,5 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SNORE) | TUTOR(MOVE_SUBSTITUTE) | TUTOR(MOVE_SWIFT)), +#endif }; diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index 70baff4b4..98aa69403 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -1939,6 +1939,7 @@ const struct MonCoords gMonBackPicCoords[] = .size = MON_COORDS_SIZE(64, 56), .y_offset = 9, }, +#if P_NEW_POKEMON == TRUE [SPECIES_TURTWIG] = { .size = MON_COORDS_SIZE(48, 56), @@ -5017,6 +5018,7 @@ const struct MonCoords gMonBackPicCoords[] = .size = MON_COORDS_SIZE(48, 56), .y_offset = 8, }, +#endif // Unown [SPECIES_UNOWN_B] = { @@ -5185,6 +5187,7 @@ const struct MonCoords gMonBackPicCoords[] = .size = MON_COORDS_SIZE(64, 64), .y_offset = 0, }, +#if P_NEW_POKEMON == TRUE // Burmy [SPECIES_BURMY_SANDY_CLOAK] = { @@ -6104,6 +6107,7 @@ const struct MonCoords gMonBackPicCoords[] = .size = MON_COORDS_SIZE(64, 56), .y_offset = 7, }, +#endif // Egg [SPECIES_EGG] = { diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index 80f7aab3b..f9a97cdd5 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -387,6 +387,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(JIRACHI, gMonBackPic_Jirachi), SPECIES_SPRITE(DEOXYS, gMonBackPic_Deoxys), SPECIES_SPRITE(CHIMECHO, gMonBackPic_Chimecho), +#if P_NEW_POKEMON == TRUE SPECIES_SPRITE(TURTWIG, gMonBackPic_Turtwig), SPECIES_SPRITE(GROTLE, gMonBackPic_Grotle), SPECIES_SPRITE(TORTERRA, gMonBackPic_Torterra), @@ -1008,7 +1009,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(PIKACHU_WORLD_CAP, gMonBackPic_PikachuWorldCap), SPECIES_SPRITE(PICHU_SPIKY_EARED, gMonBackPic_PichuSpikyEared), - +#endif SPECIES_SPRITE(UNOWN_B, gMonBackPic_UnownB), SPECIES_SPRITE(UNOWN_C, gMonBackPic_UnownC), SPECIES_SPRITE(UNOWN_D, gMonBackPic_UnownD), @@ -1044,7 +1045,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(DEOXYS_ATTACK, gMonBackPic_DeoxysAttack), SPECIES_SPRITE(DEOXYS_DEFENSE, gMonBackPic_DeoxysDefense), SPECIES_SPRITE(DEOXYS_SPEED, gMonBackPic_DeoxysSpeed), - +#if P_NEW_POKEMON == TRUE SPECIES_SPRITE(BURMY_SANDY_CLOAK, gMonBackPic_BurmySandyCloak), SPECIES_SPRITE(BURMY_TRASH_CLOAK, gMonBackPic_BurmyTrashCloak), @@ -1271,13 +1272,14 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(CALYREX_ICE_RIDER, gMonBackPic_CalyrexIceRider), SPECIES_SPRITE(CALYREX_SHADOW_RIDER, gMonBackPic_CalyrexShadowRider), - +#endif SPECIES_SPRITE(EGG, gMonFrontPic_Egg), }; const struct CompressedSpriteSheet gMonBackPicTableFemale[] = { SPECIES_SPRITE(EEVEE, gMonBackPic_EeveeF), +#if P_NEW_POKEMON == TRUE SPECIES_SPRITE(STARLY, gMonBackPic_StarlyF), SPECIES_SPRITE(STARAVIA, gMonBackPic_StaraviaF), SPECIES_SPRITE(STARAPTOR, gMonBackPic_Staraptor), @@ -1292,4 +1294,5 @@ const struct CompressedSpriteSheet gMonBackPicTableFemale[] = SPECIES_SPRITE(FRILLISH, gMonBackPic_FrillishF), SPECIES_SPRITE(JELLICENT, gMonBackPic_JellicentF), SPECIES_SPRITE(PYROAR, gMonBackPic_PyroarF), +#endif }; diff --git a/src/data/pokemon_graphics/enemy_mon_elevation.h b/src/data/pokemon_graphics/enemy_mon_elevation.h index 84a5ea9fa..26d49a528 100644 --- a/src/data/pokemon_graphics/enemy_mon_elevation.h +++ b/src/data/pokemon_graphics/enemy_mon_elevation.h @@ -58,6 +58,7 @@ const u8 gEnemyMonElevation[NUM_SPECIES] = [SPECIES_LATIOS] = 6, [SPECIES_JIRACHI] = 14, [SPECIES_CHIMECHO] = 16, +#if P_NEW_POKEMON == TRUE // Gen 4 [SPECIES_MOTHIM] = 10, [SPECIES_COMBEE] = 8, @@ -177,6 +178,7 @@ const u8 gEnemyMonElevation[NUM_SPECIES] = [SPECIES_WEEZING_GALARIAN] = 6, [SPECIES_ARTICUNO_GALARIAN] = 10, [SPECIES_YAMASK_GALARIAN] = 4, +#endif // Other Forms [SPECIES_UNOWN_B] = 8, [SPECIES_UNOWN_C] = 8, @@ -208,6 +210,7 @@ const u8 gEnemyMonElevation[NUM_SPECIES] = [SPECIES_CASTFORM_SUNNY] = 5, [SPECIES_CASTFORM_RAINY] = 5, [SPECIES_CASTFORM_SNOWY] = 5, +#if P_NEW_POKEMON == TRUE [SPECIES_ROTOM_HEAT] = 6, [SPECIES_ROTOM_WASH] = 6, [SPECIES_ROTOM_FROST] = 6, @@ -264,4 +267,5 @@ const u8 gEnemyMonElevation[NUM_SPECIES] = [SPECIES_SINISTEA_ANTIQUE] = 10, [SPECIES_POLTEAGEIST_ANTIQUE] = 12, [SPECIES_ETERNATUS_ETERNAMAX] = 13, +#endif }; diff --git a/src/data/pokemon_graphics/footprint_table.h b/src/data/pokemon_graphics/footprint_table.h index da05b7fff..cacf582ca 100644 --- a/src/data/pokemon_graphics/footprint_table.h +++ b/src/data/pokemon_graphics/footprint_table.h @@ -387,6 +387,7 @@ const u8 *const gMonFootprintTable[] = [SPECIES_JIRACHI] = gMonFootprint_Jirachi, [SPECIES_DEOXYS] = gMonFootprint_Deoxys, [SPECIES_CHIMECHO] = gMonFootprint_Chimecho, +#if P_NEW_POKEMON == TRUE [SPECIES_TURTWIG] = gMonFootprint_Turtwig, [SPECIES_GROTLE] = gMonFootprint_Grotle, [SPECIES_TORTERRA] = gMonFootprint_Torterra, @@ -899,5 +900,6 @@ const u8 *const gMonFootprintTable[] = [SPECIES_GLASTRIER] = gMonFootprint_Glastrier, [SPECIES_SPECTRIER] = gMonFootprint_Spectrier, [SPECIES_CALYREX] = gMonFootprint_Calyrex, +#endif [SPECIES_EGG] = gMonFootprint_Bulbasaur, }; diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index 6387994c1..bd3c82b20 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -4805,6 +4805,7 @@ static const union AnimCmd sAnim_UNOWN_QMARK_1[] = ANIMCMD_END, }; +#if P_NEW_POKEMON == TRUE static const union AnimCmd sAnim_TURTWIG_1[] = { ANIMCMD_FRAME(0, 15), @@ -9168,7 +9169,7 @@ static const union AnimCmd sAnim_ZYGARDE_COMPLETE_1[] = ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; - +#endif static const union AnimCmd sAnim_DEOXYS_ATTACK_1[] = { ANIMCMD_FRAME(0, 16), @@ -9226,6 +9227,7 @@ static const union AnimCmd sAnim_DEOXYS_SPEED_2[] = ANIMCMD_END, }; +#if P_NEW_POKEMON == TRUE static const union AnimCmd sAnim_PIKACHU_COSPLAY_1[] = { ANIMCMD_FRAME(0, 1), @@ -9315,6 +9317,7 @@ static const union AnimCmd sAnim_PICHU_SPIKY_EARED_1[] = ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; +#endif static const union AnimCmd *const sAnims_NONE[] ={ sAnim_GeneralFrame0, @@ -11456,6 +11459,7 @@ static const union AnimCmd *const sAnims_UNOWN_QMARK[] ={ sAnim_UNOWN_QMARK_1, }; +#if P_NEW_POKEMON == TRUE static const union AnimCmd *const sAnims_TURTWIG[] ={ sAnim_GeneralFrame0, sAnim_TURTWIG_1, @@ -14575,7 +14579,7 @@ static const union AnimCmd *const sAnims_ZYGARDE_COMPLETE[] ={ sAnim_GeneralFrame0, sAnim_ZYGARDE_COMPLETE_1, }; - +#endif static const union AnimCmd *const sAnims_DEOXYS_ATTACK[] ={ sAnim_GeneralFrame0, sAnim_DEOXYS_ATTACK_1, @@ -14594,6 +14598,7 @@ static const union AnimCmd *const sAnims_DEOXYS_SPEED[] ={ sAnim_DEOXYS_SPEED_2, }; +#if P_NEW_POKEMON == TRUE static const union AnimCmd *const sAnims_PIKACHU_COSPLAY[] ={ sAnim_GeneralFrame0, sAnim_PIKACHU_COSPLAY_1, @@ -14668,6 +14673,7 @@ static const union AnimCmd *const sAnims_PICHU_SPIKY_EARED[] ={ sAnim_GeneralFrame0, sAnim_PICHU_SPIKY_EARED_1, }; +#endif #define ANIM_CMD(name) [SPECIES_##name] = sAnims_##name #define ANIM_CMD_FULL(name, anims) [SPECIES_##name] = anims @@ -15061,6 +15067,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD(JIRACHI), ANIM_CMD(DEOXYS), ANIM_CMD(CHIMECHO), +#if P_NEW_POKEMON == TRUE ANIM_CMD(TURTWIG), ANIM_CMD(GROTLE), ANIM_CMD(TORTERRA), @@ -15675,6 +15682,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD(PIKACHU_PARTNER_CAP), ANIM_CMD(PIKACHU_WORLD_CAP), ANIM_CMD(PICHU_SPIKY_EARED), +#endif ANIM_CMD(UNOWN_B), ANIM_CMD(UNOWN_C), ANIM_CMD(UNOWN_D), @@ -15708,6 +15716,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD(DEOXYS_ATTACK), ANIM_CMD(DEOXYS_DEFENSE), ANIM_CMD(DEOXYS_SPEED), +#if P_NEW_POKEMON == TRUE ANIM_CMD_FULL(BURMY_SANDY_CLOAK, sAnims_BURMY), ANIM_CMD_FULL(BURMY_TRASH_CLOAK, sAnims_BURMY), ANIM_CMD_FULL(WORMADAM_SANDY_CLOAK, sAnims_WORMADAM), @@ -15881,6 +15890,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD_FULL(ZARUDE_DADA, sAnims_ZARUDE), ANIM_CMD_FULL(CALYREX_ICE_RIDER, sAnims_CALYREX), ANIM_CMD_FULL(CALYREX_SHADOW_RIDER, sAnims_CALYREX), +#endif ANIM_CMD(EGG), }; diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index 02a0e0613..2f658eea9 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -1939,6 +1939,7 @@ const struct MonCoords gMonFrontPicCoords[] = .size = MON_COORDS_SIZE(48, 48), .y_offset = 11, }, +#if P_NEW_POKEMON == TRUE [SPECIES_TURTWIG] = { .size = MON_COORDS_SIZE(40, 48), @@ -5017,6 +5018,7 @@ const struct MonCoords gMonFrontPicCoords[] = .size = MON_COORDS_SIZE(32, 40), .y_offset = 14, }, +#endif // Unown [SPECIES_UNOWN_B] = { @@ -5185,6 +5187,7 @@ const struct MonCoords gMonFrontPicCoords[] = .size = MON_COORDS_SIZE(64, 64), .y_offset = 1, }, +#if P_NEW_POKEMON == TRUE // Burmy [SPECIES_BURMY_SANDY_CLOAK] = { @@ -6104,6 +6107,7 @@ const struct MonCoords gMonFrontPicCoords[] = .size = MON_COORDS_SIZE(64, 64), .y_offset = 0, }, +#endif // Egg [SPECIES_EGG] = { diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index 7640dc23e..969ef7579 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -387,6 +387,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(JIRACHI, gMonFrontPic_Jirachi), SPECIES_SPRITE(DEOXYS, gMonFrontPic_Deoxys), SPECIES_SPRITE(CHIMECHO, gMonFrontPic_Chimecho), +#if P_NEW_POKEMON == TRUE SPECIES_SPRITE(TURTWIG, gMonFrontPic_Turtwig), SPECIES_SPRITE(GROTLE, gMonFrontPic_Grotle), SPECIES_SPRITE(TORTERRA, gMonFrontPic_Torterra), @@ -1008,7 +1009,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(PIKACHU_WORLD_CAP, gMonFrontPic_PikachuWorldCap), SPECIES_SPRITE(PICHU_SPIKY_EARED, gMonFrontPic_PichuSpikyEared), - +#endif SPECIES_SPRITE(UNOWN_B, gMonFrontPic_UnownB), SPECIES_SPRITE(UNOWN_C, gMonFrontPic_UnownC), SPECIES_SPRITE(UNOWN_D, gMonFrontPic_UnownD), @@ -1044,7 +1045,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(DEOXYS_ATTACK, gMonFrontPic_DeoxysAttack), SPECIES_SPRITE(DEOXYS_DEFENSE, gMonFrontPic_DeoxysDefense), SPECIES_SPRITE(DEOXYS_SPEED, gMonFrontPic_DeoxysSpeed), - +#if P_NEW_POKEMON == TRUE SPECIES_SPRITE(BURMY_SANDY_CLOAK, gMonFrontPic_BurmySandyCloak), SPECIES_SPRITE(BURMY_TRASH_CLOAK, gMonFrontPic_BurmyTrashCloak), @@ -1271,13 +1272,14 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(CALYREX_ICE_RIDER, gMonFrontPic_CalyrexIceRider), SPECIES_SPRITE(CALYREX_SHADOW_RIDER, gMonFrontPic_CalyrexShadowRider), - +#endif SPECIES_SPRITE(EGG, gMonFrontPic_Egg), }; const struct CompressedSpriteSheet gMonFrontPicTableFemale[] = { SPECIES_SPRITE(EEVEE, gMonFrontPic_EeveeF), +#if P_NEW_POKEMON == TRUE SPECIES_SPRITE(STARLY, gMonFrontPic_StarlyF), SPECIES_SPRITE(STARAVIA, gMonFrontPic_StaraviaF), SPECIES_SPRITE(STARAPTOR, gMonFrontPic_StaraptorF), @@ -1292,4 +1294,5 @@ const struct CompressedSpriteSheet gMonFrontPicTableFemale[] = SPECIES_SPRITE(FRILLISH, gMonFrontPic_FrillishF), SPECIES_SPRITE(JELLICENT, gMonFrontPic_JellicentF), SPECIES_SPRITE(PYROAR, gMonFrontPic_PyroarF), +#endif }; diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index 3de410700..ba7801bca 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -387,6 +387,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(JIRACHI, gMonPalette_Jirachi), SPECIES_PAL(DEOXYS, gMonPalette_Deoxys), SPECIES_PAL(CHIMECHO, gMonPalette_Chimecho), +#if P_NEW_POKEMON == TRUE SPECIES_PAL(TURTWIG, gMonPalette_Turtwig), SPECIES_PAL(GROTLE, gMonPalette_Grotle), SPECIES_PAL(TORTERRA, gMonPalette_Torterra), @@ -1008,7 +1009,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(PIKACHU_WORLD_CAP, gMonPalette_PikachuWorldCap), SPECIES_PAL(PICHU_SPIKY_EARED, gMonPalette_PichuSpikyEared), - +#endif SPECIES_PAL(UNOWN_B, gMonPalette_Unown), SPECIES_PAL(UNOWN_C, gMonPalette_Unown), SPECIES_PAL(UNOWN_D, gMonPalette_Unown), @@ -1044,7 +1045,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(DEOXYS_ATTACK, gMonPalette_DeoxysAttack), SPECIES_PAL(DEOXYS_DEFENSE, gMonPalette_DeoxysDefense), SPECIES_PAL(DEOXYS_SPEED, gMonPalette_DeoxysSpeed), - +#if P_NEW_POKEMON == TRUE SPECIES_PAL(BURMY_SANDY_CLOAK, gMonPalette_BurmySandyCloak), SPECIES_PAL(BURMY_TRASH_CLOAK, gMonPalette_BurmyTrashCloak), @@ -1271,13 +1272,14 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(CALYREX_ICE_RIDER, gMonPalette_CalyrexIceRider), SPECIES_PAL(CALYREX_SHADOW_RIDER, gMonPalette_CalyrexShadowRider), - +#endif SPECIES_PAL(EGG, gMonPalette_Egg), }; const struct CompressedSpritePalette gMonPaletteTableFemale[] = { SPECIES_PAL(EEVEE, gMonPalette_Eevee), +#if P_NEW_POKEMON == TRUE SPECIES_PAL(COMBEE, gMonPalette_Combee), SPECIES_PAL(STARLY, gMonPalette_Starly), SPECIES_PAL(STARAVIA, gMonPalette_Staravia), @@ -1292,4 +1294,5 @@ const struct CompressedSpritePalette gMonPaletteTableFemale[] = SPECIES_PAL(FRILLISH, gMonPalette_FrillishF), SPECIES_PAL(JELLICENT, gMonPalette_JellicentF), SPECIES_PAL(PYROAR, gMonPalette_PyroarF), +#endif }; diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index aa7c4153e..bc1b8266f 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -387,6 +387,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(JIRACHI, gMonShinyPalette_Jirachi), SPECIES_SHINY_PAL(DEOXYS, gMonShinyPalette_Deoxys), SPECIES_SHINY_PAL(CHIMECHO, gMonShinyPalette_Chimecho), +#if P_NEW_POKEMON == TRUE SPECIES_SHINY_PAL(TURTWIG, gMonShinyPalette_Turtwig), SPECIES_SHINY_PAL(GROTLE, gMonShinyPalette_Grotle), SPECIES_SHINY_PAL(TORTERRA, gMonShinyPalette_Torterra), @@ -1008,7 +1009,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(PIKACHU_WORLD_CAP, gMonShinyPalette_PikachuWorldCap), SPECIES_SHINY_PAL(PICHU_SPIKY_EARED, gMonShinyPalette_PichuSpikyEared), - +#endif SPECIES_SHINY_PAL(UNOWN_B, gMonShinyPalette_Unown), SPECIES_SHINY_PAL(UNOWN_C, gMonShinyPalette_Unown), SPECIES_SHINY_PAL(UNOWN_D, gMonShinyPalette_Unown), @@ -1044,7 +1045,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(DEOXYS_ATTACK, gMonShinyPalette_DeoxysAttack), SPECIES_SHINY_PAL(DEOXYS_DEFENSE, gMonShinyPalette_DeoxysDefense), SPECIES_SHINY_PAL(DEOXYS_SPEED, gMonShinyPalette_DeoxysSpeed), - +#if P_NEW_POKEMON == TRUE SPECIES_SHINY_PAL(BURMY_SANDY_CLOAK, gMonShinyPalette_BurmySandyCloak), SPECIES_SHINY_PAL(BURMY_TRASH_CLOAK, gMonShinyPalette_BurmyTrashCloak), @@ -1271,13 +1272,14 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(CALYREX_ICE_RIDER, gMonShinyPalette_CalyrexIceRider), SPECIES_SHINY_PAL(CALYREX_SHADOW_RIDER, gMonShinyPalette_CalyrexShadowRider), - +#endif SPECIES_SHINY_PAL(EGG, gMonPalette_Egg), }; const struct CompressedSpritePalette gMonShinyPaletteTableFemale[] = { SPECIES_SHINY_PAL(EEVEE, gMonShinyPalette_Eevee), +#if P_NEW_POKEMON == TRUE SPECIES_SHINY_PAL(STARLY, gMonShinyPalette_Starly), SPECIES_SHINY_PAL(STARAVIA, gMonShinyPalette_Staravia), SPECIES_SHINY_PAL(STARAPTOR, gMonShinyPalette_Staraptor), @@ -1292,4 +1294,5 @@ const struct CompressedSpritePalette gMonShinyPaletteTableFemale[] = SPECIES_SHINY_PAL(FRILLISH, gMonShinyPalette_FrillishF), SPECIES_SHINY_PAL(JELLICENT, gMonShinyPalette_JellicentF), SPECIES_SHINY_PAL(PYROAR, gMonShinyPalette_PyroarF), +#endif }; diff --git a/src/data/text/species_names.h b/src/data/text/species_names.h index 8129e2a60..95774f963 100644 --- a/src/data/text/species_names.h +++ b/src/data/text/species_names.h @@ -386,6 +386,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_RAYQUAZA] = _("Rayquaza"), [SPECIES_JIRACHI] = _("Jirachi"), [SPECIES_DEOXYS] = _("Deoxys"), +#if P_NEW_POKEMON == TRUE [SPECIES_TURTWIG] = _("Turtwig"), [SPECIES_GROTLE] = _("Grotle"), [SPECIES_TORTERRA] = _("Torterra"), @@ -1011,6 +1012,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_PIKACHU_WORLD_CAP] = _("Pikachu"), // Pichu [SPECIES_PICHU_SPIKY_EARED] = _("Pichu"), +#endif // Unown [SPECIES_UNOWN_B] = _("Unown"), [SPECIES_UNOWN_C] = _("Unown"), @@ -1047,6 +1049,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_DEOXYS_ATTACK] = _("Deoxys"), [SPECIES_DEOXYS_DEFENSE] = _("Deoxys"), [SPECIES_DEOXYS_SPEED] = _("Deoxys"), +#if P_NEW_POKEMON == TRUE // Burmy [SPECIES_BURMY_SANDY_CLOAK] = _("Burmy"), [SPECIES_BURMY_TRASH_CLOAK] = _("Burmy"), @@ -1274,4 +1277,5 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { // Calyrex [SPECIES_CALYREX_ICE_RIDER] = _("Calyrex"), [SPECIES_CALYREX_SHADOW_RIDER] = _("Calyrex"), +#endif }; diff --git a/src/pokedex.c b/src/pokedex.c index a0231f8ac..dd4a9c749 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -2242,7 +2242,7 @@ static void CreatePokedexList(u8 dexMode, u8 order) { temp_dexNum = gPokedexOrder_Alphabetical[i]; - if ((!temp_isHoennDex || NationalToHoennOrder(temp_dexNum) != 0) && GetSetPokedexFlag(temp_dexNum, FLAG_GET_SEEN)) + if (temp_dexNum <= NATIONAL_DEX_COUNT && (!temp_isHoennDex || NationalToHoennOrder(temp_dexNum) != 0) && GetSetPokedexFlag(temp_dexNum, FLAG_GET_SEEN)) { sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = temp_dexNum; sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = TRUE; @@ -2256,7 +2256,7 @@ static void CreatePokedexList(u8 dexMode, u8 order) { temp_dexNum = gPokedexOrder_Weight[i]; - if ((!temp_isHoennDex || NationalToHoennOrder(temp_dexNum) != 0) && GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT)) + if (temp_dexNum <= NATIONAL_DEX_COUNT && (!temp_isHoennDex || NationalToHoennOrder(temp_dexNum) != 0) && GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT)) { sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = temp_dexNum; sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = TRUE; @@ -2270,7 +2270,7 @@ static void CreatePokedexList(u8 dexMode, u8 order) { temp_dexNum = gPokedexOrder_Weight[i]; - if ((!temp_isHoennDex || NationalToHoennOrder(temp_dexNum) != 0) && GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT)) + if (temp_dexNum <= NATIONAL_DEX_COUNT && (!temp_isHoennDex || NationalToHoennOrder(temp_dexNum) != 0) && GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT)) { sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = temp_dexNum; sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = TRUE; @@ -2284,7 +2284,7 @@ static void CreatePokedexList(u8 dexMode, u8 order) { temp_dexNum = gPokedexOrder_Height[i]; - if ((!temp_isHoennDex || NationalToHoennOrder(temp_dexNum) != 0) && GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT)) + if (temp_dexNum <= NATIONAL_DEX_COUNT && (!temp_isHoennDex || NationalToHoennOrder(temp_dexNum) != 0) && GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT)) { sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = temp_dexNum; sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = TRUE; @@ -2298,7 +2298,7 @@ static void CreatePokedexList(u8 dexMode, u8 order) { temp_dexNum = gPokedexOrder_Height[i]; - if ((!temp_isHoennDex || NationalToHoennOrder(temp_dexNum) != 0) && GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT)) + if (temp_dexNum <= NATIONAL_DEX_COUNT && (!temp_isHoennDex || NationalToHoennOrder(temp_dexNum) != 0) && GetSetPokedexFlag(temp_dexNum, FLAG_GET_CAUGHT)) { sPokedexView->pokedexList[sPokedexView->pokemonListCount].dexNum = temp_dexNum; sPokedexView->pokedexList[sPokedexView->pokemonListCount].seen = TRUE; diff --git a/src/pokemon.c b/src/pokemon.c index 7de256407..d8cbfd66f 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -136,7 +136,9 @@ static const u16 sSpeciesToHoennPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_HOENN(RALTS), SPECIES_TO_HOENN(KIRLIA), SPECIES_TO_HOENN(GARDEVOIR), +#if P_NEW_POKEMON == TRUE SPECIES_TO_HOENN(GALLADE), +#endif SPECIES_TO_HOENN(SURSKIT), SPECIES_TO_HOENN(MASQUERAIN), SPECIES_TO_HOENN(SHROOMISH), @@ -166,7 +168,9 @@ static const u16 sSpeciesToHoennPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_HOENN(GRAVELER), SPECIES_TO_HOENN(GOLEM), SPECIES_TO_HOENN(NOSEPASS), +#if P_NEW_POKEMON == TRUE SPECIES_TO_HOENN(PROBOPASS), +#endif SPECIES_TO_HOENN(SKITTY), SPECIES_TO_HOENN(DELCATTY), SPECIES_TO_HOENN(ZUBAT), @@ -190,7 +194,9 @@ static const u16 sSpeciesToHoennPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_HOENN(MINUN), SPECIES_TO_HOENN(MAGNEMITE), SPECIES_TO_HOENN(MAGNETON), +#if P_NEW_POKEMON == TRUE SPECIES_TO_HOENN(MAGNEZONE), +#endif SPECIES_TO_HOENN(VOLTORB), SPECIES_TO_HOENN(ELECTRODE), SPECIES_TO_HOENN(VOLBEAT), @@ -201,9 +207,13 @@ static const u16 sSpeciesToHoennPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_HOENN(BELLOSSOM), SPECIES_TO_HOENN(DODUO), SPECIES_TO_HOENN(DODRIO), +#if P_NEW_POKEMON == TRUE SPECIES_TO_HOENN(BUDEW), SPECIES_TO_HOENN(ROSELIA), SPECIES_TO_HOENN(ROSERADE), +#else + SPECIES_TO_HOENN(ROSELIA), +#endif SPECIES_TO_HOENN(GULPIN), SPECIES_TO_HOENN(SWALOT), SPECIES_TO_HOENN(CARVANHA), @@ -259,9 +269,13 @@ static const u16 sSpeciesToHoennPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_HOENN(BANETTE), SPECIES_TO_HOENN(DUSKULL), SPECIES_TO_HOENN(DUSCLOPS), +#if P_NEW_POKEMON == TRUE SPECIES_TO_HOENN(DUSKNOIR), SPECIES_TO_HOENN(TROPIUS), SPECIES_TO_HOENN(CHINGLING), +#else + SPECIES_TO_HOENN(TROPIUS), +#endif SPECIES_TO_HOENN(CHIMECHO), SPECIES_TO_HOENN(ABSOL), SPECIES_TO_HOENN(VULPIX), @@ -282,10 +296,14 @@ static const u16 sSpeciesToHoennPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_HOENN(HERACROSS), SPECIES_TO_HOENN(RHYHORN), SPECIES_TO_HOENN(RHYDON), +#if P_NEW_POKEMON == TRUE SPECIES_TO_HOENN(RHYPERIOR), +#endif SPECIES_TO_HOENN(SNORUNT), SPECIES_TO_HOENN(GLALIE), +#if P_NEW_POKEMON == TRUE SPECIES_TO_HOENN(FROSLASS), +#endif SPECIES_TO_HOENN(SPHEAL), SPECIES_TO_HOENN(SEALEO), SPECIES_TO_HOENN(WALREIN), @@ -707,6 +725,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = SPECIES_TO_NATIONAL(RAYQUAZA), SPECIES_TO_NATIONAL(JIRACHI), SPECIES_TO_NATIONAL(DEOXYS), +#if P_NEW_POKEMON == TRUE SPECIES_TO_NATIONAL(TURTWIG), SPECIES_TO_NATIONAL(GROTLE), SPECIES_TO_NATIONAL(TORTERRA), @@ -1329,6 +1348,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = [SPECIES_PIKACHU_WORLD_CAP - 1] = NATIONAL_DEX_PIKACHU, // Pichu [SPECIES_PICHU_SPIKY_EARED - 1] = NATIONAL_DEX_PICHU, +#endif // Unown [SPECIES_UNOWN_B - 1] = NATIONAL_DEX_UNOWN, [SPECIES_UNOWN_C - 1] = NATIONAL_DEX_UNOWN, @@ -1365,6 +1385,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = [SPECIES_DEOXYS_ATTACK - 1] = NATIONAL_DEX_DEOXYS, [SPECIES_DEOXYS_DEFENSE - 1] = NATIONAL_DEX_DEOXYS, [SPECIES_DEOXYS_SPEED - 1] = NATIONAL_DEX_DEOXYS, +#if P_NEW_POKEMON == TRUE // Burmy [SPECIES_BURMY_SANDY_CLOAK - 1] = NATIONAL_DEX_BURMY, [SPECIES_BURMY_TRASH_CLOAK - 1] = NATIONAL_DEX_BURMY, @@ -1592,6 +1613,7 @@ static const u16 sSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = // Calyrex [SPECIES_CALYREX_ICE_RIDER - 1] = NATIONAL_DEX_CALYREX, [SPECIES_CALYREX_SHADOW_RIDER - 1] = NATIONAL_DEX_CALYREX, +#endif }; // Assigns all Hoenn Dex Indexes to a National Dex Index @@ -1628,7 +1650,9 @@ static const u16 sHoennToNationalOrder[HOENN_DEX_COUNT - 1] = HOENN_TO_NATIONAL(RALTS), HOENN_TO_NATIONAL(KIRLIA), HOENN_TO_NATIONAL(GARDEVOIR), +#if P_NEW_POKEMON == TRUE HOENN_TO_NATIONAL(GALLADE), +#endif HOENN_TO_NATIONAL(SURSKIT), HOENN_TO_NATIONAL(MASQUERAIN), HOENN_TO_NATIONAL(SHROOMISH), @@ -1658,7 +1682,9 @@ static const u16 sHoennToNationalOrder[HOENN_DEX_COUNT - 1] = HOENN_TO_NATIONAL(GRAVELER), HOENN_TO_NATIONAL(GOLEM), HOENN_TO_NATIONAL(NOSEPASS), +#if P_NEW_POKEMON == TRUE HOENN_TO_NATIONAL(PROBOPASS), +#endif HOENN_TO_NATIONAL(SKITTY), HOENN_TO_NATIONAL(DELCATTY), HOENN_TO_NATIONAL(ZUBAT), @@ -1682,7 +1708,9 @@ static const u16 sHoennToNationalOrder[HOENN_DEX_COUNT - 1] = HOENN_TO_NATIONAL(MINUN), HOENN_TO_NATIONAL(MAGNEMITE), HOENN_TO_NATIONAL(MAGNETON), +#if P_NEW_POKEMON == TRUE HOENN_TO_NATIONAL(MAGNEZONE), +#endif HOENN_TO_NATIONAL(VOLTORB), HOENN_TO_NATIONAL(ELECTRODE), HOENN_TO_NATIONAL(VOLBEAT), @@ -1693,9 +1721,13 @@ static const u16 sHoennToNationalOrder[HOENN_DEX_COUNT - 1] = HOENN_TO_NATIONAL(BELLOSSOM), HOENN_TO_NATIONAL(DODUO), HOENN_TO_NATIONAL(DODRIO), +#if P_NEW_POKEMON == TRUE HOENN_TO_NATIONAL(BUDEW), HOENN_TO_NATIONAL(ROSELIA), HOENN_TO_NATIONAL(ROSERADE), +#else + HOENN_TO_NATIONAL(ROSELIA), +#endif HOENN_TO_NATIONAL(GULPIN), HOENN_TO_NATIONAL(SWALOT), HOENN_TO_NATIONAL(CARVANHA), @@ -1751,9 +1783,13 @@ static const u16 sHoennToNationalOrder[HOENN_DEX_COUNT - 1] = HOENN_TO_NATIONAL(BANETTE), HOENN_TO_NATIONAL(DUSKULL), HOENN_TO_NATIONAL(DUSCLOPS), +#if P_NEW_POKEMON == TRUE HOENN_TO_NATIONAL(DUSKNOIR), HOENN_TO_NATIONAL(TROPIUS), HOENN_TO_NATIONAL(CHINGLING), +#else + HOENN_TO_NATIONAL(TROPIUS), +#endif HOENN_TO_NATIONAL(CHIMECHO), HOENN_TO_NATIONAL(ABSOL), HOENN_TO_NATIONAL(VULPIX), @@ -1774,10 +1810,14 @@ static const u16 sHoennToNationalOrder[HOENN_DEX_COUNT - 1] = HOENN_TO_NATIONAL(HERACROSS), HOENN_TO_NATIONAL(RHYHORN), HOENN_TO_NATIONAL(RHYDON), +#if P_NEW_POKEMON == TRUE HOENN_TO_NATIONAL(RHYPERIOR), +#endif HOENN_TO_NATIONAL(SNORUNT), HOENN_TO_NATIONAL(GLALIE), +#if P_NEW_POKEMON == TRUE HOENN_TO_NATIONAL(FROSLASS), +#endif HOENN_TO_NATIONAL(SPHEAL), HOENN_TO_NATIONAL(SEALEO), HOENN_TO_NATIONAL(WALREIN), @@ -1855,7 +1895,11 @@ const s8 gNatureStatTable[NUM_NATURES][NUM_NATURE_STATS] = #include "data/pokemon/experience_tables.h" #include "data/pokemon/base_stats.h" #include "data/pokemon/level_up_learnsets.h" +#if P_NEW_POKEMON == TRUE #include "data/pokemon/evolution.h" +#else +#include "data/pokemon/evolution_old.h" +#endif #include "data/pokemon/level_up_learnset_pointers.h" #include "data/pokemon/form_species_tables.h" #include "data/pokemon/form_species_table_pointers.h" @@ -2256,6 +2300,7 @@ static const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_JIRACHI - 1] = ANIM_SWING_CONVEX, [SPECIES_DEOXYS - 1] = ANIM_H_PIVOT, +#if P_NEW_POKEMON == TRUE // Gen 4 [SPECIES_TURTWIG - 1] = ANIM_V_SLIDE, [SPECIES_GROTLE - 1] = ANIM_H_SLIDE, @@ -2801,6 +2846,7 @@ static const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_ARCEUS_DRAGON - 1] = ANIM_CIRCULAR_VIBRATE, [SPECIES_ARCEUS_DARK - 1] = ANIM_CIRCULAR_VIBRATE, [SPECIES_ARCEUS_FAIRY - 1] = ANIM_CIRCULAR_VIBRATE, +#endif }; static const u8 sMonAnimationDelayTable[NUM_SPECIES - 1] = @@ -2860,8 +2906,10 @@ static const u8 sMonAnimationDelayTable[NUM_SPECIES - 1] = [SPECIES_SALAMENCE - 1] = 70, [SPECIES_KYOGRE - 1] = 60, [SPECIES_RAYQUAZA - 1] = 60, +#if P_NEW_POKEMON == TRUE [SPECIES_TAPU_FINI - 1] = 5, [SPECIES_ROTOM_FAN - 1] = 7, +#endif }; #define PP_UP_SHIFTS(val) val, (val) << 2, (val) << 4, (val) << 6 diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 0faebfe74..fa5ad93bd 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -417,6 +417,7 @@ const u8 *const gMonIconTable[] = [SPECIES_JIRACHI] = gMonIcon_Jirachi, [SPECIES_DEOXYS] = gMonIcon_Deoxys, [SPECIES_CHIMECHO] = gMonIcon_Chimecho, +#if P_NEW_POKEMON == TRUE [SPECIES_TURTWIG] = gMonIcon_Turtwig, [SPECIES_GROTLE] = gMonIcon_Grotle, [SPECIES_TORTERRA] = gMonIcon_Torterra, @@ -1031,6 +1032,7 @@ const u8 *const gMonIconTable[] = [SPECIES_PIKACHU_PARTNER_CAP] = gMonIcon_PikachuPartnerCap, [SPECIES_PIKACHU_WORLD_CAP] = gMonIcon_QuestionMark, [SPECIES_PICHU_SPIKY_EARED] = gMonIcon_PichuSpikyEared, +#endif [SPECIES_UNOWN_B] = gMonIcon_UnownB, [SPECIES_UNOWN_C] = gMonIcon_UnownC, [SPECIES_UNOWN_D] = gMonIcon_UnownD, @@ -1064,6 +1066,7 @@ const u8 *const gMonIconTable[] = [SPECIES_DEOXYS_ATTACK] = gMonIcon_DeoxysAttack, [SPECIES_DEOXYS_DEFENSE] = gMonIcon_DeoxysDefense, [SPECIES_DEOXYS_SPEED] = gMonIcon_DeoxysSpeed, +#if P_NEW_POKEMON == TRUE [SPECIES_BURMY_SANDY_CLOAK] = gMonIcon_BurmySandyCloak, [SPECIES_BURMY_TRASH_CLOAK] = gMonIcon_BurmyTrashCloak, [SPECIES_WORMADAM_SANDY_CLOAK] = gMonIcon_WormadamSandyCloak, @@ -1237,12 +1240,14 @@ const u8 *const gMonIconTable[] = [SPECIES_ZARUDE_DADA] = gMonIcon_ZarudeDada, [SPECIES_CALYREX_ICE_RIDER] = gMonIcon_CalyrexIceRider, [SPECIES_CALYREX_SHADOW_RIDER] = gMonIcon_CalyrexShadowRider, +#endif [SPECIES_EGG] = gMonIcon_Egg, }; const u8 *const gMonIconTableFemale[] = { [SPECIES_EEVEE] = gMonIcon_Eevee, +#if P_NEW_POKEMON == TRUE [SPECIES_STARLY] = gMonIcon_Starly, [SPECIES_STARAVIA] = gMonIcon_Staravia, [SPECIES_STARAPTOR] = gMonIcon_Staraptor, @@ -1257,6 +1262,7 @@ const u8 *const gMonIconTableFemale[] = [SPECIES_FRILLISH] = gMonIcon_FrillishF, [SPECIES_JELLICENT] = gMonIcon_JellicentF, [SPECIES_PYROAR] = gMonIcon_PyroarF, +#endif }; const u8 gMonIconPaletteIndices[] = @@ -1647,6 +1653,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_JIRACHI] = 0, [SPECIES_DEOXYS] = 0, [SPECIES_CHIMECHO] = 0, +#if P_NEW_POKEMON == TRUE [SPECIES_TURTWIG] = 1, [SPECIES_GROTLE] = 1, [SPECIES_TORTERRA] = 1, @@ -2261,10 +2268,15 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_PIKACHU_PARTNER_CAP] = 0, [SPECIES_PIKACHU_WORLD_CAP] = 0, [SPECIES_PICHU_SPIKY_EARED] = 1, +#endif [SPECIES_UNOWN_B ... SPECIES_UNOWN_QMARK] = 0, [SPECIES_CASTFORM_SUNNY] = 0, [SPECIES_CASTFORM_RAINY] = 0, [SPECIES_CASTFORM_SNOWY] = 0, + [SPECIES_DEOXYS_ATTACK] = 0, + [SPECIES_DEOXYS_DEFENSE] = 0, + [SPECIES_DEOXYS_SPEED] = 0, +#if P_NEW_POKEMON == TRUE [SPECIES_BURMY_SANDY_CLOAK] = 1, [SPECIES_BURMY_TRASH_CLOAK] = 0, [SPECIES_WORMADAM_SANDY_CLOAK] = 1, @@ -2432,12 +2444,14 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_ZARUDE_DADA] = 1, [SPECIES_CALYREX_ICE_RIDER] = 0, [SPECIES_CALYREX_SHADOW_RIDER] = 0, +#endif [SPECIES_EGG] = 1, }; const u8 gMonIconPaletteIndicesFemale[] = { [SPECIES_EEVEE] = 2, +#if P_NEW_POKEMON == TRUE [SPECIES_STARLY] = 0, [SPECIES_STARAVIA] = 0, [SPECIES_BIDOOF] = 2, @@ -2451,6 +2465,7 @@ const u8 gMonIconPaletteIndicesFemale[] = [SPECIES_FRILLISH] = 1, [SPECIES_JELLICENT] = 1, [SPECIES_PYROAR] = 2, +#endif }; const struct SpritePalette gMonIconPaletteTable[] =