More splitting of main.asm; remove unneeded rept 2

12 files changed, 56 insertions, 112 deletions

diff --git a/misc/battle_tower_47.asm b/misc/battle_tower_47.asm
index a11f61064..1c83fabf5 100755
--- a/misc/battle_tower_47.asm
+++ b/misc/battle_tower_47.asm
@@ -61,9 +61,8 @@ ENDC
 
 .okay2
 	push af
-rept 2
 	add hl, bc
-endr
+	add hl, bc
 	ld a, [hli]
 	ld c, a
 	ld a, [hl]
@@ -72,9 +71,8 @@ endr
 	pop af
 	ld c, a
 	ld b, 0
-rept 2
 	add hl, bc
-endr
+	add hl, bc
 	ld a, [hli]
 	ld c, a
 	ld a, [hl]
diff --git a/misc/battle_tower_5c.asm b/misc/battle_tower_5c.asm
index fb441a3f8..a3779e24f 100755
--- a/misc/battle_tower_5c.asm
+++ b/misc/battle_tower_5c.asm
@@ -217,9 +217,8 @@ _BattleTowerBattle: ; 17022c
 	ld e, a
 	ld d, 0
 	ld hl, .dw
-rept 2
 	add hl, de
-endr
+	add hl, de
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -459,9 +458,8 @@ endr
 	ld a, POUND
 	ld [hli], a
 	xor a
-rept 2
 	ld [hli], a
-endr
+	ld [hli], a
 	ld [hl], a
 	jr .done_moves
 
@@ -489,9 +487,8 @@ endr
 	predef CalcPkmnStats
 	pop de
 	pop hl
-rept 2
 	dec de
-endr
+	dec de
 	ld a, [hli]
 	ld [de], a
 	inc de
@@ -690,9 +687,8 @@ Function1704e1: ; 1704e1
 	ld e, a
 	ld d, 0
 	ld hl, .dw
-rept 2
 	add hl, de
-endr
+	add hl, de
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -908,9 +904,8 @@ endr
 	ld [hli], a
 	dec c
 	jr nz, .clearbox_column
-rept 2
 	inc hl
-endr
+	inc hl
 	dec b
 	jr nz, .clearbox_row
 	ret
@@ -947,9 +942,8 @@ BattleTowerAction: ; 170687
 	ld e, a
 	ld d, 0
 	ld hl, .dw
-rept 2
 	add hl, de
-endr
+	add hl, de
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -1393,9 +1387,8 @@ rept 4
 	dec hl
 endr
 	ld a, "@"
-rept 2
 	ld [hli], a
-endr
+	ld [hli], a
 	pop hl
 	ld a, EGG_TICKET
 	ld [CurItem], a
@@ -1445,9 +1438,8 @@ Function1709bb: ; 1709bb (5c:49bb) BattleTowerAction $10
 	ld e, a
 	ld d, 0
 	ld hl, Jumptable_1709e7
-rept 2
 	add hl, de
-endr
+	add hl, de
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
diff --git a/misc/crystal_misc.asm b/misc/crystal_misc.asm
index 01538a3d6..8ff138869 100644
--- a/misc/crystal_misc.asm
+++ b/misc/crystal_misc.asm
@@ -682,15 +682,13 @@ Function17aaa9: ; 17aaa9 (5e:6aa9)
 Function17aac3: ; 17aac3 (5e:6ac3)
 	ld a, $b
 	push hl
-rept 2
 	ld [hli], a
-endr
+	ld [hli], a
 	pop hl
 	ld de, SCREEN_WIDTH
 	add hl, de
-rept 2
 	ld [hli], a
-endr
+	ld [hli], a
 	ret
 
 Function17aad0: ; 17aad0 (5e:6ad0)
diff --git a/misc/mobile_12_2.asm b/misc/mobile_12_2.asm
index 05e92cd55..dcf37aa70 100755
--- a/misc/mobile_12_2.asm
+++ b/misc/mobile_12_2.asm
@@ -616,9 +616,8 @@ Function4abc3: ; 4abc3
 	ld a, [wMenuCursorY]
 	ld [wMenuCursorY], a
 	ld a, [PartyCount]
-rept 2
 	inc a
-endr
+	inc a
 	ld b, a
 	ld a, [wMenuCursorY]
 	cp b
