diff options
| author | einstein95 <einstein95@users.noreply.github.com> | 2016-07-20 01:40:11 +1200 |
|---|---|---|
| committer | einstein95 <einstein95@users.noreply.github.com> | 2016-07-20 01:40:11 +1200 |
| commit | 19a2bab265231012f42e9664f9219fac4cf5ae69 (patch) | |
| tree | fcc68e71600e6150f38dc05f954d0ca861242c7a /engine/hidden_object_functions17.asm | |
| parent | 44965d9518145eae7c6f1ea250ff4e6f88b61f09 (diff) | |
| parent | 6c2df7c2aea94b0e5a5532293aae9a25d64a8050 (diff) | |
Merge branch 'master' of https://github.com/einstein95/pokered-fr
Diffstat (limited to 'engine/hidden_object_functions17.asm')
| -rwxr-xr-x | engine/hidden_object_functions17.asm | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm index 1b571d35..4b159ab4 100755 --- a/engine/hidden_object_functions17.asm +++ b/engine/hidden_object_functions17.asm @@ -150,11 +150,19 @@ LinkCableHelpText2: TX_FAR _LinkCableHelpText2 db "@" +<<<<<<< HEAD HowToLinkText: db "HOW TO LINK" next "COLOSSEUM" next "TRADE CENTER" next "STOP READING@" +======= +HowToLinkText: ; 5dca8 (17:5ca8) + db "CABLE LINK" + next "COLISEE" + next "CENTRE TROC" + next "NE PLUS LIRE@" +>>>>>>> 6c2df7c2aea94b0e5a5532293aae9a25d64a8050 LinkCableInfoTexts: dw LinkCableInfoText1 @@ -268,14 +276,14 @@ ViridianSchoolBlackboardText2: db "@" StatusAilmentText1: - db " SLP" + db " SOM" next " PSN" next " PAR@" StatusAilmentText2: - db " BRN" - next " FRZ" - next " QUIT@@" + db " BRU" + next " GEL" + next " RET@" ViridianBlackboardStatusPointers: dw ViridianBlackboardSleepText |