diff options
| author | yenatch <yenatch@gmail.com> | 2014-09-20 00:57:27 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-09-20 00:57:27 -0400 |
| commit | dff0cdeb5a2f901dc8d1a05847d09d7faf1654ad (patch) | |
| tree | 3618582f76f4183b6bc22c5d4743b6d171d11128 /home/init.asm | |
| parent | 1185d69819af3493fe8ace9f576fee4b420db55e (diff) | |
| parent | 2ed65d9c3e3ba60939ebe2928ffddc06a90b1876 (diff) | |
Merge remote-tracking branch 'YamaArashi/master'
Conflicts:
constants/misc_constants.asm
engine/battle/core.asm
engine/menu/pokedex.asm
engine/town_map.asm
home.asm
hram.asm
Diffstat (limited to 'home/init.asm')
| -rw-r--r-- | home/init.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/home/init.asm b/home/init.asm index b79b19d9..e170fe78 100644 --- a/home/init.asm +++ b/home/init.asm @@ -25,7 +25,7 @@ rLCDC_DEFAULT EQU %11100011 ld [rIE], a ld [$ff43], a ld [$ff42], a - ld [$ff01], a + ld [rSB], a ld [$ff02], a ld [$ff4b], a ld [$ff4a], a @@ -61,11 +61,11 @@ rLCDC_DEFAULT EQU %11100011 ld a, Bank(WriteDMACodeToHRAM) ld [H_LOADEDROMBANK], a - ld [MBC3RomBank], a + ld [MBC1RomBank], a call WriteDMACodeToHRAM xor a - ld [$ffd7], a + ld [hTilesetType], a ld [$ff41], a ld [$ffae], a ld [$ffaf], a @@ -74,7 +74,7 @@ rLCDC_DEFAULT EQU %11100011 ld [rIE], a ld a, 144 ; move the window off-screen - ld [$ffb0], a + ld [hVBlankWY], a ld [rWY], a ld a, 7 ld [rWX], a @@ -105,7 +105,7 @@ rLCDC_DEFAULT EQU %11100011 xor a ld [$ffbc], a dec a - ld [wcfcb], a + ld [wUpdateSpritesEnabled], a predef PlayIntro |