fix new songs not being integreated into pymap and songlist

assets/sound/Songtable/_songtable.s

@@ -1962,7 +1962,7 @@ _songtable:
 
 @**************** Song 0391 ****************@
 
-	.word	SEQ_BGM_INVALID
+	.word	SEQ_BGM_CAVE_02
 	.byte	0x00, 0x00, 0x00, 0x00
 
 @**************** Song 0392 ****************@
@@ -2072,7 +2072,7 @@ _songtable:
 
 @**************** Song 0413 ****************@
 
-    .word   SEQ_BGM_INVALID
+    .word   SEQ_BGM_SCHOOL
     .byte   0x00, 0x00, 0x00, 0x00
 
 @**************** Song 0414 ****************@
@@ -2112,7 +2112,7 @@ _songtable:
 
 @**************** Song 0421 ****************@
 
-    .word   SEQ_BGM_INVALID
+    .word   SEQ_BGM_GYM_FOREST
     .byte   0x00, 0x00, 0x00, 0x00
 
 @**************** Song 0422 ****************@
@@ -2197,12 +2197,12 @@ _songtable:
 
 @**************** Song 0438 ****************@
 
-    .word   SEQ_BGM_INVALID
+    .word   SEQ_BGM_P_MT_1
     .byte   0x00, 0x00, 0x00, 0x00
 
 @**************** Song 0439 ****************@
 
-    .word   SEQ_BGM_INVALID
+    .word   SEQ_BGM_P_ROGI
     .byte   0x00, 0x00, 0x00, 0x00
 
 @**************** Song 0440 ****************@

makefile

@@ -31,7 +31,7 @@ CHARMAP := charmap.txt
 
 DEFINES   := -DBPRE -DSOFTWARE_VERSION=0 -DLAN_DE
 ASFLAGS   := -mthumb
-CFLAGS    := -mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fdiagnostics-show-option -mlong-calls -march=armv4t -Og -std=c11 -Werror -Wall -Wextra -Wunreachable-code -I$(PAGB_INCLUDE) -Isrc/include -Igenerated_image -fdiagnostics-color=always $(DEFINES)
+CFLAGS    := -mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fdiagnostics-show-option -mlong-calls -march=armv4t -Og -std=c11 -Wall -Wextra -Wunreachable-code -I$(PAGB_INCLUDE) -Isrc/include -Igenerated_image -fdiagnostics-color=always $(DEFINES)
 GRITFLAGS := -ftc -fa
 LDFLAGS   := -z muldefs
 BLDPATH   := object
@@ -239,4 +239,4 @@ run: rom
 
 src/include/pymap_constants.h: sots-private/map/sots.json.constants sots-private/map/sots.json.config
 	pymapconstex.py sots-private/map/sots.json
-	$(shell  ./generate_pymap_header.sh)
+	$(shell  ./generate_pymap_header.sh)

sots-private

@@ -1 +1 @@
-Subproject commit 91a073b54ceade52defaa078953aaf5407370c1b
+Subproject commit cc4061c000589ba7767d352304378ed3767f16a7

src/include/constants/pymap/songs.h

@@ -1,21 +1,106 @@
-#define SEQ_BGM_TOWN_HESPERIA 0x10b
-#define SEQ_BGM_CITY_CARUN 0x110
-#define SEQ_BGM_CITY_URBANIA 0x111
-#define SEQ_BGM_ROUTE_1 0x12e
-#define SEQ_BGM_ROUTE_2 0x12f
-#define SEQ_BGM_PC 0x15b
-#define SEQ_BGM_LAB 0x17e
+#define SEQ_BGM_TOWN_HESPERIA 0x15e
+#define SEQ_BGM_CITY_CARUN 0x15f
 #define SEQ_BGM_P_FOY 0x160
+#define SEQ_BGM_TOWN_04 0x161
+#define SEQ_BGM_TOWN_02 0x162
+#define SEQ_BGM_TOWN_06 0x163
+#define SEQ_BGM_TOWN_07 0x164
+#define SEQ_BGM_TOWN_01 0x165
+#define SEQ_BGM_CITY_01 0x166
+#define SEQ_BGM_CITY_02 0x167
+#define SEQ_BGM_CITY_03 0x168
+#define SEQ_BGM_CITY_04 0x169
+#define SEQ_BGM_CITY_05 0x16a
+#define SEQ_BGM_CITY_06 0x16b
+#define SEQ_BGM_TOWN_03 0x16c
+#define SEQ_BGM_R_01 0x172
+#define SEQ_BGM_R_02 0x173
+#define SEQ_BGM_R_03 0x174
+#define SEQ_BGM_R_04 0x175
+#define SEQ_BGM_R_05 0x176
+#define SEQ_BGM_R_06 0x177
+#define SEQ_BGM_R_07 0x178
+#define SEQ_BGM_R_08 0x179
 #define SEQ_BGM_CAVE_GUARDIAN 0x186
