convert to using asciz for handling all the 0x00 bytes

10 files changed, 237 insertions, 490 deletions

diff --git a/data/data.s b/data/data.s
index 9bd863a..fe5a062 100644
--- a/data/data.s
+++ b/data/data.s
@@ -28,7 +28,10 @@ gUnknown_80B6A28: @ 80B6A28
 gUnknown_80B6D90: @ 80B6D90
 	.incbin "baserom.gba", 0xB6D90, 0x3B4
 
-        .include "data/text/none.inc"
+	.global gUnknown_80B7144
+gUnknown_80B7144: @ 80B7144
+        .asciz "NONE"
+        .align 2,0
 
 	.global gUnknown_80B714C
 gUnknown_80B714C: @ 80B714C
diff --git a/data/data_80B9BB8.s b/data/data_80B9BB8.s
index 64503b0..41e03b2 100644
--- a/data/data_80B9BB8.s
+++ b/data/data_80B9BB8.s
@@ -18,9 +18,13 @@ gUnknown_80B9C00: @ 80B9C00
 gUnknown_80B9C60: @ 80B9C60
 	.incbin "baserom.gba", 0xB9C60, 0xC
 
-        .include "data/text/efob001.inc"
+gUnknown_80B9C6C:: @ 80B9C6C
+        .asciz "efob001"
+        .align 2,0
 
-        .include "data/text/efob000.inc"
+gUnknown_80B9C74:: @ 80B9C74
+        .asciz "efob000"
+        .align 2,0
 
 	.global gUnknown_80B9C7C
 gUnknown_80B9C7C: @ 80B9C7C
@@ -118,18 +122,13 @@ gUnknown_80D4074: @ 80D4074
 
 	.global gUnknown_80D407C
 gUnknown_80D407C: @ 80D4074
-        .string "Yes"
-        .byte 0
-        .align 2,0
+        .asciz "Yes"
 
 	.global gUnknown_80D4080
 gUnknown_80D4080: @ 80D4080
-        .string "No"
-        .byte 0
-        .byte 0
-        .string "pksdir0"
-        .byte 0
+        .asciz "No"
         .align 2,0
+        .asciz "pksdir0"
 
 	.global gUnknown_80D408C
 gUnknown_80D408C: @ 80D408C
@@ -157,15 +156,11 @@ gUnknown_80D40FC: @ 80D40FC
 
 	.global gUnknown_80D4104
 gUnknown_80D4104: @ 80D4104
-	.string "Where would you like to go?"
-	.byte 0
-	.align 2, 0
+	.asciz "Where would you like to go?"
 
 	.global gUnknown_80D4120
 gUnknown_80D4120: @ 80D4120
-	.string "$i0"
-        .byte 0
-        .align 2,0
+	.asciz "$i0"
 
 	.global gUnknown_80D4124
 gUnknown_80D4124: @ 80D4124
@@ -201,73 +196,35 @@ gUnknown_80D4288: @ 80D4288
 
 	.global gUnknown_80D42C0
 gUnknown_80D42C0: @ 80D42C0
-        .string "!!!!! Fatal !!!!!\n"
-        .byte 0
-        .byte 0
+        .asciz "!!!!! Fatal !!!!!\n"
         .align 2,0
 
 	.global gUnknown_80D42D4
 gUnknown_80D42D4: @ 80D42D4
-	.string "%s\n"
-        .byte 0
-        .align 2,0
-        .string "pksdir0"
-        .byte 0
-        .align 2,0
-        .string "pksdir0"
-        .byte 0
-        .align 2,0
-        .string "pksdir0"
-        .byte 0
-        .align 2,0
-        .string "pksdir0"
-        .byte 0
-        .align 2,0
-        .string "pksdir0"
-        .byte 0
-        .align 2,0
-        .string "pksdir0"
-        .byte 0
-        .align 2,0
-        .string "pksdir0"
-        .byte 0
-        .align 2,0
-        .string "pksdir0"
-        .byte 0
-        .align 2,0
-        .string "pksdir0"
-        .byte 0
-        .align 2,0
-        .string "POKE_DUNGEON__05"
-        .byte 0
-        .byte 0
-        .byte 0
-        .byte 0
-        .align 2,0
-        .string "pksdir0"
-        .byte 0
+	.asciz "%s\n"
         .align 2,0
-        .string "pksdir0"
-        .byte 0
-        .align 2,0
-        .string "pksdir0"
-        .byte 0
-        .align 2,0
-        .string "pksdir0"
-        .byte 0
+        .asciz "pksdir0"
+        .asciz "pksdir0"
+        .asciz "pksdir0"
+        .asciz "pksdir0"
+        .asciz "pksdir0"
+        .asciz "pksdir0"
+        .asciz "pksdir0"
+        .asciz "pksdir0"
+        .asciz "pksdir0"
+        .asciz "POKE_DUNGEON__05"
         .align 2,0
+        .asciz "pksdir0"
+        .asciz "pksdir0"
+        .asciz "pksdir0"
+        .asciz "pksdir0"
 
 	.global gUnknown_80D4354
 gUnknown_80D4354: @ 80D4354
         .string "#+The game data is corrupted.\n"
