diff options
Diffstat (limited to 'data/mapObjects')
| -rw-r--r-- | data/mapObjects/beach_house.asm | 20 | ||||
| -rwxr-xr-x | data/mapObjects/route19.asm | 28 |
2 files changed, 40 insertions, 8 deletions
diff --git a/data/mapObjects/beach_house.asm b/data/mapObjects/beach_house.asm new file mode 100644 index 00000000..ad648931 --- /dev/null +++ b/data/mapObjects/beach_house.asm @@ -0,0 +1,20 @@ +BeachHouseObjects: ; 0xf23a4 + db $a ; border block + + db 2 ; warps + db 7,2,0,$ff + db 7,3,0,$ff + + db 4 ; signs + db 0,3,3 + db 0,7,4 + 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 + + ; warp-to + EVENT_DISP BEACH_HOUSE_WIDTH,7,2 + EVENT_DISP BEACH_HOUSE_WIDTH,7,3 diff --git a/data/mapObjects/route19.asm b/data/mapObjects/route19.asm index 806e92ca..c6f80b6c 100755 --- a/data/mapObjects/route19.asm +++ b/data/mapObjects/route19.asm @@ -1,30 +1,42 @@ Route19Object: ; 0x54e9a (size=87) db $43 ; border block - IF _YELLOW + IF DEF(_OPTION_BEACH_HOUSE) db $1 ; warps - db $9, $5, $0, $f8 ; SURF_HOUSE - ENDC - IF !_YELLOW + db $9, $5, $0, BEACH_HOUSE + ELSE db $0 ; warps ENDC db $1 ; signs +IF DEF(_OPTION_BEACH_HOUSE) + db $b,$b,$b +ELSE db $9, $b, $b ; Route19Text11 +ENDC db $a ; people - db SPRITE_BLACK_HAIR_BOY_1, $7 + 4, $8 + 4, $ff, $d2, TRAINER | $1, SWIMMER + $C8, $2 - db SPRITE_BLACK_HAIR_BOY_1, $7 + 4, $d + 4, $ff, $d2, TRAINER | $2, SWIMMER + $C8, $3 +IF DEF(_OPTION_BEACH_HOUSE) + db SPRITE_BLACK_HAIR_BOY_1, $7 + 4, $9 + 4, $ff, $d3, TRAINER | 1, SWIMMER + $C8, 2 + db SPRITE_BLACK_HAIR_BOY_1, $9 + 4, $c + 4, $ff, $d2, TRAINER | 2, SWIMMER + $C8, 3 +ELSE + db SPRITE_BLACK_HAIR_BOY_1, $7 + 4, $8 + 4, $ff, $d2, TRAINER | 1, SWIMMER + $C8, 2 + db SPRITE_BLACK_HAIR_BOY_1, $7 + 4, $d + 4, $ff, $d2, TRAINER | 2, SWIMMER + $C8, 3 +ENDC db SPRITE_SWIMMER, $19 + 4, $d + 4, $ff, $d2, TRAINER | $3, SWIMMER + $C8, $4 db SPRITE_SWIMMER, $1b + 4, $4 + 4, $ff, $d3, TRAINER | $4, SWIMMER + $C8, $5 db SPRITE_SWIMMER, $1f + 4, $10 + 4, $ff, $d1, TRAINER | $5, SWIMMER + $C8, $6 +IF DEF(_OPTION_BEACH_HOUSE) + db SPRITE_SWIMMER, $d + 4, $9 + 4, $ff, $d0, TRAINER | $6, SWIMMER + $C8, $7 +ELSE db SPRITE_SWIMMER, $b + 4, $9 + 4, $ff, $d0, TRAINER | $6, SWIMMER + $C8, $7 +ENDC db SPRITE_SWIMMER, $2b + 4, $8 + 4, $ff, $d2, TRAINER | $7, BEAUTY + $C8, $c db SPRITE_SWIMMER, $2b + 4, $b + 4, $ff, $d3, TRAINER | $8, BEAUTY + $C8, $d db SPRITE_SWIMMER, $2a + 4, $9 + 4, $ff, $d1, TRAINER | $9, SWIMMER + $C8, $8 db SPRITE_SWIMMER, $2c + 4, $a + 4, $ff, $d0, TRAINER | $a, BEAUTY + $C8, $e ; warp-to - IF _YELLOW - EVENT_DISP ROUTE_19_WIDTH, $9, $5 ; SURF_HOUSE + IF DEF(_OPTION_BEACH_HOUSE) + EVENT_DISP ROUTE_19_WIDTH, $9, $5 ; BEACH_HOUSE ENDC |