diff options
| author | JimB16 <f1@jimb.de> | 2015-10-26 03:26:53 +0100 |
|---|---|---|
| committer | JimB16 <f1@jimb.de> | 2015-10-26 03:26:53 +0100 |
| commit | 9a9cb38e39c991e102a1c6da7e8e16b2a1c61e07 (patch) | |
| tree | 46c064628b3d8015da22d6396b3c711e80646745 /home/window.asm | |
| parent | 3b9a3cc3bee8934e45f5e4d3fd9704b3fa619560 (diff) | |
| parent | 0d17d4a75866d053f5e0b48c66deb2508071d98b (diff) | |
merge with newest update
Diffstat (limited to 'home/window.asm')
| -rw-r--r-- | home/window.asm | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/home/window.asm b/home/window.asm index 0d30cfbdd..1198cfbe1 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) @@ -16,12 +16,14 @@ ResetWindow:: ; 2dba ; 2dcf -Function2dcf:: ; 2dcf +LoadMoveSprites:: ; 2dcf ld a, [hOAMUpdate] push af ld a, $1 ld [hOAMUpdate], a + call Function2de2 + pop af ld [hOAMUpdate], a ld hl, VramState @@ -30,7 +32,7 @@ Function2dcf:: ; 2dcf ; 2de2 Function2de2:: ; 2de2 - call Function1fbf + call ResetTextRelatedRAM xor a ld [hBGMapMode], a call Function2173 @@ -46,8 +48,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 +70,9 @@ Function2e20:: ; 2e20 push af ld a, $1 ld [hOAMUpdate], a + callba Function104110 + pop af ld [hOAMUpdate], a ret |