-        .string "#+Your data will be erased."
-        .byte 0
-        .byte 0
-        .byte 0
-        .align 2,0
-        .string "pksdir0"
-        .byte 0
+        .asciz "#+Your data will be erased."
         .align 2,0
+        .asciz "pksdir0"
 
 	.global gUnknown_80D4398
 gUnknown_80D4398: @ 80D4398
@@ -277,37 +234,26 @@ gUnknown_80D4398: @ 80D4398
 gUnknown_80D43D8: @ 80D43D8
         .string "#+Writing to GBA Game Pak.\n"
         .string "#+Do not remove the GBA Game Pak.\n"
-        .string "#+Please wait with the power on."
-        .byte 0
-        .byte 0
-        .byte 0
+        .asciz "#+Please wait with the power on."
         .align 2,0
 
 	.global gUnknown_80D4438
 gUnknown_80D4438: @ 80D4438
-        .string "#+Save completed!"
-        .byte 0
-        .byte 0
-        .byte 0
+        .asciz "#+Save completed!"
         .align 2,0
 
 	.global gUnknown_80D444C
 gUnknown_80D444C: @ 80D444C
         .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
+        .asciz "#+and reinsert the DS Card."
         .align 2,0
 
 	.global gUnknown_80D44B0
 gUnknown_80D44B0: @ 80D44B0
-        .string "#+Save failed."
-        .byte 0
-        .byte 0
-        .align 2,0
-        .string "pksdir0"
-        .byte 0
+        .asciz "#+Save failed."
         .align 2,0
+        .asciz "pksdir0"
 
 	.global gUnknown_80D44C8
 gUnknown_80D44C8: @ 80D44C8
@@ -316,11 +262,8 @@ gUnknown_80D44C8: @ 80D44C8
 	.global gUnknown_80D45AC
 gUnknown_80D45AC: @ 80D45AC
         .string "#+Quicksaving your adventure...\n"
-        .string "#+Please don~27t turn off the power."
-        .byte 0
-        .byte 0
-        .byte 0
-        .byte 0
+        .asciz "#+Please don~27t turn off the power."
+        .align 2,0
 
 	.global gUnknown_80D45F4
 gUnknown_80D45F4: @ 80D45F4
@@ -336,11 +279,9 @@ gUnknown_80D473C: @ 80D473C
 
 	.global gUnknown_80D47A0
 gUnknown_80D47A0: @ 80D47A0
-        .string "#+Save failed."
-        .byte 0
-        .byte 0
-        .string "pksdir0"
-        .byte 0
+        .asciz "#+Save failed."
+        .align 2,0
+        .asciz "pksdir0"
 
 	.global gUnknown_80D47B8
 gUnknown_80D47B8: @ 80D47B8
@@ -1427,8 +1368,8 @@ gUnknown_80DD764: @ 80DD764
         .string "to this Pokémon.#P"
         .string "The Pokémon will leave its Friend Area.\n"
         .string "It will no longer be available for\n"
-        .string "adventures. Is that OK?"
-        .byte 0x00, 0x00, 0x00, 0x00
+        .asciz "adventures. Is that OK?"
+        .align 2,0
 
 	.global gUnknown_80DD7FC
 gUnknown_80DD7FC: @ 80DD7FC
@@ -1437,8 +1378,8 @@ gUnknown_80DD7FC: @ 80DD7FC
 	.global gUnknown_80DD8A0
 gUnknown_80DD8A0: @ 80DD8A0
         .string "#+The #C4$i0#R was\n"
-        .string "#+returned to the Toolbox."
-        .byte 0x00, 0x00, 0x00
+        .asciz "#+returned to the Toolbox."
+        .align 2,0
 
 	.global gUnknown_80DD8D0
 gUnknown_80DD8D0: @ 80DD8D0
@@ -1446,55 +1387,52 @@ gUnknown_80DD8D0: @ 80DD8D0
 
 	.global gUnknown_80DD8F8
 gUnknown_80DD8F8: @ 80DD8F8
-        .string "Stand By"
-        .byte 0x00, 0x00, 0x00, 0x00
+        .asciz "Stand By"
+        .align 2,0
 
 	.global gUnknown_80DD904
 gUnknown_80DD904: @ 80DD904
-        .string "Make Leader"
-        .byte 0x00
+        .asciz "Make Leader"
 
 	.global gUnknown_80DD910
 gUnknown_80DD910: @ 80DD910
-        .string "Join Team"
-        .byte 0x00, 0x00, 0x00
+        .asciz "Join Team"
+        .align 2,0
 
 	.global gUnknown_80DD91C
 gUnknown_80DD91C: @ 80DD91C
-        .string "Say Farewell"
-        .byte 0x00, 0x00, 0x00, 0x00
+        .asciz "Say Farewell"
+        .align 2,0
 
 	.global gUnknown_80DD92C
 gUnknown_80DD92C: @ 80DD92C
-        .string "Give"
-        .byte 0x00, 0x00, 0x00, 0x00
+        .asciz "Give"
+        .align 2,0
 
 	.global gUnknown_80DD934
 gUnknown_80DD934: @ 80DD934
