diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-29 03:11:03 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-08-29 03:11:03 -0400 |
| commit | bb56d4a3f4cab33f899646e0630282fc6176a9c9 (patch) | |
| tree | cb094078122b217fc67e2285614b79c6e83eaf88 /data/maps/ThreeIsland | |
| parent | c5839905a1259fd7e843c0ffa1ce2470d40b76ae (diff) | |
Give songs meaningful english names
Diffstat (limited to 'data/maps/ThreeIsland')
| -rw-r--r-- | data/maps/ThreeIsland/map.json | 2 | ||||
| -rw-r--r-- | data/maps/ThreeIsland/scripts.inc | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index db9fe9ef4..b760e50b2 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -2,7 +2,7 @@ "id": "MAP_THREE_ISLAND", "name": "ThreeIsland", "layout": "LAYOUT_THREE_ISLAND", - "music": "MUS_NANA123", + "music": "MUS_SEVII_123", "region_map_section": "MAPSEC_THREE_ISLAND", "requires_flash": false, "weather": "WEATHER_SUNNY", diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index 484d8dba0..303fd046e 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -230,7 +230,7 @@ ThreeIsland_EventScript_BattleBikersScene:: @ 8167A59 waitmovement 0 applymovement LOCALID_BIKER1, ThreeIsland_Movement_BikerApproach waitmovement 0 - playbgm MUS_SHOUNEN, 0 + playbgm MUS_ENCOUNTER_BOY, 0 msgbox ThreeIsland_Text_WannaMakeSomethingOfYourStaring, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq ThreeIsland_EventScript_LeaveBikersAlone @@ -243,7 +243,7 @@ ThreeIsland_EventScript_BattleBikersScene:: @ 8167A59 closemessage applymovement LOCALID_BIKER2, ThreeIsland_Movement_BikerApproach waitmovement 0 - playbgm MUS_SHOUNEN, 0 + playbgm MUS_ENCOUNTER_BOY, 0 msgbox ThreeIsland_Text_Biker2Intro setvar VAR_LAST_TALKED, LOCALID_BIKER2 trainerbattle_no_intro TRAINER_BIKER_GOON_2, ThreeIsland_Text_Biker2Defeat @@ -253,7 +253,7 @@ ThreeIsland_EventScript_BattleBikersScene:: @ 8167A59 closemessage applymovement LOCALID_BIKER3, ThreeIsland_Movement_BikerApproach waitmovement 0 - playbgm MUS_SHOUNEN, 0 + playbgm MUS_ENCOUNTER_BOY, 0 msgbox ThreeIsland_Text_Biker3Intro setvar VAR_LAST_TALKED, LOCALID_BIKER3 trainerbattle_no_intro TRAINER_BIKER_GOON_3, ThreeIsland_Text_Biker3Defeat @@ -275,7 +275,7 @@ ThreeIsland_EventScript_BattleBikersScene:: @ 8167A59 call_if_eq ThreeIsland_EventScript_PaxtonApproachMidRight compare VAR_TEMP_1, 4 call_if_eq ThreeIsland_EventScript_PaxtonApproachRight - playbgm MUS_SHOUNEN, 0 + playbgm MUS_ENCOUNTER_BOY, 0 msgbox ThreeIsland_Text_PaxtonIntro setvar VAR_LAST_TALKED, LOCALID_PAXTON trainerbattle_no_intro TRAINER_CUE_BALL_PAXTON, ThreeIsland_Text_PaxtonDefeat |