diff --git a/asm/macros/battle_anim_script.inc b/asm/macros/battle_anim_script.inc
index 31489a25dd..7aa8ff7505 100644
--- a/asm/macros/battle_anim_script.inc
+++ b/asm/macros/battle_anim_script.inc
@@ -549,6 +549,10 @@
 	createsprite gThunderboltOrbSpriteTemplate, \anim_battler, \subpriority_offset, \unk0, \x, \y, \unk3
 	.endm
 
+	.macro create_thunder_wave_sprite anim_battler:req, subpriority_offset:req, x:req, y:req
+	createsprite gThunderWaveSpriteTemplate, \anim_battler, \subpriority_offset, \x, \y
+	.endm
+
 	@.macro create_zap_cannon_ball_sprite anim_battler:req, subpriority_offset:req
 	@createsprite gZapCannonBallSpriteTemplate, \anim_battler, \subpriority_offset
 	@.endm
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s
index c297648de0..bc76eae8b5 100644
--- a/data/battle_anim_scripts.s
+++ b/data/battle_anim_scripts.s
@@ -1132,11 +1132,11 @@ Move_THUNDER_WAVE:
 	playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_TARGET
 	delay 20
 	loopsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET, 10, 4
-	createsprite gThunderWaveSpriteTemplate, ANIM_TARGET, 2, -16, -16
+	create_thunder_wave_sprite ANIM_TARGET, 2, x=-16, y=-16
 	delay 4
-	createsprite gThunderWaveSpriteTemplate, ANIM_TARGET, 2, -16, 0
+	create_thunder_wave_sprite ANIM_TARGET, 2, x=-16, y=0
 	delay 4
-	createsprite gThunderWaveSpriteTemplate, ANIM_TARGET, 2, -16, 16
+	create_thunder_wave_sprite ANIM_TARGET, 2, x=-16, y=16
 	waitforvisualfinish
 	createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 6, 0, RGB_BLACK
 	waitforvisualfinish
diff --git a/src/battle_anim_electric.c b/src/battle_anim_electric.c
index 475834384c..c2c90bf23b 100644
--- a/src/battle_anim_electric.c
+++ b/src/battle_anim_electric.c
@@ -797,10 +797,12 @@ static void AnimElectricBoltSegment(struct Sprite *sprite)
 // The horizontal bands of electricity used in Thunder Wave
 static void AnimThunderWave(struct Sprite *sprite)
 {
+    CMD_ARGS(x, y);
+
     u8 spriteId;
 
-    sprite->x += gBattleAnimArgs[0];
-    sprite->y += gBattleAnimArgs[1];
+    sprite->x += cmd->x;
+    sprite->y += cmd->y;
     spriteId = CreateSprite(&gThunderWaveSpriteTemplate, sprite->x + 32, sprite->y, sprite->subpriority);
     gSprites[spriteId].oam.tileNum += 8;
     gAnimVisualTaskCount++;