Leahnaya/Dynamic-Pokemon-Expansion
1
0
Fork 0
mirror of https://github.com/Skeli789/Dynamic-Pokemon-Expansion.git synced 2026-09-07 17:45:33 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Evolutions + Necrozma Refs

Browse Source
This commit is contained in:
Skeli
2019-08-25 03:16:27 -04:00
parent d3d205eafc
commit 59069dc6d1
18 changed files with 66 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/items.h
View File

@@ -523,7 +523,7 @@
//Mega Stones
#define ITEM_MEGA_RING 0x161
#define ITEM_ULTRA_NECROZIUM_Z 0x1BD
#define ITEM_ULTRANECROZIUM_Z 0x1BD
#define ITEM_VENUSAURITE 0x1BE
#define ITEM_CHARIZARDITE_X 0x1BF
#define ITEM_CHARIZARDITE_Y 0x1C0
@@ -727,7 +727,7 @@ enum
ITEM_DRAGONIUM_Z,
ITEM_DARKINIUM_Z,
ITEM_FAIRIUM,
ITEM_ALORAICHUIUM_Z,
ITEM_ALORAICHIUM_Z,
ITEM_DECIDIUM_Z,
ITEM_EEVIUM_Z,
ITEM_INCINIUM_Z,

4
include/species.h
View File

@@ -1057,8 +1057,8 @@
#define SPECIES_STAKATAKA 0x434
#define SPECIES_BLACEPHALON 0x435
#define SPECIES_ZERAORA 0x436
#define SPECIES_NECROZMA_MANE 0x437
#define SPECIES_NECROZMA_WINGS 0x438
#define SPECIES_NECROZMA_DUSK_MANE 0x437
#define SPECIES_NECROZMA_DAWN_WINGS 0x438
#define SPECIES_NECROZMA_ULTRA 0x439
#define SPECIES_LYCANROC_DUSK 0x43A
#define SPECIES_MELTAN 0x43B

6
src/Back_Pic_Coords_Table.c
View File

