aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/viridianforestentrance.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/viridianforestentrance.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/viridianforestentrance.asm')
-rwxr-xr-xdata/mapObjects/viridianforestentrance.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/viridianforestentrance.asm b/data/mapObjects/viridianforestentrance.asm
index ce0aaae5..fc676a6d 100755
--- a/data/mapObjects/viridianforestentrance.asm
+++ b/data/mapObjects/viridianforestentrance.asm
@@ -9,9 +9,9 @@ ViridianForestEntranceObject: ; 0x5d66d (size=48)
db $0 ; signs
- db $2 ; people
- db SPRITE_GIRL, $4 + 4, $8 + 4, $ff, $d2, $1 ; person
- db SPRITE_LITTLE_GIRL, $4 + 4, $2 + 4, $fe, $1, $2 ; person
+ db $2 ; objects
+ object SPRITE_GIRL, $8, $4, STAY, LEFT, $1 ; person
+ object SPRITE_LITTLE_GIRL, $2, $4, WALK, $1, $2 ; person
; warp-to
EVENT_DISP VIRIDIAN_FOREST_ENTRANCE_WIDTH, $0, $4 ; VIRIDIAN_FOREST