ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-09-28 16:54:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Sync encounter musics with encounter music types

Browse Source
This commit is contained in:
GriffinR 2020-08-20 21:03:24 -04:00
parent d356e35b64
commit ee72696b53
12 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
berry_fix/charmap.txt
View File

@ -770,7 +770,7 @@ MUS_LINK_CONTEST_P1 = 89 01
MUS_LINK_CONTEST_P2 = 8A 01 MUS_LINK_CONTEST_P2 = 8A 01
MUS_LINK_CONTEST_P3 = 8B 01 MUS_LINK_CONTEST_P3 = 8B 01
MUS_LINK_CONTEST_P4 = 8C 01 MUS_LINK_CONTEST_P4 = 8C 01
MUS_ENCOUNTER_GENTLEMAN = 8D 01 MUS_ENCOUNTER_RICH = 8D 01
MUS_VERDANTURF = 8E 01 MUS_VERDANTURF = 8E 01
MUS_RUSTBORO = 8F 01 MUS_RUSTBORO = 8F 01
MUS_POKE_CENTER = 90 01 MUS_POKE_CENTER = 90 01
@ -789,14 +789,14 @@ MUS_VICTORY_TRAINER = 9C 01
MUS_TITLE = 9D 01 MUS_TITLE = 9D 01
MUS_INTRO = 9E 01 MUS_INTRO = 9E 01
MUS_ENCOUNTER_MAY = 9F 01 MUS_ENCOUNTER_MAY = 9F 01
MUS_ENCOUNTER_PSYCHIC = A0 01 MUS_ENCOUNTER_INTENSE = A0 01
MUS_ENCOUNTER_COOLTRAINER = A1 01 MUS_ENCOUNTER_COOL = A1 01
MUS_ROUTE113 = A2 01 MUS_ROUTE113 = A2 01
MUS_ENCOUNTER_AQUA = A3 01 MUS_ENCOUNTER_AQUA = A3 01
MUS_FOLLOW_ME = A4 01 MUS_FOLLOW_ME = A4 01
MUS_ENCOUNTER_BRENDAN = A5 01 MUS_ENCOUNTER_BRENDAN = A5 01
MUS_EVER_GRANDE = A6 01 MUS_EVER_GRANDE = A6 01
MUS_ENCOUNTER_HEX_MANIAC = A7 01 MUS_ENCOUNTER_SUSPICIOUS = A7 01
MUS_VICTORY_AQUA_MAGMA = A8 01 MUS_VICTORY_AQUA_MAGMA = A8 01
MUS_CABLE_CAR = A9 01 MUS_CABLE_CAR = A9 01
MUS_GAME_CORNER = AA 01 MUS_GAME_CORNER = AA 01

8
berry_fix/payload/charmap.txt
View File

@ -770,7 +770,7 @@ MUS_LINK_CONTEST_P1 = 89 01
MUS_LINK_CONTEST_P2 = 8A 01 MUS_LINK_CONTEST_P2 = 8A 01
MUS_LINK_CONTEST_P3 = 8B 01 MUS_LINK_CONTEST_P3 = 8B 01
MUS_LINK_CONTEST_P4 = 8C 01 MUS_LINK_CONTEST_P4 = 8C 01
MUS_ENCOUNTER_GENTLEMAN = 8D 01 MUS_ENCOUNTER_RICH = 8D 01
MUS_VERDANTURF = 8E 01 MUS_VERDANTURF = 8E 01
MUS_RUSTBORO = 8F 01 MUS_RUSTBORO = 8F 01
MUS_POKE_CENTER = 90 01 MUS_POKE_CENTER = 90 01
@ -789,14 +789,14 @@ MUS_VICTORY_TRAINER = 9C 01
MUS_TITLE = 9D 01 MUS_TITLE = 9D 01
MUS_INTRO = 9E 01 MUS_INTRO = 9E 01
MUS_ENCOUNTER_MAY = 9F 01 MUS_ENCOUNTER_MAY = 9F 01
MUS_ENCOUNTER_PSYCHIC = A0 01 MUS_ENCOUNTER_INTENSE = A0 01
MUS_ENCOUNTER_COOLTRAINER = A1 01 MUS_ENCOUNTER_COOL = A1 01
MUS_ROUTE113 = A2 01 MUS_ROUTE113 = A2 01
MUS_ENCOUNTER_AQUA = A3 01 MUS_ENCOUNTER_AQUA = A3 01
MUS_FOLLOW_ME = A4 01 MUS_FOLLOW_ME = A4 01
MUS_ENCOUNTER_BRENDAN = A5 01 MUS_ENCOUNTER_BRENDAN = A5 01
MUS_EVER_GRANDE = A6 01 MUS_EVER_GRANDE = A6 01
MUS_ENCOUNTER_HEX_MANIAC = A7 01 MUS_ENCOUNTER_SUSPICIOUS = A7 01
MUS_VICTORY_AQUA_MAGMA = A8 01 MUS_VICTORY_AQUA_MAGMA = A8 01
MUS_CABLE_CAR = A9 01 MUS_CABLE_CAR = A9 01
MUS_GAME_CORNER = AA 01 MUS_GAME_CORNER = AA 01

