aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/pewtergym.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/pewtergym.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/pewtergym.asm')
-rwxr-xr-xdata/mapObjects/pewtergym.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/mapObjects/pewtergym.asm b/data/mapObjects/pewtergym.asm
index f5fa120e..0381db07 100755
--- a/data/mapObjects/pewtergym.asm
+++ b/data/mapObjects/pewtergym.asm
@@ -7,10 +7,10 @@ PewterGymObject: ; 0x5c52e (size=42)
db $0 ; signs
- db $3 ; people
- db SPRITE_BLACK_HAIR_BOY_2, $1 + 4, $4 + 4, $ff, $d0, TRAINER | $1, BROCK + $C8, $1
- db SPRITE_BLACK_HAIR_BOY_1, $6 + 4, $3 + 4, $ff, $d3, TRAINER | $2, JR__TRAINER_M + $C8, $1
- db SPRITE_GYM_HELPER, $a + 4, $7 + 4, $ff, $d0, $3 ; person
+ db $3 ; objects
+ object SPRITE_BLACK_HAIR_BOY_2, $4, $1, FACE, DOWN, $1, BROCK + $C8, $1
+ object SPRITE_BLACK_HAIR_BOY_1, $3, $6, FACE, LEFT, $2, JR__TRAINER_M + $C8, $1
+ object SPRITE_GYM_HELPER, $7, $a, FACE, DOWN, $3 ; person
; warp-to
EVENT_DISP PEWTER_GYM_WIDTH, $d, $4