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

8
data/hidden_objects.asm
View file

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

4
data/map_header_banks.asm
View file

@ -239,8 +239,8 @@ MapHeaderBanks: ; c23d (3:423d)
db BANK(SilphCoElevator_h)
db $11
db $11
db BANK(BattleCenterM_h)
db BANK(TradeCenterM_h)
db BANK(TradeCenter_h)
db BANK(Colosseum_h)
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 SilphCo2_h ; unused
dw SilphCo2_h ; unused
dw BattleCenterM_h
dw TradeCenterM_h
dw TradeCenter_h
dw Colosseum_h
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)
db MUSIC_SILPH_CO, BANK(Music_SilphCo)
db MUSIC_CELADON, BANK(Music_Celadon) ; BattleCenterM
db MUSIC_CELADON, BANK(Music_Celadon) ; TradeCenterM
db MUSIC_CELADON, BANK(Music_Celadon) ; TradeCenter
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)

24
data/special_warps.asm
View file

@ -39,26 +39,26 @@ FirstMapSpec: ; 6420 (1:6420)
FLYWARP_DATA REDS_HOUSE_2F_WIDTH,6,3
db REDS_HOUSE_2
BattleCenterSpec1: ; 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)
TradeCenterSpec1: ; 6428 (1:6428)
db TRADE_CENTER
FLYWARP_DATA TRADE_CENTER_WIDTH,4,3
db CLUB
TradeCenterSpec2: ; 6440 (1:6440)
TradeCenterSpec2: ; 6430 (1:6430)
db TRADE_CENTER
FLYWARP_DATA TRADE_CENTER_WIDTH,4,6
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)
db PALLET_TOWN, 0
dw PalletTownFlyWarp