thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Swap trade center and battle center

Browse source 
also rename battle center to colosseum
closes https://github.com/iimarckus/pokered/issues/102
This commit is contained in:
dannye 2015-07-16 23:21:57 -05:00
parent b1cb378893
commit 4670a1ddae
23 changed files with 85 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engine/cable_club.asm
View file

@ -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

4
engine/menu/bills_pc.asm
View file

@ -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

8
engine/menu/main_menu.asm
View file

@ -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@"