diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-01-19 20:49:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-19 20:49:58 -0500 |
| commit | 6999b237ebbc36c3aa751335027bcba6b5b3556f (patch) | |
| tree | 993f5737fbe70a21f062e7d18908267a456f145d /src/mail.c | |
| parent | c2ddb92c9e0905a6625f83f7b5e0936b630c0597 (diff) | |
| parent | 752982552e212dcb33d57c66342f87eba3ce9089 (diff) | |
Merge pull request #1309 from GriffinRichards/misc-macro
Use constants for item data, misc other constants/fixes
Diffstat (limited to 'src/mail.c')
| -rw-r--r-- | src/mail.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mail.c b/src/mail.c index 04464f06b..71e98b42a 100644 --- a/src/mail.c +++ b/src/mail.c @@ -125,7 +125,7 @@ static void CB2_ExitMailReadFreeVars(void); // .rodata -static const struct BgTemplate sUnknown_0859F290[] = { +static const struct BgTemplate sBgTemplates[] = { { .bg = 0, .charBaseIndex = 2, @@ -254,7 +254,7 @@ void ReadMail(struct MailStruct *mail, void (*callback)(void), bool8 flag) sMailRead->parserMultiple = ConvertEasyChatWordsToString; if (IS_ITEM_MAIL(mail->itemId)) { - sMailRead->mailType = mail->itemId - ITEM_ORANGE_MAIL; + sMailRead->mailType = mail->itemId - FIRST_MAIL_INDEX; } else { @@ -279,10 +279,10 @@ void ReadMail(struct MailStruct *mail, void (*callback)(void), bool8 flag) default: sMailRead->animsActive = 0; break; - case ITEM_BEAD_MAIL - ITEM_ORANGE_MAIL: + case ITEM_BEAD_MAIL - FIRST_MAIL_INDEX: sMailRead->animsActive = 1; break; - case ITEM_DREAM_MAIL - ITEM_ORANGE_MAIL: + case ITEM_DREAM_MAIL - FIRST_MAIL_INDEX: sMailRead->animsActive = 2; break; } @@ -336,7 +336,7 @@ static bool8 MailReadBuildGraphics(void) break; case 6: ResetBgsAndClearDma3BusyFlags(0); - InitBgsFromTemplates(0, sUnknown_0859F290, 3); + InitBgsFromTemplates(0, sBgTemplates, ARRAY_COUNT(sBgTemplates)); SetBgTilemapBuffer(1, sMailRead->bg1TilemapBuffer); SetBgTilemapBuffer(2, sMailRead->bg2TilemapBuffer); break; |