diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-29 14:38:54 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-29 14:38:54 -0400 |
| commit | 849725d85e7379c939c459f1e38e9693e24fc378 (patch) | |
| tree | 8b5ce744d958a3ff51eb43b784af89bb448d436e | |
| parent | 4b9835fbdf223072589325f4273275c55072d72c (diff) | |
Merge battle structs at 17810
| -rw-r--r-- | include/ewram.h | 1 | ||||
| -rw-r--r-- | src/battle_anim.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/ewram.h b/include/ewram.h index 45762bcc3..2528b62d1 100644 --- a/include/ewram.h +++ b/include/ewram.h @@ -163,7 +163,6 @@ extern u8 gSharedMem[]; #define eCableCar1 ((struct CableCarEwramStruct1 *)(gSharedMem + 0x17000)) #define gBattleSpriteInfo ((struct BattleSpriteInfo *) (gSharedMem + 0x17800)) #define ewram17810 ((struct Struct2017810 *) (gSharedMem + 0x17810)) -#define EWRAM_17810 ((struct UnknownStruct3 *)(gSharedMem + 0x17810)) #define ewram17840 (*(struct Struct2017840 *) (gSharedMem + 0x17840)) #define ewram17850 ((struct UnknownStruct5 *)(gSharedMem + 0x17850)) #define EWRAM_18000 ((u16 *)(gSharedMem + 0x18000)) diff --git a/src/battle_anim.c b/src/battle_anim.c index 788dc210b..8516c62f1 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -2526,7 +2526,7 @@ static void ScriptCmd_changebg(void) s8 BattleAnimAdjustPanning(s8 pan) { - if (!IsContest() && (EWRAM_17810[gBattleAnimAttacker].unk0 & 0x10)) + if (!IsContest() && ewram17810[gBattleAnimAttacker].unk0_4) { if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) pan = SOUND_PAN_TARGET; @@ -2568,7 +2568,7 @@ s8 BattleAnimAdjustPanning(s8 pan) s8 BattleAnimAdjustPanning2(s8 pan) { - if (!IsContest() && (EWRAM_17810[gBattleAnimAttacker].unk0 & 0x10)) + if (!IsContest() && ewram17810[gBattleAnimAttacker].unk0_4) { if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) pan = SOUND_PAN_TARGET; |