8
charmap.txt
View File

@ -774,7 +774,7 @@ MUS_LINK_CONTEST_P1 = 89 01
MUS_LINK_CONTEST_P2 = 8A 01 MUS_LINK_CONTEST_P2 = 8A 01
MUS_LINK_CONTEST_P3 = 8B 01 MUS_LINK_CONTEST_P3 = 8B 01
MUS_LINK_CONTEST_P4 = 8C 01 MUS_LINK_CONTEST_P4 = 8C 01
MUS_ENCOUNTER_GENTLEMAN = 8D 01 MUS_ENCOUNTER_RICH = 8D 01
MUS_VERDANTURF = 8E 01 MUS_VERDANTURF = 8E 01
MUS_RUSTBORO = 8F 01 MUS_RUSTBORO = 8F 01
MUS_POKE_CENTER = 90 01 MUS_POKE_CENTER = 90 01
@ -793,14 +793,14 @@ MUS_VICTORY_TRAINER = 9C 01
MUS_TITLE = 9D 01 MUS_TITLE = 9D 01
MUS_INTRO = 9E 01 MUS_INTRO = 9E 01
MUS_ENCOUNTER_MAY = 9F 01 MUS_ENCOUNTER_MAY = 9F 01
MUS_ENCOUNTER_PSYCHIC = A0 01 MUS_ENCOUNTER_INTENSE = A0 01
MUS_ENCOUNTER_COOLTRAINER = A1 01 MUS_ENCOUNTER_COOL = A1 01
MUS_ROUTE113 = A2 01 MUS_ROUTE113 = A2 01
MUS_ENCOUNTER_AQUA = A3 01 MUS_ENCOUNTER_AQUA = A3 01
MUS_FOLLOW_ME = A4 01 MUS_FOLLOW_ME = A4 01
MUS_ENCOUNTER_BRENDAN = A5 01 MUS_ENCOUNTER_BRENDAN = A5 01
MUS_EVER_GRANDE = A6 01 MUS_EVER_GRANDE = A6 01
MUS_ENCOUNTER_HEX_MANIAC = A7 01 MUS_ENCOUNTER_SUSPICIOUS = A7 01
MUS_VICTORY_AQUA_MAGMA = A8 01 MUS_VICTORY_AQUA_MAGMA = A8 01
MUS_CABLE_CAR = A9 01 MUS_CABLE_CAR = A9 01
MUS_GAME_CORNER = AA 01 MUS_GAME_CORNER = AA 01

8
include/constants/songs.h
View File

