summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/data/items.h24
-rw-r--r--src/evolution_scene.c3
-rw-r--r--src/international_string_util.c8
-rw-r--r--src/mail.c641
-rw-r--r--src/mail_data.c22
-rw-r--r--src/menu_specialized.c6
-rw-r--r--src/mevent_801BAAC.c4
-rw-r--r--src/mystery_event_script.c8
-rwxr-xr-xsrc/party_menu.c2
-rw-r--r--src/player_pc.c16
-rw-r--r--src/pokemon_icon.c6
-rw-r--r--src/trade.c4
12 files changed, 476 insertions, 268 deletions
diff --git a/src/data/items.h b/src/data/items.h
index 443c45f1a..e4e7e0fbc 100644
--- a/src/data/items.h
+++ b/src/data/items.h
@@ -1479,7 +1479,7 @@ const struct Item gItems[] =
.pocket = POCKET_ITEMS,
.type = ITEM_USE_MAIL,
.fieldUseFunc = ItemUseOutOfBattle_Mail,
- .secondaryId = ITEM_ORANGE_MAIL - FIRST_MAIL_INDEX,
+ .secondaryId = ITEM_TO_MAIL(ITEM_ORANGE_MAIL),
},
[ITEM_HARBOR_MAIL] =
@@ -1491,7 +1491,7 @@ const struct Item gItems[] =
.pocket = POCKET_ITEMS,
.type = ITEM_USE_MAIL,
.fieldUseFunc = ItemUseOutOfBattle_Mail,
- .secondaryId = ITEM_HARBOR_MAIL - FIRST_MAIL_INDEX,
+ .secondaryId = ITEM_TO_MAIL(ITEM_HARBOR_MAIL),
},
[ITEM_GLITTER_MAIL] =
@@ -1503,7 +1503,7 @@ const struct Item gItems[] =
.pocket = POCKET_ITEMS,
.type = ITEM_USE_MAIL,
.fieldUseFunc = ItemUseOutOfBattle_Mail,
- .secondaryId = ITEM_GLITTER_MAIL - FIRST_MAIL_INDEX,
+ .secondaryId = ITEM_TO_MAIL(ITEM_GLITTER_MAIL),
},
[ITEM_MECH_MAIL] =
@@ -1515,7 +1515,7 @@ const struct Item gItems[] =
.pocket = POCKET_ITEMS,
.type = ITEM_USE_MAIL,
.fieldUseFunc = ItemUseOutOfBattle_Mail,
- .secondaryId = ITEM_MECH_MAIL - FIRST_MAIL_INDEX,
+ .secondaryId = ITEM_TO_MAIL(ITEM_MECH_MAIL),
},
[ITEM_WOOD_MAIL] =
@@ -1527,7 +1527,7 @@ const struct Item gItems[] =
.pocket = POCKET_ITEMS,
.type = ITEM_USE_MAIL,
.fieldUseFunc = ItemUseOutOfBattle_Mail,
- .secondaryId = ITEM_WOOD_MAIL - FIRST_MAIL_INDEX,
+ .secondaryId = ITEM_TO_MAIL(ITEM_WOOD_MAIL),
},
[ITEM_WAVE_MAIL] =
@@ -1539,7 +1539,7 @@ const struct Item gItems[] =
.pocket = POCKET_ITEMS,
.type = ITEM_USE_MAIL,
.fieldUseFunc = ItemUseOutOfBattle_Mail,
- .secondaryId = ITEM_WAVE_MAIL - FIRST_MAIL_INDEX,
+ .secondaryId = ITEM_TO_MAIL(ITEM_WAVE_MAIL),
},
[ITEM_BEAD_MAIL] =
@@ -1551,7 +1551,7 @@ const struct Item gItems[] =
.pocket = POCKET_ITEMS,
.type = ITEM_USE_MAIL,
.fieldUseFunc = ItemUseOutOfBattle_Mail,
- .secondaryId = ITEM_BEAD_MAIL - FIRST_MAIL_INDEX,
+ .secondaryId = ITEM_TO_MAIL(ITEM_BEAD_MAIL),
},
[ITEM_SHADOW_MAIL] =
@@ -1563,7 +1563,7 @@ const struct Item gItems[] =
.pocket = POCKET_ITEMS,
.type = ITEM_USE_MAIL,
.fieldUseFunc = ItemUseOutOfBattle_Mail,
- .secondaryId = ITEM_SHADOW_MAIL - FIRST_MAIL_INDEX,
+ .secondaryId = ITEM_TO_MAIL(ITEM_SHADOW_MAIL),
},
[ITEM_TROPIC_MAIL] =
@@ -1575,7 +1575,7 @@ const struct Item gItems[] =
.pocket = POCKET_ITEMS,
.type = ITEM_USE_MAIL,
.fieldUseFunc = ItemUseOutOfBattle_Mail,
- .secondaryId = ITEM_TROPIC_MAIL - FIRST_MAIL_INDEX,
+ .secondaryId = ITEM_TO_MAIL(ITEM_TROPIC_MAIL),
},
[ITEM_DREAM_MAIL] =
@@ -1587,7 +1587,7 @@ const struct Item gItems[] =
.pocket = POCKET_ITEMS,
.type = ITEM_USE_MAIL,
.fieldUseFunc = ItemUseOutOfBattle_Mail,
- .secondaryId = ITEM_DREAM_MAIL - FIRST_MAIL_INDEX,
+ .secondaryId = ITEM_TO_MAIL(ITEM_DREAM_MAIL),
},
[ITEM_FAB_MAIL] =
@@ -1599,7 +1599,7 @@ const struct Item gItems[] =
.pocket = POCKET_ITEMS,
.type = ITEM_USE_MAIL,
.fieldUseFunc = ItemUseOutOfBattle_Mail,
- .secondaryId = ITEM_FAB_MAIL - FIRST_MAIL_INDEX,
+ .secondaryId = ITEM_TO_MAIL(ITEM_FAB_MAIL),
},
[ITEM_RETRO_MAIL] =
@@ -1611,7 +1611,7 @@ const struct Item gItems[] =
.pocket = POCKET_ITEMS,
.type = ITEM_USE_MAIL,
.fieldUseFunc = ItemUseOutOfBattle_Mail,
- .secondaryId = ITEM_RETRO_MAIL - FIRST_MAIL_INDEX,
+ .secondaryId = ITEM_TO_MAIL(ITEM_RETRO_MAIL),
},
// Berries
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index f77c3d760..88f46d295 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -32,6 +32,7 @@
#include "constants/battle_string_ids.h"
#include "constants/songs.h"
#include "constants/rgb.h"
+#include "constants/items.h"
struct EvoInfo
{
@@ -565,7 +566,7 @@ static void CreateShedinja(u16 preEvoSpecies, struct Pokemon* mon)
SetMonData(&gPlayerParty[gPlayerPartyCount], i, &data);
SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_STATUS, &data);
- data = 0xFF;
+ data = MAIL_NONE;
SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_MAIL, &data);
CalculateMonStats(&gPlayerParty[gPlayerPartyCount]);
diff --git a/src/international_string_util.c b/src/international_string_util.c
index c2b4b43cf..ed1e17816 100644
--- a/src/international_string_util.c
+++ b/src/international_string_util.c
@@ -152,7 +152,7 @@ void PadNameString(u8 *dest, u8 padChar)
dest[length] = EOS;
}
-void sub_81DB52C(u8 *str)
+void ConvertInternationalPlayerName(u8 *str)
{
if (StringLength(str) < PLAYER_NAME_LENGTH - 1)
ConvertInternationalString(str, LANGUAGE_JAPANESE);
@@ -160,14 +160,14 @@ void sub_81DB52C(u8 *str)
StripExtCtrlCodes(str);
}
-void sub_81DB554(u8 *str, u8 arg1)
+void ConvertInternationalPlayerNameStripChar(u8 *str, u8 removeChar)
{
u8 *buffer;
if (StringLength(str) < PLAYER_NAME_LENGTH - 1)
{
ConvertInternationalString(str, LANGUAGE_JAPANESE);
}
- else if (arg1 == EXT_CTRL_CODE_BEGIN)
+ else if (removeChar == EXT_CTRL_CODE_BEGIN)
{
StripExtCtrlCodes(str);
}
@@ -177,7 +177,7 @@ void sub_81DB554(u8 *str, u8 arg1)
while (buffer[1] != EOS)
buffer++;
- while (buffer >= str && buffer[0] == arg1)
+ while (buffer >= str && buffer[0] == removeChar)
{
buffer[0] = EOS;
buffer--;
diff --git a/src/mail.c b/src/mail.c
index 09d5bfc44..e2fe22f51 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -18,62 +18,31 @@
#include "pokemon_icon.h"
#include "malloc.h"
#include "easy_chat.h"
+#include "graphics.h"
#include "constants/rgb.h"
-extern const u16 gMailPalette_Orange[];
-extern const u16 gMailPalette_Harbor[];
-extern const u16 gMailPalette_Glitter[];
-extern const u16 gMailPalette_Mech[];
-extern const u16 gMailPalette_Wood[];
-extern const u16 gMailPalette_Wave[];
-extern const u16 gMailPalette_Bead[];
-extern const u16 gMailPalette_Shadow[];
-extern const u16 gMailPalette_Tropic[];
-extern const u16 gMailPalette_Dream[];
-extern const u16 gMailPalette_Fab[];
-extern const u16 gMailPalette_Retro[];
-extern const u8 gMailTiles_Orange[];
-extern const u8 gMailTilemap_Orange[];
-extern const u8 gMailTiles_Harbor[];
-extern const u8 gMailTilemap_Harbor[];
-extern const u8 gMailTiles_Glitter[];
-extern const u8 gMailTilemap_Glitter[];
-extern const u8 gMailTiles_Mech[];
-extern const u8 gMailTilemap_Mech[];
-extern const u8 gMailTiles_Wood[];
-extern const u8 gMailTilemap_Wood[];
-extern const u8 gMailTiles_Wave[];
-extern const u8 gMailTilemap_Wave[];
-extern const u8 gMailTiles_Bead[];
-extern const u8 gMailTilemap_Bead[];
-extern const u8 gMailTiles_Shadow[];
-extern const u8 gMailTilemap_Shadow[];
-extern const u8 gMailTiles_Tropic[];
-extern const u8 gMailTilemap_Tropic[];
-extern const u8 gMailTiles_Dream[];
-extern const u8 gMailTilemap_Dream[];
-extern const u8 gMailTiles_Fab[];
-extern const u8 gMailTilemap_Fab[];
-extern const u8 gMailTiles_Retro[];
-extern const u8 gMailTilemap_Retro[];
-
-// Static type declarations
-
-struct UnkMailStruct
+// Bead and Dream mail feature an icon of the Pokémon holding it.
+enum {
+ ICON_TYPE_NONE,
+ ICON_TYPE_BEAD,
+ ICON_TYPE_DREAM,
+};
+
+struct MailLineLayout
{
- u32 numEasyChatWords:2;
- u32 xOffset:6;
- u32 lineHeight:8;
+ u8 numEasyChatWords:2;
+ u8 xOffset:6;
+ u8 height;
};
struct MailLayout
{
- u8 numSubStructs;
+ u8 numLines;
u8 signatureYPos;
u8 signatureWidth;
- u8 wordsXPos;
u8 wordsYPos;
- const struct UnkMailStruct *var8;
+ u8 wordsXPos;
+ const struct MailLineLayout *lines;
};
struct MailGraphics
@@ -81,26 +50,25 @@ struct MailGraphics
const u16 *palette;
const u8 *tiles;
const u8 *tileMap;
- u16 var0C;
- u16 var0E;
- u16 color10;
- u16 color12;
+ u32 unused;
+ u16 textColor;
+ u16 textShadow;
};
struct MailRead
{
- /*0x0000*/ u8 strbuf[8][64];
+ /*0x0000*/ u8 message[8][64];
/*0x0200*/ u8 playerName[12];
- /*0x020C*/ MainCallback callback;
- /*0x0210*/ MainCallback callback2;
+ /*0x020C*/ MainCallback exitCallback;
+ /*0x0210*/ MainCallback callback;
/*0x0214*/ struct MailStruct *mail;
- /*0x0218*/ bool8 flag;
+ /*0x0218*/ bool8 hasText;
/*0x0219*/ u8 signatureWidth;
/*0x021a*/ u8 mailType;
- /*0x021b*/ u8 animsActive;
- /*0x021c*/ u8 monIconSprite;
+ /*0x021b*/ u8 iconType;
+ /*0x021c*/ u8 monIconSpriteId;
/*0x021d*/ u8 language;
- /*0x021e*/ bool8 playerIsSender;
+ /*0x021e*/ bool8 international;
/*0x0220*/ u8 * (*parserSingle)(u8 *dest, u16 word);
/*0x0224*/ u8 * (*parserMultiple)(u8 *dest, const u16 *src, u16 length1, u16 length2);
/*0x0228*/ const struct MailLayout *layout;
@@ -108,23 +76,17 @@ struct MailRead
/*0x122c*/ u8 bg2TilemapBuffer[0x1000];
};
-// Static RAM declarations
-
static EWRAM_DATA struct MailRead *sMailRead = NULL;
-// Static ROM declarations
-
static void CB2_InitMailRead(void);
-static void sub_8121A1C(void);
-static void sub_8121B1C(void);
+static void BufferMailText(void);
+static void PrintMailText(void);
static void VBlankCB_MailRead(void);
static void CB2_MailRead(void);
static void CB2_WaitForPaletteExitOnKeyPress(void);
static void CB2_ExitOnKeyPress(void);
static void CB2_ExitMailReadFreeVars(void);
-// .rodata
-
static const struct BgTemplate sBgTemplates[] = {
{
.bg = 0,
@@ -144,7 +106,7 @@ static const struct BgTemplate sBgTemplates[] = {
}
};
-static const struct WindowTemplate sUnknown_0859F29C[] = {
+static const struct WindowTemplate sWindowTemplates[] = {
{
.bg = 0,
.tilemapLeft = 2,
@@ -163,137 +125,377 @@ static const u8 sTextColors[] = {
TEXT_DYNAMIC_COLOR_2
};
-static const u16 sUnknown_0859F2B0[][2] = {
- { 0x6ACD, 0x51A5 },
- { 0x45FC, 0x38D4 }
+// Background is alternating bars of a dark/light color.
+// Either blue or red depending on player's gender
+static const u16 sBgColors[GENDER_COUNT][2] = {
+ [MALE] = { RGB(13, 22, 26), RGB(5, 13, 20) },
+ [FEMALE] = { RGB(28, 15, 17), RGB(20, 6, 14) }
};
-static const struct MailGraphics sUnknown_0859F2B8[] = {
- {
- gMailPalette_Orange, gMailTiles_Orange, gMailTilemap_Orange, 0x02c0, 0, 0x294a, 0x6739
- }, {
- gMailPalette_Harbor, gMailTiles_Harbor, gMailTilemap_Harbor, 0x02e0, 0, 0x7fff, 0x4631
- }, {
- gMailPalette_Glitter, gMailTiles_Glitter, gMailTilemap_Glitter, 0x0400, 0, 0x294a, 0x6739
- }, {
- gMailPalette_Mech, gMailTiles_Mech, gMailTilemap_Mech, 0x01e0, 0, 0x7fff, 0x4631
- }, {
- gMailPalette_Wood, gMailTiles_Wood, gMailTilemap_Wood, 0x02e0, 0, 0x7fff, 0x4631
- }, {
- gMailPalette_Wave, gMailTiles_Wave, gMailTilemap_Wave, 0x0300, 0, 0x294a, 0x6739
- }, {
- gMailPalette_Bead, gMailTiles_Bead, gMailTilemap_Bead, 0x0140, 0, 0x7fff, 0x4631
- }, {
- gMailPalette_Shadow, gMailTiles_Shadow, gMailTilemap_Shadow, 0x0300, 0, 0x7fff, 0x4631
- }, {
- gMailPalette_Tropic, gMailTiles_Tropic, gMailTilemap_Tropic, 0x0220, 0, 0x294a, 0x6739
- }, {
- gMailPalette_Dream, gMailTiles_Dream, gMailTilemap_Dream, 0x0340, 0, 0x294a, 0x6739
- }, {
- gMailPalette_Fab, gMailTiles_Fab, gMailTilemap_Fab, 0x02a0, 0, 0x294a, 0x6739
- }, {
- gMailPalette_Retro, gMailTiles_Retro, gMailTilemap_Retro, 0x0520, 0, 0x294a, 0x6739
+static const struct MailGraphics sMailGraphics[] = {
+ [ITEM_TO_MAIL(ITEM_ORANGE_MAIL)] = {
+ .palette = gMailPalette_Orange,
+ .tiles = gMailTiles_Orange,
+ .tileMap = gMailTilemap_Orange,
+ .unused = 0x2C0,
+ .textColor = RGB(10, 10, 10),
+ .textShadow = RGB(25, 25, 25),
+ },
+ [ITEM_TO_MAIL(ITEM_HARBOR_MAIL)] = {
+ .palette = gMailPalette_Harbor,
+ .tiles = gMailTiles_Harbor,
+ .tileMap = gMailTilemap_Harbor,
+ .unused = 0x2E0,
+ .textColor = RGB_WHITE,
+ .textShadow = RGB(17, 17, 17),
+ },
+ [ITEM_TO_MAIL(ITEM_GLITTER_MAIL)] = {
+ .palette = gMailPalette_Glitter,
+ .tiles = gMailTiles_Glitter,
+ .tileMap = gMailTilemap_Glitter,
+ .unused = 0x400,
+ .textColor = RGB(10, 10, 10),
+ .textShadow = RGB(25, 25, 25),
+ },
+ [ITEM_TO_MAIL(ITEM_MECH_MAIL)] = {
+ .palette = gMailPalette_Mech,
+ .tiles = gMailTiles_Mech,
+ .tileMap = gMailTilemap_Mech,
+ .unused = 0x1E0,
+ .textColor = RGB_WHITE,
+ .textShadow = RGB(17, 17, 17),
+ },
+ [ITEM_TO_MAIL(ITEM_WOOD_MAIL)] = {
+ .palette = gMailPalette_Wood,
+ .tiles = gMailTiles_Wood,
+ .tileMap = gMailTilemap_Wood,
+ .unused = 0x2E0,
+ .textColor = RGB_WHITE,
+ .textShadow = RGB(17, 17, 17),
+ },
+ [ITEM_TO_MAIL(ITEM_WAVE_MAIL)] = {
+ .palette = gMailPalette_Wave,
+ .tiles = gMailTiles_Wave,
+ .tileMap = gMailTilemap_Wave,
+ .unused = 0x300,
+ .textColor = RGB(10, 10, 10),
+ .textShadow = RGB(25, 25, 25),
+ },
+ [ITEM_TO_MAIL(ITEM_BEAD_MAIL)] = {
+ .palette = gMailPalette_Bead,
+ .tiles = gMailTiles_Bead,
+ .tileMap = gMailTilemap_Bead,
+ .unused = 0x140,
+ .textColor = RGB_WHITE,
+ .textShadow = RGB(17, 17, 17),
+ },
+ [ITEM_TO_MAIL(ITEM_SHADOW_MAIL)] = {
+ .palette = gMailPalette_Shadow,
+ .tiles = gMailTiles_Shadow,
+ .tileMap = gMailTilemap_Shadow,
+ .unused = 0x300,
+ .textColor = RGB_WHITE,
+ .textShadow = RGB(17, 17, 17),
+ },
+ [ITEM_TO_MAIL(ITEM_TROPIC_MAIL)] = {
+ .palette = gMailPalette_Tropic,
+ .tiles = gMailTiles_Tropic,
+ .tileMap = gMailTilemap_Tropic,
+ .unused = 0x220,
+ .textColor = RGB(10, 10, 10),
+ .textShadow = RGB(25, 25, 25),
+ },
+ [ITEM_TO_MAIL(ITEM_DREAM_MAIL)] = {
+ .palette = gMailPalette_Dream,
+ .tiles = gMailTiles_Dream,
+ .tileMap = gMailTilemap_Dream,
+ .unused = 0x340,
+ .textColor = RGB(10, 10, 10),
+ .textShadow = RGB(25, 25, 25),
+ },
+ [ITEM_TO_MAIL(ITEM_FAB_MAIL)] = {
+ .palette = gMailPalette_Fab,
+ .tiles = gMailTiles_Fab,
+ .tileMap = gMailTilemap_Fab,
+ .unused = 0x2a0,
+ .textColor = RGB(10, 10, 10),
+ .textShadow = RGB(25, 25, 25),
+ },
+ [ITEM_TO_MAIL(ITEM_RETRO_MAIL)] = {
+ .palette = gMailPalette_Retro,
+ .tiles = gMailTiles_Retro,
+ .tileMap = gMailTilemap_Retro,
+ .unused = 0x520,
+ .textColor = RGB(10, 10, 10),
+ .textShadow = RGB(25, 25, 25),
}
};
-static const struct UnkMailStruct Unknown_0859F3A8[] = {
- { .numEasyChatWords = 3, .lineHeight = 16 },
- { .numEasyChatWords = 3, .lineHeight = 16 },
- { .numEasyChatWords = 3, .lineHeight = 16 }
+static const struct MailLineLayout sLineLayouts_Wide[] = {
+ { .numEasyChatWords = 3, .xOffset = 0, .height = 16 },
+ { .numEasyChatWords = 3, .xOffset = 0, .height = 16 },
+ { .numEasyChatWords = 3, .xOffset = 0, .height = 16 }
};
-static const struct MailLayout sUnknown_0859F3B4[] = {
- { 0x03, 0x00, 0x00, 0x02, 0x04, Unknown_0859F3A8 },
- { 0x03, 0x00, 0x00, 0x02, 0x04, Unknown_0859F3A8 },
- { 0x03, 0x00, 0x00, 0x02, 0x04, Unknown_0859F3A8 },
- { 0x03, 0x00, 0x00, 0x02, 0x04, Unknown_0859F3A8 },
- { 0x03, 0x00, 0x00, 0x02, 0x04, Unknown_0859F3A8 },
- { 0x03, 0x00, 0x00, 0x02, 0x04, Unknown_0859F3A8 },
- { 0x03, 0x00, 0x00, 0x02, 0x04, Unknown_0859F3A8 },
- { 0x03, 0x00, 0x00, 0x02, 0x04, Unknown_0859F3A8 },
- { 0x03, 0x00, 0x00, 0x02, 0x04, Unknown_0859F3A8 },
- { 0x03, 0x00, 0x00, 0x02, 0x04, Unknown_0859F3A8 },
- { 0x03, 0x08, 0x00, 0x02, 0x04, Unknown_0859F3A8 },
- { 0x03, 0x00, 0x00, 0x02, 0x00, Unknown_0859F3A8 }
+static const struct MailLayout sMailLayouts_Wide[] = {
+ [ITEM_TO_MAIL(ITEM_ORANGE_MAIL)] = {
+ .numLines = ARRAY_COUNT(sLineLayouts_Wide),
+ .signatureYPos = 0,
+ .signatureWidth = 0,
+ .wordsYPos = 2,
+ .wordsXPos = 4,
+ .lines = sLineLayouts_Wide,
+ },
+ [ITEM_TO_MAIL(ITEM_HARBOR_MAIL)] = {
+ .numLines = ARRAY_COUNT(sLineLayouts_Wide),
+ .signatureYPos = 0,
+ .signatureWidth = 0,
+ .wordsYPos = 2,
+ .wordsXPos = 4,
+ .lines = sLineLayouts_Wide,
+ },
+ [ITEM_TO_MAIL(ITEM_GLITTER_MAIL)] = {
+ .numLines = ARRAY_COUNT(sLineLayouts_Wide),
+ .signatureYPos = 0,
+ .signatureWidth = 0,
+ .wordsYPos = 2,
+ .wordsXPos = 4,
+ .lines = sLineLayouts_Wide,
+ },
+ [ITEM_TO_MAIL(ITEM_MECH_MAIL)] = {
+ .numLines = ARRAY_COUNT(sLineLayouts_Wide),
+ .signatureYPos = 0,
+ .signatureWidth = 0,
+ .wordsYPos = 2,
+ .wordsXPos = 4,
+ .lines = sLineLayouts_Wide,
+ },
+ [ITEM_TO_MAIL(ITEM_WOOD_MAIL)] = {
+ .numLines = ARRAY_COUNT(sLineLayouts_Wide),
+ .signatureYPos = 0,
+ .signatureWidth = 0,
+ .wordsYPos = 2,
+ .wordsXPos = 4,
+ .lines = sLineLayouts_Wide,
+ },
+ [ITEM_TO_MAIL(ITEM_WAVE_MAIL)] = {
+ .numLines = ARRAY_COUNT(sLineLayouts_Wide),
+ .signatureYPos = 0,
+ .signatureWidth = 0,
+ .wordsYPos = 2,
+ .wordsXPos = 4,
+ .lines = sLineLayouts_Wide,
+ },
+ [ITEM_TO_MAIL(ITEM_BEAD_MAIL)] = {
+ .numLines = ARRAY_COUNT(sLineLayouts_Wide),
+ .signatureYPos = 0,
+ .signatureWidth = 0,
+ .wordsYPos = 2,
+ .wordsXPos = 4,
+ .lines = sLineLayouts_Wide,
+ },
+ [ITEM_TO_MAIL(ITEM_SHADOW_MAIL)] = {
+ .numLines = ARRAY_COUNT(sLineLayouts_Wide),
+ .signatureYPos = 0,
+ .signatureWidth = 0,
+ .wordsYPos = 2,
+ .wordsXPos = 4,
+ .lines = sLineLayouts_Wide,
+ },
+ [ITEM_TO_MAIL(ITEM_TROPIC_MAIL)] = {
+ .numLines = ARRAY_COUNT(sLineLayouts_Wide),
+ .signatureYPos = 0,
+ .signatureWidth = 0,
+ .wordsYPos = 2,
+ .wordsXPos = 4,
+ .lines = sLineLayouts_Wide,
+ },
+ [ITEM_TO_MAIL(ITEM_DREAM_MAIL)] = {
+ .numLines = ARRAY_COUNT(sLineLayouts_Wide),
+ .signatureYPos = 0,
+ .signatureWidth = 0,
+ .wordsYPos = 2,
+ .wordsXPos = 4,
+ .lines = sLineLayouts_Wide,
+ },
+ [ITEM_TO_MAIL(ITEM_FAB_MAIL)] = {
+ .numLines = ARRAY_COUNT(sLineLayouts_Wide),
+ .signatureYPos = 8,
+ .signatureWidth = 0,
+ .wordsYPos = 2,
+ .wordsXPos = 4,
+ .lines = sLineLayouts_Wide,
+ },
+ [ITEM_TO_MAIL(ITEM_RETRO_MAIL)] = {
+ .numLines = ARRAY_COUNT(sLineLayouts_Wide),
+ .signatureYPos = 0,
+ .signatureWidth = 0,
+ .wordsYPos = 2,
+ .wordsXPos = 0,
+ .lines = sLineLayouts_Wide,
+ },
};
-static const struct UnkMailStruct Unknown_0859F444[] = {
- { .numEasyChatWords = 2, .lineHeight = 16 },
- { .numEasyChatWords = 2, .lineHeight = 16 },
- { .numEasyChatWords = 2, .lineHeight = 16 },
- { .numEasyChatWords = 2, .lineHeight = 16 },
- { .numEasyChatWords = 1, .lineHeight = 16 }
+static const struct MailLineLayout sLineLayouts_Tall[] = {
+ { .numEasyChatWords = 2, .xOffset = 0, .height = 16 },
+ { .numEasyChatWords = 2, .xOffset = 0, .height = 16 },
+ { .numEasyChatWords = 2, .xOffset = 0, .height = 16 },
+ { .numEasyChatWords = 2, .xOffset = 0, .height = 16 },
+ { .numEasyChatWords = 1, .xOffset = 0, .height = 16 }
};
-static const struct MailLayout sUnknown_0859F458[] = {
- { 0x05, 0x07, 0x58, 0x0b, 0x1e, Unknown_0859F444 },
- { 0x05, 0x0a, 0x60, 0x09, 0x1e, Unknown_0859F444 },
- { 0x05, 0x0c, 0x68, 0x05, 0x1e, Unknown_0859F444 },
- { 0x05, 0x05, 0x60, 0x08, 0x1e, Unknown_0859F444 },
- { 0x05, 0x0a, 0x60, 0x09, 0x1e, Unknown_0859F444 },
- { 0x05, 0x09, 0x70, 0x05, 0x1e, Unknown_0859F444 },
- { 0x05, 0x0c, 0x68, 0x09, 0x1e, Unknown_0859F444 },
- { 0x05, 0x0d, 0x68, 0x0d, 0x1e, Unknown_0859F444 },
- { 0x05, 0x09, 0x60, 0x09, 0x1e, Unknown_0859F444 },
- { 0x05, 0x09, 0x60, 0x09, 0x1e, Unknown_0859F444 },
- { 0x05, 0x11, 0x68, 0x0f, 0x1e, Unknown_0859F444 },
- { 0x05, 0x09, 0x60, 0x05, 0x1e, Unknown_0859F444 }
+static const struct MailLayout sMailLayouts_Tall[] = {
+ [ITEM_TO_MAIL(ITEM_ORANGE_MAIL)] = {
+ .numLines = ARRAY_COUNT(sLineLayouts_Tall),
+ .signatureYPos = 7,
+ .signatureWidth = 88,
+ .wordsYPos = 11,
+ .wordsXPos = 30,
+ .lines = sLineLayouts_Tall,
+ },
+ [ITEM_TO_MAIL(ITEM_HARBOR_MAIL)] = {
+ .numLines = ARRAY_COUNT(sLineLayouts_Tall),
+ .signatureYPos = 10,
+ .signatureWidth = 96,
+ .wordsYPos = 9,
+ .wordsXPos = 30,
+ .lines = sLineLayouts_Tall,
+ },
+ [ITEM_TO_MAIL(ITEM_GLITTER_MAIL)] = {
+ .numLines = ARRAY_COUNT(sLineLayouts_Tall),
+ .signatureYPos = 12,
+ .signatureWidth = 104,
+ .wordsYPos = 5,
+ .wordsXPos = 30,
+ .lines = sLineLayouts_Tall,
+ },
+ [ITEM_TO_MAIL(ITEM_MECH_MAIL)] = {
+ .numLines = ARRAY_COUNT(sLineLayouts_Tall),
+ .signatureYPos = 5,
+ .signatureWidth = 96,
+ .wordsYPos = 8,
+ .wordsXPos = 30,
+ .lines = sLineLayouts_Tall,
+ },
+ [ITEM_TO_MAIL(ITEM_WOOD_MAIL)] = {
+ .numLines = ARRAY_COUNT(sLineLayouts_Tall),
+ .signatureYPos = 10,
+ .signatureWidth = 96,
+ .wordsYPos = 9,
+ .wordsXPos = 30,
+ .lines = sLineLayouts_Tall,
+ },
+ [ITEM_TO_MAIL(ITEM_WAVE_MAIL)] = {
+ .numLines = ARRAY_COUNT(sLineLayouts_Tall),
+ .signatureYPos = 9,
+ .signatureWidth = 112,
+ .wordsYPos = 5,
+ .wordsXPos = 30,
+ .lines = sLineLayouts_Tall,
+ },
+ [ITEM_TO_MAIL(ITEM_BEAD_MAIL)] = {
+ .numLines = ARRAY_COUNT(sLineLayouts_Tall),
+ .signatureYPos = 12,
+ .signatureWidth = 104,
+ .wordsYPos = 9,
+ .wordsXPos = 30,
+ .lines = sLineLayouts_Tall,
+ },
+ [ITEM_TO_MAIL(ITEM_SHADOW_MAIL)] = {
+ .numLines = ARRAY_COUNT(sLineLayouts_Tall),
+ .signatureYPos = 13,
+ .signatureWidth = 104,
+ .wordsYPos = 13,
+ .wordsXPos = 30,
+ .lines = sLineLayouts_Tall,
+ },
+ [ITEM_TO_MAIL(ITEM_TROPIC_MAIL)] = {
+ .numLines = ARRAY_COUNT(sLineLayouts_Tall),
+ .signatureYPos = 9,
+ .signatureWidth = 96,
+ .wordsYPos = 9,
+ .wordsXPos = 30,
+ .lines = sLineLayouts_Tall,
+ },
+ [ITEM_TO_MAIL(ITEM_DREAM_MAIL)] = {
+ .numLines = ARRAY_COUNT(sLineLayouts_Tall),
+ .signatureYPos = 9,
+ .signatureWidth = 96,
+ .wordsYPos = 9,
+ .wordsXPos = 30,
+ .lines = sLineLayouts_Tall,
+ },
+ [ITEM_TO_MAIL(ITEM_FAB_MAIL)] = {
+ .numLines = ARRAY_COUNT(sLineLayouts_Tall),
+ .signatureYPos = 17,
+ .signatureWidth = 104,
+ .wordsYPos = 15,
+ .wordsXPos = 30,
+ .lines = sLineLayouts_Tall,
+ },
+ [ITEM_TO_MAIL(ITEM_RETRO_MAIL)] = {
+ .numLines = ARRAY_COUNT(sLineLayouts_Tall),
+ .signatureYPos = 9,
+ .signatureWidth = 96,
+ .wordsYPos = 5,
+ .wordsXPos = 30,
+ .lines = sLineLayouts_Tall,
+ },
};
-// .text
-
-void ReadMail(struct MailStruct *mail, void (*callback)(void), bool8 flag)
+void ReadMail(struct MailStruct *mail, void (*exitCallback)(void), bool8 hasText)
{
u16 buffer[2];
u16 species;
sMailRead = calloc(1, sizeof(*sMailRead));
sMailRead->language = GAME_LANGUAGE;
- sMailRead->playerIsSender = TRUE;
+ sMailRead->international = TRUE;
sMailRead->parserSingle = CopyEasyChatWord;
sMailRead->parserMultiple = ConvertEasyChatWordsToString;
if (IS_ITEM_MAIL(mail->itemId))
{
- sMailRead->mailType = mail->itemId - FIRST_MAIL_INDEX;
+ sMailRead->mailType = ITEM_TO_MAIL(mail->itemId);
}
else
{
- sMailRead->mailType = 0;
- flag = FALSE;
+ sMailRead->mailType = ITEM_TO_MAIL(FIRST_MAIL_INDEX);
+ hasText = FALSE;
}
- switch (sMailRead->playerIsSender)
+ switch (sMailRead->international)
{
- case FALSE:
- default:
- sMailRead->layout = &sUnknown_0859F3B4[sMailRead->mailType];
- break;
- case TRUE:
- sMailRead->layout = &sUnknown_0859F458[sMailRead->mailType];
- break;
+ case FALSE:
+ default:
+ // Never reached. JP only?
+ sMailRead->layout = &sMailLayouts_Wide[sMailRead->mailType];
+ break;
+ case TRUE:
+ sMailRead->layout = &sMailLayouts_Tall[sMailRead->mailType];
+ break;
}
species = MailSpeciesToSpecies(mail->species, buffer);
- if (species >= SPECIES_BULBASAUR && species < NUM_SPECIES)
+ if (species > SPECIES_NONE && species < NUM_SPECIES)
{
switch (sMailRead->mailType)
{
- default:
- sMailRead->animsActive = 0;
- break;
- case ITEM_BEAD_MAIL - FIRST_MAIL_INDEX:
- sMailRead->animsActive = 1;
- break;
- case ITEM_DREAM_MAIL - FIRST_MAIL_INDEX:
- sMailRead->animsActive = 2;
- break;
+ default:
+ sMailRead->iconType = ICON_TYPE_NONE;
+ break;
+ case ITEM_TO_MAIL(ITEM_BEAD_MAIL):
+ sMailRead->iconType = ICON_TYPE_BEAD;
+ break;
+ case ITEM_TO_MAIL(ITEM_DREAM_MAIL):
+ sMailRead->iconType = ICON_TYPE_DREAM;
+ break;
}
}
else
{
- sMailRead->animsActive = 0;
+ sMailRead->iconType = ICON_TYPE_NONE;
}
sMailRead->mail = mail;
- sMailRead->callback = callback;
- sMailRead->flag = flag;
+ sMailRead->exitCallback = exitCallback;
+ sMailRead->hasText = hasText;
SetMainCallback2(CB2_InitMailRead);
}
@@ -341,11 +543,11 @@ static bool8 MailReadBuildGraphics(void)
SetBgTilemapBuffer(2, sMailRead->bg2TilemapBuffer);
break;
case 7:
- InitWindows(sUnknown_0859F29C);
+ InitWindows(sWindowTemplates);
DeactivateAllTextPrinters();
break;
case 8:
- DecompressAndCopyTileDataToVram(1, sUnknown_0859F2B8[sMailRead->mailType].tiles, 0, 0, 0);
+ DecompressAndCopyTileDataToVram(1, sMailGraphics[sMailRead->mailType].tiles, 0, 0, 0);
break;
case 9:
if (FreeTempTileDataBuffersIfPossible())
@@ -356,7 +558,7 @@ static bool8 MailReadBuildGraphics(void)
case 10:
FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 30, 20);
FillBgTilemapBufferRect_Palette0(2, 1, 0, 0, 30, 20);
- CopyToBgTilemapBuffer(1, sUnknown_0859F2B8[sMailRead->mailType].tileMap, 0, 0);
+ CopyToBgTilemapBuffer(1, sMailGraphics[sMailRead->mailType].tileMap, 0, 0);
break;
case 11:
CopyBgTilemapBufferToVram(0);
@@ -365,26 +567,28 @@ static bool8 MailReadBuildGraphics(void)
break;
case 12:
LoadPalette(GetOverworldTextboxPalettePtr(), 240, 32);
- gPlttBufferUnfaded[250] = sUnknown_0859F2B8[sMailRead->mailType].color10;
- gPlttBufferFaded[250] = sUnknown_0859F2B8[sMailRead->mailType].color10;
- gPlttBufferUnfaded[251] = sUnknown_0859F2B8[sMailRead->mailType].color12;
- gPlttBufferFaded[251] = sUnknown_0859F2B8[sMailRead->mailType].color12;
- LoadPalette(sUnknown_0859F2B8[sMailRead->mailType].palette, 0, 32);
- gPlttBufferUnfaded[10] = sUnknown_0859F2B0[gSaveBlock2Ptr->playerGender][0];
- gPlttBufferFaded[10] = sUnknown_0859F2B0[gSaveBlock2Ptr->playerGender][0];
- gPlttBufferUnfaded[11] = sUnknown_0859F2B0[gSaveBlock2Ptr->playerGender][1];
- gPlttBufferFaded[11] = sUnknown_0859F2B0[gSaveBlock2Ptr->playerGender][1];
+
+ gPlttBufferUnfaded[250] = sMailGraphics[sMailRead->mailType].textColor;
+ gPlttBufferFaded[250] = sMailGraphics[sMailRead->mailType].textColor;
+ gPlttBufferUnfaded[251] = sMailGraphics[sMailRead->mailType].textShadow;
+ gPlttBufferFaded[251] = sMailGraphics[sMailRead->mailType].textShadow;
+ LoadPalette(sMailGraphics[sMailRead->mailType].palette, 0, 32);
+
+ gPlttBufferUnfaded[10] = sBgColors[gSaveBlock2Ptr->playerGender][0];
+ gPlttBufferFaded[10] = sBgColors[gSaveBlock2Ptr->playerGender][0];
+ gPlttBufferUnfaded[11] = sBgColors[gSaveBlock2Ptr->playerGender][1];
+ gPlttBufferFaded[11] = sBgColors[gSaveBlock2Ptr->playerGender][1];
break;
case 13:
- if (sMailRead->flag)
+ if (sMailRead->hasText)
{
- sub_8121A1C();
+ BufferMailText();
}
break;
case 14:
- if (sMailRead->flag)
+ if (sMailRead->hasText)
{
- sub_8121B1C();
+ PrintMailText();
RunTextPrinters();
}
break;
@@ -399,17 +603,17 @@ static bool8 MailReadBuildGraphics(void)
gPaletteFade.bufferTransferDisabled = TRUE;
break;
case 17:
- icon = sub_80D2E84(sMailRead->mail->species);
- switch (sMailRead->animsActive)
+ icon = GetIconSpeciesNoPersonality(sMailRead->mail->species);
+ switch (sMailRead->iconType)
{
- case 1:
- LoadMonIconPalette(icon);
- sMailRead->monIconSprite = sub_80D2D78(icon, SpriteCallbackDummy, 0x60, 0x80, 0, 0);
- break;
- case 2:
- LoadMonIconPalette(icon);
- sMailRead->monIconSprite = sub_80D2D78(icon, SpriteCallbackDummy, 0x28, 0x80, 0, 0);
- break;
+ case ICON_TYPE_BEAD:
+ LoadMonIconPalette(icon);
+ sMailRead->monIconSpriteId = CreateMonIconNoPersonality(icon, SpriteCallbackDummy, 96, 128, 0, FALSE);
+ break;
+ case ICON_TYPE_DREAM:
+ LoadMonIconPalette(icon);
+ sMailRead->monIconSpriteId = CreateMonIconNoPersonality(icon, SpriteCallbackDummy, 40, 128, 0, FALSE);
+ break;
}
break;
case 18:
@@ -419,7 +623,7 @@ static bool8 MailReadBuildGraphics(void)
ShowBg(2);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
gPaletteFade.bufferTransferDisabled = FALSE;
- sMailRead->callback2 = CB2_WaitForPaletteExitOnKeyPress;
+ sMailRead->callback = CB2_WaitForPaletteExitOnKeyPress;
return TRUE;
default:
return FALSE;
@@ -440,35 +644,39 @@ static void CB2_InitMailRead(void)
} while (MenuHelpers_LinkSomething() != TRUE);
}
-static void sub_8121A1C(void)
+static void BufferMailText(void)
{
u16 i;
- u8 total;
+ u8 numWords;
u8 *ptr;
- total = 0;
- for (i = 0; i < sMailRead->layout->numSubStructs; i ++)
+ // Convert the easy chat words to strings line by line and buffer them to message
+ numWords = 0;
+ for (i = 0; i < sMailRead->layout->numLines; i ++)
{
- ConvertEasyChatWordsToString(sMailRead->strbuf[i], &sMailRead->mail->words[total], sMailRead->layout->var8[i].numEasyChatWords, 1);
- total += sMailRead->layout->var8[i].numEasyChatWords;
+ ConvertEasyChatWordsToString(sMailRead->message[i], &sMailRead->mail->words[numWords], sMailRead->layout->lines[i].numEasyChatWords, 1);
+ numWords += sMailRead->layout->lines[i].numEasyChatWords;
}
+
+ // Buffer the signature
ptr = StringCopy(sMailRead->playerName, sMailRead->mail->playerName);
- if (!sMailRead->playerIsSender)
+ if (!sMailRead->international)
{
- StringCopy(ptr, gText_FromSpace);
- sMailRead->signatureWidth = sMailRead->layout->signatureWidth - (StringLength(sMailRead->playerName) * 8 - 0x60);
+ // Never reached
+ StringCopy(ptr, gText_FromSpace); // Odd, "From" text is already printed in PrintMailText
+ sMailRead->signatureWidth = sMailRead->layout->signatureWidth - (StringLength(sMailRead->playerName) * 8 - 96);
}
else
{
- sub_81DB52C(sMailRead->playerName);
+ ConvertInternationalPlayerName(sMailRead->playerName);
sMailRead->signatureWidth = sMailRead->layout->signatureWidth;
}
}
-static void sub_8121B1C(void)
+static void PrintMailText(void)
{
u16 i;
- u8 strbuf[0x20];
+ u8 signature[32];
u8 y;
u8 *bufptr;
s32 box_x;
@@ -479,20 +687,19 @@ static void sub_8121B1C(void)
PutWindowTilemap(1);
FillWindowPixelBuffer(0, PIXEL_FILL(0));
FillWindowPixelBuffer(1, PIXEL_FILL(0));
- for (i = 0; i < sMailRead->layout->numSubStructs; i ++)
+ for (i = 0; i < sMailRead->layout->numLines; i ++)
{
- if (sMailRead->strbuf[i][0] == EOS || sMailRead->strbuf[i][0] == CHAR_SPACE)
- {
+ if (sMailRead->message[i][0] == EOS || sMailRead->message[i][0] == CHAR_SPACE)
continue;
- }
- AddTextPrinterParameterized3(0, 1, sMailRead->layout->var8[i].xOffset + sMailRead->layout->wordsYPos, y + sMailRead->layout->wordsXPos, sTextColors, 0, sMailRead->strbuf[i]);
- y += sMailRead->layout->var8[i].lineHeight;
+
+ AddTextPrinterParameterized3(0, 1, sMailRead->layout->lines[i].xOffset + sMailRead->layout->wordsXPos, y + sMailRead->layout->wordsYPos, sTextColors, 0, sMailRead->message[i]);
+ y += sMailRead->layout->lines[i].height;
}
- bufptr = StringCopy(strbuf, gText_FromSpace);
+ bufptr = StringCopy(signature, gText_FromSpace);
StringCopy(bufptr, sMailRead->playerName);
- box_x = GetStringCenterAlignXOffset(1, strbuf, sMailRead->signatureWidth) + 0x68;
- box_y = sMailRead->layout->signatureYPos + 0x58;
- AddTextPrinterParameterized3(0, 1, box_x, box_y, sTextColors, 0, strbuf);
+ box_x = GetStringCenterAlignXOffset(1, signature, sMailRead->signatureWidth) + 104;
+ box_y = sMailRead->layout->signatureYPos + 88;
+ AddTextPrinterParameterized3(0, 1, box_x, box_y, sTextColors, 0, signature);
CopyWindowToVram(0, 3);
CopyWindowToVram(1, 3);
}
@@ -506,19 +713,19 @@ static void VBlankCB_MailRead(void)
static void CB2_MailRead(void)
{
- if (sMailRead->animsActive != 0)
+ if (sMailRead->iconType != ICON_TYPE_NONE)
{
AnimateSprites();
BuildOamBuffer();
}
- sMailRead->callback2();
+ sMailRead->callback();
}
static void CB2_WaitForPaletteExitOnKeyPress(void)
{
if (!UpdatePaletteFade())
{
- sMailRead->callback2 = CB2_ExitOnKeyPress;
+ sMailRead->callback = CB2_ExitOnKeyPress;
}
}
@@ -527,7 +734,7 @@ static void CB2_ExitOnKeyPress(void)
if (JOY_NEW(A_BUTTON | B_BUTTON))
{
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
- sMailRead->callback2 = CB2_ExitMailReadFreeVars;
+ sMailRead->callback = CB2_ExitMailReadFreeVars;
}
}
@@ -535,13 +742,13 @@ static void CB2_ExitMailReadFreeVars(void)
{
if (!UpdatePaletteFade())
{
- SetMainCallback2(sMailRead->callback);
- switch (sMailRead->animsActive)
+ SetMainCallback2(sMailRead->exitCallback);
+ switch (sMailRead->iconType)
{
- case 1:
- case 2:
- FreeMonIconPalette(sub_80D2E84(sMailRead->mail->species));
- FreeAndDestroyMonIconSprite(&gSprites[sMailRead->monIconSprite]);
+ case ICON_TYPE_BEAD:
+ case ICON_TYPE_DREAM:
+ FreeMonIconPalette(GetIconSpeciesNoPersonality(sMailRead->mail->species));
+ FreeAndDestroyMonIconSprite(&gSprites[sMailRead->monIconSpriteId]);
}
memset(sMailRead, 0, sizeof(*sMailRead));
ResetPaletteFade();
diff --git a/src/mail_data.c b/src/mail_data.c
index e0553af99..350888d0b 100644
--- a/src/mail_data.c
+++ b/src/mail_data.c
@@ -24,7 +24,7 @@ void ClearMailStruct(struct MailStruct *mail)
for (i = 0; i < PLAYER_NAME_LENGTH + 1; i++)
mail->playerName[i] = EOS;
- for (i = 0; i < 4; i++)
+ for (i = 0; i < TRAINER_ID_LENGTH; i++)
mail->trainerId[i] = 0;
mail->species = SPECIES_BULBASAUR;
@@ -34,7 +34,7 @@ void ClearMailStruct(struct MailStruct *mail)
bool8 MonHasMail(struct Pokemon *mon)
{
u16 heldItem = GetMonData(mon, MON_DATA_HELD_ITEM);
- if (ItemIsMail(heldItem) && GetMonData(mon, MON_DATA_MAIL) != 0xFF)
+ if (ItemIsMail(heldItem) && GetMonData(mon, MON_DATA_MAIL) != MAIL_NONE)
return TRUE;
else
return FALSE;
@@ -52,12 +52,12 @@ u8 GiveMailToMon(struct Pokemon *mon, u16 itemId)
for (id = 0; id < PARTY_SIZE; id++)
{
- if (gSaveBlock1Ptr->mail[id].itemId == 0)
+ if (gSaveBlock1Ptr->mail[id].itemId == ITEM_NONE)
{
for (i = 0; i < MAIL_WORDS_COUNT; i++)
gSaveBlock1Ptr->mail[id].words[i] = 0xFFFF;
- for (i = 0; i < PLAYER_NAME_LENGTH + 1 - 1; i++)
+ for (i = 0; i < PLAYER_NAME_LENGTH; i++)
gSaveBlock1Ptr->mail[id].playerName[i] = gSaveBlock2Ptr->playerName[i];
gSaveBlock1Ptr->mail[id].playerName[i] = EOS;
PadNameString(gSaveBlock1Ptr->mail[id].playerName, CHAR_SPACE);
@@ -75,7 +75,7 @@ u8 GiveMailToMon(struct Pokemon *mon, u16 itemId)
}
}
- return 0xFF;
+ return MAIL_NONE;
}
u16 SpeciesToMailSpecies(u16 species, u32 personality)
@@ -93,7 +93,7 @@ u16 MailSpeciesToSpecies(u16 mailSpecies, u16 *buffer)
{
u16 result;
- if (mailSpecies >= 30000 && mailSpecies < (30000 + UNOWN_FORM_COUNT))
+ if (mailSpecies >= 30000 && mailSpecies < (30000 + NUM_UNOWN_FORMS))
{
result = SPECIES_UNOWN;
*buffer = mailSpecies - 30000;
@@ -112,8 +112,8 @@ u8 GiveMailToMon2(struct Pokemon *mon, struct MailStruct *mail)
u16 itemId = mail->itemId;
u8 mailId = GiveMailToMon(mon, itemId);
- if (mailId == 0xFF)
- return 0xFF;
+ if (mailId == MAIL_NONE)
+ return MAIL_NONE;
gSaveBlock1Ptr->mail[mailId] = *mail;
@@ -141,7 +141,7 @@ void TakeMailFromMon(struct Pokemon *mon)
{
mailId = GetMonData(mon, MON_DATA_MAIL);
gSaveBlock1Ptr->mail[mailId].itemId = ITEM_NONE;
- mailId = 0xFF;
+ mailId = MAIL_NONE;
heldItem[0] = ITEM_NONE;
heldItem[1] = ITEM_NONE << 8;
SetMonData(mon, MON_DATA_MAIL, &mailId);
@@ -162,7 +162,7 @@ u8 TakeMailFromMon2(struct Pokemon *mon)
newHeldItem[0] = ITEM_NONE;
newHeldItem[1] = ITEM_NONE << 8;
- newMailId = 0xFF;
+ newMailId = MAIL_NONE;
for (i = PARTY_SIZE; i < MAIL_COUNT; i++)
{
@@ -176,7 +176,7 @@ u8 TakeMailFromMon2(struct Pokemon *mon)
}
}
- return 0xFF;
+ return MAIL_NONE;
}
bool8 ItemIsMail(u16 itemId)
diff --git a/src/menu_specialized.c b/src/menu_specialized.c
index 1fbeb59b4..8eda1621e 100644
--- a/src/menu_specialized.c
+++ b/src/menu_specialized.c
@@ -261,10 +261,10 @@ static void sub_81D1D44(u8 windowId, s32 itemId, u8 y)
if (itemId == LIST_CANCEL)
return;
- StringCopy(buffer, gSaveBlock1Ptr->mail[6 + itemId].playerName);
- sub_81DB52C(buffer);
+ StringCopy(buffer, gSaveBlock1Ptr->mail[PARTY_SIZE + itemId].playerName);
+ ConvertInternationalPlayerName(buffer);
length = StringLength(buffer);
- if (length <= 5)
+ if (length < PLAYER_NAME_LENGTH - 1)
ConvertInternationalString(buffer, LANGUAGE_JAPANESE);
AddTextPrinterParameterized4(windowId, 1, 8, y, 0, 0, sPlayerNameTextColors, -1, buffer);
}
diff --git a/src/mevent_801BAAC.c b/src/mevent_801BAAC.c
index d732e3045..2702b53f9 100644
--- a/src/mevent_801BAAC.c
+++ b/src/mevent_801BAAC.c
@@ -420,7 +420,7 @@ void sub_801C4C0(void)
sWonderCardData->unk_017C = 0xFF;
if (sWonderCardData->unk_014C.unk_06 != SPECIES_NONE)
{
- sWonderCardData->unk_017C = sub_80D2D78(sub_80D2E84(sWonderCardData->unk_014C.unk_06), SpriteCallbackDummy, 0xDC, 0x14, 0, FALSE);
+ sWonderCardData->unk_017C = CreateMonIconNoPersonality(GetIconSpeciesNoPersonality(sWonderCardData->unk_014C.unk_06), SpriteCallbackDummy, 0xDC, 0x14, 0, FALSE);
gSprites[sWonderCardData->unk_017C].oam.priority = 2;
}
if (sWonderCardData->unk_0000.unk_09 != 0 && sWonderCardData->unk_0000.unk_08_0 == 1)
@@ -434,7 +434,7 @@ void sub_801C4C0(void)
sWonderCardData->unk_017D[r7][0] = CreateSprite(&gUnknown_082F1D48, 0xd8 - 32 * r7, 0x90, 8);
if (sWonderCardData->unk_014C.unk_08[0][r7] != 0)
{
- sWonderCardData->unk_017D[r7][1] = sub_80D2D78(sub_80D2E84(sWonderCardData->unk_014C.unk_08[0][r7]), SpriteCallbackDummy, 0xd8 - 32 * r7, 0x88, 0, 0);
+ sWonderCardData->unk_017D[r7][1] = CreateMonIconNoPersonality(GetIconSpeciesNoPersonality(sWonderCardData->unk_014C.unk_08[0][r7]), SpriteCallbackDummy, 0xd8 - 32 * r7, 0x88, 0, 0);
}
}
}
diff --git a/src/mystery_event_script.c b/src/mystery_event_script.c
index beb1bf45d..176eab7fc 100644
--- a/src/mystery_event_script.c
+++ b/src/mystery_event_script.c
@@ -325,7 +325,7 @@ bool8 MEScrCmd_givepokemon(struct ScriptContext *ctx)
}
else
{
- memcpy(&gPlayerParty[5], pokemonPtr, sizeof(struct Pokemon));
+ memcpy(&gPlayerParty[PARTY_SIZE - 1], pokemonPtr, sizeof(struct Pokemon));
memcpy(&mail, mailPtr, sizeof(struct MailStruct));
if (species != SPECIES_EGG)
@@ -335,9 +335,9 @@ bool8 MEScrCmd_givepokemon(struct ScriptContext *ctx)
GetSetPokedexFlag(pokedexNum, FLAG_SET_CAUGHT);
}
- heldItem = GetMonData(&gPlayerParty[5], MON_DATA_HELD_ITEM);
+ heldItem = GetMonData(&gPlayerParty[PARTY_SIZE - 1], MON_DATA_HELD_ITEM);
if (ItemIsMail(heldItem))
- GiveMailToMon2(&gPlayerParty[5], &mail);
+ GiveMailToMon2(&gPlayerParty[PARTY_SIZE - 1], &mail);
CompactPartySlots();
CalculatePlayerPartyCount();
StringExpandPlaceholders(gStringVar4, gText_MysteryGiftSentOver);
@@ -350,7 +350,7 @@ bool8 MEScrCmd_givepokemon(struct ScriptContext *ctx)
bool8 MEScrCmd_addtrainer(struct ScriptContext *ctx)
{
u32 data = ScriptReadWord(ctx) - ctx->data[1] + ctx->data[0];
- memcpy((void*)(gSaveBlock2Ptr) + 0xBEC, (void *)data, 0xBC);
+ memcpy(&gSaveBlock2Ptr->frontier.ereaderTrainer, (void *)data, sizeof(gSaveBlock2Ptr->frontier.ereaderTrainer));
ValidateEReaderTrainer();
StringExpandPlaceholders(gStringVar4, gText_MysteryGiftNewTrainer);
ctx->data[2] = 2;
diff --git a/src/party_menu.c b/src/party_menu.c
index a648d6d04..7d53a2c12 100755
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -955,7 +955,7 @@ static void DisplayPartyPokemonDataForMultiBattle(u8 slot)
menuBox->infoRects->blitFunc(menuBox->windowId, 0, 0, 0, 0, FALSE);
StringCopy(gStringVar1, gMultiPartnerParty[actualSlot].nickname);
StringGetEnd10(gStringVar1);
- sub_81DB52C(gStringVar1);
+ ConvertInternationalPlayerName(gStringVar1);
DisplayPartyPokemonBarDetail(menuBox->windowId, gStringVar1, 0, menuBox->infoRects->dimensions);
DisplayPartyPokemonLevel(gMultiPartnerParty[actualSlot].level, menuBox);
DisplayPartyPokemonGender(gMultiPartnerParty[actualSlot].gender, gMultiPartnerParty[actualSlot].species, gMultiPartnerParty[actualSlot].nickname, menuBox);
diff --git a/src/player_pc.c b/src/player_pc.c
index f272ad55d..a06aad60e 100644
--- a/src/player_pc.c
+++ b/src/player_pc.c
@@ -593,8 +593,8 @@ static u8 GetMailboxMailCount(void)
{
u8 i, j;
- for(i = 0, j = 6; j < 16; j++)
- if (gSaveBlock1Ptr->mail[j].itemId != 0)
+ for(i = 0, j = PARTY_SIZE; j < MAIL_COUNT; j++)
+ if (gSaveBlock1Ptr->mail[j].itemId != ITEM_NONE)
i++;
return i;
@@ -605,9 +605,9 @@ static void Mailbox_UpdateMailList(void)
struct MailStruct mailBuffer;
u8 i, j;
- for (i=6; i<15; i++)
+ for (i = PARTY_SIZE; i < MAIL_COUNT - 1; i++)
{
- for (j=i+1; j<16; j++)
+ for (j = i + 1; j < MAIL_COUNT; j++)
{
if (gSaveBlock1Ptr->mail[i].itemId == 0)
{
@@ -665,8 +665,8 @@ static void Mailbox_ProcessInput(u8 taskId)
static void Mailbox_PrintWhatToDoWithPlayerMailText(u8 taskId)
{
- StringCopy(gStringVar1, gSaveBlock1Ptr->mail[playerPCItemPageInfo.itemsAbove + 6 + playerPCItemPageInfo.cursorPos].playerName);
- sub_81DB554(gStringVar1, 0);
+ StringCopy(gStringVar1, gSaveBlock1Ptr->mail[playerPCItemPageInfo.itemsAbove + PARTY_SIZE + playerPCItemPageInfo.cursorPos].playerName);
+ ConvertInternationalPlayerNameStripChar(gStringVar1, CHAR_SPACE);
StringExpandPlaceholders(gStringVar4, gText_WhatToDoWithVar1sMail);
DisplayItemMessageOnField(taskId, gStringVar4, Mailbox_PrintMailOptions);
}
@@ -724,7 +724,7 @@ static void Mailbox_FadeAndReadMail(u8 taskId)
{
sub_81D1EC0();
CleanupOverworldWindowsAndTilemaps();
- ReadMail(&(gSaveBlock1Ptr->mail[playerPCItemPageInfo.itemsAbove + 6 + playerPCItemPageInfo.cursorPos]), Mailbox_ReturnToFieldFromReadMail, TRUE);
+ ReadMail(&(gSaveBlock1Ptr->mail[playerPCItemPageInfo.itemsAbove + PARTY_SIZE + playerPCItemPageInfo.cursorPos]), Mailbox_ReturnToFieldFromReadMail, TRUE);
DestroyTask(taskId);
}
}
@@ -785,7 +785,7 @@ static void Mailbox_MoveToBagYesNoPrompt(u8 taskId)
static void Mailbox_DoMailMoveToBag(u8 taskId)
{
- struct MailStruct *mailStruct = &(gSaveBlock1Ptr->mail[playerPCItemPageInfo.itemsAbove + 6 + playerPCItemPageInfo.cursorPos]);
+ struct MailStruct *mailStruct = &(gSaveBlock1Ptr->mail[playerPCItemPageInfo.itemsAbove + PARTY_SIZE + playerPCItemPageInfo.cursorPos]);
if (!AddBagItem(mailStruct->itemId, 1))
{
DisplayItemMessageOnField(taskId, gText_BagIsFull, Mailbox_Cancel);
diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c
index 2a606f6fb..42330b6a5 100644
--- a/src/pokemon_icon.c
+++ b/src/pokemon_icon.c
@@ -1051,7 +1051,7 @@ u8 CreateMonIcon(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u
return spriteId;
}
-u8 sub_80D2D78(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, bool32 extra)
+u8 CreateMonIconNoPersonality(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, bool32 handleDeoxys)
{
u8 spriteId;
struct MonIconSpriteTemplate iconTemplate =
@@ -1064,7 +1064,7 @@ u8 sub_80D2D78(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8
.paletteTag = POKE_ICON_BASE_PAL_TAG + gMonIconPaletteIndices[species],
};
- iconTemplate.image = GetMonIconTiles(species, extra);
+ iconTemplate.image = GetMonIconTiles(species, handleDeoxys);
spriteId = CreateMonIconSprite(&iconTemplate, x, y, subpriority);
UpdateMonIconFrame(&gSprites[spriteId]);
@@ -1104,7 +1104,7 @@ u16 GetUnownLetterByPersonality(u32 personality)
return GET_UNOWN_LETTER(personality);
}
-u16 sub_80D2E84(u16 species)
+u16 GetIconSpeciesNoPersonality(u16 species)
{
u16 value;
diff --git a/src/trade.c b/src/trade.c
index b8551845b..5db85ceb8 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -3024,7 +3024,7 @@ static void TradeMons(u8 playerPartyIdx, u8 partnerPartyIdx)
struct Pokemon *partnerMon = &gEnemyParty[partnerPartyIdx];
u16 partnerMail = GetMonData(partnerMon, MON_DATA_MAIL);
- if (playerMail != 0xFF)
+ if (playerMail != MAIL_NONE)
ClearMailStruct(&gSaveBlock1Ptr->mail[playerMail]);
sTradeData->mon = *playerMon;
@@ -3035,7 +3035,7 @@ static void TradeMons(u8 playerPartyIdx, u8 partnerPartyIdx)
if (!GetMonData(playerMon, MON_DATA_IS_EGG))
SetMonData(playerMon, MON_DATA_FRIENDSHIP, &friendship);
- if (partnerMail != 0xFF)
+ if (partnerMail != MAIL_NONE)
GiveMailToMon2(playerMon, &gTradeMail[partnerMail]);
UpdatePokedexForReceivedMon(playerPartyIdx);
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 17:28:05 +0000