aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/silphco11.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/silphco11.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/silphco11.asm')
-rwxr-xr-xdata/mapObjects/silphco11.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/data/mapObjects/silphco11.asm b/data/mapObjects/silphco11.asm
index 93b9e339..ddab6d12 100755
--- a/data/mapObjects/silphco11.asm
+++ b/data/mapObjects/silphco11.asm
@@ -9,12 +9,12 @@ SilphCo11Object: ; 0x62380 (size=72)
db $0 ; signs
- db $5 ; people
- db SPRITE_MR_MASTERBALL, $5 + 4, $7 + 4, $ff, $d0, $1 ; person
- db SPRITE_FOULARD_WOMAN, $5 + 4, $a + 4, $ff, $d0, $2 ; person
- db SPRITE_GIOVANNI, $9 + 4, $6 + 4, $ff, $d0, TRAINER | $3, GIOVANNI + $C8, $2
- db SPRITE_ROCKET, $10 + 4, $3 + 4, $ff, $d1, TRAINER | $4, ROCKET + $C8, $29
- db SPRITE_ROCKET, $9 + 4, $f + 4, $ff, $d1, TRAINER | $5, ROCKET + $C8, $28
+ db $5 ; objects
+ object SPRITE_MR_MASTERBALL, $7, $5, FACE, DOWN, $1 ; person
+ object SPRITE_FOULARD_WOMAN, $a, $5, FACE, DOWN, $2 ; person
+ object SPRITE_GIOVANNI, $6, $9, FACE, DOWN, $3, GIOVANNI + $C8, $2
+ object SPRITE_ROCKET, $3, $10, FACE, UP, $4, ROCKET + $C8, $29
+ object SPRITE_ROCKET, $f, $9, FACE, UP, $5, ROCKET + $C8, $28
; warp-to
EVENT_DISP SILPH_CO_11F_WIDTH, $0, $9 ; SILPH_CO_10F