pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tilesets' into master

Browse Source 
Conflicts:
	tilesets/tileset_headers.asm
This commit is contained in:
yenatch
2015-06-26 11:00:39 -07:00
parent 89073da581 07b9c4b030
commit 0f57aefdf2
16 changed files with 800 additions and 1024 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
misc/crystal_misc.asm
View File

@@ -752,10 +752,10 @@ Function17abcf: ; 17abcf (5e:6bcf)
ld de, $d048
ld bc, $10
call CopyBytes
ld hl, Palette_b471
ld hl, MapObjectPals + 8
ld de, $d058
ld bc, $8
ld a, BANK(Palette_b471)
ld a, BANK(MapObjectPals)
call FarCopyBytes
pop af
ld [rSVBK], a ; $ff00+$70

12
misc/unused_title.asm
View File

@@ -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