diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-20 21:03:24 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-08-20 21:03:24 -0400 |
| commit | ee72696b5340b5578941aeb5d03bca6099e26538 (patch) | |
| tree | b74eaac85f4a63addeffecf5f061a86f964fa863 /berry_fix | |
| parent | d356e35b648c6689155c9cbd2d23ea8bede8f097 (diff) | |
Sync encounter musics with encounter music types
Diffstat (limited to 'berry_fix')
| -rw-r--r-- | berry_fix/charmap.txt | 8 | ||||
| -rw-r--r-- | berry_fix/payload/charmap.txt | 8 |
2 files changed, 8 insertions, 8 deletions
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 |