4 files changed, 106 insertions, 106 deletions
diff --git a/data/text/credits.inc b/data/text/credits.inc
index 7bcec19..0e6ea9f 100644
--- a/data/text/credits.inc
+++ b/data/text/credits.inc
@@ -7,7 +7,7 @@
 
         .global StaffCredits_80E4AD8
         StaffCredits_80E4AD8:
-        .string "#+"
+        .string "{CENTER_ALIGN}"
         .byte 0x82, 0xa0
         .string "STAFF CREDITS"
         .byte 0x82, 0xa2, 0x00
diff --git a/data/text/luminous_cave.inc b/data/text/luminous_cave.inc
index ad99469..d7136af 100644
--- a/data/text/luminous_cave.inc
+++ b/data/text/luminous_cave.inc
@@ -1,124 +1,124 @@
 gLuminousCaveSeekAwakening:: @ 80DCA34
-	.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"
+	.string "{CENTER_ALIGN}...{WAIT_PRESS}A voice emanates from somewhere...{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}...Ye who seek awakening...{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}This is Luminous Cave.{WAIT_PRESS}\n"
+	.string "{CENTER_ALIGN}Do ye seek a new evolution?\0"
 	.align 2, 0
 
 gLuminousCaveAskEvolution:: @ 80DCAB8
-	.string "#+Do ye seek evolution?\0"
+	.string "{CENTER_ALIGN}Do ye seek evolution?\0"
 	.align 2, 0
 
 gLuminousCaveEvolutionInfo:: @ 80DCAD0
-	.string "#+There are those among Pokémon\n"
-	.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{COMMA} 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{COMMA} 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"
+	.string "{CENTER_ALIGN}There are those among Pokémon\n"
+	.string "{CENTER_ALIGN}that can evolve.{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}Such Pokémon can evolve at this very\n"
+	.string "{CENTER_ALIGN}spot if they satisfy certain conditions.{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}Evolution brings about changes\n"
+	.string "{CENTER_ALIGN}in appearance and abilities.{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}Not only that{COMMA} some Pokémon even change\n"
+	.string "{CENTER_ALIGN}type and learn different moves.{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}However...{WAIT_PRESS} The requirements for\n"
+	.string "{CENTER_ALIGN}evolution differ among Pokémon.{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}Some become ready for evolution\n"
+	.string "{CENTER_ALIGN}merely by leveling up.{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}Still others may need special items\n"
+	.string "{CENTER_ALIGN}to attain evolution.{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}Ye must also be aware of this:{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}Once it has evolved{COMMA} a Pokémon\n"
+	.string "{CENTER_ALIGN}can never regain its previous form.{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}That is why ye must think carefully\n"
+	.string "{CENTER_ALIGN}before committing to evolution.\0"
 	.align 2, 0
 
 gLuminousCaveYeShallReturn:: @ 80DCD5C
-	.string "#+Ye shall return if evolution\n"
-	.string "#+is what ye seek...\0"
+	.string "{CENTER_ALIGN}Ye shall return if evolution\n"
+	.string "{CENTER_ALIGN}is what ye seek...\0"
 	.align 2, 0
 
 gLuminousCaveGiveItem:: @ 80DCD90
-	.string "#+Will ye give an item for evolution?\0"
+	.string "{CENTER_ALIGN}Will ye give an item for evolution?\0"
 	.align 2, 0
 
 gLuminousCaveGiveAnotherItem:: @ 80DCDB8
-	.string "#+Will ye give yet another item?\0"
+	.string "{CENTER_ALIGN}Will ye give yet another item?\0"
 	.align 2, 0
 
 gLuminousCaveLackWhatIsNeeded:: @ 80DCDDC
-	.string "#+Alas{COMMA} ye seem to lack what is needed\n"
-	.string "#+for evolution.\0"
+	.string "{CENTER_ALIGN}Alas{COMMA} ye seem to lack what is needed\n"
+	.string "{CENTER_ALIGN}for evolution.\0"
 	.align 2, 0
 
 gLuminousCaveOnlyOneItem:: @ 80DCE18
-	.string "#+Ye seem to have but one item.\0"
+	.string "{CENTER_ALIGN}Ye seem to have but one item.\0"
 	.align 2, 0
 
 gLuminousCaveLetUsBegin:: @ 80DCE38
-	.string "#+...Ye who seek awakening...\n"
-	.string "#+Let us begin.\0"
+	.string "{CENTER_ALIGN}...Ye who seek awakening...\n"
+	.string "{CENTER_ALIGN}Let us begin.\0"
 	.align 2, 0
 
 gLuminousCaveChangedAppearance:: @ 80DCE68
-	.string "#+...#W$n0 is undergoing changes...#P"
-	.string "#+$n0{APOSTROPHE}s appearance changed...#P\0"
+	.string "{CENTER_ALIGN}...{WAIT_PRESS}$n0 is undergoing changes...{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}$n0{APOSTROPHE}s appearance changed...{EXTRA_MSG}\0"
 	.align 2, 0
 
 gLuminousCaveEvolved:: @ 80DCEB0
-	.string "#+It evolved from {COLOR_1 GREEN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}\n"
-	.string "#+to {COLOR_1 YELLOW}{ARG_POKEMON_1}{END_COLOR_TEXT_1}!\0"
+	.string "{CENTER_ALIGN}It evolved from {COLOR_1 GREEN}{ARG_POKEMON_0}{END_COLOR_TEXT_1}\n"
+	.string "{CENTER_ALIGN}to {COLOR_1 YELLOW}{ARG_POKEMON_1}{END_COLOR_TEXT_1}!\0"
 	.align 2, 0
 
 gLuminousCaveComeAlone:: @ 80DCEDC
-	.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"
+	.string "{CENTER_ALIGN}...{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}One cannot evolve if one\n"
+	.string "{CENTER_ALIGN}is in the company of others.{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}Come alone if ye wish to evolve.\0"
 	.align 2, 0
 
 gLuminousCaveLackLevel:: @ 80DCF44
-	.string "#+...#P"
-	.string "#+Ye cannot evolve yet.#P"
-	.string "#+Ye have not high enough a level.\0"
+	.string "{CENTER_ALIGN}...{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}Ye cannot evolve yet.{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}Ye have not high enough a level.\0"
 	.align 2, 0
 
 gLuminousCaveCantEvolveAnymore:: @ 80DCF88
-	.string "#+...#P"
-	.string "#+Ye cannot evolve anymore.\0"
+	.string "{CENTER_ALIGN}...{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}Ye cannot evolve anymore.\0"
 	.align 2, 0
 
 gLuminousCaveLackFriendArea:: @ 80DCFAC
-	.string "#+...#P"
-	.string "#+Ye cannot evolve yet.#P"
-	.string "#+Ye need your Friend Area to evolve.\0"
+	.string "{CENTER_ALIGN}...{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}Ye cannot evolve yet.{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}Ye need your Friend Area to evolve.\0"
 	.align 2, 0
 
 gLuminousCaveLackRoom:: @ 80DCFF4
-	.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"
+	.string "{CENTER_ALIGN}...{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}Ye cannot evolve yet.{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}The Friend Area to which ye shall go\n"
+	.string "{CENTER_ALIGN}has no room for ye.\0"
 	.align 2, 0
 
 gLuminousCaveLackIQ:: @ 80DD054
-	.string "#+...#P"
-	.string "#+Ye cannot evolve yet.#P"
-	.string "#+Ye seem to lack the IQ to evolve.\0"
+	.string "{CENTER_ALIGN}...{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}Ye cannot evolve yet.{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}Ye seem to lack the IQ to evolve.\0"
 	.align 2, 0
 
 gLuminousCaveLackItem:: @ 80DD098
-	.string "#+#+...#P"
-	.string "#+Ye cannot evolve yet.#P"
-	.string "#+Ye seem to lack an item to evolve.\0"
+	.string "{CENTER_ALIGN}{CENTER_ALIGN}...{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}Ye cannot evolve yet.{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}Ye seem to lack an item to evolve.\0"
 	.align 2, 0
 
 gLuminousCaveCantEvolveYet:: @ 80DD0E0
-	.string "#+#+...#P"
-	.string "#+Ye cannot evolve yet. \0"
+	.string "{CENTER_ALIGN}{CENTER_ALIGN}...{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}Ye cannot evolve yet. \0"
 	.align 2, 0
 
 gLuminousCaveGiveName:: @ 80DD104
