ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #369 from garakmon/pan-constants

Browse Source 
Use sound pan constants in data/battle_anim_scripts.s
This commit is contained in:
Diegoisawesome 2018-10-19 20:27:54 -05:00 committed by GitHub
commit 2a3ba78831
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 1109 additions and 1097 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2092
data/battle_anim_scripts.s
View File

File diff suppressed because it is too large Load Diff

3
include/battle_anim.h
View File

@ -31,9 +31,6 @@ struct BattleAnimBackground
#define ANIM_ARGS_COUNT 8 #define ANIM_ARGS_COUNT 8
#define PAN_SIDE_PLAYER -64
#define PAN_SIDE_OPPONENT 63
extern void (*gAnimScriptCallback)(void); extern void (*gAnimScriptCallback)(void);
extern bool8 gAnimScriptActive; extern bool8 gAnimScriptActive;
extern u8 gAnimVisualTaskCount; extern u8 gAnimVisualTaskCount;

14
include/constants/battle_anim.h
View File

@ -313,6 +313,20 @@
#define ANIM_ATK_PARTNER 2 #define ANIM_ATK_PARTNER 2
#define ANIM_DEF_PARTNER 3 #define ANIM_DEF_PARTNER 3
// stereo panning constants [0-255]
//
// 0
// . .
// . .
// 192 . . 63
// . .
// . .
// . .
// 127
//
#define SOUND_PAN_ATTACKER -64
#define SOUND_PAN_TARGET 63
// move background ids // move background ids
#define BG_DARK_ 0 // the same as BG_DARK but is unused #define BG_DARK_ 0 // the same as BG_DARK but is unused
#define BG_DARK 1 #define BG_DARK 1

36
src/battle_anim.c
View File

