From 2c6849bee81f2c05cbf0df1f88c6d5460e7b1e2d Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 13 Dec 2018 21:33:54 -0600 Subject: Decompile battle_anim_8170478.c (#445) --- src/battle_anim.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/battle_anim.c') diff --git a/src/battle_anim.c b/src/battle_anim.c index 95c6f7b3c..5e62c0957 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -26,8 +26,6 @@ extern struct MusicPlayerInfo gMPlayInfo_SE2; 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[]; // this file's functions -- cgit v1.2.3 From 60484153a5630bfe88c1623b7ec1cf7052d67752 Mon Sep 17 00:00:00 2001 From: shinny456 Date: Sun, 16 Dec 2018 22:23:05 -0500 Subject: decompile electric.s --- src/battle_anim.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/battle_anim.c') diff --git a/src/battle_anim.c b/src/battle_anim.c index 5e62c0957..c3fa2e2aa 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -1656,7 +1656,7 @@ static void ScriptCmd_createsprite(void) else argVar *= -1; - subpriority = sub_80A82E4(gBattleAnimTarget) + (s8)(argVar); + subpriority = GetBattlerSubpriority(gBattleAnimTarget) + (s8)(argVar); } else { @@ -1665,7 +1665,7 @@ static void ScriptCmd_createsprite(void) else argVar *= -1; - subpriority = sub_80A82E4(gBattleAnimAttacker) + (s8)(argVar); + subpriority = GetBattlerSubpriority(gBattleAnimAttacker) + (s8)(argVar); } if (subpriority < 3) -- cgit v1.2.3 From c74468fd11b551e1babf18a4d320e114fe495bd8 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 17 Dec 2018 22:08:08 -0600 Subject: Document a bunch of battle anim stuff --- src/battle_anim.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/battle_anim.c') diff --git a/src/battle_anim.c b/src/battle_anim.c index c3fa2e2aa..88c548208 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -1656,7 +1656,7 @@ static void ScriptCmd_createsprite(void) else argVar *= -1; - subpriority = GetBattlerSubpriority(gBattleAnimTarget) + (s8)(argVar); + subpriority = GetBattlerSpriteSubpriority(gBattleAnimTarget) + (s8)(argVar); } else { @@ -1665,7 +1665,7 @@ static void ScriptCmd_createsprite(void) else argVar *= -1; - subpriority = GetBattlerSubpriority(gBattleAnimAttacker) + (s8)(argVar); + subpriority = GetBattlerSpriteSubpriority(gBattleAnimAttacker) + (s8)(argVar); } if (subpriority < 3) -- cgit v1.2.3 From b7ce383a9673b9e4ddfdc8dc5b70248801dc7e20 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 19 Dec 2018 21:13:26 -0600 Subject: Document a bunch of battle anims --- src/battle_anim.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src/battle_anim.c') diff --git a/src/battle_anim.c b/src/battle_anim.c index 88c548208..1e1219800 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -1671,7 +1671,11 @@ static void ScriptCmd_createsprite(void) if (subpriority < 3) subpriority = 3; - CreateSpriteAndAnimate(template, GetBattlerSpriteCoord(gBattleAnimTarget, 2), GetBattlerSpriteCoord(gBattleAnimTarget, 3), subpriority); + CreateSpriteAndAnimate( + template, + GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2), + GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET), + subpriority); gAnimVisualTaskCount++; } @@ -3029,12 +3033,12 @@ static void ScriptCmd_doublebattle_2D(void) { if (wantedBattler == ANIM_ATTACKER) { - r4 = sub_80A8364(gBattleAnimAttacker); + r4 = GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker); spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER); } else { - r4 = sub_80A8364(gBattleAnimTarget); + r4 = GetBattlerSpriteBGPriorityRank(gBattleAnimTarget); spriteId = GetAnimBattlerSpriteId(ANIM_TARGET); } if (spriteId != 0xFF) @@ -3064,12 +3068,12 @@ static void ScriptCmd_doublebattle_2E(void) { if (wantedBattler == ANIM_ATTACKER) { - r4 = sub_80A8364(gBattleAnimAttacker); + r4 = GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker); spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER); } else { - r4 = sub_80A8364(gBattleAnimTarget); + r4 = GetBattlerSpriteBGPriorityRank(gBattleAnimTarget); spriteId = GetAnimBattlerSpriteId(ANIM_TARGET); } -- cgit v1.2.3