Some Fixes + SwSh Prep

This commit is contained in:
Skeli
2019-12-02 20:55:20 +02:00
parent 5d33ba8829
commit e8ce326bd0
12 changed files with 444 additions and 163 deletions

View File

@@ -37,7 +37,7 @@
#define ABILITY_CHLOROPHYLL 0x22
#define ABILITY_ILLUMINATE 0x23
#define ABILITY_TRACE 0x24
#define ABILITY_HUGEPOWER 0x25
#define ABILITY_HUGEPOWER 0x25 //Also Pure Power
#define ABILITY_POISONPOINT 0x26
#define ABILITY_INNERFOCUS 0x27
#define ABILITY_MAGMAARMOR 0x28
@@ -74,9 +74,9 @@
#define ABILITY_ARENATRAP 0x47
#define ABILITY_VITALSPIRIT 0x48
#define ABILITY_WHITESMOKE 0x49
#define ABILITY_PUREPOWER 0x4A
#define ABILITY_NEUTRALIINGGAS 0x4A
#define ABILITY_SHELLARMOR 0x4B
#define ABILITY_CACOPHONY 0x4C
#define ABILITY_HUNGERSWITCH 0x4C
#define ABILITY_AIRLOCK 0x4D
#define ABILITY_SWEETVEIL 0x4E
#define ABILITY_SKILLLINK 0x4F
@@ -150,7 +150,7 @@
#define ABILITY_FLAREBOOST 0x93
#define ABILITY_FURCOAT 0x94
#define ABILITY_WONDERSKIN 0x95
#define ABILITY_PROTEAN 0x96
#define ABILITY_PROTEAN 0x96 //Also Libero
#define ABILITY_PARENTALBOND 0x97
#define ABILITY_MOLDBREAKER 0x98
#define ABILITY_TURBOBLAZE 0x99
@@ -160,11 +160,11 @@
#define ABILITY_BEASTBOOST 0x9D
#define ABILITY_CORROSION 0x9E
#define ABILITY_DISGUISE 0x9F
#define ABILITY_EMERGENCYEXIT 0xA0
#define ABILITY_EMERGENCYEXIT 0xA0 //Also Wimp Out
#define ABILITY_FLUFFY 0xA1
#define ABILITY_FULLMETALBODY 0xA2
#define ABILITY_BROKEN_1 0xA3
#define ABILITY_BROKEN_2 0xA4
#define ABILITY_STEELY_SPIRIT 0xA2
#define ABILITY_PERISH_BODY 0xA3
#define ABILITY_WANDERING_SPIRIT 0xA4
#define ABILITY_POWERCONSTRUCT 0xA5
#define ABILITY_PRISMARMOR 0xA6
#define ABILITY_RKS_SYSTEM 0xA7
@@ -215,7 +215,7 @@
#define ABILITY_PRIMORDIALSEA 0xD4
#define ABILITY_DESOLATELAND 0xD5
#define ABILITY_DELTASTREAM 0xD6
#define ABILITY_WIMPOUT 0xD7
#define ABILITY_GORILLATACTICS 0xD7
#define ABILITY_BERSERK 0xD8
#define ABILITY_LONGREACH 0xD9
#define ABILITY_LIQUIDVOICE 0xDA
@@ -238,3 +238,20 @@
#define ABILITY_POWEROFALCHEMY 0xEB
#define ABILITY_NEUROFORCE 0xEC
#define ABILITY_GALVANIZE 0xED
#define ABILITY_INTREPIDSWORD 0xEE
#define ABILITY_DAUNTLESSSHIELD 0xEF
#define ABILITY_BALLFETCH 0xF0
#define ABILITY_COTTONDOWN 0xF1
#define ABILITY_MIRRORARMOR 0xF2
#define ABILITY_GULPMISSLE 0xF3
#define ABILITY_STALWART 0xF4 //Also Propellor Tail
#define ABILITY_STEAMENGINE 0xF5
#define ABILITY_PUNKROCK 0xF6
#define ABILITY_SANDSPIT 0xF7
#define ABILITY_ICESCALES 0xF8
#define ABILITY_RIPEN 0xF9
#define ABILITY_ICEFACE 0xFA
#define ABILITY_POWERSPOT 0xFB
#define ABILITY_MIMICRY 0xFC
#define ABILITY_SCREENCLEANER 0xFD
#define ABILITY_PASTELVEIL 0xFE

View File

