diff options
author | Mateusz Naściszewski <matin1111@wp.pl> | 2020-12-12 19:30:04 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-12 12:30:04 -0600 |
commit | 5e2842c6989e27f9dcc7b9f9a309c00bb5e58566 (patch) | |
tree | bcc702bc8f8b54eec54a69d7859bcdc916970fb5 /data/text/luminous_cave.inc | |
parent | 1b9aeaf5186492f767e591484efe4ed37d0cdb75 (diff) |
Text data cleanup! (#6)
* 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
Diffstat (limited to 'data/text/luminous_cave.inc')
-rw-r--r-- | data/text/luminous_cave.inc | 123 |
1 files changed, 60 insertions, 63 deletions
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 |