mirror of
https://github.com/Skeli789/Dynamic-Pokemon-Expansion.git
synced 2026-04-22 00:07:24 -05:00
Add Crown Tundra Base
+Fix some tms/tutors
This commit is contained in:
Skeli
parent
338dd15368
commit
a2a9474ba6
321
include/moves.h
321
include/moves.h
|
|
@ -742,172 +742,175 @@
|
|||
#define MOVE_FREEZINGGLARE 0x2DF
|
||||
#define MOVE_THUNDEROUSKICK 0x2E0
|
||||
#define MOVE_FIERYWRATH 0x2E1
|
||||
#define MOVE_THUNDERCAGE 0x2E2
|
||||
#define MOVE_DRAGONENERGY 0x2E3
|
||||
#define MOVE_EERIESPELL 0x2E2
|
||||
#define MOVE_THUNDERCAGE 0x2E3
|
||||
#define MOVE_DRAGONENERGY 0x2E4
|
||||
#define MOVE_ASTRALBARRAGE 0x2E5
|
||||
#define MOVE_GLACIALLANCE 0x2E6
|
||||
|
||||
//Z-Moves
|
||||
#define MOVE_BREAKNECK_BLITZ_P 0x2E4
|
||||
#define MOVE_BREAKNECK_BLITZ_S 0x2E5
|
||||
#define MOVE_ALL_OUT_PUMMELING_P 0x2E6
|
||||
#define MOVE_ALL_OUT_PUMMELING_S 0x2E7
|
||||
#define MOVE_SUPERSONIC_SKYSTRIKE_P 0x2E8
|
||||
#define MOVE_SUPERSONIC_SKYSTRIKE_S 0x2E9
|
||||
#define MOVE_ACID_DOWNPOUR_P 0x2EA
|
||||
#define MOVE_ACID_DOWNPOUR_S 0x2EB
|
||||
#define MOVE_TECTONIC_RAGE_P 0x2EC
|
||||
#define MOVE_TECTONIC_RAGE_S 0x2ED
|
||||
#define MOVE_CONTINENTAL_CRUSH_P 0x2EE
|
||||
#define MOVE_CONTINENTAL_CRUSH_S 0x2EF
|
||||
#define MOVE_SAVAGE_SPIN_OUT_P 0x2F0
|
||||
#define MOVE_SAVAGE_SPIN_OUT_S 0x2F1
|
||||
#define MOVE_NEVER_ENDING_NIGHTMARE_P 0x2F2
|
||||
#define MOVE_NEVER_ENDING_NIGHTMARE_S 0x2F3
|
||||
#define MOVE_CORKSCREW_CRASH_P 0x2F4
|
||||
#define MOVE_CORKSCREW_CRASH_S 0x2F5
|
||||
#define MOVE_INFERNO_OVERDRIVE_P 0x2F6
|
||||
#define MOVE_INFERNO_OVERDRIVE_S 0x2F7
|
||||
#define MOVE_HYDRO_VORTEX_P 0x2F8
|
||||
#define MOVE_HYDRO_VORTEX_S 0x2F9
|
||||
#define MOVE_BLOOM_DOOM_P 0x2FA
|
||||
#define MOVE_BLOOM_DOOM_S 0x2FB
|
||||
#define MOVE_GIGAVOLT_HAVOC_P 0x2FC
|
||||
#define MOVE_GIGAVOLT_HAVOC_S 0x2FD
|
||||
#define MOVE_SHATTERED_PSYCHE_P 0x2FE
|
||||
#define MOVE_SHATTERED_PSYCHE_S 0x2FF
|
||||
#define MOVE_SUBZERO_SLAMMER_P 0x300
|
||||
#define MOVE_SUBZERO_SLAMMER_S 0x301
|
||||
#define MOVE_DEVASTATING_DRAKE_P 0x302
|
||||
#define MOVE_DEVASTATING_DRAKE_S 0x303
|
||||
#define MOVE_BLACK_HOLE_ECLIPSE_P 0x304
|
||||
#define MOVE_BLACK_HOLE_ECLIPSE_S 0x305
|
||||
#define MOVE_TWINKLE_TACKLE_P 0x306
|
||||
#define MOVE_TWINKLE_TACKLE_S 0x307
|
||||
#define MOVE_BREAKNECK_BLITZ_P 0x2E7
|
||||
#define MOVE_BREAKNECK_BLITZ_S 0x2E8
|
||||
#define MOVE_ALL_OUT_PUMMELING_P 0x2E9
|
||||
#define MOVE_ALL_OUT_PUMMELING_S 0x2EA
|
||||
#define MOVE_SUPERSONIC_SKYSTRIKE_P 0x2EB
|
||||
#define MOVE_SUPERSONIC_SKYSTRIKE_S 0x2EC
|
||||
#define MOVE_ACID_DOWNPOUR_P 0x2ED
|
||||
#define MOVE_ACID_DOWNPOUR_S 0x2EE
|
||||
#define MOVE_TECTONIC_RAGE_P 0x2EF
|
||||
#define MOVE_TECTONIC_RAGE_S 0x2F0
|
||||
#define MOVE_CONTINENTAL_CRUSH_P 0x2F1
|
||||
#define MOVE_CONTINENTAL_CRUSH_S 0x2F2
|
||||
#define MOVE_SAVAGE_SPIN_OUT_P 0x2F3
|
||||
#define MOVE_SAVAGE_SPIN_OUT_S 0x2F4
|
||||
#define MOVE_NEVER_ENDING_NIGHTMARE_P 0x2F5
|
||||
#define MOVE_NEVER_ENDING_NIGHTMARE_S 0x2F6
|
||||
#define MOVE_CORKSCREW_CRASH_P 0x2F7
|
||||
#define MOVE_CORKSCREW_CRASH_S 0x2F8
|
||||
#define MOVE_INFERNO_OVERDRIVE_P 0x2F9
|
||||
#define MOVE_INFERNO_OVERDRIVE_S 0x2FA
|
||||
#define MOVE_HYDRO_VORTEX_P 0x2FB
|
||||
#define MOVE_HYDRO_VORTEX_S 0x2FC
|
||||
#define MOVE_BLOOM_DOOM_P 0x2FD
|
||||
#define MOVE_BLOOM_DOOM_S 0x2FE
|
||||
#define MOVE_GIGAVOLT_HAVOC_P 0x2FF
|
||||
#define MOVE_GIGAVOLT_HAVOC_S 0x300
|
||||
#define MOVE_SHATTERED_PSYCHE_P 0x301
|
||||
#define MOVE_SHATTERED_PSYCHE_S 0x302
|
||||
#define MOVE_SUBZERO_SLAMMER_P 0x303
|
||||
#define MOVE_SUBZERO_SLAMMER_S 0x304
|
||||
#define MOVE_DEVASTATING_DRAKE_P 0x305
|
||||
#define MOVE_DEVASTATING_DRAKE_S 0x306
|
||||
#define MOVE_BLACK_HOLE_ECLIPSE_P 0x307
|
||||
#define MOVE_BLACK_HOLE_ECLIPSE_S 0x308
|
||||
#define MOVE_TWINKLE_TACKLE_P 0x309
|
||||
#define MOVE_TWINKLE_TACKLE_S 0x30A
|
||||
|
||||
#define MOVE_CATASTROPIKA 0x308
|
||||
#define MOVE_10000000_VOLT_THUNDERBOLT 0x309
|
||||
#define MOVE_STOKED_SPARKSURFER 0x30A //Paralyze Target
|
||||
#define MOVE_EXTREME_EVOBOOST 0x30B //Double Ancient Power
|
||||
#define MOVE_PULVERIZING_PANCAKE 0x30C
|
||||
#define MOVE_GENESIS_SUPERNOVA 0x30D //Sets up Psychic Terrain
|
||||
#define MOVE_SINISTER_ARROW_RAID 0x30E
|
||||
#define MOVE_MALICIOUS_MOONSAULT 0x30F
|
||||
#define MOVE_OCEANIC_OPERETTA 0x310
|
||||
#define MOVE_SPLINTERED_STORMSHARDS 0x311 //Removes Terrain
|
||||
#define MOVE_LETS_SNUGGLE_FOREVER 0x312
|
||||
#define MOVE_CLANGOROUS_SOULBLAZE 0x313 //Ancient Power
|
||||
#define MOVE_GUARDIAN_OF_ALOLA 0x314
|
||||
#define MOVE_SEARING_SUNRAZE_SMASH 0x315
|
||||
#define MOVE_MENACING_MOONRAZE_MAELSTROM 0x316
|
||||
#define MOVE_LIGHT_THAT_BURNS_THE_SKY 0x317
|
||||
#define MOVE_SOUL_STEALING_7_STAR_STRIKE 0x318
|
||||
#define MOVE_CATASTROPIKA 0x30B
|
||||
#define MOVE_10000000_VOLT_THUNDERBOLT 0x30C
|
||||
#define MOVE_STOKED_SPARKSURFER 0x30D //Paralyze Target
|
||||
#define MOVE_EXTREME_EVOBOOST 0x30E //Double Ancient Power
|
||||
#define MOVE_PULVERIZING_PANCAKE 0x30F
|
||||
#define MOVE_GENESIS_SUPERNOVA 0x310 //Sets up Psychic Terrain
|
||||
#define MOVE_SINISTER_ARROW_RAID 0x311
|
||||
#define MOVE_MALICIOUS_MOONSAULT 0x312
|
||||
#define MOVE_OCEANIC_OPERETTA 0x313
|
||||
#define MOVE_SPLINTERED_STORMSHARDS 0x314 //Removes Terrain
|
||||
#define MOVE_LETS_SNUGGLE_FOREVER 0x315
|
||||
#define MOVE_CLANGOROUS_SOULBLAZE 0x316 //Ancient Power
|
||||
#define MOVE_GUARDIAN_OF_ALOLA 0x317
|
||||
#define MOVE_SEARING_SUNRAZE_SMASH 0x318
|
||||
#define MOVE_MENACING_MOONRAZE_MAELSTROM 0x319
|
||||
#define MOVE_LIGHT_THAT_BURNS_THE_SKY 0x31A
|
||||
#define MOVE_SOUL_STEALING_7_STAR_STRIKE 0x31B
|
||||
|
||||
#define FIRST_Z_MOVE MOVE_BREAKNECK_BLITZ_P
|
||||
#define LAST_Z_MOVE MOVE_SOUL_STEALING_7_STAR_STRIKE
|
||||
|
||||
//Max Moves
|
||||
#define MOVE_MAX_GUARD 0x319
|
||||
#define MOVE_MAX_STRIKE_P 0x31A
|
||||
#define MOVE_MAX_STRIKE_S 0x31B
|
||||
#define MOVE_MAX_KNUCKLE_P 0x31C
|
||||
#define MOVE_MAX_KNUCKLE_S 0x31D
|
||||
#define MOVE_MAX_AIRSTREAM_P 0x31E
|
||||
#define MOVE_MAX_AIRSTREAM_S 0x31F
|
||||
#define MOVE_MAX_OOZE_P 0x320
|
||||
#define MOVE_MAX_OOZE_S 0x321
|
||||
#define MOVE_MAX_QUAKE_P 0x322
|
||||
#define MOVE_MAX_QUAKE_S 0x323
|
||||
#define MOVE_MAX_ROCKFALL_P 0x324
|
||||
#define MOVE_MAX_ROCKFALL_S 0x325
|
||||
#define MOVE_MAX_FLUTTERBY_P 0x326
|
||||
#define MOVE_MAX_FLUTTERBY_S 0x327
|
||||
#define MOVE_MAX_PHANTASM_P 0x328
|
||||
#define MOVE_MAX_PHANTASM_S 0x329
|
||||
#define MOVE_MAX_STEELSPIKE_P 0x32A
|
||||
#define MOVE_MAX_STEELSPIKE_S 0x32B
|
||||
#define MOVE_MAX_FLARE_P 0x32C
|
||||
#define MOVE_MAX_FLARE_S 0x32D
|
||||
#define MOVE_MAX_GEYSER_P 0x32E
|
||||
#define MOVE_MAX_GEYSER_S 0x32F
|
||||
#define MOVE_MAX_OVERGROWTH_P 0x330
|
||||
#define MOVE_MAX_OVERGROWTH_S 0x331
|
||||
#define MOVE_MAX_LIGHTNING_P 0x332
|
||||
#define MOVE_MAX_LIGHTNING_S 0x333
|
||||
#define MOVE_MAX_MINDSTORM_P 0x334
|
||||
#define MOVE_MAX_MINDSTORM_S 0x335
|
||||
#define MOVE_MAX_HAILSTORM_P 0x336
|
||||
#define MOVE_MAX_HAILSTORM_S 0x337
|
||||
#define MOVE_MAX_WYRMWIND_P 0x338
|
||||
#define MOVE_MAX_WYRMWIND_S 0x339
|
||||
#define MOVE_MAX_DARKNESS_P 0x33A
|
||||
#define MOVE_MAX_DARKNESS_S 0x33B
|
||||
#define MOVE_MAX_STARFALL_P 0x33C
|
||||
#define MOVE_MAX_STARFALL_S 0x33D
|
||||
#define MOVE_G_MAX_VINE_LASH_P 0x33E
|
||||
#define MOVE_G_MAX_VINE_LASH_S 0x33F
|
||||
#define MOVE_G_MAX_WILDFIRE_P 0x340
|
||||
#define MOVE_G_MAX_WILDFIRE_S 0x341
|
||||
#define MOVE_G_MAX_CANNONADE_P 0x342
|
||||
#define MOVE_G_MAX_CANNONADE_S 0x343
|
||||
#define MOVE_G_MAX_BEFUDDLE_P 0x344
|
||||
#define MOVE_G_MAX_BEFUDDLE_S 0x345
|
||||
#define MOVE_G_MAX_VOLT_CRASH_P 0x346
|
||||
#define MOVE_G_MAX_VOLT_CRASH_S 0x347
|
||||
#define MOVE_G_MAX_GOLD_RUSH_P 0x348
|
||||
#define MOVE_G_MAX_GOLD_RUSH_S 0x349
|
||||
#define MOVE_G_MAX_CHI_STRIKE_P 0x34A
|
||||
#define MOVE_G_MAX_CHI_STRIKE_S 0x34B
|
||||
#define MOVE_G_MAX_TERROR_P 0x34C
|
||||
#define MOVE_G_MAX_TERROR_S 0x34D
|
||||
#define MOVE_G_MAX_FOAM_BURST_P 0x34E
|
||||
#define MOVE_G_MAX_FOAM_BURST_S 0x34F
|
||||
#define MOVE_G_MAX_RESONANCE_P 0x350
|
||||
#define MOVE_G_MAX_RESONANCE_S 0x351
|
||||
#define MOVE_G_MAX_CUDDLE_P 0x352
|
||||
#define MOVE_G_MAX_CUDDLE_S 0x353
|
||||
#define MOVE_G_MAX_REPLENISH_P 0x354
|
||||
#define MOVE_G_MAX_REPLENISH_S 0x355
|
||||
#define MOVE_G_MAX_MALODOR_P 0x356
|
||||
#define MOVE_G_MAX_MALODOR_S 0x357
|
||||
#define MOVE_G_MAX_MELTDOWN_P 0x358
|
||||
#define MOVE_G_MAX_MELTDOWN_S 0x359
|
||||
#define MOVE_G_MAX_DRUM_SOLO_P 0x35A
|
||||
#define MOVE_G_MAX_DRUM_SOLO_S 0x35B
|
||||
#define MOVE_G_MAX_FIREBALL_P 0x35C
|
||||
#define MOVE_G_MAX_FIREBALL_S 0x35D
|
||||
#define MOVE_G_MAX_HYDROSNIPE_P 0x35E
|
||||
#define MOVE_G_MAX_HYDROSNIPE_S 0x35F
|
||||
#define MOVE_G_MAX_WIND_RAGE_P 0x360
|
||||
#define MOVE_G_MAX_WIND_RAGE_S 0x361
|
||||
#define MOVE_G_MAX_GRAVITAS_P 0x362
|
||||
#define MOVE_G_MAX_GRAVITAS_S 0x363
|
||||
#define MOVE_G_MAX_STONESURGE_P 0x364
|
||||
#define MOVE_G_MAX_STONESURGE_S 0x365
|
||||
#define MOVE_G_MAX_VOLCALITH_P 0x366
|
||||
#define MOVE_G_MAX_VOLCALITH_S 0x367
|
||||
#define MOVE_G_MAX_TARTNESS_P 0x368
|
||||
#define MOVE_G_MAX_TARTNESS_S 0x369
|
||||
#define MOVE_G_MAX_SWEETNESS_P 0x36A
|
||||
#define MOVE_G_MAX_SWEETNESS_S 0x36B
|
||||
#define MOVE_G_MAX_SANDBLAST_P 0x36C
|
||||
#define MOVE_G_MAX_SANDBLAST_S 0x36D
|
||||
#define MOVE_G_MAX_STUN_SHOCK_P 0x36E
|
||||
#define MOVE_G_MAX_STUN_SHOCK_S 0x36F
|
||||
#define MOVE_G_MAX_CENTIFERNO_P 0x370
|
||||
#define MOVE_G_MAX_CENTIFERNO_S 0x371
|
||||
#define MOVE_G_MAX_SMITE_P 0x372
|
||||
#define MOVE_G_MAX_SMITE_S 0x373
|
||||
#define MOVE_G_MAX_SNOOZE_P 0x374
|
||||
#define MOVE_G_MAX_SNOOZE_S 0x375
|
||||
#define MOVE_G_MAX_FINALE_P 0x376
|
||||
#define MOVE_G_MAX_FINALE_S 0x377
|
||||
#define MOVE_G_MAX_STEELSURGE_P 0x378
|
||||
#define MOVE_G_MAX_STEELSURGE_S 0x379
|
||||
#define MOVE_G_MAX_DEPLETION_P 0x37A
|
||||
#define MOVE_G_MAX_DEPLETION_S 0x37B
|
||||
#define MOVE_G_MAX_ONE_BLOW_P 0x37C
|
||||
#define MOVE_G_MAX_ONE_BLOW_S 0x37D
|
||||
#define MOVE_G_MAX_RAPID_FLOW_P 0x37E
|
||||
#define MOVE_G_MAX_RAPID_FLOW_S 0x37F
|
||||
#define MOVE_MAX_GUARD 0x31C
|
||||
#define MOVE_MAX_STRIKE_P 0x31D
|
||||
#define MOVE_MAX_STRIKE_S 0x31E
|
||||
#define MOVE_MAX_KNUCKLE_P 0x31F
|
||||
#define MOVE_MAX_KNUCKLE_S 0x320
|
||||
#define MOVE_MAX_AIRSTREAM_P 0x321
|
||||
#define MOVE_MAX_AIRSTREAM_S 0x322
|
||||
#define MOVE_MAX_OOZE_P 0x323
|
||||
#define MOVE_MAX_OOZE_S 0x324
|
||||
#define MOVE_MAX_QUAKE_P 0x325
|
||||
#define MOVE_MAX_QUAKE_S 0x326
|
||||
#define MOVE_MAX_ROCKFALL_P 0x327
|
||||
#define MOVE_MAX_ROCKFALL_S 0x328
|
||||
#define MOVE_MAX_FLUTTERBY_P 0x329
|
||||
#define MOVE_MAX_FLUTTERBY_S 0x32A
|
||||
#define MOVE_MAX_PHANTASM_P 0x32B
|
||||
#define MOVE_MAX_PHANTASM_S 0x32C
|
||||
#define MOVE_MAX_STEELSPIKE_P 0x32D
|
||||
#define MOVE_MAX_STEELSPIKE_S 0x32E
|
||||
#define MOVE_MAX_FLARE_P 0x32F
|
||||
#define MOVE_MAX_FLARE_S 0x330
|
||||
#define MOVE_MAX_GEYSER_P 0x331
|
||||
#define MOVE_MAX_GEYSER_S 0x332
|
||||
#define MOVE_MAX_OVERGROWTH_P 0x333
|
||||
#define MOVE_MAX_OVERGROWTH_S 0x334
|
||||
#define MOVE_MAX_LIGHTNING_P 0x335
|
||||
#define MOVE_MAX_LIGHTNING_S 0x336
|
||||
#define MOVE_MAX_MINDSTORM_P 0x337
|
||||
#define MOVE_MAX_MINDSTORM_S 0x338
|
||||
#define MOVE_MAX_HAILSTORM_P 0x339
|
||||
#define MOVE_MAX_HAILSTORM_S 0x33A
|
||||
#define MOVE_MAX_WYRMWIND_P 0x33B
|
||||
#define MOVE_MAX_WYRMWIND_S 0x33C
|
||||
#define MOVE_MAX_DARKNESS_P 0x33D
|
||||
#define MOVE_MAX_DARKNESS_S 0x33E
|
||||
#define MOVE_MAX_STARFALL_P 0x33F
|
||||
#define MOVE_MAX_STARFALL_S 0x340
|
||||
#define MOVE_G_MAX_VINE_LASH_P 0x341
|
||||
#define MOVE_G_MAX_VINE_LASH_S 0x342
|
||||
#define MOVE_G_MAX_WILDFIRE_P 0x343
|
||||
#define MOVE_G_MAX_WILDFIRE_S 0x344
|
||||
#define MOVE_G_MAX_CANNONADE_P 0x345
|
||||
#define MOVE_G_MAX_CANNONADE_S 0x346
|
||||
#define MOVE_G_MAX_BEFUDDLE_P 0x347
|
||||
#define MOVE_G_MAX_BEFUDDLE_S 0x348
|
||||
#define MOVE_G_MAX_VOLT_CRASH_P 0x349
|
||||
#define MOVE_G_MAX_VOLT_CRASH_S 0x34A
|
||||
#define MOVE_G_MAX_GOLD_RUSH_P 0x34B
|
||||
#define MOVE_G_MAX_GOLD_RUSH_S 0x34C
|
||||
#define MOVE_G_MAX_CHI_STRIKE_P 0x34D
|
||||
#define MOVE_G_MAX_CHI_STRIKE_S 0x34E
|
||||
#define MOVE_G_MAX_TERROR_P 0x34F
|
||||
#define MOVE_G_MAX_TERROR_S 0x350
|
||||
#define MOVE_G_MAX_FOAM_BURST_P 0x351
|
||||
#define MOVE_G_MAX_FOAM_BURST_S 0x352
|
||||
#define MOVE_G_MAX_RESONANCE_P 0x353
|
||||
#define MOVE_G_MAX_RESONANCE_S 0x354
|
||||
#define MOVE_G_MAX_CUDDLE_P 0x355
|
||||
#define MOVE_G_MAX_CUDDLE_S 0x356
|
||||
#define MOVE_G_MAX_REPLENISH_P 0x357
|
||||
#define MOVE_G_MAX_REPLENISH_S 0x358
|
||||
#define MOVE_G_MAX_MALODOR_P 0x359
|
||||
#define MOVE_G_MAX_MALODOR_S 0x35A
|
||||
#define MOVE_G_MAX_MELTDOWN_P 0x35B
|
||||
#define MOVE_G_MAX_MELTDOWN_S 0x35C
|
||||
#define MOVE_G_MAX_DRUM_SOLO_P 0x35D
|
||||
#define MOVE_G_MAX_DRUM_SOLO_S 0x35E
|
||||
#define MOVE_G_MAX_FIREBALL_P 0x35F
|
||||
#define MOVE_G_MAX_FIREBALL_S 0x360
|
||||
#define MOVE_G_MAX_HYDROSNIPE_P 0x361
|
||||
#define MOVE_G_MAX_HYDROSNIPE_S 0x362
|
||||
#define MOVE_G_MAX_WIND_RAGE_P 0x363
|
||||
#define MOVE_G_MAX_WIND_RAGE_S 0x364
|
||||
#define MOVE_G_MAX_GRAVITAS_P 0x365
|
||||
#define MOVE_G_MAX_GRAVITAS_S 0x366
|
||||
#define MOVE_G_MAX_STONESURGE_P 0x367
|
||||
#define MOVE_G_MAX_STONESURGE_S 0x368
|
||||
#define MOVE_G_MAX_VOLCALITH_P 0x369
|
||||
#define MOVE_G_MAX_VOLCALITH_S 0x36A
|
||||
#define MOVE_G_MAX_TARTNESS_P 0x36B
|
||||
#define MOVE_G_MAX_TARTNESS_S 0x36C
|
||||
#define MOVE_G_MAX_SWEETNESS_P 0x36D
|
||||
#define MOVE_G_MAX_SWEETNESS_S 0x36E
|
||||
#define MOVE_G_MAX_SANDBLAST_P 0x36F
|
||||
#define MOVE_G_MAX_SANDBLAST_S 0x370
|
||||
#define MOVE_G_MAX_STUN_SHOCK_P 0x371
|
||||
#define MOVE_G_MAX_STUN_SHOCK_S 0x372
|
||||
#define MOVE_G_MAX_CENTIFERNO_P 0x373
|
||||
#define MOVE_G_MAX_CENTIFERNO_S 0x374
|
||||
#define MOVE_G_MAX_SMITE_P 0x375
|
||||
#define MOVE_G_MAX_SMITE_S 0x376
|
||||
#define MOVE_G_MAX_SNOOZE_P 0x377
|
||||
#define MOVE_G_MAX_SNOOZE_S 0x378
|
||||
#define MOVE_G_MAX_FINALE_P 0x379
|
||||
#define MOVE_G_MAX_FINALE_S 0x37A
|
||||
#define MOVE_G_MAX_STEELSURGE_P 0x37B
|
||||
#define MOVE_G_MAX_STEELSURGE_S 0x37C
|
||||
#define MOVE_G_MAX_DEPLETION_P 0x37D
|
||||
#define MOVE_G_MAX_DEPLETION_S 0x37E
|
||||
#define MOVE_G_MAX_ONE_BLOW_P 0x37F
|
||||
#define MOVE_G_MAX_ONE_BLOW_S 0x380
|
||||
#define MOVE_G_MAX_RAPID_FLOW_P 0x381
|
||||
#define MOVE_G_MAX_RAPID_FLOW_S 0x382
|
||||
|
||||
#define FIRST_MAX_MOVE MOVE_MAX_GUARD
|
||||
#define LAST_MAX_MOVE MOVE_MAX_STARFALL_S
|
||||
|
|
@ -916,4 +919,4 @@
|
|||
|
||||
#define LAST_MOVE_INDEX MOVE_G_MAX_RAPID_FLOW_S
|
||||
#define MOVES_COUNT (MOVE_G_MAX_RAPID_FLOW_S + 1)
|
||||
#define NON_Z_MOVE_COUNT (MOVE_DRAGONENERGY + 1)
|
||||
#define NON_Z_MOVE_COUNT (MOVE_GLACIALLANCE + 1)
|
||||
|
|
|
|||
|
|
@ -1176,86 +1176,89 @@
|
|||
#define SPECIES_KUBFU 0x49F
|
||||
#define SPECIES_URSHIFU_SINGLE 0x4A0
|
||||
#define SPECIES_ZARUDE 0x4A1
|
||||
#define SPECIES_UNKNOWN_MYTHICAL 0x4A2
|
||||
#define SPECIES_CALYREX 0x4A3
|
||||
#define SPECIES_REGIELEKI 0x4A4
|
||||
#define SPECIES_REGIDRAGO 0x4A5
|
||||
#define SPECIES_REGIELEKI 0x4A2
|
||||
#define SPECIES_REGIDRAGO 0x4A3
|
||||
#define SPECIES_GLASTRIER 0x4A4
|
||||
#define SPECIES_SPECTRIER 0x4A5
|
||||
#define SPECIES_CALYREX 0x4A6
|
||||
|
||||
#define SPECIES_CRAMORANT_GULPING 0x4A6
|
||||
#define SPECIES_CRAMORANT_GORGING 0x4A7
|
||||
#define SPECIES_TOXTRICITY_LOW_KEY 0x4A8
|
||||
#define SPECIES_SINISTEA_CHIPPED 0x4A9
|
||||
#define SPECIES_POLTEAGEIST_CHIPPED 0x4AA
|
||||
#define SPECIES_ALCREMIE_BERRY 0x4AB
|
||||
#define SPECIES_ALCREMIE_CLOVER 0x4AC
|
||||
#define SPECIES_ALCREMIE_FLOWER 0x4AD
|
||||
#define SPECIES_ALCREMIE_LOVE 0x4AE
|
||||
#define SPECIES_ALCREMIE_RIBBON 0x4AF
|
||||
#define SPECIES_ALCREMIE_STAR 0x4B0
|
||||
#define SPECIES_EISCUE_NOICE 0x4B1
|
||||
#define SPECIES_INDEEDEE_FEMALE 0x4B2
|
||||
#define SPECIES_MORPEKO_HANGRY 0x4B3
|
||||
#define SPECIES_ZACIAN_CROWNED 0x4B4
|
||||
#define SPECIES_ZAMAZENTA_CROWNED 0x4B5
|
||||
#define SPECIES_ETERNATUS_ETERNAMAX 0x4B6
|
||||
#define SPECIES_URSHIFU_RAPID 0x4B7
|
||||
#define SPECIES_CRAMORANT_GULPING 0x4A7
|
||||
#define SPECIES_CRAMORANT_GORGING 0x4A8
|
||||
#define SPECIES_TOXTRICITY_LOW_KEY 0x4A9
|
||||
#define SPECIES_SINISTEA_CHIPPED 0x4AA
|
||||
#define SPECIES_POLTEAGEIST_CHIPPED 0x4AB
|
||||
#define SPECIES_ALCREMIE_BERRY 0x4AC
|
||||
#define SPECIES_ALCREMIE_CLOVER 0x4AD
|
||||
#define SPECIES_ALCREMIE_FLOWER 0x4AE
|
||||
#define SPECIES_ALCREMIE_LOVE 0x4AF
|
||||
#define SPECIES_ALCREMIE_RIBBON 0x4B0
|
||||
#define SPECIES_ALCREMIE_STAR 0x4B1
|
||||
#define SPECIES_EISCUE_NOICE 0x4B2
|
||||
#define SPECIES_INDEEDEE_FEMALE 0x4B3
|
||||
#define SPECIES_MORPEKO_HANGRY 0x4B4
|
||||
#define SPECIES_ZACIAN_CROWNED 0x4B5
|
||||
#define SPECIES_ZAMAZENTA_CROWNED 0x4B6
|
||||
#define SPECIES_ETERNATUS_ETERNAMAX 0x4B7
|
||||
#define SPECIES_URSHIFU_RAPID 0x4B8
|
||||
#define SPECIES_CALYREX_ICE_RIDER 0x4B9
|
||||
#define SPECIES_CALYREX_SHADOW_RIDER 0x4BA
|
||||
|
||||
#define SPECIES_MEOWTH_G 0x4B8
|
||||
#define SPECIES_PONYTA_G 0x4B9
|
||||
#define SPECIES_RAPIDASH_G 0x4BA
|
||||
#define SPECIES_SLOWPOKE_G 0x4BB
|
||||
#define SPECIES_SLOWBRO_G 0x4BC
|
||||
#define SPECIES_FARFETCHD_G 0x4BD
|
||||
#define SPECIES_KOFFING_G 0x4BE
|
||||
#define SPECIES_WEEZING_G 0x4BF
|
||||
#define SPECIES_MR_MIME_G 0x4C0
|
||||
#define SPECIES_ARTICUNO_G 0x4C1
|
||||
#define SPECIES_ZAPDOS_G 0x4C2
|
||||
#define SPECIES_MOLTRES_G 0x4C3
|
||||
#define SPECIES_SLOWKING_G 0x4C4
|
||||
#define SPECIES_CORSOLA_G 0x4C5
|
||||
#define SPECIES_ZIGZAGOON_G 0x4C6
|
||||
#define SPECIES_LINOONE_G 0x4C7
|
||||
#define SPECIES_MIME_JR_G 0x4C8
|
||||
#define SPECIES_DARUMAKA_G 0x4C9
|
||||
#define SPECIES_DARMANITAN_G 0x4CA
|
||||
#define SPECIES_DARMANITAN_G_ZEN 0x4CB
|
||||
#define SPECIES_YAMASK_G 0x4CC
|
||||
#define SPECIES_STUNFISK_G 0x4CD
|
||||
#define SPECIES_MEOWTH_G 0x4BB
|
||||
#define SPECIES_PONYTA_G 0x4BC
|
||||
#define SPECIES_RAPIDASH_G 0x4BD
|
||||
#define SPECIES_SLOWPOKE_G 0x4BE
|
||||
#define SPECIES_SLOWBRO_G 0x4BF
|
||||
#define SPECIES_FARFETCHD_G 0x4C0
|
||||
#define SPECIES_KOFFING_G 0x4C1
|
||||
#define SPECIES_WEEZING_G 0x4C2
|
||||
#define SPECIES_MR_MIME_G 0x4C3
|
||||
#define SPECIES_ARTICUNO_G 0x4C4
|
||||
#define SPECIES_ZAPDOS_G 0x4C5
|
||||
#define SPECIES_MOLTRES_G 0x4C6
|
||||
#define SPECIES_SLOWKING_G 0x4C7
|
||||
#define SPECIES_CORSOLA_G 0x4C8
|
||||
#define SPECIES_ZIGZAGOON_G 0x4C9
|
||||
#define SPECIES_LINOONE_G 0x4CA
|
||||
#define SPECIES_MIME_JR_G 0x4CB
|
||||
#define SPECIES_DARUMAKA_G 0x4CC
|
||||
#define SPECIES_DARMANITAN_G 0x4CD
|
||||
#define SPECIES_DARMANITAN_G_ZEN 0x4CE
|
||||
#define SPECIES_YAMASK_G 0x4CF
|
||||
#define SPECIES_STUNFISK_G 0x4D0
|
||||
|
||||
#define SPECIES_VENUSAUR_GIGA 0x4CE
|
||||
#define SPECIES_CHARIZARD_GIGA 0x4CF
|
||||
#define SPECIES_BLASTOISE_GIGA 0x4D0
|
||||
#define SPECIES_BUTTERFREE_GIGA 0x4D1
|
||||
#define SPECIES_PIKACHU_GIGA 0x4D2
|
||||
#define SPECIES_MEOWTH_GIGA 0x4D3
|
||||
#define SPECIES_MACHAMP_GIGA 0x4D4
|
||||
#define SPECIES_GENGAR_GIGA 0x4D5
|
||||
#define SPECIES_KINGLER_GIGA 0x4D6
|
||||
#define SPECIES_LAPRAS_GIGA 0x4D7
|
||||
#define SPECIES_EEVEE_GIGA 0x4D8
|
||||
#define SPECIES_SNORLAX_GIGA 0x4D9
|
||||
#define SPECIES_GARBODOR_GIGA 0x4DA
|
||||
#define SPECIES_MELMETAL_GIGA 0x4DB
|
||||
#define SPECIES_RILLABOOM_GIGA 0x4DC
|
||||
#define SPECIES_CINDERACE_GIGA 0x4DD
|
||||
#define SPECIES_INTELEON_GIGA 0x4DE
|
||||
#define SPECIES_CORVIKNIGHT_GIGA 0x4DF
|
||||
#define SPECIES_ORBEETLE_GIGA 0x4E0
|
||||
#define SPECIES_DREDNAW_GIGA 0x4E1
|
||||
#define SPECIES_COALOSSAL_GIGA 0x4E2
|
||||
#define SPECIES_FLAPPLE_GIGA 0x4E3
|
||||
#define SPECIES_APPLETUN_GIGA 0x4E4
|
||||
#define SPECIES_SANDACONDA_GIGA 0x4E5
|
||||
#define SPECIES_TOXTRICITY_GIGA 0x4E6
|
||||
#define SPECIES_TOXTRICITY_LOW_KEY_GIGA 0x4E7
|
||||
#define SPECIES_CENTISKORCH_GIGA 0x4E8
|
||||
#define SPECIES_HATTERENE_GIGA 0x4E9
|
||||
#define SPECIES_GRIMMSNARL_GIGA 0x4EA
|
||||
#define SPECIES_ALCREMIE_GIGA 0x4EB
|
||||
#define SPECIES_COPPERAJAH_GIGA 0x4EC
|
||||
#define SPECIES_DURALUDON_GIGA 0x4ED
|
||||
#define SPECIES_URSHIFU_SINGLE_GIGA 0x4EE
|
||||
#define SPECIES_URSHIFU_RAPID_GIGA 0x4EF
|
||||
#define SPECIES_VENUSAUR_GIGA 0x4D1
|
||||
#define SPECIES_CHARIZARD_GIGA 0x4D2
|
||||
#define SPECIES_BLASTOISE_GIGA 0x4D3
|
||||
#define SPECIES_BUTTERFREE_GIGA 0x4D4
|
||||
#define SPECIES_PIKACHU_GIGA 0x4D5
|
||||
#define SPECIES_MEOWTH_GIGA 0x4D6
|
||||
#define SPECIES_MACHAMP_GIGA 0x4D7
|
||||
#define SPECIES_GENGAR_GIGA 0x4D8
|
||||
#define SPECIES_KINGLER_GIGA 0x4D9
|
||||
#define SPECIES_LAPRAS_GIGA 0x4DA
|
||||
#define SPECIES_EEVEE_GIGA 0x4DB
|
||||
#define SPECIES_SNORLAX_GIGA 0x4DC
|
||||
#define SPECIES_GARBODOR_GIGA 0x4DD
|
||||
#define SPECIES_MELMETAL_GIGA 0x4DE
|
||||
#define SPECIES_RILLABOOM_GIGA 0x4DF
|
||||
#define SPECIES_CINDERACE_GIGA 0x4E0
|
||||
#define SPECIES_INTELEON_GIGA 0x4E1
|
||||
#define SPECIES_CORVIKNIGHT_GIGA 0x4E2
|
||||
#define SPECIES_ORBEETLE_GIGA 0x4E3
|
||||
#define SPECIES_DREDNAW_GIGA 0x4E4
|
||||
#define SPECIES_COALOSSAL_GIGA 0x4E5
|
||||
#define SPECIES_FLAPPLE_GIGA 0x4E6
|
||||
#define SPECIES_APPLETUN_GIGA 0x4E7
|
||||
#define SPECIES_SANDACONDA_GIGA 0x4E8
|
||||
#define SPECIES_TOXTRICITY_GIGA 0x4E9
|
||||
#define SPECIES_TOXTRICITY_LOW_KEY_GIGA 0x4EA
|
||||
#define SPECIES_CENTISKORCH_GIGA 0x4EB
|
||||
#define SPECIES_HATTERENE_GIGA 0x4EC
|
||||
#define SPECIES_GRIMMSNARL_GIGA 0x4ED
|
||||
#define SPECIES_ALCREMIE_GIGA 0x4EE
|
||||
#define SPECIES_COPPERAJAH_GIGA 0x4EF
|
||||
#define SPECIES_DURALUDON_GIGA 0x4F0
|
||||
#define SPECIES_URSHIFU_SINGLE_GIGA 0x4F1
|
||||
#define SPECIES_URSHIFU_RAPID_GIGA 0x4F2
|
||||
|
||||
#define NUM_SPECIES (SPECIES_URSHIFU_RAPID_GIGA + 1)
|
||||
|
|
|
|||
|
|
@ -4191,12 +4191,12 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES] =
|
|||
[SPECIES_ZYGARDE_10] =
|
||||
{
|
||||
.size = 0x0,
|
||||
.y_offset = 0x5,
|
||||
.y_offset = 0x8,
|
||||
},
|
||||
[SPECIES_ZYGARDE_COMPLETE] =
|
||||
{
|
||||
.size = 0x0,
|
||||
.y_offset = 0x0,
|
||||
.y_offset = 0x3,
|
||||
},
|
||||
[SPECIES_ASHGRENINJA] =
|
||||
{
|
||||
|
|
@ -5081,7 +5081,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES] =
|
|||
[SPECIES_KARTANA] =
|
||||
{
|
||||
.size = 0x0,
|
||||
.y_offset = 0xd,
|
||||
.y_offset = 0xB,
|
||||
},
|
||||
[SPECIES_GUZZLORD] =
|
||||
{
|
||||
|
|
@ -5928,17 +5928,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES] =
|
|||
.size = 0x0,
|
||||
.y_offset = 0x0,
|
||||
},
|
||||
[SPECIES_ZARUDE] =
|
||||
{
|
||||
.size = 0x0,
|
||||
.y_offset = 0x0,
|
||||
},
|
||||
[SPECIES_UNKNOWN_MYTHICAL] =
|
||||
{
|
||||
.size = 0x0,
|
||||
.y_offset = 0x0,
|
||||
},
|
||||
[SPECIES_CALYREX] =
|
||||
[SPECIES_ZARUDE] =
|
||||
{
|
||||
.size = 0x0,
|
||||
.y_offset = 0x0,
|
||||
|
|
@ -5953,6 +5943,21 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES] =
|
|||
.size = 0x0,
|
||||
.y_offset = 0x0,
|
||||
},
|
||||
[SPECIES_GLASTRIER] =
|
||||
{
|
||||
.size = 0x0,
|
||||
.y_offset = 0x0,
|
||||
},
|
||||
[SPECIES_SPECTRIER] =
|
||||
{
|
||||
.size = 0x0,
|
||||
.y_offset = 0x0,
|
||||
},
|
||||
[SPECIES_CALYREX] =
|
||||
{
|
||||
.size = 0x0,
|
||||
.y_offset = 0x0,
|
||||
},
|
||||
[SPECIES_CRAMORANT_GULPING] =
|
||||
{
|
||||
.size = 0x0,
|
||||
|
|
|
|||
|
|
@ -648,7 +648,7 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
|
|||
[SPECIES_FOONGUS] = 0x0,
|
||||
[SPECIES_AMOONGUSS] = 0x0,
|
||||
[SPECIES_FRILLISH] = 0x0,
|
||||
[SPECIES_JELLICENT] = 0x0,
|
||||
[SPECIES_JELLICENT] = 0x8,
|
||||
[SPECIES_ALOMOMOLA] = 0x0,
|
||||
[SPECIES_JOLTIK] = 0x0,
|
||||
[SPECIES_GALVANTULA] = 0x0,
|
||||
|
|
@ -707,7 +707,7 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
|
|||
[SPECIES_GENESECT] = 0x0,
|
||||
[SPECIES_UNFEZANT_F] = 0x0,
|
||||
[SPECIES_FRILLISH_F] = 0x0,
|
||||
[SPECIES_JELLICENT_F] = 0x0,
|
||||
[SPECIES_JELLICENT_F] = 0x8,
|
||||
[SPECIES_SHADOW_WARRIOR] = 0x0,
|
||||
[SPECIES_BURMY_SANDY] = 0x0,
|
||||
[SPECIES_BURMY_TRASH] = 0x0,
|
||||
|
|
@ -1017,7 +1017,7 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
|
|||
[SPECIES_PHEROMOSA] = 0x0,
|
||||
[SPECIES_XURKITREE] = 0x0,
|
||||
[SPECIES_CELESTEELA] = 0x0,
|
||||
[SPECIES_KARTANA] = 0x0,
|
||||
[SPECIES_KARTANA] = 0x8,
|
||||
[SPECIES_GUZZLORD] = 0x0,
|
||||
[SPECIES_NECROZMA] = 0x0,
|
||||
[SPECIES_MAGEARNA] = 0x0,
|
||||
|
|
@ -1188,10 +1188,11 @@ const u8 gEnemyMonElevation[NUM_SPECIES] =
|
|||
[SPECIES_KUBFU] = 0x0,
|
||||
[SPECIES_URSHIFU_SINGLE] = 0x0,
|
||||
[SPECIES_ZARUDE] = 0x0,
|
||||
[SPECIES_UNKNOWN_MYTHICAL] = 0x0,
|
||||
[SPECIES_CALYREX] = 0x0,
|
||||
[SPECIES_REGIELEKI] = 0x0,
|
||||
[SPECIES_REGIDRAGO] = 0x0,
|
||||
[SPECIES_GLASTRIER] = 0x0,
|
||||
[SPECIES_SPECTRIER] = 0x0,
|
||||
[SPECIES_CALYREX] = 0x0,
|
||||
[SPECIES_CRAMORANT_GULPING] = 0x0,
|
||||
[SPECIES_CRAMORANT_GORGING] = 0x0,
|
||||
[SPECIES_TOXTRICITY_LOW_KEY] = 0x0,
|
||||
|
|
|
|||
|
|
@ -3836,7 +3836,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES] =
|
|||
[SPECIES_GRENINJA] =
|
||||
{
|
||||
.size = 0x0,
|
||||
.y_offset = 0x1,
|
||||
.y_offset = 0x5,
|
||||
},
|
||||
[SPECIES_BUNNELBY] =
|
||||
{
|
||||
|
|
@ -4116,7 +4116,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES] =
|
|||
[SPECIES_NOIBAT] =
|
||||
{
|
||||
.size = 0x0,
|
||||
.y_offset = 0x8,
|
||||
.y_offset = 0x9,
|
||||
},
|
||||
[SPECIES_NOIVERN] =
|
||||
{
|
||||
|
|
@ -4191,7 +4191,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES] =
|
|||
[SPECIES_ZYGARDE_10] =
|
||||
{
|
||||
.size = 0x0,
|
||||
.y_offset = 0x4,
|
||||
.y_offset = 0x3,
|
||||
},
|
||||
[SPECIES_ZYGARDE_COMPLETE] =
|
||||
{
|
||||
|
|
@ -4201,7 +4201,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES] =
|
|||
[SPECIES_ASHGRENINJA] =
|
||||
{
|
||||
.size = 0x0,
|
||||
.y_offset = 0x4,
|
||||
.y_offset = 0x5,
|
||||
},
|
||||
[SPECIES_FLABEBE_BLUE] =
|
||||
{
|
||||
|
|
@ -5081,7 +5081,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES] =
|
|||
[SPECIES_KARTANA] =
|
||||
{
|
||||
.size = 0x0,
|
||||
.y_offset = 0x3,
|
||||
.y_offset = 0xB,
|
||||
},
|
||||
[SPECIES_GUZZLORD] =
|
||||
{
|
||||
|
|
@ -5116,12 +5116,12 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES] =
|
|||
[SPECIES_RAICHU_A] =
|
||||
{
|
||||
.size = 0x0,
|
||||
.y_offset = 0x0,
|
||||
.y_offset = 0x1,
|
||||
},
|
||||
[SPECIES_SANDSHREW_A] =
|
||||
{
|
||||
.size = 0x0,
|
||||
.y_offset = 0x7,
|
||||
.y_offset = 13,
|
||||
},
|
||||
[SPECIES_SANDSLASH_A] =
|
||||
{
|
||||
|
|
@ -5933,7 +5933,22 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES] =
|
|||
.size = 0x0,
|
||||
.y_offset = 0x0,
|
||||
},
|
||||
[SPECIES_UNKNOWN_MYTHICAL] =
|
||||
[SPECIES_REGIELEKI] =
|
||||
{
|
||||
.size = 0x0,
|
||||
.y_offset = 0x0,
|
||||
},
|
||||
[SPECIES_REGIDRAGO] =
|
||||
{
|
||||
.size = 0x0,
|
||||
.y_offset = 0x0,
|
||||
},
|
||||
[SPECIES_GLASTRIER] =
|
||||
{
|
||||
.size = 0x0,
|
||||
.y_offset = 0x0,
|
||||
},
|
||||
[SPECIES_SPECTRIER] =
|
||||
{
|
||||
.size = 0x0,
|
||||
.y_offset = 0x0,
|
||||
|
|
|
|||
|
|
@ -1188,10 +1188,11 @@ const u8 gMonIconPaletteIndices[NUM_SPECIES] =
|
|||
[SPECIES_KUBFU] = 0x0,
|
||||
[SPECIES_URSHIFU_SINGLE] = 0x0,
|
||||
[SPECIES_ZARUDE] = 0x0,
|
||||
[SPECIES_UNKNOWN_MYTHICAL] = 0x0,
|
||||
[SPECIES_CALYREX] = 0x0,
|
||||
[SPECIES_REGIELEKI] = 0x0,
|
||||
[SPECIES_REGIDRAGO] = 0x0,
|
||||
[SPECIES_SPECTRIER] = 0x0,
|
||||
[SPECIES_GLASTRIER] = 0x0,
|
||||
[SPECIES_CALYREX] = 0x0,
|
||||
[SPECIES_CRAMORANT_GULPING] = 0x0,
|
||||
[SPECIES_CRAMORANT_GORGING] = 0x0,
|
||||
[SPECIES_TOXTRICITY_LOW_KEY] = 0x0,
|
||||
|
|
|
|||
|
|
@ -1197,10 +1197,11 @@ const struct ItemAnimation gItemAnimationTable[NUM_SPECIES] =
|
|||
[SPECIES_KUBFU] = {0x0, 0x0, 0x0, 0x0, 0x0},
|
||||
[SPECIES_URSHIFU_SINGLE] = {0x0, 0x0, 0x0, 0x0, 0x0},
|
||||
[SPECIES_ZARUDE] = {0x0, 0x0, 0x0, 0x0, 0x0},
|
||||
[SPECIES_UNKNOWN_MYTHICAL] = {0x0, 0x0, 0x0, 0x0, 0x0},
|
||||
[SPECIES_CALYREX] = {0x0, 0x0, 0x0, 0x0, 0x0},
|
||||
[SPECIES_REGIELEKI] = {0x0, 0x0, 0x0, 0x0, 0x0},
|
||||
[SPECIES_REGIDRAGO] = {0x0, 0x0, 0x0, 0x0, 0x0},
|
||||
[SPECIES_GLASTRIER] = {0x0, 0x0, 0x0, 0x0, 0x0},
|
||||
[SPECIES_SPECTRIER] = {0x0, 0x0, 0x0, 0x0, 0x0},
|
||||
[SPECIES_CALYREX] = {0x0, 0x0, 0x0, 0x0, 0x0},
|
||||
[SPECIES_CRAMORANT_GULPING] = {0x0, 0x0, 0x0, 0x0, 0x0},
|
||||
[SPECIES_CRAMORANT_GORGING] = {0x0, 0x0, 0x0, 0x0, 0x0},
|
||||
[SPECIES_TOXTRICITY_LOW_KEY] = {0x0, 0x0, 0x0, 0x0, 0x0},
|
||||
|
|
|
|||
|
|
@ -870,7 +870,7 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES - 1] =
|
|||
[SPECIES_FURFROU_MATRON - 1] = NATIONAL_DEX_FURFROU,
|
||||
[SPECIES_FURFROU_DANDY - 1] = NATIONAL_DEX_FURFROU,
|
||||
[SPECIES_FURFROU_DEBUTANTE - 1] = NATIONAL_DEX_FURFROU,
|
||||
[SPECIES_VIVILLON_FANCY - 1] = NATIONAL_DEX_FURFROU,
|
||||
[SPECIES_VIVILLON_FANCY - 1] = NATIONAL_DEX_VIVILLON,
|
||||
[SPECIES_VENUSAUR_MEGA - 1] = NATIONAL_DEX_VENUSAUR,
|
||||
[SPECIES_CHARIZARD_MEGA_X - 1] = NATIONAL_DEX_CHARIZARD,
|
||||
[SPECIES_CHARIZARD_MEGA_Y - 1] = NATIONAL_DEX_CHARIZARD,
|
||||
|
|
|
|||
|
|
@ -113,6 +113,7 @@ AROMATISSE
|
|||
SWIRLIX
|
||||
SLURPUFF
|
||||
SYLVEON
|
||||
DEDENNE
|
||||
CARBINK
|
||||
KLEFKI
|
||||
XERNEAS
|
||||
|
|
|
|||
|
|
@ -113,6 +113,8 @@ PIKIPEK
|
|||
TRUMBEAK
|
||||
TOUCANNON
|
||||
TOXAPEX
|
||||
MUDBRAY
|
||||
MUDSDALE
|
||||
PASSIMIAN
|
||||
TURTONATOR
|
||||
BUZZWOLE
|
||||
|
|
@ -120,4 +122,7 @@ CELESTEELA
|
|||
GUZZLORD
|
||||
MARSHADOW
|
||||
STAKATAKA
|
||||
BLACEPHALON
|
||||
BLACEPHALON
|
||||
ROLYCOLY
|
||||
CARKOL
|
||||
COALOSSAL
|
||||
|
|
|
|||
|
|
@ -9,11 +9,17 @@ MEW
|
|||
DELIBIRD
|
||||
SMOOCHUM
|
||||
REGICE
|
||||
ABOMASNOW
|
||||
GLACEON
|
||||
FROSLASS
|
||||
VANILLITE
|
||||
VANILLISH
|
||||
VANILLUXE
|
||||
CRYOGONAL
|
||||
AMAURA
|
||||
AURORUS
|
||||
BERGMITE
|
||||
AVALUGG
|
||||
FROSMOTH
|
||||
EISCUE
|
||||
ARCTOVISH
|
||||
|
|
|
|||
|
|
@ -45,6 +45,7 @@ MEGANIUM
|
|||
TYPHLOSION
|
||||
FERALIGATR
|
||||
AMPHAROS
|
||||
GLIGAR
|
||||
STEELIX
|
||||
GRANBULL
|
||||
URSARING
|
||||
|
|
@ -56,6 +57,10 @@ TYRANITAR
|
|||
SCEPTILE
|
||||
BLAZIKEN
|
||||
SWAMPERT
|
||||
ZIGZAGOON
|
||||
ZIGZAGOON_G
|
||||
LINOONE
|
||||
LINOONE_G
|
||||
LUDICOLO
|
||||
VIGOROTH
|
||||
SLAKING
|
||||
|
|
@ -64,6 +69,7 @@ MAKUHITA
|
|||
HARIYAMA
|
||||
AGGRON
|
||||
ZANGOOSE
|
||||
METAGROSS
|
||||
REGIROCK
|
||||
REGICE
|
||||
REGISTEEL
|
||||
|
|
@ -75,6 +81,7 @@ CHIMCHAR
|
|||
MONFERNO
|
||||
INFERNAPE
|
||||
EMPOLEON
|
||||
BIDOOF
|
||||
BIBAREL
|
||||
CRANIDOS
|
||||
RAMPARDOS
|
||||
|
|
@ -92,6 +99,7 @@ RHYPERIOR
|
|||
ELECTIVIRE
|
||||
MAGMORTAR
|
||||
MAMOSWINE
|
||||
GLISCOR
|
||||
HEATRAN
|
||||
REGIGIGAS
|
||||
GIRATINA
|
||||
|
|
@ -199,4 +207,5 @@ KOMMO_O
|
|||
BUZZWOLE
|
||||
PHEROMOSA
|
||||
GUZZLORD
|
||||
MELMETAL
|
||||
MELMETAL
|
||||
OBSTAGOON
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ BEEDRILL
|
|||
CLEFAIRY
|
||||
CLEFABLE
|
||||
NINETALES
|
||||
NINETALES_A
|
||||
JIGGLYPUFF
|
||||
WIGGLYTUFF
|
||||
ODDISH
|
||||
|
|
@ -219,6 +220,7 @@ DWEBBLE
|
|||
CRUSTLE
|
||||
SIGILYPH
|
||||
GARBODOR
|
||||
EMOLGA
|
||||
DEERLING
|
||||
DEERLING_SUMMER
|
||||
DEERLING_AUTUMN
|
||||
|
|
@ -294,6 +296,7 @@ FLORGES_YELLOW
|
|||
FLORGES_WHITE
|
||||
SKIDDO
|
||||
GOGOAT
|
||||
HELIOLISK
|
||||
PHANTUMP
|
||||
TREVENANT
|
||||
PUMPKABOO
|
||||
|
|
@ -342,4 +345,33 @@ NECROZMA_DAWN_WINGS
|
|||
NECROZMA_ULTRA
|
||||
MAGEARNA
|
||||
MAGEARNA_P
|
||||
MELMETAL
|
||||
BLACEPHALON
|
||||
MELMETAL
|
||||
GROOKEY
|
||||
THWACKEY
|
||||
RILLABOOM
|
||||
DOTTLER
|
||||
ORBEETLE
|
||||
GOSSIFLEUR
|
||||
ELDEGOSS
|
||||
COALOSSAL
|
||||
FLAPPLE
|
||||
APPLETUN
|
||||
CENTISKORCH
|
||||
MR_RIME
|
||||
ALCREMIE_STRAWBERRY
|
||||
ALCREMIE_BERRY
|
||||
ALCREMIE_CLOVER
|
||||
ALCREMIE_FLOWER
|
||||
ALCREMIE_LOVE
|
||||
ALCREMIE_RIBBON
|
||||
ALCREMIE_STAR
|
||||
DURALUDON
|
||||
DRAGAPULT
|
||||
ZAMAZENTA
|
||||
ZAMAZENTA_CROWNED
|
||||
ETERNATUS
|
||||
ZARUDE
|
||||
CALYREX
|
||||
CALYREX_ICE_RIDER
|
||||
CALYREX_SHADOW_RIDER
|
||||
|
|
|
|||
|
|
@ -965,6 +965,5 @@ NECROZMA_DUSK_MANE
|
|||
NECROZMA_DAWN_WINGS
|
||||
NECROZMA_ULTRA
|
||||
LYCANROC_DUSK
|
||||
PYUKUMUKU
|
||||
MELTAN
|
||||
MELMETAL
|
||||
|
|
@ -22,6 +22,8 @@ PIKACHU_CAP_ALOLA
|
|||
PIKACHU_CAP_PARTNER
|
||||
RAICHU
|
||||
RAICHU_A
|
||||
VULPIX_A
|
||||
NINETALES_A
|
||||
CLEFAIRY
|
||||
CLEFABLE
|
||||
JIGGLYPUFF
|
||||
|
|
@ -35,10 +37,14 @@ VENONAT
|
|||
VENOMOTH
|
||||
MEOWTH
|
||||
MEOWTH_A
|
||||
MEOWTH_G
|
||||
PERSIAN
|
||||
PERSIAN_A
|
||||
PERRSERKER
|
||||
PSYDUCK
|
||||
GOLDUCK
|
||||
PONYTA_G
|
||||
RAPIDASH_G
|
||||
ABRA
|
||||
KADABRA
|
||||
ALAKAZAM
|
||||
|
|
@ -173,6 +179,7 @@ CHIMECHO
|
|||
ABSOL
|
||||
SNORUNT
|
||||
GLALIE
|
||||
BELDUM
|
||||
METANG
|
||||
METAGROSS
|
||||
LATIAS
|
||||
|
|
@ -441,3 +448,22 @@ NECROZMA_ULTRA
|
|||
MAGEARNA
|
||||
MAGEARNA_P
|
||||
ZERAORA
|
||||
HATENNA
|
||||
HATTREM
|
||||
HATTERENE
|
||||
IMPIDIMP
|
||||
MORGREM
|
||||
GRIMMSNARL
|
||||
MR_RIME
|
||||
MILCERY
|
||||
ALCREMIE_STRAWBERRY
|
||||
ALCREMIE_BERRY
|
||||
ALCREMIE_CLOVER
|
||||
ALCREMIE_FLOWER
|
||||
ALCREMIE_LOVE
|
||||
ALCREMIE_RIBBON
|
||||
ALCREMIE_STAR
|
||||
FROSMOTH
|
||||
INDEEDEE
|
||||
INDEEDEE_FEMALE
|
||||
ZAMAZENTA
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@ TORKOAL
|
|||
CLAYDOL
|
||||
WALREIN
|
||||
RELICANTH
|
||||
METAGROSS
|
||||
REGIROCK
|
||||
REGISTEEL
|
||||
BRONZONG
|
||||
|
|
|
|||
|
|
@ -3560,18 +3560,21 @@ Urshifu
|
|||
#org @NAME_ZARUDE
|
||||
Zarude
|
||||
|
||||
#org @NAME_UNKNOWN_MYTHICAL
|
||||
??????
|
||||
|
||||
#org @NAME_CALYREX
|
||||
Calyrex
|
||||
|
||||
#org @NAME_REGIELEKI
|
||||
Regieleki
|
||||
|
||||
#org @NAME_REGIDRAGO
|
||||
Regidrago
|
||||
|
||||
#org @NAME_GLASTRIER
|
||||
Glastrier
|
||||
|
||||
#org @NAME_SPECTRIER
|
||||
Spectrier
|
||||
|
||||
#org @NAME_CALYREX
|
||||
Calyrex
|
||||
|
||||
#org @NAME_CRAMORANT_GULPING
|
||||
Cramorant
|
||||
|
||||
|
|
@ -3626,6 +3629,12 @@ Eternatus
|
|||
#org @NAME_URSHIFU_RAPID
|
||||
Urshifu
|
||||
|
||||
#org @NAME_CALYREX_ICE
|
||||
Calyrex
|
||||
|
||||
#org @NAME_CALYREX_SHADOW
|
||||
Calyrex
|
||||
|
||||
#org @NAME_MEOWTH_G
|
||||
Meowth
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user