summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/code_8012A18_1.c2
-rw-r--r--src/code_801AFA4.c6
-rw-r--r--src/code_801B3C0.c4
-rw-r--r--src/code_801C620.c12
-rw-r--r--src/code_8040094.c4
-rw-r--r--src/code_8041AD0.c4
-rw-r--r--src/code_80428A0.c2
-rw-r--r--src/code_80521D0_1.c12
-rw-r--r--src/code_8057824.c2
-rw-r--r--src/code_8057824_1.c42
-rw-r--r--src/code_8086A3C.c4
-rw-r--r--src/code_8090208.c2
-rw-r--r--src/code_8097F40.c4
-rw-r--r--src/code_80983D8.c2
-rw-r--r--src/data/nature_description.h104
-rw-r--r--src/data/pelipper_help_guide_dialogue.h146
-rw-r--r--src/data/wonder_mail_1.h156
-rw-r--r--src/dungeon_pokemon_attributes_1.c2
-rw-r--r--src/dungeon_util.c4
-rw-r--r--src/friend_area_action_menu.c4
-rw-r--r--src/personality_test.c30
-rw-r--r--src/pokemon_3.c50
-rw-r--r--src/post_office_guide.c28
-rw-r--r--src/save.c28
-rw-r--r--src/thank_you_wonder_mail.c76
-rw-r--r--src/wonder_mail_2.c18
-rw-r--r--src/wonder_mail_main_menu.c10
27 files changed, 379 insertions, 379 deletions
diff --git a/src/code_8012A18_1.c b/src/code_8012A18_1.c
index d5b6be7..d654e57 100644
--- a/src/code_8012A18_1.c
+++ b/src/code_8012A18_1.c
@@ -176,7 +176,7 @@ void sub_8016110(void)
else {
sub_80922B4(gAvailablePokemonNames,gUnknown_203B200->pokeName, POKEMON_NAME_LENGTH);
}
- // Is the name {COLOR_1 CYAN}$m0{END_COLOR_TEXT_1} OK?
+ // Is the name {COLOR_1 CYAN}{ARG_POKEMON_0}{END_COLOR_TEXT_1} OK?
sub_8014248(&gUnknown_80DB688,0,3,gUnknown_203B200->menus,0,4,0,0,0x20);
break;
diff --git a/src/code_801AFA4.c b/src/code_801AFA4.c
index e60fec1..03183ae 100644
--- a/src/code_801AFA4.c
+++ b/src/code_801AFA4.c
@@ -126,7 +126,7 @@ void sub_801B080(void)
case 0:
sub_801B178();
// #+Who will learn the move
- // #+{COLOR_1 CYAN}$m7{END_COLOR_TEXT_1}?
+ // #+{COLOR_1 CYAN}{ARG_POKEMON_7}{END_COLOR_TEXT_1}?
sub_8014248(&gUnknown_80DB9BC, 0, gUnknown_203B22C->unk60, gUnknown_203B22C->menuItems, 0, 4, 0, 0, 0x20);
break;
case 1:
@@ -140,8 +140,8 @@ void sub_801B080(void)
gTeamInventory_203B460->teamItems[gUnknown_203B22C->teamItemIndex].itemIndex = ITEM_ID_USED_TM;
}
PlaySound(0x9C << 1);
- // #+CM$m8{END_COLOR_TEXT_1} learned
- // #+the move {COLOR_1 CYAN}$m7{END_COLOR_TEXT_1}!
+ // #+CM{ARG_POKEMON_8}{END_COLOR_TEXT_1} learned
+ // #+the move {COLOR_1 CYAN}{ARG_POKEMON_7}{END_COLOR_TEXT_1}!
sub_80141B4(&gUnknown_80DB9E4, 0, 0, 0x121);
break;
case 3:
diff --git a/src/code_801B3C0.c b/src/code_801B3C0.c
index 502ce60..19f2f7f 100644
--- a/src/code_801B3C0.c
+++ b/src/code_801B3C0.c
@@ -115,7 +115,7 @@ void sub_801B480(void)
sub_80073B8(gUnknown_203B230->unk24);
preload = gUnknown_203B230->unk10[gUnknown_203B230->unk8];
strcpy(gAvailablePokemonNames, preload->pokeName);
- xxx_format_and_draw(16, 0, gUnknown_80DBA4C, gUnknown_203B230->unk24, 0); // $m0
+ xxx_format_and_draw(16, 0, gUnknown_80DBA4C, gUnknown_203B230->unk24, 0); // {ARG_POKEMON_0}
xxx_format_and_draw(4, 16, gUnknown_203B230->unk10[gUnknown_203B230->unk8]->unk4, gUnknown_203B230->unk24, 0);
sub_80073E0(gUnknown_203B230->unk24);
break;
@@ -156,7 +156,7 @@ void sub_801B51C(void)
void sub_801B590(void)
{
-
+
if (gUnknown_203B230->unk8 < (gUnknown_203B230->unkC - 1)) {
if ((gUnknown_203B230->unk20 & 8)) {
sub_8013F84();
diff --git a/src/code_801C620.c b/src/code_801C620.c
index 7ae8c6a..c28e347 100644
--- a/src/code_801C620.c
+++ b/src/code_801C620.c
@@ -23,8 +23,8 @@ struct unkStruct_203B240
};
extern struct unkStruct_203B240 *gUnknown_203B240;
-extern char gUnknown_80DBE2C[]; // $i0
-extern char gUnknown_80DBE30[]; // $m0
+extern char gUnknown_80DBE2C[]; // {ARG_MOVE_ITEM_0}
+extern char gUnknown_80DBE30[]; // {ARG_POKEMON_0}
extern u8 gUnknown_202DE58[0x58];
extern u8 gAvailablePokemonNames[0x58];
@@ -103,7 +103,7 @@ void sub_801C6E4(void)
{
char *skillName;
struct subStruct_203B240 *preload;
-
+
switch(gUnknown_203B240->state)
{
case 0:
@@ -111,7 +111,7 @@ void sub_801C6E4(void)
sub_80073B8(gUnknown_203B240->unk24);
skillName = GetIQSkillName(gUnknown_203B240->unk4);
strcpy(gUnknown_202DE58,skillName);
- xxx_format_and_draw(16,0,gUnknown_80DBE2C,0,0); // $i0
+ xxx_format_and_draw(16,0,gUnknown_80DBE2C,0,0); // {ARG_MOVE_ITEM_0}
xxx_call_draw_string(8,16,GetIQSkillDescription(gUnknown_203B240->unk4),gUnknown_203B240->unk24,0);
sub_80073E0(gUnknown_203B240->unk24);
gUnknown_203B240->unkC = sub_8097DF0(GetIQSkillDescription(gUnknown_203B240->unk4),gUnknown_203B240->unk10);
@@ -122,7 +122,7 @@ void sub_801C6E4(void)
sub_80073B8(gUnknown_203B240->unk24);
preload = gUnknown_203B240->unk10[gUnknown_203B240->unk8];
strcpy(gAvailablePokemonNames,preload->unk0);
- xxx_format_and_draw(16,0,gUnknown_80DBE30,gUnknown_203B240->unk24,0); // $m0
+ xxx_format_and_draw(16,0,gUnknown_80DBE30,gUnknown_203B240->unk24,0); // {ARG_POKEMON_0}
xxx_format_and_draw(4,16,gUnknown_203B240->unk10[gUnknown_203B240->unk8]->unk4, gUnknown_203B240->unk24,0);
sub_80073E0(gUnknown_203B240->unk24);
break;
@@ -161,7 +161,7 @@ void sub_801C7D4(void)
void sub_801C848(void)
{
-
+
if (gUnknown_203B240->unk8 < (gUnknown_203B240->unkC - 1)) {
if ((gUnknown_203B240->unk20 & 8)) {
sub_8013F84();
diff --git a/src/code_8040094.c b/src/code_8040094.c
index 608bbf4..4e30873 100644
--- a/src/code_8040094.c
+++ b/src/code_8040094.c
@@ -31,7 +31,7 @@ struct unk8049590
u16 unk4;
};
-extern struct unk8049590 *sub_8049590(u32, u32);
+extern struct unk8049590 *GetMapEntity(u32, u32);
// Luminous Orb???
void sub_804002C(u32 param_1)
@@ -47,7 +47,7 @@ void sub_804002C(u32 param_1)
innerCounter = 0;
iVar4 = iVar3 + 1;
do {
- iVar1 = sub_8049590(innerCounter, iVar3);
+ iVar1 = GetMapEntity(innerCounter, iVar3);
iVar1->unk4 = iVar1->unk4 | 1;
innerCounter++;
} while (innerCounter < 0x38);
diff --git a/src/code_8041AD0.c b/src/code_8041AD0.c
index 6388af1..f711b92 100644
--- a/src/code_8041AD0.c
+++ b/src/code_8041AD0.c
@@ -17,7 +17,7 @@ extern void sub_804151C(struct DungeonEntity *r0, u32 r1, u8 r2);
extern void sub_80416E0(struct DungeonEntity *r0, u32, u32);
extern u8 sub_8042768(struct DungeonEntity *r0);
extern void sub_806CDD4(struct DungeonEntity *r0, u8, u32);
-extern u8 sub_8071858(struct DungeonEntity *r0, u8);
+extern u8 HasType(struct DungeonEntity *r0, u8);
extern u32 sub_806F62C(u32);
extern void PlaySoundEffect(u32);
extern u8 sub_803F428(struct DungeonEntity *r0);
@@ -344,7 +344,7 @@ void sub_8041DD8(struct DungeonEntity *r0, s16 r1)
u32 temp;
temp = r1;
- if(sub_8071858(r0, 0xE) != 0)
+ if(HasType(r0, 0xE) != 0)
sub_804151C(r0, temp, 1);
else
sub_804151C(r0, 0xE, 1);
diff --git a/src/code_80428A0.c b/src/code_80428A0.c
index da72193..01f9f1f 100644
--- a/src/code_80428A0.c
+++ b/src/code_80428A0.c
@@ -40,7 +40,7 @@ void sub_8042900(struct DungeonEntity *r0)
sub_804151C(r0, 0xD4 << 1, 0);
}
-void sub_8042910(struct DungeonEntity *r0)
+void ShowVisualFlags(struct DungeonEntity *r0)
{
sub_804151C(r0, 0x29, 0);
}
diff --git a/src/code_80521D0_1.c b/src/code_80521D0_1.c
index 482e3ba..04e70a9 100644
--- a/src/code_80521D0_1.c
+++ b/src/code_80521D0_1.c
@@ -148,7 +148,7 @@ struct unk8049590
u8 unk8;
};
-extern struct unk8049590 *sub_8049590(u32, u32);
+extern struct unk8049590 *GetMapEntity(u32, u32);
extern void sub_806BFC0(struct DungeonEntityData *, u32);
void sub_808BBA8(struct DungeonEntity *param_1)
@@ -217,7 +217,7 @@ void sub_808BCE4(void)
{
struct unk8049590 *puVar1;
- puVar1 = sub_8049590(gDungeonGlobalData->unkE23C, gDungeonGlobalData->unkE23E);
+ puVar1 = GetMapEntity(gDungeonGlobalData->unkE23C, gDungeonGlobalData->unkE23E);
puVar1->unk0 &= 0xfffc;
puVar1->unk0 |= 16;
puVar1->unk0 &= 0xfdff;
@@ -231,7 +231,7 @@ void sub_808BD38(void)
{
struct unk8049590 *puVar1;
- puVar1 = sub_8049590(gDungeonGlobalData->unkE23C, gDungeonGlobalData->unkE23E);
+ puVar1 = GetMapEntity(gDungeonGlobalData->unkE23C, gDungeonGlobalData->unkE23E);
puVar1->unk0 &= 0xfffc;
puVar1->unk0 |= 1;
puVar1->unk0 &= 0xffef;
@@ -478,10 +478,10 @@ void KyogrePreFightDialogue(void)
sub_803E708(10,0x46);
sub_8083EA8(0x23,0x3c);
sub_808C360();
- // My duels agaisnt $m3 (Groudon) left us both exhausted
+ // My duels against {ARG_POKEMON_3} (Groudon) left us both exhausted
sub_8052910(&gUnknown_8106140);
KyogreScreenFlash();
- // I am $m2 (Kyogre)!
+ // I am {ARG_POKEMON_2} (Kyogre)!
// The lord of the sea!
sub_8052910(&gUnknown_8106214);
KyogreScreenFlash();
@@ -694,7 +694,7 @@ void CelebiJoinDialogue(void)
sub_8086598();
sub_8086598();
sub_8086598();
- // The Time-Traveling Pokemon $m2 (Celebi)!
+ // The Time-Traveling Pokemon {ARG_POKEMON_2} (Celebi)!
sub_8052910(&gUnknown_8106400);
PlaySoundEffect(0x1c7);
sub_806CDD4(local_1c,10,0);
diff --git a/src/code_8057824.c b/src/code_8057824.c
index 7f02fd5..031d063 100644
--- a/src/code_8057824.c
+++ b/src/code_8057824.c
@@ -96,7 +96,7 @@ bool32 sub_8057948(struct DungeonEntity *param_1, struct DungeonEntity *param_2)
bool32 sub_8057954(struct DungeonEntity *param_1, struct DungeonEntity *param_2, u32 param_3)
{
- // $m0 is enraged
+ // {ARG_POKEMON_0} is enraged
sub_8079618(param_1,param_2,0xc,param_3,gUnknown_80FAC88);
return TRUE;
}
diff --git a/src/code_8057824_1.c b/src/code_8057824_1.c
index 4dfc978..b29e46e 100644
--- a/src/code_8057824_1.c
+++ b/src/code_8057824_1.c
@@ -255,7 +255,7 @@ extern void sub_806CE68(struct DungeonEntity *, u32);
extern void sub_8052D44(u8 *, struct DungeonEntity *, struct DungeonEntity *);
extern void sub_8097FD0(u32);
extern void SetMessageArgument(u8 *, struct DungeonEntity *, u32);
-extern struct DungeonEntity *sub_8083600();
+extern struct DungeonEntity *GetLeaderEntity();
extern void sub_80421C0(struct DungeonEntity *, u32);
extern void sub_8046D20();
extern void sub_808B1CC(u8);
@@ -1595,7 +1595,7 @@ void MagmaCavernMidDialogue(void)
SpriteLookAroundEffect(uVar2);
PlaySoundEffect(0x1c7);
sub_80856E0(uVar2,4);
- // Hey! $m0!
+ // Hey! {ARG_POKEMON_0}!
// Over there!
sub_8052910(&gUnknown_8102C30);
iVar3->entityData->unk15E = 0;
@@ -1622,7 +1622,7 @@ void MagmaCavernMidDialogue(void)
sub_8052910(&gUnknown_8102CB0);
sub_803E708(10,0x46);
// We challenged..
- // $m2...
+ // {ARG_POKEMON_2}...
// And wiped out..
sub_8052910(&gUnknown_8102CF8);
sub_803E708(10,0x46);
@@ -1637,21 +1637,21 @@ void MagmaCavernMidDialogue(void)
PlaySoundEffect(0x1d5);
SpriteLookAroundEffect(uVar2);
// That's right...
- // What happened to $m3?
- // Where is $m3?
+ // What happened to {ARG_POKEMON_3}?
+ // Where is {ARG_POKEMON_3}?
//
// Wait...
- // What about $m3?
- // Where did $m3 go?
+ // What about {ARG_POKEMON_3}?
+ // Where did {ARG_POKEMON_3} go?
sub_8052910(&gUnknown_8102D7C);
sub_803E708(0x1e,0x46);
- // $m3 is...
- // Still battling $m2...
+ // {ARG_POKEMON_3} is...
+ // Still battling {ARG_POKEMON_2}...
sub_8052910(&gUnknown_8102DFC);
sub_803E708(10,0x46);
sub_80869E4(uVar2,4,1,2);
sub_80869E4(uVar1,4,2,6);
- // $m0!
+ // {ARG_POKEMON_0}!
// We've got to hurry!
sub_8052910(&gUnknown_8102E2C);
sub_8089294();
@@ -3105,7 +3105,7 @@ void sub_808AE54(char param_1,char param_2,u32 *param_3)
sub_808B1CC(0);
if (sub_8098100(0x1d) == 0) {
xxx_init_itemslot_8090A8C(&auStack20,ITEM_ID_ROCK_PART,0);
- sub_80464C8(sub_8083600(),param_3,&auStack20);
+ sub_80464C8(GetLeaderEntity(),param_3,&auStack20);
sub_8083E88(0x72);
// Something fell from Regirock's body
// Regirock was apparently guarding this item
@@ -3128,7 +3128,7 @@ void sub_808AEC8(char param_1,char param_2,u32 *param_3)
sub_808B1CC(0);
if (sub_8098100(0x1d) == 0) {
xxx_init_itemslot_8090A8C(&auStack20,ITEM_ID_ICE_PART,0);
- sub_80464C8(sub_8083600(),param_3,&auStack20);
+ sub_80464C8(GetLeaderEntity(),param_3,&auStack20);
sub_8083E88(0x72);
// Something fell from Regice's body
// Regice was apparently guarding this item
@@ -3150,7 +3150,7 @@ void sub_808AF3C(char param_1,char param_2,u32 *param_3)
sub_808B1CC(0);
if (sub_8098100(0x1d) == 0) {
xxx_init_itemslot_8090A8C(&auStack20,ITEM_ID_STEEL_PART,0);
- sub_80464C8(sub_8083600(),param_3, &auStack20);
+ sub_80464C8(GetLeaderEntity(),param_3, &auStack20);
sub_8083E88(0x72);
// Something fell from Registeel's body
// Registeel was apparently guarding this item
@@ -3168,8 +3168,8 @@ void sub_808AFB0(char param_1)
sub_8052D44(auStack12,uVar3,0);
if ((sub_8098100(0x22) == 0) && (param_1 == 0x2E) && (sub_8098100(0x1d) == 0) && (sub_80860A8(ITEM_ID_ROCK_PART) != 0)) {
sub_8097FD0(0x1d);
- SetMessageArgument(gAvailablePokemonNames,sub_8083600(),0);
- // $m0 obatined the Rock Part that Regirock was guarding
+ SetMessageArgument(gAvailablePokemonNames,GetLeaderEntity(),0);
+ // {ARG_POKEMON_0} obtained the Rock Part that Regirock was guarding
sub_8052910(&gUnknown_81050B4);
sub_80421C0(0,0xd4);
sub_803E708(10,70);
@@ -3186,8 +3186,8 @@ void sub_808B030(char param_1)
sub_8052D44(auStack12,uVar3,0);
if ((sub_8098100(0x22) == 0) && (param_1 == 0x2F) && (sub_8098100(0x1d) == 0) && (sub_80860A8(ITEM_ID_ICE_PART) != 0)) {
sub_8097FD0(0x1d);
- SetMessageArgument(gAvailablePokemonNames,sub_8083600(),0);
- // $m0 obatined the Ice Part that Regice was guarding
+ SetMessageArgument(gAvailablePokemonNames,GetLeaderEntity(),0);
+ // {ARG_POKEMON_0} obtained the Ice Part that Regice was guarding
sub_8052910(&gUnknown_810517C);
sub_80421C0(0,0xd4);
sub_803E708(10,70);
@@ -3204,8 +3204,8 @@ void sub_808B0B0(char param_1)
sub_8052D44(auStack12,uVar3,0);
if ((sub_8098100(0x22) == 0) && (param_1 == 0x30) && (sub_8098100(0x1d) == 0) && (sub_80860A8(ITEM_ID_STEEL_PART) != 0)) {
sub_8097FD0(0x1d);
- SetMessageArgument(gAvailablePokemonNames, sub_8083600(), 0);
- // $m0 obatined the Steel Part that Registeel was guarding
+ SetMessageArgument(gAvailablePokemonNames, GetLeaderEntity(), 0);
+ // {ARG_POKEMON_0} obtained the Steel Part that Registeel was guarding
sub_8052910(&gUnknown_8105244);
sub_80421C0(0,0xd4);
sub_803E708(10,70);
@@ -3284,7 +3284,7 @@ void sub_808B1CC(u8 r0)
"\tcmp r2, 0\n"
"\tbge _0808B244\n"
"_0808B208:\n"
- "\tbl sub_8083600\n"
+ "\tbl GetLeaderEntity\n"
"\tadds r2, r0, 0\n"
"\tcmp r2, 0\n"
"\tbne _0808B230\n"
@@ -3319,7 +3319,7 @@ void sub_808B1CC(u8 r0)
"\tldrsh r0, [r0, r2]\n"
"\tmovs r3, 0x2\n"
"\tldrsh r1, [r5, r3]\n"
- "\tbl sub_8049590\n"
+ "\tbl GetMapEntity\n"
"\tldrh r2, [r0]\n"
"\tmovs r3, 0x80\n"
"\tlsls r3, 2\n"
diff --git a/src/code_8086A3C.c b/src/code_8086A3C.c
index 67fd08d..db438c0 100644
--- a/src/code_8086A3C.c
+++ b/src/code_8086A3C.c
@@ -4,7 +4,7 @@
#include "pokemon.h"
extern struct DungeonGlobalData *gDungeonGlobalData;
-extern void sub_807191C(struct DungeonEntity *);
+extern void LoadIQSkills(struct DungeonEntity *);
extern struct DungeonEntity *sub_8085480(void);
extern struct DungeonEntity *sub_8085680(u32);
extern void SetDefaultIQSkills(u8 *param_1, u8 param_2);
@@ -57,7 +57,7 @@ void SetupBossFightHP(struct DungeonEntity *param_1, s32 newHP, u16 param_3)
gDungeonGlobalData->unk66A = param_3;
SetDefaultIQSkills(iVar2->IQSkillsSelected,iVar2->isBoss);
- sub_807191C(param_1);
+ LoadIQSkills(param_1);
}
void sub_8086AC0(void)
diff --git a/src/code_8090208.c b/src/code_8090208.c
index 3a60640..970154c 100644
--- a/src/code_8090208.c
+++ b/src/code_8090208.c
@@ -16,7 +16,7 @@ struct unkDungeonStruct
void sub_8090208(u8 *buffer, struct unkDungeonStruct *dungeonLocation)
{
- ExpandPlaceholdersBuffer(buffer, gUnknown_8108F10, gDungeonNames[dungeonLocation->index].name1); // {COLOR_2 YELLOW_3}%s{END_COLOR_TEXT_2} (normal floor print (no B)
+ ExpandPlaceholdersBuffer(buffer, gUnknown_8108F10, gDungeonNames[dungeonLocation->index].name1); // {COLOR_2 YELLOW_4}%s{END_COLOR_TEXT_2} (normal floor print (no B)
}
void PrintDungeonLocationtoBuffer(u8 *buffer, struct unkDungeonStruct *dungeonLocation)
diff --git a/src/code_8097F40.c b/src/code_8097F40.c
index 9a9c193..d7f6490 100644
--- a/src/code_8097F40.c
+++ b/src/code_8097F40.c
@@ -1,8 +1,8 @@
#include "global.h"
-extern u8 gUnknown_810ACC0[];
+extern u8 gDungeonWaterType[];
bool8 sub_8097F40(u32 r0)
{
- return gUnknown_810ACC0[r0] == 2;
+ return gDungeonWaterType[r0] == 2;
}
diff --git a/src/code_80983D8.c b/src/code_80983D8.c
index 4c0e870..25c57d2 100644
--- a/src/code_80983D8.c
+++ b/src/code_80983D8.c
@@ -31,7 +31,7 @@ s32 CalculateFacingDir(short *param_1,short *param_2)
return uVar1;
}
-s32 sub_8098434(short param_1[],short param_2[])
+s32 GetMaxPositionDifference(short param_1[],short param_2[])
{
s32 diff_index1;
s32 diff_index0;
diff --git a/src/data/nature_description.h b/src/data/nature_description.h
index 7281705..8ee5d45 100644
--- a/src/data/nature_description.h
+++ b/src/data/nature_description.h
@@ -12,7 +12,7 @@ ALIGNED(4) const char gQuirkyDescription[] = _(
"{CENTER_ALIGN}Maybe people are even upset\n"
"{CENTER_ALIGN}with you for being so fickle?{EXTRA_MSG}"
"{CENTER_ALIGN}If you realize how selfishly\n"
- "{CENTER_ALIGN}you~27re behaving~2c try to think\n"
+ "{CENTER_ALIGN}you{APOSTROPHE}re behaving{COMMA} try to think\n"
"{CENTER_ALIGN}before you do anything rash.{EXTRA_MSG}"
"{CENTER_ALIGN}A quirky person like you should be...");
@@ -21,23 +21,23 @@ ALIGNED(4) const char gLonelyDescription[] = _(
"{CENTER_ALIGN}The lonely type.{EXTRA_MSG}"
"{CENTER_ALIGN}You always act cheerful and\n"
"{CENTER_ALIGN}jocular around other people.{EXTRA_MSG}"
- "{CENTER_ALIGN}But that~27s only because\n"
+ "{CENTER_ALIGN}But that{APOSTROPHE}s only because\n"
"{CENTER_ALIGN}you are with other people.{EXTRA_MSG}"
- "{CENTER_ALIGN}However~2c when you get alone...{EXTRA_MSG}"
+ "{CENTER_ALIGN}However{COMMA} when you get alone...{EXTRA_MSG}"
"{CENTER_ALIGN}Do you find yourself\n"
"{CENTER_ALIGN}feeling oddly depressed?{EXTRA_MSG}"
- "{CENTER_ALIGN}That~27s why you always\n"
+ "{CENTER_ALIGN}That{APOSTROPHE}s why you always\n"
"{CENTER_ALIGN}want to be with others.{EXTRA_MSG}"
"{CENTER_ALIGN}But if you go around feeling\n"
"{CENTER_ALIGN}depressed too much...{EXTRA_MSG}"
"{CENTER_ALIGN}Your nutritional balance goes out\n"
"{CENTER_ALIGN}of wack. Eat more vegetables!{EXTRA_MSG}"
"{CENTER_ALIGN}However...{WAIT_PRESS}\n"
- "{CENTER_ALIGN}It~27s not a bad thing\n"
+ "{CENTER_ALIGN}It{APOSTROPHE}s not a bad thing\n"
"{CENTER_ALIGN}to feel lonely.{EXTRA_MSG}"
- "{CENTER_ALIGN}You know what it~27s like when you aren~27t\n"
- "{CENTER_ALIGN}alone~2c so that~27s why you feel lonesome.{EXTRA_MSG}"
- "{CENTER_ALIGN}And that~27s why you aren~27t really alone.{EXTRA_MSG}"
+ "{CENTER_ALIGN}You know what it{APOSTROPHE}s like when you aren{APOSTROPHE}t\n"
+ "{CENTER_ALIGN}alone{COMMA} so that{APOSTROPHE}s why you feel lonesome.{EXTRA_MSG}"
+ "{CENTER_ALIGN}And that{APOSTROPHE}s why you aren{APOSTROPHE}t really alone.{EXTRA_MSG}"
"{CENTER_ALIGN}A lonely person like you should be...");
ALIGNED(4) const char gRelaxedDescription[] = _(
@@ -48,28 +48,28 @@ ALIGNED(4) const char gRelaxedDescription[] = _(
"{CENTER_ALIGN}Or do you find yourself dozing off?{EXTRA_MSG}"
"{CENTER_ALIGN}Or is your reaction time\n"
"{CENTER_ALIGN}a little slower than others?{EXTRA_MSG}"
- "{CENTER_ALIGN}But that~27s not necessarily\n"
+ "{CENTER_ALIGN}But that{APOSTROPHE}s not necessarily\n"
"{CENTER_ALIGN}a bad thing.{EXTRA_MSG}"
"{CENTER_ALIGN}You can do things at your own\n"
"{CENTER_ALIGN}tempo without feeling pressured.{EXTRA_MSG}"
"{CENTER_ALIGN}You can live in a relaxed and\n"
"{CENTER_ALIGN}unhurried manner without worries.{EXTRA_MSG}"
- "{CENTER_ALIGN}I think that~27s a happy\n"
- "{CENTER_ALIGN}lifestyle to be envied~2c even.{EXTRA_MSG}"
- "{CENTER_ALIGN}You~27re also surprisingly popular.{EXTRA_MSG}"
+ "{CENTER_ALIGN}I think that{APOSTROPHE}s a happy\n"
+ "{CENTER_ALIGN}lifestyle to be envied{COMMA} even.{EXTRA_MSG}"
+ "{CENTER_ALIGN}You{APOSTROPHE}re also surprisingly popular.{EXTRA_MSG}"
"{CENTER_ALIGN}The way you vacantly stare\n"
"{CENTER_ALIGN}off into the distance...{EXTRA_MSG}"
"{CENTER_ALIGN}It should make that someone\n"
- "{CENTER_ALIGN}special~27s pulse race.{EXTRA_MSG}"
+ "{CENTER_ALIGN}special{APOSTROPHE}s pulse race.{EXTRA_MSG}"
"{CENTER_ALIGN}A relaxed person like you should be...");
ALIGNED(4) const char gCalmDescription[] = _(
"{CENTER_ALIGN}You appear to be...{WAIT_PRESS}\n"
"{CENTER_ALIGN}The calm type.{EXTRA_MSG}"
- "{CENTER_ALIGN}You~27re capable of giving advice\n"
+ "{CENTER_ALIGN}You{APOSTROPHE}re capable of giving advice\n"
"{CENTER_ALIGN}to friends with worries.{EXTRA_MSG}"
- "{CENTER_ALIGN}You don~27t like to fight.{EXTRA_MSG}"
- "{CENTER_ALIGN}You~27re a warm~2c kindhearted\n"
+ "{CENTER_ALIGN}You don{APOSTROPHE}t like to fight.{EXTRA_MSG}"
+ "{CENTER_ALIGN}You{APOSTROPHE}re a warm{COMMA} kindhearted\n"
"{CENTER_ALIGN}person who cares.{EXTRA_MSG}"
"{CENTER_ALIGN}You must have many friends\n"
"{CENTER_ALIGN}who look up to you.{EXTRA_MSG}"
@@ -85,21 +85,21 @@ ALIGNED(4) const char gSassyDescription[] = _(
"{CENTER_ALIGN}You appear to be...{WAIT_PRESS}\n"
"{CENTER_ALIGN}The sassy type.{EXTRA_MSG}"
"{CENTER_ALIGN}You tend to be somewhat cynical.{EXTRA_MSG}"
- "{CENTER_ALIGN}Despite that~2c there is something\n"
+ "{CENTER_ALIGN}Despite that{COMMA} there is something\n"
"{CENTER_ALIGN}appealing and lovable about you.{EXTRA_MSG}"
"{CENTER_ALIGN}But do you occasionally say something\n"
"{CENTER_ALIGN}arrogant that angers others?{EXTRA_MSG}"
"{CENTER_ALIGN}Do you make that mistake?{EXTRA_MSG}"
"{CENTER_ALIGN}Or have people called you\n"
- "{CENTER_ALIGN}conceited~2c vain~2c or selfish?{EXTRA_MSG}"
+ "{CENTER_ALIGN}conceited{COMMA} vain{COMMA} or selfish?{EXTRA_MSG}"
"{CENTER_ALIGN}Have people said that about you?{EXTRA_MSG}"
- "{CENTER_ALIGN}Huh?{WAIT_PRESS} You~27re telling me to get lost?{EXTRA_MSG}"
- "{CENTER_ALIGN}Why~2c you... Come here and say that!{WAIT_PRESS}\n"
+ "{CENTER_ALIGN}Huh?{WAIT_PRESS} You{APOSTROPHE}re telling me to get lost?{EXTRA_MSG}"
+ "{CENTER_ALIGN}Why{COMMA} you... Come here and say that!{WAIT_PRESS}\n"
"{CENTER_ALIGN}......Gasp!{EXTRA_MSG}"
- "{CENTER_ALIGN}...I~27m sorry.\n"
+ "{CENTER_ALIGN}...I{APOSTROPHE}m sorry.\n"
"{CENTER_ALIGN}I let my feelings run away.\n"
- "{CENTER_ALIGN}I truly regret this~2c really.{EXTRA_MSG}"
- "{CENTER_ALIGN}Anyway~2c your cool and aloof\n"
+ "{CENTER_ALIGN}I truly regret this{COMMA} really.{EXTRA_MSG}"
+ "{CENTER_ALIGN}Anyway{COMMA} your cool and aloof\n"
"{CENTER_ALIGN}attitude is what defines you.{EXTRA_MSG}"
"{CENTER_ALIGN}It makes you exasperating and\n"
"{CENTER_ALIGN}appealing at the same time.{EXTRA_MSG}"
@@ -110,18 +110,18 @@ ALIGNED(4) const char gHastyDescription[] = _(
"{CENTER_ALIGN}The hasty type.{EXTRA_MSG}"
"{CENTER_ALIGN}You like to take charge\n"
"{CENTER_ALIGN}and get things done.{EXTRA_MSG}"
- "{CENTER_ALIGN}You~27re a real go-getter.{EXTRA_MSG}"
+ "{CENTER_ALIGN}You{APOSTROPHE}re a real go-getter.{EXTRA_MSG}"
"{CENTER_ALIGN}But are you also stressed out?{EXTRA_MSG}"
"{CENTER_ALIGN}You get irritated when your\n"
- "{CENTER_ALIGN}friends don~27t show up on time.{EXTRA_MSG}"
+ "{CENTER_ALIGN}friends don{APOSTROPHE}t show up on time.{EXTRA_MSG}"
"{CENTER_ALIGN}You get frustrated when things\n"
- "{CENTER_ALIGN}don~27t turn out the way you expect.{EXTRA_MSG}"
+ "{CENTER_ALIGN}don{APOSTROPHE}t turn out the way you expect.{EXTRA_MSG}"
"{CENTER_ALIGN}Maybe you jab the elevator button\n"
"{CENTER_ALIGN}if the elevator is slow to arrive.{EXTRA_MSG}"
- "{CENTER_ALIGN}...Maybe you~27re already jabbing\n"
+ "{CENTER_ALIGN}...Maybe you{APOSTROPHE}re already jabbing\n"
"{CENTER_ALIGN}the A Button repeatedly now.{EXTRA_MSG}"
"{CENTER_ALIGN}Beware--getting too easily irritated\n"
- "{CENTER_ALIGN}just isn~27t good for your well-being.{EXTRA_MSG}"
+ "{CENTER_ALIGN}just isn{APOSTROPHE}t good for your well-being.{EXTRA_MSG}"
"{CENTER_ALIGN}A hasty person like you should be...");
ALIGNED(4) const char gTimidDescription[] = _(
@@ -132,8 +132,8 @@ ALIGNED(4) const char gTimidDescription[] = _(
"{CENTER_ALIGN}You may also find it too frightening\n"
"{CENTER_ALIGN}to go back to school to get something\n"
"{CENTER_ALIGN}you left behind in class.{EXTRA_MSG}"
- "{CENTER_ALIGN}If you~27re ever walking on a dark\n"
- "{CENTER_ALIGN}street at night~2c you probably turn\n"
+ "{CENTER_ALIGN}If you{APOSTROPHE}re ever walking on a dark\n"
+ "{CENTER_ALIGN}street at night{COMMA} you probably turn\n"
"{CENTER_ALIGN}around often to check behind you.{EXTRA_MSG}"
"{CENTER_ALIGN}But your timid nature is\n"
"{CENTER_ALIGN}also your good point!{EXTRA_MSG}"
@@ -144,7 +144,7 @@ ALIGNED(4) const char gTimidDescription[] = _(
ALIGNED(4) const char gNaiveDescription[] = _(
"{CENTER_ALIGN}You appear to be...{WAIT_PRESS}\n"
"{CENTER_ALIGN}The naive type.{EXTRA_MSG}"
- "{CENTER_ALIGN}You are highly curious~2c\n"
+ "{CENTER_ALIGN}You are highly curious{COMMA}\n"
"{CENTER_ALIGN}and you love rare things.{EXTRA_MSG}"
"{CENTER_ALIGN}Your cheerful and carefree\n"
"{CENTER_ALIGN}attitude should make things fun\n"
@@ -152,38 +152,38 @@ ALIGNED(4) const char gNaiveDescription[] = _(
"{CENTER_ALIGN}But you do have one flaw.\n"
"{CENTER_ALIGN}You can be childish.{EXTRA_MSG}"
"{CENTER_ALIGN}You can never sit still.\n"
- "{CENTER_ALIGN}You~27re always on the move.{EXTRA_MSG}"
- "{CENTER_ALIGN}You can also be selfish~2c\n"
+ "{CENTER_ALIGN}You{APOSTROPHE}re always on the move.{EXTRA_MSG}"
+ "{CENTER_ALIGN}You can also be selfish{COMMA}\n"
"{CENTER_ALIGN}so you should watch yourself.{EXTRA_MSG}"
"{CENTER_ALIGN}A naive person like you should be...");
ALIGNED(4) const char gImpishDescription[] = _(
"{CENTER_ALIGN}You appear to be...{WAIT_PRESS}\n"
"{CENTER_ALIGN}The impish type.{EXTRA_MSG}"
- "{CENTER_ALIGN}You~27re playful~2c cheerful~2c\n"
+ "{CENTER_ALIGN}You{APOSTROPHE}re playful{COMMA} cheerful{COMMA}\n"
"{CENTER_ALIGN}and you love pranks.{EXTRA_MSG}"
- "{CENTER_ALIGN}You~27re also kindhearted.{EXTRA_MSG}"
- "{CENTER_ALIGN}That~27s why the people around\n"
+ "{CENTER_ALIGN}You{APOSTROPHE}re also kindhearted.{EXTRA_MSG}"
+ "{CENTER_ALIGN}That{APOSTROPHE}s why the people around\n"
"{CENTER_ALIGN}you find you so irresistible.{EXTRA_MSG}"
"{CENTER_ALIGN}You must be the most\n"
"{CENTER_ALIGN}popular person around!{EXTRA_MSG}"
- "{CENTER_ALIGN}Oh?{WAIT_PRESS} You~27re not that popular?{WAIT_PRESS}\n"
- "{CENTER_ALIGN}You~27re either being modest...\n"
- "{CENTER_ALIGN}or you just don~27t notice it.{EXTRA_MSG}"
+ "{CENTER_ALIGN}Oh?{WAIT_PRESS} You{APOSTROPHE}re not that popular?{WAIT_PRESS}\n"
+ "{CENTER_ALIGN}You{APOSTROPHE}re either being modest...\n"
+ "{CENTER_ALIGN}or you just don{APOSTROPHE}t notice it.{EXTRA_MSG}"
"{CENTER_ALIGN}I bet people are just too shy\n"
"{CENTER_ALIGN}to let their feelings be known.{EXTRA_MSG}"
- "{CENTER_ALIGN}There~27s someone out there who~27s\n"
+ "{CENTER_ALIGN}There{APOSTROPHE}s someone out there who{APOSTROPHE}s\n"
"{CENTER_ALIGN}afraid to declare their love for you!{EXTRA_MSG}"
"{CENTER_ALIGN}An impish person like you should be...");
ALIGNED(4) const char gJollyDescription[] = _(
"{CENTER_ALIGN}You appear to be...{WAIT_PRESS}\n"
"{CENTER_ALIGN}The jolly type.{EXTRA_MSG}"
- "{CENTER_ALIGN}Always laughing and smiling~2c\n"
+ "{CENTER_ALIGN}Always laughing and smiling{COMMA}\n"
"{CENTER_ALIGN}you uplift everyone around you.{EXTRA_MSG}"
"{CENTER_ALIGN}You love jokes!{EXTRA_MSG}"
- "{CENTER_ALIGN}You have lots of friends~2c and\n"
- "{CENTER_ALIGN}you~27re popular wherever you go.{EXTRA_MSG}"
+ "{CENTER_ALIGN}You have lots of friends{COMMA} and\n"
+ "{CENTER_ALIGN}you{APOSTROPHE}re popular wherever you go.{EXTRA_MSG}"
"{CENTER_ALIGN}But sometimes you get carried away\n"
"{CENTER_ALIGN}and say things that get you in trouble.{EXTRA_MSG}"
"{CENTER_ALIGN}You should learn to think before\n"
@@ -201,19 +201,19 @@ ALIGNED(4) const char gBraveDescription[] = _(
"{CENTER_ALIGN}For justice...{WAIT_PRESS}\n"
"{CENTER_ALIGN}For peace on earth...{WAIT_PRESS}\n"
"{CENTER_ALIGN}Fight the forces of evil!{EXTRA_MSG}"
- "{CENTER_ALIGN}......{WAIT_PRESS}If I~27m wrong...{WAIT_PRESS}\n"
+ "{CENTER_ALIGN}......{WAIT_PRESS}If I{APOSTROPHE}m wrong...{WAIT_PRESS}\n"
"{CENTER_ALIGN}Work at becoming a true hero!{EXTRA_MSG}"
"{CENTER_ALIGN}A brave person like you should be...");
ALIGNED(4) const char gDocileDescription[] = _(
"{CENTER_ALIGN}You appear to be...{WAIT_PRESS}\n"
"{CENTER_ALIGN}The docile type.{EXTRA_MSG}"
- "{CENTER_ALIGN}You~27re very kindhearted.{WAIT_PRESS}\n"
+ "{CENTER_ALIGN}You{APOSTROPHE}re very kindhearted.{WAIT_PRESS}\n"
"{CENTER_ALIGN}Very helpful.{WAIT_PRESS}\n"
"{CENTER_ALIGN}You can make friends with anyone.{EXTRA_MSG}"
- "{CENTER_ALIGN}You~27re a wonderful person.{EXTRA_MSG}"
+ "{CENTER_ALIGN}You{APOSTROPHE}re a wonderful person.{EXTRA_MSG}"
"{CENTER_ALIGN}......{WAIT_PRESS}Is that going overboard?{WAIT_PRESS}\n"
- "{CENTER_ALIGN}I don~27t think so.{EXTRA_MSG}"
+ "{CENTER_ALIGN}I don{APOSTROPHE}t think so.{EXTRA_MSG}"
"{CENTER_ALIGN}You yourself should be\n"
"{CENTER_ALIGN}the best judge of that.{EXTRA_MSG}"
"{CENTER_ALIGN}A docile person like you should be...");
@@ -222,12 +222,12 @@ ALIGNED(4) const char gDocileDescription[] = _(
ALIGNED(4) const char gHardyDescription[] = _(
"{CENTER_ALIGN}You appear to be...{WAIT_PRESS}\n"
"{CENTER_ALIGN}The hardy type.{EXTRA_MSG}"
- "{CENTER_ALIGN}You do your homework diligently~2c\n"
+ "{CENTER_ALIGN}You do your homework diligently{COMMA}\n"
"{CENTER_ALIGN}and you know to eat properly.{EXTRA_MSG}"
"{CENTER_ALIGN}You have strong willpower that lets\n"
- "{CENTER_ALIGN}you complete tasks~2c however tough.{EXTRA_MSG}"
- "{CENTER_ALIGN}But~2c you can also be stubborn to the\n"
+ "{CENTER_ALIGN}you complete tasks{COMMA} however tough.{EXTRA_MSG}"
+ "{CENTER_ALIGN}But{COMMA} you can also be stubborn to the\n"
"{CENTER_ALIGN}point of even feuding with friends...{EXTRA_MSG}"
- "{CENTER_ALIGN}Nothing will go right for you when you~27re\n"
- "{CENTER_ALIGN}irritated~2c so learn to laugh it off.{EXTRA_MSG}"
+ "{CENTER_ALIGN}Nothing will go right for you when you{APOSTROPHE}re\n"
+ "{CENTER_ALIGN}irritated{COMMA} so learn to laugh it off.{EXTRA_MSG}"
"{CENTER_ALIGN}A hardy person like you should be...");
diff --git a/src/data/pelipper_help_guide_dialogue.h b/src/data/pelipper_help_guide_dialogue.h
index 678be4f..0c442fb 100644
--- a/src/data/pelipper_help_guide_dialogue.h
+++ b/src/data/pelipper_help_guide_dialogue.h
@@ -1,112 +1,112 @@
-ALIGNED(4) const char gWhatdYouWantToKnow[] =
- _(" So~2c what~27d you want to\n"
+ALIGNED(4) const char gWhatdYouWantToKnow[] =
+ _(" So{COMMA} what{APOSTROPHE}d you want to\n"
"know?");
-ALIGNED(4) const char gGettingHelpExplaination[] =
+ALIGNED(4) const char gGettingHelpExplanation[] =
_(" If you need to call for\n"
- "help~2c first send your friend\n"
+ "help{COMMA} first send your friend\n"
"an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}"
- " Once you send that mail~2c\n"
+ " Once you send that mail{COMMA}\n"
"wait until your friend sends you back\n"
"an {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}"
" When you get that\n"
- "{COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1} back~2c your team\n"
+ "{COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1} back{COMMA} your team\n"
"can continue from where it went down.{EXTRA_MSG}"
" Make sure you send your\n"
"friend a {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}.\n"
- "That~27s if you get revived~2c of course.");
+ "That{APOSTROPHE}s if you get revived{COMMA} of course.");
-ALIGNED(4) const char gSendSOSMailExplaination[] =
+ALIGNED(4) const char gSendSOSMailExplanation[] =
_(" If your team gets defeated\n"
- "in a dungeon~2c you can send an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}\n"
+ "in a dungeon{COMMA} you can send an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}\n"
"to a friend willing to help.{EXTRA_MSG}"
" But I have to warn you.\n"
- "You can~27t get anyone to rescue you\n"
+ "You can{APOSTROPHE}t get anyone to rescue you\n"
"in certain places.{EXTRA_MSG}"
" If you need to send\n"
- "an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}~2c you send it from the\n"
+ "an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}{COMMA} you send it from the\n"
"{COLOR_1 LIGHT_BLUE_2}main menu{END_COLOR_TEXT_1}.");
-
-ALIGNED(4) const char gReceiveAOKMailExplaination[] =
+
+ALIGNED(4) const char gReceiveAOKMailExplanation[] =
_(" If your friend manages to\n"
- "rescue your team~2c you need to receive\n"
+ "rescue your team{COMMA} you need to receive\n"
"an {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1} from your friend.{EXTRA_MSG}"
- " See~2c once you get that\n"
- "{COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}~2c your team can continue from\n"
+ " See{COMMA} once you get that\n"
+ "{COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}{COMMA} your team can continue from\n"
"where it went down in the dungeon.{EXTRA_MSG}"
- " And~2c if you use\n"
- "a {COLOR_1 LIGHT_BLUE_2}Game Link cable{END_COLOR_TEXT_1}~2c your friend can\n"
+ " And{COMMA} if you use\n"
+ "a {COLOR_1 LIGHT_BLUE_2}Game Link cable{END_COLOR_TEXT_1}{COMMA} your friend can\n"
"even send you a {COLOR_1 LIGHT_BLUE_2}helper Pokémon{END_COLOR_TEXT_1}.{EXTRA_MSG}"
- " There~27s just one thing.\n"
- "A {COLOR_1 LIGHT_BLUE_2}helper Pokémon{END_COLOR_TEXT_1} can~27t bring\n"
+ " There{APOSTROPHE}s just one thing.\n"
+ "A {COLOR_1 LIGHT_BLUE_2}helper Pokémon{END_COLOR_TEXT_1} can{APOSTROPHE}t bring\n"
"any item it happens to be holding.{EXTRA_MSG}"
" You can receive that\n"
- "team-saving {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1} on the {COLOR_1 LIGHT_BLUE_2}main menu{END_COLOR_TEXT_1}~2c\n"
+ "team-saving {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1} on the {COLOR_1 LIGHT_BLUE_2}main menu{END_COLOR_TEXT_1}{COMMA}\n"
"all right?");
-ALIGNED(4) const char gSendThankYouMailExplaination[] =
- _(" If your team gets rescued~2c\n"
+ALIGNED(4) const char gSendThankYouMailExplanation[] =
+ _(" If your team gets rescued{COMMA}\n"
"be sure to send your friend\n"
"a {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}"
" You do that by going to\n"
- "the {COLOR_1 LIGHT_BLUE_2}right counter{END_COLOR_TEXT_1}~2c or\n"
+ "the {COLOR_1 LIGHT_BLUE_2}right counter{END_COLOR_TEXT_1}{COMMA} or\n"
"by selecting it from the {COLOR_1 LIGHT_BLUE_2}main menu{END_COLOR_TEXT_1}.{EXTRA_MSG}"
" You can attach an item in\n"
"storage to your {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}\n"
"as a {COLOR_1 LIGHT_BLUE_2}reward item{END_COLOR_TEXT_1}.{EXTRA_MSG}"
- " You don~27t want to ever\n"
+ " You don{APOSTROPHE}t want to ever\n"
"forget to express your thanks.");
-ALIGNED(4) const char gRescueProceduresExplaination[] =
+ALIGNED(4) const char gRescueProceduresExplanation[] =
_(" If you want to go and\n"
- "rescue your friend~27s KO~27d team~2c\n"
+ "rescue your friend{APOSTROPHE}s KO{APOSTROPHE}d team{COMMA}\n"
"you need to receive an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}"
- " When you get that mail~2c\n"
+ " When you get that mail{COMMA}\n"
"you can rescue your friend at\n"
"the {COLOR_1 LIGHT_BLUE_2}left counter{END_COLOR_TEXT_1} over there.{EXTRA_MSG}"
" If you do manage to rescue\n"
- "the team~2c you send your friend\n"
+ "the team{COMMA} you send your friend\n"
"an {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}"
- " After you do that~2c your\n"
+ " After you do that{COMMA} your\n"
"friend can send back to you\n"
"a {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}.");
-ALIGNED(4) const char gReceiveSOSMailExplaination[] =
- _(" To go off on a rescue~2c\n"
- "you first need to receive your friend~27s\n"
+ALIGNED(4) const char gReceiveSOSMailExplanation[] =
+ _(" To go off on a rescue{COMMA}\n"
+ "you first need to receive your friend{APOSTROPHE}s\n"
"{COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}"
" You do that at\n"
- "the {COLOR_1 LIGHT_BLUE_2}left counter{END_COLOR_TEXT_1} over there~2c\n"
+ "the {COLOR_1 LIGHT_BLUE_2}left counter{END_COLOR_TEXT_1} over there{COMMA}\n"
"or by selecting it from the {COLOR_1 LIGHT_BLUE_2}main menu{END_COLOR_TEXT_1}.");
-ALIGNED(4) const char gSendAOKMailExplaination[] =
+ALIGNED(4) const char gSendAOKMailExplanation[] =
_(" If you succeed in rescuing\n"
- "that team~2c you send your friend an\n"
+ "that team{COMMA} you send your friend an\n"
"{COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}"
" You do that by going to\n"
- "the {COLOR_1 LIGHT_BLUE_2}left counter{END_COLOR_TEXT_1}~2c\n"
+ "the {COLOR_1 LIGHT_BLUE_2}left counter{END_COLOR_TEXT_1}{COMMA}\n"
"or from the {COLOR_1 LIGHT_BLUE_2}main menu{END_COLOR_TEXT_1}.{EXTRA_MSG}"
" You can send your friend\n"
"a Pokémon as a helper from your Friend\n"
"Areas using a {COLOR_1 LIGHT_BLUE_2}Game Link cable{END_COLOR_TEXT_1}.{EXTRA_MSG}"
- " This Pokémon won~27t\n"
- "disappear from its Friend Area~2c so\n"
- "don~27t you worry any.");
+ " This Pokémon won{APOSTROPHE}t\n"
+ "disappear from its Friend Area{COMMA} so\n"
+ "don{APOSTROPHE}t you worry any.");
-ALIGNED(4) const char gLeaveForRescueExplaination[] =
- _(" If you get an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}~2c\n"
+ALIGNED(4) const char gLeaveForRescueExplanation[] =
+ _(" If you get an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}{COMMA}\n"
"you head off on the rescue from\n"
"the {COLOR_1 LIGHT_BLUE_2}left counter{END_COLOR_TEXT_1}.{EXTRA_MSG}"
- " But~2c I have to warn you.\n"
- "You can~27t go off to rescue in a dungeon\n"
- "if you can~27t get into it.{EXTRA_MSG}"
- " You~27ll be able to get\n"
+ " But{COMMA} I have to warn you.\n"
+ "You can{APOSTROPHE}t go off to rescue in a dungeon\n"
+ "if you can{APOSTROPHE}t get into it.{EXTRA_MSG}"
+ " You{APOSTROPHE}ll be able to get\n"
"there when you go farther in your\n"
- "adventure~2c so it won~27t do to fret.");
+ "adventure{COMMA} so it won{APOSTROPHE}t do to fret.");
-ALIGNED(4) const char gGetThankYouMailExplaination[] =
+ALIGNED(4) const char gGetThankYouMailExplanation[] =
_(" If you send your friend\n"
- "an {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}~2c you can look forward\n"
+ "an {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}{COMMA} you can look forward\n"
"to getting a {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1} back.{EXTRA_MSG}"
" You can receive it at\n"
"the {COLOR_1 LIGHT_BLUE_2}right counter{END_COLOR_TEXT_1}\n"
@@ -115,73 +115,73 @@ ALIGNED(4) const char gGetThankYouMailExplaination[] =
"You {COLOR_1 RED}must not delete the A-OK Mail{END_COLOR_TEXT_1}\n"
"before you get the {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1} back.");
-ALIGNED(4) const char gImYourGuide[] =
- _(" I~27m your guide to what you\n"
+ALIGNED(4) const char gImYourGuide[] =
+ _(" I{APOSTROPHE}m your guide to what you\n"
"can expect at the Pelipper Post Office.\n"
- "If you have any questions~2c just ask away!");
+ "If you have any questions{COMMA} just ask away!");
ALIGNED(4) const char gAnythingElse[] =
_(" Did you want to ask about\n"
"anything else?");
-ALIGNED(4) const char gPostOfficeExplaination[] =
+ALIGNED(4) const char gPostOfficeExplanation[] =
_(" {COLOR_1 LIGHT_BLUE_2}The Pelipper Post Office{END_COLOR_TEXT_1}\n"
"keeps track of information from\n"
"around the world.{EXTRA_MSG}"
" We inform folks\n"
"about everything from gossip to calls\n"
"for help from fellow Pokémon.{EXTRA_MSG}"
- " For the latest news~2c check\n"
+ " For the latest news{COMMA} check\n"
"{COLOR_1 LIGHT_BLUE_2}your Mailbox{END_COLOR_TEXT_1} or the {COLOR_1 LIGHT_BLUE_2}Bulletin Board{END_COLOR_TEXT_1}\n"
- "outside~2c all right?{EXTRA_MSG}"
- " Oh~2c that~27s not all.\n"
+ "outside{COMMA} all right?{EXTRA_MSG}"
+ " Oh{COMMA} that{APOSTROPHE}s not all.\n"
"You can arrange for {COLOR_1 LIGHT_BLUE_2}Friend Rescue{END_COLOR_TEXT_1}\n"
"missions at that counter there.{EXTRA_MSG}"
" The {COLOR_1 LIGHT_BLUE_2}left counter{END_COLOR_TEXT_1} is\n"
- "for rescues~2c and the {COLOR_1 LIGHT_BLUE_2}right counter{END_COLOR_TEXT_1}\n"
+ "for rescues{COMMA} and the {COLOR_1 LIGHT_BLUE_2}right counter{END_COLOR_TEXT_1}\n"
"is for Thank-You Mail.");
-ALIGNED(4) const char gBulletinBoardExplaination[] =
+ALIGNED(4) const char gBulletinBoardExplanation[] =
_(" The {COLOR_1 LIGHT_BLUE_2}Bulletin Board{END_COLOR_TEXT_1} outside\n"
"here lists rescue requests.{EXTRA_MSG}"
" Take on rescue jobs from\n"
"the Bulletin Board. Be a hero and handle\n"
"the jobs for fellow Pokémon in need!");
-ALIGNED(4) const char gDeliveryExplaination[] =
+ALIGNED(4) const char gDeliveryExplanation[] =
_(" If your rescue team\n"
- "becomes famous for doing lots of rescues~2c\n"
+ "becomes famous for doing lots of rescues{COMMA}\n"
"expect to get rescue requests directly.{EXTRA_MSG}"
- " Our delivery $m0\n"
+ " Our delivery {ARG_POKEMON_0}\n"
"will take those jobs straight to your\n"
"{COLOR_1 LIGHT_BLUE_2}Mailbox{END_COLOR_TEXT_1}.");
-ALIGNED(4) const char gFriendRescueExplaination[] =
+ALIGNED(4) const char gFriendRescueExplanation[] =
_(" Friend Rescue is what we\n"
"call rescue missions between friends using\n"
- "a {COLOR_1 LIGHT_BLUE_2}Game Link cable{END_COLOR_TEXT_1}~2c {COLOR_1 LIGHT_BLUE_2}passwords{END_COLOR_TEXT_1}~2c etc.{EXTRA_MSG}"
- " For instance~2c you can send\n"
+ "a {COLOR_1 LIGHT_BLUE_2}Game Link cable{END_COLOR_TEXT_1}{COMMA} {COLOR_1 LIGHT_BLUE_2}passwords{END_COLOR_TEXT_1}{COMMA} etc.{EXTRA_MSG}"
+ " For instance{COMMA} you can send\n"
"out for help saying your team wiped out\n"
"in a dungeon at such and such a place.{EXTRA_MSG}"
" Your friend could play\n"
- "the hero and come to your team~27s rescue.\n"
- "Or it can be the other way around~2c too.{EXTRA_MSG}"
- " If you use {COLOR_1 LIGHT_BLUE_2}passwords{END_COLOR_TEXT_1}~2c\n"
+ "the hero and come to your team{APOSTROPHE}s rescue.\n"
+ "Or it can be the other way around{COMMA} too.{EXTRA_MSG}"
+ " If you use {COLOR_1 LIGHT_BLUE_2}passwords{END_COLOR_TEXT_1}{COMMA}\n"
"you can do rescues with friends in\n"
"far-away places.{EXTRA_MSG}"
" You can apply for Friend\n"
"Rescue jobs at the {COLOR_1 LIGHT_BLUE_2}left counter{END_COLOR_TEXT_1} of\n"
"that counter there.");
-ALIGNED(4) const char gDeletingMailExplaination[] =
+ALIGNED(4) const char gDeletingMailExplanation[] =
_(" Deleting mail just means\n"
- "getting rid of old mail that you don~27t\n"
+ "getting rid of old mail that you don{APOSTROPHE}t\n"
"need anymore.{EXTRA_MSG}"
" If you do lots of Friend\n"
- "Rescues~2c you~27ll find {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1} and\n"
+ "Rescues{COMMA} you{APOSTROPHE}ll find {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1} and\n"
"{COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1} piling up.{EXTRA_MSG}"
- " Once you get {COLOR_1 LIGHT_BLUE_2}30 pieces{END_COLOR_TEXT_1}~2c\n"
- "you won~27t be able to receive more mail.\n"
- "That~27s why you~27ll need to delete old mail.{EXTRA_MSG}"
+ " Once you get {COLOR_1 LIGHT_BLUE_2}30 pieces{END_COLOR_TEXT_1}{COMMA}\n"
+ "you won{APOSTROPHE}t be able to receive more mail.\n"
+ "That{APOSTROPHE}s why you{APOSTROPHE}ll need to delete old mail.{EXTRA_MSG}"
" You can look through old\n"
"mail at the {COLOR_1 LIGHT_BLUE_2}left counter{END_COLOR_TEXT_1} over there.");
diff --git a/src/data/wonder_mail_1.h b/src/data/wonder_mail_1.h
index 19c49dd..e7dc2b3 100644
--- a/src/data/wonder_mail_1.h
+++ b/src/data/wonder_mail_1.h
@@ -5,10 +5,10 @@ ALIGNED(4) const char gUnknown_80DDBA8[] = _(
ALIGNED(4) const char gUnknown_80DDBFC[] = _(
" All righty!\n"
- "Here~27s your {COLOR_1 LIGHT_BLUE_2}A-OK Mail password{END_COLOR_TEXT_1}.");
+ "Here{APOSTROPHE}s your {COLOR_1 LIGHT_BLUE_2}A-OK Mail password{END_COLOR_TEXT_1}.");
ALIGNED(4) const char gUnknown_80DDC30[] = _(
- " Okeydoke! That~27s all done.\n"
+ " Okeydoke! That{APOSTROPHE}s all done.\n"
"Come around whenever you need.");
ALIGNED(4) const char gUnknown_80DDC70[] = _(
@@ -22,106 +22,106 @@ ALIGNED(4) const char gUnknown_80DDCBC[] = _(
"{CENTER_ALIGN}(Its hold item will not be sent.)");
ALIGNED(4) const char gUnknown_80DDD2C[] = _(
- " ...Uh~2c no?\n"
+ " ...Uh{COMMA} no?\n"
"There appear to be no Pokémon in your\n"
"Friend Areas. What do you want to do?");
ALIGNED(4) const char gUnknown_80DDD88[] = _(
- " You~27re sure you want to\n"
+ " You{APOSTROPHE}re sure you want to\n"
"send this here Pokémon?");
ALIGNED(4) const char gUnknown_80DDDBC[] = _(
- " You~27re sure about this?");
+ " You{APOSTROPHE}re sure about this?");
ALIGNED(4) const char gUnknown_80DDDD8[] = _(
" All righty. I need you to\n"
"pick the {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1} you want to send.");
ALIGNED(4) const char gUnknown_80DDE20[] = _(
- " ...Uh~2c no?\n"
- "I don~27t see any {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1} here.");
+ " ...Uh{COMMA} no?\n"
+ "I don{APOSTROPHE}t see any {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1} here.");
ALIGNED(4) const char gUnknown_80DDE58[] = _(
" Did you know? If you use\n"
- "a {COLOR_1 LIGHT_BLUE_2}Game Link cable{END_COLOR_TEXT_1}~2c you can send\n"
+ "a {COLOR_1 LIGHT_BLUE_2}Game Link cable{END_COLOR_TEXT_1}{COMMA} you can send\n"
"a {COLOR_1 LIGHT_BLUE_2}helper Pokémon{END_COLOR_TEXT_1} to your friend.");
ALIGNED(4) const char gUnknown_80DDEC0[] = _(
- " Don~27t you worry. Sending\n"
- "a Pokémon doesn~27t mean it will go away.\n"
+ " Don{APOSTROPHE}t you worry. Sending\n"
+ "a Pokémon doesn{APOSTROPHE}t mean it will go away.\n"
"So! Want to send one to your friend?");
ALIGNED(4) const char gUnknown_80DDF2C[] = _(
- " ...Uh~2c no?\n"
- "There~27s no space at all to receive\n"
+ " ...Uh{COMMA} no?\n"
+ "There{APOSTROPHE}s no space at all to receive\n"
"any more mail.{EXTRA_MSG}"
- " Delete some old mail~2c\n"
+ " Delete some old mail{COMMA}\n"
"and then come to me to receive\n"
- "your mail~2c OK?");
+ "your mail{COMMA} OK?");
ALIGNED(4) const char gUnknown_80DDFB8[] = _(
" All righty! Connect up\n"
- "the {COLOR_1 LIGHT_BLUE_2}Game Link cable{END_COLOR_TEXT_1}~2c if you~27d please.\n"
- "Your friend ready~2c too?");
+ "the {COLOR_1 LIGHT_BLUE_2}Game Link cable{END_COLOR_TEXT_1}{COMMA} if you{APOSTROPHE}d please.\n"
+ "Your friend ready{COMMA} too?");
ALIGNED(4) const char gUnknown_80DE01C[] = _(
"{CENTER_ALIGN}Communicating...\n"
"{CENTER_ALIGN}Please wait with the power on.\n"
- "{CENTER_ALIGN}To cancel~2c press {B_BUTTON}.");
+ "{CENTER_ALIGN}To cancel{COMMA} press {B_BUTTON}.");
ALIGNED(4) const char gUnknown_80DE06C[] = _(
" Okeydoke!\n"
- "I received your friend~27s {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}"
+ "I received your friend{APOSTROPHE}s {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}"
" Let me save your adventure.");
ALIGNED(4) const char gUnknown_80DE0C0[] = _(
- " Okeydoke! You~27re good to go.\n"
- "Just give me a shout when you~27d like\n"
+ " Okeydoke! You{APOSTROPHE}re good to go.\n"
+ "Just give me a shout when you{APOSTROPHE}d like\n"
"to go rescue your friend.");
ALIGNED(4) const char gUnknown_80DE124[] = _(
- " OK~2c I need you to enter\n"
+ " OK{COMMA} I need you to enter\n"
"the {COLOR_1 LIGHT_BLUE_2}SOS Mail password{END_COLOR_TEXT_1} that your\n"
"friend gave you.");
ALIGNED(4) const char gUnknown_80DE178[] = _(
" How do you want to receive\n"
- "your friend~27s {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}?");
+ "your friend{APOSTROPHE}s {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}?");
ALIGNED(4) const char gUnknown_80DE1B4[] = _(
" How do you want to send\n"
"your {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}?");
ALIGNED(4) const char gUnknown_80DE1E4[] = _(
- " ...Uh~2c no?\n"
- "You don~27t have an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}"
- " You~27ll need to arrange\n"
- "to receive your friend~27s {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1} first.\n"
- "That~27s what you need to do.");
+ " ...Uh{COMMA} no?\n"
+ "You don{APOSTROPHE}t have an {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}"
+ " You{APOSTROPHE}ll need to arrange\n"
+ "to receive your friend{APOSTROPHE}s {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1} first.\n"
+ "That{APOSTROPHE}s what you need to do.");
ALIGNED(4) const char gUnknown_80DE280[] = _(
" Okeydoke!\n"
"Let me show you to the rescue site.");
ALIGNED(4) const char gUnknown_80DE2B0[] = _(
- " ...Uh~2c no?\n"
- "Doesn~27t look like you can go to the dungeon\n"
+ " ...Uh{COMMA} no?\n"
+ "Doesn{APOSTROPHE}t look like you can go to the dungeon\n"
"named in this {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}"
" Come see me about doing\n"
"this rescue when you can actually go\n"
- "to that dungeon~2c all right?");
+ "to that dungeon{COMMA} all right?");
ALIGNED(4) const char gUnknown_80DE368[] = _(
- " ...Uh~2c no?\n"
- "You~27ve blown this rescue mission too\n"
- "often. Your friend~27s team is beyond help.{EXTRA_MSG}"
- " I~27m sorry to say this~2c\n"
- "but you~27ll have to tell your friend that\n"
+ " ...Uh{COMMA} no?\n"
+ "You{APOSTROPHE}ve blown this rescue mission too\n"
+ "often. Your friend{APOSTROPHE}s team is beyond help.{EXTRA_MSG}"
+ " I{APOSTROPHE}m sorry to say this{COMMA}\n"
+ "but you{APOSTROPHE}ll have to tell your friend that\n"
"your rescue attempts failed.");
ALIGNED(4) const char gUnknown_80DE430[] = _(
" Okeydoke.\n"
- "I~27ll need you to choose the {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}\n"
+ "I{APOSTROPHE}ll need you to choose the {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}\n"
"for you to go on a rescue mission.");
ALIGNED(4) const char gUnknown_80DE48C[] = _(
@@ -130,52 +130,52 @@ ALIGNED(4) const char gUnknown_80DE48C[] = _(
ALIGNED(4) const char gUnknown_80DE4B8[] = _(
" All righty. Choose\n"
- "the {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1} you don~27t need.");
+ "the {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1} you don{APOSTROPHE}t need.");
ALIGNED(4) const char gUnknown_80DE4F0[] = _(
- " ...Uh~2c no?\n"
- "You don~27t have any {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}.");
+ " ...Uh{COMMA} no?\n"
+ "You don{APOSTROPHE}t have any {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}.");
ALIGNED(4) const char gUnknown_80DE524[] = _(
- " If you want a reward~2c {COLOR_1 RED}don~27t\n"
+ " If you want a reward{COMMA} {COLOR_1 RED}don{APOSTROPHE}t\n"
"delete an A-OK Mail{END_COLOR_TEXT_1} before getting a\n"
"{COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1} back for it.{EXTRA_MSG}"
- " {COLOR_1 RED}Be careful{END_COLOR_TEXT_1} if you~27re going\n"
+ " {COLOR_1 RED}Be careful{END_COLOR_TEXT_1} if you{APOSTROPHE}re going\n"
"to delete any {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}.{EXTRA_MSG}"
" Okeydoke.\n"
"Choose an {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}\n"
- "you don~27t need anymore.");
+ "you don{APOSTROPHE}t need anymore.");
ALIGNED(4) const char gUnknown_80DE614[] = _(
- " ...Uh~2c no?\n"
- "You don~27t have any {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}.");
+ " ...Uh{COMMA} no?\n"
+ "You don{APOSTROPHE}t have any {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}.");
ALIGNED(4) const char gUnknown_80DE648[] = _(
- " Uh~2c OK.\n"
- "So~2c you want me to delete every piece\n"
+ " Uh{COMMA} OK.\n"
+ "So{COMMA} you want me to delete every piece\n"
"of mail that you have.");
ALIGNED(4) const char gUnknown_80DE694[] = _(
- " ...Uh~2c no?\n"
- "You don~27t have a single piece of\n"
+ " ...Uh{COMMA} no?\n"
+ "You don{APOSTROPHE}t have a single piece of\n"
"mail on you!");
ALIGNED(4) const char gUnknown_80DE6D4[] = _(
- " So~2c delete all your {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}~2c\n"
- "{COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}~2c and your {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}?\n"
- "You~27re absolutely~2c positively sure?");
+ " So{COMMA} delete all your {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}{COMMA}\n"
+ "{COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}{COMMA} and your {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}?\n"
+ "You{APOSTROPHE}re absolutely{COMMA} positively sure?");
ALIGNED(4) const char gUnknown_80DE754[] = _(
- " If I delete any mail~2c it~27s\n"
+ " If I delete any mail{COMMA} it{APOSTROPHE}s\n"
"gone forever and ever. Bye-bye.\n"
- "You~27re really~2c really sure now?");
+ "You{APOSTROPHE}re really{COMMA} really sure now?");
ALIGNED(4) const char gUnknown_80DE7B8[] = _(
- " OK~2c then.\n"
+ " OK{COMMA} then.\n"
"Let me save your adventure now.");
ALIGNED(4) const char gUnknown_80DE7E8[] = _(
- " Okeydoke. That~27s all done.");
+ " Okeydoke. That{APOSTROPHE}s all done.");
ALIGNED(4) const char gUnknown_80DE808[] = _(
" Do you want to delete\n"
@@ -183,7 +183,7 @@ ALIGNED(4) const char gUnknown_80DE808[] = _(
ALIGNED(4) const char gUnknown_80DE830[] = _(
" Okeydoke.\n"
- "I~27ll delete {COLOR_1 LIGHT_BLUE_2}every piece of mail{END_COLOR_TEXT_1}.");
+ "I{APOSTROPHE}ll delete {COLOR_1 LIGHT_BLUE_2}every piece of mail{END_COLOR_TEXT_1}.");
ALIGNED(4) const char gUnknown_80DE864[] = _(
" Okeydoke.\n"
@@ -191,7 +191,7 @@ ALIGNED(4) const char gUnknown_80DE864[] = _(
" Let me save your adventure.");
ALIGNED(4) const char gUnknown_80DE8B4[] = _(
- " Well~2c hello~2c there!\n"
+ " Well{COMMA} hello{COMMA} there!\n"
"This is the {COLOR_1 LIGHT_BLUE_2}Friend Rescue{END_COLOR_TEXT_1} counter.\n"
"What can I help you with today?");
@@ -203,53 +203,53 @@ ALIGNED(4) const char gUnknown_80DE93C[] = _(
" Come again anytime!");
ALIGNED(4) const char gWonderMailErrorText[] = _(
- " ...Uh~2c no?\n"
- "Something~27s not working right here...");
+ " ...Uh{COMMA} no?\n"
+ "Something{APOSTROPHE}s not working right here...");
ALIGNED(4) const char gWonderMailNumGBAsText[] = _(
- " ...Uh~2c no?\n"
- "The number of GBA systems isn~27t right.\n"
- "You~27d better try this again from the top.");
+ " ...Uh{COMMA} no?\n"
+ "The number of GBA systems isn{APOSTROPHE}t right.\n"
+ "You{APOSTROPHE}d better try this again from the top.");
ALIGNED(4) const char gWonderMailWrongModeText[] = _(
- " ...Uh~2c no? You~27re not in the\n"
+ " ...Uh{COMMA} no? You{APOSTROPHE}re not in the\n"
"same mode as your friend.\n"
- "You~27d better try this again from the top.");
+ "You{APOSTROPHE}d better try this again from the top.");
ALIGNED(4) const char gWonderMailStorageFullText[] = _(
- " ...Uh~2c no?\n"
+ " ...Uh{COMMA} no?\n"
"Your storage space is stuffed full.\n"
- "You~27d better make room and try again.");
+ "You{APOSTROPHE}d better make room and try again.");
ALIGNED(4) const char gWonderMailDuplicateText[] = _(
- " ...Uh~2c no? It looks like\n"
+ " ...Uh{COMMA} no? It looks like\n"
"you received this mail before.\n"
- "You can~27t get the same mail twice. ");
+ "You can{APOSTROPHE}t get the same mail twice. ");
ALIGNED(4) const char gWonderMailNotEligibleReceiveText[] = _(
- " ...Uh~2c no?\n"
- "You~27re not eligible to receive this mail.");
+ " ...Uh{COMMA} no?\n"
+ "You{APOSTROPHE}re not eligible to receive this mail.");
ALIGNED(4) const char gWonderMailNoRoomText[] = _(
- " ...Uh~2c no?\n"
- "There~27s no room for you to \n"
+ " ...Uh{COMMA} no?\n"
+ "There{APOSTROPHE}s no room for you to \n"
"receive any more mail.{EXTRA_MSG}"
- " You~27d better delete some\n"
+ " You{APOSTROPHE}d better delete some\n"
"mail and make room before you come see\n"
"me again about receiving new mail.");
ALIGNED(4) const char gWonderMailFriendErrorText[] = _(
- " ...Uh~2c no? Looks like your\n"
- "friend didn~27t do what needed doing.\n"
- "You~27d better do this again from the top.");
+ " ...Uh{COMMA} no? Looks like your\n"
+ "friend didn{APOSTROPHE}t do what needed doing.\n"
+ "You{APOSTROPHE}d better do this again from the top.");
ALIGNED(4) const char gWonderMailPasswordIncorrectText[] = _(
- " ...Uh~2c no?\n"
+ " ...Uh{COMMA} no?\n"
"This here password looks wrong.\n"
"Do you want to try that again?");
ALIGNED(4) const char gWonderMailSOSPasswordIncorrectText[] = _(
- " ...Uh~2c no? This password~27s\n"
+ " ...Uh{COMMA} no? This password{APOSTROPHE}s\n"
"not for any {COLOR_1 LIGHT_BLUE_2}SOS Mail{END_COLOR_TEXT_1}.");
ALIGNED(4) const char gWonderMailAOKMailReceivedText[] = _(
diff --git a/src/dungeon_pokemon_attributes_1.c b/src/dungeon_pokemon_attributes_1.c
index ac865a9..02e9af0 100644
--- a/src/dungeon_pokemon_attributes_1.c
+++ b/src/dungeon_pokemon_attributes_1.c
@@ -7,7 +7,7 @@
extern bool8 IsIQSkillSet(u8 *, u32);
extern u8 HasItem(struct DungeonEntity *, u32);
-bool8 sub_8071884(struct DungeonEntity *pokemon)
+bool8 CanSeeInvisible(struct DungeonEntity *pokemon)
{
struct DungeonEntityData *pokemonData = pokemon->entityData;
if(pokemonData->eyesightStatus != EYESIGHT_STATUS_EYEDROPS)
diff --git a/src/dungeon_util.c b/src/dungeon_util.c
index 94cd327..f70148a 100644
--- a/src/dungeon_util.c
+++ b/src/dungeon_util.c
@@ -12,7 +12,7 @@ struct unk8049590
u8 unk8;
};
-extern struct unk8049590 *sub_8049590(s16, s16);
+extern struct unk8049590 *GetMapEntity(s16, s16);
bool8 EntityExists(struct DungeonEntity *entity)
{
@@ -60,5 +60,5 @@ struct MapTile *sub_8045114(struct DungeonEntity *entity)
struct unk8049590 *sub_8045128(struct DungeonEntity *entity)
{
- return sub_8049590(entity->posWorldX, entity->posWorldY);
+ return GetMapEntity(entity->posWorldX, entity->posWorldY);
}
diff --git a/src/friend_area_action_menu.c b/src/friend_area_action_menu.c
index 48ebb1a..7da7a59 100644
--- a/src/friend_area_action_menu.c
+++ b/src/friend_area_action_menu.c
@@ -234,13 +234,13 @@ void sub_8027274(void)
break;
case 6:
gUnknown_203B2BC->unk4 = 2;
- // The {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1} was
+ // The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was
// returned to the Toolbox
sub_80141B4(gUnknown_80DD8A0,0,0,0x101);
break;
case 7:
gUnknown_203B2BC->unk4 = 2;
- // The {COLOR_1 GREEN}$i0{END_COLOR_TEXT_1} was
+ // The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was
// returned to storage
sub_80141B4(gUnknown_80DD8D0,0,0,0x101);
break;
diff --git a/src/personality_test.c b/src/personality_test.c
index d129d8c..2a623b6 100644
--- a/src/personality_test.c
+++ b/src/personality_test.c
@@ -74,7 +74,7 @@ extern const char gRelaxedDescription[];
extern const char gLonelyDescription[];
extern const char gQuirkyDescription[];
-ALIGNED(4) const char gStarterReveal[] = _("\n{CENTER_ALIGN}The Pokémon $m0!");
+ALIGNED(4) const char gStarterReveal[] = _("\n{CENTER_ALIGN}The Pokémon {ARG_POKEMON_0}!");
const char * const gStarterRevealPtr = gStarterReveal;
ALIGNED(4) const char gPartnerPrompt[] = _(
@@ -84,17 +84,17 @@ ALIGNED(4) const char gPartnerPrompt[] = _(
"{CENTER_ALIGN}as your partner from this group.");
const char * const gPartnerPromptPtr = gPartnerPrompt;
-ALIGNED(4) const char gPartnerNickPrompt[] = _("{CENTER_ALIGN}What is your partner~27s nickname?");
+ALIGNED(4) const char gPartnerNickPrompt[] = _("{CENTER_ALIGN}What is your partner{APOSTROPHE}s nickname?");
const char * const gPartnerNickPromptPtr = gPartnerNickPrompt;
ALIGNED(4) const char gEndIntroText[] = _(
- "{CENTER_ALIGN}OK! We~27re all set!{EXTRA_MSG}"
- "{CENTER_ALIGN}Let~27s get you into the\n"
+ "{CENTER_ALIGN}OK! We{APOSTROPHE}re all set!{EXTRA_MSG}"
+ "{CENTER_ALIGN}Let{APOSTROPHE}s get you into the\n"
"{CENTER_ALIGN}world of Pokémon!{EXTRA_MSG}"
"{CENTER_ALIGN}Go for it!");
const char * const gEndIntroTextPtr = gEndIntroText;
-const char * const gPersonalityTypeDescriptionTable[NUM_PERSONALITIES] =
+const char * const gPersonalityTypeDescriptionTable[NUM_PERSONALITIES] =
{
[HARDY] = gHardyDescription,
[DOCILE] = gDocileDescription,
@@ -113,7 +113,7 @@ const char * const gPersonalityTypeDescriptionTable[NUM_PERSONALITIES] =
#include "data/nature_description.h"
-const struct UnkTextStruct2 gUnknown_80F4244 =
+const struct UnkTextStruct2 gUnknown_80F4244 =
{
0x00, 0x00, 0x00, 0x00,
0x05, 0x00, 0x00, 0x00,
@@ -125,7 +125,7 @@ const struct UnkTextStruct2 gUnknown_80F4244 =
const char filler[] = "pksdir0"; // CHUNSOFT inserted for aligning data
-const s16 gPartners[NUM_PARTNERS] =
+const s16 gPartners[NUM_PARTNERS] =
{
SPECIES_CHARMANDER,
SPECIES_BULBASAUR,
@@ -139,7 +139,7 @@ const s16 gPartners[NUM_PARTNERS] =
SPECIES_MUDKIP
};
-const struct UnkTextStruct2 gUnknown_80F4278 =
+const struct UnkTextStruct2 gUnknown_80F4278 =
{
0x00, 0x00, 0x00, 0x00,
0x03, 0x00, 0x00, 0x00,
@@ -149,7 +149,7 @@ const struct UnkTextStruct2 gUnknown_80F4278 =
NULL
};
-const struct UnkTextStruct2 gUnknown_80F4290 =
+const struct UnkTextStruct2 gUnknown_80F4290 =
{
0x00, 0x00, 0x00, 0x00,
0x06, 0x00, 0x00, 0x00,
@@ -159,7 +159,7 @@ const struct UnkTextStruct2 gUnknown_80F4290 =
NULL
};
-const struct UnkTextStruct2 gUnknown_80F42A8 =
+const struct UnkTextStruct2 gUnknown_80F42A8 =
{
0x00, 0x00, 0x00, 0x00,
0x05, 0x00, 0x00, 0x00,
@@ -324,7 +324,7 @@ void UpdateNatureTotals()
s32 answerIndex;
s32 natureIndex;
const u8 *pointArray;
-
+
if (!sub_80144A4(&answerIndex))
{
if (answerIndex == 99)
@@ -585,7 +585,7 @@ void PersonalityTest_DisplayStarterSprite(void)
sub_8008C54(1);
sub_80073B8(1);
faceFile = GetDialogueSpriteDataPtr(starterID);
- r6 = ((struct FaceData *)(faceFile->data))->unk0[1 + EMOTION_HAPPY];
+ r6 = ((struct FaceData *)(faceFile->data))->unk0[1 + EMOTION_HAPPY];
faceIndex = EMOTION_HAPPY;
for(palleteIndex = 0; palleteIndex < 16; palleteIndex++){
SetBGPaletteBufferColorArray(palleteIndex + 224, &((struct FaceData *)(faceFile->data))->unk0[faceIndex][palleteIndex << 2]);
@@ -696,10 +696,10 @@ void RedrawPartnerSelectionMenu(void)
u32 yCoord;
const char *monName;
s32 monCounter;
-
+
sVar1 = sub_80095E4(gUnknown_203B404->unk32, 0xc);
- // Have a feeling this is some graphical thing but
+ // Have a feeling this is some graphical thing but
// still not sure structure so it's not matching yet bc of that
// and some casting stuff
sVar1 += 2;
@@ -855,7 +855,7 @@ s32 GetValidPartners(void)
s32 counter;
s32 ValidPartnerCounter;
s32 CurrentPartnerID;
-
+
ValidPartnerCounter = 0;
PlayerType[0] = GetPokemonType(gUnknown_203B404->StarterID, 0);
PlayerType[1] = GetPokemonType(gUnknown_203B404->StarterID, 1);
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index beaa4a3..427e0ed 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -27,7 +27,7 @@ struct unkStruct_808E9EC
};
extern u32 gUnknown_81076C4[];
-struct unkStruct_202F3E8
+struct unkStruct_202F3E8
{
u16 unk0;
u16 unk2;
@@ -64,7 +64,7 @@ extern void sub_809447C(struct unkStruct_8094924*, void*);
extern void sub_808F428(struct unkStruct_8094924*, struct unkStruct_808E6F4*);
-bool8 sub_808E668(s16 a1, s16* a2, s16* a3)
+bool8 sub_808E668(s16 a1, s16* a2, s16* a3)
{
u32 shifted = a1 << 16;
@@ -92,7 +92,7 @@ bool8 sub_808E668(s16 a1, s16* a2, s16* a3)
void sub_808E6F4(struct unkStruct_808E6F4* a1)
{
- s32 i;
+ s32 i;
a1->unk0 = gUnknown_810AC90[RandomCapped(10)];
for (i = 0; i < 100; i++) {
@@ -108,7 +108,7 @@ bool8 HasRecruitedMon(s16 species_) {
s32 species = species_;
s32 i = 0;
struct PokemonStruct *pokemon = gRecruitedPokemonRef->pokemon;
-
+
for (i = 0; i < NUM_SPECIES; i++) {
if (((u8)pokemon->unk0 & 1)) {
if(pokemon->speciesNum == species)
@@ -188,7 +188,7 @@ s32 GetBaseSpecies(s16 index) {
return SPECIES_DEOXYS_NORMAL;
if (index == SPECIES_RAYQUAZA_CUTSCENE)
return SPECIES_RAYQUAZA;
-
+
return index;
}
@@ -278,7 +278,7 @@ s32 GetUnownIndex(s16 index)
return 0;
}
-u32 sub_808E9B8(struct PokemonStruct *r0)
+u32 ExtractSpeciesIndex(struct PokemonStruct *r0)
{
return r0->unk0 & 0x000001ff;
}
@@ -295,7 +295,7 @@ void sub_808E9D8(struct PokemonStruct *r0, s32 r1, s16 r2)
r0->unk0 = r2_32 | (r1 << 9) ;
}
-u32 sub_808E9E4(struct PokemonStruct *r0)
+u32 ExtractLevel(struct PokemonStruct *r0)
{
return (r0->unk0 >> 9);
}
@@ -481,7 +481,7 @@ u32 GetTacticsDescription(u8 r0)
return gTacticsDescriptions[r0];
}
-u8 sub_808EAFC(u8 r0)
+u8 TacticsTargetLeader(u8 r0)
{
return gUnknown_810A36B[r0];
}
@@ -620,9 +620,9 @@ void SetDefaultIQSkills(u8 *param_1, bool8 enableSelfCurer)
bool8 IsIQSkillSet(u8 *param_1, u32 param_2)
{
- if ((((param_1[0] & param_2) == 0) &&
+ if ((((param_1[0] & param_2) == 0) &&
((param_1[1] & param_2 >> 8) == 0)) &&
- ((param_1[2] & param_2 >> 0x10) == 0))
+ ((param_1[2] & param_2 >> 0x10) == 0))
{
return FALSE;
}
@@ -652,7 +652,7 @@ void sub_808ED00() {
}
}
-s32 SaveRecruitedPokemon(u8 *a1, s32 a2)
+s32 SaveRecruitedPokemon(u8 *a1, s32 a2)
{
u16 buffer[6];
struct unkStruct_8094924 backup;
@@ -689,7 +689,7 @@ s32 SaveRecruitedPokemon(u8 *a1, s32 a2)
}
else {
pokemon->unkHasNextStage = 0;
- }
+ }
SavePokemonStruct(&backup, pokemon);
}
@@ -699,7 +699,7 @@ s32 SaveRecruitedPokemon(u8 *a1, s32 a2)
}
else {
data_u8 = 0;
- }
+ }
SaveIntegerBits(&backup, &data_u8, 1);
SavePokemonStruct(&backup, &gRecruitedPokemonRef->team[i]);
}
@@ -712,7 +712,7 @@ s32 SaveRecruitedPokemon(u8 *a1, s32 a2)
return backup.unk8;
}
-s32 RestoreRecruitedPokemon(u8 *a1, s32 a2)
+s32 RestoreRecruitedPokemon(u8 *a1, s32 a2)
{
struct unkStruct_8094924 backup;
u8 data_u8; // same as saverecruitedpokemon
@@ -749,7 +749,7 @@ s32 RestoreRecruitedPokemon(u8 *a1, s32 a2)
return backup.unk8;
}
-void SavePokemonStruct(struct unkStruct_8094924* a1, struct PokemonStruct* pokemon)
+void SavePokemonStruct(struct unkStruct_8094924* a1, struct PokemonStruct* pokemon)
{
SaveIntegerBits(a1, &pokemon->unkHasNextStage, 7);
SaveIntegerBits(a1, &pokemon->speciesNum, 9);
@@ -770,7 +770,7 @@ void SavePokemonStruct(struct unkStruct_8094924* a1, struct PokemonStruct* pokem
SaveIntegerBits(a1, pokemon->name, 80);
}
-void RestorePokemonStruct(struct unkStruct_8094924* a1, struct PokemonStruct* pokemon)
+void RestorePokemonStruct(struct unkStruct_8094924* a1, struct PokemonStruct* pokemon)
{
memset(pokemon, 0, sizeof(struct PokemonStruct));
pokemon->unk0 = 0;
@@ -797,7 +797,7 @@ void RestorePokemonStruct(struct unkStruct_8094924* a1, struct PokemonStruct* po
RestoreIntegerBits(a1, pokemon->name, 80);
}
-s32 SavePokemonStruct2(u8* a1, s32 size)
+s32 SavePokemonStruct2(u8* a1, s32 size)
{
struct unkStruct_8094924 backup;
s32 i;
@@ -809,13 +809,13 @@ s32 SavePokemonStruct2(u8* a1, s32 size)
data_u8_zero = 0;
for (i = 0; i < 4; i++) {
- struct PokemonStruct2* pokemon2 = &gRecruitedPokemonRef->pokemon2[i];
+ struct PokemonStruct2* pokemon2 = &gRecruitedPokemonRef->pokemon2[i];
SaveIntegerBits(&backup, &pokemon2->unk0, 2);
SaveIntegerBits(&backup, pokemon2->unk2 ? &data_u8_neg1 : &data_u8_zero, 1);
SaveIntegerBits(&backup, &pokemon2->unkHasNextStage, 7);
- xxx_save_poke_sub_4_80902F4(&backup, &pokemon2->unk4);
+ xxx_save_poke_sub_4_80902F4(&backup, &pokemon2->unk4);
SaveIntegerBits(&backup, &pokemon2->IQ, 10);
SaveIntegerBits(&backup, &pokemon2->unkA, 16);
SaveIntegerBits(&backup, &pokemon2->unkC, 16);
@@ -840,18 +840,18 @@ s32 SavePokemonStruct2(u8* a1, s32 size)
return backup.unk8;
}
-s32 RestorePokemonStruct2(u8* a1, s32 size)
+s32 RestorePokemonStruct2(u8* a1, s32 size)
{
struct unkStruct_8094924 backup;
- s32 i;
-
+ s32 i;
+
xxx_init_struct_8094924_restore_809485C(&backup, a1, size);
for (i = 0; i < 4; i++) {
- struct PokemonStruct2* pokemon2 = &gRecruitedPokemonRef->pokemon2[i];
+ struct PokemonStruct2* pokemon2 = &gRecruitedPokemonRef->pokemon2[i];
u8 unk2;
memset(pokemon2, 0, sizeof(struct PokemonStruct2));
-
+
RestoreIntegerBits(&backup, &pokemon2->unk0, 2);
RestoreIntegerBits(&backup, &unk2, 1);
@@ -863,7 +863,7 @@ s32 RestorePokemonStruct2(u8* a1, s32 size)
}
RestoreIntegerBits(&backup, &pokemon2->unkHasNextStage, 7);
- xxx_restore_poke_sub_4_8090314(&backup, &pokemon2->unk4);
+ xxx_restore_poke_sub_4_8090314(&backup, &pokemon2->unk4);
RestoreIntegerBits(&backup, &pokemon2->IQ, 10);
RestoreIntegerBits(&backup, &pokemon2->unkA, 16);
RestoreIntegerBits(&backup, &pokemon2->unkC, 16);
diff --git a/src/post_office_guide.c b/src/post_office_guide.c
index 388955c..63470f5 100644
--- a/src/post_office_guide.c
+++ b/src/post_office_guide.c
@@ -314,16 +314,16 @@ void UpdateHelperPelipperText(void)
switch(gPostOfficeHelper->currMenuChoice)
{
case GETTING_HELP:
- sub_80141B4(gGettingHelpExplaination, 0, faceFile, 0x10d);
+ sub_80141B4(gGettingHelpExplanation, 0, faceFile, 0x10d);
break;
case SEND_SOS_MAIL:
- sub_80141B4(gSendSOSMailExplaination, 0, faceFile, 0x10d);
+ sub_80141B4(gSendSOSMailExplanation, 0, faceFile, 0x10d);
break;
case RECEIVE_AOK_MAIL:
- sub_80141B4(gReceiveAOKMailExplaination, 0, faceFile, 0x10d);
+ sub_80141B4(gReceiveAOKMailExplanation, 0, faceFile, 0x10d);
break;
case SEND_THANK_YOU_MAIL:
- sub_80141B4(gSendThankYouMailExplaination, 0, faceFile, 0x10d);
+ sub_80141B4(gSendThankYouMailExplanation, 0, faceFile, 0x10d);
break;
default:
break;
@@ -336,19 +336,19 @@ void UpdateHelperPelipperText(void)
switch(gPostOfficeHelper->currMenuChoice)
{
case RESCUE_PROCEDURES:
- sub_80141B4(gRescueProceduresExplaination, 0, faceFile, 0x10d);
+ sub_80141B4(gRescueProceduresExplanation, 0, faceFile, 0x10d);
break;
case RECEIVE_SOS_MAIL:
- sub_80141B4(gReceiveSOSMailExplaination, 0, faceFile, 0x10d);
+ sub_80141B4(gReceiveSOSMailExplanation, 0, faceFile, 0x10d);
break;
case SEND_AOK_MAIL:
- sub_80141B4(gSendAOKMailExplaination, 0, faceFile, 0x10d);
+ sub_80141B4(gSendAOKMailExplanation, 0, faceFile, 0x10d);
break;
case LEAVE_FOR_RESCUE:
- sub_80141B4(gLeaveForRescueExplaination, 0, faceFile, 0x10d);
+ sub_80141B4(gLeaveForRescueExplanation, 0, faceFile, 0x10d);
break;
case GET_THANK_YOU_MAIL:
- sub_80141B4(gGetThankYouMailExplaination, 0, faceFile, 0x10d);
+ sub_80141B4(gGetThankYouMailExplanation, 0, faceFile, 0x10d);
break;
default:
break;
@@ -364,13 +364,13 @@ void UpdateHelperPelipperText(void)
switch(gPostOfficeHelper->currMenuChoice)
{
case POST_OFFICE:
- sub_80141B4(gPostOfficeExplaination, 0, faceFile, 0x10d);
+ sub_80141B4(gPostOfficeExplanation, 0, faceFile, 0x10d);
break;
case BULLETIN_BOARD:
- sub_80141B4(gBulletinBoardExplaination, 0, faceFile, 0x10d);
+ sub_80141B4(gBulletinBoardExplanation, 0, faceFile, 0x10d);
break;
case DELIVERY:
- sub_80141B4(gDeliveryExplaination, 0, faceFile, 0x10d);
+ sub_80141B4(gDeliveryExplanation, 0, faceFile, 0x10d);
break;
default:
break;
@@ -383,10 +383,10 @@ void UpdateHelperPelipperText(void)
switch(gPostOfficeHelper->currMenuChoice)
{
case FRIEND_RESCUE_INFO:
- sub_80141B4(gFriendRescueExplaination, 0, faceFile, 0x10d);
+ sub_80141B4(gFriendRescueExplanation, 0, faceFile, 0x10d);
break;
case DELETING_MAIL:
- sub_80141B4(gDeletingMailExplaination, 0, faceFile, 0x10d);
+ sub_80141B4(gDeletingMailExplanation, 0, faceFile, 0x10d);
break;
default:
break;
diff --git a/src/save.c b/src/save.c
index f4ba192..835c111 100644
--- a/src/save.c
+++ b/src/save.c
@@ -95,7 +95,7 @@ ALIGNED(4) const char gSaveCorrupted[] = _("{CENTER_ALIGN}The game data is corru
ALIGNED(4) const char fill_save4[] = _("pksdir0");
ALIGNED(4) const char gSavingAdventure[] = _("{CENTER_ALIGN}Saving your adventure...\n"
- "{CENTER_ALIGN}Please don~27t turn off the power.");
+ "{CENTER_ALIGN}Please don{APOSTROPHE}t turn off the power.");
ALIGNED(4) const char gWriteGamePak[] = _("{CENTER_ALIGN}Writing to GBA Game Pak.\n"
"{CENTER_ALIGN}Do not remove the GBA Game Pak.\n"
@@ -111,27 +111,27 @@ ALIGNED(4) const char gSaveFailed[] = _("{CENTER_ALIGN}Save failed.");
ALIGNED(4) const char fill_save5[] = _("pksdir0");
-ALIGNED(4) const char gUnknown_80D44C8[] = _("{CENTER_ALIGN}Your data was not properly saved~2c\n"
+ALIGNED(4) const char gUnknown_80D44C8[] = _("{CENTER_ALIGN}Your data was not properly saved{COMMA}\n"
"{CENTER_ALIGN}so your game cannot be resumed\n"
"{CENTER_ALIGN}from your last spot.{EXTRA_MSG}"
"{CENTER_ALIGN}Your last outing is considered a defeat.\n"
- "{CENTER_ALIGN}Before shutting down~2c save in your\n"
- "{CENTER_ALIGN}team base~2c or quicksave in a dungeon.");
+ "{CENTER_ALIGN}Before shutting down{COMMA} save in your\n"
+ "{CENTER_ALIGN}team base{COMMA} or quicksave in a dungeon.");
ALIGNED(4) const char fill_save6[] = _("pksdir0");
ALIGNED(4) const char gUnknown_80D45AC[] = _("{CENTER_ALIGN}Quicksaving your adventure...\n"
- "{CENTER_ALIGN}Please don~27t turn off the power.");
+ "{CENTER_ALIGN}Please don{APOSTROPHE}t turn off the power.");
ALIGNED(4) const char gUnknown_80D45F4[] = _("{CENTER_ALIGN}Your adventure has been saved.\n"
- "{CENTER_ALIGN}When you are in a dungeon~2c quicksave\n"
+ "{CENTER_ALIGN}When you are in a dungeon{COMMA} quicksave\n"
"{CENTER_ALIGN}your progress before ending the game.");
ALIGNED(4) const char gUnknown_80D4668[] = _("{CENTER_ALIGN}Your adventure has been saved.\n"
- "{CENTER_ALIGN}When you resume play~2c the quicksave\n"
+ "{CENTER_ALIGN}When you resume play{COMMA} the quicksave\n"
"{CENTER_ALIGN}data will be deleted.{EXTRA_MSG}"
- "{CENTER_ALIGN}When you are shutting down the game~2c\n"
- "{CENTER_ALIGN}save your progress in your team base~2c\n"
+ "{CENTER_ALIGN}When you are shutting down the game{COMMA}\n"
+ "{CENTER_ALIGN}save your progress in your team base{COMMA}\n"
"{CENTER_ALIGN}or quicksave in a dungeon.");
ALIGNED(4) const char gSaveNotWritten2[] = _("{CENTER_ALIGN}The data could not be written.\n"
@@ -458,7 +458,7 @@ u32 WriteSavetoPak(s32 *param_1,u32 param_2)
int r5;
int r4;
u8 *array_ptr;
-
+
iVar1 = MemoryAlloc(sizeof(struct UnkStruct_sub_8011DAC),5);
array_ptr = iVar1->unk448;
if (gUnknown_203B184 == NULL) {
@@ -720,7 +720,7 @@ void PrepareSavePakWrite(s16 PokemonID)
u8 *preload_face;
id_s32 = PokemonID; // had to cast for asr shift
-
+
sub_80993D8();
gSavePakWrite = MemoryAlloc(sizeof(struct SavePakWrite),5);
gSavePakWrite->pokeID = id_s32;
@@ -737,7 +737,7 @@ void PrepareSavePakWrite(s16 PokemonID)
gSavePakWrite->unk16 = 8;
}
if (gSavePakWrite->faceFile != 0) {
- preload_face = (u8 *)&gSavePakWrite->faceFile;
+ preload_face = (u8 *)&gSavePakWrite->faceFile;
sub_80141B4(gSavingAdventure,0,preload_face,0x20);
}
else {
@@ -751,12 +751,12 @@ bool8 WriteSavePak(void)
struct OpenedFile **faceFile;
u32 local_14;
u32 other_stack;
-
+
faceFile = NULL;
if (gSavePakWrite->faceFile != 0) {
faceFile = &gSavePakWrite->faceFile;
}
- switch(gSavePakWrite->state)
+ switch(gSavePakWrite->state)
{
case 0:
gSavePakWrite->state = 7;
diff --git a/src/thank_you_wonder_mail.c b/src/thank_you_wonder_mail.c
index 078fc50..3f105c5 100644
--- a/src/thank_you_wonder_mail.c
+++ b/src/thank_you_wonder_mail.c
@@ -154,7 +154,7 @@ const struct MenuItem gUnknown_80DEE7C[4] =
{NULL, 0x0},
};
-ALIGNED(4) const u8 DontSendItem_Text[] = "Don~27t Send Item";
+ALIGNED(4) const u8 DontSendItem_Text[] = _("Don{APOSTROPHE}t Send Item");
ALIGNED(4) const u8 SendItem_Text[] = "Send Item";
const struct MenuItem gUnknown_80DEEBC[3] =
@@ -174,8 +174,8 @@ const struct MenuItem gUnknown_80DEEE4[4] =
{NULL, 0x0},
};
-ALIGNED(4) const char gUnknown_80DEF04[] = " ...Oh?\n"
- "Something~27s gone wrong.";
+ALIGNED(4) const char gUnknown_80DEF04[] = _(" ...Oh?\n"
+ "Something{APOSTROPHE}s gone wrong.");
ALIGNED(4) const char gUnknown_80DEF28[] = " ...Oh? The number of linked\n"
"GBA systems is incorrect.\n"
@@ -191,25 +191,25 @@ ALIGNED(4) const u8 gUnknown_80DEFDC[]=
"storage space is full. Please clear some\n"
"space and try again from the start.";
-ALIGNED(4) const u8 gUnknown_80DF044[]=
+ALIGNED(4) const u8 gUnknown_80DF044[]= _(
" ...Oh?\n"
- "I think you~27ve received this mail before.\n"
- "You can~27t get the same mail twice.";
+ "I think you{APOSTROPHE}ve received this mail before.\n"
+ "You can{APOSTROPHE}t get the same mail twice.");
-ALIGNED(4) const u8 gUnknown_80DF0A0[]=
+ALIGNED(4) const u8 gUnknown_80DF0A0[]= _(
" ...Oh?\n"
- "I don~27t think you~27re eligible to receive\n"
- "this mail.";
+ "I don{APOSTROPHE}t think you{APOSTROPHE}re eligible to receive\n"
+ "this mail.");
ALIGNED(4) const u8 gUnknown_80DF0E0[]=
" ...Oh?\n"
"There is no room to receive new mail.\n"
"Please delete some mail and try again.";
-ALIGNED(4) const u8 gUnknown_80DF138[]=
- " ...Oh? Your friend didn~27t\n"
+ALIGNED(4) const u8 gUnknown_80DF138[]= _(
+ " ...Oh? Your friend didn{APOSTROPHE}t\n"
"follow through on their side.\n"
- "Please try again from the start.";
+ "Please try again from the start.");
ALIGNED(4) const u8 gUnknown_80DF194[]= _(
" Your {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}\n"
@@ -221,14 +221,14 @@ ALIGNED(4) const u8 gUnknown_80DF1C0[]=
"Would you like to try again?";
ALIGNED(4) const u8 gUnknown_80DF208[]= _(
- " ...Oh? This password doesn~27t\n"
+ " ...Oh? This password doesn{APOSTROPHE}t\n"
"appear to be for a {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}.");
ALIGNED(4) const u8 gUnknown_80DF250[]= _(
": This is the counter for\n"
"{COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}.#P"
- ": Oh~2c hi~2c #CN%s{END_COLOR_TEXT_1}.\n"
- "I~27ve been waiting for you. You wanted me\n"
+ ": Oh{COMMA} hi{COMMA} {COLOR_1 YELLOW_5}%s{END_COLOR_TEXT_1}.\n"
+ "I{APOSTROPHE}ve been waiting for you. You wanted me\n"
"to process a {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}?#P"
": Let me get on it right away.");
@@ -252,19 +252,19 @@ ALIGNED(4) const u8 gUnknown_80DF3B4[]=
"adventure.";
ALIGNED(4) const u8 gUnknown_80DF418[]= _(
- " OK~2c here is your\n"
+ " OK{COMMA} here is your\n"
"{COLOR_1 LIGHT_BLUE_2}Thank-You Mail password{END_COLOR_TEXT_1}.");
ALIGNED(4) const u8 gUnknown_80DF44C[]=
" I need to save your\n"
"adventure.";
-ALIGNED(4) const u8 gUnknown_80DF46C[]=
+ALIGNED(4) const u8 gUnknown_80DF46C[]= _(
" There we go.\n"
- "I~27m all done.#P"
- " Doesn~27t it feel great to\n"
+ "I{APOSTROPHE}m all done.#P"
+ " Doesn{APOSTROPHE}t it feel great to\n"
"be appreciated for doing something good?\n"
- "Please keep up your rescue work!";
+ "Please keep up your rescue work!");
ALIGNED(4) const u8 gUnknown_80DF4F4[]= _(
" A {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1} has\n"
@@ -274,10 +274,10 @@ ALIGNED(4) const u8 gUnknown_80DF4F4[]= _(
ALIGNED(4) const u8 gUnknown_80DF544[]= _(
"#+Communicating...\n"
"#+Please wait with the power on.\n"
- "#+To cancel~2c press {B_BUTTON}.");
+ "#+To cancel{COMMA} press {B_BUTTON}.");
ALIGNED(4) const u8 gUnknown_80DF594[]= _(
- " There. I~27ve sent your\n"
+ " There. I{APOSTROPHE}ve sent your\n"
"{COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}.\n"
"I need to save your adventure.");
@@ -287,21 +287,21 @@ ALIGNED(4) const u8 gUnknown_80DF5E4[]= _(
"Is your friend also ready?");
ALIGNED(4) const u8 gUnknown_80DF63C[]= _(
- " There~2c all done.\n"
- "#CN%s{END_COLOR_TEXT_1}~2c I hope your friend\n"
+ " There{COMMA} all done.\n"
+ "{COLOR_1 YELLOW_5}%s{END_COLOR_TEXT_1}{COMMA} I hope your friend\n"
"appreciates your sense of gratitude.");
-ALIGNED(4) const u8 gUnknown_80DF694[]=
- " The item you~27ve chosen\n"
- "here can~27t be exchanged later.\n"
- "Are you certain this item is OK?";
+ALIGNED(4) const u8 gUnknown_80DF694[]= _(
+ " The item you{APOSTROPHE}ve chosen\n"
+ "here can{APOSTROPHE}t be exchanged later.\n"
+ "Are you certain this item is OK?");
-ALIGNED(4) const u8 gUnknown_80DF6F0[]=
- " I~27ve saved your adventure. ";
+ALIGNED(4) const u8 gUnknown_80DF6F0[]= _(
+ " I{APOSTROPHE}ve saved your adventure. ");
-ALIGNED(4) const u8 gUnknown_80DF710[]=
- " OK~2c please choose\n"
- "the item to be sent.";
+ALIGNED(4) const u8 gUnknown_80DF710[]= _(
+ " OK{COMMA} please choose\n"
+ "the item to be sent.");
ALIGNED(4) const u8 gUnknown_80DF73C[]=
" ...Oh?\n"
@@ -315,10 +315,10 @@ ALIGNED(4) const u8 gUnknown_80DF77C[]= _(
ALIGNED(4) const u8 gUnknown_80DF7D4[]= _(
" ...Oh?\n"
- "You~27ve already attached a {COLOR_1 LIGHT_BLUE_2}reward item{END_COLOR_TEXT_1}\n"
+ "You{APOSTROPHE}ve already attached a {COLOR_1 LIGHT_BLUE_2}reward item{END_COLOR_TEXT_1}\n"
"to this mail.#P"
- " I~27m sorry~2c but once an item\n"
- "has been attached to mail~2c it can~27t be\n"
+ " I{APOSTROPHE}m sorry{COMMA} but once an item\n"
+ "has been attached to mail{COMMA} it can{APOSTROPHE}t be\n"
"exchanged.");
ALIGNED(4) const u8 gUnknown_80DF870[]=
@@ -327,7 +327,7 @@ ALIGNED(4) const u8 gUnknown_80DF870[]=
ALIGNED(4) const u8 gUnknown_80DF8B4[]= _(
" ...Oh?\n"
- "You don~27t seem to have a {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}.");
+ "You don{APOSTROPHE}t seem to have a {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}.");
ALIGNED(4) const u8 gUnknown_80DF8EC[]= _(
" Hello.\n"
@@ -348,7 +348,7 @@ ALIGNED(4) const u8 gUnknown_80DF96C[] = _(
ALIGNED(4) const u8 gUnknown_80DF9A4[]= _(
" How would you like to\n"
- "receive your friend~27s {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}?");
+ "receive your friend{APOSTROPHE}s {COLOR_1 LIGHT_BLUE_2}Thank-You Mail{END_COLOR_TEXT_1}?");
ALIGNED(4) const u8 thank_you_fill[] = "pksdir0";
diff --git a/src/wonder_mail_2.c b/src/wonder_mail_2.c
index 8a9c0ed..34feee1 100644
--- a/src/wonder_mail_2.c
+++ b/src/wonder_mail_2.c
@@ -163,23 +163,23 @@ ALIGNED(4) const char gUnknown_80DF9F0[] = "????";
// NOTE: had to be pre-proc'd to match
ALIGNED(4) const char gUnknown_80DF9F8[] = _(
- " Oh~2c hello!\n"
- "Your rescue mission went well~2c didn~27t it?\n"
- "I wouldn~27t expect any less~2c {COLOR_1 LIGHT_BLUE_2}%s{END_COLOR_TEXT_1}!#P"
- " Well~2c well!\n"
+ " Oh{COMMA} hello!\n"
+ "Your rescue mission went well{COMMA} didn{APOSTROPHE}t it?\n"
+ "I wouldn{APOSTROPHE}t expect any less{COMMA} {COLOR_1 LIGHT_BLUE_2}%s{END_COLOR_TEXT_1}!#P"
+ " Well{COMMA} well!\n"
"Here is your reward from the Pokémon\n"
"Rescue Organization!");
-ALIGNED(4) const char gUnknown_80DFAA8[] =
+ALIGNED(4) const char gUnknown_80DFAA8[] = _(
" I hope you will keep on\n"
"rescuing your friends in\n"
"dire straits.#P"
- " And now~2c I must save\n"
- "your adventure.";
+ " And now{COMMA} I must save\n"
+ "your adventure.");
ALIGNED(4) const char gUnknown_80DFB14[] = _(
- " Oh~2c yes~2c that~27s right.\n"
- "Please don~27t forget to send an {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}\n"
+ " Oh{COMMA} yes{COMMA} that{APOSTROPHE}s right.\n"
+ "Please don{APOSTROPHE}t forget to send an {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}\n"
"to the friend you just rescued.#P"
" Please give me a shout if\n"
"you would like to send {COLOR_1 LIGHT_BLUE_2}A-OK Mail{END_COLOR_TEXT_1}.");
diff --git a/src/wonder_mail_main_menu.c b/src/wonder_mail_main_menu.c
index 340e804..9566614 100644
--- a/src/wonder_mail_main_menu.c
+++ b/src/wonder_mail_main_menu.c
@@ -88,9 +88,9 @@ ALIGNED(4) const char gUnknown_80E79E4[] = "The sender and receiver appear to be
"in different modes.\n"
"Please redo the process from the start.";
-ALIGNED(4) const char gUnknown_80E7A48[] = "There is no response from your friend.\n"
- "Please make sure the sender and receiver\n"
- "are ready~2c then redo this from the start.";
+ALIGNED(4) const char gUnknown_80E7A48[] = _("There is no response from your friend.\n"
+ "Please make sure the sender and receiver\n"
+ "are ready{COMMA} then redo this from the start.");
ALIGNED(4) const char gUnknown_80E7AC4[] = "What would you like to do?";
@@ -110,12 +110,12 @@ ALIGNED(4) const char gUnknown_80E7B88[] = _("The received {COLOR_1 LIGHT_BLUE_2
ALIGNED(4) const char gUnknown_80E7BC8[] = _("The {COLOR_1 LIGHT_BLUE_2}Wonder Mail{END_COLOR_TEXT_1} was refused.");
ALIGNED(4) const char gUnknown_80E7BEC[] = _("Connect a {COLOR_1 LIGHT_BLUE_2}Game Link cable{END_COLOR_TEXT_1}.\n"
- "When you and your friend are ready~2c\n"
+ "When you and your friend are ready{COMMA}\n"
"you may communicate. ");
ALIGNED(4) const char gUnknown_80E7C48[] = _("#+In communication...\n"
"#+Please wait with the power on.\n"
- "#+To cancel~2c press {B_BUTTON}.");
+ "#+To cancel{COMMA} press {B_BUTTON}.");
ALIGNED(4) const char gUnknown_80E7C98[] = _("Please enter the\n"
"{COLOR_1 LIGHT_BLUE_2}Wonder Mail password{END_COLOR_TEXT_1}.");
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 11:12:04 +0000