From a6bd35ceab236419fc2664c838cf21964e5b371c Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sun, 5 Mar 2023 17:17:39 -0300 Subject: [PATCH] Review changes --- charmap.txt | 2 +- data/maps/Route111/scripts.inc | 2 +- include/constants/songs.h | 4 ++-- src/overworld.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/charmap.txt b/charmap.txt index 8c886bdf0c..477448c9c5 100644 --- a/charmap.txt +++ b/charmap.txt @@ -795,7 +795,7 @@ MUS_LITTLEROOT = 95 01 MUS_MT_CHIMNEY = 96 01 MUS_ENCOUNTER_FEMALE = 97 01 MUS_LILYCOVE = 98 01 -MUS_ROUTE111_DESERT = 99 01 +MUS_DESERT = 99 01 MUS_HELP = 9A 01 MUS_UNDERWATER = 9B 01 MUS_VICTORY_TRAINER = 9C 01 diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 44372da37d..7335d0e1ce 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -260,7 +260,7 @@ Route111_EventScript_SunTrigger:: Route111_EventScript_SandstormTrigger:: setweather WEATHER_SANDSTORM - fadenewbgm MUS_ROUTE111_DESERT + fadenewbgm MUS_DESERT doweather end diff --git a/include/constants/songs.h b/include/constants/songs.h index ffa5c3df0b..ab6ddd62bc 100644 --- a/include/constants/songs.h +++ b/include/constants/songs.h @@ -337,7 +337,7 @@ #define MUS_MT_CHIMNEY 406 // MUS_TOZAN // Also used in Desert Underpass, Mirage Tower, Seafloor Cavern and Sky Pillar. #define MUS_ENCOUNTER_FEMALE 407 // MUS_GIRLEYE #define MUS_LILYCOVE 408 // MUS_MINAMO // Also used in Pacifidlog Town and the Diving Treasure Hunter's house. -#define MUS_ROUTE111_DESERT 409 // MUS_ASHROAD +#define MUS_DESERT 409 // MUS_ASHROAD #define MUS_HELP 410 // MUS_EVENT0 #define MUS_UNDERWATER 411 // MUS_DEEPDEEP #define MUS_VICTORY_TRAINER 412 // MUS_KACHI1 @@ -372,7 +372,7 @@ #define MUS_ENCOUNTER_MAGMA 441 // MUS_MGM0 #define MUS_INTRO_BATTLE 442 // MUS_T_BATTLE #define MUS_ABNORMAL_WEATHER 443 // MUS_OOAME // Replaces MUS_WEATHER_KYOGRE from R/S. -#define MUS_WEATHER_GROUDON 444 // MUS_HIDERI // Unused from R/S. +#define MUS_WEATHER_GROUDON 444 // MUS_HIDERI // Unused, from R/S. #define MUS_SOOTOPOLIS 445 // MUS_RUNECITY #define MUS_CONTEST_RESULTS 446 // MUS_CON_K #define MUS_HALL_OF_FAME_ROOM 447 // MUS_EIKOU_R diff --git a/src/overworld.c b/src/overworld.c index c9258e05e8..4f7cccdffb 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -1104,7 +1104,7 @@ u16 GetCurrLocationDefaultMusic(void) if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ROUTE111) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE111) && GetSavedWeather() == WEATHER_SANDSTORM) - return MUS_ROUTE111_DESERT; + return MUS_DESERT; music = GetLocationMusic(&gSaveBlock1Ptr->location); if (music != MUS_ROUTE118)