This commit is contained in:
LOuroboros
2022-09-06 10:53:12 -03:00
191 changed files with 39531 additions and 36141 deletions

View File

@@ -147,6 +147,7 @@ struct ProtectStruct
u16 pranksterElevated:1;
u16 quickDraw:1;
u16 beakBlastCharge:1;
u16 quash:1;
u32 physicalDmg;
u32 specialDmg;
u8 physicalBattlerId;
@@ -620,6 +621,9 @@ struct BattleStruct
u8 stickyWebUser;
u8 appearedInBattle; // Bitfield to track which Pokemon appeared in battle. Used for Burmy's form change
u8 skyDropTargets[MAX_BATTLERS_COUNT]; // For Sky Drop, to account for if multiple Pokemon use Sky Drop in a double battle.
// When using a move which hits multiple opponents which is then bounced by a target, we need to make sure, the move hits both opponents, the one with bounce, and the one without.
u8 attackerBeforeBounce:2;
u8 targetsDone[MAX_BATTLERS_COUNT]; // Each battler as a bit.
};
#define F_DYNAMIC_TYPE_1 (1 << 6)
@@ -670,7 +674,7 @@ struct BattleStruct
#define SET_STATCHANGER(statId, stage, goesDown)(gBattleScripting.statChanger = (statId) + ((stage) << 3) + (goesDown << 7))
#define SET_STATCHANGER2(dst, statId, stage, goesDown)(dst = (statId) + ((stage) << 3) + (goesDown << 7))
// NOTE: The members of this struct have hard-coded offsets
// NOTE: The members of this struct have hard-coded offsets
// in include/constants/battle_script_commands.h
struct BattleScripting
{

View File

@@ -124,7 +124,7 @@ void PrepareBattlerSpriteForRotScale(u8 spriteId, u8 objMode);
void SetBattlerSpriteYOffsetFromRotation(u8 spriteId);
u32 GetBattlePalettesMask(bool8 battleBackground, bool8 attacker, bool8 target, bool8 attackerPartner, bool8 targetPartner, bool8 anim1, bool8 anim2);
u32 GetBattleMonSpritePalettesMask(u8 playerLeft, u8 playerRight, u8 opponentLeft, u8 opponentRight);
u8 AnimDummyReturnArg(u8 battler);
u8 GetSpritePalIdxByBattler(u8 battler);
s16 CloneBattlerSpriteWithBlend(u8);
void DestroySpriteWithActiveSheet(struct Sprite *);
u8 CreateInvisibleSpriteCopy(int, u8, int);

View File

@@ -35,22 +35,25 @@ enum
#define TAG_HEALTHBAR_PLAYER2_TILE 0xD706
#define TAG_HEALTHBAR_OPPONENT2_TILE 0xD707
#define TAG_HEALTHBOX_PALS_1 0xD709
#define TAG_HEALTHBOX_PALS_2 0xD70A
#define TAG_HEALTHBOX_SAFARI_TILE 0xD70B
#define TAG_STATUS_SUMMARY_BAR_TILE 0xD70C
#define TAG_STATUS_SUMMARY_BAR_PAL 0xD710
#define TAG_STATUS_SUMMARY_BALLS_PAL 0xD712
#define TAG_STATUS_SUMMARY_BALLS_TILE 0xD714
#define TAG_HEALTHBAR_PAL TAG_HEALTHBAR_PLAYER1_TILE
#define TAG_HEALTHBOX_PAL TAG_HEALTHBOX_PLAYER1_TILE
#define TAG_MEGA_TRIGGER_TILE 0xD777
#define TAG_MEGA_INDICATOR_TILE 0xD778
#define TAG_ALPHA_INDICATOR_TILE 0xD779
#define TAG_OMEGA_INDICATOR_TILE 0xD77A
#define TAG_ZMOVE_TRIGGER_TILE 0xD77B
#define TAG_HEALTHBOX_PAL 0xD6FF
#define TAG_HEALTHBAR_PAL 0xD704
#define TAG_STATUS_SUMMARY_BAR_PAL 0xD710
#define TAG_STATUS_SUMMARY_BALLS_PAL 0xD712
#define TAG_MEGA_TRIGGER_PAL 0xD777
#define TAG_MEGA_INDICATOR_PAL 0xD778
#define TAG_ALPHA_INDICATOR_PAL 0xD779

View File

@@ -781,8 +781,33 @@
#define MOVE_GLACIAL_LANCE 752
#define MOVE_ASTRAL_BARRAGE 753
#define MOVE_EERIE_SPELL 754
// Legends: Arceus Moves
#define MOVE_DIRE_CLAW 755
#define MOVE_PSYSHIELD_BASH 756
#define MOVE_POWER_SHIFT 757
#define MOVE_STONE_AXE 758
#define MOVE_SPRINGTIDE_STORM 759
#define MOVE_MYSTICAL_POWER 760
#define MOVE_RAGING_FURY 761
#define MOVE_WAVE_CRASH 762
#define MOVE_CHLOROBLAST 763
#define MOVE_MOUNTAIN_GALE 764
#define MOVE_VICTORY_DANCE 765
#define MOVE_HEADLONG_RUSH 766
#define MOVE_BARB_BARRAGE 767
#define MOVE_ESPER_WING 768
#define MOVE_BITTER_MALICE 769
#define MOVE_SHELTER 770
#define MOVE_TRIPLE_ARROWS 771
#define MOVE_INFERNAL_PARADE 772
#define MOVE_CEASELESS_EDGE 773
#define MOVE_BLEAKWIND_STORM 774
#define MOVE_WILDBOLT_STORM 775
#define MOVE_SANDSEAR_STORM 776
#define MOVE_LUNAR_BLESSING 777
#define MOVE_TAKE_HEART 778
#define MOVES_COUNT_GEN8 755
#define MOVES_COUNT_GEN8 779
#define MOVES_COUNT MOVES_COUNT_GEN8

View File

@@ -12,38 +12,6 @@
#define AILMENT_PKRS 6
#define AILMENT_FNT 7
#define TUTOR_MOVE_MEGA_PUNCH 0
#define TUTOR_MOVE_SWORDS_DANCE 1
#define TUTOR_MOVE_MEGA_KICK 2
#define TUTOR_MOVE_BODY_SLAM 3
#define TUTOR_MOVE_DOUBLE_EDGE 4
#define TUTOR_MOVE_COUNTER 5
#define TUTOR_MOVE_SEISMIC_TOSS 6
#define TUTOR_MOVE_MIMIC 7
#define TUTOR_MOVE_METRONOME 8
#define TUTOR_MOVE_SOFT_BOILED 9
#define TUTOR_MOVE_DREAM_EATER 10
#define TUTOR_MOVE_THUNDER_WAVE 11
#define TUTOR_MOVE_EXPLOSION 12
#define TUTOR_MOVE_ROCK_SLIDE 13
#define TUTOR_MOVE_SUBSTITUTE 14
#define TUTOR_MOVE_DYNAMIC_PUNCH 15
#define TUTOR_MOVE_ROLLOUT 16
#define TUTOR_MOVE_PSYCH_UP 17
#define TUTOR_MOVE_SNORE 18
#define TUTOR_MOVE_ICY_WIND 19
#define TUTOR_MOVE_ENDURE 20
#define TUTOR_MOVE_MUD_SLAP 21
#define TUTOR_MOVE_ICE_PUNCH 22
#define TUTOR_MOVE_SWAGGER 23
#define TUTOR_MOVE_SLEEP_TALK 24
#define TUTOR_MOVE_SWIFT 25
#define TUTOR_MOVE_DEFENSE_CURL 26
#define TUTOR_MOVE_THUNDER_PUNCH 27
#define TUTOR_MOVE_FIRE_PUNCH 28
#define TUTOR_MOVE_FURY_CUTTER 29
#define TUTOR_MOVE_COUNT 30
#define PARTY_LAYOUT_SINGLE 0
#define PARTY_LAYOUT_DOUBLE 1
#define PARTY_LAYOUT_MULTI 2

View File

@@ -912,12 +912,19 @@ enum {
NATIONAL_DEX_GLASTRIER,
NATIONAL_DEX_SPECTRIER,
NATIONAL_DEX_CALYREX,
NATIONAL_DEX_WYRDEER,
NATIONAL_DEX_KLEAVOR,
NATIONAL_DEX_URSALUNA,
NATIONAL_DEX_BASCULEGION,
NATIONAL_DEX_SNEASLER,
NATIONAL_DEX_OVERQWIL,
NATIONAL_DEX_ENAMORUS,
};
#define KANTO_DEX_COUNT NATIONAL_DEX_MEW
#define JOHTO_DEX_COUNT NATIONAL_DEX_CELEBI
#if P_NEW_POKEMON == TRUE
#define NATIONAL_DEX_COUNT NATIONAL_DEX_CALYREX
#define NATIONAL_DEX_COUNT NATIONAL_DEX_ENAMORUS
#else
#define NATIONAL_DEX_COUNT NATIONAL_DEX_DEOXYS
#endif

View File

@@ -350,7 +350,8 @@
#define FLAG_ULTRA_BEAST (1 << 2)
#define FLAG_ALOLAN_FORM (1 << 3)
#define FLAG_GALARIAN_FORM (1 << 4)
#define FLAG_GENDER_DIFFERENCE (1 << 5)
#define FLAG_HISUIAN_FORM (1 << 5)
#define FLAG_GENDER_DIFFERENCE (1 << 6)
#define LEGENDARY_PERFECT_IV_COUNT 3

View File

@@ -902,6 +902,13 @@
#define SPECIES_GLASTRIER 896
#define SPECIES_SPECTRIER 897
#define SPECIES_CALYREX 898
#define SPECIES_WYRDEER 899
#define SPECIES_KLEAVOR 900
#define SPECIES_URSALUNA 901
#define SPECIES_BASCULEGION 902
#define SPECIES_SNEASLER 903
#define SPECIES_OVERQWIL 904
#define SPECIES_ENAMORUS 905
// Megas
#define SPECIES_VENUSAUR_MEGA FORMS_START + 1
@@ -998,68 +1005,86 @@
#define SPECIES_YAMASK_GALARIAN FORMS_START + 86
#define SPECIES_STUNFISK_GALARIAN FORMS_START + 87
//Hisuian Forms
#define SPECIES_GROWLITHE_HISUIAN FORMS_START + 88
#define SPECIES_ARCANINE_HISUIAN FORMS_START + 89
#define SPECIES_VOLTORB_HISUIAN FORMS_START + 90
#define SPECIES_ELECTRODE_HISUIAN FORMS_START + 91
#define SPECIES_TYPHLOSION_HISUIAN FORMS_START + 92
#define SPECIES_QWILFISH_HISUIAN FORMS_START + 93
#define SPECIES_SNEASEL_HISUIAN FORMS_START + 94
#define SPECIES_SAMUROTT_HISUIAN FORMS_START + 95
#define SPECIES_LILLIGANT_HISUIAN FORMS_START + 96
#define SPECIES_ZORUA_HISUIAN FORMS_START + 97
#define SPECIES_ZOROARK_HISUIAN FORMS_START + 98
#define SPECIES_BRAVIARY_HISUIAN FORMS_START + 99
#define SPECIES_SLIGGOO_HISUIAN FORMS_START + 100
#define SPECIES_GOODRA_HISUIAN FORMS_START + 101
#define SPECIES_AVALUGG_HISUIAN FORMS_START + 102
#define SPECIES_DECIDUEYE_HISUIAN FORMS_START + 103
// Misc Forms
// Cosplay Pikachu
#define SPECIES_PIKACHU_COSPLAY FORMS_START + 88
#define SPECIES_PIKACHU_ROCK_STAR FORMS_START + 89
#define SPECIES_PIKACHU_BELLE FORMS_START + 90
#define SPECIES_PIKACHU_POP_STAR FORMS_START + 91
#define SPECIES_PIKACHU_PH_D FORMS_START + 92
#define SPECIES_PIKACHU_LIBRE FORMS_START + 93
#define SPECIES_PIKACHU_COSPLAY FORMS_START + 104
#define SPECIES_PIKACHU_ROCK_STAR FORMS_START + 105
#define SPECIES_PIKACHU_BELLE FORMS_START + 106
#define SPECIES_PIKACHU_POP_STAR FORMS_START + 107
#define SPECIES_PIKACHU_PH_D FORMS_START + 108
#define SPECIES_PIKACHU_LIBRE FORMS_START + 109
// Cap Pikachu
#define SPECIES_PIKACHU_ORIGINAL_CAP FORMS_START + 94
#define SPECIES_PIKACHU_HOENN_CAP FORMS_START + 95
#define SPECIES_PIKACHU_SINNOH_CAP FORMS_START + 96
#define SPECIES_PIKACHU_UNOVA_CAP FORMS_START + 97
#define SPECIES_PIKACHU_KALOS_CAP FORMS_START + 98
#define SPECIES_PIKACHU_ALOLA_CAP FORMS_START + 99
#define SPECIES_PIKACHU_PARTNER_CAP FORMS_START + 100
#define SPECIES_PIKACHU_WORLD_CAP FORMS_START + 101
#define SPECIES_PIKACHU_ORIGINAL_CAP FORMS_START + 110
#define SPECIES_PIKACHU_HOENN_CAP FORMS_START + 111
#define SPECIES_PIKACHU_SINNOH_CAP FORMS_START + 112
#define SPECIES_PIKACHU_UNOVA_CAP FORMS_START + 113
#define SPECIES_PIKACHU_KALOS_CAP FORMS_START + 114
#define SPECIES_PIKACHU_ALOLA_CAP FORMS_START + 115
#define SPECIES_PIKACHU_PARTNER_CAP FORMS_START + 116
#define SPECIES_PIKACHU_WORLD_CAP FORMS_START + 117
// Pichu
#define SPECIES_PICHU_SPIKY_EARED FORMS_START + 102
#define SPECIES_PICHU_SPIKY_EARED FORMS_START + 118
#if P_NEW_POKEMON == TRUE
// Unown
#define SPECIES_UNOWN_B FORMS_START + 103
#define SPECIES_UNOWN_C FORMS_START + 104
#define SPECIES_UNOWN_D FORMS_START + 105
#define SPECIES_UNOWN_E FORMS_START + 106
#define SPECIES_UNOWN_F FORMS_START + 107
#define SPECIES_UNOWN_G FORMS_START + 108
#define SPECIES_UNOWN_H FORMS_START + 109
#define SPECIES_UNOWN_I FORMS_START + 110
#define SPECIES_UNOWN_J FORMS_START + 111
#define SPECIES_UNOWN_K FORMS_START + 112
#define SPECIES_UNOWN_L FORMS_START + 113
#define SPECIES_UNOWN_M FORMS_START + 114
#define SPECIES_UNOWN_N FORMS_START + 115
#define SPECIES_UNOWN_O FORMS_START + 116
#define SPECIES_UNOWN_P FORMS_START + 117
#define SPECIES_UNOWN_Q FORMS_START + 118
#define SPECIES_UNOWN_R FORMS_START + 119
#define SPECIES_UNOWN_S FORMS_START + 120
#define SPECIES_UNOWN_T FORMS_START + 121
#define SPECIES_UNOWN_U FORMS_START + 122
#define SPECIES_UNOWN_V FORMS_START + 123
#define SPECIES_UNOWN_W FORMS_START + 124
#define SPECIES_UNOWN_X FORMS_START + 125
#define SPECIES_UNOWN_Y FORMS_START + 126
#define SPECIES_UNOWN_Z FORMS_START + 127
#define SPECIES_UNOWN_EMARK FORMS_START + 128
#define SPECIES_UNOWN_QMARK FORMS_START + 129
#define SPECIES_UNOWN_B FORMS_START + 119
#define SPECIES_UNOWN_C FORMS_START + 120
#define SPECIES_UNOWN_D FORMS_START + 121
#define SPECIES_UNOWN_E FORMS_START + 122
#define SPECIES_UNOWN_F FORMS_START + 123
#define SPECIES_UNOWN_G FORMS_START + 124
#define SPECIES_UNOWN_H FORMS_START + 125
#define SPECIES_UNOWN_I FORMS_START + 126
#define SPECIES_UNOWN_J FORMS_START + 127
#define SPECIES_UNOWN_K FORMS_START + 128
#define SPECIES_UNOWN_L FORMS_START + 129
#define SPECIES_UNOWN_M FORMS_START + 130
#define SPECIES_UNOWN_N FORMS_START + 131
#define SPECIES_UNOWN_O FORMS_START + 132
#define SPECIES_UNOWN_P FORMS_START + 133
#define SPECIES_UNOWN_Q FORMS_START + 134
#define SPECIES_UNOWN_R FORMS_START + 135
#define SPECIES_UNOWN_S FORMS_START + 136
#define SPECIES_UNOWN_T FORMS_START + 137
#define SPECIES_UNOWN_U FORMS_START + 138
#define SPECIES_UNOWN_V FORMS_START + 139
#define SPECIES_UNOWN_W FORMS_START + 140
#define SPECIES_UNOWN_X FORMS_START + 141
#define SPECIES_UNOWN_Y FORMS_START + 142
#define SPECIES_UNOWN_Z FORMS_START + 143
#define SPECIES_UNOWN_EMARK FORMS_START + 144
#define SPECIES_UNOWN_QMARK FORMS_START + 145
// Castform
#define SPECIES_CASTFORM_SUNNY FORMS_START + 130
#define SPECIES_CASTFORM_RAINY FORMS_START + 131
#define SPECIES_CASTFORM_SNOWY FORMS_START + 132
#define SPECIES_CASTFORM_SUNNY FORMS_START + 146
#define SPECIES_CASTFORM_RAINY FORMS_START + 147
#define SPECIES_CASTFORM_SNOWY FORMS_START + 148
// Deoxys
#define SPECIES_DEOXYS_ATTACK FORMS_START + 133
#define SPECIES_DEOXYS_DEFENSE FORMS_START + 134
#define SPECIES_DEOXYS_SPEED FORMS_START + 135
#define SPECIES_DEOXYS_ATTACK FORMS_START + 149
#define SPECIES_DEOXYS_DEFENSE FORMS_START + 150
#define SPECIES_DEOXYS_SPEED FORMS_START + 151
#else
// Unown
@@ -1103,288 +1128,292 @@
#endif
// Burmy
#define SPECIES_BURMY_SANDY_CLOAK FORMS_START + 136
#define SPECIES_BURMY_TRASH_CLOAK FORMS_START + 137
#define SPECIES_BURMY_SANDY_CLOAK FORMS_START + 152
#define SPECIES_BURMY_TRASH_CLOAK FORMS_START + 153
// Wormadam
#define SPECIES_WORMADAM_SANDY_CLOAK FORMS_START + 138
#define SPECIES_WORMADAM_TRASH_CLOAK FORMS_START + 139
#define SPECIES_WORMADAM_SANDY_CLOAK FORMS_START + 154
#define SPECIES_WORMADAM_TRASH_CLOAK FORMS_START + 155
// Cherrim
#define SPECIES_CHERRIM_SUNSHINE FORMS_START + 140
#define SPECIES_CHERRIM_SUNSHINE FORMS_START + 156
// Shellos
#define SPECIES_SHELLOS_EAST_SEA FORMS_START + 141
#define SPECIES_SHELLOS_EAST_SEA FORMS_START + 157
// Gastrodon
#define SPECIES_GASTRODON_EAST_SEA FORMS_START + 142
#define SPECIES_GASTRODON_EAST_SEA FORMS_START + 158
// Rotom
#define SPECIES_ROTOM_HEAT FORMS_START + 143
#define SPECIES_ROTOM_WASH FORMS_START + 144
#define SPECIES_ROTOM_FROST FORMS_START + 145
#define SPECIES_ROTOM_FAN FORMS_START + 146
#define SPECIES_ROTOM_MOW FORMS_START + 147
#define SPECIES_ROTOM_HEAT FORMS_START + 159
#define SPECIES_ROTOM_WASH FORMS_START + 160
#define SPECIES_ROTOM_FROST FORMS_START + 161
#define SPECIES_ROTOM_FAN FORMS_START + 162
#define SPECIES_ROTOM_MOW FORMS_START + 163
// Giratina
#define SPECIES_GIRATINA_ORIGIN FORMS_START + 148
// Origin Forme
#define SPECIES_DIALGA_ORIGIN FORMS_START + 164
#define SPECIES_PALKIA_ORIGIN FORMS_START + 165
#define SPECIES_GIRATINA_ORIGIN FORMS_START + 166
// Shaymin
#define SPECIES_SHAYMIN_SKY FORMS_START + 149
#define SPECIES_SHAYMIN_SKY FORMS_START + 167
// Arceus
#define SPECIES_ARCEUS_FIGHTING FORMS_START + 150
#define SPECIES_ARCEUS_FLYING FORMS_START + 151
#define SPECIES_ARCEUS_POISON FORMS_START + 152
#define SPECIES_ARCEUS_GROUND FORMS_START + 153
#define SPECIES_ARCEUS_ROCK FORMS_START + 154
#define SPECIES_ARCEUS_BUG FORMS_START + 155
#define SPECIES_ARCEUS_GHOST FORMS_START + 156
#define SPECIES_ARCEUS_STEEL FORMS_START + 157
#define SPECIES_ARCEUS_FIRE FORMS_START + 158
#define SPECIES_ARCEUS_WATER FORMS_START + 159
#define SPECIES_ARCEUS_GRASS FORMS_START + 160
#define SPECIES_ARCEUS_ELECTRIC FORMS_START + 161
#define SPECIES_ARCEUS_PSYCHIC FORMS_START + 162
#define SPECIES_ARCEUS_ICE FORMS_START + 163
#define SPECIES_ARCEUS_DRAGON FORMS_START + 164
#define SPECIES_ARCEUS_DARK FORMS_START + 165
#define SPECIES_ARCEUS_FAIRY FORMS_START + 166
#define SPECIES_ARCEUS_FIGHTING FORMS_START + 168
#define SPECIES_ARCEUS_FLYING FORMS_START + 169
#define SPECIES_ARCEUS_POISON FORMS_START + 170
#define SPECIES_ARCEUS_GROUND FORMS_START + 171
#define SPECIES_ARCEUS_ROCK FORMS_START + 172
#define SPECIES_ARCEUS_BUG FORMS_START + 173
#define SPECIES_ARCEUS_GHOST FORMS_START + 174
#define SPECIES_ARCEUS_STEEL FORMS_START + 175
#define SPECIES_ARCEUS_FIRE FORMS_START + 176
#define SPECIES_ARCEUS_WATER FORMS_START + 177
#define SPECIES_ARCEUS_GRASS FORMS_START + 178
#define SPECIES_ARCEUS_ELECTRIC FORMS_START + 179
#define SPECIES_ARCEUS_PSYCHIC FORMS_START + 180
#define SPECIES_ARCEUS_ICE FORMS_START + 181
#define SPECIES_ARCEUS_DRAGON FORMS_START + 182
#define SPECIES_ARCEUS_DARK FORMS_START + 183
#define SPECIES_ARCEUS_FAIRY FORMS_START + 184
// Basculin
#define SPECIES_BASCULIN_BLUE_STRIPED FORMS_START + 167
#define SPECIES_BASCULIN_BLUE_STRIPED FORMS_START + 185
#define SPECIES_BASCULIN_WHITE_STRIPED FORMS_START + 186
// Darmanitan
#define SPECIES_DARMANITAN_ZEN_MODE FORMS_START + 168
#define SPECIES_DARMANITAN_ZEN_MODE_GALARIAN FORMS_START + 169
#define SPECIES_DARMANITAN_ZEN_MODE FORMS_START + 187
#define SPECIES_DARMANITAN_ZEN_MODE_GALARIAN FORMS_START + 188
// Deerling
#define SPECIES_DEERLING_SUMMER FORMS_START + 170
#define SPECIES_DEERLING_AUTUMN FORMS_START + 171
#define SPECIES_DEERLING_WINTER FORMS_START + 172
#define SPECIES_DEERLING_SUMMER FORMS_START + 189
#define SPECIES_DEERLING_AUTUMN FORMS_START + 190
#define SPECIES_DEERLING_WINTER FORMS_START + 191
// Sawsbuck
#define SPECIES_SAWSBUCK_SUMMER FORMS_START + 173
#define SPECIES_SAWSBUCK_AUTUMN FORMS_START + 174
#define SPECIES_SAWSBUCK_WINTER FORMS_START + 175
#define SPECIES_SAWSBUCK_SUMMER FORMS_START + 192
#define SPECIES_SAWSBUCK_AUTUMN FORMS_START + 193
#define SPECIES_SAWSBUCK_WINTER FORMS_START + 194
// Therian Forms
#define SPECIES_TORNADUS_THERIAN FORMS_START + 176
#define SPECIES_THUNDURUS_THERIAN FORMS_START + 177
#define SPECIES_LANDORUS_THERIAN FORMS_START + 178
#define SPECIES_TORNADUS_THERIAN FORMS_START + 195
#define SPECIES_THUNDURUS_THERIAN FORMS_START + 196
#define SPECIES_LANDORUS_THERIAN FORMS_START + 197
#define SPECIES_ENAMORUS_THERIAN FORMS_START + 198
// Kyurem
#define SPECIES_KYUREM_WHITE FORMS_START + 179
#define SPECIES_KYUREM_BLACK FORMS_START + 180
#define SPECIES_KYUREM_WHITE FORMS_START + 199
#define SPECIES_KYUREM_BLACK FORMS_START + 200
// Keldeo
#define SPECIES_KELDEO_RESOLUTE FORMS_START + 181
#define SPECIES_KELDEO_RESOLUTE FORMS_START + 201
// Meloetta
#define SPECIES_MELOETTA_PIROUETTE FORMS_START + 182
#define SPECIES_MELOETTA_PIROUETTE FORMS_START + 202
// Genesect
#define SPECIES_GENESECT_DOUSE_DRIVE FORMS_START + 183
#define SPECIES_GENESECT_SHOCK_DRIVE FORMS_START + 184
#define SPECIES_GENESECT_BURN_DRIVE FORMS_START + 185
#define SPECIES_GENESECT_CHILL_DRIVE FORMS_START + 186
#define SPECIES_GENESECT_DOUSE_DRIVE FORMS_START + 203
#define SPECIES_GENESECT_SHOCK_DRIVE FORMS_START + 204
#define SPECIES_GENESECT_BURN_DRIVE FORMS_START + 205
#define SPECIES_GENESECT_CHILL_DRIVE FORMS_START + 206
// Greninja
#define SPECIES_GRENINJA_BATTLE_BOND FORMS_START + 187
#define SPECIES_GRENINJA_ASH FORMS_START + 188
#define SPECIES_GRENINJA_BATTLE_BOND FORMS_START + 207
#define SPECIES_GRENINJA_ASH FORMS_START + 208
// Vivillon
#define SPECIES_VIVILLON_POLAR FORMS_START + 189
#define SPECIES_VIVILLON_TUNDRA FORMS_START + 190
#define SPECIES_VIVILLON_CONTINENTAL FORMS_START + 191
#define SPECIES_VIVILLON_GARDEN FORMS_START + 192
#define SPECIES_VIVILLON_ELEGANT FORMS_START + 193
#define SPECIES_VIVILLON_MEADOW FORMS_START + 194
#define SPECIES_VIVILLON_MODERN FORMS_START + 195
#define SPECIES_VIVILLON_MARINE FORMS_START + 196
#define SPECIES_VIVILLON_ARCHIPELAGO FORMS_START + 197
#define SPECIES_VIVILLON_HIGH_PLAINS FORMS_START + 198
#define SPECIES_VIVILLON_SANDSTORM FORMS_START + 199
#define SPECIES_VIVILLON_RIVER FORMS_START + 200
#define SPECIES_VIVILLON_MONSOON FORMS_START + 201
#define SPECIES_VIVILLON_SAVANNA FORMS_START + 202
#define SPECIES_VIVILLON_SUN FORMS_START + 203
#define SPECIES_VIVILLON_OCEAN FORMS_START + 204
#define SPECIES_VIVILLON_JUNGLE FORMS_START + 205
#define SPECIES_VIVILLON_FANCY FORMS_START + 206
#define SPECIES_VIVILLON_POKE_BALL FORMS_START + 207
#define SPECIES_VIVILLON_POLAR FORMS_START + 209
#define SPECIES_VIVILLON_TUNDRA FORMS_START + 210
#define SPECIES_VIVILLON_CONTINENTAL FORMS_START + 211
#define SPECIES_VIVILLON_GARDEN FORMS_START + 212
#define SPECIES_VIVILLON_ELEGANT FORMS_START + 213
#define SPECIES_VIVILLON_MEADOW FORMS_START + 214
#define SPECIES_VIVILLON_MODERN FORMS_START + 215
#define SPECIES_VIVILLON_MARINE FORMS_START + 216
#define SPECIES_VIVILLON_ARCHIPELAGO FORMS_START + 217
#define SPECIES_VIVILLON_HIGH_PLAINS FORMS_START + 218
#define SPECIES_VIVILLON_SANDSTORM FORMS_START + 219
#define SPECIES_VIVILLON_RIVER FORMS_START + 220
#define SPECIES_VIVILLON_MONSOON FORMS_START + 221
#define SPECIES_VIVILLON_SAVANNA FORMS_START + 222
#define SPECIES_VIVILLON_SUN FORMS_START + 223
#define SPECIES_VIVILLON_OCEAN FORMS_START + 224
#define SPECIES_VIVILLON_JUNGLE FORMS_START + 225
#define SPECIES_VIVILLON_FANCY FORMS_START + 226
#define SPECIES_VIVILLON_POKE_BALL FORMS_START + 227
// Flabébé
#define SPECIES_FLABEBE_YELLOW_FLOWER FORMS_START + 208
#define SPECIES_FLABEBE_ORANGE_FLOWER FORMS_START + 209
#define SPECIES_FLABEBE_BLUE_FLOWER FORMS_START + 210
#define SPECIES_FLABEBE_WHITE_FLOWER FORMS_START + 211
#define SPECIES_FLABEBE_YELLOW_FLOWER FORMS_START + 228
#define SPECIES_FLABEBE_ORANGE_FLOWER FORMS_START + 229
#define SPECIES_FLABEBE_BLUE_FLOWER FORMS_START + 230
#define SPECIES_FLABEBE_WHITE_FLOWER FORMS_START + 231
// Floette
#define SPECIES_FLOETTE_YELLOW_FLOWER FORMS_START + 212
#define SPECIES_FLOETTE_ORANGE_FLOWER FORMS_START + 213
#define SPECIES_FLOETTE_BLUE_FLOWER FORMS_START + 214
#define SPECIES_FLOETTE_WHITE_FLOWER FORMS_START + 215
#define SPECIES_FLOETTE_ETERNAL_FLOWER FORMS_START + 216
#define SPECIES_FLOETTE_YELLOW_FLOWER FORMS_START + 232
#define SPECIES_FLOETTE_ORANGE_FLOWER FORMS_START + 233
#define SPECIES_FLOETTE_BLUE_FLOWER FORMS_START + 234
#define SPECIES_FLOETTE_WHITE_FLOWER FORMS_START + 235
#define SPECIES_FLOETTE_ETERNAL_FLOWER FORMS_START + 236
// Florges
#define SPECIES_FLORGES_YELLOW_FLOWER FORMS_START + 217
#define SPECIES_FLORGES_ORANGE_FLOWER FORMS_START + 218
#define SPECIES_FLORGES_BLUE_FLOWER FORMS_START + 219
#define SPECIES_FLORGES_WHITE_FLOWER FORMS_START + 220
#define SPECIES_FLORGES_YELLOW_FLOWER FORMS_START + 237
#define SPECIES_FLORGES_ORANGE_FLOWER FORMS_START + 238
#define SPECIES_FLORGES_BLUE_FLOWER FORMS_START + 239
#define SPECIES_FLORGES_WHITE_FLOWER FORMS_START + 240
// Furfrou
#define SPECIES_FURFROU_HEART_TRIM FORMS_START + 221
#define SPECIES_FURFROU_STAR_TRIM FORMS_START + 222
#define SPECIES_FURFROU_DIAMOND_TRIM FORMS_START + 223
#define SPECIES_FURFROU_DEBUTANTE_TRIM FORMS_START + 224
#define SPECIES_FURFROU_MATRON_TRIM FORMS_START + 225
#define SPECIES_FURFROU_DANDY_TRIM FORMS_START + 226
#define SPECIES_FURFROU_LA_REINE_TRIM FORMS_START + 227
#define SPECIES_FURFROU_KABUKI_TRIM FORMS_START + 228
#define SPECIES_FURFROU_PHARAOH_TRIM FORMS_START + 229
#define SPECIES_FURFROU_HEART_TRIM FORMS_START + 241
#define SPECIES_FURFROU_STAR_TRIM FORMS_START + 242
#define SPECIES_FURFROU_DIAMOND_TRIM FORMS_START + 243
#define SPECIES_FURFROU_DEBUTANTE_TRIM FORMS_START + 244
#define SPECIES_FURFROU_MATRON_TRIM FORMS_START + 245
#define SPECIES_FURFROU_DANDY_TRIM FORMS_START + 246
#define SPECIES_FURFROU_LA_REINE_TRIM FORMS_START + 247
#define SPECIES_FURFROU_KABUKI_TRIM FORMS_START + 248
#define SPECIES_FURFROU_PHARAOH_TRIM FORMS_START + 249
// Meowstic
#define SPECIES_MEOWSTIC_FEMALE FORMS_START + 230
#define SPECIES_MEOWSTIC_FEMALE FORMS_START + 250
// Aegislash
#define SPECIES_AEGISLASH_BLADE FORMS_START + 231
#define SPECIES_AEGISLASH_BLADE FORMS_START + 251
// Pumpkaboo
#define SPECIES_PUMPKABOO_SMALL FORMS_START + 232
#define SPECIES_PUMPKABOO_LARGE FORMS_START + 233
#define SPECIES_PUMPKABOO_SUPER FORMS_START + 234
#define SPECIES_PUMPKABOO_SMALL FORMS_START + 252
#define SPECIES_PUMPKABOO_LARGE FORMS_START + 253
#define SPECIES_PUMPKABOO_SUPER FORMS_START + 254
// Gourgeist
#define SPECIES_GOURGEIST_SMALL FORMS_START + 235
#define SPECIES_GOURGEIST_LARGE FORMS_START + 236
#define SPECIES_GOURGEIST_SUPER FORMS_START + 237
#define SPECIES_GOURGEIST_SMALL FORMS_START + 255
#define SPECIES_GOURGEIST_LARGE FORMS_START + 256
#define SPECIES_GOURGEIST_SUPER FORMS_START + 257
// Xerneas
#define SPECIES_XERNEAS_ACTIVE FORMS_START + 238
#define SPECIES_XERNEAS_ACTIVE FORMS_START + 258
// Zygarde
#define SPECIES_ZYGARDE_10 FORMS_START + 239
#define SPECIES_ZYGARDE_10_POWER_CONSTRUCT FORMS_START + 240
#define SPECIES_ZYGARDE_50_POWER_CONSTRUCT FORMS_START + 241
#define SPECIES_ZYGARDE_COMPLETE FORMS_START + 242
#define SPECIES_ZYGARDE_10 FORMS_START + 259
#define SPECIES_ZYGARDE_10_POWER_CONSTRUCT FORMS_START + 260
#define SPECIES_ZYGARDE_50_POWER_CONSTRUCT FORMS_START + 261
#define SPECIES_ZYGARDE_COMPLETE FORMS_START + 262
// Hoopa
#define SPECIES_HOOPA_UNBOUND FORMS_START + 243
#define SPECIES_HOOPA_UNBOUND FORMS_START + 263
// Oricorio
#define SPECIES_ORICORIO_POM_POM FORMS_START + 244
#define SPECIES_ORICORIO_PAU FORMS_START + 245
#define SPECIES_ORICORIO_SENSU FORMS_START + 246
#define SPECIES_ORICORIO_POM_POM FORMS_START + 264
#define SPECIES_ORICORIO_PAU FORMS_START + 265
#define SPECIES_ORICORIO_SENSU FORMS_START + 266
// Rockruff
#define SPECIES_ROCKRUFF_OWN_TEMPO FORMS_START + 247
#define SPECIES_ROCKRUFF_OWN_TEMPO FORMS_START + 267
// Lycanroc
#define SPECIES_LYCANROC_MIDNIGHT FORMS_START + 248
#define SPECIES_LYCANROC_DUSK FORMS_START + 249
#define SPECIES_LYCANROC_MIDNIGHT FORMS_START + 268
#define SPECIES_LYCANROC_DUSK FORMS_START + 269
// Wishiwashi
#define SPECIES_WISHIWASHI_SCHOOL FORMS_START + 250
#define SPECIES_WISHIWASHI_SCHOOL FORMS_START + 270
// Silvally
#define SPECIES_SILVALLY_FIGHTING FORMS_START + 251
#define SPECIES_SILVALLY_FLYING FORMS_START + 252
#define SPECIES_SILVALLY_POISON FORMS_START + 253
#define SPECIES_SILVALLY_GROUND FORMS_START + 254
#define SPECIES_SILVALLY_ROCK FORMS_START + 255
#define SPECIES_SILVALLY_BUG FORMS_START + 256
#define SPECIES_SILVALLY_GHOST FORMS_START + 257
#define SPECIES_SILVALLY_STEEL FORMS_START + 258
#define SPECIES_SILVALLY_FIRE FORMS_START + 259
#define SPECIES_SILVALLY_WATER FORMS_START + 260
#define SPECIES_SILVALLY_GRASS FORMS_START + 261
#define SPECIES_SILVALLY_ELECTRIC FORMS_START + 262
#define SPECIES_SILVALLY_PSYCHIC FORMS_START + 263
#define SPECIES_SILVALLY_ICE FORMS_START + 264
#define SPECIES_SILVALLY_DRAGON FORMS_START + 265
#define SPECIES_SILVALLY_DARK FORMS_START + 266
#define SPECIES_SILVALLY_FAIRY FORMS_START + 267
#define SPECIES_SILVALLY_FIGHTING FORMS_START + 271
#define SPECIES_SILVALLY_FLYING FORMS_START + 272
#define SPECIES_SILVALLY_POISON FORMS_START + 273
#define SPECIES_SILVALLY_GROUND FORMS_START + 274
#define SPECIES_SILVALLY_ROCK FORMS_START + 275
#define SPECIES_SILVALLY_BUG FORMS_START + 276
#define SPECIES_SILVALLY_GHOST FORMS_START + 277
#define SPECIES_SILVALLY_STEEL FORMS_START + 278
#define SPECIES_SILVALLY_FIRE FORMS_START + 279
#define SPECIES_SILVALLY_WATER FORMS_START + 280
#define SPECIES_SILVALLY_GRASS FORMS_START + 281
#define SPECIES_SILVALLY_ELECTRIC FORMS_START + 282
#define SPECIES_SILVALLY_PSYCHIC FORMS_START + 283
#define SPECIES_SILVALLY_ICE FORMS_START + 284
#define SPECIES_SILVALLY_DRAGON FORMS_START + 285
#define SPECIES_SILVALLY_DARK FORMS_START + 286
#define SPECIES_SILVALLY_FAIRY FORMS_START + 287
// Minior
#define SPECIES_MINIOR_METEOR_ORANGE FORMS_START + 268
#define SPECIES_MINIOR_METEOR_YELLOW FORMS_START + 269
#define SPECIES_MINIOR_METEOR_GREEN FORMS_START + 270
#define SPECIES_MINIOR_METEOR_BLUE FORMS_START + 271
#define SPECIES_MINIOR_METEOR_INDIGO FORMS_START + 272
#define SPECIES_MINIOR_METEOR_VIOLET FORMS_START + 273
#define SPECIES_MINIOR_CORE_RED FORMS_START + 274
#define SPECIES_MINIOR_CORE_ORANGE FORMS_START + 275
#define SPECIES_MINIOR_CORE_YELLOW FORMS_START + 276
#define SPECIES_MINIOR_CORE_GREEN FORMS_START + 277
#define SPECIES_MINIOR_CORE_BLUE FORMS_START + 278
#define SPECIES_MINIOR_CORE_INDIGO FORMS_START + 279
#define SPECIES_MINIOR_CORE_VIOLET FORMS_START + 280
#define SPECIES_MINIOR_METEOR_ORANGE FORMS_START + 288
#define SPECIES_MINIOR_METEOR_YELLOW FORMS_START + 289
#define SPECIES_MINIOR_METEOR_GREEN FORMS_START + 290
#define SPECIES_MINIOR_METEOR_BLUE FORMS_START + 291
#define SPECIES_MINIOR_METEOR_INDIGO FORMS_START + 292
#define SPECIES_MINIOR_METEOR_VIOLET FORMS_START + 293
#define SPECIES_MINIOR_CORE_RED FORMS_START + 294
#define SPECIES_MINIOR_CORE_ORANGE FORMS_START + 295
#define SPECIES_MINIOR_CORE_YELLOW FORMS_START + 296
#define SPECIES_MINIOR_CORE_GREEN FORMS_START + 297
#define SPECIES_MINIOR_CORE_BLUE FORMS_START + 298
#define SPECIES_MINIOR_CORE_INDIGO FORMS_START + 299
#define SPECIES_MINIOR_CORE_VIOLET FORMS_START + 300
// Mimikyu
#define SPECIES_MIMIKYU_BUSTED FORMS_START + 281
#define SPECIES_MIMIKYU_BUSTED FORMS_START + 301
// Necrozma
#define SPECIES_NECROZMA_DUSK_MANE FORMS_START + 282
#define SPECIES_NECROZMA_DAWN_WINGS FORMS_START + 283
#define SPECIES_NECROZMA_ULTRA FORMS_START + 284
#define SPECIES_NECROZMA_DUSK_MANE FORMS_START + 302
#define SPECIES_NECROZMA_DAWN_WINGS FORMS_START + 303
#define SPECIES_NECROZMA_ULTRA FORMS_START + 304
// Magearna
#define SPECIES_MAGEARNA_ORIGINAL_COLOR FORMS_START + 285
#define SPECIES_MAGEARNA_ORIGINAL_COLOR FORMS_START + 305
// Cramorant
#define SPECIES_CRAMORANT_GULPING FORMS_START + 286
#define SPECIES_CRAMORANT_GORGING FORMS_START + 287
#define SPECIES_CRAMORANT_GULPING FORMS_START + 306
#define SPECIES_CRAMORANT_GORGING FORMS_START + 307
// Toxtricity
#define SPECIES_TOXTRICITY_LOW_KEY FORMS_START + 288
#define SPECIES_TOXTRICITY_LOW_KEY FORMS_START + 308
// Sinistea
#define SPECIES_SINISTEA_ANTIQUE FORMS_START + 289
#define SPECIES_SINISTEA_ANTIQUE FORMS_START + 309
// Polteageist
#define SPECIES_POLTEAGEIST_ANTIQUE FORMS_START + 290
#define SPECIES_POLTEAGEIST_ANTIQUE FORMS_START + 310
// Alcremie
#define SPECIES_ALCREMIE_RUBY_CREAM FORMS_START + 291
#define SPECIES_ALCREMIE_MATCHA_CREAM FORMS_START + 292
#define SPECIES_ALCREMIE_MINT_CREAM FORMS_START + 293
#define SPECIES_ALCREMIE_LEMON_CREAM FORMS_START + 294
#define SPECIES_ALCREMIE_SALTED_CREAM FORMS_START + 295
#define SPECIES_ALCREMIE_RUBY_SWIRL FORMS_START + 296
#define SPECIES_ALCREMIE_CARAMEL_SWIRL FORMS_START + 297
#define SPECIES_ALCREMIE_RAINBOW_SWIRL FORMS_START + 298
#define SPECIES_ALCREMIE_RUBY_CREAM FORMS_START + 311
#define SPECIES_ALCREMIE_MATCHA_CREAM FORMS_START + 312
#define SPECIES_ALCREMIE_MINT_CREAM FORMS_START + 313
#define SPECIES_ALCREMIE_LEMON_CREAM FORMS_START + 314
#define SPECIES_ALCREMIE_SALTED_CREAM FORMS_START + 315
#define SPECIES_ALCREMIE_RUBY_SWIRL FORMS_START + 316
#define SPECIES_ALCREMIE_CARAMEL_SWIRL FORMS_START + 317
#define SPECIES_ALCREMIE_RAINBOW_SWIRL FORMS_START + 318
// Eiscue
#define SPECIES_EISCUE_NOICE_FACE FORMS_START + 299
#define SPECIES_EISCUE_NOICE_FACE FORMS_START + 319
// Indeedee
#define SPECIES_INDEEDEE_FEMALE FORMS_START + 300
#define SPECIES_INDEEDEE_FEMALE FORMS_START + 320
// Morpeko
#define SPECIES_MORPEKO_HANGRY FORMS_START + 301
#define SPECIES_MORPEKO_HANGRY FORMS_START + 321
// Zacian
#define SPECIES_ZACIAN_CROWNED_SWORD FORMS_START + 302
#define SPECIES_ZACIAN_CROWNED_SWORD FORMS_START + 322
// Zamazenta
#define SPECIES_ZAMAZENTA_CROWNED_SHIELD FORMS_START + 303
#define SPECIES_ZAMAZENTA_CROWNED_SHIELD FORMS_START + 323
// Eternatus
#define SPECIES_ETERNATUS_ETERNAMAX FORMS_START + 304
#define SPECIES_ETERNATUS_ETERNAMAX FORMS_START + 324
// Urshifu
#define SPECIES_URSHIFU_RAPID_STRIKE_STYLE FORMS_START + 305
#define SPECIES_URSHIFU_RAPID_STRIKE_STYLE FORMS_START + 325
// Zarude
#define SPECIES_ZARUDE_DADA FORMS_START + 306
#define SPECIES_ZARUDE_DADA FORMS_START + 326
// Calyrex
#define SPECIES_CALYREX_ICE_RIDER FORMS_START + 307
#define SPECIES_CALYREX_SHADOW_RIDER FORMS_START + 308
#define SPECIES_CALYREX_ICE_RIDER FORMS_START + 327
#define SPECIES_CALYREX_SHADOW_RIDER FORMS_START + 328
#if P_NEW_POKEMON == TRUE
#define FORMS_START SPECIES_CALYREX
#define FORMS_START SPECIES_ENAMORUS
#define SPECIES_EGG SPECIES_CALYREX_SHADOW_RIDER + 1
#else
#define FORMS_START SPECIES_DEOXYS

View File

@@ -980,6 +980,14 @@ extern const u32 gMonFrontPic_Regidrago[];
extern const u32 gMonFrontPic_Glastrier[];
extern const u32 gMonFrontPic_Spectrier[];
extern const u32 gMonFrontPic_Calyrex[];
//extern const u32 gMonFrontPic_Wyrdeer[];
extern const u32 gMonFrontPic_Kleavor[];
extern const u32 gMonFrontPic_Ursaluna[];
//extern const u32 gMonFrontPic_Basculegion[];
//extern const u32 gMonFrontPic_BasculegionF[];
//extern const u32 gMonFrontPic_Sneasler[];
extern const u32 gMonFrontPic_Overqwil[];
//extern const u32 gMonFrontPic_Enamorus[];
extern const u32 gMonFrontPic_VenusaurMega[];
extern const u32 gMonFrontPic_CharizardMegaX[];
extern const u32 gMonFrontPic_CharizardMegaY[];
@@ -1067,6 +1075,22 @@ extern const u32 gMonFrontPic_DarumakaGalarian[];
extern const u32 gMonFrontPic_DarmanitanGalarian[];
extern const u32 gMonFrontPic_YamaskGalarian[];
extern const u32 gMonFrontPic_StunfiskGalarian[];
extern const u32 gMonFrontPic_GrowlitheHisuian[];
extern const u32 gMonFrontPic_ArcanineHisuian[];
extern const u32 gMonFrontPic_VoltorbHisuian[];
extern const u32 gMonFrontPic_ElectrodeHisuian[];
extern const u32 gMonFrontPic_TyphlosionHisuian[];
extern const u32 gMonFrontPic_QwilfishHisuian[];
extern const u32 gMonFrontPic_SneaselHisuian[];
//extern const u32 gMonFrontPic_SamurottHisuian[];
extern const u32 gMonFrontPic_LilligantHisuian[];
extern const u32 gMonFrontPic_ZoruaHisuian[];
extern const u32 gMonFrontPic_ZoroarkHisuian[];
extern const u32 gMonFrontPic_BraviaryHisuian[];
extern const u32 gMonFrontPic_SliggooHisuian[];
extern const u32 gMonFrontPic_GoodraHisuian[];
extern const u32 gMonFrontPic_AvaluggHisuian[];
//extern const u32 gMonFrontPic_DecidueyeHisuian[];
extern const u32 gMonFrontPic_PikachuCosplay[];
extern const u32 gMonFrontPic_PikachuRockStar[];
extern const u32 gMonFrontPic_PikachuBelle[];
@@ -1129,9 +1153,12 @@ extern const u32 gMonFrontPic_RotomWash[];
extern const u32 gMonFrontPic_RotomFrost[];
extern const u32 gMonFrontPic_RotomFan[];
extern const u32 gMonFrontPic_RotomMow[];
extern const u32 gMonFrontPic_DialgaOrigin[];
extern const u32 gMonFrontPic_PalkiaOrigin[];
extern const u32 gMonFrontPic_GiratinaOrigin[];
extern const u32 gMonFrontPic_ShayminSky[];
extern const u32 gMonFrontPic_BasculinBlueStriped[];
extern const u32 gMonFrontPic_BasculinWhiteStriped[];
extern const u32 gMonFrontPic_DarmanitanZenMode[];
extern const u32 gMonFrontPic_DarmanitanZenModeGalarian[];
extern const u32 gMonFrontPic_SawsbuckSummer[];
@@ -1140,6 +1167,7 @@ extern const u32 gMonFrontPic_SawsbuckWinter[];
extern const u32 gMonFrontPic_TornadusTherian[];
extern const u32 gMonFrontPic_ThundurusTherian[];
extern const u32 gMonFrontPic_LandorusTherian[];
//extern const u32 gMonFrontPic_EnamorusTherian[];
extern const u32 gMonFrontPic_KyuremWhite[];
extern const u32 gMonFrontPic_KyuremBlack[];
extern const u32 gMonFrontPic_KeldeoResolute[];
@@ -2136,6 +2164,14 @@ extern const u32 gMonBackPic_Regidrago[];
extern const u32 gMonBackPic_Glastrier[];
extern const u32 gMonBackPic_Spectrier[];
extern const u32 gMonBackPic_Calyrex[];
//extern const u32 gMonBackPic_Wyrdeer[];
extern const u32 gMonBackPic_Kleavor[];
extern const u32 gMonBackPic_Ursaluna[];
//extern const u32 gMonBackPic_Basculegion[];
//extern const u32 gMonBackPic_BasculegionF[];
//extern const u32 gMonBackPic_Sneasler[];
extern const u32 gMonBackPic_Overqwil[];
//extern const u32 gMonBackPic_Enamorus[];
extern const u32 gMonBackPic_VenusaurMega[];
extern const u32 gMonBackPic_CharizardMegaX[];
extern const u32 gMonBackPic_CharizardMegaY[];
@@ -2223,6 +2259,22 @@ extern const u32 gMonBackPic_DarumakaGalarian[];
extern const u32 gMonBackPic_DarmanitanGalarian[];
extern const u32 gMonBackPic_YamaskGalarian[];
extern const u32 gMonBackPic_StunfiskGalarian[];
extern const u32 gMonBackPic_GrowlitheHisuian[];
extern const u32 gMonBackPic_ArcanineHisuian[];
extern const u32 gMonBackPic_VoltorbHisuian[];
extern const u32 gMonBackPic_ElectrodeHisuian[];
extern const u32 gMonBackPic_TyphlosionHisuian[];
extern const u32 gMonBackPic_QwilfishHisuian[];
extern const u32 gMonBackPic_SneaselHisuian[];
//extern const u32 gMonBackPic_SamurottHisuian[];
extern const u32 gMonBackPic_LilligantHisuian[];
extern const u32 gMonBackPic_ZoruaHisuian[];
extern const u32 gMonBackPic_ZoroarkHisuian[];
extern const u32 gMonBackPic_BraviaryHisuian[];
extern const u32 gMonBackPic_SliggooHisuian[];
extern const u32 gMonBackPic_GoodraHisuian[];
extern const u32 gMonBackPic_AvaluggHisuian[];
//extern const u32 gMonBackPic_DecidueyeHisuian[];
extern const u32 gMonBackPic_PikachuCosplay[];
extern const u32 gMonBackPic_PikachuRockStar[];
extern const u32 gMonBackPic_PikachuBelle[];
@@ -2285,9 +2337,12 @@ extern const u32 gMonBackPic_RotomWash[];
extern const u32 gMonBackPic_RotomFrost[];
extern const u32 gMonBackPic_RotomFan[];
extern const u32 gMonBackPic_RotomMow[];
extern const u32 gMonBackPic_DialgaOrigin[];
extern const u32 gMonBackPic_PalkiaOrigin[];
extern const u32 gMonBackPic_GiratinaOrigin[];
extern const u32 gMonBackPic_ShayminSky[];
extern const u32 gMonBackPic_BasculinBlueStriped[];
extern const u32 gMonBackPic_BasculinWhiteStriped[];
extern const u32 gMonBackPic_DarmanitanZenMode[];
extern const u32 gMonBackPic_DarmanitanZenModeGalarian[];
extern const u32 gMonBackPic_SawsbuckSummer[];
@@ -2296,6 +2351,7 @@ extern const u32 gMonBackPic_SawsbuckWinter[];
extern const u32 gMonBackPic_TornadusTherian[];
extern const u32 gMonBackPic_ThundurusTherian[];
extern const u32 gMonBackPic_LandorusTherian[];
//extern const u32 gMonBackPic_EnamorusTherian[];
extern const u32 gMonBackPic_KyuremWhite[];
extern const u32 gMonBackPic_KyuremBlack[];
extern const u32 gMonBackPic_KeldeoResolute[];
@@ -3284,6 +3340,14 @@ extern const u32 gMonPalette_Regidrago[];
extern const u32 gMonPalette_Glastrier[];
extern const u32 gMonPalette_Spectrier[];
extern const u32 gMonPalette_Calyrex[];
//extern const u32 gMonPalette_Wyrdeer[];
extern const u32 gMonPalette_Kleavor[];
extern const u32 gMonPalette_Ursaluna[];
//extern const u32 gMonPalette_Basculegion[];
//extern const u32 gMonPalette_BasculegionF[];
//extern const u32 gMonPalette_Sneasler[];
extern const u32 gMonPalette_Overqwil[];
//extern const u32 gMonPalette_Enamorus[];
extern const u32 gMonPalette_VenusaurMega[];
extern const u32 gMonPalette_CharizardMegaX[];
extern const u32 gMonPalette_CharizardMegaY[];
@@ -3371,6 +3435,22 @@ extern const u32 gMonPalette_DarumakaGalarian[];
extern const u32 gMonPalette_DarmanitanGalarian[];
extern const u32 gMonPalette_YamaskGalarian[];
extern const u32 gMonPalette_StunfiskGalarian[];
extern const u32 gMonPalette_GrowlitheHisuian[];
extern const u32 gMonPalette_ArcanineHisuian[];
extern const u32 gMonPalette_VoltorbHisuian[];
extern const u32 gMonPalette_ElectrodeHisuian[];
extern const u32 gMonPalette_TyphlosionHisuian[];
extern const u32 gMonPalette_QwilfishHisuian[];
extern const u32 gMonPalette_SneaselHisuian[];
//extern const u32 gMonPalette_SamurottHisuian[];
extern const u32 gMonPalette_LilligantHisuian[];
extern const u32 gMonPalette_ZoruaHisuian[];
extern const u32 gMonPalette_ZoroarkHisuian[];
extern const u32 gMonPalette_BraviaryHisuian[];
extern const u32 gMonPalette_SliggooHisuian[];
extern const u32 gMonPalette_GoodraHisuian[];
extern const u32 gMonPalette_AvaluggHisuian[];
//extern const u32 gMonPalette_DecidueyeHisuian[];
extern const u32 gMonPalette_PikachuCosplay[];
extern const u32 gMonPalette_PikachuRockStar[];
extern const u32 gMonPalette_PikachuBelle[];
@@ -3406,6 +3486,8 @@ extern const u32 gMonPalette_RotomWash[];
extern const u32 gMonPalette_RotomFrost[];
extern const u32 gMonPalette_RotomFan[];
extern const u32 gMonPalette_RotomMow[];
extern const u32 gMonPalette_DialgaOrigin[];
extern const u32 gMonPalette_PalkiaOrigin[];
extern const u32 gMonPalette_GiratinaOrigin[];
extern const u32 gMonPalette_ShayminSky[];
extern const u32 gMonPalette_ArceusFighting[];
@@ -3426,6 +3508,7 @@ extern const u32 gMonPalette_ArceusDragon[];
extern const u32 gMonPalette_ArceusDark[];
extern const u32 gMonPalette_ArceusFairy[];
extern const u32 gMonPalette_BasculinBlueStriped[];
extern const u32 gMonPalette_BasculinWhiteStriped[];
extern const u32 gMonPalette_DarmanitanZenMode[];
extern const u32 gMonPalette_DarmanitanZenModeGalarian[];
extern const u32 gMonPalette_DeerlingSummer[];
@@ -3437,6 +3520,7 @@ extern const u32 gMonPalette_SawsbuckWinter[];
extern const u32 gMonPalette_TornadusTherian[];
extern const u32 gMonPalette_ThundurusTherian[];
extern const u32 gMonPalette_LandorusTherian[];
//extern const u32 gMonPalette_EnamorusTherian[];
extern const u32 gMonPalette_KyuremWhite[];
extern const u32 gMonPalette_KyuremBlack[];
extern const u32 gMonPalette_KeldeoResolute[];
@@ -4460,6 +4544,14 @@ extern const u32 gMonShinyPalette_Regidrago[];
extern const u32 gMonShinyPalette_Glastrier[];
extern const u32 gMonShinyPalette_Spectrier[];
extern const u32 gMonShinyPalette_Calyrex[];
//extern const u32 gMonShinyPalette_Wyrdeer[];
extern const u32 gMonShinyPalette_Kleavor[];
extern const u32 gMonShinyPalette_Ursaluna[];
//extern const u32 gMonShinyPalette_Basculegion[];
//extern const u32 gMonShinyPalette_BasculegionF[];
//extern const u32 gMonShinyPalette_Sneasler[];
extern const u32 gMonShinyPalette_Overqwil[];
//extern const u32 gMonShinyPalette_Enamorus[];
extern const u32 gMonShinyPalette_VenusaurMega[];
extern const u32 gMonShinyPalette_CharizardMegaX[];
extern const u32 gMonShinyPalette_CharizardMegaY[];
@@ -4547,6 +4639,22 @@ extern const u32 gMonShinyPalette_DarumakaGalarian[];
extern const u32 gMonShinyPalette_DarmanitanGalarian[];
extern const u32 gMonShinyPalette_YamaskGalarian[];
extern const u32 gMonShinyPalette_StunfiskGalarian[];
extern const u32 gMonShinyPalette_GrowlitheHisuian[];
extern const u32 gMonShinyPalette_ArcanineHisuian[];
extern const u32 gMonShinyPalette_VoltorbHisuian[];
extern const u32 gMonShinyPalette_ElectrodeHisuian[];
extern const u32 gMonShinyPalette_TyphlosionHisuian[];
extern const u32 gMonShinyPalette_QwilfishHisuian[];
extern const u32 gMonShinyPalette_SneaselHisuian[];
//extern const u32 gMonShinyPalette_SamurottHisuian[];
extern const u32 gMonShinyPalette_LilligantHisuian[];
extern const u32 gMonShinyPalette_ZoruaHisuian[];
extern const u32 gMonShinyPalette_ZoroarkHisuian[];
extern const u32 gMonShinyPalette_BraviaryHisuian[];
extern const u32 gMonShinyPalette_SliggooHisuian[];
extern const u32 gMonShinyPalette_GoodraHisuian[];
extern const u32 gMonShinyPalette_AvaluggHisuian[];
//extern const u32 gMonShinyPalette_DecidueyeHisuian[];
extern const u32 gMonShinyPalette_PikachuCosplay[];
extern const u32 gMonShinyPalette_PikachuRockStar[];
extern const u32 gMonShinyPalette_PikachuBelle[];
@@ -4582,6 +4690,8 @@ extern const u32 gMonShinyPalette_RotomWash[];
extern const u32 gMonShinyPalette_RotomFrost[];
extern const u32 gMonShinyPalette_RotomFan[];
extern const u32 gMonShinyPalette_RotomMow[];
extern const u32 gMonShinyPalette_DialgaOrigin[];
extern const u32 gMonShinyPalette_PalkiaOrigin[];
extern const u32 gMonShinyPalette_GiratinaOrigin[];
extern const u32 gMonShinyPalette_ShayminSky[];
extern const u32 gMonShinyPalette_ArceusFighting[];
@@ -4602,6 +4712,7 @@ extern const u32 gMonShinyPalette_ArceusDragon[];
extern const u32 gMonShinyPalette_ArceusDark[];
extern const u32 gMonShinyPalette_ArceusFairy[];
extern const u32 gMonShinyPalette_BasculinBlueStriped[];
extern const u32 gMonShinyPalette_BasculinWhiteStriped[];
extern const u32 gMonShinyPalette_DarmanitanZenMode[];
extern const u32 gMonShinyPalette_DarmanitanZenModeGalarian[];
extern const u32 gMonShinyPalette_DeerlingSummer[];
@@ -4613,6 +4724,7 @@ extern const u32 gMonShinyPalette_SawsbuckWinter[];
extern const u32 gMonShinyPalette_TornadusTherian[];
extern const u32 gMonShinyPalette_ThundurusTherian[];
extern const u32 gMonShinyPalette_LandorusTherian[];
//extern const u32 gMonShinyPalette_EnamorusTherian[];
extern const u32 gMonShinyPalette_KyuremWhite[];
extern const u32 gMonShinyPalette_KyuremBlack[];
extern const u32 gMonShinyPalette_KeldeoResolute[];
@@ -5624,7 +5736,15 @@ extern const u8 gMonIcon_Regieleki[];
extern const u8 gMonIcon_Regidrago[];
extern const u8 gMonIcon_Glastrier[];
extern const u8 gMonIcon_Spectrier[];
//extern const u8 gMonIcon_Calyrex[];
extern const u8 gMonIcon_Calyrex[];
extern const u8 gMonIcon_Wyrdeer[];
extern const u8 gMonIcon_Kleavor[];
extern const u8 gMonIcon_Ursaluna[];
extern const u8 gMonIcon_Basculegion[];
extern const u8 gMonIcon_BasculegionF[];
extern const u8 gMonIcon_Sneasler[];
extern const u8 gMonIcon_Overqwil[];
extern const u8 gMonIcon_Enamorus[];
extern const u8 gMonIcon_VenusaurMega[];
extern const u8 gMonIcon_CharizardMegaX[];
extern const u8 gMonIcon_CharizardMegaY[];
@@ -5712,6 +5832,22 @@ extern const u8 gMonIcon_DarumakaGalarian[];
extern const u8 gMonIcon_DarmanitanGalarian[];
extern const u8 gMonIcon_YamaskGalarian[];
extern const u8 gMonIcon_StunfiskGalarian[];
extern const u8 gMonIcon_GrowlitheHisuian[];
extern const u8 gMonIcon_ArcanineHisuian[];
extern const u8 gMonIcon_VoltorbHisuian[];
extern const u8 gMonIcon_ElectrodeHisuian[];
extern const u8 gMonIcon_TyphlosionHisuian[];
extern const u8 gMonIcon_QwilfishHisuian[];
extern const u8 gMonIcon_SneaselHisuian[];
extern const u8 gMonIcon_SamurottHisuian[];
extern const u8 gMonIcon_LilligantHisuian[];
extern const u8 gMonIcon_ZoruaHisuian[];
extern const u8 gMonIcon_ZoroarkHisuian[];
extern const u8 gMonIcon_BraviaryHisuian[];
extern const u8 gMonIcon_SliggooHisuian[];
extern const u8 gMonIcon_GoodraHisuian[];
extern const u8 gMonIcon_AvaluggHisuian[];
extern const u8 gMonIcon_DecidueyeHisuian[];
extern const u8 gMonIcon_PikachuCosplay[];
extern const u8 gMonIcon_PikachuRockStar[];
extern const u8 gMonIcon_PikachuBelle[];
@@ -5773,9 +5909,12 @@ extern const u8 gMonIcon_RotomWash[];
extern const u8 gMonIcon_RotomFrost[];
extern const u8 gMonIcon_RotomFan[];
extern const u8 gMonIcon_RotomMow[];
extern const u8 gMonIcon_DialgaOrigin[];
extern const u8 gMonIcon_PalkiaOrigin[];
extern const u8 gMonIcon_GiratinaOrigin[];
extern const u8 gMonIcon_ShayminSky[];
extern const u8 gMonIcon_BasculinBlueStriped[];
extern const u8 gMonIcon_BasculinWhiteStriped[];
extern const u8 gMonIcon_DarmanitanZenMode[];
extern const u8 gMonIcon_DarmanitanZenModeGalarian[];
extern const u8 gMonIcon_DeerlingSummer[];
@@ -5787,6 +5926,7 @@ extern const u8 gMonIcon_SawsbuckWinter[];
extern const u8 gMonIcon_TornadusTherian[];
extern const u8 gMonIcon_ThundurusTherian[];
extern const u8 gMonIcon_LandorusTherian[];
extern const u8 gMonIcon_EnamorusTherian[];
extern const u8 gMonIcon_KyuremWhite[];
extern const u8 gMonIcon_KyuremBlack[];
extern const u8 gMonIcon_KeldeoResolute[];
@@ -6780,6 +6920,13 @@ extern const u8 gMonFootprint_Regidrago[];
extern const u8 gMonFootprint_Glastrier[];
extern const u8 gMonFootprint_Spectrier[];
extern const u8 gMonFootprint_Calyrex[];
//extern const u8 gMonFootprint_Wyrdeer[];
//extern const u8 gMonFootprint_Kleavor[];
//extern const u8 gMonFootprint_Ursaluna[];
//extern const u8 gMonFootprint_Basculegion[];
//extern const u8 gMonFootprint_Sneasler[];
//extern const u8 gMonFootprint_Overqwil[];
//extern const u8 gMonFootprint_Enamorus[];
#endif
// trainer sprites

View File

@@ -29,8 +29,6 @@ extern u8 gBattlePartyCurrentOrder[PARTY_SIZE / 2];
extern void (*gItemUseCB)(u8, TaskFunc);
extern const u16 gTutorMoves[];
void AnimatePartySlot(u8 slot, u8 animNum);
bool8 IsMultiBattle(void);
u8 GetCursorSelectionMonId(void);

View File

@@ -399,6 +399,7 @@ extern const struct BaseStats gBaseStats[];
extern const u8 *const gItemEffectTable[];
extern const u32 gExperienceTables[][MAX_LEVEL + 1];
extern const struct LevelUpMove *const gLevelUpLearnsets[];
extern const u16 *const gTeachableLearnsets[];
extern const u8 gPPUpGetMask[];
extern const u8 gPPUpClearMask[];
extern const u8 gPPUpAddValues[];
@@ -511,8 +512,7 @@ u8 CheckPartyHasHadPokerus(struct Pokemon *party, u8 selection);
void UpdatePartyPokerusTime(u16 days);
void PartySpreadPokerus(struct Pokemon *party);
bool8 TryIncrementMonLevel(struct Pokemon *mon);
u32 CanMonLearnTMHM(struct Pokemon *mon, u8 tm);
u32 CanSpeciesLearnTMHM(u16 species, u8 tm);
u8 CanLearnTeachableMove(u16 species, u16 move);
u8 GetMoveRelearnerMoves(struct Pokemon *mon, u16 *moves);
u8 GetLevelUpMovesBySpecies(u16 species, u16 *moves);
u8 GetNumberOfRelearnableMoves(struct Pokemon *mon);