summaryrefslogtreecommitdiff
path: root/data/mapObjects/route19.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/route19.asm')
-rwxr-xr-xdata/mapObjects/route19.asm23
1 files changed, 1 insertions, 22 deletions
diff --git a/data/mapObjects/route19.asm b/data/mapObjects/route19.asm
index ee55a069..1b99d90e 100755
--- a/data/mapObjects/route19.asm
+++ b/data/mapObjects/route19.asm
@@ -1,42 +1,21 @@
Route19Object: ; 0x54e9a (size=87)
db $43 ; border block
- IF DEF(_OPTION_BEACH_HOUSE)
- db $1 ; warps
- db $9, $5, $0, BEACH_HOUSE
- ELSE
- db $0 ; warps
- ENDC
+ db $0 ; warps
db $1 ; signs
-IF DEF(_OPTION_BEACH_HOUSE)
- db $b,$b,$b
-ELSE
db $9, $b, $b ; Route19Text11
-ENDC
db $a ; objects
-IF DEF(_OPTION_BEACH_HOUSE)
- object SPRITE_BLACK_HAIR_BOY_1, $9, $7, STAY, RIGHT, 1, OPP_SWIMMER, 2
- object SPRITE_BLACK_HAIR_BOY_1, $c, $9, STAY, LEFT, 2, OPP_SWIMMER, 3
-ELSE
object SPRITE_BLACK_HAIR_BOY_1, $8, $7, STAY, LEFT, 1, OPP_SWIMMER, 2
object SPRITE_BLACK_HAIR_BOY_1, $d, $7, STAY, LEFT, 2, OPP_SWIMMER, 3
-ENDC
object SPRITE_SWIMMER, $d, $19, STAY, LEFT, $3, OPP_SWIMMER, $4
object SPRITE_SWIMMER, $4, $1b, STAY, RIGHT, $4, OPP_SWIMMER, $5
object SPRITE_SWIMMER, $10, $1f, STAY, UP, $5, OPP_SWIMMER, $6
-IF DEF(_OPTION_BEACH_HOUSE)
- object SPRITE_SWIMMER, $9, $d, STAY, DOWN, $6, OPP_SWIMMER, $7
-ELSE
object SPRITE_SWIMMER, $9, $b, STAY, DOWN, $6, OPP_SWIMMER, $7
-ENDC
object SPRITE_SWIMMER, $8, $2b, STAY, LEFT, $7, OPP_BEAUTY, $c
object SPRITE_SWIMMER, $b, $2b, STAY, RIGHT, $8, OPP_BEAUTY, $d
object SPRITE_SWIMMER, $9, $2a, STAY, UP, $9, OPP_SWIMMER, $8
object SPRITE_SWIMMER, $a, $2c, STAY, DOWN, $a, OPP_BEAUTY, $e
; warp-to
- IF DEF(_OPTION_BEACH_HOUSE)
- EVENT_DISP ROUTE_19_WIDTH, $9, $5 ; BEACH_HOUSE
- ENDC