From ba679ddc2682e44c47ab307a432edbcd1b5e333b Mon Sep 17 00:00:00 2001 From: John Cooper McDonald Date: Sun, 28 Dec 2025 03:02:21 -0600 Subject: [PATCH] Fix the game not building with OW_POKEMON_OBJECT_EVENTS disabled (#8654) --- .../pokemon/species_info/gen_1_families.h | 200 +++---- .../pokemon/species_info/gen_2_families.h | 150 ++---- .../pokemon/species_info/gen_3_families.h | 50 +- .../pokemon/species_info/gen_5_families.h | 300 ++++------- .../pokemon/species_info/gen_6_families.h | 500 ++++++------------ .../pokemon/species_info/gen_7_families.h | 50 +- .../pokemon/species_info/gen_8_families.h | 50 +- 7 files changed, 390 insertions(+), 910 deletions(-) diff --git a/src/data/pokemon/species_info/gen_1_families.h b/src/data/pokemon/species_info/gen_1_families.h index aab42559cb..ec7edba642 100644 --- a/src/data/pokemon/species_info/gen_1_families.h +++ b/src/data/pokemon/species_info/gen_1_families.h @@ -5048,42 +5048,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "It flies by using the power of\n" "moonlight to control gravity within\n" "a radius of over 32 feet around it."), - .frontPic = gMonFrontPic_CircledQuestionMark, - .frontPicSize = MON_COORDS_SIZE(40, 40), - .frontPicYOffset = 12, - .frontAnimFrames = sAnims_TwoFramePlaceHolder, - .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_CircledQuestionMark, - .backPicSize = MON_COORDS_SIZE(40, 40), - .backPicYOffset = 12, - .backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_CircledQuestionMark, - .shinyPalette = gMonShinyPalette_CircledQuestionMark, - .iconSprite = gMonIcon_QuestionMark, - .iconPalIndex = 0, + //.frontPic = gMonFrontPic_CircledQuestionMark, + //.frontPicSize = MON_COORDS_SIZE(40, 40), + //.frontPicYOffset = 12, + //.frontAnimFrames = sAnims_TwoFramePlaceHolder, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //.backPic = gMonBackPic_CircledQuestionMark, + //.backPicSize = MON_COORDS_SIZE(40, 40), + //.backPicYOffset = 12, + //.backAnimId = BACK_ANIM_NONE, + //.palette = gMonPalette_CircledQuestionMark, + //.shinyPalette = gMonShinyPalette_CircledQuestionMark, + //.iconSprite = gMonIcon_QuestionMark, + //.iconPalIndex = 0, .pokemonJumpType = PKMN_JUMP_TYPE_NONE, - FOOTPRINT(QuestionMark) - SHADOW(-1, 0, SHADOW_SIZE_M) - #if OW_BATTLE_ONLY_FORMS - .overworldData = { - .tileTag = TAG_NONE, - .paletteTag = OBJ_EVENT_PAL_TAG_SUBSTITUTE, - .reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE, - .size = 512, - .width = 32, - .height = 32, - .paletteSlot = PALSLOT_NPC_1, - .shadowSize = SHADOW_SIZE_M, - .inanimate = FALSE, - .compressed = COMP, - .tracks = TRACKS_FOOT, - .oam = &gObjectEventBaseOam_32x32, - .subspriteTables = sOamTables_32x32, - .anims = sAnimTable_Following, - .images = sPicTable_Substitute, - .affineAnims = gDummySpriteAffineAnimTable, - }, - #endif //OW_BATTLE_ONLY_FORMS + FOOTPRINT(Clefable) + //SHADOW(-1, 0, SHADOW_SIZE_M) .isMegaEvolution = TRUE, .levelUpLearnset = sClefableLevelUpLearnset, .teachableLearnset = sClefableTeachableLearnset, @@ -9253,42 +9233,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "has increased due to Mega Evolution,\n" "filling its mouth. If not careful,\n" "the acid will overflow and spill out."), - .frontPic = gMonFrontPic_CircledQuestionMark, - .frontPicSize = MON_COORDS_SIZE(40, 40), - .frontPicYOffset = 12, - .frontAnimFrames = sAnims_TwoFramePlaceHolder, - .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_CircledQuestionMark, - .backPicSize = MON_COORDS_SIZE(40, 40), - .backPicYOffset = 12, - .backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_CircledQuestionMark, - .shinyPalette = gMonShinyPalette_CircledQuestionMark, - .iconSprite = gMonIcon_QuestionMark, - .iconPalIndex = 0, + //.frontPic = gMonFrontPic_CircledQuestionMark, + //.frontPicSize = MON_COORDS_SIZE(40, 40), + //.frontPicYOffset = 12, + //.frontAnimFrames = sAnims_TwoFramePlaceHolder, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //.backPic = gMonBackPic_CircledQuestionMark, + //.backPicSize = MON_COORDS_SIZE(40, 40), + //.backPicYOffset = 12, + //.backAnimId = BACK_ANIM_NONE, + //.palette = gMonPalette_CircledQuestionMark, + //.shinyPalette = gMonShinyPalette_CircledQuestionMark, + //.iconSprite = gMonIcon_QuestionMark, + //.iconPalIndex = 0, .pokemonJumpType = PKMN_JUMP_TYPE_NONE, - FOOTPRINT(QuestionMark) - SHADOW(-1, 0, SHADOW_SIZE_M) - #if OW_BATTLE_ONLY_FORMS - .overworldData = { - .tileTag = TAG_NONE, - .paletteTag = OBJ_EVENT_PAL_TAG_SUBSTITUTE, - .reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE, - .size = 512, - .width = 32, - .height = 32, - .paletteSlot = PALSLOT_NPC_1, - .shadowSize = SHADOW_SIZE_M, - .inanimate = FALSE, - .compressed = COMP, - .tracks = TRACKS_FOOT, - .oam = &gObjectEventBaseOam_32x32, - .subspriteTables = sOamTables_32x32, - .anims = sAnimTable_Following, - .images = sPicTable_Substitute, - .affineAnims = gDummySpriteAffineAnimTable, - }, - #endif //OW_BATTLE_ONLY_FORMS + FOOTPRINT(Victreebel) + //SHADOW(-1, 0, SHADOW_SIZE_M) .isMegaEvolution = TRUE, .levelUpLearnset = sVictreebelLevelUpLearnset, .teachableLearnset = sVictreebelTeachableLearnset, @@ -15684,42 +15644,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "humanlike. Whether it's simply\n" "trying to communicate or wants to\n" "supplant humanity is unclear."), - .frontPic = gMonFrontPic_CircledQuestionMark, - .frontPicSize = MON_COORDS_SIZE(40, 40), - .frontPicYOffset = 12, - .frontAnimFrames = sAnims_TwoFramePlaceHolder, - .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_CircledQuestionMark, - .backPicSize = MON_COORDS_SIZE(40, 40), - .backPicYOffset = 12, - .backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_CircledQuestionMark, - .shinyPalette = gMonShinyPalette_CircledQuestionMark, - .iconSprite = gMonIcon_QuestionMark, - .iconPalIndex = 0, + //.frontPic = gMonFrontPic_CircledQuestionMark, + //.frontPicSize = MON_COORDS_SIZE(40, 40), + //.frontPicYOffset = 12, + //.frontAnimFrames = sAnims_TwoFramePlaceHolder, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //.backPic = gMonBackPic_CircledQuestionMark, + //.backPicSize = MON_COORDS_SIZE(40, 40), + //.backPicYOffset = 12, + //.backAnimId = BACK_ANIM_NONE, + //.palette = gMonPalette_CircledQuestionMark, + //.shinyPalette = gMonShinyPalette_CircledQuestionMark, + //.iconSprite = gMonIcon_QuestionMark, + //.iconPalIndex = 0, .pokemonJumpType = PKMN_JUMP_TYPE_NONE, - FOOTPRINT(QuestionMark) - SHADOW(-1, 0, SHADOW_SIZE_M) - #if OW_BATTLE_ONLY_FORMS - .overworldData = { - .tileTag = TAG_NONE, - .paletteTag = OBJ_EVENT_PAL_TAG_SUBSTITUTE, - .reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE, - .size = 512, - .width = 32, - .height = 32, - .paletteSlot = PALSLOT_NPC_1, - .shadowSize = SHADOW_SIZE_M, - .inanimate = FALSE, - .compressed = COMP, - .tracks = TRACKS_FOOT, - .oam = &gObjectEventBaseOam_32x32, - .subspriteTables = sOamTables_32x32, - .anims = sAnimTable_Following, - .images = sPicTable_Substitute, - .affineAnims = gDummySpriteAffineAnimTable, - }, - #endif //OW_BATTLE_ONLY_FORMS + FOOTPRINT(Starmie) + //SHADOW(-1, 0, SHADOW_SIZE_M) .isMegaEvolution = TRUE, .levelUpLearnset = sStarmieLevelUpLearnset, .teachableLearnset = sStarmieTeachableLearnset, @@ -20231,42 +20171,22 @@ const struct SpeciesInfo gSpeciesInfoGen1[] = "powered up this Pokémon's feelings\n" "of kindness. It finishes off its\n" "opponents with mercy in its heart."), - .frontPic = gMonFrontPic_CircledQuestionMark, - .frontPicSize = MON_COORDS_SIZE(40, 40), - .frontPicYOffset = 12, - .frontAnimFrames = sAnims_TwoFramePlaceHolder, - .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_CircledQuestionMark, - .backPicSize = MON_COORDS_SIZE(40, 40), - .backPicYOffset = 12, - .backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_CircledQuestionMark, - .shinyPalette = gMonShinyPalette_CircledQuestionMark, - .iconSprite = gMonIcon_QuestionMark, - .iconPalIndex = 0, + //.frontPic = gMonFrontPic_CircledQuestionMark, + //.frontPicSize = MON_COORDS_SIZE(40, 40), + //.frontPicYOffset = 12, + //.frontAnimFrames = sAnims_TwoFramePlaceHolder, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //.backPic = gMonBackPic_CircledQuestionMark, + //.backPicSize = MON_COORDS_SIZE(40, 40), + //.backPicYOffset = 12, + //.backAnimId = BACK_ANIM_NONE, + //.palette = gMonPalette_CircledQuestionMark, + //.shinyPalette = gMonShinyPalette_CircledQuestionMark, + //.iconSprite = gMonIcon_QuestionMark, + //.iconPalIndex = 0, .pokemonJumpType = PKMN_JUMP_TYPE_NONE, - FOOTPRINT(QuestionMark) - SHADOW(-1, 0, SHADOW_SIZE_M) - #if OW_BATTLE_ONLY_FORMS - .overworldData = { - .tileTag = TAG_NONE, - .paletteTag = OBJ_EVENT_PAL_TAG_SUBSTITUTE, - .reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE, - .size = 512, - .width = 32, - .height = 32, - .paletteSlot = PALSLOT_NPC_1, - .shadowSize = SHADOW_SIZE_M, - .inanimate = FALSE, - .compressed = COMP, - .tracks = TRACKS_FOOT, - .oam = &gObjectEventBaseOam_32x32, - .subspriteTables = sOamTables_32x32, - .anims = sAnimTable_Following, - .images = sPicTable_Substitute, - .affineAnims = gDummySpriteAffineAnimTable, - }, - #endif //OW_BATTLE_ONLY_FORMS + FOOTPRINT(Dragonite) + //SHADOW(-1, 0, SHADOW_SIZE_M) .isMegaEvolution = TRUE, .levelUpLearnset = sDragoniteLevelUpLearnset, .teachableLearnset = sDragoniteTeachableLearnset, diff --git a/src/data/pokemon/species_info/gen_2_families.h b/src/data/pokemon/species_info/gen_2_families.h index 3849ab760d..bfd1f90c68 100644 --- a/src/data/pokemon/species_info/gen_2_families.h +++ b/src/data/pokemon/species_info/gen_2_families.h @@ -267,42 +267,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = "powerful Solar Beam from its four\n" "flowers. Another name for this is\n" "Mega Sol Cannon."), - .frontPic = gMonFrontPic_CircledQuestionMark, - .frontPicSize = MON_COORDS_SIZE(40, 40), - .frontPicYOffset = 12, - .frontAnimFrames = sAnims_TwoFramePlaceHolder, - .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_CircledQuestionMark, - .backPicSize = MON_COORDS_SIZE(40, 40), - .backPicYOffset = 12, - .backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_CircledQuestionMark, - .shinyPalette = gMonShinyPalette_CircledQuestionMark, - .iconSprite = gMonIcon_QuestionMark, - .iconPalIndex = 0, + //.frontPic = gMonFrontPic_CircledQuestionMark, + //.frontPicSize = MON_COORDS_SIZE(40, 40), + //.frontPicYOffset = 12, + //.frontAnimFrames = sAnims_TwoFramePlaceHolder, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //.backPic = gMonBackPic_CircledQuestionMark, + //.backPicSize = MON_COORDS_SIZE(40, 40), + //.backPicYOffset = 12, + //.backAnimId = BACK_ANIM_NONE, + //.palette = gMonPalette_CircledQuestionMark, + //.shinyPalette = gMonShinyPalette_CircledQuestionMark, + //.iconSprite = gMonIcon_QuestionMark, + //.iconPalIndex = 0, .pokemonJumpType = PKMN_JUMP_TYPE_NONE, - FOOTPRINT(QuestionMark) - SHADOW(-1, 0, SHADOW_SIZE_M) - #if OW_BATTLE_ONLY_FORMS - .overworldData = { - .tileTag = TAG_NONE, - .paletteTag = OBJ_EVENT_PAL_TAG_SUBSTITUTE, - .reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE, - .size = 512, - .width = 32, - .height = 32, - .paletteSlot = PALSLOT_NPC_1, - .shadowSize = SHADOW_SIZE_M, - .inanimate = FALSE, - .compressed = COMP, - .tracks = TRACKS_FOOT, - .oam = &gObjectEventBaseOam_32x32, - .subspriteTables = sOamTables_32x32, - .anims = sAnimTable_Following, - .images = sPicTable_Substitute, - .affineAnims = gDummySpriteAffineAnimTable, - }, - #endif //OW_BATTLE_ONLY_FORMS + FOOTPRINT(Meganium) + //SHADOW(-1, 0, SHADOW_SIZE_M) .isMegaEvolution = TRUE, .levelUpLearnset = sMeganiumLevelUpLearnset, .teachableLearnset = sMeganiumTeachableLearnset, @@ -854,42 +834,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = "Pokémon forms a gigantic set of jaws\n" "with a bite 10 times as powerful\n" "as Mega Feraligatr's actual jaws."), - .frontPic = gMonFrontPic_CircledQuestionMark, - .frontPicSize = MON_COORDS_SIZE(40, 40), - .frontPicYOffset = 12, - .frontAnimFrames = sAnims_TwoFramePlaceHolder, - .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_CircledQuestionMark, - .backPicSize = MON_COORDS_SIZE(40, 40), - .backPicYOffset = 12, - .backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_CircledQuestionMark, - .shinyPalette = gMonShinyPalette_CircledQuestionMark, - .iconSprite = gMonIcon_QuestionMark, - .iconPalIndex = 0, + //.frontPic = gMonFrontPic_CircledQuestionMark, + //.frontPicSize = MON_COORDS_SIZE(40, 40), + //.frontPicYOffset = 12, + //.frontAnimFrames = sAnims_TwoFramePlaceHolder, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //.backPic = gMonBackPic_CircledQuestionMark, + //.backPicSize = MON_COORDS_SIZE(40, 40), + //.backPicYOffset = 12, + //.backAnimId = BACK_ANIM_NONE, + //.palette = gMonPalette_CircledQuestionMark, + //.shinyPalette = gMonShinyPalette_CircledQuestionMark, + //.iconSprite = gMonIcon_QuestionMark, + //.iconPalIndex = 0, .pokemonJumpType = PKMN_JUMP_TYPE_NONE, - FOOTPRINT(QuestionMark) - SHADOW(-1, 0, SHADOW_SIZE_M) - #if OW_BATTLE_ONLY_FORMS - .overworldData = { - .tileTag = TAG_NONE, - .paletteTag = OBJ_EVENT_PAL_TAG_SUBSTITUTE, - .reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE, - .size = 512, - .width = 32, - .height = 32, - .paletteSlot = PALSLOT_NPC_1, - .shadowSize = SHADOW_SIZE_M, - .inanimate = FALSE, - .compressed = COMP, - .tracks = TRACKS_FOOT, - .oam = &gObjectEventBaseOam_32x32, - .subspriteTables = sOamTables_32x32, - .anims = sAnimTable_Following, - .images = sPicTable_Substitute, - .affineAnims = gDummySpriteAffineAnimTable, - }, - #endif //OW_BATTLE_ONLY_FORMS + FOOTPRINT(Feraligatr) + //SHADOW(-1, 0, SHADOW_SIZE_M) .isMegaEvolution = TRUE, .levelUpLearnset = sFeraligatrLevelUpLearnset, .teachableLearnset = sFeraligatrTeachableLearnset, @@ -7311,42 +7271,22 @@ const struct SpeciesInfo gSpeciesInfoGen2[] = "its pincers have taken a more\n" "diabolical form, ripping anything\n" "they pierce to shreds."), - .frontPic = gMonFrontPic_CircledQuestionMark, - .frontPicSize = MON_COORDS_SIZE(40, 40), - .frontPicYOffset = 12, - .frontAnimFrames = sAnims_TwoFramePlaceHolder, - .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_CircledQuestionMark, - .backPicSize = MON_COORDS_SIZE(40, 40), - .backPicYOffset = 12, - .backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_CircledQuestionMark, - .shinyPalette = gMonShinyPalette_CircledQuestionMark, - .iconSprite = gMonIcon_QuestionMark, - .iconPalIndex = 0, + //.frontPic = gMonFrontPic_CircledQuestionMark, + //.frontPicSize = MON_COORDS_SIZE(40, 40), + //.frontPicYOffset = 12, + //.frontAnimFrames = sAnims_TwoFramePlaceHolder, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //.backPic = gMonBackPic_CircledQuestionMark, + //.backPicSize = MON_COORDS_SIZE(40, 40), + //.backPicYOffset = 12, + //.backAnimId = BACK_ANIM_NONE, + //.palette = gMonPalette_CircledQuestionMark, + //.shinyPalette = gMonShinyPalette_CircledQuestionMark, + //.iconSprite = gMonIcon_QuestionMark, + //.iconPalIndex = 0, .pokemonJumpType = PKMN_JUMP_TYPE_NONE, - FOOTPRINT(QuestionMark) - SHADOW(-1, 0, SHADOW_SIZE_M) - #if OW_BATTLE_ONLY_FORMS - .overworldData = { - .tileTag = TAG_NONE, - .paletteTag = OBJ_EVENT_PAL_TAG_SUBSTITUTE, - .reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE, - .size = 512, - .width = 32, - .height = 32, - .paletteSlot = PALSLOT_NPC_1, - .shadowSize = SHADOW_SIZE_M, - .inanimate = FALSE, - .compressed = COMP, - .tracks = TRACKS_FOOT, - .oam = &gObjectEventBaseOam_32x32, - .subspriteTables = sOamTables_32x32, - .anims = sAnimTable_Following, - .images = sPicTable_Substitute, - .affineAnims = gDummySpriteAffineAnimTable, - }, - #endif //OW_BATTLE_ONLY_FORMS + FOOTPRINT(Skarmory) + //SHADOW(-1, 0, SHADOW_SIZE_M) .isMegaEvolution = TRUE, .levelUpLearnset = sSkarmoryLevelUpLearnset, .teachableLearnset = sSkarmoryTeachableLearnset, diff --git a/src/data/pokemon/species_info/gen_3_families.h b/src/data/pokemon/species_info/gen_3_families.h index 6535497ddf..29459bfb45 100644 --- a/src/data/pokemon/species_info/gen_3_families.h +++ b/src/data/pokemon/species_info/gen_3_families.h @@ -10743,42 +10743,22 @@ const struct SpeciesInfo gSpeciesInfoGen3[] = "air imbued with ghost energy to\n" "freeze even insubstantial things,\n" "such as flames or the wind."), - .frontPic = gMonFrontPic_CircledQuestionMark, - .frontPicSize = MON_COORDS_SIZE(40, 40), - .frontPicYOffset = 12, - .frontAnimFrames = sAnims_TwoFramePlaceHolder, - .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_CircledQuestionMark, - .backPicSize = MON_COORDS_SIZE(40, 40), - .backPicYOffset = 12, - .backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_CircledQuestionMark, - .shinyPalette = gMonShinyPalette_CircledQuestionMark, - .iconSprite = gMonIcon_QuestionMark, - .iconPalIndex = 0, + //.frontPic = gMonFrontPic_CircledQuestionMark, + //.frontPicSize = MON_COORDS_SIZE(40, 40), + //.frontPicYOffset = 12, + //.frontAnimFrames = sAnims_TwoFramePlaceHolder, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //.backPic = gMonBackPic_CircledQuestionMark, + //.backPicSize = MON_COORDS_SIZE(40, 40), + //.backPicYOffset = 12, + //.backAnimId = BACK_ANIM_NONE, + //.palette = gMonPalette_CircledQuestionMark, + //.shinyPalette = gMonShinyPalette_CircledQuestionMark, + //.iconSprite = gMonIcon_QuestionMark, + //.iconPalIndex = 0, .pokemonJumpType = PKMN_JUMP_TYPE_NONE, - FOOTPRINT(QuestionMark) - SHADOW(-1, 0, SHADOW_SIZE_M) - #if OW_BATTLE_ONLY_FORMS - .overworldData = { - .tileTag = TAG_NONE, - .paletteTag = OBJ_EVENT_PAL_TAG_SUBSTITUTE, - .reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE, - .size = 512, - .width = 32, - .height = 32, - .paletteSlot = PALSLOT_NPC_1, - .shadowSize = SHADOW_SIZE_M, - .inanimate = FALSE, - .compressed = COMP, - .tracks = TRACKS_FOOT, - .oam = &gObjectEventBaseOam_32x32, - .subspriteTables = sOamTables_32x32, - .anims = sAnimTable_Following, - .images = sPicTable_Substitute, - .affineAnims = gDummySpriteAffineAnimTable, - }, - #endif //OW_BATTLE_ONLY_FORMS + FOOTPRINT(Froslass) + //SHADOW(-1, 0, SHADOW_SIZE_M) .isMegaEvolution = TRUE, .levelUpLearnset = sFroslassLevelUpLearnset, .teachableLearnset = sFroslassTeachableLearnset, diff --git a/src/data/pokemon/species_info/gen_5_families.h b/src/data/pokemon/species_info/gen_5_families.h index 0acaeb8ec7..249257c425 100644 --- a/src/data/pokemon/species_info/gen_5_families.h +++ b/src/data/pokemon/species_info/gen_5_families.h @@ -548,42 +548,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = "shaped like a serpentine spear,\n" "it rushes in to save its\n" "imperiled allies."), - .frontPic = gMonFrontPic_CircledQuestionMark, - .frontPicSize = MON_COORDS_SIZE(40, 40), - .frontPicYOffset = 12, - .frontAnimFrames = sAnims_TwoFramePlaceHolder, - .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_CircledQuestionMark, - .backPicSize = MON_COORDS_SIZE(40, 40), - .backPicYOffset = 12, - .backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_CircledQuestionMark, - .shinyPalette = gMonShinyPalette_CircledQuestionMark, - .iconSprite = gMonIcon_QuestionMark, - .iconPalIndex = 0, + //.frontPic = gMonFrontPic_CircledQuestionMark, + //.frontPicSize = MON_COORDS_SIZE(40, 40), + //.frontPicYOffset = 12, + //.frontAnimFrames = sAnims_TwoFramePlaceHolder, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //.backPic = gMonBackPic_CircledQuestionMark, + //.backPicSize = MON_COORDS_SIZE(40, 40), + //.backPicYOffset = 12, + //.backAnimId = BACK_ANIM_NONE, + //.palette = gMonPalette_CircledQuestionMark, + //.shinyPalette = gMonShinyPalette_CircledQuestionMark, + //.iconSprite = gMonIcon_QuestionMark, + //.iconPalIndex = 0, .pokemonJumpType = PKMN_JUMP_TYPE_NONE, - FOOTPRINT(QuestionMark) - SHADOW(-1, 0, SHADOW_SIZE_M) - #if OW_BATTLE_ONLY_FORMS - .overworldData = { - .tileTag = TAG_NONE, - .paletteTag = OBJ_EVENT_PAL_TAG_SUBSTITUTE, - .reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE, - .size = 512, - .width = 32, - .height = 32, - .paletteSlot = PALSLOT_NPC_1, - .shadowSize = SHADOW_SIZE_M, - .inanimate = FALSE, - .compressed = COMP, - .tracks = TRACKS_FOOT, - .oam = &gObjectEventBaseOam_32x32, - .subspriteTables = sOamTables_32x32, - .anims = sAnimTable_Following, - .images = sPicTable_Substitute, - .affineAnims = gDummySpriteAffineAnimTable, - }, - #endif //OW_BATTLE_ONLY_FORMS + FOOTPRINT(Emboar) + //SHADOW(-1, 0, SHADOW_SIZE_M) .isMegaEvolution = TRUE, .levelUpLearnset = sEmboarLevelUpLearnset, .teachableLearnset = sEmboarTeachableLearnset, @@ -2880,42 +2860,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = "head together to form a streamlined\n" "shape and spins at high speeds,\n" "it can destroy anything."), - .frontPic = gMonFrontPic_CircledQuestionMark, - .frontPicSize = MON_COORDS_SIZE(40, 40), - .frontPicYOffset = 12, - .frontAnimFrames = sAnims_TwoFramePlaceHolder, - .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_CircledQuestionMark, - .backPicSize = MON_COORDS_SIZE(40, 40), - .backPicYOffset = 12, - .backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_CircledQuestionMark, - .shinyPalette = gMonShinyPalette_CircledQuestionMark, - .iconSprite = gMonIcon_QuestionMark, - .iconPalIndex = 0, + //.frontPic = gMonFrontPic_CircledQuestionMark, + //.frontPicSize = MON_COORDS_SIZE(40, 40), + //.frontPicYOffset = 12, + //.frontAnimFrames = sAnims_TwoFramePlaceHolder, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //.backPic = gMonBackPic_CircledQuestionMark, + //.backPicSize = MON_COORDS_SIZE(40, 40), + //.backPicYOffset = 12, + //.backAnimId = BACK_ANIM_NONE, + //.palette = gMonPalette_CircledQuestionMark, + //.shinyPalette = gMonShinyPalette_CircledQuestionMark, + //.iconSprite = gMonIcon_QuestionMark, + //.iconPalIndex = 0, .pokemonJumpType = PKMN_JUMP_TYPE_NONE, - FOOTPRINT(QuestionMark) - SHADOW(-1, 0, SHADOW_SIZE_M) - #if OW_BATTLE_ONLY_FORMS - .overworldData = { - .tileTag = TAG_NONE, - .paletteTag = OBJ_EVENT_PAL_TAG_SUBSTITUTE, - .reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE, - .size = 512, - .width = 32, - .height = 32, - .paletteSlot = PALSLOT_NPC_1, - .shadowSize = SHADOW_SIZE_M, - .inanimate = FALSE, - .compressed = COMP, - .tracks = TRACKS_FOOT, - .oam = &gObjectEventBaseOam_32x32, - .subspriteTables = sOamTables_32x32, - .anims = sAnimTable_Following, - .images = sPicTable_Substitute, - .affineAnims = gDummySpriteAffineAnimTable, - }, - #endif //OW_BATTLE_ONLY_FORMS + FOOTPRINT(Excadrill) + //SHADOW(-1, 0, SHADOW_SIZE_M) .isMegaEvolution = TRUE, .levelUpLearnset = sExcadrillLevelUpLearnset, .teachableLearnset = sExcadrillTeachableLearnset, @@ -4129,42 +4089,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = "Its deadly venom gives off a faint\n" "glow. The venom affects Scolipede's\n" "mind, honing its viciousness."), - .frontPic = gMonFrontPic_CircledQuestionMark, - .frontPicSize = MON_COORDS_SIZE(40, 40), - .frontPicYOffset = 12, - .frontAnimFrames = sAnims_TwoFramePlaceHolder, - .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_CircledQuestionMark, - .backPicSize = MON_COORDS_SIZE(40, 40), - .backPicYOffset = 12, - .backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_CircledQuestionMark, - .shinyPalette = gMonShinyPalette_CircledQuestionMark, - .iconSprite = gMonIcon_QuestionMark, - .iconPalIndex = 0, + //.frontPic = gMonFrontPic_CircledQuestionMark, + //.frontPicSize = MON_COORDS_SIZE(40, 40), + //.frontPicYOffset = 12, + //.frontAnimFrames = sAnims_TwoFramePlaceHolder, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //.backPic = gMonBackPic_CircledQuestionMark, + //.backPicSize = MON_COORDS_SIZE(40, 40), + //.backPicYOffset = 12, + //.backAnimId = BACK_ANIM_NONE, + //.palette = gMonPalette_CircledQuestionMark, + //.shinyPalette = gMonShinyPalette_CircledQuestionMark, + //.iconSprite = gMonIcon_QuestionMark, + //.iconPalIndex = 0, .pokemonJumpType = PKMN_JUMP_TYPE_NONE, - FOOTPRINT(QuestionMark) - SHADOW(-1, 0, SHADOW_SIZE_M) - #if OW_BATTLE_ONLY_FORMS - .overworldData = { - .tileTag = TAG_NONE, - .paletteTag = OBJ_EVENT_PAL_TAG_SUBSTITUTE, - .reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE, - .size = 512, - .width = 32, - .height = 32, - .paletteSlot = PALSLOT_NPC_1, - .shadowSize = SHADOW_SIZE_M, - .inanimate = FALSE, - .compressed = COMP, - .tracks = TRACKS_FOOT, - .oam = &gObjectEventBaseOam_32x32, - .subspriteTables = sOamTables_32x32, - .anims = sAnimTable_Following, - .images = sPicTable_Substitute, - .affineAnims = gDummySpriteAffineAnimTable, - }, - #endif //OW_BATTLE_ONLY_FORMS + FOOTPRINT(Scolipede) + //SHADOW(-1, 0, SHADOW_SIZE_M) .isMegaEvolution = TRUE, .levelUpLearnset = sScolipedeLevelUpLearnset, .teachableLearnset = sScolipedeTeachableLearnset, @@ -5885,42 +5825,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = "shed skin to turn white, growing\n" "tough and supple. Of course, this\n" "Pokémon is still as feisty as ever."), - .frontPic = gMonFrontPic_CircledQuestionMark, - .frontPicSize = MON_COORDS_SIZE(40, 40), - .frontPicYOffset = 12, - .frontAnimFrames = sAnims_TwoFramePlaceHolder, - .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_CircledQuestionMark, - .backPicSize = MON_COORDS_SIZE(40, 40), - .backPicYOffset = 12, - .backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_CircledQuestionMark, - .shinyPalette = gMonShinyPalette_CircledQuestionMark, - .iconSprite = gMonIcon_QuestionMark, - .iconPalIndex = 0, + //.frontPic = gMonFrontPic_CircledQuestionMark, + //.frontPicSize = MON_COORDS_SIZE(40, 40), + //.frontPicYOffset = 12, + //.frontAnimFrames = sAnims_TwoFramePlaceHolder, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //.backPic = gMonBackPic_CircledQuestionMark, + //.backPicSize = MON_COORDS_SIZE(40, 40), + //.backPicYOffset = 12, + //.backAnimId = BACK_ANIM_NONE, + //.palette = gMonPalette_CircledQuestionMark, + //.shinyPalette = gMonShinyPalette_CircledQuestionMark, + //.iconSprite = gMonIcon_QuestionMark, + //.iconPalIndex = 0, .pokemonJumpType = PKMN_JUMP_TYPE_NONE, - FOOTPRINT(QuestionMark) - SHADOW(-1, 0, SHADOW_SIZE_M) - #if OW_BATTLE_ONLY_FORMS - .overworldData = { - .tileTag = TAG_NONE, - .paletteTag = OBJ_EVENT_PAL_TAG_SUBSTITUTE, - .reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE, - .size = 512, - .width = 32, - .height = 32, - .paletteSlot = PALSLOT_NPC_1, - .shadowSize = SHADOW_SIZE_M, - .inanimate = FALSE, - .compressed = COMP, - .tracks = TRACKS_FOOT, - .oam = &gObjectEventBaseOam_32x32, - .subspriteTables = sOamTables_32x32, - .anims = sAnimTable_Following, - .images = sPicTable_Substitute, - .affineAnims = gDummySpriteAffineAnimTable, - }, - #endif //OW_BATTLE_ONLY_FORMS + FOOTPRINT(Scrafty) + //SHADOW(-1, 0, SHADOW_SIZE_M) .isMegaEvolution = TRUE, .levelUpLearnset = sScraftyLevelUpLearnset, .teachableLearnset = sScraftyTeachableLearnset, @@ -9893,42 +9813,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = "electricity it did before Mega\n" "Evolving. It discharges this energy\n" "from its false Eelektrik made of mucus."), - .frontPic = gMonFrontPic_CircledQuestionMark, - .frontPicSize = MON_COORDS_SIZE(40, 40), - .frontPicYOffset = 12, - .frontAnimFrames = sAnims_TwoFramePlaceHolder, - .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_CircledQuestionMark, - .backPicSize = MON_COORDS_SIZE(40, 40), - .backPicYOffset = 12, - .backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_CircledQuestionMark, - .shinyPalette = gMonShinyPalette_CircledQuestionMark, - .iconSprite = gMonIcon_QuestionMark, - .iconPalIndex = 0, + //.frontPic = gMonFrontPic_CircledQuestionMark, + //.frontPicSize = MON_COORDS_SIZE(40, 40), + //.frontPicYOffset = 12, + //.frontAnimFrames = sAnims_TwoFramePlaceHolder, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //.backPic = gMonBackPic_CircledQuestionMark, + //.backPicSize = MON_COORDS_SIZE(40, 40), + //.backPicYOffset = 12, + //.backAnimId = BACK_ANIM_NONE, + //.palette = gMonPalette_CircledQuestionMark, + //.shinyPalette = gMonShinyPalette_CircledQuestionMark, + //.iconSprite = gMonIcon_QuestionMark, + //.iconPalIndex = 0, .pokemonJumpType = PKMN_JUMP_TYPE_NONE, - FOOTPRINT(QuestionMark) - SHADOW(-1, 0, SHADOW_SIZE_M) - #if OW_BATTLE_ONLY_FORMS - .overworldData = { - .tileTag = TAG_NONE, - .paletteTag = OBJ_EVENT_PAL_TAG_SUBSTITUTE, - .reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE, - .size = 512, - .width = 32, - .height = 32, - .paletteSlot = PALSLOT_NPC_1, - .shadowSize = SHADOW_SIZE_M, - .inanimate = FALSE, - .compressed = COMP, - .tracks = TRACKS_FOOT, - .oam = &gObjectEventBaseOam_32x32, - .subspriteTables = sOamTables_32x32, - .anims = sAnimTable_Following, - .images = sPicTable_Substitute, - .affineAnims = gDummySpriteAffineAnimTable, - }, - #endif //OW_BATTLE_ONLY_FORMS + FOOTPRINT(Eelektross) + //SHADOW(-1, 0, SHADOW_SIZE_M) .isMegaEvolution = TRUE, .levelUpLearnset = sEelektrossLevelUpLearnset, .teachableLearnset = sEelektrossTeachableLearnset, @@ -10335,42 +10235,22 @@ const struct SpeciesInfo gSpeciesInfoGen5[] = "our world with the afterlife.\n" "This Pokémon draws in hatred and\n" "converts it into power."), - .frontPic = gMonFrontPic_CircledQuestionMark, - .frontPicSize = MON_COORDS_SIZE(40, 40), - .frontPicYOffset = 12, - .frontAnimFrames = sAnims_TwoFramePlaceHolder, - .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_CircledQuestionMark, - .backPicSize = MON_COORDS_SIZE(40, 40), - .backPicYOffset = 12, - .backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_CircledQuestionMark, - .shinyPalette = gMonShinyPalette_CircledQuestionMark, - .iconSprite = gMonIcon_QuestionMark, - .iconPalIndex = 0, + //.frontPic = gMonFrontPic_CircledQuestionMark, + //.frontPicSize = MON_COORDS_SIZE(40, 40), + //.frontPicYOffset = 12, + //.frontAnimFrames = sAnims_TwoFramePlaceHolder, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //.backPic = gMonBackPic_CircledQuestionMark, + //.backPicSize = MON_COORDS_SIZE(40, 40), + //.backPicYOffset = 12, + //.backAnimId = BACK_ANIM_NONE, + //.palette = gMonPalette_CircledQuestionMark, + //.shinyPalette = gMonShinyPalette_CircledQuestionMark, + //.iconSprite = gMonIcon_QuestionMark, + //.iconPalIndex = 0, .pokemonJumpType = PKMN_JUMP_TYPE_NONE, - FOOTPRINT(QuestionMark) - SHADOW(-1, 0, SHADOW_SIZE_M) - #if OW_BATTLE_ONLY_FORMS - .overworldData = { - .tileTag = TAG_NONE, - .paletteTag = OBJ_EVENT_PAL_TAG_SUBSTITUTE, - .reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE, - .size = 512, - .width = 32, - .height = 32, - .paletteSlot = PALSLOT_NPC_1, - .shadowSize = SHADOW_SIZE_M, - .inanimate = FALSE, - .compressed = COMP, - .tracks = TRACKS_FOOT, - .oam = &gObjectEventBaseOam_32x32, - .subspriteTables = sOamTables_32x32, - .anims = sAnimTable_Following, - .images = sPicTable_Substitute, - .affineAnims = gDummySpriteAffineAnimTable, - }, - #endif //OW_BATTLE_ONLY_FORMS + FOOTPRINT(Chandelure) + //SHADOW(-1, 0, SHADOW_SIZE_M) .isMegaEvolution = TRUE, .levelUpLearnset = sChandelureLevelUpLearnset, .teachableLearnset = sChandelureTeachableLearnset, diff --git a/src/data/pokemon/species_info/gen_6_families.h b/src/data/pokemon/species_info/gen_6_families.h index 3e99facb91..23a3b9f25f 100644 --- a/src/data/pokemon/species_info/gen_6_families.h +++ b/src/data/pokemon/species_info/gen_6_families.h @@ -244,42 +244,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = "It has fortified armor and a\n" "will to defend at all costs.\n" "Both are absurdly strong."), - .frontPic = gMonFrontPic_CircledQuestionMark, - .frontPicSize = MON_COORDS_SIZE(40, 40), - .frontPicYOffset = 12, - .frontAnimFrames = sAnims_TwoFramePlaceHolder, - .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_CircledQuestionMark, - .backPicSize = MON_COORDS_SIZE(40, 40), - .backPicYOffset = 12, - .backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_CircledQuestionMark, - .shinyPalette = gMonShinyPalette_CircledQuestionMark, - .iconSprite = gMonIcon_QuestionMark, - .iconPalIndex = 0, + //.frontPic = gMonFrontPic_CircledQuestionMark, + //.frontPicSize = MON_COORDS_SIZE(40, 40), + //.frontPicYOffset = 12, + //.frontAnimFrames = sAnims_TwoFramePlaceHolder, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //.backPic = gMonBackPic_CircledQuestionMark, + //.backPicSize = MON_COORDS_SIZE(40, 40), + //.backPicYOffset = 12, + //.backAnimId = BACK_ANIM_NONE, + //.palette = gMonPalette_CircledQuestionMark, + //.shinyPalette = gMonShinyPalette_CircledQuestionMark, + //.iconSprite = gMonIcon_QuestionMark, + //.iconPalIndex = 0, .pokemonJumpType = PKMN_JUMP_TYPE_NONE, - FOOTPRINT(QuestionMark) - SHADOW(-1, 0, SHADOW_SIZE_M) - #if OW_BATTLE_ONLY_FORMS - .overworldData = { - .tileTag = TAG_NONE, - .paletteTag = OBJ_EVENT_PAL_TAG_SUBSTITUTE, - .reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE, - .size = 512, - .width = 32, - .height = 32, - .paletteSlot = PALSLOT_NPC_1, - .shadowSize = SHADOW_SIZE_M, - .inanimate = FALSE, - .compressed = COMP, - .tracks = TRACKS_FOOT, - .oam = &gObjectEventBaseOam_32x32, - .subspriteTables = sOamTables_32x32, - .anims = sAnimTable_Following, - .images = sPicTable_Substitute, - .affineAnims = gDummySpriteAffineAnimTable, - }, - #endif //OW_BATTLE_ONLY_FORMS + FOOTPRINT(Chesnaught) + //SHADOW(-1, 0, SHADOW_SIZE_M) .isMegaEvolution = TRUE, .levelUpLearnset = sChesnaughtLevelUpLearnset, .teachableLearnset = sChesnaughtTeachableLearnset, @@ -535,42 +515,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = "dazzle its opponents before\n" "incinerating them with a\n" "huge fireball."), - .frontPic = gMonFrontPic_CircledQuestionMark, - .frontPicSize = MON_COORDS_SIZE(40, 40), - .frontPicYOffset = 12, - .frontAnimFrames = sAnims_TwoFramePlaceHolder, - .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_CircledQuestionMark, - .backPicSize = MON_COORDS_SIZE(40, 40), - .backPicYOffset = 12, - .backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_CircledQuestionMark, - .shinyPalette = gMonShinyPalette_CircledQuestionMark, - .iconSprite = gMonIcon_QuestionMark, - .iconPalIndex = 0, + //.frontPic = gMonFrontPic_CircledQuestionMark, + //.frontPicSize = MON_COORDS_SIZE(40, 40), + //.frontPicYOffset = 12, + //.frontAnimFrames = sAnims_TwoFramePlaceHolder, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //.backPic = gMonBackPic_CircledQuestionMark, + //.backPicSize = MON_COORDS_SIZE(40, 40), + //.backPicYOffset = 12, + //.backAnimId = BACK_ANIM_NONE, + //.palette = gMonPalette_CircledQuestionMark, + //.shinyPalette = gMonShinyPalette_CircledQuestionMark, + //.iconSprite = gMonIcon_QuestionMark, + //.iconPalIndex = 0, .pokemonJumpType = PKMN_JUMP_TYPE_NONE, - FOOTPRINT(QuestionMark) - SHADOW(-1, 0, SHADOW_SIZE_M) - #if OW_BATTLE_ONLY_FORMS - .overworldData = { - .tileTag = TAG_NONE, - .paletteTag = OBJ_EVENT_PAL_TAG_SUBSTITUTE, - .reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE, - .size = 512, - .width = 32, - .height = 32, - .paletteSlot = PALSLOT_NPC_1, - .shadowSize = SHADOW_SIZE_M, - .inanimate = FALSE, - .compressed = COMP, - .tracks = TRACKS_FOOT, - .oam = &gObjectEventBaseOam_32x32, - .subspriteTables = sOamTables_32x32, - .anims = sAnimTable_Following, - .images = sPicTable_Substitute, - .affineAnims = gDummySpriteAffineAnimTable, - }, - #endif //OW_BATTLE_ONLY_FORMS + FOOTPRINT(Delphox) + //SHADOW(-1, 0, SHADOW_SIZE_M) .isMegaEvolution = TRUE, .levelUpLearnset = sDelphoxLevelUpLearnset, .teachableLearnset = sDelphoxTeachableLearnset, @@ -947,42 +907,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = "shuriken at high speed to make it\n" "float, then clings to it upside\n" "down to catch opponents unawares."), - .frontPic = gMonFrontPic_CircledQuestionMark, - .frontPicSize = MON_COORDS_SIZE(40, 40), - .frontPicYOffset = 12, - .frontAnimFrames = sAnims_TwoFramePlaceHolder, - .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_CircledQuestionMark, - .backPicSize = MON_COORDS_SIZE(40, 40), - .backPicYOffset = 12, - .backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_CircledQuestionMark, - .shinyPalette = gMonShinyPalette_CircledQuestionMark, - .iconSprite = gMonIcon_QuestionMark, - .iconPalIndex = 0, + //.frontPic = gMonFrontPic_CircledQuestionMark, + //.frontPicSize = MON_COORDS_SIZE(40, 40), + //.frontPicYOffset = 12, + //.frontAnimFrames = sAnims_TwoFramePlaceHolder, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //.backPic = gMonBackPic_CircledQuestionMark, + //.backPicSize = MON_COORDS_SIZE(40, 40), + //.backPicYOffset = 12, + //.backAnimId = BACK_ANIM_NONE, + //.palette = gMonPalette_CircledQuestionMark, + //.shinyPalette = gMonShinyPalette_CircledQuestionMark, + //.iconSprite = gMonIcon_QuestionMark, + //.iconPalIndex = 0, .pokemonJumpType = PKMN_JUMP_TYPE_NONE, - FOOTPRINT(QuestionMark) - SHADOW(-1, 0, SHADOW_SIZE_M) - #if OW_BATTLE_ONLY_FORMS - .overworldData = { - .tileTag = TAG_NONE, - .paletteTag = OBJ_EVENT_PAL_TAG_SUBSTITUTE, - .reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE, - .size = 512, - .width = 32, - .height = 32, - .paletteSlot = PALSLOT_NPC_1, - .shadowSize = SHADOW_SIZE_M, - .inanimate = FALSE, - .compressed = COMP, - .tracks = TRACKS_FOOT, - .oam = &gObjectEventBaseOam_32x32, - .subspriteTables = sOamTables_32x32, - .anims = sAnimTable_Following, - .images = sPicTable_Substitute, - .affineAnims = gDummySpriteAffineAnimTable, - }, - #endif //OW_BATTLE_ONLY_FORMS + FOOTPRINT(Greninja) + //SHADOW(-1, 0, SHADOW_SIZE_M) .isMegaEvolution = TRUE, .levelUpLearnset = sGreninjaLevelUpLearnset, .teachableLearnset = sGreninjaTeachableLearnset, @@ -1937,42 +1877,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = "than 18,000 degrees Fahrenheit.\n" "It swings around its grand, blazing\n" "mane as it protects its allies."), - .frontPic = gMonFrontPic_CircledQuestionMark, - .frontPicSize = MON_COORDS_SIZE(40, 40), - .frontPicYOffset = 12, - .frontAnimFrames = sAnims_TwoFramePlaceHolder, - .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_CircledQuestionMark, - .backPicSize = MON_COORDS_SIZE(40, 40), - .backPicYOffset = 12, - .backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_CircledQuestionMark, - .shinyPalette = gMonShinyPalette_CircledQuestionMark, - .iconSprite = gMonIcon_QuestionMark, - .iconPalIndex = 0, + //.frontPic = gMonFrontPic_CircledQuestionMark, + //.frontPicSize = MON_COORDS_SIZE(40, 40), + //.frontPicYOffset = 12, + //.frontAnimFrames = sAnims_TwoFramePlaceHolder, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //.backPic = gMonBackPic_CircledQuestionMark, + //.backPicSize = MON_COORDS_SIZE(40, 40), + //.backPicYOffset = 12, + //.backAnimId = BACK_ANIM_NONE, + //.palette = gMonPalette_CircledQuestionMark, + //.shinyPalette = gMonShinyPalette_CircledQuestionMark, + //.iconSprite = gMonIcon_QuestionMark, + //.iconPalIndex = 0, .pokemonJumpType = PKMN_JUMP_TYPE_NONE, - FOOTPRINT(QuestionMark) - SHADOW(-1, 0, SHADOW_SIZE_M) - #if OW_BATTLE_ONLY_FORMS - .overworldData = { - .tileTag = TAG_NONE, - .paletteTag = OBJ_EVENT_PAL_TAG_SUBSTITUTE, - .reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE, - .size = 512, - .width = 32, - .height = 32, - .paletteSlot = PALSLOT_NPC_1, - .shadowSize = SHADOW_SIZE_M, - .inanimate = FALSE, - .compressed = COMP, - .tracks = TRACKS_FOOT, - .oam = &gObjectEventBaseOam_32x32, - .subspriteTables = sOamTables_32x32, - .anims = sAnimTable_Following, - .images = sPicTable_Substitute, - .affineAnims = gDummySpriteAffineAnimTable, - }, - #endif //OW_BATTLE_ONLY_FORMS + FOOTPRINT(Pyroar) + //SHADOW(-1, 0, SHADOW_SIZE_M) .isMegaEvolution = TRUE, .levelUpLearnset = sPyroarLevelUpLearnset, .teachableLearnset = sPyroarTeachableLearnset, @@ -2358,42 +2278,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = "all the energy from Mega\n" "Evolution. The flower now attacks\n" "enemies on its own."), - .frontPic = gMonFrontPic_CircledQuestionMark, - .frontPicSize = MON_COORDS_SIZE(40, 40), - .frontPicYOffset = 12, - .frontAnimFrames = sAnims_TwoFramePlaceHolder, - .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_CircledQuestionMark, - .backPicSize = MON_COORDS_SIZE(40, 40), - .backPicYOffset = 12, - .backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_CircledQuestionMark, - .shinyPalette = gMonShinyPalette_CircledQuestionMark, - .iconSprite = gMonIcon_QuestionMark, - .iconPalIndex = 0, + //.frontPic = gMonFrontPic_CircledQuestionMark, + //.frontPicSize = MON_COORDS_SIZE(40, 40), + //.frontPicYOffset = 12, + //.frontAnimFrames = sAnims_TwoFramePlaceHolder, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //.backPic = gMonBackPic_CircledQuestionMark, + //.backPicSize = MON_COORDS_SIZE(40, 40), + //.backPicYOffset = 12, + //.backAnimId = BACK_ANIM_NONE, + //.palette = gMonPalette_CircledQuestionMark, + //.shinyPalette = gMonShinyPalette_CircledQuestionMark, + //.iconSprite = gMonIcon_QuestionMark, + //.iconPalIndex = 0, .pokemonJumpType = PKMN_JUMP_TYPE_NONE, - FOOTPRINT(QuestionMark) - SHADOW(-1, 0, SHADOW_SIZE_M) - #if OW_BATTLE_ONLY_FORMS - .overworldData = { - .tileTag = TAG_NONE, - .paletteTag = OBJ_EVENT_PAL_TAG_SUBSTITUTE, - .reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE, - .size = 512, - .width = 32, - .height = 32, - .paletteSlot = PALSLOT_NPC_1, - .shadowSize = SHADOW_SIZE_M, - .inanimate = FALSE, - .compressed = COMP, - .tracks = TRACKS_FOOT, - .oam = &gObjectEventBaseOam_32x32, - .subspriteTables = sOamTables_32x32, - .anims = sAnimTable_Following, - .images = sPicTable_Substitute, - .affineAnims = gDummySpriteAffineAnimTable, - }, - #endif //OW_BATTLE_ONLY_FORMS + FOOTPRINT(Floette) + //SHADOW(-1, 0, SHADOW_SIZE_M) .isMegaEvolution = TRUE, .levelUpLearnset = sFloetteEternalLevelUpLearnset, .teachableLearnset = sFloetteEternalTeachableLearnset, @@ -3713,42 +3613,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = "overwrite the personality and\n" "memories of others-and to\n" "control them."), - .frontPic = gMonFrontPic_CircledQuestionMark, - .frontPicSize = MON_COORDS_SIZE(40, 40), - .frontPicYOffset = 12, - .frontAnimFrames = sAnims_TwoFramePlaceHolder, - .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_CircledQuestionMark, - .backPicSize = MON_COORDS_SIZE(40, 40), - .backPicYOffset = 12, - .backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_CircledQuestionMark, - .shinyPalette = gMonShinyPalette_CircledQuestionMark, - .iconSprite = gMonIcon_QuestionMark, - .iconPalIndex = 0, + //.frontPic = gMonFrontPic_CircledQuestionMark, + //.frontPicSize = MON_COORDS_SIZE(40, 40), + //.frontPicYOffset = 12, + //.frontAnimFrames = sAnims_TwoFramePlaceHolder, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //.backPic = gMonBackPic_CircledQuestionMark, + //.backPicSize = MON_COORDS_SIZE(40, 40), + //.backPicYOffset = 12, + //.backAnimId = BACK_ANIM_NONE, + //.palette = gMonPalette_CircledQuestionMark, + //.shinyPalette = gMonShinyPalette_CircledQuestionMark, + //.iconSprite = gMonIcon_QuestionMark, + //.iconPalIndex = 0, .pokemonJumpType = PKMN_JUMP_TYPE_NONE, - FOOTPRINT(QuestionMark) - SHADOW(-1, 0, SHADOW_SIZE_M) - #if OW_BATTLE_ONLY_FORMS - .overworldData = { - .tileTag = TAG_NONE, - .paletteTag = OBJ_EVENT_PAL_TAG_SUBSTITUTE, - .reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE, - .size = 512, - .width = 32, - .height = 32, - .paletteSlot = PALSLOT_NPC_1, - .shadowSize = SHADOW_SIZE_M, - .inanimate = FALSE, - .compressed = COMP, - .tracks = TRACKS_FOOT, - .oam = &gObjectEventBaseOam_32x32, - .subspriteTables = sOamTables_32x32, - .anims = sAnimTable_Following, - .images = sPicTable_Substitute, - .affineAnims = gDummySpriteAffineAnimTable, - }, - #endif //OW_BATTLE_ONLY_FORMS + FOOTPRINT(Malamar) + //SHADOW(-1, 0, SHADOW_SIZE_M) .isMegaEvolution = TRUE, .levelUpLearnset = sMalamarLevelUpLearnset, .teachableLearnset = sMalamarTeachableLearnset, @@ -3931,42 +3811,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = "It uses its many arms to toy\n" "with its opponents. This\n" "keeps the head extremely busy."), - .frontPic = gMonFrontPic_CircledQuestionMark, - .frontPicSize = MON_COORDS_SIZE(40, 40), - .frontPicYOffset = 12, - .frontAnimFrames = sAnims_TwoFramePlaceHolder, - .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_CircledQuestionMark, - .backPicSize = MON_COORDS_SIZE(40, 40), - .backPicYOffset = 12, - .backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_CircledQuestionMark, - .shinyPalette = gMonShinyPalette_CircledQuestionMark, - .iconSprite = gMonIcon_QuestionMark, - .iconPalIndex = 0, + //.frontPic = gMonFrontPic_CircledQuestionMark, + //.frontPicSize = MON_COORDS_SIZE(40, 40), + //.frontPicYOffset = 12, + //.frontAnimFrames = sAnims_TwoFramePlaceHolder, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //.backPic = gMonBackPic_CircledQuestionMark, + //.backPicSize = MON_COORDS_SIZE(40, 40), + //.backPicYOffset = 12, + //.backAnimId = BACK_ANIM_NONE, + //.palette = gMonPalette_CircledQuestionMark, + //.shinyPalette = gMonShinyPalette_CircledQuestionMark, + //.iconSprite = gMonIcon_QuestionMark, + //.iconPalIndex = 0, .pokemonJumpType = PKMN_JUMP_TYPE_NONE, - FOOTPRINT(QuestionMark) - SHADOW(-1, 0, SHADOW_SIZE_M) - #if OW_BATTLE_ONLY_FORMS - .overworldData = { - .tileTag = TAG_NONE, - .paletteTag = OBJ_EVENT_PAL_TAG_SUBSTITUTE, - .reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE, - .size = 512, - .width = 32, - .height = 32, - .paletteSlot = PALSLOT_NPC_1, - .shadowSize = SHADOW_SIZE_M, - .inanimate = FALSE, - .compressed = COMP, - .tracks = TRACKS_FOOT, - .oam = &gObjectEventBaseOam_32x32, - .subspriteTables = sOamTables_32x32, - .anims = sAnimTable_Following, - .images = sPicTable_Substitute, - .affineAnims = gDummySpriteAffineAnimTable, - }, - #endif //OW_BATTLE_ONLY_FORMS + FOOTPRINT(Barbaracle) + //SHADOW(-1, 0, SHADOW_SIZE_M) .isMegaEvolution = TRUE, .levelUpLearnset = sBarbaracleLevelUpLearnset, .teachableLearnset = sBarbaracleTeachableLearnset, @@ -4152,42 +4012,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = "regenerative power of cells to run\n" "wild. The liquid is deadly poison\n" "to everything other than itself."), - .frontPic = gMonFrontPic_CircledQuestionMark, - .frontPicSize = MON_COORDS_SIZE(40, 40), - .frontPicYOffset = 12, - .frontAnimFrames = sAnims_TwoFramePlaceHolder, - .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_CircledQuestionMark, - .backPicSize = MON_COORDS_SIZE(40, 40), - .backPicYOffset = 12, - .backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_CircledQuestionMark, - .shinyPalette = gMonShinyPalette_CircledQuestionMark, - .iconSprite = gMonIcon_QuestionMark, - .iconPalIndex = 0, + //.frontPic = gMonFrontPic_CircledQuestionMark, + //.frontPicSize = MON_COORDS_SIZE(40, 40), + //.frontPicYOffset = 12, + //.frontAnimFrames = sAnims_TwoFramePlaceHolder, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //.backPic = gMonBackPic_CircledQuestionMark, + //.backPicSize = MON_COORDS_SIZE(40, 40), + //.backPicYOffset = 12, + //.backAnimId = BACK_ANIM_NONE, + //.palette = gMonPalette_CircledQuestionMark, + //.shinyPalette = gMonShinyPalette_CircledQuestionMark, + //.iconSprite = gMonIcon_QuestionMark, + //.iconPalIndex = 0, .pokemonJumpType = PKMN_JUMP_TYPE_NONE, - FOOTPRINT(QuestionMark) - SHADOW(-1, 0, SHADOW_SIZE_M) - #if OW_BATTLE_ONLY_FORMS - .overworldData = { - .tileTag = TAG_NONE, - .paletteTag = OBJ_EVENT_PAL_TAG_SUBSTITUTE, - .reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE, - .size = 512, - .width = 32, - .height = 32, - .paletteSlot = PALSLOT_NPC_1, - .shadowSize = SHADOW_SIZE_M, - .inanimate = FALSE, - .compressed = COMP, - .tracks = TRACKS_FOOT, - .oam = &gObjectEventBaseOam_32x32, - .subspriteTables = sOamTables_32x32, - .anims = sAnimTable_Following, - .images = sPicTable_Substitute, - .affineAnims = gDummySpriteAffineAnimTable, - }, - #endif //OW_BATTLE_ONLY_FORMS + FOOTPRINT(Dragalge) + //SHADOW(-1, 0, SHADOW_SIZE_M) .isMegaEvolution = TRUE, .levelUpLearnset = sDragalgeLevelUpLearnset, .teachableLearnset = sDragalgeTeachableLearnset, @@ -4872,42 +4712,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = "Mega Evolution has pumped up all\n" "its muscles. Hawlucha flexes to\n" "show off its strength."), - .frontPic = gMonFrontPic_CircledQuestionMark, - .frontPicSize = MON_COORDS_SIZE(40, 40), - .frontPicYOffset = 12, - .frontAnimFrames = sAnims_TwoFramePlaceHolder, - .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_CircledQuestionMark, - .backPicSize = MON_COORDS_SIZE(40, 40), - .backPicYOffset = 12, - .backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_CircledQuestionMark, - .shinyPalette = gMonShinyPalette_CircledQuestionMark, - .iconSprite = gMonIcon_QuestionMark, - .iconPalIndex = 0, + //.frontPic = gMonFrontPic_CircledQuestionMark, + //.frontPicSize = MON_COORDS_SIZE(40, 40), + //.frontPicYOffset = 12, + //.frontAnimFrames = sAnims_TwoFramePlaceHolder, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //.backPic = gMonBackPic_CircledQuestionMark, + //.backPicSize = MON_COORDS_SIZE(40, 40), + //.backPicYOffset = 12, + //.backAnimId = BACK_ANIM_NONE, + //.palette = gMonPalette_CircledQuestionMark, + //.shinyPalette = gMonShinyPalette_CircledQuestionMark, + //.iconSprite = gMonIcon_QuestionMark, + //.iconPalIndex = 0, .pokemonJumpType = PKMN_JUMP_TYPE_NONE, - FOOTPRINT(QuestionMark) - SHADOW(-1, 0, SHADOW_SIZE_M) - #if OW_BATTLE_ONLY_FORMS - .overworldData = { - .tileTag = TAG_NONE, - .paletteTag = OBJ_EVENT_PAL_TAG_SUBSTITUTE, - .reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE, - .size = 512, - .width = 32, - .height = 32, - .paletteSlot = PALSLOT_NPC_1, - .shadowSize = SHADOW_SIZE_M, - .inanimate = FALSE, - .compressed = COMP, - .tracks = TRACKS_FOOT, - .oam = &gObjectEventBaseOam_32x32, - .subspriteTables = sOamTables_32x32, - .anims = sAnimTable_Following, - .images = sPicTable_Substitute, - .affineAnims = gDummySpriteAffineAnimTable, - }, - #endif //OW_BATTLE_ONLY_FORMS + FOOTPRINT(Hawlucha) + //SHADOW(-1, 0, SHADOW_SIZE_M) .isMegaEvolution = TRUE, .levelUpLearnset = sHawluchaLevelUpLearnset, .teachableLearnset = sHawluchaTeachableLearnset, @@ -7096,42 +6916,22 @@ const struct SpeciesInfo gSpeciesInfoGen6[] = "during an unprecedented crisis,\n" "Zygarde Mega Evolves and calms the\n" "situation with its unmatched power."), - .frontPic = gMonFrontPic_CircledQuestionMark, - .frontPicSize = MON_COORDS_SIZE(40, 40), - .frontPicYOffset = 12, - .frontAnimFrames = sAnims_TwoFramePlaceHolder, - .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_CircledQuestionMark, - .backPicSize = MON_COORDS_SIZE(40, 40), - .backPicYOffset = 12, - .backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_CircledQuestionMark, - .shinyPalette = gMonShinyPalette_CircledQuestionMark, - .iconSprite = gMonIcon_QuestionMark, - .iconPalIndex = 0, + //.frontPic = gMonFrontPic_CircledQuestionMark, + //.frontPicSize = MON_COORDS_SIZE(40, 40), + //.frontPicYOffset = 12, + //.frontAnimFrames = sAnims_TwoFramePlaceHolder, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //.backPic = gMonBackPic_CircledQuestionMark, + //.backPicSize = MON_COORDS_SIZE(40, 40), + //.backPicYOffset = 12, + //.backAnimId = BACK_ANIM_NONE, + //.palette = gMonPalette_CircledQuestionMark, + //.shinyPalette = gMonShinyPalette_CircledQuestionMark, + //.iconSprite = gMonIcon_QuestionMark, + //.iconPalIndex = 0, .pokemonJumpType = PKMN_JUMP_TYPE_NONE, - FOOTPRINT(QuestionMark) - SHADOW(-1, 0, SHADOW_SIZE_M) - #if OW_BATTLE_ONLY_FORMS - .overworldData = { - .tileTag = TAG_NONE, - .paletteTag = OBJ_EVENT_PAL_TAG_SUBSTITUTE, - .reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE, - .size = 512, - .width = 32, - .height = 32, - .paletteSlot = PALSLOT_NPC_1, - .shadowSize = SHADOW_SIZE_M, - .inanimate = FALSE, - .compressed = COMP, - .tracks = TRACKS_FOOT, - .oam = &gObjectEventBaseOam_32x32, - .subspriteTables = sOamTables_32x32, - .anims = sAnimTable_Following, - .images = sPicTable_Substitute, - .affineAnims = gDummySpriteAffineAnimTable, - }, - #endif //OW_BATTLE_ONLY_FORMS + FOOTPRINT(Zygarde) + //SHADOW(-1, 0, SHADOW_SIZE_M) .isMegaEvolution = TRUE, .levelUpLearnset = sZygardeLevelUpLearnset, .teachableLearnset = sZygardeTeachableLearnset, diff --git a/src/data/pokemon/species_info/gen_7_families.h b/src/data/pokemon/species_info/gen_7_families.h index 3b982f2c22..26637ad423 100644 --- a/src/data/pokemon/species_info/gen_7_families.h +++ b/src/data/pokemon/species_info/gen_7_families.h @@ -5239,42 +5239,22 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = "invigorated, allowing it to regain\n" "its youth. It manipulates the\n" "atmosphere to summon storms."), - .frontPic = gMonFrontPic_CircledQuestionMark, - .frontPicSize = MON_COORDS_SIZE(40, 40), - .frontPicYOffset = 12, - .frontAnimFrames = sAnims_TwoFramePlaceHolder, - .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_CircledQuestionMark, - .backPicSize = MON_COORDS_SIZE(40, 40), - .backPicYOffset = 12, - .backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_CircledQuestionMark, - .shinyPalette = gMonShinyPalette_CircledQuestionMark, - .iconSprite = gMonIcon_QuestionMark, - .iconPalIndex = 0, + //.frontPic = gMonFrontPic_CircledQuestionMark, + //.frontPicSize = MON_COORDS_SIZE(40, 40), + //.frontPicYOffset = 12, + //.frontAnimFrames = sAnims_TwoFramePlaceHolder, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //.backPic = gMonBackPic_CircledQuestionMark, + //.backPicSize = MON_COORDS_SIZE(40, 40), + //.backPicYOffset = 12, + //.backAnimId = BACK_ANIM_NONE, + //.palette = gMonPalette_CircledQuestionMark, + //.shinyPalette = gMonShinyPalette_CircledQuestionMark, + //.iconSprite = gMonIcon_QuestionMark, + //.iconPalIndex = 0, .pokemonJumpType = PKMN_JUMP_TYPE_NONE, - FOOTPRINT(QuestionMark) - SHADOW(-1, 0, SHADOW_SIZE_M) - #if OW_BATTLE_ONLY_FORMS - .overworldData = { - .tileTag = TAG_NONE, - .paletteTag = OBJ_EVENT_PAL_TAG_SUBSTITUTE, - .reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE, - .size = 512, - .width = 32, - .height = 32, - .paletteSlot = PALSLOT_NPC_1, - .shadowSize = SHADOW_SIZE_M, - .inanimate = FALSE, - .compressed = COMP, - .tracks = TRACKS_FOOT, - .oam = &gObjectEventBaseOam_32x32, - .subspriteTables = sOamTables_32x32, - .anims = sAnimTable_Following, - .images = sPicTable_Substitute, - .affineAnims = gDummySpriteAffineAnimTable, - }, - #endif //OW_BATTLE_ONLY_FORMS + FOOTPRINT(Drampa) + //SHADOW(-1, 0, SHADOW_SIZE_M) .isMegaEvolution = TRUE, .levelUpLearnset = sDrampaLevelUpLearnset, .teachableLearnset = sDrampaTeachableLearnset, diff --git a/src/data/pokemon/species_info/gen_8_families.h b/src/data/pokemon/species_info/gen_8_families.h index 04dc82f493..bc73d7bcec 100644 --- a/src/data/pokemon/species_info/gen_8_families.h +++ b/src/data/pokemon/species_info/gen_8_families.h @@ -5277,42 +5277,22 @@ const struct SpeciesInfo gSpeciesInfoGen8[] = "ultimate battle formation, which\n" "can be achieved only if the troopers\n" "and brass have the strongest of bonds."), - .frontPic = gMonFrontPic_CircledQuestionMark, - .frontPicSize = MON_COORDS_SIZE(40, 40), - .frontPicYOffset = 12, - .frontAnimFrames = sAnims_TwoFramePlaceHolder, - .frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, - .backPic = gMonBackPic_CircledQuestionMark, - .backPicSize = MON_COORDS_SIZE(40, 40), - .backPicYOffset = 12, - .backAnimId = BACK_ANIM_NONE, - .palette = gMonPalette_CircledQuestionMark, - .shinyPalette = gMonShinyPalette_CircledQuestionMark, - .iconSprite = gMonIcon_QuestionMark, - .iconPalIndex = 0, + //.frontPic = gMonFrontPic_CircledQuestionMark, + //.frontPicSize = MON_COORDS_SIZE(40, 40), + //.frontPicYOffset = 12, + //.frontAnimFrames = sAnims_TwoFramePlaceHolder, + //.frontAnimId = ANIM_V_SQUISH_AND_BOUNCE, + //.backPic = gMonBackPic_CircledQuestionMark, + //.backPicSize = MON_COORDS_SIZE(40, 40), + //.backPicYOffset = 12, + //.backAnimId = BACK_ANIM_NONE, + //.palette = gMonPalette_CircledQuestionMark, + //.shinyPalette = gMonShinyPalette_CircledQuestionMark, + //.iconSprite = gMonIcon_QuestionMark, + //.iconPalIndex = 0, .pokemonJumpType = PKMN_JUMP_TYPE_NONE, - FOOTPRINT(QuestionMark) - SHADOW(-1, 0, SHADOW_SIZE_M) - #if OW_BATTLE_ONLY_FORMS - .overworldData = { - .tileTag = TAG_NONE, - .paletteTag = OBJ_EVENT_PAL_TAG_SUBSTITUTE, - .reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE, - .size = 512, - .width = 32, - .height = 32, - .paletteSlot = PALSLOT_NPC_1, - .shadowSize = SHADOW_SIZE_M, - .inanimate = FALSE, - .compressed = COMP, - .tracks = TRACKS_FOOT, - .oam = &gObjectEventBaseOam_32x32, - .subspriteTables = sOamTables_32x32, - .anims = sAnimTable_Following, - .images = sPicTable_Substitute, - .affineAnims = gDummySpriteAffineAnimTable, - }, - #endif //OW_BATTLE_ONLY_FORMS + FOOTPRINT(Falinks) + //SHADOW(-1, 0, SHADOW_SIZE_M) .isMegaEvolution = TRUE, .levelUpLearnset = sFalinksLevelUpLearnset, .teachableLearnset = sFalinksTeachableLearnset,