@@ -3886,7 +3886,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES] =
[SPECIES_PYROAR] =
{
.size = 0x0,
.y_offset = 0x3,
.y_offset = 0x5,
},
[SPECIES_FLABEBE] =
{
@@ -5398,12 +5398,12 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES] =
.size = 0x0,
.y_offset = 0xb,
},
[SPECIES_NECROZMA_MANE] =
[SPECIES_NECROZMA_DUSK_MANE] =
{
.size = 0x0,
.y_offset = 0x1,
},
[SPECIES_NECROZMA_WINGS] =
[SPECIES_NECROZMA_DAWN_WINGS] =
{
.size = 0x0,
.y_offset = 0x2,

4
src/Back_Pic_Table.c
View File

@@ -1085,8 +1085,8 @@ const struct CompressedSpriteSheet gMonBackPicTable[NUM_SPECIES] =
[SPECIES_STAKATAKA] = {gBackShinySprite1076StakatakaTiles, (64 * 64) / 2, SPECIES_STAKATAKA},
[SPECIES_BLACEPHALON] = {gBackShinySprite1077BlacephalonTiles, (64 * 64) / 2, SPECIES_BLACEPHALON},
[SPECIES_ZERAORA] = {gBackShinySprite1078ZeraoraTiles, (64 * 64) / 2, SPECIES_ZERAORA},
[SPECIES_NECROZMA_MANE] = {gBackShinySprite1079NecrozmaManeTiles, (64 * 64) / 2, SPECIES_NECROZMA_MANE},
[SPECIES_NECROZMA_WINGS] = {gBackShinySprite1080NecrozmaWingsTiles, (64 * 64) / 2, SPECIES_NECROZMA_WINGS},
[SPECIES_NECROZMA_DUSK_MANE] = {gBackShinySprite1079NecrozmaManeTiles, (64 * 64) / 2, SPECIES_NECROZMA_DUSK_MANE},
[SPECIES_NECROZMA_DAWN_WINGS] = {gBackShinySprite1080NecrozmaWingsTiles, (64 * 64) / 2, SPECIES_NECROZMA_DAWN_WINGS},
[SPECIES_NECROZMA_ULTRA] = {gBackShinySprite1081NecrozmaUltraTiles, (64 * 64) / 2, SPECIES_NECROZMA_ULTRA},
[SPECIES_LYCANROC_DUSK] = {gBackShinySprite1082LycanrocDuskTiles, (64 * 64) / 2, SPECIES_LYCANROC_DUSK},
[SPECIES_MELTAN] = {gBackShinySprite1083MeltanTiles, (64 * 64) / 2, SPECIES_MELTAN},

6
src/Cry_Table.c
View File

@@ -10334,7 +10334,7 @@ const struct ToneData gCryTable[NUM_SPECIES] =
.key = 0x3c,
.length = 0x0,
.pan_sweep = 0x0,
.wav = (u8*) 0x85e5074,
.wav = (u8*) 0x85ea850,
.attack = 0xff,
.decay = 0x0,
.sustain = 0xff,
@@ -12644,7 +12644,7 @@ const struct ToneData gCryTable[NUM_SPECIES] =
.sustain = 0xff,
.release = 0x0,
},
[SPECIES_NECROZMA_MANE] =
[SPECIES_NECROZMA_DUSK_MANE] =
{
.type = 0x20,
.key = 0x3c,
@@ -12656,7 +12656,7 @@ const struct ToneData gCryTable[NUM_SPECIES] =
.sustain = 0xff,
.release = 0x0,
},
[SPECIES_NECROZMA_WINGS] =
[SPECIES_NECROZMA_DAWN_WINGS] =
{
.type = 0x20,
.key = 0x3c,

6
src/Cry_Table_2.c
View File

@@ -10332,7 +10332,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] =
.key = 0x3c,
.length = 0x0,
.pan_sweep = 0x0,
.wav = (u8*) 0x85e5074,
.wav = (u8*) 0x85ea850,
.attack = 0xff,
.decay = 0x0,
.sustain = 0xff,
@@ -12642,7 +12642,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] =
.sustain = 0xff,
.release = 0x0,
},
[SPECIES_NECROZMA_MANE] =
[SPECIES_NECROZMA_DUSK_MANE] =
{
.type = 0x30,
.key = 0x3c,
@@ -12654,7 +12654,7 @@ const struct ToneData gCryTable2[NUM_SPECIES] =
.sustain = 0xff,
.release = 0x0,
},
[SPECIES_NECROZMA_WINGS] =
[SPECIES_NECROZMA_DAWN_WINGS] =
{
.type = 0x30,
.key = 0x3c,

15
src/Enemy_Elevation_Table.c
View File

@@ -51,7 +51,7 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
[SPECIES_PARAS] = 0x0,
[SPECIES_PARASECT] = 0x0,
[SPECIES_VENONAT] = 0x0,
[SPECIES_VENOMOTH] = 0x8,
[SPECIES_VENOMOTH] = 0xa,
[SPECIES_DIGLETT] = 0x0,
[SPECIES_DUGTRIO] = 0x0,
[SPECIES_MEOWTH] = 0x0,
@@ -307,7 +307,7 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
[SPECIES_NINJASK] = 0xe,
[SPECIES_SHEDINJA] = 0xe,
[SPECIES_TAILLOW] = 0x0,
[SPECIES_SWELLOW] = 0x0,
[SPECIES_SWELLOW] = 0x7,
[SPECIES_SHROOMISH] = 0x0,
[SPECIES_BRELOOM] = 0x0,
[SPECIES_SPINDA] = 0x0,
@@ -335,7 +335,7 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
[SPECIES_CARVANHA] = 0x0,
[SPECIES_SHARPEDO] = 0x0,
[SPECIES_TRAPINCH] = 0x0,
[SPECIES_VIBRAVA] = 0x0,
[SPECIES_VIBRAVA] = 0xa,
[SPECIES_FLYGON] = 0x7,
[SPECIES_MAKUHITA] = 0x0,
[SPECIES_HARIYAMA] = 0x0,
@@ -572,8 +572,8 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
[SPECIES_SIMISEAR] = 0x0,
[SPECIES_PANPOUR] = 0x0,
[SPECIES_SIMIPOUR] = 0x0,
[SPECIES_MUNNA] = 0x0,
[SPECIES_MUSHARNA] = 0x0,
[SPECIES_MUNNA] = 0xa,
[SPECIES_MUSHARNA] = 0xa,
[SPECIES_PIDOVE] = 0x0,
[SPECIES_TRANQUILL] = 0x0,
[SPECIES_UNFEZANT] = 0x0,
@@ -1081,8 +1081,8 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
[SPECIES_STAKATAKA] = 0x0,
[SPECIES_BLACEPHALON] = 0x0,
[SPECIES_ZERAORA] = 0x0,
[SPECIES_NECROZMA_MANE] = 0x0,
[SPECIES_NECROZMA_WINGS] = 0x6,
[SPECIES_NECROZMA_DUSK_MANE] = 0x0,
[SPECIES_NECROZMA_DAWN_WINGS] = 0x6,
[SPECIES_NECROZMA_ULTRA] = 0x6,
[SPECIES_LYCANROC_DUSK] = 0x0,
[SPECIES_MELTAN] = 0x0,
@@ -1105,3 +1105,4 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
[SPECIES_PICHU_SPIKY] = 0x0,
[SPECIES_XERNEAS_NATURAL] = 0x0,
};

