Vermilion House 3

data/mapObjects/vermilionhouse3.asm

@@ -8,7 +8,7 @@ VermilionHouse3Object: ; 0x19c25 (size=26)
 	db $0 ; signs
 
 	db $1 ; objects
-	object SPRITE_LITTLE_GIRL, $3, $5, STAY, UP, $1 ; person
+	object SPRITE_GENTLEMAN, $3, $5, STAY, UP, $1 ; person
 
 	; warp-to
 	EVENT_DISP VERMILION_HOUSE_3_WIDTH, $7, $2

data/map_header_banks.asm

@@ -195,8 +195,8 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
 	db BANK(SeafoamIslands1_h)
 	db BANK(Route22Gate_h)
 	db BANK(VictoryRoad2_h)
-	db $12 ; db BANK(Route12GateUpstairs_h)
-	db $06 ; db BANK(VermilionHouse3_h)
+	db BANK(Route12GateUpstairs_h)
+	db BANK(VermilionHouse3_h)
 	db $18 ; db BANK(DiglettsCave_h)
 	db $11 ; db BANK(VictoryRoad3_h)
 	db $11 ; db BANK(RocketHideout1_h)

data/map_header_pointers.asm

@@ -195,8 +195,8 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
 	dw SeafoamIslands1_h
 	dw Route22Gate_h
 	dw VictoryRoad2_h
-	dw $54eb ; dw Route12GateUpstairs_h
-	dw $5d05 ; dw VermilionHouse3_h
+	dw Route12GateUpstairs_h
+	dw VermilionHouse3_h
 	dw $5f79 ; dw DiglettsCave_h
 	dw $4a0d ; dw VictoryRoad3_h
 	dw $4c5e ; dw RocketHideout1_h

main.asm

@@ -272,7 +272,11 @@ INCLUDE "data/mapHeaders/blueshouse.asm"
 INCLUDE "scripts/blueshouse.asm"
 INCLUDE "data/mapObjects/blueshouse.asm"
 BluesHouseBlocks: INCBIN "maps/blueshouse.blk"
-	dr $19d05,$19d45
+
+INCLUDE "data/mapHeaders/vermilionhouse3.asm"
+INCLUDE "scripts/vermilionhouse3.asm"
+INCLUDE "data/mapObjects/vermilionhouse3.asm"
+VermilionHouse3Blocks: INCBIN "maps/vermilionhouse3.blk"
 
 INCLUDE "data/mapHeaders/indigoplateaulobby.asm"
 INCLUDE "scripts/indigoplateaulobby.asm"

scripts/vermilionhouse3.asm

@@ -5,8 +5,5 @@ VermilionHouse3TextPointers: ; 19c15 (6:5c15)
 	dw VermilionHouse3Text1
 
 VermilionHouse3Text1: ; 19c17 (6:5c17)
-	TX_ASM
-	ld a, $4
-	ld [wWhichTrade], a
-	predef DoInGameTradeDialogue
-	jp TextScriptEnd
+	TX_FAR TeachingHMsText
+	db "@"