summaryrefslogtreecommitdiff
path: root/asm/party_menu.s
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2018-01-31 00:02:16 +0100
committerDizzyEggg <jajkodizzy@wp.pl>2018-01-31 00:02:16 +0100
commit9fbedcc41c2c888b612efd1b3797c181ff7cb107 (patch)
tree49dbac1e2b3aa0ff7e4451a0d64e9299ae030357 /asm/party_menu.s
parente6fb626c1fddb2f696b26219156d2591867295e7 (diff)
parentb3315b64a1ecefc04f36ed50dd341f1f90d3ba97 (diff)
coord weather fix conflicts
Diffstat (limited to 'asm/party_menu.s')
-rw-r--r--asm/party_menu.s8
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/party_menu.s b/asm/party_menu.s
index 429b629ea..0dc03a1e2 100644
--- a/asm/party_menu.s
+++ b/asm/party_menu.s
@@ -17171,7 +17171,7 @@ sub_81B9404: @ 81B9404
bl ScriptContext2_Enable
movs r0, 0x1
movs r1, 0
- bl fade_screen
+ bl FadeScreen
ldr r0, =sub_81B9424
movs r1, 0xA
bl CreateTask
@@ -17247,7 +17247,7 @@ sub_81B94B0: @ 81B94B0
bl ScriptContext2_Enable
movs r0, 0x1
movs r1, 0
- bl fade_screen
+ bl FadeScreen
ldr r0, =sub_81B94D0
movs r1, 0xA
bl CreateTask
@@ -17297,7 +17297,7 @@ sub_81B951C: @ 81B951C
bl ScriptContext2_Enable
movs r0, 0x1
movs r1, 0
- bl fade_screen
+ bl FadeScreen
ldr r0, =sub_81B953C
movs r1, 0xA
bl CreateTask
@@ -17418,7 +17418,7 @@ sub_81B9620: @ 81B9620
bl ScriptContext2_Enable
movs r0, 0x1
movs r1, 0
- bl fade_screen
+ bl FadeScreen
ldr r0, =sub_81B9640
movs r1, 0xA
bl CreateTask