dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Standarized Solarbeam into Solar Beam

Browse Source
This commit is contained in:
Eduardo Quezada D'Ottone
2021-11-01 18:36:35 -03:00
parent 54a70ca4d4
commit f3013d8ee9
16 changed files with 220 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/battle_ai_scripts.s
+2 -2
View File
@@ -735,7 +735,7 @@ AI_CheckViability:
if_effect EFFECT_PSYCH_UP, AI_CV_PsychUp if_effect EFFECT_PSYCH_UP, AI_CV_PsychUp
if_effect EFFECT_MIRROR_COAT, AI_CV_MirrorCoat if_effect EFFECT_MIRROR_COAT, AI_CV_MirrorCoat
if_effect EFFECT_SKULL_BASH, AI_CV_ChargeUpMove if_effect EFFECT_SKULL_BASH, AI_CV_ChargeUpMove
if_effect EFFECT_SOLARBEAM, AI_CV_ChargeUpMove if_effect EFFECT_SOLAR_BEAM, AI_CV_ChargeUpMove
if_effect EFFECT_SEMI_INVULNERABLE, AI_CV_SemiInvulnerable if_effect EFFECT_SEMI_INVULNERABLE, AI_CV_SemiInvulnerable
if_effect EFFECT_SOFTBOILED, AI_CV_Heal if_effect EFFECT_SOFTBOILED, AI_CV_Heal
if_effect EFFECT_FAKE_OUT, AI_CV_FakeOut if_effect EFFECT_FAKE_OUT, AI_CV_FakeOut
@@ -3051,7 +3051,7 @@ AI_HPAware_DiscouragedEffectsWhenLowHP:
.byte EFFECT_BELLY_DRUM .byte EFFECT_BELLY_DRUM
.byte EFFECT_PSYCH_UP .byte EFFECT_PSYCH_UP
.byte EFFECT_MIRROR_COAT .byte EFFECT_MIRROR_COAT
.byte EFFECT_SOLARBEAM .byte EFFECT_SOLAR_BEAM
.byte EFFECT_ERUPTION .byte EFFECT_ERUPTION
.byte EFFECT_TICKLE .byte EFFECT_TICKLE
.byte EFFECT_COSMIC_POWER .byte EFFECT_COSMIC_POWER
data/battle_anim_scripts.s
+32 -32
View File
@@ -5474,45 +5474,45 @@ SolarBeamAbsorbEffect:
delay 2 delay 2
return return
SolarBeamUnleash: SolarBeamUnleash:
call SetSolarbeamBg call SetSolarBeamBg
panse SE_M_SOLAR_BEAM, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 panse SE_M_SOLAR_BEAM, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
createvisualtask AnimTask_CreateSmallSolarbeamOrbs, 5 createvisualtask AnimTask_CreateSmallSolarBeamOrbs, 5
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 0 createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 0
delay 4 delay 4
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 1 createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 1
delay 4 delay 4
createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 1, 0, 10, RGB(25, 31, 0) createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 1, 0, 10, RGB(25, 31, 0)
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 2 createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 2
delay 4 delay 4
createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 65, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 65, 1
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 3 createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 3
delay 4 delay 4
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 4 createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 4
delay 4 delay 4
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 5 createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 5
delay 4 delay 4
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 6 createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 6
delay 4 delay 4
call SolarBeamUnleash1 call SolarBeamUnleash1
call SolarBeamUnleash1 call SolarBeamUnleash1
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 1, 10, 0, RGB(25, 31, 0) createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 1, 10, 0, RGB(25, 31, 0)
call UnsetSolarbeamBg call UnsetSolarBeamBg
goto SolarBeamEnd goto SolarBeamEnd
SolarBeamUnleash1: SolarBeamUnleash1:
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 0 createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 0
delay 4 delay 4
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 1 createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 1
delay 4 delay 4
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 2 createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 2
delay 4 delay 4
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 3 createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 3
delay 4 delay 4
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 4 createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 4
delay 4 delay 4
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 5 createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 5
delay 4 delay 4
createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 6 createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 6
delay 4 delay 4
return return
@@ -10189,26 +10189,26 @@ UnsetSkyBg:
waitbgfadein waitbgfadein
return return
SetSolarbeamBg: SetSolarBeamBg:
createvisualtask AnimTask_IsContest, 2 createvisualtask AnimTask_IsContest, 2
jumprettrue SetSolarbeamBgContest jumprettrue SetSolarBeamBgContest
createvisualtask AnimTask_IsTargetPlayerSide, 2 createvisualtask AnimTask_IsTargetPlayerSide, 2
jumpretfalse SetSolarbeamBgOpponent jumpretfalse SetSolarBeamBgOpponent
goto SetSolarbeamBgPlayer goto SetSolarBeamBgPlayer
SetSolarbeamBgContinue: SetSolarBeamBgContinue:
waitbgfadein waitbgfadein
return return
SetSolarbeamBgContest: SetSolarBeamBgContest:
fadetobg BG_SOLARBEAM_CONTESTS fadetobg BG_SOLAR_BEAM_CONTESTS
goto SetSolarbeamBgContinue goto SetSolarBeamBgContinue
SetSolarbeamBgPlayer: SetSolarBeamBgPlayer:
fadetobg BG_SOLARBEAM_PLAYER fadetobg BG_SOLAR_BEAM_PLAYER
goto SetSolarbeamBgContinue goto SetSolarBeamBgContinue
SetSolarbeamBgOpponent: SetSolarBeamBgOpponent:
fadetobg BG_SOLARBEAM_OPPONENT fadetobg BG_SOLAR_BEAM_OPPONENT
goto SetSolarbeamBgContinue goto SetSolarBeamBgContinue
UnsetSolarbeamBg: UnsetSolarBeamBg:
restorebg restorebg
waitbgfadein waitbgfadein
return return
data/battle_scripts_1.s
+7 -7
View File
@@ -168,7 +168,7 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectFutureSight @ EFFECT_FUTURE_SIGHT .4byte BattleScript_EffectFutureSight @ EFFECT_FUTURE_SIGHT
.4byte BattleScript_EffectGust @ EFFECT_GUST .4byte BattleScript_EffectGust @ EFFECT_GUST
.4byte BattleScript_EffectStomp @ EFFECT_FLINCH_MINIMIZE_HIT .4byte BattleScript_EffectStomp @ EFFECT_FLINCH_MINIMIZE_HIT
.4byte BattleScript_EffectSolarbeam @ EFFECT_SOLARBEAM .4byte BattleScript_EffectSolarBeam @ EFFECT_SOLAR_BEAM
.4byte BattleScript_EffectThunder @ EFFECT_THUNDER .4byte BattleScript_EffectThunder @ EFFECT_THUNDER
.4byte BattleScript_EffectTeleport @ EFFECT_TELEPORT .4byte BattleScript_EffectTeleport @ EFFECT_TELEPORT
.4byte BattleScript_EffectBeatUp @ EFFECT_BEAT_UP .4byte BattleScript_EffectBeatUp @ EFFECT_BEAT_UP
@@ -1898,17 +1898,17 @@ BattleScript_EffectStomp::
setbyte sDMG_MULTIPLIER, 2 setbyte sDMG_MULTIPLIER, 2
goto BattleScript_FlinchEffect goto BattleScript_FlinchEffect
BattleScript_EffectSolarbeam:: BattleScript_EffectSolarBeam::
jumpifabilitypresent ABILITY_CLOUD_NINE, BattleScript_SolarbeamDecideTurn jumpifabilitypresent ABILITY_CLOUD_NINE, BattleScript_SolarBeamDecideTurn
jumpifabilitypresent ABILITY_AIR_LOCK, BattleScript_SolarbeamDecideTurn jumpifabilitypresent ABILITY_AIR_LOCK, BattleScript_SolarBeamDecideTurn
jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_SUN, BattleScript_SolarbeamOnFirstTurn jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_SUN, BattleScript_SolarBeamOnFirstTurn
BattleScript_SolarbeamDecideTurn:: BattleScript_SolarBeamDecideTurn::
jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn
jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn
setbyte sTWOTURN_STRINGID, B_MSG_TURN1_SOLAR_BEAM setbyte sTWOTURN_STRINGID, B_MSG_TURN1_SOLAR_BEAM
call BattleScriptFirstChargingTurn call BattleScriptFirstChargingTurn
goto BattleScript_MoveEnd goto BattleScript_MoveEnd
BattleScript_SolarbeamOnFirstTurn:: BattleScript_SolarBeamOnFirstTurn::
orword gHitMarker, HITMARKER_CHARGING orword gHitMarker, HITMARKER_CHARGING
setmoveeffect MOVE_EFFECT_CHARGING | MOVE_EFFECT_AFFECTS_USER setmoveeffect MOVE_EFFECT_CHARGING | MOVE_EFFECT_AFFECTS_USER
seteffectprimary seteffectprimary
include/constants/battle_anim.h
+3 -3
View File
@@ -342,9 +342,9 @@
#define BG_FISSURE 21 #define BG_FISSURE 21
#define BG_BUG_OPPONENT 22 #define BG_BUG_OPPONENT 22
#define BG_BUG_PLAYER 23 #define BG_BUG_PLAYER 23
#define BG_SOLARBEAM_OPPONENT 24 #define BG_SOLAR_BEAM_OPPONENT 24
#define BG_SOLARBEAM_PLAYER 25 #define BG_SOLAR_BEAM_PLAYER 25
#define BG_SOLARBEAM_CONTESTS 26 #define BG_SOLAR_BEAM_CONTESTS 26
// table ids for general animations (gBattleAnims_General) // table ids for general animations (gBattleAnims_General)
#define B_ANIM_CASTFORM_CHANGE 0 #define B_ANIM_CASTFORM_CHANGE 0
include/constants/battle_move_effects.h
+1 -1
View File
@@ -152,7 +152,7 @@
#define EFFECT_FUTURE_SIGHT 148 #define EFFECT_FUTURE_SIGHT 148
#define EFFECT_GUST 149 #define EFFECT_GUST 149
#define EFFECT_FLINCH_MINIMIZE_HIT 150 // STOMP ASTONISH EXTRASENSORY NEEDLE_ARM #define EFFECT_FLINCH_MINIMIZE_HIT 150 // STOMP ASTONISH EXTRASENSORY NEEDLE_ARM
#define EFFECT_SOLARBEAM 151 #define EFFECT_SOLAR_BEAM 151
#define EFFECT_THUNDER 152 #define EFFECT_THUNDER 152
#define EFFECT_TELEPORT 153 #define EFFECT_TELEPORT 153
#define EFFECT_BEAT_UP 154 #define EFFECT_BEAT_UP 154
include/constants/items.h
+1 -1
View File
@@ -402,7 +402,7 @@
#define ITEM_TM19_GIGA_DRAIN ITEM_TM19 #define ITEM_TM19_GIGA_DRAIN ITEM_TM19
#define ITEM_TM20_SAFEGUARD ITEM_TM20 #define ITEM_TM20_SAFEGUARD ITEM_TM20
#define ITEM_TM21_FRUSTRATION ITEM_TM21 #define ITEM_TM21_FRUSTRATION ITEM_TM21
#define ITEM_TM22_SOLARBEAM ITEM_TM22 #define ITEM_TM22_SOLAR_BEAM ITEM_TM22
#define ITEM_TM23_IRON_TAIL ITEM_TM23 #define ITEM_TM23_IRON_TAIL ITEM_TM23
#define ITEM_TM24_THUNDERBOLT ITEM_TM24 #define ITEM_TM24_THUNDERBOLT ITEM_TM24
#define ITEM_TM25_THUNDER ITEM_TM25 #define ITEM_TM25_THUNDER ITEM_TM25
include/graphics.h
+1 -1
View File
@@ -4733,7 +4733,7 @@ extern const u32 gBattleAnimBgPalette_Sky[];
extern const u32 gBattleAnimBgPalette_Aurora[]; extern const u32 gBattleAnimBgPalette_Aurora[];
extern const u32 gBattleAnimBgPalette_Fissure[]; extern const u32 gBattleAnimBgPalette_Fissure[];
extern const u32 gBattleAnimBgPalette_Bug[]; extern const u32 gBattleAnimBgPalette_Bug[];
extern const u32 gBattleAnimBgPalette_Solarbeam[]; extern const u32 gBattleAnimBgPalette_SolarBeam[];
extern const u32 gBattleAnimBgTilemap_Dark[]; extern const u32 gBattleAnimBgTilemap_Dark[];
extern const u32 gBattleAnimBgTilemap_Ghost[]; extern const u32 gBattleAnimBgTilemap_Ghost[];
extern const u32 gBattleAnimBgTilemap_Psychic[]; extern const u32 gBattleAnimBgTilemap_Psychic[];
src/battle_ai_script_commands.c
+1 -1
View File
@@ -274,7 +274,7 @@ static const u16 sIgnoredPowerfulMoveEffects[] =
EFFECT_SKY_ATTACK, EFFECT_SKY_ATTACK,
EFFECT_RECHARGE, EFFECT_RECHARGE,
EFFECT_SKULL_BASH, EFFECT_SKULL_BASH,
EFFECT_SOLARBEAM, EFFECT_SOLAR_BEAM,
EFFECT_SPIT_UP, EFFECT_SPIT_UP,
EFFECT_FOCUS_PUNCH, EFFECT_FOCUS_PUNCH,
EFFECT_SUPERPOWER, EFFECT_SUPERPOWER,
src/battle_anim_effects_1.c
+36 -36
View File
@@ -26,9 +26,9 @@ struct {
static void AnimMovePowderParticle(struct Sprite *); static void AnimMovePowderParticle(struct Sprite *);
static void AnimMovePowderParticle_Step(struct Sprite *); static void AnimMovePowderParticle_Step(struct Sprite *);
static void AnimPowerAbsorptionOrb(struct Sprite *); static void AnimPowerAbsorptionOrb(struct Sprite *);
static void AnimSolarbeamBigOrb(struct Sprite *); static void AnimSolarBeamBigOrb(struct Sprite *);
static void AnimSolarbeamSmallOrb(struct Sprite *); static void AnimSolarBeamSmallOrb(struct Sprite *);
static void AnimSolarbeamSmallOrb_Step(struct Sprite *); static void AnimSolarBeamSmallOrb_Step(struct Sprite *);
static void AnimAbsorptionOrb(struct Sprite *); static void AnimAbsorptionOrb(struct Sprite *);
static void AnimAbsorptionOrb_Step(struct Sprite *); static void AnimAbsorptionOrb_Step(struct Sprite *);
static void AnimHyperBeamOrb(struct Sprite *); static void AnimHyperBeamOrb(struct Sprite *);
@@ -208,49 +208,49 @@ const struct SpriteTemplate gPoisonPowderParticleSpriteTemplate =
.callback = AnimMovePowderParticle, .callback = AnimMovePowderParticle,
}; };
const union AnimCmd gSolarbeamBigOrbAnimCmds1[] = const union AnimCmd gSolarBeamBigOrbAnimCmds1[] =
{ {
ANIMCMD_FRAME(0, 1), ANIMCMD_FRAME(0, 1),
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd gSolarbeamBigOrbAnimCmds2[] = const union AnimCmd gSolarBeamBigOrbAnimCmds2[] =
{ {
ANIMCMD_FRAME(1, 1), ANIMCMD_FRAME(1, 1),
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd gSolarbeamBigOrbAnimCmds3[] = const union AnimCmd gSolarBeamBigOrbAnimCmds3[] =
{ {
ANIMCMD_FRAME(2, 1), ANIMCMD_FRAME(2, 1),
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd gSolarbeamBigOrbAnimCmds4[] = const union AnimCmd gSolarBeamBigOrbAnimCmds4[] =
{ {
ANIMCMD_FRAME(3, 1), ANIMCMD_FRAME(3, 1),
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd gSolarbeamBigOrbAnimCmds5[] = const union AnimCmd gSolarBeamBigOrbAnimCmds5[] =
{ {
ANIMCMD_FRAME(4, 1), ANIMCMD_FRAME(4, 1),
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd gSolarbeamBigOrbAnimCmds6[] = const union AnimCmd gSolarBeamBigOrbAnimCmds6[] =
{ {
ANIMCMD_FRAME(5, 1), ANIMCMD_FRAME(5, 1),
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd gSolarbeamBigOrbAnimCmds7[] = const union AnimCmd gSolarBeamBigOrbAnimCmds7[] =
{ {
ANIMCMD_FRAME(6, 1), ANIMCMD_FRAME(6, 1),
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd gSolarbeamSmallOrbAnimCms[] = const union AnimCmd gSolarBeamSmallOrbAnimCms[] =
{ {
ANIMCMD_FRAME(7, 1), ANIMCMD_FRAME(7, 1),
ANIMCMD_END, ANIMCMD_END,
@@ -262,20 +262,20 @@ const union AnimCmd gPowerAbsorptionOrbAnimCmds[] =
ANIMCMD_END, ANIMCMD_END,
}; };
const union AnimCmd *const gSolarbeamBigOrbAnimTable[] = const union AnimCmd *const gSolarBeamBigOrbAnimTable[] =
{ {
gSolarbeamBigOrbAnimCmds1, gSolarBeamBigOrbAnimCmds1,
gSolarbeamBigOrbAnimCmds2, gSolarBeamBigOrbAnimCmds2,
gSolarbeamBigOrbAnimCmds3, gSolarBeamBigOrbAnimCmds3,
gSolarbeamBigOrbAnimCmds4, gSolarBeamBigOrbAnimCmds4,
gSolarbeamBigOrbAnimCmds5, gSolarBeamBigOrbAnimCmds5,
gSolarbeamBigOrbAnimCmds6, gSolarBeamBigOrbAnimCmds6,
gSolarbeamBigOrbAnimCmds7, gSolarBeamBigOrbAnimCmds7,
}; };
const union AnimCmd *const gSolarbeamSmallOrbAnimTable[] = const union AnimCmd *const gSolarBeamSmallOrbAnimTable[] =
{ {
gSolarbeamSmallOrbAnimCms, gSolarBeamSmallOrbAnimCms,
}; };
const union AnimCmd *const gPowerAbsorptionOrbAnimTable[] = const union AnimCmd *const gPowerAbsorptionOrbAnimTable[] =
@@ -303,26 +303,26 @@ const struct SpriteTemplate gPowerAbsorptionOrbSpriteTemplate =
.callback = AnimPowerAbsorptionOrb, .callback = AnimPowerAbsorptionOrb,
}; };
const struct SpriteTemplate gSolarbeamBigOrbSpriteTemplate = const struct SpriteTemplate gSolarBeamBigOrbSpriteTemplate =
{ {
.tileTag = ANIM_TAG_ORBS, .tileTag = ANIM_TAG_ORBS,
.paletteTag = ANIM_TAG_ORBS, .paletteTag = ANIM_TAG_ORBS,
.oam = &gOamData_AffineOff_ObjNormal_8x8, .oam = &gOamData_AffineOff_ObjNormal_8x8,
.anims = gSolarbeamBigOrbAnimTable, .anims = gSolarBeamBigOrbAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = AnimSolarbeamBigOrb, .callback = AnimSolarBeamBigOrb,
}; };
const struct SpriteTemplate gSolarbeamSmallOrbSpriteTemplate = const struct SpriteTemplate gSolarBeamSmallOrbSpriteTemplate =
{ {
.tileTag = ANIM_TAG_ORBS, .tileTag = ANIM_TAG_ORBS,
.paletteTag = ANIM_TAG_ORBS, .paletteTag = ANIM_TAG_ORBS,
.oam = &gOamData_AffineOff_ObjNormal_8x8, .oam = &gOamData_AffineOff_ObjNormal_8x8,
.anims = gSolarbeamSmallOrbAnimTable, .anims = gSolarBeamSmallOrbAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = AnimSolarbeamSmallOrb, .callback = AnimSolarBeamSmallOrb,
}; };
const union AffineAnimCmd gStockpileAbsorptionOrbAffineCmds[] = { const union AffineAnimCmd gStockpileAbsorptionOrbAffineCmds[] = {
@@ -371,7 +371,7 @@ const struct SpriteTemplate gHyperBeamOrbSpriteTemplate =
.tileTag = ANIM_TAG_ORBS, .tileTag = ANIM_TAG_ORBS,
.paletteTag = ANIM_TAG_ORBS, .paletteTag = ANIM_TAG_ORBS,
.oam = &gOamData_AffineOff_ObjNormal_8x8, .oam = &gOamData_AffineOff_ObjNormal_8x8,
.anims = gSolarbeamBigOrbAnimTable, .anims = gSolarBeamBigOrbAnimTable,
.images = NULL, .images = NULL,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = AnimHyperBeamOrb, .callback = AnimHyperBeamOrb,
@@ -2252,7 +2252,7 @@ static void AnimPowerAbsorptionOrb(struct Sprite* sprite)
// arg 1: initial y pixel offset // arg 1: initial y pixel offset
// arg 2: duration // arg 2: duration
// arg 3: sprite anim number // arg 3: sprite anim number
static void AnimSolarbeamBigOrb(struct Sprite* sprite) static void AnimSolarBeamBigOrb(struct Sprite* sprite)
{ {
InitSpritePosToAnimAttacker(sprite, TRUE); InitSpritePosToAnimAttacker(sprite, TRUE);
StartSpriteAnim(sprite, gBattleAnimArgs[3]); StartSpriteAnim(sprite, gBattleAnimArgs[3]);
@@ -2264,12 +2264,12 @@ static void AnimSolarbeamBigOrb(struct Sprite* sprite)
} }
// Moves a small orb in a wavy pattern towards the target mon. // Moves a small orb in a wavy pattern towards the target mon.
// The small orb "circles" the big orbs in AnimSolarbeamBigOrb. // The small orb "circles" the big orbs in AnimSolarBeamBigOrb.
// arg 0: initial x pixel offset // arg 0: initial x pixel offset
// arg 1: initial y pixel offset // arg 1: initial y pixel offset
// arg 2: duration // arg 2: duration
// arg 3: initial wave offset // arg 3: initial wave offset
static void AnimSolarbeamSmallOrb(struct Sprite* sprite) static void AnimSolarBeamSmallOrb(struct Sprite* sprite)
{ {
InitSpritePosToAnimAttacker(sprite, TRUE); InitSpritePosToAnimAttacker(sprite, TRUE);
sprite->data[0] = gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[2];
@@ -2279,11 +2279,11 @@ static void AnimSolarbeamSmallOrb(struct Sprite* sprite)
sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET); sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET);
InitAnimLinearTranslation(sprite); InitAnimLinearTranslation(sprite);
sprite->data[5] = gBattleAnimArgs[3]; sprite->data[5] = gBattleAnimArgs[3];
sprite->callback = AnimSolarbeamSmallOrb_Step; sprite->callback = AnimSolarBeamSmallOrb_Step;
sprite->callback(sprite); sprite->callback(sprite);
} }
static void AnimSolarbeamSmallOrb_Step(struct Sprite* sprite) static void AnimSolarBeamSmallOrb_Step(struct Sprite* sprite)
{ {
if (AnimTranslateLinear(sprite)) if (AnimTranslateLinear(sprite))
{ {
@@ -2302,10 +2302,10 @@ static void AnimSolarbeamSmallOrb_Step(struct Sprite* sprite)
} }
} }
// Creates 15 small secondary orbs used in the solarbeam anim effect. // Creates 15 small secondary orbs used in the SolarBeam anim effect.
// There is a 7-frame delay between each of them. // There is a 7-frame delay between each of them.
// No args. // No args.
void AnimTask_CreateSmallSolarbeamOrbs(u8 taskId) void AnimTask_CreateSmallSolarBeamOrbs(u8 taskId)
{ {
if (--gTasks[taskId].data[0] == -1) if (--gTasks[taskId].data[0] == -1)
{ {
@@ -2315,7 +2315,7 @@ void AnimTask_CreateSmallSolarbeamOrbs(u8 taskId)
gBattleAnimArgs[1] = 0; gBattleAnimArgs[1] = 0;
gBattleAnimArgs[2] = 80; gBattleAnimArgs[2] = 80;
gBattleAnimArgs[3] = 0; gBattleAnimArgs[3] = 0;
CreateSpriteAndAnimate(&gSolarbeamSmallOrbSpriteTemplate, 0, 0, GetBattlerSpriteSubpriority(gBattleAnimTarget) + 1); CreateSpriteAndAnimate(&gSolarBeamSmallOrbSpriteTemplate, 0, 0, GetBattlerSpriteSubpriority(gBattleAnimTarget) + 1);
} }
if (gTasks[taskId].data[1] == 15) if (gTasks[taskId].data[1] == 15)
src/battle_script_commands.c
+3 -3
View File
@@ -8098,7 +8098,7 @@ static bool8 IsTwoTurnsMove(u16 move)
if (gBattleMoves[move].effect == EFFECT_SKULL_BASH if (gBattleMoves[move].effect == EFFECT_SKULL_BASH
|| gBattleMoves[move].effect == EFFECT_RAZOR_WIND || gBattleMoves[move].effect == EFFECT_RAZOR_WIND
|| gBattleMoves[move].effect == EFFECT_SKY_ATTACK || gBattleMoves[move].effect == EFFECT_SKY_ATTACK
|| gBattleMoves[move].effect == EFFECT_SOLARBEAM || gBattleMoves[move].effect == EFFECT_SOLAR_BEAM
|| gBattleMoves[move].effect == EFFECT_SEMI_INVULNERABLE || gBattleMoves[move].effect == EFFECT_SEMI_INVULNERABLE
|| gBattleMoves[move].effect == EFFECT_BIDE) || gBattleMoves[move].effect == EFFECT_BIDE)
return TRUE; return TRUE;
@@ -8118,14 +8118,14 @@ static bool8 IsInvalidForSleepTalkOrAssist(u16 move)
static u8 AttacksThisTurn(u8 battlerId, u16 move) // Note: returns 1 if it's a charging turn, otherwise 2 static u8 AttacksThisTurn(u8 battlerId, u16 move) // Note: returns 1 if it's a charging turn, otherwise 2
{ {
// first argument is unused // first argument is unused
if (gBattleMoves[move].effect == EFFECT_SOLARBEAM if (gBattleMoves[move].effect == EFFECT_SOLAR_BEAM
&& (gBattleWeather & B_WEATHER_SUN)) && (gBattleWeather & B_WEATHER_SUN))
return 2; return 2;
if (gBattleMoves[move].effect == EFFECT_SKULL_BASH if (gBattleMoves[move].effect == EFFECT_SKULL_BASH
|| gBattleMoves[move].effect == EFFECT_RAZOR_WIND || gBattleMoves[move].effect == EFFECT_RAZOR_WIND
|| gBattleMoves[move].effect == EFFECT_SKY_ATTACK || gBattleMoves[move].effect == EFFECT_SKY_ATTACK
|| gBattleMoves[move].effect == EFFECT_SOLARBEAM || gBattleMoves[move].effect == EFFECT_SOLAR_BEAM
|| gBattleMoves[move].effect == EFFECT_SEMI_INVULNERABLE || gBattleMoves[move].effect == EFFECT_SEMI_INVULNERABLE
|| gBattleMoves[move].effect == EFFECT_BIDE) || gBattleMoves[move].effect == EFFECT_BIDE)
{ {
src/battle_tv.c
+1 -1
View File
@@ -237,7 +237,7 @@ static const u16 sPoints_MoveEffect[NUM_BATTLE_MOVE_EFFECTS] =
[EFFECT_FUTURE_SIGHT] = 1, [EFFECT_FUTURE_SIGHT] = 1,
[EFFECT_GUST] = 1, [EFFECT_GUST] = 1,
[EFFECT_FLINCH_MINIMIZE_HIT] = 1, [EFFECT_FLINCH_MINIMIZE_HIT] = 1,
[EFFECT_SOLARBEAM] = 1, [EFFECT_SOLAR_BEAM] = 1,
[EFFECT_THUNDER] = 1, [EFFECT_THUNDER] = 1,
[EFFECT_TELEPORT] = 1, [EFFECT_TELEPORT] = 1,
[EFFECT_BEAT_UP] = 2, [EFFECT_BEAT_UP] = 2,
src/data/battle_anim.h
+3 -3
View File
@@ -1619,7 +1619,7 @@ const struct BattleAnimBackground gBattleAnimBackgroundTable[] =
[BG_FISSURE] = {gBattleAnimBgImage_Fissure, gBattleAnimBgPalette_Fissure, gBattleAnimBgTilemap_Fissure}, [BG_FISSURE] = {gBattleAnimBgImage_Fissure, gBattleAnimBgPalette_Fissure, gBattleAnimBgTilemap_Fissure},
[BG_BUG_OPPONENT] = {gBattleAnimBgImage_Highspeed, gBattleAnimBgPalette_Bug, gBattleAnimBgTilemap_HighspeedOpponent}, [BG_BUG_OPPONENT] = {gBattleAnimBgImage_Highspeed, gBattleAnimBgPalette_Bug, gBattleAnimBgTilemap_HighspeedOpponent},
[BG_BUG_PLAYER] = {gBattleAnimBgImage_Highspeed, gBattleAnimBgPalette_Bug, gBattleAnimBgTilemap_HighspeedPlayer}, [BG_BUG_PLAYER] = {gBattleAnimBgImage_Highspeed, gBattleAnimBgPalette_Bug, gBattleAnimBgTilemap_HighspeedPlayer},
[BG_SOLARBEAM_OPPONENT] = {gBattleAnimBgImage_Impact, gBattleAnimBgPalette_Solarbeam, gBattleAnimBgTilemap_ImpactOpponent}, [BG_SOLAR_BEAM_OPPONENT] = {gBattleAnimBgImage_Impact, gBattleAnimBgPalette_SolarBeam, gBattleAnimBgTilemap_ImpactOpponent},
[BG_SOLARBEAM_PLAYER] = {gBattleAnimBgImage_Impact, gBattleAnimBgPalette_Solarbeam, gBattleAnimBgTilemap_ImpactPlayer}, [BG_SOLAR_BEAM_PLAYER] = {gBattleAnimBgImage_Impact, gBattleAnimBgPalette_SolarBeam, gBattleAnimBgTilemap_ImpactPlayer},
[BG_SOLARBEAM_CONTESTS] = {gBattleAnimBgImage_Impact, gBattleAnimBgPalette_Solarbeam, gBattleAnimBgTilemap_ImpactContests}, [BG_SOLAR_BEAM_CONTESTS] = {gBattleAnimBgImage_Impact, gBattleAnimBgPalette_SolarBeam, gBattleAnimBgTilemap_ImpactContests},
}; };
src/data/battle_moves.h
+1 -1
View File
@@ -990,7 +990,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
[MOVE_SOLAR_BEAM] = [MOVE_SOLAR_BEAM] =
{ {
.effect = EFFECT_SOLARBEAM, .effect = EFFECT_SOLAR_BEAM,
.power = 120, .power = 120,
.type = TYPE_GRASS, .type = TYPE_GRASS,
.accuracy = 100, .accuracy = 100,
src/data/items.h
+2 -2
View File
@@ -3744,10 +3744,10 @@ const struct Item gItems[] =
.fieldUseFunc = ItemUseOutOfBattle_TMHM, .fieldUseFunc = ItemUseOutOfBattle_TMHM,
}, },
[ITEM_TM22_SOLARBEAM] = [ITEM_TM22_SOLAR_BEAM] =
{ {
.name = _("TM22"), .name = _("TM22"),
.itemId = ITEM_TM22_SOLARBEAM, .itemId = ITEM_TM22_SOLAR_BEAM,
.price = 3000, .price = 3000,
.description = sTM22Desc, .description = sTM22Desc,
.pocket = POCKET_TM_HM, .pocket = POCKET_TM_HM,
src/data/pokemon/tmhm_learnsets.h
+124 -124
View File
@@ -15,7 +15,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM36_SLUDGE_BOMB) | TMHM(TM36_SLUDGE_BOMB)
@@ -35,7 +35,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM36_SLUDGE_BOMB) | TMHM(TM36_SLUDGE_BOMB)
@@ -57,7 +57,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM26_EARTHQUAKE) | TMHM(TM26_EARTHQUAKE)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
@@ -239,7 +239,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM29_PSYCHIC) | TMHM(TM29_PSYCHIC)
| TMHM(TM30_SHADOW_BALL) | TMHM(TM30_SHADOW_BALL)
@@ -264,7 +264,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM31_BRICK_BREAK) | TMHM(TM31_BRICK_BREAK)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
@@ -758,7 +758,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
@@ -794,7 +794,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
@@ -867,7 +867,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
@@ -901,7 +901,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
@@ -974,7 +974,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM36_SLUDGE_BOMB) | TMHM(TM36_SLUDGE_BOMB)
@@ -992,7 +992,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM36_SLUDGE_BOMB) | TMHM(TM36_SLUDGE_BOMB)
@@ -1011,7 +1011,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM36_SLUDGE_BOMB) | TMHM(TM36_SLUDGE_BOMB)
@@ -1029,7 +1029,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM28_DIG) | TMHM(TM28_DIG)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
@@ -1052,7 +1052,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM28_DIG) | TMHM(TM28_DIG)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
@@ -1073,7 +1073,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM29_PSYCHIC) | TMHM(TM29_PSYCHIC)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
@@ -1093,7 +1093,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM29_PSYCHIC) | TMHM(TM29_PSYCHIC)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
@@ -1607,7 +1607,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM36_SLUDGE_BOMB) | TMHM(TM36_SLUDGE_BOMB)
@@ -1626,7 +1626,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM36_SLUDGE_BOMB) | TMHM(TM36_SLUDGE_BOMB)
@@ -1646,7 +1646,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM36_SLUDGE_BOMB) | TMHM(TM36_SLUDGE_BOMB)
@@ -1778,7 +1778,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM11_SUNNY_DAY) | TMHM(TM11_SUNNY_DAY)
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
@@ -1797,7 +1797,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM15_HYPER_BEAM) | TMHM(TM15_HYPER_BEAM)
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
@@ -2348,7 +2348,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM29_PSYCHIC) | TMHM(TM29_PSYCHIC)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
@@ -2372,7 +2372,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM29_PSYCHIC) | TMHM(TM29_PSYCHIC)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
@@ -2495,7 +2495,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
@@ -2647,7 +2647,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
@@ -2680,7 +2680,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM36_SLUDGE_BOMB) | TMHM(TM36_SLUDGE_BOMB)
@@ -2706,7 +2706,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
@@ -2872,7 +2872,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
@@ -3021,7 +3021,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
@@ -3198,7 +3198,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
@@ -3356,7 +3356,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
| TMHM(TM26_EARTHQUAKE) | TMHM(TM26_EARTHQUAKE)
@@ -3560,7 +3560,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
@@ -3608,7 +3608,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
@@ -3655,7 +3655,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
@@ -3676,7 +3676,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
@@ -3700,7 +3700,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM26_EARTHQUAKE) | TMHM(TM26_EARTHQUAKE)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
@@ -3874,7 +3874,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
@@ -3903,7 +3903,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
@@ -3976,7 +3976,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM28_DIG) | TMHM(TM28_DIG)
| TMHM(TM31_BRICK_BREAK) | TMHM(TM31_BRICK_BREAK)
@@ -4000,7 +4000,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM28_DIG) | TMHM(TM28_DIG)
| TMHM(TM31_BRICK_BREAK) | TMHM(TM31_BRICK_BREAK)
@@ -4020,7 +4020,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM28_DIG) | TMHM(TM28_DIG)
| TMHM(TM29_PSYCHIC) | TMHM(TM29_PSYCHIC)
@@ -4040,7 +4040,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM28_DIG) | TMHM(TM28_DIG)
| TMHM(TM29_PSYCHIC) | TMHM(TM29_PSYCHIC)
@@ -4151,7 +4151,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM28_DIG) | TMHM(TM28_DIG)
@@ -4177,7 +4177,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM28_DIG) | TMHM(TM28_DIG)
| TMHM(TM29_PSYCHIC) | TMHM(TM29_PSYCHIC)
@@ -4202,7 +4202,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM29_PSYCHIC) | TMHM(TM29_PSYCHIC)
| TMHM(TM30_SHADOW_BALL) | TMHM(TM30_SHADOW_BALL)
@@ -4229,7 +4229,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM29_PSYCHIC) | TMHM(TM29_PSYCHIC)
| TMHM(TM30_SHADOW_BALL) | TMHM(TM30_SHADOW_BALL)
@@ -4258,7 +4258,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM29_PSYCHIC) | TMHM(TM29_PSYCHIC)
| TMHM(TM30_SHADOW_BALL) | TMHM(TM30_SHADOW_BALL)
@@ -4284,7 +4284,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM29_PSYCHIC) | TMHM(TM29_PSYCHIC)
| TMHM(TM30_SHADOW_BALL) | TMHM(TM30_SHADOW_BALL)
@@ -4373,7 +4373,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM36_SLUDGE_BOMB) | TMHM(TM36_SLUDGE_BOMB)
@@ -4493,7 +4493,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM40_AERIAL_ACE) | TMHM(TM40_AERIAL_ACE)
@@ -4510,7 +4510,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM40_AERIAL_ACE) | TMHM(TM40_AERIAL_ACE)
@@ -4528,7 +4528,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM40_AERIAL_ACE) | TMHM(TM40_AERIAL_ACE)
@@ -4547,7 +4547,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
@@ -4577,7 +4577,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM36_SLUDGE_BOMB) | TMHM(TM36_SLUDGE_BOMB)
@@ -4598,7 +4598,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM36_SLUDGE_BOMB) | TMHM(TM36_SLUDGE_BOMB)
@@ -4615,7 +4615,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM29_PSYCHIC) | TMHM(TM29_PSYCHIC)
| TMHM(TM30_SHADOW_BALL) | TMHM(TM30_SHADOW_BALL)
@@ -4855,7 +4855,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM26_EARTHQUAKE) | TMHM(TM26_EARTHQUAKE)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM28_DIG) | TMHM(TM28_DIG)
@@ -4877,7 +4877,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM26_EARTHQUAKE) | TMHM(TM26_EARTHQUAKE)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM28_DIG) | TMHM(TM28_DIG)
@@ -4901,7 +4901,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
@@ -4982,7 +4982,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
| TMHM(TM26_EARTHQUAKE) | TMHM(TM26_EARTHQUAKE)
@@ -5017,7 +5017,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
@@ -5455,7 +5455,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM12_TAUNT) | TMHM(TM12_TAUNT)
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM30_SHADOW_BALL) | TMHM(TM30_SHADOW_BALL)
@@ -5481,7 +5481,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM15_HYPER_BEAM) | TMHM(TM15_HYPER_BEAM)
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM30_SHADOW_BALL) | TMHM(TM30_SHADOW_BALL)
@@ -5568,7 +5568,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
@@ -5593,7 +5593,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
@@ -5731,7 +5731,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
@@ -5766,7 +5766,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
@@ -5826,7 +5826,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM28_DIG) | TMHM(TM28_DIG)
@@ -6003,7 +6003,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
| TMHM(TM26_EARTHQUAKE) | TMHM(TM26_EARTHQUAKE)
@@ -6039,7 +6039,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM29_PSYCHIC) | TMHM(TM29_PSYCHIC)
| TMHM(TM30_SHADOW_BALL) | TMHM(TM30_SHADOW_BALL)
@@ -6114,7 +6114,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM28_DIG) | TMHM(TM28_DIG)
@@ -6140,7 +6140,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM28_DIG) | TMHM(TM28_DIG)
@@ -6169,7 +6169,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM26_EARTHQUAKE) | TMHM(TM26_EARTHQUAKE)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
@@ -6450,7 +6450,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM29_PSYCHIC) | TMHM(TM29_PSYCHIC)
| TMHM(TM30_SHADOW_BALL) | TMHM(TM30_SHADOW_BALL)
@@ -6473,7 +6473,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM29_PSYCHIC) | TMHM(TM29_PSYCHIC)
| TMHM(TM30_SHADOW_BALL) | TMHM(TM30_SHADOW_BALL)
@@ -6499,7 +6499,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM42_FACADE) | TMHM(TM42_FACADE)
@@ -6522,7 +6522,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM31_BRICK_BREAK) | TMHM(TM31_BRICK_BREAK)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
@@ -6552,7 +6552,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM31_BRICK_BREAK) | TMHM(TM31_BRICK_BREAK)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
@@ -6575,7 +6575,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM28_DIG) | TMHM(TM28_DIG)
| TMHM(TM30_SHADOW_BALL) | TMHM(TM30_SHADOW_BALL)
@@ -6595,7 +6595,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM28_DIG) | TMHM(TM28_DIG)
| TMHM(TM30_SHADOW_BALL) | TMHM(TM30_SHADOW_BALL)
@@ -6621,7 +6621,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM28_DIG) | TMHM(TM28_DIG)
| TMHM(TM30_SHADOW_BALL) | TMHM(TM30_SHADOW_BALL)
@@ -6646,7 +6646,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM28_DIG) | TMHM(TM28_DIG)
| TMHM(TM30_SHADOW_BALL) | TMHM(TM30_SHADOW_BALL)
@@ -6666,7 +6666,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM28_DIG) | TMHM(TM28_DIG)
| TMHM(TM30_SHADOW_BALL) | TMHM(TM30_SHADOW_BALL)
@@ -6688,7 +6688,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM28_DIG) | TMHM(TM28_DIG)
| TMHM(TM30_SHADOW_BALL) | TMHM(TM30_SHADOW_BALL)
@@ -6745,7 +6745,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM36_SLUDGE_BOMB) | TMHM(TM36_SLUDGE_BOMB)
@@ -6767,7 +6767,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM31_BRICK_BREAK) | TMHM(TM31_BRICK_BREAK)
@@ -6866,7 +6866,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM30_SHADOW_BALL) | TMHM(TM30_SHADOW_BALL)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
@@ -6888,7 +6888,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM30_SHADOW_BALL) | TMHM(TM30_SHADOW_BALL)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
@@ -6960,7 +6960,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
@@ -6987,7 +6987,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
@@ -7014,7 +7014,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
@@ -7048,7 +7048,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM26_EARTHQUAKE) | TMHM(TM26_EARTHQUAKE)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM28_DIG) | TMHM(TM28_DIG)
@@ -7073,7 +7073,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM26_EARTHQUAKE) | TMHM(TM26_EARTHQUAKE)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM28_DIG) | TMHM(TM28_DIG)
@@ -7383,7 +7383,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM26_EARTHQUAKE) | TMHM(TM26_EARTHQUAKE)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM28_DIG) | TMHM(TM28_DIG)
@@ -7404,7 +7404,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM26_EARTHQUAKE) | TMHM(TM26_EARTHQUAKE)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM28_DIG) | TMHM(TM28_DIG)
@@ -7428,7 +7428,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM26_EARTHQUAKE) | TMHM(TM26_EARTHQUAKE)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
@@ -7660,7 +7660,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM37_SANDSTORM) | TMHM(TM37_SANDSTORM)
@@ -7680,7 +7680,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM37_SANDSTORM) | TMHM(TM37_SANDSTORM)
@@ -7769,7 +7769,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM26_EARTHQUAKE) | TMHM(TM26_EARTHQUAKE)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM29_PSYCHIC) | TMHM(TM29_PSYCHIC)
@@ -7906,7 +7906,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM31_BRICK_BREAK) | TMHM(TM31_BRICK_BREAK)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
@@ -7982,7 +7982,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM40_AERIAL_ACE) | TMHM(TM40_AERIAL_ACE)
@@ -8005,7 +8005,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM26_EARTHQUAKE) | TMHM(TM26_EARTHQUAKE)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
@@ -8085,7 +8085,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM30_SHADOW_BALL) | TMHM(TM30_SHADOW_BALL)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
@@ -8108,7 +8108,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
@@ -8140,7 +8140,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
| TMHM(TM26_EARTHQUAKE) | TMHM(TM26_EARTHQUAKE)
@@ -8174,7 +8174,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
| TMHM(TM26_EARTHQUAKE) | TMHM(TM26_EARTHQUAKE)
@@ -8204,7 +8204,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM30_SHADOW_BALL) | TMHM(TM30_SHADOW_BALL)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
@@ -8229,7 +8229,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM30_SHADOW_BALL) | TMHM(TM30_SHADOW_BALL)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
@@ -8253,7 +8253,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM26_EARTHQUAKE) | TMHM(TM26_EARTHQUAKE)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
@@ -8279,7 +8279,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM30_SHADOW_BALL) | TMHM(TM30_SHADOW_BALL)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
@@ -8302,7 +8302,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM26_EARTHQUAKE) | TMHM(TM26_EARTHQUAKE)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM30_SHADOW_BALL) | TMHM(TM30_SHADOW_BALL)
@@ -8332,7 +8332,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM26_EARTHQUAKE) | TMHM(TM26_EARTHQUAKE)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM30_SHADOW_BALL) | TMHM(TM30_SHADOW_BALL)
@@ -8538,7 +8538,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
@@ -8649,7 +8649,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
@@ -8683,7 +8683,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
@@ -8710,7 +8710,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
@@ -8736,7 +8736,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
@@ -8759,7 +8759,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
| TMHM(TM36_SLUDGE_BOMB) | TMHM(TM36_SLUDGE_BOMB)
@@ -8777,7 +8777,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM19_GIGA_DRAIN) | TMHM(TM19_GIGA_DRAIN)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM26_EARTHQUAKE) | TMHM(TM26_EARTHQUAKE)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)
@@ -9160,7 +9160,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
@@ -9196,7 +9196,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM17_PROTECT) | TMHM(TM17_PROTECT)
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM23_IRON_TAIL) | TMHM(TM23_IRON_TAIL)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
@@ -9234,7 +9234,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
| TMHM(TM26_EARTHQUAKE) | TMHM(TM26_EARTHQUAKE)
@@ -9272,7 +9272,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
| TMHM(TM26_EARTHQUAKE) | TMHM(TM26_EARTHQUAKE)
@@ -9337,7 +9337,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM18_RAIN_DANCE) | TMHM(TM18_RAIN_DANCE)
| TMHM(TM20_SAFEGUARD) | TMHM(TM20_SAFEGUARD)
| TMHM(TM21_FRUSTRATION) | TMHM(TM21_FRUSTRATION)
| TMHM(TM22_SOLARBEAM) | TMHM(TM22_SOLAR_BEAM)
| TMHM(TM24_THUNDERBOLT) | TMHM(TM24_THUNDERBOLT)
| TMHM(TM25_THUNDER) | TMHM(TM25_THUNDER)
| TMHM(TM27_RETURN) | TMHM(TM27_RETURN)
src/graphics.c
+2 -2
View File
@@ -1050,8 +1050,8 @@ const u32 gBattleAnimBgTilemap_Ghost[] = INCBIN_U32("graphics/battle_anims/backg
const u32 gBattleAnimSpritePal_WhipHit[] = INCBIN_U32("graphics/battle_anims/sprites/whip_hit.gbapal.lz"); const u32 gBattleAnimSpritePal_WhipHit[] = INCBIN_U32("graphics/battle_anims/sprites/whip_hit.gbapal.lz");
const u32 gBattleAnimBgPalette_Solarbeam[] = INCBIN_U32("graphics/battle_anims/backgrounds/solarbeam.gbapal.lz"); const u32 gBattleAnimBgPalette_SolarBeam[] = INCBIN_U32("graphics/battle_anims/backgrounds/solarbeam.gbapal.lz");
const u32 gBattleAnimBgTilemap_Solarbeam[] = INCBIN_U32("graphics/battle_anims/backgrounds/solarbeam.bin.lz"); // Unused const u32 gBattleAnimBgTilemap_SolarBeam[] = INCBIN_U32("graphics/battle_anims/backgrounds/solarbeam.bin.lz"); // Unused
const u32 gBerryBlenderCenter_Gfx[] = INCBIN_U32("graphics/berry_blender/center.8bpp.lz"); const u32 gBerryBlenderCenter_Gfx[] = INCBIN_U32("graphics/berry_blender/center.8bpp.lz");
const u32 gBerryBlenderOuter_Gfx[] = INCBIN_U32("graphics/berry_blender/outer.4bpp.lz"); const u32 gBerryBlenderOuter_Gfx[] = INCBIN_U32("graphics/berry_blender/outer.4bpp.lz");