@ -1262,39 +1262,39 @@ s8 BattleAnimAdjustPanning(s8 pan)
if (!IsContest() && gBattleSpritesDataPtr->healthBoxesData[gBattleAnimAttacker].statusAnimActive) if (!IsContest() && gBattleSpritesDataPtr->healthBoxesData[gBattleAnimAttacker].statusAnimActive)
{ {
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
pan = PAN_SIDE_OPPONENT; pan = SOUND_PAN_TARGET;
else else
pan = PAN_SIDE_PLAYER; pan = SOUND_PAN_ATTACKER;
} }
else if (IsContest()) else if (IsContest())
{ {
if (gBattleAnimAttacker != gBattleAnimTarget || gBattleAnimAttacker != 2 || pan != PAN_SIDE_OPPONENT) if (gBattleAnimAttacker != gBattleAnimTarget || gBattleAnimAttacker != 2 || pan != SOUND_PAN_TARGET)
pan *= -1; pan *= -1;
} }
else if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) else if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
{ {
if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER)
{ {
if (pan == PAN_SIDE_OPPONENT) if (pan == SOUND_PAN_TARGET)
pan = PAN_SIDE_PLAYER; pan = SOUND_PAN_ATTACKER;
else if (pan != PAN_SIDE_PLAYER) else if (pan != SOUND_PAN_ATTACKER)
pan *= -1; pan *= -1;
} }
} }
else if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_OPPONENT) else if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_OPPONENT)
{ {
if (pan == PAN_SIDE_PLAYER) if (pan == SOUND_PAN_ATTACKER)
pan = PAN_SIDE_OPPONENT; pan = SOUND_PAN_TARGET;
} }
else else
{ {
pan *= -1; pan *= -1;
} }
if (pan > PAN_SIDE_OPPONENT) if (pan > SOUND_PAN_TARGET)
pan = PAN_SIDE_OPPONENT; pan = SOUND_PAN_TARGET;
else if (pan < PAN_SIDE_PLAYER) else if (pan < SOUND_PAN_ATTACKER)
pan = PAN_SIDE_PLAYER; pan = SOUND_PAN_ATTACKER;
return pan; return pan;
} }
@ -1304,9 +1304,9 @@ s8 BattleAnimAdjustPanning2(s8 pan)
if (!IsContest() && gBattleSpritesDataPtr->healthBoxesData[gBattleAnimAttacker].statusAnimActive) if (!IsContest() && gBattleSpritesDataPtr->healthBoxesData[gBattleAnimAttacker].statusAnimActive)
{ {
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
pan = PAN_SIDE_OPPONENT; pan = SOUND_PAN_TARGET;
else else
pan = PAN_SIDE_PLAYER; pan = SOUND_PAN_ATTACKER;
} }
else else
{ {
@ -1320,10 +1320,10 @@ s16 KeepPanInRange(s16 panArg)
{ {
s16 pan = panArg; s16 pan = panArg;
if (pan > PAN_SIDE_OPPONENT) if (pan > SOUND_PAN_TARGET)
pan = PAN_SIDE_OPPONENT; pan = SOUND_PAN_TARGET;
else if (pan < PAN_SIDE_PLAYER) else if (pan < SOUND_PAN_ATTACKER)
pan = PAN_SIDE_PLAYER; pan = SOUND_PAN_ATTACKER;
return pan; return pan;
} }

12
src/battle_anim_sound_tasks.c
View File

@ -23,8 +23,8 @@ void sub_8158B30(u8 taskId)
gTasks[taskId].data[0] = gBattleAnimArgs[0]; gTasks[taskId].data[0] = gBattleAnimArgs[0];
gTasks[taskId].data[1] = gBattleAnimArgs[1]; gTasks[taskId].data[1] = gBattleAnimArgs[1];
pan1 = BattleAnimAdjustPanning(PAN_SIDE_PLAYER); pan1 = BattleAnimAdjustPanning(SOUND_PAN_ATTACKER);
pan2 = BattleAnimAdjustPanning(PAN_SIDE_OPPONENT); pan2 = BattleAnimAdjustPanning(SOUND_PAN_TARGET);
panIncrement = CalculatePanIncrement(pan1, pan2, 2); panIncrement = CalculatePanIncrement(pan1, pan2, 2);
gTasks[taskId].data[2] = pan1; gTasks[taskId].data[2] = pan1;
@ -64,7 +64,7 @@ static void sub_8158C04(u8 taskId)
s8 pan; s8 pan;
gTasks[taskId].data[10] = 0; gTasks[taskId].data[10] = 0;
pan = BattleAnimAdjustPanning(PAN_SIDE_OPPONENT); pan = BattleAnimAdjustPanning(SOUND_PAN_TARGET);
PlaySE12WithPanning(gTasks[taskId].data[1], pan); PlaySE12WithPanning(gTasks[taskId].data[1], pan);
if (++gTasks[taskId].data[11] == 2) if (++gTasks[taskId].data[11] == 2)
DestroyAnimSoundTask(taskId); DestroyAnimSoundTask(taskId);
@ -127,7 +127,7 @@ static void sub_8158D08(u8 taskId)
void sub_8158D8C(u8 taskId) void sub_8158D8C(u8 taskId)
{ {
u16 species = 0; u16 species = 0;
s8 pan = BattleAnimAdjustPanning(PAN_SIDE_PLAYER); s8 pan = BattleAnimAdjustPanning(SOUND_PAN_ATTACKER);
if (IsContest()) if (IsContest())
{ {
if (gBattleAnimArgs[0] == ANIM_ATTACKER) if (gBattleAnimArgs[0] == ANIM_ATTACKER)
@ -173,7 +173,7 @@ void sub_8158D8C(u8 taskId)
void sub_8158E9C(u8 taskId) void sub_8158E9C(u8 taskId)
{ {
u16 species = 0; u16 species = 0;
s8 pan = BattleAnimAdjustPanning(PAN_SIDE_PLAYER); s8 pan = BattleAnimAdjustPanning(SOUND_PAN_ATTACKER);
if (IsContest()) if (IsContest())
{ {
if (gBattleAnimArgs[0] == ANIM_ATTACKER) if (gBattleAnimArgs[0] == ANIM_ATTACKER)
@ -278,7 +278,7 @@ void sub_81590B8(u8 taskId)
s8 pan; s8 pan;
gTasks[taskId].data[10] = gBattleAnimArgs[0]; gTasks[taskId].data[10] = gBattleAnimArgs[0];
pan = BattleAnimAdjustPanning(PAN_SIDE_PLAYER); pan = BattleAnimAdjustPanning(SOUND_PAN_ATTACKER);
if (IsContest()) if (IsContest())
species = gContestResources->field_18->unk0; species = gContestResources->field_18->unk0;

6
src/battle_controller_link_opponent.c
View File

@ -1364,7 +1364,7 @@ static void LinkOpponentHandleFaintAnimation(void)
if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive) if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
{ {
gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0; gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_OPPONENT); PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_TARGET);
gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_FaintOpponentMon; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_FaintOpponentMon;
gBattlerControllerFuncs[gActiveBattler] = sub_8064C14; gBattlerControllerFuncs[gActiveBattler] = sub_8064C14;
} }
@ -1660,9 +1660,9 @@ static void LinkOpponentHandlePlaySE(void)
s8 pan; s8 pan;
if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER) if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
pan = PAN_SIDE_PLAYER; pan = SOUND_PAN_ATTACKER;
else else
pan = PAN_SIDE_OPPONENT; pan = SOUND_PAN_TARGET;
PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan); PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan);
LinkOpponentBufferExecCompleted(); LinkOpponentBufferExecCompleted();

6
src/battle_controller_link_partner.c
View File

@ -1187,7 +1187,7 @@ static void LinkPartnerHandleFaintAnimation(void)
{ {
gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0; gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_PLAYER); PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_ATTACKER);
gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0; gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0;
gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5;
gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8039C00; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8039C00;
@ -1485,9 +1485,9 @@ static void LinkPartnerHandlePlaySE(void)
s8 pan; s8 pan;
if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER) if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
pan = PAN_SIDE_PLAYER; pan = SOUND_PAN_ATTACKER;
else else
pan = PAN_SIDE_OPPONENT; pan = SOUND_PAN_TARGET;
PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan); PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan);
LinkPartnerBufferExecCompleted(); LinkPartnerBufferExecCompleted();

6
src/battle_controller_opponent.c
View File

@ -1402,7 +1402,7 @@ static void OpponentHandleFaintAnimation(void)
if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive) if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
{ {
gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0; gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_OPPONENT); PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_TARGET);
gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_FaintOpponentMon; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_FaintOpponentMon;
gBattlerControllerFuncs[gActiveBattler] = sub_805FAC4; gBattlerControllerFuncs[gActiveBattler] = sub_805FAC4;
} }
@ -1810,9 +1810,9 @@ static void OpponentHandlePlaySE(void)
s8 pan; s8 pan;
if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER) if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
pan = PAN_SIDE_PLAYER; pan = SOUND_PAN_ATTACKER;
else else
pan = PAN_SIDE_OPPONENT; pan = SOUND_PAN_TARGET;
PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan); PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan);
OpponentBufferExecCompleted(); OpponentBufferExecCompleted();

