aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapObjects/beach_house.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/beach_house.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/beach_house.asm')
-rw-r--r--data/mapObjects/beach_house.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/beach_house.asm b/data/mapObjects/beach_house.asm
index ad648931..0f660357 100644
--- a/data/mapObjects/beach_house.asm
+++ b/data/mapObjects/beach_house.asm
@@ -11,9 +11,9 @@ BeachHouseObjects: ; 0xf23a4
db 0,$b,5
db 1,$d,6
- db 2 ; people
- db SPRITE_FISHER, 3+4, 2+4, $ff, $d0, 1 ; surfin' dude
- db $3d, 3+4, 5+4, $fe, $01, 2 ; pikachu
+ db 2 ; objects
+ object SPRITE_FISHER, 2, 3, FACE, DOWN, 1 ; surfin' dude
+ object $3d, 5, 3, WALK, $01, 2 ; pikachu
; warp-to
EVENT_DISP BEACH_HOUSE_WIDTH,7,2