Sync with pokered

1 files changed, 30 insertions, 30 deletions

diff --git a/scripts/BillsHouse.asm b/scripts/BillsHouse.asm
index a9e09947..8559c0b1 100755
--- a/scripts/BillsHouse.asm
+++ b/scripts/BillsHouse.asm
@@ -41,9 +41,9 @@ BillsHouseScript0:
 	ld a, [wd472]
 	bit 7, a
 	jr z, .asm_1e0d2
-	callab CheckPikachuFaintedOrStatused
+	callfar CheckPikachuFaintedOrStatused
 	jr c, .asm_1e0d2
-	callab Func_f24d5
+	callfar Func_f24d5
 .asm_1e0d2
 	xor a
 	ld [wJoyIgnore], a
@@ -63,12 +63,12 @@ BillsHouseScript2:
 	jr nz, .notDown
 	call CheckPikachuFollowingPlayer
 	jr nz, .asm_1e0f8
-	callab Func_f250b
+	callfar Func_f250b
 .asm_1e0f8
 	ld de, MovementData_1e7a0
 .notDown
 	ld a, $1
-	ld [H_SPRITEINDEX], a
+	ldh [hSpriteIndex], a
 	call MoveSprite
 	ld a, $3
 	ld [wBillsHouseCurScript], a
@@ -78,7 +78,7 @@ MovementData_1e79c:
 	db NPC_MOVEMENT_UP
 	db NPC_MOVEMENT_UP
 	db NPC_MOVEMENT_UP
-	db $FF
+	db -1 ; end
 
 ; make Bill walk around the player
 MovementData_1e7a0:
@@ -87,7 +87,7 @@ MovementData_1e7a0:
 	db NPC_MOVEMENT_UP
 	db NPC_MOVEMENT_LEFT
 	db NPC_MOVEMENT_UP
-	db $FF
+	db -1 ; end
 
 BillsHouseScript3:
 	ld a, [wd730]
@@ -105,7 +105,7 @@ BillsHouseScript3:
 	ld hl, PikachuMovementData_1e152
 .asm_1e133
 	call ApplyPikachuMovementData
-	callab InitializePikachuTextID
+	callfar InitializePikachuTextID
 .asm_1e13e
 	xor a
 	ld [wJoyIgnore], a
@@ -144,13 +144,13 @@ BillsHouseScript5:
 	ld a, $2
 	ld [wSpriteIndex], a
 	ld a, $c
-	ld [$ffeb], a
+	ldh [hSpriteScreenYCoord], a
 	ld a, $40
-	ld [$ffec], a
-	ld a, $6
-	ld [$ffed], a
-	ld a, $5
-	ld [$ffee], a
+	ldh [hSpriteScreenXCoord], a
+	ld a, 6
+	ldh [hSpriteMapYCoord], a
+	ld a, 5
+	ldh [hSpriteMapXCoord], a
 	call SetSpritePosition1
 	ld a, HS_BILL_1
 	ld [wMissableObjectIndex], a
@@ -163,9 +163,9 @@ BillsHouseScript5:
 	call CheckPikachuFollowingPlayer
 	jr z, .asm_1e1c6
 	ld a, $2
-	ld [H_SPRITEINDEX], a
+	ldh [hSpriteIndex], a
 	ld a, SPRITE_FACING_DOWN
-	ld [hSpriteFacingDirection], a
+	ldh [hSpriteFacingDirection], a
 	call SetSpriteFacingDirectionAndDelay
 	ld hl, PikachuMovementData_1e1a9
 	call ApplyPikachuMovementData
@@ -174,10 +174,10 @@ BillsHouseScript5:
 	ld a, EXCLAMATION_BUBBLE
 	ld [wWhichEmotionBubble], a
 	predef EmotionBubble
-	callab InitializePikachuTextID
+	callfar InitializePikachuTextID
 .asm_1e1c6
 	ld a, $2
-	ld [H_SPRITEINDEX], a
+	ldh [hSpriteIndex], a
 	ld de, MovementData_1e807
 	call MoveSprite
 	ld a, $6
@@ -190,7 +190,7 @@ MovementData_1e807:
 	db NPC_MOVEMENT_RIGHT
 	db NPC_MOVEMENT_RIGHT
 	db NPC_MOVEMENT_DOWN
-	db $FF
+	db -1 ; end
 
 PikachuMovementData_1e1a9:
 	db $00
@@ -225,7 +225,7 @@ BillsHouseScript7:
 	ret
 
 RLE_1e219:
-	db D_RIGHT,$3
+	db D_RIGHT, $3
 	db $FF
 
 BillsHouseScript8:
@@ -237,14 +237,14 @@ BillsHouseScript8:
 	ld a, SPRITE_FACING_UP
 	ld [wSpritePlayerStateData1FacingDirection], a
 	ld a, $2
-	ld [H_SPRITEINDEX], a
+	ldh [hSpriteIndex], a
 	ld a, SPRITE_FACING_DOWN
-	ld [hSpriteFacingDirection], a
+	ldh [hSpriteFacingDirection], a
 	call SetSpriteFacingDirectionAndDelay
 	xor a
 	ld [wJoyIgnore], a
 	ld a, $2
-	ld [hSpriteIndexOrTextID], a
+	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	ld a, $9
 	ld [wBillsHouseCurScript], a
@@ -260,20 +260,20 @@ BillsHouse_TextPointers:
 	dw BillsHouseText4
 
 BillsHouseText4:
-	TX_FAR _BillsHouseDontLeaveText
-	db "@"
+	text_far _BillsHouseDontLeaveText
+	text_end
 
 BillsHouseText1:
-	TX_ASM
-	callba Func_f2418
+	text_asm
+	farcall Func_f2418
 	jp TextScriptEnd
 
 BillsHouseText2:
-	TX_ASM
-	callba Func_f244a
+	text_asm
+	farcall Func_f244a
 	jp TextScriptEnd
 
 BillsHouseText3:
-	TX_ASM
-	callba Func_f24a2
+	text_asm
+	farcall Func_f24a2
 	jp TextScriptEnd