diff options
| author | xCrystal <rgr.crystal@gmail.com> | 2019-07-25 15:40:03 +0200 |
|---|---|---|
| committer | xCrystal <rgr.crystal@gmail.com> | 2019-07-25 15:40:03 +0200 |
| commit | d79d138ffe16800e99e564b4c7729e437e36d41e (patch) | |
| tree | 9b34fbb3092c67fabcb610957690c13ee1f82b25 /src | |
| parent | 46f1b78bf98cf1de7a1f85e2848126da39e53d32 (diff) | |
Fix #52 post-merge build issues
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/bank02.asm | 4 | ||||
| -rw-r--r-- | src/wram.asm | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/engine/bank02.asm b/src/engine/bank02.asm index a4a0f62..c969add 100644 --- a/src/engine/bank02.asm +++ b/src/engine/bank02.asm @@ -35,8 +35,8 @@ _OpenDuelCheckMenu: ; 8000 (2:4000) ; opens the In Play Area submenu DuelCheckMenu_InPlayArea: ; 8039 (2:4039) xor a - ld [wce60], a - farcall Func_180d5 + ld [wIsFromSelectButton], a + farcall OpenInPlayAreaScreen ret ; opens the Glossary submenu diff --git a/src/wram.asm b/src/wram.asm index 97ce581..18b0a04 100644 --- a/src/wram.asm +++ b/src/wram.asm @@ -1308,12 +1308,14 @@ wPrizeCardCursorPosition:: ; ce52 ; pointer to the table which contains information for each key-press. wInPlayAreaInputTablePointer:: ; ce53 + +wce53:: ; ce53 ds $2 ; same as wDuelInitialPrizes but with upper 2 bits set wDuelInitialPrizesUpperBitsSet:: ; ce55 ds $1 - + ds $1 ; it's used for restore the position of cursor |