Merge branch 'master' into sprite-tags

2018-10-21 15:12:18 -04:00
parent 2bb286ab4e 804d0a4b6a
commit 7a9c7e5f06
73 changed files with 8366 additions and 8378 deletions
--- a/include/constants/battle_anim.h
+++ b/include/constants/battle_anim.h
@@ -306,6 +306,20 @@
 #define ANIM_ATK_PARTNER 2
 #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
 #define BG_DARK_ 0 // the same as BG_DARK but is unused
 #define BG_DARK 1