6
src/battle_controller_player.c
View File

@ -2407,7 +2407,7 @@ static void PlayerHandleFaintAnimation(void)
{ {
gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0; gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_PLAYER); PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_ATTACKER);
gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0; gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0;
gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5;
gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8039C00; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8039C00;
@ -2882,9 +2882,9 @@ static void PlayerHandlePlaySE(void)
s8 pan; s8 pan;
if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER) if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
pan = PAN_SIDE_PLAYER; pan = SOUND_PAN_ATTACKER;
else else
pan = PAN_SIDE_OPPONENT; pan = SOUND_PAN_TARGET;
PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan); PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan);
PlayerBufferExecCompleted(); PlayerBufferExecCompleted();

6
src/battle_controller_player_partner.c
View File

@ -1382,7 +1382,7 @@ static void PlayerPartnerHandleFaintAnimation(void)
{ {
gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0; gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler);
PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_PLAYER); PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_ATTACKER);
gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0; gSprites[gBattlerSpriteIds[gActiveBattler]].data[1] = 0;
gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5; gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 5;
gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8039C00; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = sub_8039C00;
@ -1739,9 +1739,9 @@ static void PlayerPartnerHandlePlaySE(void)
s8 pan; s8 pan;
if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER) if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
pan = PAN_SIDE_PLAYER; pan = SOUND_PAN_ATTACKER;
else else
pan = PAN_SIDE_OPPONENT; pan = SOUND_PAN_TARGET;
PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan); PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan);
PlayerPartnerBufferExecCompleted(); PlayerPartnerBufferExecCompleted();

