aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/colosseum.asm
diff options
context:
space:
mode:
authorDaniel Harding <33dannye@gmail.com>2018-02-05 10:57:14 -0600
committerGitHub <noreply@github.com>2018-02-05 10:57:14 -0600
commitb8aa9ec80e43257a9e3a487b46a33f99c999a940 (patch)
tree3813e75239070dbb3d549e8c03297cc28b2551e3 /data/mapObjects/colosseum.asm
parentAdd pokegold and pokefirered. (diff)
parentINCBIN don't start with tabs (diff)
downloadpokeyellow-b8aa9ec80e43257a9e3a487b46a33f99c999a940.tar.gz
pokeyellow-b8aa9ec80e43257a9e3a487b46a33f99c999a940.tar.xz
pokeyellow-b8aa9ec80e43257a9e3a487b46a33f99c999a940.zip
Merge pull request #174 from Rangi42/master
Add warp, sign, and warp_to macros for data/mapObjects definitions; use base 10 numbers
Diffstat (limited to 'data/mapObjects/colosseum.asm')
-rwxr-xr-xdata/mapObjects/colosseum.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/mapObjects/colosseum.asm b/data/mapObjects/colosseum.asm
index 91fea6b9..1c32de2f 100755
--- a/data/mapObjects/colosseum.asm
+++ b/data/mapObjects/colosseum.asm
@@ -1,9 +1,9 @@
ColosseumObject:
db $e ; border block
- db $0 ; warps
+ db 0 ; warps
- db $0 ; signs
+ db 0 ; signs
- db $1 ; objects
- object SPRITE_RED, $2, $2, STAY, $0, $1 ; person
+ db 1 ; objects
+ object SPRITE_RED, 2, 2, STAY, 0, 1 ; person