diff options
| author | YamaArashi <shadow962@live.com> | 2015-02-07 02:43:08 -0800 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2015-02-07 02:43:08 -0800 |
| commit | 3fdb8a0d8995746d5605136ece384516338489b0 (patch) | |
| tree | 214030fb5b6ec943cdcb2ba84e622fba0ad3fb8f /engine/menu/start_sub_menus.asm | |
| parent | 9de54645c896cc57a79679aecd6174afc59762c8 (diff) | |
serial/trade/misc
Diffstat (limited to 'engine/menu/start_sub_menus.asm')
| -rwxr-xr-x | engine/menu/start_sub_menus.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index c6373e76..cdd93875 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -31,7 +31,7 @@ StartMenu_Pokemon: ; 130a9 (4:70a9) .chosePokemon call SaveScreenTilesToBuffer1 ; save screen ld a,$04 - ld [wd125],a + ld [wTextBoxID],a call DisplayTextBoxID ; display pokemon menu options ld hl,wWhichTrade ld bc,$020c ; max menu item ID, top menu item Y @@ -300,13 +300,13 @@ ItemMenuLoop: ; 132fc (4:72fc) call GoPAL_SET_CF1C StartMenu_Item: ; 13302 (4:7302) - ld a,[W_ISLINKBATTLE] - dec a - jr nz,.notInLinkBattle + ld a,[wLinkState] + dec a ; is the player in the Colosseum or Trade Centre? + jr nz,.notInCableClubRoom ld hl,CannotUseItemsHereText call PrintText jr .exitMenu -.notInLinkBattle +.notInCableClubRoom ld bc,wNumBagItems ld hl,wcf8b ld a,c @@ -342,7 +342,7 @@ StartMenu_Item: ; 13302 (4:7302) jp z,.useOrTossItem .notBicycle1 ld a,$06 ; use/toss menu - ld [wd125],a + ld [wTextBoxID],a call DisplayTextBoxID ld hl,wTopMenuItemY ld a,11 |