Use rgbds 0.5.0

3 files changed, 14 insertions, 49 deletions

diff --git a/data/moves/tmhm_moves.asm b/data/moves/tmhm_moves.asm
index 50f423596..bc3d5b685 100644
--- a/data/moves/tmhm_moves.asm
+++ b/data/moves/tmhm_moves.asm
@@ -6,44 +6,21 @@ TMHMMoves:
 	table_width 1, TMHMMoves
 
 ; TMs
-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
 
 ; HMs
-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_TMS + NUM_HMS
 
-; Move tutor
+; Move tutors
 n = 1
-rept NUM_TUTORS
-if n < 10
-MOVE_FOR_MT EQUS "MT0{d:n}_MOVE"
-else
-MOVE_FOR_MT EQUS "MT{d:n}_MOVE"
-endc
-	db MOVE_FOR_MT
-PURGE MOVE_FOR_MT
-n = n + 1
+for n, 1, NUM_TUTORS + 1
+	db MT{02d:n}_MOVE
 endr
 	assert_table_length NUM_TM_HM_TUTOR
 
diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm
index 0bd395fd8..71b8ca95d 100644
--- a/data/pokemon/base_stats.asm
+++ b/data/pokemon/base_stats.asm
@@ -1,33 +1,23 @@
 ; used in data/pokemon/base_stats/*.asm
 tmhm: MACRO
 ; initialize bytes to 0
-n = 0
-rept (NUM_TM_HM_TUTOR + 7) / 8
-_TM_BYTE EQUS "_tm{d:n}"
-_TM_BYTE = 0
-PURGE _TM_BYTE
-n = n + 1
+for n, (NUM_TM_HM_TUTOR + 7) / 8
+_tm{d:n} = 0
 endr
 ; set bits of bytes
 rept _NARG
 	if DEF(\1_TMNUM)
 n = (\1_TMNUM - 1) / 8
 i = (\1_TMNUM - 1) % 8
-_TM_BYTE EQUS "_tm{d:n}"
-_TM_BYTE = _TM_BYTE | (1 << i)
-PURGE _TM_BYTE
+_tm{d:n} = _tm{d:n} | (1 << i)
 	else
 		fail "\1 is not a TM, HM, or tutor move"
 	endc
 	shift
 endr
 ; output bytes
-n = 0
-rept (NUM_TM_HM_TUTOR + 7) / 8
-_TM_BYTE EQUS "_tm{d:n}"
-	db _TM_BYTE
-PURGE _TM_BYTE
-n = n + 1
+for n, (NUM_TM_HM_TUTOR + 7) / 8
+	db _tm{d:n}
 endr
 ENDM
 
diff --git a/data/pokemon/unown_words.asm b/data/pokemon/unown_words.asm
index 329a6aae0..7c41e19a3 100644
--- a/data/pokemon/unown_words.asm
+++ b/data/pokemon/unown_words.asm
@@ -1,8 +1,6 @@
 unownword: MACRO
-x = 1
-rept STRLEN(\1)
-	db STRSUB(\1, x, 1) - "A" + FIRST_UNOWN_CHAR
-x = x + 1
+for x, STRLEN(\1)
+	db STRSUB(\1, x + 1, 1) - "A" + FIRST_UNOWN_CHAR
 endr
 	db -1
 ENDM