+#define SEQ_BGM_CAVE_02 0x187
+#define SEQ_BGM_PC 0x15b
+#define SEQ_BGM_LAB 0x17e
+#define SEQ_BGM_GYM 0x19b
+#define SEQ_BGM_LAB 0x19c
+#define SEQ_BGM_SCHOOL 0x19d
+#define SEQ_BGM_PC 0x1a0
+#define SEQ_BGM_MART 0x1a2
+#define SEQ_BGM_GYM_GHOST 0x1a3
+#define SEQ_BGM_GYM_WATER 0x1a4
+#define SEQ_BGM_GYM_FOREST 0x1a5
+#define SEQ_BGM_P_04 0x1ae
+#define SEQ_BGM_DESERT 0x1af
+#define SEQ_BGM_P_01 0x1b1
+#define SEQ_BGM_P_02 0x1b2
+#define SEQ_BGM_P_FOY 0x1b3
 #define SEQ_BGM_P_TOL 0x1b4
 #define SEQ_BGM_P_DFOY 0x1b5
+#define SEQ_BGM_P_MT_1 0x1b6
+#define SEQ_BGM_P_ROGI 0x1b7
+#define SEQ_BGM_EYE_02 0x1d6
+#define SEQ_BGM_EYE_ACE 0x1d7
+#define SEQ_BGM_EYE_MANIAC 0x1d8
+#define SEQ_BGM_EYE_PSYCHO 0x1d9
+#define SEQ_BGM_EYE_UMBRELLA 0x1da
+#define SEQ_BGM_EYE_WORKER 0x1db
+#define SEQ_BGM_EYE_HIKER 0x1dc
+#define SEQ_BGM_EYE_MODEL 0x1dd
+#define SEQ_BGM_EYE_RIVF 0x1de
+#define SEQ_BGM_EYE_RIVM 0x1df
+#define SEQ_BGM_EYE_TEENAGER 0x1e0
 #define SEQ_BGM_EYE_TT 0x1e2
 #define SEQ_BGM_EYE_TT_BOSS 0x1e3
+#define SEQ_BGM_EYE_CHAMPION 0x1e5
 #define SEQ_BGM_EYE_GUARDIAN 0x1e6
+#define SEQ_BGM_EYE_BRAT 0x1e7
+#define SEQ_BGM_EYE_FIGHTER 0x1e8
+#define SEQ_BGM_EYE_JANA 0x1e9
+#define SEQ_BGM_EYE_03 0x1ec
+#define SEQ_BGM_EYE_BREEDER 0x1f1
+#define SEQ_BGM_EYE_BICYCLE 0x1f2
+#define SEQ_BGM_EYE_PRIG 0x1f3
 #define SEQ_BGM_EVENT_TT_RAID 0x1f4
 #define SEQ_BGM_INTRO 0x1f5
+#define SEQ_BGM_EVENT_END 0x1f6
+#define SEQ_BGM_MENU 0x1f7
 #define SEQ_BGM_EVENT_DEOXYS 0x1f8
 #define SEQ_BGM_EVENT_TT_DANCE 0x1f9
