Meteor Beam

data/battle_scripts_1.s

@@ -371,6 +371,33 @@ gBattleScriptsForMoveEffects:: @ 82D86A8
 	.4byte BattleScript_EffectBodyPress
 	.4byte BattleScript_EffectExpandingForce
 	.4byte BattleScript_EffectScaleShot
+	.4byte BattleScript_EffectMeteorBeam
+
+BattleScript_EffectMeteorBeam::
+	@ DecideTurn
+	jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn
+	jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn
+	setbyte sTWOTURN_STRINGID, B_MSG_TURN1_METEOR_BEAM
+	call BattleScript_FirstChargingTurnMeteorBeam
+	jumpifnoholdeffect BS_ATTACKER, HOLD_EFFECT_POWER_HERB, BattleScript_MoveEnd
+	call BattleScript_PowerHerbActivation
+	goto BattleScript_TwoTurnMovesSecondTurn
+
+BattleScript_FirstChargingTurnMeteorBeam::
+	attackcanceler
+	printstring STRINGID_EMPTYSTRING3
+	ppreduce
+	attackanimation
+	waitanimation
+	orword gHitMarker, HITMARKER_CHARGING
+	setmoveeffect MOVE_EFFECT_CHARGING | MOVE_EFFECT_AFFECTS_USER
+	seteffectprimary
+	copybyte cMULTISTRING_CHOOSER, sTWOTURN_STRINGID
+	printfromtable gFirstTurnOfTwoStringIds
+	waitmessage 0x40
+	setmoveeffect MOVE_EFFECT_SP_ATK_PLUS_1 | MOVE_EFFECT_AFFECTS_USER
+	seteffectsecondary
+	return
 
 BattleScript_EffectScaleShot::
 	attackcanceler

include/constants/battle_move_effects.h

@@ -355,7 +355,8 @@
 #define EFFECT_BODY_PRESS 349
 #define EFFECT_EXPANDING_FORCE 350
 #define EFFECT_SCALE_SHOT 351
+#define EFFECT_METEOR_BEAM 352
 
-#define NUM_BATTLE_MOVE_EFFECTS 352
+#define NUM_BATTLE_MOVE_EFFECTS 353
 
 #endif  // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H

include/constants/battle_string_ids.h

@@ -570,9 +570,10 @@
 #define STRINGID_MICLEBERRYACTIVATES             566
 #define STRINGID_PKMNSHOOKOFFTHETAUNT            567
 #define STRINGID_PKMNGOTOVERITSINFATUATION       568
-#define STRINGID_PKMNINSNAPTRAP                        569
+#define STRINGID_PKMNINSNAPTRAP                  569
+#define STRINGID_METEORBEAMCHARGING              570
 
-#define BATTLESTRINGS_COUNT                      570
+#define BATTLESTRINGS_COUNT                      571
 
 // The below IDs are all indexes into battle message tables,
 // used to determine which of a set of messages to print.
@@ -623,6 +624,7 @@
 #define B_MSG_TURN1_PHANTOM_FORCE  8
 #define B_MSG_TURN1_GEOMANCY       9
 #define B_MSG_TURN1_FREEZE_SHOCK   10
+#define B_MSG_TURN1_METEOR_BEAM    11
 
 // gMoveWeatherChangeStringIds
 #define B_MSG_STARTED_RAIN      0

src/battle_message.c

@@ -697,9 +697,11 @@ static const u8 sText_CanActFaster[] = _("{B_ATK_NAME_WITH_PREFIX} can act faste
 static const u8 sText_MicleBerryActivates[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} boosted the accuracy of its\nnext move using {B_LAST_ITEM}!");
 static const u8 sText_PkmnShookOffTheTaunt[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} shook off\nthe taunt!");
 static const u8 sText_PkmnGotOverItsInfatuation[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} got over\nits infatuation!");
+static const u8 sText_MeteorBeamCharging[] = _("{B_ATK_NAME_WITH_PREFIX} is overflowing\nwith space energy!");
 
 const u8 *const gBattleStringsTable[BATTLESTRINGS_COUNT] =
 {
+    [STRINGID_METEORBEAMCHARGING - 12] = sText_MeteorBeamCharging,
     [STRINGID_PKMNINSNAPTRAP - 12] = sText_PkmnInSnapTrap,
     [STRINGID_PKMNGOTOVERITSINFATUATION - 12] = sText_PkmnGotOverItsInfatuation,
     [STRINGID_PKMNSHOOKOFFTHETAUNT - 12] = sText_PkmnShookOffTheTaunt,
@@ -1453,6 +1455,7 @@ const u16 gFirstTurnOfTwoStringIds[] =
     [B_MSG_TURN1_PHANTOM_FORCE] = STRINGID_VANISHEDINSTANTLY,
     [B_MSG_TURN1_GEOMANCY]      = STRINGID_PKNMABSORBINGPOWER,
     [B_MSG_TURN1_FREEZE_SHOCK]  = STRINGID_CLOAKEDINAFREEZINGLIGHT,
+    [B_MSG_TURN1_METEOR_BEAM]   = STRINGID_METEORBEAMCHARGING,
 };
 
 // Index copied from move's index in gTrappingMoves

src/data/battle_moves.h

@@ -11262,7 +11262,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] =
 
     [MOVE_METEOR_BEAM] =
     {
-        .effect = EFFECT_PLACEHOLDER,   //TODO
+        .effect = EFFECT_METEOR_BEAM,
         .power = 120,
         .type = TYPE_ROCK,
         .accuracy = 90,