From 119d6b411922eb7b375691b81fc97c9b334f4167 Mon Sep 17 00:00:00 2001
From: PikalaxALT <PikalaxALT@gmail.com>
Date: Sat, 24 Oct 2015 10:34:19 -0400
Subject: About time I got to these functions

---
 home.asm | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

(limited to 'home.asm')

diff --git a/home.asm b/home.asm
index 75ed65900..eef727909 100644
--- a/home.asm
+++ b/home.asm
@@ -95,7 +95,7 @@ Function2ecb:: ; 2ecb
 ; 2ed3
 
 
-Function2ed3:: ; 0x2ed3
+DisableSpriteUpdates:: ; 0x2ed3
 ; disables overworld sprite updating?
 	xor a
 	ld [$ffde], a
@@ -107,7 +107,7 @@ Function2ed3:: ; 0x2ed3
 	ret
 ; 0x2ee4
 
-Function2ee4:: ; 2ee4
+EnableSpriteUpdates:: ; 2ee4
 	ld a, $1
 	ld [wc2ce], a
 	ld a, [VramState]
@@ -157,7 +157,7 @@ IsInJohto:: ; 2f17
 ; 2f3e
 
 
-Function2f3e:: ; 2f3e
+ret_2f3e:: ; 2f3e
 	ret
 ; 2f3f
 
@@ -605,10 +605,12 @@ Function3246:: ; 3246
 	push af
 	xor a
 	ld [hBGMapMode], a
+
 	ld a, [$ffde]
 	push af
 	xor a
 	ld [$ffde], a
+
 .wait
 	ld a, [rLY]
 	cp $7f
@@ -623,6 +625,7 @@ Function3246:: ; 3246
 	ld [rVBK], a
 	hlcoord 0, 0
 	call Function327b
+
 .wait2
 	ld a, [rLY]
 	cp $7f
@@ -637,30 +640,33 @@ Function3246:: ; 3246
 ; 327b
 
 Function327b:: ; 327b
+; Copy all tiles to VBGMap
 	ld [hSPBuffer], sp
 	ld sp, hl
 	ld a, [hBGMapAddress + 1]
 	ld h, a
 	ld l, 0
-	ld a, 18
+	ld a, SCREEN_HEIGHT
 	ld [$ffd3], a
 	ld b, 1 << 1 ; not in v/hblank
 	ld c, rSTAT % $100
 
 .loop
-rept 20 / 2
+rept SCREEN_WIDTH / 2
 	pop de
+; if in v/hblank, wait until not in v/hblank
 .loop\@
 	ld a, [$ff00+c]
 	and b
 	jr nz, .loop\@
+; load BGMap0
 	ld [hl], e
 	inc l
 	ld [hl], d
 	inc l
 endr
 
-	ld de, 32 - 20
+	ld de, $20 - SCREEN_WIDTH
 	add hl, de
 	ld a, [$ffd3]
 	dec a
@@ -1163,16 +1169,16 @@ Function3524:: ; 3524
 ; 352f
 
 Function352f:: ; 352f
-	ld a, [wcf82]
+	ld a, [wMenuBorderTopCoord]
 	dec a
 	ld b, a
-	ld a, [wcf84]
+	ld a, [wMenuBorderBottomCoord]
 	sub b
 	ld d, a
-	ld a, [wcf83]
+	ld a, [wMenuBorderLeftCoord]
 	dec a
 	ld c, a
-	ld a, [wcf85]
+	ld a, [wMenuBorderRightCoord]
 	sub c
 	ld e, a
 	push de
@@ -1599,7 +1605,7 @@ Function3718:: ; 3718
 	jr .ok
 
 .canlose
-	ld a, [wd0ee]
+	ld a, [wBattleResult]
 	ld hl, WalkingTile
 	and $f
 	jr z, .ok
@@ -2221,7 +2227,7 @@ Function3f6e:: ; 3f6e
 
 Function3f7c:: ; 3f7c
 	call GetMemTileCoord
-	call Function1c53
+	call GetMenuBoxDims
 	dec b
 	dec c
 	call Function3eea
-- 
cgit v1.2.3