@ -325,7 +325,7 @@
#define MUS_LINK_CONTEST_P2 394 // MUS_TEST2 #define MUS_LINK_CONTEST_P2 394 // MUS_TEST2
#define MUS_LINK_CONTEST_P3 395 // MUS_TEST3 #define MUS_LINK_CONTEST_P3 395 // MUS_TEST3
#define MUS_LINK_CONTEST_P4 396 // MUS_TEST4 #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_VERDANTURF 398 // MUS_GOMACHI0
#define MUS_RUSTBORO 399 // MUS_GOTOWN #define MUS_RUSTBORO 399 // MUS_GOTOWN
#define MUS_POKE_CENTER 400 // MUS_POKECEN #define MUS_POKE_CENTER 400 // MUS_POKECEN
@ -344,14 +344,14 @@
#define MUS_TITLE 413 // MUS_TITLE3 #define MUS_TITLE 413 // MUS_TITLE3
#define MUS_INTRO 414 // MUS_DEMO1 #define MUS_INTRO 414 // MUS_DEMO1
#define MUS_ENCOUNTER_MAY 415 // MUS_GIRL_SUP #define MUS_ENCOUNTER_MAY 415 // MUS_GIRL_SUP
#define MUS_ENCOUNTER_PSYCHIC 416 // MUS_HAGESHII #define MUS_ENCOUNTER_INTENSE 416 // MUS_HAGESHII
#define MUS_ENCOUNTER_COOLTRAINER 417 // MUS_KAKKOII #define MUS_ENCOUNTER_COOL 417 // MUS_KAKKOII
#define MUS_ROUTE113 418 // MUS_KAZANBAI #define MUS_ROUTE113 418 // MUS_KAZANBAI
#define MUS_ENCOUNTER_AQUA 419 // MUS_AQA_0 #define MUS_ENCOUNTER_AQUA 419 // MUS_AQA_0
#define MUS_FOLLOW_ME 420 // MUS_TSURETEK #define MUS_FOLLOW_ME 420 // MUS_TSURETEK
#define MUS_ENCOUNTER_BRENDAN 421 // MUS_BOY_SUP #define MUS_ENCOUNTER_BRENDAN 421 // MUS_BOY_SUP
#define MUS_EVER_GRANDE 422 // MUS_RAINBOW #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_VICTORY_AQUA_MAGMA 424 // MUS_KACHI4
#define MUS_CABLE_CAR 425 // MUS_ROPEWAY #define MUS_CABLE_CAR 425 // MUS_ROPEWAY
#define MUS_GAME_CORNER 426 // MUS_CASINO #define MUS_GAME_CORNER 426 // MUS_CASINO

8
ld_script.txt
View File

