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 /home/menu.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 'home/menu.asm')
-rw-r--r-- | home/menu.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/home/menu.asm b/home/menu.asm index 6ef1ba7f3..b2ab0feb0 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -494,7 +494,7 @@ ClearWindowData:: ; 1fbf ld a, [rSVBK] push af - ld a, $7 + ld a, BANK(wWindowStack) ld [rSVBK], a xor a |