diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-04 17:09:35 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-04 21:14:46 -0400 |
| commit | 139a28ff9906d728a6820fe678a2a616eb309421 (patch) | |
| tree | 9a4339b97e16e10c5b007e836f1f3fadd33bd9f4 /engine/movie/oak_speech | |
| parent | Merge pull request #257 from Rangi42/master (diff) | |
| download | pokeyellow-139a28ff9906d728a6820fe678a2a616eb309421.tar.gz pokeyellow-139a28ff9906d728a6820fe678a2a616eb309421.tar.xz pokeyellow-139a28ff9906d728a6820fe678a2a616eb309421.zip | |
Port pokecrystal's formatting of text commands and special characters
Diffstat (limited to 'engine/movie/oak_speech')
| -rwxr-xr-x | engine/movie/oak_speech/clear_save.asm | 4 | ||||
| -rwxr-xr-x | engine/movie/oak_speech/oak_speech.asm | 24 | ||||
| -rwxr-xr-x | engine/movie/oak_speech/oak_speech2.asm | 12 |
3 files changed, 20 insertions, 20 deletions
diff --git a/engine/movie/oak_speech/clear_save.asm b/engine/movie/oak_speech/clear_save.asm index b47cd6c4..b214ec32 100755 --- a/engine/movie/oak_speech/clear_save.asm +++ b/engine/movie/oak_speech/clear_save.asm @@ -19,5 +19,5 @@ DoClearSaveDialogue: jp Init ClearSaveDataText: - TX_FAR _ClearSaveDataText - db "@" + text_far _ClearSaveDataText + text_end diff --git a/engine/movie/oak_speech/oak_speech.asm b/engine/movie/oak_speech/oak_speech.asm index 578cf3b2..e6087012 100755 --- a/engine/movie/oak_speech/oak_speech.asm +++ b/engine/movie/oak_speech/oak_speech.asm @@ -153,22 +153,22 @@ OakSpeech: call GBFadeOutToWhite jp ClearScreen OakSpeechText1: - TX_FAR _OakSpeechText1 - db "@" + text_far _OakSpeechText1 + text_end OakSpeechText2: - TX_FAR _OakSpeechText2A - TX_CRY_NIDORINA - TX_FAR _OakSpeechText2B - db "@" + text_far _OakSpeechText2A + sound_cry_nidorina + text_far _OakSpeechText2B + text_end IntroducePlayerText: - TX_FAR _IntroducePlayerText - db "@" + text_far _IntroducePlayerText + text_end IntroduceRivalText: - TX_FAR _IntroduceRivalText - db "@" + text_far _IntroduceRivalText + text_end OakSpeechText3: - TX_FAR _OakSpeechText3 - db "@" + text_far _OakSpeechText3 + text_end FadeInIntroPic: ld hl, IntroFadePalettes diff --git a/engine/movie/oak_speech/oak_speech2.asm b/engine/movie/oak_speech/oak_speech2.asm index 8c4a896b..743d0d13 100755 --- a/engine/movie/oak_speech/oak_speech2.asm +++ b/engine/movie/oak_speech/oak_speech2.asm @@ -28,8 +28,8 @@ ChoosePlayerName: jp PrintText YourNameIsText: - TX_FAR _YourNameIsText - db "@" + text_far _YourNameIsText + text_end ChooseRivalName: call OakSpeechSlidePicRight @@ -61,8 +61,8 @@ ChooseRivalName: jp PrintText HisNameIsText: - TX_FAR _HisNameIsText - db "@" + text_far _HisNameIsText + text_end OakSpeechSlidePicLeft: push de @@ -215,5 +215,5 @@ GetDefaultName: INCLUDE "data/player_names_list.asm" -TextTerminator_6b20: - db "@" +LinkMenuEmptyText: + text_end |