37
src/Evolution Table.c
View File

@@ -4,6 +4,8 @@
#include "../include/evolution.h"
#include "../include/base_stats.h"
#define TIME_RANGE(startTime, endTime) ((startTime << 8) | endTime)
const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
{
[SPECIES_BULBASAUR] = {{EVO_LEVEL, 16, SPECIES_IVYSAUR, 0}},
@@ -87,13 +89,13 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_VOLTORB] = {{EVO_LEVEL, 30, SPECIES_ELECTRODE, 0}},
[SPECIES_EXEGGCUTE] = {{EVO_ITEM, ITEM_LEAF_STONE, SPECIES_EXEGGUTOR, 0}},
[SPECIES_CUBONE] = {{EVO_LEVEL, 28, SPECIES_MAROWAK, 0}},
[SPECIES_LICKITUNG] = {{EVO_MOVE, 205, SPECIES_LICKILICKY, 0}},
[SPECIES_LICKITUNG] = {{EVO_MOVE, MOVE_ROLLOUT, SPECIES_LICKILICKY, 0}},
[SPECIES_KOFFING] = {{EVO_LEVEL, 35, SPECIES_WEEZING, 0}},
[SPECIES_RHYHORN] = {{EVO_LEVEL, 42, SPECIES_RHYDON, 0}},
[SPECIES_RHYDON] = {{EVO_ITEM, ITEM_BIG_NUGGET, SPECIES_RHYPERIOR, 0},
{EVO_TRADE_ITEM, ITEM_BIG_NUGGET, SPECIES_RHYPERIOR, 0}},
[SPECIES_CHANSEY] = {{EVO_FRIENDSHIP, 0, SPECIES_BLISSEY, 0}},
[SPECIES_TANGELA] = {{EVO_LEVEL, 37, SPECIES_SLOWBRO, 0}},
[SPECIES_TANGELA] = {{EVO_MOVE, MOVE_ANCIENTPOWER, SPECIES_TANGROWTH, 0}},
[SPECIES_KANGASKHAN] = {{EVO_MEGA, ITEM_KANGASKHANITE, SPECIES_KANGASKHAN_MEGA, MEGA_VARIANT_STANDARD}},
[SPECIES_HORSEA] = {{EVO_LEVEL, 32, SPECIES_SEADRA, 0}},
[SPECIES_SEADRA] = {{EVO_TRADE_ITEM, ITEM_DRAGON_SCALE, SPECIES_KINGDRA, 0},
@@ -141,6 +143,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_CLEFFA] = {{EVO_FRIENDSHIP, 0, SPECIES_CLEFAIRY, 0}},
[SPECIES_IGGLYBUFF] = {{EVO_FRIENDSHIP, 0, SPECIES_JIGGLYPUFF, 0}},
[SPECIES_TOGEPI] = {{EVO_FRIENDSHIP, 0, SPECIES_TOGETIC, 0}},
[SPECIES_TOGETIC] = {{EVO_ITEM, ITEM_SHINY_STONE, SPECIES_TOGEKISS, 0}},
[SPECIES_NATU] = {{EVO_LEVEL, 25, SPECIES_XATU, 0}},
[SPECIES_MAREEP] = {{EVO_LEVEL, 15, SPECIES_FLAAFFY, 0}},
[SPECIES_FLAAFFY] = {{EVO_LEVEL, 30, SPECIES_AMPHAROS, 0}},
@@ -148,9 +151,9 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_MARILL] = {{EVO_LEVEL, 18, SPECIES_AZUMARILL, 0}},
[SPECIES_HOPPIP] = {{EVO_LEVEL, 18, SPECIES_SKIPLOOM, 0}},
[SPECIES_SKIPLOOM] = {{EVO_LEVEL, 27, SPECIES_JUMPLUFF, 0}},
[SPECIES_AIPOM] = {{EVO_MOVE, 438, SPECIES_AMBIPOM, 0}},
[SPECIES_AIPOM] = {{EVO_MOVE, MOVE_DOUBLEHIT, SPECIES_AMBIPOM, 0}},
[SPECIES_SUNKERN] = {{EVO_ITEM, ITEM_SUN_STONE, SPECIES_SUNFLORA, 0}},
[SPECIES_YANMA] = {{EVO_MOVE, 246, SPECIES_YANMEGA, 0}},
[SPECIES_YANMA] = {{EVO_MOVE, MOVE_ANCIENTPOWER, SPECIES_YANMEGA, 0}},
[SPECIES_WOOPER] = {{EVO_LEVEL, 20, SPECIES_QUAGSIRE, 0}},
[SPECIES_MURKROW] = {{EVO_ITEM, ITEM_DUSK_STONE, SPECIES_HONCHKROW, 0}},
[SPECIES_MISDREAVUS] = {{EVO_ITEM, ITEM_036, SPECIES_MISMAGIUS, 0}},
@@ -160,10 +163,11 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_SNUBBULL] = {{EVO_LEVEL, 23, SPECIES_GRANBULL, 0}},
[SPECIES_SCIZOR] = {{EVO_MEGA, ITEM_SCIZORITE, SPECIES_SCIZOR_MEGA, MEGA_VARIANT_STANDARD}},
[SPECIES_HERACROSS] = {{EVO_MEGA, ITEM_HERACRONITE, SPECIES_HERACROSS_MEGA, MEGA_VARIANT_STANDARD}},
[SPECIES_SNEASEL] = {{EVO_HOLD_ITEM_NIGHT, ITEM_RAZOR_CLAW, SPECIES_WEAVILE, 0}},
[SPECIES_TEDDIURSA] = {{EVO_LEVEL, 30, SPECIES_URSARING, 0}},
[SPECIES_SLUGMA] = {{EVO_LEVEL, 38, SPECIES_MAGCARGO, 0}},
[SPECIES_SWINUB] = {{EVO_LEVEL, 33, SPECIES_PILOSWINE, 0}},
[SPECIES_PILOSWINE] = {{EVO_MOVE, 246, SPECIES_MAMOSWINE, 0}},
[SPECIES_PILOSWINE] = {{EVO_MOVE, MOVE_ANCIENTPOWER, SPECIES_MAMOSWINE, 0}},
[SPECIES_REMORAID] = {{EVO_LEVEL, 25, SPECIES_OCTILLERY, 0}},
[SPECIES_HOUNDOUR] = {{EVO_LEVEL, 24, SPECIES_HOUNDOOM, 0}},
[SPECIES_HOUNDOOM] = {{EVO_MEGA, ITEM_HOUNDOOMINITE, SPECIES_HOUNDOOM_MEGA, MEGA_VARIANT_STANDARD}},
@@ -301,8 +305,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_CHINGLING] = {{EVO_FRIENDSHIP_NIGHT, 0, SPECIES_CHIMECHO, 0}},
[SPECIES_STUNKY] = {{EVO_LEVEL, 34, SPECIES_SKUNTANK, 0}},
[SPECIES_BRONZOR] = {{EVO_LEVEL, 33, SPECIES_BRONZONG, 0}},
[SPECIES_BONSLY] = {{EVO_MOVE, 102, SPECIES_SUDOWOODO, 0}},
[SPECIES_MIME_JR] = {{EVO_MOVE, 102, SPECIES_MR_MIME, 0}},
[SPECIES_BONSLY] = {{EVO_MOVE, MOVE_MIMIC, SPECIES_SUDOWOODO, 0}},
[SPECIES_MIME_JR] = {{EVO_MOVE, MOVE_MIMIC, SPECIES_MR_MIME, 0}},
[SPECIES_HAPPINY] = {{EVO_HOLD_ITEM_DAY, ITEM_OVAL_STONE, SPECIES_CHANSEY, 0}},
[SPECIES_GIBLE] = {{EVO_LEVEL, 24, SPECIES_GABITE, 0}},
[SPECIES_GABITE] = {{EVO_LEVEL, 48, SPECIES_GARCHOMP, 0}},
@@ -510,7 +514,6 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_GALLADE_MEGA] = {{EVO_MEGA, ITEM_NONE, SPECIES_GALLADE, MEGA_VARIANT_STANDARD}},
[SPECIES_AUDINO_MEGA] = {{EVO_MEGA, ITEM_NONE, SPECIES_AUDINO, MEGA_VARIANT_STANDARD}},
[SPECIES_DIANCIE_MEGA] = {{EVO_MEGA, ITEM_NONE, SPECIES_DIANCIE, MEGA_VARIANT_STANDARD}},
[SPECIES_VIVILLON_ELEGANT] = {{EVO_MEGA, ITEM_NONE, SPECIES_TALONFLAME, MEGA_VARIANT_STANDARD}},
[SPECIES_ROWLET] = {{EVO_LEVEL, 17, SPECIES_DARTRIX, 0}},
[SPECIES_DARTRIX] = {{EVO_LEVEL, 34, SPECIES_DECIDUEYE, 0}},
[SPECIES_LITTEN] = {{EVO_LEVEL, 17, SPECIES_TORRACAT, 0}},
@@ -526,8 +529,9 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
{EVO_MAP, MAP_NAME_ROUTE_8, SPECIES_NONE, 0},
{EVO_MAP, MAP_NAME_BLIZZARD_CITY, SPECIES_NONE, 0}},
[SPECIES_CUTIEFLY] = {{EVO_LEVEL, 25, SPECIES_RIBOMBEE, 0}},
[SPECIES_ROCKRUFF] = {{EVO_LEVEL_DAY, 25, SPECIES_LYCANROC, 0},
{EVO_LEVEL_NIGHT, 25, SPECIES_LYCANROC_N, 0}},
[SPECIES_ROCKRUFF] = {{EVO_LEVEL_SPECIFIC_TIME_RANGE, 25, SPECIES_LYCANROC_DUSK, TIME_RANGE(17, 20)}, //5 PM - 7:59 PM
{EVO_LEVEL_DAY, 25, SPECIES_LYCANROC, 0},
{EVO_LEVEL_NIGHT, 25, SPECIES_LYCANROC_N, 0}},
[SPECIES_MAREANIE] = {{EVO_LEVEL, 38, SPECIES_TOXAPEX, 0}},
[SPECIES_MUDBRAY] = {{EVO_LEVEL, 30, SPECIES_MUDSDALE, 0}},
[SPECIES_DEWPIDER] = {{EVO_LEVEL, 22, SPECIES_ARAQUANID, 0}},
@@ -536,7 +540,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_SALANDIT] = {{EVO_FEMALE_LEVEL, 33, SPECIES_SALAZZLE, 0}},
[SPECIES_STUFFUL] = {{EVO_LEVEL, 27, SPECIES_BEWEAR, 0}},
[SPECIES_BOUNSWEET] = {{EVO_LEVEL, 18, SPECIES_STEENEE, 0}},
[SPECIES_STEENEE] = {{EVO_MOVE, 23, SPECIES_TSAREENA, 0}},
[SPECIES_STEENEE] = {{EVO_MOVE, MOVE_STOMP, SPECIES_TSAREENA, 0}},
[SPECIES_WIMPOD] = {{EVO_LEVEL, 30, SPECIES_GOLISOPOD, 0}},
[SPECIES_SANDYGAST] = {{EVO_LEVEL, 42, SPECIES_PALOSSAND, 0}},
[SPECIES_TYPE_NULL] = {{EVO_FRIENDSHIP, 0, SPECIES_SILVALLY, 0}},
@@ -545,6 +549,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_COSMOG] = {{EVO_LEVEL, 43, SPECIES_COSMOEM, 0}},
[SPECIES_COSMOEM] = {{EVO_LEVEL_DAY, 53, SPECIES_SOLGALEO, 0},
{EVO_LEVEL_NIGHT, 53, SPECIES_LUNALA, 0}},
[SPECIES_RATTATA_A] = {{EVO_LEVEL_NIGHT, 20, SPECIES_RATICATE_A, 0}},
[SPECIES_SANDSHREW_A] = {{EVO_ITEM, ITEM_ICE_STONE, SPECIES_SANDSLASH_A, 0}},
[SPECIES_VULPIX_A] = {{EVO_ITEM, ITEM_ICE_STONE, SPECIES_NINETALES_A, 0}},
[SPECIES_DIGLETT_A] = {{EVO_LEVEL, 26, SPECIES_DUGTRIO_A, 0}},
@@ -555,10 +560,10 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_GRIMER_A] = {{EVO_LEVEL, 38, SPECIES_MUK_A, 0}},
[SPECIES_EXEGGCUTE_A] = {{EVO_ITEM, ITEM_LEAF_STONE, SPECIES_EXEGGUTOR_A, 0}},
[SPECIES_CUBONE_A] = {{EVO_LEVEL_NIGHT, 28, SPECIES_MAROWAK_A, 0}},
[SPECIES_POIPOLE] = {{EVO_MOVE, 370, SPECIES_NAGANADEL, 0}},
[SPECIES_NECROZMA_MANE] = {{EVO_MEGA, ITEM_ULTRA_NECROZIUM_Z, SPECIES_NECROZMA_ULTRA, MEGA_VARIANT_ULTRA_BURST}},
[SPECIES_NECROZMA_WINGS] = {{EVO_MEGA, ITEM_ULTRA_NECROZIUM_Z, SPECIES_NECROZMA_ULTRA, MEGA_VARIANT_ULTRA_BURST}},
[SPECIES_NECROZMA_ULTRA] = {{EVO_MEGA, ITEM_NONE, SPECIES_NECROZMA_MANE, MEGA_VARIANT_ULTRA_BURST},
{EVO_MEGA, ITEM_NONE, SPECIES_NECROZMA_WINGS, MEGA_VARIANT_ULTRA_BURST}},
[SPECIES_POIPOLE] = {{EVO_MOVE, MOVE_DRAGONPULSE, SPECIES_NAGANADEL, 0}},
[SPECIES_NECROZMA_DUSK_MANE] = {{EVO_MEGA, ITEM_ULTRANECROZIUM_Z, SPECIES_NECROZMA_ULTRA, MEGA_VARIANT_ULTRA_BURST}},
[SPECIES_NECROZMA_DAWN_WINGS] = {{EVO_MEGA, ITEM_ULTRANECROZIUM_Z, SPECIES_NECROZMA_ULTRA, MEGA_VARIANT_ULTRA_BURST}},
[SPECIES_NECROZMA_ULTRA] = {{EVO_MEGA, ITEM_NONE, SPECIES_NECROZMA_DUSK_MANE, MEGA_VARIANT_ULTRA_BURST},
{EVO_MEGA, ITEM_NONE, SPECIES_NECROZMA_DAWN_WINGS, MEGA_VARIANT_ULTRA_BURST}},
[SPECIES_MELTAN] = {{EVO_ITEM, ITEM_METAL_COAT, SPECIES_MELMETAL, 0}},
};

