diff options
| author | einstein95 <einstein95@users.noreply.github.com> | 2016-07-20 01:42:55 +1200 |
|---|---|---|
| committer | einstein95 <einstein95@users.noreply.github.com> | 2016-07-20 01:42:55 +1200 |
| commit | 7a9f469dca9b1e61783f015bb6eb734ec72a126a (patch) | |
| tree | f6d3e2abbaaa7573f1cc782014e8f1d0e5e58400 | |
| parent | a81898e8e2d8df62845fbbe15dbc54dca2161030 (diff) | |
Whoops x2
| -rwxr-xr-x | engine/hidden_object_functions17.asm | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm index 4b159ab4..dbbb5513 100755 --- a/engine/hidden_object_functions17.asm +++ b/engine/hidden_object_functions17.asm @@ -150,19 +150,11 @@ 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 |