summaryrefslogtreecommitdiff
path: root/data/maps/Underwater6/scripts.inc
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2020-01-13 20:26:20 -0600
committerMarcus Huderle <huderlem@gmail.com>2020-01-13 20:26:20 -0600
commit5a2d676e71b720e752ca8a624a5795b3b1d7eb6c (patch)
tree6ef755064008dfae8ce2942dc2762670cdabe815 /data/maps/Underwater6/scripts.inc
parent5007d279fea5326b41b877703c74fcaa56223364 (diff)
parent22931846d680de2bc585093678db3f5721aab891 (diff)
Merge remote-tracking branch 'upstream' into tustin2121-patch-5
Diffstat (limited to 'data/maps/Underwater6/scripts.inc')
-rw-r--r--data/maps/Underwater6/scripts.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/Underwater6/scripts.inc b/data/maps/Underwater6/scripts.inc
index d5a11c1bf..21b639cd8 100644
--- a/data/maps/Underwater6/scripts.inc
+++ b/data/maps/Underwater6/scripts.inc
@@ -1,8 +1,8 @@
Underwater6_MapScripts:: @ 81F773D
- map_script MAP_SCRIPT_ON_RESUME, Underwater6_MapScript1_1F7743
+ map_script MAP_SCRIPT_ON_RESUME, Underwater6_OnResume
.byte 0
-Underwater6_MapScript1_1F7743: @ 81F7743
- call UnusualWeather_Underwater_SetupEscapeWarp
+Underwater6_OnResume: @ 81F7743
+ call AbnormalWeather_Underwater_SetupEscapeWarp
end