summaryrefslogtreecommitdiff
path: root/home/init.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2018-02-03 17:15:20 -0500
committerGitHub <noreply@github.com>2018-02-03 17:15:20 -0500
commitb35eb72290b964b98844afbe741bb7ede34b9ef3 (patch)
tree2cf2652bc9c3e69ae5f7b2a2632c02a12498615f /home/init.asm
parent7547ad839cf1c8141b931d08ef16a894e7db68c9 (diff)
parent32ade4ac9bf113d630d904aab51f2c49c91bf8c2 (diff)
Merge pull request #480 from luckytyphlosion/master
[Ready to merge] Prefix wram labels with w.
Diffstat (limited to 'home/init.asm')
-rw-r--r--home/init.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/home/init.asm b/home/init.asm
index d8e476c3f..ec541ad16 100644
--- a/home/init.asm
+++ b/home/init.asm
@@ -79,7 +79,7 @@ Init:: ; 17d
or c
jr nz, .ByteFill
- ld sp, Stack
+ ld sp, wStack
; Clear HRAM
ld a, [hCGB]
@@ -103,10 +103,10 @@ Init:: ; 17d
call ClearsScratch
- ld a, BANK(LoadPushOAM)
+ ld a, BANK(WriteOAMDMACodeToHRAM)
rst Bankswitch
- call LoadPushOAM
+ call WriteOAMDMACodeToHRAM
xor a
ld [hMapAnims], a