diff options
author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-11-03 09:28:45 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-03 09:28:45 -0500 |
commit | 99dd461befcfe3bef3ce188fea2fb372c2f21b98 (patch) | |
tree | 2b0198d394186c371987f018677d12f929a66a44 /src/match_call.c | |
parent | 9e55ae22b19d58eca8fc0cdd2fcea9f2cca14319 (diff) | |
parent | ca950a8daf6dd95ab5dacc51f250fea7b605361c (diff) |
Merge pull request #1189 from aaaaaa123456789/reverts
Undo PokeCodec's PRs and port changes
Diffstat (limited to 'src/match_call.c')
-rw-r--r-- | src/match_call.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/match_call.c b/src/match_call.c index 944d85b8f..a39739f76 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -1334,7 +1334,7 @@ static void InitMatchCallTextPrinter(int windowId, const u8 *str) printerTemplate.currentY = 1; printerTemplate.letterSpacing = 0; printerTemplate.lineSpacing = 0; - printerTemplate.style = 0; + printerTemplate.unk = 0; printerTemplate.fgColor = 10; printerTemplate.bgColor = 8; printerTemplate.shadowColor = 14; @@ -1773,7 +1773,7 @@ static int GetNumOwnedBadges(void) static bool32 sub_8196D74(int matchCallId) { int dayCount; - u32 otId; + int otId; u16 easyChatWord; int numRematchTrainersFought; int var0, var1, var2; |