diff --git a/misc/mobile_22.asm b/misc/mobile_22.asm
index c9a844b42..3e2a9f30e 100644
--- a/misc/mobile_22.asm
+++ b/misc/mobile_22.asm
@@ -669,9 +669,8 @@ Function894dc: ; 894dc
 	ld c, d
 	ld b, 0
 	ld hl, .PalettePointers
-rept 2
 	add hl, bc
-endr
+	add hl, bc
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -787,9 +786,8 @@ Function8956f: ; 8956f
 	ld a, [TrainerClass]
 	ld h, 0
 	ld l, a
-rept 2
 	add hl, hl
-endr
+	add hl, hl
 	ld de, TrainerPalettes
 	add hl, de
 	ld a, [rSVBK]
@@ -1043,9 +1041,8 @@ Function896eb: ; 896eb
 Function896f5: ; 896f5
 	call Function8971f
 	call Function89736
-rept 2
 	inc hl
-endr
+	inc hl
 	ld b, 2
 
 ClearScreenArea: ; 0x896ff
@@ -1071,9 +1068,8 @@ ClearScreenArea: ; 0x896ff
 	jr nz, .loop
 
 	dec hl
-rept 2
 	inc c
-endr
+	inc c
 .asm_89713
 	ld a, $36
 	ld [hli], a
@@ -1107,9 +1103,8 @@ Function8971f: ; 8971f
 
 Function89736: ; 89736
 	push hl
-rept 2
 	inc hl
-endr
+	inc hl
 	ld e, c
 	ld d, $0
 	add hl, de
@@ -1145,9 +1140,8 @@ Function8975b: ; 8975b
 	ld [hli], a
 	ld a, $d
 	ld [hl], a
-rept 2
 	dec hl
-endr
+	dec hl
 	ld a, $4
 	ld e, $3
 .asm_89769
@@ -1912,9 +1906,8 @@ Function89b97: ; 89b97 (22:5b97)
 	and a
 	jr z, .asm_89bae
 .asm_89ba9
-rept 2
 	inc hl
-endr
+	inc hl
 	dec a
 	jr nz, .asm_89ba9
 .asm_89bae
@@ -2523,9 +2516,8 @@ Function89f77: ; 89f77 (22:5f77)
 	ld [hli], a
 	ld a, c
 	ld [hli], a
-rept 2
 	inc hl
-endr
+	inc hl
 	ld a, $8
 	add c
 	ld c, a
diff --git a/misc/mobile_22_2.asm b/misc/mobile_22_2.asm
index 880ae460a..616c16ae0 100644
--- a/misc/mobile_22_2.asm
+++ b/misc/mobile_22_2.asm
@@ -314,9 +314,8 @@ Function8b4d8: ; 8b4d8 (22:74d8)
 	ld hl, Unknown_8b529
 	call Function8b50a
 	push hl
-rept 2
 	inc hl
-endr
+	inc hl
 	ld a, [hli]
 	ld b, a
 	ld a, [hl]
@@ -331,9 +330,8 @@ Function8b4ea: ; 8b4ea (22:74ea)
 	ld hl, Unknown_8b529
 	call Function8b50a
 	push hl
-rept 2
 	inc hl
-endr
+	inc hl
 	ld a, [hli]
 	ld b, a
 	ld a, [hl]
@@ -698,12 +696,10 @@ Function8b73e: ; 8b73e
 Function8b744: ; 8b744
 	ld de, AttrMap - TileMap
 	add hl, de
-rept 2
 	inc b
-endr
-rept 2
+	inc b
+	inc c
 	inc c
-endr
 	xor a
 .asm_8b74d
 	push bc
@@ -975,9 +971,8 @@ Function8b8c8: ; 8b8c8
 	ld b, 0
 	ld c, a
 	ld hl, Unknown_8b903
-rept 2
 	add hl, bc
-endr
+	add hl, bc
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
diff --git a/misc/mobile_41.asm b/misc/mobile_41.asm
index 44db58602..c14a0779f 100755
--- a/misc/mobile_41.asm
+++ b/misc/mobile_41.asm
@@ -609,9 +609,8 @@ _MobilePrintNum:: ; 1061ef
 rept 3
 	inc de
 endr
-rept 2
 	dec a
-endr
+	dec a
 
 .digit_loop
 	push af
