summaryrefslogtreecommitdiff
path: root/home
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2015-10-17 20:49:34 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2015-10-17 21:26:38 -0400
commit52605b764a6ecfb781ca9e70d51dad909dabe7c3 (patch)
tree5c5f94165c373acdab98443004131d31d937b01a /home
parentf53d65c536096213b6826765f81a0f436c88fe72 (diff)
Add commented numbers to map/group constants
Diffstat (limited to 'home')
-rw-r--r--home/menu.asm17
-rw-r--r--home/window.asm10
2 files changed, 16 insertions, 11 deletions
diff --git a/home/menu.asm b/home/menu.asm
index e82511895..7c46b97e0 100644
--- a/home/menu.asm
+++ b/home/menu.asm
@@ -486,21 +486,23 @@ endr
ret
; 1fbf
-Function1fbf:: ; 1fbf
+ResetTextRelatedRAM:: ; 1fbf
ld hl, wcf71
- call Function1ff0
+ call .bytefill
ld hl, wcf81
- call Function1ff0
+ call .bytefill
ld hl, wcf91
- call Function1ff0
+ call .bytefill
ld hl, wcfa1
- call Function1ff0
+ call .bytefill
+
ld a, [rSVBK]
push af
ld a, $7
ld [rSVBK], a
+
xor a
- ld hl, $dfff
+ ld hl, w7_dfff
rept 2
ld [hld], a
endr
@@ -508,12 +510,13 @@ endr
ld [wcf71], a
ld a, h
ld [wcf72], a
+
pop af
ld [rSVBK], a
ret
; 1ff0
-Function1ff0:: ; 1ff0
+.bytefill: ; 1ff0
ld bc, $0010
xor a
call ByteFill
diff --git a/home/window.asm b/home/window.asm
index 0d30cfbdd..1b33c9901 100644
--- a/home/window.asm
+++ b/home/window.asm
@@ -1,6 +1,6 @@
ResetWindow:: ; 2dba
- call Function1fbf
+ call ResetTextRelatedRAM
ld a, [hROMBank]
push af
ld a, BANK(Function6454) ; and BANK(Function64bf)
@@ -30,7 +30,7 @@ Function2dcf:: ; 2dcf
; 2de2
Function2de2:: ; 2de2
- call Function1fbf
+ call ResetTextRelatedRAM
xor a
ld [hBGMapMode], a
call Function2173
@@ -46,8 +46,8 @@ Function2de2:: ; 2de2
ret
; 2e08
-Function2e08:: ; 2e08
- call Function1fbf
+LoadFont:: ; 2e08
+ call ResetTextRelatedRAM
ld a, [hROMBank]
push af
ld a, BANK(Function6454) ; and BANK(Function64bf)
@@ -68,7 +68,9 @@ Function2e20:: ; 2e20
push af
ld a, $1
ld [hOAMUpdate], a
+
callba Function104110
+
pop af
ld [hOAMUpdate], a
ret