More far text scripts

4 files changed, 69 insertions, 3 deletions

diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index 2d57ccff..fe3a1db1 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -51,7 +51,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
 	db BANK(Route2House_h)
 	db BANK(Route2Gate_h)
 	db BANK(ViridianForestEntrance_h)
-	db $18 ; db BANK(ViridianForest_h)
+	db BANK(ViridianForest_h)
 	db $17 ; db BANK(Museum1F_h)
 	db $17 ; db BANK(Museum2F_h)
 	db $17 ; db BANK(PewterGym_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index 1c151398..930ce54a 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -51,7 +51,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
 	dw Route2House_h
 	dw Route2Gate_h
 	dw ViridianForestEntrance_h ;id=50
-	dw $50ed ; dw ViridianForest_h
+	dw ViridianForest_h
 	dw $40e3 ; dw Museum1F_h
 	dw $41b4 ; dw Museum2F_h
 	dw $4257 ; dw PewterGym_h
diff --git a/engine/bank3c.asm b/engine/bank3c.asm
index 964cc0bd..26fcbf61 100644
--- a/engine/bank3c.asm
+++ b/engine/bank3c.asm
@@ -360,7 +360,72 @@ INCBIN "maps/beach_house.blk"
 INCLUDE "data/mapObjects/beach_house.asm"
 
 Func_f23d0: ; f23d0
-	dr $f23d0, $f24ae
+	call SaveScreenTilesToBuffer2
+	xor a
+	ld [wUpdateSpritesEnabled], a
+	ld hl, wd730
+	set 6, [hl]
+	callab Func_e8c5c
+	ld hl, wd730
+	res 6, [hl]
+	call GBPalWhiteOutWithDelay3
+	call ReloadTilesetTilePatterns
+	call RestoreScreenTilesAndReloadTilePatterns
+	call LoadScreenTilesFromBuffer2
+	call Delay3
+	call GBPalNormal
+	ld hl, Text_f2412
+	ld a, [hOaksAideResult]
+	and a
+	jr nz, .asm_f2406
+	ld hl, Text_f240c
+.asm_f2406
+	call PrintText
+	jp TextScriptEnd
+
+Text_f240c:
+	TX_FAR _BeachHousePrinterText5
+	TX_SFX_ITEM2
+	db "@"
+
+Text_f2412:
+	TX_FAR _BeachHousePrinterText6
+	TX_SFX_ITEM2
+	db "@"
+
+Func_f2418:
+	ld hl, BillsHouseText_f243b
+	call PrintText
+	call YesNoChoice
+	ld a, [wCurrentMenuItem]
+	and a
+	jr nz, .asm_f2433
+.asm_f2427
+	ld hl, BillsHouseText_f2440
+	call PrintText
+	ld a, $2
+	ld [W_BILLSHOUSECURSCRIPT], a
+	ret
+
+.asm_f2433
+	ld hl, BillsHouseText_f2445
+	call PrintText
+	jr .asm_f2427
+
+BillsHouseText_f243b:
+	TX_FAR _BillsHouseText_1e865
+	db "@"
+
+BillsHouseText_f2440:
+	TX_FAR _BillsHouseText_1e86a
+	db "@"
+
+BillsHouseText_f2445:
+	TX_FAR _BillsHouseText_1e86f
+	db "@"
+
+Func_f244a:
+	dr $f244a, $f24ae
 Func_f24ae: ; f24ae
 	dr $f24ae, $f2528
 
diff --git a/macros.asm b/macros.asm
index 829841fa..29ca12f3 100644
--- a/macros.asm
+++ b/macros.asm
@@ -316,6 +316,7 @@ TX_BUTTON_SOUND: MACRO
 	ENDM
 
 TX_SFX_ITEM EQUS "db $0b"
+TX_SFX_ITEM2 EQUS "db $0d"
 TX_SFX_CONGRATS EQUS "db $10"
 TX_SFX_KEY_ITEM EQUS "db $11"