4
src/Front_Pic_Coords_Table.c
View File

@@ -5398,12 +5398,12 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES] =
.size = 0x0,
.y_offset = 0x4,
},
[SPECIES_NECROZMA_MANE] =
[SPECIES_NECROZMA_DUSK_MANE] =
{
.size = 0x0,
.y_offset = 0x0,
},
[SPECIES_NECROZMA_WINGS] =
[SPECIES_NECROZMA_DAWN_WINGS] =
{
.size = 0x0,
.y_offset = 0x0,

4
src/Front_Pic_Table.c
View File

@@ -1085,8 +1085,8 @@ const struct CompressedSpriteSheet gMonFrontPicTable[NUM_SPECIES] =
[SPECIES_STAKATAKA] = {gFrontSprite1076StakatakaTiles, (64 * 64) / 2, SPECIES_STAKATAKA},
[SPECIES_BLACEPHALON] = {gFrontSprite1077BlacephalonTiles, (64 * 64) / 2, SPECIES_BLACEPHALON},
[SPECIES_ZERAORA] = {gFrontSprite1078ZeraoraTiles, (64 * 64) / 2, SPECIES_ZERAORA},
[SPECIES_NECROZMA_MANE] = {gFrontSprite1079NecrozmaManeTiles, (64 * 64) / 2, SPECIES_NECROZMA_MANE},
[SPECIES_NECROZMA_WINGS] = {gFrontSprite1080NecrozmaWingsTiles, (64 * 64) / 2, SPECIES_NECROZMA_WINGS},
[SPECIES_NECROZMA_DUSK_MANE] = {gFrontSprite1079NecrozmaManeTiles, (64 * 64) / 2, SPECIES_NECROZMA_DUSK_MANE},
[SPECIES_NECROZMA_DAWN_WINGS] = {gFrontSprite1080NecrozmaWingsTiles, (64 * 64) / 2, SPECIES_NECROZMA_DAWN_WINGS},
[SPECIES_NECROZMA_ULTRA] = {gFrontSprite1081NecrozmaUltraTiles, (64 * 64) / 2, SPECIES_NECROZMA_ULTRA},
[SPECIES_LYCANROC_DUSK] = {gFrontSprite1082LycanrocDuskTiles, (64 * 64) / 2, SPECIES_LYCANROC_DUSK},
[SPECIES_MELTAN] = {gFrontSprite1083MeltanTiles, (64 * 64) / 2, SPECIES_MELTAN},

4
src/Habitat_Table.c
View File

@@ -2081,8 +2081,8 @@ const u16 gRarePage17[] =
const u16 gRarePage18[] =
{
SPECIES_NECROZMA,
SPECIES_NECROZMA_MANE,
SPECIES_NECROZMA_WINGS,
SPECIES_NECROZMA_DUSK_MANE,
SPECIES_NECROZMA_DAWN_WINGS,
SPECIES_NECROZMA_ULTRA,
};

4
src/Icon_Palette_Table.c
View File

@@ -1081,8 +1081,8 @@ const u8 gMonIconPaletteIndices[NUM_SPECIES] =
[SPECIES_STAKATAKA] = 0x0,
[SPECIES_BLACEPHALON] = 0x0,
[SPECIES_ZERAORA] = 0x0,
[SPECIES_NECROZMA_MANE] = 0x0,
[SPECIES_NECROZMA_WINGS] = 0x0,
[SPECIES_NECROZMA_DUSK_MANE] = 0x0,
[SPECIES_NECROZMA_DAWN_WINGS] = 0x0,
[SPECIES_NECROZMA_ULTRA] = 0x2,
[SPECIES_LYCANROC_DUSK] = 0x0,
[SPECIES_MELTAN] = 0x2,

4
src/Icon_Table.c
View File

@@ -1082,8 +1082,8 @@ const u8* const gMonIconTable[NUM_SPECIES] =
[SPECIES_STAKATAKA] = gIconSprite1076StakatakaTiles,
[SPECIES_BLACEPHALON] = gIconSprite1077BlacephalonTiles,
[SPECIES_ZERAORA] = gIconSprite1078ZeraoraTiles,
[SPECIES_NECROZMA_MANE] = gIconSprite1079NecrozmaManeTiles,
[SPECIES_NECROZMA_WINGS] = gIconSprite1080NecrozmaWingsTiles,
[SPECIES_NECROZMA_DUSK_MANE] = gIconSprite1079NecrozmaManeTiles,
[SPECIES_NECROZMA_DAWN_WINGS] = gIconSprite1080NecrozmaWingsTiles,
[SPECIES_NECROZMA_ULTRA] = gIconSprite1081NecrozmaUltraTiles,
[SPECIES_LYCANROC_DUSK] = gIconSprite1082LycanrocDuskTiles,
[SPECIES_MELTAN] = gIconSprite1083MeltanTiles,

4
src/Item_Animation_Table.c
View File

@@ -1090,8 +1090,8 @@ const struct ItemAnimation gItemAnimationTable[NUM_SPECIES] =
[SPECIES_STAKATAKA] = {0x0, 0x0, 0x0, 0x0, 0x0},
[SPECIES_BLACEPHALON] = {0x0, 0x0, 0x0, 0x0, 0x0},
[SPECIES_ZERAORA] = {0x0, 0x0, 0x0, 0x0, 0x0},
[SPECIES_NECROZMA_MANE] = {0x0, 0x0, 0x0, 0x0, 0x0},
[SPECIES_NECROZMA_WINGS] = {0x0, 0x0, 0x0, 0x0, 0x0},
[SPECIES_NECROZMA_DUSK_MANE] = {0x0, 0x0, 0x0, 0x0, 0x0},
[SPECIES_NECROZMA_DAWN_WINGS] = {0x0, 0x0, 0x0, 0x0, 0x0},
[SPECIES_NECROZMA_ULTRA] = {0x0, 0x0, 0x0, 0x0, 0x0},
[SPECIES_LYCANROC_DUSK] = {0x0, 0x0, 0x0, 0x0, 0x0},
[SPECIES_MELTAN] = {0x0, 0x0, 0x0, 0x0, 0x0},

4
src/Learnsets.c
View File

@@ -18132,8 +18132,8 @@ const struct LevelUpMove* const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_STAKATAKA] = sStakatakaLevelUpLearnset,
[SPECIES_BLACEPHALON] = sBlacephalonLevelUpLearnset,
[SPECIES_ZERAORA] = sZeraoraLevelUpLearnset,
[SPECIES_NECROZMA_MANE] = sNecrozmaLevelUpLearnset,
[SPECIES_NECROZMA_WINGS] = sNecrozmaLevelUpLearnset,
[SPECIES_NECROZMA_DUSK_MANE] = sNecrozmaLevelUpLearnset,
[SPECIES_NECROZMA_DAWN_WINGS] = sNecrozmaLevelUpLearnset,
[SPECIES_NECROZMA_ULTRA] = sNecrozmaLevelUpLearnset,
[SPECIES_LYCANROC_DUSK] = sLycanrocDuskLevelUpLearnset,
[SPECIES_MELTAN] = sMeltanLevelUpLearnset,

