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

Merge branch 'master' of https://github.com/pret/pokecrystal

Browse Source 
# Conflicts:
#	maps/KrissHouse2F.asm
This commit is contained in:
Rangi
2018-02-15 21:21:58 -05:00
parent 62d6f72bb3 4046b41c3a
commit 612fd7cb96
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engine/color.asm
View File

@@ -716,7 +716,7 @@ GetPlayerOrMonPalettePointer:
ret
.male
ld hl, wPlayerPalette
ld hl, PlayerPalette
ret
GetFrontpicPalettePointer: