summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rw-r--r--source/bank_02.asm4
-rw-r--r--source/bank_05.asm78
2 files changed, 41 insertions, 41 deletions
diff --git a/source/bank_02.asm b/source/bank_02.asm
index 1e5d8d3..41844ab 100644
--- a/source/bank_02.asm
+++ b/source/bank_02.asm
@@ -28,7 +28,7 @@ text_char_print::
; Check if we've reached the end of the string
ld d, a
and e
- cp TX_EOM
+ cp TX_END
jp z, farcall_ret
push hl
@@ -80,7 +80,7 @@ text_char_print::
; Check if the next character is a terminator
ld a, [hl+]
and [hl]
- cp TX_EOM
+ cp TX_END
jp farcall_ret
; Returns:
diff --git a/source/bank_05.asm b/source/bank_05.asm
index ce0b36f..57e91cb 100644
--- a/source/bank_05.asm
+++ b/source/bank_05.asm
@@ -53,7 +53,7 @@ function_05_4028:
ld [w_textbox_width], a
ld a, 141
ld [w_textbox_height], a
- ld16 w_text_cur_string, string_02_6880
+ ld16 w_text_cur_string, tutorial_message_00
ld a, $01
ld [w_d6ca], a
ld a, [w_d61b]
@@ -230,7 +230,7 @@ tutorial_scene_01:
call function_00_1085
farcall function_02_5b98
- ld16 w_text_cur_string, string_02_68ca
+ ld16 w_text_cur_string, tutorial_message_01
xor a
ld [w_cdb0], a
@@ -272,7 +272,7 @@ tutorial_scene_03:
farcall text_delay
jp nz, farcall_ret
- ld16 w_text_cur_string, string_02_68e2
+ ld16 w_text_cur_string, tutorial_message_02
xor a
ld [w_cdb0], a
@@ -311,7 +311,7 @@ tutorial_scene_05:
farcall text_delay
jp nz, farcall_ret
- ld16 w_text_cur_string, string_02_68fe
+ ld16 w_text_cur_string, tutorial_message_03
ld hl, w_tutorial_scene
inc [hl]
@@ -330,7 +330,7 @@ tutorial_scene_06:
call function_00_1085
farcall function_02_5b98
- ld16 w_text_cur_string, string_02_693e
+ ld16 w_text_cur_string, tutorial_message_04
ld a, 10
ld [w_text_delay_timer], a
@@ -392,7 +392,7 @@ tutorial_scene_10:
ld [w_text_delay_timer], a
farcall function_02_5b67
- ld16 w_text_cur_string, string_02_6960
+ ld16 w_text_cur_string, tutorial_message_05
ld hl, w_tutorial_scene
inc [hl]
@@ -413,7 +413,7 @@ tutorial_scene_11:
farcall function_06_4964
farcall function_02_5b98
- ld16 w_text_cur_string, string_02_69ae
+ ld16 w_text_cur_string, tutorial_message_06
ld hl, w_tutorial_scene
inc [hl]
@@ -435,7 +435,7 @@ tutorial_scene_12:
farcall function_02_5560
farcall function_02_5a82
- ld16 w_text_cur_string, string_02_69e6
+ ld16 w_text_cur_string, tutorial_message_07
xor a
ld [w_cdb0], a
@@ -474,7 +474,7 @@ tutorial_scene_14:
farcall text_delay
jp nz, farcall_ret
- ld16 w_text_cur_string, string_02_6a06
+ ld16 w_text_cur_string, tutorial_message_08
ld hl, w_tutorial_scene
inc [hl]
@@ -493,7 +493,7 @@ tutorial_scene_15:
call function_00_1085
farcall function_02_5b98
- ld16 w_text_cur_string, string_02_6a44
+ ld16 w_text_cur_string, tutorial_message_09
xor a
ld [w_cdb0], a
@@ -535,7 +535,7 @@ tutorial_scene_17:
farcall text_delay
jp nz, farcall_ret
- ld16 w_text_cur_string, string_02_6a5e
+ ld16 w_text_cur_string, tutorial_message_10
ld hl, w_tutorial_scene
inc [hl]
@@ -595,7 +595,7 @@ tutorial_scene_19:
ld a, 60
ld [w_text_delay_timer], a
- ld16 w_text_cur_string, string_02_6aa4
+ ld16 w_text_cur_string, tutorial_message_11
ld hl, w_tutorial_scene
inc [hl]
@@ -620,7 +620,7 @@ tutorial_scene_21:
farcall text_delay
jp nz, farcall_ret
- ld16 w_text_cur_string, string_02_6ac4
+ ld16 w_text_cur_string, tutorial_message_12
ld hl, w_tutorial_scene
inc [hl]
@@ -636,7 +636,7 @@ tutorial_scene_22:
ld hl, function_02_5b77
farcall wait_press_a_blink
- ld16 w_text_cur_string, string_02_6afc
+ ld16 w_text_cur_string, tutorial_message_13
call function_00_1085
farcall function_02_5b98
@@ -680,7 +680,7 @@ tutorial_scene_24:
farcall text_delay
jp nz, farcall_ret
- ld16 w_text_cur_string, string_02_6b1c
+ ld16 w_text_cur_string, tutorial_message_14
ld hl, w_tutorial_scene
inc [hl]
@@ -727,7 +727,7 @@ tutorial_scene_26:
ld hl, w_tutorial_scene
inc [hl]
- ld16 w_text_cur_string, string_02_6b7e
+ ld16 w_text_cur_string, tutorial_message_15
call function_00_1085
farcall function_02_5b98
@@ -763,7 +763,7 @@ tutorial_scene_28:
ld [w_ce00], a
farcall function_3c_4377
- ld16 w_text_cur_string, string_02_6bca
+ ld16 w_text_cur_string, tutorial_message_16
ld hl, w_tutorial_scene
inc [hl]
@@ -782,7 +782,7 @@ tutorial_scene_29:
ld hl, w_tutorial_scene
inc [hl]
- ld16 w_text_cur_string, string_02_6be4
+ ld16 w_text_cur_string, tutorial_message_17
call function_00_1085
farcall function_02_5b98
@@ -834,7 +834,7 @@ tutorial_scene_32:
call function_00_1085
- ld16 w_text_cur_string, string_02_6c18
+ ld16 w_text_cur_string, tutorial_message_18
ld a, $01
ld [w_d6ca], a
@@ -856,7 +856,7 @@ tutorial_scene_33:
ld hl, w_tutorial_scene
inc [hl]
- ld16 w_text_cur_string, string_02_6c58
+ ld16 w_text_cur_string, tutorial_message_19
call function_00_1085
farcall function_02_5b98
@@ -908,7 +908,7 @@ tutorial_scene_35:
farcall function_02_5a82
farcall function_29_7421
- ld16 w_text_cur_string, string_02_6cba
+ ld16 w_text_cur_string, tutorial_message_20
ld hl, w_tutorial_scene
inc [hl]
@@ -960,7 +960,7 @@ tutorial_scene_37:
call function_00_1085
farcall function_02_5b98
- ld16 w_text_cur_string, string_02_6d10
+ ld16 w_text_cur_string, tutorial_message_21
ld a, $01
ld [w_c329], a
@@ -998,7 +998,7 @@ tutorial_scene_39:
cp $3f
jp c, farcall_ret
- ld16 w_text_cur_string, string_02_6d74
+ ld16 w_text_cur_string, tutorial_message_22
ld hl, w_tutorial_scene
inc [hl]
@@ -1032,7 +1032,7 @@ tutorial_scene_41:
cp $3f
jp c, farcall_ret
- ld16 w_text_cur_string, string_02_6d90
+ ld16 w_text_cur_string, tutorial_message_23
call function_00_1085
farcall function_02_5b98
@@ -1057,7 +1057,7 @@ tutorial_scene_42:
call function_00_1085
farcall function_02_5b98
- ld16 w_text_cur_string, string_02_6dde
+ ld16 w_text_cur_string, tutorial_message_24
ld hl, w_tutorial_scene
inc [hl]
@@ -1077,7 +1077,7 @@ tutorial_scene_43:
farcall function_02_5b98
farcall function_02_5a82
- ld16 w_text_cur_string, string_02_6e1e
+ ld16 w_text_cur_string, tutorial_message_25
ld hl, w_tutorial_scene
inc [hl]
@@ -1118,7 +1118,7 @@ tutorial_scene_45:
ld hl, function_02_5b77
farcall wait_press_a_blink
- ld16 w_text_cur_string, string_02_6e42
+ ld16 w_text_cur_string, tutorial_message_26
ld hl, w_tutorial_scene
inc [hl]
@@ -1142,7 +1142,7 @@ tutorial_scene_46:
call function_00_1085
farcall function_02_5b98
- ld16 w_text_cur_string, string_02_6e60
+ ld16 w_text_cur_string, tutorial_message_27
ld hl, w_tutorial_scene
inc [hl]
@@ -1161,7 +1161,7 @@ tutorial_scene_47:
call function_00_1085
farcall function_02_5b98
- ld16 w_text_cur_string, string_02_6ed0
+ ld16 w_text_cur_string, tutorial_message_28
ld hl, w_tutorial_scene
inc [hl]
@@ -1194,7 +1194,7 @@ tutorial_scene_48:
farcall function_02_5b98
farcall function_02_5a82
- ld16 w_text_cur_string, string_02_6ee4
+ ld16 w_text_cur_string, tutorial_message_29
ld hl, w_tutorial_scene
inc [hl]
@@ -1213,7 +1213,7 @@ tutorial_scene_49:
call function_00_1085
farcall function_02_5b98
- ld16 w_text_cur_string, string_02_6f32
+ ld16 w_text_cur_string, tutorial_message_30
ld hl, w_tutorial_scene
inc [hl]
@@ -1232,7 +1232,7 @@ tutorial_scene_50:
call function_00_1085
farcall function_02_5b98
- ld16 w_text_cur_string, string_02_6f96
+ ld16 w_text_cur_string, tutorial_message_31
ld hl, w_tutorial_scene
inc [hl]
@@ -1251,7 +1251,7 @@ tutorial_scene_51:
call function_00_1085
farcall function_02_5b98
- ld16 w_text_cur_string, string_02_6fe2
+ ld16 w_text_cur_string, tutorial_message_32
ld hl, w_tutorial_scene
inc [hl]
@@ -1297,7 +1297,7 @@ tutorial_scene_53:
call function_00_1085
farcall function_02_5b98
- ld16 w_text_cur_string, string_02_702c
+ ld16 w_text_cur_string, tutorial_message_33
ld hl, w_tutorial_scene
inc [hl]
@@ -1346,7 +1346,7 @@ tutorial_scene_55:
call function_00_1085
farcall function_02_5b98
- ld16 w_text_cur_string, string_02_708c
+ ld16 w_text_cur_string, tutorial_message_34
ld hl, w_tutorial_scene
inc [hl]
@@ -1365,7 +1365,7 @@ tutorial_scene_56:
call function_00_1085
farcall function_02_5b98
- ld16 w_text_cur_string, string_02_70c2
+ ld16 w_text_cur_string, tutorial_message_35
ld hl, w_tutorial_scene
inc [hl]
@@ -1384,7 +1384,7 @@ tutorial_scene_57:
call function_00_1085
farcall function_02_5b98
- ld16 w_text_cur_string, string_02_710e
+ ld16 w_text_cur_string, tutorial_message_36
ld hl, w_tutorial_scene
inc [hl]
@@ -1403,7 +1403,7 @@ tutorial_scene_58:
call function_00_1085
farcall function_02_5b98
- ld16 w_text_cur_string, string_02_7142
+ ld16 w_text_cur_string, tutorial_message_37
ld hl, w_tutorial_scene
inc [hl]
@@ -1422,7 +1422,7 @@ tutorial_scene_59:
call function_00_1085
farcall function_02_5b98
- ld16 w_text_cur_string, string_02_71be
+ ld16 w_text_cur_string, tutorial_message_38
ld hl, w_tutorial_scene
inc [hl]