Actually include the Beach House scripts and headers

4 files changed, 91 insertions, 88 deletions

diff --git a/data/mapHeaders/beach_house.asm b/data/mapHeaders/beach_house.asm
index 99d237f6..04652643 100644
--- a/data/mapHeaders/beach_house.asm
+++ b/data/mapHeaders/beach_house.asm
@@ -1,4 +1,4 @@
-BeachHouse_h:
+BeachHouse_h: ; f220e (3c:620e)
 
 	db BEACH_HOUSE_TILESET
 	db BEACH_HOUSE_HEIGHT, BEACH_HOUSE_WIDTH ; dimensions (y, x)
diff --git a/engine/bank3c.asm b/engine/bank3c.asm
index e2aa941c..db31842b 100644
--- a/engine/bank3c.asm
+++ b/engine/bank3c.asm
@@ -292,11 +292,18 @@ Pointer_f0a76:: ; f0a76 (3c:4a76)
 	db $27, $07, $7b, $4a, $ff
 	db $01, $ec, $02, $ed, $03, $ee, $ff
 
+Func_f0a82: ; f0a82
 	dr $f0a82, $f220e
-BeachHouse_h: ; f220e (3c:620e)
-;INCLUDE "data/mapHeaders/beach_house.asm"
-	dr $f220e, $f24ae
-Func_f24ae: ; f24ae (3c:64ae)
+
+INCLUDE "data/mapHeaders/beach_house.asm"
+INCLUDE "scripts/beach_house.asm"
+BeachHouseBlockdata: ; f2388 (3c:6388)
+INCBIN "maps/beach_house.blk"
+INCLUDE "data/mapObjects/beach_house.asm"
+
+Func_f23d0: ; f23d0
+	dr $f23d0, $f24ae
+Func_f24ae: ; f24ae
 	dr $f24ae, $f25f8
 
 INCLUDE "engine/overworld/hidden_objects.asm"
diff --git a/main.asm b/main.asm
index a106b3a3..c77d840f 100755
--- a/main.asm
+++ b/main.asm
@@ -943,7 +943,7 @@ SECTION "bank3D",ROMX,BANK[$3D]
 INCLUDE "engine/bank3d.asm"
 
 SECTION "bank3E",ROMX,BANK[$3E]
-
+Func_f8000: ; f8000
 	dr $f8000,$f982d
 PlayIntroScene: ; f982d (3e:582d)
 	dr $f982d,$fa35a
diff --git a/scripts/beach_house.asm b/scripts/beach_house.asm
index d6112df7..6d53b7ce 100644
--- a/scripts/beach_house.asm
+++ b/scripts/beach_house.asm
@@ -12,37 +12,35 @@ BeachHouseTextPointers:
 
 SurfinDudeText:
 	TX_ASM
-	ld a,[$d471]
-	bit 6,a
-	jr nz,.next
-	ld hl,.SurfinDudeText4
+	ld a, [wd472]
+	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
+	ld hl, wPreventBlackout
+	bit 0, [hl]
+	set 0, [hl]
+	jr nz, .next2
+	ld hl, .SurfinDudeText1
 	jr .next3
 .next2
-	ld hl,.SurfinDudeText3
+	ld hl, .SurfinDudeText3
 .next3
 	call PrintText
 	call YesNoChoice
-	ld a,[wCurrentMenuItem]
+	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 nz, .asm_f226b
+	ld a, 1
+	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
+	callba Func_f8000
+	ld hl, wPreventBlackout
+	set 1, [hl]
 	jr .done
-.xf226b
-	ld hl,.SurfinDudeText2
+.asm_f226b
+	ld hl, .SurfinDudeText2
 	call PrintText
 .done
 	jp TextScriptEnd
@@ -62,9 +60,9 @@ SurfinDudeText:
 
 BeachHousePikachuText:
 	TX_ASM
-	ld hl,.BeachHousePikachuText
+	ld hl, .BeachHousePikachuText
 	call PrintText
-	ld a,PIKACHU
+	ld a, PIKACHU
 	call PlayCry
 	call WaitForSoundToFinish
 	jp TextScriptEnd
@@ -75,11 +73,11 @@ BeachHousePikachuText:
 
 BeachHouseSign1Text:
 	TX_ASM
-	ld hl,.BeachHouseSign1Text2
-	ld a,[$d471]
-	bit 6,a
-	jr z,.next
-	ld hl,.BeachHouseSign1Text1
+	ld hl, .BeachHouseSign1Text2
+	ld a, [wd472]
+	bit 6, a
+	jr z, .next
+	ld hl, .BeachHouseSign1Text1
 .next
 	call PrintText
 	jp TextScriptEnd
@@ -93,11 +91,11 @@ BeachHouseSign1Text:
 
 BeachHouseSign2Text:
 	TX_ASM
-	ld hl,.BeachHouseSign2Text2
-	ld a,[$d471]
-	bit 6,a
-	jr z,.next
-	ld hl,.BeachHouseSign2Text1
+	ld hl, .BeachHouseSign2Text2
+	ld a, [wd472]
+	bit 6, a
+	jr z, .next
+	ld hl, .BeachHouseSign2Text1
 .next
 	call PrintText
 	jp TextScriptEnd
@@ -111,11 +109,11 @@ BeachHouseSign2Text:
 
 BeachHouseSign3Text:
 	TX_ASM
-	ld hl,.BeachHouseSign3Text2
-	ld a,[$d471]
-	bit 6,a
-	jr z,.next
-	ld hl,.BeachHouseSign3Text1
+	ld hl, .BeachHouseSign3Text2
+	ld a, [wd472]
+	bit 6, a
+	jr z, .next
+	ld hl, .BeachHouseSign3Text1
 .next
 	call PrintText
 	jp TextScriptEnd
@@ -129,67 +127,65 @@ BeachHouseSign3Text:
 
 BeachHouseSign4Text:
 	TX_ASM
-	ld a,1
-	ld [$cc3c],a
-	ld a,[$d471]
-	bit 6,a
-	jr z,.xf2369
+	ld a, 1
+	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
+	ld a, [wd472]
+	bit 6, a
+	jr z, .asm_f2369
 
-	ld hl,$d492
-	bit 1,[hl]
-	jr z,.next2
-	ld a,0
-	ld [$cc3c],a
+	ld hl, wPreventBlackout
+	bit 1, [hl]
+	jr z, .next2
+	ld a, 0
+	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
 .next2
-	ld hl,.BeachHousePrinterText2
+	ld hl, .BeachHousePrinterText2
 	call PrintText
-	ld a,[$d492]
-	bit 1,a
-	jr z,.xf236f
+	ld a, [wPreventBlackout]
+	bit 1, a
+	jr z, .asm_f236f
 
-	ld a,1
-	ld [$cc3c],a
-	ld hl,.BeachHousePrinterText3
+	ld a, 1
+	ld [wDoNotWaitForButtonPressAfterDisplayingText], a
+	ld hl, .BeachHousePrinterText3
 	call PrintText
 	call YesNoChoice
-	ld a,[wCurrentMenuItem]
+	ld a, [wCurrentMenuItem]
 	and a
-	jp z,$63d0 ; 0xf23d0
-	call $36ec
-	ld hl,$d72f
-	set 6,[hl]
+	jp z, Func_f23d0 ; 0xf23d0
+	call SaveScreenTilesToBuffer2
+	ld hl, wd730
+	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
+	ld [wUpdateSpritesEnabled], a
+	callab Func_e910a
+	call WaitForTextScrollButtonPress
+	ld hl, wd730
+	res 6, [hl]
+	call GBPalWhiteOutWithDelay3
+	call ReloadTilesetTilePatterns
+	call RestoreScreenTilesAndReloadTilePatterns
+	call LoadScreenTilesFromBuffer2
+	call Delay3
+	call GBPalNormal
+	ld a, 1
+	ld [wUpdateSpritesEnabled], a
+	jr .asm_f236f
+.asm_f2369
+	ld hl, .BeachHousePrinterText1
 	call PrintText
-.xf236f
+.asm_f236f
 	jp TextScriptEnd
 
 .BeachHousePrinterText1
 	TX_FAR _BeachHousePrinterText1
-	db $d,"@"
+	db $d, "@"
 .BeachHousePrinterText2
 	TX_FAR _BeachHousePrinterText2
-	db $d,"@"
+	db $d, "@"
 .BeachHousePrinterText3
 	TX_FAR _BeachHousePrinterText3
 	db "@"
-.xf2383
+.BeachHousePrinterText4
 	TX_FAR _BeachHousePrinterText4
 	db "@"