aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/ceruleangym.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2015-07-18 22:22:51 -0500
committerdannye <corrnondacqb@yahoo.com>2015-07-18 22:22:51 -0500
commit0e48333fb864b0c8b6914fe1b5e57929d5258080 (patch)
tree02a69d268fd1234b0a3da2745065130f7193118c /data/mapObjects/ceruleangym.asm
parentConsolidate coord macros (diff)
downloadpokeyellow-0e48333fb864b0c8b6914fe1b5e57929d5258080.tar.gz
pokeyellow-0e48333fb864b0c8b6914fe1b5e57929d5258080.tar.xz
pokeyellow-0e48333fb864b0c8b6914fe1b5e57929d5258080.zip
Map object macro
closes https://github.com/iimarckus/pokered/issues/89
Diffstat (limited to 'data/mapObjects/ceruleangym.asm')
-rwxr-xr-xdata/mapObjects/ceruleangym.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/mapObjects/ceruleangym.asm b/data/mapObjects/ceruleangym.asm
index 87128c5b..239e27fb 100755
--- a/data/mapObjects/ceruleangym.asm
+++ b/data/mapObjects/ceruleangym.asm
@@ -7,11 +7,11 @@ CeruleanGymObject: ; 0x5c834 (size=50)
db $0 ; signs
- db $4 ; people
- db SPRITE_BRUNETTE_GIRL, $2 + 4, $4 + 4, $ff, $d0, TRAINER | $1, MISTY + $C8, $1
- db SPRITE_LASS, $3 + 4, $2 + 4, $ff, $d3, TRAINER | $2, JR__TRAINER_F + $C8, $1
- db SPRITE_SWIMMER, $7 + 4, $8 + 4, $ff, $d2, TRAINER | $3, SWIMMER + $C8, $1
- db SPRITE_GYM_HELPER, $a + 4, $7 + 4, $ff, $d0, $4 ; person
+ db $4 ; objects
+ object SPRITE_BRUNETTE_GIRL, $4, $2, FACE, DOWN, $1, MISTY + $C8, $1
+ object SPRITE_LASS, $2, $3, FACE, LEFT, $2, JR__TRAINER_F + $C8, $1
+ object SPRITE_SWIMMER, $8, $7, FACE, RIGHT, $3, SWIMMER + $C8, $1
+ object SPRITE_GYM_HELPER, $7, $a, FACE, DOWN, $4 ; person
; warp-to
EVENT_DISP CERULEAN_GYM_WIDTH, $d, $4