summaryrefslogtreecommitdiff
path: root/src/battle
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle')
-rw-r--r--src/battle/anim/dark.c2
-rw-r--r--src/battle/anim/normal.c10
-rw-r--r--src/battle/anim/sfx.c3
3 files changed, 6 insertions, 9 deletions
diff --git a/src/battle/anim/dark.c b/src/battle/anim/dark.c
index f09ddfcf0..de64599c2 100644
--- a/src/battle/anim/dark.c
+++ b/src/battle/anim/dark.c
@@ -864,7 +864,7 @@ void sub_80E0A4C(u8 taskId)
if (IsContest())
{
- species = EWRAM_19348[0];
+ species = gContestResources__moveAnim.species;
}
else
{
diff --git a/src/battle/anim/normal.c b/src/battle/anim/normal.c
index 6ab501cf1..9a31fcf37 100644
--- a/src/battle/anim/normal.c
+++ b/src/battle/anim/normal.c
@@ -1227,7 +1227,7 @@ void sub_80E2F2C(u8 taskId)
if (IsContest())
{
- species = eWRAM_19348Struct->species2;
+ species = gContestResources__moveAnim.species;
}
else
{
@@ -1364,7 +1364,7 @@ static void sub_80E3338(u8 taskId)
if (IsContest())
{
- species = eWRAM_19348Struct->species2;
+ species = gContestResources__moveAnim.species;
}
else
{
@@ -1694,7 +1694,7 @@ void sub_80E3C4C(u8 taskId, int unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5,
if (IsContest())
{
- species = eWRAM_19348Struct->species2;
+ species = gContestResources__moveAnim.species;
}
else
{
@@ -1816,7 +1816,7 @@ void sub_80E4028(u8 taskId)
}
offset = gBattleAnimArgs[1] * 32;
- dest = IsContest() ? &ewram14800[offset] : &ewram18000_2[offset];
+ dest = IsContest() ? &((u8 *)EWRAM_14800)[offset] : &((u8 *)ewram18000)[offset];
// This doesn't match when u16* is used.
memcpy(dest, &((u8 *)gPlttBufferUnfaded)[i * 32], 32);
DestroyAnimVisualTask(taskId);
@@ -1851,7 +1851,7 @@ void sub_80E40D0(u8 taskId)
dest = &((u8 *)gPlttBufferUnfaded)[i * 32];
offset = gBattleAnimArgs[1] * 32;
- src = IsContest() ? &ewram14800[offset] : &ewram18000_2[offset];
+ src = IsContest() ? &((u8 *)EWRAM_14800)[offset] : &((u8 *)ewram18000)[offset];
// This doesn't match when u16* is used.
memcpy(dest, src, 32);
DestroyAnimVisualTask(taskId);
diff --git a/src/battle/anim/sfx.c b/src/battle/anim/sfx.c
index a22e96428..349716e74 100644
--- a/src/battle/anim/sfx.c
+++ b/src/battle/anim/sfx.c
@@ -137,9 +137,6 @@ static void sub_812B108(u8 taskId)
}
}
-// #define gContestResources__moveAnim (*(struct ContestMoveAnim *)(gSharedMem + 0x19348))
-// #define EWRAM_19348 (*(u16 *)(gSharedMem + 0x19348))
-
// used in 3 moves:
// Move_HOWL, Move_ROAR, Move_GROWL
void sub_812B18C(u8 taskId)