From 4670a1ddae02fd73d8c4826f9d9c9948820636a0 Mon Sep 17 00:00:00 2001
From: dannye <corrnondacqb@yahoo.com>
Date: Thu, 16 Jul 2015 23:21:57 -0500
Subject: Swap trade center and battle center also rename battle center to
 colosseum closes https://github.com/iimarckus/pokered/issues/102

---
 scripts/battlecenterm.asm | 38 --------------------------------------
 scripts/colosseum.asm     |  9 +++++++++
 scripts/tradecenter.asm   | 38 ++++++++++++++++++++++++++++++++++++++
 scripts/tradecenterm.asm  |  9 ---------
 4 files changed, 47 insertions(+), 47 deletions(-)
 delete mode 100755 scripts/battlecenterm.asm
 create mode 100755 scripts/colosseum.asm
 create mode 100755 scripts/tradecenter.asm
 delete mode 100755 scripts/tradecenterm.asm

(limited to 'scripts')

diff --git a/scripts/battlecenterm.asm b/scripts/battlecenterm.asm
deleted file mode 100755
index dcb20d83..00000000
--- a/scripts/battlecenterm.asm
+++ /dev/null
@@ -1,38 +0,0 @@
-BattleCenterMScript: ; 4fd10 (13:7d10)
-	call EnableAutoTextBoxDrawing
-	ld a, [$ffaa]
-	cp $2
-	ld a, $8
-	jr z, .asm_4fd1d
-	ld a, $c
-.asm_4fd1d
-	ld [$ff8d], a
-	ld a, $1
-	ld [$ff8c], a
-	call SetSpriteFacingDirection
-	ld hl, wd72d
-	bit 0, [hl]
-	set 0, [hl]
-	ret nz
-	ld hl, wSpriteStateData2 + $14
-	ld a, $8
-	ld [hli], a
-	ld a, $a
-	ld [hl], a
-	ld a, SPRITE_FACING_LEFT
-	ld [wSpriteStateData1 + $19], a
-	ld a, [$ffaa]
-	cp $2
-	ret z
-	ld a, $7
-	ld [wSpriteStateData2 + $15], a
-	ld a, SPRITE_FACING_RIGHT
-	ld [wSpriteStateData1 + $19], a
-	ret
-
-BattleCenterMTextPointers: ; 4fd4c (13:7d4c)
-	dw BattleCenterMText1
-
-BattleCenterMText1: ; 4fd4e (13:7d4e)
-	TX_FAR _BattleCenterMText1
-	db "@"
diff --git a/scripts/colosseum.asm b/scripts/colosseum.asm
new file mode 100755
index 00000000..e4ba4611
--- /dev/null
+++ b/scripts/colosseum.asm
@@ -0,0 +1,9 @@
+ColosseumScript: ; 4fd7d (13:7d7d)
+	jp TradeCenterScript
+
+ColosseumTextPointers: ; 4fd80 (13:7d80)
+	dw ColosseumText1
+
+ColosseumText1: ; 4fd82 (13:7d82)
+	TX_FAR _ColosseumText1
+	db "@"
diff --git a/scripts/tradecenter.asm b/scripts/tradecenter.asm
new file mode 100755
index 00000000..0a5cc100
--- /dev/null
+++ b/scripts/tradecenter.asm
@@ -0,0 +1,38 @@
+TradeCenterScript: ; 4fd10 (13:7d10)
+	call EnableAutoTextBoxDrawing
+	ld a, [$ffaa]
+	cp $2
+	ld a, $8
+	jr z, .asm_4fd1d
+	ld a, $c
+.asm_4fd1d
+	ld [$ff8d], a
+	ld a, $1
+	ld [$ff8c], a
+	call SetSpriteFacingDirection
+	ld hl, wd72d
+	bit 0, [hl]
+	set 0, [hl]
+	ret nz
+	ld hl, wSpriteStateData2 + $14
+	ld a, $8
+	ld [hli], a
+	ld a, $a
+	ld [hl], a
+	ld a, SPRITE_FACING_LEFT
+	ld [wSpriteStateData1 + $19], a
+	ld a, [$ffaa]
+	cp $2
+	ret z
+	ld a, $7
+	ld [wSpriteStateData2 + $15], a
+	ld a, SPRITE_FACING_RIGHT
+	ld [wSpriteStateData1 + $19], a
+	ret
+
+TradeCenterTextPointers: ; 4fd4c (13:7d4c)
+	dw TradeCenterText1
+
+TradeCenterText1: ; 4fd4e (13:7d4e)
+	TX_FAR _TradeCenterText1
+	db "@"
diff --git a/scripts/tradecenterm.asm b/scripts/tradecenterm.asm
deleted file mode 100755
index 662a1df7..00000000
--- a/scripts/tradecenterm.asm
+++ /dev/null
@@ -1,9 +0,0 @@
-TradeCenterMScript: ; 4fd7d (13:7d7d)
-	jp BattleCenterMScript
-
-TradeCenterMTextPointers: ; 4fd80 (13:7d80)
-	dw TradeCenterMText1
-
-TradeCenterMText1: ; 4fd82 (13:7d82)
-	TX_FAR _TradeCenterMText1
-	db "@"
-- 
cgit v1.2.3