diff --git a/berry_fix/charmap.txt b/berry_fix/charmap.txt index efb88b8f4..09427dc8d 100644 --- a/berry_fix/charmap.txt +++ b/berry_fix/charmap.txt @@ -770,7 +770,7 @@ MUS_LINK_CONTEST_P1 = 89 01 MUS_LINK_CONTEST_P2 = 8A 01 MUS_LINK_CONTEST_P3 = 8B 01 MUS_LINK_CONTEST_P4 = 8C 01 -MUS_ENCOUNTER_GENTLEMAN = 8D 01 +MUS_ENCOUNTER_RICH = 8D 01 MUS_VERDANTURF = 8E 01 MUS_RUSTBORO = 8F 01 MUS_POKE_CENTER = 90 01 @@ -789,14 +789,14 @@ MUS_VICTORY_TRAINER = 9C 01 MUS_TITLE = 9D 01 MUS_INTRO = 9E 01 MUS_ENCOUNTER_MAY = 9F 01 -MUS_ENCOUNTER_PSYCHIC = A0 01 -MUS_ENCOUNTER_COOLTRAINER = A1 01 +MUS_ENCOUNTER_INTENSE = A0 01 +MUS_ENCOUNTER_COOL = A1 01 MUS_ROUTE113 = A2 01 MUS_ENCOUNTER_AQUA = A3 01 MUS_FOLLOW_ME = A4 01 MUS_ENCOUNTER_BRENDAN = A5 01 MUS_EVER_GRANDE = A6 01 -MUS_ENCOUNTER_HEX_MANIAC = A7 01 +MUS_ENCOUNTER_SUSPICIOUS = A7 01 MUS_VICTORY_AQUA_MAGMA = A8 01 MUS_CABLE_CAR = A9 01 MUS_GAME_CORNER = AA 01 diff --git a/berry_fix/payload/charmap.txt b/berry_fix/payload/charmap.txt index efb88b8f4..09427dc8d 100644 --- a/berry_fix/payload/charmap.txt +++ b/berry_fix/payload/charmap.txt @@ -770,7 +770,7 @@ MUS_LINK_CONTEST_P1 = 89 01 MUS_LINK_CONTEST_P2 = 8A 01 MUS_LINK_CONTEST_P3 = 8B 01 MUS_LINK_CONTEST_P4 = 8C 01 -MUS_ENCOUNTER_GENTLEMAN = 8D 01 +MUS_ENCOUNTER_RICH = 8D 01 MUS_VERDANTURF = 8E 01 MUS_RUSTBORO = 8F 01 MUS_POKE_CENTER = 90 01 @@ -789,14 +789,14 @@ MUS_VICTORY_TRAINER = 9C 01 MUS_TITLE = 9D 01 MUS_INTRO = 9E 01 MUS_ENCOUNTER_MAY = 9F 01 -MUS_ENCOUNTER_PSYCHIC = A0 01 -MUS_ENCOUNTER_COOLTRAINER = A1 01 +MUS_ENCOUNTER_INTENSE = A0 01 +MUS_ENCOUNTER_COOL = A1 01 MUS_ROUTE113 = A2 01 MUS_ENCOUNTER_AQUA = A3 01 MUS_FOLLOW_ME = A4 01 MUS_ENCOUNTER_BRENDAN = A5 01 MUS_EVER_GRANDE = A6 01 -MUS_ENCOUNTER_HEX_MANIAC = A7 01 +MUS_ENCOUNTER_SUSPICIOUS = A7 01 MUS_VICTORY_AQUA_MAGMA = A8 01 MUS_CABLE_CAR = A9 01 MUS_GAME_CORNER = AA 01 diff --git a/charmap.txt b/charmap.txt index 23fe569d5..ca4db0fc7 100644 --- a/charmap.txt +++ b/charmap.txt @@ -774,7 +774,7 @@ MUS_LINK_CONTEST_P1 = 89 01 MUS_LINK_CONTEST_P2 = 8A 01 MUS_LINK_CONTEST_P3 = 8B 01 MUS_LINK_CONTEST_P4 = 8C 01 -MUS_ENCOUNTER_GENTLEMAN = 8D 01 +MUS_ENCOUNTER_RICH = 8D 01 MUS_VERDANTURF = 8E 01 MUS_RUSTBORO = 8F 01 MUS_POKE_CENTER = 90 01 @@ -793,14 +793,14 @@ MUS_VICTORY_TRAINER = 9C 01 MUS_TITLE = 9D 01 MUS_INTRO = 9E 01 MUS_ENCOUNTER_MAY = 9F 01 -MUS_ENCOUNTER_PSYCHIC = A0 01 -MUS_ENCOUNTER_COOLTRAINER = A1 01 +MUS_ENCOUNTER_INTENSE = A0 01 +MUS_ENCOUNTER_COOL = A1 01 MUS_ROUTE113 = A2 01 MUS_ENCOUNTER_AQUA = A3 01 MUS_FOLLOW_ME = A4 01 MUS_ENCOUNTER_BRENDAN = A5 01 MUS_EVER_GRANDE = A6 01 -MUS_ENCOUNTER_HEX_MANIAC = A7 01 +MUS_ENCOUNTER_SUSPICIOUS = A7 01 MUS_VICTORY_AQUA_MAGMA = A8 01 MUS_CABLE_CAR = A9 01 MUS_GAME_CORNER = AA 01 diff --git a/include/constants/songs.h b/include/constants/songs.h index 87bb741af..a78ee6faf 100644 --- a/include/constants/songs.h +++ b/include/constants/songs.h @@ -325,7 +325,7 @@ #define MUS_LINK_CONTEST_P2 394 // MUS_TEST2 #define MUS_LINK_CONTEST_P3 395 // MUS_TEST3 #define MUS_LINK_CONTEST_P4 396 // MUS_TEST4 -#define MUS_ENCOUNTER_GENTLEMAN 397 // MUS_TEST +#define MUS_ENCOUNTER_RICH 397 // MUS_TEST #define MUS_VERDANTURF 398 // MUS_GOMACHI0 #define MUS_RUSTBORO 399 // MUS_GOTOWN #define MUS_POKE_CENTER 400 // MUS_POKECEN @@ -344,14 +344,14 @@ #define MUS_TITLE 413 // MUS_TITLE3 #define MUS_INTRO 414 // MUS_DEMO1 #define MUS_ENCOUNTER_MAY 415 // MUS_GIRL_SUP -#define MUS_ENCOUNTER_PSYCHIC 416 // MUS_HAGESHII -#define MUS_ENCOUNTER_COOLTRAINER 417 // MUS_KAKKOII +#define MUS_ENCOUNTER_INTENSE 416 // MUS_HAGESHII +#define MUS_ENCOUNTER_COOL 417 // MUS_KAKKOII #define MUS_ROUTE113 418 // MUS_KAZANBAI #define MUS_ENCOUNTER_AQUA 419 // MUS_AQA_0 #define MUS_FOLLOW_ME 420 // MUS_TSURETEK #define MUS_ENCOUNTER_BRENDAN 421 // MUS_BOY_SUP #define MUS_EVER_GRANDE 422 // MUS_RAINBOW -#define MUS_ENCOUNTER_HEX_MANIAC 423 // MUS_AYASII +#define MUS_ENCOUNTER_SUSPICIOUS 423 // MUS_AYASII #define MUS_VICTORY_AQUA_MAGMA 424 // MUS_KACHI4 #define MUS_CABLE_CAR 425 // MUS_ROPEWAY #define MUS_GAME_CORNER 426 // MUS_CASINO diff --git a/ld_script.txt b/ld_script.txt index 9ed3e8a5e..9be5e4db3 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -1014,7 +1014,7 @@ SECTIONS { sound/songs/midi/mus_link_contest_p2.o(.rodata); sound/songs/midi/mus_link_contest_p3.o(.rodata); sound/songs/midi/mus_link_contest_p4.o(.rodata); - sound/songs/midi/mus_encounter_gentleman.o(.rodata); + sound/songs/midi/mus_encounter_rich.o(.rodata); sound/songs/midi/mus_verdanturf.o(.rodata); sound/songs/midi/mus_rustboro.o(.rodata); sound/songs/midi/mus_poke_center.o(.rodata); @@ -1033,14 +1033,14 @@ SECTIONS { sound/songs/midi/mus_title.o(.rodata); sound/songs/midi/mus_intro.o(.rodata); sound/songs/midi/mus_encounter_may.o(.rodata); - sound/songs/midi/mus_encounter_psychic.o(.rodata); - sound/songs/midi/mus_encounter_cooltrainer.o(.rodata); + sound/songs/midi/mus_encounter_intense.o(.rodata); + sound/songs/midi/mus_encounter_cool.o(.rodata); sound/songs/midi/mus_route113.o(.rodata); sound/songs/midi/mus_encounter_aqua.o(.rodata); sound/songs/midi/mus_follow_me.o(.rodata); sound/songs/midi/mus_encounter_brendan.o(.rodata); sound/songs/midi/mus_ever_grande.o(.rodata); - sound/songs/midi/mus_encounter_hex_maniac.o(.rodata); + sound/songs/midi/mus_encounter_suspicious.o(.rodata); sound/songs/midi/mus_victory_aqua_magma.o(.rodata); sound/songs/midi/mus_cable_car.o(.rodata); sound/songs/midi/mus_game_corner.o(.rodata); diff --git a/songs.mk b/songs.mk index 8c500457a..698f983ce 100644 --- a/songs.mk +++ b/songs.mk @@ -12,7 +12,7 @@ $(MID_SUBDIR)/mus_encounter_aqua.s: %.s: %.mid $(MID_SUBDIR)/mus_route111.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G055 -V076 -$(MID_SUBDIR)/mus_encounter_hex_maniac.s: %.s: %.mid +$(MID_SUBDIR)/mus_encounter_suspicious.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G069 -V078 $(MID_SUBDIR)/mus_b_arena.s: %.s: %.mid @@ -186,7 +186,7 @@ $(MID_SUBDIR)/mus_rustboro.s: %.s: %.mid $(MID_SUBDIR)/mus_route119.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G048 -V096 -$(MID_SUBDIR)/mus_encounter_psychic.s: %.s: %.mid +$(MID_SUBDIR)/mus_encounter_intense.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G062 -V078 $(MID_SUBDIR)/mus_weather_groudon.s: %.s: %.mid @@ -219,7 +219,7 @@ $(MID_SUBDIR)/mus_victory_league.s: %.s: %.mid $(MID_SUBDIR)/mus_caught.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G025 -V080 -$(MID_SUBDIR)/mus_encounter_cooltrainer.s: %.s: %.mid +$(MID_SUBDIR)/mus_encounter_cool.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G063 -V086 $(MID_SUBDIR)/mus_trick_house.s: %.s: %.mid @@ -588,7 +588,7 @@ $(MID_SUBDIR)/mus_encounter_girl.s: %.s: %.mid $(MID_SUBDIR)/mus_intro_battle.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G088 -V088 -$(MID_SUBDIR)/mus_encounter_gentleman.s: %.s: %.mid +$(MID_SUBDIR)/mus_encounter_rich.s: %.s: %.mid $(MID) $< $@ -E -R$(STD_REVERB) -G043 -V094 $(MID_SUBDIR)/mus_link_contest_p1.s: %.s: %.mid diff --git a/sound/song_table.inc b/sound/song_table.inc index 8ad178f92..ef5b4b48e 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -398,7 +398,7 @@ gSongTable:: @ 86B49F0 song mus_link_contest_p2, 0, 0 song mus_link_contest_p3, 0, 0 song mus_link_contest_p4, 0, 0 - song mus_encounter_gentleman, 0, 0 + song mus_encounter_rich, 0, 0 song mus_verdanturf, 0, 0 song mus_rustboro, 0, 0 song mus_poke_center, 0, 0 @@ -417,14 +417,14 @@ gSongTable:: @ 86B49F0 song mus_title, 0, 0 song mus_intro, 0, 0 song mus_encounter_may, 0, 0 - song mus_encounter_psychic, 0, 0 - song mus_encounter_cooltrainer, 0, 0 + song mus_encounter_intense, 0, 0 + song mus_encounter_cool, 0, 0 song mus_route113, 0, 0 song mus_encounter_aqua, 0, 0 song mus_follow_me, 0, 0 song mus_encounter_brendan, 0, 0 song mus_ever_grande, 0, 0 - song mus_encounter_hex_maniac, 0, 0 + song mus_encounter_suspicious, 0, 0 song mus_victory_aqua_magma, 0, 0 song mus_cable_car, 0, 0 song mus_game_corner, 0, 0 diff --git a/sound/songs/midi/mus_encounter_cooltrainer.mid b/sound/songs/midi/mus_encounter_cool.mid similarity index 100% rename from sound/songs/midi/mus_encounter_cooltrainer.mid rename to sound/songs/midi/mus_encounter_cool.mid diff --git a/sound/songs/midi/mus_encounter_psychic.mid b/sound/songs/midi/mus_encounter_intense.mid similarity index 100% rename from sound/songs/midi/mus_encounter_psychic.mid rename to sound/songs/midi/mus_encounter_intense.mid diff --git a/sound/songs/midi/mus_encounter_gentleman.mid b/sound/songs/midi/mus_encounter_rich.mid similarity index 100% rename from sound/songs/midi/mus_encounter_gentleman.mid rename to sound/songs/midi/mus_encounter_rich.mid diff --git a/sound/songs/midi/mus_encounter_hex_maniac.mid b/sound/songs/midi/mus_encounter_suspicious.mid similarity index 100% rename from sound/songs/midi/mus_encounter_hex_maniac.mid rename to sound/songs/midi/mus_encounter_suspicious.mid diff --git a/src/battle_setup.c b/src/battle_setup.c index 81c7295bc..3c20d9ffe 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -1463,10 +1463,10 @@ void SetUpTrainerEncounterMusic(void) music = MUS_ENCOUNTER_GIRL; break; case TRAINER_ENCOUNTER_MUSIC_INTENSE: - music = MUS_ENCOUNTER_PSYCHIC; + music = MUS_ENCOUNTER_INTENSE; break; case TRAINER_ENCOUNTER_MUSIC_COOL: - music = MUS_ENCOUNTER_COOLTRAINER; + music = MUS_ENCOUNTER_COOL; break; case TRAINER_ENCOUNTER_MUSIC_AQUA: music = MUS_ENCOUNTER_AQUA; @@ -1490,10 +1490,10 @@ void SetUpTrainerEncounterMusic(void) music = MUS_ENCOUNTER_INTERVIEWER; break; case TRAINER_ENCOUNTER_MUSIC_RICH: - music = MUS_ENCOUNTER_GENTLEMAN; + music = MUS_ENCOUNTER_RICH; break; default: - music = MUS_ENCOUNTER_HEX_MANIAC; + music = MUS_ENCOUNTER_SUSPICIOUS; } PlayNewMapMusic(music); }