6
src/battle_controller_recorded_opponent.c
View File

@ -1295,7 +1295,7 @@ static void RecordedOpponentHandleFaintAnimation(void)
if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive) if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive)
{ {
gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0; gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].animationState = 0;
PlaySE12WithPanning(SE_POKE_DEAD, PAN_SIDE_OPPONENT); PlaySE12WithPanning(SE_POKE_DEAD, SOUND_PAN_TARGET);
gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_FaintOpponentMon; gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_FaintOpponentMon;
gBattlerControllerFuncs[gActiveBattler] = sub_8186D58; gBattlerControllerFuncs[gActiveBattler] = sub_8186D58;
} }
@ -1603,9 +1603,9 @@ static void RecordedOpponentHandlePlaySE(void)
s8 pan; s8 pan;
if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER) if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
pan = PAN_SIDE_PLAYER; pan = SOUND_PAN_ATTACKER;
else else
pan = PAN_SIDE_OPPONENT; pan = SOUND_PAN_TARGET;
PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan); PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan);
RecordedOpponentBufferExecCompleted(); RecordedOpponentBufferExecCompleted();

4
src/battle_controller_recorded_player.c
View File

@ -1624,9 +1624,9 @@ static void RecordedPlayerHandlePlaySE(void)
s8 pan; s8 pan;
if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER) if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
pan = PAN_SIDE_PLAYER; pan = SOUND_PAN_ATTACKER;
else else
pan = PAN_SIDE_OPPONENT; pan = SOUND_PAN_TARGET;
PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan); PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan);
RecordedPlayerBufferExecCompleted(); RecordedPlayerBufferExecCompleted();

4
src/battle_controller_safari.c
View File

@ -594,9 +594,9 @@ static void SafariHandlePlaySE(void)
s8 pan; s8 pan;
if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER) if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
pan = PAN_SIDE_PLAYER; pan = SOUND_PAN_ATTACKER;
else else
pan = PAN_SIDE_OPPONENT; pan = SOUND_PAN_TARGET;
PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan); PlaySE12WithPanning(gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8), pan);
SafariBufferExecCompleted(); SafariBufferExecCompleted();

5
src/battle_interface.c
View File

@ -20,6 +20,7 @@
#include "international_string_util.h" #include "international_string_util.h"
#include "safari_zone.h" #include "safari_zone.h"
#include "battle_anim.h" #include "battle_anim.h"
#include "constants/battle_anim.h"
#include "constants/rgb.h" #include "constants/rgb.h"
#include "data2.h" #include "data2.h"
@ -1889,9 +1890,9 @@ static void SpriteCB_StatusSummaryBallsOnBattleStart(struct Sprite *sprite)
if (sprite->pos2.x == 0) if (sprite->pos2.x == 0)
{ {
pan = PAN_SIDE_OPPONENT; pan = SOUND_PAN_TARGET;
if (var1 != 0) if (var1 != 0)
pan = PAN_SIDE_PLAYER; pan = SOUND_PAN_ATTACKER;
if (sprite->data[7] != 0) if (sprite->data[7] != 0)
PlaySE2WithPanning(SE_TB_KARA, pan); PlaySE2WithPanning(SE_TB_KARA, pan);