summaryrefslogtreecommitdiff
path: root/data/mapObjects/silphco4.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2015-07-18 22:36:22 -0500
committerdannye <corrnondacqb@yahoo.com>2015-07-18 22:36:22 -0500
commit4452acb021873affd95c92f096d0b1b9e8b50e7a (patch)
treee905b665cfa1ef2eb7c62e475620bc40a9edb10d /data/mapObjects/silphco4.asm
parent0e48333fb864b0c8b6914fe1b5e57929d5258080 (diff)
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
Diffstat (limited to 'data/mapObjects/silphco4.asm')
-rwxr-xr-xdata/mapObjects/silphco4.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/data/mapObjects/silphco4.asm b/data/mapObjects/silphco4.asm
index a5eae9f0..f9974ccb 100755
--- a/data/mapObjects/silphco4.asm
+++ b/data/mapObjects/silphco4.asm
@@ -13,13 +13,13 @@ SilphCo4Object: ; 0x19e35 (size=111)
db $0 ; signs
db $7 ; objects
- object SPRITE_LAPRAS_GIVER, $6, $2, FACE, STAY, $1 ; person
- object SPRITE_ROCKET, $9, $e, FACE, LEFT, $2, ROCKET + $C8, $1a
- object SPRITE_OAK_AIDE, $e, $6, FACE, RIGHT, $3, SCIENTIST + $C8, $5
- object SPRITE_ROCKET, $1a, $a, FACE, UP, $4, ROCKET + $C8, $1b
- object SPRITE_BALL, $3, $9, FACE, STAY, $5, FULL_HEAL
- object SPRITE_BALL, $4, $7, FACE, STAY, $6, MAX_REVIVE
- object SPRITE_BALL, $5, $8, FACE, STAY, $7, ESCAPE_ROPE
+ object SPRITE_LAPRAS_GIVER, $6, $2, STAY, NONE, $1 ; person
+ object SPRITE_ROCKET, $9, $e, STAY, RIGHT, $2, ROCKET + $C8, $1a
+ object SPRITE_OAK_AIDE, $e, $6, STAY, LEFT, $3, SCIENTIST + $C8, $5
+ object SPRITE_ROCKET, $1a, $a, STAY, UP, $4, ROCKET + $C8, $1b
+ object SPRITE_BALL, $3, $9, STAY, NONE, $5, FULL_HEAL
+ object SPRITE_BALL, $4, $7, STAY, NONE, $6, MAX_REVIVE
+ object SPRITE_BALL, $5, $8, STAY, NONE, $7, ESCAPE_ROPE
; warp-to
EVENT_DISP SILPH_CO_4F_WIDTH, $0, $18 ; SILPH_CO_3F