-        .string "Take"
-        .byte 0x00, 0x00, 0x00, 0x00
+        .asciz "Take"
+        .align 2,0
 
 	.global gUnknown_80DD93C
 gUnknown_80DD93C: @ 80DD93C
-        .string "Summary"
-        .byte 0x00
+        .asciz "Summary"
+        .align 2,0
 
 	.global gUnknown_80DD944
 gUnknown_80DD944: @ 80DD944
-        .string "Moves"
-        .byte 0x00, 0x00, 0x00
+        .asciz "Moves"
+        .align 2,0
 
 	.global gUnknown_80DD94C
 gUnknown_80DD94C: @ 80DD94C
-        .string "Check IQ"
-        .byte 0x00, 0x00, 0x00, 0x00
+        .asciz "Check IQ"
+        .align 2,0
 
 	.global gUnknown_80DD958
 gUnknown_80DD958: @ 80DD958
-        .string "Item: #C4$i0#R "
-        .byte 0x00
-        .string "pksdir0"
-        .byte 0x00
+        .asciz "Item: #C4$i0#R "
+        .asciz "pksdir0"
 
 	.global gUnknown_80DD970
 gUnknown_80DD970: @ 80DD970
@@ -1609,10 +1547,9 @@ gUnknown_80DFBEC: @ 80DFBEC
 
 	.global gUnknown_80DFC04
 gUnknown_80DFC04: @ 80DFC04
-        .string "News List"
-        .byte 0x00, 0x00, 0x00
-        .string "pksdir0"
-        .byte 0
+        .asciz "News List"
+        .align 2,0
+        .asciz "pksdir0"
 
 	.global gUnknown_80DFC18
 gUnknown_80DFC18: @ 80DFC18
@@ -1640,15 +1577,13 @@ gUnknown_80DFC34: @ 80DFC34
 
 	.global gUnknown_80DFC4C
 gUnknown_80DFC4C: @ 80DFC4C
-        .string "She"
-        .byte 0
+        .asciz "She"
 
 	.global gUnknown_80DFC50
 gUnknown_80DFC50: @ 80DFC50
-        .string "He"
-        .byte 0x00, 0x00
-        .string "pksdir0"
-        .byte 0
+        .asciz "He"
+        .align 2,0
+        .asciz "pksdir0"
 
 	.global gUnknown_80DFC5C
 gUnknown_80DFC5C: @ 80DFC5C
@@ -1660,10 +1595,8 @@ gUnknown_80DFC74: @ 80DFC74
 
 	.global gUnknown_80DFC8C
 gUnknown_80DFC8C: @ 80DFC8C
-        .string "Mailbox"
-        .byte 0
-        .string "pksdir0"
-        .byte 0
+        .asciz "Mailbox"
+        .asciz "pksdir0"
 
 	.global gUnknown_80DFC9C
 gUnknown_80DFC9C: @ 80DFC9C
@@ -1675,10 +1608,9 @@ gUnknown_80DFCB4: @ 80DFCB4
 
 	.global gUnknown_80DFCCC
 gUnknown_80DFCCC: @ 80DFCCC
-        .string "Bulletin Board"
-        .byte 0x00, 0x00
-        .string "pksdir0"
-        .byte 0
+        .asciz "Bulletin Board"
+        .align 2,0
+        .asciz "pksdir0"
 
 	.global gUnknown_80DFCE4
 gUnknown_80DFCE4: @ 80DFCE4
@@ -1690,10 +1622,9 @@ gUnknown_80DFCFC: @ 80DFCFC
 
 	.global gUnknown_80DFD14
 gUnknown_80DFD14: @ 80DFD14
-        .string "Job List"
-        .byte 0x00, 0x00, 0x00, 0x00
-        .string "pksdir0"
-        .byte 0x00
+        .asciz "Job List"
+        .align 2,0
+        .asciz "pksdir0"
 
 	.global gUnknown_80DFD28
 gUnknown_80DFD28: @ 80DFD28
@@ -1709,15 +1640,13 @@ gUnknown_80DFD58: @ 80DFD58
 
 	.global gUnknown_80DFD70
 gUnknown_80DFD70: @ 80DFD70
-        .string "Take Job"
-        .byte 0x00, 0x00, 0x00, 0x00
+        .asciz "Take Job"
+        .align 2,0
 
 	.global gUnknown_80DFD7C
 gUnknown_80DFD7C: @ 80DFD7C
-        .string "Suspend"
-        .byte 0
-        .string "pksdir0"
-        .byte 0
+        .asciz "Suspend"
+        .asciz "pksdir0"
 
 	.global gUnknown_80DFD8C
 gUnknown_80DFD8C: @ 80DFD8C
@@ -1729,13 +1658,9 @@ gUnknown_80DFDA4: @ 80DFDA4
 
 	.global gUnknown_80DFDBC
 gUnknown_80DFDBC: @ 80DFDBC
