Merge branch 'master' of https://github.com/SBird1337/source_of_the_sovereign

sots-private

-Subproject commit fcd659ca46df13d14f4f9cc3bbacd7b5212c62aa
+Subproject commit 158d1fb72312d2f213e0452ea9acc3e6aa8e28bc

src/music/battle_music_lookup.c

             res = 481;
             break;
         case 22:
-            res = 471;
+            res = 498;
             break;
         case 23:
-            res = 471;
+            res = 498;
             break;
         case 24:
             res = 473;
             res = 490;
             break;
         case 34:
-            res = 472;
+            res = 497;
             break;
         case 35:
-            res = 472;
+            res = 497;
             break;
         case 36:
             res = 471;
             res = 490;
             break;
         case 40:
-            res = 472;
+            res = 499;
             break;
         case 41:
             res = 491;

src/music/main_mixer.s

 
         MOV     R12, R0             @ left sample #1
         CMP     R12, #0x40000000
-        MOVGE   R12, #0x3F800000
+        MOVGE   R12, #0x3FC00000
         CMP     R12, #-0x40000000
         MOVLT   R12, #-0x40000000
         AND     R6, R11, R12, LSL#1
 
         MOV     R0, R0, LSL#16      @ right
         CMP     R0, #0x40000000
-        MOVGE   R0, #0x3F800000
+        MOVGE   R0, #0x3FC00000
         CMP     R0, #-0x40000000
         MOVLT   R0, #-0x40000000
         AND     R7, R11, R0, LSL#1
 
         MOV     R12, R1             @ left sample #2
         CMP     R12, #0x40000000
-        MOVGE   R12, #0x3F800000
+        MOVGE   R12, #0x3FC00000
         CMP     R12, #-0x40000000
         MOVLT   R12, #-0x40000000
         AND     R12, R11, R12, LSL#1
 
         MOV     R1, R1, LSL#16      @ right
         CMP     R1, #0x40000000
-        MOVGE   R1, #0x3F800000
+        MOVGE   R1, #0x3FC00000
         CMP     R1, #-0x40000000
         MOVLT   R1, #-0x40000000
         AND     R1, R11, R1, LSL#1
 
         MOV     R12, R2             @ left sample #3
         CMP     R12, #0x40000000
-        MOVGE   R12, #0x3F800000
+        MOVGE   R12, #0x3FC00000
         CMP     R12, #-0x40000000
         MOVLT   R12, #-0x40000000
         AND     R12, R11, R12, LSL#1
 
         MOV     R2, R2, LSL#16      @ right
         CMP     R2, #0x40000000
-        MOVGE   R2, #0x3F800000
+        MOVGE   R2, #0x3FC00000
         CMP     R2, #-0x40000000
         MOVLT   R2, #-0x40000000
         AND     R2, R11, R2, LSL#1
 
         MOV     R12, R3             @ left sample #4
         CMP     R12, #0x40000000
-        MOVGE   R12, #0x3F800000
+        MOVGE   R12, #0x3FC00000
         CMP     R12, #-0x40000000
         MOVLT   R12, #-0x40000000
         AND     R12, R11, R12, LSL#1
 
         MOV     R3, R3, LSL#16      @ right
         CMP     R3, #0x40000000
-        MOVGE   R3, #0x3F800000
+        MOVGE   R3, #0x3FC00000
         CMP     R3, #-0x40000000
         MOVLT   R3, #-0x40000000
         AND     R3, R11, R3, LSL#1