From 3655fe52f37e3267060a5001ca9a9098f630614c Mon Sep 17 00:00:00 2001 From: ExpoSeed <> Date: Tue, 9 Mar 2021 11:53:39 -0600 Subject: [PATCH] Prison Bottle and Reveal Glass don't exist yet --- include/constants/pokemon_config.h | 4 ++-- src/data/pokemon/form_change_tables.h | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/constants/pokemon_config.h b/include/constants/pokemon_config.h index e1e0540ddb..48c90073fa 100644 --- a/include/constants/pokemon_config.h +++ b/include/constants/pokemon_config.h @@ -154,8 +154,8 @@ //FORM_ITEM_USE #define ITEM_GRACIDEA ITEM_NONE -#define ITEM_REVEAL_GLASS ITEM_NONE -#define ITEM_PRISON_BOTTLE ITEM_NONE +// #define ITEM_REVEAL_GLASS ITEM_NONE +// #define ITEM_PRISON_BOTTLE ITEM_NONE #define ITEM_RED_NECTAR ITEM_NONE #define ITEM_YELLOW_NECTAR ITEM_NONE #define ITEM_PINK_NECTAR ITEM_NONE diff --git a/src/data/pokemon/form_change_tables.h b/src/data/pokemon/form_change_tables.h index f199dbeea3..5ea28e309f 100644 --- a/src/data/pokemon/form_change_tables.h +++ b/src/data/pokemon/form_change_tables.h @@ -77,32 +77,32 @@ static const struct FormChange sArceusFormChangeTable[] = { }; static const struct FormChange sTornadusFormChangeTable[] = { - {FORM_ITEM_USE, SPECIES_TORNADUS_THERIAN, ITEM_REVEAL_GLASS}, + // {FORM_ITEM_USE, SPECIES_TORNADUS_THERIAN, ITEM_REVEAL_GLASS}, {FORM_CHANGE_END}, }; static const struct FormChange sTornadusTherianFormChangeTable[] = { - {FORM_ITEM_USE, SPECIES_TORNADUS, ITEM_REVEAL_GLASS}, + // {FORM_ITEM_USE, SPECIES_TORNADUS, ITEM_REVEAL_GLASS}, {FORM_CHANGE_END}, }; static const struct FormChange sThundurusFormChangeTable[] = { - {FORM_ITEM_USE, SPECIES_THUNDURUS_THERIAN, ITEM_REVEAL_GLASS}, + // {FORM_ITEM_USE, SPECIES_THUNDURUS_THERIAN, ITEM_REVEAL_GLASS}, {FORM_CHANGE_END}, }; static const struct FormChange sThundurusTherianFormChangeTable[] = { - {FORM_ITEM_USE, SPECIES_THUNDURUS, ITEM_REVEAL_GLASS}, + // {FORM_ITEM_USE, SPECIES_THUNDURUS, ITEM_REVEAL_GLASS}, {FORM_CHANGE_END}, }; static const struct FormChange sLandorusFormChangeTable[] = { - {FORM_ITEM_USE, SPECIES_LANDORUS_THERIAN, ITEM_REVEAL_GLASS}, + // {FORM_ITEM_USE, SPECIES_LANDORUS_THERIAN, ITEM_REVEAL_GLASS}, {FORM_CHANGE_END}, }; static const struct FormChange sLandorusTherianFormChangeTable[] = { - {FORM_ITEM_USE, SPECIES_LANDORUS, ITEM_REVEAL_GLASS}, + // {FORM_ITEM_USE, SPECIES_LANDORUS, ITEM_REVEAL_GLASS}, {FORM_CHANGE_END}, }; @@ -125,7 +125,7 @@ static const struct FormChange sGenesectFormChangeTable[] = { }; static const struct FormChange sHoopaFormChangeTable[] = { - {FORM_ITEM_USE, SPECIES_HOOPA_UNBOUND, ITEM_PRISON_BOTTLE, SPECIES_HOOPA}, + // {FORM_ITEM_USE, SPECIES_HOOPA_UNBOUND, ITEM_PRISON_BOTTLE, SPECIES_HOOPA}, {FORM_CHANGE_END}, };