4
src/Palette_Table.c
View File

@@ -1085,8 +1085,8 @@ const struct CompressedSpritePalette gMonPaletteTable[NUM_SPECIES] =
[SPECIES_STAKATAKA] = {gFrontSprite1076StakatakaPal, SPECIES_STAKATAKA, 0x0},
[SPECIES_BLACEPHALON] = {gFrontSprite1077BlacephalonPal, SPECIES_BLACEPHALON, 0x0},
[SPECIES_ZERAORA] = {gFrontSprite1078ZeraoraPal, SPECIES_ZERAORA, 0x0},
[SPECIES_NECROZMA_MANE] = {gFrontSprite1079NecrozmaManePal, SPECIES_NECROZMA_MANE, 0x0},
[SPECIES_NECROZMA_WINGS] = {gFrontSprite1080NecrozmaWingsPal, SPECIES_NECROZMA_WINGS, 0x0},
[SPECIES_NECROZMA_DUSK_MANE] = {gFrontSprite1079NecrozmaManePal, SPECIES_NECROZMA_DUSK_MANE, 0x0},
[SPECIES_NECROZMA_DAWN_WINGS] = {gFrontSprite1080NecrozmaWingsPal, SPECIES_NECROZMA_DAWN_WINGS, 0x0},
[SPECIES_NECROZMA_ULTRA] = {gFrontSprite1081NecrozmaUltraPal, SPECIES_NECROZMA_ULTRA, 0x0},
[SPECIES_LYCANROC_DUSK] = {gFrontSprite1082LycanrocDuskPal, SPECIES_LYCANROC_DUSK, 0x0},
[SPECIES_MELTAN] = {gFrontSprite1083MeltanPal, SPECIES_MELTAN, 0x0},

