summaryrefslogtreecommitdiff
path: root/data/maps/PalletTown
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-08-29 03:11:03 -0400
committerGriffinR <griffin.g.richards@gmail.com>2020-08-29 03:11:03 -0400
commitbb56d4a3f4cab33f899646e0630282fc6176a9c9 (patch)
treecb094078122b217fc67e2285614b79c6e83eaf88 /data/maps/PalletTown
parentc5839905a1259fd7e843c0ffa1ce2470d40b76ae (diff)
Give songs meaningful english names
Diffstat (limited to 'data/maps/PalletTown')
-rw-r--r--data/maps/PalletTown/map.json2
-rw-r--r--data/maps/PalletTown/scripts.inc4
2 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json
index 8ebfb8bcc..91819b8b1 100644
--- a/data/maps/PalletTown/map.json
+++ b/data/maps/PalletTown/map.json
@@ -2,7 +2,7 @@
"id": "MAP_PALLET_TOWN",
"name": "PalletTown",
"layout": "LAYOUT_PALLET_TOWN",
- "music": "MUS_MASARA",
+ "music": "MUS_PALLET",
"region_map_section": "MAPSEC_PALLET_TOWN",
"requires_flash": false,
"weather": "WEATHER_SUNNY",
diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc
index 62e9d8a01..bed477a5c 100644
--- a/data/maps/PalletTown/scripts.inc
+++ b/data/maps/PalletTown/scripts.inc
@@ -65,7 +65,7 @@ PalletTown_EventScript_OakRatingScene:: @ 81654D8
goto_if_lt PalletTown_EventScript_NotEnoughMonsForNationalDex
msgbox PalletTown_Text_CaughtXImpressiveFollowMe
closemessage
- playbgm MUS_ANNAI, 0
+ playbgm MUS_FOLLOW_ME, 0
applymovement OBJ_EVENT_ID_PLAYER, PalletTown_Movement_PlayerWalkToLabFromHouse
applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakWalkToLabFromHouse
waitmovement 0
@@ -189,7 +189,7 @@ PalletTown_EventScript_OakTrigger:: @ 8165605
famechecker FAMECHECKER_OAK, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
textcolor 0
delay 30
- playbgm MUS_OHKIDO, 0
+ playbgm MUS_OAK, 0
message PalletTown_Text_OakDontGoOut
waitmessage
delay 85