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

# Conflicts: # engine/battle/core.asm # engine/save.asm
2018-01-14 23:00:22 -05:00
parent 5c28d05bb4 6c5cd7a963
commit dfcca93b45
54 changed files with 298 additions and 324 deletions
--- a/engine/init_gender.asm
+++ b/engine/init_gender.asm
@@ -89,7 +89,7 @@ LoadGenderScreenPal: ; 48e47 (12:4e47)
 	ld hl, .Palette
 	ld de, wBGPals1
 	ld bc, 1 palettes
-	ld a, $5
+	ld a, BANK(wBGPals1)
 	call FarCopyWRAM
 	farcall ApplyPals
 	ret