Red's House 1F

4 files changed, 73 insertions, 60 deletions

diff --git a/engine/bank3c.asm b/engine/bank3c.asm
index 6174dc0b..54649b0b 100644
--- a/engine/bank3c.asm
+++ b/engine/bank3c.asm
@@ -348,7 +348,8 @@ INCLUDE "scripts/vermilioncity2.asm"
 INCLUDE "scripts/celadoncity2.asm"
 INCLUDE "scripts/route1_2.asm"
 INCLUDE "scripts/route22_2.asm"
-	dr $f1b73, $f220e
+INCLUDE "scripts/redshouse1f2.asm"
+	dr $f1be0, $f220e
 
 INCLUDE "data/mapHeaders/beach_house.asm"
 INCLUDE "scripts/beach_house.asm"
diff --git a/main.asm b/main.asm
index f4e6d582..bd9d8322 100755
--- a/main.asm
+++ b/main.asm
@@ -705,9 +705,13 @@ Route7Blocks: ; 48051
 INCBIN "maps/route7.blk"
 	dr $480ab,$480eb
 INCLUDE "scripts/route7.asm"
-; INCLUDE "data/mapHeaders/redshouse1f.asm"
-; INCLUDE "data/mapObjects/redshouse1f.asm"
-	dr $480f6,$4a540
+
+INCLUDE "data/mapHeaders/redshouse1f.asm"
+INCLUDE "scripts/redshouse1f.asm"
+INCLUDE "data/mapObjects/redshouse1f.asm"
+RedsHouse1FBlocks:
+INCBIN "maps/redshouse1f.blk"
+	dr $48157,$4a540
 
 
 SECTION "bank13",ROMX,BANK[$13]
@@ -899,6 +903,8 @@ INCLUDE "scripts/route14.asm"
 INCLUDE "scripts/route17.asm"
 INCLUDE "scripts/route19.asm"
 INCLUDE "scripts/route21.asm"
+
+; vermilion house 2
 	dr $56054,$56714
 
 INCLUDE "engine/menu/diploma_1.asm"
diff --git a/scripts/redshouse1f.asm b/scripts/redshouse1f.asm
index f9c7193f..602e8ecf 100755
--- a/scripts/redshouse1f.asm
+++ b/scripts/redshouse1f.asm
@@ -1,5 +1,6 @@
 RedsHouse1FScript: ; 48168 (12:4168)
-	jp EnableAutoTextBoxDrawing
+	call EnableAutoTextBoxDrawing
+	ret
 
 RedsHouse1FTextPointers: ; 4816b (12:416b)
 	dw RedsHouse1FText1
@@ -7,63 +8,10 @@ RedsHouse1FTextPointers: ; 4816b (12:416b)
 
 RedsHouse1FText1: ; 4816f (12:416f) Mom
 	TX_ASM
-	ld a, [wd72e]
-	bit 3, a
-	jr nz, .heal ; if player has received a Pokémon from Oak, heal team
-	ld hl, MomWakeUpText
-	call PrintText
-	jr .done
-.heal
-	call MomHealPokemon
-.done
+	callab Func_f1b73
 	jp TextScriptEnd
 
-MomWakeUpText: ; 48185 (12:4185)
-	TX_FAR _MomWakeUpText
-	db "@"
-
-MomHealPokemon: ; 4818a (12:418a)
-	ld hl, MomHealText1
-	call PrintText
-	call GBFadeOutToWhite
-	call ReloadMapData
-	predef HealParty
-	ld a, MUSIC_PKMN_HEALED
-	ld [wNewSoundID], a
-	call PlaySound
-.next
-	ld a, [wChannelSoundIDs]
-	cp MUSIC_PKMN_HEALED
-	jr z, .next
-	ld a, [wMapMusicSoundID]
-	ld [wNewSoundID], a
-	call PlaySound
-	call GBFadeInFromWhite
-	ld hl, MomHealText2
-	jp PrintText
-
-MomHealText1: ; 481bc (12:41bc)
-	TX_FAR _MomHealText1
-	db "@"
-MomHealText2: ; 481c1 (12:41c1)
-	TX_FAR _MomHealText2
-	db "@"
-
 RedsHouse1FText2: ; 0x481c6 TV
 	TX_ASM
-	ld a,[wSpriteStateData1 + 9]
-	cp SPRITE_FACING_UP
-	ld hl,TVWrongSideText
-	jr nz,.notUp
-	ld hl,StandByMeText
-.notUp
-	call PrintText
+	callab Func_f1bc4
 	jp TextScriptEnd
-
-StandByMeText: ; 481da (12:41da)
-	TX_FAR _StandByMeText
-	db "@"
-
-TVWrongSideText: ; 481df (12:41df)
-	TX_FAR _TVWrongSideText
-	db "@"
diff --git a/scripts/redshouse1f2.asm b/scripts/redshouse1f2.asm
new file mode 100755
index 00000000..0ddd22d6
--- /dev/null
+++ b/scripts/redshouse1f2.asm
@@ -0,0 +1,58 @@
+Func_f1b73:
+	ld a, [wd72e]
+	bit 3, a
+	jp nz, MomHealPokemon ; if player has received a Pokémon from Oak, heal team
+	ld hl, MomWakeUpText
+	call PrintText
+	ret
+
+MomWakeUpText: ; 48185 (12:4185)
+	TX_FAR _MomWakeUpText
+	db "@"
+
+MomHealPokemon: ; 4818a (12:418a)
+	ld hl, MomHealText1
+	call PrintText
+	call GBFadeOutToWhite
+	call ReloadMapData
+	predef HealParty
+	ld a, MUSIC_PKMN_HEALED
+	ld [wNewSoundID], a
+	call PlaySound
+.loop
+	ld a, [wChannelSoundIDs]
+	cp MUSIC_PKMN_HEALED
+	jr z, .loop
+	ld a, [wMapMusicSoundID]
+	ld [wNewSoundID], a
+	call PlaySound
+	call GBFadeInFromWhite
+	ld hl, MomHealText2
+	call PrintText
+	ret
+
+MomHealText1: ; 481bc (12:41bc)
+	TX_FAR _MomHealText1
+	db "@"
+MomHealText2: ; 481c1 (12:41c1)
+	TX_FAR _MomHealText2
+	db "@"
+
+Func_f1bc4:
+	ld hl, TVWrongSideText
+	ld a, [wSpriteStateData1 + 9]
+	cp SPRITE_FACING_UP
+	jp nz, .notUp
+	ld hl, StandByMeText
+.notUp
+	call PrintText
+	ret
+
+StandByMeText: ; 481da (12:41da)
+	TX_FAR _StandByMeText
+	db "@"
+
+TVWrongSideText: ; 481df (12:41df)
+	TX_FAR _TVWrongSideText
+	db "@"
+