disable help menu and increase audio samplerate to 31536 Hz

patches/hooks.asm

@@ -12,8 +12,8 @@ _call_via_r1 equ 0x081E3BAC
     .word  0x0203E000   // new PCM work area
 .org 0x081DD0C8
      // set correct sound driver operation mode
-     // 12 channels at 26758 Hz samplerate
-    .byte  0x00, 0xCC, 0x98, 0x00
+     // 12 channels at 31536 Hz samplerate
+    .byte  0x00, 0xCC, 0x99, 0x00
 .org 0x081DC094
     .word  0x03005F50+1 // new mixer RAM location (used for branch)
 
@@ -71,6 +71,34 @@ _call_via_r1 equ 0x081E3BAC
 //.org 0x0800f268
 //    .halfword 0xE000
 
+// disable help menu
+// see: https://www.pokecommunity.com/showthread.php?t=364909
+.org 0x0813B8C2
+    .halfword 0xE01D
+
+// decrease amount of valid file handles from 20 to 12 to free up some IRAM
+NUM_FILE_HANDLES equ 12
+.org 0x081E9948
+    cmp r1, #(NUM_FILE_HANDLES - 1)
+.org 0x081E99E4
+    add r0, #((NUM_FILE_HANDLES - 1) * 8)
+.org 0x081E9AA4
+    cmp r6, #NUM_FILE_HANDLES
+.org 0x081E9ADE
+    cmp r6, #NUM_FILE_HANDLES
+.org 0x081E9B1C
+    cmp r6, #NUM_FILE_HANDLES
+    bge 0x081E9B2E
+.org 0x081E9BA6
+    cmp r7, #NUM_FILE_HANDLES
+    bge 0x081E9BB8
+.org 0x081E9BDA
+    cmp r0, #NUM_FILE_HANDLES
+    blo 0x081E9BE2
+.org 0x081E9C84
+    cmp r1, #NUM_FILE_HANDLES
+    bge 0x081E9C94
+
 //flag routine
 .org 0x0806E5D6
 	ldr r0, =flag_hook|1

src/music/main_mixer.s

@@ -14,9 +14,10 @@
     .equ    GAME_KWJ6, 3
     .equ    GAME_AE7E, 4
     .equ    GAME_BPRD, 5
+    .equ    GAME_SOTS, 6
 
     /* SELECT USED GAME HERE */
-    .equ    USED_GAME, GAME_BPRE
+    .equ    USED_GAME, GAME_SOTS
 
     .equ    FRAME_LENGTH_5734, 0x60
     .equ    FRAME_LENGTH_7884, 0x84             @ THIS MODE IS NOT SUPPORTED BY THIS ENGINE BECAUSE IT DOESN'T USE AN 8 ALIGNED BUFFER LENGTH
@@ -37,6 +38,7 @@
 
     .equ    BUFFER_IRAM_BPE, 0x03001AA8
     .equ    BUFFER_IRAM_BPR, 0x030028E0
+    .equ    BUFFER_IRAM_SOTS, 0x030028A0
     .equ    BUFFER_IRAM_KWJ, 0x03005840
     .equ    BUFFER_IRAM_AE7, 0x03006D60
 
@@ -155,6 +157,16 @@
     .equ    ENABLE_DECOMPRESSION, 1
 
 .endif
+@*********** IF POKEMON SOTS
+.if USED_GAME==GAME_SOTS
+
+    .equ    hq_buffer_ptr, BUFFER_IRAM_SOTS
+    .equ    decoder_buffer_target, DECODER_BUFFER_BPR
+    .equ    POKE_INIT, 1
+    .equ    DMA_FIX, 1
+    .equ    ENABLE_DECOMPRESSION, 1
+
+.endif
 @*********** IF KAWAs JUKEBOX 2006
 .if USED_GAME==GAME_KWJ6
 
@@ -1359,12 +1371,13 @@ C_uncompressed_reverse_mixing_load_skip:
  */
 F_bdpcm_decoder:
 
-    STMFD   SP!, {R0, R2, R5-R7, LR}
+    STMFD   SP!, {R0, LR}
     MOV     R0, R3, LSR#6                       @ clip off everything but the block offset, each block is 0x40 samples long
     LDR     R12, [R4, #CHN_BLOCK_COUNT]
     CMP     R0, R12
     BEQ     C_bdpcm_decoder_return              @ block already decoded -> skip
 
+    STMFD   SP!, {R2, R5-R7}
     STR     R0, [R4, #CHN_BLOCK_COUNT]
     MOV     R12, #0x21                          @ 1 Block = 0x21 Bytes, 0x40 decoded samples
     MUL     R2, R12, R0
@@ -1393,12 +1406,13 @@ C_bdpcm_decoder_lsb:
         STRB    LR, [R5], #1
         SUBS    R7, R7, #2
         BGT     C_bdpcm_decoder_msb
-
+    
+    LDMFD   SP!, {R2, R5-R7}
 C_bdpcm_decoder_return:
-    LDR     R5, decoder_buffer
+    LDR     R12, decoder_buffer
     AND     R0, R3, #0x3F
-    LDRSB   R12, [R5, R0]
-    LDMFD   SP!, {R0, R2, R5-R7, PC}
+    LDRSB   R12, [R12, R0]
+    LDMFD   SP!, {R0, PC}
 
     .align  2