diff options
| author | Thomas Winwood <twwinwood@gmail.com> | 2018-07-21 02:06:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 02:06:31 +0100 |
| commit | 23ef2f50a7b94c23b50e9e690a7482ac349c9ef3 (patch) | |
| tree | 63c20c67efbdf8334c6e273f78065b83135e3886 /engine/overworld/select_menu.asm | |
| parent | 17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff) | |
| parent | 2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff) | |
Merge branch 'master' into the-diffening
Diffstat (limited to 'engine/overworld/select_menu.asm')
| -rw-r--r-- | engine/overworld/select_menu.asm | 41 |
1 files changed, 11 insertions, 30 deletions
diff --git a/engine/overworld/select_menu.asm b/engine/overworld/select_menu.asm index 9898afda2..9eba9de83 100644 --- a/engine/overworld/select_menu.asm +++ b/engine/overworld/select_menu.asm @@ -1,5 +1,4 @@ -SelectMenu:: ; 13327 - +SelectMenu:: call CheckRegisteredItem jr c, .NotRegistered jp UseRegisteredItem @@ -11,17 +10,12 @@ SelectMenu:: ; 13327 call MapTextbox call WaitButton jp CloseText -; 13340 - -ItemMayBeRegisteredText: ; 13340 +ItemMayBeRegisteredText: text_jump UnknownText_0x1c1cf3 db "@" -; 13345 - - -CheckRegisteredItem: ; 13345 +CheckRegisteredItem: ld a, [wWhichRegisteredItem] and a jr z, .NoRegisteredItem @@ -86,10 +80,8 @@ CheckRegisteredItem: ; 13345 ld [wRegisteredItem], a scf ret -; 133a6 - -.CheckRegisteredNo: ; 133a6 +.CheckRegisteredNo: ld a, [wWhichRegisteredItem] and REGISTERED_NUMBER dec a @@ -102,10 +94,8 @@ CheckRegisteredItem: ; 13345 .NotEnoughItems: scf ret -; 133b6 - -.IsSameItem: ; 133b6 +.IsSameItem: ld a, [wRegisteredItem] cp [hl] jr nz, .NotSameItem @@ -116,11 +106,8 @@ CheckRegisteredItem: ; 13345 .NotSameItem: scf ret -; 133c3 - - -UseRegisteredItem: ; 133c3 +UseRegisteredItem: farcall CheckItemMenu ld a, [wItemAttributeParamBuffer] ld hl, .SwitchTo @@ -136,25 +123,22 @@ UseRegisteredItem: ; 133c3 dw .Current dw .Party dw .Overworld -; 133df -.NoFunction: ; 133df +.NoFunction: call OpenText call CantUseItem call CloseText and a ret -; 133ea -.Current: ; 133ea +.Current: call OpenText call DoItemEffect call CloseText and a ret -; 133f5 -.Party: ; 133f5 +.Party: call RefreshScreen call FadeToMenu call DoItemEffect @@ -162,9 +146,8 @@ UseRegisteredItem: ; 133c3 call CloseText and a ret -; 13406 -.Overworld: ; 13406 +.Overworld: call RefreshScreen ld a, 1 ld [wUsingItemWithSelect], a @@ -178,9 +161,8 @@ UseRegisteredItem: ; 133c3 ld a, HMENURETURN_SCRIPT ld [hMenuReturn], a ret -; 13422 -.CantUse: ; 13422 +.CantUse: call RefreshScreen ._cantuse @@ -188,4 +170,3 @@ UseRegisteredItem: ; 133c3 call CloseText and a ret -; 1342d |