From dd4f0a0064921f74fd68750848fca87ae21c4545 Mon Sep 17 00:00:00 2001
From: Remy Oukaour <remy.oukaour@gmail.com>
Date: Mon, 29 Jan 2018 11:12:59 -0500
Subject: Use base 10 (note, the previous commit resolves #173)

---
 data/mapObjects/pokemontower5.asm | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'data/mapObjects/pokemontower5.asm')

diff --git a/data/mapObjects/pokemontower5.asm b/data/mapObjects/pokemontower5.asm
index 72401577..0b3349d8 100755
--- a/data/mapObjects/pokemontower5.asm
+++ b/data/mapObjects/pokemontower5.asm
@@ -1,20 +1,20 @@
 PokemonTower5Object:
-	db $1 ; border block
+	db 1 ; border block
 
-	db $2 ; warps
-	warp $3, $9, $0, POKEMONTOWER_4
-	warp $12, $9, $0, POKEMONTOWER_6
+	db 2 ; warps
+	warp 3, 9, 0, POKEMONTOWER_4
+	warp 18, 9, 0, POKEMONTOWER_6
 
-	db $0 ; signs
+	db 0 ; signs
 
-	db $6 ; objects
-	object SPRITE_MEDIUM, $c, $8, STAY, NONE, $1 ; person
-	object SPRITE_MEDIUM, $11, $7, STAY, LEFT, $2, OPP_CHANNELER, $e
-	object SPRITE_MEDIUM, $e, $3, STAY, LEFT, $3, OPP_CHANNELER, $10
-	object SPRITE_MEDIUM, $6, $a, STAY, RIGHT, $4, OPP_CHANNELER, $11
-	object SPRITE_MEDIUM, $9, $10, STAY, RIGHT, $5, OPP_CHANNELER, $12
-	object SPRITE_BALL, $6, $e, STAY, NONE, $6, NUGGET
+	db 6 ; objects
+	object SPRITE_MEDIUM, 12, 8, STAY, NONE, 1 ; person
+	object SPRITE_MEDIUM, 17, 7, STAY, LEFT, 2, OPP_CHANNELER, 14
+	object SPRITE_MEDIUM, 14, 3, STAY, LEFT, 3, OPP_CHANNELER, 16
+	object SPRITE_MEDIUM, 6, 10, STAY, RIGHT, 4, OPP_CHANNELER, 17
+	object SPRITE_MEDIUM, 9, 16, STAY, RIGHT, 5, OPP_CHANNELER, 18
+	object SPRITE_BALL, 6, 14, STAY, NONE, 6, NUGGET
 
 	; warp-to
-	warp_to $3, $9, POKEMONTOWER_5_WIDTH ; POKEMONTOWER_4
-	warp_to $12, $9, POKEMONTOWER_5_WIDTH ; POKEMONTOWER_6
+	warp_to 3, 9, POKEMONTOWER_5_WIDTH ; POKEMONTOWER_4
+	warp_to 18, 9, POKEMONTOWER_5_WIDTH ; POKEMONTOWER_6
-- 
cgit v1.3.1-sl0p