-	.string "#+Ye must give a name to\n"
-	.string "#+the evolved Pokémon. \0"
+	.string "{CENTER_ALIGN}Ye must give a name to\n"
+	.string "{CENTER_ALIGN}the evolved Pokémon. \0"
 	.align 2, 0
 
 	.string "pksdir0\0"
diff --git a/data/text/party_menu.inc b/data/text/party_menu.inc
index 7296f91..1afaaae 100644
--- a/data/text/party_menu.inc
+++ b/data/text/party_menu.inc
@@ -1,6 +1,6 @@
 gUnknown_80DD388:: @ 80DD388
 	.string "You have chosen to say farewell\n"
-	.string "to this Pokémon.#P"
+	.string "to this Pokémon.{EXTRA_MSG}"
 	.string "The Pokémon will leave its Friend Area.\n"
 	.string "It will no longer be available for\n"
 	.string "adventures. Is that OK?\0"
@@ -8,53 +8,53 @@ gUnknown_80DD388:: @ 80DD388
 
 gUnknown_80DD420:: @ 80DD420
 	.string "If you say farewell to this\n"
-	.string "Pokémon{COMMA} it will be gone forever.#P"
+	.string "Pokémon{COMMA} it will be gone forever.{EXTRA_MSG}"
 	.string "You will never be able to get another one\n"
 	.string "like it to join your team.\n"
 	.string "Will you release it anyway?\0"
 	.align 2, 0
 
 gUnknown_80DD4C4:: @ 80DD4C4
-	.string "#+{ARG_POKEMON_1} joined the\n"
-	.string "#+rescue team for adventures!\0"
+	.string "{CENTER_ALIGN}{ARG_POKEMON_1} joined the\n"
+	.string "{CENTER_ALIGN}rescue team for adventures!\0"
 	.align 2, 0
 
 gUnknown_80DD4F4:: @ 80DD4F4
-	.string "#+{ARG_POKEMON_1} left the team to remain\n"
-	.string "#+on standby in the Friend Area.\0"
+	.string "{CENTER_ALIGN}{ARG_POKEMON_1} left the team to remain\n"
+	.string "{CENTER_ALIGN}on standby in the Friend Area.\0"
 	.align 2, 0
 
 gUnknown_80DD534:: @ 80DD534
-	.string "#+{ARG_POKEMON_1} became the leader\n"
-	.string "#+of the rescue team.\0"
+	.string "{CENTER_ALIGN}{ARG_POKEMON_1} became the leader\n"
+	.string "{CENTER_ALIGN}of the rescue team.\0"
 	.align 2, 0
 
 gUnknown_80DD564:: @ 80DD564
-	.string "#+{ARG_POKEMON_1} left\n"
-	.string "#+the Friend Area.\n"
-	.string "#+Bye-bye{COMMA} {ARG_POKEMON_1}!\0"
+	.string "{CENTER_ALIGN}{ARG_POKEMON_1} left\n"
+	.string "{CENTER_ALIGN}the Friend Area.\n"
+	.string "{CENTER_ALIGN}Bye-bye{COMMA} {ARG_POKEMON_1}!\0"
 	.align 2,0
 
 gUnknown_80DD594:: @ 80DD594
-	.string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_1}{END_COLOR_TEXT_1} was\n"
-	.string "#+handed over. \0"
+	.string "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_1}{END_COLOR_TEXT_1} was\n"
+	.string "{CENTER_ALIGN}handed over. \0"
 	.align 2, 0
 
 gUnknown_80DD5B8:: @ 80DD5B8
-	.string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_1}{END_COLOR_TEXT_1} was\n"
-	.string "#+handed over.#P"
-	.string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was\n"
-	.string "#+returned to the Toolbox.\0"
+	.string "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_1}{END_COLOR_TEXT_1} was\n"
+	.string "{CENTER_ALIGN}handed over.{EXTRA_MSG}"
+	.string "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was\n"
+	.string "{CENTER_ALIGN}returned to the Toolbox.\0"
 	.align 2, 0
 
 gUnknown_80DD60C:: @ 80DD60C
-	.string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was\n"
-	.string "#+returned to the Toolbox.\0"
+	.string "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was\n"
+	.string "{CENTER_ALIGN}returned to the Toolbox.\0"
 	.align 2, 0
 
 gUnknown_80DD63C:: @ 80DD63C
