diff options
Diffstat (limited to 'engine/selectmenu.asm')
| -rwxr-xr-x | engine/selectmenu.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/engine/selectmenu.asm b/engine/selectmenu.asm index 916e48b3c..03210f43d 100755 --- a/engine/selectmenu.asm +++ b/engine/selectmenu.asm @@ -5,12 +5,12 @@ SelectMenu:: ; 13327 jp UseRegisteredItem .NotRegistered - call LoadFont + call OpenText ld b, BANK(ItemMayBeRegisteredText) ld hl, ItemMayBeRegisteredText call MapTextbox - call CloseText - jp LoadMoveSprites + call WaitButton + jp CloseText ; 13340 @@ -139,17 +139,17 @@ UseRegisteredItem: ; 133c3 ; 133df .NoFunction ; 133df - call LoadFont + call OpenText call CantUseItem - call LoadMoveSprites + call CloseText and a ret ; 133ea .Current ; 133ea - call LoadFont + call OpenText call DoItemEffect - call LoadMoveSprites + call CloseText and a ret ; 133f5 @@ -158,8 +158,8 @@ UseRegisteredItem: ; 133c3 call ResetWindow call FadeToMenu call DoItemEffect - call ReturnToCallingMenu - call LoadMoveSprites + call CloseSubmenu + call CloseText and a ret ; 13406 @@ -167,11 +167,11 @@ UseRegisteredItem: ; 133c3 .Overworld ; 13406 call ResetWindow ld a, 1 - ld [wd0ef], a + ld [wUsingItemWithSelect], a call DoItemEffect xor a - ld [wd0ef], a - ld a, [wd0ec] + ld [wUsingItemWithSelect], a + ld a, [wItemEffectSucceeded] cp 1 jr nz, ._cantuse scf @@ -185,7 +185,7 @@ UseRegisteredItem: ; 133c3 ._cantuse call CantUseItem - call LoadMoveSprites + call CloseText and a ret ; 1342d |