aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/mtmoonpokecenter.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/mtmoonpokecenter.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/mtmoonpokecenter.asm')
-rwxr-xr-xdata/mapObjects/mtmoonpokecenter.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/data/mapObjects/mtmoonpokecenter.asm b/data/mapObjects/mtmoonpokecenter.asm
index f5f52f65..d6cd35ba 100755
--- a/data/mapObjects/mtmoonpokecenter.asm
+++ b/data/mapObjects/mtmoonpokecenter.asm
@@ -7,13 +7,13 @@ MtMoonPokecenterObject: ; 0x49376 (size=56)
db $0 ; signs
- db $6 ; people
- db SPRITE_NURSE, $1 + 4, $3 + 4, $ff, $d0, $1 ; person
- db SPRITE_BUG_CATCHER, $3 + 4, $4 + 4, $ff, $d1, $2 ; person
- db SPRITE_GENTLEMAN, $3 + 4, $7 + 4, $ff, $d1, $3 ; person
- db SPRITE_FAT_BALD_GUY, $6 + 4, $a + 4, $fe, $2, $4 ; person
- db SPRITE_CLIPBOARD, $2 + 4, $7 + 4, $ff, $ff, $5 ; person
- db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $6 ; person
+ db $6 ; objects
+ object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person
+ object SPRITE_BUG_CATCHER, $4, $3, STAY, UP, $2 ; person
+ object SPRITE_GENTLEMAN, $7, $3, STAY, UP, $3 ; person
+ object SPRITE_FAT_BALD_GUY, $a, $6, WALK, $2, $4 ; person
+ object SPRITE_CLIPBOARD, $7, $2, STAY, NONE, $5 ; person
+ object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $6 ; person
; warp-to
EVENT_DISP MT_MOON_POKECENTER_WIDTH, $7, $3