diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-09-03 14:42:46 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-09-03 14:42:46 -0400 |
| commit | b7ed43bd568045f265fc96abee480ff8bb8e2177 (patch) | |
| tree | 2fbfc9ff6bdd61ffc64ec0d94ee264a414f61f48 /engine/bank3d/link_menu.asm | |
| parent | 6de043f87d500014c7cc9c85a203f387a9cd4c7a (diff) | |
Make pokeyellow build correctly.
Diffstat (limited to 'engine/bank3d/link_menu.asm')
| -rw-r--r-- | engine/bank3d/link_menu.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/bank3d/link_menu.asm b/engine/bank3d/link_menu.asm index 69d0458e..bd1f664c 100644 --- a/engine/bank3d/link_menu.asm +++ b/engine/bank3d/link_menu.asm @@ -22,7 +22,7 @@ Func_f531b:: ; f531b (3d:531b) call TextBoxBorder call UpdateSprites xor a - ld [wcd37],a + ld [wUnusedCD37],a ld [wd72d],a ld [wd11e],a ld hl,wTopMenuItemY @@ -634,7 +634,7 @@ ColosseumIneligibleText:: ; f5807 (3d:5807) LinkMenu: ; f580c (3d:580c) xor a - ld [wd358], a + ld [wLetterPrintingDelayFlags], a ld hl, wd72e set 6, [hl] ld hl, TextTerminator_f5a16 @@ -650,7 +650,7 @@ LinkMenu: ; f580c (3d:580c) ld de, TradeCenterText call PlaceString xor a - ld [wcd37], a + ld [wUnusedCD37], a ld [wd72d], a ld [wd11e], a ld hl, wTopMenuItemY @@ -765,9 +765,9 @@ LinkMenu: ; f580c (3d:580c) ld [wWalkBikeSurfState], a ; start walking ld a, [wCurrentMenuItem] and a - ld a, TRADE_CENTER + ld a, COLOSSEUM jr nz, .next - ld a, BATTLE_CENTER + ld a, TRADE_CENTER .next ld [wd72d], a ld hl, ColosseumPleaseWaitText @@ -786,7 +786,7 @@ LinkMenu: ; f580c (3d:580c) ld [wSerialExchangeNybbleSendData], a inc a ; LINK_STATE_IN_CABLE_CLUB ld [wLinkState], a - ld [wcc47], a + ld [wEnteringCableClub], a ld hl,Func_5ce4 ld b,BANK(Func_5ce4) jp Bankswitch |