From b63ca60f2d973012974e5a9da4b777f751bdd9c8 Mon Sep 17 00:00:00 2001 From: Skeli Date: Fri, 7 May 2021 18:33:50 -0400 Subject: [PATCH] Remove commented references to SPECIES_UNKNOWN_MYTHICAL People who uncomment it don't understand what the error is --- src/Back_Pic_Table.c | 1 - src/Base_Stats.c | 34 +--------------------------------- src/Cry_Table.c | 12 ------------ src/Cry_Table_2.c | 12 ------------ src/Front_Pic_Table.c | 1 - src/Icon_Table.c | 1 - src/Learnsets.c | 3 +-- src/Palette_Table.c | 1 - src/Shiny_Palette_Table.c | 1 - src/Species_To_Pokdex_Table.c | 3 +-- 10 files changed, 3 insertions(+), 66 deletions(-) diff --git a/src/Back_Pic_Table.c b/src/Back_Pic_Table.c index 9f7bc5f..39f7980 100644 --- a/src/Back_Pic_Table.c +++ b/src/Back_Pic_Table.c @@ -1192,7 +1192,6 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES] = [SPECIES_KUBFU] = {gBackShinySprite1183KubfuTiles, (64 * 64) / 2, SPECIES_KUBFU}, [SPECIES_URSHIFU_SINGLE] = {gBackShinySprite1184UrshifuSingleTiles, (64 * 64) / 2, SPECIES_URSHIFU_SINGLE}, [SPECIES_ZARUDE] = {gBackShinySprite1185ZarudeTiles, (64 * 64) / 2, SPECIES_ZARUDE}, - [SPECIES_UNKNOWN_MYTHICAL] = {gBackShinySprite1186UnknownMythicalTiles, (64 * 64) / 2, SPECIES_UNKNOWN_MYTHICAL}, [SPECIES_CALYREX] = {gBackShinySprite1187CalyrexTiles, (64 * 64) / 2, SPECIES_CALYREX}, [SPECIES_REGIELEKI] = {gBackShinySprite1188RegielekiTiles, (64 * 64) / 2, SPECIES_REGIELEKI}, [SPECIES_REGIDRAGO] = {gBackShinySprite1189RegidragoTiles, (64 * 64) / 2, SPECIES_REGIDRAGO}, diff --git a/src/Base_Stats.c b/src/Base_Stats.c index 93c1f80..6df5ab0 100644 --- a/src/Base_Stats.c +++ b/src/Base_Stats.c @@ -38191,39 +38191,7 @@ const struct BaseStats gBaseStats[] = .noFlip = TRUE, }, -/* [SPECIES_UNKNOWN_MYTHICAL] = //PLACEHOLDER DATA - { - .baseHP = 100, - .baseAttack = 100, - .baseDefense = 100, - .baseSpAttack = 100, - .baseSpDefense = 100, - .baseSpeed = 100, - .type1 = TYPE_NORMAL, - .type2 = TYPE_NORMAL, - .catchRate = 255, - .expYield = 255, - .evYield_HP = 0, - .evYield_Attack = 0, - .evYield_Defense = 0, - .evYield_SpAttack = 0, - .evYield_SpDefense = 0, - .evYield_Speed = 0, - .item1 = ITEM_NONE, - .item2 = ITEM_NONE, - .genderRatio = MON_GENDERLESS, - .eggCycles = 120, - .friendship = 0, - .growthRate = GROWTH_SLOW, - .eggGroup1 = EGG_GROUP_UNDISCOVERED, - .eggGroup2 = EGG_GROUP_UNDISCOVERED, - .ability1 = ABILITY_PRESSURE, - .ability2 = ABILITY_NONE, - .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_NONE, - .noFlip = TRUE, - }, - +/* [SPECIES_CALYREX] = //PLACEHOLDER DATA { .baseHP = 100, diff --git a/src/Cry_Table.c b/src/Cry_Table.c index f41d22c..24f3b50 100644 --- a/src/Cry_Table.c +++ b/src/Cry_Table.c @@ -13926,18 +13926,6 @@ const struct ToneData gCryTable[NUM_SPECIES] = .sustain = 0xff, .release = 0x0, }, - [SPECIES_UNKNOWN_MYTHICAL] = - { - .type = 0x20, - .key = 0x3c, - .length = 0x0, - .pan_sweep = 0x0, - .wav = gCryUnknownMythical, - .attack = 0xff, - .decay = 0x0, - .sustain = 0xff, - .release = 0x0, - }, [SPECIES_CALYREX] = { .type = 0x20, diff --git a/src/Cry_Table_2.c b/src/Cry_Table_2.c index 5d05b34..3249059 100644 --- a/src/Cry_Table_2.c +++ b/src/Cry_Table_2.c @@ -13926,18 +13926,6 @@ const struct ToneData gCryTable2[NUM_SPECIES] = .sustain = 0xff, .release = 0x0, }, - [SPECIES_UNKNOWN_MYTHICAL] = - { - .type = 0x20, - .key = 0x3c, - .length = 0x0, - .pan_sweep = 0x0, - .wav = gCryUnknownMythical, - .attack = 0xff, - .decay = 0x0, - .sustain = 0xff, - .release = 0x0, - }, [SPECIES_CALYREX] = { .type = 0x20, diff --git a/src/Front_Pic_Table.c b/src/Front_Pic_Table.c index 7a0b794..5daba4d 100644 --- a/src/Front_Pic_Table.c +++ b/src/Front_Pic_Table.c @@ -1192,7 +1192,6 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES] = [SPECIES_KUBFU] = {gFrontSprite1183KubfuTiles, (64 * 64) / 2, SPECIES_KUBFU}, [SPECIES_URSHIFU_SINGLE] = {gFrontSprite1184UrshifuSingleTiles, (64 * 64) / 2, SPECIES_URSHIFU_SINGLE}, [SPECIES_ZARUDE] = {gFrontSprite1185ZarudeTiles, (64 * 64) / 2, SPECIES_ZARUDE}, - [SPECIES_UNKNOWN_MYTHICAL] = {gFrontSprite1186UnknownMythicalTiles, (64 * 64) / 2, SPECIES_UNKNOWN_MYTHICAL}, [SPECIES_CALYREX] = {gFrontSprite1187CalyrexTiles, (64 * 64) / 2, SPECIES_CALYREX}, [SPECIES_REGIELEKI] = {gFrontSprite1188RegielekiTiles, (64 * 64) / 2, SPECIES_REGIELEKI}, [SPECIES_REGIDRAGO] = {gFrontSprite1189RegidragoTiles, (64 * 64) / 2, SPECIES_REGIDRAGO}, diff --git a/src/Icon_Table.c b/src/Icon_Table.c index 1c9872c..253268a 100644 --- a/src/Icon_Table.c +++ b/src/Icon_Table.c @@ -1189,7 +1189,6 @@ const u8* const gMonIconTable[NUM_SPECIES] = [SPECIES_KUBFU] = gIconSprite1183KubfuTiles, [SPECIES_URSHIFU_SINGLE] = gIconSprite1184UrshifuSingleTiles, [SPECIES_ZARUDE] = gIconSprite1185ZarudeTiles, - [SPECIES_UNKNOWN_MYTHICAL] = gIconSprite1186UnknownMythicalTiles, [SPECIES_CALYREX] = gIconSprite1187CalyrexTiles, [SPECIES_REGIELEKI] = gIconSprite1188RegielekiTiles, [SPECIES_REGIDRAGO] = gIconSprite1189RegidragoTiles, diff --git a/src/Learnsets.c b/src/Learnsets.c index 4eec53e..6d14b7b 100644 --- a/src/Learnsets.c +++ b/src/Learnsets.c @@ -20126,8 +20126,7 @@ const struct LevelUpMove* const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_KUBFU] = sKubfuLevelUpLearnset, [SPECIES_URSHIFU_SINGLE] = sUrshifuLevelUpLearnset, [SPECIES_ZARUDE] = sZarudeLevelUpLearnset, -/* [SPECIES_UNKNOWN_MYTHICAL] = sUnknownMythicalLevelUpLearnset, - [SPECIES_CALYREX] = sCalyrexLevelUpLearnset, +/* [SPECIES_CALYREX] = sCalyrexLevelUpLearnset, [SPECIES_REGIELEKI] = sRegielekiLevelUpLearnset, [SPECIES_REGIDRAGO] = sRegidragoLevelUpLearnset,*/ [SPECIES_CRAMORANT_GULPING] = sCramorantLevelUpLearnset, diff --git a/src/Palette_Table.c b/src/Palette_Table.c index 68f3cec..f1ab7d0 100644 --- a/src/Palette_Table.c +++ b/src/Palette_Table.c @@ -1192,7 +1192,6 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES] = [SPECIES_KUBFU] = {gFrontSprite1183KubfuPal, SPECIES_KUBFU, 0x0}, [SPECIES_URSHIFU_SINGLE] = {gFrontSprite1184UrshifuSinglePal, SPECIES_URSHIFU_SINGLE, 0x0}, [SPECIES_ZARUDE] = {gFrontSprite1185ZarudePal, SPECIES_ZARUDE, 0x0}, - [SPECIES_UNKNOWN_MYTHICAL] = {gFrontSprite1186UnknownMythicalPal, SPECIES_UNKNOWN_MYTHICAL, 0x0}, [SPECIES_CALYREX] = {gFrontSprite1187CalyrexPal, SPECIES_CALYREX, 0x0}, [SPECIES_REGIELEKI] = {gFrontSprite1188RegielekiPal, SPECIES_REGIELEKI, 0x0}, [SPECIES_REGIDRAGO] = {gFrontSprite1189RegidragoPal, SPECIES_REGIDRAGO, 0x0}, diff --git a/src/Shiny_Palette_Table.c b/src/Shiny_Palette_Table.c index 689377a..eddf87f 100644 --- a/src/Shiny_Palette_Table.c +++ b/src/Shiny_Palette_Table.c @@ -1192,7 +1192,6 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES] = [SPECIES_KUBFU] = {gBackShinySprite1183KubfuPal, SPECIES_KUBFU + NUM_SPECIES, 0x0}, [SPECIES_URSHIFU_SINGLE] = {gBackShinySprite1184UrshifuSinglePal, SPECIES_URSHIFU_SINGLE + NUM_SPECIES, 0x0}, [SPECIES_ZARUDE] = {gBackShinySprite1185ZarudePal, SPECIES_ZARUDE + NUM_SPECIES, 0x0}, - [SPECIES_UNKNOWN_MYTHICAL] = {gBackShinySprite1186UnknownMythicalPal, SPECIES_UNKNOWN_MYTHICAL + NUM_SPECIES, 0x0}, [SPECIES_CALYREX] = {gBackShinySprite1187CalyrexPal, SPECIES_CALYREX + NUM_SPECIES, 0x0}, [SPECIES_REGIELEKI] = {gBackShinySprite1188RegielekiPal, SPECIES_REGIELEKI + NUM_SPECIES, 0x0}, [SPECIES_REGIDRAGO] = {gBackShinySprite1189RegidragoPal, SPECIES_REGIDRAGO + NUM_SPECIES, 0x0}, diff --git a/src/Species_To_Pokdex_Table.c b/src/Species_To_Pokdex_Table.c index c79ca07..d1a8527 100644 --- a/src/Species_To_Pokdex_Table.c +++ b/src/Species_To_Pokdex_Table.c @@ -1188,8 +1188,7 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES - 1] = [SPECIES_KUBFU - 1] = NATIONAL_DEX_KUBFU, [SPECIES_URSHIFU_SINGLE - 1] = NATIONAL_DEX_URSHIFU, [SPECIES_ZARUDE - 1] = NATIONAL_DEX_ZARUDE, -/* [SPECIES_UNKNOWN_MYTHICAL -1] = NATIONAL_DEX_UNKNOWN, - [SPECIES_CALYREX - 1] = NATIONAL_DEX_CALYREX, +/* [SPECIES_CALYREX - 1] = NATIONAL_DEX_CALYREX, [SPECIES_REGIELEKI - 1] = NATIONAL_DEX_REGIELEKI, [SPECIES_REGIDRAGO - 1] = NATIONAL_DEX_REGIDRAGO, */ [SPECIES_CRAMORANT_GULPING - 1] = NATIONAL_DEX_CRAMORANT,