diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-07-20 12:11:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-20 12:11:46 -0400 |
| commit | 4d5c1ca03b4e7db3c44c71afaa01b1549a282a19 (patch) | |
| tree | ec2e9ec5f3e4a6d8523e80ab58e6c9c296fbc05c /src/contest.c | |
| parent | 3f762629e830c0cad66c4efeea5b918bdf4cce20 (diff) | |
| parent | 6edacdee36d31b2df69559f28a33b8d9e958bf5e (diff) | |
Merge pull request #732 from PikalaxALT/modern_gcc
Modernize code for compatibility with later releases of GCC
Diffstat (limited to 'src/contest.c')
| -rw-r--r-- | src/contest.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/contest.c b/src/contest.c index eb3252f72..869300a92 100644 --- a/src/contest.c +++ b/src/contest.c @@ -269,8 +269,6 @@ extern const u8 gText_Contest_Fear[]; extern const u8 gText_BDot[]; extern const u8 gText_CDot[]; extern const u8 *const gUnknown_08587E10[]; -extern const struct SpriteTemplate gSpriteTemplate_8587AD0; -extern const struct SpriteTemplate gSpriteTemplate_8587B18[]; extern void (*const gContestEffectFuncs[])(void); static const u8 gUnknown_08587A6C[] = @@ -1268,7 +1266,7 @@ static void sub_80D8108(u8 taskId) gTasks[taskId].data[0]++; break; case 1: - (s16)gBattle_BG1_Y += 7; + *(s16*)&gBattle_BG1_Y += 7; if ((s16)gBattle_BG1_Y <= 160) break; gTasks[taskId].data[0]++; |