Remove the Beach House option.

20 files changed, 1 insertions, 401 deletions

diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index 3bd79f3c..551c59ad 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -248,6 +248,3 @@ const_value = 0
 	const LORELEIS_ROOM              ; $F5
 	const BRUNOS_ROOM                ; $F6
 	const AGATHAS_ROOM               ; $F7
-IF DEF(_OPTION_BEACH_HOUSE)
-	const BEACH_HOUSE                ; $F8
-ENDC
diff --git a/constants/map_dimensions.asm b/constants/map_dimensions.asm
index ad6caa23..cc6fed9f 100755
--- a/constants/map_dimensions.asm
+++ b/constants/map_dimensions.asm
@@ -891,8 +891,3 @@ BRUNOS_ROOM_WIDTH  EQU $05
 ; Agatha_h map_id=247
 AGATHAS_ROOM_HEIGHT EQU $06
 AGATHAS_ROOM_WIDTH  EQU $05
-
-IF DEF(_OPTION_BEACH_HOUSE)
-BEACH_HOUSE_HEIGHT EQU 4
-BEACH_HOUSE_WIDTH  EQU 7
-ENDC
diff --git a/constants/tilesets.asm b/constants/tilesets.asm
index 86f87433..f10e4d92 100644
--- a/constants/tilesets.asm
+++ b/constants/tilesets.asm
@@ -24,6 +24,3 @@ const_value = 0
 	const CLUB         ; 21
 	const FACILITY     ; 22
 	const PLATEAU      ; 23
-IF DEF(_OPTION_BEACH_HOUSE)
-	const BEACH_HOUSE_TILESET ; 24
-ENDC
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.
diff --git a/gfx/blocksets/beachhouse.bst b/gfx/blocksets/beachhouse.bst
deleted file mode 100644
index bafbe0b2..00000000
--- a/gfx/blocksets/beachhouse.bst
+++ /dev/null
diff --git a/gfx/tilesets/beachhouse.png b/gfx/tilesets/beachhouse.png
deleted file mode 100644
index f5dccf7a..00000000
--- a/gfx/tilesets/beachhouse.png
+++ /dev/null
diff --git a/gfx/tilesets/beachhouse.tilecoll b/gfx/tilesets/beachhouse.tilecoll
deleted file mode 100644
index 54ddac19..00000000
--- a/gfx/tilesets/beachhouse.tilecoll
+++ /dev/null
@@ -1 +0,0 @@
-
ÿ
\ No newline at end of file
diff --git a/main.asm b/main.asm
index 8049b646..7f824b74 100755
--- a/main.asm
+++ b/main.asm
@@ -5120,12 +5120,6 @@ INCLUDE "data/mapHeaders/billshouse.asm"
 INCLUDE "scripts/billshouse.asm"
 INCLUDE "data/mapObjects/billshouse.asm"
 BillsHouseBlocks: INCBIN "maps/billshouse.blk"
-IF DEF(_OPTION_BEACH_HOUSE)
-INCLUDE "data/mapHeaders/beach_house.asm"
-INCLUDE "scripts/beach_house.asm"
-BeachHouseBlockdata: INCBIN "maps/beach_house.blk"
-INCLUDE "data/mapObjects/beach_house.asm"
-ENDC
 
 INCLUDE "engine/menu/oaks_pc.asm"
 
@@ -6042,11 +6036,7 @@ Route17Blocks: INCBIN "maps/route17.blk"
 
 INCLUDE "data/mapHeaders/route19.asm"
 INCLUDE "data/mapObjects/route19.asm"
-IF DEF(_OPTION_BEACH_HOUSE)
-Route19Blocks: INCBIN "maps/route19-yellow.blk"
-ELSE
 Route19Blocks: INCBIN "maps/route19.blk"
-ENDC
 
 INCLUDE "data/mapHeaders/route21.asm"
 INCLUDE "data/mapObjects/route21.asm"
@@ -6714,13 +6704,3 @@ INCLUDE "engine/evolution.asm"
 INCLUDE "engine/overworld/elevator.asm"
 
 INCLUDE "engine/items/tm_prices.asm"
-
-IF DEF(_OPTION_BEACH_HOUSE)
-SECTION "bank3C",ROMX[$4314],BANK[$3C]
-
-BeachHouse_GFX:
-	INCBIN "gfx/tilesets/beachhouse.2bpp"
-
-BeachHouse_Block:
-	INCBIN "gfx/blocksets/beachhouse.bst"
-ENDC
diff --git a/maps/beach_house.blk b/maps/beach_house.blk
deleted file mode 100644
index 5bcdb58a..00000000
--- a/maps/beach_house.blk
+++ /dev/null
@@ -1 +0,0 @@
-		