-	.string "RESCUE EVENT"
-        .byte 0
-        .byte 0
-        .byte 0
-        .byte 0
-        .string "pksdir0"
-        .byte 0
+	.asciz "RESCUE EVENT"
+        .align 2,0
+        .asciz "pksdir0"
 
 	.global gUnknown_80DFDD4
 gUnknown_80DFDD4: @ 80DFDD4
@@ -1783,47 +1708,33 @@ gUnknown_80E02CC: @ 80E02CC
 
 	.global gUnknown_80E02E4
 gUnknown_80E02E4: @ 80E02E4
-        .string "Check Mail"
-        .byte 0
-        .byte 0
+        .asciz "Check Mail"
+        .align 2,0
 
 	.global gUnknown_80E02F0
 gUnknown_80E02F0: @ 80E02F0
-        .string "Job List"
-        .byte 0
-        .byte 0
-        .byte 0
-        .byte 0
+        .asciz "Job List"
+        .align 2,0
 
 	.global gUnknown_80E02FC
 gUnknown_80E02FC: @ 80E02FC
-        .string "PKMN News"
-        .byte 0
-        .byte 0
-        .byte 0
+        .asciz "PKMN News"
+        .align 2,0
 
 	.global gUnknown_80E0308
 gUnknown_80E0308: @ 80E0308
-        .string "Store"
-        .byte 0
-        .byte 0
-        .byte 0
+        .asciz "Store"
+        .align 2,0
 
 	.global gUnknown_80E0310
 gUnknown_80E0310: @ 80E0310
-        .string "Read"
-        .byte 0
-        .byte 0
-        .byte 0
-        .byte 0
+        .asciz "Read"
+        .align 2,0
 
 	.global gUnknown_80E0318
 gUnknown_80E0318: @ 80E0318
-        .string "Accepted"
-        .byte 0
-        .byte 0
-        .byte 0
-        .byte 0
+        .asciz "Accepted"
+        .align 2,0
 
 	.global gUnknown_80E0324
 gUnknown_80E0324: @ 80E0324
@@ -1847,34 +1758,24 @@ gUnknown_80E0378: @ 80E0378
 
 	.global gUnknown_80E0390
 gUnknown_80E0390: @ 80E0390
-        .string "Bulletin Board"
-        .byte 0
-        .byte 0
+        .asciz "Bulletin Board"
+        .align 2,0
 
 	.global gUnknown_80E03A0
 gUnknown_80E03A0: @ 80E03A0
-        .string "Job List"
-        .byte 0
-        .byte 0
-        .byte 0
-        .byte 0
+        .asciz "Job List"
+        .align 2,0
 
 	.global gUnknown_80E03AC
 gUnknown_80E03AC: @ 80E03AC
-        .string "Accepted"
-        .byte 0
-        .byte 0
-        .byte 0
-        .byte 0
+        .asciz "Accepted"
+        .align 2,0
 
 	.global gUnknown_80E03B8
 gUnknown_80E03B8: @ 80E03B8
-        .string "/"
-        .byte 0
-        .byte 0
-        .byte 0
-        .string "pksdir0"
-        .byte 0
+        .asciz "/"
+        .align 2,0
+        .asciz "pksdir0"
 
 	.global gUnknown_80E03C4
 gUnknown_80E03C4: @ 80E03C4
@@ -1886,10 +1787,9 @@ gUnknown_80E03F4: @ 80E03F4
 
 	.global gUnknown_80E040C
 gUnknown_80E040C: @ 80E040C
-        .string "Send"
-        .byte 0x00, 0x00, 0x00, 0x00
-        .string "pksdir0"
-        .byte 0
+        .asciz "Send"
+        .align 2,0
+        .asciz "pksdir0"
 
 	.global gUnknown_80E041C
 gUnknown_80E041C: @ 80E041C
@@ -1949,8 +1849,8 @@ gUnknown_80E072C: @ 80E072C
 
 	.global gUnknown_80E0744
 gUnknown_80E0744: @ 80E0744
-        .string "Dungeons"
-        .byte 0x00, 0x00, 0x00, 0x00
+        .asciz "Dungeons"
+        .align 2,0
 
 	.global gUnknown_80E0750
 gUnknown_80E0750: @ 80E0750
@@ -1982,8 +1882,8 @@ gUnknown_80E0804: @ 80E0804
 
 	.global gUnknown_80E081C
 gUnknown_80E081C: @ 80E081C
-        .string "Courses"
-        .byte 0
+        .asciz "Courses"
+        .align 2,0
 
 	.global gUnknown_80E0824
 gUnknown_80E0824: @ 80E0824
@@ -2253,8 +2153,8 @@ gUnknown_80E25B4: @ 80E25B4
 
 	.global gUnknown_80E25F4
 gUnknown_80E25F4: @ 80E25F4
-        .string "What would you like to do?"
-        .byte 0x00, 0x00
+        .asciz "What would you like to do?"
+        .align 2,0
 
 	.global gUnknown_80E2610
 gUnknown_80E2610: @ 80E2610
@@ -3493,33 +3393,25 @@ gUnknown_80E89B0: @ 80E89B0
 	.global gUnknown_80E89FC
 gUnknown_80E89FC: @ 80E89FC
         .string "This is a rescue through communication.\n"
-        .string "Get a friend to help you!"
-        .byte 0
-        .byte 0
-        .byte 0
+        .asciz "Get a friend to help you!"
+        .align 2,0
 
 	.global gUnknown_80E8A40
 gUnknown_80E8A40: @ 80E8A40
         .string "This is a rescue through communication.\n"
-        .string "Rescue a friend!"
-        .byte 0
-        .byte 0
-        .byte 0
-        .byte 0
+        .asciz "Rescue a friend!"
+        .align 2,0
 
 	.global gUnknown_80E8A7C
 gUnknown_80E8A7C: @ 80E8A7C
         .string "This is a rescue through communication.\n"
-        .string "Send your thanks to your friend!"
-        .byte 0
-        .byte 0
-        .byte 0
-        .byte 0
+        .asciz "Send your thanks to your friend!"
+        .align 2,0
 
 	.global gUnknown_80E8AC8
 gUnknown_80E8AC8: @ 80E8AC8
-        .string "Client:"
-        .byte 0
+        .asciz "Client:"
+        .align 2,0
 
 	.global gUnknown_80E8AD0
 gUnknown_80E8AD0: @ 80E8AD0
@@ -3527,83 +3419,64 @@ gUnknown_80E8AD0: @ 80E8AD0
 
 	.global gUnknown_80E8AE0
 gUnknown_80E8AE0: @ 80E8AE0
-        .string "Objective:"
-        .byte 0
-        .byte 0
+        .asciz "Objective:"
+        .align 2,0
 
 	.global gUnknown_80E8AEC
 gUnknown_80E8AEC: @ 80E8AEC
-        .string "Friend Rescue"
-        .byte 0
-        .byte 0
-        .byte 0
+        .asciz "Friend Rescue"
+        .align 2,0
 
 	.global gUnknown_80E8AFC
 gUnknown_80E8AFC: @ 80E8AFC
-        .string "Deliver #C4%s#R."
-        .byte 0
-        .byte 0
-        .byte 0
-        .byte 0
+        .asciz "Deliver #C4%s#R."
+        .align 2,0
 
 	.global gUnknown_80E8B10
 gUnknown_80E8B10: @ 80E8B10
-        .string "Find #C4%s#R."
-        .byte 0
-        .byte 0
-        .byte 0
+        .asciz "Find #C4%s#R."
+        .align 2,0
 
 	.global gUnknown_80E8B20
 gUnknown_80E8B20: @ 80E8B20
-        .string "Help me."
-        .byte 0
-        .byte 0
-        .byte 0
-        .byte 0
+        .asciz "Help me."
+        .align 2,0
 
 	.global gUnknown_80E8B2C
 gUnknown_80E8B2C: @ 80E8B2C
-        .string "Escort to #C6%s#R."
-        .byte 0
-        .byte 0
+        .asciz "Escort to #C6%s#R."
+        .align 2,0
 
 	.global gUnknown_80E8B40
 gUnknown_80E8B40: @ 80E8B40
-        .string "Find #C6%s#R."
-        .byte 0
-        .byte 0
-        .byte 0
+        .asciz "Find #C6%s#R."
+        .align 2,0
 
 	.global gUnknown_80E8B50
 gUnknown_80E8B50: @ 80E8B50
-        .string "Special mission"
-        .byte 0
+        .asciz "Special mission"
+        .align 2,0
 
 	.global gUnknown_80E8B60
 gUnknown_80E8B60: @ 80E8B60
-        .string "Place:"
-        .byte 0
-        .byte 0
+        .asciz "Place:"
+        .align 2,0
 
 	.global gUnknown_80E8B68
 gUnknown_80E8B68: @ 80E8B68
-        .string "Difficulty:"
-        .byte 0
+        .asciz "Difficulty:"
+        .align 2,0
 
 	.global gUnknown_80E8B74
 gUnknown_80E8B74: @ 80E8B74
-        .string "Reward:"
-        .byte 0
+        .asciz "Reward:"
+        .align 2,0
 
 	.global gUnknown_80E8B7C
 gUnknown_80E8B7C: @ 80E8B7C
-        .string "Wonder Mail:"
-        .byte 0
-        .byte 0
-        .byte 0
-        .byte 0
-        .string "pksdir0"
-        .byte 0
+        .asciz "Wonder Mail:"
+        .align 2,0
+        .asciz "pksdir0"
 
 	.global gUnknown_80E8B94
 gUnknown_80E8B94: @ 80E8B94
@@ -3699,8 +3572,7 @@ gUnknown_80F42A8: @ 80F42A8
 gUnknown_80F42C0: @ 80F42C0
 	.string "Pokémon"
         .byte 0
-        .string "pksdir0"
-        .byte 0
+        .asciz "pksdir0"
 
 	.global gUnknown_80F42D0
 gUnknown_80F42D0: @ 80F42D0
diff --git a/data/friend_area.inc b/data/friend_area.inc
index 559821c..cce582a 100644
--- a/data/friend_area.inc
+++ b/data/friend_area.inc
@@ -44,10 +44,7 @@ gUnknown_80DD190: @ 80DD190 (seems to be Friend Area Warp Script)
 
 	.global gUnknown_80DD1A8
 gUnknown_80DD1A8: @ 80DD1A8
