diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2020-01-13 20:26:20 -0600 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2020-01-13 20:26:20 -0600 |
| commit | 5a2d676e71b720e752ca8a624a5795b3b1d7eb6c (patch) | |
| tree | 6ef755064008dfae8ce2942dc2762670cdabe815 /data/maps/Underwater7/scripts.inc | |
| parent | 5007d279fea5326b41b877703c74fcaa56223364 (diff) | |
| parent | 22931846d680de2bc585093678db3f5721aab891 (diff) | |
Merge remote-tracking branch 'upstream' into tustin2121-patch-5
Diffstat (limited to 'data/maps/Underwater7/scripts.inc')
| -rw-r--r-- | data/maps/Underwater7/scripts.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/Underwater7/scripts.inc b/data/maps/Underwater7/scripts.inc index c3bee154e..4215dced9 100644 --- a/data/maps/Underwater7/scripts.inc +++ b/data/maps/Underwater7/scripts.inc @@ -1,8 +1,8 @@ Underwater7_MapScripts:: @ 81F7749 - map_script MAP_SCRIPT_ON_RESUME, Underwater7_MapScript1_1F774F + map_script MAP_SCRIPT_ON_RESUME, Underwater7_OnResume .byte 0 -Underwater7_MapScript1_1F774F: @ 81F774F - call UnusualWeather_Underwater_SetupEscapeWarp +Underwater7_OnResume: @ 81F774F + call AbnormalWeather_Underwater_SetupEscapeWarp end |