diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-10-06 08:20:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-06 08:20:41 -0500 |
| commit | b9e38a569eac79572fa0676b82e2d755e30b1357 (patch) | |
| tree | 9d3b25dec0536b47a88cc190773794ff53c1b95c /src/battle_anim.c | |
| parent | 3d50d01a93314569a3b647bf52c87b52c1dcf41c (diff) | |
| parent | 17c5b4089ae0477c8500f6d2ccd686a75aab784e (diff) | |
Merge pull request #320 from DizzyEggg/anims
Document battle animation scripts
Diffstat (limited to 'src/battle_anim.c')
| -rw-r--r-- | src/battle_anim.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/battle_anim.c b/src/battle_anim.c index 2d514c955..ebaa8c6de 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -16,9 +16,6 @@ #include "palette.h" #include "main.h" -// sprites start at 10000 and thus must be subtracted of 10000 to account for the true index. -#define GET_TRUE_SPRITE_INDEX(i) ((i - 10000)) - #define ANIM_SPRITE_INDEX_COUNT 8 extern u16 gBattle_WIN0H; @@ -33,8 +30,8 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM; extern struct MusicPlayerInfo gMPlayInfo_SE1; extern struct MusicPlayerInfo gMPlayInfo_SE2; -extern const u16 gUnknown_082C8D64[]; -extern const u8 * const gBattleAnims_Moves[]; +extern const u16 gMovesWithQuietBGM[]; +extern const u8 *const gBattleAnims_Moves[]; extern const struct CompressedSpriteSheet gBattleAnimPicTable[]; extern const struct CompressedSpritePalette gBattleAnimPaletteTable[]; extern const struct BattleAnimBackground gBattleAnimBackgroundTable[]; @@ -260,9 +257,9 @@ void LaunchBattleAnimation(const u8 *const animsTable[], u16 tableId, bool8 isMo if (isMoveAnim) { - for (i = 0; gUnknown_082C8D64[i] != 0xFFFF; i++) + for (i = 0; gMovesWithQuietBGM[i] != 0xFFFF; i++) { - if (tableId == gUnknown_082C8D64[i]) + if (tableId == gMovesWithQuietBGM[i]) { m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 128); break; |