Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460)

Browse Source 
# Conflicts:
#	engine/battle/core.asm
#	engine/save.asm
This commit is contained in:
Remy Oukaour
2018-01-14 23:00:22 -05:00
parent 5c28d05bb4 6c5cd7a963
commit dfcca93b45
54 changed files with 298 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
engine/title.asm
View File

@@ -139,7 +139,7 @@ _TitleScreen: ; 10ed67
ld a, [rSVBK]
push af
; WRAM bank 5
ld a, 5
ld a, BANK(wBGPals1)
ld [rSVBK], a
; Update palette colors
@@ -162,7 +162,7 @@ _TitleScreen: ; 10ed67
ld a, [rSVBK]
push af
ld a, 5 ; BANK(LYOverrides)
ld a, BANK(LYOverrides)
ld [rSVBK], a
; Make alternating lines come in from opposite sides