diff --git a/charmap.txt b/charmap.txt
index 265c53f9..e4385f72 100644
--- a/charmap.txt
+++ b/charmap.txt
@@ -2,17 +2,17 @@
 '\n' = 0A
 ' ' = 20
 '!' = 21
-'"' = 22
+'"' = 7E 32 32
 '#' = 23
 '$' = 24
 '%' = 25
 '&' = 26
-'\'' = 27
+'\'' = 7E 32 37
 '(' = 28
 ')' = 29
 '*' = 2A
 '+' = 2B
-',' = 2C
+',' = 7E 32 63
 '-' = 2D
 '.' = 2E
 '/' = 2F
@@ -111,8 +111,8 @@
 'Ž' = 8E
 '‘' = 91
 '’' = 92
-'“' = 93
-'”' = 94
+'“' = 7E 39 33
+'”' = 7E 39 34
 '•' = 95
 @ 96, 97 are not hyphens, 'er', and 're' superscripts in kanji_a
 '˜' = 98
diff --git a/data/credits1.s b/data/credits1.s
index 9133b706..b959b073 100644
--- a/data/credits1.s
+++ b/data/credits1.s
@@ -881,7 +881,7 @@ gUnknown_80E4A40: @ 80E4A40
 
         .global AmbrellaCoLtd
         AmbrellaCoLtd:
-        .string "Ambrella Co., Ltd.\0"
+        .asciz "Ambrella Co., Ltd."
         .align 2,0
 
         .global GameFreakInc
@@ -1007,4 +1007,4 @@ gCreditsTable: @ 80E591C
         .4byte Credits_OriginalDirector
         .4byte Credits_Producers
         .4byte Credits_ExecutiveProducer
-        .4byte Credits_ExecutiveProducer2
\ No newline at end of file
+        .4byte Credits_ExecutiveProducer2
diff --git a/data/data.s b/data/data.s
index 460a1471..7514dcad 100644
--- a/data/data.s
+++ b/data/data.s
@@ -1055,8 +1055,8 @@ gUnknown_80B7F14: @ 80B7F14
 
     .global gLocateSetErrorMessage
 gLocateSetErrorMessage: @ 80B7F20
-    .string "Memroy LocateSet [%p] buffer %8x size can't locate\n"
-    .string "    atb %02x grp %3d \0"
+    .ascii "Memroy LocateSet [%p] buffer %8x size can't locate\n"
+    .asciz "    atb %02x grp %3d \0"
     .align 2,0
 
 MemoryLocate_LocalCreateText:
@@ -1069,7 +1069,7 @@ gUnknown_80B7F88: @ 80B7F88
 
 	.global gLocalCreateErrorMessage
 gLocalCreateErrorMessage: @ 80B7F94
-        .string "Memroy LocalCreate buffer %08x size can't locate\0" @ Spelling error is intentional
+        .asciz "Memroy LocalCreate buffer %08x size can't locate\0" @ Spelling error is intentional
         .align 2,0
 
 @ code_80035F0
diff --git a/data/item/item_names.s b/data/item/item_names.s
index 5518a39d..1a43a0b8 100644
--- a/data/item/item_names.s
+++ b/data/item/item_names.s
@@ -660,7 +660,7 @@ ItemNameThunderstone:
 
 .global ItemNameKingsRock
 ItemNameKingsRock:
-.string "King's Rock\0"
+.asciz "King's Rock"
 .align 2,0
 
 .global ItemNameUpgrade
diff --git a/data/monster/monster_names.s b/data/monster/monster_names.s
index 7d455e2b..b6042e62 100644
--- a/data/monster/monster_names.s
+++ b/data/monster/monster_names.s
@@ -2655,7 +2655,7 @@ MonsterCategoryWildDuck:
 
 .global MonsterNameFarfetch
 MonsterNameFarfetch:
-.string "Farfetch'd\0"
+.asciz "Farfetch'd"
 .align 2,0
 
 .global MonsterNameMagneton