-#define SEQ_BGM_SURF 0x1fa
-#define SEQ_BGM_EYE_RIVF 0x1de
-#define SEQ_BGM_EYE_RIVM 0x1df
+#define SEQ_BGM_VS_LEADER 0x209
+#define SEQ_BGM_VS_TRAINER 0x20a
+#define SEQ_BGM_VS_POKE 0x20b
+#define SEQ_BGM_VS_CHAMP 0x20c
+#define SEQ_BGM_VS_DEOXYS 0x20d
+#define SEQ_BGM_VS_LEG_1 0x20e
+#define SEQ_BGM_VS_RIVAL 0x20f
+#define SEQ_BGM_VS_TT_ADMIN 0x211
+#define SEQ_BGM_VS_TT_BOSS_JANA 0x212
+#define SEQ_BGM_VS_TT_BOSS_NORMAN 0x213
+#define SEQ_BGM_VS_TT_GRUNT 0x214
+#define SEQ_BGM_VIC_POKE 0x21c
+#define SEQ_BGM_VIC_TRAINER 0x21d
+#define SEQ_BGM_VIC_TT 0x21e
+#define SEQ_BGM_VIC_GUARDIAN 0x21f
+#define SEQ_BGM_DEMO_AMER 0x230
+#define SEQ_BGM_DEMO_R 0x231
+#define SEQ_BGM_DEMO_RL 0x232
+#define SEQ_BGM_DEMO_WITS 0x233
+#define SEQ_BGM_P_03 0x234
+#define SEQ_BGM_LEGACY_VS_POKE 0x235
+#define SEQ_BGM_LEGACY_RAGN 0x236
+#define SEQ_BGM_LEGACY_R_BW 0x237
+#define SEQ_BGM_LEGACY_VS_RIVAL 0x238
+#define SEQ_BGM_LEGACY_TITLE 0x239
+#define SEQ_BGM_LEGACY_RS_LEADER 0x23a
+#define SEQ_BGM_LEGACY_LABO 0x23b
+#define SEQ_BGM_LEGACY_EYE_01 0x23c
+#define SEQ_BGM_LEGACY_EYE_RIV_M 0x23d
+#define SEQ_BGM_LEGACY_EYE_RIV_F 0x23e
+#define SEQ_BGM_LEGACY_EYE_TEAM 0x23f
+#define SEQ_BGM_LEGACY_BA_TRAIN 0x240
+#define SEQ_BGM_LEGACY_OVERTURE 0x241
+#define SEQ_SFX_TEST 0x242

src/include/constants/pymap/songs.s

@@ -1,21 +1,106 @@
-.equ SEQ_BGM_TOWN_HESPERIA, 0x10b
-.equ SEQ_BGM_CITY_CARUN, 0x110
-.equ SEQ_BGM_CITY_URBANIA, 0x111
-.equ SEQ_BGM_ROUTE_1, 0x12e
-.equ SEQ_BGM_ROUTE_2, 0x12f
-.equ SEQ_BGM_PC, 0x15b
-.equ SEQ_BGM_LAB, 0x17e
+.equ SEQ_BGM_TOWN_HESPERIA, 0x15e
+.equ SEQ_BGM_CITY_CARUN, 0x15f
 .equ SEQ_BGM_P_FOY, 0x160
+.equ SEQ_BGM_TOWN_04, 0x161
+.equ SEQ_BGM_TOWN_02, 0x162
+.equ SEQ_BGM_TOWN_06, 0x163
+.equ SEQ_BGM_TOWN_07, 0x164
+.equ SEQ_BGM_TOWN_01, 0x165
+.equ SEQ_BGM_CITY_01, 0x166
+.equ SEQ_BGM_CITY_02, 0x167
+.equ SEQ_BGM_CITY_03, 0x168
+.equ SEQ_BGM_CITY_04, 0x169
+.equ SEQ_BGM_CITY_05, 0x16a
+.equ SEQ_BGM_CITY_06, 0x16b
+.equ SEQ_BGM_TOWN_03, 0x16c
+.equ SEQ_BGM_R_01, 0x172
+.equ SEQ_BGM_R_02, 0x173
+.equ SEQ_BGM_R_03, 0x174
+.equ SEQ_BGM_R_04, 0x175
+.equ SEQ_BGM_R_05, 0x176
+.equ SEQ_BGM_R_06, 0x177
+.equ SEQ_BGM_R_07, 0x178
+.equ SEQ_BGM_R_08, 0x179
 .equ SEQ_BGM_CAVE_GUARDIAN, 0x186
+.equ SEQ_BGM_CAVE_02, 0x187
+.equ SEQ_BGM_PC, 0x15b
+.equ SEQ_BGM_LAB, 0x17e
+.equ SEQ_BGM_GYM, 0x19b
+.equ SEQ_BGM_LAB, 0x19c
+.equ SEQ_BGM_SCHOOL, 0x19d
+.equ SEQ_BGM_PC, 0x1a0
+.equ SEQ_BGM_MART, 0x1a2
+.equ SEQ_BGM_GYM_GHOST, 0x1a3
+.equ SEQ_BGM_GYM_WATER, 0x1a4
+.equ SEQ_BGM_GYM_FOREST, 0x1a5
+.equ SEQ_BGM_P_04, 0x1ae
+.equ SEQ_BGM_DESERT, 0x1af
+.equ SEQ_BGM_P_01, 0x1b1
+.equ SEQ_BGM_P_02, 0x1b2
+.equ SEQ_BGM_P_FOY, 0x1b3
 .equ SEQ_BGM_P_TOL, 0x1b4
 .equ SEQ_BGM_P_DFOY, 0x1b5
+.equ SEQ_BGM_P_MT_1, 0x1b6
+.equ SEQ_BGM_P_ROGI, 0x1b7
+.equ SEQ_BGM_EYE_02, 0x1d6
+.equ SEQ_BGM_EYE_ACE, 0x1d7
+.equ SEQ_BGM_EYE_MANIAC, 0x1d8
+.equ SEQ_BGM_EYE_PSYCHO, 0x1d9
+.equ SEQ_BGM_EYE_UMBRELLA, 0x1da
+.equ SEQ_BGM_EYE_WORKER, 0x1db
+.equ SEQ_BGM_EYE_HIKER, 0x1dc
+.equ SEQ_BGM_EYE_MODEL, 0x1dd
+.equ SEQ_BGM_EYE_RIVF, 0x1de
+.equ SEQ_BGM_EYE_RIVM, 0x1df
+.equ SEQ_BGM_EYE_TEENAGER, 0x1e0
 .equ SEQ_BGM_EYE_TT, 0x1e2
 .equ SEQ_BGM_EYE_TT_BOSS, 0x1e3
+.equ SEQ_BGM_EYE_CHAMPION, 0x1e5
 .equ SEQ_BGM_EYE_GUARDIAN, 0x1e6
+.equ SEQ_BGM_EYE_BRAT, 0x1e7
+.equ SEQ_BGM_EYE_FIGHTER, 0x1e8
+.equ SEQ_BGM_EYE_JANA, 0x1e9
+.equ SEQ_BGM_EYE_03, 0x1ec
+.equ SEQ_BGM_EYE_BREEDER, 0x1f1
+.equ SEQ_BGM_EYE_BICYCLE, 0x1f2
+.equ SEQ_BGM_EYE_PRIG, 0x1f3
 .equ SEQ_BGM_EVENT_TT_RAID, 0x1f4
 .equ SEQ_BGM_INTRO, 0x1f5
+.equ SEQ_BGM_EVENT_END, 0x1f6
+.equ SEQ_BGM_MENU, 0x1f7
 .equ SEQ_BGM_EVENT_DEOXYS, 0x1f8
 .equ SEQ_BGM_EVENT_TT_DANCE, 0x1f9
-.equ SEQ_BGM_SURF, 0x1fa
-.equ SEQ_BGM_EYE_RIVF, 0x1de
-.equ SEQ_BGM_EYE_RIVM, 0x1df
+.equ SEQ_BGM_VS_LEADER, 0x209
+.equ SEQ_BGM_VS_TRAINER, 0x20a
+.equ SEQ_BGM_VS_POKE, 0x20b
+.equ SEQ_BGM_VS_CHAMP, 0x20c
+.equ SEQ_BGM_VS_DEOXYS, 0x20d
+.equ SEQ_BGM_VS_LEG_1, 0x20e
+.equ SEQ_BGM_VS_RIVAL, 0x20f
+.equ SEQ_BGM_VS_TT_ADMIN, 0x211
+.equ SEQ_BGM_VS_TT_BOSS_JANA, 0x212
+.equ SEQ_BGM_VS_TT_BOSS_NORMAN, 0x213
+.equ SEQ_BGM_VS_TT_GRUNT, 0x214
+.equ SEQ_BGM_VIC_POKE, 0x21c
+.equ SEQ_BGM_VIC_TRAINER, 0x21d
+.equ SEQ_BGM_VIC_TT, 0x21e
+.equ SEQ_BGM_VIC_GUARDIAN, 0x21f
+.equ SEQ_BGM_DEMO_AMER, 0x230
+.equ SEQ_BGM_DEMO_R, 0x231
+.equ SEQ_BGM_DEMO_RL, 0x232
+.equ SEQ_BGM_DEMO_WITS, 0x233
+.equ SEQ_BGM_P_03, 0x234
+.equ SEQ_BGM_LEGACY_VS_POKE, 0x235
+.equ SEQ_BGM_LEGACY_RAGN, 0x236
+.equ SEQ_BGM_LEGACY_R_BW, 0x237
+.equ SEQ_BGM_LEGACY_VS_RIVAL, 0x238
+.equ SEQ_BGM_LEGACY_TITLE, 0x239
+.equ SEQ_BGM_LEGACY_RS_LEADER, 0x23a
+.equ SEQ_BGM_LEGACY_LABO, 0x23b
+.equ SEQ_BGM_LEGACY_EYE_01, 0x23c
+.equ SEQ_BGM_LEGACY_EYE_RIV_M, 0x23d
+.equ SEQ_BGM_LEGACY_EYE_RIV_F, 0x23e
+.equ SEQ_BGM_LEGACY_EYE_TEAM, 0x23f
+.equ SEQ_BGM_LEGACY_BA_TRAIN, 0x240
+.equ SEQ_BGM_LEGACY_OVERTURE, 0x241
+.equ SEQ_SFX_TEST, 0x242

