aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/route22gate.asm
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2015-08-30 17:55:02 -0400
committerluckytyphlosion <alan.rj.huang@gmail.com>2015-08-30 17:55:02 -0400
commitd2ed7674f499b1fd6c4059da40b8b42c6bf96995 (patch)
treef581489b522fc647477d7b36dee072d553c44fd1 /data/mapObjects/route22gate.asm
parentMake pokeyellow build to baserom. (diff)
parentMerge pull request #114 from YamaArashi/master (diff)
downloadpokeyellow-d2ed7674f499b1fd6c4059da40b8b42c6bf96995.tar.gz
pokeyellow-d2ed7674f499b1fd6c4059da40b8b42c6bf96995.tar.xz
pokeyellow-d2ed7674f499b1fd6c4059da40b8b42c6bf96995.zip
Merge branch 'master' of https://github.com/iimarckus/pokered
Doesn't build.
Diffstat (limited to 'data/mapObjects/route22gate.asm')
-rwxr-xr-xdata/mapObjects/route22gate.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/mapObjects/route22gate.asm b/data/mapObjects/route22gate.asm
index cafc47ce..604a8730 100755
--- a/data/mapObjects/route22gate.asm
+++ b/data/mapObjects/route22gate.asm
@@ -9,8 +9,8 @@ Route22GateObject: ; 0x1e720 (size=42)
db $0 ; signs
- db $1 ; people
- db SPRITE_GUARD, $2 + 4, $6 + 4, $ff, $d2, $1 ; person
+ db $1 ; objects
+ object SPRITE_GUARD, $6, $2, STAY, LEFT, $1 ; person
; warp-to
EVENT_DISP ROUTE_22_GATE_WIDTH, $7, $4