@ -1014,7 +1014,7 @@ SECTIONS {
sound/songs/midi/mus_link_contest_p2.o(.rodata); sound/songs/midi/mus_link_contest_p2.o(.rodata);
sound/songs/midi/mus_link_contest_p3.o(.rodata); sound/songs/midi/mus_link_contest_p3.o(.rodata);
sound/songs/midi/mus_link_contest_p4.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_verdanturf.o(.rodata);
sound/songs/midi/mus_rustboro.o(.rodata); sound/songs/midi/mus_rustboro.o(.rodata);
sound/songs/midi/mus_poke_center.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_title.o(.rodata);
sound/songs/midi/mus_intro.o(.rodata); sound/songs/midi/mus_intro.o(.rodata);
sound/songs/midi/mus_encounter_may.o(.rodata); sound/songs/midi/mus_encounter_may.o(.rodata);
sound/songs/midi/mus_encounter_psychic.o(.rodata); sound/songs/midi/mus_encounter_intense.o(.rodata);
sound/songs/midi/mus_encounter_cooltrainer.o(.rodata); sound/songs/midi/mus_encounter_cool.o(.rodata);
sound/songs/midi/mus_route113.o(.rodata); sound/songs/midi/mus_route113.o(.rodata);
sound/songs/midi/mus_encounter_aqua.o(.rodata); sound/songs/midi/mus_encounter_aqua.o(.rodata);
sound/songs/midi/mus_follow_me.o(.rodata); sound/songs/midi/mus_follow_me.o(.rodata);
sound/songs/midi/mus_encounter_brendan.o(.rodata); sound/songs/midi/mus_encounter_brendan.o(.rodata);
sound/songs/midi/mus_ever_grande.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_victory_aqua_magma.o(.rodata);
sound/songs/midi/mus_cable_car.o(.rodata); sound/songs/midi/mus_cable_car.o(.rodata);
sound/songs/midi/mus_game_corner.o(.rodata); sound/songs/midi/mus_game_corner.o(.rodata);

8
songs.mk
View File

@ -12,7 +12,7 @@ $(MID_SUBDIR)/mus_encounter_aqua.s: %.s: %.mid
$(MID_SUBDIR)/mus_route111.s: %.s: %.mid $(MID_SUBDIR)/mus_route111.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G055 -V076 $(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) $< $@ -E -R$(STD_REVERB) -G069 -V078
$(MID_SUBDIR)/mus_b_arena.s: %.s: %.mid $(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_SUBDIR)/mus_route119.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G048 -V096 $(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) $< $@ -E -R$(STD_REVERB) -G062 -V078
$(MID_SUBDIR)/mus_weather_groudon.s: %.s: %.mid $(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_SUBDIR)/mus_caught.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G025 -V080 $(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) $< $@ -E -R$(STD_REVERB) -G063 -V086
$(MID_SUBDIR)/mus_trick_house.s: %.s: %.mid $(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_SUBDIR)/mus_intro_battle.s: %.s: %.mid
$(MID) $< $@ -E -R$(STD_REVERB) -G088 -V088 $(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) $< $@ -E -R$(STD_REVERB) -G043 -V094
$(MID_SUBDIR)/mus_link_contest_p1.s: %.s: %.mid $(MID_SUBDIR)/mus_link_contest_p1.s: %.s: %.mid

8
sound/song_table.inc
View File

@ -398,7 +398,7 @@ gSongTable:: @ 86B49F0
song mus_link_contest_p2, 0, 0 song mus_link_contest_p2, 0, 0
song mus_link_contest_p3, 0, 0 song mus_link_contest_p3, 0, 0
song mus_link_contest_p4, 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_verdanturf, 0, 0
song mus_rustboro, 0, 0 song mus_rustboro, 0, 0
song mus_poke_center, 0, 0 song mus_poke_center, 0, 0
@ -417,14 +417,14 @@ gSongTable:: @ 86B49F0
song mus_title, 0, 0 song mus_title, 0, 0
song mus_intro, 0, 0 song mus_intro, 0, 0
song mus_encounter_may, 0, 0 song mus_encounter_may, 0, 0
song mus_encounter_psychic, 0, 0 song mus_encounter_intense, 0, 0
song mus_encounter_cooltrainer, 0, 0 song mus_encounter_cool, 0, 0
song mus_route113, 0, 0 song mus_route113, 0, 0
song mus_encounter_aqua, 0, 0 song mus_encounter_aqua, 0, 0
song mus_follow_me, 0, 0 song mus_follow_me, 0, 0
song mus_encounter_brendan, 0, 0 song mus_encounter_brendan, 0, 0
song mus_ever_grande, 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_victory_aqua_magma, 0, 0
song mus_cable_car, 0, 0 song mus_cable_car, 0, 0
song mus_game_corner, 0, 0 song mus_game_corner, 0, 0

0
sound/songs/midi/mus_encounter_cooltrainer.mid → sound/songs/midi/mus_encounter_cool.mid
View File

0
sound/songs/midi/mus_encounter_psychic.mid → sound/songs/midi/mus_encounter_intense.mid
View File

0
sound/songs/midi/mus_encounter_gentleman.mid → sound/songs/midi/mus_encounter_rich.mid
View File

0
sound/songs/midi/mus_encounter_hex_maniac.mid → sound/songs/midi/mus_encounter_suspicious.mid
View File

8
src/battle_setup.c
View File

@ -1463,10 +1463,10 @@ void SetUpTrainerEncounterMusic(void)
music = MUS_ENCOUNTER_GIRL; music = MUS_ENCOUNTER_GIRL;
break; break;
case TRAINER_ENCOUNTER_MUSIC_INTENSE: case TRAINER_ENCOUNTER_MUSIC_INTENSE:
music = MUS_ENCOUNTER_PSYCHIC; music = MUS_ENCOUNTER_INTENSE;
break; break;
case TRAINER_ENCOUNTER_MUSIC_COOL: case TRAINER_ENCOUNTER_MUSIC_COOL:
music = MUS_ENCOUNTER_COOLTRAINER; music = MUS_ENCOUNTER_COOL;
break; break;
case TRAINER_ENCOUNTER_MUSIC_AQUA: case TRAINER_ENCOUNTER_MUSIC_AQUA:
music = MUS_ENCOUNTER_AQUA; music = MUS_ENCOUNTER_AQUA;
@ -1490,10 +1490,10 @@ void SetUpTrainerEncounterMusic(void)
music = MUS_ENCOUNTER_INTERVIEWER; music = MUS_ENCOUNTER_INTERVIEWER;
break; break;
case TRAINER_ENCOUNTER_MUSIC_RICH: case TRAINER_ENCOUNTER_MUSIC_RICH:
music = MUS_ENCOUNTER_GENTLEMAN; music = MUS_ENCOUNTER_RICH;
break; break;
default: default:
music = MUS_ENCOUNTER_HEX_MANIAC; music = MUS_ENCOUNTER_SUSPICIOUS;
} }
PlayNewMapMusic(music); PlayNewMapMusic(music);
} }