src/include/songlist.h

@@ -1,83 +0,0 @@
-#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
-#define SEQ_BGM_P_TOL               436
-
-// Forests
-
-#define SEQ_BGM_FOREST_YELINA       352
-#define SEQ_BGM_P_DFOY              347
-
-// Cave
-#define SEQ_BGM_CAVE_GUARDIAN       390
-
-// Indoor
-#define SEQ_BGM_GYM_GHOST           419
-#define SEQ_BGM_GYM_WATER           420
-
-// 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
-
-#define SEQ_BGM_VS_POKE             298
-#define SEQ_BGM_VS_RSE              266
-#define SEQ_BGM_VS_CHAMP            299
-#define SEQ_BGM_VS_LEADER           296
-#define SEQ_BGM_VS_TRAINER          297
-
-#define SEQ_BGM_VS_DEOXYS           399
-#define SEQ_BGM_VS_MEWTWO           340
-#define SEQ_BGM_VS_LEG1             341
-
-// Victories
-
-#define SEQ_BGM_VIC_TT              387
-#define SEQ_BGM_VIC_TRAINER         310
-
-#define SEQ_BGM_VIC_LEADER          312
-#define SEQ_BGM_VIC_POKE            311
-
-// Various Events
-
-#define SEQ_BGM_EVENT_TT_RAID       375
-
-// Misc
-
-#define SEQ_BGM_TITLE_SCREEN        278
-#define SEQ_BGM_MENU                503

src/music/battle_music_lookup.c

@@ -1,4 +1,4 @@
-#include <songlist.h>
+#include <constants/pymap/songs.h>
 #include <game_engine.h>
 #include <bpre.h>
 #include <battle_structs.h>
@@ -377,7 +377,7 @@ u16 mhk_intro_music_id_to_song(u8 introid) {
             res = 483;
             break;
         default:
-            res = SEQ_FRLG_E_1;
+            res = 283;
             break;
     }
 
@@ -390,7 +390,7 @@ u16 mhk_song_id_for_battle(void) {
     if (battle_type_flags._battle_unk_3) {
         res = SEQ_BGM_VS_POKE;
     } else if (battle_type_flags._battle_unk_5 || battle_type_flags.battle_link) {
-        res = SEQ_BGM_VS_RSE;
+        res = 266;
     } else if (battle_type_flags.battle_trainer) {
         switch (trainer_data[trainerbattle_flag_id].trainer_class) {
             case 88:
@@ -457,10 +457,10 @@ void mhk_trainer_battle_play_defeat(void) {
     switch (trainer_data[trainerbattle_flag_id].trainer_class) {
         case 84:
         case 90:
-            song = SEQ_BGM_VIC_LEADER;
+            song = 312;
             break;
         default:
-            song = SEQ_BGM_VIC_TRAINER;
+            song = 310;
             break;
     }
 
@@ -479,7 +479,7 @@ u16 mhk_species_to_song(u16 species) {
 
     switch (species) {
         case POKE_MEWTWO:
-            res = SEQ_BGM_VS_MEWTWO;
+            res = 340;
             break;
         case POKE_ARTICUNO:
         case POKE_ZAPDOS:
@@ -492,7 +492,7 @@ u16 mhk_species_to_song(u16 species) {
             res = 525;
             break;
         default:
-            res = SEQ_BGM_VS_RSE;
+            res = 266;
             break;
     }
 

src/specials/scenes/settings_intro.c

@@ -4,7 +4,7 @@
 #include <scene.h>
 #include <agb_debug.h>
 #include <constants/pkmns.h>
-#include <songlist.h>
+#include <constants/pymap/songs.h>
 
 extern u8 settings_gender_script[];
 extern u8 settings_gender_script_sure[];
@@ -92,7 +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);
+            m4aSongNumStart(503);
             tasks[id].priv[0]++;
         break;
         case 2:
@@ -537,4 +537,4 @@ void settings_mode_launch(void) {
     settings_mode_load_gfx();
     settings_mode_spawn_main_task();
     set_callback2(settings_intro_c2);
-}
+}