diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-14 23:00:22 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-14 23:00:22 -0500 |
| commit | dfcca93b451cecb6857f8b6bc6b9f67e997b09c9 (patch) | |
| tree | acf41a46e600fa3452536f97dc3f934968b3c839 /home/init.asm | |
| parent | 5c28d05bb40b47f084a34eb732da92c899e18db6 (diff) | |
| parent | 6c5cd7a963fb2b5eed109aeef25f041eabba0004 (diff) | |
Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460)
# Conflicts:
# engine/battle/core.asm
# engine/save.asm
Diffstat (limited to 'home/init.asm')
| -rw-r--r-- | home/init.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/home/init.asm b/home/init.asm index f9c8ef485..26fb17313 100644 --- a/home/init.asm +++ b/home/init.asm @@ -55,7 +55,7 @@ Init:: ; 17d ld [rOBP1], a ld [rTMA], a ld [rTAC], a - ld [$d000], a + ld [WRAM1_Begin], a ld a, %100 ; Start timer at 4096Hz ld [rTAC], a @@ -96,7 +96,7 @@ Init:: ; 17d ld [hCGB], a call ClearWRAM - ld a, 1 + ld a, BANK(wd000) ld [rSVBK], a call ClearVRAM call ClearSprites |