aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/route12gateupstairs.asm
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2018-01-29 11:12:59 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2018-01-29 11:12:59 -0500
commitdd4f0a0064921f74fd68750848fca87ae21c4545 (patch)
tree9b5aea440c39119121720a850a467bb5837c84da /data/mapObjects/route12gateupstairs.asm
parentAdd warp, sign, and warp_to macros for data/mapObjects definitions (diff)
downloadpokeyellow-dd4f0a0064921f74fd68750848fca87ae21c4545.tar.gz
pokeyellow-dd4f0a0064921f74fd68750848fca87ae21c4545.tar.xz
pokeyellow-dd4f0a0064921f74fd68750848fca87ae21c4545.zip
Use base 10 (note, the previous commit resolves #173)
Diffstat (limited to 'data/mapObjects/route12gateupstairs.asm')
-rwxr-xr-xdata/mapObjects/route12gateupstairs.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/mapObjects/route12gateupstairs.asm b/data/mapObjects/route12gateupstairs.asm
index b1c92f95..5eea516a 100755
--- a/data/mapObjects/route12gateupstairs.asm
+++ b/data/mapObjects/route12gateupstairs.asm
@@ -1,15 +1,15 @@
Route12GateUpstairsObject:
- db $a ; border block
+ db 10 ; border block
- db $1 ; warps
- warp $7, $7, $4, ROUTE_12_GATE_1F
+ db 1 ; warps
+ warp 7, 7, 4, ROUTE_12_GATE_1F
- db $2 ; signs
- sign $1, $2, $2 ; Route12GateUpstairsText2
- sign $6, $2, $3 ; Route12GateUpstairsText3
+ db 2 ; signs
+ sign 1, 2, 2 ; Route12GateUpstairsText2
+ sign 6, 2, 3 ; Route12GateUpstairsText3
- db $1 ; objects
- object SPRITE_BRUNETTE_GIRL, $3, $4, WALK, $1, $1 ; person
+ db 1 ; objects
+ object SPRITE_BRUNETTE_GIRL, 3, 4, WALK, 1, 1 ; person
; warp-to
- warp_to $7, $7, ROUTE_12_GATE_2F_WIDTH ; ROUTE_12_GATE_1F
+ warp_to 7, 7, ROUTE_12_GATE_2F_WIDTH ; ROUTE_12_GATE_1F