Clean up some data, using macros for multiline list entries

data/trainers/special_moves.asm

@@ -1,32 +1,25 @@
+; unique moves for gym leaders
 LoneMoves:
-; these are used for gym leaders.
-; this is not automatic! you have to write the number you want to wLoneAttackNo
-; first. e.g., erika's script writes 4 to wLoneAttackNo to get mega drain,
+; pokemon index, move to give nth pokemon
+; this is not automatic! you have to write the index you want to [wLoneAttackNo]
+; first. e.g., erika's script writes 4 to [wLoneAttackNo] to get mega drain, 
 ; the fourth entry in the list.
+	db 1, BIDE
+	db 1, BUBBLEBEAM
+	db 2, THUNDERBOLT
+	db 2, MEGA_DRAIN
+	db 3, TOXIC
+	db 3, PSYWAVE
+	db 3, FIRE_BLAST
+	db 4, FISSURE
 
-; first byte:  pokemon in the trainer's party that gets the move
-; second byte: move
-; unterminated
-	db 1,BIDE
-	db 1,BUBBLEBEAM
-	db 2,THUNDERBOLT
-	db 2,MEGA_DRAIN
-	db 3,TOXIC
-	db 3,PSYWAVE
-	db 3,FIRE_BLAST
-	db 4,FISSURE
-
+; unique moves for elite 4
 TeamMoves:
-; these are used for elite four.
-; this is automatic, based on trainer class.
-; don't be confused by LoneMoves above, the two data structures are
-	; _completely_ unrelated.
-
-; first byte: trainer (all trainers in this class have this move)
-; second byte: move
-; ff-terminated
-	db LORELEI,BLIZZARD
-	db BRUNO,FISSURE
-	db AGATHA,TOXIC
-	db LANCE,BARRIER
-	db $FF
+; trainer, move
+; all trainers in this class are given this move automatically
+; (unrelated to LoneMoves)
+	db LORELEI, BLIZZARD
+	db BRUNO,   FISSURE
+	db AGATHA,  TOXIC
+	db LANCE,   BARRIER
+	db -1 ; end