diff options
| author | yenatch <yenatch@gmail.com> | 2016-01-04 07:41:19 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2016-01-04 07:41:19 -0500 |
| commit | 0add51451cda9d4221af137f83e2429d3577310c (patch) | |
| tree | fd05f8f0ad49d88b032dc9e10af85a42dfa0e402 /engine/selectmenu.asm | |
| parent | da87d2a929b1d58175efe063833c124d8ba702c9 (diff) | |
| parent | 2a263629a40e201b1702e2f4e65f1c61360cc2b2 (diff) | |
Merge pull request #330 from PikalaxALT/scriptmacrorenaming
Scriptmacrorenaming
Diffstat (limited to 'engine/selectmenu.asm')
| -rwxr-xr-x | engine/selectmenu.asm | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/engine/selectmenu.asm b/engine/selectmenu.asm index 916e48b3c..ce2ff8eb7 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,39 +139,39 @@ 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 .Party ; 133f5 - call ResetWindow + call RefreshScreen call FadeToMenu call DoItemEffect - call ReturnToCallingMenu - call LoadMoveSprites + call CloseSubmenu + call CloseText and a ret ; 13406 .Overworld ; 13406 - call ResetWindow + call RefreshScreen 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 @@ -181,11 +181,11 @@ UseRegisteredItem: ; 133c3 ; 13422 .CantUse ; 13422 - call ResetWindow + call RefreshScreen ._cantuse call CantUseItem - call LoadMoveSprites + call CloseText and a ret ; 1342d |