diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2018-01-31 00:02:16 +0100 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-01-31 00:02:16 +0100 |
commit | 9fbedcc41c2c888b612efd1b3797c181ff7cb107 (patch) | |
tree | 49dbac1e2b3aa0ff7e4451a0d64e9299ae030357 /asm/pokemon_summary_screen.s | |
parent | e6fb626c1fddb2f696b26219156d2591867295e7 (diff) | |
parent | b3315b64a1ecefc04f36ed50dd341f1f90d3ba97 (diff) |
coord weather fix conflicts
Diffstat (limited to 'asm/pokemon_summary_screen.s')
-rw-r--r-- | asm/pokemon_summary_screen.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index 2817b55b1..a04939c12 100644 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -2049,7 +2049,7 @@ sub_81C4F24: @ 81C4F24 bl ScriptContext2_Enable movs r0, 0x1 movs r1, 0 - bl fade_screen + bl FadeScreen ldr r0, =sub_81C4F44 movs r1, 0xA bl CreateTask |