Merge branch 'master' of https://github.com/iimarckus/pokered

Doesn't build.

1 files changed, 51 insertions, 43 deletions

diff --git a/scripts/billshouse.asm b/scripts/billshouse.asm
index 61a575b9..08ac98d6 100755
--- a/scripts/billshouse.asm
+++ b/scripts/billshouse.asm
@@ -17,33 +17,41 @@ BillsHouseScript0: ; 1e782 (7:6782)
 
 BillsHouseScript1: ; 1e783 (7:6783)
 	ld a, [wSpriteStateData1 + 9]
-	and a
+	and a ; cp SPRITE_FACING_DOWN
 	ld de, MovementData_1e79c
-	jr nz, .asm_1e78f ; 0x1e78a $3
+	jr nz, .notDown
 	ld de, MovementData_1e7a0
-.asm_1e78f
+.notDown
 	ld a, $1
-	ld [$ff8c], a
+	ld [H_SPRITEINDEX], a
 	call MoveSprite
 	ld a, $2
 	ld [W_BILLSHOUSECURSCRIPT], a
 	ret
 
 MovementData_1e79c: ; 1e79c (7:679c)
-	db $40,$40,$40,$FF
+	db NPC_MOVEMENT_UP
+	db NPC_MOVEMENT_UP
+	db NPC_MOVEMENT_UP
+	db $FF
 
+; make Bill walk around the player
 MovementData_1e7a0: ; 1e7a0 (7:67a0)
-	db $C0,$40,$40,$80,$40,$FF
+	db NPC_MOVEMENT_RIGHT
+	db NPC_MOVEMENT_UP
+	db NPC_MOVEMENT_UP
+	db NPC_MOVEMENT_LEFT
+	db NPC_MOVEMENT_UP
+	db $FF
 
 BillsHouseScript2: ; 1e7a6 (7:67a6)
 	ld a, [wd730]
 	bit 0, a
 	ret nz
 	ld a, HS_BILL_POKEMON
-	ld [wcc4d], a
+	ld [wMissableObjectIndex], a
 	predef HideObject
-	ld hl, wd7f2
-	set 6, [hl]
+	SetEvent EVENT_BILL_SAID_USE_CELL_SEPARATOR
 	xor a
 	ld [wJoyIgnore], a
 	ld a, $3
@@ -51,8 +59,7 @@ BillsHouseScript2: ; 1e7a6 (7:67a6)
 	ret
 
 BillsHouseScript3: ; 1e7c5 (7:67c5)
-	ld a, [wd7f2]
-	bit 3, a
+	CheckEvent EVENT_USED_CELL_SEPARATOR_ON_BILL
 	ret z
 	ld a, $f0
 	ld [wJoyIgnore], a
@@ -68,12 +75,12 @@ BillsHouseScript3: ; 1e7c5 (7:67c5)
 	ld [$ffee], a
 	call SetSpritePosition1
 	ld a, HS_BILL_1
-	ld [wcc4d], a
+	ld [wMissableObjectIndex], a
 	predef ShowObject
-	ld c, $8
+	ld c, 8
 	call DelayFrames
 	ld a, $2
-	ld [$ff8c], a
+	ld [H_SPRITEINDEX], a
 	ld de, MovementData_1e807
 	call MoveSprite
 	ld a, $4
@@ -81,7 +88,12 @@ BillsHouseScript3: ; 1e7c5 (7:67c5)
 	ret
 
 MovementData_1e807: ; 1e807 (7:6807)
-	db $00,$C0,$C0,$C0,$00,$FF
+	db NPC_MOVEMENT_DOWN
+	db NPC_MOVEMENT_RIGHT
+	db NPC_MOVEMENT_RIGHT
+	db NPC_MOVEMENT_RIGHT
+	db NPC_MOVEMENT_DOWN
+	db $FF
 
 BillsHouseScript4: ; 1e80d (7:680d)
 	ld a, [wd730]
@@ -89,17 +101,15 @@ BillsHouseScript4: ; 1e80d (7:680d)
 	ret nz
 	xor a
 	ld [wJoyIgnore], a
