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/save.inc | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) (limited to 'data/text/save.inc') 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 -- cgit v1.2.3