diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-24 17:39:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-24 17:39:50 -0500 |
| commit | e400fe5142731422b0f542749d913d569997159e (patch) | |
| tree | 004b17f7b444c4bbc8bbb80e3b189a48287ed4b7 /engine/std_scripts.asm | |
| parent | 70e6b5947b5cc9ca9fd93c720c7f97d9e018da2d (diff) | |
| parent | 3e7f3bbeb6dd2d3cff6343dea2298502faa14185 (diff) | |
Merge pull request #423 from roukaour/master
Fix issues #262, #345, #347, #396, #408, and #412
Diffstat (limited to 'engine/std_scripts.asm')
| -rw-r--r-- | engine/std_scripts.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm index 020875ff7..b31f7a415 100644 --- a/engine/std_scripts.asm +++ b/engine/std_scripts.asm @@ -297,7 +297,7 @@ RadioTowerRocketsScript: clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST specialphonecall SPECIALCALL_WEIRDBROADCAST - domaptrigger MAHOGANY_TOWN, $1 + setmapscene MAHOGANY_TOWN, $1 end BugContestResultsWarpScript: @@ -354,8 +354,8 @@ BugContestResults_DidNotLeaveMons waitbutton BugContestResults_CleanUp closetext - dotrigger $0 - domaptrigger ROUTE_35_NATIONAL_PARK_GATE, $0 + setscene $0 + setmapscene ROUTE_35_NATIONAL_PARK_GATE, $0 setevent EVENT_BUG_CATCHING_CONTESTANT_1A setevent EVENT_BUG_CATCHING_CONTESTANT_2A setevent EVENT_BUG_CATCHING_CONTESTANT_3A |