-        .string "Whom would you like to visit?"
-        .byte 0
-        .byte 0
-        .byte 0
+        .asciz "Whom would you like to visit?"
         .align 2,0
 
 	.global gUnknown_80DD1C8
@@ -65,84 +62,55 @@ gUnknown_80DD240: @ 80DD240
 	.global gUnknown_80DD270
 gUnknown_80DD270: @ 80DD270
         .string "#+$m1 left the team to remain\n"
-        .string "#+on standby in the Friend Area."
-        .byte 0
-        .byte 0
+        .asciz "#+on standby in the Friend Area."
         .align 2,0
 
 	.global gUnknown_80DD2B0
 gUnknown_80DD2B0: @ 80DD2B0
-        .string "Give"
-        .byte 0
-        .byte 0
-        .byte 0
-        .byte 0
+        .asciz "Give"
         .align 2,0
 
 	.global gUnknown_80DD2B8
 gUnknown_80DD2B8: @ 80DD2B8
-        .string "Take"
-        .byte 0
-        .byte 0
-        .byte 0
-        .byte 0
+        .asciz "Take"
         .align 2,0
 
 	.global gUnknown_80DD2C0
 gUnknown_80DD2C0: @ 80DD2C0
-        .string "Stand By"
-        .byte 0
-        .byte 0
-        .byte 0
-        .byte 0
+        .asciz "Stand By"
         .align 2,0
 
 	.global gUnknown_80DD2CC
 gUnknown_80DD2CC: @ 80DD2CC
-        .string "Visit"
-        .byte 0
-        .byte 0
-        .byte 0
+        .asciz "Visit"
         .align 2,0
 
 	.global gUnknown_80DD2D4
 gUnknown_80DD2D4: @ 80DD2D4
-        .string "Name"
-        .byte 0
-        .byte 0
-        .byte 0
-        .byte 0
+        .asciz "Name"
         .align 2,0
 
 	.global gUnknown_80DD2DC
 gUnknown_80DD2DC: @ 80DD2DC
-        .string "Summary"
-        .byte 0
+        .asciz "Summary"
         .align 2,0
 
 	.global gUnknown_80DD2E4
 gUnknown_80DD2E4: @ 80DD2E4
-        .string "Moves"
-        .byte 0
-        .byte 0
-        .byte 0
+        .asciz "Moves"
         .align 2,0
 
 	.global gUnknown_80DD2EC
 gUnknown_80DD2EC: @ 80DD2EC
-        .string "Check IQ"
-        .byte 0
-        .byte 0
-        .byte 0
-        .byte 0
+        .asciz "Check IQ"
         .align 2,0
 
 	.global gUnknown_80DD2F8
 gUnknown_80DD2F8: @ 80DD2F8
-        .string "Item: #C4$i0#R "
-        .byte 0
-        .string "pksdir0"
-        .byte 0
+        .asciz "Item: #C4$i0#R "
+        .align 2,0
+        .asciz "pksdir0"
+        .align 2,0
 
 	.global gUnknown_80DD310
 gUnknown_80DD310: @ 80DD310 (default friend area script)
diff --git a/data/personality_test.inc b/data/personality_test.inc
index 9e63b96..a9f7feb 100644
--- a/data/personality_test.inc
+++ b/data/personality_test.inc
@@ -12,11 +12,8 @@ gUnknown_80F2704: @ 80F2704
 
 	.global gUnknown_80F273C
 gUnknown_80F273C: @ 80F273C
-	.string "Are you a boy or a girl?"
-        .byte 0
-        .byte 0
-        .byte 0
-        .byte 0
+	.asciz "Are you a boy or a girl?"
+        .align 2,0
         .byte 0x3C, 0x27, 0x0F, 0x08 @ Script to display small box?
 
 	.global gUnknown_80F275C
@@ -65,8 +62,8 @@ gUnknown_80F27DC: @ 80F27DC
         .string "#+This is the final step.#W\n"
         .string "#+Who would you like to have as a partner?#P" @ #P -> scroll down
         .string "#+Choose the Pokémon you want\n"
-        .string "#+as your partner from this group."
-        .byte 0, 0, 0, 0
+        .asciz "#+as your partner from this group."
+        .align 2,0
         .byte 0xDC, 0x27, 0x0F, 0x08 @ Script command to display pokepic of hovered?
 
 	.global gUnknown_80F286C
diff --git a/data/text/chunsoft.inc b/data/text/chunsoft.inc
index 89f10be..b7723a5 100644
--- a/data/text/chunsoft.inc
+++ b/data/text/chunsoft.inc
@@ -1,21 +1,11 @@
 gUnknown_80E6E50:: @ 80E6E50
-    .string "CHUNSOFT"
-    .byte 0
-    .byte 0
+    .asciz "CHUNSOFT"
     .align 2,0
 
-    .string "pksdir0"
-    .byte 0
-    .align 2,0
+    .asciz "pksdir0"
 
