diff options
| author | YamaArashi <shadow962@live.com> | 2016-06-11 17:30:20 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-11 17:30:20 -0700 |
| commit | 7e12ca56a8d04d33f3945bb5b981c311fcdd44ef (patch) | |
| tree | 8a61aee33d6b47e960dc71dbb89c096622bbdc95 /engine/hidden_object_functions14.asm | |
| parent | d8dae96f35222ababb9688ce2aed3292515f8ca2 (diff) | |
| parent | 7f34e28f242ee4d0caba0bd96b040811dcb86c50 (diff) | |
Merge pull request #133 from YamaArashi/master
Remove address comments
Diffstat (limited to 'engine/hidden_object_functions14.asm')
| -rwxr-xr-x | engine/hidden_object_functions14.asm | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/engine/hidden_object_functions14.asm b/engine/hidden_object_functions14.asm index 97187638..7591fac0 100755 --- a/engine/hidden_object_functions14.asm +++ b/engine/hidden_object_functions14.asm @@ -1,16 +1,16 @@ -PrintNotebookText: ; 52996 (14:6996) +PrintNotebookText: call EnableAutoTextBoxDrawing ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld a, [wHiddenObjectFunctionArgument] jp PrintPredefTextID -TMNotebook: ; 529a4 (14:69a4) +TMNotebook: TX_FAR TMNotebookText db $0d db "@" -ViridianSchoolNotebook: ; 529aa (14:69aa) +ViridianSchoolNotebook: TX_ASM ld hl, ViridianSchoolNotebookText1 call PrintText @@ -31,7 +31,7 @@ ViridianSchoolNotebook: ; 529aa (14:69aa) .doneReading jp TextScriptEnd -TurnPageSchoolNotebook: ; 529db (14:69db) +TurnPageSchoolNotebook: ld hl, TurnPageText call PrintText call YesNoChoice @@ -39,62 +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 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 tx_pre_jump FightingDojoText_52a10 -FightingDojoText_52a10: ; 52a10 (14:6a10) +FightingDojoText_52a10: TX_FAR _FightingDojoText_52a10 db "@" -PrintFightingDojoText3: ; 52a15 (14:6a15) +PrintFightingDojoText3: call EnableAutoTextBoxDrawing tx_pre_jump FightingDojoText_52a1d -FightingDojoText_52a1d: ; 52a1d (14:6a1d) +FightingDojoText_52a1d: TX_FAR _FightingDojoText_52a1d db "@" -PrintFightingDojoText: ; 52a22 (14:6a22) +PrintFightingDojoText: call EnableAutoTextBoxDrawing tx_pre_jump FightingDojoText -FightingDojoText: ; 52a2a (14:6a2a) +FightingDojoText: TX_FAR _FightingDojoText db "@" -PrintIndigoPlateauHQText: ; 52a2f (14:6a2f) +PrintIndigoPlateauHQText: ld a, [wSpriteStateData1 + 9] cp SPRITE_FACING_UP ret nz call EnableAutoTextBoxDrawing tx_pre_jump IndigoPlateauHQText -IndigoPlateauHQText: ; 52a3d (14:6a3d) +IndigoPlateauHQText: TX_FAR _IndigoPlateauHQText db "@" |