4
src/Shiny_Palette_Table.c
View File

@@ -1085,8 +1085,8 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[NUM_SPECIES] =
[SPECIES_STAKATAKA] = {gBackShinySprite1076StakatakaPal, SPECIES_STAKATAKA + NUM_SPECIES, 0x0},
[SPECIES_BLACEPHALON] = {gBackShinySprite1077BlacephalonPal, SPECIES_BLACEPHALON + NUM_SPECIES, 0x0},
[SPECIES_ZERAORA] = {gBackShinySprite1078ZeraoraPal, SPECIES_ZERAORA + NUM_SPECIES, 0x0},
[SPECIES_NECROZMA_MANE] = {gBackShinySprite1079NecrozmaManePal, SPECIES_NECROZMA_MANE + NUM_SPECIES, 0x0},
[SPECIES_NECROZMA_WINGS] = {gBackShinySprite1080NecrozmaWingsPal, SPECIES_NECROZMA_WINGS + NUM_SPECIES, 0x0},
[SPECIES_NECROZMA_DUSK_MANE] = {gBackShinySprite1079NecrozmaManePal, SPECIES_NECROZMA_DUSK_MANE + NUM_SPECIES, 0x0},
[SPECIES_NECROZMA_DAWN_WINGS] = {gBackShinySprite1080NecrozmaWingsPal, SPECIES_NECROZMA_DAWN_WINGS + NUM_SPECIES, 0x0},
[SPECIES_NECROZMA_ULTRA] = {gBackShinySprite1081NecrozmaUltraPal, SPECIES_NECROZMA_ULTRA + NUM_SPECIES, 0x0},
[SPECIES_LYCANROC_DUSK] = {gBackShinySprite1082LycanrocDuskPal, SPECIES_LYCANROC_DUSK + NUM_SPECIES, 0x0},
[SPECIES_MELTAN] = {gBackShinySprite1083MeltanPal, SPECIES_MELTAN + NUM_SPECIES, 0x0},

