summaryrefslogtreecommitdiff
path: root/src/data
diff options
context:
space:
mode:
Diffstat (limited to 'src/data')
-rw-r--r--src/data/battle_anim.h6
-rw-r--r--src/data/battle_moves.h2
-rw-r--r--src/data/items.h4
-rw-r--r--src/data/pokemon/tmhm_learnsets.h248
4 files changed, 130 insertions, 130 deletions
diff --git a/src/data/battle_anim.h b/src/data/battle_anim.h
index 5b24981d5..58b990c73 100644
--- a/src/data/battle_anim.h
+++ b/src/data/battle_anim.h
@@ -1619,7 +1619,7 @@ const struct BattleAnimBackground gBattleAnimBackgroundTable[] =
[BG_FISSURE] = {gBattleAnimBgImage_Fissure, gBattleAnimBgPalette_Fissure, gBattleAnimBgTilemap_Fissure},
[BG_BUG_OPPONENT] = {gBattleAnimBgImage_Highspeed, gBattleAnimBgPalette_Bug, gBattleAnimBgTilemap_HighspeedOpponent},
[BG_BUG_PLAYER] = {gBattleAnimBgImage_Highspeed, gBattleAnimBgPalette_Bug, gBattleAnimBgTilemap_HighspeedPlayer},
- [BG_SOLARBEAM_OPPONENT] = {gBattleAnimBgImage_Impact, gBattleAnimBgPalette_Solarbeam, gBattleAnimBgTilemap_ImpactOpponent},
- [BG_SOLARBEAM_PLAYER] = {gBattleAnimBgImage_Impact, gBattleAnimBgPalette_Solarbeam, gBattleAnimBgTilemap_ImpactPlayer},
- [BG_SOLARBEAM_CONTESTS] = {gBattleAnimBgImage_Impact, gBattleAnimBgPalette_Solarbeam, gBattleAnimBgTilemap_ImpactContests},
+ [BG_SOLAR_BEAM_OPPONENT] = {gBattleAnimBgImage_Impact, gBattleAnimBgPalette_SolarBeam, gBattleAnimBgTilemap_ImpactOpponent},
+ [BG_SOLAR_BEAM_PLAYER] = {gBattleAnimBgImage_Impact, gBattleAnimBgPalette_SolarBeam, gBattleAnimBgTilemap_ImpactPlayer},
+ [BG_SOLAR_BEAM_CONTESTS] = {gBattleAnimBgImage_Impact, gBattleAnimBgPalette_SolarBeam, gBattleAnimBgTilemap_ImpactContests},
};
diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h
index f78fa2c8c..82892120f 100644
--- a/src/data/battle_moves.h
+++ b/src/data/battle_moves.h
@@ -990,7 +990,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
[MOVE_SOLAR_BEAM] =
{
- .effect = EFFECT_SOLARBEAM,
+ .effect = EFFECT_SOLAR_BEAM,
.power = 120,
.type = TYPE_GRASS,
.accuracy = 100,
diff --git a/src/data/items.h b/src/data/items.h
index 370cd2022..20ee057da 100644
--- a/src/data/items.h
+++ b/src/data/items.h
@@ -3744,10 +3744,10 @@ const struct Item gItems[] =
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
},
- [ITEM_TM22_SOLARBEAM] =
+ [ITEM_TM22_SOLAR_BEAM] =
{
.name = _("TM22"),
- .itemId = ITEM_TM22_SOLARBEAM,
+ .itemId = ITEM_TM22_SOLAR_BEAM,
.price = 3000,
.description = sTM22Desc,
.pocket = POCKET_TM_HM,
diff --git a/src/data/pokemon/tmhm_learnsets.h b/src/data/pokemon/tmhm_learnsets.h
index deeeda16f..cb42d7c6f 100644
--- a/src/data/pokemon/tmhm_learnsets.h
+++ b/src/data/pokemon/tmhm_learnsets.h
@@ -15,7 +15,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM36_SLUDGE_BOMB)
@@ -35,7 +35,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM36_SLUDGE_BOMB)
@@ -57,7 +57,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM26_EARTHQUAKE)
| TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM)
@@ -239,7 +239,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM29_PSYCHIC)
| TMHM(TM30_SHADOW_BALL)
@@ -264,7 +264,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM31_BRICK_BREAK)
| TMHM(TM32_DOUBLE_TEAM)
@@ -758,7 +758,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
@@ -794,7 +794,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
@@ -867,7 +867,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
| TMHM(TM27_RETURN)
@@ -901,7 +901,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
| TMHM(TM27_RETURN)
@@ -974,7 +974,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM36_SLUDGE_BOMB)
@@ -992,7 +992,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM36_SLUDGE_BOMB)
@@ -1011,7 +1011,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM36_SLUDGE_BOMB)
@@ -1029,7 +1029,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM28_DIG)
| TMHM(TM32_DOUBLE_TEAM)
@@ -1052,7 +1052,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM28_DIG)
| TMHM(TM32_DOUBLE_TEAM)
@@ -1073,7 +1073,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM29_PSYCHIC)
| TMHM(TM32_DOUBLE_TEAM)
@@ -1093,7 +1093,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM29_PSYCHIC)
| TMHM(TM32_DOUBLE_TEAM)
@@ -1607,7 +1607,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM36_SLUDGE_BOMB)
@@ -1626,7 +1626,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM36_SLUDGE_BOMB)
@@ -1646,7 +1646,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM36_SLUDGE_BOMB)
@@ -1778,7 +1778,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM11_SUNNY_DAY)
| TMHM(TM17_PROTECT)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM)
@@ -1797,7 +1797,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM15_HYPER_BEAM)
| TMHM(TM17_PROTECT)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM)
@@ -2348,7 +2348,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM29_PSYCHIC)
| TMHM(TM32_DOUBLE_TEAM)
@@ -2372,7 +2372,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM29_PSYCHIC)
| TMHM(TM32_DOUBLE_TEAM)
@@ -2495,7 +2495,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
@@ -2647,7 +2647,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
@@ -2680,7 +2680,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM36_SLUDGE_BOMB)
@@ -2706,7 +2706,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
@@ -2872,7 +2872,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
| TMHM(TM27_RETURN)
@@ -3021,7 +3021,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
@@ -3198,7 +3198,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
@@ -3356,7 +3356,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
| TMHM(TM26_EARTHQUAKE)
@@ -3560,7 +3560,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
@@ -3608,7 +3608,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
@@ -3655,7 +3655,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM)
@@ -3676,7 +3676,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM)
@@ -3700,7 +3700,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM26_EARTHQUAKE)
| TMHM(TM27_RETURN)
@@ -3874,7 +3874,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM27_RETURN)
@@ -3903,7 +3903,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
@@ -3976,7 +3976,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM28_DIG)
| TMHM(TM31_BRICK_BREAK)
@@ -4000,7 +4000,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM28_DIG)
| TMHM(TM31_BRICK_BREAK)
@@ -4020,7 +4020,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM28_DIG)
| TMHM(TM29_PSYCHIC)
@@ -4040,7 +4040,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM28_DIG)
| TMHM(TM29_PSYCHIC)
@@ -4151,7 +4151,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM27_RETURN)
| TMHM(TM28_DIG)
@@ -4177,7 +4177,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM28_DIG)
| TMHM(TM29_PSYCHIC)
@@ -4202,7 +4202,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM29_PSYCHIC)
| TMHM(TM30_SHADOW_BALL)
@@ -4229,7 +4229,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM29_PSYCHIC)
| TMHM(TM30_SHADOW_BALL)
@@ -4258,7 +4258,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM29_PSYCHIC)
| TMHM(TM30_SHADOW_BALL)
@@ -4284,7 +4284,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM29_PSYCHIC)
| TMHM(TM30_SHADOW_BALL)
@@ -4373,7 +4373,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM36_SLUDGE_BOMB)
@@ -4493,7 +4493,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM40_AERIAL_ACE)
@@ -4510,7 +4510,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM40_AERIAL_ACE)
@@ -4528,7 +4528,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM40_AERIAL_ACE)
@@ -4547,7 +4547,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
@@ -4577,7 +4577,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM36_SLUDGE_BOMB)
@@ -4598,7 +4598,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM36_SLUDGE_BOMB)
@@ -4615,7 +4615,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM29_PSYCHIC)
| TMHM(TM30_SHADOW_BALL)
@@ -4855,7 +4855,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM26_EARTHQUAKE)
| TMHM(TM27_RETURN)
| TMHM(TM28_DIG)
@@ -4877,7 +4877,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM26_EARTHQUAKE)
| TMHM(TM27_RETURN)
| TMHM(TM28_DIG)
@@ -4901,7 +4901,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
@@ -4982,7 +4982,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
| TMHM(TM26_EARTHQUAKE)
@@ -5017,7 +5017,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
@@ -5455,7 +5455,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM12_TAUNT)
| TMHM(TM17_PROTECT)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM27_RETURN)
| TMHM(TM30_SHADOW_BALL)
@@ -5481,7 +5481,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM15_HYPER_BEAM)
| TMHM(TM17_PROTECT)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM27_RETURN)
| TMHM(TM30_SHADOW_BALL)
@@ -5568,7 +5568,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
@@ -5593,7 +5593,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
@@ -5731,7 +5731,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
@@ -5766,7 +5766,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
@@ -5826,7 +5826,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM27_RETURN)
| TMHM(TM28_DIG)
@@ -6003,7 +6003,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
| TMHM(TM26_EARTHQUAKE)
@@ -6039,7 +6039,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM29_PSYCHIC)
| TMHM(TM30_SHADOW_BALL)
@@ -6114,7 +6114,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM27_RETURN)
| TMHM(TM28_DIG)
@@ -6140,7 +6140,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM27_RETURN)
| TMHM(TM28_DIG)
@@ -6169,7 +6169,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM26_EARTHQUAKE)
| TMHM(TM27_RETURN)
@@ -6450,7 +6450,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM29_PSYCHIC)
| TMHM(TM30_SHADOW_BALL)
@@ -6473,7 +6473,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM29_PSYCHIC)
| TMHM(TM30_SHADOW_BALL)
@@ -6499,7 +6499,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM42_FACADE)
@@ -6522,7 +6522,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM31_BRICK_BREAK)
| TMHM(TM32_DOUBLE_TEAM)
@@ -6552,7 +6552,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM31_BRICK_BREAK)
| TMHM(TM32_DOUBLE_TEAM)
@@ -6575,7 +6575,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM28_DIG)
| TMHM(TM30_SHADOW_BALL)
@@ -6595,7 +6595,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM28_DIG)
| TMHM(TM30_SHADOW_BALL)
@@ -6621,7 +6621,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM28_DIG)
| TMHM(TM30_SHADOW_BALL)
@@ -6646,7 +6646,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM28_DIG)
| TMHM(TM30_SHADOW_BALL)
@@ -6666,7 +6666,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM28_DIG)
| TMHM(TM30_SHADOW_BALL)
@@ -6688,7 +6688,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM28_DIG)
| TMHM(TM30_SHADOW_BALL)
@@ -6745,7 +6745,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM36_SLUDGE_BOMB)
@@ -6767,7 +6767,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM27_RETURN)
| TMHM(TM31_BRICK_BREAK)
@@ -6866,7 +6866,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM30_SHADOW_BALL)
| TMHM(TM32_DOUBLE_TEAM)
@@ -6888,7 +6888,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM30_SHADOW_BALL)
| TMHM(TM32_DOUBLE_TEAM)
@@ -6960,7 +6960,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
@@ -6987,7 +6987,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
@@ -7014,7 +7014,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
@@ -7048,7 +7048,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM26_EARTHQUAKE)
| TMHM(TM27_RETURN)
| TMHM(TM28_DIG)
@@ -7073,7 +7073,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM26_EARTHQUAKE)
| TMHM(TM27_RETURN)
| TMHM(TM28_DIG)
@@ -7383,7 +7383,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM26_EARTHQUAKE)
| TMHM(TM27_RETURN)
| TMHM(TM28_DIG)
@@ -7404,7 +7404,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM26_EARTHQUAKE)
| TMHM(TM27_RETURN)
| TMHM(TM28_DIG)
@@ -7428,7 +7428,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM26_EARTHQUAKE)
| TMHM(TM27_RETURN)
@@ -7660,7 +7660,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM37_SANDSTORM)
@@ -7680,7 +7680,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM37_SANDSTORM)
@@ -7769,7 +7769,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM26_EARTHQUAKE)
| TMHM(TM27_RETURN)
| TMHM(TM29_PSYCHIC)
@@ -7906,7 +7906,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM31_BRICK_BREAK)
| TMHM(TM32_DOUBLE_TEAM)
@@ -7982,7 +7982,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM40_AERIAL_ACE)
@@ -8005,7 +8005,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM26_EARTHQUAKE)
| TMHM(TM27_RETURN)
@@ -8085,7 +8085,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM30_SHADOW_BALL)
| TMHM(TM32_DOUBLE_TEAM)
@@ -8108,7 +8108,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
| TMHM(TM27_RETURN)
@@ -8140,7 +8140,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
| TMHM(TM26_EARTHQUAKE)
@@ -8174,7 +8174,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
| TMHM(TM26_EARTHQUAKE)
@@ -8204,7 +8204,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM30_SHADOW_BALL)
| TMHM(TM32_DOUBLE_TEAM)
@@ -8229,7 +8229,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM30_SHADOW_BALL)
| TMHM(TM32_DOUBLE_TEAM)
@@ -8253,7 +8253,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM26_EARTHQUAKE)
| TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM)
@@ -8279,7 +8279,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM30_SHADOW_BALL)
| TMHM(TM32_DOUBLE_TEAM)
@@ -8302,7 +8302,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM26_EARTHQUAKE)
| TMHM(TM27_RETURN)
| TMHM(TM30_SHADOW_BALL)
@@ -8332,7 +8332,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM26_EARTHQUAKE)
| TMHM(TM27_RETURN)
| TMHM(TM30_SHADOW_BALL)
@@ -8538,7 +8538,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
@@ -8649,7 +8649,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
@@ -8683,7 +8683,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
| TMHM(TM27_RETURN)
@@ -8710,7 +8710,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
| TMHM(TM27_RETURN)
@@ -8736,7 +8736,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
| TMHM(TM27_RETURN)
@@ -8759,7 +8759,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM36_SLUDGE_BOMB)
@@ -8777,7 +8777,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM26_EARTHQUAKE)
| TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM)
@@ -9160,7 +9160,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
@@ -9196,7 +9196,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
@@ -9234,7 +9234,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
| TMHM(TM26_EARTHQUAKE)
@@ -9272,7 +9272,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
| TMHM(TM26_EARTHQUAKE)
@@ -9337,7 +9337,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE)
| TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION)
- | TMHM(TM22_SOLARBEAM)
+ | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER)
| TMHM(TM27_RETURN)
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 22:03:35 +0000