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/mon_stats.asm
+++ b/engine/mon_stats.asm
@@ -174,7 +174,7 @@ Predef_GetGender: ; 50bdd
 ; sBoxMon data is read directly from SRAM.
 	ld a, [MonType]
 	cp BOXMON
-	ld a, 1
+	ld a, BANK(sBox)
 	call z, GetSRAMBank

 ; Attack DV