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/type_names.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/type_names.inc')
-rw-r--r-- | data/text/type_names.inc | 36 |
1 files changed, 18 insertions, 18 deletions
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 |