From 3fdb8a0d8995746d5605136ece384516338489b0 Mon Sep 17 00:00:00 2001
From: YamaArashi <shadow962@live.com>
Date: Sat, 7 Feb 2015 02:43:08 -0800
Subject: serial/trade/misc

---
 engine/menu/start_sub_menus.asm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'engine/menu/start_sub_menus.asm')

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
-- 
cgit v1.3.1-sl0p