-	ld hl, wd7f2
-	set 5, [hl]
-	ld hl, wd7f1
-	set 0, [hl]
+	SetEvent EVENT_MET_BILL_2 ; this event seems redundant
+	SetEvent EVENT_MET_BILL
 	ld a, $0
 	ld [W_BILLSHOUSECURSCRIPT], a
 	ret
 
 BillsHouseScript5: ; 1e827 (7:6827)
 	ld a, $4
-	ld [$ff8c], a
+	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	ld a, $0
 	ld [W_BILLSHOUSECURSCRIPT], a
@@ -115,66 +125,64 @@ BillsHouseText4: ; 1e83c (7:683c)
 	db $fd
 
 BillsHouseText1: ; 1e83d (7:683d)
-	db $8
+	TX_ASM
 	ld hl, BillsHouseText_1e865
 	call PrintText
 	call YesNoChoice
 	ld a, [wCurrentMenuItem]
 	and a
-	jr nz, asm_6b196 ; 0x1e84b $d
-asm_4d03c: ; 1e84d (7:684d)
+	jr nz, .asm_1e85a
+.asm_1e84d
 	ld hl, BillsHouseText_1e86a
 	call PrintText
 	ld a, $1
 	ld [W_BILLSHOUSECURSCRIPT], a
-	jr asm_fd4e2 ; 0x1e858 $8
-asm_6b196: ; 1e85a (7:685a)
+	jr .asm_1e862
+.asm_1e85a
 	ld hl, BillsHouseText_1e86f
 	call PrintText
-	jr asm_4d03c ; 0x1e860 $eb
-asm_fd4e2 ; 0x1e862
+	jr .asm_1e84d
+.asm_1e862
 	jp TextScriptEnd
 
 BillsHouseText_1e865: ; 1e865 (7:6865)
-	TX_FAR _BillsHouseText_1e865 ; 0x8d267
+	TX_FAR _BillsHouseText_1e865
 	db "@"
 
 BillsHouseText_1e86a: ; 1e86a (7:686a)
-	TX_FAR _BillsHouseText_1e86a ; 0x8d345
+	TX_FAR _BillsHouseText_1e86a
 	db "@"
 
 BillsHouseText_1e86f: ; 1e86f (7:686f)
-	TX_FAR _BillsHouseText_1e86f ; 0x8d391
+	TX_FAR _BillsHouseText_1e86f
 	db "@"
 
 BillsHouseText2: ; 1e874 (7:6874)
-	db $08 ; asm
-	ld a, [wd7f2]
-	bit 4, a
-	jr nz, .asm_5491f ; 0x1e87a
+	TX_ASM
+	CheckEvent EVENT_GOT_SS_TICKET
+	jr nz, .asm_1e8a9
 	ld hl, BillThankYouText
 	call PrintText
-	ld bc, (S_S__TICKET << 8) | 1
+	lb bc, S_S__TICKET, 1
 	call GiveItem
 	jr nc, .BagFull
 	ld hl, SSTicketReceivedText
 	call PrintText
-	ld hl, wd7f2
-	set 4, [hl]
+	SetEvent EVENT_GOT_SS_TICKET
 	ld a, HS_CERULEAN_GUARD_1
-	ld [wcc4d], a
+	ld [wMissableObjectIndex], a
 	predef ShowObject
 	ld a, HS_CERULEAN_GUARD_2
-	ld [wcc4d], a
+	ld [wMissableObjectIndex], a
 	predef HideObject
-.asm_5491f ; 0x1e8a9
+.asm_1e8a9
 	ld hl, BillsHouseText_1e8cb
 	call PrintText
-	jr .asm_bd408 ; 0x1e8af
+	jr .asm_1e8b7
 .BagFull
 	ld hl, SSTicketNoRoomText
 	call PrintText
-.asm_bd408 ; 0x1e8b7
+.asm_1e8b7
 	jp TextScriptEnd
 
 BillThankYouText: ; 1e8ba (7:68ba)
@@ -194,7 +202,7 @@ BillsHouseText_1e8cb: ; 1e8cb (7:68cb)
 	db "@"
 
 BillsHouseText3: ; 1e8d0 (7:68d0)
-	db $08 ; asm
+	TX_ASM
 	ld hl, BillsHouseText_1e8da
 	call PrintText
 	jp TextScriptEnd