summaryrefslogtreecommitdiff
path: root/src/battle
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2021-06-23 11:10:02 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2021-06-23 11:10:02 -0400
commitd461cbcaa18e282f0a1ac5954298f2185a69b7c5 (patch)
tree99ce725ce6b91e9d340fad0b07ad2deae08327cf /src/battle
parent6e9821ca07a64ee09129038286aaba3eb1825946 (diff)
Sync more function names from Emerald
Diffstat (limited to 'src/battle')
-rw-r--r--src/battle/anim/sfx.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle/anim/sfx.c b/src/battle/anim/sfx.c
index 9bc88e258..a22e96428 100644
--- a/src/battle/anim/sfx.c
+++ b/src/battle/anim/sfx.c
@@ -137,7 +137,7 @@ static void sub_812B108(u8 taskId)
}
}
-// #define shared19348 (*(struct UnknownContestStruct8 *)(gSharedMem + 0x19348))
+// #define gContestResources__moveAnim (*(struct ContestMoveAnim *)(gSharedMem + 0x19348))
// #define EWRAM_19348 (*(u16 *)(gSharedMem + 0x19348))
// used in 3 moves:
@@ -150,7 +150,7 @@ void sub_812B18C(u8 taskId)
if (IsContest())
{
if (!gBattleAnimArgs[0])
- species = shared19348.unk0;
+ species = gContestResources__moveAnim.species;
else
DestroyAnimVisualTask(taskId);
}
@@ -200,7 +200,7 @@ void sub_812B2B8(u8 taskId)
s8 pan = BattleAnimAdjustPanning(SOUND_PAN_ATTACKER_NEG);
if (IsContest())
- species = shared19348.unk0;
+ species = gContestResources__moveAnim.species;
else
species = gAnimSpeciesByBanks[gBattleAnimAttacker];