diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-10-31 18:39:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-31 18:39:57 -0500 |
| commit | 425cb7ec71d549bed0a73bb864c3f33a1c89f1c4 (patch) | |
| tree | 075711ed6e5c746d9fdca165989ca86d8ef39710 | |
| parent | 9d62ad060b05848a0cad1f09881c3863596455fd (diff) | |
| parent | 3367b2eb1aa91b79f3398826cd6ac89957dcd202 (diff) | |
Merge pull request #699 from garakmon/song
move sound pan constants
| -rw-r--r-- | include/battle_anim.h | 1 | ||||
| -rw-r--r-- | include/constants/battle_anim.h | 15 | ||||
| -rw-r--r-- | include/constants/songs.h | 15 |
3 files changed, 15 insertions, 16 deletions
diff --git a/include/battle_anim.h b/include/battle_anim.h index 18ffd80d2..d355d9954 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -2,7 +2,6 @@ #define GUARD_BATTLEANIM_H #include "constants/battle_anim.h" -#include "constants/songs.h" #include "sprite.h" diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index 687ff15d5..a2c3eda15 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -306,6 +306,21 @@ #define ANIM_BANK_ATK_PARTNER 2 #define ANIM_BANK_DEF_PARTNER 3 +// stereo panning constants [0-255] +// +// 0 +// . . +// . . +// 192 . . 63 +// . . +// . . +// . . +// 127 +// +#define SOUND_PAN_TARGET 63 +#define SOUND_PAN_ATTACKER 192 +#define SOUND_PAN_ATTACKER_NEG -64 + // move background ids #define BG_DARK_ 0 // the same as BG_DARK but is unused #define BG_DARK 1 diff --git a/include/constants/songs.h b/include/constants/songs.h index 1fa0cee4c..45e3d335a 100644 --- a/include/constants/songs.h +++ b/include/constants/songs.h @@ -1,21 +1,6 @@ #ifndef GUARD_CONSTANTS_SONGS_H #define GUARD_CONSTANTS_SONGS_H -// stereo panning constants [0-255] -// -// 0 -// . . -// . . -// 192 . . 63 -// . . -// . . -// . . -// 127 -// -#define SOUND_PAN_TARGET 63 -#define SOUND_PAN_ATTACKER 192 -#define SOUND_PAN_ATTACKER_NEG -64 - #define SE_STOP 0 #define SE_KAIFUKU 1 // Healing Item #define SE_PC_LOGON 2 // PC Logon |