diff options
| author | camthesaxman <cameronghall@cox.net> | 2018-01-06 12:27:27 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2018-01-06 12:27:27 -0600 |
| commit | b3551bc2f328c286c6ecc45ea288665d46b44260 (patch) | |
| tree | 073770933fd52f710691952c4ddb8d27b258937d /src/battle/battle_7.c | |
| parent | 818dfa314e1658ab797af686fedd464c9fda6557 (diff) | |
fix some code and formatting anomalies
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 { |