add encounter music hook

patches/hooks.asm

@@ -1,36 +1,41 @@
 //Ipatix sound stuff
-  .org 0x080007B4
+.org 0x080007B4
     .word  0x0203E000   // new PCM work area
-  .org 0x081DD0B4
+.org 0x081DD0B4
     .word  main_mixer   // new mixer ROM location
     .word  0x03005F50   // new mixer RAM location (used for loading)
     .halfword mixer_size
     .halfword 0x400        // CpuSet, copy code by 32 bit units
     .word  0x0203E000   // new PCM work area
-  .org 0x081DD0C8
+.org 0x081DD0C8
      // set correct sound driver operation mode
      // 12 channels at 26758 Hz samplerate
     .byte  0x00, 0xCC, 0x98, 0x00
-  .org 0x081DC094
+.org 0x081DC094
     .word  0x03005F50+1 // new mixer RAM location (used for branch)
 
    // repoint correctly to the new cry tables
-  .org 0x080720C8
-  .include "patches/disable_cry_table_blocks.s"
+.org 0x080720C8
+    .include "patches/disable_cry_table_blocks.s"
 
    // cry-ID = poke-ID
-  .org 0x08043304
-  LSL	R0, R0, #0x10
-  LSR	R0, R0, #0x10
-  BX  LR
+.org 0x08043304
+    LSL R0, R0, #0x10
+    LSR R0, R0, #0x10
+    BX  LR
 
    // music overrides
-  .org 0x081DD0F4
+.org 0x081DD0F4
     LDR R1, =music_override|1
-    BX R1
-   .pool
-
+    BX  R1
+    .pool
 
+.org 0x0808064C
+    LDR R1, =trainer_intro_music_id_to_song|1
+    LDR R2, =0x080806BA|1 // return location
+    MOV LR, R2
+    BX  R1
+    .pool
 
 //End of sound stuff
 

src/include/songlist.h

@@ -0,0 +1,60 @@
+#pragma once
+
+// TODO add missing FR/LG song IDs
+
+// Towns
+
+#define SEQ_BGM_TOWN_HESPERIA       267
+
+// Cities
+
+#define SEQ_BGM_CITY_CARUN          272
+#define SEQ_BGM_CITY_URBANIA        273
+
+// Routes
+
+#define SEQ_BGM_ROUTE_1             302
+#define SEQ_BGM_ROUTE_2             303
+
+// Special Buildings
+
+#define SEQ_BGM_PC                  347
+#define SEQ_BGM_LAB                 382
+
+// Special Places
+
+#define SEQ_BGM_DESERT              350
+
+// Forests
+
+#define SEQ_BGM_FOREST_YELINA       352
+
+// Encounter
+
+#define SEQ_BGM_E_RIV_F             368
+#define SEQ_BGM_E_RIV_M             369
+#define SEQ_BGM_E_TT                385
+#define SEQ_BGM_E_TT_BOSS           386
+#define SEQ_FRLG_E_1                283
+#define SEQ_FRLG_E_2                284
+#define SEQ_FRLG_E_3                285
+
+// Battles
+
+#define SEQ_BGM_VS_RIVAL            379
+#define SEQ_BGM_VS_TT_ADMIN         381
+#define SEQ_BGM_VS_TT_BOSS_JANA     384
+#define SEQ_BGM_VS_TT_BOSS_NORMAN   388
+
+// Victories
+
+#define SEQ_BGM_VIC_TT              387
+#define SEQ_BGM_VIC_TRAINER         310
+
+// Various Events
+
+#define SEQ_BGM_EVENT_TT_RAID       375
+
+// Misc
+
+#define SEQ_BGM_TITLE_SCREEN        278

src/music/encounter_lookup.c

@@ -0,0 +1,27 @@
+#include <songlist.h>
+#include <game_engine.h>
+
+u16 trainer_intro_music_id_to_song(u8 introid) {
+    u16 res = 0;
+    switch (introid) {
+        case 0:
+        case 4:
+        case 5:
+        case 8:
+        case 10:
+        case 11:
+        case 12:
+        case 13:
+            res = SEQ_FRLG_E_3;
+            break;
+        case 1:
+        case 2:
+        case 9:
+            res = SEQ_FRLG_E_2;
+            break;
+        default:
+            res = SEQ_FRLG_E_3;
+            break;
+    }
+    return res;
+}