diff options
Diffstat (limited to 'engine/hidden_object_functions14.asm')
| -rwxr-xr-x | engine/hidden_object_functions14.asm | 62 |
1 files changed, 29 insertions, 33 deletions
diff --git a/engine/hidden_object_functions14.asm b/engine/hidden_object_functions14.asm index a162c905..f8cdf44e 100755 --- a/engine/hidden_object_functions14.asm +++ b/engine/hidden_object_functions14.asm @@ -1,17 +1,17 @@ -PrintNotebookText: ; 52996 (14:6996) +PrintNotebookText: call EnableAutoTextBoxDrawing ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld a, [wTrainerSpriteOffset] + ld a, [wHiddenObjectFunctionArgument] jp PrintPredefTextID -TMNotebook: ; 529a4 (14:69a4) +TMNotebook: TX_FAR TMNotebookText - db $0d + TX_WAIT db "@" -ViridianSchoolNotebook: ; 529aa (14:69aa) - db $08 ; asm +ViridianSchoolNotebook: + TX_ASM ld hl, ViridianSchoolNotebookText1 call PrintText call TurnPageSchoolNotebook @@ -31,7 +31,7 @@ ViridianSchoolNotebook: ; 529aa (14:69aa) .doneReading jp TextScriptEnd -TurnPageSchoolNotebook: ; 529db (14:69db) +TurnPageSchoolNotebook: ld hl, TurnPageText call PrintText call YesNoChoice @@ -39,66 +39,62 @@ TurnPageSchoolNotebook: ; 529db (14:69db) and a ret -TurnPageText: ; 529e9 (14:69e9) +TurnPageText: TX_FAR _TurnPageText db "@" -ViridianSchoolNotebookText5: ; 529ee (14:69ee) +ViridianSchoolNotebookText5: TX_FAR _ViridianSchoolNotebookText5 - db $0d + TX_WAIT db "@" -ViridianSchoolNotebookText1: ; 529f4 (14:69f4) +ViridianSchoolNotebookText1: TX_FAR _ViridianSchoolNotebookText1 db "@" -ViridianSchoolNotebookText2: ; 529f9 (14:69f9) +ViridianSchoolNotebookText2: TX_FAR _ViridianSchoolNotebookText2 db "@" -ViridianSchoolNotebookText3: ; 529fe (14:69fe) +ViridianSchoolNotebookText3: TX_FAR _ViridianSchoolNotebookText3 db "@" -ViridianSchoolNotebookText4: ; 52a03 (14:6a03) +ViridianSchoolNotebookText4: TX_FAR _ViridianSchoolNotebookText4 db "@" -PrintFightingDojoText2: ; 52a08 (14:6a08) +PrintFightingDojoText2: call EnableAutoTextBoxDrawing - ld a, $37 - jp PrintPredefTextID + tx_pre_jump EnemiesOnEverySideText -FightingDojoText_52a10: ; 52a10 (14:6a10) - TX_FAR _FightingDojoText_52a10 +EnemiesOnEverySideText: + TX_FAR _EnemiesOnEverySideText db "@" -PrintFightingDojoText3: ; 52a15 (14:6a15) +PrintFightingDojoText3: call EnableAutoTextBoxDrawing - ld a, $38 - jp PrintPredefTextID + tx_pre_jump WhatGoesAroundComesAroundText -FightingDojoText_52a1d: ; 52a1d (14:6a1d) - TX_FAR _FightingDojoText_52a1d +WhatGoesAroundComesAroundText: + TX_FAR _WhatGoesAroundComesAroundText db "@" -PrintFightingDojoText: ; 52a22 (14:6a22) +PrintFightingDojoText: call EnableAutoTextBoxDrawing - ld a, $36 - jp PrintPredefTextID + tx_pre_jump FightingDojoText -FightingDojoText: ; 52a2a (14:6a2a) +FightingDojoText: TX_FAR _FightingDojoText db "@" -PrintIndigoPlateauHQText: ; 52a2f (14:6a2f) +PrintIndigoPlateauHQText: 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) +IndigoPlateauHQText: TX_FAR _IndigoPlateauHQText db "@" |