8
src/Species_To_Pokdex_Table.c
View File

@@ -911,8 +911,8 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES - 1] =
[SPECIES_METAGROSS_MEGA - 1] = NATIONAL_DEX_METAGROSS,
[SPECIES_LATIAS_MEGA - 1] = NATIONAL_DEX_LATIAS,
[SPECIES_LATIOS_MEGA - 1] = NATIONAL_DEX_LATIOS,
[SPECIES_GROUDON_PRIMAL - 1] = NATIONAL_DEX_KYOGRE,
[SPECIES_KYOGRE_PRIMAL - 1] = NATIONAL_DEX_GROUDON,
[SPECIES_GROUDON_PRIMAL - 1] = NATIONAL_DEX_GROUDON,
[SPECIES_KYOGRE_PRIMAL - 1] = NATIONAL_DEX_KYOGRE,
[SPECIES_RAYQUAZA_MEGA - 1] = NATIONAL_DEX_RAYQUAZA,
[SPECIES_LOPUNNY_MEGA - 1] = NATIONAL_DEX_LOPUNNY,
[SPECIES_GARCHOMP_MEGA - 1] = NATIONAL_DEX_GARCHOMP,
@@ -1081,8 +1081,8 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES - 1] =
[SPECIES_STAKATAKA - 1] = NATIONAL_DEX_STAKATAKA,
[SPECIES_BLACEPHALON - 1] = NATIONAL_DEX_BLACEPHALON,
[SPECIES_ZERAORA - 1] = NATIONAL_DEX_ZERAORA,
[SPECIES_NECROZMA_MANE - 1] = NATIONAL_DEX_NECROZMA,
[SPECIES_NECROZMA_WINGS - 1] = NATIONAL_DEX_NECROZMA,
[SPECIES_NECROZMA_DUSK_MANE - 1] = NATIONAL_DEX_NECROZMA,
[SPECIES_NECROZMA_DAWN_WINGS - 1] = NATIONAL_DEX_NECROZMA,
[SPECIES_NECROZMA_ULTRA - 1] = NATIONAL_DEX_NECROZMA,
[SPECIES_LYCANROC_DUSK - 1] = NATIONAL_DEX_LYCANROC,
[SPECIES_MELTAN - 1] = NATIONAL_DEX_MELTAN,