@@ -45,6 +45,7 @@ enum EvolutionMethods
EVO_LEVEL_SPECIFIC_TIME_RANGE, // above given level with a range (unknown is [start][end]. eg lycanroc -> 1700-1800 hrs -> 0x1112)
};
#define EVO_GIGANTAMAX 0xFD
#define EVO_MEGA 0xFE
enum MegaEvoVariants

View File

@@ -563,7 +563,7 @@
#define MOVE_NOBLEROAR 0x22E
#define MOVE_DRAGONASCENT 0x22F
#define MOVE_PARTINGSHOT 0x230
#define MOVE_TOPSYTURVY 0x231
#define MOVE_TOPSYTURVY 0x231
#define MOVE_COREENFORCER 0x232
#define MOVE_CHATTER 0x233
#define MOVE_CONFIDE 0x234
@@ -681,63 +681,198 @@
#define MOVE_CELEBRATE 0x2A4
#define MOVE_HOLDHANDS 0x2A5
#define MOVE_BREAKNECK_BLITZ_P 0x2A6
#define MOVE_BREAKNECK_BLITZ_S 0x2A7
#define MOVE_ALL_OUT_PUMMELING_P 0x2A8
#define MOVE_ALL_OUT_PUMMELING_S 0x2A9
#define MOVE_SUPERSONIC_SKYSTRIKE_P 0x2AA
#define MOVE_SUPERSONIC_SKYSTRIKE_S 0x2AB
#define MOVE_ACID_DOWNPOUR_P 0x2AC
#define MOVE_ACID_DOWNPOUR_S 0x2AD
#define MOVE_TECTONIC_RAGE_P 0x2AE
#define MOVE_TECTONIC_RAGE_S 0x2AF
#define MOVE_CONTINENTAL_CRUSH_P 0x2B0
#define MOVE_CONTINENTAL_CRUSH_S 0x2B1
#define MOVE_SAVAGE_SPIN_OUT_P 0x2B2
#define MOVE_SAVAGE_SPIN_OUT_S 0x2B3
#define MOVE_NEVER_ENDING_NIGHTMARE_P 0x2B4
#define MOVE_NEVER_ENDING_NIGHTMARE_S 0x2B5
#define MOVE_CORKSCREW_CRASH_P 0x2B6
#define MOVE_CORKSCREW_CRASH_S 0x2B7
#define MOVE_INFERNO_OVERDRIVE_P 0x2B8
#define MOVE_INFERNO_OVERDRIVE_S 0x2B9
#define MOVE_HYDRO_VORTEX_P 0x2BA
#define MOVE_HYDRO_VORTEX_S 0x2BB
#define MOVE_BLOOM_DOOM_P 0x2BC
#define MOVE_BLOOM_DOOM_S 0x2BD
#define MOVE_GIGAVOLT_HAVOC_P 0x2BE
#define MOVE_GIGAVOLT_HAVOC_S 0x2BF
#define MOVE_SHATTERED_PSYCHE_P 0x2C0
#define MOVE_SHATTERED_PSYCHE_S 0x2C1
#define MOVE_SUBZERO_SLAMMER_P 0x2C2
#define MOVE_SUBZERO_SLAMMER_S 0x2C3
#define MOVE_DEVASTATING_DRAKE_P 0x2C4
#define MOVE_DEVASTATING_DRAKE_S 0x2C5
#define MOVE_BLACK_HOLE_ECLIPSE_P 0x2C6
#define MOVE_BLACK_HOLE_ECLIPSE_S 0x2C7
#define MOVE_TWINKLE_TACKLE_P 0x2C8
#define MOVE_TWINKLE_TACKLE_S 0x2C9
//Sword & Shield Moves
#define MOVE_DYNAMAXCANNON 0x2A6
#define MOVE_SNIPESHOT 0x2A7
#define MOVE_JAWLOCK 0x2A8
#define MOVE_STUFFCHEEKS 0x2A9
#define MOVE_NORETREAT 0x2AA
#define MOVE_TARSHOT 0x2AB
#define MOVE_MAGICPOWDER 0x2AC
#define MOVE_DRAGONDARTS 0x2AD
#define MOVE_TEATIME 0x2AE
#define MOVE_OCTOLOCK 0x2AF
#define MOVE_BOLTBEAK 0x2B0
#define MOVE_FISHIOUSREND 0x2B1
#define MOVE_COURTCHANGE 0x2B2
#define MOVE_CLANGOROUSSOUL 0x2B3
#define MOVE_BODYPRESS 0x2B4
#define MOVE_DECORATE 0x2B5
#define MOVE_DRUMBEATING 0x2B6
#define MOVE_SNAPTRAP 0x2B7
#define MOVE_PYROBALL 0x2B8
#define MOVE_BEHEMOTHBLADE 0x2B9
#define MOVE_BEHEMOTHBASH 0x2BA
#define MOVE_AURAWHEEL 0x2BB
#define MOVE_BREAKINGSWIPE 0x2BC
#define MOVE_BRANCHPOKE 0x2BD
#define MOVE_OVERDRIVE 0x2BE
#define MOVE_APPLEACID 0x2BF
#define MOVE_GRAVAPPLE 0x2C0
#define MOVE_SPIRITBREAK 0x2C1
#define MOVE_STRANGESTEAM 0x2C2
#define MOVE_LIFEDEW 0x2C3
#define MOVE_OBSTRUCT 0x2C4
#define MOVE_FALSESURRENDER 0x2C5
#define MOVE_METEORASSAULT 0x2C6
#define MOVE_ETERNABEAM 0x2C7
#define MOVE_STEELBEAM 0x2C8
#define MOVE_CATASTROPIKA 0x2CA
#define MOVE_10000000_VOLT_THUNDERBOLT 0x2CB
#define MOVE_STOKED_SPARKSURFER 0x2CC //Paralyze Target
#define MOVE_EXTREME_EVOBOOST 0x2CD //Double Ancient Power
#define MOVE_PULVERIZING_PANCAKE 0x2CE
#define MOVE_GENESIS_SUPERNOVA 0x2CF //Sets up Psychic Terrain
#define MOVE_SINISTER_ARROW_RAID 0x2D0
#define MOVE_MALICIOUS_MOONSAULT 0x2D1
#define MOVE_OCEANIC_OPERETTA 0x2D2
#define MOVE_SPLINTERED_STORMSHARDS 0x2D3 //Removes Terrain
#define MOVE_LETS_SNUGGLE_FOREVER 0x2D4
#define MOVE_CLANGOROUS_SOULBLAZE 0x2D5 //Ancient Power
#define MOVE_GUARDIAN_OF_ALOLA 0x2D6
#define MOVE_SEARING_SUNRAZE_SMASH 0x2D7
#define MOVE_MENACING_MOONRAZE_MAELSTROM 0x2D8
#define MOVE_LIGHT_THAT_BURNS_THE_SKY 0x2D9
#define MOVE_SOUL_STEALING_7_STAR_STRIKE 0x2DA
//Z-Moves
#define MOVE_BREAKNECK_BLITZ_P 0x2C9
#define MOVE_BREAKNECK_BLITZ_S 0x2CA
#define MOVE_ALL_OUT_PUMMELING_P 0x2CB
#define MOVE_ALL_OUT_PUMMELING_S 0x2CC
#define MOVE_SUPERSONIC_SKYSTRIKE_P 0x2CD
#define MOVE_SUPERSONIC_SKYSTRIKE_S 0x2CE
#define MOVE_ACID_DOWNPOUR_P 0x2CF
#define MOVE_ACID_DOWNPOUR_S 0x2D0
#define MOVE_TECTONIC_RAGE_P 0x2D1
#define MOVE_TECTONIC_RAGE_S 0x2D2
#define MOVE_CONTINENTAL_CRUSH_P 0x2D3
#define MOVE_CONTINENTAL_CRUSH_S 0x2D4
#define MOVE_SAVAGE_SPIN_OUT_P 0x2D5
#define MOVE_SAVAGE_SPIN_OUT_S 0x2D6
#define MOVE_NEVER_ENDING_NIGHTMARE_P 0x2D7
#define MOVE_NEVER_ENDING_NIGHTMARE_S 0x2D8
#define MOVE_CORKSCREW_CRASH_P 0x2D9
#define MOVE_CORKSCREW_CRASH_S 0x2DA
#define MOVE_INFERNO_OVERDRIVE_P 0x2DB
#define MOVE_INFERNO_OVERDRIVE_S 0x2DC
#define MOVE_HYDRO_VORTEX_P 0x2DD
#define MOVE_HYDRO_VORTEX_S 0x2DE
#define MOVE_BLOOM_DOOM_P 0x2DF
#define MOVE_BLOOM_DOOM_S 0x2E0
#define MOVE_GIGAVOLT_HAVOC_P 0x2E1
#define MOVE_GIGAVOLT_HAVOC_S 0x2E2
#define MOVE_SHATTERED_PSYCHE_P 0x2E3
#define MOVE_SHATTERED_PSYCHE_S 0x2E4
#define MOVE_SUBZERO_SLAMMER_P 0x2E5
#define MOVE_SUBZERO_SLAMMER_S 0x2E6
#define MOVE_DEVASTATING_DRAKE_P 0x2E7
#define MOVE_DEVASTATING_DRAKE_S 0x2E8
#define MOVE_BLACK_HOLE_ECLIPSE_P 0x2E9
#define MOVE_BLACK_HOLE_ECLIPSE_S 0x2EA
#define MOVE_TWINKLE_TACKLE_P 0x2EB
#define MOVE_TWINKLE_TACKLE_S 0x2EC
#define FIRST_Z_MOVE MOVE_BREAKNECK_BLITZ_P
#define LAST_Z_MOVE MOVE_SOUL_STEALING_7_STAR_STRIKE
#define MOVE_CATASTROPIKA 0x2ED
#define MOVE_10000000_VOLT_THUNDERBOLT 0x2EE
#define MOVE_STOKED_SPARKSURFER 0x2EF //Paralyze Target
#define MOVE_EXTREME_EVOBOOST 0x2F0 //Double Ancient Power
#define MOVE_PULVERIZING_PANCAKE 0x2F1
#define MOVE_GENESIS_SUPERNOVA 0x2F2 //Sets up Psychic Terrain
#define MOVE_SINISTER_ARROW_RAID 0x2F3
#define MOVE_MALICIOUS_MOONSAULT 0x2F4
#define MOVE_OCEANIC_OPERETTA 0x2F5
#define MOVE_SPLINTERED_STORMSHARDS 0x2F6 //Removes Terrain
#define MOVE_LETS_SNUGGLE_FOREVER 0x2F7
#define MOVE_CLANGOROUS_SOULBLAZE 0x2F8 //Ancient Power
#define MOVE_GUARDIAN_OF_ALOLA 0x2F9
#define MOVE_SEARING_SUNRAZE_SMASH 0x2FA
#define MOVE_MENACING_MOONRAZE_MAELSTROM 0x2FB
#define MOVE_LIGHT_THAT_BURNS_THE_SKY 0x2FC
#define MOVE_SOUL_STEALING_7_STAR_STRIKE 0x2FD
#define LAST_MOVE_INDEX MOVE_SOUL_STEALING_7_STAR_STRIKE
#define MOVES_COUNT (MOVE_SOUL_STEALING_7_STAR_STRIKE + 1)
#define FIRST_Z_MOVE MOVE_BREAKNECK_BLITZ_P
#define LAST_Z_MOVE MOVE_SOUL_STEALING_7_STAR_STRIKE
//Max Moves
#define MOVE_MAX_GUARD 0x2FE
#define MOVE_MAX_STRIKE_P 0x2FF
#define MOVE_MAX_STRIKE_S 0x300
#define MOVE_MAX_KNUCKLE_P 0x301
#define MOVE_MAX_KNUCKLE_S 0x302
#define MOVE_MAX_AIRSTREAM_P 0x303
#define MOVE_MAX_AIRSTREAM_S 0x304
#define MOVE_MAX_OOZE_P 0x305
#define MOVE_MAX_OOZE_S 0x306
#define MOVE_MAX_QUAKE_P 0x307
#define MOVE_MAX_QUAKE_S 0x308
#define MOVE_MAX_ROCKFALL_P 0x309
#define MOVE_MAX_ROCKFALL_S 0x30A
#define MOVE_MAX_FLUTTERBY_P 0x30B
#define MOVE_MAX_FLUTTERBY_S 0x30C
#define MOVE_MAX_PHANTASM_P 0x30D
#define MOVE_MAX_PHANTASM_S 0x30E
#define MOVE_MAX_STEELSPIKE_P 0x30F
#define MOVE_MAX_STEELSPIKE_S 0x310
#define MOVE_MAX_FLARE_P 0x311
#define MOVE_MAX_FLARE_S 0x312
#define MOVE_MAX_GEYSER_P 0x313
#define MOVE_MAX_GEYSER_S 0x314
#define MOVE_MAX_OVERGROWTH_P 0x315
#define MOVE_MAX_OVERGROWTH_S 0x316
#define MOVE_MAX_LIGHTNING_P 0x317
#define MOVE_MAX_LIGHTNING_S 0x318
#define MOVE_MAX_MINDSTORM_P 0x319
#define MOVE_MAX_MINDSTORM_S 0x31A
#define MOVE_MAX_HAILSTORM_P 0x31B
#define MOVE_MAX_HAILSTORM_S 0x31C
#define MOVE_MAX_WYRMWIND_P 0x31D
#define MOVE_MAX_WYRMWIND_S 0x31E
#define MOVE_MAX_DARKNESS_P 0x31F
#define MOVE_MAX_DARKNESS_S 0x320
#define MOVE_MAX_STARFALL_P 0x321
#define MOVE_MAX_STARFALL_S 0x322
#define MOVE_G_MAX_WILDFIRE_P 0x323
#define MOVE_G_MAX_WILDFIRE_S 0x324
#define MOVE_G_MAX_BEFUDDLE_P 0x325
#define MOVE_G_MAX_BEFUDDLE_S 0x326
#define MOVE_G_MAX_VOLT_CRASH_P 0x327
#define MOVE_G_MAX_VOLT_CRASH_S 0x328
#define MOVE_G_MAX_GOLD_RUSH_P 0x329
#define MOVE_G_MAX_GOLD_RUSH_S 0x32A
#define MOVE_G_MAX_CHI_STRIKE_P 0x32B
#define MOVE_G_MAX_CHI_STRIKE_S 0x32C
#define MOVE_G_MAX_TERROR_P 0x32D
#define MOVE_G_MAX_TERROR_S 0x32E
#define MOVE_G_MAX_FOAM_BURST_P 0x32F
#define MOVE_G_MAX_FOAM_BURST_S 0x330
#define MOVE_G_MAX_RESONANCE_P 0x331
#define MOVE_G_MAX_RESONANCE_S 0x332
#define MOVE_G_MAX_CUDDLE_P 0x333
#define MOVE_G_MAX_CUDDLE_S 0x334
#define MOVE_G_MAX_REPLENISH_P 0x335
#define MOVE_G_MAX_REPLENISH_S 0x336
#define MOVE_G_MAX_MALODOR_P 0x337
#define MOVE_G_MAX_MALODOR_S 0x338
#define MOVE_G_MAX_MELTDOWN_P 0x339
#define MOVE_G_MAX_MELTDOWN_S 0x33A
#define MOVE_G_MAX_STONESURGE_P 0x33B
#define MOVE_G_MAX_STONESURGE_S 0x33C
#define MOVE_G_MAX_WIND_RAGE_P 0x33D
#define MOVE_G_MAX_WIND_RAGE_S 0x33E
#define MOVE_G_MAX_STUN_SHOCK_P 0x33F
#define MOVE_G_MAX_STUN_SHOCK_S 0x340
#define MOVE_G_MAX_FINALE_P 0x341
#define MOVE_G_MAX_FINALE_S 0x342
#define MOVE_G_MAX_DEPLETION_P 0x343
#define MOVE_G_MAX_DEPLETION_S 0x344
#define MOVE_G_MAX_GRAVITAS_P 0x345
#define MOVE_G_MAX_GRAVITAS_S 0x346
#define MOVE_G_MAX_VOLCALITH_P 0x347
#define MOVE_G_MAX_VOLCALITH_S 0x348
#define MOVE_G_MAX_SANDBLAST_P 0x349
#define MOVE_G_MAX_SANDBLAST_S 0x34A
#define MOVE_G_MAX_SNOOZE_P 0x34B
#define MOVE_G_MAX_SNOOZE_S 0x34C
#define MOVE_G_MAX_TARTNESS_P 0x34D
#define MOVE_G_MAX_TARTNESS_S 0x34E
#define MOVE_G_MAX_SWEETNESS_P 0x34F
#define MOVE_G_MAX_SWEETNESS_S 0x350
#define MOVE_G_MAX_SMITE_P 0x351
#define MOVE_G_MAX_SMITE_S 0x352
#define MOVE_G_MAX_STEELSURGE_P 0x353
#define MOVE_G_MAX_STEELSURGE_S 0x354
#define MOVE_G_MAX_CENTIFERNO_P 0x355
#define MOVE_G_MAX_CENTIFERNO_S 0x356
#define FIRST_MAX_MOVE MOVE_MAX_GUARD
#define LAST_MAX_MOVE MOVE_MAX_STARFALL_S
#define FIRST_G_MAX_MOVE MOVE_G_MAX_WILDFIRE_P
#define LAST_G_MAX_MOVE MOVE_G_MAX_CENTIFERNO_S
#define LAST_MOVE_INDEX MOVE_G_MAX_CENTIFERNO_S
#define MOVES_COUNT (MOVE_G_MAX_CENTIFERNO_S + 1)
#define NON_Z_MOVE_COUNT (MOVE_STEELBEAM + 1)