Blue's House

6 files changed, 33 insertions, 28 deletions

diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm
index fc8ab90f..77820f75 100755
--- a/constants/hide_show_constants.asm
+++ b/constants/hide_show_constants.asm
@@ -75,7 +75,7 @@ const_value = 0
 	const HS_POKEMONTOWER_7_ROCKET_2      ; 42 X
 	const HS_POKEMONTOWER_7_ROCKET_3      ; 43
 
-const_value SET $43 ; something above was deleted, idk what yet
+const_value SET $43 ; replace the tower rockets with jessie/james
 	const HS_POKEMONTOWER_7_MR_FUJI       ; 43
 	const HS_LAVENDER_HOUSE_1_MR_FUJI     ; 44
 	const HS_CELADON_MANSION_5_GIFT       ; 45
diff --git a/data/mapObjects/blueshouse.asm b/data/mapObjects/blueshouse.asm
index 43ba02e4..3dfce6e1 100755
--- a/data/mapObjects/blueshouse.asm
+++ b/data/mapObjects/blueshouse.asm
@@ -8,9 +8,9 @@ BluesHouseObject: ; 19bce (6:5bce)
 	db $0 ; signs
 
 	db $3 ; objects
-	object SPRITE_DAISY, $2, $3, STAY, RIGHT, $1 ; Daisy, sitting by map
-	object SPRITE_DAISY, $6, $4, WALK, $1, $2, $0 ; Daisy, walking around
-	object SPRITE_BOOK_MAP_DEX, $3, $3, STAY, NONE, $3, $0 ; map on table
+	object SPRITE_DAISY, $2, $3, STAY, RIGHT, $81, $0 ; Daisy, sitting by map
+	object SPRITE_DAISY, $6, $4, WALK, $1, $82, $0 ; Daisy, walking around
+	object SPRITE_BOOK_MAP_DEX, $3, $3, STAY, NONE, $83, $0 ; map on table
 
 	; warp-to
 	EVENT_DISP BLUES_HOUSE_WIDTH, $7, $2
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index 060ebdc8..94393e3e 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -37,9 +37,9 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
 	db BANK(Route23_h) ; ROUTE_23
 	db BANK(Route24_h) ; ROUTE_24
 	db BANK(Route25_h) ; ROUTE_25
-	db $12 ; db BANK(RedsHouse1F_h)
-	db $17 ; db BANK(RedsHouse2F_h)
-	db $06 ; db BANK(BluesHouse_h)
+	db BANK(RedsHouse1F_h)
+	db BANK(RedsHouse2F_h)
+	db BANK(BluesHouse_h)
 	db $07 ; db BANK(OaksLab_h)
 	db $11 ; db BANK(ViridianPokecenter_h)
 	db $07 ; db BANK(ViridianMart_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index 704e7c2d..eed956bf 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -37,9 +37,9 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
 	dw Route23_h
 	dw Route24_h
 	dw Route25_h
-	dw $40f6 ; dw RedsHouse1F_h
-	dw $40a4 ; dw RedsHouse2F_h
-	dw $5c2f ; dw BluesHouse_h
+	dw RedsHouse1F_h
+	dw RedsHouse2F_h
+	dw BluesHouse_h
 	dw $4386 ; dw OaksLab_h ;id=40
 	dw $4251 ; dw ViridianPokecenter_h
 	dw $4c6e ; dw ViridianMart_h
diff --git a/main.asm b/main.asm
index 8a5d2bae..60a25157 100755
--- a/main.asm
+++ b/main.asm
@@ -267,7 +267,13 @@ INCLUDE "scripts/ceruleancity.asm"
 INCLUDE "scripts/vermilioncity.asm"
 INCLUDE "scripts/celadoncity.asm"
 INCLUDE "scripts/fuchsiacity.asm"
-	dr $19c2f,$1a4ea
+
+INCLUDE "data/mapHeaders/blueshouse.asm"
+INCLUDE "scripts/blueshouse.asm"
+INCLUDE "data/mapObjects/blueshouse.asm"
+BluesHouseBlocks:
+INCBIN "maps/blueshouse.blk"
+	dr $19d05,$1a4ea
 
 INCLUDE "engine/overworld/npc_movement.asm"
 INCLUDE "engine/overworld/doors.asm"
diff --git a/scripts/blueshouse.asm b/scripts/blueshouse.asm
index 4a23df9e..959fb23e 100755
--- a/scripts/blueshouse.asm
+++ b/scripts/blueshouse.asm
@@ -1,8 +1,9 @@
 BluesHouseScript: ; 19b3b (6:5b3b)
 	call EnableAutoTextBoxDrawing
-	ld hl,BluesHouseScriptPointers
-	ld a,[W_BLUESHOUSECURSCRIPT]
-	jp JumpTable
+	ld hl, BluesHouseScriptPointers
+	xor a
+	call JumpTable
+	ret
 
 BluesHouseScriptPointers: ; 19b47 (6:5b47)
 	dw BluesHouseScript0
@@ -12,10 +13,8 @@ BluesHouseScript0: ; 19b4b (6:5b4b)
 	SetEvent EVENT_ENTERED_BLUES_HOUSE
 
 	; trigger the next script
-	ld a,1
-	ld [W_BLUESHOUSECURSCRIPT],a
-	ret
-
+	ld a, 1
+	ld [W_BLUESHOUSECURSCRIPT], a
 BluesHouseScript1: ; 19b56 (6:5b56)
 	ret
 
@@ -27,31 +26,31 @@ BluesHouseTextPointers: ; 19b57 (6:5b57)
 BluesHouseText1: ; 19b5d (6:5b5d)
 	TX_ASM
 	CheckEvent EVENT_GOT_TOWN_MAP
-	jr nz,.GotMap
+	jr nz, .GotMap
 	CheckEvent EVENT_GOT_POKEDEX
-	jr nz,.GiveMap
-	ld hl,DaisyInitialText
+	jr nz, .GiveMap
+	ld hl, DaisyInitialText
 	call PrintText
 	jr .done
 .GiveMap
-	ld hl,DaisyOfferMapText
+	ld hl, DaisyOfferMapText
 	call PrintText
 	lb bc, TOWN_MAP, 1
 	call GiveItem
 	jr nc, .BagFull
-	ld a,HS_TOWN_MAP
-	ld [wMissableObjectIndex],a
+	ld a, HS_TOWN_MAP
+	ld [wMissableObjectIndex], a
 	predef HideObject ; hide table map object
-	ld hl,GotMapText
+	ld hl, GotMapText
 	call PrintText
 	SetEvent EVENT_GOT_TOWN_MAP
 	jr .done
 .GotMap
-	ld hl,DaisyUseMapText
+	ld hl, DaisyUseMapText
 	call PrintText
 	jr .done
 .BagFull
-	ld hl,DaisyBagFullText
+	ld hl, DaisyBagFullText
 	call PrintText
 .done
 	jp TextScriptEnd
@@ -66,7 +65,7 @@ DaisyOfferMapText: ; 19baf (6:5baf)
 
 GotMapText: ; 19bb4 (6:5bb4)
 	TX_FAR _GotMapText
-	db $11,"@"
+	db $11, "@"
 
 DaisyBagFullText: ; 19bba (6:5bba)
 	TX_FAR _DaisyBagFullText