SBird1337 7 år sedan
förälder
incheckning
74086f9fab
4 ändrade filer med 698 tillägg och 16 borttagningar
  1. 684
    2
      data/trainer/trainer_pkmn_data.s
  2. 1
    1
      sots-private
  3. 5
    5
      src/music/battle_music_lookup.c
  4. 8
    8
      src/music/main_mixer.s

+ 684
- 2
data/trainer/trainer_pkmn_data.s
Filskillnaden har hållits tillbaka eftersom den är för stor
Visa fil


+ 1
- 1
sots-private

@@ -1 +1 @@
1
-Subproject commit fcd659ca46df13d14f4f9cc3bbacd7b5212c62aa
1
+Subproject commit 158d1fb72312d2f213e0452ea9acc3e6aa8e28bc

+ 5
- 5
src/music/battle_music_lookup.c Visa fil

@@ -83,10 +83,10 @@ u16 mhk_intro_music_id_to_song(u8 introid) {
83 83
             res = 481;
84 84
             break;
85 85
         case 22:
86
-            res = 471;
86
+            res = 498;
87 87
             break;
88 88
         case 23:
89
-            res = 471;
89
+            res = 498;
90 90
             break;
91 91
         case 24:
92 92
             res = 473;
@@ -119,10 +119,10 @@ u16 mhk_intro_music_id_to_song(u8 introid) {
119 119
             res = 490;
120 120
             break;
121 121
         case 34:
122
-            res = 472;
122
+            res = 497;
123 123
             break;
124 124
         case 35:
125
-            res = 472;
125
+            res = 497;
126 126
             break;
127 127
         case 36:
128 128
             res = 471;
@@ -137,7 +137,7 @@ u16 mhk_intro_music_id_to_song(u8 introid) {
137 137
             res = 490;
138 138
             break;
139 139
         case 40:
140
-            res = 472;
140
+            res = 499;
141 141
             break;
142 142
         case 41:
143 143
             res = 491;

+ 8
- 8
src/music/main_mixer.s Visa fil

@@ -889,21 +889,21 @@ C_downsampler_loop:
889 889
 
890 890
         MOV     R12, R0             @ left sample #1
891 891
         CMP     R12, #0x40000000
892
-        MOVGE   R12, #0x3F800000
892
+        MOVGE   R12, #0x3FC00000
893 893
         CMP     R12, #-0x40000000
894 894
         MOVLT   R12, #-0x40000000
895 895
         AND     R6, R11, R12, LSL#1
896 896
 
897 897
         MOV     R0, R0, LSL#16      @ right
898 898
         CMP     R0, #0x40000000
899
-        MOVGE   R0, #0x3F800000
899
+        MOVGE   R0, #0x3FC00000
900 900
         CMP     R0, #-0x40000000
901 901
         MOVLT   R0, #-0x40000000
902 902
         AND     R7, R11, R0, LSL#1
903 903
 
904 904
         MOV     R12, R1             @ left sample #2
905 905
         CMP     R12, #0x40000000
906
-        MOVGE   R12, #0x3F800000
906
+        MOVGE   R12, #0x3FC00000
907 907
         CMP     R12, #-0x40000000
908 908
         MOVLT   R12, #-0x40000000
909 909
         AND     R12, R11, R12, LSL#1
@@ -911,7 +911,7 @@ C_downsampler_loop:
911 911
 
912 912
         MOV     R1, R1, LSL#16      @ right
913 913
         CMP     R1, #0x40000000
914
-        MOVGE   R1, #0x3F800000
914
+        MOVGE   R1, #0x3FC00000
915 915
         CMP     R1, #-0x40000000
916 916
         MOVLT   R1, #-0x40000000
917 917
         AND     R1, R11, R1, LSL#1
@@ -919,7 +919,7 @@ C_downsampler_loop:
919 919
 
920 920
         MOV     R12, R2             @ left sample #3
921 921
         CMP     R12, #0x40000000
922
-        MOVGE   R12, #0x3F800000
922
+        MOVGE   R12, #0x3FC00000
923 923
         CMP     R12, #-0x40000000
924 924
         MOVLT   R12, #-0x40000000
925 925
         AND     R12, R11, R12, LSL#1
@@ -927,7 +927,7 @@ C_downsampler_loop:
927 927
 
928 928
         MOV     R2, R2, LSL#16      @ right
929 929
         CMP     R2, #0x40000000
930
-        MOVGE   R2, #0x3F800000
930
+        MOVGE   R2, #0x3FC00000
931 931
         CMP     R2, #-0x40000000
932 932
         MOVLT   R2, #-0x40000000
933 933
         AND     R2, R11, R2, LSL#1
@@ -935,7 +935,7 @@ C_downsampler_loop:
935 935
 
936 936
         MOV     R12, R3             @ left sample #4
937 937
         CMP     R12, #0x40000000
938
-        MOVGE   R12, #0x3F800000
938
+        MOVGE   R12, #0x3FC00000
939 939
         CMP     R12, #-0x40000000
940 940
         MOVLT   R12, #-0x40000000
941 941
         AND     R12, R11, R12, LSL#1
@@ -943,7 +943,7 @@ C_downsampler_loop:
943 943
 
944 944
         MOV     R3, R3, LSL#16      @ right
945 945
         CMP     R3, #0x40000000
946
-        MOVGE   R3, #0x3F800000
946
+        MOVGE   R3, #0x3FC00000
947 947
         CMP     R3, #-0x40000000
948 948
         MOVLT   R3, #-0x40000000
949 949
         AND     R3, R11, R3, LSL#1