summaryrefslogtreecommitdiff
path: root/engine/hidden_object_functions14.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2015-07-04 00:44:12 -0500
committerdannye <corrnondacqb@yahoo.com>2015-07-04 00:47:29 -0500
commitf702fc7840e30f00c840ce619a1ea15d763438de (patch)
treee28c8b27278228f95139f7a73daf214ac680014e /engine/hidden_object_functions14.asm
parentbc6f0bc08a73a4afafc24d5349d56108d3971e2a (diff)
Start using text predef macros
also sprite direction constants
Diffstat (limited to 'engine/hidden_object_functions14.asm')
-rwxr-xr-xengine/hidden_object_functions14.asm14
1 files changed, 5 insertions, 9 deletions
diff --git a/engine/hidden_object_functions14.asm b/engine/hidden_object_functions14.asm
index 5b97b815..e0ed973d 100755
--- a/engine/hidden_object_functions14.asm
+++ b/engine/hidden_object_functions14.asm
@@ -66,8 +66,7 @@ ViridianSchoolNotebookText4: ; 52a03 (14:6a03)
PrintFightingDojoText2: ; 52a08 (14:6a08)
call EnableAutoTextBoxDrawing
- ld a, $37
- jp PrintPredefTextID
+ tx_pre_jump FightingDojoText_52a10
FightingDojoText_52a10: ; 52a10 (14:6a10)
TX_FAR _FightingDojoText_52a10
@@ -75,8 +74,7 @@ FightingDojoText_52a10: ; 52a10 (14:6a10)
PrintFightingDojoText3: ; 52a15 (14:6a15)
call EnableAutoTextBoxDrawing
- ld a, $38
- jp PrintPredefTextID
+ tx_pre_jump FightingDojoText_52a1d
FightingDojoText_52a1d: ; 52a1d (14:6a1d)
TX_FAR _FightingDojoText_52a1d
@@ -84,8 +82,7 @@ FightingDojoText_52a1d: ; 52a1d (14:6a1d)
PrintFightingDojoText: ; 52a22 (14:6a22)
call EnableAutoTextBoxDrawing
- ld a, $36
- jp PrintPredefTextID
+ tx_pre_jump FightingDojoText
FightingDojoText: ; 52a2a (14:6a2a)
TX_FAR _FightingDojoText
@@ -93,11 +90,10 @@ FightingDojoText: ; 52a2a (14:6a2a)
PrintIndigoPlateauHQText: ; 52a2f (14:6a2f)
ld a, [wSpriteStateData1 + 9]
- cp $4
+ cp SPRITE_FACING_UP
ret nz
call EnableAutoTextBoxDrawing
- ld a, $27
- jp PrintPredefTextID
+ tx_pre_jump IndigoPlateauHQText
IndigoPlateauHQText: ; 52a3d (14:6a3d)
TX_FAR _IndigoPlateauHQText