diff options
| author | Daniel Harding <corrnondacqb@yahoo.com> | 2015-08-18 10:32:50 -0500 |
|---|---|---|
| committer | Daniel Harding <corrnondacqb@yahoo.com> | 2015-08-18 10:32:50 -0500 |
| commit | 1a987d1e1ab96ca9553d4253c72858057332a03a (patch) | |
| tree | d101dc054e112304f327a5359532ee972e8da81a /engine/titlescreen.asm | |
| parent | More joypad constants (diff) | |
| parent | item name length constant (diff) | |
| download | pokeyellow-1a987d1e1ab96ca9553d4253c72858057332a03a.tar.gz pokeyellow-1a987d1e1ab96ca9553d4253c72858057332a03a.tar.xz pokeyellow-1a987d1e1ab96ca9553d4253c72858057332a03a.zip | |
Merge pull request #114 from YamaArashi/master
Commented SGB palettes and other things
Diffstat (limited to 'engine/titlescreen.asm')
| -rwxr-xr-x | engine/titlescreen.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm index 0dbe4a4c..b0bf0fb6 100755 --- a/engine/titlescreen.asm +++ b/engine/titlescreen.asm @@ -134,8 +134,8 @@ ENDC call LoadScreenTilesFromBuffer2 ld a, vBGMap0 / $100 call TitleScreenCopyTileMapToVRAM - ld b, $6 - call GoPAL_SET + ld b, SET_PAL_TITLE_SCREEN + call RunPaletteCommand call GBPalNormal ld a, %11100100 ld [rOBP0], a @@ -215,7 +215,7 @@ ENDC ld [wNewSoundID], a call PlaySound xor a - ld [wcc5b], a + ld [wUnusedCC5B], a ; Keep scrolling in new mons indefinitely until the user performs input. .awaitUserInterruptionLoop |