diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/cable_club.asm | 4 | ||||
| -rw-r--r-- | engine/menu/bills_pc.asm | 4 | ||||
| -rwxr-xr-x | engine/menu/main_menu.asm | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/engine/cable_club.asm b/engine/cable_club.asm index 75509312..87f7b34c 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -1,5 +1,5 @@ -; performs the appropriate action when the player uses the gameboy on the table in the Colosseum or Trade Centre -; In the Colosseum, it starts a battle. In the Trade Centre, it displays the trade selection screen. +; performs the appropriate action when the player uses the gameboy on the table in the Colosseum or Trade Center +; In the Colosseum, it starts a battle. In the Trade Center, it displays the trade selection screen. ; Before doing either action, it swaps random numbers, trainer names and party data with the other gameboy. CableClub_DoBattleOrTrade: ; 5317 (1:5317) ld c, 80 diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm index fcc51af1..a4096ce7 100644 --- a/engine/menu/bills_pc.asm +++ b/engine/menu/bills_pc.asm @@ -516,7 +516,7 @@ CableClubLeftGameboy:: ; 5824 (8:5825) cp SPRITE_FACING_RIGHT ret nz ld a, [W_CURMAP] - cp BATTLE_CENTER + cp TRADE_CENTER ld a, LINK_STATE_START_TRADE jr z, .asm_2183a inc a ; LINK_STATE_START_BATTLE @@ -533,7 +533,7 @@ CableClubRightGameboy:: ; 5845 (8:5845) cp SPRITE_FACING_LEFT ret nz ld a, [W_CURMAP] - cp BATTLE_CENTER + cp TRADE_CENTER ld a, LINK_STATE_START_TRADE jr z, .asm_2185a inc a ; LINK_STATE_START_BATTLE diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index 0856352c..55e92fae 100755 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -145,7 +145,7 @@ LinkMenu: ; 5c0a (1:5c0a) call TextBoxBorder call UpdateSprites hlCoord 7, 7 - ld de, TradeCenterText + ld de, CableClubOptionsText call PlaceString xor a ld [wcd37], a @@ -255,9 +255,9 @@ LinkMenu: ; 5c0a (1:5c0a) 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, PleaseWaitText @@ -332,7 +332,7 @@ NewGameText: ; 5d87 (1:5d87) db "NEW GAME", $4e db "OPTION@" -TradeCenterText: ; 5d97 (1:5d97) +CableClubOptionsText: ; 5d97 (1:5d97) db "TRADE CENTER", $4e db "COLOSSEUM", $4e db "CANCEL@" |