From f37cf959c930ae9595f9f71ce0d9b17dcf5421d0 Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Tue, 14 Jul 2020 10:21:18 -0400
Subject: Clean up some data, using macros for multiline list entries

---
 data/moves/grammar.asm | 84 ++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 71 insertions(+), 13 deletions(-)

(limited to 'data/moves/grammar.asm')

diff --git a/data/moves/grammar.asm b/data/moves/grammar.asm
index 8113ab7c..bc3d1dc6 100644
--- a/data/moves/grammar.asm
+++ b/data/moves/grammar.asm
@@ -1,14 +1,72 @@
 ExclamationPointMoveSets:
-	db SWORDS_DANCE, GROWTH
-	db $00
-	db RECOVER, BIDE, SELFDESTRUCT, AMNESIA
-	db $00
-	db MEDITATE, AGILITY, TELEPORT, MIMIC, DOUBLE_TEAM, BARRAGE
-	db $00
-	db POUND, SCRATCH, VICEGRIP, WING_ATTACK, FLY, BIND, SLAM, HORN_ATTACK, BODY_SLAM
-	db WRAP, THRASH, TAIL_WHIP, LEER, BITE, GROWL, ROAR, SING, PECK, COUNTER
-	db STRENGTH, ABSORB, STRING_SHOT, EARTHQUAKE, FISSURE, DIG, TOXIC, SCREECH, HARDEN
-	db MINIMIZE, WITHDRAW, DEFENSE_CURL, METRONOME, LICK, CLAMP, CONSTRICT, POISON_GAS
-	db LEECH_LIFE, BUBBLE, FLASH, SPLASH, ACID_ARMOR, FURY_SWIPES, REST, SHARPEN, SLASH, SUBSTITUTE
-	db $00
-	db $FF ; terminator
+; set 0
+	db SWORDS_DANCE
+	db GROWTH
+	db 0 ; end set
+
+; set 1
+	db RECOVER
+	db BIDE
+	db SELFDESTRUCT
+	db AMNESIA
+	db 0 ; end set
+
+; set 2
+	db MEDITATE
+	db AGILITY
+	db TELEPORT
+	db MIMIC
+	db DOUBLE_TEAM
+	db BARRAGE
+	db 0 ; end set
+
+; set 3
+	db POUND
+	db SCRATCH
+	db VICEGRIP
+	db WING_ATTACK
+	db FLY
+	db BIND
+	db SLAM
+	db HORN_ATTACK
+	db BODY_SLAM
+	db WRAP
+	db THRASH
+	db TAIL_WHIP
+	db LEER
+	db BITE
+	db GROWL
+	db ROAR
+	db SING
+	db PECK
+	db COUNTER
+	db STRENGTH
+	db ABSORB
+	db STRING_SHOT
+	db EARTHQUAKE
+	db FISSURE
+	db DIG
+	db TOXIC
+	db SCREECH
+	db HARDEN
+	db MINIMIZE
+	db WITHDRAW
+	db DEFENSE_CURL
+	db METRONOME
+	db LICK
+	db CLAMP
+	db CONSTRICT
+	db POISON_GAS
+	db LEECH_LIFE
+	db BUBBLE
+	db FLASH
+	db SPLASH
+	db ACID_ARMOR
+	db FURY_SWIPES
+	db REST
+	db SHARPEN
+	db SLASH
+	db SUBSTITUTE
+	db 0 ; end set
+
+	db -1 ; end
-- 
cgit v1.3.1-sl0p