aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/halloffameroom.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/halloffameroom.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/halloffameroom.asm')
-rwxr-xr-xdata/mapObjects/halloffameroom.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/mapObjects/halloffameroom.asm b/data/mapObjects/halloffameroom.asm
index 54e284ae..dc63d777 100755
--- a/data/mapObjects/halloffameroom.asm
+++ b/data/mapObjects/halloffameroom.asm
@@ -1,15 +1,15 @@
HallofFameRoomObject:
- db $3 ; border block
+ db 3 ; border block
- db $2 ; warps
- warp $4, $7, $2, CHAMPIONS_ROOM
- warp $5, $7, $3, CHAMPIONS_ROOM
+ db 2 ; warps
+ warp 4, 7, 2, CHAMPIONS_ROOM
+ warp 5, 7, 3, CHAMPIONS_ROOM
- db $0 ; signs
+ db 0 ; signs
- db $1 ; objects
- object SPRITE_OAK, $5, $2, STAY, DOWN, $1 ; person
+ db 1 ; objects
+ object SPRITE_OAK, 5, 2, STAY, DOWN, 1 ; person
; warp-to
- warp_to $4, $7, HALL_OF_FAME_WIDTH ; CHAMPIONS_ROOM
- warp_to $5, $7, HALL_OF_FAME_WIDTH ; CHAMPIONS_ROOM
+ warp_to 4, 7, HALL_OF_FAME_WIDTH ; CHAMPIONS_ROOM
+ warp_to 5, 7, HALL_OF_FAME_WIDTH ; CHAMPIONS_ROOM