diff options
| -rw-r--r-- | charmap.txt | 8 | ||||
| -rw-r--r-- | data/data.s | 206 | ||||
| -rw-r--r-- | data/data_80B9BB8.s | 712 | ||||
| -rw-r--r-- | data/data_80EBA18.s | 4 | ||||
| -rw-r--r-- | data/data_80F4278.s | 605 | ||||
| -rw-r--r-- | data/friend_area.inc | 30 | ||||
| -rw-r--r-- | data/personality_test.s | 146 | ||||
| -rw-r--r-- | data/system_sbin.s | 6 | ||||
| -rw-r--r-- | data/text/chunsoft.inc | 10 | ||||
| -rw-r--r-- | data/text/luminous_cave.inc | 123 | ||||
| -rw-r--r-- | data/text/party_menu.inc | 97 | ||||
| -rw-r--r-- | data/text/save.inc | 26 | ||||
| -rw-r--r-- | data/text/type_names.inc | 36 | ||||
| -rw-r--r-- | data/text/wonder_mail_1.inc | 190 | ||||
| -rw-r--r-- | data/text/wonder_mail_2.inc | 153 | ||||
| -rw-r--r-- | data/text/wonder_mail_3.inc | 37 | ||||
| -rw-r--r-- | data/text/wonder_mail_4.inc | 165 | ||||
| -rw-r--r-- | data/text/wonder_mail_complete.inc | 26 | ||||
| -rw-r--r-- | data/unk_data.s | 16 | ||||
| -rw-r--r-- | data/unk_dungeon.inc | 4 |
20 files changed, 1244 insertions, 1356 deletions
diff --git a/charmap.txt b/charmap.txt index e7ea662..3124770 100644 --- a/charmap.txt +++ b/charmap.txt @@ -213,5 +213,11 @@ POKE = 83 BF 83 C4 A_BUTTON = 87 50 B_BUTTON = 87 51 +L_BUTTON = 87 74 +R_BUTTON = 84 86 +SELECT_BUTTON = 87 72 87 73 +START_BUTTON = 87 53 87 71 +DPAD = 87 52 -'\n' = 0A
\ No newline at end of file +'\0' = 00 +'\n' = 0A diff --git a/data/data.s b/data/data.s index 8107ae1..c6f2826 100644 --- a/data/data.s +++ b/data/data.s @@ -1,6 +1,6 @@ .section .rodata - .asciz "pksdir0" + .string "pksdir0\0" .global gUnknown_80B690C gUnknown_80B690C: @ 80B690C @@ -54,13 +54,13 @@ gUnknown_80B6994: @ 80B6994 .global gUnknown_80B69BC gUnknown_80B69BC: @ 80B69BC - .asciz "PKDi ver 1.0 [Apr 28 2006] 16:37:54" + .string "PKDi ver 1.0 [Apr 28 2006] 16:37:54\0" .align 2,0 - .asciz "titlen0" + .string "titlen0\0" .align 2,0 - .asciz "titlen1" + .string "titlen1\0" .align 2,0 - .asciz "titlen2" + .string "titlen2\0" .align 2,0 .global gUnknown_80B69F8 @@ -68,11 +68,11 @@ gUnknown_80B69F8: @ 80B69F8 .byte 0xE0, 0x69, 0x0B, 0x08 .byte 0xE8, 0x69, 0x0B, 0x08 .byte 0xF0, 0x69, 0x0B, 0x08 - .asciz "titlen0p" + .string "titlen0p\0" .align 2,0 - .asciz "titlen1p" + .string "titlen1p\0" .align 2,0 - .asciz "titlen2p" + .string "titlen2p\0" .align 2,0 .global gUnknown_80B6A28 @@ -204,126 +204,126 @@ gUnknown_80B6D90: @ 80B6D90 .byte 0x68, 0x6f, 0x0b, 0x08 .byte 0xff, 0xff, 0xff, 0xff - .asciz "DEBUG GROUND" + .string "DEBUG GROUND\0" .align 2,0 - .asciz "NEXT DAY" + .string "NEXT DAY\0" .align 2,0 - .asciz "R00E01A" + .string "R00E01A\0" .align 2,0 - .asciz "S09E01C" + .string "S09E01C\0" .align 2,0 - .asciz "S09E01B" + .string "S09E01B\0" .align 2,0 - .asciz "S09E01A" + .string "S09E01A\0" .align 2,0 - .asciz "S08E01B" + .string "S08E01B\0" .align 2,0 - .asciz "S08E01A" + .string "S08E01A\0" .align 2,0 - .asciz "S07E01B" + .string "S07E01B\0" .align 2,0 - .asciz "S07E01A" + .string "S07E01A\0" .align 2,0 - .asciz "S06E01C" + .string "S06E01C\0" .align 2,0 - .asciz "S06E01B" + .string "S06E01B\0" .align 2,0 - .asciz "S06E01A" + .string "S06E01A\0" .align 2,0 - .asciz "S05E01B" + .string "S05E01B\0" .align 2,0 - .asciz "S05E01A" + .string "S05E01A\0" .align 2,0 - .asciz "S04E01F" + .string "S04E01F\0" .align 2,0 - .asciz "S04E01E" + .string "S04E01E\0" .align 2,0 - .asciz "S04E01D" + .string "S04E01D\0" .align 2,0 - .asciz "S04E01C" + .string "S04E01C\0" .align 2,0 - .asciz "S04E01B" + .string "S04E01B\0" .align 2,0 - .asciz "S04E01A" + .string "S04E01A\0" .align 2,0 - .asciz "S03E01B" + .string "S03E01B\0" .align 2,0 - .asciz "S03E01A" + .string "S03E01A\0" .align 2,0 - .asciz "S02E02B" + .string "S02E02B\0" .align 2,0 - .asciz "S02E02A" + .string "S02E02A\0" .align 2,0 - .asciz "S02E01A" + .string "S02E01A\0" .align 2,0 - .asciz "S01E02B" + .string "S01E02B\0" .align 2,0 - .asciz "S01E02A" + .string "S01E02A\0" .align 2,0 - .asciz "S01E01B" + .string "S01E01B\0" .align 2,0 - .asciz "S01E01A" + .string "S01E01A\0" .align 2,0 - .asciz "S00E01A" + .string "S00E01A\0" .align 2,0 - .asciz "M02END" + .string "M02END\0" .align 2,0 - .asciz "M02E02H" + .string "M02E02H\0" .align 2,0 - .asciz "M02E02G" + .string "M02E02G\0" .align 2,0 - .asciz "M02E02F" + .string "M02E02F\0" .align 2,0 - .asciz "M02E02E" + .string "M02E02E\0" .align 2,0 - .asciz "M02E02D" + .string "M02E02D\0" .align 2,0 - .asciz "M02E02C" + .string "M02E02C\0" .align 2,0 - .asciz "M02E02B" + .string "M02E02B\0" .align 2,0 - .asciz "M02E02A" + .string "M02E02A\0" .align 2,0 - .asciz "M02E01A" + .string "M02E01A\0" .align 2,0 - .asciz "M01END" + .string "M01END\0" .align 2,0 - .asciz "M01E10A" + .string "M01E10A\0" .align 2,0 - .asciz "M01E09A" + .string "M01E09A\0" .align 2,0 - .asciz "M01E08B" + .string "M01E08B\0" .align 2,0 - .asciz "M01E08A" + .string "M01E08A\0" .align 2,0 - .asciz "M01E07B" + .string "M01E07B\0" .align 2,0 - .asciz "M01E07A" + .string "M01E07A\0" .align 2,0 - .asciz "M01E06A" + .string "M01E06A\0" .align 2,0 - .asciz "M01E05B" + .string "M01E05B\0" .align 2,0 - .asciz "M01E05A" + .string "M01E05A\0" .align 2,0 - .asciz "M01E04B" + .string "M01E04B\0" .align 2,0 - .asciz "M01E04A" + .string "M01E04A\0" .align 2,0 - .asciz "M01E03A" + .string "M01E03A\0" .align 2,0 - .asciz "M01E02B" + .string "M01E02B\0" .align 2,0 - .asciz "M01E02A" + .string "M01E02A\0" .align 2,0 - .asciz "M01E01A" + .string "M01E01A\0" .align 2,0 - .asciz "M00E01A" + .string "M00E01A\0" .align 2,0 .global gUnknown_80B7144 gUnknown_80B7144: @ 80B7144 - .asciz "NONE" + .string "NONE\0" .align 2,0 .global gUnknown_80B714C @@ -338,22 +338,22 @@ gUnknown_80B714C: @ 80B714C .byte 0x7C, 0x71, 0x0B, 0x08 .byte 0x78, 0x71, 0x0B, 0x08 .byte 0x74, 0x71, 0x0B, 0x08 - .asciz "END" - .asciz "9" + .string "END\0" + .string "9\0" .align 2,0 - .asciz "3" + .string "3\0" .align 2,0 - .asciz "2-2 8" + .string "2-2 8\0" .align 2,0 - .asciz "6" + .string "6\0" .align 2,0 - .asciz "5" + .string "5\0" .align 2,0 - .asciz "4" + .string "4\0" .align 2,0 - .asciz "1-2 7" + .string "1-2 7\0" .align 2,0 - .asciz "2-1" + .string "2-1\0" .align 2,0 .global gUnknown_80B71A0 @@ -362,13 +362,13 @@ gUnknown_80B71A0: @ 80B71A0 .byte 0xC8, 0x71, 0x0B, 0x08 @ Pointer to CECONTINUE .byte 0xBC, 0x71, 0x0B, 0x08 @ Pointer to CNLAST .byte 0xB0, 0x71, 0x0B, 0x08 @ Pointer to CWEND - .asciz "#CWEND#R" + .string "#CWEND#R\0" .align 2,0 - .asciz "#CNLAST#R" + .string "#CNLAST#R\0" .align 2,0 - .asciz "#CECONTINUE#R" + .string "#CECONTINUE#R\0" .align 2,0 - .asciz "#CISTART#R" + .string "#CISTART#R\0" .align 2,0 .global gUnknown_80B71E4 @@ -397,18 +397,18 @@ gUnknown_80B7350: @ 80B7350 .global gUnknown_80B735C gUnknown_80B735C: @ 80B735C - .asciz "event flag rule error %d" + .string "event flag rule error %d\0" .align 2,0 .global gUnknown_80B7378 gUnknown_80B7378: @ 80B7378 - .asciz "error number" + .string "error number\0" .align 2,0 .global gUnknown_80B7388 gUnknown_80B7388: @ 80B7388 - .asciz "1-1" - .asciz "pksdir0" + .string "1-1\0" + .string "pksdir0\0" .global gUnknown_80B7394 gUnknown_80B7394: @ 80B7394 @@ -433,7 +433,7 @@ gUnknown_80B7EFC: @ 80B7EFC .byte 0x8C, 0x7E, 0x0B, 0x08 .byte 0xA1, 0x02, 0x00, 0x00 .byte 0xEC, 0x7E, 0x0B, 0x08 - .asciz "_LocateSet" + .string "_LocateSet\0" .align 2,0 .global gUnknown_80B7F14 @@ -454,16 +454,16 @@ gUnknown_80B7F88: @ 80B7F88 .global gUnknown_80B7F94 gUnknown_80B7F94: @ 80B7F94 - .asciz "Memroy LocalCreate buffer %08x size can\'t locate" @ Spelling error is intentional + .string "Memroy LocalCreate buffer %08x size can't locate\0" @ Spelling error is intentional .align 2,0 - .asciz "pksdir0" - .asciz "pksdir0" - .asciz "pksdir0" - .asciz "pksdir0" - .asciz "pksdir0" - .asciz "pksdir0" - .asciz "pksdir0" - .asciz "pksdir0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" .global gUnknown_80B8008 gUnknown_80B8008: @ 80B8008 @@ -518,12 +518,12 @@ gUnknown_80B86B4: @ 80B86B4 .global gUnknown_80B87B4 gUnknown_80B87B4: @ 80B87B4 - .asciz "kanji_a" + .string "kanji_a\0" .align 2,0 .global gUnknown_80B87BC gUnknown_80B87BC: @ 80B87BC - .asciz "kanji_b" + .string "kanji_b\0" .align 2,0 .global gUnknown_80B87C4 @@ -603,30 +603,30 @@ gUnknown_80B8868: @ 80B8868 .byte 0x00, 0x00, 0xf0, 0xff .byte 0x00, 0x00, 0x00, 0xff .byte 0x00, 0x00, 0x00, 0xf0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80B88B0 gUnknown_80B88B0: @ 80B88B0 - .asciz "font" + .string "font\0" .align 2,0 .global gUnknown_80B88B8 gUnknown_80B88B8: @ 80B88B8 - .asciz "fontsp" + .string "fontsp\0" .align 2,0 .global gUnknown_80B88C0 gUnknown_80B88C0: @ 80B88C0 - .asciz "fontsppa" + .string "fontsppa\0" .align 2,0 .global gUnknown_80B88CC gUnknown_80B88CC: @ 80B88CC - .asciz "fontpal" + .string "fontpal\0" .align 2,0 - .asciz "pksdir0" - .asciz "pksdir0" + .string "pksdir0\0" + .string "pksdir0\0" .global gUnknown_80B88E4 gUnknown_80B88E4: @ 80B88E4 @ (uppercase font table??) diff --git a/data/data_80B9BB8.s b/data/data_80B9BB8.s index b43d140..2c3e39d 100644 --- a/data/data_80B9BB8.s +++ b/data/data_80B9BB8.s @@ -1,6 +1,6 @@ .section .rodata - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80B9BB8 @@ -9,15 +9,15 @@ gUnknown_80B9BB8: @ 80B9BB8 .byte 0x08, 0x00, 0x00, 0x00 .byte 0x10, 0x00, 0x00, 0x00 .byte 0x18, 0x00, 0x00, 0x00 - .asciz "pksdir0" - .asciz "pksdir0" - .asciz "PKD ROM USER DATA 000000" + .string "pksdir0\0" + .string "pksdir0\0" + .string "PKD ROM USER DATA 000000\0" .global gUnknown_80B9BF1 gUnknown_80B9BF1: @ 80B9BF1 .byte 0x36, 0x27, 0x46, 0x01 .byte 0xB9, 0x48, 0x00 - .asciz "pksdir0" + .string "pksdir0\0" .global gUnknown_80B9C00 gUnknown_80B9C00: @ 80B9C00 @@ -30,11 +30,11 @@ gUnknown_80B9C60: @ 80B9C60 .byte 0x00, 0x00, 0x00, 0x00 gUnknown_80B9C6C:: @ 80B9C6C - .asciz "efob001" + .string "efob001\0" .align 2,0 gUnknown_80B9C74:: @ 80B9C74 - .asciz "efob000" + .string "efob000\0" .align 2,0 .global gUnknown_80B9C7C @@ -51,7 +51,7 @@ gUnknown_80B9C9C: @ 80B9C9C .byte 0xff, 0xff, 0xff, 0xff .byte 0x01, 0x00, 0x00, 0x00 .byte 0x01, 0x00, 0x00, 0x00 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80B9CC4 @@ -92,21 +92,21 @@ gUnknown_80CE73C: @ 80CE73C .byte 0x00, 0x00 .byte 0xd2, 0x00 .byte 0x00, 0x00 - .asciz "pksdir0" - .asciz "pksdir0" - .asciz "pksdir0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80CE77C gUnknown_80CE77C: @ 80CE77C - .asciz "efob%03d" + .string "efob%03d\0" .align 2,0 .global gUnknown_80CE788 gUnknown_80CE788: @ 80CE788 - .asciz "efbg%03d" + .string "efbg%03d\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" @ Status Conditions Graphics @@ -125,7 +125,7 @@ gUnknown_80D3474: @ 80D3474 .global gUnknown_80D3564 gUnknown_80D3564: @ 80D3564 .byte 0,0,0,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 @ Friend Area Data @@ -173,47 +173,47 @@ gUnknown_80D4014: @ 80D4014 .byte 0x3C, 0x40, 0x0D, 0x08 .byte 0x34, 0x40, 0x0D, 0x08 .byte 0x28, 0x40, 0x0D, 0x08 - .asciz "wmp2fon1" + .string "wmp2fon1\0" .align 2,0 - .asciz "wmp2pal" + .string "wmp2pal\0" .align 2,0 - .asciz "wmp2cani" + .string "wmp2cani\0" .align 2,0 - .asciz "wmp2mcc" + .string "wmp2mcc\0" .align 2,0 - .asciz "wmp2font" + .string "wmp2font\0" .align 2,0 .global gUnknown_80D405C gUnknown_80D405C: @ 80D405C - .asciz "ax%03d" + .string "ax%03d\0" .align 2,0 .global gUnknown_80D4064 gUnknown_80D4064: @ 80D4064 - .asciz "wmapspr" + .string "wmapspr\0" .align 2,0 .global gUnknown_80D406C gUnknown_80D406C: @ 80D406C - .asciz "palet" + .string "palet\0" .align 2,0 .global gUnknown_80D4074 gUnknown_80D4074: @ 80D4074 - .asciz "#+$m0" + .string "#+$m0\0" .align 2,0 .global gUnknown_80D407C gUnknown_80D407C: @ 80D4074 - .asciz "Yes" + .string "Yes\0" .align 2,0 .global gUnknown_80D4080 gUnknown_80D4080: @ 80D4080 - .asciz "No" + .string "No\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80D408C @@ -233,32 +233,32 @@ gUnknown_80D40C4: @ 80D40C4 .global gUnknown_80D40E4 gUnknown_80D40E4: @ 80D40E4 - .asciz "ax%03d" + .string "ax%03d\0" .align 2,0 .global gUnknown_80D40EC gUnknown_80D40EC: @ 80D40EC - .asciz "wmapspr" + .string "wmapspr\0" .align 2,0 .global gUnknown_80D40F4 gUnknown_80D40F4: @ 80D40F4 - .asciz "palet" + .string "palet\0" .align 2,0 .global gUnknown_80D40FC gUnknown_80D40FC: @ 80D40FC - .asciz "#+%s" + .string "#+%s\0" .align 2,0 .global gUnknown_80D4104 gUnknown_80D4104: @ 80D4104 - .asciz "Where would you like to go?" + .string "Where would you like to go?\0" .align 2,0 .global gUnknown_80D4120 gUnknown_80D4120: @ 80D4120 - .asciz "$i0" + .string "$i0\0" .align 2,0 .global gUnknown_80D4124 @@ -276,139 +276,139 @@ gUnknown_80D4144: @ 80D4144 .byte 0x32, 0x01 .byte 0x33, 0x01 .byte 0x00, 0x00 - .asciz "pksdir0" - .asciz "pksdir0" + .string "pksdir0\0" + .string "pksdir0\0" .byte 0x70, 0x41, 0x0d, 0x08 @ Pointer to none .byte 0xff, 0xff, 0xff, 0xff .byte 0x70, 0x41, 0x0d, 0x08 @ Pointer to none - .asciz "none" + .string "none\0" .align 2,0 .byte 0x84, 0x41, 0x0d, 0x08 @ Pointer to default .byte 0xff, 0xff, 0xff, 0xff .byte 0x70, 0x41, 0x0d, 0x08 @ Pointer to none - .asciz "default" + .string "default\0" .global gUnknown_80D418C gUnknown_80D418C: @ 80D418C .string "func = '%s'\n" - .asciz "file = '%s' line = %5d" + .string "file = '%s' line = %5d\0" .global gNotEntryText gNotEntryText: @ 80D41B0 - .asciz "--- not entry ---" + .string "--- not entry ---\0" .align 2,0 .global gUnknown_80D41C4 gUnknown_80D41C4: @ 80D41C4 .string "%sfunc = '%s'\n" - .asciz "file = '%s' line = %5d\n" + .string "file = '%s' line = %5d\n\0" .align 2,0 .global gUnknown_80D41EC gUnknown_80D41EC: @ 80D41EC .string "func = '%s'\n" - .asciz "file = '%s' line = %5d\n" + .string "file = '%s' line = %5d\n\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .global gUnknown_80D421C gUnknown_80D421C: @ 80D421C - .asciz " Print " + .string " Print \0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 - .asciz "Performance" + .string "Performance\0" .align 2,0 - .asciz "Memory Card" + .string "Memory Card\0" .align 2,0 - .asciz "Memory" + .string "Memory\0" .align 2,0 - .asciz "Flag" + .string "Flag\0" .align 2,0 - .asciz "Se" + .string "Se\0" .align 2,0 - .asciz "Bgm" + .string "Bgm\0" .align 2,0 - .asciz "Sound" + .string "Sound\0" .align 2,0 - .asciz "Dungeon" + .string "Dungeon\0" .align 2,0 - .asciz "GroundScript" + .string "GroundScript\0" .align 2,0 - .asciz "Ground" + .string "Ground\0" .align 2,0 .global gNotMountText gNotMountText: @ 80D4288 - .asciz "not mount log system" + .string "not mount log system\0" .align 2,0 - .asciz "pksdir0" - .asciz "pksdir0" - .asciz "pksdir0" - .asciz "pksdir0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" .global gFatalText gFatalText: @ 80D42C0 - .asciz "!!!!! Fatal !!!!!\n" + .string "!!!!! Fatal !!!!!\n\0" .align 2,0 .global gUnknown_80D42D4 gUnknown_80D42D4: @ 80D42D4 - .asciz "%s\n" - .align 2,0 - .asciz "pksdir0" - .asciz "pksdir0" - .asciz "pksdir0" - .asciz "pksdir0" - .asciz "pksdir0" - .asciz "pksdir0" - .asciz "pksdir0" - .asciz "pksdir0" - .asciz "pksdir0" - .asciz "POKE_DUNGEON__05" - .align 2,0 - .asciz "pksdir0" - .asciz "pksdir0" - .asciz "pksdir0" - .asciz "pksdir0" + .string "%s\n\0" + .align 2,0 + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "POKE_DUNGEON__05\0" + .align 2,0 + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" .global gUnknown_80D4354 gUnknown_80D4354: @ 80D4354 .string "#+The game data is corrupted.\n" - .asciz "#+Your data will be erased." + .string "#+Your data will be erased.\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .global gUnknown_80D4398 gUnknown_80D4398: @ 80D4398 .string "#+Saving your adventure...\n" - .asciz "#+Please don~27t turn off the power." + .string "#+Please don~27t turn off the power.\0" .align 2,0 .global gUnknown_80D43D8 gUnknown_80D43D8: @ 80D43D8 .string "#+Writing to GBA Game Pak.\n" .string "#+Do not remove the GBA Game Pak.\n" - .asciz "#+Please wait with the power on." + .string "#+Please wait with the power on.\0" .align 2,0 .global gUnknown_80D4438 gUnknown_80D4438: @ 80D4438 - .asciz "#+Save completed!" + .string "#+Save completed!\0" .align 2,0 .global gUnknown_80D444C gUnknown_80D444C: @ 80D444C .string "#+The data could not be written.\n" .string "#+Please turn off the power and remove\n" - .asciz "#+and reinsert the DS Card." + .string "#+and reinsert the DS Card.\0" .align 2,0 .global gUnknown_80D44B0 gUnknown_80D44B0: @ 80D44B0 - .asciz "#+Save failed." + .string "#+Save failed.\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .global gUnknown_80D44C8 gUnknown_80D44C8: @ 80D44C8 @@ -417,7 +417,7 @@ gUnknown_80D44C8: @ 80D44C8 .global gUnknown_80D45AC gUnknown_80D45AC: @ 80D45AC .string "#+Quicksaving your adventure...\n" - .asciz "#+Please don~27t turn off the power." + .string "#+Please don~27t turn off the power.\0" .align 2,0 .global gUnknown_80D45F4 @@ -434,9 +434,9 @@ gUnknown_80D473C: @ 80D473C .global gUnknown_80D47A0 gUnknown_80D47A0: @ 80D47A0 - .asciz "#+Save failed." + .string "#+Save failed.\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .global gUnknown_80D47B8 gUnknown_80D47B8: @ 80D47B8 @@ -451,7 +451,7 @@ gUnknown_80D47C8: @ 80D47C8 .global gUnknown_80D4828 gUnknown_80D4828: @ 80D4828 - .asciz "#C%c%s" + .string "#C%c%s\0" .align 2,0 .global gUnknown_80D4830 @@ -466,9 +466,9 @@ gUnknown_80D485C: @ 80D485C .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 .byte 0xFF, 0xFF, 0xFF, 0xFF - .asciz "No" + .string "No\0" .align 2,0 - .asciz "*Yes" + .string "*Yes\0" .align 2,0 .global gUnknown_80D4880 @@ -479,8 +479,8 @@ gUnknown_80D4880: @ 80D4880 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 @ End of table .byte 0xFF, 0xFF, 0xFF, 0xFF - .asciz "*No" - .asciz "Yes" + .string "*No\0" + .string "Yes\0" .align 2,0 .global gUnknown_80D48A0 @@ -527,120 +527,120 @@ gUnknown_80D48F8: @ 80D48F8 .global gUnknown_80D4900 gUnknown_80D4900: @ 80D4900 - .asciz "%d" + .string "%d\0" .align 2,0 .global gUnknown_80D4904 gUnknown_80D4904: @ 80D4904 - .asciz "%*d" + .string "%*d\0" .align 2,0 .global gUnknown_80D4908 gUnknown_80D4908: @ 80D4908 - .asciz "%0*d" + .string "%0*d\0" .align 2,0 .global gUnknown_80D4910 gUnknown_80D4910: @ 80D4910 - .asciz "$" + .string "$\0" .align 2,0 - .asciz "pksdir0" - .asciz "Yes" + .string "pksdir0\0" + .string "Yes\0" .global gUnknown_80D4920 gUnknown_80D4920: @ 80D4920 .byte 0x1C, 0x49, 0x0D, 0x08 @ Pointer to Yes - .asciz "No" + .string "No\0" .align 2,0 .global gUnknown_80D4928 gUnknown_80D4928: @ 80D4928 .byte 0x24, 0x49, 0x0D, 0x08 @ Pointer to No - .asciz "Cancel" + .string "Cancel\0" .align 2,0 .global gUnknown_80D4934 gUnknown_80D4934: @ 80D4934 .byte 0x2C, 0x49, 0x0D, 0x08 @ Pointer to Cancel - .asciz "Trash " + .string "Trash \0" .align 2,0 .global gUnknown_80D4940 gUnknown_80D4940: @ 80D4940 .byte 0x38, 0x49, 0x0D, 0x08 - .asciz "Delete" + .string "Delete\0" .align 2,0 .global gUnknown_80D494C gUnknown_80D494C: @ 80D494C .byte 0x44, 0x49, 0x0D, 0x08 - .asciz "Store" + .string "Store\0" .align 2,0 .global gUnknown_80D4958 gUnknown_80D4958: @ 80D4958 .byte 0x50, 0x49, 0x0D, 0x08 - .asciz "Take" + .string "Take\0" .align 2,0 .global gUnknown_80D4964 gUnknown_80D4964: @ 80D4964 .byte 0x5C, 0x49, 0x0D, 0x08 @ Pointer to Take - .asciz "Info" + .string "Info\0" .align 2,0 .global gUnknown_80D4970 gUnknown_80D4970: @ 80D4970 .byte 0x68, 0x49, 0x0D, 0x08 @ Pointer to Info - .asciz "Buy" + .string "Buy\0" .align 2,0 .global gUnknown_80D4978 gUnknown_80D4978: @ 80D4978 .byte 0x74, 0x49, 0x0D, 0x08 @ Pointer to Buy - .asciz "Sell " + .string "Sell \0" .align 2,0 .global gUnknown_80D4984 gUnknown_80D4984: @ 80D4984 .byte 0x7C, 0x49, 0x0D, 0x08 @ Pointer to Sell - .asciz "Accept" + .string "Accept\0" .align 2,0 .global gUnknown_80D4990 gUnknown_80D4990: @ 80D4990 .byte 0x88, 0x49, 0x0D, 0x08 @ Pointer to Accept - .asciz "Check" + .string "Check\0" .align 2,0 .global gUnknown_80D499C gUnknown_80D499C: @ 80D499C .byte 0x94, 0x49, 0x0D, 0x08 @ Pointer to Check - .asciz "Friend" + .string "Friend\0" .align 2,0 .global gUnknown_80D49A8 gUnknown_80D49A8: @ 80D49A8 .byte 0xA0, 0x49, 0x0D, 0x08 @ Pointer to Friend - .asciz "Exit" + .string "Exit\0" .align 2,0 .global gUnknown_80D49B4 gUnknown_80D49B4: @ 80D49B4 .byte 0xAC, 0x49, 0x0D, 0x08 @ Poiner to Exit - .asciz "???" + .string "???\0" .align 2,0 .global gUnknown_80D49BC gUnknown_80D49BC: @ 80D49BC .byte 0xB8, 0x49, 0x0D, 0x08 @ Pointer to the question marks above - .asciz "Deposit?" + .string "Deposit?\0" .align 2,0 .global gUnknown_80D49CC gUnknown_80D49CC: @ 80D49CC .byte 0xC0, 0x49, 0x0D, 0x08 @ Pointer to Deposit - .asciz "Withdraw?" + .string "Withdraw?\0" .align 2,0 .global gUnknown_80D49DC @@ -701,7 +701,7 @@ gUnknown_80DAFA0: @ 80DAFA0 .byte 0x06, 0x00, 0x03, 0x00 .byte 0x03, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80DAFC0 @@ -776,12 +776,12 @@ gUnknown_80DB580: @ 80DB580 .global gUnknown_80DB598 gUnknown_80DB598: @ 80DB598 - .asciz "#C4OVR#R" + .string "#C4OVR#R\0" .align 2,0 .global gUnknown_80DB5A4 gUnknown_80DB5A4: @ 80DB5A4 - .asciz "#C6INS#R" + .string "#C6INS#R\0" .align 2,0 .global gUnknown_80DB5B0 @@ -790,12 +790,12 @@ gUnknown_80DB5B0: @ 80DB5B0 .global gUnknown_80DB5B8 gUnknown_80DB5B8: @ 80DB5B8 - .asciz "#C%c%s" + .string "#C%c%s\0" .align 2,0 .global gUnknown_80DB5C0 gUnknown_80DB5C0: @ 80DB5C0 - .asciz "What is your name?" + .string "What is your name?\0" .align 2,0 .global gUnknown_80DB5D4 @@ -804,34 +804,34 @@ gUnknown_80DB5D4: @ 80DB5D4 .global gUnknown_80DB5F8 gUnknown_80DB5F8: @ 80DB5F8 - .asciz "What is your partner~27s nickname?" + .string "What is your partner~27s nickname?\0" .align 2,0 .global gUnknown_80DB61C gUnknown_80DB61C: @ 80DB61C - .asciz "What is your team~27s name?" + .string "What is your team~27s name?\0" .align 2,0 .global gUnknown_80DB638 gUnknown_80DB638: @ 80DB638 - .asciz "Please enter the password." + .string "Please enter the password.\0" .align 2,0 .global gUnknown_80DB654 gUnknown_80DB654: @ 80DB654 - .asciz "#C2%s#R" + .string "#C2%s#R\0" .align 2,0 .global gUnknown_80DB65C gUnknown_80DB65C: @ 80DB65C - .asciz "#C5%s#R" + .string "#C5%s#R\0" .align 2,0 .global gUnknown_80DB664 gUnknown_80DB664: @ 80DB664 - .asciz "%s" + .string "%s\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x03, 0x00, 0x00, 0x00 @@ -842,19 +842,19 @@ gUnknown_80DB664: @ 80DB664 .global gUnknown_80DB688 gUnknown_80DB688: @ 80DB688 - .asciz "Is the name #C5$m0#R OK?" + .string "Is the name #C5$m0#R OK?\0" .align 2,0 .global gUnknown_80DB6A4 gUnknown_80DB6A4: @ 80DB6A4 - .asciz "This name is too long." + .string "This name is too long.\0" .align 2,0 .global gUnknown_80DB6BC gUnknown_80DB6BC: @ 80DB6BC - .asciz "Please enter a name." + .string "Please enter a name.\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80DB6DC @@ -886,19 +886,19 @@ gUnknown_80DB70C: @ 80DB70C .global gUnknown_80DB724 gUnknown_80DB724: @ 80DB724 - .asciz "Money: " + .string "Money: \0" .align 2,0 .global gUnknown_80DB72C gUnknown_80DB72C: @ 80DB72C - .asciz "Savings: " + .string "Savings: \0" .align 2,0 .global gUnknown_80DB738 gUnknown_80DB738: @ 80DB738 - .asciz "Money" + .string "Money\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .global gUnknown_80DB748 gUnknown_80DB748: @ 80DB748 @@ -938,9 +938,9 @@ gUnknown_80DB790: @ 80DB790 .global gUnknown_80DB7A8 gUnknown_80DB7A8: @ 80DB7A8 - .asciz "Number?" + .string "Number?\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80DB7B8 @@ -975,9 +975,9 @@ gUnknown_80DB818: @ 80DB818 .global gUnknown_80DB830 gUnknown_80DB830: @ 80DB830 - .asciz "Number?" + .string "Number?\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80DB840 @@ -1018,9 +1018,9 @@ gUnknown_80DB888: @ 80DB888 .global gUnknown_80DB8A0 gUnknown_80DB8A0: @ 80DB8A0 - .asciz "Sell All" + .string "Sell All\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80DB8B4 @@ -1043,13 +1043,13 @@ gUnknown_80DB8CC: @ 80DB8CC .global gUnknown_80DB8E4 gUnknown_80DB8E4: @ 80DB8E4 - .asciz "Goods" + .string "Goods\0" .align 2,0 .global gUnknown_80DB8EC gUnknown_80DB8EC: @ 80DB8EC - .asciz "#C2%s#R" - .asciz "pksdir0" + .string "#C2%s#R\0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80DB8FC @@ -1062,13 +1062,13 @@ gUnknown_80DB914: @ 80DB914 .global gUnknown_80DB92C gUnknown_80DB92C: @ 80DB92C - .asciz "Goods" + .string "Goods\0" .align 2,0 .global gUnknown_80DB934 gUnknown_80DB934: @ 80DB934 - .asciz "#C2%s#R" - .asciz "pksdir0" + .string "#C2%s#R\0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80DB944 @@ -1081,12 +1081,12 @@ gUnknown_80DB95C: @ 80DB95C .global gUnknown_80DB974 gUnknown_80DB974: @ 80DB974 - .asciz "Team Toolbox A" + .string "Team Toolbox A\0" .align 2,0 .global gUnknown_80DB984 gUnknown_80DB984: @ 80DB984 - .asciz "Team Toolbox B" + .string "Team Toolbox B\0" .align 2,0 .global gUnknown_80DB994 @@ -1095,31 +1095,31 @@ gUnknown_80DB994: @ 80DB994 .global gUnknown_80DB9A0 gUnknown_80DB9A0: @ 80DB9A0 - .asciz "#C2%s#R" + .string "#C2%s#R\0" .align 2,0 .global gUnknown_80DB9A8 gUnknown_80DB9A8: @ 80DB9A8 - .asciz "Items" + .string "Items\0" .align 2,0 .global gUnknown_80DB9B0 gUnknown_80DB9B0: @ 80DB9B0 - .asciz "/" + .string "/\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80DB9BC gUnknown_80DB9BC: @ 80DB9BC .string "#+Who will learn the move\n" - .asciz "#+#C5$m7#R?" + .string "#+#C5$m7#R?\0" .align 2,0 .global gUnknown_80DB9E4 gUnknown_80DB9E4: @ 80DB9E4 .string "#+#CM$m8#R learned\n" - .asciz "#+the move #C5$m7#R!" + .string "#+the move #C5$m7#R!\0" .align 2,0 .global gUnknown_80DBA0C @@ -1128,8 +1128,8 @@ gUnknown_80DBA0C: @ 80DBA0C .global gUnknown_80DBA4C gUnknown_80DBA4C: @ 80DBA4C - .asciz "$m0" - .asciz "pksdir0" + .string "$m0\0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80DBA58 @@ -1190,24 +1190,24 @@ gUnknown_80DBD24: @ 80DBD24 .global gUnknown_80DBD58 gUnknown_80DBD58: @ 80DBD58 - .asciz "Trash Toolbox Item" + .string "Trash Toolbox Item\0" .align 2,0 .global gUnknown_80DBD6C gUnknown_80DBD6C: @ 80DBD6C - .asciz "Trash Received Item" + .string "Trash Received Item\0" .align 2,0 .global gUnknown_80DBD80 gUnknown_80DBD80: @ 80DBD80 - .asciz "Storage" + .string "Storage\0" .align 2,0 .global gUnknown_80DBD88 gUnknown_80DBD88: @ 80DBD88 - .asciz "Trash" + .string "Trash\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80DBD98 @@ -1220,9 +1220,9 @@ gUnknown_80DBDB0: @ 80DBDB0 .global gUnknown_80DBDC8 gUnknown_80DBDC8: @ 80DBDC8 - .asciz "Switch" + .string "Switch\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80DBDD8 @@ -1235,7 +1235,7 @@ gUnknown_80DBDF0: @ 80DBDF0 .global gUnknown_80DBE08 gUnknown_80DBE08: @ 80DBE08 - .asciz "IQ Skills" + .string "IQ Skills\0" .align 2,0 .global gUnknown_80DBE14 @@ -1248,20 +1248,20 @@ gUnknown_80DBE18: @ 80DBE18 .global gUnknown_80DBE1C gUnknown_80DBE1C: @ 80DBE1C - .asciz "$i0$i1" + .string "$i0$i1\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80DBE2C gUnknown_80DBE2C: @ 80DBE2C - .asciz "$i0" + .string "$i0\0" .align 2,0 .global gUnknown_80DBE30 gUnknown_80DBE30: @ 80DBE30 - .asciz "$m0" - .asciz "pksdir0" + .string "$m0\0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80DBE3C @@ -1274,8 +1274,8 @@ gUnknown_80DBE54: @ 80DBE54 .global gUnknown_80DBE6C gUnknown_80DBE6C: @ 80DBE6C - .asciz "Storage" - .asciz "pksdir0" + .string "Storage\0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80DBE7C @@ -1292,22 +1292,22 @@ gUnknown_80DBEB0: @ 80DBEB0 .global gUnknown_80DBF10 gUnknown_80DBF10: @ 80DBF10 - .asciz "Items" + .string "Items\0" .align 2,0 .global gUnknown_80DBF18 gUnknown_80DBF18: @ 80DBF18 - .asciz "Team" + .string "Team\0" .align 2,0 .global gUnknown_80DBF20 gUnknown_80DBF20: @ 80DBF20 - .asciz "Job List" + .string "Job List\0" .align 2,0 .global gUnknown_80DBF2C gUnknown_80DBF2C: @ 80DBF2C - .asciz "Others" + .string "Others\0" .align 2,0 .global gUnknown_80DBF34 @@ -1319,7 +1319,7 @@ gUnknown_80DBF34: @ 80DBF34 .global gUnknown_80DBF3C gUnknown_80DBF3C: @ 80DBF3C - .asciz "%s #C5%d#R Pts." + .string "%s #C5%d#R Pts.\0" .align 2,0 .global gUnknown_80DBF4C @@ -1328,9 +1328,9 @@ gUnknown_80DBF4C: @ 80DBF4C .global gUnknown_80DBF60 gUnknown_80DBF60: @ 80DBF60 - .asciz "tmrkpat" + .string "tmrkpat\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80DBF70 @@ -1343,9 +1343,9 @@ gUnknown_80DBF88: @ 80DBF88 .global gUnknown_80DBFA0 gUnknown_80DBFA0: @ 80DBFA0 - .asciz "Field" + .string "Field\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80DBFB0 @@ -1358,24 +1358,24 @@ gUnknown_80DBFCC: @ 80DBFCC .global gUnknown_80DBFE4 gUnknown_80DBFE4: @ 80DBFE4 - .asciz "Others" + .string "Others\0" .align 2,0 .global gUnknown_80DBFEC gUnknown_80DBFEC: @ 80DBFEC - .asciz "Change settings?" + .string "Change settings?\0" .align 2,0 .global gUnknown_80DC000 gUnknown_80DC000: @ 80DC000 - .asciz "Game Options" + .string "Game Options\0" .align 2,0 .global gUnknown_80DC010 gUnknown_80DC010: @ 80DC010 - .asciz "Hints" + .string "Hints\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80DC020 @@ -1388,7 +1388,7 @@ gUnknown_80DC03C: @ 80DC03C .global gUnknown_80DC054 gUnknown_80DC054: @ 80DC054 - .asciz "Game Options" + .string "Game Options\0" .align 2,0 @ Window Settings @@ -1398,19 +1398,19 @@ gUnknown_80DC064: @ 80DC064 .global gUnknown_80DC084 gUnknown_80DC084: @ 80DC084 - .asciz "Blue" + .string "Blue\0" .align 2,0 .global gUnknown_80DC08C gUnknown_80DC08C: @ 80DC08C - .asciz "Red" + .string "Red\0" .align 2,0 .global gUnknown_80DC090 gUnknown_80DC090: @ 80DC090 - .asciz "Green" + .string "Green\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80DC0A0 @@ -1423,9 +1423,9 @@ gUnknown_80DC0BC: @ 80DC0BC .global gUnknown_80DC0D4 gUnknown_80DC0D4: @ 80DC0D4 - .asciz "Hints" + .string "Hints\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80DC0E4 @@ -1447,7 +1447,7 @@ gUnknown_80DC134: @ 80DC134 .global gUnknown_80DC164 gUnknown_80DC164: @ 80DC164 .string "Only four moves may be learned!\n" - .asciz "Will a move be forgotten?" + .string "Will a move be forgotten?\0" .align 2,0 .global gUnknown_80DC1A0 @@ -1460,9 +1460,9 @@ gUnknown_80DC1FC: @ 80DC1FC .global gUnknown_80DC230 gUnknown_80DC230: @ 80DC230 - .asciz "Forget" + .string "Forget\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80DC240 @@ -1500,14 +1500,14 @@ gUnknown_80DC274: @ 80DC274 .global gUnknown_80DC28C gUnknown_80DC28C: @ 80DC28C - .asciz "Moves: #C6$m0#R " + .string "Moves: #C6$m0#R \0" .align 2,0 .global gUnknown_80DC2A0 gUnknown_80DC2A0: @ 80DC2A0 - .asciz "$i0" + .string "$i0\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80DC2AC @@ -1536,9 +1536,9 @@ gUnknown_80DC2C4: @ 80DC2C4 .global gUnknown_80DC2DC gUnknown_80DC2DC: @ 80DC2DC - .asciz "Moves Page: %d/%d " + .string "Moves Page: %d/%d \0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80DC2F8 @@ -1552,9 +1552,9 @@ gUnknown_80DC2F8: @ 80DC2F8 .global gUnknown_80DC310 gUnknown_80DC310: @ 80DC310 - .asciz "$m0" + .string "$m0\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80DC31C @@ -1601,83 +1601,79 @@ gUnknown_80DC37C: @ 80DC37C .global gUnknown_80DC394 gUnknown_80DC394: @ 80DC394 - .byte 0x84, 0x86, 0x2b, 0x87 - .string "R: Shift moves\n" - .byte 0x84, 0x86, 0x2b, 0x87 - .string "P: Switch link " - .byte 0x87, 0x72, 0x87, 0x73 - .asciz " Set" + .string "{R_BUTTON}+{DPAD}: Shift moves\n" + .string "{R_BUTTON}+{A_BUTTON}: Switch link {SELECT_BUTTON} Set\0" .global gUnknown_80DC3C4 gUnknown_80DC3C4: @ 80DC3C4 - .asciz "Proceed" + .string "Proceed\0" .align 2,0 .global gUnknown_80DC3CC gUnknown_80DC3CC: @ 80DC3CC - .asciz "#C6Info#R " + .string "#C6Info#R \0" .align 2,0 .global gUnknown_80DC3D8 gUnknown_80DC3D8: @ 80DC3D8 - .asciz "Moves" + .string "Moves\0" .align 2,0 .global gUnknown_80DC3E0 gUnknown_80DC3E0: @ 80DC3E0 - .asciz "Summary" + .string "Summary\0" .align 2,0 .global gUnknown_80DC3E8 gUnknown_80DC3E8: @ 80DC3E8 - .asciz "Check IQ" + .string "Check IQ\0" .align 2,0 .global gUnknown_80DC3F4 gUnknown_80DC3F4: @ 80DC3F4 - .asciz "Remember" + .string "Remember\0" .align 2,0 .global gUnknown_80DC400 gUnknown_80DC400: @ 80DC400 - .asciz "Deselect" + .string "Deselect\0" .align 2,0 .global gUnknown_80DC40C gUnknown_80DC40C: @ 80DC40C - .asciz "Set" + .string "Set\0" .align 2,0 .global gUnknown_80DC410 gUnknown_80DC410: @ 80DC410 - .asciz "Link" + .string "Link\0" .align 2,0 .global gUnknown_80DC418 gUnknown_80DC418: @ 80DC418 - .asciz "Delink" + .string "Delink\0" .align 2,0 .global gUnknown_80DC420 gUnknown_80DC420: @ 80DC420 - .asciz "Forget" + .string "Forget\0" .align 2,0 .global gUnknown_80DC428 gUnknown_80DC428: @ 80DC428 - .asciz "Setting moves" + .string "Setting moves\0" .align 2,0 .global gUnknown_80DC438 gUnknown_80DC438: @ 80DC438 - .asciz "Linking moves" + .string "Linking moves\0" .align 2,0 .global gUnknown_80DC448 gUnknown_80DC448: @ 80DC448 - .asciz "Remembering moves" + .string "Remembering moves\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80DC464 @@ -1706,19 +1702,19 @@ gUnknown_80DC47C: @ 80DC47C .global gUnknown_80DC494 gUnknown_80DC494: @ 80DC494 - .asciz "Friend Areas" + .string "Friend Areas\0" .align 2,0 .global gUnknown_80DC4A4 gUnknown_80DC4A4: @ 80DC4A4 - .asciz "#C2%s#R" + .string "#C2%s#R\0" .align 2,0 .global gUnknown_80DC4AC gUnknown_80DC4AC: @ 80DC4AC - .asciz "#C4%s#R" + .string "#C4%s#R\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80DC4BC @@ -1747,19 +1743,19 @@ gUnknown_80DC4D8: @ 80DC4D8 .global gUnknown_80DC4F0 gUnknown_80DC4F0: @ 80DC4F0 - .asciz "Inhabitants (Friends: #c5Light blue#r)" + .string "Inhabitants (Friends: #c5Light blue#r)\0" .align 2,0 .global gUnknown_80DC518 gUnknown_80DC518: @ 80DC518 - .asciz "Inhabitants" + .string "Inhabitants\0" .align 2,0 .global gUnknown_80DC524 gUnknown_80DC524: @ 80DC524 - .asciz "#c5%s#r" + .string "#c5%s#r\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80DC534 @@ -1788,7 +1784,7 @@ gUnknown_80DC564: @ 80DC564 .byte 0x06, 0x00, 0x03, 0x00 .byte 0x03, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80DC584 @@ -1838,7 +1834,7 @@ gUnknown_80DC5EC: @ 80DC5EC .global gUnknown_80DC5F4 gUnknown_80DC5F4: @ 80DC5F4 - .asciz "It doesn~27t appear to be hungry." + .string "It doesn~27t appear to be hungry.\0" .align 2,0 .global gUnknown_80DC618 @@ -1869,21 +1865,21 @@ gUnknown_80DC7B4: @ 80DC7B4 gUnknown_80DC7FC: @ 80DC7FC @ replacing .incbin "baserom.gba", 0x000dc7fc, 0x20 .string "Yes!\n" - .asciz "$m1~27s Attack rose by 1!" + .string "$m1~27s Attack rose by 1!\0" .align 2,0 .global gUnknown_80DC81C gUnknown_80DC81C: @ 80DC81C @ replacing .incbin "baserom.gba", 0x000dc81c, 0x28 .string "Yes!\n" - .asciz "$m1~27s Special Attack rose by 1!" + .string "$m1~27s Special Attack rose by 1!\0" .align 2,0 .global gUnknown_80DC844 gUnknown_80DC844: @ 80DC844 @ replacing .incbin "baserom.gba", 0x000dc844, 0x20 .string "Yes!\n" - .asciz "$m1~27s Defense rose by 1!" + .string "$m1~27s Defense rose by 1!\0" .align 2,0 @@ -1891,43 +1887,43 @@ gUnknown_80DC844: @ 80DC844 gUnknown_80DC864: @ 80DC864 @ replacing .incbin "baserom.gba", 0x000dc864, 0x28 .string "Yes!\n" - .asciz "$m1~27s Special Defense rose by 1!" + .string "$m1~27s Special Defense rose by 1!\0" .align 2,0 .global gUnknown_80DC88C gUnknown_80DC88C: @ 80DC88C @ replacing .incbin "baserom.gba", 0x000dc88c, 0x20 - .asciz "You don~27t have any Gummis." + .string "You don~27t have any Gummis.\0" .align 2,0 .global gUnknown_80DC8AC gUnknown_80DC8AC: @ 80DC8AC @ replacing .incbin "baserom.gba", 0x000dc8ac, 0x1c - .asciz "You don~27t have an item." + .string "You don~27t have an item.\0" .align 2,0 .global gUnknown_80DC8C8 gUnknown_80DC8C8: @ 80DC8C8 @ replacing .incbin "baserom.gba", 0x000dc8c8, 0x14 - .asciz "The Gummi is gone!" + .string "The Gummi is gone!\0" .align 2,0 .global gUnknown_80DC8DC gUnknown_80DC8DC: @ 80DC8DC - .asciz "The item is gone!" + .string "The item is gone!\0" .align 2,0 .global gUnknown_80DC8F0 gUnknown_80DC8F0: @ 80DC8F0 - .asciz "Give" + .string "Give\0" .align 2,0 .global gUnknown_80DC8F8 gUnknown_80DC8F8: @ 80DC8F8 @ replacing .incbin "baserom.gba", 0x000dc8f8, 0xc - .asciz "Use" + .string "Use\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80DC904 @@ -1958,9 +1954,9 @@ gUnknown_80DC934: @ 80DC934 .global gUnknown_80DC93C gUnknown_80DC93C: @ 80DC93C @ replacing .incbin "baserom.gba", 0x000dc93c, 0x14 - .asciz "#c%c%s#r" + .string "#c%c%s#r\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80DC950 @@ -1986,7 +1982,7 @@ gUnknown_80DC968: @ 80DC968 .global gUnknown_80DC980 gUnknown_80DC980: @ 80DC980 @ replacing .incbin "baserom.gba", 0x000dc980, 0x8 - .asciz "Friends" + .string "Friends\0" .global gUnknown_80DC988 gUnknown_80DC988: @ 80DC988 @@ -2047,20 +2043,20 @@ gUnknown_80DCA00: @ 80DCA00 .global gUnknown_80DCA18 gUnknown_80DCA18: @ 80DCA18 - .asciz "Evolve" + .string "Evolve\0" .align 2,0 .4byte gUnknown_80DCA18 .global gUnknown_80DCA24 gUnknown_80DCA24: @ 80DCA24 - .asciz "No" + .string "No\0" .align 2,0 .4byte gUnknown_80DCA24 .global gUnknown_80DCA2C gUnknown_80DCA2C: @ 80DCA2C @ replacing .incbin "baserom.gba", 0x000dca2c, 0x8 - .asciz "Yes" + .string "Yes\0" .align 2,0 .4byte gUnknown_80DCA2C @@ -2113,7 +2109,7 @@ gUnknown_80DD764: @ 80DD764 .string "to this Pokémon.#P" .string "The Pokémon will leave its Friend Area.\n" .string "It will no longer be available for\n" - .asciz "adventures. Is that OK?" + .string "adventures. Is that OK?\0" .align 2,0 .global gUnknown_80DD7FC @@ -2123,7 +2119,7 @@ gUnknown_80DD7FC: @ 80DD7FC .global gUnknown_80DD8A0 gUnknown_80DD8A0: @ 80DD8A0 .string "#+The #C4$i0#R was\n" - .asciz "#+returned to the Toolbox." + .string "#+returned to the Toolbox.\0" .align 2,0 .global gUnknown_80DD8D0 @@ -2132,52 +2128,52 @@ gUnknown_80DD8D0: @ 80DD8D0 .global gUnknown_80DD8F8 gUnknown_80DD8F8: @ 80DD8F8 - .asciz "Stand By" + .string "Stand By\0" .align 2,0 .global gUnknown_80DD904 gUnknown_80DD904: @ 80DD904 - .asciz "Make Leader" + .string "Make Leader\0" .global gUnknown_80DD910 gUnknown_80DD910: @ 80DD910 - .asciz "Join Team" + .string "Join Team\0" .align 2,0 .global gUnknown_80DD91C gUnknown_80DD91C: @ 80DD91C - .asciz "Say Farewell" + .string "Say Farewell\0" .align 2,0 .global gUnknown_80DD92C gUnknown_80DD92C: @ 80DD92C - .asciz "Give" + .string "Give\0" .align 2,0 .global gUnknown_80DD934 gUnknown_80DD934: @ 80DD934 - .asciz "Take" + .string "Take\0" .align 2,0 .global gUnknown_80DD93C gUnknown_80DD93C: @ 80DD93C - .asciz "Summary" + .string "Summary\0" .align 2,0 .global gUnknown_80DD944 gUnknown_80DD944: @ 80DD944 - .asciz "Moves" + .string "Moves\0" .align 2,0 .global gUnknown_80DD94C gUnknown_80DD94C: @ 80DD94C - .asciz "Check IQ" + .string "Check IQ\0" .align 2,0 .global gUnknown_80DD958 gUnknown_80DD958: @ 80DD958 - .asciz "Item: #C4$i0#R " - .asciz "pksdir0" + .string "Item: #C4$i0#R \0" + .string "pksdir0\0" .global gUnknown_80DD970 gUnknown_80DD970: @ 80DD970 @@ -2301,9 +2297,9 @@ gUnknown_80DFBEC: @ 80DFBEC .global gUnknown_80DFC04 gUnknown_80DFC04: @ 80DFC04 - .asciz "News List" + .string "News List\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .global gUnknown_80DFC18 gUnknown_80DFC18: @ 80DFC18 @@ -2331,13 +2327,13 @@ gUnknown_80DFC34: @ 80DFC34 .global gUnknown_80DFC4C gUnknown_80DFC4C: @ 80DFC4C - .asciz "She" + .string "She\0" .global gUnknown_80DFC50 gUnknown_80DFC50: @ 80DFC50 - .asciz "He" + .string "He\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .global gUnknown_80DFC5C gUnknown_80DFC5C: @ 80DFC5C @@ -2361,8 +2357,8 @@ gUnknown_80DFC74: @ 80DFC74 .global gUnknown_80DFC8C gUnknown_80DFC8C: @ 80DFC8C - .asciz "Mailbox" - .asciz "pksdir0" + .string "Mailbox\0" + .string "pksdir0\0" .global gUnknown_80DFC9C gUnknown_80DFC9C: @ 80DFC9C @@ -2386,9 +2382,9 @@ gUnknown_80DFCB4: @ 80DFCB4 .global gUnknown_80DFCCC gUnknown_80DFCCC: @ 80DFCCC - .asciz "Bulletin Board" + .string "Bulletin Board\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .global gUnknown_80DFCE4 gUnknown_80DFCE4: @ 80DFCE4 @@ -2418,9 +2414,9 @@ gUnknown_80DFCFC: @ 80DFCFC .global gUnknown_80DFD14 gUnknown_80DFD14: @ 80DFD14 - .asciz "Job List" + .string "Job List\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .global gUnknown_80DFD28 gUnknown_80DFD28: @ 80DFD28 @@ -2466,13 +2462,13 @@ gUnknown_80DFD58: @ 80DFD58 .global gUnknown_80DFD70 gUnknown_80DFD70: @ 80DFD70 - .asciz "Take Job" + .string "Take Job\0" .align 2,0 .global gUnknown_80DFD7C gUnknown_80DFD7C: @ 80DFD7C - .asciz "Suspend" - .asciz "pksdir0" + .string "Suspend\0" + .string "pksdir0\0" .global gUnknown_80DFD8C gUnknown_80DFD8C: @ 80DFD8C @@ -2496,9 +2492,9 @@ gUnknown_80DFDA4: @ 80DFDA4 .global gUnknown_80DFDBC gUnknown_80DFDBC: @ 80DFDBC - .asciz "RESCUE EVENT" + .string "RESCUE EVENT\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .global gUnknown_80DFDD4 gUnknown_80DFDD4: @ 80DFDD4 @@ -2611,32 +2607,32 @@ gUnknown_80E02CC: @ 80E02CC .global gUnknown_80E02E4 gUnknown_80E02E4: @ 80E02E4 - .asciz "Check Mail" + .string "Check Mail\0" .align 2,0 .global gUnknown_80E02F0 gUnknown_80E02F0: @ 80E02F0 - .asciz "Job List" + .string "Job List\0" .align 2,0 .global gUnknown_80E02FC gUnknown_80E02FC: @ 80E02FC - .asciz "PKMN News" + .string "PKMN News\0" .align 2,0 .global gUnknown_80E0308 gUnknown_80E0308: @ 80E0308 - .asciz "Store" + .string "Store\0" .align 2,0 .global gUnknown_80E0310 gUnknown_80E0310: @ 80E0310 - .asciz "Read" + .string "Read\0" .align 2,0 .global gUnknown_80E0318 gUnknown_80E0318: @ 80E0318 - .asciz "Accepted" + .string "Accepted\0" .align 2,0 .global gUnknown_80E0324 @@ -2682,24 +2678,24 @@ gUnknown_80E0378: @ 80E0378 .global gUnknown_80E0390 gUnknown_80E0390: @ 80E0390 - .asciz "Bulletin Board" + .string "Bulletin Board\0" .align 2,0 .global gUnknown_80E03A0 gUnknown_80E03A0: @ 80E03A0 - .asciz "Job List" + .string "Job List\0" .align 2,0 .global gUnknown_80E03AC gUnknown_80E03AC: @ 80E03AC - .asciz "Accepted" + .string "Accepted\0" .align 2,0 .global gUnknown_80E03B8 gUnknown_80E03B8: @ 80E03B8 - .asciz "/" + .string "/\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .global gUnknown_80E03C4 gUnknown_80E03C4: @ 80E03C4 @@ -2711,9 +2707,9 @@ gUnknown_80E03F4: @ 80E03F4 .global gUnknown_80E040C gUnknown_80E040C: @ 80E040C - .asciz "Send" + .string "Send\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .global gUnknown_80E041C gUnknown_80E041C: @ 80E041C @@ -2773,7 +2769,7 @@ gUnknown_80E072C: @ 80E072C .global gUnknown_80E0744 gUnknown_80E0744: @ 80E0744 - .asciz "Dungeons" + .string "Dungeons\0" .align 2,0 .global gUnknown_80E0750 @@ -2783,7 +2779,7 @@ gUnknown_80E0750: @ 80E0750 .global gUnknown_80E0754 gUnknown_80E0754: @ 80E0754 .byte 0x83, 0xC0, 0x00, 0x00 - .asciz "pksdir0" + .string "pksdir0\0" .global gUnknown_80E0760 gUnknown_80E0760: @ 80E0760 @@ -2817,7 +2813,7 @@ gUnknown_80E0804: @ 80E0804 .global gUnknown_80E081C gUnknown_80E081C: @ 80E081C - .asciz "Courses" + .string "Courses\0" .align 2,0 .global gUnknown_80E0824 @@ -2855,13 +2851,13 @@ gUnknown_80E091C: @ 80E091C .global gUnknown_80E0934 gUnknown_80E0934: @ 80E0934 - .asciz "ID:" + .string "ID:\0" .global gUnknown_80E0938 gUnknown_80E0938: @ 80E0938 - .asciz "%-4d" + .string "%-4d\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .global gUnknown_80E0948 gUnknown_80E0948: @ 80E0948 @@ -2919,43 +2915,43 @@ gUnknown_80E1F18: @ 80E1F18 .global gUnknown_80E1F30 gUnknown_80E1F30: @ 80E1F30 - .asciz "Objectives" + .string "Objectives\0" .align 2,0 .global gUnknown_80E1F3C gUnknown_80E1F3C: @ 80E1F3C - .asciz "%dF" + .string "%dF\0" .global gUnknown_80E1F40 gUnknown_80E1F40: @ 80E1F40 - .asciz " Rescue #C6%s#R" + .string " Rescue #C6%s#R\0" .align 2,0 .global gUnknown_80E1F54 gUnknown_80E1F54: @ 80E1F54 - .asciz "Just go!" + .string "Just go!\0" .align 2,0 .global gUnknown_80E1F60 gUnknown_80E1F60: @ 80E1F60 - .asciz " Bring #C4%s#R" + .string " Bring #C4%s#R\0" .align 2,0 .global gUnknown_80E1F70 gUnknown_80E1F70: @ 80E1F70 - .asciz " Find #C4%s#R" + .string " Find #C4%s#R\0" .align 2,0 .global gUnknown_80E1F80 gUnknown_80E1F80: @ 80E1F80 - .asciz " Escort to #C6%s#R" + .string " Escort to #C6%s#R\0" .align 2,0 .global gUnknown_80E1F94 gUnknown_80E1F94: @ 80E1F94 - .asciz "#CW???#R" + .string "#CW???#R\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .global gUnknown_80E1FA8 gUnknown_80E1FA8: @ 80E1FA8 @@ -2979,15 +2975,15 @@ gUnknown_80E2008: @ 80E2008 .global gUnknown_80E2020 gUnknown_80E2020: @ 80E2020 - .asciz "Adventure Log" + .string "Adventure Log\0" .align 2,0 .global gUnknown_80E2030 gUnknown_80E2030: @ 80E2030 @ Probably some sort of placeholder - .asciz "~95~95~95~95~95~95~95~95~95~95~95~95~95~95~95 " + .string "~95~95~95~95~95~95~95~95~95~95~95~95~95~95~95 \0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .global gUnknown_80E2068 gUnknown_80E2068: @ 80E2068 @@ -3107,7 +3103,7 @@ gUnknown_80E25B4: @ 80E25B4 .global gUnknown_80E25F4 gUnknown_80E25F4: @ 80E25F4 - .asciz "What would you like to do?" + .string "What would you like to do?\0" .align 2,0 .global gUnknown_80E2610 @@ -4206,9 +4202,9 @@ gUnknown_80E7E64: @ 80E7E64 .global gUnknown_80E7E7C gUnknown_80E7E7C: @ 80E7E7C - .asciz "Number?" + .string "Number?\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80E7E8C @@ -4221,14 +4217,14 @@ gUnknown_80E7EA4: @ 80E7EA4 .global gUnknown_80E7EBC gUnknown_80E7EBC: @ 80E7EBC - .asciz "CLOSE" + .string "CLOSE\0" .align 2,0 .global gUnknown_80E7EC4 gUnknown_80E7EC4: @ 80E7EC4 - .asciz "OPEN" + .string "OPEN\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80E7ED4 @@ -4245,19 +4241,19 @@ gUnknown_80E7F04: @ 80E7F04 .global gUnknown_80E7F1C gUnknown_80E7F1C: @ 80E7F1C - .asciz "Number?" + .string "Number?\0" .align 2,0 .global gUnknown_80E7F24 gUnknown_80E7F24: @ 80E7F24 - .asciz "LEVEL" + .string "LEVEL\0" .align 2,0 .global gUnknown_80E7F2C gUnknown_80E7F2C: @ 80E7F2C - .asciz "Name" + .string "Name\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80E7F3C @@ -4270,15 +4266,15 @@ gUnknown_80E7F54: @ 80E7F54 .global gUnknown_80E7F6C gUnknown_80E7F6C: @ 80E7F6C - .asciz "Script" + .string "Script\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80E7F94 @@ -4311,52 +4307,52 @@ gUnknown_80E81D4: @ 80E81D4 .global gMankeyMission gMankeyMission: @ 80E87DC - .asciz "Punish bad #C6Mankey#R!" + .string "Punish bad #C6Mankey#R!\0" .align 2,0 .global gSmeargleMission gSmeargleMission: @ 80E87F4 - .asciz "#C6Smeargle#R~27s desperate plea!" + .string "#C6Smeargle#R~27s desperate plea!\0" .align 2,0 .global gMedichamMission gMedichamMission: @ 80E8818 - .asciz "#C6Medicham#R: Help me!" + .string "#C6Medicham#R: Help me!\0" .align 2,0 .global gUnknown_80E8830 gUnknown_80E8830: @ 80E8830 - .asciz "Deliver one #C4%s#R." + .string "Deliver one #C4%s#R.\0" .align 2,0 .global gUnknown_80E8848 gUnknown_80E8848: @ 80E8848 - .asciz "One #C4%s#R wanted!" + .string "One #C4%s#R wanted!\0" .align 2,0 .global gUnknown_80E885C gUnknown_80E885C: @ 80E885C - .asciz "Save my child!" + .string "Save my child!\0" .align 2,0 .global gUnknown_80E886C gUnknown_80E886C: @ 80E886C - .asciz "Escort me to my love!" + .string "Escort me to my love!\0" .align 2,0 .global gUnknown_80E8884 gUnknown_80E8884: @ 80E8884 - .asciz "Near %s" + .string "Near %s\0" .align 2,0 .global gUnknown_80E888C gUnknown_80E888C: @ 80E888C - .asciz "Rescue Description" + .string "Rescue Description\0" .align 2,0 .global gUnknown_80E88A0 gUnknown_80E88A0: @ 80E88A0 - .asciz "Please punish bad #C6Mankey#R~27s gang." + .string "Please punish bad #C6Mankey#R~27s gang.\0" .align 2,0 .global gUnknown_80E88C8 @@ -4370,36 +4366,36 @@ gUnknown_80E8920: @ 80E8920 .global gUnknown_80E8968 gUnknown_80E8968: @ 80E8968 .string "With the item #C4%s#R~2c I can\n" - .asciz "evolve! I~27m yearning to evolve! Help!" + .string "evolve! I~27m yearning to evolve! Help!\0" .align 2,0 .global gUnknown_80E89B0 gUnknown_80E89B0: @ 80E89B0 .string "The #C4%s#R! What I love to eat\n" - .asciz "and can~27t live without! Please get one!" + .string "and can~27t live without! Please get one!\0" .align 2,0 .global gUnknown_80E89FC gUnknown_80E89FC: @ 80E89FC .string "This is a rescue through communication.\n" - .asciz "Get a friend to help you!" + .string "Get a friend to help you!\0" .align 2,0 .global gUnknown_80E8A40 gUnknown_80E8A40: @ 80E8A40 .string "This is a rescue through communication.\n" - .asciz "Rescue a friend!" + .string "Rescue a friend!\0" .align 2,0 .global gUnknown_80E8A7C gUnknown_80E8A7C: @ 80E8A7C .string "This is a rescue through communication.\n" - .asciz "Send your thanks to your friend!" + .string "Send your thanks to your friend!\0" .align 2,0 .global gUnknown_80E8AC8 gUnknown_80E8AC8: @ 80E8AC8 - .asciz "Client:" + .string "Client:\0" .align 2,0 .global gUnknown_80E8AD0 @@ -4408,64 +4404,64 @@ gUnknown_80E8AD0: @ 80E8AD0 .global gUnknown_80E8AE0 gUnknown_80E8AE0: @ 80E8AE0 - .asciz "Objective:" + .string "Objective:\0" .align 2,0 .global gUnknown_80E8AEC gUnknown_80E8AEC: @ 80E8AEC - .asciz "Friend Rescue" + .string "Friend Rescue\0" .align 2,0 .global gUnknown_80E8AFC gUnknown_80E8AFC: @ 80E8AFC - .asciz "Deliver #C4%s#R." + .string "Deliver #C4%s#R.\0" .align 2,0 .global gUnknown_80E8B10 gUnknown_80E8B10: @ 80E8B10 - .asciz "Find #C4%s#R." + .string "Find #C4%s#R.\0" .align 2,0 .global gUnknown_80E8B20 gUnknown_80E8B20: @ 80E8B20 - .asciz "Help me." + .string "Help me.\0" .align 2,0 .global gUnknown_80E8B2C gUnknown_80E8B2C: @ 80E8B2C - .asciz "Escort to #C6%s#R." + .string "Escort to #C6%s#R.\0" .align 2,0 .global gUnknown_80E8B40 gUnknown_80E8B40: @ 80E8B40 - .asciz "Find #C6%s#R." + .string "Find #C6%s#R.\0" .align 2,0 .global gSpecialMissionText gSpecialMissionText: @ 80E8B50 - .asciz "Special mission" + .string "Special mission\0" .align 2,0 .global gPlaceText gPlaceText: @ 80E8B60 - .asciz "Place:" + .string "Place:\0" .align 2,0 .global gDifficultyText gDifficultyText: @ 80E8B68 - .asciz "Difficulty:" + .string "Difficulty:\0" .align 2,0 .global gRewardText gRewardText: @ 80E8B74 - .asciz "Reward:" + .string "Reward:\0" .align 2,0 .global gUnknown_80E8B7C gUnknown_80E8B7C: @ 80E8B7C - .asciz "Wonder Mail:" + .string "Wonder Mail:\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80E8B94 @@ -4478,11 +4474,11 @@ gUnknown_80E8BCC: @ 80E8BCC .byte 0xF0, 0x8B, 0x0E, 0x08 @ Pointer to Suspend .byte 0xE4, 0x8B, 0x0E, 0x08 @ Pointer to Take Job .byte 0xDC, 0x8B, 0x0E, 0x08 @ Pointer to Done - .asciz "Done" + .string "Done\0" .align 2,0 - .asciz "Take Job" + .string "Take Job\0" .align 2,0 - .asciz "Suspend" + .string "Suspend\0" .align 2,0 .global gUnknown_80E8BF8 diff --git a/data/data_80EBA18.s b/data/data_80EBA18.s index 2b900ad..f8b5e0e 100644 --- a/data/data_80EBA18.s +++ b/data/data_80EBA18.s @@ -121,9 +121,9 @@ gUnknown_80EBA18: @ 80EBA18 .string "Wigglytuff for what is available.\n" .string "By adding to your Friend Areas~2c you can\n" .string "recruit Pokémon that wouldn~27t join your\n" - .asciz "rescue team before!" + .string "rescue team before!\0" .align 2,0 - .asciz "New Friend Areas!" + .string "New Friend Areas!\0" .align 2,0 .byte 0x43, 0x6f, 0x6e, 0x67 diff --git a/data/data_80F4278.s b/data/data_80F4278.s index 7841948..eece33a 100644 --- a/data/data_80F4278.s +++ b/data/data_80F4278.s @@ -29,10 +29,9 @@ gUnknown_80F42A8: @ 80F42A8 .global gUnknown_80F42C0 gUnknown_80F42C0: @ 80F42C0 - .string "Pokémon" - .byte 0 - .asciz "pksdir0" - .align 2,0 + .string "Pokémon\0" + .string "pksdir0\0" + .align 2,0 .global gUnknown_80F42D0 gUnknown_80F42D0: @ 80F42D0 @@ -1372,12 +1371,12 @@ gUnknown_80F60DC: @ 80F60DC .global gUnknown_80F60F8 gUnknown_80F60F8: @ 80F60F8 @ replacing .incbin "baserom.gba", 0x000f60f8, 0x8 - .asciz "banrpal" + .string "banrpal\0" .global gUnknown_80F6100 gUnknown_80F6100: @ 80F6100 @ replacing .incbin "baserom.gba", 0x000f6100, 0x8 - .asciz "banfont" + .string "banfont\0" .global gUnknown_80F6108 gUnknown_80F6108: @ 80F6108 @@ -1406,33 +1405,33 @@ gUnknown_80F6120: @ 80F6120 .byte 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x08, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0f, 0x00, 0x00, 0x00, 0xf0, 0xff, 0x0c, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 .byte 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0x00, 0xf0, 0xff, 0xff, 0x14, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00 .byte 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x18, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0xf0, 0xff, 0xff, 0xff, 0x1c, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 -.asciz "pksdir0" +.string "pksdir0\0" .global gUnknown_80F61A8 gUnknown_80F61A8: @ 80F61A8 @ replacing .incbin "baserom.gba", 0x000f61a8, 0x8 - .asciz "itempat" + .string "itempat\0" .global gUnknown_80F61B0 gUnknown_80F61B0: @ 80F61B0 @ replacing .incbin "baserom.gba", 0x000f61b0, 0x8 - .asciz "etcfont" + .string "etcfont\0" .global gUnknown_80F61B8 gUnknown_80F61B8: @ 80F61B8 @ replacing .incbin "baserom.gba", 0x000f61b8, 0xc - .asciz "etcfonta" + .string "etcfonta\0" .align 2,0 .global gUnknown_80F61C4 gUnknown_80F61C4: @ 80F61C4 @ replacing .incbin "baserom.gba", 0x000f61c4, 0x8 - .asciz "levfont" + .string "levfont\0" .global gUnknown_80F61CC gUnknown_80F61CC: @ 80F61CC @ replacing .incbin "baserom.gba", 0x000f61cc, 0x8 - .asciz "hp5font" + .string "hp5font\0" .global gUnknown_80F61D4 gUnknown_80F61D4: @ 80F61D4 @@ -1443,7 +1442,7 @@ gUnknown_80F61D4: @ 80F61D4 gUnknown_80F61DC: @ 80F61DC @ replacing .incbin "baserom.gba", 0x000f61dc, 0x10 .byte 0x74, 0x72, 0x61, 0x70, 0x70, 0x61, 0x74, 0x00 -.asciz "pksdir0" +.string "pksdir0\0" .global gUnknown_80F61EC gUnknown_80F61EC: @ 80F61EC @@ -1548,7 +1547,7 @@ gUnknown_80F6478: @ 80F6478 .byte 0x0e, 0x00, 0x00, 0x00 .byte 0x0f, 0x00, 0x00, 0x00 .byte 0x0f, 0x00, 0x00, 0x00 -.asciz "pksdir0" +.string "pksdir0\0" .global gUnknown_80F6490 gUnknown_80F6490: @ 80F6490 @@ -1617,10 +1616,10 @@ gUnknown_80F65F0: @ 80F65F0 .global gUnknown_80F6604 gUnknown_80F6604: @ 80F6604 @ replacing .incbin "baserom.gba", 0x000f6604, 0x20 - .asciz "zmappat" - .asciz "pksdir0" - .asciz "pksdir0" - .asciz "pksdir0" + .string "zmappat\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" .global gUnknown_80F6624 @@ -1845,72 +1844,72 @@ gActions: @ 80F7B14 .global gEquipPutOnDescription gEquipPutOnDescription: @ 80F7B94 .string "$m0 put on\n" - .asciz "the $i0." + .string "the $i0.\0" .global gPeelText gPeelText: @ 80F7BA8 - .asciz "Peel" + .string "Peel\0" .align 2,0 .global gPeelDescription gPeelDescription: @ 80F7BB0 .string "$m0 peeled\n" - .asciz "the $i0." + .string "the $i0.\0" .align 2,0 .global gIngestText gIngestText: @ 80F7BC4 - .asciz "Ingest" + .string "Ingest\0" .align 2,0 .global gIngestDescription gIngestDescription: @ 80F7BCC .string "$m0 swallowed\n" - .asciz "the $i0." + .string "the $i0.\0" .align 2,0 .global gEatText gEatText: @ 80F7BE4 - .asciz "Eat" + .string "Eat\0" .align 2,0 .global gEatDescription gEatDescription: @ 80F7BE8 .string "$m0 ate\n" - .asciz "the $i0." + .string "the $i0.\0" .align 2,0 .global gEquipText gEquipText: @ 80F7BFC - .asciz "Equip" + .string "Equip\0" .align 2,0 .global gEquipDescription gEquipDescription: @ 80F7C04 .string "$m0 equipped\n" - .asciz "the $i0." + .string "the $i0.\0" .align 2,0 .global gThrowText gThrowText: @ 80F7C1C - .string "Throw" + .string "Throw\0" .align 2,0 .global gThrowDescription gThrowDescription: @ 80F7C24 .string "$m0 threw\n" - .asciz "the $i0." + .string "the $i0.\0" .align 2,0 .global gUseText gUseText: @ 80F7C38 - .asciz "Use" + .string "Use\0" .align 2,0 .global gUseDescription gUseDescription: @ 80F7C3C .string "$m0 used\n" - .asciz "the $i0." + .string "the $i0.\0" .align 2,0 .global gUnknown_80F7C50 @@ -2053,112 +2052,112 @@ gUnknown_80F7C54: @ 80F7C54 .global gMenuPickUpText gMenuPickUpText: @ 80F7E60 - .asciz "Pick Up" + .string "Pick Up\0" .align 2,0 .global gMenuLeaderText gMenuLeaderText: @ 80F7E68 - .asciz "Leader" + .string "Leader\0" .align 2,0 .global gMenuSwapText gMenuSwapText: @ 80F7E70 - .asciz "Swap" + .string "Swap\0" .align 2,0 .global gMenuTakeText gMenuTakeText: @ 80F7E78 - .asciz "Take" + .string "Take\0" .align 2,0 .global gMenuGiveText gMenuGiveText: @ 80F7E80 - .asciz "Give" + .string "Give\0" .align 2,0 .global gMenuDeselectText gMenuDeselectText: @ 80F7E88 - .asciz "Deselect" + .string "Deselect\0" .align 2,0 .global gMenuCheckIQText gMenuCheckIQText: @ 80F7E94 - .asciz "Check IQ" + .string "Check IQ\0" .align 2,0 .global gMenuGiveUpText gMenuGiveUpText: @ 80F7EA0 - .asciz "Give Up" + .string "Give Up\0" .align 2,0 .global gMenuQuicksaveText gMenuQuicksaveText: @ 80F7EA8 - .asciz "Quicksave" + .string "Quicksave\0" .align 2,0 .global gMenuCancelText gMenuCancelText: @ 80F7EB0 - .asciz "Cancel" + .string "Cancel\0" .align 2,0 .global gMenuFarewellText gMenuFarewellText: @ 80F7EBC - .asciz "Farewell" + .string "Farewell\0" .align 2,0 .global gMenuProceedText gMenuProceedText: @ 80F7EC8 - .asciz "Proceed" + .string "Proceed\0" .align 2,0 .global gMenuTriggerText gMenuTriggerText: @ 80F7ED0 - .asciz "Trigger" + .string "Trigger\0" .align 2,0 .global gMenuForgetText gMenuForgetText: @ 80F7ED8 - .asciz "Forget" + .string "Forget\0" .align 2,0 .global gMenuDelinkText gMenuDelinkText: @ 80F7EE0 - .asciz "Delink" + .string "Delink\0" .align 2,0 .global gMenuLinkText gMenuLinkText: @ 80F7EE8 - .asciz "Link" + .string "Link\0" .align 2,0 .global gMenuSetText gMenuSetText: @ 80F7EF0 - .asciz "Set" + .string "Set\0" .align 2,0 .global gMenuSummaryText gMenuSummaryText: @ 80F7EF4 - .asciz "Summary" + .string "Summary\0" .align 2,0 .global gMenuTacticsText gMenuTacticsText: @ 80F7EFC - .asciz "Tactics" + .string "Tactics\0" .align 2,0 .global gMenuMovesText gMenuMovesText: @ 80F7F04 - .asciz "Moves" + .string "Moves\0" .align 2,0 .global gMenuMoneySymbols gMenuMoneySymbols: @ 80F7F0C - .asciz "$$$$" + .string "$$$$\0" .align 2,0 .global gMenuStruggleText gMenuStruggleText: @ 80F7F14 - .asciz "Struggle" + .string "Struggle\0" .align 2,0 .global gMenuEmpty @@ -2168,57 +2167,57 @@ gMenuEmpty: @ 80F7F20 .global gMenuTalkText gMenuTalkText: @ 80F7F24 - .asciz "Talk" + .string "Talk\0" .align 2,0 .global gMenuXText gMenuXText: @ 80F7F2C - .asciz "X" + .string "X\0" .align 2,0 .global gMenuInfoText gMenuInfoText: @ 80F7F30 - .asciz "Info" + .string "Info\0" .align 2,0 .global gMenuSwitchText gMenuSwitchText: @ 80F7F38 - .asciz "Switch" + .string "Switch\0" .align 2,0 .global gMenuGetText gMenuGetText: @ 80F7F40 - .asciz "Get" + .string "Get\0" .align 2,0 .global gMenuPlaceText gMenuPlaceText: @ 80F7F44 - .asciz "Place" + .string "Place\0" .align 2,0 .global gMenuPrevText gMenuPrevText: @ 80F7F4C - .asciz "Prev." + .string "Prev.\0" .align 2,0 .global gMenuNextText gMenuNextText: @ 80F7F54 - .asciz "Next" + .string "Next\0" .align 2,0 .global gMenuMoveText gMenuMoveText: @ 80F7F5C - .asciz "Move" + .string "Move\0" .align 2,0 .global gMenuWaitText gMenuWaitText: @ 80F7F64 - .asciz "Wait" + .string "Wait\0" .align 2,0 .global gMenuQuestionMarks gMenuQuestionMarks: @ 80F7F6C - .asciz "???" + .string "???\0" .align 2,0 .global gUnknown_80F7F70 @@ -2233,21 +2232,21 @@ gRescueSpotDescription: @ 80F7F7C .string "friend~27s team went down!\n" .string "Send an #c2A-OK Mail#r from the Pelipper Post\n" .string "Office to let your friend know you~27ve\n" - .asciz "rescued the defeated team." + .string "rescued the defeated team.\0" .align 2,0 .global gWarpZoneDescription gWarpZoneDescription: @ 80F8030 .string "The warp zone leading to the next floor.\n" .string "If you are on the final floor~2c you will\n" - .asciz "escape from the dungeon." + .string "escape from the dungeon.\0" .align 2,0 .global gDungeonStairsDescription gDungeonStairsDescription: @ 80F809C .string "Stairs leading to the next floor.\n" .string "If you are on the final floor~2c you will\n" - .asciz "escape from the dungeon." + .string "escape from the dungeon.\0" .align 2,0 .global gUnknown_80F8104 @@ -2258,17 +2257,17 @@ gUnknown_80F8104: @ 80F8104 .global gRescueSpotText gRescueSpotText: @ 80F7F7C - .asciz "Rescue Spot" + .string "Rescue Spot\0" .align 2,0 .global gWarpZoneText gWarpZoneText: @ 80F8030 - .asciz "Warp Zone" + .string "Warp Zone\0" .align 2,0 .global gDungeonStairsText gDungeonStairsText: @ 80F809C - .asciz "Stairs" + .string "Stairs\0" .align 2,0 .global gTrapDescriptions @@ -2278,7 +2277,7 @@ gTrapDescriptions: @ 80F8130 .global gUnknown_80F8968 gUnknown_80F8968: @ 80F8968 .byte 0x5C, 0x89, 0x0F, 0x08 - .asciz "Decoy" + .string "Decoy\0" .align 2,0 .global gUnknown_80F8974 @@ -2292,13 +2291,13 @@ gUnknown_80F8988: @ 80F8988 .global gUnknown_80F8994 gUnknown_80F8994: @ 80F8994 .byte 0x8C, 0x89, 0x0F, 0x08 - .asciz "Your partner $m0 fainted!" + .string "Your partner $m0 fainted!\0" .align 2,0 .global gUnknown_80F89B4 gUnknown_80F89B4: @ 80F89B4 .byte 0x98, 0x89, 0x0F, 0x08 - .asciz "Your client $m0 fainted!" + .string "Your client $m0 fainted!\0" .align 2,0 .global gUnknown_80F89D4 @@ -2308,91 +2307,91 @@ gUnknown_80F89D4: @ 80F89D4 .global gUnknown_80F89D8 gUnknown_80F89D8: @ 80F89D8 .byte 0xB8, 0x89, 0x0F, 0x08 - .asciz "But nothing happened!" + .string "But nothing happened!\0" .align 2,0 .global gUnknown_80F89F4 gUnknown_80F89F4: @ 80F89F4 .byte 0xDC, 0x89, 0x0F, 0x08 - .asciz "$m0 was blown away!" + .string "$m0 was blown away!\0" .align 2,0 .global gUnknown_80F8A0C gUnknown_80F8A0C: @ 80F8A0C .byte 0xF8, 0x89, 0x0F, 0x08 - .asciz "No move has been set." + .string "No move has been set.\0" .align 2,0 .global gUnknown_80F8A28 gUnknown_80F8A28: @ 80F8A28 .byte 0x10, 0x8A, 0x0F, 0x08 - .asciz "The set move can~27t be used." + .string "The set move can~27t be used.\0" .align 2,0 .global gUnknown_80F8A4C gUnknown_80F8A4C: @ 80F8A4C .byte 0x2C, 0x8A, 0x0F, 0x08 - .asciz "You~27re being constricted!" + .string "You~27re being constricted!\0" .align 2,0 .global gUnknown_80F8A6C gUnknown_80F8A6C: @ 80F8A6C .byte 0x50, 0x8A, 0x0F, 0x08 - .asciz "You can~27t move!" + .string "You can~27t move!\0" .align 2,0 .global gUnknown_80F8A84 gUnknown_80F8A84: @ 80F8A84 .byte 0x70, 0x8A, 0x0F, 0x08 - .asciz "You can~27t move while you~27re rooted!" + .string "You can~27t move while you~27re rooted!\0" .align 2,0 .global gUnknown_80F8AB0 gUnknown_80F8AB0: @ 80F8AB0 .byte 0x88, 0x8A, 0x0F, 0x08 - .asciz "You can~27t move while wrapping a foe!" + .string "You can~27t move while wrapping a foe!\0" .align 2,0 .global gUnknown_80F8ADC gUnknown_80F8ADC: @ 80F8ADC .byte 0xB4, 0x8A, 0x0F, 0x08 - .asciz "The foe has you wrapped! You can~27t move!" + .string "The foe has you wrapped! You can~27t move!\0" .align 2,0 .global gUnknown_80F8B0C gUnknown_80F8B0C: @ 80F8B0C .byte 0xE0, 0x8A, 0x0F, 0x08 - .asciz "There are no items." + .string "There are no items.\0" .global gUnknown_80F8B24 gUnknown_80F8B24: @ 80F8B24 .byte 0x10, 0x8B, 0x0F, 0x08 - .asciz "The move $i0 was set." + .string "The move $i0 was set.\0" .align 2,0 .global gUnknown_80F8B40 gUnknown_80F8B40: @ 80F8B40 .byte 0x28, 0x8B, 0x0F, 0x08 - .asciz "The move $i0 was deselected." + .string "The move $i0 was deselected.\0" .align 2,0 .global gUnknown_80F8B64 gUnknown_80F8B64: @ 80F8B64 .byte 0x44, 0x8B, 0x0F, 0x08 .byte 0x20, 0x7F, 0x0F, 0x08 - .asciz "The move $i0 was delinked." + .string "The move $i0 was delinked.\0" .align 2,0 .global gUnknown_80F8B88 gUnknown_80F8B88: @ 80F8B88 .byte 0x6C, 0x8B, 0x0F, 0x08 - .asciz "The linked moves were left unchanged." + .string "The linked moves were left unchanged.\0" .align 2,0 .global gUnknown_80F8BB4 gUnknown_80F8BB4: @ 80F8BB4 .byte 0x8C, 0x8B, 0x0F, 0x08 - .asciz "It~27s all sticky and doesn~27t work!" + .string "It~27s all sticky and doesn~27t work!\0" .align 2,0 .global gUnknown_80F8BE0 @@ -2410,14 +2409,14 @@ gUnknown_80F8C44: @ 80F8C44 .global gUnknown_80F8C48 gUnknown_80F8C48: @ 80F8C48 .byte 0x14, 0x8C, 0x0F, 0x08 - .asciz "The $i0 is all sticky!\nIt can~27t be equipped." + .string "The $i0 is all sticky!\nIt can~27t be equipped.\0" .align 2,0 .global gUnknown_80F8C7C gUnknown_80F8C7C: @ 80F8C7C .byte 0x4C, 0x8C, 0x0F, 0x08 .string "$m1 took the $i0\n" - .asciz "and returned the $i1." + .string "and returned the $i1.\0" .align 2,0 .global gUnknown_80F8CA8 @@ -2431,25 +2430,25 @@ gUnknown_80F8CE4: @ 80F8CE4 .global gUnknown_80F8CE8 gUnknown_80F8CE8: @ 80F8CE8 .byte 0xAC, 0x8C, 0x0F, 0x08 - .asciz "Equipped the item $i0." + .string "Equipped the item $i0.\0" .align 2,0 .global gUnknown_80F8D04 gUnknown_80F8D04: @ 80F8D04 .byte 0xEC, 0x8C, 0x0F, 0x08 - .asciz "The $i0 was deselected." + .string "The $i0 was deselected.\0" .global gUnknown_80F8D20 gUnknown_80F8D20: @ 80F8D20 .byte 0x08, 0x8D, 0x0F, 0x08 .string "The item $i0 was given\n" - .asciz "to $m1." + .string "to $m1.\0" .align 2,0 .global gUnknown_80F8D44 gUnknown_80F8D44: @ 80F8D44 .byte 0x24, 0x8D, 0x0F, 0x08 - .asciz "The Toolbox is full." + .string "The Toolbox is full.\0" .align 2,0 .global gUnknown_80F8D60 @@ -6652,7 +6651,7 @@ gUnknown_81063D0: @ 81063D0 .byte 0x00, 0x00, 0x00, 0x00 .byte 0xDC, 0x63, 0x10, 0x08 .string "#+Oh?#W\n" - .asciz "#+There~27s someone there." + .string "#+There~27s someone there.\0" .align 2,0 .global gUnknown_8106400 @@ -6664,7 +6663,7 @@ gUnknown_810643C: @ 810643C .byte 0x04, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x48, 0x64, 0x10, 0x08 - .asciz "#+$m2 wants to join the team." + .string "#+$m2 wants to join the team.\0" .align 2,0 .global gUnknown_8106468 @@ -6672,7 +6671,7 @@ gUnknown_8106468: @ 8106468 .byte 0x04, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x74, 0x64, 0x10, 0x08 - .asciz "#+$m2 joined the team! " + .string "#+$m2 joined the team! \0" .align 2,0 .global gUnknown_810648C @@ -6681,7 +6680,7 @@ gUnknown_810648C: @ 810648C .byte 0x00, 0x00, 0x00, 0x00 .byte 0x98, 0x64, 0x10, 0x08 .string "#+$m3 appears to\n" - .asciz "#+be very happy!" + .string "#+be very happy!\0" .align 2,0 .global gUnknown_81064BC @@ -6690,7 +6689,7 @@ gUnknown_81064BC: @ 81064BC .byte 0x00, 0x00, 0x00, 0x00 .byte 0xC8, 0x64, 0x10, 0x08 .string "#+It~27s delighted to have\n" - .asciz "#+joined the rescue team!" + .string "#+joined the rescue team!\0" .align 2,0 .global gUnknown_8106500 @@ -6699,7 +6698,7 @@ gUnknown_8106500: @ 8106500 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x0C, 0x65, 0x10, 0x08 .string "#+$m0 turned down\n" - .asciz "#+the offer to join." + .string "#+the offer to join.\0" .align 2,0 .global gUnknown_8106534 @@ -6707,7 +6706,7 @@ gUnknown_8106534: @ 8106534 .byte 0x04, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x40, 0x65, 0x10, 0x08 - .asciz "#+Celebi is very disappointed." + .string "#+Celebi is very disappointed.\0" .align 2,0 .global gUnknown_8106560 @@ -6716,10 +6715,10 @@ gUnknown_8106560: @ 8106560 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x6C, 0x65, 0x10, 0x08 .string "#+$m2 left\n" - .asciz "#+dejectedly..." + .string "#+dejectedly...\0" .align 2,0 .string "#+Allow $m2\n" - .asciz "#+to join the team?" + .string "#+to join the team?\0" .align 2,0 .global gUnknown_81065A8 @@ -7203,7 +7202,7 @@ gUnknown_8107544: @ 8107544 .global gUnknown_81075F4 gUnknown_81075F4: @ 81075F4 - .asciz "monspara" + .string "monspara\0" .align 2,0 .global gUnknown_8107600 @@ -7216,17 +7215,17 @@ gUnknown_8107608: @ 8107608 .global gUnknown_8107610 gUnknown_8107610: @ 8107610 - .asciz "ABCDEFGHIJKLMNOPQRSTUVWXYZ!?" + .string "ABCDEFGHIJKLMNOPQRSTUVWXYZ!?\0" .align 2,0 .global gUnknown_8107630 gUnknown_8107630: @ 8107630 - .asciz "%s%c" + .string "%s%c\0" .align 2,0 .global gUnknown_8107638 gUnknown_8107638: @ 8107638 - .asciz "%s" + .string "%s\0" .align 2,0 .global gUnknown_810763C @@ -7243,12 +7242,12 @@ gUnknown_8107654: @ 8107654 .global gUnknown_8107684 gUnknown_8107684: @ 8107684 - .asciz "kao%03d" + .string "kao%03d\0" .align 2,0 .global gUnknown_810768C gUnknown_810768C: @ 810768C - .asciz "lvmp%03d" + .string "lvmp%03d\0" .align 2,0 .global gUnknown_8107698 @@ -7257,7 +7256,7 @@ gUnknown_8107698: @ 8107698 .global gUnknown_81076BC gUnknown_81076BC: @ 81076BC - .asciz "etcfont" + .string "etcfont\0" .align 2,0 .global gUnknown_81076C4 @@ -7270,27 +7269,27 @@ gUnknown_81076E4: @ 81076E4 .global gUnknown_8107754 gUnknown_8107754: @ 8107754 - .asciz "Stats" + .string "Stats\0" .align 2,0 .global gUnknown_810775C gUnknown_810775C: @ 810775C - .asciz "Features" + .string "Features\0" .align 2,0 .global gUnknown_8107768 gUnknown_8107768: @ 8107768 - .asciz "Type:" + .string "Type:\0" .align 2,0 .global gUnknown_8107770 gUnknown_8107770: @ 8107770 - .asciz "Special Abilities:" + .string "Special Abilities:\0" .align 2,0 .global gUnknown_8107784 gUnknown_8107784: @ 8107784 - .asciz "$i1" + .string "$i1\0" .align 2,0 .global gUnknown_8107788 @@ -7303,14 +7302,14 @@ gUnknown_810778C: @ 810778C .global gUnknown_8107790 gUnknown_8107790: @ 8107790 - .asciz "$i0$i1" + .string "$i0$i1\0" .align 2,0 .global gUnknown_8107798 gUnknown_8107798: @ 8107798 - .asciz "Info" + .string "Info\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gUnknown_81077A8 @@ -7363,9 +7362,9 @@ gUnknown_8108F4A: @ 8108F4A .global gUnknown_8108F50 gUnknown_8108F50: @ 8108F50 - .asciz "No problem." + .string "No problem.\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gUnknown_8108F64 @@ -7374,17 +7373,17 @@ gUnknown_8108F64: @ 8108F64 .global gUnknown_8109764 gUnknown_8109764: @ 8109764 - .asciz "itempara" + .string "itempara\0" .align 2,0 .global gUnknown_8109770 gUnknown_8109770: @ 8109770 - .asciz "%s %d" + .string "%s %d\0" .align 2,0 .global gUnknown_8109778 gUnknown_8109778: @ 8109778 - .asciz "%s" + .string "%s\0" .align 2,0 .global gUnknown_810977C @@ -7458,16 +7457,16 @@ gUnknown_81098C4: @ 81098C4 .global gUnknown_81098D0 gUnknown_81098D0: @ 81098D0 - .asciz "wazapara" + .string "wazapara\0" .align 2,0 .global gUnknown_81098DC gUnknown_81098DC: @ 81098DC - .asciz "%+d" + .string "%+d\0" .global gUnknown_81098E0 gUnknown_81098E0: @ 81098E0 - .asciz "#c%c%s%s#r" + .string "#c%c%s%s#r\0" .align 2,0 .global gUnknown_81098EC @@ -7496,20 +7495,20 @@ gUnknown_810992B: @ 810992B .global gUnknown_810992C gUnknown_810992C: @ 810992C - .asciz "%s" + .string "%s\0" .align 2,0 .global gUnknown_8109930 gUnknown_8109930: @ 8109930 - .asciz "$m0" + .string "$m0\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gUnknown_8109954 @@ -7519,7 +7518,7 @@ gUnknown_8109954: @ 8109954 .global gUnknown_8109984 gUnknown_8109984: @ 8109984 .byte 0x00, 0x01, 0x02, 0x03, 0x04, 0x02, 0x01, 0x00 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gStoryMissionText @@ -7528,23 +7527,23 @@ gStoryMissionText: @ 8109994 .global gDummyScenarioText gDummyScenarioText: @ 8109CA8 - .asciz "#CCScenario try dummy#R" + .string "#CCScenario try dummy#R\0" .align 2,0 .global gUnknown_8109CC0 gUnknown_8109CC0: @ 8109CC0 - .asciz "#CW???#R" + .string "#CW???#R\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .global gMeetNinetalesText gMeetNinetalesText: @ 8109CD4 - .asciz "Meet Ninetales." + .string "Meet Ninetales.\0" .align 2,0 .global gAvoidCaptureText gAvoidCaptureText: @ 8109CE4 - .asciz "Avoid capture." + .string "Avoid capture.\0" .align 2,0 .global gFinalScenarioText @@ -7863,8 +7862,8 @@ gUnknown_810AD0C: @ 810AD0C .byte 0xfb, 0x00, 0x01, 0x00 .byte 0x54, 0x01, 0x01, 0x00 .byte 0xbe, 0x00, 0x00, 0x01 - .asciz "pksdir0" - .asciz "pksdir0" + .string "pksdir0\0" + .string "pksdir0\0" .include "data/text/type_names.inc" @@ -7889,19 +7888,19 @@ gRescueTeamRanks: @ 810B44C .byte 0x88, 0xB4, 0x10, 0x08 .byte 0x78, 0xB4, 0x10, 0x08 .byte 0x68, 0xB4, 0x10, 0x08 @ Lucario - .asciz "Lucario Rank" + .string "Lucario Rank\0" .align 2,0 - .asciz "Diamond Rank" + .string "Diamond Rank\0" .align 2,0 - .asciz "Platinum Rank" + .string "Platinum Rank\0" .align 2,0 - .asciz "Gold Rank" + .string "Gold Rank\0" .align 2,0 - .asciz "Silver Rank" + .string "Silver Rank\0" .align 2,0 - .asciz "Bronze Rank" + .string "Bronze Rank\0" .align 2,0 - .asciz "Normal Rank" + .string "Normal Rank\0" .align 2,0 .global gAbilityNames @@ -7919,13 +7918,13 @@ gRangeNames: @ 810CC0C .global gUnknown_810CF00 gUnknown_810CF00: @ 810CF00 .byte 0xF0, 0xCE, 0x10, 0x08 @ (pointer to range string) - .asciz "Type" + .string "Type\0" .align 2,0 .global gUnknown_810CF0C gUnknown_810CF0C: @ 810CF0C .byte 0x04, 0xCF, 0x10, 0x08 @ (pointer to type string) - .asciz "Power" + .string "Power\0" .align 2,0 .byte 0x10, 0xCF, 0x10, 0x08 @ (pointer to power string) @@ -7940,55 +7939,55 @@ gFormattedStatusNames: @ 810D628 .global gUnknown_810DD58 gUnknown_810DD58: @ 810DD58 .byte 0x50, 0xDD, 0x10, 0x08 - .asciz "IQ Skills" + .string "IQ Skills\0" .align 2,0 .global gUnknown_810DD68 gUnknown_810DD68: @ 810DD68 .byte 0x5C, 0xDD, 0x10, 0x08 - .asciz "Level: #>82.$d0 " + .string "Level: #>82.$d0 \0" .align 2,0 .global gUnknown_810DD80 gUnknown_810DD80: @ 810DD80 .byte 0x6C, 0xDD, 0x10, 0x08 - .asciz "Exp. Pts.: #>82.$d1 " + .string "Exp. Pts.: #>82.$d1 \0" .align 2,0 .global gUnknown_810DD9C gUnknown_810DD9C: @ 810DD9C .byte 0x84, 0xDD, 0x10, 0x08 - .asciz "To next level:#>82.$d0" + .string "To next level:#>82.$d0\0" .align 2,0 .global gUnknown_810DDB8 gUnknown_810DDB8: @ 810DDB8 .byte 0xA0, 0xDD, 0x10, 0x08 - .asciz "HP:#>82.$v03/$v13" + .string "HP:#>82.$v03/$v13\0" .align 2,0 .global gUnknown_810DDD0 gUnknown_810DDD0: @ 810DDD0 .byte 0xBC, 0xDD, 0x10, 0x08 - .asciz "Attack/Defense:" + .string "Attack/Defense:\0" .align 2,0 .global gUnknown_810DDE4 gUnknown_810DDE4: @ 810DDE4 .byte 0xD4, 0xDD, 0x10, 0x08 - .asciz "Sp. Atk./Sp. Def.:" + .string "Sp. Atk./Sp. Def.:\0" .align 2,0 .global gUnknown_810DDFC gUnknown_810DDFC: @ 810DDFC .byte 0xE8, 0xDD, 0x10, 0x08 - .asciz "#>92.$v03/" + .string "#>92.$v03/\0" .align 2,0 .global gUnknown_810DE0C gUnknown_810DE0C: @ 810DE0C .byte 0x00, 0xDE, 0x10, 0x08 - .asciz "#>92.#c2$v03#r/" + .string "#>92.#c2$v03#r/\0" .align 2,0 .global gUnknown_810DE20 @@ -8002,13 +8001,13 @@ gUnknown_810DE24: @ 810DE24 .global gUnknown_810DE28 gUnknown_810DE28: @ 810DE28 .byte 0x10, 0xDE, 0x10, 0x08 - .asciz "#>118.$v03" + .string "#>118.$v03\0" .align 2,0 .global gUnknown_810DE38 gUnknown_810DE38: @ 810DE38 .byte 0x2C, 0xDE, 0x10, 0x08 - .asciz "#>118.#c2$v03#r" + .string "#>118.#c2$v03#r\0" .align 2,0 .global gUnknown_810DE4C @@ -8026,37 +8025,37 @@ gUnknown_810DE54: @ 810DE54 .global gUnknown_810DE58 gUnknown_810DE58: @ 810DE58 .byte 0x1C, 0xAE, 0x10, 0x08 - .asciz "Item:#>46.$i0 " + .string "Item:#>46.$i0 \0" .align 2,0 .global gUnknown_810DE6C gUnknown_810DE6C: @ 810DE6C .byte 0x5C, 0xDE, 0x10, 0x08 - .asciz "IQ:#>52.$m0 " + .string "IQ:#>52.$m0 \0" .align 2,0 .global gUnknown_810DE80 gUnknown_810DE80: @ 810DE80 .byte 0x70, 0xDE, 0x10, 0x08 - .asciz "Tactics:#>52.$m0 " + .string "Tactics:#>52.$m0 \0" .align 2,0 .global gUnknown_810DE98 gUnknown_810DE98: @ 810DE98 .byte 0x84, 0xDE, 0x10, 0x08 - .asciz "Species:#>54.#C6$m0#R " + .string "Species:#>54.#C6$m0#R \0" .align 2,0 .global gUnknown_810DEB4 gUnknown_810DEB4: @ 810DEB4 .byte 0x9C, 0xDE, 0x10, 0x08 - .asciz "Friend Area: " + .string "Friend Area: \0" .align 2,0 .global gUnknown_810DEC8 gUnknown_810DEC8: @ 810DEC8 .byte 0xB8, 0xDE, 0x10, 0x08 - .asciz "#>22.#C4$i0#R" + .string "#>22.#C4$i0#R\0" .align 2,0 .global gUnknown_810DEDC @@ -8070,25 +8069,25 @@ gUnknown_810DEF4: @ 810DEF4 .global gUnknown_810DF78 gUnknown_810DF78: @ 810DF78 .byte 0x64, 0xDF, 0x10, 0x08 - .asciz "No IQ" + .string "No IQ\0" .align 2,0 .global gUnknown_810DF84 gUnknown_810DF84: @ 810DF84 .byte 0x7C, 0xDF, 0x10, 0x08 - .asciz "Size:#>82.$m0" + .string "Size:#>82.$m0\0" .align 2,0 .global gUnknown_810DF98 gUnknown_810DF98: @ 810DF98 .byte 0x88, 0xDF, 0x10, 0x08 - .asciz "Joined rescue team at:" + .string "Joined rescue team at:\0" .align 2,0 .global gUnknown_810DFB4 gUnknown_810DFB4: @ 810DFB4 .byte 0x9C, 0xDF, 0x10, 0x08 - .asciz "#>22.#C5$i0#R" + .string "#>22.#C5$i0#R\0" .align 2,0 .global gUnknown_810DFC8 @@ -8102,11 +8101,11 @@ gUnknown_810DFCC: @ 810DFCC .byte 0xE0, 0xDF, 0x10, 0x08 .byte 0xDC, 0xDF, 0x10, 0x08 .byte 0x20, 0x00, 0x00, 0x00 - .asciz "Evolution: #>54.No more" + .string "Evolution: #>54.No more\0" .align 2,0 - .asciz "Evolution: #>54.Possible" + .string "Evolution: #>54.Possible\0" .align 2,0 - .asciz "Evolution: #>54.Not now" + .string "Evolution: #>54.Not now\0" .align 2,0 .global gUnknown_810E02C @@ -8144,19 +8143,19 @@ gUnknown_8113080: @ 8113080 .global gUnknown_811383C gUnknown_811383C: @ 811383C .byte 0x2C, 0x38, 0x11, 0x08 - .asciz "#+Place: $m0" + .string "#+Place: $m0\0" .align 2,0 .global gUnknown_8113850 gUnknown_8113850: @ 8113850 .byte 0x40, 0x38, 0x11, 0x08 - .asciz "$m1 was defeated by" + .string "$m1 was defeated by\0" .global gUnknown_8113868 gUnknown_8113868: @ 8113868 .byte 0x54, 0x38, 0x11, 0x08 - .asciz "$m1" + .string "$m1\0" .align 2,0 .global gUnknown_8113870 @@ -8170,12 +8169,12 @@ gUnknown_8113898: @ 8113898 .global gUnknown_81138C0 gUnknown_81138C0: @ 81138C0 .byte 0x9C, 0x38, 0x11, 0x08 - .asciz "HP#>42.$d0 " + .string "HP#>42.$d0 \0" .global gUnknown_81138D0 gUnknown_81138D0: @ 81138D0 .byte 0xC4, 0x38, 0x11, 0x08 - .asciz "Attack#>42.$d0 " + .string "Attack#>42.$d0 \0" .global gUnknown_81138E4 gUnknown_81138E4: @ 81138E4 @@ -8212,7 +8211,7 @@ gUnknown_81139B4: @ 81139B4 .global gUnknown_81139B8 gUnknown_81139B8: @ 81139B8 .byte 0x1C, 0xAE, 0x10, 0x08 - .asciz "Item:#>42.$i0 " + .string "Item:#>42.$i0 \0" .align 2,0 .global gUnknown_81139CC @@ -8279,104 +8278,104 @@ gFriendAreaNames: @ 81139D0 .byte 0xD8, 0x3A, 0x11, 0x08 .byte 0xC8, 0x3A, 0x11, 0x08 .byte 0xB8, 0x3A, 0x11, 0x08 - .asciz "Final Island" + .string "Final Island\0" .align 2,0 - .asciz "Enclosed Island" - .asciz "Southern Island" - .asciz "Legendary Island" + .string "Enclosed Island\0" + .string "Southern Island\0" + .string "Legendary Island\0" .align 2,0 - .asciz "Magnetic Quarry" - .asciz "Ravaged Field" + .string "Magnetic Quarry\0" + .string "Ravaged Field\0" .align 2,0 - .asciz "Stratos Lookout" - .asciz "Volcanic Pit" + .string "Stratos Lookout\0" + .string "Volcanic Pit\0" .align 2,0 - .asciz "Ice Floe Beach" + .string "Ice Floe Beach\0" .align 2,0 - .asciz "Frigid Cavern" + .string "Frigid Cavern\0" .align 2,0 - .asciz "Darkness Ridge" + .string "Darkness Ridge\0" .align 2,0 - .asciz "Ancient Relic" + .string "Ancient Relic\0" .align 2,0 - .asciz "Aged Chamber O?" - .asciz "Aged Chamber AN" - .asciz "Furnace Desert" + .string "Aged Chamber O?\0" + .string "Aged Chamber AN\0" + .string "Furnace Desert\0" .align 2,0 - .asciz "Crater" + .string "Crater\0" .align 2,0 - .asciz "Power Plant" - .asciz "Thunder Meadow" + .string "Power Plant\0" + .string "Thunder Meadow\0" .align 2,0 - .asciz "Mt. Discipline" + .string "Mt. Discipline\0" .align 2,0 - .asciz "Decrepit Lab" + .string "Decrepit Lab\0" .align 2,0 - .asciz "Jungle" + .string "Jungle\0" .align 2,0 - .asciz "Boulder Cave" + .string "Boulder Cave\0" .align 2,0 - .asciz "Dragon Cave" - .asciz "Cryptic Cave" + .string "Dragon Cave\0" + .string "Cryptic Cave\0" .align 2,0 - .asciz "Echo Cave" + .string "Echo Cave\0" .align 2,0 - .asciz "Poison Swamp" + .string "Poison Swamp\0" .align 2,0 - .asciz "Peanut Swamp" + .string "Peanut Swamp\0" .align 2,0 - .asciz "Waterfall Lake" + .string "Waterfall Lake\0" .align 2,0 - .asciz "Mystic Lake" - .asciz "Turtleshell Pond" + .string "Mystic Lake\0" + .string "Turtleshell Pond\0" .align 2,0 - .asciz "Tadpole Pond" + .string "Tadpole Pond\0" .align 2,0 - .asciz "Rub-a-Dub River" - .asciz "Secretive Forest" + .string "Rub-a-Dub River\0" + .string "Secretive Forest\0" .align 2,0 - .asciz "Transform Forest" + .string "Transform Forest\0" .align 2,0 - .asciz "Healing Forest" + .string "Healing Forest\0" .align 2,0 - .asciz "Mushroom Forest" - .asciz "Energetic Forest" + .string "Mushroom Forest\0" + .string "Energetic Forest\0" .align 2,0 - .asciz "Overgrown Forest" + .string "Overgrown Forest\0" .align 2,0 - .asciz "Flyaway Forest" + .string "Flyaway Forest\0" .align 2,0 - .asciz "Mist-Rise Forest" + .string "Mist-Rise Forest\0" .align 2,0 - .asciz "Sacred Field" + .string "Sacred Field\0" .align 2,0 - .asciz "Scorched Plains" - .asciz "Safari" + .string "Scorched Plains\0" + .string "Safari\0" .align 2,0 - .asciz "Sky Blue Plains" - .asciz "Beau Plains" - .asciz "Wild Plains" - .asciz "Rainbow Peak" + .string "Sky Blue Plains\0" + .string "Beau Plains\0" + .string "Wild Plains\0" + .string "Rainbow Peak\0" .align 2,0 - .asciz "Mt. Moonview" + .string "Mt. Moonview\0" .align 2,0 - .asciz "Mt. Cleft" + .string "Mt. Cleft\0" .align 2,0 - .asciz "Mt. Deepgreen" + .string "Mt. Deepgreen\0" .align 2,0 - .asciz "Shallow Beach" + .string "Shallow Beach\0" .align 2,0 - .asciz "Seafloor Cave" + .string "Seafloor Cave\0" .align 2,0 - .asciz "Deep-Sea Current" + .string "Deep-Sea Current\0" .align 2,0 - .asciz "Deep-Sea Floor" + .string "Deep-Sea Floor\0" .align 2,0 - .asciz "Serene Sea" + .string "Serene Sea\0" .align 2,0 - .asciz "Treasure Sea" + .string "Treasure Sea\0" .align 2,0 - .asciz "Bountiful Sea" + .string "Bountiful Sea\0" .align 2,0 .global gFriendAreaDescriptions @@ -8443,35 +8442,35 @@ gUnknown_8115D94: @ 8115D94 gUnknown_8115DD4: @ 8115DD4 .byte 0x98, 0x5D, 0x11, 0x08 .byte 0x87, 0x42 - .asciz " Game will be saved before entering." + .string " Game will be saved before entering.\0" .align 2,0 .global gUnknown_8115E00 gUnknown_8115E00: @ 8115E00 .byte 0xD8, 0x5D, 0x11, 0x08 .byte 0x87, 0x42 - .asciz " The team will enter at Level 1. " + .string " The team will enter at Level 1. \0" .align 2,0 .global gUnknown_8115E28 gUnknown_8115E28: @ 8115E28 .byte 0x04, 0x5E, 0x11, 0x08 .byte 0x87, 0x42, 0x20 - .asciz "All items will be lost on entering." + .string "All items will be lost on entering.\0" .align 2,0 .global gUnknown_8115E54 gUnknown_8115E54: @ 8115E54 .byte 0x2C, 0x5E, 0x11, 0x08 .byte 0x87, 0x42, 0x20 - .asciz "All money will be lost on entering." + .string "All money will be lost on entering.\0" .align 2,0 .global gUnknown_8115E80 gUnknown_8115E80: @ 8115E80 .byte 0x58, 0x5E, 0x11, 0x08 - .asciz "pksdir0" - .asciz "pksdir0" + .string "pksdir0\0" + .string "pksdir0\0" .align 2,0 .global gUnknown_8115E94 @@ -8480,42 +8479,42 @@ gUnknown_8115E94: @ 8115E94 .global gUnknown_8115F5C gUnknown_8115F5C: @ 8115F5C - .asciz "GroundMain ground request %3d %3d" + .string "GroundMain ground request %3d %3d\0" .align 2,0 .global gUnknown_8115F80 gUnknown_8115F80: @ 8115F80 - .asciz "GroundMain recue request %3d %3d" + .string "GroundMain recue request %3d %3d\0" .align 2,0 .global gUnknown_8115FA4 gUnknown_8115FA4: @ 8115FA4 - .asciz "GroundMain user rescue request %3d" + .string "GroundMain user rescue request %3d\0" .align 2,0 .global gUnknown_8115FC8 gUnknown_8115FC8: @ 8115FC8 - .asciz "GroundMain game end request %3d" + .string "GroundMain game end request %3d\0" .align 2,0 .global gUnknown_8115FE8 gUnknown_8115FE8: @ 8115FE8 - .asciz "GroundMain game cancel request %3d" + .string "GroundMain game cancel request %3d\0" .align 2,0 - .asciz "pksdir0" - .asciz "pksdir0" + .string "pksdir0\0" + .string "pksdir0\0" .align 2,0 .global gUnknown_811601C gUnknown_811601C: @ 811601C - .asciz "fontsppa" + .string "fontsppa\0" .align 2,0 .global gUnknown_8116028 gUnknown_8116028: @ 8116028 - .asciz "fontpal" - .asciz "pksdir0" - .asciz "pksdir0" + .string "fontpal\0" + .string "pksdir0\0" + .string "pksdir0\0" .align 2,0 .global gUnknown_8116040 @@ -8562,13 +8561,13 @@ gUnknown_8116148: @ 8116148 .global gUnknown_811615C gUnknown_811615C: @ 811615C @ replacing .incbin "baserom.gba", 0x0011615c, 0x10 - .asciz "#CWinvalidity#R" + .string "#CWinvalidity#R\0" .align 2,0 .global gUnknown_811616C gUnknown_811616C: @ 811616C @ replacing .incbin "baserom.gba", 0x0011616c, 0x10 - .asciz "#CWundefine#R" + .string "#CWundefine#R\0" .align 2,0 .global gUnknown_811617C @@ -8584,7 +8583,7 @@ gUnknown_8116180: @ 8116180 .global gUnknown_8116188 gUnknown_8116188: @ 8116188 @ replacing .incbin "baserom.gba", 0x00116188, 0x8 - .asciz "#CN%s#R" + .string "#CN%s#R\0" .align 2,0 .global gUnknown_8116190 @@ -9059,14 +9058,14 @@ gUnknown_8117734: @ 8117734 .global gUnknown_8117740 gUnknown_8117740: @ 8117740 - .asciz "map type error %d" + .string "map type error %d\0" .align 2,0 .global gUnknown_8117754 gUnknown_8117754: @ 8117754 .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 - .asciz "GroundMap_Action" + .string "GroundMap_Action\0" .align 2,0 .global gUnknown_8117770 @@ -9079,37 +9078,37 @@ gUnknown_8117784: @ 8117784 .global gUnknown_811779C gUnknown_811779C: @ 811779C - .asciz "GroundWeather Select %3d %3d" + .string "GroundWeather Select %3d %3d\0" .align 2,0 .global gUnknown_81177BC gUnknown_81177BC: @ 81177BC .byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 - .asciz "pksdir0" + .string "pksdir0\0" .global gUnknown_81177CC gUnknown_81177CC: @ 81177CC - .asciz "etcfonta" + .string "etcfonta\0" .align 2,0 .global gUnknown_81177D8 gUnknown_81177D8: @ 81177D8 - .asciz "GroundSprite Reset" + .string "GroundSprite Reset\0" .align 2,0 .global gUnknown_81177EC gUnknown_81177EC: @ 81177EC - .asciz "palet" + .string "palet\0" .align 2,0 .global gUnknown_81177F4 gUnknown_81177F4: @ 81177F4 - .asciz "extend palette %3d[%3d] %04x up %04x" + .string "extend palette %3d[%3d] %04x up %04x\0" .align 2,0 - .asciz "../ground/ground_sprite.c" + .string "../ground/ground_sprite.c\0" .align 2,0 - .asciz "GroundSprite_ExtendPaletteAdd" + .string "GroundSprite_ExtendPaletteAdd\0" .align 2,0 .global gUnknown_8117858 @@ -9118,7 +9117,7 @@ gUnknown_8117858: @ 8117858 .global gUnknown_8117864 gUnknown_8117864: @ 8117864 - .asciz "extend palette buffer error %08x" + .string "extend palette buffer error %08x\0" .align 2,0 .global gUnknown_8117888 @@ -9127,12 +9126,12 @@ gUnknown_8117888: @ 8117888 .global gUnknown_8117894 gUnknown_8117894: @ 8117894 - .asciz "extend palette %3d[%3d] %04x set %04x %04x" + .string "extend palette %3d[%3d] %04x set %04x %04x\0" .align 2,0 .global gUnknown_81178C0 gUnknown_81178C0: @ 81178C0 - .asciz "extend palette %3d delete %04x" + .string "extend palette %3d delete %04x\0" .align 2,0 .global gUnknown_81178E0 @@ -9188,9 +9187,9 @@ gUnknown_8118050: @ 8118050 .byte 0x00, 0x14, 0x00, 0x00 .byte 0x00, 0x14, 0x00, 0x00 .byte 0x00, 0x18, 0x00, 0x00 - .asciz "../ground/ground_lives.c" + .string "../ground/ground_lives.c\0" .align 2,0 - .asciz "GroundLives_Select" + .string "GroundLives_Select\0" .align 2,0 .global gUnknown_811808C @@ -9199,17 +9198,17 @@ gUnknown_811808C: @ 811808C .global gUnknown_8118098 gUnknown_8118098: @ 8118098 - .asciz "GroundLives Select %3d %3d %3d" + .string "GroundLives Select %3d %3d %3d\0" .align 2,0 .global gUnknown_81180BC gUnknown_81180BC: @ 81180BC - .asciz "GroundLives Cancel %3d %3d" + .string "GroundLives Cancel %3d %3d\0" .align 2,0 .global gUnknown_81180D8 gUnknown_81180D8: @ 81180D8 - .asciz "GroundLives CancelBlank" + .string "GroundLives CancelBlank\0" .align 2,0 .global gUnknown_81180F0 @@ -9227,9 +9226,9 @@ gUnknown_81180FC: @ 81180FC .global gUnknown_811811C gUnknown_811811C: @ 811811C - .asciz "GroundLive Add id %3d kind %3d type %3d group %3d sector %3d" + .string "GroundLive Add id %3d kind %3d type %3d group %3d sector %3d\0" .align 2,0 - .asciz "GroundLives_Add" + .string "GroundLives_Add\0" .align 2,0 .global gUnknown_8118170 @@ -9248,14 +9247,14 @@ gUnknown_8118188: @ 8118188 .global gUnknown_8118194 gUnknown_8118194: @ 8118194 - .asciz "GroundLives Delete id %3d" + .string "GroundLives Delete id %3d\0" .align 2,0 .global gUnknown_81181B0 gUnknown_81181B0: @ 81181B0 - .asciz "GroundLives Execute %3d kind %3d %p" + .string "GroundLives Execute %3d kind %3d %p\0" .align 2,0 - .asciz "GroundLives_ExecuteScript" + .string "GroundLives_ExecuteScript\0" .align 2,0 .global gUnknown_81181F4 @@ -9304,24 +9303,24 @@ gUnknown_81183E4: @ 81183E4 .global gUnknown_81183F0 gUnknown_81183F0: @ 81183F0 - .asciz "GroundObject Select %3d %3d %3d" + .string "GroundObject Select %3d %3d %3d\0" .align 2,0 .global gUnknown_8118414 gUnknown_8118414: @ 8118414 - .asciz "GroundObject Cancel %3d" + .string "GroundObject Cancel %3d\0" .align 2,0 .global gUnknown_811842C gUnknown_811842C: @ 811842C - .asciz "GroundObject CancelBlank" + .string "GroundObject CancelBlank\0" .align 2,0 .global gUnknown_8118448 gUnknown_8118448: @ 8118448 - .asciz "GroundObject Add id %3d kind %3d[%3d] type %3d group %3d sector %3d" + .string "GroundObject Add id %3d kind %3d[%3d] type %3d group %3d sector %3d\0" .align 2,0 - .asciz "GroundObject_Add" + .string "GroundObject_Add\0" .align 2,0 .global gUnknown_81184A4 @@ -9330,14 +9329,14 @@ gUnknown_81184A4: @ 81184A4 .global gUnknown_81184B0 gUnknown_81184B0: @ 81184B0 - .asciz "GroundObject Delete id %3d" + .string "GroundObject Delete id %3d\0" .align 2,0 .global gUnknown_81184CC gUnknown_81184CC: @ 81184CC - .asciz "GroundObject Execute %3d " + .string "GroundObject Execute %3d \0" .align 2,0 - .asciz "GroundObject_ExecuteScript" + .string "GroundObject_ExecuteScript\0" .align 2,0 .global gUnknown_8118504 @@ -9410,10 +9409,10 @@ gUnknown_8118798: @ 8118798 .byte 0x6C, 0x87, 0x11, 0x08 .byte 0x4D, 0x00, 0x00, 0x00 .byte 0x84, 0x87, 0x11, 0x08 - .asciz "pksdir0" - .asciz "../ground/ground_event.c" + .string "pksdir0\0" + .string "../ground/ground_event.c\0" .align 2,0 - .asciz "GroundEvent_Select" + .string "GroundEvent_Select\0" .align 2,0 .global gUnknown_81187DC @@ -9424,61 +9423,61 @@ gUnknown_81187DC: @ 81187DC .global gGroundEventSelectText gGroundEventSelectText: @ 81187E8 - .asciz "GroundEvent Select %3d %3d %3d" + .string "GroundEvent Select %3d %3d %3d\0" .align 2,0 .global gGroundEventCancelText gGroundEventCancelText: @ 811880C - .asciz "GroundEvent Cancel %3d %3d" + .string "GroundEvent Cancel %3d %3d\0" .align 2,0 .global gGroundEventAddText gGroundEventAddText: @ 8118828 - .asciz "GroundEvent Add id %3d kind %3d group %3d sector %3d script %p" + .string "GroundEvent Add id %3d kind %3d group %3d sector %3d script %p\0" .align 2,0 .global gGroundEventDeleteText gGroundEventDeleteText: @ 811886C - .asciz "GroundEvent Delete id %3d" + .string "GroundEvent Delete id %3d\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gMapparamText gMapparamText: @ 8118890 - .asciz "mapparam" + .string "mapparam\0" .align 2,0 .global gUnknown_811889C gUnknown_811889C: @ 811889C - .asciz "b%02dfon" + .string "b%02dfon\0" .align 2,0 .global gUnknown_81188A8 gUnknown_81188A8: @ 81188A8 - .asciz "b%02dpal" + .string "b%02dpal\0" .align 2,0 .global gUnknown_81188B4 gUnknown_81188B4: @ 81188B4 - .asciz "b%02dcel" + .string "b%02dcel\0" .align 2,0 .global gUnknown_81188C0 gUnknown_81188C0: @ 81188C0 - .asciz "b%02dcex" + .string "b%02dcex\0" .align 2,0 .global gUnknown_81188CC gUnknown_81188CC: @ 81188CC - .asciz "b%02demap%01d" + .string "b%02demap%01d\0" .align 2,0 .global gUnknown_81188DC gUnknown_81188DC: @ 81188DC - .asciz "b%02dcanm" + .string "b%02dcanm\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gUnknown_81188F0 diff --git a/data/friend_area.inc b/data/friend_area.inc index 75d48ec..8e1c5b0 100644 --- a/data/friend_area.inc +++ b/data/friend_area.inc @@ -44,13 +44,13 @@ gUnknown_80DD190: @ 80DD190 (seems to be Friend Area Warp Script) .global gUnknown_80DD1A8 gUnknown_80DD1A8: @ 80DD1A8 - .asciz "Whom would you like to visit?" + .string "Whom would you like to visit?\0" .align 2,0 .global gUnknown_80DD1C8 gUnknown_80DD1C8: @ 80DD1C8 .string "#+The #C4$i1#R was\n" - .asciz "#+handed over. " + .string "#+handed over. \0" .align 2,0 .global gUnknown_80DD1EC @@ -58,66 +58,66 @@ gUnknown_80DD1EC: @ 80DD1EC .string "#+The #C4$i1#R was\n" .string "#+handed over.#P" .string "#+The #C4$i0#R was\n" - .asciz "#+returned to the Toolbox." + .string "#+returned to the Toolbox.\0" .align 2,0 .global gUnknown_80DD240 gUnknown_80DD240: @ 80DD240 .string "#+The #C4$i0#R was\n" - .asciz "#+returned to the Toolbox." + .string "#+returned to the Toolbox.\0" .align 2,0 .global gUnknown_80DD270 gUnknown_80DD270: @ 80DD270 .string "#+$m1 left the team to remain\n" - .asciz "#+on standby in the Friend Area." + .string "#+on standby in the Friend Area.\0" .align 2,0 .global gUnknown_80DD2B0 gUnknown_80DD2B0: @ 80DD2B0 - .asciz "Give" + .string "Give\0" .align 2,0 .global gUnknown_80DD2B8 gUnknown_80DD2B8: @ 80DD2B8 - .asciz "Take" + .string "Take\0" .align 2,0 .global gUnknown_80DD2C0 gUnknown_80DD2C0: @ 80DD2C0 - .asciz "Stand By" + .string "Stand By\0" .align 2,0 .global gUnknown_80DD2CC gUnknown_80DD2CC: @ 80DD2CC - .asciz "Visit" + .string "Visit\0" .align 2,0 .global gUnknown_80DD2D4 gUnknown_80DD2D4: @ 80DD2D4 - .asciz "Name" + .string "Name\0" .align 2,0 .global gUnknown_80DD2DC gUnknown_80DD2DC: @ 80DD2DC - .asciz "Summary" + .string "Summary\0" .align 2,0 .global gUnknown_80DD2E4 gUnknown_80DD2E4: @ 80DD2E4 - .asciz "Moves" + .string "Moves\0" .align 2,0 .global gUnknown_80DD2EC gUnknown_80DD2EC: @ 80DD2EC - .asciz "Check IQ" + .string "Check IQ\0" .align 2,0 .global gUnknown_80DD2F8 gUnknown_80DD2F8: @ 80DD2F8 - .asciz "Item: #C4$i0#R " + .string "Item: #C4$i0#R \0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2,0 .global gUnknown_80DD310 diff --git a/data/personality_test.s b/data/personality_test.s index 0bb2d8d..ea138f5 100644 --- a/data/personality_test.s +++ b/data/personality_test.s @@ -13,14 +13,14 @@ .byte 0x02, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 .byte 0xff, 0xff, 0xff, 0xff - .asciz "Ignore it and play." - .asciz "At the last second." - .asciz "Study hard." + .string "Ignore it and play.\0" + .string "At the last second.\0" + .string "Study hard.\0" .byte 0xe4, 0x00, 0x0f, 0x08 .byte 0x84, 0x00, 0x0f, 0x08 .byte 0x54, 0x00, 0x0f, 0x08 .string "A test is coming up.\n" - .asciz "How do you study for it?" + .string "How do you study for it?\0" .align 2,0 @ Question 2, Category 1 (Hardy) @@ -32,14 +32,14 @@ .byte 0x01, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 .byte 0xff, 0xff, 0xff, 0xff - .asciz "No. " + .string "No. \0" .align 2,0 - .asciz "Yes." + .string "Yes.\0" .align 2,0 .byte 0x68, 0x01, 0x0f, 0x08 .byte 0x34, 0x01, 0x0f, 0x08 .byte 0x14, 0x01, 0x0f, 0x08 - .asciz "Can you focus on something you like?" + .string "Can you focus on something you like?\0" .align 2,0 @ Question 3, Category 1 (Hardy) @@ -51,12 +51,12 @@ .byte 0x01, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 .byte 0xff, 0xff, 0xff, 0xff - .asciz "No." + .string "No.\0" .byte 0xd8, 0x01, 0x0f, 0x08 .byte 0xb0, 0x01, 0x0f, 0x08 .byte 0x90, 0x01, 0x0f, 0x08 .string "When the going gets tough~2c do you get\n" - .asciz "going?" + .string "going?\0" .align 2,0 @ Question 4, Category 1 (Hardy) @@ -70,17 +70,17 @@ .byte 0x02, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 .byte 0xff, 0xff, 0xff, 0xff - .asciz "A little." + .string "A little.\0" .align 2,0 - .asciz "Half." + .string "Half.\0" .align 2,0 - .asciz "Full." + .string "Full.\0" .align 2,0 .byte 0x80, 0x02, 0x0f, 0x08 .byte 0x38, 0x02, 0x0f, 0x08 .byte 0x08, 0x02, 0x0f, 0x08 .string "There is a bucket. If you put\n" - .asciz "water in it~2c how high will you fill it?" + .string "water in it~2c how high will you fill it?\0" .align 2,0 @ Question 1, Category 2 (Docile) @@ -92,15 +92,15 @@ .byte 0x01, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 .byte 0xff, 0xff, 0xff, 0xff - .asciz "Small box." + .string "Small box.\0" .align 2,0 - .asciz "Big box." + .string "Big box.\0" .align 2,0 .byte 0x24, 0x03, 0x0f, 0x08 .byte 0xe8, 0x02, 0x0f, 0x08 .byte 0xc8, 0x02, 0x0f, 0x08 .string "You are offered a choice of two gifts.\n" - .asciz "Which one will you take?" + .string "Which one will you take?\0" .align 2,0 @ Question 2, Category 2 (Docile) @@ -112,15 +112,15 @@ .byte 0x01, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 .byte 0xff, 0xff, 0xff, 0xff - .asciz "Take a sniff first." + .string "Take a sniff first.\0" .align 2,0 - .asciz "Open a window right away." + .string "Open a window right away.\0" .align 2,0 .byte 0xd8, 0x03, 0x0f, 0x08 .byte 0x84, 0x03, 0x0f, 0x08 .byte 0x64, 0x03, 0x0f, 0x08 .string "You broke a rotten egg in your room!\n" - .asciz "What will you do?" + .string "What will you do?\0" .align 2,0 @ Question 3, Category 2 (Docile) @@ -135,18 +135,18 @@ .byte 0x02, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 .byte 0xff, 0xff, 0xff, 0xff - .asciz "Say thanks~2c but be cool." + .string "Say thanks~2c but be cool.\0" .align 2,0 - .asciz "Say thanks with a joke." + .string "Say thanks with a joke.\0" .align 2,0 - .asciz "Say thank you regularly." + .string "Say thank you regularly.\0" .align 2,0 .byte 0xbc, 0x04, 0x0f, 0x08 .byte 0x40, 0x04, 0x0f, 0x08 .byte 0x10, 0x04, 0x0f, 0x08 .string "A friend brought over something you~27d\n" .string "forgotten.#W\n" - .asciz "How do you thank your friend?" + .string "How do you thank your friend?\0" .align 2,0 @ Question 4, Category 2 (Docile) @@ -161,16 +161,16 @@ .byte 0x02, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 .byte 0xff, 0xff, 0xff, 0xff - .asciz "Is anyone watching...?" + .string "Is anyone watching...?\0" .align 2,0 - .asciz "Yay! Yay!" + .string "Yay! Yay!\0" .align 2,0 - .asciz "Turn it in to the police!" + .string "Turn it in to the police!\0" .align 2,0 .byte 0xac, 0x05, 0x0f, 0x08 .byte 0x40, 0x05, 0x0f, 0x08 .byte 0x10, 0x05, 0x0f, 0x08 - .asciz "There is a wallet at the side of a road." + .string "There is a wallet at the side of a road.\0" .align 2,0 @ Question 1, Category 3 (Brave) @@ -188,8 +188,8 @@ .string "You~27re going bungee jumping for the first\n" .string "time.#PSince it~27s scary~2c you decide to test the\n" .string "jump with a doll...#W\n" - .string "And the bungee cord snaps!" - .asciz "#PWill you still try to make a jump anyway?" + .string "And the bungee cord snaps!#P" + .string "Will you still try to make a jump anyway?\0" .align 2,0 @ Question 2, Category 3 (Brave) @@ -204,17 +204,17 @@ .byte 0x02, 0x00, 0x00, 0x0 .byte 0x00, 0x00, 0x00, 0x00 .byte 0xff, 0xff, 0xff, 0xff - .asciz "Ignore it." + .string "Ignore it.\0" .align 2,0 - .asciz "Run." + .string "Run.\0" .align 2,0 - .asciz "Fight." + .string "Fight.\0" .align 2,0 .byte 0x50, 0x07, 0x0f, 0x08 .byte 0x08, 0x07, 0x0f, 0x08 .byte 0xd8, 0x06, 0x0f, 0x08 .string "There is an alien invasion!\n" - .asciz "What will you do?" + .string "What will you do?\0" .align 2,0 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 @@ -225,9 +225,9 @@ .byte 0x01, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 .byte 0xff, 0xff, 0xff, 0xff - .asciz "Refuse." + .string "Refuse.\0" .align 2,0 - .asciz "Rule with the aliens." + .string "Rule with the aliens.\0" .align 2,0 .byte 0xe4, 0x07, 0x0f, 0x08 .byte 0xa0, 0x07, 0x0f, 0x08 @@ -236,7 +236,7 @@ .string "But~2c you are defeated...#PAn alien says to you...#P~93YOU HAVE IMPRESSED US.\n" .string "IT WAS A PLEASURE TO SEE.#PJOIN US~2c AND TOGETHER WE SHALL\n" .string "RULE THE WORLD.~94#W\n" - .asciz "What will you do?" + .string "What will you do?\0" .align 2,0 .byte 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 @@ -247,15 +247,15 @@ .byte 0x01, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 .byte 0xff, 0xff, 0xff, 0xff - .asciz "Scream in unison." + .string "Scream in unison.\0" .align 2,0 - .asciz "Yank open the door." + .string "Yank open the door.\0" .align 2,0 .byte 0x28, 0x09, 0x0f, 0x08 .byte 0xdc, 0x08, 0x0f, 0x08 .byte 0xbc, 0x08, 0x0f, 0x08 .string "There is a scream from behind a door!#W\n" - .asciz "How will you react?" + .string "How will you react?\0" .align 2,0 .byte 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 @@ -996,7 +996,7 @@ .byte 0x3c, 0x22, 0x0f, 0x08 .string "There is a person you like...#W\n" .string "But there~27s no opportunity to get close.\n" - .asciz "What do you do?" + .string "What do you do?\0" .align 2,0 @ Question 4, Category 13 (Quirky) @@ -1013,11 +1013,11 @@ .byte 0x00, 0x00, 0x00, 0x00 .byte 0xff, 0xff, 0xff, 0xff - .asciz "Choose either side." + .string "Choose either side.\0" .align 2,0 - .asciz "It~27s a trap! Go left." + .string "It~27s a trap! Go left.\0" .align 2,0 - .asciz "Instantly go right." + .string "Instantly go right.\0" .align 2,0 .global QuirkyQuest4 @@ -1028,7 +1028,7 @@ .string "The road forks to the right and left.\n" .string "You are told there is a treasure on the\n" - .asciz "right side. What do you do?" + .string "right side. What do you do?\0" .align 2,0 @ Question 1, Category 14 (Miscellaneous) @@ -1040,9 +1040,9 @@ .byte 0x01, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 .byte 0xff, 0xff, 0xff, 0xff - .asciz "Go with others." + .string "Go with others.\0" .align 2,0 - .asciz "Go alone." + .string "Go alone.\0" .align 2,0 .global MiscQuest1 @@ -1050,7 +1050,7 @@ .byte 0xd4, 0x24, 0x0f, 0x08 .byte 0x94, 0x24, 0x0f, 0x08 .byte 0x74, 0x24, 0x0f, 0x08 - .asciz "On vacation outings~2c you want to..." + .string "On vacation outings~2c you want to...\0" .align 2,0 @ Question 2, Category 14 (Miscellaneous) @@ -1062,7 +1062,7 @@ .byte 0x01, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00 .byte 0xff, 0xff, 0xff, 0xff - .asciz "Don~27t care." + .string "Don~27t care.\0" .align 2,0 .global MiscQuest2 @@ -1071,7 +1071,7 @@ .byte 0x1c, 0x25, 0x0f, 0x08 @ Pointer to Answers Pointer Table .byte 0xfc, 0x24, 0x0f, 0x08 @ Nature Points for Answers .string "It~27s the summer festival!\n" - .asciz "Do you like carnivals?" + .string "Do you like carnivals?\0" .align 2,0 @ Question 3, Category 14 (Miscellaneous) @@ -1091,12 +1091,12 @@ .global MiscQuest3NotHappy MiscQuest3NotHappy: - .asciz "Not happy." + .string "Not happy.\0" .align 2,0 .global MiscQuest3Happy MiscQuest3Happy: - .asciz "Happy!" + .string "Happy!\0" .align 2,0 .global MiscQuest3 @@ -1108,7 +1108,7 @@ .global MiscQuest3Text MiscQuest3Text: .string "Somebody calls you ~93weird but funny.~94\n" - .asciz "How does that make you feel?" + .string "How does that make you feel?\0" .align 2,0 .global gPersonalityQuestionPointerTable @@ -1190,7 +1190,7 @@ gNatureQuestionTable: @ 80F2704 (Categories??) .global gGenderText gGenderText: @ 80F273C - .asciz "Are you a boy or a girl?" + .string "Are you a boy or a girl?\0" .align 2,0 .byte 0x3C, 0x27, 0x0F, 0x08 @ pointer to above text @@ -1205,14 +1205,13 @@ gUnknown_80F275C: @ 80F275C .global GirlText GirlText: - .asciz "Girl." + .string "Girl.\0" .align 2,0 .global BoyText BoyText: - .string "Boy." + .string "Boy.\0" - .byte 0x00 .byte 0x01 .byte 0x02 .byte 0x03 @@ -1260,8 +1259,7 @@ gStarters: @ 80F278E .global gStarterReveal gStarterReveal: @ 80F27C4 .string "\n" - .string "#+The Pokémon $m0!" - .byte 0 + .string "#+The Pokémon $m0!\0" .4byte gStarterReveal .global gUnknown_80F27DC @@ -1269,13 +1267,13 @@ gUnknown_80F27DC: @ 80F27DC .string "#+This is the final step.#W\n" .string "#+Who would you like to have as a partner?#P" @ #P -> scroll down .string "#+Choose the Pokémon you want\n" - .asciz "#+as your partner from this group." + .string "#+as your partner from this group.\0" .align 2,0 .4byte gUnknown_80F27DC .global gUnknown_80F286C gUnknown_80F286C: @ 80F286C - .asciz "#+What is your partner~27s nickname?" + .string "#+What is your partner~27s nickname?\0" .align 2,0 .4byte gUnknown_80F286C @@ -1284,7 +1282,7 @@ gUnknown_80F2898: @ 80F2898 .string "#+OK! We~27re all set!#P" .string "#+Let~27s get you into the\n" .string "#+world of Pokémon!#P" - .asciz "#+Go for it!" + .string "#+Go for it!\0" .align 2,0 .4byte gUnknown_80F2898 @@ -1321,7 +1319,7 @@ gPersonalityTypeDescriptionTable: @ 80F28F4 .string "#+If you realize how selfishly\n" .string "#+you~27re behaving~2c try to think\n" .string "#+before you do anything rash.#P" - .asciz "#+A quirky person like you should be..." + .string "#+A quirky person like you should be...\0" .align 2,0 .global gLonelyDescription @@ -1347,7 +1345,7 @@ gPersonalityTypeDescriptionTable: @ 80F28F4 .string "#+You know what it~27s like when you aren~27t\n" .string "#+alone~2c so that~27s why you feel lonesome.#P" .string "#+And that~27s why you aren~27t really alone.#P" - .asciz "#+A lonely person like you should be..." + .string "#+A lonely person like you should be...\0" .align 2,0 .global gRelaxedDescription @@ -1372,7 +1370,7 @@ gPersonalityTypeDescriptionTable: @ 80F28F4 .string "#+off into the distance...#P" .string "#+It should make that someone\n" .string "#+special~27s pulse race.#P" - .asciz "#+A relaxed person like you should be..." + .string "#+A relaxed person like you should be...\0" .align 2,0 .global gCalmDescription @@ -1392,7 +1390,7 @@ gPersonalityTypeDescriptionTable: @ 80F28F4 .string "#+And even a little sloppy.#P" .string "#+You might want to keep\n" .string "#+those points in mind.#P" - .asciz "#+A calm person like you should be..." + .string "#+A calm person like you should be...\0" .align 2,0 .global gSassyDescription @@ -1418,7 +1416,7 @@ gPersonalityTypeDescriptionTable: @ 80F28F4 .string "#+attitude is what defines you.#P" .string "#+It makes you exasperating and\n" .string "#+appealing at the same time.#P" - .asciz "#+A sassy person like you should be..." + .string "#+A sassy person like you should be...\0" .align 2,0 .global gHastyDescription @@ -1439,7 +1437,7 @@ gPersonalityTypeDescriptionTable: @ 80F28F4 .string "#+the A Button repeatedly now.#P" .string "#+Beware--getting too easily irritated\n" .string "#+just isn~27t good for your well-being.#P" - .asciz "#+A hasty person like you should be..." + .string "#+A hasty person like you should be...\0" .align 2,0 .global gTimidDescription @@ -1458,7 +1456,7 @@ gPersonalityTypeDescriptionTable: @ 80F28F4 .string "#+also your good point!#P" .string "#+Because those who know fear are\n" .string "#+those who know true courage.#P" - .asciz "#+A timid person like you should be..." + .string "#+A timid person like you should be...\0" .align 2,0 .global gNaiveDescription @@ -1476,7 +1474,7 @@ gPersonalityTypeDescriptionTable: @ 80F28F4 .string "#+You~27re always on the move.#P" .string "#+You can also be selfish~2c\n" .string "#+so you should watch yourself.#P" - .asciz "#+A naive person like you should be..." + .string "#+A naive person like you should be...\0" .align 2,0 .global gImpishDescription @@ -1497,7 +1495,7 @@ gPersonalityTypeDescriptionTable: @ 80F28F4 .string "#+to let their feelings be known.#P" .string "#+There~27s someone out there who~27s\n" .string "#+afraid to declare their love for you!#P" - .asciz "#+An impish person like you should be..." + .string "#+An impish person like you should be...\0" .align 2,0 .global gJollyDescription @@ -1513,7 +1511,7 @@ gPersonalityTypeDescriptionTable: @ 80F28F4 .string "#+and say things that get you in trouble.#P" .string "#+You should learn to think before\n" .string "#+saying or doing anything.#P" - .asciz "#+A jolly person like you should be..." + .string "#+A jolly person like you should be...\0" .align 2,0 .global gBraveDescription @@ -1530,7 +1528,7 @@ gPersonalityTypeDescriptionTable: @ 80F28F4 .string "#+Fight the forces of evil!#P" .string "#+......#WIf I~27m wrong...#W\n" .string "#+Work at becoming a true hero!#P" - .asciz "#+A brave person like you should be..." + .string "#+A brave person like you should be...\0" .align 2,0 .global gDocileDescription @@ -1545,7 +1543,7 @@ gPersonalityTypeDescriptionTable: @ 80F28F4 .string "#+I don~27t think so.#P" .string "#+You yourself should be\n" .string "#+the best judge of that.#P" - .asciz "#+A docile person like you should be..." + .string "#+A docile person like you should be...\0" .align 2,0 .global gHardyDescription @@ -1560,5 +1558,5 @@ gPersonalityTypeDescriptionTable: @ 80F28F4 .string "#+point of even feuding with friends...#P" .string "#+Nothing will go right for you when you~27re\n" .string "#+irritated~2c so learn to laugh it off.#P" - .string "#+A hardy person like you should be..." + .string "#+A hardy person like you should be...\0" .align 2,0 diff --git a/data/system_sbin.s b/data/system_sbin.s index 7a40973..73aac26 100644 --- a/data/system_sbin.s +++ b/data/system_sbin.s @@ -3,10 +3,10 @@ .global gUnknown_8300500 gUnknown_8300500: @ 8300500 @ replacing .incbin "baserom.gba", 0x00300500, 0x72e40 -.asciz "pksdir0" +.string "pksdir0\0" .byte 0xaf, 0x01, 0x00, 0x00 @ 431 (421 level maps) .byte 0x18, 0x05, 0x30, 0x08 @ Pointer to Data Root Table -.asciz "pksdir0" +.string "pksdir0\0" @ Data Root Table .byte 0x14, 0x20, 0x30, 0x08 @ Pointer to font string @@ -873,7 +873,7 @@ gUnknown_8300500: @ 8300500 .byte 0xf4, 0x0b, 0x36, 0x08 @ End of Data Root Table -.asciz "wazapara" +.string "wazapara\0" .align 2,0 .byte 0x6d, 0x6f, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x61, 0x00, 0x00, 0x00, 0x00 .byte 0x6c, 0x76, 0x6d, 0x70, 0x34, 0x32, 0x31, 0x00 diff --git a/data/text/chunsoft.inc b/data/text/chunsoft.inc index b7723a5..19c7513 100644 --- a/data/text/chunsoft.inc +++ b/data/text/chunsoft.inc @@ -1,11 +1,11 @@ gUnknown_80E6E50:: @ 80E6E50 - .asciz "CHUNSOFT" + .string "CHUNSOFT\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" - .asciz "pksdir0" + .string "pksdir0\0" - .asciz "pksdir0" + .string "pksdir0\0" - .asciz "pksdir0" + .string "pksdir0\0" diff --git a/data/text/luminous_cave.inc b/data/text/luminous_cave.inc index 92b9c2d..3446aa8 100644 --- a/data/text/luminous_cave.inc +++ b/data/text/luminous_cave.inc @@ -1,131 +1,128 @@ gUnknown_80DCA34:: @ 80DCA34 - .string "#+...#WA voice emanates from somewhere...#P#+...Ye who seek awak" - .string "ening...#P#+This is Luminous Cave.#W\n" - .string "#+Do ye seek a new evolution?" - .byte 0 + .string "#+...#WA voice emanates from somewhere...#P" + .string "#+...Ye who seek awakening...#P" + .string "#+This is Luminous Cave.#W\n" + .string "#+Do ye seek a new evolution?\0" .align 2, 0 gUnknown_80DCAB8:: @ 80DCAB8 - .string "#+Do ye seek evolution?" - .byte 0 + .string "#+Do ye seek evolution?\0" .align 2, 0 gUnknown_80DCAD0:: @ 80DCAD0 .string "#+There are those among Pokémon\n" - .string "#+that can evolve.#P#+Such Pokémon can evolve at this very\n" - .string "#+spot if they satisfy certain conditions.#P#+Evolution brings about changes\n" - .string "#+in appearance and abilities.#P#+Not only that~2c some Pokémon even change\n" - .string "#+type and learn different moves.#P#+However...#W The requirements for\n" - .string "#+evolution differ among Pokémon.#P#+Some become ready for evolution\n" - .string "#+merely by leveling up.#P#+Still others may need special items\n" - .string "#+to attain evolution.#P#+Ye must also be aware of this:#P#+Once it has evolved~2c a Pokémon\n" - .string "#+can never regain its previous form.#P#+That is why ye must think carefully\n" - .string "#+before committing to evolution." - .byte 0 + .string "#+that can evolve.#P" + .string "#+Such Pokémon can evolve at this very\n" + .string "#+spot if they satisfy certain conditions.#P" + .string "#+Evolution brings about changes\n" + .string "#+in appearance and abilities.#P" + .string "#+Not only that~2c some Pokémon even change\n" + .string "#+type and learn different moves.#P" + .string "#+However...#W The requirements for\n" + .string "#+evolution differ among Pokémon.#P" + .string "#+Some become ready for evolution\n" + .string "#+merely by leveling up.#P" + .string "#+Still others may need special items\n" + .string "#+to attain evolution.#P" + .string "#+Ye must also be aware of this:#P" + .string "#+Once it has evolved~2c a Pokémon\n" + .string "#+can never regain its previous form.#P" + .string "#+That is why ye must think carefully\n" + .string "#+before committing to evolution.\0" .align 2, 0 gUnknown_80DCD5C:: @ 80DCD5C .string "#+Ye shall return if evolution\n" - .string "#+is what ye seek..." - .byte 0 + .string "#+is what ye seek...\0" .align 2, 0 gUnknown_80DCD90:: @ 80DCD90 - .string "#+Will ye give an item for evolution?" - .byte 0 + .string "#+Will ye give an item for evolution?\0" .align 2, 0 gUnknown_80DCDB8:: @ 80DCDB8 - .string "#+Will ye give yet another item?" - .byte 0 + .string "#+Will ye give yet another item?\0" .align 2, 0 gUnknown_80DCDDC:: @ 80DCDDC .string "#+Alas~2c ye seem to lack what is needed\n" - .string "#+for evolution." - .byte 0 + .string "#+for evolution.\0" .align 2, 0 gUnknown_80DCE18:: @ 80DCE18 - .string "#+Ye seem to have but one item." - .byte 0 + .string "#+Ye seem to have but one item.\0" .align 2, 0 gUnknown_80DCE38:: @ 80DCE38 .string "#+...Ye who seek awakening...\n" - .string "#+Let us begin." - .byte 0 + .string "#+Let us begin.\0" .align 2, 0 gUnknown_80DCE68:: @ 80DCE68 - .string "#+...#W" - .byte 0x24 - .string "n0 is undergoing changes...#P#+" - .byte 0x24 - .string "n0~27s appearance changed...#P" - .byte 0 + .string "#+...#W$n0 is undergoing changes...#P" + .string "#+$n0~27s appearance changed...#P\0" .align 2, 0 gUnknown_80DCEB0:: @ 80DCEB0 - .string "#+It evolved from #C4" - .byte 0x24 - .string "m0#R\n" - .string "#+to #C6" - .byte 0x24 - .string "m1#R!" - .byte 0 + .string "#+It evolved from #C4$m0#R\n" + .string "#+to #C6$m1#R!\0" .align 2, 0 gUnknown_80DCEDC:: @ 80DCEDC - .string "#+...#P#+One cannot evolve if one\n" - .string "#+is in the company of others.#P#+Come alone if ye wish to evolve." - .byte 0 + .string "#+...#P" + .string "#+One cannot evolve if one\n" + .string "#+is in the company of others.#P" + .string "#+Come alone if ye wish to evolve.\0" .align 2, 0 gUnknown_80DCF44:: @ 80DCF44 - .string "#+...#P#+Ye cannot evolve yet.#P#+Ye have not high enough a level." - .byte 0 + .string "#+...#P" + .string "#+Ye cannot evolve yet.#P" + .string "#+Ye have not high enough a level.\0" .align 2, 0 gUnknown_80DCF88:: @ 80DCF88 - .string "#+...#P#+Ye cannot evolve anymore." - .byte 0 + .string "#+...#P" + .string "#+Ye cannot evolve anymore.\0" .align 2, 0 gUnknown_80DCFAC:: @ 80DCFAC - .string "#+...#P#+Ye cannot evolve yet.#P#+Ye need your Friend Area to evolve." - .byte 0 + .string "#+...#P" + .string "#+Ye cannot evolve yet.#P" + .string "#+Ye need your Friend Area to evolve.\0" .align 2, 0 gUnknown_80DCFF4:: @ 80DCFF4 - .string "#+...#P#+Ye cannot evolve yet.#P#+The Friend Area to which ye shall go\n" - .string "#+has no room for ye." - .byte 0 + .string "#+...#P" + .string "#+Ye cannot evolve yet.#P" + .string "#+The Friend Area to which ye shall go\n" + .string "#+has no room for ye.\0" .align 2, 0 gUnknown_80DD054:: @ 80DD054 - .string "#+...#P#+Ye cannot evolve yet.#P#+Ye seem to lack the IQ to evolve." - .byte 0 + .string "#+...#P" + .string "#+Ye cannot evolve yet.#P" + .string "#+Ye seem to lack the IQ to evolve.\0" .align 2, 0 gUnknown_80DD098:: @ 80DD098 - .string "#+#+...#P#+Ye cannot evolve yet.#P#+Ye seem to lack an item to evolve." - .byte 0 + .string "#+#+...#P" + .string "#+Ye cannot evolve yet.#P" + .string "#+Ye seem to lack an item to evolve.\0" .align 2, 0 gUnknown_80DD0E0:: @ 80DD0E0 - .string "#+#+...#P#+Ye cannot evolve yet. " - .byte 0 + .string "#+#+...#P" + .string "#+Ye cannot evolve yet. \0" .align 2, 0 gUnknown_80DD104:: @ 80DD104 .string "#+Ye must give a name to\n" - .string "#+the evolved Pokémon. " - .byte 0 + .string "#+the evolved Pokémon. \0" .align 2, 0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2, 0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2, 0 diff --git a/data/text/party_menu.inc b/data/text/party_menu.inc index f23f231..73c5856 100644 --- a/data/text/party_menu.inc +++ b/data/text/party_menu.inc @@ -1,128 +1,109 @@ gUnknown_80DD388:: @ 80DD388 .string "You have chosen to say farewell\n" - .string "to this Pokémon.#PThe Pokémon will leave its Friend Area.\n" + .string "to this Pokémon.#P" + .string "The Pokémon will leave its Friend Area.\n" .string "It will no longer be available for\n" - .asciz "adventures. Is that OK?" + .string "adventures. Is that OK?\0" .align 2, 0 gUnknown_80DD420:: @ 80DD420 .string "If you say farewell to this\n" - .string "Pokémon~2c it will be gone forever.#PYou will never be able to get another one\n" + .string "Pokémon~2c it will be gone forever.#P" + .string "You will never be able to get another one\n" .string "like it to join your team.\n" - .asciz "Will you release it anyway?" + .string "Will you release it anyway?\0" .align 2, 0 gUnknown_80DD4C4:: @ 80DD4C4 - .string "#+" - .byte 0x24 - .string "m1 joined the\n" - .asciz "#+rescue team for adventures!" + .string "#+$m1 joined the\n" + .string "#+rescue team for adventures!\0" .align 2, 0 gUnknown_80DD4F4:: @ 80DD4F4 - .string "#+" - .byte 0x24 - .string "m1 left the team to remain\n" - .asciz "#+on standby in the Friend Area." + .string "#+$m1 left the team to remain\n" + .string "#+on standby in the Friend Area.\0" .align 2, 0 gUnknown_80DD534:: @ 80DD534 - .string "#+" - .byte 0x24 - .string "m1 became the leader\n" - .asciz "#+of the rescue team." + .string "#+$m1 became the leader\n" + .string "#+of the rescue team.\0" .align 2, 0 gUnknown_80DD564:: @ 80DD564 - .string "#+" - .byte 0x24 - .string "m1 left\n" + .string "#+$m1 left\n" .string "#+the Friend Area.\n" - .string "#+Bye-bye~2c " - .byte 0x24 - .asciz "m1!" - .align 2,0 + .string "#+Bye-bye~2c $m1!\0" + .align 2,0 gUnknown_80DD594:: @ 80DD594 - .string "#+The #C4" - .byte 0x24 - .string "i1#R was\n" - .asciz "#+handed over. " + .string "#+The #C4$i1#R was\n" + .string "#+handed over. \0" .align 2, 0 gUnknown_80DD5B8:: @ 80DD5B8 - .string "#+The #C4" - .byte 0x24 - .string "i1#R was\n" - .string "#+handed over.#P#+The #C4" - .byte 0x24 - .string "i0#R was\n" - .asciz "#+returned to the Toolbox." + .string "#+The #C4$i1#R was\n" + .string "#+handed over.#P" + .string "#+The #C4$i0#R was\n" + .string "#+returned to the Toolbox.\0" .align 2, 0 gUnknown_80DD60C:: @ 80DD60C - .string "#+The #C4" - .byte 0x24 - .string "i0#R was\n" - .asciz "#+returned to the Toolbox." + .string "#+The #C4$i0#R was\n" + .string "#+returned to the Toolbox.\0" .align 2, 0 gUnknown_80DD63C:: @ 80DD63C - .string "#+The #C4" - .byte 0x24 - .string "i0#R was\n" - .asciz "#+sent to storage." + .string "#+The #C4$i0#R was\n" + .string "#+sent to storage.\0" .align 2, 0 gUnknown_80DD664:: @ 80DD664 - .asciz "Stand By" + .string "Stand By\0" .align 2, 0 gUnknown_80DD670:: @ 80DD670 - .asciz "Make Leader" - .align 2,0 + .string "Make Leader\0" + .align 2,0 gUnknown_80DD67C:: @ 80DD67C - .asciz "Join Team" + .string "Join Team\0" .align 2, 0 gUnknown_80DD688:: @ 80DD688 - .asciz "Give Gummi" + .string "Give Gummi\0" .align 2, 0 gUnknown_80DD694:: @ 80DD694 - .asciz "Give" + .string "Give\0" .align 2, 0 gUnknown_80DD69C:: @ 80DD69C - .asciz "Take" + .string "Take\0" .align 2, 0 gUnknown_80DD6A4:: @ 80DD6A4 - .asciz "Say Farewell" + .string "Say Farewell\0" .align 2, 0 gUnknown_80DD6B4:: @ 80DD6B4 - .asciz "Summary" + .string "Summary\0" .align 2, 0 gUnknown_80DD6BC:: @ 80DD6BC - .asciz "Moves" + .string "Moves\0" .align 2, 0 gUnknown_80DD6C4:: @ 80DD6C4 - .asciz "Check IQ" + .string "Check IQ\0" .align 2, 0 gUnknown_80DD6D0:: @ 80DD6D0 - .string "Item: #C4" - .byte 0x24 - .asciz "i0#R " + .string "Item: #C4$i0#R \0" .align 2, 0 gUnknown_80DD6E0:: @ 80DD6E0 - .asciz "%s" + .string "%s\0" .align 2, 0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2, 0 diff --git a/data/text/save.inc b/data/text/save.inc index 4843851..b01e2d8 100644 --- a/data/text/save.inc +++ b/data/text/save.inc @@ -1,38 +1,32 @@ gUnknown_80B6A34:: @ 80B6A34 .string "#+Quicksaving your adventure...\n" - .string "#+Please don~27t turn off the power." - .byte 0 + .string "#+Please don~27t turn off the power.\0" .align 2, 0 gUnknown_80B6A7C:: @ 80B6A7C - .string "#+Your adventure has been saved." - .byte 0 + .string "#+Your adventure has been saved.\0" .align 2, 0 gUnknown_80B6AA0:: @ 80B6AA0 .string "#+Your adventure has been saved.\n" .string "#+When you are in a dungeon~2c quicksave\n" - .string "#+your progress before ending the game." - .byte 0 + .string "#+your progress before ending the game.\0" .align 2, 0 gUnknown_80B6B14:: @ 80B6B14 .string "#+The data could not be written.\n" .string "#+Please turn off the power and remove\n" - .string "#+and reinsert the DS Card." - .byte 0 + .string "#+and reinsert the DS Card.\0" .align 2, 0 gUnknown_80B6B78:: @ 80B6B78 - .string "#+Save failed." - .byte 0 + .string "#+Save failed.\0" .align 2, 0 gUnknown_80B6B88:: @ 80B6B88 .string "#+Error reading data.\n" .string "#+Please turn off the power and reinsert\n" - .string "#+the DS Game Card." - .byte 0 + .string "#+the DS Game Card.\0" .align 2, 0 gUnknown_80B6BDC:: @ 80B6BDC @@ -40,18 +34,16 @@ gUnknown_80B6BDC:: @ 80B6BDC .string "#+so your game cannot be resumed\n" .string "#+from your last spot.#P#+Your last outing is considered a defeat.\n" .string "#+Before shutting down~2c save in your\n" - .string "#+team base~2c or quicksave in a dungeon." - .byte 0 + .string "#+team base~2c or quicksave in a dungeon.\0" .align 2, 0 gUnknown_80B6CB8:: @ 80B6CB8 .string "#+You may not resume your dungeon\n" .string "#+adventure using this saved data.\n" - .string "#+Your last outing is considered a defeat." - .byte 0 + .string "#+Your last outing is considered a defeat.\0" .align 2, 0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2, 0 .incbin "baserom.gba", 0xB6D30, 0x60 diff --git a/data/text/type_names.inc b/data/text/type_names.inc index feffc64..57913c6 100644 --- a/data/text/type_names.inc +++ b/data/text/type_names.inc @@ -21,90 +21,90 @@ gUnformattedTypeStrings:: @ 810AD4C .global gSteelText gSteelText: -.asciz "Steel" +.string "Steel\0" .align 2,0 .global gDarkText gDarkText: -.asciz "Dark" +.string "Dark\0" .align 2,0 .global gDragonText gDragonText: -.asciz "Dragon" +.string "Dragon\0" .align 2,0 .global gGhostText gGhostText: -.asciz "Ghost" +.string "Ghost\0" .align 2,0 .global gRockText gRockText: -.asciz "Rock" +.string "Rock\0" .align 2,0 .global gBugText gBugText: -.asciz "Bug" +.string "Bug\0" .align 2,0 .global gPsychicText gPsychicText: -.asciz "Psychic" +.string "Psychic\0" .align 2,0 .global gFlyingText gFlyingText: -.asciz "Flying" +.string "Flying\0" .align 2,0 .global gGroundText gGroundText: -.asciz "Ground" +.string "Ground\0" .align 2,0 .global gPoisonText gPoisonText: -.asciz "Poison" +.string "Poison\0" .align 2,0 .global gFightingText gFightingText: -.asciz "Fighting" +.string "Fighting\0" .align 2,0 .global gIceText gIceText: -.asciz "Ice" +.string "Ice\0" .align 2,0 .global gElectricText gElectricText: -.asciz "Electric" +.string "Electric\0" .align 2,0 .global gGrassText gGrassText: -.asciz "Grass" +.string "Grass\0" .align 2,0 .global gWaterText gWaterText: -.asciz "Water" +.string "Water\0" .align 2,0 .global gFireText gFireText: -.asciz "Fire" +.string "Fire\0" .align 2,0 .global gNormalText gNormalText: -.asciz "Normal" +.string "Normal\0" .align 2,0 .global gNoneText gNoneText: -.asciz "None" +.string "None\0" .align 2,0 diff --git a/data/text/wonder_mail_1.inc b/data/text/wonder_mail_1.inc index a5ec8a2..a7611fa 100644 --- a/data/text/wonder_mail_1.inc +++ b/data/text/wonder_mail_1.inc @@ -1,351 +1,313 @@ gUnknown_80DDBA8:: @ 80DDBA8 .string " What you need to do is\n" .string "tell your friend--the one you rescued--\n" - .string "this here password." - .byte 0 + .string "this here password.\0" .align 2, 0 gUnknown_80DDBFC:: @ 80DDBFC .string " All righty!\n" - .string "Here~27s your #CGA-OK Mail password#R." - .byte 0 + .string "Here~27s your #CGA-OK Mail password#R.\0" .align 2, 0 gUnknown_80DDC30:: @ 80DDC30 .string " Okeydoke! That~27s all done.\n" - .string "Come around whenever you need." - .byte 0 + .string "Come around whenever you need.\0" .align 2, 0 gUnknown_80DDC70:: @ 80DDC70 .string " Okeydoke! I sent off your\n" - .string "#CGA-OK Mail#R.#P Let me save your adventure." - .byte 0 + .string "#CGA-OK Mail#R.#P" + .string " Let me save your adventure.\0" .align 2, 0 gUnknown_80DDCBC:: @ 80DDCBC .string "#+Please choose the Pokémon you want to\n" .string "#+send as a helper to your friend.\n" - .string "#+(Its hold item will not be sent.)" - .byte 0 + .string "#+(Its hold item will not be sent.)\0" .align 2, 0 gUnknown_80DDD2C:: @ 80DDD2C .string " ...Uh~2c no?\n" .string "There appear to be no Pokémon in your\n" - .string "Friend Areas. What do you want to do?" - .byte 0 + .string "Friend Areas. What do you want to do?\0" .align 2, 0 gUnknown_80DDD88:: @ 80DDD88 .string " You~27re sure you want to\n" - .string "send this here Pokémon?" - .byte 0 + .string "send this here Pokémon?\0" @ must stay .string due to encoding issues .align 2, 0 gUnknown_80DDDBC:: @ 80DDDBC - .string " You~27re sure about this?" - .byte 0 + .string " You~27re sure about this?\0" .align 2, 0 gUnknown_80DDDD8:: @ 80DDDD8 .string " All righty. I need you to\n" - .string "pick the #CGA-OK Mail#R you want to send." - .byte 0 + .string "pick the #CGA-OK Mail#R you want to send.\0" .align 2, 0 gUnknown_80DDE20:: @ 80DDE20 .string " ...Uh~2c no?\n" - .string "I don~27t see any #CGA-OK Mail#R here." - .byte 0 + .string "I don~27t see any #CGA-OK Mail#R here.\0" .align 2, 0 gUnknown_80DDE58:: @ 80DDE58 .string " Did you know? If you use\n" .string "a #CGGame Link cable#R~2c you can send\n" - .string "a #CGhelper Pokémon#R to your friend." - .byte 0 + .string "a #CGhelper Pokémon#R to your friend.\0" .align 2, 0 gUnknown_80DDEC0:: @ 80DDEC0 .string " Don~27t you worry. Sending\n" .string "a Pokémon doesn~27t mean it will go away.\n" - .string "So! Want to send one to your friend?" - .byte 0 + .string "So! Want to send one to your friend?\0" .align 2, 0 gUnknown_80DDF2C:: @ 80DDF2C .string " ...Uh~2c no?\n" .string "There~27s no space at all to receive\n" - .string "any more mail.#P Delete some old mail~2c\n" + .string "any more mail.#P" + .string " Delete some old mail~2c\n" .string "and then come to me to receive\n" - .string "your mail~2c OK?" - .byte 0 + .string "your mail~2c OK?\0" .align 2, 0 gUnknown_80DDFB8:: @ 80DDFB8 .string " All righty! Connect up\n" .string "the #CGGame Link cable#R~2c if you~27d please.\n" - .string "Your friend ready~2c too?" - .byte 0 + .string "Your friend ready~2c too?\0" .align 2, 0 gUnknown_80DE01C:: @ 80DE01C .string "#+Communicating...\n" .string "#+Please wait with the power on.\n" - .string "#+To cancel~2c press {B_BUTTON}." - .byte 0 + .string "#+To cancel~2c press {B_BUTTON}.\0" .align 2, 0 gUnknown_80DE06C:: @ 80DE06C .string " Okeydoke!\n" - .string "I received your friend~27s #CGSOS Mail#R.#P Let me save your adventure." - .byte 0 + .string "I received your friend~27s #CGSOS Mail#R.#P" + .string " Let me save your adventure.\0" .align 2, 0 gUnknown_80DE0C0:: @ 80DE0C0 .string " Okeydoke! You~27re good to go.\n" .string "Just give me a shout when you~27d like\n" - .string "to go rescue your friend." - .byte 0 + .string "to go rescue your friend.\0" .align 2, 0 gUnknown_80DE124:: @ 80DE124 .string " OK~2c I need you to enter\n" .string "the #CGSOS Mail password#R that your\n" - .string "friend gave you." - .byte 0 + .string "friend gave you.\0" .align 2, 0 gUnknown_80DE178:: @ 80DE178 .string " How do you want to receive\n" - .string "your friend~27s #CGSOS Mail#R?" - .byte 0 + .string "your friend~27s #CGSOS Mail#R?\0" .align 2, 0 gUnknown_80DE1B4:: @ 80DE1B4 .string " How do you want to send\n" - .string "your #CGA-OK Mail#R?" - .byte 0 + .string "your #CGA-OK Mail#R?\0" .align 2, 0 gUnknown_80DE1E4:: @ 80DE1E4 .string " ...Uh~2c no?\n" - .string "You don~27t have an #CGSOS Mail#R.#P You~27ll need to arrange\n" + .string "You don~27t have an #CGSOS Mail#R.#P" + .string " You~27ll need to arrange\n" .string "to receive your friend~27s #CGSOS Mail#R first.\n" - .string "That~27s what you need to do." - .byte 0 + .string "That~27s what you need to do.\0" .align 2, 0 gUnknown_80DE280:: @ 80DE280 .string " Okeydoke!\n" - .string "Let me show you to the rescue site." - .byte 0 + .string "Let me show you to the rescue site.\0" .align 2, 0 gUnknown_80DE2B0:: @ 80DE2B0 .string " ...Uh~2c no?\n" .string "Doesn~27t look like you can go to the dungeon\n" - .string "named in this #CGSOS Mail#R.#P Come see me about doing\n" + .string "named in this #CGSOS Mail#R.#P" + .string " Come see me about doing\n" .string "this rescue when you can actually go\n" - .string "to that dungeon~2c all right?" - .byte 0 + .string "to that dungeon~2c all right?\0" .align 2, 0 gUnknown_80DE368:: @ 80DE368 .string " ...Uh~2c no?\n" .string "You~27ve blown this rescue mission too\n" - .string "often. Your friend~27s team is beyond help.#P I~27m sorry to say this~2c\n" + .string "often. Your friend~27s team is beyond help.#P" + .string " I~27m sorry to say this~2c\n" .string "but you~27ll have to tell your friend that\n" - .string "your rescue attempts failed." - .byte 0 + .string "your rescue attempts failed.\0" .align 2, 0 gUnknown_80DE430:: @ 80DE430 .string " Okeydoke.\n" .string "I~27ll need you to choose the #CGSOS Mail#R\n" - .string "for you to go on a rescue mission." - .byte 0 + .string "for you to go on a rescue mission.\0" .align 2, 0 gUnknown_80DE48C:: @ 80DE48C .string " What kind of mail do you\n" - .string "want to delete?" - .byte 0 + .string "want to delete?\0" .align 2, 0 gUnknown_80DE4B8:: @ 80DE4B8 .string " All righty. Choose\n" - .string "the #CGSOS Mail#R you don~27t need." - .byte 0 + .string "the #CGSOS Mail#R you don~27t need.\0" + .align 2, 0 gUnknown_80DE4F0:: @ 80DE4F0 .string " ...Uh~2c no?\n" - .string "You don~27t have any #CGSOS Mail#R." - .byte 0 + .string "You don~27t have any #CGSOS Mail#R.\0" .align 2, 0 gUnknown_80DE524:: @ 80DE524 .string " If you want a reward~2c #C2don~27t\n" .string "delete an A-OK Mail#R before getting a\n" - .string "#CGThank-You Mail#R back for it.#P #C2Be careful#R if you~27re going\n" - .string "to delete any #CGA-OK Mail#R.#P Okeydoke.\n" + .string "#CGThank-You Mail#R back for it.#P" + .string " #C2Be careful#R if you~27re going\n" + .string "to delete any #CGA-OK Mail#R.#P" + .string " Okeydoke.\n" .string "Choose an #CGA-OK Mail#R\n" - .string "you don~27t need anymore." - .byte 0 + .string "you don~27t need anymore.\0" .align 2, 0 gUnknown_80DE614:: @ 80DE614 .string " ...Uh~2c no?\n" - .string "You don~27t have any #CGA-OK Mail#R." - .byte 0 + .string "You don~27t have any #CGA-OK Mail#R.\0" .align 2, 0 gUnknown_80DE648:: @ 80DE648 .string " Uh~2c OK.\n" .string "So~2c you want me to delete every piece\n" - .string "of mail that you have." - .byte 0 + .string "of mail that you have.\0" .align 2, 0 gUnknown_80DE694:: @ 80DE694 .string " ...Uh~2c no?\n" .string "You don~27t have a single piece of\n" - .string "mail on you!" - .byte 0 + .string "mail on you!\0" .align 2, 0 gUnknown_80DE6D4:: @ 80DE6D4 .string " So~2c delete all your #CGSOS Mail#R~2c\n" .string "#CGA-OK Mail#R~2c and your #CGThank-You Mail#R?\n" - .string "You~27re absolutely~2c positively sure?" - .byte 0 + .string "You~27re absolutely~2c positively sure?\0" + .align 2, 0 gUnknown_80DE754:: @ 80DE754 .string " If I delete any mail~2c it~27s\n" .string "gone forever and ever. Bye-bye.\n" - .string "You~27re really~2c really sure now?" - .byte 0 + .string "You~27re really~2c really sure now?\0" + .align 2, 0 gUnknown_80DE7B8:: @ 80DE7B8 .string " OK~2c then.\n" - .string "Let me save your adventure now." - .byte 0 + .string "Let me save your adventure now.\0" .align 2, 0 gUnknown_80DE7E8:: @ 80DE7E8 - .string " Okeydoke. That~27s all done." - .byte 0 + .string " Okeydoke. That~27s all done.\0" .align 2, 0 gUnknown_80DE808:: @ 80DE808 .string " Do you want to delete\n" - .string "any other mail?" - .byte 0 + .string "any other mail?\0" .align 2, 0 gUnknown_80DE830:: @ 80DE830 .string " Okeydoke.\n" - .string "I~27ll delete #CGevery piece of mail#R." - .byte 0 + .string "I~27ll delete #CGevery piece of mail#R.\0" .align 2, 0 gUnknown_80DE864:: @ 80DE864 .string " Okeydoke.\n" - .string "Every bit of mail has been deleted.#P Let me save your adventure." - .byte 0 + .string "Every bit of mail has been deleted.#P" + .string " Let me save your adventure.\0" .align 2, 0 gUnknown_80DE8B4:: @ 80DE8B4 .string " Well~2c hello~2c there!\n" .string "This is the #CGFriend Rescue#R counter.\n" - .string "What can I help you with today?" - .byte 0 + .string "What can I help you with today?\0" .align 2, 0 gUnknown_80DE918:: @ 80DE918 .string " Help you with anything\n" - .string "else today?" - .byte 0 + .string "else today?\0" + .align 2, 0 gUnknown_80DE93C:: @ 80DE93C - .string " Come again anytime!" - .byte 0 + .string " Come again anytime!\0" .align 2, 0 gUnknown_80DE954:: @ 80DE954 .string " ...Uh~2c no?\n" - .string "Something~27s not working right here..." - .byte 0 + .string "Something~27s not working right here...\0" .align 2, 0 gUnknown_80DE98C:: @ 80DE98C .string " ...Uh~2c no?\n" .string "The number of GBA systems isn~27t right.\n" - .string "You~27d better try this again from the top." - .byte 0 + .string "You~27d better try this again from the top.\0" .align 2, 0 gUnknown_80DE9F0:: @ 80DE9F0 .string " ...Uh~2c no? You~27re not in the\n" .string "same mode as your friend.\n" - .string "You~27d better try this again from the top." - .byte 0 + .string "You~27d better try this again from the top.\0" + .align 2, 0 gUnknown_80DEA58:: @ 80DEA58 .string " ...Uh~2c no?\n" .string "Your storage space is stuffed full.\n" - .string "You~27d better make room and try again." - .byte 0 + .string "You~27d better make room and try again.\0" .align 2, 0 gUnknown_80DEAB4:: @ 80DEAB4 .string " ...Uh~2c no? It looks like\n" .string "you received this mail before.\n" - .string "You can~27t get the same mail twice. " - .byte 0 + .string "You can~27t get the same mail twice. \0" .align 2, 0 gUnknown_80DEB18:: @ 80DEB18 .string " ...Uh~2c no?\n" - .string "You~27re not eligible to receive this mail." - .byte 0 + .string "You~27re not eligible to receive this mail.\0" .align 2, 0 gUnknown_80DEB54:: @ 80DEB54 .string " ...Uh~2c no?\n" .string "There~27s no room for you to \n" - .string "receive any more mail.#P You~27d better delete some\n" + .string "receive any more mail.#P" + .string " You~27d better delete some\n" .string "mail and make room before you come see\n" - .string "me again about receiving new mail." - .byte 0 + .string "me again about receiving new mail.\0" .align 2, 0 gUnknown_80DEC00:: @ 80DEC00 .string " ...Uh~2c no? Looks like your\n" .string "friend didn~27t do what needed doing.\n" - .string "You~27d better do this again from the top." - .byte 0 + .string "You~27d better do this again from the top.\0" .align 2, 0 gUnknown_80DEC70:: @ 80DEC70 .string " ...Uh~2c no?\n" .string "This here password looks wrong.\n" - .string "Do you want to try that again?" - .byte 0 + .string "Do you want to try that again?\0" .align 2, 0 gUnknown_80DECC0:: @ 80DECC0 .string " ...Uh~2c no? This password~27s\n" - .string "not for any #CGSOS Mail#R." - .byte 0 + .string "not for any #CGSOS Mail#R.\0" .align 2, 0 gUnknown_80DECFC:: @ 80DECFC .string ": I received the #CGSOS Mail#R.\n" - .string "Your adventure will be saved." - .byte 0 + .string "Your adventure will be saved.\0" .align 2, 0 - .asciz "pksdir0" + .string "pksdir0\0" .align 2, 0 diff --git a/data/text/wonder_mail_2.inc b/data/text/wonder_mail_2.inc index 1cc51b9..b1ee6ce 100644 --- a/data/text/wonder_mail_2.inc +++ b/data/text/wonder_mail_2.inc @@ -1,283 +1,248 @@ gUnknown_80DEF04:: @ 80DEF04 .string " ...Oh?\n" - .string "Something~27s gone wrong." - .byte 0 + .string "Something~27s gone wrong.\0" .align 2, 0 gUnknown_80DEF28:: @ 80DEF28 .string " ...Oh? The number of linked\n" .string "GBA systems is incorrect.\n" - .string "Please try again from the start." - .byte 0 + .string "Please try again from the start.\0" .align 2, 0 gUnknown_80DEF80:: @ 80DEF80 .string " ...Oh? It looks like your\n" .string "friend chose a different mode.\n" - .string "Please try again from the start." - .byte 0 + .string "Please try again from the start.\0" .align 2, 0 gUnknown_80DEFDC:: @ 80DEFDC .string " ...Oh? It looks like your\n" .string "storage space is full. Please clear some\n" - .string "space and try again from the start." - .byte 0 + .string "space and try again from the start.\0" .align 2, 0 gUnknown_80DF044:: @ 80DF044 .string " ...Oh?\n" .string "I think you~27ve received this mail before.\n" - .string "You can~27t get the same mail twice." - .byte 0 + .string "You can~27t get the same mail twice.\0" .align 2, 0 gUnknown_80DF0A0:: @ 80DF0A0 .string " ...Oh?\n" .string "I don~27t think you~27re eligible to receive\n" - .string "this mail." - .byte 0 + .string "this mail.\0" .align 2, 0 gUnknown_80DF0E0:: @ 80DF0E0 .string " ...Oh?\n" .string "There is no room to receive new mail.\n" - .string "Please delete some mail and try again." - .byte 0 + .string "Please delete some mail and try again.\0" .align 2, 0 gUnknown_80DF138:: @ 80DF138 .string " ...Oh? Your friend didn~27t\n" .string "follow through on their side.\n" - .string "Please try again from the start." - .byte 0 + .string "Please try again from the start.\0" .align 2, 0 gUnknown_80DF194:: @ 80DF194 .string " Your #CGThank-You Mail#R\n" - .string "has been sent." - .byte 0 + .string "has been sent.\0" .align 2, 0 gUnknown_80DF1C0:: @ 80DF1C0 .string " ...Oh?\n" .string "This password appears to be wrong.\n" - .string "Would you like to try again?" - .byte 0 + .string "Would you like to try again?\0" .align 2, 0 gUnknown_80DF208:: @ 80DF208 .string " ...Oh? This password doesn~27t\n" - .string "appear to be for a #CGThank-You Mail#R." - .byte 0 + .string "appear to be for a #CGThank-You Mail#R.\0" .align 2, 0 gUnknown_80DF250:: @ 80DF250 .string ": This is the counter for\n" - .string "#CGThank-You Mail#R.#P: Oh~2c hi~2c #CN%s#R.\n" + .string "#CGThank-You Mail#R.#P" + .string ": Oh~2c hi~2c #CN%s#R.\n" .string "I~27ve been waiting for you. You wanted me\n" - .string "to process a #CGThank-You Mail#R?#P: Let me get on it right away" - .string "." - .byte 0 + .string "to process a #CGThank-You Mail#R?#P" + .string ": Let me get on it right away.\0" .align 2, 0 gUnknown_80DF304:: @ 80DF304 .string " Is it OK to send this\n" - .string "#CGThank-You Mail#R?" - .byte 0 + .string "#CGThank-You Mail#R?\0" .align 2, 0 gUnknown_80DF330:: @ 80DF330 .string " Please choose the\n" .string "#CGThank-You Mail#R that you want to\n" - .string "send to your friend." - .byte 0 + .string "send to your friend.\0" .align 2, 0 gUnknown_80DF380:: @ 80DF380 .string " OK. Please enter the\n" - .string "#CGThank-You Mail password#R." - .byte 0 + .string "#CGThank-You Mail password#R.\0" .align 2, 0 gUnknown_80DF3B4:: @ 80DF3B4 .string " Please give this password\n" - .string "to the friend that rescued your team.#P I also must save your\n" - .string "adventure." - .byte 0 + .string "to the friend that rescued your team.#P" + .string " I also must save your\n" + .string "adventure.\0" .align 2, 0 gUnknown_80DF418:: @ 80DF418 .string " OK~2c here is your\n" - .string "#CGThank-You Mail password#R." - .byte 0 + .string "#CGThank-You Mail password#R.\0" .align 2, 0 gUnknown_80DF44C:: @ 80DF44C .string " I need to save your\n" - .string "adventure." - .byte 0 + .string "adventure.\0" .align 2, 0 gUnknown_80DF46C:: @ 80DF46C .string " There we go.\n" - .string "I~27m all done.#P Doesn~27t it feel great to\n" + .string "I~27m all done.#P" + .string " Doesn~27t it feel great to\n" .string "be appreciated for doing something good?\n" - .string "Please keep up your rescue work!" - .byte 0 + .string "Please keep up your rescue work!\0" .align 2, 0 gUnknown_80DF4F4:: @ 80DF4F4 .string " A #CGThank-You Mail#R has\n" .string "arrived from your friend for your rescue\n" - .string "mission." - .byte 0 + .string "mission.\0" .align 2, 0 gUnknown_80DF544:: @ 80DF544 .string "#+Communicating...\n" .string "#+Please wait with the power on.\n" - .string "#+To cancel~2c press {B_BUTTON}." - .byte 0 + .string "#+To cancel~2c press {B_BUTTON}.\0" .align 2, 0 gUnknown_80DF594:: @ 80DF594 .string " There. I~27ve sent your\n" .string "#CGThank-You Mail#R.\n" - .string "I need to save your adventure." - .byte 0 + .string "I need to save your adventure.\0" .align 2, 0 gUnknown_80DF5E4:: @ 80DF5E4 .string " Please connect the GBA\n" .string "systems with a #CGGame Link cable#R.\n" - .string "Is your friend also ready?" - .byte 0 + .string "Is your friend also ready?\0" .align 2, 0 gUnknown_80DF63C:: @ 80DF63C .string " There~2c all done.\n" .string "#CN%s#R~2c I hope your friend\n" - .string "appreciates your sense of gratitude." - .byte 0 + .string "appreciates your sense of gratitude.\0" .align 2, 0 gUnknown_80DF694:: @ 80DF694 .string " The item you~27ve chosen\n" .string "here can~27t be exchanged later.\n" - .string "Are you certain this item is OK?" - .byte 0 + .string "Are you certain this item is OK?\0" .align 2, 0 gUnknown_80DF6F0:: @ 80DF6F0 - .string " I~27ve saved your adventure. " - .byte 0 + .string " I~27ve saved your adventure. \0" .align 2, 0 gUnknown_80DF710:: @ 80DF710 .string " OK~2c please choose\n" - .string "the item to be sent." - .byte 0 + .string "the item to be sent.\0" .align 2, 0 gUnknown_80DF73C:: @ 80DF73C .string " ...Oh?\n" .string "Your storage space is empty.\n" - .string "What would you like to do?" - .byte 0 + .string "What would you like to do?\0" .align 2, 0 gUnknown_80DF77C:: @ 80DF77C .string " Would you like to choose\n" .string "a #CGreward item#R from storage and\n" - .string "send it with your mail?" - .byte 0 + .string "send it with your mail?\0" .align 2, 0 gUnknown_80DF7D4:: @ 80DF7D4 .string " ...Oh?\n" .string "You~27ve already attached a #CGreward item#R\n" - .string "to this mail.#P I~27m sorry~2c but once an item\n" + .string "to this mail.#P" + .string " I~27m sorry~2c but once an item\n" .string "has been attached to mail~2c it can~27t be\n" - .string "exchanged." - .byte 0 + .string "exchanged.\0" .align 2, 0 gUnknown_80DF870:: @ 80DF870 .string " Would you like to send it\n" - .string "again with the item you chose before?" - .byte 0 + .string "again with the item you chose before?\0" .align 2, 0 gUnknown_80DF8B4:: @ 80DF8B4 .string " ...Oh?\n" - .string "You don~27t seem to have a #CGThank-You Mail#R." - .byte 0 + .string "You don~27t seem to have a #CGThank-You Mail#R.\0" .align 2, 0 gUnknown_80DF8EC:: @ 80DF8EC .string " Hello.\n" .string "I handle #CGThank-You Mail#R.\n" - .string "How may I serve you?" - .byte 0 + .string "How may I serve you?\0" .align 2, 0 gUnknown_80DF928:: @ 80DF928 .string " May I help you with\n" - .string "anything else?" - .byte 0 + .string "anything else?\0" .align 2, 0 gUnknown_80DF94C:: @ 80DF94C .string " Please come see me\n" - .string "anytime." - .byte 0 + .string "anytime.\0" .align 2, 0 gUnknown_80DF96C:: @ 80DF96C .string " How would you like to send\n" - .string "your #CGThank-You Mail#R?" - .byte 0 + .string "your #CGThank-You Mail#R?\0" .align 2, 0 gUnknown_80DF9A4:: @ 80DF9A4 .string " How would you like to\n" - .string "receive your friend~27s #CGThank-You Mail#R?" - .byte 0 + .string "receive your friend~27s #CGThank-You Mail#R?\0" - .string "pksdir0" - .byte 0 + .string "pksdir0\0" .align 2, 0 gUnknown_80DF9F0:: @ 80DF9F0 - .string "????" - .byte 0 + .string "????\0" .align 2, 0 gUnknown_80DF9F8:: @ 80DF9F8 .string " Oh~2c hello!\n" .string "Your rescue mission went well~2c didn~27t it?\n" - .string "I wouldn~27t expect any less~2c #CG%s#R!#P Well~2c well!\n" + .string "I wouldn~27t expect any less~2c #CG%s#R!#P" + .string " Well~2c well!\n" .string "Here is your reward from the Pokémon\n" - .string "Rescue Organization!" - .byte 0 + .string "Rescue Organization!\0" .align 2, 0 gUnknown_80DFAA8:: @ 80DFAA8 .string " I hope you will keep on\n" .string "rescuing your friends in\n" - .string "dire straits.#P And now~2c I must save\n" - .string "your adventure." - .byte 0 + .string "dire straits.#P" + .string " And now~2c I must save\n" + .string "your adventure.\0" .align 2, 0 gUnknown_80DFB14:: @ 80DFB14 .string " Oh~2c yes~2c that~27s right.\n" .string "Please don~27t forget to send an #CGA-OK Mail#R\n" - .string "to the friend you just rescued.#P Please give me a shout if\n" - .string "you would like to send #CGA-OK Mail#R." - .byte 0 + .string "to the friend you just rescued.#P" + .string " Please give me a shout if\n" + .string "you would like to send #CGA-OK Mail#R.\0" .align 2, 0 - .string "pksdir0" - .byte 0 + .string "pksdir0\0" + .align 2, 0 diff --git a/data/text/wonder_mail_3.inc b/data/text/wonder_mail_3.inc index 1aa2213..773b1f6 100644 --- a/data/text/wonder_mail_3.inc +++ b/data/text/wonder_mail_3.inc @@ -1,68 +1,57 @@ gUnknown_80DFE4C:: @ 80DFE4C .string "Are you sure you want to replace the\n" - .string "old #CGWonder Mail#R with the new one?" - .byte 0 + .string "old #CGWonder Mail#R with the new one?\0" .align 2, 0 gUnknown_80DFE9C:: @ 80DFE9C .string "This #CGWonder Mail#R has already been\n" - .string "received." - .byte 0 + .string "received.\0" .align 2, 0 gUnknown_80DFED0:: @ 80DFED0 .string "This #CGWonder Mail#R has already been\n" .string "received.\n" - .string "You may not receive the same one again." - .byte 0 + .string "You may not receive the same one again.\0" .align 2, 0 gUnknown_80DFF2C:: @ 80DFF2C .string "Only #CGone piece#R of #CGWonder Mail#R can be held.\n" .string "Please receive it after completing any\n" - .string "rescue mission in progress." - .byte 0 + .string "rescue mission in progress.\0" .align 2, 0 gUnknown_80DFFA4:: @ 80DFFA4 .string "The rescue team has quicksaved in\n" .string "a dungeon with a mission in progress.\n" - .string "Please complete the mission first." - .byte 0 + .string "Please complete the mission first.\0" .align 2, 0 gUnknown_80E0010:: @ 80E0010 .string "The rescue team has quicksaved in\n" .string "a dungeon with a mission in progress.\n" - .string "Mail cannot be deleted now." - .byte 0 + .string "Mail cannot be deleted now.\0" gUnknown_80E0074:: @ 80E0074 - .string "Received the #CGWonder Mail#R!" - .byte 0 + .string "Received the #CGWonder Mail#R!\0" .align 2, 0 gUnknown_80E0094:: @ 80E0094 .string "Only #CGone piece#R of #CGWonder Mail#R can be held.\n" .string "Is it OK to replace the old #CGWonder Mail#R\n" - .string "with the new one?" - .byte 0 + .string "with the new one?\0" .align 2, 0 gUnknown_80E0108:: @ 80E0108 .string "Your #CGJob List#R is full.\n" - .string "Please select and delete unwanted mail." - .byte 0 + .string "Please select and delete unwanted mail.\0" .align 2, 0 gUnknown_80E014C:: @ 80E014C - .string "New Mail" - .byte 0 + .string "New Mail\0" .align 2, 0 gUnknown_80E0158:: @ 80E0158 - .string "Old Mail" - .byte 0 + .string "Old Mail\0" .align 2, 0 - .string "pksdir0" - .byte 0 + .string "pksdir0\0" + .align 2, 0 diff --git a/data/text/wonder_mail_4.inc b/data/text/wonder_mail_4.inc index a8b30f9..b1b2c12 100644 --- a/data/text/wonder_mail_4.inc +++ b/data/text/wonder_mail_4.inc @@ -1,190 +1,207 @@ gUnknown_80E0C4C:: @ 80E0C4C .string " So~2c what~27d you want to\n" - .string "know?" - .byte 0 + .string "know?\0" .align 2, 0 gUnknown_80E0C70:: @ 80E0C70 .string " If you need to call for\n" .string "help~2c first send your friend\n" - .string "an #CGSOS Mail#R.#P Once you send that mail~2c\n" + .string "an #CGSOS Mail#R.#P" + .string " Once you send that mail~2c\n" .string "wait until your friend sends you back\n" - .string "an #CGA-OK Mail#R.#P When you get that\n" + .string "an #CGA-OK Mail#R.#P" + .string " When you get that\n" .string "#CGA-OK Mail#R back~2c your team\n" - .string "can continue from where it went down.#P Make sure you send your\n" + .string "can continue from where it went down.#P" + .string " Make sure you send your\n" .string "friend a #CGThank-You Mail#R.\n" - .string "That~27s if you get revived~2c of course." - .byte 0 + .string "That~27s if you get revived~2c of course.\0" .align 2, 0 gUnknown_80E0DD0:: @ 80E0DD0 .string " If your team gets defeated\n" .string "in a dungeon~2c you can send an #CGSOS Mail#R\n" - .string "to a friend willing to help.#P But I have to warn you.\n" + .string "to a friend willing to help.#P" + .string " But I have to warn you.\n" .string "You can~27t get anyone to rescue you\n" - .string "in certain places.#P If you need to send\n" + .string "in certain places.#P" + .string " If you need to send\n" .string "an #CGSOS Mail#R~2c you send it from the\n" - .string "#CGmain menu#R." - .byte 0 + .string "#CGmain menu#R.\0" .align 2, 0 gUnknown_80E0ED8:: @ 80E0ED8 .string " If your friend manages to\n" .string "rescue your team~2c you need to receive\n" - .string "an #CGA-OK Mail#R from your friend.#P See~2c once you get that\n" + .string "an #CGA-OK Mail#R from your friend.#P" + .string " See~2c once you get that\n" .string "#CGA-OK Mail#R~2c your team can continue from\n" - .string "where it went down in the dungeon.#P And~2c if you use\n" + .string "where it went down in the dungeon.#P" + .string " And~2c if you use\n" .string "a #CGGame Link cable#R~2c your friend can\n" - .string "even send you a #CGhelper Pokémon#R.#P There~27s just one thing.\n" + .string "even send you a #CGhelper Pokémon#R.#P" + .string " There~27s just one thing.\n" .string "A #CGhelper Pokémon#R can~27t bring\n" - .string "any item it happens to be holding.#P You can receive that\n" + .string "any item it happens to be holding.#P" + .string " You can receive that\n" .string "team-saving #CGA-OK Mail#R on the #CGmain menu#R~2c\n" - .string "all right?" - .byte 0 + .string "all right?\0" .align 2, 0 gUnknown_80E10C8:: @ 80E10C8 .string " If your team gets rescued~2c\n" .string "be sure to send your friend\n" - .string "a #CGThank-You Mail#R.#P You do that by going to\n" + .string "a #CGThank-You Mail#R.#P" + .string " You do that by going to\n" .string "the #CGright counter#R~2c or\n" - .string "by selecting it from the #CGmain menu#R.#P You can attach an item in\n" + .string "by selecting it from the #CGmain menu#R.#P" + .string " You can attach an item in\n" .string "storage to your #CGThank-You Mail#R\n" - .string "as a #CGreward item#R.#P You don~27t want to ever\n" - .string "forget to express your thanks." - .byte 0 + .string "as a #CGreward item#R.#P" + .string " You don~27t want to ever\n" + .string "forget to express your thanks.\0" .align 2, 0 gUnknown_80E120C:: @ 80E120C .string " If you want to go and\n" .string "rescue your friend~27s KO~27d team~2c\n" - .string "you need to receive an #CGSOS Mail#R.#P When you get that mail~2c\n" + .string "you need to receive an #CGSOS Mail#R.#P" + .string " When you get that mail~2c\n" .string "you can rescue your friend at\n" - .string "the #CGleft counter#R over there.#P If you do manage to rescue\n" + .string "the #CGleft counter#R over there.#P" + .string " If you do manage to rescue\n" .string "the team~2c you send your friend\n" - .string "an #CGA-OK Mail#R.#P After you do that~2c your\n" + .string "an #CGA-OK Mail#R.#P" + .string " After you do that~2c your\n" .string "friend can send back to you\n" - .string "a #CGThank-You Mail#R." - .byte 0 + .string "a #CGThank-You Mail#R.\0" .align 2, 0 gUnknown_80E136C:: @ 80E136C .string " To go off on a rescue~2c\n" .string "you first need to receive your friend~27s\n" - .string "#CGSOS Mail#R.#P You do that at\n" + .string "#CGSOS Mail#R.#P" + .string " You do that at\n" .string "the #CGleft counter#R over there~2c\n" - .string "or by selecting it from the #CGmain menu#R." - .byte 0 + .string "or by selecting it from the #CGmain menu#R.\0" .align 2, 0 gUnknown_80E1420:: @ 80E1420 .string " If you succeed in rescuing\n" .string "that team~2c you send your friend an\n" - .string "#CGA-OK Mail#R.#P You do that by going to\n" + .string "#CGA-OK Mail#R.#P" + .string " You do that by going to\n" .string "the #CGleft counter#R~2c\n" - .string "or from the #CGmain menu#R.#P You can send your friend\n" + .string "or from the #CGmain menu#R.#P" + .string " You can send your friend\n" .string "a Pokémon as a helper from your Friend\n" - .string "Areas using a #CGGame Link cable#R.#P This Pokémon won~27t\n" + .string "Areas using a #CGGame Link cable#R.#P" + .string " This Pokémon won~27t\n" .string "disappear from its Friend Area~2c so\n" - .string "don~27t you worry any." - .byte 0 + .string "don~27t you worry any.\0" .align 2, 0 gUnknown_80E157C:: @ 80E157C .string " If you get an #CGSOS Mail#R~2c\n" .string "you head off on the rescue from\n" - .string "the #CGleft counter#R.#P But~2c I have to warn you.\n" + .string "the #CGleft counter#R.#P" + .string " But~2c I have to warn you.\n" .string "You can~27t go off to rescue in a dungeon\n" - .string "if you can~27t get into it.#P You~27ll be able to get\n" + .string "if you can~27t get into it.#P" + .string " You~27ll be able to get\n" .string "there when you go farther in your\n" - .string "adventure~2c so it won~27t do to fret." - .byte 0 + .string "adventure~2c so it won~27t do to fret.\0" .align 2, 0 gUnknown_80E169C:: @ 80E169C .string " If you send your friend\n" .string "an #CGA-OK Mail#R~2c you can look forward\n" - .string "to getting a #CGThank-You Mail#R back.#P You can receive it at\n" + .string "to getting a #CGThank-You Mail#R back.#P" + .string " You can receive it at\n" .string "the #CGright counter#R\n" - .string "or on the #CGmain menu#R.#P But you need to #C2be careful#R.\n" + .string "or on the #CGmain menu#R.#P" + .string " But you need to #C2be careful#R.\n" .string "You #C2must not delete the A-OK Mail#R\n" - .string "before you get the #CGThank-You Mail#R back." - .byte 0 + .string "before you get the #CGThank-You Mail#R back.\0" .align 2, 0 gUnknown_80E17C8:: @ 80E17C8 .string " I~27m your guide to what you\n" .string "can expect at the Pelipper Post Office.\n" - .string "If you have any questions~2c just ask away!" - .byte 0 + .string "If you have any questions~2c just ask away!\0" .align 2, 0 gUnknown_80E183C:: @ 80E183C .string " Did you want to ask about\n" - .string "anything else?" - .byte 0 + .string "anything else?\0" .align 2, 0 gUnknown_80E1868:: @ 80E1868 .string " #CGThe Pelipper Post Office#R\n" .string "keeps track of information from\n" - .string "around the world.#P We inform folks\n" + .string "around the world.#P" + .string " We inform folks\n" .string "about everything from gossip to calls\n" - .string "for help from fellow Pokémon.#P For the latest news~2c check\n" + .string "for help from fellow Pokémon.#P" + .string " For the latest news~2c check\n" .string "#CGyour Mailbox#R or the #CGBulletin Board#R\n" - .string "outside~2c all right?#P Oh~2c that~27s not all.\n" + .string "outside~2c all right?#P" + .string " Oh~2c that~27s not all.\n" .string "You can arrange for #CGFriend Rescue#R\n" - .string "missions at that counter there.#P The #CGleft counter#R is\n" + .string "missions at that counter there.#P" + .string " The #CGleft counter#R is\n" .string "for rescues~2c and the #CGright counter#R\n" - .string "is for Thank-You Mail." - .byte 0 + .string "is for Thank-You Mail.\0" .align 2, 0 gUnknown_80E1A30:: @ 80E1A30 .string " The #CGBulletin Board#R outside\n" - .string "here lists rescue requests.#P Take on rescue jobs from\n" + .string "here lists rescue requests.#P" + .string " Take on rescue jobs from\n" .string "the Bulletin Board. Be a hero and handle\n" - .string "the jobs for fellow Pokémon in need!" - .byte 0 + .string "the jobs for fellow Pokémon in need!\0" .align 2, 0 gUnknown_80E1AD8:: @ 80E1AD8 .string " If your rescue team\n" .string "becomes famous for doing lots of rescues~2c\n" - .string "expect to get rescue requests directly.#P Our delivery " - .byte 0x24 - .string "m0\n" + .string "expect to get rescue requests directly.#P" + .string " Our delivery $m0\n" .string "will take those jobs straight to your\n" - .string "#CGMailbox#R." - .byte 0 + .string "#CGMailbox#R.\0" .align 2, 0 gUnknown_80E1B88:: @ 80E1B88 .string " Friend Rescue is what we\n" .string "call rescue missions between friends using\n" - .string "a #CGGame Link cable#R~2c #CGpasswords#R~2c etc.#P For instance~2c you can send\n" + .string "a #CGGame Link cable#R~2c #CGpasswords#R~2c etc.#P" + .string " For instance~2c you can send\n" .string "out for help saying your team wiped out\n" - .string "in a dungeon at such and such a place.#P Your friend could play\n" + .string "in a dungeon at such and such a place.#P" + .string " Your friend could play\n" .string "the hero and come to your team~27s rescue.\n" - .string "Or it can be the other way around~2c too.#P If you use #CGpasswords#R~2c\n" + .string "Or it can be the other way around~2c too.#P" + .string " If you use #CGpasswords#R~2c\n" .string "you can do rescues with friends in\n" - .string "far-away places.#P You can apply for Friend\n" + .string "far-away places.#P" + .string " You can apply for Friend\n" .string "Rescue jobs at the #CGleft counter#R of\n" - .string "that counter there." - .byte 0 + .string "that counter there.\0" .align 2, 0 gUnknown_80E1D84:: @ 80E1D84 .string " Deleting mail just means\n" .string "getting rid of old mail that you don~27t\n" - .string "need anymore.#P If you do lots of Friend\n" + .string "need anymore.#P" + .string " If you do lots of Friend\n" .string "Rescues~2c you~27ll find #CGSOS Mail#R and\n" - .string "#CGA-OK Mail#R piling up.#P Once you get #CG30 pieces#R~2c\n" + .string "#CGA-OK Mail#R piling up.#P" + .string " Once you get #CG30 pieces#R~2c\n" .string "you won~27t be able to receive more mail.\n" - .string "That~27s why you~27ll need to delete old mail.#P You can look through old\n" - .string "mail at the #CGleft counter#R over there." - .byte 0 + .string "That~27s why you~27ll need to delete old mail.#P" + .string " You can look through old\n" + .string "mail at the #CGleft counter#R over there.\0" .align 2, 0 - .string "pksdir0" - .byte 0 + .string "pksdir0\0" + .align 2, 0 diff --git a/data/text/wonder_mail_complete.inc b/data/text/wonder_mail_complete.inc index 7b6fad1..d919ffb 100644 --- a/data/text/wonder_mail_complete.inc +++ b/data/text/wonder_mail_complete.inc @@ -1,40 +1,26 @@ gUnknown_80E0184:: @ 80E0184 - .string " Thank you for rescuing me!" - .byte 0 + .string " Thank you for rescuing me!\0" .align 2, 0 gUnknown_80E01A0:: @ 80E01A0 .string " Thank you for rescuing\n" - .string "#C5" - .byte 0x24 - .string "m1#R!" - .byte 0 + .string "#C5$m1#R!\0" .align 2, 0 gUnknown_80E01C4:: @ 80E01C4 .string " Thank you for escorting me\n" - .string "to #C5" - .byte 0x24 - .string "m1#R! " - .byte 0 + .string "to #C5$m1#R! \0" .align 2, 0 gUnknown_80E01F0:: @ 80E01F0 .string " Thank you for delivering\n" - .string "the #C4" - .byte 0x24 - .string "i0#R!" - .byte 0 + .string "the #C4$i0#R!\0" .align 2, 0 gUnknown_80E0218:: @ 80E0218 .string " Thank you for getting me\n" - .string "the #C4" - .byte 0x24 - .string "i0#R!" - .byte 0 + .string "the #C4$i0#R!\0" .align 2, 0 - .string "pksdir0" - .byte 0 + .string "pksdir0\0" .align 2, 0 diff --git a/data/unk_data.s b/data/unk_data.s index 25f11fe..1ed8758 100644 --- a/data/unk_data.s +++ b/data/unk_data.s @@ -1,14 +1,14 @@ .section .rodata - .asciz "pksdir0" + .string "pksdir0\0" .byte 0x01, 0x00, 0x00, 0x00 @ # of pointers .byte 0x18, 0x00, 0x30, 0x08 @ pointer to pointer table - .asciz "pksdir0" + .string "pksdir0\0" .byte 0x20, 0x00, 0x30, 0x08 @ pointer to monpal string .byte 0x30, 0x00, 0x30, 0x08 @ Pointer to unknown palette - .asciz "monpal" + .string "monpal\0" .align 2,0 - .asciz "pksdir0" + .string "pksdir0\0" @ Unknown Palette .byte 0x00, 0x00, 0x00, 0x80 @@ -267,10 +267,10 @@ .byte 0x00, 0x00, 0x00, 0x80 .byte 0x00, 0x00, 0x00, 0x80 - .asciz "pksdir0" - .asciz "pksdir0" - .asciz "pksdir0" - .asciz "pksdir0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" + .string "pksdir0\0" @ Blank Space .byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff diff --git a/data/unk_dungeon.inc b/data/unk_dungeon.inc index beac28c..929330c 100644 --- a/data/unk_dungeon.inc +++ b/data/unk_dungeon.inc @@ -1,10 +1,10 @@ .global gUnknown_83B0000 gUnknown_83B0000: @ 83B0000 @ replacing .incbin "baserom.gba", 0x003b0000, 0x151200 -.asciz "pksdir0" +.string "pksdir0\0" .byte 0xc7, 0x01, 0x00, 0x00 @ 455 palettes? .byte 0x18, 0x00, 0x3b, 0x08 @ Pointer to start of pointers? -.asciz "pksdir0" +.string "pksdir0\0" .byte 0xbc, 0x1c, 0x3b, 0x08 @ Pointer to b00canm .byte 0xcc, 0x1c, 0x3b, 0x08 @ Pointer to SIRO header .byte 0xb4, 0x1c, 0x3b, 0x08 @ Pointer to b00cel |