Another chunk of bank 3c

6 files changed, 311 insertions, 1 deletions

diff --git a/scripts/beach_house2.asm b/scripts/beach_house2.asm
new file mode 100755
index 00000000..918334ab
--- /dev/null
+++ b/scripts/beach_house2.asm
@@ -0,0 +1,33 @@
+Func_f23d0: ; f23d0
+	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 "@"
diff --git a/scripts/billshouse2.asm b/scripts/billshouse2.asm
new file mode 100755
index 00000000..48205029
--- /dev/null
+++ b/scripts/billshouse2.asm
@@ -0,0 +1,158 @@
+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:
+	CheckEvent EVENT_GOT_SS_TICKET
+	jr nz, .asm_f247e
+	ld hl, BillsHouseText_f248c
+	call PrintText
+	lb bc, S_S_TICKET, 1
+	call GiveItem
+	jr nc, .asm_f2485
+	ld hl, BillsHouseText_f2491
+	call PrintText
+	SetEvent EVENT_GOT_SS_TICKET
+	ld a, HS_CERULEAN_GUARD_1
+	ld [wMissableObjectIndex], a
+	predef ShowObject
+	ld a, HS_CERULEAN_GUARD_2
+	ld [wMissableObjectIndex], a
+	predef HideObject
+.asm_f247e
+	ld hl, BillsHouseText_f249d
+	call PrintText
+	ret
+
+.asm_f2485
+	ld hl, BillsHouseText_f2498
+	call PrintText
+	ret
+
+BillsHouseText_f248c:
+	TX_FAR _BillThankYouText
+	db "@"
+
+BillsHouseText_f2491:
+	TX_FAR _SSTicketReceivedText
+	TX_SFX_KEY_ITEM
+	TX_BUTTON_SOUND
+	db "@"
+
+BillsHouseText_f2498:
+	TX_FAR _SSTicketNoRoomText
+	db "@"
+
+BillsHouseText_f249d:
+	TX_FAR _BillsHouseText_1e8cb
+	db "@"
+
+Func_f24a2:
+	ld hl, BillsHouseText_f24a9
+	call PrintText
+	ret
+
+BillsHouseText_f24a9:
+	TX_FAR _BillsHouseText_1e8da
+	db "@"
+
+Func_f24ae: ; f24ae
+	ld a, [wCurMap]
+	cp BILLS_HOUSE
+	jr nz, .asm_f24d2
+	call Func_154a
+	jr z, .asm_f24d2
+	ld a, [W_BILLSHOUSECURSCRIPT]
+	cp $5
+	ld e, $1b
+	ret z
+	cp $0
+	ld e, $17
+	ret z
+	CheckEventHL EVENT_MET_BILL_2
+	ld e, $20
+	ret z
+	ld e, $1f
+	ret
+
+.asm_f24d2
+	ld e, $ff
+	ret
+
+Func_f24d5:
+	ld a, $ff
+	ld [wJoyIgnore], a
+	xor a
+	ld [wPlayerMovingDirection], a
+	call UpdateSprites
+	call UpdateSprites
+	ld hl, Data_f2505
+	call Func_159b
+	ld a, $f ; pikachu
+	ld [wEmotionBubbleSpriteIndex], a
+	ld a, $1
+	ld [wWhichEmotionBubble], a
+	predef EmotionBubble
+	call Func_153a
+	callab InitializePikachuTextID
+	ret
+
+Data_f2505:
+	db $00
+	db $20
+	db $20
+	db $20
+	db $1e
+	db $3f
+
+Func_f250b:
+	ld hl, Data_f251c
+	ld b, SPRITE_FACING_UP
+	call Func_f0a82
+	ld hl, Data_f2521
+	ld b, SPRITE_FACING_RIGHT
+	call Func_f0a82
+	ret
+
+Data_f251c:
+	db $00
+	db $1f
+	db $1d
+	db $38
+	db $3f
+
+Data_f2521:
+	db $00
+	db $1e
+	db $1f
+	db $1f
+	db $1d
+	db $38
+	db $3f
diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm
index 63cec822..43464d77 100755
--- a/scripts/oakslab.asm
+++ b/scripts/oakslab.asm
@@ -798,7 +798,7 @@ OaksLabText_1c9a7:
 
 OaksLabScript_1c9ac:
 	ld a, $1
-	ld [wSavedPlayerScreenY], a
+	ld [wEmotionBubbleSpriteIndex], a
 	xor a
 	ld [wWhichEmotionBubble], a
 	predef EmotionBubble
diff --git a/scripts/silphco11_2.asm b/scripts/silphco11_2.asm
new file mode 100755
index 00000000..e7b59757
--- /dev/null
+++ b/scripts/silphco11_2.asm
@@ -0,0 +1,76 @@
+Func_f25a0:
+	ld hl, MissableObjects_f25ce
+.asm_f25a3
+	ld a, [hli]
+	cp $ff
+	jr z, .asm_f25b4
+	push hl
+	ld [wMissableObjectIndex], a
+	predef HideObject
+	pop hl
+	jr .asm_f25a3
+
+.asm_f25b4
+	ld hl, MissableObjects_f25c7
+.asm_f25b7
+	ld a, [hli]
+	cp $ff
+	ret z
+	push hl
+	ld [wMissableObjectIndex], a
+	predef ShowObject
+	pop hl
+	jr .asm_f25b7
+
+MissableObjects_f25c7:
+	db HS_SAFFRON_CITY_8
+	db HS_SAFFRON_CITY_9
+	db HS_SAFFRON_CITY_A
+	db HS_SAFFRON_CITY_B
+	db HS_SAFFRON_CITY_C
+	db HS_SAFFRON_CITY_D
+	db $FF
+
+MissableObjects_f25ce
+	db HS_SAFFRON_CITY_1
+	db HS_SAFFRON_CITY_2
+	db HS_SAFFRON_CITY_3
+	db HS_SAFFRON_CITY_4
+	db HS_SAFFRON_CITY_5
+	db HS_SAFFRON_CITY_6
+	db HS_SAFFRON_CITY_7
+	db HS_SAFFRON_CITY_E
+	db HS_SAFFRON_CITY_F
+	db HS_SILPH_CO_2F_2
+	db HS_SILPH_CO_2F_3
+	db HS_SILPH_CO_2F_4
+	db HS_SILPH_CO_2F_5
+	db HS_SILPH_CO_3F_1
+	db HS_SILPH_CO_3F_2
+	db HS_SILPH_CO_4F_1
+	db HS_SILPH_CO_4F_2
+	db HS_SILPH_CO_4F_3
+	db HS_SILPH_CO_5F_1
+	db HS_SILPH_CO_5F_2
+	db HS_SILPH_CO_5F_3
+	db HS_SILPH_CO_5F_4
+	db HS_SILPH_CO_6F_1
+	db HS_SILPH_CO_6F_2
+	db HS_SILPH_CO_6F_3
+	db HS_SILPH_CO_7F_1
+	db HS_SILPH_CO_7F_2
+	db HS_SILPH_CO_7F_3
+	db HS_SILPH_CO_7F_4
+	db HS_SILPH_CO_8F_1
+	db HS_SILPH_CO_8F_2
+	db HS_SILPH_CO_8F_3
+	db HS_SILPH_CO_9F_1
+	db HS_SILPH_CO_9F_2
+	db HS_SILPH_CO_9F_3
+	db HS_SILPH_CO_10F_1
+	db HS_SILPH_CO_10F_2
+	db HS_SILPH_CO_11F_1
+	db HS_SILPH_CO_11F_2
+	db HS_SILPH_CO_11F_3
+	db HS_MAP_F4_1
+	db $ff
\ No newline at end of file
diff --git a/scripts/ssanne9_2.asm b/scripts/ssanne9_2.asm
new file mode 100755
index 00000000..f856221c
--- /dev/null
+++ b/scripts/ssanne9_2.asm
@@ -0,0 +1,35 @@
+Func_f2570:
+	ld hl, SSAnne9Text_f2577
+	call PrintText
+	ret
+
+SSAnne9Text_f2577:
+	TX_FAR _SSAnne9Text_61c1f
+	db "@"
+
+Func_f257c:
+	ld hl, SSAnne9Text_f2583
+	call PrintText
+	ret
+
+SSAnne9Text_f2583:
+	TX_FAR _SSAnne9Text_61c2e
+	db "@"
+
+Func_f2588:
+	ld hl, SSAnne9Text_f258f
+	call PrintText
+	ret
+
+SSAnne9Text_f258f:
+	TX_FAR _SSAnne9Text_61c3d
+	db "@"
+
+Func_f2594:
+	ld hl, SSAnne9Text_f259b
+	call PrintText
+	ret
+
+SSAnne9Text_f259b:
+	TX_FAR _SSAnne9Text_61c4c
+	db "@"
diff --git a/scripts/viridianforest2.asm b/scripts/viridianforest2.asm
index 41c81218..489db39c 100755
--- a/scripts/viridianforest2.asm
+++ b/scripts/viridianforest2.asm
@@ -43,3 +43,11 @@ Text_f255f:
 	TX_FAR _ViridianForestText13
 	db "@"
 
+Func_f2564:
+	ld hl, ViridianForestText_f256b
+	call PrintText
+	ret
+
+ViridianForestText_f256b:
+	TX_FAR _ViridianForestText14
+	db "@"