\ No newline at end of file
diff --git a/scripts/beach_house.asm b/scripts/beach_house.asm
deleted file mode 100644
index d6112df7..00000000
--- a/scripts/beach_house.asm
+++ /dev/null
@@ -1,195 +0,0 @@
-BeachHouseScript:
-	call $3c29
-	ret
-
-BeachHouseTextPointers:
-	dw SurfinDudeText
-	dw BeachHousePikachuText
-	dw BeachHouseSign1Text
-	dw BeachHouseSign2Text
-	dw BeachHouseSign3Text
-	dw BeachHouseSign4Text
-
-SurfinDudeText:
-	TX_ASM
-	ld a,[$d471]
-	bit 6,a
-	jr nz,.next
-	ld hl,.SurfinDudeText4
-	call PrintText
-	jr .done
-.next
-	ld hl,$d492
-	bit 0,[hl]
-	set 0,[hl]
-	jr nz,.next2
-	ld hl,.SurfinDudeText1
-	jr .next3
-.next2
-	ld hl,.SurfinDudeText3
-.next3
-	call PrintText
-	call YesNoChoice
-	ld a,[wCurrentMenuItem]
-	and a
-	jr nz,.xf226b
-	ld a,1
-	ld [$cc3c],a
-	ld b,$3e
-	ld hl,$4000
-	call $3e84
-	ld hl,$d492
-	set 1,[hl]
-	jr .done
-.xf226b
-	ld hl,.SurfinDudeText2
-	call PrintText
-.done
-	jp TextScriptEnd
-
-.SurfinDudeText1
-	TX_FAR _SurfinDudeText1
-	db "@"
-.SurfinDudeText2
-	TX_FAR _SurfinDudeText2
-	db "@"
-.SurfinDudeText3
-	TX_FAR _SurfinDudeText3
-	db "@"
-.SurfinDudeText4
-	TX_FAR _SurfinDudeText4
-	db "@"
-
-BeachHousePikachuText:
-	TX_ASM
-	ld hl,.BeachHousePikachuText
-	call PrintText
-	ld a,PIKACHU
-	call PlayCry
-	call WaitForSoundToFinish
-	jp TextScriptEnd
-
-.BeachHousePikachuText
-	TX_FAR _BeachHousePikachuText
-	db "@"
-
-BeachHouseSign1Text:
-	TX_ASM
-	ld hl,.BeachHouseSign1Text2
-	ld a,[$d471]
-	bit 6,a
-	jr z,.next
-	ld hl,.BeachHouseSign1Text1
-.next
-	call PrintText
-	jp TextScriptEnd
-
-.BeachHouseSign1Text1
-	TX_FAR _BeachHouseSign1Text1
-	db "@"
-.BeachHouseSign1Text2
-	TX_FAR _BeachHouseSign1Text2
-	db "@"
-
-BeachHouseSign2Text:
-	TX_ASM
-	ld hl,.BeachHouseSign2Text2
-	ld a,[$d471]
-	bit 6,a
-	jr z,.next
-	ld hl,.BeachHouseSign2Text1
-.next
-	call PrintText
-	jp TextScriptEnd
-
-.BeachHouseSign2Text1
-	TX_FAR _BeachHouseSign2Text1
-	db "@"
-.BeachHouseSign2Text2
-	TX_FAR _BeachHouseSign2Text2
-	db "@"
-
-BeachHouseSign3Text:
-	TX_ASM
-	ld hl,.BeachHouseSign3Text2
-	ld a,[$d471]
-	bit 6,a
-	jr z,.next
-	ld hl,.BeachHouseSign3Text1
-.next
-	call PrintText
-	jp TextScriptEnd
-
-.BeachHouseSign3Text1
-	TX_FAR _BeachHouseSign3Text1
-	db "@"
-.BeachHouseSign3Text2
-	TX_FAR _BeachHouseSign3Text2
-	db "@"
-
-BeachHouseSign4Text:
-	TX_ASM
-	ld a,1
-	ld [$cc3c],a
-	ld a,[$d471]
-	bit 6,a
-	jr z,.xf2369
-
-	ld hl,$d492
-	bit 1,[hl]
-	jr z,.next2
-	ld a,0
-	ld [$cc3c],a
-.next2
-	ld hl,.BeachHousePrinterText2
-	call PrintText
-	ld a,[$d492]
-	bit 1,a
-	jr z,.xf236f
-
-	ld a,1
-	ld [$cc3c],a
-	ld hl,.BeachHousePrinterText3
-	call PrintText
-	call YesNoChoice
-	ld a,[wCurrentMenuItem]
-	and a
-	jp z,$63d0 ; 0xf23d0
-	call $36ec
-	ld hl,$d72f
-	set 6,[hl]
-	xor a
-	ld [$cfca],a
-	ld hl,$510a
-	ld b,$3a
-	call $3e84
-	call $3852
-	ld hl,$d72f
-	res 6,[hl]
-	call $3dd8
-	call $2f83
-	call $3dc2
-	call $36f8
-	call $3ddb
-	call $3de0
-	ld a,1
-	ld [$cfca],a
-	jr .xf236f
-.xf2369
-	ld hl,.BeachHousePrinterText1
-	call PrintText
-.xf236f
-	jp TextScriptEnd
-
-.BeachHousePrinterText1
-	TX_FAR _BeachHousePrinterText1
-	db $d,"@"
-.BeachHousePrinterText2
-	TX_FAR _BeachHousePrinterText2
-	db $d,"@"
-.BeachHousePrinterText3
-	TX_FAR _BeachHousePrinterText3
-	db "@"
-.xf2383
-	TX_FAR _BeachHousePrinterText4
-	db "@"
diff --git a/text.asm b/text.asm
index 9a5ecff7..17959ce2 100644
--- a/text.asm
+++ b/text.asm
@@ -1969,9 +1969,6 @@ INCLUDE "text/maps/route_16_gate_upstairs.asm"
 INCLUDE "text/maps/route_16_house.asm"
 INCLUDE "text/maps/route_18_gate.asm"
 INCLUDE "text/maps/route_18_gate_upstairs.asm"
-IF DEF(_OPTION_BEACH_HOUSE)
-INCLUDE "text/maps/beach_house.asm"
-ENDC
 INCLUDE "text/maps/pokemon_league_gate.asm"
 INCLUDE "text/maps/victory_road_2f.asm"
 INCLUDE "text/maps/bills_house.asm"
diff --git a/text/maps/beach_house.asm b/text/maps/beach_house.asm
deleted file mode 100644
index 318b6013..00000000
--- a/text/maps/beach_house.asm
+++ /dev/null
@@ -1,103 +0,0 @@
-_SurfinDudeText1::
-	text "Whoa!"
-
-	para "Your PIKACHU knows"
-	line "how to SURF! So,"
-	cont "I'm not alone..."
-
-	para "Great! You earned"
-	line "the right to SURF"
-	cont "with the DUDE!"
-
-	para "Give it a go?"
-	done
-
-_SurfinDudeText2::
-	text "Come SURF anytime,"
-	line "my friend!"
-	done
-
-_SurfinDudeText3::
-	text "Wanna go SURF?"
-	done
-
-_SurfinDudeText4::
-	text "Dogs and burgers"
-	line "on special today!"
-	done
-
-_BeachHousePikachuText::
-	text "PIKACHU: Pikaa."
-	done
-
-_BeachHouseSign1Text1::
-	text "SURFIN' DUDE's"
-	line "scribbles..."
-
-	para "When I shoot the"
-	line "tube, the tunes"
-	cont "hit the groove!"
-	done
-
-_BeachHouseSign1Text2::
-	text "30 years of waves!"
-	line "SURFIN' DUDE"
-	done
-
-_BeachHouseSign2Text1::
-	text "SURFING TIP 1!"
-
-	para "After flips, line"
-	line "the board up with"
-	cont "a wave for a cool"
-	cont "effect!"
-	done
-
-_BeachHouseSign2Text2::
-	text "SUMMER BEACH HOUSE"
-	line "#MON welcome!"
-	done
-
-_BeachHouseSign3Text1::
-	text "SURFING TIP 2!"
-
-	para "Pulling flips in"
-	line "a jump is totally"
-	cont "rad!"
-	done
-
-_BeachHouseSign3Text2::
-	text "The sea unites"
-	line "all in surfdom!"
-	done
-
-_BeachHousePrinterText1::
-	text "It's some sort of"
-	line "a machine...@@"
-
-_BeachHousePrinterText2::
-	text "SUMMER BEACH HOUSE"
-	line "PRINTER, it says.@@"
-
-_BeachHousePrinterText3::
-	text "The Hi.Score is"
-	line "shown."
-
-	para "PRINT it out?"
-	done
-
-_BeachHousePrinterText4::
-	text "SUMMER BEACH HOUSE"
-	line "PRINTER, it says."
-
-	para "The Hi.Score is"
-	line "shown."
-
-	para "PRINT it out?"
-	done
-
-_BeachHousePrinterText5::
-	text "PRINT completed.@@"
-
-_BeachHousePrinterText6::
-	text "PRINT error!@@"