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

src/include/songlist.h

@@ -79,4 +79,5 @@
 
 // Misc
 
-#define SEQ_BGM_TITLE_SCREEN        278
+#define SEQ_BGM_TITLE_SCREEN        278
+#define SEQ_BGM_MENU                503

src/specials/scenes/settings_intro.c

@@ -4,6 +4,7 @@
 #include <scene.h>
 #include <agb_debug.h>
 #include <constants/pkmns.h>
+#include <songlist.h>
 
 extern u8 settings_gender_script[];
 extern u8 settings_gender_script_sure[];
@@ -91,6 +92,7 @@ void settings_loop(u8 id) {
             objects[tasks[id].priv[1]].pos1 = male_position;
             objects[tasks[id].priv[2]].pos1 = female_position;
             fade_screen(0xFFFFFFFF, 1, 16, 0, 0x0000);
+            m4aSongNumStart(SEQ_BGM_MENU);
             tasks[id].priv[0]++;
         break;
         case 2:

src/trainer/trainer_battle.c

@@ -97,7 +97,7 @@ u32 load_word(void *ptr) {
  * @return flag +1 for medium, flag +2 for hard
  */
 u16 tb_modify_flag_id(u16 flag) {
-    u16 difficulty = var_load(0x5052);
+    u16 difficulty = var_load(0x5050);
     u16 new_flag = flag;
     switch (difficulty) {
     case 0: