summaryrefslogtreecommitdiff
path: root/engine/hidden_object_functions14.asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-06-12 00:54:14 -0700
committerGitHub <noreply@github.com>2016-06-12 00:54:14 -0700
commit2b2c6fefd311101c87845c8c498746dc74bd725f (patch)
tree3f917e1bf896e380cfea6d2d876ff68a4db87a57 /engine/hidden_object_functions14.asm
parenta51037eeeedb03e29d8675626018cf02750882fa (diff)
parent61ee39678695479816feff4b58baaa6953ff219f (diff)
Merge pull request #134 from YamaArashi/master
sync engine code with pokeyellow
Diffstat (limited to 'engine/hidden_object_functions14.asm')
-rwxr-xr-xengine/hidden_object_functions14.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/hidden_object_functions14.asm b/engine/hidden_object_functions14.asm
index 7591fac0..fcc79f6d 100755
--- a/engine/hidden_object_functions14.asm
+++ b/engine/hidden_object_functions14.asm
@@ -66,18 +66,18 @@ ViridianSchoolNotebookText4:
PrintFightingDojoText2:
call EnableAutoTextBoxDrawing
- tx_pre_jump FightingDojoText_52a10
+ tx_pre_jump EnemiesOnEverySideText
-FightingDojoText_52a10:
- TX_FAR _FightingDojoText_52a10
+EnemiesOnEverySideText:
+ TX_FAR _EnemiesOnEverySideText
db "@"
PrintFightingDojoText3:
call EnableAutoTextBoxDrawing
- tx_pre_jump FightingDojoText_52a1d
+ tx_pre_jump WhatGoesAroundComesAroundText
-FightingDojoText_52a1d:
- TX_FAR _FightingDojoText_52a1d
+WhatGoesAroundComesAroundText:
+ TX_FAR _WhatGoesAroundComesAroundText
db "@"
PrintFightingDojoText: