Restructured functions in main.asm to resemble the home functions they clone

home/copy.asm

@@ -211,6 +211,7 @@ endr
 
 
 Request2bpp:: ; eba
+; Load 2bpp at b:de to occupy c tiles of hl.
 	ld a, [hBGMapMode]
 	push af
 	xor a
@@ -228,14 +229,14 @@ Request2bpp:: ; eba
 	ld [$ffd3], a
 	ld a, [InLinkBattle]
 	cp $4
-	jr nz, .asm_edc
+	jr nz, .okay
 	ld a, [$ffe9]
 	and a
-	jr nz, .asm_edc
+	jr nz, .okay
 	ld a, $6
 	ld [$ffd3], a
 
-.asm_edc
+.okay
 	ld a, e
 	ld [Requested2bppSource], a
 	ld a, d
@@ -245,11 +246,11 @@ Request2bpp:: ; eba
 	ld a, h
 	ld [Requested2bppDest + 1], a
 
-.asm_eec
+.loop
 	ld a, c
 	ld hl, $ffd3
 	cp [hl]
-	jr nc, .asm_f08
+	jr nc, .iterate
 
 	ld [Requested2bpp], a
 .wait
@@ -268,19 +269,19 @@ Request2bpp:: ; eba
 	ld [hBGMapMode], a
 	ret
 
-.asm_f08
+.iterate
 	ld a, [$ffd3]
 	ld [Requested2bpp], a
-.asm_f0d
+.wait2
 	call DelayFrame
 	ld a, [Requested2bpp]
 	and a
-	jr nz, .asm_f0d
+	jr nz, .wait2
 	ld a, c
 	ld hl, $ffd3
 	sub [hl]
 	ld c, a
-	jr .asm_eec
+	jr .loop
 ; f1e
 
 
@@ -302,14 +303,14 @@ Request1bpp:: ; f1e
 	ld [$ffd3], a
 	ld a, [InLinkBattle]
 	cp $4
-	jr nz, .asm_f40
+	jr nz, .NotMobile
 	ld a, [$ffe9]
 	and a
-	jr nz, .asm_f40
+	jr nz, .NotMobile
 	ld a, $6
 	ld [$ffd3], a
 
-.asm_f40
+.NotMobile
 	ld a, e
 	ld [Requested1bppSource], a
 	ld a, d
@@ -318,11 +319,11 @@ Request1bpp:: ; f1e
 	ld [Requested1bppDest], a
 	ld a, h
 	ld [Requested1bppDest + 1], a
-.asm_f50
+.loop
 	ld a, c
 	ld hl, $ffd3
 	cp [hl]
-	jr nc, .asm_f6c
+	jr nc, .iterate
 
 	ld [Requested1bpp], a
 .wait
@@ -341,19 +342,21 @@ Request1bpp:: ; f1e
 	ld [hBGMapMode], a
 	ret
 
-.asm_f6c
+.iterate
 	ld a, [$ffd3]
 	ld [Requested1bpp], a
-.asm_f71
+
+.wait2
 	call DelayFrame
 	ld a, [Requested1bpp]
 	and a
-	jr nz, .asm_f71
+	jr nz, .wait2
+
 	ld a, c
 	ld hl, $ffd3
 	sub [hl]
 	ld c, a
-	jr .asm_f50
+	jr .loop
 ; f82
 
 

home/joypad.asm

@@ -273,42 +273,44 @@ StopAutoInput:: ; a0a
 ; a1b
 
 
-Functiona1b:: ; a1b
+JoyTitleScreenInput:: ; a1b
+.loop
 
 	call DelayFrame
 
 	push bc
-	call Functiona57
+	call JoyTextDelay
 	pop bc
 
 	ld a, [hJoyDown]
 	cp D_UP | SELECT | B_BUTTON
-	jr z, .asm_a34
+	jr z, .keycombo
 
 	ld a, [hJoyLast]
 	and START | A_BUTTON
-	jr nz, .asm_a34
+	jr nz, .keycombo
 
 	dec c
-	jr nz, Functiona1b
+	jr nz, .loop
 
 	and a
 	ret
 
-.asm_a34
+.keycombo
 	scf
 	ret
 ; a36
 
 
-Functiona36:: ; a36
+JoyWaitAorB:: ; a36
+.loop
 	call DelayFrame
 	call GetJoypad
 	ld a, [hJoyPressed]
 	and A_BUTTON | B_BUTTON
 	ret nz
 	call RTC
-	jr Functiona36
+	jr .loop
 ; a46
 
 CloseText:: ; a46
@@ -317,13 +319,13 @@ CloseText:: ; a46
 	ld a, 1
 	ld [hOAMUpdate], a
 	call WaitBGMap
-	call Functiona36
+	call JoyWaitAorB
 	pop af
 	ld [hOAMUpdate], a
 	ret
 ; a57
 
-Functiona57:: ; a57
+JoyTextDelay:: ; a57
 	call GetJoypad
 	ld a, [hInMenu]
 	and a
@@ -367,7 +369,7 @@ Functiona80:: ; a80
 	hlcoord 18, 17
 	call Functionb06
 	pop hl
-	call Functiona57
+	call JoyTextDelay
 	ld a, [hJoyLast]
 	and $3
 	jr z, .asm_a8d
@@ -379,7 +381,7 @@ Functiona80:: ; a80
 ; aa5
 
 Functionaa5:: ; aa5
-	call Functiona57
+	call JoyTextDelay
 	ld a, [hJoyLast]
 	and A_BUTTON | B_BUTTON
 	jr z, Functionaa5
@@ -413,7 +415,7 @@ Functionac6:: ; ac6
 	callba Function1de28a
 .asm_ad9
 	call Functionaf5
-	call Functiona57
+	call JoyTextDelay
 	ld a, [hJoyPressed]
 	and $3
 	jr nz, .asm_af1