Merge branch 'master' of https://github.com/pret/pokered

9 files changed, 1 insertions, 67 deletions

diff --git a/data/collision.asm b/data/collision.asm
index 46d5ddc6..78579242 100644
--- a/data/collision.asm
+++ b/data/collision.asm
@@ -22,6 +22,3 @@ Lab_Coll::          INCBIN  "gfx/tilesets/lab.tilecoll"
 Club_Coll::         INCBIN  "gfx/tilesets/club.tilecoll"
 Facility_Coll::     INCBIN  "gfx/tilesets/facility.tilecoll"
 Plateau_Coll::      INCBIN  "gfx/tilesets/plateau.tilecoll"
-IF DEF(_OPTION_BEACH_HOUSE)
-BeachHouse_Coll::   INCBIN  "gfx/tilesets/beachhouse.tilecoll"
-ENDC
diff --git a/data/mapHeaders/beach_house.asm b/data/mapHeaders/beach_house.asm
deleted file mode 100644
index 99d237f6..00000000
--- a/data/mapHeaders/beach_house.asm
+++ /dev/null
@@ -1,7 +0,0 @@
-BeachHouse_h:
-
-	db BEACH_HOUSE_TILESET
-	db BEACH_HOUSE_HEIGHT, BEACH_HOUSE_WIDTH ; dimensions (y, x)
-	dw BeachHouseBlockdata,BeachHouseTextPointers,BeachHouseScript ; blocks, texts, scripts
-	db 0 ; connections
-	dw BeachHouseObjects ; objects
diff --git a/data/mapObjects/beach_house.asm b/data/mapObjects/beach_house.asm
deleted file mode 100644
index 847883d1..00000000
--- a/data/mapObjects/beach_house.asm
+++ /dev/null
@@ -1,20 +0,0 @@
-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 ; objects
-	object SPRITE_FISHER, 2, 3, STAY, DOWN, 1 ; surfin' dude
-	object $3d, 5, 3, WALK, $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 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
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index ed120d75..8796a608 100755
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -248,6 +248,3 @@ MapHeaderBanks: ; c23d (3:423d)
 	db BANK(Lorelei_h)
 	db BANK(Bruno_h)
 	db BANK(Agatha_h)
-IF DEF(_OPTION_BEACH_HOUSE)
-	db BANK(BeachHouse_h)
-ENDC
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index ef2b4e65..746d3211 100755
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -248,6 +248,3 @@ MapHeaderPointers:: ; 01ae (0:01ae)
 	dw Lorelei_h
 	dw Bruno_h
 	dw Agatha_h ;247
-IF DEF(_OPTION_BEACH_HOUSE)
-	dw BeachHouse_h
-ENDC
diff --git a/data/map_songs.asm b/data/map_songs.asm
index a8022da2..8fee18d2 100755
--- a/data/map_songs.asm
+++ b/data/map_songs.asm
@@ -247,6 +247,3 @@ MapSongBanks: ; c04d (3:404d)
 	db MUSIC_GYM, BANK(Music_Gym) ; Lorelei
 	db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; Bruno
 	db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; Agatha
-IF DEF(_OPTION_BEACH_HOUSE)
-	db MUSIC_ROUTES3, BANK(Music_Routes3) ; BeachHouse
-ENDC
diff --git a/data/tileset_headers.asm b/data/tileset_headers.asm
index 3e2e68bb..84cfaffd 100755
--- a/data/tileset_headers.asm
+++ b/data/tileset_headers.asm
@@ -23,6 +23,3 @@ Tilesets: ; c7be (3:47be)
 	tileset Club_Block,        Club_GFX,        Club_Coll,        $07,$17,$FF, $FF, INDOOR
 	tileset Facility_Block,    Facility_GFX,    Facility_Coll,    $12,$FF,$FF, $FF, CAVE
 	tileset Plateau_Block,     Plateau_GFX,     Plateau_Coll,     $FF,$FF,$FF, $45, CAVE
-IF DEF(_OPTION_BEACH_HOUSE)
-	tileset BeachHouse_Block,  BeachHouse_GFX,  BeachHouse_Coll,  $FF,$FF,$FF, $FF, INDOOR
-ENDC
diff --git a/data/wild_mons.asm b/data/wild_mons.asm
index f29fd340..482405e3 100755
--- a/data/wild_mons.asm
+++ b/data/wild_mons.asm
@@ -247,9 +247,6 @@ WildDataPointers: ; ceeb (3:4eeb)
 	dw NoMons
 	dw NoMons
 	dw NoMons
-	IF DEF(_OPTION_BEACH_HOUSE)
-		dw NoMons
-	ENDC
 	dw $FFFF
 
 ; wild pokemon data is divided into two parts.