Start using text predef macros

also sprite direction constants

1 files changed, 13 insertions, 20 deletions

diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm
index b7b2fa00..46140927 100755
--- a/engine/hidden_object_functions17.asm
+++ b/engine/hidden_object_functions17.asm
@@ -1,7 +1,6 @@
 PrintRedsNESText: ; 5db79 (17:5b79)
 	call EnableAutoTextBoxDrawing
-	ld a, $4 ; RedBedroomSNESText
-	jp PrintPredefTextID
+	tx_pre_jump RedBedroomSNESText
 
 RedBedroomSNESText: ; 5db81 (17:5b81)
 	TX_FAR _RedBedroomSNESText
@@ -9,19 +8,17 @@ RedBedroomSNESText: ; 5db81 (17:5b81)
 
 OpenRedsPC: ; 5db86 (17:5b86)
 	call EnableAutoTextBoxDrawing
-	ld a, $3
-	jp PrintPredefTextID
+	tx_pre_jump RedBedroomPCText
 
-RedBedroomPC: ; 5db8e (17:5b8e)
+RedBedroomPCText: ; 5db8e (17:5b8e)
 	db $fc ; FuncTX_ItemStoragePC
 
 Route15GateLeftBinoculars: ; 5db8f (17:5b8f)
 	ld a, [wSpriteStateData1 + 9]
-	cp $4 ; i
+	cp SPRITE_FACING_UP
 	ret nz
 	call EnableAutoTextBoxDrawing
-	ld a, $a ; text id Route15UpstairsBinocularsText
-	call PrintPredefTextID
+	tx_pre Route15UpstairsBinocularsText
 	ld a, ARTICUNO
 	ld [wcf91], a
 	call PlayCry
@@ -36,8 +33,7 @@ AerodactylFossil: ; 5dbad (17:5bad)
 	ld [wcf91], a
 	call DisplayMonFrontSpriteInBox
 	call EnableAutoTextBoxDrawing
-	ld a, $9
-	call PrintPredefTextID
+	tx_pre AerodactylFossilText
 	ret
 
 AerodactylFossilText: ; 5dbbe (17:5bbe)
@@ -49,8 +45,7 @@ KabutopsFossil: ; 5bdc3 (17:5bc3)
 	ld [wcf91], a
 	call DisplayMonFrontSpriteInBox
 	call EnableAutoTextBoxDrawing
-	ld a, $b
-	call PrintPredefTextID
+	tx_pre KabutopsFossilText
 	ret
 
 KabutopsFossilText: ; 5dbd4 (17:5bd4)
@@ -307,8 +302,7 @@ ViridianBlackboardFrozenText: ; 5ddea (17:5dea)
 
 PrintTrashText: ; 5ddef (17:5def)
 	call EnableAutoTextBoxDrawing
-	ld a, $26
-	jp PrintPredefTextID
+	tx_pre_jump VermilionGymTrashText
 
 VermilionGymTrashText: ; 5ddf7 (17:5df7)
 	TX_FAR _VermilionGymTrashText
@@ -324,8 +318,7 @@ GymTrashScript: ; 5ddfc (17:5dfc)
 	bit 0, a
 	jr z, .ok
 
-	ld a, $26 ; DisplayTextID $26 = VermilionGymTrashText (nothing in the trash)
-	jp PrintPredefTextID
+	tx_pre_jump VermilionGymTrashText
 
 .ok
 	bit 1, a
@@ -337,7 +330,7 @@ GymTrashScript: ; 5ddfc (17:5dfc)
 	cp b
 	jr z, .openFirstLock
 
-	ld a, $26 ; DisplayTextID $26 = VermilionGymTrashText (nothing in the trash)
+	tx_pre_id VermilionGymTrashText
 	jr .done
 
 .openFirstLock
@@ -375,7 +368,7 @@ GymTrashScript: ; 5ddfc (17:5dfc)
 	and $f
 	ld [wd744], a
 
-	ld a, $3b ; DisplayTextID $3b = VermilionGymTrashSuccesText1 (first lock opened!)
+	tx_pre_id VermilionGymTrashSuccesText1
 	jr .done
 
 .trySecondLock
@@ -393,7 +386,7 @@ GymTrashScript: ; 5ddfc (17:5dfc)
 	and $e
 	ld [wd743], a
 
-	ld a, $3e ; DisplayTextID $3e = VermilionGymTrashFailText (locks reset!)
+	tx_pre_id VermilionGymTrashFailText
 	jr .done
 
 .openSecondLock
@@ -403,7 +396,7 @@ GymTrashScript: ; 5ddfc (17:5dfc)
 	ld hl, wd126
 	set 6, [hl]
 
-	ld a, $3d ; DisplayTextID $3d = VermilionGymTrashSuccesText3 (2nd lock opened!)
+	tx_pre_id VermilionGymTrashSuccesText3
 
 .done
 	jp PrintPredefTextID