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:
#	macros/scripts/maps.asm
This commit is contained in:
Remy Oukaour
2017-12-28 20:56:21 -05:00
parent bb005694b3 82a05a1752
commit 4c35f3ac85
156 changed files with 2060 additions and 1926 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engine/player_object.asm
View File

@@ -33,7 +33,7 @@ SpawnPlayer: ; 8029
ld a, [wPlayerSpriteSetupFlags]
bit 2, a
jr nz, .ok
ld a, [PlayerGender]
ld a, [wPlayerGender]
bit 0, a
jr z, .ok
ln e, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT