aboutsummaryrefslogtreecommitdiffstats
path: root/data/special_warps.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2015-07-16 23:21:57 -0500
committerdannye <corrnondacqb@yahoo.com>2015-07-16 23:21:57 -0500
commit4670a1ddae02fd73d8c4826f9d9c9948820636a0 (patch)
tree42f3a4c0861f920a88254cd13d8ec05a0f9a7238 /data/special_warps.asm
parentComment naming screen (diff)
downloadpokeyellow-4670a1ddae02fd73d8c4826f9d9c9948820636a0.tar.gz
pokeyellow-4670a1ddae02fd73d8c4826f9d9c9948820636a0.tar.xz
pokeyellow-4670a1ddae02fd73d8c4826f9d9c9948820636a0.zip
Swap trade center and battle center
also rename battle center to colosseum closes https://github.com/iimarckus/pokered/issues/102
Diffstat (limited to 'data/special_warps.asm')
-rwxr-xr-xdata/special_warps.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/data/special_warps.asm b/data/special_warps.asm
index 480bac89..b8baccfb 100755
--- a/data/special_warps.asm
+++ b/data/special_warps.asm
@@ -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