From 47e1d6b7907d8d20aadff0158690428a6807a7d5 Mon Sep 17 00:00:00 2001 From: amiosi <44352097+amiosi@users.noreply.github.com> Date: Tue, 2 Feb 2021 12:36:05 -0500 Subject: [PATCH 01/15] MIMEJR -> MIME_JR --- include/constants/species.h | 4 ++-- src/data/pokemon/base_stats.h | 2 +- src/data/pokemon/egg_moves.h | 2 +- src/data/pokemon/evolution.h | 2 +- src/data/pokemon/level_up_learnset_pointers.h | 2 +- src/data/pokemon/pokedex_entries.h | 2 +- src/data/pokemon/pokedex_orders.h | 6 +++--- src/data/pokemon/tmhm_learnsets.h | 2 +- src/data/pokemon/tutor_learnsets.h | 2 +- src/data/pokemon_graphics/back_pic_coordinates.h | 2 +- src/data/pokemon_graphics/back_pic_table.h | 2 +- src/data/pokemon_graphics/footprint_table.h | 2 +- src/data/pokemon_graphics/front_pic_anims.h | 8 ++++---- src/data/pokemon_graphics/front_pic_coordinates.h | 2 +- src/data/pokemon_graphics/front_pic_table.h | 2 +- src/data/pokemon_graphics/palette_table.h | 2 +- src/data/pokemon_graphics/shiny_palette_table.h | 2 +- src/data/text/species_names.h | 2 +- src/pokemon.c | 4 ++-- src/pokemon_icon.c | 4 ++-- 20 files changed, 28 insertions(+), 28 deletions(-) diff --git a/include/constants/species.h b/include/constants/species.h index f4151466b1..d73e2a5dbb 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -440,7 +440,7 @@ #define SPECIES_BRONZOR 436 #define SPECIES_BRONZONG 437 #define SPECIES_BONSLY 438 -#define SPECIES_MIMEJR 439 +#define SPECIES_MIME_JR 439 #define SPECIES_HAPPINY 440 #define SPECIES_CHATOT 441 #define SPECIES_SPIRITOMB 442 @@ -1791,7 +1791,7 @@ #define NATIONAL_DEX_BRONZOR 436 #define NATIONAL_DEX_BRONZONG 437 #define NATIONAL_DEX_BONSLY 438 -#define NATIONAL_DEX_MIMEJR 439 +#define NATIONAL_DEX_MIME_JR 439 #define NATIONAL_DEX_HAPPINY 440 #define NATIONAL_DEX_CHATOT 441 #define NATIONAL_DEX_SPIRITOMB 442 diff --git a/src/data/pokemon/base_stats.h b/src/data/pokemon/base_stats.h index 67ddca5dc4..3fad49fb15 100644 --- a/src/data/pokemon/base_stats.h +++ b/src/data/pokemon/base_stats.h @@ -12408,7 +12408,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MIMEJR] = + [SPECIES_MIME_JR] = { .baseHP = 20, .baseAttack = 25, diff --git a/src/data/pokemon/egg_moves.h b/src/data/pokemon/egg_moves.h index c00e2fe0ae..18853e0c87 100644 --- a/src/data/pokemon/egg_moves.h +++ b/src/data/pokemon/egg_moves.h @@ -2678,7 +2678,7 @@ const u16 gEggMoves[] = { MOVE_CURSE, MOVE_ENDURE), - egg_moves(MIMEJR, + egg_moves(MIME_JR, MOVE_FUTURE_SIGHT, MOVE_HYPNOSIS, MOVE_MIMIC, diff --git a/src/data/pokemon/evolution.h b/src/data/pokemon/evolution.h index 1e2f2bf584..9d67f1f17d 100644 --- a/src/data/pokemon/evolution.h +++ b/src/data/pokemon/evolution.h @@ -286,7 +286,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_STUNKY] = {{EVO_LEVEL, 34, SPECIES_SKUNTANK}}, [SPECIES_BRONZOR] = {{EVO_LEVEL, 35, SPECIES_BRONZONG}}, [SPECIES_BONSLY] = {{EVO_MOVE, MOVE_MIMIC, SPECIES_SUDOWOODO}}, - [SPECIES_MIMEJR] = {{EVO_MOVE, MOVE_MIMIC, SPECIES_MR_MIME}}, + [SPECIES_MIME_JR] = {{EVO_MOVE, MOVE_MIMIC, SPECIES_MR_MIME}}, [SPECIES_HAPPINY] = {{EVO_ITEM_HOLD_DAY, ITEM_OVAL_STONE, SPECIES_CHANSEY}}, [SPECIES_GIBLE] = {{EVO_LEVEL, 24, SPECIES_GABITE}}, [SPECIES_GABITE] = {{EVO_LEVEL, 48, SPECIES_GARCHOMP}}, diff --git a/src/data/pokemon/level_up_learnset_pointers.h b/src/data/pokemon/level_up_learnset_pointers.h index 721ce3920c..8c9f8a1946 100644 --- a/src/data/pokemon/level_up_learnset_pointers.h +++ b/src/data/pokemon/level_up_learnset_pointers.h @@ -439,7 +439,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_BRONZOR] = sBronzorLevelUpLearnset, [SPECIES_BRONZONG] = sBronzongLevelUpLearnset, [SPECIES_BONSLY] = sBonslyLevelUpLearnset, - [SPECIES_MIMEJR] = sMimejrLevelUpLearnset, + [SPECIES_MIME_JR] = sMimejrLevelUpLearnset, [SPECIES_HAPPINY] = sHappinyLevelUpLearnset, [SPECIES_CHATOT] = sChatotLevelUpLearnset, [SPECIES_SPIRITOMB] = sSpiritombLevelUpLearnset, diff --git a/src/data/pokemon/pokedex_entries.h b/src/data/pokemon/pokedex_entries.h index 9cd0a73b24..d873f14018 100644 --- a/src/data/pokemon/pokedex_entries.h +++ b/src/data/pokemon/pokedex_entries.h @@ -5268,7 +5268,7 @@ const struct PokedexEntry gPokedexEntries[] = .trainerOffset = 0, }, - [NATIONAL_DEX_MIMEJR] = + [NATIONAL_DEX_MIME_JR] = { .categoryName = _("Mime"), .height = 6, diff --git a/src/data/pokemon/pokedex_orders.h b/src/data/pokemon/pokedex_orders.h index 402e11b534..68b09bf9ec 100644 --- a/src/data/pokemon/pokedex_orders.h +++ b/src/data/pokemon/pokedex_orders.h @@ -507,7 +507,7 @@ const u16 gPokedexOrder_Alphabetical[] = NATIONAL_DEX_MILCERY, NATIONAL_DEX_MILOTIC, NATIONAL_DEX_MILTANK, - NATIONAL_DEX_MIMEJR, + NATIONAL_DEX_MIME_JR, NATIONAL_DEX_MIMIKYU, NATIONAL_DEX_MINCCINO, NATIONAL_DEX_MINIOR, @@ -1248,7 +1248,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_MORGREM, NATIONAL_DEX_IVYSAUR, //NATIONAL_DEX_BANETTE, // Mega - NATIONAL_DEX_MIMEJR, + NATIONAL_DEX_MIME_JR, NATIONAL_DEX_LAMPENT, //NATIONAL_DEX_TOGEDEMARU, // Totem-sized NATIONAL_DEX_BLACEPHALON, @@ -2260,7 +2260,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_BAGON, NATIONAL_DEX_BELDUM, NATIONAL_DEX_STARAVIA, - NATIONAL_DEX_MIMEJR, + NATIONAL_DEX_MIME_JR, NATIONAL_DEX_HAPPINY, NATIONAL_DEX_MUNCHLAX, NATIONAL_DEX_SNIVY, diff --git a/src/data/pokemon/tmhm_learnsets.h b/src/data/pokemon/tmhm_learnsets.h index 6013a93f03..f50c7d3f46 100644 --- a/src/data/pokemon/tmhm_learnsets.h +++ b/src/data/pokemon/tmhm_learnsets.h @@ -10829,7 +10829,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_MIMEJR] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_MIME_JR] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) diff --git a/src/data/pokemon/tutor_learnsets.h b/src/data/pokemon/tutor_learnsets.h index 712932b7e9..f450b206e3 100644 --- a/src/data/pokemon/tutor_learnsets.h +++ b/src/data/pokemon/tutor_learnsets.h @@ -6438,7 +6438,7 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SUBSTITUTE) | TUTOR(MOVE_SWAGGER)), - [SPECIES_MIMEJR] = TUTOR_LEARNSET(TUTOR(MOVE_DREAM_EATER) + [SPECIES_MIME_JR] = TUTOR_LEARNSET(TUTOR(MOVE_DREAM_EATER) | TUTOR(MOVE_ENDURE) | TUTOR(MOVE_ICY_WIND) | TUTOR(MOVE_MIMIC) diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index 840b5caaf4..540b44a122 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -2195,7 +2195,7 @@ const struct MonCoords gMonBackPicCoords[] = .size = 0x58, .y_offset = 6, }, - [SPECIES_MIMEJR] = + [SPECIES_MIME_JR] = { .size = 0x88, .y_offset = 1, diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index 4c8c485226..5f79ce1498 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -439,7 +439,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(BRONZOR, gMonBackPic_Bronzor), SPECIES_SPRITE(BRONZONG, gMonBackPic_Bronzong), SPECIES_SPRITE(BONSLY, gMonBackPic_Bonsly), - SPECIES_SPRITE(MIMEJR, gMonBackPic_Mimejr), + SPECIES_SPRITE(MIME_JR, gMonBackPic_Mimejr), SPECIES_SPRITE(HAPPINY, gMonBackPic_Happiny), SPECIES_SPRITE(CHATOT, gMonBackPic_Chatot), SPECIES_SPRITE(SPIRITOMB, gMonBackPic_Spiritomb), diff --git a/src/data/pokemon_graphics/footprint_table.h b/src/data/pokemon_graphics/footprint_table.h index da132bbf30..aec82a15bf 100644 --- a/src/data/pokemon_graphics/footprint_table.h +++ b/src/data/pokemon_graphics/footprint_table.h @@ -439,7 +439,7 @@ const u8 *const gMonFootprintTable[] = [SPECIES_BRONZOR] = gMonFootprint_Bronzor, [SPECIES_BRONZONG] = gMonFootprint_Bronzong, [SPECIES_BONSLY] = gMonFootprint_Bonsly, - [SPECIES_MIMEJR] = gMonFootprint_MimeJr, + [SPECIES_MIME_JR] = gMonFootprint_MimeJr, [SPECIES_HAPPINY] = gMonFootprint_Happiny, [SPECIES_CHATOT] = gMonFootprint_Chatot, [SPECIES_SPIRITOMB] = gMonFootprint_Spiritomb, diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index 9f5ae7cbd5..b79ae0e61c 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -5256,7 +5256,7 @@ static const union AnimCmd sAnim_BONSLY_1[] = ANIMCMD_END, }; -static const union AnimCmd sAnim_MIMEJR_1[] = +static const union AnimCmd sAnim_MIME_JR_1[] = { ANIMCMD_FRAME(0, 10), ANIMCMD_FRAME(1, 10), @@ -11526,9 +11526,9 @@ static const union AnimCmd *const sAnims_BONSLY[] ={ sAnim_BONSLY_1, }; -static const union AnimCmd *const sAnims_MIMEJR[] ={ +static const union AnimCmd *const sAnims_MIME_JR[] ={ sAnim_GeneralFrame0, - sAnim_MIMEJR_1, + sAnim_MIME_JR_1, }; static const union AnimCmd *const sAnims_HAPPINY[] ={ @@ -14843,7 +14843,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD(BRONZOR), ANIM_CMD(BRONZONG), ANIM_CMD(BONSLY), - ANIM_CMD(MIMEJR), + ANIM_CMD(MIME_JR), ANIM_CMD(HAPPINY), ANIM_CMD(CHATOT), ANIM_CMD(SPIRITOMB), diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index f3373ce351..c3ad1ac453 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -2195,7 +2195,7 @@ const struct MonCoords gMonFrontPicCoords[] = .size = 0x55, .y_offset = 9, }, - [SPECIES_MIMEJR] = + [SPECIES_MIME_JR] = { .size = 0x77, .y_offset = 9, diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index ddb907952e..8ae5fc9ec1 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -439,7 +439,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(BRONZOR, gMonFrontPic_Bronzor), SPECIES_SPRITE(BRONZONG, gMonFrontPic_Bronzong), SPECIES_SPRITE(BONSLY, gMonFrontPic_Bonsly), - SPECIES_SPRITE(MIMEJR, gMonFrontPic_Mimejr), + SPECIES_SPRITE(MIME_JR, gMonFrontPic_Mimejr), SPECIES_SPRITE(HAPPINY, gMonFrontPic_Happiny), SPECIES_SPRITE(CHATOT, gMonFrontPic_Chatot), SPECIES_SPRITE(SPIRITOMB, gMonFrontPic_Spiritomb), diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index 0e202b5c2a..3ccb072cac 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -439,7 +439,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(BRONZOR, gMonPalette_Bronzor), SPECIES_PAL(BRONZONG, gMonPalette_Bronzong), SPECIES_PAL(BONSLY, gMonPalette_Bonsly), - SPECIES_PAL(MIMEJR, gMonPalette_Mimejr), + SPECIES_PAL(MIME_JR, gMonPalette_Mimejr), SPECIES_PAL(HAPPINY, gMonPalette_Happiny), SPECIES_PAL(CHATOT, gMonPalette_Chatot), SPECIES_PAL(SPIRITOMB, gMonPalette_Spiritomb), diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index 180fc7c00e..93bfe33b70 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -439,7 +439,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(BRONZOR, gMonShinyPalette_Bronzor), SPECIES_SHINY_PAL(BRONZONG, gMonShinyPalette_Bronzong), SPECIES_SHINY_PAL(BONSLY, gMonShinyPalette_Bonsly), - SPECIES_SHINY_PAL(MIMEJR, gMonShinyPalette_Mimejr), + SPECIES_SHINY_PAL(MIME_JR, gMonShinyPalette_Mimejr), SPECIES_SHINY_PAL(HAPPINY, gMonShinyPalette_Happiny), SPECIES_SHINY_PAL(CHATOT, gMonShinyPalette_Chatot), SPECIES_SHINY_PAL(SPIRITOMB, gMonShinyPalette_Spiritomb), diff --git a/src/data/text/species_names.h b/src/data/text/species_names.h index d51f76ae2c..26677bcca9 100644 --- a/src/data/text/species_names.h +++ b/src/data/text/species_names.h @@ -438,7 +438,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_BRONZOR] = _("Bronzor"), [SPECIES_BRONZONG] = _("Bronzong"), [SPECIES_BONSLY] = _("Bonsly"), - [SPECIES_MIMEJR] = _("Mime jr."), + [SPECIES_MIME_JR] = _("Mime jr."), [SPECIES_HAPPINY] = _("Happiny"), [SPECIES_CHATOT] = _("Chatot"), [SPECIES_SPIRITOMB] = _("Spiritomb"), diff --git a/src/pokemon.c b/src/pokemon.c index 1f6fc98326..517725c345 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -751,7 +751,7 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to SPECIES_TO_NATIONAL(BRONZOR), SPECIES_TO_NATIONAL(BRONZONG), SPECIES_TO_NATIONAL(BONSLY), - SPECIES_TO_NATIONAL(MIMEJR), + SPECIES_TO_NATIONAL(MIME_JR), SPECIES_TO_NATIONAL(HAPPINY), SPECIES_TO_NATIONAL(CHATOT), SPECIES_TO_NATIONAL(SPIRITOMB), @@ -2293,7 +2293,7 @@ static const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_BRONZOR - 1] = 0x4E, [SPECIES_BRONZONG - 1] = 0x51, [SPECIES_BONSLY - 1] = 0x52, - [SPECIES_MIMEJR - 1] = 0x40, + [SPECIES_MIME_JR - 1] = 0x40, [SPECIES_HAPPINY - 1] = 0x45, [SPECIES_CHATOT - 1] = 0x19, [SPECIES_SPIRITOMB - 1] = 0x3A, diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index d3c75bb1b5..81a2040752 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -464,7 +464,7 @@ const u8 *const gMonIconTable[] = [SPECIES_BRONZOR] = gMonIcon_Bronzor, [SPECIES_BRONZONG] = gMonIcon_Bronzong, [SPECIES_BONSLY] = gMonIcon_Bonsly, - [SPECIES_MIMEJR] = gMonIcon_Mimejr, + [SPECIES_MIME_JR] = gMonIcon_Mimejr, [SPECIES_HAPPINY] = gMonIcon_Happiny, [SPECIES_CHATOT] = gMonIcon_Chatot, [SPECIES_SPIRITOMB] = gMonIcon_Spiritomb, @@ -1680,7 +1680,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_BRONZOR] = 0, [SPECIES_BRONZONG] = 0, [SPECIES_BONSLY] = 1, - [SPECIES_MIMEJR] = 0, + [SPECIES_MIME_JR] = 0, [SPECIES_HAPPINY] = 0, [SPECIES_CHATOT] = 0, [SPECIES_SPIRITOMB] = 5, From f700004188d3f187b9d07c918470755d6a42a665 Mon Sep 17 00:00:00 2001 From: amiosi <44352097+amiosi@users.noreply.github.com> Date: Tue, 2 Feb 2021 14:21:00 -0500 Subject: [PATCH 02/15] proper CamelCase --- .../{mimejr => mime_jr}/anim_front.png | Bin graphics/pokemon/{mimejr => mime_jr}/back.png | Bin .../pokemon/{mimejr => mime_jr}/footprint.png | Bin .../pokemon/{mimejr => mime_jr}/front.png | Bin graphics/pokemon/{mimejr => mime_jr}/icon.png | Bin .../pokemon/{mimejr => mime_jr}/normal.pal | 0 .../pokemon/{mimejr => mime_jr}/shiny.pal | 0 .../pokemon/oricorio/{pa_u => pau}/back.png | Bin .../pokemon/oricorio/{pa_u => pau}/front.png | Bin .../pokemon/oricorio/{pa_u => pau}/icon.png | Bin .../pokemon/oricorio/{pa_u => pau}/normal.pal | 0 .../pokemon/oricorio/{pa_u => pau}/shiny.pal | 0 include/graphics.h | 52 +++++++------- src/data/graphics/pokemon.h | 64 +++++++++--------- src/data/pokemon/level_up_learnset_pointers.h | 10 +-- src/data/pokemon/level_up_learnsets.h | 10 +-- src/data/pokemon/pokedex_entries.h | 2 +- src/data/pokemon/pokedex_text.h | 2 +- src/data/pokemon_graphics/back_pic_table.h | 10 +-- src/data/pokemon_graphics/footprint_table.h | 2 +- src/data/pokemon_graphics/front_pic_table.h | 10 +-- src/data/pokemon_graphics/palette_table.h | 10 +-- .../pokemon_graphics/shiny_palette_table.h | 10 +-- src/data/text/species_names.h | 4 +- src/pokemon_icon.c | 10 +-- 25 files changed, 98 insertions(+), 98 deletions(-) rename graphics/pokemon/{mimejr => mime_jr}/anim_front.png (100%) rename graphics/pokemon/{mimejr => mime_jr}/back.png (100%) rename graphics/pokemon/{mimejr => mime_jr}/footprint.png (100%) rename graphics/pokemon/{mimejr => mime_jr}/front.png (100%) rename graphics/pokemon/{mimejr => mime_jr}/icon.png (100%) rename graphics/pokemon/{mimejr => mime_jr}/normal.pal (100%) rename graphics/pokemon/{mimejr => mime_jr}/shiny.pal (100%) rename graphics/pokemon/oricorio/{pa_u => pau}/back.png (100%) rename graphics/pokemon/oricorio/{pa_u => pau}/front.png (100%) rename graphics/pokemon/oricorio/{pa_u => pau}/icon.png (100%) rename graphics/pokemon/oricorio/{pa_u => pau}/normal.pal (100%) rename graphics/pokemon/oricorio/{pa_u => pau}/shiny.pal (100%) diff --git a/graphics/pokemon/mimejr/anim_front.png b/graphics/pokemon/mime_jr/anim_front.png similarity index 100% rename from graphics/pokemon/mimejr/anim_front.png rename to graphics/pokemon/mime_jr/anim_front.png diff --git a/graphics/pokemon/mimejr/back.png b/graphics/pokemon/mime_jr/back.png similarity index 100% rename from graphics/pokemon/mimejr/back.png rename to graphics/pokemon/mime_jr/back.png diff --git a/graphics/pokemon/mimejr/footprint.png b/graphics/pokemon/mime_jr/footprint.png similarity index 100% rename from graphics/pokemon/mimejr/footprint.png rename to graphics/pokemon/mime_jr/footprint.png diff --git a/graphics/pokemon/mimejr/front.png b/graphics/pokemon/mime_jr/front.png similarity index 100% rename from graphics/pokemon/mimejr/front.png rename to graphics/pokemon/mime_jr/front.png diff --git a/graphics/pokemon/mimejr/icon.png b/graphics/pokemon/mime_jr/icon.png similarity index 100% rename from graphics/pokemon/mimejr/icon.png rename to graphics/pokemon/mime_jr/icon.png diff --git a/graphics/pokemon/mimejr/normal.pal b/graphics/pokemon/mime_jr/normal.pal similarity index 100% rename from graphics/pokemon/mimejr/normal.pal rename to graphics/pokemon/mime_jr/normal.pal diff --git a/graphics/pokemon/mimejr/shiny.pal b/graphics/pokemon/mime_jr/shiny.pal similarity index 100% rename from graphics/pokemon/mimejr/shiny.pal rename to graphics/pokemon/mime_jr/shiny.pal diff --git a/graphics/pokemon/oricorio/pa_u/back.png b/graphics/pokemon/oricorio/pau/back.png similarity index 100% rename from graphics/pokemon/oricorio/pa_u/back.png rename to graphics/pokemon/oricorio/pau/back.png diff --git a/graphics/pokemon/oricorio/pa_u/front.png b/graphics/pokemon/oricorio/pau/front.png similarity index 100% rename from graphics/pokemon/oricorio/pa_u/front.png rename to graphics/pokemon/oricorio/pau/front.png diff --git a/graphics/pokemon/oricorio/pa_u/icon.png b/graphics/pokemon/oricorio/pau/icon.png similarity index 100% rename from graphics/pokemon/oricorio/pa_u/icon.png rename to graphics/pokemon/oricorio/pau/icon.png diff --git a/graphics/pokemon/oricorio/pa_u/normal.pal b/graphics/pokemon/oricorio/pau/normal.pal similarity index 100% rename from graphics/pokemon/oricorio/pa_u/normal.pal rename to graphics/pokemon/oricorio/pau/normal.pal diff --git a/graphics/pokemon/oricorio/pa_u/shiny.pal b/graphics/pokemon/oricorio/pau/shiny.pal similarity index 100% rename from graphics/pokemon/oricorio/pa_u/shiny.pal rename to graphics/pokemon/oricorio/pau/shiny.pal diff --git a/include/graphics.h b/include/graphics.h index 6e4223be9d..85ee8e2000 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -158,7 +158,7 @@ extern const u32 gMonFrontPic_Goldeen[]; extern const u32 gMonFrontPic_Seaking[]; extern const u32 gMonFrontPic_Staryu[]; extern const u32 gMonFrontPic_Starmie[]; -extern const u32 gMonFrontPic_Mrmime[]; +extern const u32 gMonFrontPic_MrMime[]; extern const u32 gMonFrontPic_Scyther[]; extern const u32 gMonFrontPic_Jynx[]; extern const u32 gMonFrontPic_Electabuzz[]; @@ -476,7 +476,7 @@ extern const u32 gMonFrontPic_Skuntank[]; extern const u32 gMonFrontPic_Bronzor[]; extern const u32 gMonFrontPic_Bronzong[]; extern const u32 gMonFrontPic_Bonsly[]; -extern const u32 gMonFrontPic_Mimejr[]; +extern const u32 gMonFrontPic_MimeJr[]; extern const u32 gMonFrontPic_Happiny[]; extern const u32 gMonFrontPic_Chatot[]; extern const u32 gMonFrontPic_Spiritomb[]; @@ -819,9 +819,9 @@ extern const u32 gMonFrontPic_Mimikyu[]; extern const u32 gMonFrontPic_Bruxish[]; extern const u32 gMonFrontPic_Drampa[]; extern const u32 gMonFrontPic_Dhelmise[]; -extern const u32 gMonFrontPic_Jangmo_o[]; -extern const u32 gMonFrontPic_Hakamo_o[]; -extern const u32 gMonFrontPic_Kommo_o[]; +extern const u32 gMonFrontPic_Jangmoo[]; +extern const u32 gMonFrontPic_Hakamoo[]; +extern const u32 gMonFrontPic_Kommoo[]; extern const u32 gMonFrontPic_Tapu_koko[]; extern const u32 gMonFrontPic_Tapu_lele[]; extern const u32 gMonFrontPic_Tapu_bulu[]; @@ -1298,7 +1298,7 @@ extern const u32 gMonBackPic_Goldeen[]; extern const u32 gMonBackPic_Seaking[]; extern const u32 gMonBackPic_Staryu[]; extern const u32 gMonBackPic_Starmie[]; -extern const u32 gMonBackPic_Mrmime[]; +extern const u32 gMonBackPic_MrMime[]; extern const u32 gMonBackPic_Scyther[]; extern const u32 gMonBackPic_Jynx[]; extern const u32 gMonBackPic_Electabuzz[]; @@ -1616,7 +1616,7 @@ extern const u32 gMonBackPic_Skuntank[]; extern const u32 gMonBackPic_Bronzor[]; extern const u32 gMonBackPic_Bronzong[]; extern const u32 gMonBackPic_Bonsly[]; -extern const u32 gMonBackPic_Mimejr[]; +extern const u32 gMonBackPic_MimeJr[]; extern const u32 gMonBackPic_Happiny[]; extern const u32 gMonBackPic_Chatot[]; extern const u32 gMonBackPic_Spiritomb[]; @@ -1959,9 +1959,9 @@ extern const u32 gMonBackPic_Mimikyu[]; extern const u32 gMonBackPic_Bruxish[]; extern const u32 gMonBackPic_Drampa[]; extern const u32 gMonBackPic_Dhelmise[]; -extern const u32 gMonBackPic_Jangmo_o[]; -extern const u32 gMonBackPic_Hakamo_o[]; -extern const u32 gMonBackPic_Kommo_o[]; +extern const u32 gMonBackPic_Jangmoo[]; +extern const u32 gMonBackPic_Hakamoo[]; +extern const u32 gMonBackPic_Kommoo[]; extern const u32 gMonBackPic_Tapu_koko[]; extern const u32 gMonBackPic_Tapu_lele[]; extern const u32 gMonBackPic_Tapu_bulu[]; @@ -2437,7 +2437,7 @@ extern const u32 gMonPalette_Goldeen[]; extern const u32 gMonPalette_Seaking[]; extern const u32 gMonPalette_Staryu[]; extern const u32 gMonPalette_Starmie[]; -extern const u32 gMonPalette_Mrmime[]; +extern const u32 gMonPalette_MrMime[]; extern const u32 gMonPalette_Scyther[]; extern const u32 gMonPalette_Jynx[]; extern const u32 gMonPalette_Electabuzz[]; @@ -2754,7 +2754,7 @@ extern const u32 gMonPalette_Skuntank[]; extern const u32 gMonPalette_Bronzor[]; extern const u32 gMonPalette_Bronzong[]; extern const u32 gMonPalette_Bonsly[]; -extern const u32 gMonPalette_Mimejr[]; +extern const u32 gMonPalette_MimeJr[]; extern const u32 gMonPalette_Happiny[]; extern const u32 gMonPalette_Chatot[]; extern const u32 gMonPalette_Spiritomb[]; @@ -3097,9 +3097,9 @@ extern const u32 gMonPalette_Mimikyu[]; extern const u32 gMonPalette_Bruxish[]; extern const u32 gMonPalette_Drampa[]; extern const u32 gMonPalette_Dhelmise[]; -extern const u32 gMonPalette_Jangmo_o[]; -extern const u32 gMonPalette_Hakamo_o[]; -extern const u32 gMonPalette_Kommo_o[]; +extern const u32 gMonPalette_Jangmoo[]; +extern const u32 gMonPalette_Hakamoo[]; +extern const u32 gMonPalette_Kommoo[]; extern const u32 gMonPalette_Tapu_koko[]; extern const u32 gMonPalette_Tapu_lele[]; extern const u32 gMonPalette_Tapu_bulu[]; @@ -3602,7 +3602,7 @@ extern const u32 gMonShinyPalette_Goldeen[]; extern const u32 gMonShinyPalette_Seaking[]; extern const u32 gMonShinyPalette_Staryu[]; extern const u32 gMonShinyPalette_Starmie[]; -extern const u32 gMonShinyPalette_Mrmime[]; +extern const u32 gMonShinyPalette_MrMime[]; extern const u32 gMonShinyPalette_Scyther[]; extern const u32 gMonShinyPalette_Jynx[]; extern const u32 gMonShinyPalette_Electabuzz[]; @@ -3919,7 +3919,7 @@ extern const u32 gMonShinyPalette_Skuntank[]; extern const u32 gMonShinyPalette_Bronzor[]; extern const u32 gMonShinyPalette_Bronzong[]; extern const u32 gMonShinyPalette_Bonsly[]; -extern const u32 gMonShinyPalette_Mimejr[]; +extern const u32 gMonShinyPalette_MimeJr[]; extern const u32 gMonShinyPalette_Happiny[]; extern const u32 gMonShinyPalette_Chatot[]; extern const u32 gMonShinyPalette_Spiritomb[]; @@ -4262,9 +4262,9 @@ extern const u32 gMonShinyPalette_Mimikyu[]; extern const u32 gMonShinyPalette_Bruxish[]; extern const u32 gMonShinyPalette_Drampa[]; extern const u32 gMonShinyPalette_Dhelmise[]; -extern const u32 gMonShinyPalette_Jangmo_o[]; -extern const u32 gMonShinyPalette_Hakamo_o[]; -extern const u32 gMonShinyPalette_Kommo_o[]; +extern const u32 gMonShinyPalette_Jangmoo[]; +extern const u32 gMonShinyPalette_Hakamoo[]; +extern const u32 gMonShinyPalette_Kommoo[]; extern const u32 gMonShinyPalette_Tapu_koko[]; extern const u32 gMonShinyPalette_Tapu_lele[]; extern const u32 gMonShinyPalette_Tapu_bulu[]; @@ -4759,7 +4759,7 @@ extern const u8 gMonIcon_Goldeen[]; extern const u8 gMonIcon_Seaking[]; extern const u8 gMonIcon_Staryu[]; extern const u8 gMonIcon_Starmie[]; -extern const u8 gMonIcon_Mrmime[]; +extern const u8 gMonIcon_MrMime[]; extern const u8 gMonIcon_Scyther[]; extern const u8 gMonIcon_Jynx[]; extern const u8 gMonIcon_Electabuzz[]; @@ -5076,7 +5076,7 @@ extern const u8 gMonIcon_Skuntank[]; extern const u8 gMonIcon_Bronzor[]; extern const u8 gMonIcon_Bronzong[]; extern const u8 gMonIcon_Bonsly[]; -extern const u8 gMonIcon_Mimejr[]; +extern const u8 gMonIcon_MimeJr[]; extern const u8 gMonIcon_Happiny[]; extern const u8 gMonIcon_Chatot[]; extern const u8 gMonIcon_Spiritomb[]; @@ -5419,9 +5419,9 @@ extern const u8 gMonIcon_Mimikyu[]; extern const u8 gMonIcon_Bruxish[]; extern const u8 gMonIcon_Drampa[]; extern const u8 gMonIcon_Dhelmise[]; -extern const u8 gMonIcon_Jangmo_o[]; -extern const u8 gMonIcon_Hakamo_o[]; -extern const u8 gMonIcon_Kommo_o[]; +extern const u8 gMonIcon_Jangmoo[]; +extern const u8 gMonIcon_Hakamoo[]; +extern const u8 gMonIcon_Kommoo[]; extern const u8 gMonIcon_Tapu_koko[]; extern const u8 gMonIcon_Tapu_lele[]; extern const u8 gMonIcon_Tapu_bulu[]; @@ -5781,7 +5781,7 @@ extern const u8 gMonFootprint_Goldeen[]; extern const u8 gMonFootprint_Seaking[]; extern const u8 gMonFootprint_Staryu[]; extern const u8 gMonFootprint_Starmie[]; -extern const u8 gMonFootprint_Mrmime[]; +extern const u8 gMonFootprint_MrMime[]; extern const u8 gMonFootprint_Scyther[]; extern const u8 gMonFootprint_Jynx[]; extern const u8 gMonFootprint_Electabuzz[]; diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 651f368df7..5ab18ed617 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -121,7 +121,7 @@ const u32 gMonFrontPic_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/anim_fro const u32 gMonFrontPic_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/anim_front.4bpp.lz"); const u32 gMonFrontPic_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/anim_front.4bpp.lz"); const u32 gMonFrontPic_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Mrmime[] = INCBIN_U32("graphics/pokemon/mr_mime/anim_front.4bpp.lz"); +const u32 gMonFrontPic_MrMime[] = INCBIN_U32("graphics/pokemon/mr_mime/anim_front.4bpp.lz"); const u32 gMonFrontPic_Scyther[] = INCBIN_U32("graphics/pokemon/scyther/anim_front.4bpp.lz"); const u32 gMonFrontPic_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/anim_front.4bpp.lz"); const u32 gMonFrontPic_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/anim_front.4bpp.lz"); @@ -439,7 +439,7 @@ const u32 gMonFrontPic_Skuntank[] = INCBIN_U32("graphics/pokemon/skuntank/anim_f const u32 gMonFrontPic_Bronzor[] = INCBIN_U32("graphics/pokemon/bronzor/anim_front.4bpp.lz"); const u32 gMonFrontPic_Bronzong[] = INCBIN_U32("graphics/pokemon/bronzong/anim_front.4bpp.lz"); const u32 gMonFrontPic_Bonsly[] = INCBIN_U32("graphics/pokemon/bonsly/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Mimejr[] = INCBIN_U32("graphics/pokemon/mimejr/anim_front.4bpp.lz"); +const u32 gMonFrontPic_MimeJr[] = INCBIN_U32("graphics/pokemon/mime_jr/anim_front.4bpp.lz"); const u32 gMonFrontPic_Happiny[] = INCBIN_U32("graphics/pokemon/happiny/anim_front.4bpp.lz"); const u32 gMonFrontPic_Chatot[] = INCBIN_U32("graphics/pokemon/chatot/anim_front.4bpp.lz"); const u32 gMonFrontPic_Spiritomb[] = INCBIN_U32("graphics/pokemon/spiritomb/anim_front.4bpp.lz"); @@ -782,9 +782,9 @@ const u32 gMonFrontPic_Mimikyu[] = INCBIN_U32("graphics/pokemon/mimikyu/front.4b const u32 gMonFrontPic_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/front.4bpp.lz"); const u32 gMonFrontPic_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/front.4bpp.lz"); const u32 gMonFrontPic_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/front.4bpp.lz"); -const u32 gMonFrontPic_Jangmo_o[] = INCBIN_U32("graphics/pokemon/jangmo_o/front.4bpp.lz"); -const u32 gMonFrontPic_Hakamo_o[] = INCBIN_U32("graphics/pokemon/hakamo_o/front.4bpp.lz"); -const u32 gMonFrontPic_Kommo_o[] = INCBIN_U32("graphics/pokemon/kommo_o/front.4bpp.lz"); +const u32 gMonFrontPic_Jangmoo[] = INCBIN_U32("graphics/pokemon/jangmo_o/front.4bpp.lz"); +const u32 gMonFrontPic_Hakamoo[] = INCBIN_U32("graphics/pokemon/hakamo_o/front.4bpp.lz"); +const u32 gMonFrontPic_Kommoo[] = INCBIN_U32("graphics/pokemon/kommo_o/front.4bpp.lz"); const u32 gMonFrontPic_Tapu_koko[] = INCBIN_U32("graphics/pokemon/tapu_koko/front.4bpp.lz"); const u32 gMonFrontPic_Tapu_lele[] = INCBIN_U32("graphics/pokemon/tapu_lele/front.4bpp.lz"); const u32 gMonFrontPic_Tapu_bulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/front.4bpp.lz"); @@ -1104,7 +1104,7 @@ const u32 gMonFrontPic_Zygarde10[] = INCBIN_U32("graphics/pokemon/zygarde/10_per const u32 gMonFrontPic_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/zygarde/complete/front.4bpp.lz"); const u32 gMonFrontPic_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/unbound/front.4bpp.lz"); const u32 gMonFrontPic_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/oricorio/pom_pom/front.4bpp.lz"); -const u32 gMonFrontPic_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pa_u/front.4bpp.lz"); +const u32 gMonFrontPic_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pau/front.4bpp.lz"); const u32 gMonFrontPic_OricorioSensu[] = INCBIN_U32("graphics/pokemon/oricorio/sensu/front.4bpp.lz"); const u32 gMonFrontPic_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/lycanroc/midnight/front.4bpp.lz"); const u32 gMonFrontPic_LycanrocDusk[] = INCBIN_U32("graphics/pokemon/lycanroc/dusk/front.4bpp.lz"); @@ -1261,7 +1261,7 @@ const u32 gMonBackPic_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/back.4bpp const u32 gMonBackPic_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/back.4bpp.lz"); const u32 gMonBackPic_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/back.4bpp.lz"); const u32 gMonBackPic_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/back.4bpp.lz"); -const u32 gMonBackPic_Mrmime[] = INCBIN_U32("graphics/pokemon/mr_mime/back.4bpp.lz"); +const u32 gMonBackPic_MrMime[] = INCBIN_U32("graphics/pokemon/mr_mime/back.4bpp.lz"); const u32 gMonBackPic_Scyther[] = INCBIN_U32("graphics/pokemon/scyther/back.4bpp.lz"); const u32 gMonBackPic_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/back.4bpp.lz"); const u32 gMonBackPic_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/back.4bpp.lz"); @@ -1579,7 +1579,7 @@ const u32 gMonBackPic_Skuntank[] = INCBIN_U32("graphics/pokemon/skuntank/back.4b const u32 gMonBackPic_Bronzor[] = INCBIN_U32("graphics/pokemon/bronzor/back.4bpp.lz"); const u32 gMonBackPic_Bronzong[] = INCBIN_U32("graphics/pokemon/bronzong/back.4bpp.lz"); const u32 gMonBackPic_Bonsly[] = INCBIN_U32("graphics/pokemon/bonsly/back.4bpp.lz"); -const u32 gMonBackPic_Mimejr[] = INCBIN_U32("graphics/pokemon/mimejr/back.4bpp.lz"); +const u32 gMonBackPic_MimeJr[] = INCBIN_U32("graphics/pokemon/mime_jr/back.4bpp.lz"); const u32 gMonBackPic_Happiny[] = INCBIN_U32("graphics/pokemon/happiny/back.4bpp.lz"); const u32 gMonBackPic_Chatot[] = INCBIN_U32("graphics/pokemon/chatot/back.4bpp.lz"); const u32 gMonBackPic_Spiritomb[] = INCBIN_U32("graphics/pokemon/spiritomb/back.4bpp.lz"); @@ -1922,9 +1922,9 @@ const u32 gMonBackPic_Mimikyu[] = INCBIN_U32("graphics/pokemon/mimikyu/back.4bpp const u32 gMonBackPic_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/back.4bpp.lz"); const u32 gMonBackPic_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/back.4bpp.lz"); const u32 gMonBackPic_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/back.4bpp.lz"); -const u32 gMonBackPic_Jangmo_o[] = INCBIN_U32("graphics/pokemon/jangmo_o/back.4bpp.lz"); -const u32 gMonBackPic_Hakamo_o[] = INCBIN_U32("graphics/pokemon/hakamo_o/back.4bpp.lz"); -const u32 gMonBackPic_Kommo_o[] = INCBIN_U32("graphics/pokemon/kommo_o/back.4bpp.lz"); +const u32 gMonBackPic_Jangmoo[] = INCBIN_U32("graphics/pokemon/jangmo_o/back.4bpp.lz"); +const u32 gMonBackPic_Hakamoo[] = INCBIN_U32("graphics/pokemon/hakamo_o/back.4bpp.lz"); +const u32 gMonBackPic_Kommoo[] = INCBIN_U32("graphics/pokemon/kommo_o/back.4bpp.lz"); const u32 gMonBackPic_Tapu_koko[] = INCBIN_U32("graphics/pokemon/tapu_koko/back.4bpp.lz"); const u32 gMonBackPic_Tapu_lele[] = INCBIN_U32("graphics/pokemon/tapu_lele/back.4bpp.lz"); const u32 gMonBackPic_Tapu_bulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/back.4bpp.lz"); @@ -2244,7 +2244,7 @@ const u32 gMonBackPic_Zygarde10[] = INCBIN_U32("graphics/pokemon/zygarde/10_perc const u32 gMonBackPic_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/zygarde/complete/back.4bpp.lz"); const u32 gMonBackPic_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/unbound/back.4bpp.lz"); const u32 gMonBackPic_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/oricorio/pom_pom/back.4bpp.lz"); -const u32 gMonBackPic_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pa_u/back.4bpp.lz"); +const u32 gMonBackPic_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pau/back.4bpp.lz"); const u32 gMonBackPic_OricorioSensu[] = INCBIN_U32("graphics/pokemon/oricorio/sensu/back.4bpp.lz"); const u32 gMonBackPic_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/lycanroc/midnight/back.4bpp.lz"); const u32 gMonBackPic_LycanrocDusk[] = INCBIN_U32("graphics/pokemon/lycanroc/dusk/back.4bpp.lz"); @@ -2400,7 +2400,7 @@ const u32 gMonPalette_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/normal.gb const u32 gMonPalette_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/normal.gbapal.lz"); const u32 gMonPalette_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/normal.gbapal.lz"); const u32 gMonPalette_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/normal.gbapal.lz"); -const u32 gMonPalette_Mrmime[] = INCBIN_U32("graphics/pokemon/mr_mime/normal.gbapal.lz"); +const u32 gMonPalette_MrMime[] = INCBIN_U32("graphics/pokemon/mr_mime/normal.gbapal.lz"); const u32 gMonPalette_Scyther[] = INCBIN_U32("graphics/pokemon/scyther/normal.gbapal.lz"); const u32 gMonPalette_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/normal.gbapal.lz"); const u32 gMonPalette_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/normal.gbapal.lz"); @@ -2717,7 +2717,7 @@ const u32 gMonPalette_Skuntank[] = INCBIN_U32("graphics/pokemon/skuntank/normal. const u32 gMonPalette_Bronzor[] = INCBIN_U32("graphics/pokemon/bronzor/normal.gbapal.lz"); const u32 gMonPalette_Bronzong[] = INCBIN_U32("graphics/pokemon/bronzong/normal.gbapal.lz"); const u32 gMonPalette_Bonsly[] = INCBIN_U32("graphics/pokemon/bonsly/normal.gbapal.lz"); -const u32 gMonPalette_Mimejr[] = INCBIN_U32("graphics/pokemon/mimejr/normal.gbapal.lz"); +const u32 gMonPalette_MimeJr[] = INCBIN_U32("graphics/pokemon/mime_jr/normal.gbapal.lz"); const u32 gMonPalette_Happiny[] = INCBIN_U32("graphics/pokemon/happiny/normal.gbapal.lz"); const u32 gMonPalette_Chatot[] = INCBIN_U32("graphics/pokemon/chatot/normal.gbapal.lz"); const u32 gMonPalette_Spiritomb[] = INCBIN_U32("graphics/pokemon/spiritomb/normal.gbapal.lz"); @@ -3060,9 +3060,9 @@ const u32 gMonPalette_Mimikyu[] = INCBIN_U32("graphics/pokemon/mimikyu/normal.gb const u32 gMonPalette_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/normal.gbapal.lz"); const u32 gMonPalette_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/normal.gbapal.lz"); const u32 gMonPalette_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/normal.gbapal.lz"); -const u32 gMonPalette_Jangmo_o[] = INCBIN_U32("graphics/pokemon/jangmo_o/normal.gbapal.lz"); -const u32 gMonPalette_Hakamo_o[] = INCBIN_U32("graphics/pokemon/hakamo_o/normal.gbapal.lz"); -const u32 gMonPalette_Kommo_o[] = INCBIN_U32("graphics/pokemon/kommo_o/normal.gbapal.lz"); +const u32 gMonPalette_Jangmoo[] = INCBIN_U32("graphics/pokemon/jangmo_o/normal.gbapal.lz"); +const u32 gMonPalette_Hakamoo[] = INCBIN_U32("graphics/pokemon/hakamo_o/normal.gbapal.lz"); +const u32 gMonPalette_Kommoo[] = INCBIN_U32("graphics/pokemon/kommo_o/normal.gbapal.lz"); const u32 gMonPalette_Tapu_koko[] = INCBIN_U32("graphics/pokemon/tapu_koko/normal.gbapal.lz"); const u32 gMonPalette_Tapu_lele[] = INCBIN_U32("graphics/pokemon/tapu_lele/normal.gbapal.lz"); const u32 gMonPalette_Tapu_bulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/normal.gbapal.lz"); @@ -3385,7 +3385,7 @@ const u32 gMonPalette_Zygarde10[] = INCBIN_U32("graphics/pokemon/zygarde/10_perc const u32 gMonPalette_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/zygarde/complete/normal.gbapal.lz"); const u32 gMonPalette_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/unbound/normal.gbapal.lz"); const u32 gMonPalette_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/oricorio/pom_pom/normal.gbapal.lz"); -const u32 gMonPalette_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pa_u/normal.gbapal.lz"); +const u32 gMonPalette_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pau/normal.gbapal.lz"); const u32 gMonPalette_OricorioSensu[] = INCBIN_U32("graphics/pokemon/oricorio/sensu/normal.gbapal.lz"); const u32 gMonPalette_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/lycanroc/midnight/normal.gbapal.lz"); const u32 gMonPalette_LycanrocDusk[] = INCBIN_U32("graphics/pokemon/lycanroc/dusk/normal.gbapal.lz"); @@ -3565,7 +3565,7 @@ const u32 gMonShinyPalette_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/shin const u32 gMonShinyPalette_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/shiny.gbapal.lz"); const u32 gMonShinyPalette_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/shiny.gbapal.lz"); const u32 gMonShinyPalette_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Mrmime[] = INCBIN_U32("graphics/pokemon/mr_mime/shiny.gbapal.lz"); +const u32 gMonShinyPalette_MrMime[] = INCBIN_U32("graphics/pokemon/mr_mime/shiny.gbapal.lz"); const u32 gMonShinyPalette_Scyther[] = INCBIN_U32("graphics/pokemon/scyther/shiny.gbapal.lz"); const u32 gMonShinyPalette_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/shiny.gbapal.lz"); const u32 gMonShinyPalette_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/shiny.gbapal.lz"); @@ -3882,7 +3882,7 @@ const u32 gMonShinyPalette_Skuntank[] = INCBIN_U32("graphics/pokemon/skuntank/sh const u32 gMonShinyPalette_Bronzor[] = INCBIN_U32("graphics/pokemon/bronzor/shiny.gbapal.lz"); const u32 gMonShinyPalette_Bronzong[] = INCBIN_U32("graphics/pokemon/bronzong/shiny.gbapal.lz"); const u32 gMonShinyPalette_Bonsly[] = INCBIN_U32("graphics/pokemon/bonsly/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Mimejr[] = INCBIN_U32("graphics/pokemon/mimejr/shiny.gbapal.lz"); +const u32 gMonShinyPalette_MimeJr[] = INCBIN_U32("graphics/pokemon/mime_jr/shiny.gbapal.lz"); const u32 gMonShinyPalette_Happiny[] = INCBIN_U32("graphics/pokemon/happiny/shiny.gbapal.lz"); const u32 gMonShinyPalette_Chatot[] = INCBIN_U32("graphics/pokemon/chatot/shiny.gbapal.lz"); const u32 gMonShinyPalette_Spiritomb[] = INCBIN_U32("graphics/pokemon/spiritomb/shiny.gbapal.lz"); @@ -4225,9 +4225,9 @@ const u32 gMonShinyPalette_Mimikyu[] = INCBIN_U32("graphics/pokemon/mimikyu/shin const u32 gMonShinyPalette_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/shiny.gbapal.lz"); const u32 gMonShinyPalette_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/shiny.gbapal.lz"); const u32 gMonShinyPalette_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Jangmo_o[] = INCBIN_U32("graphics/pokemon/jangmo_o/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Hakamo_o[] = INCBIN_U32("graphics/pokemon/hakamo_o/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Kommo_o[] = INCBIN_U32("graphics/pokemon/kommo_o/shiny.gbapal.lz"); +const u32 gMonShinyPalette_Jangmoo[] = INCBIN_U32("graphics/pokemon/jangmo_o/shiny.gbapal.lz"); +const u32 gMonShinyPalette_Hakamoo[] = INCBIN_U32("graphics/pokemon/hakamo_o/shiny.gbapal.lz"); +const u32 gMonShinyPalette_Kommoo[] = INCBIN_U32("graphics/pokemon/kommo_o/shiny.gbapal.lz"); const u32 gMonShinyPalette_Tapu_koko[] = INCBIN_U32("graphics/pokemon/tapu_koko/shiny.gbapal.lz"); const u32 gMonShinyPalette_Tapu_lele[] = INCBIN_U32("graphics/pokemon/tapu_lele/shiny.gbapal.lz"); const u32 gMonShinyPalette_Tapu_bulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/shiny.gbapal.lz"); @@ -4550,7 +4550,7 @@ const u32 gMonShinyPalette_Zygarde10[] = INCBIN_U32("graphics/pokemon/zygarde/10 const u32 gMonShinyPalette_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/zygarde/complete/shiny.gbapal.lz"); const u32 gMonShinyPalette_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/unbound/shiny.gbapal.lz"); const u32 gMonShinyPalette_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/oricorio/pom_pom/shiny.gbapal.lz"); -const u32 gMonShinyPalette_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pa_u/shiny.gbapal.lz"); +const u32 gMonShinyPalette_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pau/shiny.gbapal.lz"); const u32 gMonShinyPalette_OricorioSensu[] = INCBIN_U32("graphics/pokemon/oricorio/sensu/shiny.gbapal.lz"); const u32 gMonShinyPalette_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/lycanroc/midnight/shiny.gbapal.lz"); const u32 gMonShinyPalette_LycanrocDusk[] = INCBIN_U32("graphics/pokemon/lycanroc/dusk/shiny.gbapal.lz"); @@ -4722,7 +4722,7 @@ const u8 gMonIcon_Goldeen[] = INCBIN_U8("graphics/pokemon/goldeen/icon.4bpp"); const u8 gMonIcon_Seaking[] = INCBIN_U8("graphics/pokemon/seaking/icon.4bpp"); const u8 gMonIcon_Staryu[] = INCBIN_U8("graphics/pokemon/staryu/icon.4bpp"); const u8 gMonIcon_Starmie[] = INCBIN_U8("graphics/pokemon/starmie/icon.4bpp"); -const u8 gMonIcon_Mrmime[] = INCBIN_U8("graphics/pokemon/mr_mime/icon.4bpp"); +const u8 gMonIcon_MrMime[] = INCBIN_U8("graphics/pokemon/mr_mime/icon.4bpp"); const u8 gMonIcon_Scyther[] = INCBIN_U8("graphics/pokemon/scyther/icon.4bpp"); const u8 gMonIcon_Jynx[] = INCBIN_U8("graphics/pokemon/jynx/icon.4bpp"); const u8 gMonIcon_Electabuzz[] = INCBIN_U8("graphics/pokemon/electabuzz/icon.4bpp"); @@ -5039,7 +5039,7 @@ const u8 gMonIcon_Skuntank[] = INCBIN_U8("graphics/pokemon/skuntank/icon.4bpp"); const u8 gMonIcon_Bronzor[] = INCBIN_U8("graphics/pokemon/bronzor/icon.4bpp"); const u8 gMonIcon_Bronzong[] = INCBIN_U8("graphics/pokemon/bronzong/icon.4bpp"); const u8 gMonIcon_Bonsly[] = INCBIN_U8("graphics/pokemon/bonsly/icon.4bpp"); -const u8 gMonIcon_Mimejr[] = INCBIN_U8("graphics/pokemon/mimejr/icon.4bpp"); +const u8 gMonIcon_MimeJr[] = INCBIN_U8("graphics/pokemon/mime_jr/icon.4bpp"); const u8 gMonIcon_Happiny[] = INCBIN_U8("graphics/pokemon/happiny/icon.4bpp"); const u8 gMonIcon_Chatot[] = INCBIN_U8("graphics/pokemon/chatot/icon.4bpp"); const u8 gMonIcon_Spiritomb[] = INCBIN_U8("graphics/pokemon/spiritomb/icon.4bpp"); @@ -5382,9 +5382,9 @@ const u8 gMonIcon_Mimikyu[] = INCBIN_U8("graphics/pokemon/mimikyu/icon.4bpp"); const u8 gMonIcon_Bruxish[] = INCBIN_U8("graphics/pokemon/bruxish/icon.4bpp"); const u8 gMonIcon_Drampa[] = INCBIN_U8("graphics/pokemon/drampa/icon.4bpp"); const u8 gMonIcon_Dhelmise[] = INCBIN_U8("graphics/pokemon/dhelmise/icon.4bpp"); -const u8 gMonIcon_Jangmo_o[] = INCBIN_U8("graphics/pokemon/jangmo_o/icon.4bpp"); -const u8 gMonIcon_Hakamo_o[] = INCBIN_U8("graphics/pokemon/hakamo_o/icon.4bpp"); -const u8 gMonIcon_Kommo_o[] = INCBIN_U8("graphics/pokemon/kommo_o/icon.4bpp"); +const u8 gMonIcon_Jangmoo[] = INCBIN_U8("graphics/pokemon/jangmo_o/icon.4bpp"); +const u8 gMonIcon_Hakamoo[] = INCBIN_U8("graphics/pokemon/hakamo_o/icon.4bpp"); +const u8 gMonIcon_Kommoo[] = INCBIN_U8("graphics/pokemon/kommo_o/icon.4bpp"); const u8 gMonIcon_Tapu_koko[] = INCBIN_U8("graphics/pokemon/tapu_koko/icon.4bpp"); const u8 gMonIcon_Tapu_lele[] = INCBIN_U8("graphics/pokemon/tapu_lele/icon.4bpp"); const u8 gMonIcon_Tapu_bulu[] = INCBIN_U8("graphics/pokemon/tapu_bulu/icon.4bpp"); @@ -5603,7 +5603,7 @@ const u8 gMonIcon_Zygarde10[] = INCBIN_U8("graphics/pokemon/zygarde/10_percent/i const u8 gMonIcon_ZygardeComplete[] = INCBIN_U8("graphics/pokemon/zygarde/complete/icon.4bpp"); const u8 gMonIcon_HoopaUnbound[] = INCBIN_U8("graphics/pokemon/hoopa/unbound/icon.4bpp"); const u8 gMonIcon_OricorioPomPom[] = INCBIN_U8("graphics/pokemon/oricorio/pom_pom/icon.4bpp"); -const u8 gMonIcon_OricorioPau[] = INCBIN_U8("graphics/pokemon/oricorio/pa_u/icon.4bpp"); +const u8 gMonIcon_OricorioPau[] = INCBIN_U8("graphics/pokemon/oricorio/pau/icon.4bpp"); const u8 gMonIcon_OricorioSensu[] = INCBIN_U8("graphics/pokemon/oricorio/sensu/icon.4bpp"); const u8 gMonIcon_LycanrocMidnight[] = INCBIN_U8("graphics/pokemon/lycanroc/midnight/icon.4bpp"); const u8 gMonIcon_LycanrocDusk[] = INCBIN_U8("graphics/pokemon/lycanroc/dusk/icon.4bpp"); @@ -5744,7 +5744,7 @@ const u8 gMonFootprint_Goldeen[] = INCBIN_U8("graphics/pokemon/goldeen/footprint const u8 gMonFootprint_Seaking[] = INCBIN_U8("graphics/pokemon/seaking/footprint.1bpp"); const u8 gMonFootprint_Staryu[] = INCBIN_U8("graphics/pokemon/staryu/footprint.1bpp"); const u8 gMonFootprint_Starmie[] = INCBIN_U8("graphics/pokemon/starmie/footprint.1bpp"); -const u8 gMonFootprint_Mrmime[] = INCBIN_U8("graphics/pokemon/mr_mime/footprint.1bpp"); +const u8 gMonFootprint_MrMime[] = INCBIN_U8("graphics/pokemon/mr_mime/footprint.1bpp"); const u8 gMonFootprint_Scyther[] = INCBIN_U8("graphics/pokemon/scyther/footprint.1bpp"); const u8 gMonFootprint_Jynx[] = INCBIN_U8("graphics/pokemon/jynx/footprint.1bpp"); const u8 gMonFootprint_Electabuzz[] = INCBIN_U8("graphics/pokemon/electabuzz/footprint.1bpp"); @@ -6061,7 +6061,7 @@ const u8 gMonFootprint_Skuntank[] = INCBIN_U8("graphics/pokemon/skuntank/footpri const u8 gMonFootprint_Bronzor[] = INCBIN_U8("graphics/pokemon/bronzor/footprint.1bpp"); const u8 gMonFootprint_Bronzong[] = INCBIN_U8("graphics/pokemon/bronzong/footprint.1bpp"); const u8 gMonFootprint_Bonsly[] = INCBIN_U8("graphics/pokemon/bonsly/footprint.1bpp"); -const u8 gMonFootprint_MimeJr[] = INCBIN_U8("graphics/pokemon/mimejr/footprint.1bpp"); +const u8 gMonFootprint_MimeJr[] = INCBIN_U8("graphics/pokemon/mime_jr/footprint.1bpp"); const u8 gMonFootprint_Happiny[] = INCBIN_U8("graphics/pokemon/happiny/footprint.1bpp"); const u8 gMonFootprint_Chatot[] = INCBIN_U8("graphics/pokemon/chatot/footprint.1bpp"); const u8 gMonFootprint_Spiritomb[] = INCBIN_U8("graphics/pokemon/spiritomb/footprint.1bpp"); diff --git a/src/data/pokemon/level_up_learnset_pointers.h b/src/data/pokemon/level_up_learnset_pointers.h index 8c9f8a1946..b6186f2d83 100644 --- a/src/data/pokemon/level_up_learnset_pointers.h +++ b/src/data/pokemon/level_up_learnset_pointers.h @@ -122,7 +122,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_SEAKING] = sSeakingLevelUpLearnset, [SPECIES_STARYU] = sStaryuLevelUpLearnset, [SPECIES_STARMIE] = sStarmieLevelUpLearnset, - [SPECIES_MR_MIME] = sMrmimeLevelUpLearnset, + [SPECIES_MR_MIME] = sMrMimeLevelUpLearnset, [SPECIES_SCYTHER] = sScytherLevelUpLearnset, [SPECIES_JYNX] = sJynxLevelUpLearnset, [SPECIES_ELECTABUZZ] = sElectabuzzLevelUpLearnset, @@ -439,7 +439,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_BRONZOR] = sBronzorLevelUpLearnset, [SPECIES_BRONZONG] = sBronzongLevelUpLearnset, [SPECIES_BONSLY] = sBonslyLevelUpLearnset, - [SPECIES_MIME_JR] = sMimejrLevelUpLearnset, + [SPECIES_MIME_JR] = sMimeJrLevelUpLearnset, [SPECIES_HAPPINY] = sHappinyLevelUpLearnset, [SPECIES_CHATOT] = sChatotLevelUpLearnset, [SPECIES_SPIRITOMB] = sSpiritombLevelUpLearnset, @@ -782,9 +782,9 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_BRUXISH] = sBruxishLevelUpLearnset, [SPECIES_DRAMPA] = sDrampaLevelUpLearnset, [SPECIES_DHELMISE] = sDhelmiseLevelUpLearnset, - [SPECIES_JANGMO_O] = sJangmoOLevelUpLearnset, - [SPECIES_HAKAMO_O] = sHakamoOLevelUpLearnset, - [SPECIES_KOMMO_O] = sKommoOLevelUpLearnset, + [SPECIES_JANGMO_O] = sJangmooLevelUpLearnset, + [SPECIES_HAKAMO_O] = sHakamooLevelUpLearnset, + [SPECIES_KOMMO_O] = sKommooLevelUpLearnset, [SPECIES_TAPU_KOKO] = sTapuKokoLevelUpLearnset, [SPECIES_TAPU_LELE] = sTapuLeleLevelUpLearnset, [SPECIES_TAPU_BULU] = sTapuBuluLevelUpLearnset, diff --git a/src/data/pokemon/level_up_learnsets.h b/src/data/pokemon/level_up_learnsets.h index 2cd3c98f90..c774cc3127 100644 --- a/src/data/pokemon/level_up_learnsets.h +++ b/src/data/pokemon/level_up_learnsets.h @@ -2388,7 +2388,7 @@ static const struct LevelUpMove sStarmieLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sMrmimeLevelUpLearnset[] = { +static const struct LevelUpMove sMrMimeLevelUpLearnset[] = { //LEVEL_UP_MOVE( 1, MOVE_MISTY_TERRAIN), LEVEL_UP_MOVE( 1, MOVE_MAGICAL_LEAF), //LEVEL_UP_MOVE( 1, MOVE_QUICK_GUARD), @@ -8862,7 +8862,7 @@ static const struct LevelUpMove sBonslyLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sMimejrLevelUpLearnset[] = { +static const struct LevelUpMove sMimeJrLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TICKLE), LEVEL_UP_MOVE( 1, MOVE_BARRIER), LEVEL_UP_MOVE( 1, MOVE_POUND), @@ -15954,7 +15954,7 @@ static const struct LevelUpMove sDhelmiseLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sJangmoOLevelUpLearnset[] = { +static const struct LevelUpMove sJangmooLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 5, MOVE_LEER), LEVEL_UP_MOVE( 9, MOVE_BIDE), @@ -15972,7 +15972,7 @@ static const struct LevelUpMove sJangmoOLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sHakamoOLevelUpLearnset[] = { +static const struct LevelUpMove sHakamooLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SKY_UPPERCUT), LEVEL_UP_MOVE( 1, MOVE_SKY_UPPERCUT), //LEVEL_UP_MOVE( 1, MOVE_AUTOTOMIZE), @@ -15997,7 +15997,7 @@ static const struct LevelUpMove sHakamoOLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sKommoOLevelUpLearnset[] = { +static const struct LevelUpMove sKommooLevelUpLearnset[] = { //LEVEL_UP_MOVE( 0, MOVE_CLANGING_SCALES), //LEVEL_UP_MOVE( 1, MOVE_CLANGING_SCALES), LEVEL_UP_MOVE( 1, MOVE_SKY_UPPERCUT), diff --git a/src/data/pokemon/pokedex_entries.h b/src/data/pokemon/pokedex_entries.h index d873f14018..7cf2b9d434 100644 --- a/src/data/pokemon/pokedex_entries.h +++ b/src/data/pokemon/pokedex_entries.h @@ -1469,7 +1469,7 @@ const struct PokedexEntry gPokedexEntries[] = .categoryName = _("BARRIER"), .height = 13, .weight = 545, - .description = gMrmimePokedexText, + .description = gMrMimePokedexText, .pokemonScale = 258, .pokemonOffset = 6, .trainerScale = 256, diff --git a/src/data/pokemon/pokedex_text.h b/src/data/pokemon/pokedex_text.h index 120c5abcad..44aa56d0cd 100644 --- a/src/data/pokemon/pokedex_text.h +++ b/src/data/pokemon/pokedex_text.h @@ -730,7 +730,7 @@ const u8 gStarmiePokedexText[] = _( "reflections of stars that twinkled on\n" "gentle waves at night."); -const u8 gMrmimePokedexText[] = _( +const u8 gMrMimePokedexText[] = _( "A Mr. Mime is a master of pantomime. It can\n" "convince others that something unseeable\n" "actually exists. Once believed, the\n" diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index 5f79ce1498..12de66f378 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -122,7 +122,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(SEAKING, gMonBackPic_Seaking), SPECIES_SPRITE(STARYU, gMonBackPic_Staryu), SPECIES_SPRITE(STARMIE, gMonBackPic_Starmie), - SPECIES_SPRITE(MR_MIME, gMonBackPic_Mrmime), + SPECIES_SPRITE(MR_MIME, gMonBackPic_MrMime), SPECIES_SPRITE(SCYTHER, gMonBackPic_Scyther), SPECIES_SPRITE(JYNX, gMonBackPic_Jynx), SPECIES_SPRITE(ELECTABUZZ, gMonBackPic_Electabuzz), @@ -439,7 +439,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(BRONZOR, gMonBackPic_Bronzor), SPECIES_SPRITE(BRONZONG, gMonBackPic_Bronzong), SPECIES_SPRITE(BONSLY, gMonBackPic_Bonsly), - SPECIES_SPRITE(MIME_JR, gMonBackPic_Mimejr), + SPECIES_SPRITE(MIME_JR, gMonBackPic_MimeJr), SPECIES_SPRITE(HAPPINY, gMonBackPic_Happiny), SPECIES_SPRITE(CHATOT, gMonBackPic_Chatot), SPECIES_SPRITE(SPIRITOMB, gMonBackPic_Spiritomb), @@ -782,9 +782,9 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(BRUXISH, gMonBackPic_Bruxish), SPECIES_SPRITE(DRAMPA, gMonBackPic_Drampa), SPECIES_SPRITE(DHELMISE, gMonBackPic_Dhelmise), - SPECIES_SPRITE(JANGMO_O, gMonBackPic_Jangmo_o), - SPECIES_SPRITE(HAKAMO_O, gMonBackPic_Hakamo_o), - SPECIES_SPRITE(KOMMO_O, gMonBackPic_Kommo_o), + SPECIES_SPRITE(JANGMO_O, gMonBackPic_Jangmoo), + SPECIES_SPRITE(HAKAMO_O, gMonBackPic_Hakamoo), + SPECIES_SPRITE(KOMMO_O, gMonBackPic_Kommoo), SPECIES_SPRITE(TAPU_KOKO, gMonBackPic_Tapu_koko), SPECIES_SPRITE(TAPU_LELE, gMonBackPic_Tapu_lele), SPECIES_SPRITE(TAPU_BULU, gMonBackPic_Tapu_bulu), diff --git a/src/data/pokemon_graphics/footprint_table.h b/src/data/pokemon_graphics/footprint_table.h index aec82a15bf..f546028550 100644 --- a/src/data/pokemon_graphics/footprint_table.h +++ b/src/data/pokemon_graphics/footprint_table.h @@ -122,7 +122,7 @@ const u8 *const gMonFootprintTable[] = [SPECIES_SEAKING] = gMonFootprint_Seaking, [SPECIES_STARYU] = gMonFootprint_Staryu, [SPECIES_STARMIE] = gMonFootprint_Starmie, - [SPECIES_MR_MIME] = gMonFootprint_Mrmime, + [SPECIES_MR_MIME] = gMonFootprint_MrMime, [SPECIES_SCYTHER] = gMonFootprint_Scyther, [SPECIES_JYNX] = gMonFootprint_Jynx, [SPECIES_ELECTABUZZ] = gMonFootprint_Electabuzz, diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index 8ae5fc9ec1..f34a27d31c 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -122,7 +122,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(SEAKING, gMonFrontPic_Seaking), SPECIES_SPRITE(STARYU, gMonFrontPic_Staryu), SPECIES_SPRITE(STARMIE, gMonFrontPic_Starmie), - SPECIES_SPRITE(MR_MIME, gMonFrontPic_Mrmime), + SPECIES_SPRITE(MR_MIME, gMonFrontPic_MrMime), SPECIES_SPRITE(SCYTHER, gMonFrontPic_Scyther), SPECIES_SPRITE(JYNX, gMonFrontPic_Jynx), SPECIES_SPRITE(ELECTABUZZ, gMonFrontPic_Electabuzz), @@ -439,7 +439,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(BRONZOR, gMonFrontPic_Bronzor), SPECIES_SPRITE(BRONZONG, gMonFrontPic_Bronzong), SPECIES_SPRITE(BONSLY, gMonFrontPic_Bonsly), - SPECIES_SPRITE(MIME_JR, gMonFrontPic_Mimejr), + SPECIES_SPRITE(MIME_JR, gMonFrontPic_MimeJr), SPECIES_SPRITE(HAPPINY, gMonFrontPic_Happiny), SPECIES_SPRITE(CHATOT, gMonFrontPic_Chatot), SPECIES_SPRITE(SPIRITOMB, gMonFrontPic_Spiritomb), @@ -782,9 +782,9 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(BRUXISH, gMonFrontPic_Bruxish), SPECIES_SPRITE(DRAMPA, gMonFrontPic_Drampa), SPECIES_SPRITE(DHELMISE, gMonFrontPic_Dhelmise), - SPECIES_SPRITE(JANGMO_O, gMonFrontPic_Jangmo_o), - SPECIES_SPRITE(HAKAMO_O, gMonFrontPic_Hakamo_o), - SPECIES_SPRITE(KOMMO_O, gMonFrontPic_Kommo_o), + SPECIES_SPRITE(JANGMO_O, gMonFrontPic_Jangmoo), + SPECIES_SPRITE(HAKAMO_O, gMonFrontPic_Hakamoo), + SPECIES_SPRITE(KOMMO_O, gMonFrontPic_Kommoo), SPECIES_SPRITE(TAPU_KOKO, gMonFrontPic_Tapu_koko), SPECIES_SPRITE(TAPU_LELE, gMonFrontPic_Tapu_lele), SPECIES_SPRITE(TAPU_BULU, gMonFrontPic_Tapu_bulu), diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index 3ccb072cac..5905e1369c 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -122,7 +122,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(SEAKING, gMonPalette_Seaking), SPECIES_PAL(STARYU, gMonPalette_Staryu), SPECIES_PAL(STARMIE, gMonPalette_Starmie), - SPECIES_PAL(MR_MIME, gMonPalette_Mrmime), + SPECIES_PAL(MR_MIME, gMonPalette_MrMime), SPECIES_PAL(SCYTHER, gMonPalette_Scyther), SPECIES_PAL(JYNX, gMonPalette_Jynx), SPECIES_PAL(ELECTABUZZ, gMonPalette_Electabuzz), @@ -439,7 +439,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(BRONZOR, gMonPalette_Bronzor), SPECIES_PAL(BRONZONG, gMonPalette_Bronzong), SPECIES_PAL(BONSLY, gMonPalette_Bonsly), - SPECIES_PAL(MIME_JR, gMonPalette_Mimejr), + SPECIES_PAL(MIME_JR, gMonPalette_MimeJr), SPECIES_PAL(HAPPINY, gMonPalette_Happiny), SPECIES_PAL(CHATOT, gMonPalette_Chatot), SPECIES_PAL(SPIRITOMB, gMonPalette_Spiritomb), @@ -782,9 +782,9 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(BRUXISH, gMonPalette_Bruxish), SPECIES_PAL(DRAMPA, gMonPalette_Drampa), SPECIES_PAL(DHELMISE, gMonPalette_Dhelmise), - SPECIES_PAL(JANGMO_O, gMonPalette_Jangmo_o), - SPECIES_PAL(HAKAMO_O, gMonPalette_Hakamo_o), - SPECIES_PAL(KOMMO_O, gMonPalette_Kommo_o), + SPECIES_PAL(JANGMO_O, gMonPalette_Jangmoo), + SPECIES_PAL(HAKAMO_O, gMonPalette_Hakamoo), + SPECIES_PAL(KOMMO_O, gMonPalette_Kommoo), SPECIES_PAL(TAPU_KOKO, gMonPalette_Tapu_koko), SPECIES_PAL(TAPU_LELE, gMonPalette_Tapu_lele), SPECIES_PAL(TAPU_BULU, gMonPalette_Tapu_bulu), diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index 93bfe33b70..e2ce6126bb 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -122,7 +122,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(SEAKING, gMonShinyPalette_Seaking), SPECIES_SHINY_PAL(STARYU, gMonShinyPalette_Staryu), SPECIES_SHINY_PAL(STARMIE, gMonShinyPalette_Starmie), - SPECIES_SHINY_PAL(MR_MIME, gMonShinyPalette_Mrmime), + SPECIES_SHINY_PAL(MR_MIME, gMonShinyPalette_MrMime), SPECIES_SHINY_PAL(SCYTHER, gMonShinyPalette_Scyther), SPECIES_SHINY_PAL(JYNX, gMonShinyPalette_Jynx), SPECIES_SHINY_PAL(ELECTABUZZ, gMonShinyPalette_Electabuzz), @@ -439,7 +439,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(BRONZOR, gMonShinyPalette_Bronzor), SPECIES_SHINY_PAL(BRONZONG, gMonShinyPalette_Bronzong), SPECIES_SHINY_PAL(BONSLY, gMonShinyPalette_Bonsly), - SPECIES_SHINY_PAL(MIME_JR, gMonShinyPalette_Mimejr), + SPECIES_SHINY_PAL(MIME_JR, gMonShinyPalette_MimeJr), SPECIES_SHINY_PAL(HAPPINY, gMonShinyPalette_Happiny), SPECIES_SHINY_PAL(CHATOT, gMonShinyPalette_Chatot), SPECIES_SHINY_PAL(SPIRITOMB, gMonShinyPalette_Spiritomb), @@ -782,9 +782,9 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(BRUXISH, gMonShinyPalette_Bruxish), SPECIES_SHINY_PAL(DRAMPA, gMonShinyPalette_Drampa), SPECIES_SHINY_PAL(DHELMISE, gMonShinyPalette_Dhelmise), - SPECIES_SHINY_PAL(JANGMO_O, gMonShinyPalette_Jangmo_o), - SPECIES_SHINY_PAL(HAKAMO_O, gMonShinyPalette_Hakamo_o), - SPECIES_SHINY_PAL(KOMMO_O, gMonShinyPalette_Kommo_o), + SPECIES_SHINY_PAL(JANGMO_O, gMonShinyPalette_Jangmoo), + SPECIES_SHINY_PAL(HAKAMO_O, gMonShinyPalette_Hakamoo), + SPECIES_SHINY_PAL(KOMMO_O, gMonShinyPalette_Kommoo), SPECIES_SHINY_PAL(TAPU_KOKO, gMonShinyPalette_Tapu_koko), SPECIES_SHINY_PAL(TAPU_LELE, gMonShinyPalette_Tapu_lele), SPECIES_SHINY_PAL(TAPU_BULU, gMonShinyPalette_Tapu_bulu), diff --git a/src/data/text/species_names.h b/src/data/text/species_names.h index 26677bcca9..c13b1361ce 100644 --- a/src/data/text/species_names.h +++ b/src/data/text/species_names.h @@ -438,7 +438,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_BRONZOR] = _("Bronzor"), [SPECIES_BRONZONG] = _("Bronzong"), [SPECIES_BONSLY] = _("Bonsly"), - [SPECIES_MIME_JR] = _("Mime jr."), + [SPECIES_MIME_JR] = _("Mime Jr."), [SPECIES_HAPPINY] = _("Happiny"), [SPECIES_CHATOT] = _("Chatot"), [SPECIES_SPIRITOMB] = _("Spiritomb"), @@ -473,7 +473,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_GLACEON] = _("Glaceon"), [SPECIES_GLISCOR] = _("Gliscor"), [SPECIES_MAMOSWINE] = _("Mamoswine"), - [SPECIES_PORYGON_Z] = _("Porygon-z"), + [SPECIES_PORYGON_Z] = _("Porygon-Z"), [SPECIES_GALLADE] = _("Gallade"), [SPECIES_PROBOPASS] = _("Probopass"), [SPECIES_DUSKNOIR] = _("Dusknoir"), diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 9265871f1c..1795df2325 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -147,7 +147,7 @@ const u8 *const gMonIconTable[] = [SPECIES_SEAKING] = gMonIcon_Seaking, [SPECIES_STARYU] = gMonIcon_Staryu, [SPECIES_STARMIE] = gMonIcon_Starmie, - [SPECIES_MR_MIME] = gMonIcon_Mrmime, + [SPECIES_MR_MIME] = gMonIcon_MrMime, [SPECIES_SCYTHER] = gMonIcon_Scyther, [SPECIES_JYNX] = gMonIcon_Jynx, [SPECIES_ELECTABUZZ] = gMonIcon_Electabuzz, @@ -464,7 +464,7 @@ const u8 *const gMonIconTable[] = [SPECIES_BRONZOR] = gMonIcon_Bronzor, [SPECIES_BRONZONG] = gMonIcon_Bronzong, [SPECIES_BONSLY] = gMonIcon_Bonsly, - [SPECIES_MIME_JR] = gMonIcon_Mimejr, + [SPECIES_MIME_JR] = gMonIcon_MimeJr, [SPECIES_HAPPINY] = gMonIcon_Happiny, [SPECIES_CHATOT] = gMonIcon_Chatot, [SPECIES_SPIRITOMB] = gMonIcon_Spiritomb, @@ -807,9 +807,9 @@ const u8 *const gMonIconTable[] = [SPECIES_BRUXISH] = gMonIcon_Bruxish, [SPECIES_DRAMPA] = gMonIcon_Drampa, [SPECIES_DHELMISE] = gMonIcon_Dhelmise, - [SPECIES_JANGMO_O] = gMonIcon_Jangmo_o, - [SPECIES_HAKAMO_O] = gMonIcon_Hakamo_o, - [SPECIES_KOMMO_O] = gMonIcon_Kommo_o, + [SPECIES_JANGMO_O] = gMonIcon_Jangmoo, + [SPECIES_HAKAMO_O] = gMonIcon_Hakamoo, + [SPECIES_KOMMO_O] = gMonIcon_Kommoo, [SPECIES_TAPU_KOKO] = gMonIcon_Tapu_koko, [SPECIES_TAPU_LELE] = gMonIcon_Tapu_lele, [SPECIES_TAPU_BULU] = gMonIcon_Tapu_bulu, From 9c2c337e6f98c3ce5d7827841fcffd6460187c5e Mon Sep 17 00:00:00 2001 From: amiosi <44352097+amiosi@users.noreply.github.com> Date: Tue, 2 Feb 2021 14:24:15 -0500 Subject: [PATCH 03/15] tapu case --- include/graphics.h | 40 +++++++++---------- src/data/graphics/pokemon.h | 40 +++++++++---------- src/data/pokemon_graphics/back_pic_table.h | 8 ++-- src/data/pokemon_graphics/front_pic_table.h | 8 ++-- src/data/pokemon_graphics/palette_table.h | 8 ++-- .../pokemon_graphics/shiny_palette_table.h | 8 ++-- src/pokemon_icon.c | 8 ++-- 7 files changed, 60 insertions(+), 60 deletions(-) diff --git a/include/graphics.h b/include/graphics.h index 85ee8e2000..e3995d1fa3 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -822,10 +822,10 @@ extern const u32 gMonFrontPic_Dhelmise[]; extern const u32 gMonFrontPic_Jangmoo[]; extern const u32 gMonFrontPic_Hakamoo[]; extern const u32 gMonFrontPic_Kommoo[]; -extern const u32 gMonFrontPic_Tapu_koko[]; -extern const u32 gMonFrontPic_Tapu_lele[]; -extern const u32 gMonFrontPic_Tapu_bulu[]; -extern const u32 gMonFrontPic_Tapu_fini[]; +extern const u32 gMonFrontPic_Tapu_Koko[]; +extern const u32 gMonFrontPic_Tapu_Lele[]; +extern const u32 gMonFrontPic_Tapu_Bulu[]; +extern const u32 gMonFrontPic_Tapu_Fini[]; extern const u32 gMonFrontPic_Cosmog[]; extern const u32 gMonFrontPic_Cosmoem[]; extern const u32 gMonFrontPic_Solgaleo[]; @@ -1962,10 +1962,10 @@ extern const u32 gMonBackPic_Dhelmise[]; extern const u32 gMonBackPic_Jangmoo[]; extern const u32 gMonBackPic_Hakamoo[]; extern const u32 gMonBackPic_Kommoo[]; -extern const u32 gMonBackPic_Tapu_koko[]; -extern const u32 gMonBackPic_Tapu_lele[]; -extern const u32 gMonBackPic_Tapu_bulu[]; -extern const u32 gMonBackPic_Tapu_fini[]; +extern const u32 gMonBackPic_Tapu_Koko[]; +extern const u32 gMonBackPic_Tapu_Lele[]; +extern const u32 gMonBackPic_Tapu_Bulu[]; +extern const u32 gMonBackPic_Tapu_Fini[]; extern const u32 gMonBackPic_Cosmog[]; extern const u32 gMonBackPic_Cosmoem[]; extern const u32 gMonBackPic_Solgaleo[]; @@ -3100,10 +3100,10 @@ extern const u32 gMonPalette_Dhelmise[]; extern const u32 gMonPalette_Jangmoo[]; extern const u32 gMonPalette_Hakamoo[]; extern const u32 gMonPalette_Kommoo[]; -extern const u32 gMonPalette_Tapu_koko[]; -extern const u32 gMonPalette_Tapu_lele[]; -extern const u32 gMonPalette_Tapu_bulu[]; -extern const u32 gMonPalette_Tapu_fini[]; +extern const u32 gMonPalette_Tapu_Koko[]; +extern const u32 gMonPalette_Tapu_Lele[]; +extern const u32 gMonPalette_Tapu_Bulu[]; +extern const u32 gMonPalette_Tapu_Fini[]; extern const u32 gMonPalette_Cosmog[]; extern const u32 gMonPalette_Cosmoem[]; extern const u32 gMonPalette_Solgaleo[]; @@ -4265,10 +4265,10 @@ extern const u32 gMonShinyPalette_Dhelmise[]; extern const u32 gMonShinyPalette_Jangmoo[]; extern const u32 gMonShinyPalette_Hakamoo[]; extern const u32 gMonShinyPalette_Kommoo[]; -extern const u32 gMonShinyPalette_Tapu_koko[]; -extern const u32 gMonShinyPalette_Tapu_lele[]; -extern const u32 gMonShinyPalette_Tapu_bulu[]; -extern const u32 gMonShinyPalette_Tapu_fini[]; +extern const u32 gMonShinyPalette_Tapu_Koko[]; +extern const u32 gMonShinyPalette_Tapu_Lele[]; +extern const u32 gMonShinyPalette_Tapu_Bulu[]; +extern const u32 gMonShinyPalette_Tapu_Fini[]; extern const u32 gMonShinyPalette_Cosmog[]; extern const u32 gMonShinyPalette_Cosmoem[]; extern const u32 gMonShinyPalette_Solgaleo[]; @@ -5422,10 +5422,10 @@ extern const u8 gMonIcon_Dhelmise[]; extern const u8 gMonIcon_Jangmoo[]; extern const u8 gMonIcon_Hakamoo[]; extern const u8 gMonIcon_Kommoo[]; -extern const u8 gMonIcon_Tapu_koko[]; -extern const u8 gMonIcon_Tapu_lele[]; -extern const u8 gMonIcon_Tapu_bulu[]; -extern const u8 gMonIcon_Tapu_fini[]; +extern const u8 gMonIcon_Tapu_Koko[]; +extern const u8 gMonIcon_Tapu_Lele[]; +extern const u8 gMonIcon_Tapu_Bulu[]; +extern const u8 gMonIcon_Tapu_Fini[]; extern const u8 gMonIcon_Cosmog[]; extern const u8 gMonIcon_Cosmoem[]; extern const u8 gMonIcon_Solgaleo[]; diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 5ab18ed617..534d912792 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -785,10 +785,10 @@ const u32 gMonFrontPic_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/front. const u32 gMonFrontPic_Jangmoo[] = INCBIN_U32("graphics/pokemon/jangmo_o/front.4bpp.lz"); const u32 gMonFrontPic_Hakamoo[] = INCBIN_U32("graphics/pokemon/hakamo_o/front.4bpp.lz"); const u32 gMonFrontPic_Kommoo[] = INCBIN_U32("graphics/pokemon/kommo_o/front.4bpp.lz"); -const u32 gMonFrontPic_Tapu_koko[] = INCBIN_U32("graphics/pokemon/tapu_koko/front.4bpp.lz"); -const u32 gMonFrontPic_Tapu_lele[] = INCBIN_U32("graphics/pokemon/tapu_lele/front.4bpp.lz"); -const u32 gMonFrontPic_Tapu_bulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/front.4bpp.lz"); -const u32 gMonFrontPic_Tapu_fini[] = INCBIN_U32("graphics/pokemon/tapu_fini/front.4bpp.lz"); +const u32 gMonFrontPic_Tapu_Koko[] = INCBIN_U32("graphics/pokemon/tapu_koko/front.4bpp.lz"); +const u32 gMonFrontPic_Tapu_Lele[] = INCBIN_U32("graphics/pokemon/tapu_lele/front.4bpp.lz"); +const u32 gMonFrontPic_Tapu_Bulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/front.4bpp.lz"); +const u32 gMonFrontPic_Tapu_Fini[] = INCBIN_U32("graphics/pokemon/tapu_fini/front.4bpp.lz"); const u32 gMonFrontPic_Cosmog[] = INCBIN_U32("graphics/pokemon/cosmog/front.4bpp.lz"); const u32 gMonFrontPic_Cosmoem[] = INCBIN_U32("graphics/pokemon/cosmoem/front.4bpp.lz"); const u32 gMonFrontPic_Solgaleo[] = INCBIN_U32("graphics/pokemon/solgaleo/front.4bpp.lz"); @@ -1925,10 +1925,10 @@ const u32 gMonBackPic_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/back.4b const u32 gMonBackPic_Jangmoo[] = INCBIN_U32("graphics/pokemon/jangmo_o/back.4bpp.lz"); const u32 gMonBackPic_Hakamoo[] = INCBIN_U32("graphics/pokemon/hakamo_o/back.4bpp.lz"); const u32 gMonBackPic_Kommoo[] = INCBIN_U32("graphics/pokemon/kommo_o/back.4bpp.lz"); -const u32 gMonBackPic_Tapu_koko[] = INCBIN_U32("graphics/pokemon/tapu_koko/back.4bpp.lz"); -const u32 gMonBackPic_Tapu_lele[] = INCBIN_U32("graphics/pokemon/tapu_lele/back.4bpp.lz"); -const u32 gMonBackPic_Tapu_bulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/back.4bpp.lz"); -const u32 gMonBackPic_Tapu_fini[] = INCBIN_U32("graphics/pokemon/tapu_fini/back.4bpp.lz"); +const u32 gMonBackPic_Tapu_Koko[] = INCBIN_U32("graphics/pokemon/tapu_koko/back.4bpp.lz"); +const u32 gMonBackPic_Tapu_Lele[] = INCBIN_U32("graphics/pokemon/tapu_lele/back.4bpp.lz"); +const u32 gMonBackPic_Tapu_Bulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/back.4bpp.lz"); +const u32 gMonBackPic_Tapu_Fini[] = INCBIN_U32("graphics/pokemon/tapu_fini/back.4bpp.lz"); const u32 gMonBackPic_Cosmog[] = INCBIN_U32("graphics/pokemon/cosmog/back.4bpp.lz"); const u32 gMonBackPic_Cosmoem[] = INCBIN_U32("graphics/pokemon/cosmoem/back.4bpp.lz"); const u32 gMonBackPic_Solgaleo[] = INCBIN_U32("graphics/pokemon/solgaleo/back.4bpp.lz"); @@ -3063,10 +3063,10 @@ const u32 gMonPalette_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/normal. const u32 gMonPalette_Jangmoo[] = INCBIN_U32("graphics/pokemon/jangmo_o/normal.gbapal.lz"); const u32 gMonPalette_Hakamoo[] = INCBIN_U32("graphics/pokemon/hakamo_o/normal.gbapal.lz"); const u32 gMonPalette_Kommoo[] = INCBIN_U32("graphics/pokemon/kommo_o/normal.gbapal.lz"); -const u32 gMonPalette_Tapu_koko[] = INCBIN_U32("graphics/pokemon/tapu_koko/normal.gbapal.lz"); -const u32 gMonPalette_Tapu_lele[] = INCBIN_U32("graphics/pokemon/tapu_lele/normal.gbapal.lz"); -const u32 gMonPalette_Tapu_bulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/normal.gbapal.lz"); -const u32 gMonPalette_Tapu_fini[] = INCBIN_U32("graphics/pokemon/tapu_fini/normal.gbapal.lz"); +const u32 gMonPalette_Tapu_Koko[] = INCBIN_U32("graphics/pokemon/tapu_koko/normal.gbapal.lz"); +const u32 gMonPalette_Tapu_Lele[] = INCBIN_U32("graphics/pokemon/tapu_lele/normal.gbapal.lz"); +const u32 gMonPalette_Tapu_Bulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/normal.gbapal.lz"); +const u32 gMonPalette_Tapu_Fini[] = INCBIN_U32("graphics/pokemon/tapu_fini/normal.gbapal.lz"); const u32 gMonPalette_Cosmog[] = INCBIN_U32("graphics/pokemon/cosmog/normal.gbapal.lz"); const u32 gMonPalette_Cosmoem[] = INCBIN_U32("graphics/pokemon/cosmoem/normal.gbapal.lz"); const u32 gMonPalette_Solgaleo[] = INCBIN_U32("graphics/pokemon/solgaleo/normal.gbapal.lz"); @@ -4228,10 +4228,10 @@ const u32 gMonShinyPalette_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/sh const u32 gMonShinyPalette_Jangmoo[] = INCBIN_U32("graphics/pokemon/jangmo_o/shiny.gbapal.lz"); const u32 gMonShinyPalette_Hakamoo[] = INCBIN_U32("graphics/pokemon/hakamo_o/shiny.gbapal.lz"); const u32 gMonShinyPalette_Kommoo[] = INCBIN_U32("graphics/pokemon/kommo_o/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Tapu_koko[] = INCBIN_U32("graphics/pokemon/tapu_koko/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Tapu_lele[] = INCBIN_U32("graphics/pokemon/tapu_lele/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Tapu_bulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Tapu_fini[] = INCBIN_U32("graphics/pokemon/tapu_fini/shiny.gbapal.lz"); +const u32 gMonShinyPalette_Tapu_Koko[] = INCBIN_U32("graphics/pokemon/tapu_koko/shiny.gbapal.lz"); +const u32 gMonShinyPalette_Tapu_Lele[] = INCBIN_U32("graphics/pokemon/tapu_lele/shiny.gbapal.lz"); +const u32 gMonShinyPalette_Tapu_Bulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/shiny.gbapal.lz"); +const u32 gMonShinyPalette_Tapu_Fini[] = INCBIN_U32("graphics/pokemon/tapu_fini/shiny.gbapal.lz"); const u32 gMonShinyPalette_Cosmog[] = INCBIN_U32("graphics/pokemon/cosmog/shiny.gbapal.lz"); const u32 gMonShinyPalette_Cosmoem[] = INCBIN_U32("graphics/pokemon/cosmoem/shiny.gbapal.lz"); const u32 gMonShinyPalette_Solgaleo[] = INCBIN_U32("graphics/pokemon/solgaleo/shiny.gbapal.lz"); @@ -5385,10 +5385,10 @@ const u8 gMonIcon_Dhelmise[] = INCBIN_U8("graphics/pokemon/dhelmise/icon.4bpp"); const u8 gMonIcon_Jangmoo[] = INCBIN_U8("graphics/pokemon/jangmo_o/icon.4bpp"); const u8 gMonIcon_Hakamoo[] = INCBIN_U8("graphics/pokemon/hakamo_o/icon.4bpp"); const u8 gMonIcon_Kommoo[] = INCBIN_U8("graphics/pokemon/kommo_o/icon.4bpp"); -const u8 gMonIcon_Tapu_koko[] = INCBIN_U8("graphics/pokemon/tapu_koko/icon.4bpp"); -const u8 gMonIcon_Tapu_lele[] = INCBIN_U8("graphics/pokemon/tapu_lele/icon.4bpp"); -const u8 gMonIcon_Tapu_bulu[] = INCBIN_U8("graphics/pokemon/tapu_bulu/icon.4bpp"); -const u8 gMonIcon_Tapu_fini[] = INCBIN_U8("graphics/pokemon/tapu_fini/icon.4bpp"); +const u8 gMonIcon_Tapu_Koko[] = INCBIN_U8("graphics/pokemon/tapu_koko/icon.4bpp"); +const u8 gMonIcon_Tapu_Lele[] = INCBIN_U8("graphics/pokemon/tapu_lele/icon.4bpp"); +const u8 gMonIcon_Tapu_Bulu[] = INCBIN_U8("graphics/pokemon/tapu_bulu/icon.4bpp"); +const u8 gMonIcon_Tapu_Fini[] = INCBIN_U8("graphics/pokemon/tapu_fini/icon.4bpp"); const u8 gMonIcon_Cosmog[] = INCBIN_U8("graphics/pokemon/cosmog/icon.4bpp"); const u8 gMonIcon_Cosmoem[] = INCBIN_U8("graphics/pokemon/cosmoem/icon.4bpp"); const u8 gMonIcon_Solgaleo[] = INCBIN_U8("graphics/pokemon/solgaleo/icon.4bpp"); diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index 12de66f378..e71f450d83 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -785,10 +785,10 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(JANGMO_O, gMonBackPic_Jangmoo), SPECIES_SPRITE(HAKAMO_O, gMonBackPic_Hakamoo), SPECIES_SPRITE(KOMMO_O, gMonBackPic_Kommoo), - SPECIES_SPRITE(TAPU_KOKO, gMonBackPic_Tapu_koko), - SPECIES_SPRITE(TAPU_LELE, gMonBackPic_Tapu_lele), - SPECIES_SPRITE(TAPU_BULU, gMonBackPic_Tapu_bulu), - SPECIES_SPRITE(TAPU_FINI, gMonBackPic_Tapu_fini), + SPECIES_SPRITE(TAPU_KOKO, gMonBackPic_Tapu_Koko), + SPECIES_SPRITE(TAPU_LELE, gMonBackPic_Tapu_Lele), + SPECIES_SPRITE(TAPU_BULU, gMonBackPic_Tapu_Bulu), + SPECIES_SPRITE(TAPU_FINI, gMonBackPic_Tapu_Fini), SPECIES_SPRITE(COSMOG, gMonBackPic_Cosmog), SPECIES_SPRITE(COSMOEM, gMonBackPic_Cosmoem), SPECIES_SPRITE(SOLGALEO, gMonBackPic_Solgaleo), diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index f34a27d31c..2a8f113e68 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -785,10 +785,10 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(JANGMO_O, gMonFrontPic_Jangmoo), SPECIES_SPRITE(HAKAMO_O, gMonFrontPic_Hakamoo), SPECIES_SPRITE(KOMMO_O, gMonFrontPic_Kommoo), - SPECIES_SPRITE(TAPU_KOKO, gMonFrontPic_Tapu_koko), - SPECIES_SPRITE(TAPU_LELE, gMonFrontPic_Tapu_lele), - SPECIES_SPRITE(TAPU_BULU, gMonFrontPic_Tapu_bulu), - SPECIES_SPRITE(TAPU_FINI, gMonFrontPic_Tapu_fini), + SPECIES_SPRITE(TAPU_KOKO, gMonFrontPic_Tapu_Koko), + SPECIES_SPRITE(TAPU_LELE, gMonFrontPic_Tapu_Lele), + SPECIES_SPRITE(TAPU_BULU, gMonFrontPic_Tapu_Bulu), + SPECIES_SPRITE(TAPU_FINI, gMonFrontPic_Tapu_Fini), SPECIES_SPRITE(COSMOG, gMonFrontPic_Cosmog), SPECIES_SPRITE(COSMOEM, gMonFrontPic_Cosmoem), SPECIES_SPRITE(SOLGALEO, gMonFrontPic_Solgaleo), diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index 5905e1369c..082f48da84 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -785,10 +785,10 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(JANGMO_O, gMonPalette_Jangmoo), SPECIES_PAL(HAKAMO_O, gMonPalette_Hakamoo), SPECIES_PAL(KOMMO_O, gMonPalette_Kommoo), - SPECIES_PAL(TAPU_KOKO, gMonPalette_Tapu_koko), - SPECIES_PAL(TAPU_LELE, gMonPalette_Tapu_lele), - SPECIES_PAL(TAPU_BULU, gMonPalette_Tapu_bulu), - SPECIES_PAL(TAPU_FINI, gMonPalette_Tapu_fini), + SPECIES_PAL(TAPU_KOKO, gMonPalette_Tapu_Koko), + SPECIES_PAL(TAPU_LELE, gMonPalette_Tapu_Lele), + SPECIES_PAL(TAPU_BULU, gMonPalette_Tapu_Bulu), + SPECIES_PAL(TAPU_FINI, gMonPalette_Tapu_Fini), SPECIES_PAL(COSMOG, gMonPalette_Cosmog), SPECIES_PAL(COSMOEM, gMonPalette_Cosmoem), SPECIES_PAL(SOLGALEO, gMonPalette_Solgaleo), diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index e2ce6126bb..64c8f6f750 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -785,10 +785,10 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(JANGMO_O, gMonShinyPalette_Jangmoo), SPECIES_SHINY_PAL(HAKAMO_O, gMonShinyPalette_Hakamoo), SPECIES_SHINY_PAL(KOMMO_O, gMonShinyPalette_Kommoo), - SPECIES_SHINY_PAL(TAPU_KOKO, gMonShinyPalette_Tapu_koko), - SPECIES_SHINY_PAL(TAPU_LELE, gMonShinyPalette_Tapu_lele), - SPECIES_SHINY_PAL(TAPU_BULU, gMonShinyPalette_Tapu_bulu), - SPECIES_SHINY_PAL(TAPU_FINI, gMonShinyPalette_Tapu_fini), + SPECIES_SHINY_PAL(TAPU_KOKO, gMonShinyPalette_Tapu_Koko), + SPECIES_SHINY_PAL(TAPU_LELE, gMonShinyPalette_Tapu_Lele), + SPECIES_SHINY_PAL(TAPU_BULU, gMonShinyPalette_Tapu_Bulu), + SPECIES_SHINY_PAL(TAPU_FINI, gMonShinyPalette_Tapu_Fini), SPECIES_SHINY_PAL(COSMOG, gMonShinyPalette_Cosmog), SPECIES_SHINY_PAL(COSMOEM, gMonShinyPalette_Cosmoem), SPECIES_SHINY_PAL(SOLGALEO, gMonShinyPalette_Solgaleo), diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 1795df2325..7311cf6fa9 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -810,10 +810,10 @@ const u8 *const gMonIconTable[] = [SPECIES_JANGMO_O] = gMonIcon_Jangmoo, [SPECIES_HAKAMO_O] = gMonIcon_Hakamoo, [SPECIES_KOMMO_O] = gMonIcon_Kommoo, - [SPECIES_TAPU_KOKO] = gMonIcon_Tapu_koko, - [SPECIES_TAPU_LELE] = gMonIcon_Tapu_lele, - [SPECIES_TAPU_BULU] = gMonIcon_Tapu_bulu, - [SPECIES_TAPU_FINI] = gMonIcon_Tapu_fini, + [SPECIES_TAPU_KOKO] = gMonIcon_Tapu_Koko, + [SPECIES_TAPU_LELE] = gMonIcon_Tapu_Lele, + [SPECIES_TAPU_BULU] = gMonIcon_Tapu_Bulu, + [SPECIES_TAPU_FINI] = gMonIcon_Tapu_Fini, [SPECIES_COSMOG] = gMonIcon_Cosmog, [SPECIES_COSMOEM] = gMonIcon_Cosmoem, [SPECIES_SOLGALEO] = gMonIcon_Solgaleo, From f46f21bb38d64b5df1bd304ecb53c40eb9c0b689 Mon Sep 17 00:00:00 2001 From: amiosi <44352097+amiosi@users.noreply.github.com> Date: Tue, 2 Feb 2021 14:40:04 -0500 Subject: [PATCH 04/15] tapus again --- include/graphics.h | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/include/graphics.h b/include/graphics.h index e3995d1fa3..4db865ce1b 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -822,10 +822,10 @@ extern const u32 gMonFrontPic_Dhelmise[]; extern const u32 gMonFrontPic_Jangmoo[]; extern const u32 gMonFrontPic_Hakamoo[]; extern const u32 gMonFrontPic_Kommoo[]; -extern const u32 gMonFrontPic_Tapu_Koko[]; -extern const u32 gMonFrontPic_Tapu_Lele[]; -extern const u32 gMonFrontPic_Tapu_Bulu[]; -extern const u32 gMonFrontPic_Tapu_Fini[]; +extern const u32 gMonFrontPic_TapuKoko[]; +extern const u32 gMonFrontPic_TapuLele[]; +extern const u32 gMonFrontPic_TapuBulu[]; +extern const u32 gMonFrontPic_TapuFini[]; extern const u32 gMonFrontPic_Cosmog[]; extern const u32 gMonFrontPic_Cosmoem[]; extern const u32 gMonFrontPic_Solgaleo[]; @@ -1962,10 +1962,10 @@ extern const u32 gMonBackPic_Dhelmise[]; extern const u32 gMonBackPic_Jangmoo[]; extern const u32 gMonBackPic_Hakamoo[]; extern const u32 gMonBackPic_Kommoo[]; -extern const u32 gMonBackPic_Tapu_Koko[]; -extern const u32 gMonBackPic_Tapu_Lele[]; -extern const u32 gMonBackPic_Tapu_Bulu[]; -extern const u32 gMonBackPic_Tapu_Fini[]; +extern const u32 gMonBackPic_TapuKoko[]; +extern const u32 gMonBackPic_TapuLele[]; +extern const u32 gMonBackPic_TapuBulu[]; +extern const u32 gMonBackPic_TapuFini[]; extern const u32 gMonBackPic_Cosmog[]; extern const u32 gMonBackPic_Cosmoem[]; extern const u32 gMonBackPic_Solgaleo[]; @@ -3100,10 +3100,10 @@ extern const u32 gMonPalette_Dhelmise[]; extern const u32 gMonPalette_Jangmoo[]; extern const u32 gMonPalette_Hakamoo[]; extern const u32 gMonPalette_Kommoo[]; -extern const u32 gMonPalette_Tapu_Koko[]; -extern const u32 gMonPalette_Tapu_Lele[]; -extern const u32 gMonPalette_Tapu_Bulu[]; -extern const u32 gMonPalette_Tapu_Fini[]; +extern const u32 gMonPalette_TapuKoko[]; +extern const u32 gMonPalette_TapuLele[]; +extern const u32 gMonPalette_TapuBulu[]; +extern const u32 gMonPalette_TapuFini[]; extern const u32 gMonPalette_Cosmog[]; extern const u32 gMonPalette_Cosmoem[]; extern const u32 gMonPalette_Solgaleo[]; @@ -4265,10 +4265,10 @@ extern const u32 gMonShinyPalette_Dhelmise[]; extern const u32 gMonShinyPalette_Jangmoo[]; extern const u32 gMonShinyPalette_Hakamoo[]; extern const u32 gMonShinyPalette_Kommoo[]; -extern const u32 gMonShinyPalette_Tapu_Koko[]; -extern const u32 gMonShinyPalette_Tapu_Lele[]; -extern const u32 gMonShinyPalette_Tapu_Bulu[]; -extern const u32 gMonShinyPalette_Tapu_Fini[]; +extern const u32 gMonShinyPalette_TapuKoko[]; +extern const u32 gMonShinyPalette_TapuLele[]; +extern const u32 gMonShinyPalette_TapuBulu[]; +extern const u32 gMonShinyPalette_TapuFini[]; extern const u32 gMonShinyPalette_Cosmog[]; extern const u32 gMonShinyPalette_Cosmoem[]; extern const u32 gMonShinyPalette_Solgaleo[]; @@ -5422,10 +5422,10 @@ extern const u8 gMonIcon_Dhelmise[]; extern const u8 gMonIcon_Jangmoo[]; extern const u8 gMonIcon_Hakamoo[]; extern const u8 gMonIcon_Kommoo[]; -extern const u8 gMonIcon_Tapu_Koko[]; -extern const u8 gMonIcon_Tapu_Lele[]; -extern const u8 gMonIcon_Tapu_Bulu[]; -extern const u8 gMonIcon_Tapu_Fini[]; +extern const u8 gMonIcon_TapuKoko[]; +extern const u8 gMonIcon_TapuLele[]; +extern const u8 gMonIcon_TapuBulu[]; +extern const u8 gMonIcon_TapuFini[]; extern const u8 gMonIcon_Cosmog[]; extern const u8 gMonIcon_Cosmoem[]; extern const u8 gMonIcon_Solgaleo[]; From 032f8ac834c571b7c01b58f122d6a90a4c28c343 Mon Sep 17 00:00:00 2001 From: amiosi <44352097+amiosi@users.noreply.github.com> Date: Tue, 2 Feb 2021 14:43:12 -0500 Subject: [PATCH 05/15] tapus pls --- src/data/graphics/pokemon.h | 40 +++++++++---------- src/data/pokemon_graphics/back_pic_table.h | 8 ++-- src/data/pokemon_graphics/front_pic_table.h | 8 ++-- src/data/pokemon_graphics/palette_table.h | 8 ++-- .../pokemon_graphics/shiny_palette_table.h | 8 ++-- src/pokemon_icon.c | 8 ++-- 6 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 534d912792..9ede202856 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -785,10 +785,10 @@ const u32 gMonFrontPic_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/front. const u32 gMonFrontPic_Jangmoo[] = INCBIN_U32("graphics/pokemon/jangmo_o/front.4bpp.lz"); const u32 gMonFrontPic_Hakamoo[] = INCBIN_U32("graphics/pokemon/hakamo_o/front.4bpp.lz"); const u32 gMonFrontPic_Kommoo[] = INCBIN_U32("graphics/pokemon/kommo_o/front.4bpp.lz"); -const u32 gMonFrontPic_Tapu_Koko[] = INCBIN_U32("graphics/pokemon/tapu_koko/front.4bpp.lz"); -const u32 gMonFrontPic_Tapu_Lele[] = INCBIN_U32("graphics/pokemon/tapu_lele/front.4bpp.lz"); -const u32 gMonFrontPic_Tapu_Bulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/front.4bpp.lz"); -const u32 gMonFrontPic_Tapu_Fini[] = INCBIN_U32("graphics/pokemon/tapu_fini/front.4bpp.lz"); +const u32 gMonFrontPic_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/front.4bpp.lz"); +const u32 gMonFrontPic_TapuLele[] = INCBIN_U32("graphics/pokemon/tapu_lele/front.4bpp.lz"); +const u32 gMonFrontPic_TapuBulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/front.4bpp.lz"); +const u32 gMonFrontPic_TapuFini[] = INCBIN_U32("graphics/pokemon/tapu_fini/front.4bpp.lz"); const u32 gMonFrontPic_Cosmog[] = INCBIN_U32("graphics/pokemon/cosmog/front.4bpp.lz"); const u32 gMonFrontPic_Cosmoem[] = INCBIN_U32("graphics/pokemon/cosmoem/front.4bpp.lz"); const u32 gMonFrontPic_Solgaleo[] = INCBIN_U32("graphics/pokemon/solgaleo/front.4bpp.lz"); @@ -1925,10 +1925,10 @@ const u32 gMonBackPic_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/back.4b const u32 gMonBackPic_Jangmoo[] = INCBIN_U32("graphics/pokemon/jangmo_o/back.4bpp.lz"); const u32 gMonBackPic_Hakamoo[] = INCBIN_U32("graphics/pokemon/hakamo_o/back.4bpp.lz"); const u32 gMonBackPic_Kommoo[] = INCBIN_U32("graphics/pokemon/kommo_o/back.4bpp.lz"); -const u32 gMonBackPic_Tapu_Koko[] = INCBIN_U32("graphics/pokemon/tapu_koko/back.4bpp.lz"); -const u32 gMonBackPic_Tapu_Lele[] = INCBIN_U32("graphics/pokemon/tapu_lele/back.4bpp.lz"); -const u32 gMonBackPic_Tapu_Bulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/back.4bpp.lz"); -const u32 gMonBackPic_Tapu_Fini[] = INCBIN_U32("graphics/pokemon/tapu_fini/back.4bpp.lz"); +const u32 gMonBackPic_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/back.4bpp.lz"); +const u32 gMonBackPic_TapuLele[] = INCBIN_U32("graphics/pokemon/tapu_lele/back.4bpp.lz"); +const u32 gMonBackPic_TapuBulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/back.4bpp.lz"); +const u32 gMonBackPic_TapuFini[] = INCBIN_U32("graphics/pokemon/tapu_fini/back.4bpp.lz"); const u32 gMonBackPic_Cosmog[] = INCBIN_U32("graphics/pokemon/cosmog/back.4bpp.lz"); const u32 gMonBackPic_Cosmoem[] = INCBIN_U32("graphics/pokemon/cosmoem/back.4bpp.lz"); const u32 gMonBackPic_Solgaleo[] = INCBIN_U32("graphics/pokemon/solgaleo/back.4bpp.lz"); @@ -3063,10 +3063,10 @@ const u32 gMonPalette_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/normal. const u32 gMonPalette_Jangmoo[] = INCBIN_U32("graphics/pokemon/jangmo_o/normal.gbapal.lz"); const u32 gMonPalette_Hakamoo[] = INCBIN_U32("graphics/pokemon/hakamo_o/normal.gbapal.lz"); const u32 gMonPalette_Kommoo[] = INCBIN_U32("graphics/pokemon/kommo_o/normal.gbapal.lz"); -const u32 gMonPalette_Tapu_Koko[] = INCBIN_U32("graphics/pokemon/tapu_koko/normal.gbapal.lz"); -const u32 gMonPalette_Tapu_Lele[] = INCBIN_U32("graphics/pokemon/tapu_lele/normal.gbapal.lz"); -const u32 gMonPalette_Tapu_Bulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/normal.gbapal.lz"); -const u32 gMonPalette_Tapu_Fini[] = INCBIN_U32("graphics/pokemon/tapu_fini/normal.gbapal.lz"); +const u32 gMonPalette_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/normal.gbapal.lz"); +const u32 gMonPalette_TapuLele[] = INCBIN_U32("graphics/pokemon/tapu_lele/normal.gbapal.lz"); +const u32 gMonPalette_TapuBulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/normal.gbapal.lz"); +const u32 gMonPalette_TapuFini[] = INCBIN_U32("graphics/pokemon/tapu_fini/normal.gbapal.lz"); const u32 gMonPalette_Cosmog[] = INCBIN_U32("graphics/pokemon/cosmog/normal.gbapal.lz"); const u32 gMonPalette_Cosmoem[] = INCBIN_U32("graphics/pokemon/cosmoem/normal.gbapal.lz"); const u32 gMonPalette_Solgaleo[] = INCBIN_U32("graphics/pokemon/solgaleo/normal.gbapal.lz"); @@ -4228,10 +4228,10 @@ const u32 gMonShinyPalette_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/sh const u32 gMonShinyPalette_Jangmoo[] = INCBIN_U32("graphics/pokemon/jangmo_o/shiny.gbapal.lz"); const u32 gMonShinyPalette_Hakamoo[] = INCBIN_U32("graphics/pokemon/hakamo_o/shiny.gbapal.lz"); const u32 gMonShinyPalette_Kommoo[] = INCBIN_U32("graphics/pokemon/kommo_o/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Tapu_Koko[] = INCBIN_U32("graphics/pokemon/tapu_koko/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Tapu_Lele[] = INCBIN_U32("graphics/pokemon/tapu_lele/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Tapu_Bulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Tapu_Fini[] = INCBIN_U32("graphics/pokemon/tapu_fini/shiny.gbapal.lz"); +const u32 gMonShinyPalette_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/shiny.gbapal.lz"); +const u32 gMonShinyPalette_TapuLele[] = INCBIN_U32("graphics/pokemon/tapu_lele/shiny.gbapal.lz"); +const u32 gMonShinyPalette_TapuBulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/shiny.gbapal.lz"); +const u32 gMonShinyPalette_TapuFini[] = INCBIN_U32("graphics/pokemon/tapu_fini/shiny.gbapal.lz"); const u32 gMonShinyPalette_Cosmog[] = INCBIN_U32("graphics/pokemon/cosmog/shiny.gbapal.lz"); const u32 gMonShinyPalette_Cosmoem[] = INCBIN_U32("graphics/pokemon/cosmoem/shiny.gbapal.lz"); const u32 gMonShinyPalette_Solgaleo[] = INCBIN_U32("graphics/pokemon/solgaleo/shiny.gbapal.lz"); @@ -5385,10 +5385,10 @@ const u8 gMonIcon_Dhelmise[] = INCBIN_U8("graphics/pokemon/dhelmise/icon.4bpp"); const u8 gMonIcon_Jangmoo[] = INCBIN_U8("graphics/pokemon/jangmo_o/icon.4bpp"); const u8 gMonIcon_Hakamoo[] = INCBIN_U8("graphics/pokemon/hakamo_o/icon.4bpp"); const u8 gMonIcon_Kommoo[] = INCBIN_U8("graphics/pokemon/kommo_o/icon.4bpp"); -const u8 gMonIcon_Tapu_Koko[] = INCBIN_U8("graphics/pokemon/tapu_koko/icon.4bpp"); -const u8 gMonIcon_Tapu_Lele[] = INCBIN_U8("graphics/pokemon/tapu_lele/icon.4bpp"); -const u8 gMonIcon_Tapu_Bulu[] = INCBIN_U8("graphics/pokemon/tapu_bulu/icon.4bpp"); -const u8 gMonIcon_Tapu_Fini[] = INCBIN_U8("graphics/pokemon/tapu_fini/icon.4bpp"); +const u8 gMonIcon_TapuKoko[] = INCBIN_U8("graphics/pokemon/tapu_koko/icon.4bpp"); +const u8 gMonIcon_TapuLele[] = INCBIN_U8("graphics/pokemon/tapu_lele/icon.4bpp"); +const u8 gMonIcon_TapuBulu[] = INCBIN_U8("graphics/pokemon/tapu_bulu/icon.4bpp"); +const u8 gMonIcon_TapuFini[] = INCBIN_U8("graphics/pokemon/tapu_fini/icon.4bpp"); const u8 gMonIcon_Cosmog[] = INCBIN_U8("graphics/pokemon/cosmog/icon.4bpp"); const u8 gMonIcon_Cosmoem[] = INCBIN_U8("graphics/pokemon/cosmoem/icon.4bpp"); const u8 gMonIcon_Solgaleo[] = INCBIN_U8("graphics/pokemon/solgaleo/icon.4bpp"); diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index e71f450d83..720a3dbb99 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -785,10 +785,10 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(JANGMO_O, gMonBackPic_Jangmoo), SPECIES_SPRITE(HAKAMO_O, gMonBackPic_Hakamoo), SPECIES_SPRITE(KOMMO_O, gMonBackPic_Kommoo), - SPECIES_SPRITE(TAPU_KOKO, gMonBackPic_Tapu_Koko), - SPECIES_SPRITE(TAPU_LELE, gMonBackPic_Tapu_Lele), - SPECIES_SPRITE(TAPU_BULU, gMonBackPic_Tapu_Bulu), - SPECIES_SPRITE(TAPU_FINI, gMonBackPic_Tapu_Fini), + SPECIES_SPRITE(TAPU_KOKO, gMonBackPic_TapuKoko), + SPECIES_SPRITE(TAPU_LELE, gMonBackPic_TapuLele), + SPECIES_SPRITE(TAPU_BULU, gMonBackPic_TapuBulu), + SPECIES_SPRITE(TAPU_FINI, gMonBackPic_TapuFini), SPECIES_SPRITE(COSMOG, gMonBackPic_Cosmog), SPECIES_SPRITE(COSMOEM, gMonBackPic_Cosmoem), SPECIES_SPRITE(SOLGALEO, gMonBackPic_Solgaleo), diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index 2a8f113e68..938dd0dca5 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -785,10 +785,10 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(JANGMO_O, gMonFrontPic_Jangmoo), SPECIES_SPRITE(HAKAMO_O, gMonFrontPic_Hakamoo), SPECIES_SPRITE(KOMMO_O, gMonFrontPic_Kommoo), - SPECIES_SPRITE(TAPU_KOKO, gMonFrontPic_Tapu_Koko), - SPECIES_SPRITE(TAPU_LELE, gMonFrontPic_Tapu_Lele), - SPECIES_SPRITE(TAPU_BULU, gMonFrontPic_Tapu_Bulu), - SPECIES_SPRITE(TAPU_FINI, gMonFrontPic_Tapu_Fini), + SPECIES_SPRITE(TAPU_KOKO, gMonFrontPic_TapuKoko), + SPECIES_SPRITE(TAPU_LELE, gMonFrontPic_TapuLele), + SPECIES_SPRITE(TAPU_BULU, gMonFrontPic_TapuBulu), + SPECIES_SPRITE(TAPU_FINI, gMonFrontPic_TapuFini), SPECIES_SPRITE(COSMOG, gMonFrontPic_Cosmog), SPECIES_SPRITE(COSMOEM, gMonFrontPic_Cosmoem), SPECIES_SPRITE(SOLGALEO, gMonFrontPic_Solgaleo), diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index 082f48da84..7149baea57 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -785,10 +785,10 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(JANGMO_O, gMonPalette_Jangmoo), SPECIES_PAL(HAKAMO_O, gMonPalette_Hakamoo), SPECIES_PAL(KOMMO_O, gMonPalette_Kommoo), - SPECIES_PAL(TAPU_KOKO, gMonPalette_Tapu_Koko), - SPECIES_PAL(TAPU_LELE, gMonPalette_Tapu_Lele), - SPECIES_PAL(TAPU_BULU, gMonPalette_Tapu_Bulu), - SPECIES_PAL(TAPU_FINI, gMonPalette_Tapu_Fini), + SPECIES_PAL(TAPU_KOKO, gMonPalette_TapuKoko), + SPECIES_PAL(TAPU_LELE, gMonPalette_TapuLele), + SPECIES_PAL(TAPU_BULU, gMonPalette_TapuBulu), + SPECIES_PAL(TAPU_FINI, gMonPalette_TapuFini), SPECIES_PAL(COSMOG, gMonPalette_Cosmog), SPECIES_PAL(COSMOEM, gMonPalette_Cosmoem), SPECIES_PAL(SOLGALEO, gMonPalette_Solgaleo), diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index 64c8f6f750..6a149dd87a 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -785,10 +785,10 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(JANGMO_O, gMonShinyPalette_Jangmoo), SPECIES_SHINY_PAL(HAKAMO_O, gMonShinyPalette_Hakamoo), SPECIES_SHINY_PAL(KOMMO_O, gMonShinyPalette_Kommoo), - SPECIES_SHINY_PAL(TAPU_KOKO, gMonShinyPalette_Tapu_Koko), - SPECIES_SHINY_PAL(TAPU_LELE, gMonShinyPalette_Tapu_Lele), - SPECIES_SHINY_PAL(TAPU_BULU, gMonShinyPalette_Tapu_Bulu), - SPECIES_SHINY_PAL(TAPU_FINI, gMonShinyPalette_Tapu_Fini), + SPECIES_SHINY_PAL(TAPU_KOKO, gMonShinyPalette_TapuKoko), + SPECIES_SHINY_PAL(TAPU_LELE, gMonShinyPalette_TapuLele), + SPECIES_SHINY_PAL(TAPU_BULU, gMonShinyPalette_TapuBulu), + SPECIES_SHINY_PAL(TAPU_FINI, gMonShinyPalette_TapuFini), SPECIES_SHINY_PAL(COSMOG, gMonShinyPalette_Cosmog), SPECIES_SHINY_PAL(COSMOEM, gMonShinyPalette_Cosmoem), SPECIES_SHINY_PAL(SOLGALEO, gMonShinyPalette_Solgaleo), diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 7311cf6fa9..33534206e7 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -810,10 +810,10 @@ const u8 *const gMonIconTable[] = [SPECIES_JANGMO_O] = gMonIcon_Jangmoo, [SPECIES_HAKAMO_O] = gMonIcon_Hakamoo, [SPECIES_KOMMO_O] = gMonIcon_Kommoo, - [SPECIES_TAPU_KOKO] = gMonIcon_Tapu_Koko, - [SPECIES_TAPU_LELE] = gMonIcon_Tapu_Lele, - [SPECIES_TAPU_BULU] = gMonIcon_Tapu_Bulu, - [SPECIES_TAPU_FINI] = gMonIcon_Tapu_Fini, + [SPECIES_TAPU_KOKO] = gMonIcon_TapuKoko, + [SPECIES_TAPU_LELE] = gMonIcon_TapuLele, + [SPECIES_TAPU_BULU] = gMonIcon_TapuBulu, + [SPECIES_TAPU_FINI] = gMonIcon_TapuFini, [SPECIES_COSMOG] = gMonIcon_Cosmog, [SPECIES_COSMOEM] = gMonIcon_Cosmoem, [SPECIES_SOLGALEO] = gMonIcon_Solgaleo, From a021204389226f56522dfcb52b0c545c552c6168 Mon Sep 17 00:00:00 2001 From: amiosi <44352097+amiosi@users.noreply.github.com> Date: Tue, 2 Feb 2021 14:49:01 -0500 Subject: [PATCH 06/15] oricorio pau constants --- src/data/pokemon/base_stats.h | 2 +- src/data/pokemon/form_species_table_pointers.h | 2 +- src/data/pokemon/form_species_tables.h | 2 +- src/data/pokemon/level_up_learnset_pointers.h | 2 +- src/data/pokemon/tmhm_learnsets.h | 2 +- src/data/pokemon_graphics/back_pic_table.h | 2 +- src/data/pokemon_graphics/front_pic_table.h | 2 +- src/data/pokemon_graphics/palette_table.h | 2 +- src/data/pokemon_graphics/shiny_palette_table.h | 2 +- src/data/text/species_names.h | 2 +- src/pokemon.c | 2 +- src/pokemon_icon.c | 4 ++-- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/data/pokemon/base_stats.h b/src/data/pokemon/base_stats.h index 3fad49fb15..db02c10a0b 100644 --- a/src/data/pokemon/base_stats.h +++ b/src/data/pokemon/base_stats.h @@ -32414,7 +32414,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_ORICORIO_PA_U] = + [SPECIES_ORICORIO_PAU] = { .baseHP = 75, .baseAttack = 70, diff --git a/src/data/pokemon/form_species_table_pointers.h b/src/data/pokemon/form_species_table_pointers.h index ac58f1bfb2..7c7c56b0e3 100644 --- a/src/data/pokemon/form_species_table_pointers.h +++ b/src/data/pokemon/form_species_table_pointers.h @@ -430,7 +430,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_HOOPA_UNBOUND] = sHoopaFormSpeciesIdTable, // Oricorio [SPECIES_ORICORIO_POM_POM] = sOricorioFormSpeciesIdTable, - [SPECIES_ORICORIO_PA_U] = sOricorioFormSpeciesIdTable, + [SPECIES_ORICORIO_PAU] = sOricorioFormSpeciesIdTable, [SPECIES_ORICORIO_SENSU] = sOricorioFormSpeciesIdTable, // Rockruff [SPECIES_ROCKRUFF_OWN_TEMPO] = sRockruffFormSpeciesIdTable, diff --git a/src/data/pokemon/form_species_tables.h b/src/data/pokemon/form_species_tables.h index f702530eb2..89b3f4eec1 100644 --- a/src/data/pokemon/form_species_tables.h +++ b/src/data/pokemon/form_species_tables.h @@ -846,7 +846,7 @@ static const u16 sHoopaFormSpeciesIdTable[] = { static const u16 sOricorioFormSpeciesIdTable[] = { SPECIES_ORICORIO, SPECIES_ORICORIO_POM_POM, - SPECIES_ORICORIO_PA_U, + SPECIES_ORICORIO_PAU, SPECIES_ORICORIO_SENSU, FORM_SPECIES_END, }; diff --git a/src/data/pokemon/level_up_learnset_pointers.h b/src/data/pokemon/level_up_learnset_pointers.h index b6186f2d83..6cd308aa7d 100644 --- a/src/data/pokemon/level_up_learnset_pointers.h +++ b/src/data/pokemon/level_up_learnset_pointers.h @@ -1186,7 +1186,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_HOOPA_UNBOUND] = sHoopaUnboundLevelUpLearnset, // Oricorio [SPECIES_ORICORIO_POM_POM] = sOricorioLevelUpLearnset, - [SPECIES_ORICORIO_PA_U] = sOricorioLevelUpLearnset, + [SPECIES_ORICORIO_PAU] = sOricorioLevelUpLearnset, [SPECIES_ORICORIO_SENSU] = sOricorioLevelUpLearnset, // Rockruff [SPECIES_ROCKRUFF_OWN_TEMPO] = sRockruffLevelUpLearnset, diff --git a/src/data/pokemon/tmhm_learnsets.h b/src/data/pokemon/tmhm_learnsets.h index f50c7d3f46..27be7f3a6d 100644 --- a/src/data/pokemon/tmhm_learnsets.h +++ b/src/data/pokemon/tmhm_learnsets.h @@ -23878,7 +23878,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM06_TOXIC)), - [SPECIES_ORICORIO_PA_U] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ORICORIO_PAU] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index 720a3dbb99..f00db0c565 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -1185,7 +1185,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(HOOPA_UNBOUND, gMonBackPic_HoopaUnbound), SPECIES_SPRITE(ORICORIO_POM_POM, gMonBackPic_OricorioPomPom), - SPECIES_SPRITE(ORICORIO_PA_U, gMonBackPic_OricorioPau), + SPECIES_SPRITE(ORICORIO_PAU, gMonBackPic_OricorioPau), SPECIES_SPRITE(ORICORIO_SENSU, gMonBackPic_OricorioSensu), SPECIES_SPRITE(ROCKRUFF_OWN_TEMPO, gMonBackPic_Rockruff), diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index 938dd0dca5..f4cb60dad5 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -1185,7 +1185,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(HOOPA_UNBOUND, gMonFrontPic_HoopaUnbound), SPECIES_SPRITE(ORICORIO_POM_POM, gMonFrontPic_OricorioPomPom), - SPECIES_SPRITE(ORICORIO_PA_U, gMonFrontPic_OricorioPau), + SPECIES_SPRITE(ORICORIO_PAU, gMonFrontPic_OricorioPau), SPECIES_SPRITE(ORICORIO_SENSU, gMonFrontPic_OricorioSensu), SPECIES_SPRITE(ROCKRUFF_OWN_TEMPO, gMonFrontPic_Rockruff), diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index 7149baea57..f2fdf18263 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -1185,7 +1185,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(HOOPA_UNBOUND, gMonPalette_HoopaUnbound), SPECIES_PAL(ORICORIO_POM_POM, gMonPalette_OricorioPomPom), - SPECIES_PAL(ORICORIO_PA_U, gMonPalette_OricorioPau), + SPECIES_PAL(ORICORIO_PAU, gMonPalette_OricorioPau), SPECIES_PAL(ORICORIO_SENSU, gMonPalette_OricorioSensu), SPECIES_PAL(ROCKRUFF_OWN_TEMPO, gMonPalette_Rockruff), diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index 6a149dd87a..0213306839 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -1185,7 +1185,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(HOOPA_UNBOUND, gMonShinyPalette_HoopaUnbound), SPECIES_SHINY_PAL(ORICORIO_POM_POM, gMonShinyPalette_OricorioPomPom), - SPECIES_SHINY_PAL(ORICORIO_PA_U, gMonShinyPalette_OricorioPau), + SPECIES_SHINY_PAL(ORICORIO_PAU, gMonShinyPalette_OricorioPau), SPECIES_SHINY_PAL(ORICORIO_SENSU, gMonShinyPalette_OricorioSensu), SPECIES_SHINY_PAL(ROCKRUFF_OWN_TEMPO, gMonShinyPalette_Rockruff), diff --git a/src/data/text/species_names.h b/src/data/text/species_names.h index c13b1361ce..9d5c3ebd5c 100644 --- a/src/data/text/species_names.h +++ b/src/data/text/species_names.h @@ -1188,7 +1188,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_HOOPA_UNBOUND] = _("Hoopa"), // Oricorio [SPECIES_ORICORIO_POM_POM] = _("Oricorio"), - [SPECIES_ORICORIO_PA_U] = _("Oricorio"), + [SPECIES_ORICORIO_PAU] = _("Oricorio"), [SPECIES_ORICORIO_SENSU] = _("Oricorio"), // Rockruff [SPECIES_ROCKRUFF_OWN_TEMPO] = _("Rockruff"), diff --git a/src/pokemon.c b/src/pokemon.c index c0e373c0e7..233b88a5b2 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1496,7 +1496,7 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to [SPECIES_HOOPA_UNBOUND - 1] = NATIONAL_DEX_HOOPA, // Oricorio [SPECIES_ORICORIO_POM_POM - 1] = NATIONAL_DEX_ORICORIO, - [SPECIES_ORICORIO_PA_U - 1] = NATIONAL_DEX_ORICORIO, + [SPECIES_ORICORIO_PAU - 1] = NATIONAL_DEX_ORICORIO, [SPECIES_ORICORIO_SENSU - 1] = NATIONAL_DEX_ORICORIO, // Rockruff [SPECIES_ROCKRUFF_OWN_TEMPO - 1] = NATIONAL_DEX_ROCKRUFF, diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 33534206e7..3411f6bd94 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -1168,7 +1168,7 @@ const u8 *const gMonIconTable[] = [SPECIES_ZYGARDE_COMPLETE] = gMonIcon_ZygardeComplete, [SPECIES_HOOPA_UNBOUND] = gMonIcon_HoopaUnbound, [SPECIES_ORICORIO_POM_POM] = gMonIcon_OricorioPomPom, - [SPECIES_ORICORIO_PA_U] = gMonIcon_OricorioPau, + [SPECIES_ORICORIO_PAU] = gMonIcon_OricorioPau, [SPECIES_ORICORIO_SENSU] = gMonIcon_OricorioSensu, [SPECIES_ROCKRUFF_OWN_TEMPO] = gMonIcon_Rockruff, [SPECIES_LYCANROC_MIDNIGHT] = gMonIcon_LycanrocMidnight, @@ -2355,7 +2355,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_ZYGARDE_COMPLETE] = 1, [SPECIES_HOOPA_UNBOUND] = 0, [SPECIES_ORICORIO_POM_POM] = 1, - [SPECIES_ORICORIO_PA_U] = 1, + [SPECIES_ORICORIO_PAU] = 1, [SPECIES_ORICORIO_SENSU] = 0, [SPECIES_ROCKRUFF_OWN_TEMPO] = 2, [SPECIES_LYCANROC_MIDNIGHT] = 0, From 0798ba22a6ce145f2e9b9ac0fd575eda4ffc09a4 Mon Sep 17 00:00:00 2001 From: amiosi <44352097+amiosi@users.noreply.github.com> Date: Tue, 2 Feb 2021 15:10:45 -0500 Subject: [PATCH 07/15] fix tmhm spacing i missed, extend to all species --- src/data/pokemon/tmhm_learnsets.h | 388 +++++++++++++++--------------- 1 file changed, 194 insertions(+), 194 deletions(-) diff --git a/src/data/pokemon/tmhm_learnsets.h b/src/data/pokemon/tmhm_learnsets.h index 27be7f3a6d..3d9eac9637 100644 --- a/src/data/pokemon/tmhm_learnsets.h +++ b/src/data/pokemon/tmhm_learnsets.h @@ -10829,7 +10829,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_MIME_JR] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_MIME_JR] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -19183,9 +19183,9 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), //TMs of LGPE don't match with USUM - [SPECIES_MELTAN] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_MELTAN] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_MELMETAL] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_MELMETAL] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), [SPECIES_GROOKEY] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM42_FACADE) @@ -20193,7 +20193,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM22_SOLARBEAM) | TMHM(TM11_SUNNY_DAY)), - [SPECIES_RATTATA_ALOLAN] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + [SPECIES_RATTATA_ALOLAN]= TMHM_LEARNSET(TMHM(TM14_BLIZZARD) | TMHM(HM01_CUT) | TMHM(TM28_DIG) | TMHM(TM42_FACADE) @@ -20206,7 +20206,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM06_TOXIC)), - [SPECIES_RATICATE_ALOLAN] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + [SPECIES_RATICATE_ALOLAN]= TMHM_LEARNSET(TMHM(TM14_BLIZZARD) | TMHM(TM08_BULK_UP) | TMHM(HM01_CUT) | TMHM(TM28_DIG) @@ -20221,7 +20221,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM06_TOXIC)), - [SPECIES_RAICHU_ALOLAN] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_RAICHU_ALOLAN]= TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM04_CALM_MIND) | TMHM(TM28_DIG) | TMHM(TM42_FACADE) @@ -20239,7 +20239,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM25_THUNDER) | TMHM(TM06_TOXIC)), - [SPECIES_SANDSHREW_ALOLAN] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + [SPECIES_SANDSHREW_ALOLAN]= TMHM_LEARNSET(TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(HM01_CUT) | TMHM(TM28_DIG) @@ -20253,7 +20253,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM04_STRENGTH) | TMHM(TM06_TOXIC)), - [SPECIES_SANDSLASH_ALOLAN] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + [SPECIES_SANDSLASH_ALOLAN]= TMHM_LEARNSET(TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(HM01_CUT) | TMHM(TM28_DIG) @@ -20268,7 +20268,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM04_STRENGTH) | TMHM(TM06_TOXIC)), - [SPECIES_VULPIX_ALOLAN] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + [SPECIES_VULPIX_ALOLAN]= TMHM_LEARNSET(TMHM(TM14_BLIZZARD) | TMHM(TM28_DIG) | TMHM(TM42_FACADE) | TMHM(TM13_ICE_BEAM) @@ -20278,7 +20278,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM44_REST) | TMHM(TM06_TOXIC)), - [SPECIES_NINETALES_ALOLAN] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + [SPECIES_NINETALES_ALOLAN]= TMHM_LEARNSET(TMHM(TM14_BLIZZARD) | TMHM(TM04_CALM_MIND) | TMHM(TM28_DIG) | TMHM(TM42_FACADE) @@ -20290,7 +20290,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM44_REST) | TMHM(TM06_TOXIC)), - [SPECIES_DIGLETT_ALOLAN] = TMHM_LEARNSET(TMHM(HM01_CUT) + [SPECIES_DIGLETT_ALOLAN]= TMHM_LEARNSET(TMHM(HM01_CUT) | TMHM(TM28_DIG) | TMHM(TM26_EARTHQUAKE) | TMHM(TM42_FACADE) @@ -20300,7 +20300,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM36_SLUDGE_BOMB) | TMHM(TM06_TOXIC)), - [SPECIES_DUGTRIO_ALOLAN] = TMHM_LEARNSET(TMHM(HM01_CUT) + [SPECIES_DUGTRIO_ALOLAN]= TMHM_LEARNSET(TMHM(HM01_CUT) | TMHM(TM28_DIG) | TMHM(TM26_EARTHQUAKE) | TMHM(TM42_FACADE) @@ -20311,7 +20311,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM36_SLUDGE_BOMB) | TMHM(TM06_TOXIC)), - [SPECIES_MEOWTH_ALOLAN] = TMHM_LEARNSET(TMHM(HM01_CUT) + [SPECIES_MEOWTH_ALOLAN]= TMHM_LEARNSET(TMHM(HM01_CUT) | TMHM(TM42_FACADE) | TMHM(HM05_FLASH) | TMHM(TM23_IRON_TAIL) @@ -20323,7 +20323,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM25_THUNDER) | TMHM(TM06_TOXIC)), - [SPECIES_PERSIAN_ALOLAN] = TMHM_LEARNSET(TMHM(HM01_CUT) + [SPECIES_PERSIAN_ALOLAN]= TMHM_LEARNSET(TMHM(HM01_CUT) | TMHM(TM42_FACADE) | TMHM(HM05_FLASH) | TMHM(TM15_HYPER_BEAM) @@ -20336,7 +20336,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM25_THUNDER) | TMHM(TM06_TOXIC)), - [SPECIES_GEODUDE_ALOLAN] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_GEODUDE_ALOLAN]= TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM42_FACADE) | TMHM(TM38_FIRE_BLAST) @@ -20350,7 +20350,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM25_THUNDER) | TMHM(TM06_TOXIC)), - [SPECIES_GRAVELER_ALOLAN] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_GRAVELER_ALOLAN]= TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM26_EARTHQUAKE) | TMHM(TM42_FACADE) @@ -20364,7 +20364,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM25_THUNDER) | TMHM(TM06_TOXIC)), - [SPECIES_GOLEM_ALOLAN] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_GOLEM_ALOLAN]= TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM26_EARTHQUAKE) | TMHM(TM42_FACADE) @@ -20379,7 +20379,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM25_THUNDER) | TMHM(TM06_TOXIC)), - [SPECIES_GRIMER_ALOLAN] = TMHM_LEARNSET(TMHM(TM28_DIG) + [SPECIES_GRIMER_ALOLAN]= TMHM_LEARNSET(TMHM(TM28_DIG) | TMHM(TM42_FACADE) | TMHM(TM38_FIRE_BLAST) | TMHM(TM35_FLAMETHROWER) @@ -20391,7 +20391,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM06_TOXIC)), - [SPECIES_MUK_ALOLAN] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_MUK_ALOLAN] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM42_FACADE) | TMHM(TM38_FIRE_BLAST) @@ -20406,7 +20406,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM06_TOXIC)), - [SPECIES_EXEGGUTOR_ALOLAN] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_EXEGGUTOR_ALOLAN]= TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM26_EARTHQUAKE) | TMHM(TM42_FACADE) | TMHM(TM35_FLAMETHROWER) @@ -20423,7 +20423,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM04_STRENGTH) | TMHM(TM06_TOXIC)), - [SPECIES_MAROWAK_ALOLAN] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + [SPECIES_MAROWAK_ALOLAN]= TMHM_LEARNSET(TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM26_EARTHQUAKE) @@ -20761,7 +20761,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM36_SLUDGE_BOMB) | TMHM(HM03_SURF)), - [SPECIES_PIKACHU_COSPLAY] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_COSPLAY]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -20787,7 +20787,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PIKACHU_ROCK_STAR] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_ROCK_STAR]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -20813,7 +20813,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PIKACHU_BELLE] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_BELLE]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -20839,7 +20839,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PIKACHU_POP_STAR] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_POP_STAR]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -20865,7 +20865,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PIKACHU_PH_D] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_PH_D]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -20891,7 +20891,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PIKACHU_LIBRE] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_LIBRE]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -20917,7 +20917,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PIKACHU_ORIGINAL_CAP] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_ORIGINAL_CAP]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -20943,7 +20943,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PIKACHU_HOENN_CAP] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_HOENN_CAP]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -20969,7 +20969,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PIKACHU_SINNOH_CAP] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_SINNOH_CAP]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -20995,7 +20995,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PIKACHU_UNOVA_CAP] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_UNOVA_CAP]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -21021,7 +21021,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PIKACHU_KALOS_CAP] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_KALOS_CAP]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -21047,7 +21047,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PIKACHU_ALOLA_CAP] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_ALOLA_CAP]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -21073,7 +21073,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PIKACHU_PARTNER_CAP] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_PARTNER_CAP]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -21099,7 +21099,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PICHU_SPIKY_EARED] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PICHU_SPIKY_EARED]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) | TMHM(HM05_FLASH) @@ -21118,61 +21118,61 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_UNOWN_B] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_B] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_C] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_C] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_D] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_D] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_E] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_E] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_F] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_F] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_G] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_G] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_H] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_H] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_I] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_I] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_J] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_J] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_K] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_K] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_L] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_L] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_M] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_M] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_N] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_N] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_O] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_O] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_P] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_P] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_Q] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_Q] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_R] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_R] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_S] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_S] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_T] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_T] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_U] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_U] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_V] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_V] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_W] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_W] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_X] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_X] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_Y] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_Y] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_Z] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_Z] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_EMARK] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_EMARK] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_QMARK] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_QMARK] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_DEOXYS_ATTACK] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_DEOXYS_ATTACK]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM31_BRICK_BREAK) | TMHM(TM04_CALM_MIND) | TMHM(HM01_CUT) @@ -21209,7 +21209,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM06_TOXIC) | TMHM(TM03_WATER_PULSE)), - [SPECIES_DEOXYS_DEFENSE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_DEOXYS_DEFENSE]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM31_BRICK_BREAK) | TMHM(TM04_CALM_MIND) | TMHM(HM01_CUT) @@ -21246,7 +21246,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM06_TOXIC) | TMHM(TM03_WATER_PULSE)), - [SPECIES_DEOXYS_SPEED] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_DEOXYS_SPEED]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM31_BRICK_BREAK) | TMHM(TM04_CALM_MIND) | TMHM(HM01_CUT) @@ -21283,13 +21283,13 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM06_TOXIC) | TMHM(TM03_WATER_PULSE)), - [SPECIES_BURMY_SANDY_CLOAK] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER) + [SPECIES_BURMY_SANDY_CLOAK]= TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER) | TMHM(TM17_PROTECT)), - [SPECIES_BURMY_TRASH_CLOAK] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER) + [SPECIES_BURMY_TRASH_CLOAK]= TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER) | TMHM(TM17_PROTECT)), - [SPECIES_WORMADAM_SANDY_CLOAK] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_WORMADAM_SANDY_CLOAK]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM26_EARTHQUAKE) @@ -21313,7 +21313,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_WORMADAM_TRASH_CLOAK] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_WORMADAM_TRASH_CLOAK]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) | TMHM(HM05_FLASH) @@ -21333,7 +21333,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_SHELLOS_EAST_SEA] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_SHELLOS_EAST_SEA]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM14_BLIZZARD) | TMHM(HM08_DIVE) | TMHM(TM32_DOUBLE_TEAM) @@ -21351,7 +21351,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM06_TOXIC) | TMHM(TM03_WATER_PULSE)), - [SPECIES_GASTRODON_EAST_SEA] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_GASTRODON_EAST_SEA]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM14_BLIZZARD) | TMHM(TM28_DIG) | TMHM(HM08_DIVE) @@ -21389,7 +21389,7 @@ const u32 gTMHMLearnsets[][2] = [SPECIES_ROTOM_MOW] = TMHM_LEARNSET(0), - [SPECIES_GIRATINA_ORIGIN] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_GIRATINA_ORIGIN]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM04_CALM_MIND) | TMHM(HM01_CUT) | TMHM(TM32_DOUBLE_TEAM) @@ -21419,7 +21419,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SHAYMIN_SKY] = TMHM_LEARNSET(TMHM(TM09_BULLET_SEED) + [SPECIES_SHAYMIN_SKY] = TMHM_LEARNSET(TMHM(TM09_BULLET_SEED) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) | TMHM(HM05_FLASH) @@ -21437,7 +21437,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_ARCEUS_FIGHTING] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_FIGHTING]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -21486,7 +21486,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_FLYING] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_FLYING]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -21535,7 +21535,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_POISON] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_POISON]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -21584,7 +21584,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_GROUND] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_GROUND]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -21633,7 +21633,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_ROCK] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_ROCK] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -21682,7 +21682,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_BUG] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_BUG] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -21731,7 +21731,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_GHOST] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_GHOST]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -21780,7 +21780,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_STEEL] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_STEEL]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -21829,7 +21829,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_FIRE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_FIRE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -21878,7 +21878,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_WATER] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_WATER]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -21927,7 +21927,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_GRASS] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_GRASS]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -21976,7 +21976,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_ELECTRIC] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_ELECTRIC]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -22025,7 +22025,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_PSYCHIC] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_PSYCHIC]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -22074,7 +22074,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_ICE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_ICE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -22123,7 +22123,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_DRAGON] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_DRAGON]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -22172,7 +22172,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_DARK] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_DARK] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -22221,7 +22221,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_FAIRY] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_FAIRY]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -22270,7 +22270,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_BASCULIN_BLUE_STRIPED] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_BASCULIN_BLUE_STRIPED]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(HM01_CUT) | TMHM(HM08_DIVE) | TMHM(TM32_DOUBLE_TEAM) @@ -22289,7 +22289,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM06_TOXIC) | TMHM(HM07_WATERFALL)), - [SPECIES_DEERLING_SUMMER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_DEERLING_SUMMER]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) | TMHM(HM05_FLASH) @@ -22308,7 +22308,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_DEERLING_AUTUMN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_DEERLING_AUTUMN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) | TMHM(HM05_FLASH) @@ -22327,7 +22327,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_DEERLING_WINTER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_DEERLING_WINTER]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) | TMHM(HM05_FLASH) @@ -22346,7 +22346,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_SAWSBUCK_SUMMER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_SAWSBUCK_SUMMER]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(HM01_CUT) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -22368,7 +22368,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_SAWSBUCK_AUTUMN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_SAWSBUCK_AUTUMN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(HM01_CUT) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -22390,7 +22390,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_SAWSBUCK_WINTER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_SAWSBUCK_WINTER]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(HM01_CUT) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -22412,7 +22412,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_TORNADUS_THERIAN] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_TORNADUS_THERIAN]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM08_BULK_UP) @@ -22437,7 +22437,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM41_TORMENT) | TMHM(TM06_TOXIC)), - [SPECIES_THUNDURUS_THERIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_THUNDURUS_THERIAN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM08_BULK_UP) | TMHM(TM32_DOUBLE_TEAM) @@ -22464,7 +22464,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM41_TORMENT) | TMHM(TM06_TOXIC)), - [SPECIES_LANDORUS_THERIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_LANDORUS_THERIAN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM08_BULK_UP) | TMHM(TM04_CALM_MIND) @@ -22489,7 +22489,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM04_STRENGTH) | TMHM(TM06_TOXIC)), - [SPECIES_KYUREM_WHITE] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + [SPECIES_KYUREM_WHITE]= TMHM_LEARNSET(TMHM(TM14_BLIZZARD) | TMHM(HM01_CUT) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) @@ -22517,7 +22517,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_KYUREM_BLACK] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + [SPECIES_KYUREM_BLACK]= TMHM_LEARNSET(TMHM(TM14_BLIZZARD) | TMHM(HM01_CUT) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) @@ -22545,7 +22545,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_KELDEO_RESOLUTE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_KELDEO_RESOLUTE]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM04_CALM_MIND) | TMHM(HM01_CUT) | TMHM(TM32_DOUBLE_TEAM) @@ -22569,7 +22569,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM06_TOXIC) | TMHM(TM03_WATER_PULSE)), - [SPECIES_GENESECT_DOUSE_DRIVE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_GENESECT_DOUSE_DRIVE]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -22594,7 +22594,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_GENESECT_SHOCK_DRIVE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_GENESECT_SHOCK_DRIVE]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -22619,7 +22619,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_GENESECT_BURN_DRIVE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_GENESECT_BURN_DRIVE]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -22644,7 +22644,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_GENESECT_CHILL_DRIVE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_GENESECT_CHILL_DRIVE]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -22669,7 +22669,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_GRENINJA_BATTLE_BOND] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_GRENINJA_BATTLE_BOND]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM14_BLIZZARD) | TMHM(HM01_CUT) @@ -22697,7 +22697,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_VIVILLON_POLAR] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_POLAR]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22720,7 +22720,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_TUNDRA] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_TUNDRA]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22743,7 +22743,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_CONTINENTAL] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_CONTINENTAL]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22766,7 +22766,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_GARDEN] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_GARDEN]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22789,7 +22789,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_ELEGANT] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_ELEGANT]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22812,7 +22812,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_MEADOW] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_MEADOW]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22835,7 +22835,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_MODERN] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_MODERN]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22858,7 +22858,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_MARINE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_MARINE]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22881,7 +22881,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_ARCHIPELAGO] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_ARCHIPELAGO]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22904,7 +22904,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_HIGH_PLAINS] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_HIGH_PLAINS]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22927,7 +22927,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_SANDSTORM] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_SANDSTORM]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22950,7 +22950,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_RIVER] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_RIVER]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22973,7 +22973,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_MONSOON] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_MONSOON]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22996,7 +22996,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_SAVANNA] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_SAVANNA]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -23019,7 +23019,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_SUN] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_SUN]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -23042,7 +23042,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_OCEAN] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_OCEAN]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -23065,7 +23065,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_JUNGLE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_JUNGLE]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -23088,7 +23088,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_FANCY] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_FANCY]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -23111,7 +23111,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_POKE_BALL] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_POKE_BALL]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -23134,7 +23134,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_FLABEBE_YELLOW_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLABEBE_YELLOW_FLOWER]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23153,7 +23153,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FLABEBE_ORANGE_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLABEBE_ORANGE_FLOWER]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23172,7 +23172,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FLABEBE_BLUE_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLABEBE_BLUE_FLOWER]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23191,7 +23191,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FLABEBE_WHITE_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLABEBE_WHITE_FLOWER]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23210,7 +23210,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FLOETTE_YELLOW_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLOETTE_YELLOW_FLOWER]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23229,7 +23229,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FLOETTE_ORANGE_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLOETTE_ORANGE_FLOWER]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23248,7 +23248,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FLOETTE_BLUE_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLOETTE_BLUE_FLOWER]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23267,7 +23267,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FLOETTE_WHITE_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLOETTE_WHITE_FLOWER]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23286,7 +23286,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FLOETTE_ETERNAL_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLOETTE_ETERNAL_FLOWER]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23305,7 +23305,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FLORGES_YELLOW_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLORGES_YELLOW_FLOWER]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23326,7 +23326,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FLORGES_ORANGE_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLORGES_ORANGE_FLOWER]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23347,7 +23347,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FLORGES_BLUE_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLORGES_BLUE_FLOWER]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23368,7 +23368,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FLORGES_WHITE_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLORGES_WHITE_FLOWER]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23389,7 +23389,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FURFROU_HEART_TRIM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FURFROU_HEART_TRIM]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23408,7 +23408,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM03_SURF) | TMHM(TM06_TOXIC)), - [SPECIES_FURFROU_STAR_TRIM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FURFROU_STAR_TRIM]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23427,7 +23427,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM03_SURF) | TMHM(TM06_TOXIC)), - [SPECIES_FURFROU_DIAMOND_TRIM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FURFROU_DIAMOND_TRIM]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23446,7 +23446,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM03_SURF) | TMHM(TM06_TOXIC)), - [SPECIES_FURFROU_DEBUTANTE_TRIM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FURFROU_DEBUTANTE_TRIM]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23465,7 +23465,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM03_SURF) | TMHM(TM06_TOXIC)), - [SPECIES_FURFROU_MATRON_TRIM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FURFROU_MATRON_TRIM]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23484,7 +23484,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM03_SURF) | TMHM(TM06_TOXIC)), - [SPECIES_FURFROU_DANDY_TRIM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FURFROU_DANDY_TRIM]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23503,7 +23503,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM03_SURF) | TMHM(TM06_TOXIC)), - [SPECIES_FURFROU_LA_REINE_TRIM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FURFROU_LA_REINE_TRIM]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23522,7 +23522,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM03_SURF) | TMHM(TM06_TOXIC)), - [SPECIES_FURFROU_KABUKI_TRIM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FURFROU_KABUKI_TRIM]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23541,7 +23541,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM03_SURF) | TMHM(TM06_TOXIC)), - [SPECIES_FURFROU_PHARAOH_TRIM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FURFROU_PHARAOH_TRIM]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23560,7 +23560,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM03_SURF) | TMHM(TM06_TOXIC)), - [SPECIES_MEOWSTIC_FEMALE] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_MEOWSTIC_FEMALE]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(HM01_CUT) | TMHM(TM28_DIG) @@ -23589,7 +23589,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM41_TORMENT) | TMHM(TM06_TOXIC)), - [SPECIES_PUMPKABOO_SMALL] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PUMPKABOO_SMALL]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM09_BULLET_SEED) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23615,7 +23615,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_PUMPKABOO_LARGE] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PUMPKABOO_LARGE]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM09_BULLET_SEED) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23641,7 +23641,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_PUMPKABOO_SUPER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PUMPKABOO_SUPER]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM09_BULLET_SEED) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23667,7 +23667,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_GOURGEIST_SMALL] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_GOURGEIST_SMALL]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM09_BULLET_SEED) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23694,7 +23694,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_GOURGEIST_LARGE] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_GOURGEIST_LARGE]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM09_BULLET_SEED) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23721,7 +23721,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_GOURGEIST_SUPER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_GOURGEIST_SUPER]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM09_BULLET_SEED) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23748,7 +23748,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_ZYGARDE_10] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_ZYGARDE_10] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM26_EARTHQUAKE) @@ -23769,7 +23769,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_ZYGARDE_10_POWER_CONSTRUCT]= TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM26_EARTHQUAKE) @@ -23790,7 +23790,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_ZYGARDE_50_POWER_CONSTRUCT]= TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM26_EARTHQUAKE) @@ -23811,7 +23811,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_ZYGARDE_COMPLETE] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_ZYGARDE_COMPLETE]= TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM26_EARTHQUAKE) @@ -23832,7 +23832,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_HOOPA_UNBOUND] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_HOOPA_UNBOUND]= TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23861,7 +23861,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM41_TORMENT) | TMHM(TM06_TOXIC)), - [SPECIES_ORICORIO_POM_POM] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ORICORIO_POM_POM]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -23878,7 +23878,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM06_TOXIC)), - [SPECIES_ORICORIO_PAU] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ORICORIO_PAU]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -23895,7 +23895,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM06_TOXIC)), - [SPECIES_ORICORIO_SENSU] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ORICORIO_SENSU]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -23912,7 +23912,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM06_TOXIC)), - [SPECIES_ROCKRUFF_OWN_TEMPO] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_ROCKRUFF_OWN_TEMPO]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) | TMHM(TM21_FRUSTRATION) @@ -23926,7 +23926,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM06_TOXIC)), - [SPECIES_LYCANROC_MIDNIGHT] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_LYCANROC_MIDNIGHT]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM08_BULK_UP) | TMHM(TM32_DOUBLE_TEAM) @@ -23942,7 +23942,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM06_TOXIC)), - [SPECIES_LYCANROC_DUSK] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_LYCANROC_DUSK]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM08_BULK_UP) | TMHM(TM32_DOUBLE_TEAM) @@ -23958,7 +23958,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_FIGHTING] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_FIGHTING]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -23981,7 +23981,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_FLYING] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_FLYING]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24004,7 +24004,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_POISON] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_POISON]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24027,7 +24027,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_GROUND] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_GROUND]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24050,7 +24050,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_ROCK] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_ROCK]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24073,7 +24073,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_BUG] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_BUG]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24096,7 +24096,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_GHOST] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_GHOST]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24119,7 +24119,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_STEEL] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_STEEL]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24142,7 +24142,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_FIRE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_FIRE]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24165,7 +24165,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_WATER] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_WATER]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24188,7 +24188,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_GRASS] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_GRASS]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24211,7 +24211,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_ELECTRIC] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_ELECTRIC]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24234,7 +24234,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_PSYCHIC] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_PSYCHIC]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24257,7 +24257,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_ICE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_ICE]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24280,7 +24280,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_DRAGON] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_DRAGON]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24303,7 +24303,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_DARK] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_DARK]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24326,7 +24326,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_FAIRY] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_FAIRY]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24349,7 +24349,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_MINIOR_CORE_RED] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_MINIOR_CORE_RED]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM26_EARTHQUAKE) @@ -24369,7 +24369,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM22_SOLARBEAM) | TMHM(TM06_TOXIC)), - [SPECIES_MINIOR_CORE_ORANGE] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_MINIOR_CORE_ORANGE]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM26_EARTHQUAKE) @@ -24389,7 +24389,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM22_SOLARBEAM) | TMHM(TM06_TOXIC)), - [SPECIES_MINIOR_CORE_YELLOW] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_MINIOR_CORE_YELLOW]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM26_EARTHQUAKE) @@ -24409,7 +24409,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM22_SOLARBEAM) | TMHM(TM06_TOXIC)), - [SPECIES_MINIOR_CORE_GREEN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_MINIOR_CORE_GREEN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM26_EARTHQUAKE) @@ -24429,7 +24429,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM22_SOLARBEAM) | TMHM(TM06_TOXIC)), - [SPECIES_MINIOR_CORE_BLUE] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_MINIOR_CORE_BLUE]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM26_EARTHQUAKE) @@ -24449,7 +24449,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM22_SOLARBEAM) | TMHM(TM06_TOXIC)), - [SPECIES_MINIOR_CORE_INDIGO] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_MINIOR_CORE_INDIGO]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM26_EARTHQUAKE) @@ -24469,7 +24469,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM22_SOLARBEAM) | TMHM(TM06_TOXIC)), - [SPECIES_MINIOR_CORE_VIOLET] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_MINIOR_CORE_VIOLET]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM26_EARTHQUAKE) @@ -24489,7 +24489,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM22_SOLARBEAM) | TMHM(TM06_TOXIC)), - [SPECIES_NECROZMA_DUSK_MANE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_NECROZMA_DUSK_MANE]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM31_BRICK_BREAK) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -24510,7 +24510,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_NECROZMA_DAWN_WINGS] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_NECROZMA_DAWN_WINGS]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM31_BRICK_BREAK) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -24531,7 +24531,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_MAGEARNA_ORIGINAL_COLOR] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_MAGEARNA_ORIGINAL_COLOR]= TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM21_FRUSTRATION) From e62f53b13e2d9031887587da81dc025d6f53cfed Mon Sep 17 00:00:00 2001 From: amiosi <44352097+amiosi@users.noreply.github.com> Date: Tue, 2 Feb 2021 15:18:45 -0500 Subject: [PATCH 08/15] fix spacing i missed on tutors and expand to all species plus reorder kyurem forms to match the rest of the repo --- src/data/pokemon/tutor_learnsets.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/data/pokemon/tutor_learnsets.h b/src/data/pokemon/tutor_learnsets.h index f450b206e3..88b70e1899 100644 --- a/src/data/pokemon/tutor_learnsets.h +++ b/src/data/pokemon/tutor_learnsets.h @@ -6438,7 +6438,7 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SUBSTITUTE) | TUTOR(MOVE_SWAGGER)), - [SPECIES_MIME_JR] = TUTOR_LEARNSET(TUTOR(MOVE_DREAM_EATER) + [SPECIES_MIME_JR] = TUTOR_LEARNSET(TUTOR(MOVE_DREAM_EATER) | TUTOR(MOVE_ENDURE) | TUTOR(MOVE_ICY_WIND) | TUTOR(MOVE_MIMIC) @@ -10371,9 +10371,9 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SUBSTITUTE) | TUTOR(MOVE_THUNDER_WAVE)), - [SPECIES_BURMY_SANDY_CLOAK] = TUTOR_LEARNSET(TUTOR(MOVE_SNORE)), + [SPECIES_BURMY_SANDY_CLOAK]= TUTOR_LEARNSET(TUTOR(MOVE_SNORE)), - [SPECIES_BURMY_TRASH_CLOAK] = TUTOR_LEARNSET(TUTOR(MOVE_SNORE)), + [SPECIES_BURMY_TRASH_CLOAK]= TUTOR_LEARNSET(TUTOR(MOVE_SNORE)), [SPECIES_WORMADAM_SANDY_CLOAK]= TUTOR_LEARNSET(TUTOR(MOVE_DREAM_EATER) | TUTOR(MOVE_ENDURE) @@ -10448,13 +10448,6 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SWIFT) | TUTOR(MOVE_THUNDER_WAVE)), - [SPECIES_KYUREM_BLACK] = TUTOR_LEARNSET(TUTOR(MOVE_ICY_WIND) - | TUTOR(MOVE_ROCK_SLIDE) - | TUTOR(MOVE_SLEEP_TALK) - | TUTOR(MOVE_SNORE) - | TUTOR(MOVE_SUBSTITUTE) - | TUTOR(MOVE_SWAGGER)), - [SPECIES_KYUREM_WHITE] = TUTOR_LEARNSET(TUTOR(MOVE_ICY_WIND) | TUTOR(MOVE_ROCK_SLIDE) | TUTOR(MOVE_SLEEP_TALK) @@ -10462,7 +10455,14 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SUBSTITUTE) | TUTOR(MOVE_SWAGGER)), - [SPECIES_MEOWSTIC_FEMALE] = TUTOR_LEARNSET(TUTOR(MOVE_DREAM_EATER) + [SPECIES_KYUREM_BLACK] = TUTOR_LEARNSET(TUTOR(MOVE_ICY_WIND) + | TUTOR(MOVE_ROCK_SLIDE) + | TUTOR(MOVE_SLEEP_TALK) + | TUTOR(MOVE_SNORE) + | TUTOR(MOVE_SUBSTITUTE) + | TUTOR(MOVE_SWAGGER)), + + [SPECIES_MEOWSTIC_FEMALE]= TUTOR_LEARNSET(TUTOR(MOVE_DREAM_EATER) | TUTOR(MOVE_PSYCH_UP) | TUTOR(MOVE_SLEEP_TALK) | TUTOR(MOVE_SNORE) From 2cba017699cb4000795df73421eb22ad6d5b572f Mon Sep 17 00:00:00 2001 From: amiosi <44352097+amiosi@users.noreply.github.com> Date: Wed, 3 Feb 2021 12:50:54 -0500 Subject: [PATCH 09/15] cry renames --- sound/cry_tables.inc | 22 +++++++------- sound/direct_sound_data.inc | 28 +++++++++--------- .../cries/{mimejr.aif => mime_jr.aif} | Bin .../cries/{porygonZ.aif => porygon_z.aif} | Bin ...corio_pa_u.aif => uncomp_oricorio_pau.aif} | Bin 5 files changed, 25 insertions(+), 25 deletions(-) rename sound/direct_sound_samples/cries/{mimejr.aif => mime_jr.aif} (100%) rename sound/direct_sound_samples/cries/{porygonZ.aif => porygon_z.aif} (100%) rename sound/direct_sound_samples/cries/{uncomp_oricorio_pa_u.aif => uncomp_oricorio_pau.aif} (100%) diff --git a/sound/cry_tables.inc b/sound/cry_tables.inc index 6e84fc737c..842094e3fb 100644 --- a/sound/cry_tables.inc +++ b/sound/cry_tables.inc @@ -29,10 +29,10 @@ gCryTable:: @ 869DCF4 cry Cry_Raichu @ 869DE20 cry Cry_Sandshrew @ 869DE2C cry Cry_Sandslash @ 869DE38 - cry Cry_NidoranF @ 869DE44 + cry Cry_Nidoran_F @ 869DE44 cry Cry_Nidorina @ 869DE50 cry Cry_Nidoqueen @ 869DE5C - cry Cry_NidoranM @ 869DE68 + cry Cry_Nidoran_M @ 869DE68 cry Cry_Nidorino @ 869DE74 cry Cry_Nidoking @ 869DE80 cry Cry_Clefairy @ 869DE8C @@ -122,7 +122,7 @@ gCryTable:: @ 869DCF4 cry Cry_Seaking @ 869E27C cry Cry_Staryu @ 869E288 cry Cry_Starmie @ 869E294 - cry Cry_MrMime @ 869E2A0 + cry Cry_Mr_Mime @ 869E2A0 cry Cry_Scyther @ 869E2AC cry Cry_Jynx @ 869E2B8 cry Cry_Electabuzz @ 869E2C4 @@ -439,7 +439,7 @@ gCryTable:: @ 869DCF4 cry Cry_Bronzor cry Cry_Bronzong cry Cry_Bonsly - cry Cry_Mimejr + cry Cry_Mime_Jr cry Cry_Happiny cry Cry_Chatot cry Cry_Spiritomb @@ -785,10 +785,10 @@ gCryTable:: @ 869DCF4 cry_uncomp Cry_Jangmo_o cry_uncomp Cry_Hakamo_o cry_uncomp Cry_Kommo_o - cry_uncomp Cry_Tapu_koko - cry_uncomp Cry_Tapu_lele - cry_uncomp Cry_Tapu_bulu - cry_uncomp Cry_Tapu_fini + cry_uncomp Cry_Tapu_Koko + cry_uncomp Cry_Tapu_Lele + cry_uncomp Cry_Tapu_Bulu + cry_uncomp Cry_Tapu_Fini cry_uncomp Cry_Cosmog cry_uncomp Cry_Cosmoem cry_uncomp Cry_Solgaleo @@ -1186,7 +1186,7 @@ gCryTable:: @ 869DCF4 cry_uncomp Cry_Hoopa_Unbound @ Oricorio cry_uncomp Cry_Oricorio_Pom_Pom - cry_uncomp Cry_Oricorio_Pa_u + cry_uncomp Cry_Oricorio_Pau cry_uncomp Cry_Oricorio_Sensu @ Rockruff cry_uncomp Cry_Rockruff @@ -1748,7 +1748,7 @@ gCryTable2:: @ 869EF24 cry2 Cry_Glaceon cry2 Cry_Gliscor cry2 Cry_Mamoswine - cry2 Cry_PorygonZ + cry2 Cry_Porygon_Z cry2 Cry_Gallade cry2 Cry_Probopass cry2 Cry_Dusknoir @@ -2140,7 +2140,7 @@ gCryTable2:: @ 869EF24 cry2_uncomp Cry_Perrserker cry2_uncomp Cry_Cursola cry2_uncomp Cry_Sirfetchd - cry2_uncomp Cry_MrRime + cry2_uncomp Cry_Mr_Rime cry2_uncomp Cry_Runerigus cry2_uncomp Cry_Milcery cry2_uncomp Cry_Alcremie diff --git a/sound/direct_sound_data.inc b/sound/direct_sound_data.inc index 7e68260858..4985c744e3 100644 --- a/sound/direct_sound_data.inc +++ b/sound/direct_sound_data.inc @@ -499,7 +499,7 @@ Cry_Sandslash:: .incbin "sound/direct_sound_samples/cries/sandslash.bin" .align 2 -Cry_NidoranF:: +Cry_Nidoran_F:: .incbin "sound/direct_sound_samples/cries/nidoran_f.bin" .align 2 @@ -511,7 +511,7 @@ Cry_Nidoqueen:: .incbin "sound/direct_sound_samples/cries/nidoqueen.bin" .align 2 -Cry_NidoranM:: +Cry_Nidoran_M:: .incbin "sound/direct_sound_samples/cries/nidoran_m.bin" .align 2 @@ -871,7 +871,7 @@ Cry_Starmie:: .incbin "sound/direct_sound_samples/cries/starmie.bin" .align 2 -Cry_MrMime:: +Cry_Mr_Mime:: .incbin "sound/direct_sound_samples/cries/mr_mime.bin" .align 2 @@ -2139,8 +2139,8 @@ Cry_Bonsly:: .incbin "sound/direct_sound_samples/cries/bonsly.bin" .align 2 -Cry_Mimejr:: - .incbin "sound/direct_sound_samples/cries/mimejr.bin" +Cry_Mime_Jr:: + .incbin "sound/direct_sound_samples/cries/mime_jr.bin" .align 2 Cry_Happiny:: @@ -2279,8 +2279,8 @@ Cry_Mamoswine:: .incbin "sound/direct_sound_samples/cries/mamoswine.bin" .align 2 -Cry_PorygonZ:: - .incbin "sound/direct_sound_samples/cries/porygonZ.bin" +Cry_Porygon_Z:: + .incbin "sound/direct_sound_samples/cries/porygon_z.bin" .align 2 Cry_Gallade:: @@ -3523,19 +3523,19 @@ Cry_Kommo_o:: .incbin "sound/direct_sound_samples/cries/uncomp_kommo_o.bin" .align 2 -Cry_Tapu_koko:: +Cry_Tapu_Koko:: .incbin "sound/direct_sound_samples/cries/uncomp_tapu_koko.bin" .align 2 -Cry_Tapu_lele:: +Cry_Tapu_Lele:: .incbin "sound/direct_sound_samples/cries/uncomp_tapu_lele.bin" .align 2 -Cry_Tapu_bulu:: +Cry_Tapu_Bulu:: .incbin "sound/direct_sound_samples/cries/uncomp_tapu_bulu.bin" .align 2 -Cry_Tapu_fini:: +Cry_Tapu_Fini:: .incbin "sound/direct_sound_samples/cries/uncomp_tapu_fini.bin" .align 2 @@ -3847,7 +3847,7 @@ Cry_Sirfetchd:: .incbin "sound/direct_sound_samples/cries/uncomp_sirfetchd.bin" .align 2 -Cry_MrRime:: +Cry_Mr_Rime:: .incbin "sound/direct_sound_samples/cries/uncomp_mr_rime.bin" .align 2 @@ -4235,8 +4235,8 @@ Cry_Oricorio_Pom_Pom:: .incbin "sound/direct_sound_samples/cries/uncomp_oricorio_pom_pom.bin" .align 2 -Cry_Oricorio_Pa_u:: - .incbin "sound/direct_sound_samples/cries/uncomp_oricorio_pa_u.bin" +Cry_Oricorio_Pau:: + .incbin "sound/direct_sound_samples/cries/uncomp_oricorio_pau.bin" .align 2 Cry_Oricorio_Sensu:: diff --git a/sound/direct_sound_samples/cries/mimejr.aif b/sound/direct_sound_samples/cries/mime_jr.aif similarity index 100% rename from sound/direct_sound_samples/cries/mimejr.aif rename to sound/direct_sound_samples/cries/mime_jr.aif diff --git a/sound/direct_sound_samples/cries/porygonZ.aif b/sound/direct_sound_samples/cries/porygon_z.aif similarity index 100% rename from sound/direct_sound_samples/cries/porygonZ.aif rename to sound/direct_sound_samples/cries/porygon_z.aif diff --git a/sound/direct_sound_samples/cries/uncomp_oricorio_pa_u.aif b/sound/direct_sound_samples/cries/uncomp_oricorio_pau.aif similarity index 100% rename from sound/direct_sound_samples/cries/uncomp_oricorio_pa_u.aif rename to sound/direct_sound_samples/cries/uncomp_oricorio_pau.aif From 418da6158b2cd3069841fd4570e563bc83518351 Mon Sep 17 00:00:00 2001 From: amiosi <44352097+amiosi@users.noreply.github.com> Date: Wed, 3 Feb 2021 12:57:56 -0500 Subject: [PATCH 10/15] last of the cries --- sound/cry_tables.inc | 26 +++++++++++++------------- src/data/graphics/pokemon.h | 8 ++++---- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/sound/cry_tables.inc b/sound/cry_tables.inc index 842094e3fb..d105846046 100644 --- a/sound/cry_tables.inc +++ b/sound/cry_tables.inc @@ -474,7 +474,7 @@ gCryTable:: @ 869DCF4 cry Cry_Glaceon cry Cry_Gliscor cry Cry_Mamoswine - cry Cry_PorygonZ + cry Cry_Porygon_Z cry Cry_Gallade cry Cry_Probopass cry Cry_Dusknoir @@ -866,7 +866,7 @@ gCryTable:: @ 869DCF4 cry_uncomp Cry_Perrserker cry_uncomp Cry_Cursola cry_uncomp Cry_Sirfetchd - cry_uncomp Cry_MrRime + cry_uncomp Cry_Mr_Rime cry_uncomp Cry_Runerigus cry_uncomp Cry_Milcery cry_uncomp Cry_Alcremie @@ -978,7 +978,7 @@ gCryTable:: @ 869DCF4 cry Cry_Slowbro cry Cry_Farfetchd cry Cry_Weezing - cry Cry_MrMime + cry Cry_Mr_Mime cry Cry_Articuno cry Cry_Zapdos cry Cry_Moltres @@ -1303,10 +1303,10 @@ gCryTable2:: @ 869EF24 cry2 Cry_Raichu @ 869F050 cry2 Cry_Sandshrew @ 869F05C cry2 Cry_Sandslash @ 869F068 - cry2 Cry_NidoranF @ 869F074 + cry2 Cry_Nidoran_F @ 869F074 cry2 Cry_Nidorina @ 869F080 cry2 Cry_Nidoqueen @ 869F08C - cry2 Cry_NidoranM @ 869F098 + cry2 Cry_Nidoran_M @ 869F098 cry2 Cry_Nidorino @ 869F0A4 cry2 Cry_Nidoking @ 869F0B0 cry2 Cry_Clefairy @ 869F0BC @@ -1396,7 +1396,7 @@ gCryTable2:: @ 869EF24 cry2 Cry_Seaking @ 869F4AC cry2 Cry_Staryu @ 869F4B8 cry2 Cry_Starmie @ 869F4C4 - cry2 Cry_MrMime @ 869F4D0 + cry2 Cry_Mr_Mime @ 869F4D0 cry2 Cry_Scyther @ 869F4DC cry2 Cry_Jynx @ 869F4E8 cry2 Cry_Electabuzz @ 869F4F4 @@ -1713,7 +1713,7 @@ gCryTable2:: @ 869EF24 cry2 Cry_Bronzor cry2 Cry_Bronzong cry2 Cry_Bonsly - cry2 Cry_Mimejr + cry2 Cry_Mime_Jr cry2 Cry_Happiny cry2 Cry_Chatot cry2 Cry_Spiritomb @@ -2059,10 +2059,10 @@ gCryTable2:: @ 869EF24 cry2_uncomp Cry_Jangmo_o cry2_uncomp Cry_Hakamo_o cry2_uncomp Cry_Kommo_o - cry2_uncomp Cry_Tapu_koko - cry2_uncomp Cry_Tapu_lele - cry2_uncomp Cry_Tapu_bulu - cry2_uncomp Cry_Tapu_fini + cry2_uncomp Cry_Tapu_Koko + cry2_uncomp Cry_Tapu_Lele + cry2_uncomp Cry_Tapu_Bulu + cry2_uncomp Cry_Tapu_Fini cry2_uncomp Cry_Cosmog cry2_uncomp Cry_Cosmoem cry2_uncomp Cry_Solgaleo @@ -2252,7 +2252,7 @@ gCryTable2:: @ 869EF24 cry2 Cry_Slowbro cry2 Cry_Farfetchd cry2 Cry_Weezing - cry2 Cry_MrMime + cry2 Cry_Mr_Mime cry2 Cry_Articuno cry2 Cry_Zapdos cry2 Cry_Moltres @@ -2460,7 +2460,7 @@ gCryTable2:: @ 869EF24 cry2_uncomp Cry_Hoopa_Unbound @ Oricorio cry2_uncomp Cry_Oricorio_Pom_Pom - cry2_uncomp Cry_Oricorio_Pa_u + cry2_uncomp Cry_Oricorio_Pau cry2_uncomp Cry_Oricorio_Sensu @ Rockruff cry2_uncomp Cry_Rockruff diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 9ede202856..b93000cfe0 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -866,7 +866,7 @@ const u32 gMonFrontPic_Obstagoon[] = INCBIN_U32("graphics/pokemon/obstagoon/fron const u32 gMonFrontPic_Perrserker[] = INCBIN_U32("graphics/pokemon/perrserker/front.4bpp.lz"); const u32 gMonFrontPic_Cursola[] = INCBIN_U32("graphics/pokemon/cursola/front.4bpp.lz"); const u32 gMonFrontPic_Sirfetchd[] = INCBIN_U32("graphics/pokemon/sirfetchd/front.4bpp.lz"); -const u32 gMonFrontPic_MrRime[] = INCBIN_U32("graphics/pokemon/mr_rime/front.4bpp.lz"); +const u32 gMonFrontPic_Mr_Rime[] = INCBIN_U32("graphics/pokemon/mr_rime/front.4bpp.lz"); const u32 gMonFrontPic_Runerigus[] = INCBIN_U32("graphics/pokemon/runerigus/front.4bpp.lz"); const u32 gMonFrontPic_Milcery[] = INCBIN_U32("graphics/pokemon/milcery/front.4bpp.lz"); const u32 gMonFrontPic_Alcremie[] = INCBIN_U32("graphics/pokemon/alcremie/front.4bpp.lz"); @@ -2006,7 +2006,7 @@ const u32 gMonBackPic_Obstagoon[] = INCBIN_U32("graphics/pokemon/obstagoon/back. const u32 gMonBackPic_Perrserker[] = INCBIN_U32("graphics/pokemon/perrserker/back.4bpp.lz"); const u32 gMonBackPic_Cursola[] = INCBIN_U32("graphics/pokemon/cursola/back.4bpp.lz"); const u32 gMonBackPic_Sirfetchd[] = INCBIN_U32("graphics/pokemon/sirfetchd/back.4bpp.lz"); -const u32 gMonBackPic_MrRime[] = INCBIN_U32("graphics/pokemon/mr_rime/back.4bpp.lz"); +const u32 gMonBackPic_Mr_Rime[] = INCBIN_U32("graphics/pokemon/mr_rime/back.4bpp.lz"); const u32 gMonBackPic_Runerigus[] = INCBIN_U32("graphics/pokemon/runerigus/back.4bpp.lz"); const u32 gMonBackPic_Milcery[] = INCBIN_U32("graphics/pokemon/milcery/back.4bpp.lz"); const u32 gMonBackPic_Alcremie[] = INCBIN_U32("graphics/pokemon/alcremie/back.4bpp.lz"); @@ -3144,7 +3144,7 @@ const u32 gMonPalette_Obstagoon[] = INCBIN_U32("graphics/pokemon/obstagoon/norma const u32 gMonPalette_Perrserker[] = INCBIN_U32("graphics/pokemon/perrserker/normal.gbapal.lz"); const u32 gMonPalette_Cursola[] = INCBIN_U32("graphics/pokemon/cursola/normal.gbapal.lz"); const u32 gMonPalette_Sirfetchd[] = INCBIN_U32("graphics/pokemon/sirfetchd/normal.gbapal.lz"); -const u32 gMonPalette_MrRime[] = INCBIN_U32("graphics/pokemon/mr_rime/normal.gbapal.lz"); +const u32 gMonPalette_Mr_Rime[] = INCBIN_U32("graphics/pokemon/mr_rime/normal.gbapal.lz"); const u32 gMonPalette_Runerigus[] = INCBIN_U32("graphics/pokemon/runerigus/normal.gbapal.lz"); const u32 gMonPalette_Milcery[] = INCBIN_U32("graphics/pokemon/milcery/normal.gbapal.lz"); const u32 gMonPalette_Alcremie[] = INCBIN_U32("graphics/pokemon/alcremie/normal.gbapal.lz"); @@ -4309,7 +4309,7 @@ const u32 gMonShinyPalette_Obstagoon[] = INCBIN_U32("graphics/pokemon/obstagoon/ const u32 gMonShinyPalette_Perrserker[] = INCBIN_U32("graphics/pokemon/perrserker/shiny.gbapal.lz"); const u32 gMonShinyPalette_Cursola[] = INCBIN_U32("graphics/pokemon/cursola/shiny.gbapal.lz"); const u32 gMonShinyPalette_Sirfetchd[] = INCBIN_U32("graphics/pokemon/sirfetchd/shiny.gbapal.lz"); -const u32 gMonShinyPalette_MrRime[] = INCBIN_U32("graphics/pokemon/mr_rime/shiny.gbapal.lz"); +const u32 gMonShinyPalette_Mr_Rime[] = INCBIN_U32("graphics/pokemon/mr_rime/shiny.gbapal.lz"); const u32 gMonShinyPalette_Runerigus[] = INCBIN_U32("graphics/pokemon/runerigus/shiny.gbapal.lz"); const u32 gMonShinyPalette_Milcery[] = INCBIN_U32("graphics/pokemon/milcery/shiny.gbapal.lz"); const u32 gMonShinyPalette_Alcremie[] = INCBIN_U32("graphics/pokemon/alcremie/shiny.gbapal.lz"); From 663cc5b15c579a76f5012e782c395b75bd904473 Mon Sep 17 00:00:00 2001 From: amiosi <44352097+amiosi@users.noreply.github.com> Date: Wed, 3 Feb 2021 13:02:13 -0500 Subject: [PATCH 11/15] oricorio... --- include/constants/species.h | 2 +- src/data/pokemon_graphics/back_pic_coordinates.h | 2 +- src/data/pokemon_graphics/front_pic_anims.h | 2 +- src/data/pokemon_graphics/front_pic_coordinates.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/constants/species.h b/include/constants/species.h index d73e2a5dbb..5a410aa5b0 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -1232,7 +1232,7 @@ // Oricorio #define SPECIES_ORICORIO_POM_POM FORMS_START + 244 -#define SPECIES_ORICORIO_PA_U FORMS_START + 245 +#define SPECIES_ORICORIO_PAU FORMS_START + 245 #define SPECIES_ORICORIO_SENSU FORMS_START + 246 // Rockruff diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index 540b44a122..1770255c27 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -5758,7 +5758,7 @@ const struct MonCoords gMonBackPicCoords[] = .size = 0x88, .y_offset = 0, }, - [SPECIES_ORICORIO_PA_U] = + [SPECIES_ORICORIO_PAU] = { .size = 0x88, .y_offset = 0, diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index b1847466de..421c830df9 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -15559,7 +15559,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD(ZYGARDE_COMPLETE), ANIM_CMD(HOOPA_UNBOUND), ANIM_CMD_FULL(ORICORIO_POM_POM, sAnims_ORICORIO), - ANIM_CMD_FULL(ORICORIO_PA_U, sAnims_ORICORIO), + ANIM_CMD_FULL(ORICORIO_PAU, sAnims_ORICORIO), ANIM_CMD_FULL(ORICORIO_SENSU, sAnims_ORICORIO), ANIM_CMD_FULL(ROCKRUFF_OWN_TEMPO, sAnims_ROCKRUFF), ANIM_CMD(LYCANROC_MIDNIGHT), diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index c3ad1ac453..56632aa435 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -5759,7 +5759,7 @@ const struct MonCoords gMonFrontPicCoords[] = .size = 0x45, .y_offset = 2, }, - [SPECIES_ORICORIO_PA_U] = + [SPECIES_ORICORIO_PAU] = { .size = 0x45, .y_offset = 2, From b84f952f329bed564cfa6e78a6614827c6955c72 Mon Sep 17 00:00:00 2001 From: amiosi <44352097+amiosi@users.noreply.github.com> Date: Wed, 3 Feb 2021 13:09:09 -0500 Subject: [PATCH 12/15] mistaken MrRime change --- src/data/graphics/pokemon.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index b93000cfe0..9ede202856 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -866,7 +866,7 @@ const u32 gMonFrontPic_Obstagoon[] = INCBIN_U32("graphics/pokemon/obstagoon/fron const u32 gMonFrontPic_Perrserker[] = INCBIN_U32("graphics/pokemon/perrserker/front.4bpp.lz"); const u32 gMonFrontPic_Cursola[] = INCBIN_U32("graphics/pokemon/cursola/front.4bpp.lz"); const u32 gMonFrontPic_Sirfetchd[] = INCBIN_U32("graphics/pokemon/sirfetchd/front.4bpp.lz"); -const u32 gMonFrontPic_Mr_Rime[] = INCBIN_U32("graphics/pokemon/mr_rime/front.4bpp.lz"); +const u32 gMonFrontPic_MrRime[] = INCBIN_U32("graphics/pokemon/mr_rime/front.4bpp.lz"); const u32 gMonFrontPic_Runerigus[] = INCBIN_U32("graphics/pokemon/runerigus/front.4bpp.lz"); const u32 gMonFrontPic_Milcery[] = INCBIN_U32("graphics/pokemon/milcery/front.4bpp.lz"); const u32 gMonFrontPic_Alcremie[] = INCBIN_U32("graphics/pokemon/alcremie/front.4bpp.lz"); @@ -2006,7 +2006,7 @@ const u32 gMonBackPic_Obstagoon[] = INCBIN_U32("graphics/pokemon/obstagoon/back. const u32 gMonBackPic_Perrserker[] = INCBIN_U32("graphics/pokemon/perrserker/back.4bpp.lz"); const u32 gMonBackPic_Cursola[] = INCBIN_U32("graphics/pokemon/cursola/back.4bpp.lz"); const u32 gMonBackPic_Sirfetchd[] = INCBIN_U32("graphics/pokemon/sirfetchd/back.4bpp.lz"); -const u32 gMonBackPic_Mr_Rime[] = INCBIN_U32("graphics/pokemon/mr_rime/back.4bpp.lz"); +const u32 gMonBackPic_MrRime[] = INCBIN_U32("graphics/pokemon/mr_rime/back.4bpp.lz"); const u32 gMonBackPic_Runerigus[] = INCBIN_U32("graphics/pokemon/runerigus/back.4bpp.lz"); const u32 gMonBackPic_Milcery[] = INCBIN_U32("graphics/pokemon/milcery/back.4bpp.lz"); const u32 gMonBackPic_Alcremie[] = INCBIN_U32("graphics/pokemon/alcremie/back.4bpp.lz"); @@ -3144,7 +3144,7 @@ const u32 gMonPalette_Obstagoon[] = INCBIN_U32("graphics/pokemon/obstagoon/norma const u32 gMonPalette_Perrserker[] = INCBIN_U32("graphics/pokemon/perrserker/normal.gbapal.lz"); const u32 gMonPalette_Cursola[] = INCBIN_U32("graphics/pokemon/cursola/normal.gbapal.lz"); const u32 gMonPalette_Sirfetchd[] = INCBIN_U32("graphics/pokemon/sirfetchd/normal.gbapal.lz"); -const u32 gMonPalette_Mr_Rime[] = INCBIN_U32("graphics/pokemon/mr_rime/normal.gbapal.lz"); +const u32 gMonPalette_MrRime[] = INCBIN_U32("graphics/pokemon/mr_rime/normal.gbapal.lz"); const u32 gMonPalette_Runerigus[] = INCBIN_U32("graphics/pokemon/runerigus/normal.gbapal.lz"); const u32 gMonPalette_Milcery[] = INCBIN_U32("graphics/pokemon/milcery/normal.gbapal.lz"); const u32 gMonPalette_Alcremie[] = INCBIN_U32("graphics/pokemon/alcremie/normal.gbapal.lz"); @@ -4309,7 +4309,7 @@ const u32 gMonShinyPalette_Obstagoon[] = INCBIN_U32("graphics/pokemon/obstagoon/ const u32 gMonShinyPalette_Perrserker[] = INCBIN_U32("graphics/pokemon/perrserker/shiny.gbapal.lz"); const u32 gMonShinyPalette_Cursola[] = INCBIN_U32("graphics/pokemon/cursola/shiny.gbapal.lz"); const u32 gMonShinyPalette_Sirfetchd[] = INCBIN_U32("graphics/pokemon/sirfetchd/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Mr_Rime[] = INCBIN_U32("graphics/pokemon/mr_rime/shiny.gbapal.lz"); +const u32 gMonShinyPalette_MrRime[] = INCBIN_U32("graphics/pokemon/mr_rime/shiny.gbapal.lz"); const u32 gMonShinyPalette_Runerigus[] = INCBIN_U32("graphics/pokemon/runerigus/shiny.gbapal.lz"); const u32 gMonShinyPalette_Milcery[] = INCBIN_U32("graphics/pokemon/milcery/shiny.gbapal.lz"); const u32 gMonShinyPalette_Alcremie[] = INCBIN_U32("graphics/pokemon/alcremie/shiny.gbapal.lz"); From 762dcb8a7c01e83d2c234dec764ca072fbe5f267 Mon Sep 17 00:00:00 2001 From: amiosi <44352097+amiosi@users.noreply.github.com> Date: Wed, 3 Feb 2021 14:10:39 -0500 Subject: [PATCH 13/15] cry fixes, type null --- include/graphics.h | 10 +- sound/cry_tables.inc | 392 +++++++++--------- sound/direct_sound_data.inc | 192 ++++----- src/data/graphics/pokemon.h | 10 +- src/data/pokemon_graphics/back_pic_table.h | 2 +- src/data/pokemon_graphics/front_pic_table.h | 2 +- src/data/pokemon_graphics/palette_table.h | 2 +- .../pokemon_graphics/shiny_palette_table.h | 2 +- src/pokemon_icon.c | 2 +- 9 files changed, 307 insertions(+), 307 deletions(-) diff --git a/include/graphics.h b/include/graphics.h index 4db865ce1b..898199713f 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -809,7 +809,7 @@ extern const u32 gMonFrontPic_Golisopod[]; extern const u32 gMonFrontPic_Sandygast[]; extern const u32 gMonFrontPic_Palossand[]; extern const u32 gMonFrontPic_Pyukumuku[]; -extern const u32 gMonFrontPic_Type_null[]; +extern const u32 gMonFrontPic_TypeNull[]; extern const u32 gMonFrontPic_Silvally[]; extern const u32 gMonFrontPic_Minior[]; extern const u32 gMonFrontPic_Komala[]; @@ -1949,7 +1949,7 @@ extern const u32 gMonBackPic_Golisopod[]; extern const u32 gMonBackPic_Sandygast[]; extern const u32 gMonBackPic_Palossand[]; extern const u32 gMonBackPic_Pyukumuku[]; -extern const u32 gMonBackPic_Type_null[]; +extern const u32 gMonBackPic_TypeNull[]; extern const u32 gMonBackPic_Silvally[]; extern const u32 gMonBackPic_Minior[]; extern const u32 gMonBackPic_Komala[]; @@ -3087,7 +3087,7 @@ extern const u32 gMonPalette_Golisopod[]; extern const u32 gMonPalette_Sandygast[]; extern const u32 gMonPalette_Palossand[]; extern const u32 gMonPalette_Pyukumuku[]; -extern const u32 gMonPalette_Type_null[]; +extern const u32 gMonPalette_TypeNull[]; extern const u32 gMonPalette_Silvally[]; extern const u32 gMonPalette_Minior[]; extern const u32 gMonPalette_Komala[]; @@ -4252,7 +4252,7 @@ extern const u32 gMonShinyPalette_Golisopod[]; extern const u32 gMonShinyPalette_Sandygast[]; extern const u32 gMonShinyPalette_Palossand[]; extern const u32 gMonShinyPalette_Pyukumuku[]; -extern const u32 gMonShinyPalette_Type_null[]; +extern const u32 gMonShinyPalette_TypeNull[]; extern const u32 gMonShinyPalette_Silvally[]; extern const u32 gMonShinyPalette_Minior[]; extern const u32 gMonShinyPalette_Komala[]; @@ -5409,7 +5409,7 @@ extern const u8 gMonIcon_Golisopod[]; extern const u8 gMonIcon_Sandygast[]; extern const u8 gMonIcon_Palossand[]; extern const u8 gMonIcon_Pyukumuku[]; -extern const u8 gMonIcon_Type_null[]; +extern const u8 gMonIcon_TypeNull[]; extern const u8 gMonIcon_Silvally[]; extern const u8 gMonIcon_Minior[]; extern const u8 gMonIcon_Komala[]; diff --git a/sound/cry_tables.inc b/sound/cry_tables.inc index d105846046..2eb578d646 100644 --- a/sound/cry_tables.inc +++ b/sound/cry_tables.inc @@ -29,10 +29,10 @@ gCryTable:: @ 869DCF4 cry Cry_Raichu @ 869DE20 cry Cry_Sandshrew @ 869DE2C cry Cry_Sandslash @ 869DE38 - cry Cry_Nidoran_F @ 869DE44 + cry Cry_NidoranF @ 869DE44 cry Cry_Nidorina @ 869DE50 cry Cry_Nidoqueen @ 869DE5C - cry Cry_Nidoran_M @ 869DE68 + cry Cry_NidoranM @ 869DE68 cry Cry_Nidorino @ 869DE74 cry Cry_Nidoking @ 869DE80 cry Cry_Clefairy @ 869DE8C @@ -122,7 +122,7 @@ gCryTable:: @ 869DCF4 cry Cry_Seaking @ 869E27C cry Cry_Staryu @ 869E288 cry Cry_Starmie @ 869E294 - cry Cry_Mr_Mime @ 869E2A0 + cry Cry_MrMime @ 869E2A0 cry Cry_Scyther @ 869E2AC cry Cry_Jynx @ 869E2B8 cry Cry_Electabuzz @ 869E2C4 @@ -439,7 +439,7 @@ gCryTable:: @ 869DCF4 cry Cry_Bronzor cry Cry_Bronzong cry Cry_Bonsly - cry Cry_Mime_Jr + cry Cry_MimeJr cry Cry_Happiny cry Cry_Chatot cry Cry_Spiritomb @@ -474,7 +474,7 @@ gCryTable:: @ 869DCF4 cry Cry_Glaceon cry Cry_Gliscor cry Cry_Mamoswine - cry Cry_Porygon_Z + cry Cry_PorygonZ cry Cry_Gallade cry Cry_Probopass cry Cry_Dusknoir @@ -772,7 +772,7 @@ gCryTable:: @ 869DCF4 cry_uncomp Cry_Sandygast cry_uncomp Cry_Palossand cry_uncomp Cry_Pyukumuku - cry_uncomp Cry_Type_null + cry_uncomp Cry_TypeNull cry_uncomp Cry_Silvally cry_uncomp Cry_Minior cry_uncomp Cry_Komala @@ -782,13 +782,13 @@ gCryTable:: @ 869DCF4 cry_uncomp Cry_Bruxish cry_uncomp Cry_Drampa cry_uncomp Cry_Dhelmise - cry_uncomp Cry_Jangmo_o - cry_uncomp Cry_Hakamo_o - cry_uncomp Cry_Kommo_o - cry_uncomp Cry_Tapu_Koko - cry_uncomp Cry_Tapu_Lele - cry_uncomp Cry_Tapu_Bulu - cry_uncomp Cry_Tapu_Fini + cry_uncomp Cry_Jangmoo + cry_uncomp Cry_Hakamoo + cry_uncomp Cry_Kommoo + cry_uncomp Cry_TapuKoko + cry_uncomp Cry_TapuLele + cry_uncomp Cry_TapuBulu + cry_uncomp Cry_TapuFini cry_uncomp Cry_Cosmog cry_uncomp Cry_Cosmoem cry_uncomp Cry_Solgaleo @@ -866,7 +866,7 @@ gCryTable:: @ 869DCF4 cry_uncomp Cry_Perrserker cry_uncomp Cry_Cursola cry_uncomp Cry_Sirfetchd - cry_uncomp Cry_Mr_Rime + cry_uncomp Cry_MrRime cry_uncomp Cry_Runerigus cry_uncomp Cry_Milcery cry_uncomp Cry_Alcremie @@ -900,57 +900,57 @@ gCryTable:: @ 869DCF4 cry_uncomp Cry_Spectrier cry_uncomp Cry_Calyrex @ Megas - cry_uncomp Cry_Venusaur_Mega - cry_uncomp Cry_Charizard_Mega_X - cry_uncomp Cry_Charizard_Mega_Y - cry_uncomp Cry_Blastoise_Mega - cry_uncomp Cry_Beedrill_Mega - cry_uncomp Cry_Pidgeot_Mega - cry_uncomp Cry_Alakazam_Mega - cry_uncomp Cry_Slowbro_Mega - cry_uncomp Cry_Gengar_Mega - cry_uncomp Cry_Kangaskhan_Mega - cry_uncomp Cry_Pinsir_Mega - cry_uncomp Cry_Gyarados_Mega - cry_uncomp Cry_Aerodactyl_Mega - cry_uncomp Cry_Mewtwo_Mega_X - cry_uncomp Cry_Mewtwo_Mega_Y - cry_uncomp Cry_Ampharos_Mega - cry_uncomp Cry_Steelix_Mega - cry_uncomp Cry_Scizor_Mega - cry_uncomp Cry_Heracross_Mega - cry_uncomp Cry_Houndoom_Mega - cry_uncomp Cry_Tyranitar_Mega - cry_uncomp Cry_Sceptile_Mega - cry_uncomp Cry_Blaziken_Mega - cry_uncomp Cry_Swampert_Mega - cry_uncomp Cry_Gardevoir_Mega - cry_uncomp Cry_Sableye_Mega - cry_uncomp Cry_Mawile_Mega - cry_uncomp Cry_Aggron_Mega - cry_uncomp Cry_Medicham_Mega - cry_uncomp Cry_Manectric_Mega - cry_uncomp Cry_Sharpedo_Mega - cry_uncomp Cry_Camerupt_Mega - cry_uncomp Cry_Altaria_Mega - cry_uncomp Cry_Banette_Mega - cry_uncomp Cry_Absol_Mega - cry_uncomp Cry_Glalie_Mega - cry_uncomp Cry_Salamence_Mega - cry_uncomp Cry_Metagross_Mega - cry_uncomp Cry_Latias_Mega - cry_uncomp Cry_Latios_Mega - cry_uncomp Cry_Lopunny_Mega - cry_uncomp Cry_Garchomp_Mega - cry_uncomp Cry_Lucario_Mega - cry_uncomp Cry_Abomasnow_Mega - cry_uncomp Cry_Gallade_Mega - cry_uncomp Cry_Audino_Mega - cry_uncomp Cry_Diancie_Mega + cry_uncomp Cry_VenusaurMega + cry_uncomp Cry_CharizardMegaX + cry_uncomp Cry_CharizardMegaY + cry_uncomp Cry_BlastoiseMega + cry_uncomp Cry_BeedrillMega + cry_uncomp Cry_PidgeotMega + cry_uncomp Cry_AlakazamMega + cry_uncomp Cry_SlowbroMega + cry_uncomp Cry_GengarMega + cry_uncomp Cry_KangaskhanMega + cry_uncomp Cry_PinsirMega + cry_uncomp Cry_GyaradosMega + cry_uncomp Cry_AerodactylMega + cry_uncomp Cry_MewtwoMegaX + cry_uncomp Cry_MewtwoMegaY + cry_uncomp Cry_AmpharosMega + cry_uncomp Cry_SteelixMega + cry_uncomp Cry_ScizorMega + cry_uncomp Cry_HeracrossMega + cry_uncomp Cry_HoundoomMega + cry_uncomp Cry_TyranitarMega + cry_uncomp Cry_SceptileMega + cry_uncomp Cry_BlazikenMega + cry_uncomp Cry_SwampertMega + cry_uncomp Cry_GardevoirMega + cry_uncomp Cry_SableyeMega + cry_uncomp Cry_MawileMega + cry_uncomp Cry_AggronMega + cry_uncomp Cry_MedichamMega + cry_uncomp Cry_ManectricMega + cry_uncomp Cry_SharpedoMega + cry_uncomp Cry_CameruptMega + cry_uncomp Cry_AltariaMega + cry_uncomp Cry_BanetteMega + cry_uncomp Cry_AbsolMega + cry_uncomp Cry_GlalieMega + cry_uncomp Cry_SalamenceMega + cry_uncomp Cry_MetagrossMega + cry_uncomp Cry_LatiasMega + cry_uncomp Cry_LatiosMega + cry_uncomp Cry_LopunnyMega + cry_uncomp Cry_GarchompMega + cry_uncomp Cry_LucarioMega + cry_uncomp Cry_AbomasnowMega + cry_uncomp Cry_GalladeMega + cry_uncomp Cry_AudinoMega + cry_uncomp Cry_DiancieMega @ Special Mega + Primals - cry_uncomp Cry_Rayquaza_Mega - cry_uncomp Cry_Kyogre_Primal - cry_uncomp Cry_Groudon_Primal + cry_uncomp Cry_RayquazaMega + cry_uncomp Cry_KyogrePrimal + cry_uncomp Cry_GroudonPrimal @ Alolan Forms cry Cry_Rattata cry Cry_Raticate @@ -974,11 +974,11 @@ gCryTable:: @ 869DCF4 cry Cry_Meowth cry Cry_Ponyta cry Cry_Rapidash - cry_uncomp Cry_Slowpoke_Galarian + cry_uncomp Cry_SlowpokeGalarian cry Cry_Slowbro cry Cry_Farfetchd cry Cry_Weezing - cry Cry_Mr_Mime + cry Cry_MrMime cry Cry_Articuno cry Cry_Zapdos cry Cry_Moltres @@ -1066,7 +1066,7 @@ gCryTable:: @ 869DCF4 @ Giratina cry Cry_Giratina @ Shaymin - cry Cry_Shaymin_Sky + cry Cry_ShayminSky @ Arceus cry Cry_Arceus cry Cry_Arceus @@ -1099,12 +1099,12 @@ gCryTable:: @ 869DCF4 cry Cry_Sawsbuck cry Cry_Sawsbuck @ Therian Forms - cry Cry_Tornadus_Therian - cry Cry_Thundurus_Therian - cry Cry_Landorus_Therian + cry Cry_TornadusTherian + cry Cry_ThundurusTherian + cry Cry_LandorusTherian @ Kyurem - cry Cry_Kyurem_White - cry Cry_Kyurem_Black + cry Cry_KyuremWhite + cry Cry_KyuremBlack @ Keldeo cry Cry_Keldeo @ Meloetta @@ -1147,7 +1147,7 @@ gCryTable:: @ 869DCF4 cry_uncomp Cry_Floette cry_uncomp Cry_Floette cry_uncomp Cry_Floette - cry_uncomp Cry_Floette_Eternal_Flower + cry_uncomp Cry_FloetteEternalFlower @ Florges cry_uncomp Cry_Florges cry_uncomp Cry_Florges @@ -1170,31 +1170,31 @@ gCryTable:: @ 869DCF4 @ Pumpkaboo cry_uncomp Cry_Pumpkaboo cry_uncomp Cry_Pumpkaboo - cry_uncomp Cry_Pumpkaboo_Super + cry_uncomp Cry_PumpkabooSuper @ Gourgeist cry_uncomp Cry_Gourgeist cry_uncomp Cry_Gourgeist - cry_uncomp Cry_Gourgeist_Super + cry_uncomp Cry_GourgeistSuper @ Xerneas cry_uncomp Cry_Xerneas @ Zygarde - cry_uncomp Cry_Zygarde_10 - cry_uncomp Cry_Zygarde_10 + cry_uncomp Cry_Zygarde10 + cry_uncomp Cry_Zygarde10 cry_uncomp Cry_Zygarde - cry_uncomp Cry_Zygarde_Complete + cry_uncomp Cry_ZygardeComplete @ Hoopa - cry_uncomp Cry_Hoopa_Unbound + cry_uncomp Cry_HoopaUnbound @ Oricorio - cry_uncomp Cry_Oricorio_Pom_Pom - cry_uncomp Cry_Oricorio_Pau - cry_uncomp Cry_Oricorio_Sensu + cry_uncomp Cry_OricorioPomPom + cry_uncomp Cry_OricorioPau + cry_uncomp Cry_OricorioSensu @ Rockruff cry_uncomp Cry_Rockruff @ Lycanroc - cry_uncomp Cry_Lycanroc_Midnight - cry_uncomp Cry_Lycanroc_Dusk + cry_uncomp Cry_LycanrocMidnight + cry_uncomp Cry_LycanrocDusk @ Wishiwashi - cry_uncomp Cry_Wishiwashi_School + cry_uncomp Cry_WishiwashiSchool @ Silvally cry_uncomp Cry_Silvally cry_uncomp Cry_Silvally @@ -1230,16 +1230,16 @@ gCryTable:: @ 869DCF4 @ Mimikyu cry_uncomp Cry_Mimikyu @ Necrozma - cry_uncomp Cry_Necrozma_Dusk_Mane - cry_uncomp Cry_Necrozma_Dawn_Wings - cry_uncomp Cry_Necrozma_Ultra + cry_uncomp Cry_NecrozmaDuskMane + cry_uncomp Cry_NecrozmaDawnWings + cry_uncomp Cry_NecrozmaUltra @ Magearna cry_uncomp Cry_Magearna @ Cramorant cry_uncomp Cry_Cramorant cry_uncomp Cry_Cramorant @ Toxtricity - cry_uncomp Cry_Toxtricity_Low_Key + cry_uncomp Cry_ToxtricityLowKey @ Sinistea cry_uncomp Cry_Sinistea @ Polteageist @@ -1254,24 +1254,24 @@ gCryTable:: @ 869DCF4 cry_uncomp Cry_Alcremie cry_uncomp Cry_Alcremie @ Eiscue - cry_uncomp Cry_Eiscue_Noice_Face + cry_uncomp Cry_EiscueNoiceFace @ Indeedee - cry_uncomp Cry_Indeedee_Female + cry_uncomp Cry_IndeedeeFemale @ Morpeko - cry_uncomp Cry_Morpeko_Hangry + cry_uncomp Cry_MorpekoHangry @ Zacian - cry_uncomp Cry_Zacian_Crowned_Sword + cry_uncomp Cry_ZacianCrownedSword @ Zamazenta - cry_uncomp Cry_Zamazenta_Crowned_Shield + cry_uncomp Cry_ZamazentaCrownedShield @ Eternatus - cry_uncomp Cry_Eternatus_Eternamax + cry_uncomp Cry_EternatusEternamax @ Urshifu - cry_uncomp Cry_Urshifu_Rapid_Strike_Style + cry_uncomp Cry_UrshifuRapidStrikeStyle @ Zarude cry_uncomp Cry_Zarude @ Calyrex - cry_uncomp Cry_Calyrex_Ice_Rider - cry_uncomp Cry_Calyrex_Shadow_Rider + cry_uncomp Cry_CalyrexIceRider + cry_uncomp Cry_CalyrexShadowRider .align 2 gCryTable2:: @ 869EF24 @@ -1303,10 +1303,10 @@ gCryTable2:: @ 869EF24 cry2 Cry_Raichu @ 869F050 cry2 Cry_Sandshrew @ 869F05C cry2 Cry_Sandslash @ 869F068 - cry2 Cry_Nidoran_F @ 869F074 + cry2 Cry_NidoranF @ 869F074 cry2 Cry_Nidorina @ 869F080 cry2 Cry_Nidoqueen @ 869F08C - cry2 Cry_Nidoran_M @ 869F098 + cry2 Cry_NidoranM @ 869F098 cry2 Cry_Nidorino @ 869F0A4 cry2 Cry_Nidoking @ 869F0B0 cry2 Cry_Clefairy @ 869F0BC @@ -1396,7 +1396,7 @@ gCryTable2:: @ 869EF24 cry2 Cry_Seaking @ 869F4AC cry2 Cry_Staryu @ 869F4B8 cry2 Cry_Starmie @ 869F4C4 - cry2 Cry_Mr_Mime @ 869F4D0 + cry2 Cry_MrMime @ 869F4D0 cry2 Cry_Scyther @ 869F4DC cry2 Cry_Jynx @ 869F4E8 cry2 Cry_Electabuzz @ 869F4F4 @@ -1713,7 +1713,7 @@ gCryTable2:: @ 869EF24 cry2 Cry_Bronzor cry2 Cry_Bronzong cry2 Cry_Bonsly - cry2 Cry_Mime_Jr + cry2 Cry_MimeJr cry2 Cry_Happiny cry2 Cry_Chatot cry2 Cry_Spiritomb @@ -1748,7 +1748,7 @@ gCryTable2:: @ 869EF24 cry2 Cry_Glaceon cry2 Cry_Gliscor cry2 Cry_Mamoswine - cry2 Cry_Porygon_Z + cry2 Cry_PorygonZ cry2 Cry_Gallade cry2 Cry_Probopass cry2 Cry_Dusknoir @@ -2046,7 +2046,7 @@ gCryTable2:: @ 869EF24 cry2_uncomp Cry_Sandygast cry2_uncomp Cry_Palossand cry2_uncomp Cry_Pyukumuku - cry2_uncomp Cry_Type_null + cry2_uncomp Cry_TypeNull cry2_uncomp Cry_Silvally cry2_uncomp Cry_Minior cry2_uncomp Cry_Komala @@ -2056,13 +2056,13 @@ gCryTable2:: @ 869EF24 cry2_uncomp Cry_Bruxish cry2_uncomp Cry_Drampa cry2_uncomp Cry_Dhelmise - cry2_uncomp Cry_Jangmo_o - cry2_uncomp Cry_Hakamo_o - cry2_uncomp Cry_Kommo_o - cry2_uncomp Cry_Tapu_Koko - cry2_uncomp Cry_Tapu_Lele - cry2_uncomp Cry_Tapu_Bulu - cry2_uncomp Cry_Tapu_Fini + cry2_uncomp Cry_Jangmoo + cry2_uncomp Cry_Hakamoo + cry2_uncomp Cry_Kommoo + cry2_uncomp Cry_TapuKoko + cry2_uncomp Cry_TapuLele + cry2_uncomp Cry_TapuBulu + cry2_uncomp Cry_TapuFini cry2_uncomp Cry_Cosmog cry2_uncomp Cry_Cosmoem cry2_uncomp Cry_Solgaleo @@ -2140,7 +2140,7 @@ gCryTable2:: @ 869EF24 cry2_uncomp Cry_Perrserker cry2_uncomp Cry_Cursola cry2_uncomp Cry_Sirfetchd - cry2_uncomp Cry_Mr_Rime + cry2_uncomp Cry_MrRime cry2_uncomp Cry_Runerigus cry2_uncomp Cry_Milcery cry2_uncomp Cry_Alcremie @@ -2174,57 +2174,57 @@ gCryTable2:: @ 869EF24 cry2_uncomp Cry_Spectrier cry2_uncomp Cry_Calyrex @ Megas - cry2_uncomp Cry_Venusaur_Mega - cry2_uncomp Cry_Charizard_Mega_X - cry2_uncomp Cry_Charizard_Mega_Y - cry2_uncomp Cry_Blastoise_Mega - cry2_uncomp Cry_Beedrill_Mega - cry2_uncomp Cry_Pidgeot_Mega - cry2_uncomp Cry_Alakazam_Mega - cry2_uncomp Cry_Slowbro_Mega - cry2_uncomp Cry_Gengar_Mega - cry2_uncomp Cry_Kangaskhan_Mega - cry2_uncomp Cry_Pinsir_Mega - cry2_uncomp Cry_Gyarados_Mega - cry2_uncomp Cry_Aerodactyl_Mega - cry2_uncomp Cry_Mewtwo_Mega_X - cry2_uncomp Cry_Mewtwo_Mega_Y - cry2_uncomp Cry_Ampharos_Mega - cry2_uncomp Cry_Steelix_Mega - cry2_uncomp Cry_Scizor_Mega - cry2_uncomp Cry_Heracross_Mega - cry2_uncomp Cry_Houndoom_Mega - cry2_uncomp Cry_Tyranitar_Mega - cry2_uncomp Cry_Sceptile_Mega - cry2_uncomp Cry_Blaziken_Mega - cry2_uncomp Cry_Swampert_Mega - cry2_uncomp Cry_Gardevoir_Mega - cry2_uncomp Cry_Sableye_Mega - cry2_uncomp Cry_Mawile_Mega - cry2_uncomp Cry_Aggron_Mega - cry2_uncomp Cry_Medicham_Mega - cry2_uncomp Cry_Manectric_Mega - cry2_uncomp Cry_Sharpedo_Mega - cry2_uncomp Cry_Camerupt_Mega - cry2_uncomp Cry_Altaria_Mega - cry2_uncomp Cry_Banette_Mega - cry2_uncomp Cry_Absol_Mega - cry2_uncomp Cry_Glalie_Mega - cry2_uncomp Cry_Salamence_Mega - cry2_uncomp Cry_Metagross_Mega - cry2_uncomp Cry_Latias_Mega - cry2_uncomp Cry_Latios_Mega - cry2_uncomp Cry_Lopunny_Mega - cry2_uncomp Cry_Garchomp_Mega - cry2_uncomp Cry_Lucario_Mega - cry2_uncomp Cry_Abomasnow_Mega - cry2_uncomp Cry_Gallade_Mega - cry2_uncomp Cry_Audino_Mega - cry2_uncomp Cry_Diancie_Mega + cry2_uncomp Cry_VenusaurMega + cry2_uncomp Cry_CharizardMegaX + cry2_uncomp Cry_CharizardMegaY + cry2_uncomp Cry_BlastoiseMega + cry2_uncomp Cry_BeedrillMega + cry2_uncomp Cry_PidgeotMega + cry2_uncomp Cry_AlakazamMega + cry2_uncomp Cry_SlowbroMega + cry2_uncomp Cry_GengarMega + cry2_uncomp Cry_KangaskhanMega + cry2_uncomp Cry_PinsirMega + cry2_uncomp Cry_GyaradosMega + cry2_uncomp Cry_AerodactylMega + cry2_uncomp Cry_MewtwoMegaX + cry2_uncomp Cry_MewtwoMegaY + cry2_uncomp Cry_AmpharosMega + cry2_uncomp Cry_SteelixMega + cry2_uncomp Cry_ScizorMega + cry2_uncomp Cry_HeracrossMega + cry2_uncomp Cry_HoundoomMega + cry2_uncomp Cry_TyranitarMega + cry2_uncomp Cry_SceptileMega + cry2_uncomp Cry_BlazikenMega + cry2_uncomp Cry_SwampertMega + cry2_uncomp Cry_GardevoirMega + cry2_uncomp Cry_SableyeMega + cry2_uncomp Cry_MawileMega + cry2_uncomp Cry_AggronMega + cry2_uncomp Cry_MedichamMega + cry2_uncomp Cry_ManectricMega + cry2_uncomp Cry_SharpedoMega + cry2_uncomp Cry_CameruptMega + cry2_uncomp Cry_AltariaMega + cry2_uncomp Cry_BanetteMega + cry2_uncomp Cry_AbsolMega + cry2_uncomp Cry_GlalieMega + cry2_uncomp Cry_SalamenceMega + cry2_uncomp Cry_MetagrossMega + cry2_uncomp Cry_LatiasMega + cry2_uncomp Cry_LatiosMega + cry2_uncomp Cry_LopunnyMega + cry2_uncomp Cry_GarchompMega + cry2_uncomp Cry_LucarioMega + cry2_uncomp Cry_AbomasnowMega + cry2_uncomp Cry_GalladeMega + cry2_uncomp Cry_AudinoMega + cry2_uncomp Cry_DiancieMega @ Special Mega + Primals - cry2_uncomp Cry_Rayquaza_Mega - cry2_uncomp Cry_Kyogre_Primal - cry2_uncomp Cry_Groudon_Primal + cry2_uncomp Cry_RayquazaMega + cry2_uncomp Cry_KyogrePrimal + cry2_uncomp Cry_GroudonPrimal @ Alolan Forms cry2 Cry_Rattata cry2 Cry_Raticate @@ -2248,11 +2248,11 @@ gCryTable2:: @ 869EF24 cry2 Cry_Meowth cry2 Cry_Ponyta cry2 Cry_Rapidash - cry2_uncomp Cry_Slowpoke_Galarian + cry2_uncomp Cry_SlowpokeGalarian cry2 Cry_Slowbro cry2 Cry_Farfetchd cry2 Cry_Weezing - cry2 Cry_Mr_Mime + cry2 Cry_MrMime cry2 Cry_Articuno cry2 Cry_Zapdos cry2 Cry_Moltres @@ -2340,7 +2340,7 @@ gCryTable2:: @ 869EF24 @ Giratina cry2 Cry_Giratina @ Shaymin - cry2 Cry_Shaymin_Sky + cry2 Cry_ShayminSky @ Arceus cry2 Cry_Arceus cry2 Cry_Arceus @@ -2373,12 +2373,12 @@ gCryTable2:: @ 869EF24 cry2 Cry_Sawsbuck cry2 Cry_Sawsbuck @ Therian Forms - cry2 Cry_Tornadus_Therian - cry2 Cry_Thundurus_Therian - cry2 Cry_Landorus_Therian + cry2 Cry_TornadusTherian + cry2 Cry_ThundurusTherian + cry2 Cry_LandorusTherian @ Kyurem - cry2 Cry_Kyurem_White - cry2 Cry_Kyurem_Black + cry2 Cry_KyuremWhite + cry2 Cry_KyuremBlack @ Keldeo cry2 Cry_Keldeo @ Meloetta @@ -2421,7 +2421,7 @@ gCryTable2:: @ 869EF24 cry2_uncomp Cry_Floette cry2_uncomp Cry_Floette cry2_uncomp Cry_Floette - cry2_uncomp Cry_Floette_Eternal_Flower + cry2_uncomp Cry_FloetteEternalFlower @ Florges cry2_uncomp Cry_Florges cry2_uncomp Cry_Florges @@ -2444,31 +2444,31 @@ gCryTable2:: @ 869EF24 @ Pumpkaboo cry2_uncomp Cry_Pumpkaboo cry2_uncomp Cry_Pumpkaboo - cry2_uncomp Cry_Pumpkaboo_Super + cry2_uncomp Cry_PumpkabooSuper @ Gourgeist cry2_uncomp Cry_Gourgeist cry2_uncomp Cry_Gourgeist - cry2_uncomp Cry_Gourgeist_Super + cry2_uncomp Cry_GourgeistSuper @ Xerneas cry2_uncomp Cry_Xerneas @ Zygarde - cry2_uncomp Cry_Zygarde_10 - cry2_uncomp Cry_Zygarde_10 + cry2_uncomp Cry_Zygarde10 + cry2_uncomp Cry_Zygarde10 cry2_uncomp Cry_Zygarde - cry2_uncomp Cry_Zygarde_Complete + cry2_uncomp Cry_ZygardeComplete @ Hoopa - cry2_uncomp Cry_Hoopa_Unbound + cry2_uncomp Cry_HoopaUnbound @ Oricorio - cry2_uncomp Cry_Oricorio_Pom_Pom - cry2_uncomp Cry_Oricorio_Pau - cry2_uncomp Cry_Oricorio_Sensu + cry2_uncomp Cry_OricorioPomPom + cry2_uncomp Cry_OricorioPau + cry2_uncomp Cry_OricorioSensu @ Rockruff cry2_uncomp Cry_Rockruff @ Lycanroc - cry2_uncomp Cry_Lycanroc_Midnight - cry2_uncomp Cry_Lycanroc_Dusk + cry2_uncomp Cry_LycanrocMidnight + cry2_uncomp Cry_LycanrocDusk @ Wishiwashi - cry2_uncomp Cry_Wishiwashi_School + cry2_uncomp Cry_WishiwashiSchool @ Silvally cry2_uncomp Cry_Silvally cry2_uncomp Cry_Silvally @@ -2504,16 +2504,16 @@ gCryTable2:: @ 869EF24 @ Mimikyu cry2_uncomp Cry_Mimikyu @ Necrozma - cry2_uncomp Cry_Necrozma_Dusk_Mane - cry2_uncomp Cry_Necrozma_Dawn_Wings - cry2_uncomp Cry_Necrozma_Ultra + cry2_uncomp Cry_NecrozmaDuskMane + cry2_uncomp Cry_NecrozmaDawnWings + cry2_uncomp Cry_NecrozmaUltra @ Magearna cry2_uncomp Cry_Magearna @ Cramorant cry2_uncomp Cry_Cramorant cry2_uncomp Cry_Cramorant @ Toxtricity - cry2_uncomp Cry_Toxtricity_Low_Key + cry2_uncomp Cry_ToxtricityLowKey @ Sinistea cry2_uncomp Cry_Sinistea @ Polteageist @@ -2528,21 +2528,21 @@ gCryTable2:: @ 869EF24 cry2_uncomp Cry_Alcremie cry2_uncomp Cry_Alcremie @ Eiscue - cry2_uncomp Cry_Eiscue_Noice_Face + cry2_uncomp Cry_EiscueNoiceFace @ Indeedee - cry2_uncomp Cry_Indeedee_Female + cry2_uncomp Cry_IndeedeeFemale @ Morpeko - cry2_uncomp Cry_Morpeko_Hangry + cry2_uncomp Cry_MorpekoHangry @ Zacian - cry2_uncomp Cry_Zacian_Crowned_Sword + cry2_uncomp Cry_ZacianCrownedSword @ Zamazenta - cry2_uncomp Cry_Zamazenta_Crowned_Shield + cry2_uncomp Cry_ZamazentaCrownedShield @ Eternatus - cry2_uncomp Cry_Eternatus_Eternamax + cry2_uncomp Cry_EternatusEternamax @ Urshifu - cry2_uncomp Cry_Urshifu_Rapid_Strike_Style + cry2_uncomp Cry_UrshifuRapidStrikeStyle @ Zarude cry2_uncomp Cry_Zarude @ Calyrex - cry2_uncomp Cry_Calyrex_Ice_Rider - cry2_uncomp Cry_Calyrex_Shadow_Rider + cry2_uncomp Cry_CalyrexIceRider + cry2_uncomp Cry_CalyrexShadowRider diff --git a/sound/direct_sound_data.inc b/sound/direct_sound_data.inc index 4985c744e3..e9180dca34 100644 --- a/sound/direct_sound_data.inc +++ b/sound/direct_sound_data.inc @@ -499,7 +499,7 @@ Cry_Sandslash:: .incbin "sound/direct_sound_samples/cries/sandslash.bin" .align 2 -Cry_Nidoran_F:: +Cry_NidoranF:: .incbin "sound/direct_sound_samples/cries/nidoran_f.bin" .align 2 @@ -511,7 +511,7 @@ Cry_Nidoqueen:: .incbin "sound/direct_sound_samples/cries/nidoqueen.bin" .align 2 -Cry_Nidoran_M:: +Cry_NidoranM:: .incbin "sound/direct_sound_samples/cries/nidoran_m.bin" .align 2 @@ -871,7 +871,7 @@ Cry_Starmie:: .incbin "sound/direct_sound_samples/cries/starmie.bin" .align 2 -Cry_Mr_Mime:: +Cry_MrMime:: .incbin "sound/direct_sound_samples/cries/mr_mime.bin" .align 2 @@ -2139,7 +2139,7 @@ Cry_Bonsly:: .incbin "sound/direct_sound_samples/cries/bonsly.bin" .align 2 -Cry_Mime_Jr:: +Cry_MimeJr:: .incbin "sound/direct_sound_samples/cries/mime_jr.bin" .align 2 @@ -2279,7 +2279,7 @@ Cry_Mamoswine:: .incbin "sound/direct_sound_samples/cries/mamoswine.bin" .align 2 -Cry_Porygon_Z:: +Cry_PorygonZ:: .incbin "sound/direct_sound_samples/cries/porygon_z.bin" .align 2 @@ -3471,7 +3471,7 @@ Cry_Pyukumuku:: .incbin "sound/direct_sound_samples/cries/uncomp_pyukumuku.bin" .align 2 -Cry_Type_null:: +Cry_TypeNull:: .incbin "sound/direct_sound_samples/cries/uncomp_type_null.bin" .align 2 @@ -3511,31 +3511,31 @@ Cry_Dhelmise:: .incbin "sound/direct_sound_samples/cries/uncomp_dhelmise.bin" .align 2 -Cry_Jangmo_o:: +Cry_Jangmoo:: .incbin "sound/direct_sound_samples/cries/uncomp_jangmo_o.bin" .align 2 -Cry_Hakamo_o:: +Cry_Hakamoo:: .incbin "sound/direct_sound_samples/cries/uncomp_hakamo_o.bin" .align 2 -Cry_Kommo_o:: +Cry_Kommoo:: .incbin "sound/direct_sound_samples/cries/uncomp_kommo_o.bin" .align 2 -Cry_Tapu_Koko:: +Cry_TapuKoko:: .incbin "sound/direct_sound_samples/cries/uncomp_tapu_koko.bin" .align 2 -Cry_Tapu_Lele:: +Cry_TapuLele:: .incbin "sound/direct_sound_samples/cries/uncomp_tapu_lele.bin" .align 2 -Cry_Tapu_Bulu:: +Cry_TapuBulu:: .incbin "sound/direct_sound_samples/cries/uncomp_tapu_bulu.bin" .align 2 -Cry_Tapu_Fini:: +Cry_TapuFini:: .incbin "sound/direct_sound_samples/cries/uncomp_tapu_fini.bin" .align 2 @@ -3847,7 +3847,7 @@ Cry_Sirfetchd:: .incbin "sound/direct_sound_samples/cries/uncomp_sirfetchd.bin" .align 2 -Cry_Mr_Rime:: +Cry_MrRime:: .incbin "sound/direct_sound_samples/cries/uncomp_mr_rime.bin" .align 2 @@ -3979,331 +3979,331 @@ Cry_Calyrex:: .incbin "sound/direct_sound_samples/cries/uncomp_calyrex.bin" .align 2 -Cry_Venusaur_Mega:: +Cry_VenusaurMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_venusaur.bin" .align 2 -Cry_Charizard_Mega_X:: +Cry_CharizardMegaX:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_charizard_x.bin" .align 2 -Cry_Charizard_Mega_Y:: +Cry_CharizardMegaY:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_charizard_y.bin" .align 2 -Cry_Blastoise_Mega:: +Cry_BlastoiseMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_blastoise.bin" .align 2 -Cry_Beedrill_Mega:: +Cry_BeedrillMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_beedrill.bin" .align 2 -Cry_Pidgeot_Mega:: +Cry_PidgeotMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_pidgeot.bin" .align 2 -Cry_Alakazam_Mega:: +Cry_AlakazamMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_alakazam.bin" .align 2 -Cry_Slowbro_Mega:: +Cry_SlowbroMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_slowbro.bin" .align 2 -Cry_Gengar_Mega:: +Cry_GengarMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_gengar.bin" .align 2 -Cry_Kangaskhan_Mega:: +CryKangaskhanMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_kangaskhan.bin" .align 2 -Cry_Pinsir_Mega:: +CryPinsirMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_pinsir.bin" .align 2 -Cry_Gyarados_Mega:: +CryGyaradosMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_gyarados.bin" .align 2 -Cry_Aerodactyl_Mega:: +CryAerodactylMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_aerodactyl.bin" .align 2 -Cry_Mewtwo_Mega_X:: +CryMewtwoMegaX:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_mewtwo_x.bin" .align 2 -Cry_Mewtwo_Mega_Y:: +Cry_MewtwoMegaY:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_mewtwo_y.bin" .align 2 -Cry_Ampharos_Mega:: +Cry_AmpharosMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_ampharos.bin" .align 2 -Cry_Steelix_Mega:: +Cry_SteelixMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_steelix.bin" .align 2 -Cry_Scizor_Mega:: +Cry_ScizorMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_scizor.bin" .align 2 -Cry_Heracross_Mega:: +Cry_HeracrossMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_heracross.bin" .align 2 -Cry_Houndoom_Mega:: +Cry_HoundoomMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_houndoom.bin" .align 2 -Cry_Tyranitar_Mega:: +Cry_TyranitarMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_tyranitar.bin" .align 2 -Cry_Sceptile_Mega:: +Cry_SceptileMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_sceptile.bin" .align 2 -Cry_Blaziken_Mega:: +Cry_BlazikenMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_blaziken.bin" .align 2 -Cry_Swampert_Mega:: +Cry_SwampertMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_swampert.bin" .align 2 -Cry_Gardevoir_Mega:: +Cry_GardevoirMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_gardevoir.bin" .align 2 -Cry_Sableye_Mega:: +Cry_SableyeMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_sableye.bin" .align 2 -Cry_Mawile_Mega:: +Cry_MawileMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_mawile.bin" .align 2 -Cry_Aggron_Mega:: +Cry_AggronMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_aggron.bin" .align 2 -Cry_Medicham_Mega:: +Cry_MedichamMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_medicham.bin" .align 2 -Cry_Manectric_Mega:: +Cry_ManectricMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_manectric.bin" .align 2 -Cry_Sharpedo_Mega:: +Cry_SharpedoMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_sharpedo.bin" .align 2 -Cry_Camerupt_Mega:: +Cry_CameruptMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_camerupt.bin" .align 2 -Cry_Altaria_Mega:: +Cry_AltariaMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_altaria.bin" .align 2 -Cry_Banette_Mega:: +Cry_BanetteMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_banette.bin" .align 2 -Cry_Absol_Mega:: +Cry_AbsolMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_absol.bin" .align 2 -Cry_Glalie_Mega:: +Cry_GlalieMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_glalie.bin" .align 2 -Cry_Salamence_Mega:: +Cry_SalamenceMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_salamence.bin" .align 2 -Cry_Metagross_Mega:: +Cry_MetagrossMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_metagross.bin" .align 2 -Cry_Latias_Mega:: +Cry_LatiasMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_latias.bin" .align 2 -Cry_Latios_Mega:: +Cry_LatiosMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_latios.bin" .align 2 -Cry_Lopunny_Mega:: +Cry_LopunnyMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_lopunny.bin" .align 2 -Cry_Garchomp_Mega:: +Cry_GarchompMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_garchomp.bin" .align 2 -Cry_Lucario_Mega:: +Cry_LucarioMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_lucario.bin" .align 2 -Cry_Abomasnow_Mega:: +Cry_AbomasnowMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_abomasnow.bin" .align 2 -Cry_Gallade_Mega:: +Cry_GalladeMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_gallade.bin" .align 2 -Cry_Audino_Mega:: +Cry_AudinoMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_audino.bin" .align 2 -Cry_Diancie_Mega:: +Cry_DiancieMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_diancie.bin" .align 2 -Cry_Rayquaza_Mega:: +Cry_RayquazaMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_rayquaza.bin" .align 2 -Cry_Kyogre_Primal:: +Cry_KyogrePrimal:: .incbin "sound/direct_sound_samples/cries/uncomp_primal_kyogre.bin" .align 2 -Cry_Groudon_Primal:: +Cry_GroudonPrimal:: .incbin "sound/direct_sound_samples/cries/uncomp_primal_groudon.bin" .align 2 -Cry_Slowpoke_Galarian:: +Cry_SlowpokeGalarian:: .incbin "sound/direct_sound_samples/cries/uncomp_slowpoke_galarian.bin" .align 2 -Cry_Shaymin_Sky:: +Cry_ShayminSky:: .incbin "sound/direct_sound_samples/cries/shaymin_sky.bin" .align 2 -Cry_Tornadus_Therian:: +Cry_TornadusTherian:: .incbin "sound/direct_sound_samples/cries/tornadus_therian.bin" .align 2 -Cry_Thundurus_Therian:: +Cry_ThundurusTherian:: .incbin "sound/direct_sound_samples/cries/thundurus_therian.bin" .align 2 -Cry_Landorus_Therian:: +Cry_LandorusTherian:: .incbin "sound/direct_sound_samples/cries/landorus_therian.bin" .align 2 -Cry_Kyurem_White:: +Cry_KyuremWhite:: .incbin "sound/direct_sound_samples/cries/kyurem_white.bin" .align 2 -Cry_Kyurem_Black:: +Cry_KyuremBlack:: .incbin "sound/direct_sound_samples/cries/kyurem_black.bin" .align 2 -Cry_Floette_Eternal_Flower:: +Cry_FloetteEternalFlower:: .incbin "sound/direct_sound_samples/cries/uncomp_floette_eternal_flower.bin" .align 2 -Cry_Pumpkaboo_Super:: +Cry_PumpkabooSuper:: .incbin "sound/direct_sound_samples/cries/uncomp_pumpkaboo_super.bin" .align 2 -Cry_Gourgeist_Super:: +Cry_GourgeistSuper:: .incbin "sound/direct_sound_samples/cries/uncomp_gourgeist_super.bin" .align 2 -Cry_Zygarde_10:: +Cry_Zygarde10:: .incbin "sound/direct_sound_samples/cries/uncomp_zygarde_10.bin" .align 2 -Cry_Zygarde_Complete:: +Cry_ZygardeComplete:: .incbin "sound/direct_sound_samples/cries/uncomp_zygarde_complete.bin" .align 2 -Cry_Hoopa_Unbound:: +Cry_HoopaUnbound:: .incbin "sound/direct_sound_samples/cries/uncomp_hoopa_unbound.bin" .align 2 -Cry_Oricorio_Pom_Pom:: +Cry_OricorioPomPom:: .incbin "sound/direct_sound_samples/cries/uncomp_oricorio_pom_pom.bin" .align 2 -Cry_Oricorio_Pau:: +Cry_OricorioPau:: .incbin "sound/direct_sound_samples/cries/uncomp_oricorio_pau.bin" .align 2 -Cry_Oricorio_Sensu:: +Cry_OricorioSensu:: .incbin "sound/direct_sound_samples/cries/uncomp_oricorio_sensu.bin" .align 2 -Cry_Lycanroc_Midnight:: +Cry_LycanrocMidnight:: .incbin "sound/direct_sound_samples/cries/uncomp_lycanroc_midnight.bin" .align 2 -Cry_Lycanroc_Dusk:: +Cry_LycanrocDusk:: .incbin "sound/direct_sound_samples/cries/uncomp_lycanroc_dusk.bin" .align 2 -Cry_Wishiwashi_School:: +Cry_WishiwashiSchool:: .incbin "sound/direct_sound_samples/cries/uncomp_wishiwashi_school.bin" .align 2 -Cry_Necrozma_Dusk_Mane:: +Cry_NecrozmaDuskMane:: .incbin "sound/direct_sound_samples/cries/uncomp_necrozma_dusk_mane.bin" .align 2 -Cry_Necrozma_Dawn_Wings:: +Cry_NecrozmaDawnWings:: .incbin "sound/direct_sound_samples/cries/uncomp_necrozma_dawn_wings.bin" .align 2 -Cry_Necrozma_Ultra:: +Cry_NecrozmaUltra:: .incbin "sound/direct_sound_samples/cries/uncomp_necrozma_ultra.bin" .align 2 -Cry_Toxtricity_Low_Key:: +Cry_ToxtricityLowKey:: .incbin "sound/direct_sound_samples/cries/uncomp_toxtricity_low_key.bin" .align 2 -Cry_Eiscue_Noice_Face:: +Cry_Eiscue_NoiceFace:: .incbin "sound/direct_sound_samples/cries/uncomp_eiscue_noice_face.bin" .align 2 -Cry_Indeedee_Female:: +Cry_IndeedeeFemale:: .incbin "sound/direct_sound_samples/cries/uncomp_indeedee_female.bin" .align 2 -Cry_Morpeko_Hangry:: +Cry_MorpekoHangry:: .incbin "sound/direct_sound_samples/cries/uncomp_morpeko_hangry.bin" .align 2 -Cry_Zacian_Crowned_Sword:: +Cry_ZacianCrownedSword:: .incbin "sound/direct_sound_samples/cries/uncomp_zacian_crowned_sword.bin" .align 2 -Cry_Zamazenta_Crowned_Shield:: +Cry_ZamazentaCrownedShield:: .incbin "sound/direct_sound_samples/cries/uncomp_zamazenta_crowned_shield.bin" .align 2 -Cry_Eternatus_Eternamax:: +Cry_EternatusEternamax:: .incbin "sound/direct_sound_samples/cries/uncomp_eternatus_eternamax.bin" .align 2 -Cry_Urshifu_Rapid_Strike_Style:: +Cry_UrshifuRapidStrikeStyle:: .incbin "sound/direct_sound_samples/cries/uncomp_urshifu_rapid_strike_style.bin" .align 2 -Cry_Calyrex_Ice_Rider:: +Cry_CalyrexIceRider:: .incbin "sound/direct_sound_samples/cries/uncomp_calyrex_ice_rider.bin" .align 2 -Cry_Calyrex_Shadow_Rider:: +Cry_CalyrexShadowRider:: .incbin "sound/direct_sound_samples/cries/uncomp_calyrex_shadow_rider.bin" .align 2 diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 9ede202856..e279db7c18 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -772,7 +772,7 @@ const u32 gMonFrontPic_Golisopod[] = INCBIN_U32("graphics/pokemon/golisopod/fron const u32 gMonFrontPic_Sandygast[] = INCBIN_U32("graphics/pokemon/sandygast/front.4bpp.lz"); const u32 gMonFrontPic_Palossand[] = INCBIN_U32("graphics/pokemon/palossand/front.4bpp.lz"); const u32 gMonFrontPic_Pyukumuku[] = INCBIN_U32("graphics/pokemon/pyukumuku/front.4bpp.lz"); -const u32 gMonFrontPic_Type_null[] = INCBIN_U32("graphics/pokemon/type_null/front.4bpp.lz"); +const u32 gMonFrontPic_TypeNull[] = INCBIN_U32("graphics/pokemon/type_null/front.4bpp.lz"); const u32 gMonFrontPic_Silvally[] = INCBIN_U32("graphics/pokemon/silvally/front.4bpp.lz"); const u32 gMonFrontPic_Minior[] = INCBIN_U32("graphics/pokemon/minior/front.4bpp.lz"); const u32 gMonFrontPic_Komala[] = INCBIN_U32("graphics/pokemon/komala/front.4bpp.lz"); @@ -1912,7 +1912,7 @@ const u32 gMonBackPic_Golisopod[] = INCBIN_U32("graphics/pokemon/golisopod/back. const u32 gMonBackPic_Sandygast[] = INCBIN_U32("graphics/pokemon/sandygast/back.4bpp.lz"); const u32 gMonBackPic_Palossand[] = INCBIN_U32("graphics/pokemon/palossand/back.4bpp.lz"); const u32 gMonBackPic_Pyukumuku[] = INCBIN_U32("graphics/pokemon/pyukumuku/back.4bpp.lz"); -const u32 gMonBackPic_Type_null[] = INCBIN_U32("graphics/pokemon/type_null/back.4bpp.lz"); +const u32 gMonBackPic_TypeNull[] = INCBIN_U32("graphics/pokemon/type_null/back.4bpp.lz"); const u32 gMonBackPic_Silvally[] = INCBIN_U32("graphics/pokemon/silvally/back.4bpp.lz"); const u32 gMonBackPic_Minior[] = INCBIN_U32("graphics/pokemon/minior/back.4bpp.lz"); const u32 gMonBackPic_Komala[] = INCBIN_U32("graphics/pokemon/komala/back.4bpp.lz"); @@ -3050,7 +3050,7 @@ const u32 gMonPalette_Golisopod[] = INCBIN_U32("graphics/pokemon/golisopod/norma const u32 gMonPalette_Sandygast[] = INCBIN_U32("graphics/pokemon/sandygast/normal.gbapal.lz"); const u32 gMonPalette_Palossand[] = INCBIN_U32("graphics/pokemon/palossand/normal.gbapal.lz"); const u32 gMonPalette_Pyukumuku[] = INCBIN_U32("graphics/pokemon/pyukumuku/normal.gbapal.lz"); -const u32 gMonPalette_Type_null[] = INCBIN_U32("graphics/pokemon/type_null/normal.gbapal.lz"); +const u32 gMonPalette_TypeNull[] = INCBIN_U32("graphics/pokemon/type_null/normal.gbapal.lz"); const u32 gMonPalette_Silvally[] = INCBIN_U32("graphics/pokemon/silvally/normal.gbapal.lz"); const u32 gMonPalette_Minior[] = INCBIN_U32("graphics/pokemon/minior/normal.gbapal.lz"); const u32 gMonPalette_Komala[] = INCBIN_U32("graphics/pokemon/komala/normal.gbapal.lz"); @@ -4215,7 +4215,7 @@ const u32 gMonShinyPalette_Golisopod[] = INCBIN_U32("graphics/pokemon/golisopod/ const u32 gMonShinyPalette_Sandygast[] = INCBIN_U32("graphics/pokemon/sandygast/shiny.gbapal.lz"); const u32 gMonShinyPalette_Palossand[] = INCBIN_U32("graphics/pokemon/palossand/shiny.gbapal.lz"); const u32 gMonShinyPalette_Pyukumuku[] = INCBIN_U32("graphics/pokemon/pyukumuku/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Type_null[] = INCBIN_U32("graphics/pokemon/type_null/shiny.gbapal.lz"); +const u32 gMonShinyPalette_TypeNull[] = INCBIN_U32("graphics/pokemon/type_null/shiny.gbapal.lz"); const u32 gMonShinyPalette_Silvally[] = INCBIN_U32("graphics/pokemon/silvally/shiny.gbapal.lz"); const u32 gMonShinyPalette_Minior[] = INCBIN_U32("graphics/pokemon/minior/shiny.gbapal.lz"); const u32 gMonShinyPalette_Komala[] = INCBIN_U32("graphics/pokemon/komala/shiny.gbapal.lz"); @@ -5372,7 +5372,7 @@ const u8 gMonIcon_Golisopod[] = INCBIN_U8("graphics/pokemon/golisopod/icon.4bpp" const u8 gMonIcon_Sandygast[] = INCBIN_U8("graphics/pokemon/sandygast/icon.4bpp"); const u8 gMonIcon_Palossand[] = INCBIN_U8("graphics/pokemon/palossand/icon.4bpp"); const u8 gMonIcon_Pyukumuku[] = INCBIN_U8("graphics/pokemon/pyukumuku/icon.4bpp"); -const u8 gMonIcon_Type_null[] = INCBIN_U8("graphics/pokemon/type_null/icon.4bpp"); +const u8 gMonIcon_TypeNull[] = INCBIN_U8("graphics/pokemon/type_null/icon.4bpp"); const u8 gMonIcon_Silvally[] = INCBIN_U8("graphics/pokemon/silvally/icon.4bpp"); const u8 gMonIcon_Minior[] = INCBIN_U8("graphics/pokemon/minior/icon.4bpp"); const u8 gMonIcon_Komala[] = INCBIN_U8("graphics/pokemon/komala/icon.4bpp"); diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index f00db0c565..e1670e8195 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -772,7 +772,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(SANDYGAST, gMonBackPic_Sandygast), SPECIES_SPRITE(PALOSSAND, gMonBackPic_Palossand), SPECIES_SPRITE(PYUKUMUKU, gMonBackPic_Pyukumuku), - SPECIES_SPRITE(TYPE_NULL, gMonBackPic_Type_null), + SPECIES_SPRITE(TYPE_NULL, gMonBackPic_TypeNull), SPECIES_SPRITE(SILVALLY, gMonBackPic_Silvally), SPECIES_SPRITE(MINIOR, gMonBackPic_Minior), SPECIES_SPRITE(KOMALA, gMonBackPic_Komala), diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index f4cb60dad5..e73f6458be 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -772,7 +772,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(SANDYGAST, gMonFrontPic_Sandygast), SPECIES_SPRITE(PALOSSAND, gMonFrontPic_Palossand), SPECIES_SPRITE(PYUKUMUKU, gMonFrontPic_Pyukumuku), - SPECIES_SPRITE(TYPE_NULL, gMonFrontPic_Type_null), + SPECIES_SPRITE(TYPE_NULL, gMonFrontPic_TypeNull), SPECIES_SPRITE(SILVALLY, gMonFrontPic_Silvally), SPECIES_SPRITE(MINIOR, gMonFrontPic_Minior), SPECIES_SPRITE(KOMALA, gMonFrontPic_Komala), diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index f2fdf18263..c66d578468 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -772,7 +772,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(SANDYGAST, gMonPalette_Sandygast), SPECIES_PAL(PALOSSAND, gMonPalette_Palossand), SPECIES_PAL(PYUKUMUKU, gMonPalette_Pyukumuku), - SPECIES_PAL(TYPE_NULL, gMonPalette_Type_null), + SPECIES_PAL(TYPE_NULL, gMonPalette_TypeNull), SPECIES_PAL(SILVALLY, gMonPalette_Silvally), SPECIES_PAL(MINIOR, gMonPalette_Minior), SPECIES_PAL(KOMALA, gMonPalette_Komala), diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index 0213306839..0985b1609b 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -772,7 +772,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(SANDYGAST, gMonShinyPalette_Sandygast), SPECIES_SHINY_PAL(PALOSSAND, gMonShinyPalette_Palossand), SPECIES_SHINY_PAL(PYUKUMUKU, gMonShinyPalette_Pyukumuku), - SPECIES_SHINY_PAL(TYPE_NULL, gMonShinyPalette_Type_null), + SPECIES_SHINY_PAL(TYPE_NULL, gMonShinyPalette_TypeNull), SPECIES_SHINY_PAL(SILVALLY, gMonShinyPalette_Silvally), SPECIES_SHINY_PAL(MINIOR, gMonShinyPalette_Minior), SPECIES_SHINY_PAL(KOMALA, gMonShinyPalette_Komala), diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 3411f6bd94..534461733a 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -797,7 +797,7 @@ const u8 *const gMonIconTable[] = [SPECIES_SANDYGAST] = gMonIcon_Sandygast, [SPECIES_PALOSSAND] = gMonIcon_Palossand, [SPECIES_PYUKUMUKU] = gMonIcon_Pyukumuku, - [SPECIES_TYPE_NULL] = gMonIcon_Type_null, + [SPECIES_TYPE_NULL] = gMonIcon_TypeNull, [SPECIES_SILVALLY] = gMonIcon_Silvally, [SPECIES_MINIOR] = gMonIcon_Minior, [SPECIES_KOMALA] = gMonIcon_Komala, From 7714650feffb2324cbfc0891dbc578a710cf7bfa Mon Sep 17 00:00:00 2001 From: amiosi <44352097+amiosi@users.noreply.github.com> Date: Wed, 3 Feb 2021 14:55:55 -0500 Subject: [PATCH 14/15] fix build error --- sound/direct_sound_data.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/direct_sound_data.inc b/sound/direct_sound_data.inc index e9180dca34..ec4d9744a0 100644 --- a/sound/direct_sound_data.inc +++ b/sound/direct_sound_data.inc @@ -4015,23 +4015,23 @@ Cry_GengarMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_gengar.bin" .align 2 -CryKangaskhanMega:: +Cry_KangaskhanMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_kangaskhan.bin" .align 2 -CryPinsirMega:: +Cry_PinsirMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_pinsir.bin" .align 2 -CryGyaradosMega:: +Cry_GyaradosMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_gyarados.bin" .align 2 -CryAerodactylMega:: +Cry_AerodactylMega:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_aerodactyl.bin" .align 2 -CryMewtwoMegaX:: +Cry_MewtwoMegaX:: .incbin "sound/direct_sound_samples/cries/uncomp_mega_mewtwo_x.bin" .align 2 @@ -4271,7 +4271,7 @@ Cry_ToxtricityLowKey:: .incbin "sound/direct_sound_samples/cries/uncomp_toxtricity_low_key.bin" .align 2 -Cry_Eiscue_NoiceFace:: +Cry_EiscueNoiceFace:: .incbin "sound/direct_sound_samples/cries/uncomp_eiscue_noice_face.bin" .align 2 From 11e6298a0593c51bf7d7e9d22894ae27d8755aff Mon Sep 17 00:00:00 2001 From: amiosi <44352097+amiosi@users.noreply.github.com> Date: Wed, 3 Feb 2021 15:08:53 -0500 Subject: [PATCH 15/15] tmhm and tutor spacing --- src/data/pokemon/tmhm_learnsets.h | 382 ++++++++++++++--------------- src/data/pokemon/tutor_learnsets.h | 78 +++--- 2 files changed, 230 insertions(+), 230 deletions(-) diff --git a/src/data/pokemon/tmhm_learnsets.h b/src/data/pokemon/tmhm_learnsets.h index 3d9eac9637..30d46d59c3 100644 --- a/src/data/pokemon/tmhm_learnsets.h +++ b/src/data/pokemon/tmhm_learnsets.h @@ -17921,7 +17921,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_CRABOMINABLE]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_CRABOMINABLE] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM08_BULK_UP) @@ -20193,7 +20193,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM22_SOLARBEAM) | TMHM(TM11_SUNNY_DAY)), - [SPECIES_RATTATA_ALOLAN]= TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + [SPECIES_RATTATA_ALOLAN] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) | TMHM(HM01_CUT) | TMHM(TM28_DIG) | TMHM(TM42_FACADE) @@ -20206,7 +20206,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM06_TOXIC)), - [SPECIES_RATICATE_ALOLAN]= TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + [SPECIES_RATICATE_ALOLAN] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) | TMHM(TM08_BULK_UP) | TMHM(HM01_CUT) | TMHM(TM28_DIG) @@ -20221,7 +20221,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM06_TOXIC)), - [SPECIES_RAICHU_ALOLAN]= TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_RAICHU_ALOLAN] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM04_CALM_MIND) | TMHM(TM28_DIG) | TMHM(TM42_FACADE) @@ -20239,7 +20239,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM25_THUNDER) | TMHM(TM06_TOXIC)), - [SPECIES_SANDSHREW_ALOLAN]= TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + [SPECIES_SANDSHREW_ALOLAN] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(HM01_CUT) | TMHM(TM28_DIG) @@ -20253,7 +20253,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM04_STRENGTH) | TMHM(TM06_TOXIC)), - [SPECIES_SANDSLASH_ALOLAN]= TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + [SPECIES_SANDSLASH_ALOLAN] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(HM01_CUT) | TMHM(TM28_DIG) @@ -20268,7 +20268,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM04_STRENGTH) | TMHM(TM06_TOXIC)), - [SPECIES_VULPIX_ALOLAN]= TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + [SPECIES_VULPIX_ALOLAN] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) | TMHM(TM28_DIG) | TMHM(TM42_FACADE) | TMHM(TM13_ICE_BEAM) @@ -20278,7 +20278,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM44_REST) | TMHM(TM06_TOXIC)), - [SPECIES_NINETALES_ALOLAN]= TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + [SPECIES_NINETALES_ALOLAN] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) | TMHM(TM04_CALM_MIND) | TMHM(TM28_DIG) | TMHM(TM42_FACADE) @@ -20290,7 +20290,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM44_REST) | TMHM(TM06_TOXIC)), - [SPECIES_DIGLETT_ALOLAN]= TMHM_LEARNSET(TMHM(HM01_CUT) + [SPECIES_DIGLETT_ALOLAN] = TMHM_LEARNSET(TMHM(HM01_CUT) | TMHM(TM28_DIG) | TMHM(TM26_EARTHQUAKE) | TMHM(TM42_FACADE) @@ -20300,7 +20300,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM36_SLUDGE_BOMB) | TMHM(TM06_TOXIC)), - [SPECIES_DUGTRIO_ALOLAN]= TMHM_LEARNSET(TMHM(HM01_CUT) + [SPECIES_DUGTRIO_ALOLAN] = TMHM_LEARNSET(TMHM(HM01_CUT) | TMHM(TM28_DIG) | TMHM(TM26_EARTHQUAKE) | TMHM(TM42_FACADE) @@ -20311,7 +20311,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM36_SLUDGE_BOMB) | TMHM(TM06_TOXIC)), - [SPECIES_MEOWTH_ALOLAN]= TMHM_LEARNSET(TMHM(HM01_CUT) + [SPECIES_MEOWTH_ALOLAN] = TMHM_LEARNSET(TMHM(HM01_CUT) | TMHM(TM42_FACADE) | TMHM(HM05_FLASH) | TMHM(TM23_IRON_TAIL) @@ -20323,7 +20323,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM25_THUNDER) | TMHM(TM06_TOXIC)), - [SPECIES_PERSIAN_ALOLAN]= TMHM_LEARNSET(TMHM(HM01_CUT) + [SPECIES_PERSIAN_ALOLAN] = TMHM_LEARNSET(TMHM(HM01_CUT) | TMHM(TM42_FACADE) | TMHM(HM05_FLASH) | TMHM(TM15_HYPER_BEAM) @@ -20336,7 +20336,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM25_THUNDER) | TMHM(TM06_TOXIC)), - [SPECIES_GEODUDE_ALOLAN]= TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_GEODUDE_ALOLAN] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM42_FACADE) | TMHM(TM38_FIRE_BLAST) @@ -20350,7 +20350,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM25_THUNDER) | TMHM(TM06_TOXIC)), - [SPECIES_GRAVELER_ALOLAN]= TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_GRAVELER_ALOLAN] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM26_EARTHQUAKE) | TMHM(TM42_FACADE) @@ -20364,7 +20364,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM25_THUNDER) | TMHM(TM06_TOXIC)), - [SPECIES_GOLEM_ALOLAN]= TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_GOLEM_ALOLAN] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM26_EARTHQUAKE) | TMHM(TM42_FACADE) @@ -20379,7 +20379,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM25_THUNDER) | TMHM(TM06_TOXIC)), - [SPECIES_GRIMER_ALOLAN]= TMHM_LEARNSET(TMHM(TM28_DIG) + [SPECIES_GRIMER_ALOLAN] = TMHM_LEARNSET(TMHM(TM28_DIG) | TMHM(TM42_FACADE) | TMHM(TM38_FIRE_BLAST) | TMHM(TM35_FLAMETHROWER) @@ -20406,7 +20406,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM06_TOXIC)), - [SPECIES_EXEGGUTOR_ALOLAN]= TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_EXEGGUTOR_ALOLAN] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM26_EARTHQUAKE) | TMHM(TM42_FACADE) | TMHM(TM35_FLAMETHROWER) @@ -20423,7 +20423,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM04_STRENGTH) | TMHM(TM06_TOXIC)), - [SPECIES_MAROWAK_ALOLAN]= TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + [SPECIES_MAROWAK_ALOLAN] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM26_EARTHQUAKE) @@ -20442,7 +20442,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM25_THUNDER) | TMHM(TM06_TOXIC)), - [SPECIES_MEOWTH_GALARIAN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_MEOWTH_GALARIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM28_DIG) | TMHM(TM42_FACADE) | TMHM(TM23_IRON_TAIL) @@ -20456,7 +20456,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM25_THUNDER) | TMHM(TM24_THUNDERBOLT)), - [SPECIES_PONYTA_GALARIAN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PONYTA_GALARIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM42_FACADE) | TMHM(TM23_IRON_TAIL) @@ -20464,7 +20464,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM29_PSYCHIC) | TMHM(TM44_REST)), - [SPECIES_RAPIDASH_GALARIAN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_RAPIDASH_GALARIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM42_FACADE) | TMHM(TM15_HYPER_BEAM) @@ -20473,7 +20473,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM29_PSYCHIC) | TMHM(TM44_REST)), - [SPECIES_SLOWPOKE_GALARIAN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_SLOWPOKE_GALARIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM14_BLIZZARD) | TMHM(TM04_CALM_MIND) | TMHM(TM28_DIG) @@ -20497,7 +20497,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM03_SURF) | TMHM(TM03_WATER_PULSE)), - [SPECIES_SLOWBRO_GALARIAN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_SLOWBRO_GALARIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM04_CALM_MIND) @@ -20524,7 +20524,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM03_SURF) | TMHM(TM03_WATER_PULSE)), - [SPECIES_FARFETCHD_GALARIAN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FARFETCHD_GALARIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM42_FACADE) | TMHM(TM17_PROTECT) @@ -20533,7 +20533,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM47_STEEL_WING) | TMHM(TM11_SUNNY_DAY)), - [SPECIES_WEEZING_GALARIAN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_WEEZING_GALARIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM42_FACADE) | TMHM(TM38_FIRE_BLAST) | TMHM(TM35_FLAMETHROWER) @@ -20551,7 +20551,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_MR_MIME_GALARIAN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_MR_MIME_GALARIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM04_CALM_MIND) @@ -20575,7 +20575,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM25_THUNDER) | TMHM(TM24_THUNDERBOLT)), - [SPECIES_ARTICUNO_GALARIAN]= TMHM_LEARNSET(TMHM(TM04_CALM_MIND) + [SPECIES_ARTICUNO_GALARIAN] = TMHM_LEARNSET(TMHM(TM04_CALM_MIND) | TMHM(TM42_FACADE) | TMHM(HM02_FLY) | TMHM(TM15_HYPER_BEAM) @@ -20588,7 +20588,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM48_SKILL_SWAP) | TMHM(TM47_STEEL_WING)), - [SPECIES_ZAPDOS_GALARIAN]= TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_ZAPDOS_GALARIAN] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM08_BULK_UP) | TMHM(TM42_FACADE) | TMHM(HM02_FLY) @@ -20600,7 +20600,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM47_STEEL_WING) | TMHM(TM12_TAUNT)), - [SPECIES_MOLTRES_GALARIAN]= TMHM_LEARNSET(TMHM(TM42_FACADE) + [SPECIES_MOLTRES_GALARIAN] = TMHM_LEARNSET(TMHM(TM42_FACADE) | TMHM(HM02_FLY) | TMHM(TM15_HYPER_BEAM) | TMHM(TM17_PROTECT) @@ -20610,7 +20610,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM47_STEEL_WING) | TMHM(TM12_TAUNT)), - [SPECIES_SLOWKING_GALARIAN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_SLOWKING_GALARIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM04_CALM_MIND) @@ -20637,7 +20637,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM03_SURF) | TMHM(TM03_WATER_PULSE)), - [SPECIES_CORSOLA_GALARIAN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_CORSOLA_GALARIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM14_BLIZZARD) | TMHM(TM04_CALM_MIND) | TMHM(TM28_DIG) @@ -20660,7 +20660,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM03_SURF) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ZIGZAGOON_GALARIAN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_ZIGZAGOON_GALARIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM14_BLIZZARD) | TMHM(TM28_DIG) | TMHM(TM42_FACADE) @@ -20677,7 +20677,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM25_THUNDER) | TMHM(TM24_THUNDERBOLT)), - [SPECIES_LINOONE_GALARIAN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_LINOONE_GALARIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM14_BLIZZARD) | TMHM(TM28_DIG) | TMHM(TM42_FACADE) @@ -20695,7 +20695,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM25_THUNDER) | TMHM(TM24_THUNDERBOLT)), - [SPECIES_DARUMAKA_GALARIAN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_DARUMAKA_GALARIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) @@ -20713,7 +20713,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM46_THIEF)), - [SPECIES_DARMANITAN_GALARIAN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_DARMANITAN_GALARIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM08_BULK_UP) @@ -20734,7 +20734,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM46_THIEF)), - [SPECIES_YAMASK_GALARIAN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_YAMASK_GALARIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM26_EARTHQUAKE) | TMHM(TM42_FACADE) @@ -20749,7 +20749,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM48_SKILL_SWAP) | TMHM(TM46_THIEF)), - [SPECIES_STUNFISK_GALARIAN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_STUNFISK_GALARIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM28_DIG) | TMHM(TM26_EARTHQUAKE) | TMHM(TM42_FACADE) @@ -20761,7 +20761,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM36_SLUDGE_BOMB) | TMHM(HM03_SURF)), - [SPECIES_PIKACHU_COSPLAY]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_COSPLAY] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -20787,7 +20787,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PIKACHU_ROCK_STAR]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_ROCK_STAR] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -20813,7 +20813,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PIKACHU_BELLE]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_BELLE] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -20839,7 +20839,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PIKACHU_POP_STAR]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_POP_STAR] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -20865,7 +20865,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PIKACHU_PH_D]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_PH_D] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -20891,7 +20891,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PIKACHU_LIBRE]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_LIBRE] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -20917,7 +20917,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PIKACHU_ORIGINAL_CAP]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_ORIGINAL_CAP] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -20943,7 +20943,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PIKACHU_HOENN_CAP]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_HOENN_CAP] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -20969,7 +20969,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PIKACHU_SINNOH_CAP]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_SINNOH_CAP] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -20995,7 +20995,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PIKACHU_UNOVA_CAP]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_UNOVA_CAP] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -21021,7 +21021,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PIKACHU_KALOS_CAP]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_KALOS_CAP] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -21047,7 +21047,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PIKACHU_ALOLA_CAP]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_ALOLA_CAP] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -21073,7 +21073,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PIKACHU_PARTNER_CAP]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_PARTNER_CAP] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -21099,7 +21099,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PICHU_SPIKY_EARED]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PICHU_SPIKY_EARED] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) | TMHM(HM05_FLASH) @@ -21172,7 +21172,7 @@ const u32 gTMHMLearnsets[][2] = [SPECIES_UNOWN_QMARK] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_DEOXYS_ATTACK]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_DEOXYS_ATTACK] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM31_BRICK_BREAK) | TMHM(TM04_CALM_MIND) | TMHM(HM01_CUT) @@ -21209,7 +21209,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM06_TOXIC) | TMHM(TM03_WATER_PULSE)), - [SPECIES_DEOXYS_DEFENSE]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_DEOXYS_DEFENSE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM31_BRICK_BREAK) | TMHM(TM04_CALM_MIND) | TMHM(HM01_CUT) @@ -21246,7 +21246,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM06_TOXIC) | TMHM(TM03_WATER_PULSE)), - [SPECIES_DEOXYS_SPEED]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_DEOXYS_SPEED] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM31_BRICK_BREAK) | TMHM(TM04_CALM_MIND) | TMHM(HM01_CUT) @@ -21283,13 +21283,13 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM06_TOXIC) | TMHM(TM03_WATER_PULSE)), - [SPECIES_BURMY_SANDY_CLOAK]= TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER) + [SPECIES_BURMY_SANDY_CLOAK] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER) | TMHM(TM17_PROTECT)), - [SPECIES_BURMY_TRASH_CLOAK]= TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER) + [SPECIES_BURMY_TRASH_CLOAK] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER) | TMHM(TM17_PROTECT)), - [SPECIES_WORMADAM_SANDY_CLOAK]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_WORMADAM_SANDY_CLOAK] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM26_EARTHQUAKE) @@ -21313,7 +21313,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_WORMADAM_TRASH_CLOAK]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_WORMADAM_TRASH_CLOAK] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) | TMHM(HM05_FLASH) @@ -21333,7 +21333,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_SHELLOS_EAST_SEA]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_SHELLOS_EAST_SEA] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM14_BLIZZARD) | TMHM(HM08_DIVE) | TMHM(TM32_DOUBLE_TEAM) @@ -21351,7 +21351,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM06_TOXIC) | TMHM(TM03_WATER_PULSE)), - [SPECIES_GASTRODON_EAST_SEA]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_GASTRODON_EAST_SEA] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM14_BLIZZARD) | TMHM(TM28_DIG) | TMHM(HM08_DIVE) @@ -21389,7 +21389,7 @@ const u32 gTMHMLearnsets[][2] = [SPECIES_ROTOM_MOW] = TMHM_LEARNSET(0), - [SPECIES_GIRATINA_ORIGIN]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_GIRATINA_ORIGIN] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM04_CALM_MIND) | TMHM(HM01_CUT) | TMHM(TM32_DOUBLE_TEAM) @@ -21437,7 +21437,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_ARCEUS_FIGHTING]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_FIGHTING] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -21486,7 +21486,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_FLYING]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_FLYING] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -21535,7 +21535,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_POISON]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_POISON] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -21584,7 +21584,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_GROUND]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_GROUND] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -21731,7 +21731,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_GHOST]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_GHOST] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -21780,7 +21780,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_STEEL]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_STEEL] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -21878,7 +21878,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_WATER]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_WATER] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -21927,7 +21927,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_GRASS]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_GRASS] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -21976,7 +21976,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_ELECTRIC]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_ELECTRIC] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -22025,7 +22025,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_PSYCHIC]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_PSYCHIC] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -22123,7 +22123,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_DRAGON]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_DRAGON] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -22221,7 +22221,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_FAIRY]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_FAIRY] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -22270,7 +22270,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_BASCULIN_BLUE_STRIPED]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_BASCULIN_BLUE_STRIPED] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(HM01_CUT) | TMHM(HM08_DIVE) | TMHM(TM32_DOUBLE_TEAM) @@ -22289,7 +22289,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM06_TOXIC) | TMHM(HM07_WATERFALL)), - [SPECIES_DEERLING_SUMMER]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_DEERLING_SUMMER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) | TMHM(HM05_FLASH) @@ -22308,7 +22308,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_DEERLING_AUTUMN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_DEERLING_AUTUMN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) | TMHM(HM05_FLASH) @@ -22327,7 +22327,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_DEERLING_WINTER]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_DEERLING_WINTER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) | TMHM(HM05_FLASH) @@ -22346,7 +22346,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_SAWSBUCK_SUMMER]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_SAWSBUCK_SUMMER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(HM01_CUT) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -22368,7 +22368,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_SAWSBUCK_AUTUMN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_SAWSBUCK_AUTUMN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(HM01_CUT) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -22390,7 +22390,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_SAWSBUCK_WINTER]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_SAWSBUCK_WINTER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(HM01_CUT) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -22412,7 +22412,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_TORNADUS_THERIAN]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_TORNADUS_THERIAN] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM08_BULK_UP) @@ -22437,7 +22437,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM41_TORMENT) | TMHM(TM06_TOXIC)), - [SPECIES_THUNDURUS_THERIAN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_THUNDURUS_THERIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM08_BULK_UP) | TMHM(TM32_DOUBLE_TEAM) @@ -22464,7 +22464,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM41_TORMENT) | TMHM(TM06_TOXIC)), - [SPECIES_LANDORUS_THERIAN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_LANDORUS_THERIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM08_BULK_UP) | TMHM(TM04_CALM_MIND) @@ -22489,7 +22489,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM04_STRENGTH) | TMHM(TM06_TOXIC)), - [SPECIES_KYUREM_WHITE]= TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + [SPECIES_KYUREM_WHITE] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) | TMHM(HM01_CUT) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) @@ -22517,7 +22517,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_KYUREM_BLACK]= TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + [SPECIES_KYUREM_BLACK] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) | TMHM(HM01_CUT) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) @@ -22545,7 +22545,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_KELDEO_RESOLUTE]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_KELDEO_RESOLUTE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM04_CALM_MIND) | TMHM(HM01_CUT) | TMHM(TM32_DOUBLE_TEAM) @@ -22569,7 +22569,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM06_TOXIC) | TMHM(TM03_WATER_PULSE)), - [SPECIES_GENESECT_DOUSE_DRIVE]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_GENESECT_DOUSE_DRIVE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -22594,7 +22594,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_GENESECT_SHOCK_DRIVE]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_GENESECT_SHOCK_DRIVE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -22619,7 +22619,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_GENESECT_BURN_DRIVE]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_GENESECT_BURN_DRIVE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -22644,7 +22644,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_GENESECT_CHILL_DRIVE]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_GENESECT_CHILL_DRIVE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -22669,7 +22669,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_GRENINJA_BATTLE_BOND]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_GRENINJA_BATTLE_BOND] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM14_BLIZZARD) | TMHM(HM01_CUT) @@ -22697,7 +22697,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_VIVILLON_POLAR]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_POLAR] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22720,7 +22720,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_TUNDRA]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_TUNDRA] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22743,7 +22743,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_CONTINENTAL]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_CONTINENTAL] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22766,7 +22766,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_GARDEN]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_GARDEN] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22789,7 +22789,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_ELEGANT]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_ELEGANT] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22812,7 +22812,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_MEADOW]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_MEADOW] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22835,7 +22835,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_MODERN]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_MODERN] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22858,7 +22858,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_MARINE]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_MARINE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22881,7 +22881,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_ARCHIPELAGO]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_ARCHIPELAGO] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22904,7 +22904,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_HIGH_PLAINS]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_HIGH_PLAINS] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22927,7 +22927,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_SANDSTORM]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_SANDSTORM] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22950,7 +22950,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_RIVER]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_RIVER] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22973,7 +22973,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_MONSOON]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_MONSOON] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22996,7 +22996,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_SAVANNA]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_SAVANNA] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -23019,7 +23019,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_SUN]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_SUN] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -23042,7 +23042,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_OCEAN]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_OCEAN] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -23065,7 +23065,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_JUNGLE]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_JUNGLE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -23088,7 +23088,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_FANCY]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_FANCY] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -23111,7 +23111,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_POKE_BALL]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_POKE_BALL] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -23134,7 +23134,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_FLABEBE_YELLOW_FLOWER]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLABEBE_YELLOW_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23153,7 +23153,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FLABEBE_ORANGE_FLOWER]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLABEBE_ORANGE_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23172,7 +23172,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FLABEBE_BLUE_FLOWER]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLABEBE_BLUE_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23191,7 +23191,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FLABEBE_WHITE_FLOWER]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLABEBE_WHITE_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23210,7 +23210,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FLOETTE_YELLOW_FLOWER]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLOETTE_YELLOW_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23229,7 +23229,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FLOETTE_ORANGE_FLOWER]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLOETTE_ORANGE_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23248,7 +23248,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FLOETTE_BLUE_FLOWER]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLOETTE_BLUE_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23267,7 +23267,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FLOETTE_WHITE_FLOWER]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLOETTE_WHITE_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23286,7 +23286,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FLOETTE_ETERNAL_FLOWER]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLOETTE_ETERNAL_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23305,7 +23305,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FLORGES_YELLOW_FLOWER]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLORGES_YELLOW_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23326,7 +23326,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FLORGES_ORANGE_FLOWER]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLORGES_ORANGE_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23347,7 +23347,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FLORGES_BLUE_FLOWER]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLORGES_BLUE_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23368,7 +23368,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FLORGES_WHITE_FLOWER]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLORGES_WHITE_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23389,7 +23389,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FURFROU_HEART_TRIM]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FURFROU_HEART_TRIM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23408,7 +23408,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM03_SURF) | TMHM(TM06_TOXIC)), - [SPECIES_FURFROU_STAR_TRIM]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FURFROU_STAR_TRIM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23427,7 +23427,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM03_SURF) | TMHM(TM06_TOXIC)), - [SPECIES_FURFROU_DIAMOND_TRIM]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FURFROU_DIAMOND_TRIM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23446,7 +23446,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM03_SURF) | TMHM(TM06_TOXIC)), - [SPECIES_FURFROU_DEBUTANTE_TRIM]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FURFROU_DEBUTANTE_TRIM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23465,7 +23465,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM03_SURF) | TMHM(TM06_TOXIC)), - [SPECIES_FURFROU_MATRON_TRIM]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FURFROU_MATRON_TRIM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23484,7 +23484,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM03_SURF) | TMHM(TM06_TOXIC)), - [SPECIES_FURFROU_DANDY_TRIM]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FURFROU_DANDY_TRIM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23503,7 +23503,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM03_SURF) | TMHM(TM06_TOXIC)), - [SPECIES_FURFROU_LA_REINE_TRIM]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FURFROU_LA_REINE_TRIM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23522,7 +23522,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM03_SURF) | TMHM(TM06_TOXIC)), - [SPECIES_FURFROU_KABUKI_TRIM]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FURFROU_KABUKI_TRIM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23541,7 +23541,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM03_SURF) | TMHM(TM06_TOXIC)), - [SPECIES_FURFROU_PHARAOH_TRIM]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FURFROU_PHARAOH_TRIM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23560,7 +23560,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM03_SURF) | TMHM(TM06_TOXIC)), - [SPECIES_MEOWSTIC_FEMALE]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_MEOWSTIC_FEMALE] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(HM01_CUT) | TMHM(TM28_DIG) @@ -23589,7 +23589,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM41_TORMENT) | TMHM(TM06_TOXIC)), - [SPECIES_PUMPKABOO_SMALL]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PUMPKABOO_SMALL] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM09_BULLET_SEED) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23615,7 +23615,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_PUMPKABOO_LARGE]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PUMPKABOO_LARGE] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM09_BULLET_SEED) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23641,7 +23641,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_PUMPKABOO_SUPER]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PUMPKABOO_SUPER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM09_BULLET_SEED) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23667,7 +23667,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_GOURGEIST_SMALL]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_GOURGEIST_SMALL] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM09_BULLET_SEED) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23694,7 +23694,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_GOURGEIST_LARGE]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_GOURGEIST_LARGE] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM09_BULLET_SEED) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23721,7 +23721,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_GOURGEIST_SUPER]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_GOURGEIST_SUPER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM09_BULLET_SEED) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23769,7 +23769,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_ZYGARDE_10_POWER_CONSTRUCT]= TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM26_EARTHQUAKE) @@ -23790,7 +23790,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_ZYGARDE_50_POWER_CONSTRUCT]= TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM26_EARTHQUAKE) @@ -23811,7 +23811,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_ZYGARDE_COMPLETE]= TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_ZYGARDE_COMPLETE] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM26_EARTHQUAKE) @@ -23832,7 +23832,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_HOOPA_UNBOUND]= TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_HOOPA_UNBOUND] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23861,7 +23861,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM41_TORMENT) | TMHM(TM06_TOXIC)), - [SPECIES_ORICORIO_POM_POM]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ORICORIO_POM_POM] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -23878,7 +23878,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM06_TOXIC)), - [SPECIES_ORICORIO_PAU]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ORICORIO_PAU] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -23895,7 +23895,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM06_TOXIC)), - [SPECIES_ORICORIO_SENSU]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ORICORIO_SENSU] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -23912,7 +23912,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM06_TOXIC)), - [SPECIES_ROCKRUFF_OWN_TEMPO]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_ROCKRUFF_OWN_TEMPO] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) | TMHM(TM21_FRUSTRATION) @@ -23926,7 +23926,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM06_TOXIC)), - [SPECIES_LYCANROC_MIDNIGHT]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_LYCANROC_MIDNIGHT] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM08_BULK_UP) | TMHM(TM32_DOUBLE_TEAM) @@ -23942,7 +23942,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM06_TOXIC)), - [SPECIES_LYCANROC_DUSK]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_LYCANROC_DUSK] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM08_BULK_UP) | TMHM(TM32_DOUBLE_TEAM) @@ -23958,7 +23958,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_FIGHTING]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_FIGHTING] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -23981,7 +23981,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_FLYING]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_FLYING] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24004,7 +24004,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_POISON]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_POISON] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24027,7 +24027,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_GROUND]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_GROUND] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24050,7 +24050,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_ROCK]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_ROCK] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24073,7 +24073,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_BUG]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_BUG] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24096,7 +24096,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_GHOST]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_GHOST] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24119,7 +24119,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_STEEL]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_STEEL] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24142,7 +24142,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_FIRE]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_FIRE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24165,7 +24165,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_WATER]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_WATER] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24188,7 +24188,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_GRASS]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_GRASS] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24211,7 +24211,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_ELECTRIC]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_ELECTRIC] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24234,7 +24234,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_PSYCHIC]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_PSYCHIC] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24257,7 +24257,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_ICE]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_ICE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24280,7 +24280,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_DRAGON]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_DRAGON] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24303,7 +24303,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_DARK]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_DARK] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24326,7 +24326,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_FAIRY]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_FAIRY] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24349,7 +24349,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_MINIOR_CORE_RED]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_MINIOR_CORE_RED] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM26_EARTHQUAKE) @@ -24369,7 +24369,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM22_SOLARBEAM) | TMHM(TM06_TOXIC)), - [SPECIES_MINIOR_CORE_ORANGE]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_MINIOR_CORE_ORANGE] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM26_EARTHQUAKE) @@ -24389,7 +24389,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM22_SOLARBEAM) | TMHM(TM06_TOXIC)), - [SPECIES_MINIOR_CORE_YELLOW]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_MINIOR_CORE_YELLOW] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM26_EARTHQUAKE) @@ -24409,7 +24409,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM22_SOLARBEAM) | TMHM(TM06_TOXIC)), - [SPECIES_MINIOR_CORE_GREEN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_MINIOR_CORE_GREEN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM26_EARTHQUAKE) @@ -24429,7 +24429,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM22_SOLARBEAM) | TMHM(TM06_TOXIC)), - [SPECIES_MINIOR_CORE_BLUE]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_MINIOR_CORE_BLUE] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM26_EARTHQUAKE) @@ -24449,7 +24449,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM22_SOLARBEAM) | TMHM(TM06_TOXIC)), - [SPECIES_MINIOR_CORE_INDIGO]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_MINIOR_CORE_INDIGO] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM26_EARTHQUAKE) @@ -24469,7 +24469,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM22_SOLARBEAM) | TMHM(TM06_TOXIC)), - [SPECIES_MINIOR_CORE_VIOLET]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_MINIOR_CORE_VIOLET] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM26_EARTHQUAKE) @@ -24489,7 +24489,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM22_SOLARBEAM) | TMHM(TM06_TOXIC)), - [SPECIES_NECROZMA_DUSK_MANE]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_NECROZMA_DUSK_MANE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM31_BRICK_BREAK) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -24510,7 +24510,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_NECROZMA_DAWN_WINGS]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_NECROZMA_DAWN_WINGS] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM31_BRICK_BREAK) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -24531,7 +24531,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_MAGEARNA_ORIGINAL_COLOR]= TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_MAGEARNA_ORIGINAL_COLOR] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM21_FRUSTRATION) @@ -24547,7 +24547,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM22_SOLARBEAM) | TMHM(TM24_THUNDERBOLT)), - [SPECIES_TOXTRICITY_LOW_KEY]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_TOXTRICITY_LOW_KEY] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM42_FACADE) | TMHM(TM15_HYPER_BEAM) | TMHM(TM17_PROTECT) @@ -24559,14 +24559,14 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SINISTEA_ANTIQUE]= TMHM_LEARNSET(TMHM(TM42_FACADE) + [SPECIES_SINISTEA_ANTIQUE] = TMHM_LEARNSET(TMHM(TM42_FACADE) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM17_PROTECT) | TMHM(TM29_PSYCHIC) | TMHM(TM44_REST) | TMHM(TM30_SHADOW_BALL)), - [SPECIES_POLTEAGEIST_ANTIQUE]= TMHM_LEARNSET(TMHM(TM42_FACADE) + [SPECIES_POLTEAGEIST_ANTIQUE] = TMHM_LEARNSET(TMHM(TM42_FACADE) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM15_HYPER_BEAM) | TMHM(TM16_LIGHT_SCREEN) @@ -24576,7 +24576,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM44_REST) | TMHM(TM30_SHADOW_BALL)), - [SPECIES_ALCREMIE_RUBY_CREAM]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_ALCREMIE_RUBY_CREAM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM42_FACADE) | TMHM(TM19_GIGA_DRAIN) @@ -24588,7 +24588,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM20_SAFEGUARD) | TMHM(TM22_SOLARBEAM)), - [SPECIES_ALCREMIE_MATCHA_CREAM]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_ALCREMIE_MATCHA_CREAM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM42_FACADE) | TMHM(TM19_GIGA_DRAIN) @@ -24600,7 +24600,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM20_SAFEGUARD) | TMHM(TM22_SOLARBEAM)), - [SPECIES_ALCREMIE_MINT_CREAM]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_ALCREMIE_MINT_CREAM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM42_FACADE) | TMHM(TM19_GIGA_DRAIN) @@ -24612,7 +24612,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM20_SAFEGUARD) | TMHM(TM22_SOLARBEAM)), - [SPECIES_ALCREMIE_LEMON_CREAM]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_ALCREMIE_LEMON_CREAM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM42_FACADE) | TMHM(TM19_GIGA_DRAIN) @@ -24624,7 +24624,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM20_SAFEGUARD) | TMHM(TM22_SOLARBEAM)), - [SPECIES_ALCREMIE_SALTED_CREAM]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_ALCREMIE_SALTED_CREAM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM42_FACADE) | TMHM(TM19_GIGA_DRAIN) @@ -24636,7 +24636,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM20_SAFEGUARD) | TMHM(TM22_SOLARBEAM)), - [SPECIES_ALCREMIE_RUBY_SWIRL]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_ALCREMIE_RUBY_SWIRL] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM42_FACADE) | TMHM(TM19_GIGA_DRAIN) @@ -24648,7 +24648,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM20_SAFEGUARD) | TMHM(TM22_SOLARBEAM)), - [SPECIES_ALCREMIE_CARAMEL_SWIRL]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_ALCREMIE_CARAMEL_SWIRL] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM42_FACADE) | TMHM(TM19_GIGA_DRAIN) @@ -24660,7 +24660,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM20_SAFEGUARD) | TMHM(TM22_SOLARBEAM)), - [SPECIES_ALCREMIE_RAINBOW_SWIRL]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_ALCREMIE_RAINBOW_SWIRL] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM42_FACADE) | TMHM(TM19_GIGA_DRAIN) @@ -24672,7 +24672,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM20_SAFEGUARD) | TMHM(TM22_SOLARBEAM)), - [SPECIES_INDEEDEE_FEMALE]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_INDEEDEE_FEMALE] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM42_FACADE) | TMHM(TM16_LIGHT_SCREEN) @@ -24683,7 +24683,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM20_SAFEGUARD) | TMHM(TM30_SHADOW_BALL)), - [SPECIES_URSHIFU_RAPID_STRIKE_STYLE]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM08_BULK_UP) @@ -24715,7 +24715,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM46_THIEF)), - [SPECIES_CALYREX_ICE_RIDER]= TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + [SPECIES_CALYREX_ICE_RIDER] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) | TMHM(TM09_BULLET_SEED) | TMHM(TM04_CALM_MIND) | TMHM(TM42_FACADE) @@ -24735,7 +24735,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM41_TORMENT)), - [SPECIES_CALYREX_SHADOW_RIDER]= TMHM_LEARNSET(TMHM(TM09_BULLET_SEED) + [SPECIES_CALYREX_SHADOW_RIDER] = TMHM_LEARNSET(TMHM(TM09_BULLET_SEED) | TMHM(TM04_CALM_MIND) | TMHM(TM42_FACADE) | TMHM(TM19_GIGA_DRAIN) diff --git a/src/data/pokemon/tutor_learnsets.h b/src/data/pokemon/tutor_learnsets.h index 88b70e1899..0e63c8d58f 100644 --- a/src/data/pokemon/tutor_learnsets.h +++ b/src/data/pokemon/tutor_learnsets.h @@ -10193,7 +10193,7 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SUBSTITUTE) | TUTOR(MOVE_SWIFT)), - [SPECIES_MEOWTH_GALARIAN]= TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) + [SPECIES_MEOWTH_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) | TUTOR(MOVE_DOUBLE_EDGE) | TUTOR(MOVE_ENDURE) | TUTOR(MOVE_SLEEP_TALK) @@ -10202,7 +10202,7 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SWAGGER) | TUTOR(MOVE_SWORDS_DANCE)), - [SPECIES_PONYTA_GALARIAN]= TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) + [SPECIES_PONYTA_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) | TUTOR(MOVE_DOUBLE_EDGE) | TUTOR(MOVE_ENDURE) | TUTOR(MOVE_SLEEP_TALK) @@ -10210,7 +10210,7 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SUBSTITUTE) | TUTOR(MOVE_SWIFT)), - [SPECIES_RAPIDASH_GALARIAN]= TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) + [SPECIES_RAPIDASH_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) | TUTOR(MOVE_ENDURE) | TUTOR(MOVE_SLEEP_TALK) | TUTOR(MOVE_SNORE) @@ -10218,7 +10218,7 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SWIFT) | TUTOR(MOVE_SWORDS_DANCE)), - [SPECIES_SLOWPOKE_GALARIAN]= TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) + [SPECIES_SLOWPOKE_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) | TUTOR(MOVE_ENDURE) | TUTOR(MOVE_ICY_WIND) | TUTOR(MOVE_PSYCH_UP) @@ -10228,7 +10228,7 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SWIFT) | TUTOR(MOVE_THUNDER_WAVE)), - [SPECIES_SLOWBRO_GALARIAN]= TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) + [SPECIES_SLOWBRO_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) | TUTOR(MOVE_ENDURE) | TUTOR(MOVE_ICE_PUNCH) | TUTOR(MOVE_ICY_WIND) @@ -10241,7 +10241,7 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SWIFT) | TUTOR(MOVE_THUNDER_WAVE)), - [SPECIES_FARFETCHD_GALARIAN]= TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) + [SPECIES_FARFETCHD_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) | TUTOR(MOVE_COUNTER) | TUTOR(MOVE_DOUBLE_EDGE) | TUTOR(MOVE_ENDURE) @@ -10251,13 +10251,13 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SUBSTITUTE) | TUTOR(MOVE_SWORDS_DANCE)), - [SPECIES_WEEZING_GALARIAN]= TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) + [SPECIES_WEEZING_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) | TUTOR(MOVE_EXPLOSION) | TUTOR(MOVE_SLEEP_TALK) | TUTOR(MOVE_SNORE) | TUTOR(MOVE_SUBSTITUTE)), - [SPECIES_MR_MIME_GALARIAN]= TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) + [SPECIES_MR_MIME_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) | TUTOR(MOVE_ENDURE) | TUTOR(MOVE_ICE_PUNCH) | TUTOR(MOVE_ICY_WIND) @@ -10270,14 +10270,14 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SUBSTITUTE) | TUTOR(MOVE_THUNDER_WAVE)), - [SPECIES_ARTICUNO_GALARIAN]= TUTOR_LEARNSET(TUTOR(MOVE_DREAM_EATER) + [SPECIES_ARTICUNO_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_DREAM_EATER) | TUTOR(MOVE_ENDURE) | TUTOR(MOVE_SLEEP_TALK) | TUTOR(MOVE_SNORE) | TUTOR(MOVE_SUBSTITUTE) | TUTOR(MOVE_SWIFT)), - [SPECIES_ZAPDOS_GALARIAN]= TUTOR_LEARNSET(TUTOR(MOVE_COUNTER) + [SPECIES_ZAPDOS_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_COUNTER) | TUTOR(MOVE_ENDURE) | TUTOR(MOVE_MEGA_KICK) | TUTOR(MOVE_SLEEP_TALK) @@ -10285,13 +10285,13 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SUBSTITUTE) | TUTOR(MOVE_SWIFT)), - [SPECIES_MOLTRES_GALARIAN]= TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) + [SPECIES_MOLTRES_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) | TUTOR(MOVE_SLEEP_TALK) | TUTOR(MOVE_SNORE) | TUTOR(MOVE_SUBSTITUTE) | TUTOR(MOVE_SWIFT)), - [SPECIES_SLOWKING_GALARIAN]= TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) + [SPECIES_SLOWKING_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) | TUTOR(MOVE_ENDURE) | TUTOR(MOVE_ICE_PUNCH) | TUTOR(MOVE_ICY_WIND) @@ -10305,7 +10305,7 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SWIFT) | TUTOR(MOVE_THUNDER_WAVE)), - [SPECIES_CORSOLA_GALARIAN]= TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) + [SPECIES_CORSOLA_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) | TUTOR(MOVE_ENDURE) | TUTOR(MOVE_ICY_WIND) | TUTOR(MOVE_ROCK_SLIDE) @@ -10313,7 +10313,7 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SNORE) | TUTOR(MOVE_SUBSTITUTE)), - [SPECIES_ZIGZAGOON_GALARIAN]= TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) + [SPECIES_ZIGZAGOON_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) | TUTOR(MOVE_COUNTER) | TUTOR(MOVE_DOUBLE_EDGE) | TUTOR(MOVE_ENDURE) @@ -10324,7 +10324,7 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SWIFT) | TUTOR(MOVE_THUNDER_WAVE)), - [SPECIES_LINOONE_GALARIAN]= TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) + [SPECIES_LINOONE_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) | TUTOR(MOVE_COUNTER) | TUTOR(MOVE_DOUBLE_EDGE) | TUTOR(MOVE_ENDURE) @@ -10335,7 +10335,7 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SWIFT) | TUTOR(MOVE_THUNDER_WAVE)), - [SPECIES_DARUMAKA_GALARIAN]= TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) + [SPECIES_DARUMAKA_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) | TUTOR(MOVE_FIRE_PUNCH) | TUTOR(MOVE_ICE_PUNCH) | TUTOR(MOVE_MEGA_KICK) @@ -10345,7 +10345,7 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SNORE) | TUTOR(MOVE_SUBSTITUTE)), - [SPECIES_DARMANITAN_GALARIAN]= TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) + [SPECIES_DARMANITAN_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) | TUTOR(MOVE_ENDURE) | TUTOR(MOVE_FIRE_PUNCH) | TUTOR(MOVE_ICE_PUNCH) @@ -10356,13 +10356,13 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SNORE) | TUTOR(MOVE_SUBSTITUTE)), - [SPECIES_YAMASK_GALARIAN]= TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) + [SPECIES_YAMASK_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) | TUTOR(MOVE_ROCK_SLIDE) | TUTOR(MOVE_SLEEP_TALK) | TUTOR(MOVE_SNORE) | TUTOR(MOVE_SUBSTITUTE)), - [SPECIES_STUNFISK_GALARIAN]= TUTOR_LEARNSET(TUTOR(MOVE_COUNTER) + [SPECIES_STUNFISK_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_COUNTER) | TUTOR(MOVE_ENDURE) | TUTOR(MOVE_MUD_SLAP) | TUTOR(MOVE_ROCK_SLIDE) @@ -10371,11 +10371,11 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SUBSTITUTE) | TUTOR(MOVE_THUNDER_WAVE)), - [SPECIES_BURMY_SANDY_CLOAK]= TUTOR_LEARNSET(TUTOR(MOVE_SNORE)), + [SPECIES_BURMY_SANDY_CLOAK] = TUTOR_LEARNSET(TUTOR(MOVE_SNORE)), - [SPECIES_BURMY_TRASH_CLOAK]= TUTOR_LEARNSET(TUTOR(MOVE_SNORE)), + [SPECIES_BURMY_TRASH_CLOAK] = TUTOR_LEARNSET(TUTOR(MOVE_SNORE)), - [SPECIES_WORMADAM_SANDY_CLOAK]= TUTOR_LEARNSET(TUTOR(MOVE_DREAM_EATER) + [SPECIES_WORMADAM_SANDY_CLOAK] = TUTOR_LEARNSET(TUTOR(MOVE_DREAM_EATER) | TUTOR(MOVE_ENDURE) | TUTOR(MOVE_MUD_SLAP) | TUTOR(MOVE_PSYCH_UP) @@ -10385,7 +10385,7 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SUBSTITUTE) | TUTOR(MOVE_SWAGGER)), - [SPECIES_WORMADAM_TRASH_CLOAK]= TUTOR_LEARNSET(TUTOR(MOVE_DREAM_EATER) + [SPECIES_WORMADAM_TRASH_CLOAK] = TUTOR_LEARNSET(TUTOR(MOVE_DREAM_EATER) | TUTOR(MOVE_ENDURE) | TUTOR(MOVE_PSYCH_UP) | TUTOR(MOVE_SLEEP_TALK) @@ -10462,7 +10462,7 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SUBSTITUTE) | TUTOR(MOVE_SWAGGER)), - [SPECIES_MEOWSTIC_FEMALE]= TUTOR_LEARNSET(TUTOR(MOVE_DREAM_EATER) + [SPECIES_MEOWSTIC_FEMALE] = TUTOR_LEARNSET(TUTOR(MOVE_DREAM_EATER) | TUTOR(MOVE_PSYCH_UP) | TUTOR(MOVE_SLEEP_TALK) | TUTOR(MOVE_SNORE) @@ -10470,7 +10470,7 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SWAGGER) | TUTOR(MOVE_THUNDER_WAVE)), - [SPECIES_TOXTRICITY_LOW_KEY]= TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) + [SPECIES_TOXTRICITY_LOW_KEY] = TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) | TUTOR(MOVE_FIRE_PUNCH) | TUTOR(MOVE_MEGA_KICK) | TUTOR(MOVE_MEGA_PUNCH) @@ -10482,67 +10482,67 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_THUNDER_PUNCH) | TUTOR(MOVE_THUNDER_WAVE)), - [SPECIES_SINISTEA_ANTIQUE]= TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) + [SPECIES_SINISTEA_ANTIQUE] = TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) | TUTOR(MOVE_METRONOME) | TUTOR(MOVE_SLEEP_TALK) | TUTOR(MOVE_SNORE) | TUTOR(MOVE_SUBSTITUTE)), - [SPECIES_POLTEAGEIST_ANTIQUE]= TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) + [SPECIES_POLTEAGEIST_ANTIQUE] = TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) | TUTOR(MOVE_METRONOME) | TUTOR(MOVE_SLEEP_TALK) | TUTOR(MOVE_SNORE) | TUTOR(MOVE_SUBSTITUTE)), - [SPECIES_ALCREMIE_RUBY_CREAM]= TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) + [SPECIES_ALCREMIE_RUBY_CREAM] = TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) | TUTOR(MOVE_METRONOME) | TUTOR(MOVE_SLEEP_TALK) | TUTOR(MOVE_SNORE) | TUTOR(MOVE_SUBSTITUTE)), - [SPECIES_ALCREMIE_MATCHA_CREAM]= TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) + [SPECIES_ALCREMIE_MATCHA_CREAM] = TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) | TUTOR(MOVE_METRONOME) | TUTOR(MOVE_SLEEP_TALK) | TUTOR(MOVE_SNORE) | TUTOR(MOVE_SUBSTITUTE)), - [SPECIES_ALCREMIE_MINT_CREAM]= TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) + [SPECIES_ALCREMIE_MINT_CREAM] = TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) | TUTOR(MOVE_METRONOME) | TUTOR(MOVE_SLEEP_TALK) | TUTOR(MOVE_SNORE) | TUTOR(MOVE_SUBSTITUTE)), - [SPECIES_ALCREMIE_LEMON_CREAM]= TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) + [SPECIES_ALCREMIE_LEMON_CREAM] = TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) | TUTOR(MOVE_METRONOME) | TUTOR(MOVE_SLEEP_TALK) | TUTOR(MOVE_SNORE) | TUTOR(MOVE_SUBSTITUTE)), - [SPECIES_ALCREMIE_SALTED_CREAM]= TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) + [SPECIES_ALCREMIE_SALTED_CREAM] = TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) | TUTOR(MOVE_METRONOME) | TUTOR(MOVE_SLEEP_TALK) | TUTOR(MOVE_SNORE) | TUTOR(MOVE_SUBSTITUTE)), - [SPECIES_ALCREMIE_RUBY_SWIRL]= TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) + [SPECIES_ALCREMIE_RUBY_SWIRL] = TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) | TUTOR(MOVE_METRONOME) | TUTOR(MOVE_SLEEP_TALK) | TUTOR(MOVE_SNORE) | TUTOR(MOVE_SUBSTITUTE)), - [SPECIES_ALCREMIE_CARAMEL_SWIRL]= TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) + [SPECIES_ALCREMIE_CARAMEL_SWIRL] = TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) | TUTOR(MOVE_METRONOME) | TUTOR(MOVE_SLEEP_TALK) | TUTOR(MOVE_SNORE) | TUTOR(MOVE_SUBSTITUTE)), - [SPECIES_ALCREMIE_RAINBOW_SWIRL]= TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) + [SPECIES_ALCREMIE_RAINBOW_SWIRL] = TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) | TUTOR(MOVE_METRONOME) | TUTOR(MOVE_SLEEP_TALK) | TUTOR(MOVE_SNORE) | TUTOR(MOVE_SUBSTITUTE)), - [SPECIES_INDEEDEE_FEMALE]= TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) + [SPECIES_INDEEDEE_FEMALE] = TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) | TUTOR(MOVE_METRONOME) | TUTOR(MOVE_PSYCH_UP) | TUTOR(MOVE_SLEEP_TALK) @@ -10550,7 +10550,7 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SUBSTITUTE) | TUTOR(MOVE_SWIFT)), - [SPECIES_URSHIFU_RAPID_STRIKE_STYLE]= TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) | TUTOR(MOVE_COUNTER) | TUTOR(MOVE_DYNAMIC_PUNCH) | TUTOR(MOVE_ENDURE) @@ -10576,7 +10576,7 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SWAGGER) | TUTOR(MOVE_SWIFT)), - [SPECIES_CALYREX_ICE_RIDER]= TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) + [SPECIES_CALYREX_ICE_RIDER] = TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) | TUTOR(MOVE_DOUBLE_EDGE) | TUTOR(MOVE_ENDURE) | TUTOR(MOVE_ICY_WIND) @@ -10587,7 +10587,7 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SWIFT) | TUTOR(MOVE_SWORDS_DANCE)), - [SPECIES_CALYREX_SHADOW_RIDER]= TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) + [SPECIES_CALYREX_SHADOW_RIDER] = TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) | TUTOR(MOVE_DOUBLE_EDGE) | TUTOR(MOVE_ENDURE) | TUTOR(MOVE_METRONOME)