From fe12beaeb047ca88e1e8f3909dda0a123ae7a4e7 Mon Sep 17 00:00:00 2001
From: vulcandth <vulcandth@gmail.com>
Date: Thu, 12 May 2022 19:40:16 -0500
Subject: [PATCH] Replace some `REPT` with `FOR` Loops

Apply dannye suggestion
---
 data/unused/unused_9800.asm               | 10 +++-------
 engine/pinball_game/end_of_ball_bonus.asm | 16 +++++++---------
 engine/pinball_game/score.asm             | 16 +++++++---------
 home.asm                                  | 16 ++++++----------
 home/random.asm                           |  6 ++----
 5 files changed, 25 insertions(+), 39 deletions(-)

diff --git a/data/unused/unused_9800.asm b/data/unused/unused_9800.asm
index 9de115a..be965dc 100755
--- a/data/unused/unused_9800.asm
+++ b/data/unused/unused_9800.asm
@@ -1,12 +1,8 @@
 MACRO macro_9800
-	DEF x = 0
-	rept \1
-		DEF y = 0
-		rept $100 / \1
-			db (x + y) & $ff
-			DEF y = y + \1
+	FOR X, \1
+		FOR Y, 0, $100, \1
+			db (X + Y) & $ff
 		endr
-		DEF x = x + 1
 	endr
 endm
 
diff --git a/engine/pinball_game/end_of_ball_bonus.asm b/engine/pinball_game/end_of_ball_bonus.asm
index 60ddb45..84572d2 100644
--- a/engine/pinball_game/end_of_ball_bonus.asm
+++ b/engine/pinball_game/end_of_ball_bonus.asm
@@ -543,19 +543,17 @@ Func_f8d5: ; 0xf8d5
 	ret
 
 AddBigBCD6: ; 0xf902
-DEF x = 0
-rept 6
+FOR X, 6
 	ld a, [de]
-if x == 0
-	add [hl]
-else
-	adc [hl]
-endc
-DEF x = x + 1
+	if X == 0
+		add [hl]
+	else
+		adc [hl]
+	endc
 	daa
 	ld [hli], a
 	inc de
-endr
+ENDR
 	ret
 
 PointsPerPokemonCaught: ; 0xf921
diff --git a/engine/pinball_game/score.asm b/engine/pinball_game/score.asm
index d9ab112..a93ac26 100644
--- a/engine/pinball_game/score.asm
+++ b/engine/pinball_game/score.asm
@@ -83,20 +83,18 @@ AddBigBCD6FromQueue: ; 0x8588
 	ld b, $1
 asm_8592:
 	push hl
-DEF x = 0
-rept 6
+FOR X, 6
 	ld a, [de]
-if x == 0
-	add [hl]
-else
-	adc [hl]
-endc
+	if X == 0
+		add [hl]
+	else
+		adc [hl]
+	endc
 	daa
 	ld [de], a
 	inc de
 	inc hl
-DEF x = x + 1
-endr
+ENDR
 	ld a, e
 	cp wAddScoreQueueEnd % $100
 	jr nz, .okay
diff --git a/home.asm b/home.asm
index c3fb4ee..63102ae 100644
--- a/home.asm
+++ b/home.asm
@@ -3301,16 +3301,12 @@ BottomRightBonusStageCollisionMasks:
 
 ; These two squares data arrays must be aligned to $100 bytes and appear contiguously.
 SquaresLow:
-DEF x = 0
-rept 256
-	db (x * x) % $100
-DEF x = x + 1
-endr
+FOR X, 256
+	db (X * X) % $100
+ENDR
 
 SquaresHigh:
-DEF x = 0
-rept 256
-	db (x * x) / $100
-DEF x = x + 1
-endr
+FOR X, 256
+	db (X * X) / $100
+ENDR
 
diff --git a/home/random.asm b/home/random.asm
index e0a0a37..ac09436 100644
--- a/home/random.asm
+++ b/home/random.asm
@@ -131,8 +131,6 @@ EvensAndOdds:
 ; The first 128 bytes are the first 128 even numbers starting at 0.
 ; The next 128 bytes are the first 128 odd numbers starting at 1.
 ; The (a)th element is essentially what you'd get from rlca.
-DEF x = 0
-REPT 128
-	db x | ((x >> 7) & 1)
-DEF x = x + 2
+FOR X, 0, 256, 2
+	db X | ((X >> 7) & 1)
 ENDR