diff options
| author | Kurausukun <lord.uber1@gmail.com> | 2021-03-19 14:34:58 -0400 |
|---|---|---|
| committer | Kurausukun <lord.uber1@gmail.com> | 2021-03-19 14:34:58 -0400 |
| commit | c94e5e9ab0b2b65c8c6275f84043807b2743d6f2 (patch) | |
| tree | b188427bb1942695f32e14ee3fe137855d638c8c /src/data.c | |
| parent | 0643255c85d0ebd5212e731c9fad3b43d0d99a10 (diff) | |
| parent | ed16a7409ae9c808a110975dec1930f9f949a6d6 (diff) | |
Merge remote-tracking branch 'upstream/master' into port_matchings
Diffstat (limited to 'src/data.c')
| -rw-r--r-- | src/data.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/data.c b/src/data.c index 6b4e113af..3f6a340eb 100644 --- a/src/data.c +++ b/src/data.c @@ -8,7 +8,7 @@ #include "constants/battle_ai.h" #include "constants/trainer_classes.h" -const struct SpriteFrameImage gUnknown_8234698[] = +const struct SpriteFrameImage gSpriteImages_BattlerPlayerLeft[] = { gHeap + 0x8000, 0x800, gHeap + 0x8800, 0x800, @@ -16,7 +16,7 @@ const struct SpriteFrameImage gUnknown_8234698[] = gHeap + 0x9800, 0x800, }; -const struct SpriteFrameImage gUnknown_82346B8[] = +const struct SpriteFrameImage gSpriteImages_BattlerOpponentLeft[] = { gHeap + 0xA000, 0x800, gHeap + 0xA800, 0x800, @@ -24,7 +24,7 @@ const struct SpriteFrameImage gUnknown_82346B8[] = gHeap + 0xB800, 0x800, }; -const struct SpriteFrameImage gUnknown_82346D8[] = +const struct SpriteFrameImage gSpriteImages_BattlerPlayerRight[] = { gHeap + 0xC000, 0x800, gHeap + 0xC800, 0x800, @@ -32,7 +32,7 @@ const struct SpriteFrameImage gUnknown_82346D8[] = gHeap + 0xD800, 0x800, }; -const struct SpriteFrameImage gUnknown_82346F8[] = +const struct SpriteFrameImage gSpriteImages_BattlerOpponentRight[] = { gHeap + 0xE000, 0x800, gHeap + 0xE800, 0x800, @@ -168,7 +168,7 @@ static const union AffineAnimCmd gSpriteAffineAnim_82348B0[] = AFFINEANIMCMD_END, }; -const union AffineAnimCmd *const gSpriteAffineAnimTable_82348C8[] = +const union AffineAnimCmd *const gSpriteAffineAnimTable_BattlerPlayer[] = { gSpriteAffineAnim_82347F8, gSpriteAffineAnim_8234818, @@ -208,7 +208,7 @@ static const union AffineAnimCmd gSpriteAffineAnim_8234934[] = AFFINEANIMCMD_END, }; -const union AffineAnimCmd *const gSpriteAffineAnimTable_8234944[] = +const union AffineAnimCmd *const gSpriteAffineAnimTable_BattlerOpponent[] = { gSpriteAffineAnim_82347F8, gSpriteAffineAnim_8234818, |