diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-03-29 09:27:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-29 09:27:45 -0400 |
| commit | 75ae00beff77e166c4ae573300ed5cb31175e8ac (patch) | |
| tree | ec15c56d3b09c2cec74ac907110c9111e18e8729 /data/maps | |
| parent | d8c9214e0a911882daf28dec07204de3c3c2df80 (diff) | |
| parent | 9cfc34f2ec26d45085d9c4006b21406f8f968ed6 (diff) | |
Merge pull request #315 from PikalaxALT/overworld
Overworld
Diffstat (limited to 'data/maps')
| -rw-r--r-- | data/maps/CinnabarIsland/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/PalletTown/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/PalletTown_ProfessorOaksLab/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/RecordCenter/map.json | 8 |
5 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index e0260dac5..40e8288cd 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -60,7 +60,7 @@ CinnabarIsland_OnFrame:: @ 8166F6E CinnabarIsland_EventScript_ExitPokeCenterForOneIsland:: @ 8166F88 lockall - clearflag FLAG_SPECIAL_FLAG_0x4001 + clearflag FLAG_DONT_TRANSITION_MUSIC savebgm MUS_DUMMY textcolor 0 setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 2 diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index c96169d1d..844c38997 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -36,7 +36,7 @@ CinnabarIsland_PokemonCenter_1F_EventScript_Bill:: @ 816E90A closemessage playbgm MUS_ANNAI, 1 savebgm MUS_ANNAI - setflag FLAG_SPECIAL_FLAG_0x4001 + setflag FLAG_DONT_TRANSITION_MUSIC setflag FLAG_HIDE_CINNABAR_POKECENTER_BILL delay 20 compare VAR_FACING, DIR_SOUTH diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index b165ae6b9..1b98d4cb4 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -224,7 +224,7 @@ PalletTown_EventScript_OakTrigger:: @ 8165605 clearflag FLAG_HIDE_OAK_IN_HIS_LAB setvar VAR_MAP_SCENE_PALLET_TOWN_OAK, 1 setflag FLAG_HIDE_OAK_IN_PALLET_TOWN - setflag FLAG_SPECIAL_FLAG_0x4001 + setflag FLAG_DONT_TRANSITION_MUSIC warp MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB, 255, 6, 12 waitstate releaseall diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 461318e35..facebea6b 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -238,7 +238,7 @@ PalletTown_ProfessorOaksLab_ChooseStarterScene:: @ 816923E waitmovement 0 applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestUp waitmovement 0 - clearflag FLAG_SPECIAL_FLAG_0x4001 + clearflag FLAG_DONT_TRANSITION_MUSIC savebgm SE_STOP fadedefaultbgm msgbox PalletTown_ProfessorOaksLab_Text_RivalFedUpWithWaiting diff --git a/data/maps/RecordCenter/map.json b/data/maps/RecordCenter/map.json index 19b310814..ad4308513 100644 --- a/data/maps/RecordCenter/map.json +++ b/data/maps/RecordCenter/map.json @@ -67,7 +67,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "RecordCenter_EventScript_Spot" + "script": "RecordCenter_EventScript_Spot0" }, { "type": "trigger", @@ -76,7 +76,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "RecordCenter_EventScript_Spot" + "script": "RecordCenter_EventScript_Spot1" }, { "type": "trigger", @@ -85,7 +85,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "RecordCenter_EventScript_Spot" + "script": "RecordCenter_EventScript_Spot2" }, { "type": "trigger", @@ -94,7 +94,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "RecordCenter_EventScript_Spot" + "script": "RecordCenter_EventScript_Spot3" } ], "bg_events": [] |