diff --git a/misc/mobile_42.asm b/misc/mobile_42.asm
index a24efd10c..af7953c76 100644
--- a/misc/mobile_42.asm
+++ b/misc/mobile_42.asm
@@ -372,9 +372,8 @@ MobileTradeAnim_JumptableLoop: ; 10824b
 	ld e, a
 	ld d, 0
 	ld hl, .Jumptable
-rept 2
 	add hl, de
-endr
+	add hl, de
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -955,9 +954,8 @@ MobileTradeAnim_GiveTrademon1: ; 108763
 	ld a, [hSCX]
 	cp $e0
 	jr z, .loop2
-rept 2
 	dec a
-endr
+	dec a
 	ld [hSCX], a
 	cp $f8
 	jr nz, .next
@@ -974,9 +972,8 @@ endr
 	ld a, [hSCY]
 	cp $f8
 	jr z, .done
-rept 2
 	dec a
-endr
+	dec a
 	ld [hSCY], a
 	cp $40
 	jr z, .init
@@ -1125,9 +1122,8 @@ MobileTradeAnim_GetTrademon2: ; 108894
 	ld a, [hSCY]
 	cp $78
 	jr z, .asm_1088ee
-rept 2
 	inc a
-endr
+	inc a
 	ld [hSCY], a
 	cp $30
 	jr z, .asm_1088c5
@@ -1166,9 +1162,8 @@ endr
 	ld a, [hSCX]
 	cp $c
 	jr z, .asm_108906
-rept 2
 	inc a
-endr
+	inc a
 	ld [hSCX], a
 	cp -8
 	jr nz, .asm_1088e7
diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm
index 39d1f46ed..532a8c8cc 100644
--- a/misc/mobile_45.asm
+++ b/misc/mobile_45.asm
@@ -153,9 +153,8 @@ Function114243:: ; 114243
 Function11425c: ; 11425c
 	ld [$dc02], a
 	pop af
-rept 2
 	ld [hFF8C], a
-endr
+	ld [hFF8C], a
 	ld [MBC3SRamBank], a
 	ret
 
@@ -632,9 +631,8 @@ Function1144c8: ; 1144c8
 
 Function1144d1: ; 1144d1
 	call Function114561
-rept 2
 	dec de
-endr
+	dec de
 	push de
 rept 3
 	inc de
@@ -1006,9 +1004,8 @@ Function1146a4: ; 1146a4
 	and a
 	jr nz, .asm_1146e8
 .asm_1146da
-rept 2
 	dec bc
-endr
+	dec bc
 	call Function1149cc
 	and a
 	jr nz, .asm_1146e4
@@ -1095,9 +1092,8 @@ Function1146fa: ; 1146fa
 	ld a, [$dc0e]
 	cp $3
 	jr nz, .asm_114773
-rept 2
 	dec bc
-endr
+	dec bc
 
 .asm_114773
 	call Function1149cc
@@ -2069,9 +2065,8 @@ Function114c5e: ; 114c5e
 	inc de
 	cp $3f
 	jr nz, .asm_114c62
-rept 2
 	dec de
-endr
+	dec de
 .asm_114c75
 	ld a, [hli]
 	cp $3f
@@ -2091,9 +2086,8 @@ endr
 	ld a, [hli]
 	cp $3d
 	jr nz, .asm_114c84
-rept 2
 	dec bc
-endr
+	dec bc
 	ld a, l
 	ld [$dc03], a
 	ld a, h
@@ -2360,9 +2354,8 @@ Function114d99: ; 114d99
 	add hl, de
 	ld b, h
 	ld c, l
-rept 2
 	inc bc
-endr
+	inc bc
 	xor a
 	ret
 
@@ -2563,9 +2556,8 @@ Function114ee9: ; 114ee9
 	ld a, b
 	ld [hli], a
 	ld a, c
-rept 2
 	ld [hli], a
-endr
+	ld [hli], a
 	ld a, [de]
 	ld [hli], a
 	inc de
@@ -2970,9 +2962,8 @@ Function1150b3: ; 1150b3
 
 .asm_11510b
 	pop hl
-rept 2
 	dec hl
-endr
+	dec hl
 	push de
 	call Function1158c2
 	pop de
@@ -3499,9 +3490,8 @@ Function1153b5: ; 1153b5
 	ld e, [hl]
 	inc hl
 	ld d, [hl]
-rept 2
 	inc hl
-endr
+	inc hl
 	ld a, [de]
 	ld [hli], a
 	inc de
@@ -4523,9 +4513,8 @@ endr
 	ld a, $3f
 	and c
 	ld [hld], a
-rept 2
 	dec hl
-endr
+	dec hl
 	pop de
 	ld b, h
 	ld c, l
@@ -4581,9 +4570,8 @@ endr
 	ld a, [hli]
 	ld c, a
 	ld b, [hl]
-rept 2
 	inc bc
-endr
+	inc bc
 	ld a, b
 	ld [hld], a
 	ld [hl], c
@@ -4864,9 +4852,8 @@ Function115b00: ; 115b00
 	ld a, [wStartDay]
 	cp $4
 	jr z, .asm_115b43
-rept 2
 	inc hl
-endr
+	inc hl
 	jr .asm_115b43
 
 .asm_115b36
@@ -5048,9 +5035,8 @@ Function115bc8: ; 115bc8
 	ret
 
 .asm_115c33
-rept 2
 	dec hl
-endr
+	dec hl
 	xor a
 	ld [hl], a
 	ld a, $1
@@ -5406,9 +5392,8 @@ Function11659d: ; 11659d
 	ld e, a
 	ld d, 0
 	ld hl, Jumptable_1165af
-rept 2
 	add hl, de
-endr
+	add hl, de
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -6941,9 +6926,8 @@ Function117719: ; 117719 (45:7719)
 	ld e, a
 	ld d, 0
 	ld hl, Jumptable_117728
-rept 2
 	add hl, de
-endr
+	add hl, de
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -7430,9 +7414,8 @@ Function117ae9: ; 0x117ae9
 	ld e, a
 	ld d, $0
 	ld hl, .Jumptable
-rept 2
 	add hl, de
-endr
+	add hl, de
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
diff --git a/misc/mobile_45_sprite_engine.asm b/misc/mobile_45_sprite_engine.asm
index ab31a9bb9..d0183b2ca 100755
--- a/misc/mobile_45_sprite_engine.asm
+++ b/misc/mobile_45_sprite_engine.asm
@@ -375,9 +375,8 @@ Function1161b8: ; 1161b8
 	ld e, a
 	ld d, 0
 	ld hl, .Jumptable
-rept 2
 	add hl, de
-endr
+	add hl, de
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
diff --git a/misc/mobile_5b.asm b/misc/mobile_5b.asm
index 24f2f9189..eca57e1c8 100755
--- a/misc/mobile_5b.asm
+++ b/misc/mobile_5b.asm
@@ -356,9 +356,8 @@ Function16c943: ; 16c943
 	call Function16cae8
 
 .asm_16c9e1
-rept 2
 	inc e
-endr
+	inc e
 	ld a, e
 	cp $8
 	jr nz, .asm_16c969
@@ -459,9 +458,8 @@ Function16ca11: ; 16ca11
 	call Function16cae8
 
 .asm_16ca88
-rept 2
 	inc e
-endr
+	inc e
 	ld a, e
 	cp $8
 	jr nz, .asm_16ca28
diff --git a/misc/mobile_5c.asm b/misc/mobile_5c.asm
index 8ecd35edf..fe8432262 100755
--- a/misc/mobile_5c.asm
+++ b/misc/mobile_5c.asm
@@ -111,9 +111,8 @@ Function170c06: ; 170c06
 	inc [hl]
 
 .asm_170c15
-rept 2
 	inc hl
-endr
+	inc hl
 	ld a, [$a89b]
 	add [hl]
 	ld [hld], a
@@ -138,9 +137,8 @@ endr
 	ld a, [hli]
 	ld b, a
 	ld c, [hl]
-rept 2
 	inc hl
-endr
+	inc hl
 	ld a, [hld]
 	sub c
 	ld c, a
@@ -370,9 +368,8 @@ Function171a36: ; 171a36 (5c:5a36)
 	ld e, a
 	ld d, 0
 	ld hl, Jumptable_171a45
-rept 2
 	add hl, de
-endr
+	add hl, de
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -732,9 +729,8 @@ Function171ccd: ; 171ccd (5c:5ccd)
 Function171cf0: ; 171cf0 (5c:5cf0)
 	xor a
 	hlcoord 4, 15
-rept 2
 	ld [hli], a
-endr
+	ld [hli], a
 	ld a, [wcd4b]
 	xor $1
 	ld [wcd4b], a