thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
constants/map_constants.asm
View file

@ -237,8 +237,8 @@ SILPH_CO_11F EQU $EB
SILPH_CO_ELEVATOR EQU $EC SILPH_CO_ELEVATOR EQU $EC
;EQU $ED ;EQU $ED
;EQU $EE ;EQU $EE
BATTLE_CENTER EQU $EF TRADE_CENTER EQU $EF
TRADE_CENTER EQU $F0 COLOSSEUM EQU $F0
;EQU $F1 ;EQU $F1
;EQU $F2 ;EQU $F2
;EQU $F3 ;EQU $F3

10
constants/map_dimensions.asm
View file

@ -872,14 +872,14 @@ SILPH_CO_11F_WIDTH EQU $09
SILPH_CO_ELEVATOR_HEIGHT EQU $02 SILPH_CO_ELEVATOR_HEIGHT EQU $02
SILPH_CO_ELEVATOR_WIDTH EQU $02 SILPH_CO_ELEVATOR_WIDTH EQU $02
; BattleCenterM_h map_id=239 ; TradeCenter_h map_id=239
BATTLE_CENTER_HEIGHT EQU $04
BATTLE_CENTER_WIDTH EQU $05
; TradeCenterM_h map_id=240
TRADE_CENTER_HEIGHT EQU $04 TRADE_CENTER_HEIGHT EQU $04
TRADE_CENTER_WIDTH EQU $05 TRADE_CENTER_WIDTH EQU $05
; Colosseum_h map_id=240
COLOSSEUM_HEIGHT EQU $04
COLOSSEUM_WIDTH EQU $05
; Lorelei_h map_id=245 ; Lorelei_h map_id=245
LORELEIS_ROOM_HEIGHT EQU $06 LORELEIS_ROOM_HEIGHT EQU $06
LORELEIS_ROOM_WIDTH EQU $05 LORELEIS_ROOM_WIDTH EQU $05

8
data/hidden_objects.asm
View file

@ -28,8 +28,8 @@ HiddenObjectMaps: ; 46a40 (11:6a40)
db SAFFRON_GYM db SAFFRON_GYM
db MT_MOON_POKECENTER db MT_MOON_POKECENTER
db ROCK_TUNNEL_POKECENTER db ROCK_TUNNEL_POKECENTER
db BATTLE_CENTER
db TRADE_CENTER db TRADE_CENTER
db COLOSSEUM
db VIRIDIAN_FOREST db VIRIDIAN_FOREST
db MT_MOON_3 db MT_MOON_3
db INDIGO_PLATEAU db INDIGO_PLATEAU
@ -117,8 +117,8 @@ HiddenObjectPointers: ; 46a96 (11:6a96)
dw SaffronGymHiddenObjects dw SaffronGymHiddenObjects
dw MtMoonPokecenterHiddenObjects dw MtMoonPokecenterHiddenObjects
dw RockTunnelPokecenterHiddenObjects dw RockTunnelPokecenterHiddenObjects
dw BattleCenterHiddenObjects
dw TradeCenterHiddenObjects dw TradeCenterHiddenObjects
dw ColosseumHiddenObjects
dw ViridianForestHiddenObjects dw ViridianForestHiddenObjects
dw MtMoon3HiddenObjects dw MtMoon3HiddenObjects
dw IndigoPlateauHiddenObjects dw IndigoPlateauHiddenObjects
@ -175,7 +175,7 @@ HiddenObjectPointers: ; 46a96 (11:6a96)
dw Route4HiddenObjects dw Route4HiddenObjects
; format: y-coord, x-coord, text id/item id, object routine ; format: y-coord, x-coord, text id/item id, object routine
BattleCenterHiddenObjects: ; 46b40 (11:6b40) TradeCenterHiddenObjects: ; 46b40 (11:6b40)
db $04,$05,$d0 db $04,$05,$d0
db BANK(CableClubRightGameboy) db BANK(CableClubRightGameboy)
dw CableClubRightGameboy dw CableClubRightGameboy
@ -183,7 +183,7 @@ BattleCenterHiddenObjects: ; 46b40 (11:6b40)
db BANK(CableClubLeftGameboy) db BANK(CableClubLeftGameboy)
dw CableClubLeftGameboy dw CableClubLeftGameboy
db $FF db $FF
TradeCenterHiddenObjects: ; 46b4d (11:6b4d) ColosseumHiddenObjects: ; 46b4d (11:6b4d)
db $04,$05,$d0 db $04,$05,$d0
db BANK(CableClubRightGameboy) db BANK(CableClubRightGameboy)
dw CableClubRightGameboy dw CableClubRightGameboy

6
data/mapHeaders/battlecenterm.asm
View file

@ -1,6 +0,0 @@
BattleCenterM_h: ; 0x4fd04 to 0x4fd10 (12 bytes) (id=239)
db CLUB ; tileset
db BATTLE_CENTER_HEIGHT, BATTLE_CENTER_WIDTH ; dimensions (y, x)
dw BattleCenterMBlocks, BattleCenterMTextPointers, BattleCenterMScript ; blocks, texts, scripts
db $00 ; connections
dw BattleCenterMObject ; objects

6
data/mapHeaders/colosseum.asm Executable file
View file

@ -0,0 +1,6 @@
Colosseum_h: ; 0x4fd71 to 0x4fd7d (12 bytes) (id=240)
db CLUB ; tileset
db COLOSSEUM_HEIGHT, COLOSSEUM_WIDTH ; dimensions (y, x)
dw ColosseumBlocks, ColosseumTextPointers, ColosseumScript ; blocks, texts, scripts
db $00 ; connections
dw ColosseumObject ; objects

6
data/mapHeaders/tradecenter.asm Executable file
View file

@ -0,0 +1,6 @@
TradeCenter_h: ; 0x4fd04 to 0x4fd10 (12 bytes) (id=239)
db CLUB ; tileset
db TRADE_CENTER_HEIGHT, TRADE_CENTER_WIDTH ; dimensions (y, x)
dw TradeCenterBlocks, TradeCenterTextPointers, TradeCenterScript ; blocks, texts, scripts
db $00 ; connections
dw TradeCenterObject ; objects

6
data/mapHeaders/tradecenterm.asm
View file

@ -1,6 +0,0 @@
TradeCenterM_h: ; 0x4fd71 to 0x4fd7d (12 bytes) (id=240)
db CLUB ; tileset
db TRADE_CENTER_HEIGHT, TRADE_CENTER_WIDTH ; dimensions (y, x)
dw TradeCenterMBlocks, TradeCenterMTextPointers, TradeCenterMScript ; blocks, texts, scripts
db $00 ; connections
dw TradeCenterMObject ; objects

2
data/mapObjects/tradecenterm.asm → data/mapObjects/colosseum.asm
View file

@ -1,4 +1,4 @@
TradeCenterMObject: ; 0x4fd87 (size=10) ColosseumObject: ; 0x4fd87 (size=10)
db $e ; border block db $e ; border block
db $0 ; warps db $0 ; warps

2
data/mapObjects/battlecenterm.asm → data/mapObjects/tradecenter.asm
View file

@ -1,4 +1,4 @@
BattleCenterMObject: ; 0x4fd53 (size=10) TradeCenterObject: ; 0x4fd53 (size=10)
db $e ; border block db $e ; border block
db $0 ; warps db $0 ; warps

4
data/map_header_banks.asm
View file

@ -239,8 +239,8 @@ MapHeaderBanks: ; c23d (3:423d)
db BANK(SilphCoElevator_h) db BANK(SilphCoElevator_h)
db $11 db $11
db $11 db $11
db BANK(BattleCenterM_h) db BANK(TradeCenter_h)
db BANK(TradeCenterM_h) db BANK(Colosseum_h)
db $11 db $11
db $11 db $11
db $11 db $11

4
data/map_header_pointers.asm
View file

@ -239,8 +239,8 @@ MapHeaderPointers:: ; 01ae (0:01ae)
dw SilphCoElevator_h dw SilphCoElevator_h
dw SilphCo2_h ; unused dw SilphCo2_h ; unused
dw SilphCo2_h ; unused dw SilphCo2_h ; unused
dw BattleCenterM_h dw TradeCenter_h
dw TradeCenterM_h dw Colosseum_h
dw SilphCo2_h ; unused dw SilphCo2_h ; unused
dw SilphCo2_h ; unused dw SilphCo2_h ; unused
dw SilphCo2_h ; unused dw SilphCo2_h ; unused

4
data/map_songs.asm
View file

@ -238,8 +238,8 @@ MapSongBanks: ; c04d (3:404d)
db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCoElevator db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCoElevator
db MUSIC_SILPH_CO, BANK(Music_SilphCo) db MUSIC_SILPH_CO, BANK(Music_SilphCo)
db MUSIC_SILPH_CO, BANK(Music_SilphCo) db MUSIC_SILPH_CO, BANK(Music_SilphCo)
db MUSIC_CELADON, BANK(Music_Celadon) ; BattleCenterM db MUSIC_CELADON, BANK(Music_Celadon) ; TradeCenter
db MUSIC_CELADON, BANK(Music_Celadon) ; TradeCenterM db MUSIC_CELADON, BANK(Music_Celadon) ; Colosseum
db MUSIC_SILPH_CO, BANK(Music_SilphCo) db MUSIC_SILPH_CO, BANK(Music_SilphCo)
db MUSIC_SILPH_CO, BANK(Music_SilphCo) db MUSIC_SILPH_CO, BANK(Music_SilphCo)
db MUSIC_SILPH_CO, BANK(Music_SilphCo) db MUSIC_SILPH_CO, BANK(Music_SilphCo)

24
data/special_warps.asm
View file

@ -39,26 +39,26 @@ FirstMapSpec: ; 6420 (1:6420)
FLYWARP_DATA REDS_HOUSE_2F_WIDTH,6,3 FLYWARP_DATA REDS_HOUSE_2F_WIDTH,6,3
db REDS_HOUSE_2 db REDS_HOUSE_2
BattleCenterSpec1: ; 6428 (1:6428) TradeCenterSpec1: ; 6428 (1:6428)
db BATTLE_CENTER
FLYWARP_DATA BATTLE_CENTER_WIDTH,4,3
db CLUB
BattleCenterSpec2: ; 6430 (1:6430)
db BATTLE_CENTER
FLYWARP_DATA BATTLE_CENTER_WIDTH,4,6
db CLUB
TradeCenterSpec1: ; 6438 (1:6438)
db TRADE_CENTER db TRADE_CENTER
FLYWARP_DATA TRADE_CENTER_WIDTH,4,3 FLYWARP_DATA TRADE_CENTER_WIDTH,4,3
db CLUB db CLUB
TradeCenterSpec2: ; 6440 (1:6440) TradeCenterSpec2: ; 6430 (1:6430)
db TRADE_CENTER db TRADE_CENTER
FLYWARP_DATA TRADE_CENTER_WIDTH,4,6 FLYWARP_DATA TRADE_CENTER_WIDTH,4,6
db CLUB db CLUB
ColosseumSpec1: ; 6438 (1:6438)
db COLOSSEUM
FLYWARP_DATA COLOSSEUM_WIDTH,4,3
db CLUB
ColosseumSpec2: ; 6440 (1:6440)
db COLOSSEUM
FLYWARP_DATA COLOSSEUM_WIDTH,4,6
db CLUB
FlyWarpDataPtr: ; 6448 (1:6448) FlyWarpDataPtr: ; 6448 (1:6448)
db PALLET_TOWN, 0 db PALLET_TOWN, 0
dw PalletTownFlyWarp dw PalletTownFlyWarp

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 ; 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 Centre, it displays the trade selection screen. ; 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. ; Before doing either action, it swaps random numbers, trainer names and party data with the other gameboy.
CableClub_DoBattleOrTrade: ; 5317 (1:5317) CableClub_DoBattleOrTrade: ; 5317 (1:5317)
ld c, 80 ld c, 80

4
engine/menu/bills_pc.asm
View file

@ -516,7 +516,7 @@ CableClubLeftGameboy:: ; 5824 (8:5825)
cp SPRITE_FACING_RIGHT cp SPRITE_FACING_RIGHT
ret nz ret nz
ld a, [W_CURMAP] ld a, [W_CURMAP]
cp BATTLE_CENTER cp TRADE_CENTER
ld a, LINK_STATE_START_TRADE ld a, LINK_STATE_START_TRADE
jr z, .asm_2183a jr z, .asm_2183a
inc a ; LINK_STATE_START_BATTLE inc a ; LINK_STATE_START_BATTLE
@ -533,7 +533,7 @@ CableClubRightGameboy:: ; 5845 (8:5845)
cp SPRITE_FACING_LEFT cp SPRITE_FACING_LEFT
ret nz ret nz
ld a, [W_CURMAP] ld a, [W_CURMAP]
cp BATTLE_CENTER cp TRADE_CENTER
ld a, LINK_STATE_START_TRADE ld a, LINK_STATE_START_TRADE
jr z, .asm_2185a jr z, .asm_2185a
inc a ; LINK_STATE_START_BATTLE 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 TextBoxBorder
call UpdateSprites call UpdateSprites
hlCoord 7, 7 hlCoord 7, 7
ld de, TradeCenterText ld de, CableClubOptionsText
call PlaceString call PlaceString
xor a xor a
ld [wcd37], a ld [wcd37], a
@ -255,9 +255,9 @@ LinkMenu: ; 5c0a (1:5c0a)
ld [wWalkBikeSurfState], a ; start walking ld [wWalkBikeSurfState], a ; start walking
ld a, [wCurrentMenuItem] ld a, [wCurrentMenuItem]
and a and a
ld a, TRADE_CENTER ld a, COLOSSEUM
jr nz, .next jr nz, .next
ld a, BATTLE_CENTER ld a, TRADE_CENTER
.next .next
ld [wd72d], a ld [wd72d], a
ld hl, PleaseWaitText ld hl, PleaseWaitText
@ -332,7 +332,7 @@ NewGameText: ; 5d87 (1:5d87)
db "NEW GAME", $4e db "NEW GAME", $4e
db "OPTION@" db "OPTION@"
TradeCenterText: ; 5d97 (1:5d97) CableClubOptionsText: ; 5d97 (1:5d97)
db "TRADE CENTER", $4e db "TRADE CENTER", $4e
db "COLOSSEUM", $4e db "COLOSSEUM", $4e
db "CANCEL@" db "CANCEL@"

36
main.asm
View file

@ -630,24 +630,24 @@ SpecialWarpIn: ; 62ce (1:62ce)
; gets the map ID, tile block map view pointer, tileset, and coordinates ; gets the map ID, tile block map view pointer, tileset, and coordinates
LoadSpecialWarpData: ; 62ff (1:62ff) LoadSpecialWarpData: ; 62ff (1:62ff)
ld a, [wd72d] ld a, [wd72d]
cp BATTLE_CENTER
jr nz, .notBattleCenter
ld hl, BattleCenterSpec1
ld a, [hSerialConnectionStatus]
cp USING_INTERNAL_CLOCK ; which gameboy is clocking determines who is on the left and who is on the right
jr z, .copyWarpData
ld hl, BattleCenterSpec2
jr .copyWarpData
.notBattleCenter
cp TRADE_CENTER cp TRADE_CENTER
jr nz, .notTradeCenter jr nz, .notTradeCenter
ld hl, TradeCenterSpec1 ld hl, TradeCenterSpec1
ld a, [hSerialConnectionStatus] ld a, [hSerialConnectionStatus]
cp USING_INTERNAL_CLOCK cp USING_INTERNAL_CLOCK ; which gameboy is clocking determines who is on the left and who is on the right
jr z, .copyWarpData jr z, .copyWarpData
ld hl, TradeCenterSpec2 ld hl, TradeCenterSpec2
jr .copyWarpData jr .copyWarpData
.notTradeCenter .notTradeCenter
cp COLOSSEUM
jr nz, .notColosseum
ld hl, ColosseumSpec1
ld a, [hSerialConnectionStatus]
cp USING_INTERNAL_CLOCK
jr z, .copyWarpData
ld hl, ColosseumSpec2
jr .copyWarpData
.notColosseum
ld a, [wd732] ld a, [wd732]
bit 1, a bit 1, a
jr nz, .notFirstMap jr nz, .notFirstMap
@ -5872,15 +5872,15 @@ ChannelerPic:: INCBIN "pic/trainer/channeler.pic"
AgathaPic:: INCBIN "pic/trainer/agatha.pic" AgathaPic:: INCBIN "pic/trainer/agatha.pic"
LancePic:: INCBIN "pic/trainer/lance.pic" LancePic:: INCBIN "pic/trainer/lance.pic"
INCLUDE "data/mapHeaders/battlecenterm.asm" INCLUDE "data/mapHeaders/tradecenter.asm"
INCLUDE "scripts/battlecenterm.asm" INCLUDE "scripts/tradecenter.asm"
INCLUDE "data/mapObjects/battlecenterm.asm" INCLUDE "data/mapObjects/tradecenter.asm"
BattleCenterMBlocks: INCBIN "maps/battlecenterm.blk" TradeCenterBlocks: INCBIN "maps/tradecenter.blk"
INCLUDE "data/mapHeaders/tradecenterm.asm" INCLUDE "data/mapHeaders/colosseum.asm"
INCLUDE "scripts/tradecenterm.asm" INCLUDE "scripts/colosseum.asm"
INCLUDE "data/mapObjects/tradecenterm.asm" INCLUDE "data/mapObjects/colosseum.asm"
TradeCenterMBlocks: INCBIN "maps/tradecenterm.blk" ColosseumBlocks: INCBIN "maps/colosseum.blk"
INCLUDE "engine/give_pokemon.asm" INCLUDE "engine/give_pokemon.asm"

0
maps/tradecenterm.blk → maps/colosseum.blk
View file

0
maps/battlecenterm.blk → maps/tradecenter.blk
View file

9
scripts/colosseum.asm Executable file
View file

@ -0,0 +1,9 @@
ColosseumScript: ; 4fd7d (13:7d7d)
jp TradeCenterScript
ColosseumTextPointers: ; 4fd80 (13:7d80)
dw ColosseumText1
ColosseumText1: ; 4fd82 (13:7d82)
TX_FAR _ColosseumText1
db "@"

10
scripts/battlecenterm.asm → scripts/tradecenter.asm
View file

@ -1,4 +1,4 @@
BattleCenterMScript: ; 4fd10 (13:7d10) TradeCenterScript: ; 4fd10 (13:7d10)
call EnableAutoTextBoxDrawing call EnableAutoTextBoxDrawing
ld a, [$ffaa] ld a, [$ffaa]
cp $2 cp $2
@ -30,9 +30,9 @@ BattleCenterMScript: ; 4fd10 (13:7d10)
ld [wSpriteStateData1 + $19], a ld [wSpriteStateData1 + $19], a
ret ret
BattleCenterMTextPointers: ; 4fd4c (13:7d4c) TradeCenterTextPointers: ; 4fd4c (13:7d4c)
dw BattleCenterMText1 dw TradeCenterText1
BattleCenterMText1: ; 4fd4e (13:7d4e) TradeCenterText1: ; 4fd4e (13:7d4e)
TX_FAR _BattleCenterMText1 TX_FAR _TradeCenterText1
db "@" db "@"

9
scripts/tradecenterm.asm
View file

@ -1,9 +0,0 @@
TradeCenterMScript: ; 4fd7d (13:7d7d)
jp BattleCenterMScript
TradeCenterMTextPointers: ; 4fd80 (13:7d80)
dw TradeCenterMText1
TradeCenterMText1: ; 4fd82 (13:7d82)
TX_FAR _TradeCenterMText1
db "@"

4
text.asm
View file

@ -2494,11 +2494,11 @@ _DreamWasEatenText:: ; 94aec (25:4aec)
line "dream was eaten!" line "dream was eaten!"
prompt prompt
_BattleCenterMText1:: ; 94b01 (25:4b01) _TradeCenterText1:: ; 94b01 (25:4b01)
text "!" text "!"
done done
_TradeCenterMText1:: ; 94b04 (25:4b04) _ColosseumText1:: ; 94b04 (25:4b04)
text "!" text "!"
done done