diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-10-07 16:10:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-07 16:10:35 -0400 |
| commit | a2655ba9ab82646a54f60abc6078df372179f8d4 (patch) | |
| tree | 95b074a1a4d77d6cd77e413e1d6e72eb55b595b0 /data/maps/Route130 | |
| parent | e86d3410a1719fcbf62754bfda93a295aa7e0d57 (diff) | |
| parent | 001a25e49cd6acdac89a62f4230aef80422e78f2 (diff) | |
Merge branch 'master' into doc-union
Diffstat (limited to 'data/maps/Route130')
| -rw-r--r-- | data/maps/Route130/scripts.inc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index 141196a2d..fe360a36b 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -1,8 +1,8 @@ -Route130_MapScripts:: @ 81F735F +Route130_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, Route130_OnTransition .byte 0 -Route130_OnTransition: @ 81F7365 +Route130_OnTransition: compare VAR_SOOTOPOLIS_CITY_STATE, 4 call_if_ge Route130_EventScript_CheckSetAbnormalWeather specialvar VAR_RESULT, IsMirageIslandPresent @@ -26,25 +26,25 @@ Route130_OnTransition: @ 81F7365 setmaplayoutindex LAYOUT_ROUTE130 end -Route130_EventScript_SetMirageIslandLayout:: @ 81F73B1 +Route130_EventScript_SetMirageIslandLayout:: setmaplayoutindex LAYOUT_ROUTE130_MIRAGE_ISLAND end -Route130_EventScript_CheckSetAbnormalWeather:: @ 81F73B5 +Route130_EventScript_CheckSetAbnormalWeather:: call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather return -Route130_EventScript_Rodney:: @ 81F73BF +Route130_EventScript_Rodney:: trainerbattle_single TRAINER_RODNEY, Route130_Text_RodneyIntro, Route130_Text_RodneyDefeat msgbox Route130_Text_RodneyPostBattle, MSGBOX_AUTOCLOSE end -Route130_EventScript_Katie:: @ 81F73D6 +Route130_EventScript_Katie:: trainerbattle_single TRAINER_KATIE, Route130_Text_KatieIntro, Route130_Text_KatieDefeat msgbox Route130_Text_KatiePostBattle, MSGBOX_AUTOCLOSE end -Route130_EventScript_Santiago:: @ 81F73ED +Route130_EventScript_Santiago:: trainerbattle_single TRAINER_SANTIAGO, Route130_Text_SantiagoIntro, Route130_Text_SantiagoDefeat msgbox Route130_Text_SantiagoPostBattle, MSGBOX_AUTOCLOSE end |