diff --git a/include/constants/species.h b/include/constants/species.h index 33a3cb3194..1ebbf47acd 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -1021,359 +1021,355 @@ #define SPECIES_AVALUGG_HISUIAN FORMS_START + 102 #define SPECIES_DECIDUEYE_HISUIAN FORMS_START + 103 -//Paldean Forms -#define SPECIES_WOOPER_PALDEAN FORMS_START + 104 -#define SPECIES_TAUROS_PALDEAN FORMS_START + 105 - // Misc Forms // Cosplay Pikachu -#define SPECIES_PIKACHU_COSPLAY FORMS_START + 106 -#define SPECIES_PIKACHU_ROCK_STAR FORMS_START + 107 -#define SPECIES_PIKACHU_BELLE FORMS_START + 108 -#define SPECIES_PIKACHU_POP_STAR FORMS_START + 109 -#define SPECIES_PIKACHU_PH_D FORMS_START + 110 -#define SPECIES_PIKACHU_LIBRE FORMS_START + 111 +#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 + 112 -#define SPECIES_PIKACHU_HOENN_CAP FORMS_START + 113 -#define SPECIES_PIKACHU_SINNOH_CAP FORMS_START + 114 -#define SPECIES_PIKACHU_UNOVA_CAP FORMS_START + 115 -#define SPECIES_PIKACHU_KALOS_CAP FORMS_START + 116 -#define SPECIES_PIKACHU_ALOLA_CAP FORMS_START + 117 -#define SPECIES_PIKACHU_PARTNER_CAP FORMS_START + 118 -#define SPECIES_PIKACHU_WORLD_CAP FORMS_START + 119 +#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 + 120 +#define SPECIES_PICHU_SPIKY_EARED FORMS_START + 118 // Unown -#define SPECIES_UNOWN_B FORMS_START + 121 -#define SPECIES_UNOWN_C FORMS_START + 122 -#define SPECIES_UNOWN_D FORMS_START + 123 -#define SPECIES_UNOWN_E FORMS_START + 124 -#define SPECIES_UNOWN_F FORMS_START + 125 -#define SPECIES_UNOWN_G FORMS_START + 126 -#define SPECIES_UNOWN_H FORMS_START + 127 -#define SPECIES_UNOWN_I FORMS_START + 128 -#define SPECIES_UNOWN_J FORMS_START + 129 -#define SPECIES_UNOWN_K FORMS_START + 130 -#define SPECIES_UNOWN_L FORMS_START + 131 -#define SPECIES_UNOWN_M FORMS_START + 132 -#define SPECIES_UNOWN_N FORMS_START + 133 -#define SPECIES_UNOWN_O FORMS_START + 134 -#define SPECIES_UNOWN_P FORMS_START + 135 -#define SPECIES_UNOWN_Q FORMS_START + 136 -#define SPECIES_UNOWN_R FORMS_START + 137 -#define SPECIES_UNOWN_S FORMS_START + 138 -#define SPECIES_UNOWN_T FORMS_START + 139 -#define SPECIES_UNOWN_U FORMS_START + 140 -#define SPECIES_UNOWN_V FORMS_START + 141 -#define SPECIES_UNOWN_W FORMS_START + 142 -#define SPECIES_UNOWN_X FORMS_START + 143 -#define SPECIES_UNOWN_Y FORMS_START + 144 -#define SPECIES_UNOWN_Z FORMS_START + 145 -#define SPECIES_UNOWN_EMARK FORMS_START + 146 -#define SPECIES_UNOWN_QMARK FORMS_START + 147 +#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 + 148 -#define SPECIES_CASTFORM_RAINY FORMS_START + 149 -#define SPECIES_CASTFORM_SNOWY FORMS_START + 150 +#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 + 151 -#define SPECIES_DEOXYS_DEFENSE FORMS_START + 152 -#define SPECIES_DEOXYS_SPEED FORMS_START + 153 +#define SPECIES_DEOXYS_ATTACK FORMS_START + 149 +#define SPECIES_DEOXYS_DEFENSE FORMS_START + 150 +#define SPECIES_DEOXYS_SPEED FORMS_START + 151 // Burmy -#define SPECIES_BURMY_SANDY_CLOAK FORMS_START + 154 -#define SPECIES_BURMY_TRASH_CLOAK FORMS_START + 155 +#define SPECIES_BURMY_SANDY_CLOAK FORMS_START + 152 +#define SPECIES_BURMY_TRASH_CLOAK FORMS_START + 153 // Wormadam -#define SPECIES_WORMADAM_SANDY_CLOAK FORMS_START + 156 -#define SPECIES_WORMADAM_TRASH_CLOAK FORMS_START + 157 +#define SPECIES_WORMADAM_SANDY_CLOAK FORMS_START + 154 +#define SPECIES_WORMADAM_TRASH_CLOAK FORMS_START + 155 // Cherrim -#define SPECIES_CHERRIM_SUNSHINE FORMS_START + 158 +#define SPECIES_CHERRIM_SUNSHINE FORMS_START + 156 // Shellos -#define SPECIES_SHELLOS_EAST_SEA FORMS_START + 159 +#define SPECIES_SHELLOS_EAST_SEA FORMS_START + 157 // Gastrodon -#define SPECIES_GASTRODON_EAST_SEA FORMS_START + 160 +#define SPECIES_GASTRODON_EAST_SEA FORMS_START + 158 // Rotom -#define SPECIES_ROTOM_HEAT FORMS_START + 161 -#define SPECIES_ROTOM_WASH FORMS_START + 162 -#define SPECIES_ROTOM_FROST FORMS_START + 163 -#define SPECIES_ROTOM_FAN FORMS_START + 164 -#define SPECIES_ROTOM_MOW FORMS_START + 165 +#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 // Origin Forme -#define SPECIES_DIALGA_ORIGIN FORMS_START + 166 -#define SPECIES_PALKIA_ORIGIN FORMS_START + 167 -#define SPECIES_GIRATINA_ORIGIN FORMS_START + 168 +#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 + 169 +#define SPECIES_SHAYMIN_SKY FORMS_START + 167 // Arceus -#define SPECIES_ARCEUS_FIGHTING FORMS_START + 170 -#define SPECIES_ARCEUS_FLYING FORMS_START + 171 -#define SPECIES_ARCEUS_POISON FORMS_START + 172 -#define SPECIES_ARCEUS_GROUND FORMS_START + 173 -#define SPECIES_ARCEUS_ROCK FORMS_START + 174 -#define SPECIES_ARCEUS_BUG FORMS_START + 175 -#define SPECIES_ARCEUS_GHOST FORMS_START + 176 -#define SPECIES_ARCEUS_STEEL FORMS_START + 177 -#define SPECIES_ARCEUS_FIRE FORMS_START + 178 -#define SPECIES_ARCEUS_WATER FORMS_START + 179 -#define SPECIES_ARCEUS_GRASS FORMS_START + 180 -#define SPECIES_ARCEUS_ELECTRIC FORMS_START + 181 -#define SPECIES_ARCEUS_PSYCHIC FORMS_START + 182 -#define SPECIES_ARCEUS_ICE FORMS_START + 183 -#define SPECIES_ARCEUS_DRAGON FORMS_START + 184 -#define SPECIES_ARCEUS_DARK FORMS_START + 185 -#define SPECIES_ARCEUS_FAIRY FORMS_START + 186 +#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 + 187 -#define SPECIES_BASCULIN_WHITE_STRIPED FORMS_START + 188 +#define SPECIES_BASCULIN_BLUE_STRIPED FORMS_START + 185 +#define SPECIES_BASCULIN_WHITE_STRIPED FORMS_START + 186 // Darmanitan -#define SPECIES_DARMANITAN_ZEN_MODE FORMS_START + 189 -#define SPECIES_DARMANITAN_ZEN_MODE_GALARIAN FORMS_START + 190 +#define SPECIES_DARMANITAN_ZEN_MODE FORMS_START + 187 +#define SPECIES_DARMANITAN_ZEN_MODE_GALARIAN FORMS_START + 188 // Deerling -#define SPECIES_DEERLING_SUMMER FORMS_START + 191 -#define SPECIES_DEERLING_AUTUMN FORMS_START + 192 -#define SPECIES_DEERLING_WINTER FORMS_START + 193 +#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 + 194 -#define SPECIES_SAWSBUCK_AUTUMN FORMS_START + 195 -#define SPECIES_SAWSBUCK_WINTER FORMS_START + 196 +#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 + 197 -#define SPECIES_THUNDURUS_THERIAN FORMS_START + 198 -#define SPECIES_LANDORUS_THERIAN FORMS_START + 199 -#define SPECIES_ENAMORUS_THERIAN FORMS_START + 200 +#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 + 201 -#define SPECIES_KYUREM_BLACK FORMS_START + 202 +#define SPECIES_KYUREM_WHITE FORMS_START + 199 +#define SPECIES_KYUREM_BLACK FORMS_START + 200 // Keldeo -#define SPECIES_KELDEO_RESOLUTE FORMS_START + 203 +#define SPECIES_KELDEO_RESOLUTE FORMS_START + 201 // Meloetta -#define SPECIES_MELOETTA_PIROUETTE FORMS_START + 204 +#define SPECIES_MELOETTA_PIROUETTE FORMS_START + 202 // Genesect -#define SPECIES_GENESECT_DOUSE_DRIVE FORMS_START + 205 -#define SPECIES_GENESECT_SHOCK_DRIVE FORMS_START + 206 -#define SPECIES_GENESECT_BURN_DRIVE FORMS_START + 207 -#define SPECIES_GENESECT_CHILL_DRIVE FORMS_START + 208 +#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 + 209 -#define SPECIES_GRENINJA_ASH FORMS_START + 210 +#define SPECIES_GRENINJA_BATTLE_BOND FORMS_START + 207 +#define SPECIES_GRENINJA_ASH FORMS_START + 208 // Vivillon -#define SPECIES_VIVILLON_POLAR FORMS_START + 211 -#define SPECIES_VIVILLON_TUNDRA FORMS_START + 212 -#define SPECIES_VIVILLON_CONTINENTAL FORMS_START + 213 -#define SPECIES_VIVILLON_GARDEN FORMS_START + 214 -#define SPECIES_VIVILLON_ELEGANT FORMS_START + 215 -#define SPECIES_VIVILLON_MEADOW FORMS_START + 216 -#define SPECIES_VIVILLON_MODERN FORMS_START + 217 -#define SPECIES_VIVILLON_MARINE FORMS_START + 218 -#define SPECIES_VIVILLON_ARCHIPELAGO FORMS_START + 219 -#define SPECIES_VIVILLON_HIGH_PLAINS FORMS_START + 220 -#define SPECIES_VIVILLON_SANDSTORM FORMS_START + 221 -#define SPECIES_VIVILLON_RIVER FORMS_START + 222 -#define SPECIES_VIVILLON_MONSOON FORMS_START + 223 -#define SPECIES_VIVILLON_SAVANNA FORMS_START + 224 -#define SPECIES_VIVILLON_SUN FORMS_START + 225 -#define SPECIES_VIVILLON_OCEAN FORMS_START + 226 -#define SPECIES_VIVILLON_JUNGLE FORMS_START + 227 -#define SPECIES_VIVILLON_FANCY FORMS_START + 228 -#define SPECIES_VIVILLON_POKE_BALL FORMS_START + 229 +#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 + 230 -#define SPECIES_FLABEBE_ORANGE_FLOWER FORMS_START + 231 -#define SPECIES_FLABEBE_BLUE_FLOWER FORMS_START + 232 -#define SPECIES_FLABEBE_WHITE_FLOWER FORMS_START + 233 +#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 + 234 -#define SPECIES_FLOETTE_ORANGE_FLOWER FORMS_START + 235 -#define SPECIES_FLOETTE_BLUE_FLOWER FORMS_START + 236 -#define SPECIES_FLOETTE_WHITE_FLOWER FORMS_START + 237 -#define SPECIES_FLOETTE_ETERNAL_FLOWER FORMS_START + 238 +#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 + 239 -#define SPECIES_FLORGES_ORANGE_FLOWER FORMS_START + 240 -#define SPECIES_FLORGES_BLUE_FLOWER FORMS_START + 241 -#define SPECIES_FLORGES_WHITE_FLOWER FORMS_START + 242 +#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 + 243 -#define SPECIES_FURFROU_STAR_TRIM FORMS_START + 244 -#define SPECIES_FURFROU_DIAMOND_TRIM FORMS_START + 245 -#define SPECIES_FURFROU_DEBUTANTE_TRIM FORMS_START + 246 -#define SPECIES_FURFROU_MATRON_TRIM FORMS_START + 247 -#define SPECIES_FURFROU_DANDY_TRIM FORMS_START + 248 -#define SPECIES_FURFROU_LA_REINE_TRIM FORMS_START + 249 -#define SPECIES_FURFROU_KABUKI_TRIM FORMS_START + 250 -#define SPECIES_FURFROU_PHARAOH_TRIM FORMS_START + 251 +#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 + 252 +#define SPECIES_MEOWSTIC_FEMALE FORMS_START + 250 // Aegislash -#define SPECIES_AEGISLASH_BLADE FORMS_START + 253 +#define SPECIES_AEGISLASH_BLADE FORMS_START + 251 // Pumpkaboo -#define SPECIES_PUMPKABOO_SMALL FORMS_START + 254 -#define SPECIES_PUMPKABOO_LARGE FORMS_START + 255 -#define SPECIES_PUMPKABOO_SUPER FORMS_START + 256 +#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 + 257 -#define SPECIES_GOURGEIST_LARGE FORMS_START + 258 -#define SPECIES_GOURGEIST_SUPER FORMS_START + 259 +#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 + 260 +#define SPECIES_XERNEAS_ACTIVE FORMS_START + 258 // Zygarde -#define SPECIES_ZYGARDE_10 FORMS_START + 261 -#define SPECIES_ZYGARDE_10_POWER_CONSTRUCT FORMS_START + 262 -#define SPECIES_ZYGARDE_50_POWER_CONSTRUCT FORMS_START + 263 -#define SPECIES_ZYGARDE_COMPLETE FORMS_START + 264 +#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 + 265 +#define SPECIES_HOOPA_UNBOUND FORMS_START + 263 // Oricorio -#define SPECIES_ORICORIO_POM_POM FORMS_START + 266 -#define SPECIES_ORICORIO_PAU FORMS_START + 267 -#define SPECIES_ORICORIO_SENSU FORMS_START + 268 +#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 + 269 +#define SPECIES_ROCKRUFF_OWN_TEMPO FORMS_START + 267 // Lycanroc -#define SPECIES_LYCANROC_MIDNIGHT FORMS_START + 270 -#define SPECIES_LYCANROC_DUSK FORMS_START + 271 +#define SPECIES_LYCANROC_MIDNIGHT FORMS_START + 268 +#define SPECIES_LYCANROC_DUSK FORMS_START + 269 // Wishiwashi -#define SPECIES_WISHIWASHI_SCHOOL FORMS_START + 272 +#define SPECIES_WISHIWASHI_SCHOOL FORMS_START + 270 // Silvally -#define SPECIES_SILVALLY_FIGHTING FORMS_START + 273 -#define SPECIES_SILVALLY_FLYING FORMS_START + 274 -#define SPECIES_SILVALLY_POISON FORMS_START + 275 -#define SPECIES_SILVALLY_GROUND FORMS_START + 276 -#define SPECIES_SILVALLY_ROCK FORMS_START + 277 -#define SPECIES_SILVALLY_BUG FORMS_START + 278 -#define SPECIES_SILVALLY_GHOST FORMS_START + 279 -#define SPECIES_SILVALLY_STEEL FORMS_START + 280 -#define SPECIES_SILVALLY_FIRE FORMS_START + 281 -#define SPECIES_SILVALLY_WATER FORMS_START + 282 -#define SPECIES_SILVALLY_GRASS FORMS_START + 283 -#define SPECIES_SILVALLY_ELECTRIC FORMS_START + 284 -#define SPECIES_SILVALLY_PSYCHIC FORMS_START + 285 -#define SPECIES_SILVALLY_ICE FORMS_START + 286 -#define SPECIES_SILVALLY_DRAGON FORMS_START + 287 -#define SPECIES_SILVALLY_DARK FORMS_START + 288 -#define SPECIES_SILVALLY_FAIRY FORMS_START + 289 +#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 + 290 -#define SPECIES_MINIOR_METEOR_YELLOW FORMS_START + 291 -#define SPECIES_MINIOR_METEOR_GREEN FORMS_START + 292 -#define SPECIES_MINIOR_METEOR_BLUE FORMS_START + 293 -#define SPECIES_MINIOR_METEOR_INDIGO FORMS_START + 294 -#define SPECIES_MINIOR_METEOR_VIOLET FORMS_START + 295 -#define SPECIES_MINIOR_CORE_RED FORMS_START + 296 -#define SPECIES_MINIOR_CORE_ORANGE FORMS_START + 297 -#define SPECIES_MINIOR_CORE_YELLOW FORMS_START + 298 -#define SPECIES_MINIOR_CORE_GREEN FORMS_START + 299 -#define SPECIES_MINIOR_CORE_BLUE FORMS_START + 300 -#define SPECIES_MINIOR_CORE_INDIGO FORMS_START + 301 -#define SPECIES_MINIOR_CORE_VIOLET FORMS_START + 302 +#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 + 303 +#define SPECIES_MIMIKYU_BUSTED FORMS_START + 301 // Necrozma -#define SPECIES_NECROZMA_DUSK_MANE FORMS_START + 304 -#define SPECIES_NECROZMA_DAWN_WINGS FORMS_START + 305 -#define SPECIES_NECROZMA_ULTRA FORMS_START + 306 +#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 + 307 +#define SPECIES_MAGEARNA_ORIGINAL_COLOR FORMS_START + 305 // Cramorant -#define SPECIES_CRAMORANT_GULPING FORMS_START + 308 -#define SPECIES_CRAMORANT_GORGING FORMS_START + 309 +#define SPECIES_CRAMORANT_GULPING FORMS_START + 306 +#define SPECIES_CRAMORANT_GORGING FORMS_START + 307 // Toxtricity -#define SPECIES_TOXTRICITY_LOW_KEY FORMS_START + 310 +#define SPECIES_TOXTRICITY_LOW_KEY FORMS_START + 308 // Sinistea -#define SPECIES_SINISTEA_ANTIQUE FORMS_START + 311 +#define SPECIES_SINISTEA_ANTIQUE FORMS_START + 309 // Polteageist -#define SPECIES_POLTEAGEIST_ANTIQUE FORMS_START + 312 +#define SPECIES_POLTEAGEIST_ANTIQUE FORMS_START + 310 // Alcremie -#define SPECIES_ALCREMIE_RUBY_CREAM FORMS_START + 313 -#define SPECIES_ALCREMIE_MATCHA_CREAM FORMS_START + 314 -#define SPECIES_ALCREMIE_MINT_CREAM FORMS_START + 315 -#define SPECIES_ALCREMIE_LEMON_CREAM FORMS_START + 316 -#define SPECIES_ALCREMIE_SALTED_CREAM FORMS_START + 317 -#define SPECIES_ALCREMIE_RUBY_SWIRL FORMS_START + 318 -#define SPECIES_ALCREMIE_CARAMEL_SWIRL FORMS_START + 319 -#define SPECIES_ALCREMIE_RAINBOW_SWIRL FORMS_START + 320 +#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 + 321 +#define SPECIES_EISCUE_NOICE_FACE FORMS_START + 319 // Indeedee -#define SPECIES_INDEEDEE_FEMALE FORMS_START + 322 +#define SPECIES_INDEEDEE_FEMALE FORMS_START + 320 // Morpeko -#define SPECIES_MORPEKO_HANGRY FORMS_START + 323 +#define SPECIES_MORPEKO_HANGRY FORMS_START + 321 // Zacian -#define SPECIES_ZACIAN_CROWNED_SWORD FORMS_START + 324 +#define SPECIES_ZACIAN_CROWNED_SWORD FORMS_START + 322 // Zamazenta -#define SPECIES_ZAMAZENTA_CROWNED_SHIELD FORMS_START + 325 +#define SPECIES_ZAMAZENTA_CROWNED_SHIELD FORMS_START + 323 // Eternatus -#define SPECIES_ETERNATUS_ETERNAMAX FORMS_START + 326 +#define SPECIES_ETERNATUS_ETERNAMAX FORMS_START + 324 // Urshifu -#define SPECIES_URSHIFU_RAPID_STRIKE_STYLE FORMS_START + 327 +#define SPECIES_URSHIFU_RAPID_STRIKE_STYLE FORMS_START + 325 // Zarude -#define SPECIES_ZARUDE_DADA FORMS_START + 328 +#define SPECIES_ZARUDE_DADA FORMS_START + 326 // Calyrex -#define SPECIES_CALYREX_ICE_RIDER FORMS_START + 329 -#define SPECIES_CALYREX_SHADOW_RIDER FORMS_START + 330 +#define SPECIES_CALYREX_ICE_RIDER FORMS_START + 327 +#define SPECIES_CALYREX_SHADOW_RIDER FORMS_START + 328 // Basculegion -#define SPECIES_BASCULEGION_FEMALE FORMS_START + 331 +#define SPECIES_BASCULEGION_FEMALE FORMS_START + 329 #define SPECIES_SPRIGATITO GEN9_START + 1 #define SPECIES_FLORAGATO GEN9_START + 2 @@ -1509,9 +1505,13 @@ #define SPECIES_TAUROS_PALDEAN_BLAZE_BREED GEN9_START + 116 #define SPECIES_TAUROS_PALDEAN_AQUA_BREED GEN9_START + 117 +// Paldean Forms +#define SPECIES_WOOPER_PALDEAN GEN9_START + 118 +#define SPECIES_TAUROS_PALDEAN GEN9_START + 119 + #define FORMS_START SPECIES_ENAMORUS #define GEN9_START SPECIES_BASCULEGION_FEMALE -#define SPECIES_EGG SPECIES_TAUROS_PALDEAN_AQUA_BREED + 1 +#define SPECIES_EGG SPECIES_TAUROS_PALDEAN + 1 #define NUM_SPECIES SPECIES_EGG diff --git a/sound/cry_tables.inc b/sound/cry_tables.inc index c9eb9d8a70..e9aea62eaa 100644 --- a/sound/cry_tables.inc +++ b/sound/cry_tables.inc @@ -1588,9 +1588,6 @@ gCryTable:: .else cry Cry_Unown .endif - @ Paldean Forms - cry Cry_Wooper - cry Cry_Tauros @ Misc Forms @ Cosplay Pikachu cry Cry_Pikachu @@ -2375,6 +2372,9 @@ gCryTable:: .endif @ Tauros-Paldea cry Cry_Tauros +cry Cry_Tauros +@ Paldean Forms +cry Cry_Wooper cry Cry_Tauros .align 2 @@ -3967,9 +3967,6 @@ gCryTable_Reverse:: .else cry_reverse Cry_Unown .endif - @ Paldean Forms - cry_reverse Cry_Wooper - cry_reverse Cry_Tauros @ Misc Forms @ Cosplay Pikachu cry_reverse Cry_Pikachu @@ -4701,3 +4698,6 @@ gCryTable_Reverse:: @ Tauros-Paldea cry_reverse Cry_Tauros cry_reverse Cry_Tauros +@ Paldean Forms +cry_reverse Cry_Wooper +cry_reverse Cry_Tauros