From 3e98b529ae856b4d6f35e365e093af76d8f1e02c Mon Sep 17 00:00:00 2001 From: Sewef Date: Mon, 12 Nov 2018 14:00:35 +0100 Subject: gBattleAnimSpriteTemplate_83D6734 --- src/battle/anim/hop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/battle/anim/hop.c') diff --git a/src/battle/anim/hop.c b/src/battle/anim/hop.c index dcf8ed702..a40ee2a43 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, -- cgit v1.2.3 From 00be991c66d37d090792db8bc1e4c1b9f9e88536 Mon Sep 17 00:00:00 2001 From: shinny456 Date: Mon, 17 Dec 2018 18:12:00 -0500 Subject: gAnimBankAttacker/Target to gBattleAnimAttacker/Target --- src/battle/anim/hop.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/battle/anim/hop.c') diff --git a/src/battle/anim/hop.c b/src/battle/anim/hop.c index dcf8ed702..4fb1a916c 100644 --- a/src/battle/anim/hop.c +++ b/src/battle/anim/hop.c @@ -4,8 +4,8 @@ #include "battle_anim.h" extern s16 gBattleAnimArgs[]; -extern u8 gAnimBankAttacker; -extern u8 gAnimBankTarget; +extern u8 gBattleAnimAttacker; +extern u8 gBattleAnimTarget; void sub_80CB94C(struct Sprite* sprite); void sub_80CBA28(struct Sprite* sprite); @@ -150,9 +150,9 @@ void sub_80CB94C(struct Sprite* sprite) s16 e1; s16 e2; InitAnimSpritePos(sprite, 0); - e1 = GetBattlerSpriteCoord(gAnimBankTarget, 0); - e2 = GetBattlerSpriteCoord(gAnimBankTarget, 1); - if ((gAnimBankAttacker ^ 2) == gAnimBankTarget) + e1 = GetBattlerSpriteCoord(gBattleAnimTarget, 0); + e2 = GetBattlerSpriteCoord(gBattleAnimTarget, 1); + if ((gBattleAnimAttacker ^ 2) == gBattleAnimTarget) { sprite->data[6] = e1; sprite->data[7] = e2 + 10; @@ -193,8 +193,8 @@ void sub_80CB9C4(struct Sprite* sprite) void sub_80CBA28(struct Sprite* sprite) { - s16 e = GetBattlerSpriteCoord(gAnimBankTarget, 1); - if (GetBattlerSide(gAnimBankTarget) == 0) + s16 e = GetBattlerSpriteCoord(gBattleAnimTarget, 1); + if (GetBattlerSide(gBattleAnimTarget) == 0) { sprite->data[6] = 0; sprite->data[7] = e + 10; -- cgit v1.2.3