-    .string "pksdir0"
-    .byte 0
-    .align 2,0
+    .asciz "pksdir0"
 
-    .string "pksdir0"
-    .byte 0
-    .align 2,0
+    .asciz "pksdir0"
 
-    .string "pksdir0"
-    .byte 0
-    .align 2,0
+    .asciz "pksdir0"
diff --git a/data/text/efob000.inc b/data/text/efob000.inc
deleted file mode 100644
index 1ee932c..0000000
--- a/data/text/efob000.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-gUnknown_80B9C74:: @ 80B9C74
-    .string "efob000"
-    .byte 0
-    .align 2,0
diff --git a/data/text/efob001.inc b/data/text/efob001.inc
deleted file mode 100644
index 2c77a63..0000000
--- a/data/text/efob001.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-gUnknown_80B9C6C:: @ 80B9C6C
-    .string "efob001"
-    .byte 0
-    .align 2,0
diff --git a/data/text/none.inc b/data/text/none.inc
deleted file mode 100644
index ebd4da5..0000000
--- a/data/text/none.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-gUnknown_80B7144:: @ 80B7144
-    .string "NONE"
-    .byte 0
-    .byte 0
-    .byte 0
-    .byte 0
-    .align 2,0
diff --git a/data/text/party_menu.inc b/data/text/party_menu.inc
index eaaabd1..f23f231 100644
--- a/data/text/party_menu.inc
+++ b/data/text/party_menu.inc
@@ -2,40 +2,35 @@ gUnknown_80DD388:: @ 80DD388
 	.string "You have chosen to say farewell\n"
 	.string "to this Pokémon.#PThe Pokémon will leave its Friend Area.\n"
 	.string "It will no longer be available for\n"
-	.string "adventures. Is that OK?"
-	.byte 0
+	.asciz "adventures. Is that OK?"
 	.align 2, 0
 
 gUnknown_80DD420:: @ 80DD420
 	.string "If you say farewell to this\n"
 	.string "Pokémon~2c it will be gone forever.#PYou will never be able to get another one\n"
 	.string "like it to join your team.\n"
-	.string "Will you release it anyway?"
-	.byte 0
+	.asciz "Will you release it anyway?"
 	.align 2, 0
 
 gUnknown_80DD4C4:: @ 80DD4C4
 	.string "#+"
 	.byte 0x24
 	.string "m1 joined the\n"
-	.string "#+rescue team for adventures!"
-	.byte 0
+	.asciz "#+rescue team for adventures!"
 	.align 2, 0
 
 gUnknown_80DD4F4:: @ 80DD4F4
 	.string "#+"
 	.byte 0x24
 	.string "m1 left the team to remain\n"
-	.string "#+on standby in the Friend Area."
-	.byte 0
+	.asciz "#+on standby in the Friend Area."
 	.align 2, 0
 
 gUnknown_80DD534:: @ 80DD534
 	.string "#+"
 	.byte 0x24
 	.string "m1 became the leader\n"
-	.string "#+of the rescue team."
-	.byte 0
+	.asciz "#+of the rescue team."
 	.align 2, 0
 
 gUnknown_80DD564:: @ 80DD564
@@ -45,14 +40,14 @@ gUnknown_80DD564:: @ 80DD564
 	.string "#+the Friend Area.\n"
 	.string "#+Bye-bye~2c "
 	.byte 0x24
-	.string "m1!"
-	.byte 0
+	.asciz "m1!"
+        .align 2,0
+
 gUnknown_80DD594:: @ 80DD594
 	.string "#+The #C4"
 	.byte 0x24
 	.string "i1#R was\n"
-	.string "#+handed over. "
-	.byte 0
+	.asciz "#+handed over. "
 	.align 2, 0
 
 gUnknown_80DD5B8:: @ 80DD5B8
@@ -62,86 +57,72 @@ gUnknown_80DD5B8:: @ 80DD5B8
 	.string "#+handed over.#P#+The #C4"
 	.byte 0x24
 	.string "i0#R was\n"
-	.string "#+returned to the Toolbox."
-	.byte 0
+	.asciz "#+returned to the Toolbox."
 	.align 2, 0
 
 gUnknown_80DD60C:: @ 80DD60C
 	.string "#+The #C4"
 	.byte 0x24
 	.string "i0#R was\n"
-	.string "#+returned to the Toolbox."
-	.byte 0
+	.asciz "#+returned to the Toolbox."
 	.align 2, 0
 
 gUnknown_80DD63C:: @ 80DD63C
 	.string "#+The #C4"
 	.byte 0x24
 	.string "i0#R was\n"
-	.string "#+sent to storage."
-	.byte 0
+	.asciz "#+sent to storage."
 	.align 2, 0
 
 gUnknown_80DD664:: @ 80DD664
-	.string "Stand By"
-	.byte 0
+	.asciz "Stand By"
 	.align 2, 0
+
 gUnknown_80DD670:: @ 80DD670
-	.string "Make Leader"
-	.byte 0
+	.asciz "Make Leader"
+        .align 2,0
 
 gUnknown_80DD67C:: @ 80DD67C
