diff options
| author | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-06 22:52:10 +0100 |
|---|---|---|
| committer | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-06 22:52:10 +0100 |
| commit | dcecc8aebfd2480d6e79f3c1f54b737ecbb319f8 (patch) | |
| tree | 269aa3818b69d5379194ffff713ed5d7f4576160 /src/battle/battle_7.c | |
| parent | 344b8bffbb969cca8b1c23ddf994c0c8ec6fe1f8 (diff) | |
| parent | 680d3fd7b980578024226eccffe2e01072826227 (diff) | |
merge with master
Diffstat (limited to 'src/battle/battle_7.c')
| -rw-r--r-- | src/battle/battle_7.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/battle/battle_7.c b/src/battle/battle_7.c index 7ca9ac3c4..e11971606 100644 --- a/src/battle/battle_7.c +++ b/src/battle/battle_7.c @@ -3,6 +3,7 @@ #include "battle_anim.h" #include "battle_interface.h" #include "blend_palette.h" +#include "contest.h" #include "data2.h" #include "decompress.h" #include "main.h" @@ -629,9 +630,9 @@ void sub_8031FC4(u8 a, u8 b, bool8 c) if (IsContest()) { r10 = 0; - species = ewram19348.unk2; - personalityValue = ewram19348.unk8; - otId = ewram19348.unkC; + species = shared19348.unk2; + personalityValue = shared19348.unk8; + otId = shared19348.unkC; HandleLoadSpecialPokePic( &gMonBackPicTable[species], gMonBackPicCoords[species].coords, @@ -639,7 +640,7 @@ void sub_8031FC4(u8 a, u8 b, bool8 c) eVoidSharedArr2, gUnknown_081FAF4C[0], species, - ewram19348.unk10); + shared19348.unk10); } else { |