diff options
author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-14 23:00:22 -0500 |
---|---|---|
committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-14 23:00:22 -0500 |
commit | dfcca93b451cecb6857f8b6bc6b9f67e997b09c9 (patch) | |
tree | acf41a46e600fa3452536f97dc3f934968b3c839 /engine/mon_stats.asm | |
parent | 5c28d05bb40b47f084a34eb732da92c899e18db6 (diff) | |
parent | 6c5cd7a963fb2b5eed109aeef25f041eabba0004 (diff) |
Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460)
# Conflicts:
# engine/battle/core.asm
# engine/save.asm
Diffstat (limited to 'engine/mon_stats.asm')
-rw-r--r-- | engine/mon_stats.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/mon_stats.asm b/engine/mon_stats.asm index 1a08b2be5..a297b7760 100644 --- 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 |