diff options
| author | yenatch <yenatch@gmail.com> | 2015-06-26 11:00:39 -0700 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-06-26 11:00:39 -0700 |
| commit | 0f57aefdf2b97df9ed017ec5f4c6afd5df65149b (patch) | |
| tree | 0220d87eea2805996447b9f30c802016e7230905 /misc/unused_title.asm | |
| parent | 89073da581022316228818272892cb12c851cb68 (diff) | |
| parent | 07b9c4b03044a6e24bfeb784df62da71ff58ae94 (diff) | |
Merge branch 'tilesets' into master
Conflicts:
tilesets/tileset_headers.asm
Diffstat (limited to 'misc/unused_title.asm')
| -rw-r--r-- | misc/unused_title.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/misc/unused_title.asm b/misc/unused_title.asm index 4364f19a2..36337edaf 100644 --- a/misc/unused_title.asm +++ b/misc/unused_title.asm @@ -66,22 +66,22 @@ UnusedTitleScreen: ; 10c000 ld a, $5 ld [rSVBK], a - ld hl, UnsuedTitleBG_Palettes + ld hl, UnusedTitleBG_Palettes ld de, Unkn1Pals ld bc, $40 call CopyBytes - ld hl, UnsuedTitleFG_Palettes + ld hl, UnusedTitleFG_Palettes ld de, Unkn2Pals ld bc, $40 call CopyBytes - ld hl, UnsuedTitleBG_Palettes + ld hl, UnusedTitleBG_Palettes ld de, BGPals ld bc, $40 call CopyBytes - ld hl, UnsuedTitleFG_Palettes + ld hl, UnusedTitleFG_Palettes ld de, OBPals ld bc, $40 call CopyBytes @@ -138,7 +138,7 @@ UnusedTitleBG_Tilemap: ; 10d0b1 db $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00, $00,$00 ; 10d8b1 -UnsuedTitleBG_Palettes: ; 10d8b1 +UnusedTitleBG_Palettes: ; 10d8b1 RGB 00, 00, 00 RGB 25, 15, 28 RGB 22, 11, 28 @@ -202,7 +202,7 @@ UnusedTitleFG_GFX: ; 10dab1 INCBIN "gfx/title/old_fg.2bpp" ; 10eab1 -UnsuedTitleFG_Palettes: ; 10eab1 +UnusedTitleFG_Palettes: ; 10eab1 RGB 00, 00, 00 RGB 31, 31, 31 RGB 16, 16, 24 |