Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230319

# Conflicts: # data/battle_scripts_2.s # include/constants/battle_string_ids.h # include/constants/songs.h # src/battle_message.c # src/data/pokemon/species_info.h
2023-03-19 20:28:56 -03:00
commit 51b716c9d9
@@ -805,7 +805,7 @@ MUS_LITTLEROOT = 95 01
 MUS_MT_CHIMNEY = 96 01
 MUS_ENCOUNTER_FEMALE = 97 01
 MUS_LILYCOVE = 98 01
-MUS_ROUTE111 = 99 01
+MUS_DESERT = 99 01
 MUS_HELP = 9A 01
 MUS_UNDERWATER = 9B 01
 MUS_VICTORY_TRAINER = 9C 01