From eadf34a632e099ad350dbccdef8c3efb727ab859 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Fri, 4 Sep 2020 21:10:21 -0500 Subject: did first datadummp, woo --- data/text/chunsoft.inc | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 data/text/chunsoft.inc (limited to 'data/text') diff --git a/data/text/chunsoft.inc b/data/text/chunsoft.inc new file mode 100644 index 0000000..89f10be --- /dev/null +++ b/data/text/chunsoft.inc @@ -0,0 +1,21 @@ +gUnknown_80E6E50:: @ 80E6E50 + .string "CHUNSOFT" + .byte 0 + .byte 0 + .align 2,0 + + .string "pksdir0" + .byte 0 + .align 2,0 + + .string "pksdir0" + .byte 0 + .align 2,0 + + .string "pksdir0" + .byte 0 + .align 2,0 + + .string "pksdir0" + .byte 0 + .align 2,0 -- cgit v1.2.3 From e4b9df868fd31af595733b28d264fe3cde07a346 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Fri, 4 Sep 2020 21:29:54 -0500 Subject: dump none text --- data/text/none.inc | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 data/text/none.inc (limited to 'data/text') diff --git a/data/text/none.inc b/data/text/none.inc new file mode 100644 index 0000000..ebd4da5 --- /dev/null +++ b/data/text/none.inc @@ -0,0 +1,7 @@ +gUnknown_80B7144:: @ 80B7144 + .string "NONE" + .byte 0 + .byte 0 + .byte 0 + .byte 0 + .align 2,0 -- cgit v1.2.3 From 253dab4bc5710eee45ea7167fda0c3a72159b4d3 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Sat, 5 Sep 2020 09:59:17 -0500 Subject: dumped another pksdir0 string --- data/text/pksdir0.inc | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 data/text/pksdir0.inc (limited to 'data/text') diff --git a/data/text/pksdir0.inc b/data/text/pksdir0.inc new file mode 100644 index 0000000..a65bf68 --- /dev/null +++ b/data/text/pksdir0.inc @@ -0,0 +1,8 @@ +gUnknown_80D3564:: @ 80D3564 + .byte 0 + .byte 0 + .byte 0 + .byte 0 + .string "pksdir0" + .byte 0 + .align 2,0 -- cgit v1.2.3 From b7d1fe09f016ba8becfdcfaa2890cf3684dc85c4 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Sat, 5 Sep 2020 13:42:43 -0500 Subject: start dumping unformatted_type_names --- data/text/type_names.inc | 75 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 data/text/type_names.inc (limited to 'data/text') diff --git a/data/text/type_names.inc b/data/text/type_names.inc new file mode 100644 index 0000000..a8758e8 --- /dev/null +++ b/data/text/type_names.inc @@ -0,0 +1,75 @@ +gUnknown_810AD4C:: @ 810AD4C +.byte 0x1c, 0xae, 0x10, 0x08, 0x14, 0xae, 0x10, 0x08, 0x0c, 0xae, 0x10, 0x08, 0x04, 0xae, 0x10, 0x08, 0xfc, 0xad, 0x10, 0x08, 0xf0, 0xad, 0x10, 0x08, 0xec, 0xad, 0x10, 0x08, 0xe0, 0xad, 0x10, 0x08 +.byte 0xd8, 0xad, 0x10, 0x08, 0xd0, 0xad, 0x10, 0x08, 0xc8, 0xad, 0x10, 0x08, 0xc0, 0xad, 0x10, 0x08, 0xbc, 0xad, 0x10, 0x08, 0xb4, 0xad, 0x10, 0x08, 0xac, 0xad, 0x10, 0x08, 0xa4, 0xad, 0x10, 0x08 +.byte 0x9c, 0xad, 0x10, 0x08, 0x94, 0xad, 0x10, 0x08, 0x53, 0x74, 0x65, 0x65, 0x6c, 0x00, 0x00, 0x00, 0x44, 0x61, 0x72, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x44, 0x72, 0x61, 0x67, 0x6f, 0x6e, 0x00, 0x00 + +.string "Ghost" +.byte 0 +.byte 0 +.byte 0 +.align 2,0 +.string "Rock" +.byte 0 +.byte 0 +.byte 0 +.byte 0 +.align 2,0 +.string "Bug" +.byte 0 +.align 2,0 +.string "Psychic" +.byte 0 +.align 2,0 +.string "Flying" +.byte 0 +.byte 0 +.align 2,0 +.string "Ground" +.byte 0 +.byte 0 +.align 2,0 +.string "Poison" +.byte 0 +.byte 0 +.string "Fighting" +.align 2,0 +.byte 0 +.byte 0 +.byte 0 +.byte 0 +.align 2,0 +.string "Ice" +.byte 0 +.align 2,0 +.string "Electric" +.byte 0 +.byte 0 +.byte 0 +.byte 0 +.align 2,0 +.string "Grass" +.byte 0 +.byte 0 +.byte 0 +.align 2,0 +.string "Water" +.byte 0 +.byte 0 +.byte 0 +.align 2,0 +.string "Fire" +.byte 0 +.byte 0 +.byte 0 +.byte 0 +.align 2,0 +.string "Normal" +.byte 0 +.byte 0 +.align 2,0 +.string "None" +.byte 0 +.byte 0 +.byte 0 +.byte 0 +.align 2,0 -- cgit v1.2.3 From 3f14389d359d554d1e0c1c022da53c247da9cb5b Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Sat, 5 Sep 2020 13:48:49 -0500 Subject: got the type names figured. some junk in the top --- data/text/type_names.inc | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'data/text') diff --git a/data/text/type_names.inc b/data/text/type_names.inc index a8758e8..f3e39a6 100644 --- a/data/text/type_names.inc +++ b/data/text/type_names.inc @@ -1,8 +1,23 @@ gUnknown_810AD4C:: @ 810AD4C .byte 0x1c, 0xae, 0x10, 0x08, 0x14, 0xae, 0x10, 0x08, 0x0c, 0xae, 0x10, 0x08, 0x04, 0xae, 0x10, 0x08, 0xfc, 0xad, 0x10, 0x08, 0xf0, 0xad, 0x10, 0x08, 0xec, 0xad, 0x10, 0x08, 0xe0, 0xad, 0x10, 0x08 .byte 0xd8, 0xad, 0x10, 0x08, 0xd0, 0xad, 0x10, 0x08, 0xc8, 0xad, 0x10, 0x08, 0xc0, 0xad, 0x10, 0x08, 0xbc, 0xad, 0x10, 0x08, 0xb4, 0xad, 0x10, 0x08, 0xac, 0xad, 0x10, 0x08, 0xa4, 0xad, 0x10, 0x08 -.byte 0x9c, 0xad, 0x10, 0x08, 0x94, 0xad, 0x10, 0x08, 0x53, 0x74, 0x65, 0x65, 0x6c, 0x00, 0x00, 0x00, 0x44, 0x61, 0x72, 0x6b, 0x00, 0x00, 0x00, 0x00, 0x44, 0x72, 0x61, 0x67, 0x6f, 0x6e, 0x00, 0x00 +.byte 0x9c, 0xad, 0x10, 0x08, 0x94, 0xad, 0x10, 0x08 +.string "Steel" +.byte 0 +.byte 0 +.byte 0 +.align 2,0 +.string "Dark" +.byte 0 +.byte 0 +.byte 0 +.byte 0 +.align 2,0 +.string "Dragon" +.byte 0 +.byte 0 +.align 2,0 .string "Ghost" .byte 0 .byte 0 -- cgit v1.2.3 From b8fe22c7dd955132fd876d9b652b058697212d2b Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Mon, 7 Sep 2020 12:20:21 -0500 Subject: dump random string --- data/text/efob000.inc | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 data/text/efob000.inc (limited to 'data/text') diff --git a/data/text/efob000.inc b/data/text/efob000.inc new file mode 100644 index 0000000..1ee932c --- /dev/null +++ b/data/text/efob000.inc @@ -0,0 +1,4 @@ +gUnknown_80B9C74:: @ 80B9C74 + .string "efob000" + .byte 0 + .align 2,0 -- cgit v1.2.3 From 129156fcf1a88e2974c11a2f12e2d893486d5270 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Mon, 7 Sep 2020 12:22:28 -0500 Subject: another random efob string --- data/text/efob001.inc | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 data/text/efob001.inc (limited to 'data/text') diff --git a/data/text/efob001.inc b/data/text/efob001.inc new file mode 100644 index 0000000..2c77a63 --- /dev/null +++ b/data/text/efob001.inc @@ -0,0 +1,4 @@ +gUnknown_80B9C6C:: @ 80B9C6C + .string "efob001" + .byte 0 + .align 2,0 -- cgit v1.2.3 From 4a094ea3550cfba23ae4c17e366e334f61caf09e Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Sun, 13 Sep 2020 18:53:09 -0500 Subject: convert to using asciz for handling all the 0x00 bytes --- data/text/chunsoft.inc | 20 ++------ data/text/efob000.inc | 4 -- data/text/efob001.inc | 4 -- data/text/none.inc | 7 --- data/text/party_menu.inc | 73 +++++++++++------------------ data/text/type_names.inc | 119 ++++++++++++++--------------------------------- 6 files changed, 67 insertions(+), 160 deletions(-) delete mode 100644 data/text/efob000.inc delete mode 100644 data/text/efob001.inc delete mode 100644 data/text/none.inc (limited to 'data/text') diff --git a/data/text/chunsoft.inc b/data/text/chunsoft.inc index 89f10be..b7723a5 100644 --- a/data/text/chunsoft.inc +++ b/data/text/chunsoft.inc @@ -1,21 +1,11 @@ gUnknown_80E6E50:: @ 80E6E50 - .string "CHUNSOFT" - .byte 0 - .byte 0 + .asciz "CHUNSOFT" .align 2,0 - .string "pksdir0" - .byte 0 - .align 2,0 + .asciz "pksdir0" - .string "pksdir0" - .byte 0 - .align 2,0 + .asciz "pksdir0" - .string "pksdir0" - .byte 0 - .align 2,0 + .asciz "pksdir0" - .string "pksdir0" - .byte 0 - .align 2,0 + .asciz "pksdir0" diff --git a/data/text/efob000.inc b/data/text/efob000.inc deleted file mode 100644 index 1ee932c..0000000 --- a/data/text/efob000.inc +++ /dev/null @@ -1,4 +0,0 @@ -gUnknown_80B9C74:: @ 80B9C74 - .string "efob000" - .byte 0 - .align 2,0 diff --git a/data/text/efob001.inc b/data/text/efob001.inc deleted file mode 100644 index 2c77a63..0000000 --- a/data/text/efob001.inc +++ /dev/null @@ -1,4 +0,0 @@ -gUnknown_80B9C6C:: @ 80B9C6C - .string "efob001" - .byte 0 - .align 2,0 diff --git a/data/text/none.inc b/data/text/none.inc deleted file mode 100644 index ebd4da5..0000000 --- a/data/text/none.inc +++ /dev/null @@ -1,7 +0,0 @@ -gUnknown_80B7144:: @ 80B7144 - .string "NONE" - .byte 0 - .byte 0 - .byte 0 - .byte 0 - .align 2,0 diff --git a/data/text/party_menu.inc b/data/text/party_menu.inc index eaaabd1..f23f231 100644 --- a/data/text/party_menu.inc +++ b/data/text/party_menu.inc @@ -2,40 +2,35 @@ 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 "It will no longer be available for\n" - .string "adventures. Is that OK?" - .byte 0 + .asciz "adventures. Is that OK?" .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 "like it to join your team.\n" - .string "Will you release it anyway?" - .byte 0 + .asciz "Will you release it anyway?" .align 2, 0 gUnknown_80DD4C4:: @ 80DD4C4 .string "#+" .byte 0x24 .string "m1 joined the\n" - .string "#+rescue team for adventures!" - .byte 0 + .asciz "#+rescue team for adventures!" .align 2, 0 gUnknown_80DD4F4:: @ 80DD4F4 .string "#+" .byte 0x24 .string "m1 left the team to remain\n" - .string "#+on standby in the Friend Area." - .byte 0 + .asciz "#+on standby in the Friend Area." .align 2, 0 gUnknown_80DD534:: @ 80DD534 .string "#+" .byte 0x24 .string "m1 became the leader\n" - .string "#+of the rescue team." - .byte 0 + .asciz "#+of the rescue team." .align 2, 0 gUnknown_80DD564:: @ 80DD564 @@ -45,14 +40,14 @@ gUnknown_80DD564:: @ 80DD564 .string "#+the Friend Area.\n" .string "#+Bye-bye~2c " .byte 0x24 - .string "m1!" - .byte 0 + .asciz "m1!" + .align 2,0 + gUnknown_80DD594:: @ 80DD594 .string "#+The #C4" .byte 0x24 .string "i1#R was\n" - .string "#+handed over. " - .byte 0 + .asciz "#+handed over. " .align 2, 0 gUnknown_80DD5B8:: @ 80DD5B8 @@ -62,86 +57,72 @@ gUnknown_80DD5B8:: @ 80DD5B8 .string "#+handed over.#P#+The #C4" .byte 0x24 .string "i0#R was\n" - .string "#+returned to the Toolbox." - .byte 0 + .asciz "#+returned to the Toolbox." .align 2, 0 gUnknown_80DD60C:: @ 80DD60C .string "#+The #C4" .byte 0x24 .string "i0#R was\n" - .string "#+returned to the Toolbox." - .byte 0 + .asciz "#+returned to the Toolbox." .align 2, 0 gUnknown_80DD63C:: @ 80DD63C .string "#+The #C4" .byte 0x24 .string "i0#R was\n" - .string "#+sent to storage." - .byte 0 + .asciz "#+sent to storage." .align 2, 0 gUnknown_80DD664:: @ 80DD664 - .string "Stand By" - .byte 0 + .asciz "Stand By" .align 2, 0 + gUnknown_80DD670:: @ 80DD670 - .string "Make Leader" - .byte 0 + .asciz "Make Leader" + .align 2,0 gUnknown_80DD67C:: @ 80DD67C - .string "Join Team" - .byte 0 + .asciz "Join Team" .align 2, 0 gUnknown_80DD688:: @ 80DD688 - .string "Give Gummi" - .byte 0 + .asciz "Give Gummi" .align 2, 0 gUnknown_80DD694:: @ 80DD694 - .string "Give" - .byte 0 + .asciz "Give" .align 2, 0 gUnknown_80DD69C:: @ 80DD69C - .string "Take" - .byte 0 + .asciz "Take" .align 2, 0 gUnknown_80DD6A4:: @ 80DD6A4 - .string "Say Farewell" - .byte 0 + .asciz "Say Farewell" .align 2, 0 gUnknown_80DD6B4:: @ 80DD6B4 - .string "Summary" - .byte 0 + .asciz "Summary" .align 2, 0 gUnknown_80DD6BC:: @ 80DD6BC - .string "Moves" - .byte 0 + .asciz "Moves" .align 2, 0 gUnknown_80DD6C4:: @ 80DD6C4 - .string "Check IQ" - .byte 0 + .asciz "Check IQ" .align 2, 0 gUnknown_80DD6D0:: @ 80DD6D0 .string "Item: #C4" .byte 0x24 - .string "i0#R " - .byte 0 + .asciz "i0#R " .align 2, 0 gUnknown_80DD6E0:: @ 80DD6E0 - .string "%s" - .byte 0 + .asciz "%s" .align 2, 0 - .string "pksdir0" - .byte 0 + .asciz "pksdir0" .align 2, 0 diff --git a/data/text/type_names.inc b/data/text/type_names.inc index f3e39a6..25c1d03 100644 --- a/data/text/type_names.inc +++ b/data/text/type_names.inc @@ -3,88 +3,39 @@ gUnknown_810AD4C:: @ 810AD4C .byte 0xd8, 0xad, 0x10, 0x08, 0xd0, 0xad, 0x10, 0x08, 0xc8, 0xad, 0x10, 0x08, 0xc0, 0xad, 0x10, 0x08, 0xbc, 0xad, 0x10, 0x08, 0xb4, 0xad, 0x10, 0x08, 0xac, 0xad, 0x10, 0x08, 0xa4, 0xad, 0x10, 0x08 .byte 0x9c, 0xad, 0x10, 0x08, 0x94, 0xad, 0x10, 0x08 -.string "Steel" -.byte 0 -.byte 0 -.byte 0 -.align 2,0 -.string "Dark" -.byte 0 -.byte 0 -.byte 0 -.byte 0 -.align 2,0 -.string "Dragon" -.byte 0 -.byte 0 -.align 2,0 -.string "Ghost" -.byte 0 -.byte 0 -.byte 0 -.align 2,0 -.string "Rock" -.byte 0 -.byte 0 -.byte 0 -.byte 0 -.align 2,0 -.string "Bug" -.byte 0 -.align 2,0 -.string "Psychic" -.byte 0 -.align 2,0 -.string "Flying" -.byte 0 -.byte 0 -.align 2,0 -.string "Ground" -.byte 0 -.byte 0 -.align 2,0 -.string "Poison" -.byte 0 -.byte 0 -.string "Fighting" -.align 2,0 -.byte 0 -.byte 0 -.byte 0 -.byte 0 -.align 2,0 -.string "Ice" -.byte 0 -.align 2,0 -.string "Electric" -.byte 0 -.byte 0 -.byte 0 -.byte 0 -.align 2,0 -.string "Grass" -.byte 0 -.byte 0 -.byte 0 -.align 2,0 -.string "Water" -.byte 0 -.byte 0 -.byte 0 -.align 2,0 -.string "Fire" -.byte 0 -.byte 0 -.byte 0 -.byte 0 -.align 2,0 -.string "Normal" -.byte 0 -.byte 0 -.align 2,0 -.string "None" -.byte 0 -.byte 0 -.byte 0 -.byte 0 +.asciz "Steel" +.align 2,0 +.asciz "Dark" +.align 2,0 +.asciz "Dragon" +.align 2,0 +.asciz "Ghost" +.align 2,0 +.asciz "Rock" +.align 2,0 +.asciz "Bug" +.align 2,0 +.asciz "Psychic" +.align 2,0 +.asciz "Flying" +.align 2,0 +.asciz "Ground" +.align 2,0 +.asciz "Poison" +.align 2,0 +.asciz "Fighting" +.align 2,0 +.asciz "Ice" +.align 2,0 +.asciz "Electric" +.align 2,0 +.asciz "Grass" +.align 2,0 +.asciz "Water" +.align 2,0 +.asciz "Fire" +.align 2,0 +.asciz "Normal" +.align 2,0 +.asciz "None" .align 2,0 -- cgit v1.2.3 From e88a5526d7bb0bd77395f10808ad6d94e9ea9e16 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Tue, 15 Sep 2020 16:49:29 -0500 Subject: ahhh more string pointers. that's what that stuff was --- data/text/type_names.inc | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'data/text') diff --git a/data/text/type_names.inc b/data/text/type_names.inc index 25c1d03..1af4ac2 100644 --- a/data/text/type_names.inc +++ b/data/text/type_names.inc @@ -1,7 +1,23 @@ gUnknown_810AD4C:: @ 810AD4C -.byte 0x1c, 0xae, 0x10, 0x08, 0x14, 0xae, 0x10, 0x08, 0x0c, 0xae, 0x10, 0x08, 0x04, 0xae, 0x10, 0x08, 0xfc, 0xad, 0x10, 0x08, 0xf0, 0xad, 0x10, 0x08, 0xec, 0xad, 0x10, 0x08, 0xe0, 0xad, 0x10, 0x08 -.byte 0xd8, 0xad, 0x10, 0x08, 0xd0, 0xad, 0x10, 0x08, 0xc8, 0xad, 0x10, 0x08, 0xc0, 0xad, 0x10, 0x08, 0xbc, 0xad, 0x10, 0x08, 0xb4, 0xad, 0x10, 0x08, 0xac, 0xad, 0x10, 0x08, 0xa4, 0xad, 0x10, 0x08 -.byte 0x9c, 0xad, 0x10, 0x08, 0x94, 0xad, 0x10, 0x08 +@ (Table of pointers to each string) +.byte 0x1c, 0xae, 0x10, 0x08 +.byte 0x14, 0xae, 0x10, 0x08 +.byte 0x0c, 0xae, 0x10, 0x08 +.byte 0x04, 0xae, 0x10, 0x08 +.byte 0xfc, 0xad, 0x10, 0x08 +.byte 0xf0, 0xad, 0x10, 0x08 +.byte 0xec, 0xad, 0x10, 0x08 +.byte 0xe0, 0xad, 0x10, 0x08 +.byte 0xd8, 0xad, 0x10, 0x08 +.byte 0xd0, 0xad, 0x10, 0x08 +.byte 0xc8, 0xad, 0x10, 0x08 +.byte 0xc0, 0xad, 0x10, 0x08 +.byte 0xbc, 0xad, 0x10, 0x08 +.byte 0xb4, 0xad, 0x10, 0x08 +.byte 0xac, 0xad, 0x10, 0x08 +.byte 0xa4, 0xad, 0x10, 0x08 +.byte 0x9c, 0xad, 0x10, 0x08 +.byte 0x94, 0xad, 0x10, 0x08 .asciz "Steel" .align 2,0 -- cgit v1.2.3 From 95b06d5d6b5ec3ba54b7d9f7a04a8df91f452606 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Thu, 17 Sep 2020 12:18:11 -0500 Subject: split to decomp type name string functions --- data/text/type_names.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/text') diff --git a/data/text/type_names.inc b/data/text/type_names.inc index 1af4ac2..f1c76c9 100644 --- a/data/text/type_names.inc +++ b/data/text/type_names.inc @@ -1,4 +1,4 @@ -gUnknown_810AD4C:: @ 810AD4C +gUnformattedTypeStrings:: @ 810AD4C @ (Table of pointers to each string) .byte 0x1c, 0xae, 0x10, 0x08 .byte 0x14, 0xae, 0x10, 0x08 -- cgit v1.2.3 From 1c2975874bbb675ad92ddd3c82f56b46779af31c Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Tue, 3 Nov 2020 14:12:29 -0600 Subject: remove tiny text data file --- data/text/pksdir0.inc | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 data/text/pksdir0.inc (limited to 'data/text') diff --git a/data/text/pksdir0.inc b/data/text/pksdir0.inc deleted file mode 100644 index a65bf68..0000000 --- a/data/text/pksdir0.inc +++ /dev/null @@ -1,8 +0,0 @@ -gUnknown_80D3564:: @ 80D3564 - .byte 0 - .byte 0 - .byte 0 - .byte 0 - .string "pksdir0" - .byte 0 - .align 2,0 -- cgit v1.2.3 From a1cd2ce87fd9281dbea59520b8f5160c1bdeae28 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Sat, 7 Nov 2020 19:01:11 -0600 Subject: some data dumping and doc # of friend areas --- data/text/type_names.inc | 89 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 71 insertions(+), 18 deletions(-) (limited to 'data/text') diff --git a/data/text/type_names.inc b/data/text/type_names.inc index f1c76c9..feffc64 100644 --- a/data/text/type_names.inc +++ b/data/text/type_names.inc @@ -1,57 +1,110 @@ gUnformattedTypeStrings:: @ 810AD4C @ (Table of pointers to each string) -.byte 0x1c, 0xae, 0x10, 0x08 -.byte 0x14, 0xae, 0x10, 0x08 -.byte 0x0c, 0xae, 0x10, 0x08 -.byte 0x04, 0xae, 0x10, 0x08 -.byte 0xfc, 0xad, 0x10, 0x08 -.byte 0xf0, 0xad, 0x10, 0x08 -.byte 0xec, 0xad, 0x10, 0x08 -.byte 0xe0, 0xad, 0x10, 0x08 -.byte 0xd8, 0xad, 0x10, 0x08 -.byte 0xd0, 0xad, 0x10, 0x08 -.byte 0xc8, 0xad, 0x10, 0x08 -.byte 0xc0, 0xad, 0x10, 0x08 -.byte 0xbc, 0xad, 0x10, 0x08 -.byte 0xb4, 0xad, 0x10, 0x08 -.byte 0xac, 0xad, 0x10, 0x08 -.byte 0xa4, 0xad, 0x10, 0x08 -.byte 0x9c, 0xad, 0x10, 0x08 -.byte 0x94, 0xad, 0x10, 0x08 +.4byte gNoneText +.4byte gNormalText +.4byte gFireText +.4byte gWaterText +.4byte gGrassText +.4byte gElectricText +.4byte gIceText +.4byte gFightingText +.4byte gPoisonText +.4byte gGroundText +.4byte gFlyingText +.4byte gPsychicText +.4byte gBugText +.4byte gRockText +.4byte gGhostText +.4byte gDragonText +.4byte gDarkText +.4byte gSteelText +.global gSteelText +gSteelText: .asciz "Steel" .align 2,0 + +.global gDarkText +gDarkText: .asciz "Dark" .align 2,0 + +.global gDragonText +gDragonText: .asciz "Dragon" .align 2,0 + +.global gGhostText +gGhostText: .asciz "Ghost" .align 2,0 + +.global gRockText +gRockText: .asciz "Rock" .align 2,0 + +.global gBugText +gBugText: .asciz "Bug" .align 2,0 + +.global gPsychicText +gPsychicText: .asciz "Psychic" .align 2,0 + +.global gFlyingText +gFlyingText: .asciz "Flying" .align 2,0 + +.global gGroundText +gGroundText: .asciz "Ground" .align 2,0 + +.global gPoisonText +gPoisonText: .asciz "Poison" .align 2,0 + +.global gFightingText +gFightingText: .asciz "Fighting" .align 2,0 + +.global gIceText +gIceText: .asciz "Ice" .align 2,0 + +.global gElectricText +gElectricText: .asciz "Electric" .align 2,0 + +.global gGrassText +gGrassText: .asciz "Grass" .align 2,0 + +.global gWaterText +gWaterText: .asciz "Water" .align 2,0 + +.global gFireText +gFireText: .asciz "Fire" .align 2,0 + +.global gNormalText +gNormalText: .asciz "Normal" .align 2,0 + +.global gNoneText +gNoneText: .asciz "None" .align 2,0 -- cgit v1.2.3 From 5fd50012a4672492dd9464ed9380b70080f35921 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Na=C5=9Bciszewski?= Date: Fri, 11 Dec 2020 18:44:12 +0100 Subject: Resolve a few text incbins (#3) --- data/text/wonder_mail_1.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'data/text') diff --git a/data/text/wonder_mail_1.inc b/data/text/wonder_mail_1.inc index 3fc142f..a5ec8a2 100644 --- a/data/text/wonder_mail_1.inc +++ b/data/text/wonder_mail_1.inc @@ -91,7 +91,11 @@ gUnknown_80DDFB8:: @ 80DDFB8 .align 2, 0 gUnknown_80DE01C:: @ 80DE01C - .incbin "baserom.gba", 0xDE01C, 0x50 + .string "#+Communicating...\n" + .string "#+Please wait with the power on.\n" + .string "#+To cancel~2c press {B_BUTTON}." + .byte 0 + .align 2, 0 gUnknown_80DE06C:: @ 80DE06C .string " Okeydoke!\n" -- cgit v1.2.3 From 5e2842c6989e27f9dcc7b9f9a309c00bb5e58566 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Na=C5=9Bciszewski?= Date: Sat, 12 Dec 2020 19:30:04 +0100 Subject: Text data cleanup! (#6) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Text data cleanup! Reformatted and fixed up all of data/text/, and extended charmap.txt The `#P` metacharacter (prompt) acts like a newline, so I reformatted it as such. All `.string` macros followed by `.byte 0x00` have been replaced with `.asciz` where possible, and `.string "...\0"` elsewhere, note that `.asciz` does not respect the charmap, so characters such as 'é' in 'Pokémon' or the various buttons would be incorrectly encoded. Also cleaned up occurences of `.byte 0x24`, which should just be a literal '$' inside the string. * Nuke all instances of `.asciz` As discussed on Discord, globally replaced all `.asciz` macros with `.string "...\0"`, as `.asciz` did not respect the charmap. * Minor string consistency fixes --- data/text/chunsoft.inc | 10 +- data/text/luminous_cave.inc | 123 ++++++++++++------------ data/text/party_menu.inc | 97 ++++++++----------- data/text/save.inc | 26 ++--- data/text/type_names.inc | 36 +++---- data/text/wonder_mail_1.inc | 190 +++++++++++++++---------------------- data/text/wonder_mail_2.inc | 153 ++++++++++++----------------- data/text/wonder_mail_3.inc | 37 +++----- data/text/wonder_mail_4.inc | 165 +++++++++++++++++--------------- data/text/wonder_mail_complete.inc | 26 ++--- 10 files changed, 376 insertions(+), 487 deletions(-) (limited to 'data/text') 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 -- cgit v1.2.3 From f90f3affeb9b0a66aa7df68f5fdecd692033faf9 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Tue, 15 Dec 2020 16:28:03 -0600 Subject: Wonder mail Pt. 1 (#11) Some work on decomping/labeling wonder mail. Renamed corresponding assembly/C files. Labeled a few strings in data too. --- data/text/wonder_mail_1.inc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'data/text') diff --git a/data/text/wonder_mail_1.inc b/data/text/wonder_mail_1.inc index a7611fa..fdb94ef 100644 --- a/data/text/wonder_mail_1.inc +++ b/data/text/wonder_mail_1.inc @@ -244,41 +244,41 @@ gUnknown_80DE93C:: @ 80DE93C .string " Come again anytime!\0" .align 2, 0 -gUnknown_80DE954:: @ 80DE954 +gWonderMailErrorText:: @ 80DE954 .string " ...Uh~2c no?\n" .string "Something~27s not working right here...\0" .align 2, 0 -gUnknown_80DE98C:: @ 80DE98C +gWonderMailNumGBAsText:: @ 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.\0" .align 2, 0 -gUnknown_80DE9F0:: @ 80DE9F0 +gWonderMailWrongModeText:: @ 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.\0" .align 2, 0 -gUnknown_80DEA58:: @ 80DEA58 +gWonderMailStorageFullText:: @ 80DEA58 .string " ...Uh~2c no?\n" .string "Your storage space is stuffed full.\n" .string "You~27d better make room and try again.\0" .align 2, 0 -gUnknown_80DEAB4:: @ 80DEAB4 +gWonderMailDuplicateText:: @ 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. \0" .align 2, 0 -gUnknown_80DEB18:: @ 80DEB18 +gWonderMailNotEligibleReceiveText:: @ 80DEB18 .string " ...Uh~2c no?\n" .string "You~27re not eligible to receive this mail.\0" .align 2, 0 -gUnknown_80DEB54:: @ 80DEB54 +gWonderMailNoRoomText:: @ 80DEB54 .string " ...Uh~2c no?\n" .string "There~27s no room for you to \n" .string "receive any more mail.#P" @@ -287,24 +287,24 @@ gUnknown_80DEB54:: @ 80DEB54 .string "me again about receiving new mail.\0" .align 2, 0 -gUnknown_80DEC00:: @ 80DEC00 +gWonderMailFriendErrorText:: @ 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.\0" .align 2, 0 -gUnknown_80DEC70:: @ 80DEC70 +gWonderMailPasswordIncorrectText:: @ 80DEC70 .string " ...Uh~2c no?\n" .string "This here password looks wrong.\n" .string "Do you want to try that again?\0" .align 2, 0 -gUnknown_80DECC0:: @ 80DECC0 +gWonderMailSOSPasswordIncorrectText:: @ 80DECC0 .string " ...Uh~2c no? This password~27s\n" .string "not for any #CGSOS Mail#R.\0" .align 2, 0 -gUnknown_80DECFC:: @ 80DECFC +gWonderMailAOKMailReceivedText:: @ 80DECFC .string ": I received the #CGSOS Mail#R.\n" .string "Your adventure will be saved.\0" .align 2, 0 -- cgit v1.2.3