diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-12-17 22:24:57 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-17 22:24:57 -0600 |
| commit | 5f202c744b92dcde829c1d24ad323d824c769fec (patch) | |
| tree | 15de857c7971143ab1d7b66d8a950e5cc837f87d /src | |
| parent | 747a3b4b3e76db3a8f94bafcbe8d38e740850d59 (diff) | |
| parent | 386a20842e5587af34f71c57dfe1ddce1eb9d7eb (diff) | |
Merge pull request #707 from Sewef/anim-label
Some battle_anim labels.
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle/anim/hop.c | 2 | ||||
| -rw-r--r-- | src/battle/anim/normal.c | 2 | ||||
| -rw-r--r-- | src/battle/battle_anim_812C144.c | 6 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/battle/anim/hop.c b/src/battle/anim/hop.c index 4fb1a916c..4e3a74ffe 100644 --- a/src/battle/anim/hop.c +++ b/src/battle/anim/hop.c @@ -57,7 +57,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D671C = .callback = sub_80CB94C, }; -const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6734 = +const struct SpriteTemplate gFallingItemBagTemplate = { .tileTag = ANIM_TAG_ITEM_BAG, .paletteTag = ANIM_TAG_ITEM_BAG, diff --git a/src/battle/anim/normal.c b/src/battle/anim/normal.c index 3d4901448..d42549fc7 100644 --- a/src/battle/anim/normal.c +++ b/src/battle/anim/normal.c @@ -1772,7 +1772,7 @@ static void sub_80E3E64(u8 taskId) } } -void sub_80E4008(u8 taskId) +void AnimTask_GetBattleTerrain(u8 taskId) { gBattleAnimArgs[0] = gBattleTerrain; DestroyAnimVisualTask(taskId); diff --git a/src/battle/battle_anim_812C144.c b/src/battle/battle_anim_812C144.c index 0581cb855..bae4eef1d 100644 --- a/src/battle/battle_anim_812C144.c +++ b/src/battle/battle_anim_812C144.c @@ -888,7 +888,11 @@ const union AffineAnimCmd *const gSpriteAffineAnimTable_8402884[] = gSpriteAffineAnim_8402864, }; -const struct SpriteTemplate gBattleAnimSpriteTemplate_8402894 = +//arg[0]: frame (0-3) +//arg[1]: x +//arg[2]: y +//arg[3]: ??? (time on screen?) +const struct SpriteTemplate gPinkSmokeTemplate = { .tileTag = ANIM_TAG_PINK_CLOUD, .paletteTag = ANIM_TAG_PINK_CLOUD, |