summaryrefslogtreecommitdiff
path: root/data/mapObjects
diff options
context:
space:
mode:
authorIIMarckus <iimarckus@gmail.com>2014-10-17 12:16:52 -0600
committerIIMarckus <iimarckus@gmail.com>2014-10-17 12:16:52 -0600
commit1d579928dc0a3ecbaa169ae76a7abcc310e2c7ce (patch)
tree3320eb30ddf4e52c751a63f06e36868d33ef9544 /data/mapObjects
parent16ad16302e0c5ee116c697454cb98a62cf0bb58b (diff)
Modularize the beach house.
Diffstat (limited to 'data/mapObjects')
-rwxr-xr-xdata/mapObjects/route19.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/mapObjects/route19.asm b/data/mapObjects/route19.asm
index c225ed29..7d3a342c 100755
--- a/data/mapObjects/route19.asm
+++ b/data/mapObjects/route19.asm
@@ -1,7 +1,7 @@
Route19Object: ; 0x54e9a (size=87)
db $43 ; border block
- IF DEF(_YELLOW)
+ IF DEF(_OPTION_BEACH_HOUSE)
db $1 ; warps
db $9, $5, $0, BEACH_HOUSE
ELSE
@@ -9,14 +9,14 @@ Route19Object: ; 0x54e9a (size=87)
ENDC
db $1 ; signs
-IF DEF(_YELLOW)
+IF DEF(_OPTION_BEACH_HOUSE)
db $b,$b,$b
ELSE
db $9, $b, $b ; Route19Text11
ENDC
db $a ; people
-IF DEF(_YELLOW)
+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
@@ -33,6 +33,6 @@ ENDC
db SPRITE_SWIMMER, $2c + 4, $a + 4, $ff, $d0, TRAINER | $a, BEAUTY + $C8, $e
; warp-to
- IF DEF(_YELLOW)
+ IF DEF(_OPTION_BEACH_HOUSE)
EVENT_DISP ROUTE_19_WIDTH, $9, $5 ; BEACH_HOUSE
ENDC