-	.string "Join Team"
-	.byte 0
+        .asciz "Join Team"
 	.align 2, 0
 
 gUnknown_80DD688:: @ 80DD688
-	.string "Give Gummi"
-	.byte 0
+	.asciz "Give Gummi"
 	.align 2, 0
 
 gUnknown_80DD694:: @ 80DD694
-	.string "Give"
-	.byte 0
+	.asciz "Give"
 	.align 2, 0
 
 gUnknown_80DD69C:: @ 80DD69C
-	.string "Take"
-	.byte 0
+	.asciz "Take"
 	.align 2, 0
 
 gUnknown_80DD6A4:: @ 80DD6A4
-	.string "Say Farewell"
-	.byte 0
+	.asciz "Say Farewell"
 	.align 2, 0
 
 gUnknown_80DD6B4:: @ 80DD6B4
-	.string "Summary"
-	.byte 0
+	.asciz "Summary"
 	.align 2, 0
 
 gUnknown_80DD6BC:: @ 80DD6BC
-	.string "Moves"
-	.byte 0
+	.asciz "Moves"
 	.align 2, 0
 
 gUnknown_80DD6C4:: @ 80DD6C4
-	.string "Check IQ"
-	.byte 0
+	.asciz "Check IQ"
 	.align 2, 0
 
 gUnknown_80DD6D0:: @ 80DD6D0
 	.string "Item: #C4"
 	.byte 0x24
-	.string "i0#R "
-	.byte 0
+	.asciz "i0#R "
 	.align 2, 0
 
 gUnknown_80DD6E0:: @ 80DD6E0
-	.string "%s"
-	.byte 0
+	.asciz "%s"
 	.align 2, 0
 
-	.string "pksdir0"
-	.byte 0
+	.asciz "pksdir0"
 	.align 2, 0
diff --git a/data/text/type_names.inc b/data/text/type_names.inc
index f3e39a6..25c1d03 100644
--- a/data/text/type_names.inc
+++ b/data/text/type_names.inc
@@ -3,88 +3,39 @@ gUnknown_810AD4C:: @ 810AD4C
 .byte 0xd8, 0xad, 0x10, 0x08, 0xd0, 0xad, 0x10, 0x08, 0xc8, 0xad, 0x10, 0x08, 0xc0, 0xad, 0x10, 0x08, 0xbc, 0xad, 0x10, 0x08, 0xb4, 0xad, 0x10, 0x08, 0xac, 0xad, 0x10, 0x08, 0xa4, 0xad, 0x10, 0x08
 .byte 0x9c, 0xad, 0x10, 0x08, 0x94, 0xad, 0x10, 0x08
 
-.string "Steel"
-.byte 0
-.byte 0
-.byte 0
-.align 2,0
-.string "Dark"
-.byte 0
-.byte 0
-.byte 0
-.byte 0
-.align 2,0
-.string "Dragon"
-.byte 0
-.byte 0
-.align 2,0
-.string "Ghost"
-.byte 0
-.byte 0
-.byte 0
-.align 2,0
-.string "Rock"
-.byte 0
-.byte 0
-.byte 0
-.byte 0
-.align 2,0
-.string "Bug"
-.byte 0
-.align 2,0
-.string "Psychic"
-.byte 0
-.align 2,0
-.string "Flying"
-.byte 0
-.byte 0
-.align 2,0
-.string "Ground"
-.byte 0
-.byte 0
-.align 2,0
-.string "Poison"
-.byte 0
-.byte 0
-.string "Fighting"
-.align 2,0
-.byte 0
-.byte 0
-.byte 0
-.byte 0
-.align 2,0
-.string "Ice"
-.byte 0
-.align 2,0
-.string "Electric"
-.byte 0
-.byte 0
-.byte 0
-.byte 0
-.align 2,0
-.string "Grass"
-.byte 0
-.byte 0
-.byte 0
-.align 2,0
-.string "Water"
-.byte 0
-.byte 0
-.byte 0
-.align 2,0
-.string "Fire"
-.byte 0
-.byte 0
-.byte 0
-.byte 0
-.align 2,0
-.string "Normal"
-.byte 0
-.byte 0
-.align 2,0
-.string "None"
-.byte 0
-.byte 0
-.byte 0
-.byte 0
+.asciz "Steel"
+.align 2,0
+.asciz "Dark"
+.align 2,0
+.asciz "Dragon"
+.align 2,0
+.asciz "Ghost"
+.align 2,0
+.asciz "Rock"
+.align 2,0
+.asciz "Bug"
+.align 2,0
+.asciz "Psychic"
+.align 2,0
+.asciz "Flying"
+.align 2,0
+.asciz "Ground"
+.align 2,0
+.asciz "Poison"
+.align 2,0
+.asciz "Fighting"
+.align 2,0
+.asciz "Ice"
+.align 2,0
+.asciz "Electric"
+.align 2,0
+.asciz "Grass"
+.align 2,0
+.asciz "Water"
+.align 2,0
+.asciz "Fire"
+.align 2,0
+.asciz "Normal"
+.align 2,0
+.asciz "None"
 .align 2,0