-	.string "#+The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was\n"
-	.string "#+sent to storage.\0"
+	.string "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was\n"
+	.string "{CENTER_ALIGN}sent to storage.\0"
 	.align 2, 0
 
 gPartyMenuStandBy:: @ 80DD664
diff --git a/data/text/save.inc b/data/text/save.inc
index c508992..c0c17aa 100644
--- a/data/text/save.inc
+++ b/data/text/save.inc
@@ -1,46 +1,46 @@
 gSaveTextQuicksaving:: @ 80B6A34
-	.string "#+Quicksaving your adventure...\n"
-	.string "#+Please don{APOSTROPHE}t turn off the power.\0"
+	.string "{CENTER_ALIGN}Quicksaving your adventure...\n"
+	.string "{CENTER_ALIGN}Please don{APOSTROPHE}t turn off the power.\0"
 	.align 2, 0
 
 gSaveTextYourAdventureHasBeenSaved:: @ 80B6A7C
-	.string "#+Your adventure has been saved.\0"
+	.string "{CENTER_ALIGN}Your adventure has been saved.\0"
 	.align 2, 0
 
 gSaveTextYourAdventureHasBeenSavedLong:: @ 80B6AA0
-	.string "#+Your adventure has been saved.\n"
-	.string "#+When you are in a dungeon{COMMA} quicksave\n"
-	.string "#+your progress before ending the game.\0"
+	.string "{CENTER_ALIGN}Your adventure has been saved.\n"
+	.string "{CENTER_ALIGN}When you are in a dungeon{COMMA} quicksave\n"
+	.string "{CENTER_ALIGN}your progress before ending the game.\0"
 	.align 2, 0
 
 gSaveTextTheDataCouldNotBeWritten:: @ 80B6B14
-	.string "#+The data could not be written.\n"
-	.string "#+Please turn off the power and remove\n"
-	.string "#+and reinsert the DS Card.\0"
+	.string "{CENTER_ALIGN}The data could not be written.\n"
+	.string "{CENTER_ALIGN}Please turn off the power and remove\n"
+	.string "{CENTER_ALIGN}and reinsert the DS Card.\0"
 	.align 2, 0
 
 gSaveTextFailed:: @ 80B6B78
-	.string "#+Save failed.\0"
+	.string "{CENTER_ALIGN}Save failed.\0"
 	.align 2, 0
 
 gSaveTextError:: @ 80B6B88
-	.string "#+Error reading data.\n"
-	.string "#+Please turn off the power and reinsert\n"
-	.string "#+the DS Game Card.\0"
+	.string "{CENTER_ALIGN}Error reading data.\n"
+	.string "{CENTER_ALIGN}Please turn off the power and reinsert\n"
+	.string "{CENTER_ALIGN}the DS Game Card.\0"
 	.align 2, 0
 
 gSaveTextCantResume:: @ 80B6BDC
-	.string "#+Your data was not properly saved{COMMA}\n"
-	.string "#+so your game cannot be resumed\n"
-	.string "#+from your last spot.#P#+Your last outing is considered a defeat.\n"
-	.string "#+Before shutting down{COMMA} save in your\n"
-	.string "#+team base{COMMA} or quicksave in a dungeon.\0"
+	.string "{CENTER_ALIGN}Your data was not properly saved{COMMA}\n"
+	.string "{CENTER_ALIGN}so your game cannot be resumed\n"
+	.string "{CENTER_ALIGN}from your last spot.{EXTRA_MSG}{CENTER_ALIGN}Your last outing is considered a defeat.\n"
+	.string "{CENTER_ALIGN}Before shutting down{COMMA} save in your\n"
+	.string "{CENTER_ALIGN}team base{COMMA} or quicksave in a dungeon.\0"
 	.align 2, 0
 
 gSaveTextMayNotResume:: @ 80B6CB8
-	.string "#+You may not resume your dungeon\n"
-	.string "#+adventure using this saved data.\n"
-	.string "#+Your last outing is considered a defeat.\0"
+	.string "{CENTER_ALIGN}You may not resume your dungeon\n"
+	.string "{CENTER_ALIGN}adventure using this saved data.\n"
+	.string "{CENTER_ALIGN}Your last outing is considered a defeat.\0"
 	.align 2, 0
 
 	.string "pksdir0\0"