summaryrefslogtreecommitdiff
path: root/data/maps/ThreeIsland
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2019-10-09 20:33:28 -0400
committerGitHub <noreply@github.com>2019-10-09 20:33:28 -0400
commitc61603fb3812011981e22478bce93aba8b7ec183 (patch)
tree0bcf628e1f3615159cbae3e5c638825544699182 /data/maps/ThreeIsland
parent77a6ee507fdeef8d6a3b8146c70df107e124b0b5 (diff)
parentf3bd7f06c9f260597575f60af8daf8985ce80fe1 (diff)
Merge pull request #113 from PikalaxALT/main_menu
Main menu and Song Constants
Diffstat (limited to 'data/maps/ThreeIsland')
-rw-r--r--data/maps/ThreeIsland/map.json2
-rw-r--r--data/maps/ThreeIsland/scripts.inc8
2 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json
index 8e45d33fc..635f1a356 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": "BGM_FRLG_ISLAND_ONE",
+ "music": "MUS_NANA123",
"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 4d6773491..39a3688fe 100644
--- a/data/maps/ThreeIsland/scripts.inc
+++ b/data/maps/ThreeIsland/scripts.inc
@@ -221,7 +221,7 @@ EventScript_167A59:: @ 8167A59
waitmovement 0
applymovement 5, Movement_167C57
waitmovement 0
- playbgm BGM_FRLG_BOY_EYE, 0
+ playbgm MUS_SHOUNEN, 0
msgbox gUnknown_81823ED, MSGBOX_YESNO
compare_var_to_value VAR_RESULT, 0
goto_if_eq EventScript_167C35
@@ -234,7 +234,7 @@ EventScript_167A59:: @ 8167A59
closemessage
applymovement 7, Movement_167C57
waitmovement 0
- playbgm BGM_FRLG_BOY_EYE, 0
+ playbgm MUS_SHOUNEN, 0
msgbox gUnknown_81824EF
setvar VAR_LAST_TALKED, 7
trainerbattle 3, 528, 0, Text_182521
@@ -244,7 +244,7 @@ EventScript_167A59:: @ 8167A59
closemessage
applymovement 4, Movement_167C57
waitmovement 0
- playbgm BGM_FRLG_BOY_EYE, 0
+ playbgm MUS_SHOUNEN, 0
msgbox gUnknown_8182582
setvar VAR_LAST_TALKED, 4
trainerbattle 3, 529, 0, Text_1825D4
@@ -266,7 +266,7 @@ EventScript_167A59:: @ 8167A59
call_if 1, EventScript_167C03
compare_var_to_value VAR_0x4001, 4
call_if 1, EventScript_167C1C
- playbgm BGM_FRLG_BOY_EYE, 0
+ playbgm MUS_SHOUNEN, 0
msgbox gUnknown_8182623
setvar VAR_LAST_TALKED, 3
trainerbattle 3, 742, 0, Text_1826B7