Use rgbds 0.5.0 features:

- FOR loops
- {interpolation}
- REDEF EQUS
- \# for all macro args

data/moves/tmhm_moves.asm

@@ -4,28 +4,12 @@
 TechnicalMachines:
 	table_width 1, TechnicalMachines
 
-n = 1
-REPT NUM_TMS
-IF n < 10
-MOVE_FOR_TM EQUS "TM0{d:n}_MOVE"
-ELSE
-MOVE_FOR_TM EQUS "TM{d:n}_MOVE"
-ENDC
-	db MOVE_FOR_TM
-PURGE MOVE_FOR_TM
-n = n + 1
+FOR n, 1, NUM_TMS + 1
+	db TM{02d:n}_MOVE
 ENDR
 	assert_table_length NUM_TMS
 
-n = 1
-REPT NUM_HMS
-IF n < 10
-MOVE_FOR_HM EQUS "HM0{d:n}_MOVE"
-ELSE
-MOVE_FOR_HM EQUS "HM{d:n}_MOVE"
-ENDC
-	db MOVE_FOR_HM
-PURGE MOVE_FOR_HM
-n = n + 1
+FOR n, 1, NUM_HMS + 1
+	db HM{02d:n}_MOVE
 ENDR
 	assert_table_length NUM_TM_HM

data/tilesets/collision_tile_ids.asm

@@ -1,8 +1,7 @@
 coll_tiles: MACRO
-REPT _NARG
-	db \1
-	shift
-ENDR
+	IF _NARG
+		db \# ; all args
+	ENDC
 	db -1 ; end
 ENDM
 

data/tilesets/door_tile_ids.asm

@@ -15,10 +15,9 @@ DoorTileIDPointers:
 	db -1 ; end
 
 door_tiles: MACRO
-REPT _NARG
-	db \1
-	shift
-ENDR
+	IF _NARG
+		db \# ; all args
+	ENDC
 	db 0 ; end
 ENDM
 

data/tilesets/warp_carpet_tile_ids.asm

@@ -5,10 +5,9 @@ WarpTileListPointers:
 	dw .FacingRightWarpTiles
 
 warp_carpet_tiles: MACRO
-REPT _NARG
-	db \1
-	shift
-ENDR
+	IF _NARG
+		db \# ; all args
+	ENDC
 	db -1 ; end
 ENDM
 

data/tilesets/warp_tile_ids.asm

@@ -27,10 +27,9 @@ WarpTileIDPointers:
 	assert_table_length NUM_TILESETS
 
 warp_tiles: MACRO
-REPT _NARG
-	db \1
-	shift
-ENDR
+	IF _NARG
+		db \# ; all args
+	ENDC
 	db -1 ; end
 ENDM
 

data/trainers/move_choices.asm

@@ -1,8 +1,7 @@
 move_choices: MACRO
-REPT _NARG
-	db \1
-	shift
-ENDR
+	IF _NARG
+		db \# ; all args
+	ENDC
 	db 0 ; end
 list_index = list_index + 1
 ENDM