diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-09-12 22:58:03 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-09-12 22:58:03 +0200 |
| commit | 8a81bd1bce852e58efb9f48f4e8db225a3ee2f15 (patch) | |
| tree | f8e813baa253f7c06200a666997e9026409b9544 /src | |
| parent | 10b479a3cae98a1fa955a4fc5461bace1f630352 (diff) | |
Sync battle anim labels with pokeruby
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_anim.c | 3 | ||||
| -rw-r--r-- | src/battle_gfx_sfx_util.c | 4 | ||||
| -rw-r--r-- | src/item_menu_icons.c | 8 |
3 files changed, 6 insertions, 9 deletions
diff --git a/src/battle_anim.c b/src/battle_anim.c index 8f9b60b60..36aa803fe 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; diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 23ed8a19f..6cb5ef070 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -29,7 +29,7 @@ extern struct MusicPlayerInfo gMPlayInfo_SE2; extern struct MusicPlayerInfo gMPlayInfo_BGM; extern const u8 gUnknown_0831C604[]; -extern const u8 * const gBattleAnims_VariousTable[]; +extern const u8 * const gBattleAnims_General[]; extern const u8 * const gBattleAnims_Special[]; extern const struct CompressedSpriteSheet gMonFrontPicTable[]; extern const struct CompressedSpriteSheet gMonBackPicTable[]; @@ -437,7 +437,7 @@ bool8 TryHandleLaunchBattleTableAnimation(u8 activeBattler, u8 atkBattler, u8 de gBattleAnimAttacker = atkBattler; gBattleAnimTarget = defBattler; gBattleSpritesDataPtr->animationData->animArg = argument; - LaunchBattleAnimation(gBattleAnims_VariousTable, tableId, FALSE); + LaunchBattleAnimation(gBattleAnims_General, tableId, FALSE); taskId = CreateTask(Task_ClearBitWhenBattleTableAnimDone, 10); gTasks[taskId].tBattlerId = activeBattler; gBattleSpritesDataPtr->healthBoxesData[gTasks[taskId].tBattlerId].animFromTableActive = 1; diff --git a/src/item_menu_icons.c b/src/item_menu_icons.c index f12bb454e..1684e9b3d 100644 --- a/src/item_menu_icons.c +++ b/src/item_menu_icons.c @@ -414,7 +414,7 @@ static const struct SpriteTemplate gUnknown_0857FE10 = .callback = SpriteCallbackDummy, }; -const struct SpriteTemplate gUnknown_0857FE28 = +const struct SpriteTemplate gHorizontalLungeSpriteTemplate = { .tileTag = 0, .paletteTag = 0, @@ -425,7 +425,7 @@ const struct SpriteTemplate gUnknown_0857FE28 = .callback = sub_80D5860, }; -const struct SpriteTemplate gUnknown_0857FE40 = +const struct SpriteTemplate gVerticalDipSpriteTemplate = { .tileTag = 0, .paletteTag = 0, @@ -436,7 +436,7 @@ const struct SpriteTemplate gUnknown_0857FE40 = .callback = sub_80D58F8, }; -const struct SpriteTemplate gUnknown_0857FE58 = +const struct SpriteTemplate gSlideMonToOriginalPosSpriteTemplate = { .tileTag = 0, .paletteTag = 0, @@ -447,7 +447,7 @@ const struct SpriteTemplate gUnknown_0857FE58 = .callback = sub_80D5968, }; -const struct SpriteTemplate gUnknown_0857FE70 = +const struct SpriteTemplate gSlideMonToOffsetSpriteTemplate = { .tileTag = 0, .paletteTag = 0, |