summaryrefslogtreecommitdiff
path: root/constants
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 /constants
parentb1cb3788938fa981e65619f022a41f1c1d91ae3b (diff)
Swap trade center and battle center
also rename battle center to colosseum closes https://github.com/iimarckus/pokered/issues/102
Diffstat (limited to 'constants')
-rw-r--r--constants/map_constants.asm4
-rwxr-xr-xconstants/map_dimensions.asm10
2 files changed, 7 insertions, 7 deletions
diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index 11deedd0..c880d3f4 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -237,8 +237,8 @@ SILPH_CO_11F EQU $EB
SILPH_CO_ELEVATOR EQU $EC
;EQU $ED
;EQU $EE
-BATTLE_CENTER EQU $EF
-TRADE_CENTER EQU $F0
+TRADE_CENTER EQU $EF
+COLOSSEUM EQU $F0
;EQU $F1
;EQU $F2
;EQU $F3
diff --git a/constants/map_dimensions.asm b/constants/map_dimensions.asm
index 236ccac4..ad6caa23 100755
--- a/constants/map_dimensions.asm
+++ b/constants/map_dimensions.asm
@@ -872,14 +872,14 @@ SILPH_CO_11F_WIDTH EQU $09
SILPH_CO_ELEVATOR_HEIGHT EQU $02
SILPH_CO_ELEVATOR_WIDTH EQU $02
-; BattleCenterM_h map_id=239
-BATTLE_CENTER_HEIGHT EQU $04
-BATTLE_CENTER_WIDTH EQU $05
-
-; TradeCenterM_h map_id=240
+; TradeCenter_h map_id=239
TRADE_CENTER_HEIGHT EQU $04
TRADE_CENTER_WIDTH EQU $05
+; Colosseum_h map_id=240
+COLOSSEUM_HEIGHT EQU $04
+COLOSSEUM_WIDTH EQU $05
+
; Lorelei_h map_id=245
LORELEIS_ROOM_HEIGHT EQU $06
LORELEIS_ROOM_WIDTH EQU $05