From 4452acb021873affd95c92f096d0b1b9e8b50e7a Mon Sep 17 00:00:00 2001 From: dannye Date: Sat, 18 Jul 2015 22:36:22 -0500 Subject: Fix object constant names swap LEFT and RIGHT FACE is better named STAY because sprites that have no range do not necessarily face any direction STAY has been renamed to NONE because sprites that use this will spin randomly, except for the item/voltorb/electrode sprite I never should have listened to https://github.com/iimarckus/pokered/issues/89 --- data/mapObjects/mtmoon1.asm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'data/mapObjects/mtmoon1.asm') diff --git a/data/mapObjects/mtmoon1.asm b/data/mapObjects/mtmoon1.asm index 6444ca10..3c9bcc80 100755 --- a/data/mapObjects/mtmoon1.asm +++ b/data/mapObjects/mtmoon1.asm @@ -12,19 +12,19 @@ MtMoon1Object: ; 0x49b06 (size=145) db $17, $f, $e ; MtMoon1Text14 db $d ; objects - object SPRITE_HIKER, $5, $6, FACE, DOWN, $1, HIKER + $C8, $1 - object SPRITE_BUG_CATCHER, $c, $10, FACE, LEFT, $2, YOUNGSTER + $C8, $3 - object SPRITE_LASS, $1e, $4, FACE, DOWN, $3, LASS + $C8, $5 - object SPRITE_BLACK_HAIR_BOY_2, $18, $1f, FACE, UP, $4, SUPER_NERD + $C8, $1 - object SPRITE_LASS, $10, $17, FACE, DOWN, $5, LASS + $C8, $6 - object SPRITE_BUG_CATCHER, $7, $16, FACE, DOWN, $6, BUG_CATCHER + $C8, $7 - object SPRITE_BUG_CATCHER, $1e, $1b, FACE, LEFT, $7, BUG_CATCHER + $C8, $8 - object SPRITE_BALL, $2, $14, FACE, STAY, $8, POTION - object SPRITE_BALL, $2, $2, FACE, STAY, $9, MOON_STONE - object SPRITE_BALL, $23, $1f, FACE, STAY, $a, RARE_CANDY - object SPRITE_BALL, $24, $17, FACE, STAY, $b, ESCAPE_ROPE - object SPRITE_BALL, $14, $21, FACE, STAY, $c, POTION - object SPRITE_BALL, $5, $20, FACE, STAY, $d, TM_12 + object SPRITE_HIKER, $5, $6, STAY, DOWN, $1, HIKER + $C8, $1 + object SPRITE_BUG_CATCHER, $c, $10, STAY, RIGHT, $2, YOUNGSTER + $C8, $3 + object SPRITE_LASS, $1e, $4, STAY, DOWN, $3, LASS + $C8, $5 + object SPRITE_BLACK_HAIR_BOY_2, $18, $1f, STAY, UP, $4, SUPER_NERD + $C8, $1 + object SPRITE_LASS, $10, $17, STAY, DOWN, $5, LASS + $C8, $6 + object SPRITE_BUG_CATCHER, $7, $16, STAY, DOWN, $6, BUG_CATCHER + $C8, $7 + object SPRITE_BUG_CATCHER, $1e, $1b, STAY, RIGHT, $7, BUG_CATCHER + $C8, $8 + object SPRITE_BALL, $2, $14, STAY, NONE, $8, POTION + object SPRITE_BALL, $2, $2, STAY, NONE, $9, MOON_STONE + object SPRITE_BALL, $23, $1f, STAY, NONE, $a, RARE_CANDY + object SPRITE_BALL, $24, $17, STAY, NONE, $b, ESCAPE_ROPE + object SPRITE_BALL, $14, $21, STAY, NONE, $c, POTION + object SPRITE_BALL, $5, $20, STAY, NONE, $d, TM_12 ; warp-to EVENT_DISP MT_MOON_1_WIDTH, $23, $e -- cgit v1.3.1-sl0p