From 6e23dd4f2e4fb2e87fb4dec94e1ac729c7dd1ac7 Mon Sep 17 00:00:00 2001 From: darsh Date: Wed, 1 Oct 2025 19:38:40 -0400 Subject: [PATCH] use music song constants for gDungeonMusic --- src/dungeon_config.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/src/dungeon_config.c b/src/dungeon_config.c index 39a44040e..99749a6fb 100644 --- a/src/dungeon_config.c +++ b/src/dungeon_config.c @@ -2,11 +2,12 @@ #include "globaldata.h" #include "dungeon_config.h" #include "math.h" -#include "constants/weather.h" -#include "constants/type.h" -#include "constants/monster.h" +#include "constants/bg_music.h" #include "constants/dungeon_action.h" +#include "constants/monster.h" #include "constants/move_id.h" +#include "constants/type.h" +#include "constants/weather.h" #include "dungeon_move.h" #include "move_orb_actions_1.h" #include "move_orb_actions_2.h" @@ -568,15 +569,26 @@ const u8 gDungeonCamouflageTypes[76] = { TYPE_ROCK }; -// Todo: Use music song constants const s16 gDungeonMusic[76] = { - 114, 125, 14, 120, 15, 113, 111, 20, 102, 25, 104, - 115, 108, 22, 125, 125, 125, 125, 13, 21, 15, 126, - 33, 39, 123, 124, 23, 125, 125, 125, 125, 125, 125, - 125, 125, 125, 125, 125, 125, 125, 26, 110, 110, 125, - 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, - 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, 26, - 127, 35, 35, 35, 125, 125, 125, 125, 125, 125 + MUS_IN_THE_DEPTHS_OF_THE_PIT, MUS_TINY_WOODS, MUS_THUNDERWAVE_CAVE, MUS_MT_STEEL, + MUS_SINISTER_WOODS, MUS_SILENT_CHASM, MUS_MT_THUNDER, MUS_GREAT_CANYON, + MUS_LAPIS_CAVE, MUS_MT_BLAZE, MUS_FROSTY_FOREST, MUS_MT_FREEZE, + MUS_MAGMA_CAVERN, MUS_SKY_TOWER, MUS_TINY_WOODS, MUS_TINY_WOODS, + MUS_TINY_WOODS, MUS_TINY_WOODS, MUS_A_NEW_ADVENTURE, MUS_STORMY_SEA, + MUS_SINISTER_WOODS, MUS_MT_THUNDER_PEAK, MUS_MT_BLAZE_PEAK, MUS_FROSTY_GROTTO, + MUS_MT_FREEZE_PEAK, MUS_MAGMA_CAVERN_PIT, MUS_SKY_TOWER_SUMMIT, MUS_TINY_WOODS, + MUS_TINY_WOODS, MUS_TINY_WOODS, MUS_TINY_WOODS, MUS_TINY_WOODS, + MUS_TINY_WOODS, MUS_TINY_WOODS, MUS_TINY_WOODS, MUS_TINY_WOODS, + MUS_TINY_WOODS, MUS_TINY_WOODS, MUS_TINY_WOODS, MUS_TINY_WOODS, + MUS_RAYQUAZAS_DOMAIN, MUS_MAKUHITA_DOJO, MUS_MAKUHITA_DOJO, MUS_TINY_WOODS, + MUS_TINY_WOODS, MUS_TINY_WOODS, MUS_TINY_WOODS, MUS_TINY_WOODS, + MUS_TINY_WOODS, MUS_TINY_WOODS, MUS_TINY_WOODS, MUS_TINY_WOODS, + MUS_TINY_WOODS, MUS_TINY_WOODS, MUS_TINY_WOODS, MUS_TINY_WOODS, + MUS_TINY_WOODS, MUS_TINY_WOODS, MUS_TINY_WOODS, MUS_TINY_WOODS, + MUS_TINY_WOODS, MUS_TINY_WOODS, MUS_TINY_WOODS, MUS_TINY_WOODS, + MUS_TINY_WOODS, MUS_RAYQUAZAS_DOMAIN, MUS_FRIEND_AREA_HEALING_FOREST, MUS_FRIEND_AREA_CRYPTIC_CAVE, + MUS_FRIEND_AREA_CRYPTIC_CAVE, MUS_FRIEND_AREA_CRYPTIC_CAVE, MUS_TINY_WOODS, MUS_TINY_WOODS, + MUS_TINY_WOODS, MUS_TINY_WOODS, MUS_TINY_WOODS, MUS_TINY_WOODS }; const s16 gRecruitRateByLevel[101] = {