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/system_sbin.s | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/system_sbin.s') 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 -- cgit v1.2.3