diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-28 20:18:00 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-28 20:18:00 -0500 |
| commit | 6bef5a2622b432049df9c8b581e21ae09965b02c (patch) | |
| tree | d764c1d61d17018c41ef9eab403137d5aeef17d0 /asm/pokemon_storage_system.s | |
| parent | 4327bee485510b424cbf28e450d90ff50e6fe78b (diff) | |
| parent | e92ead0e159ccaa8301b189b9ef2bb1a33b2ea62 (diff) | |
merge
Diffstat (limited to 'asm/pokemon_storage_system.s')
| -rw-r--r-- | asm/pokemon_storage_system.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 2ac873fcd..5b5dfbdd5 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -593,7 +593,7 @@ _08095EF4: .align 2, 0 _08095F18: .4byte gUnknown_083B600C _08095F1C: - bl sub_807D770 + bl IsWeatherNotFadingIn lsls r0, 24 cmp r0, 0 bne _08095F28 @@ -732,7 +732,7 @@ _08096030: .4byte gPCText_OnlyOne _08096034: movs r0, 0x1 movs r1, 0 - bl fade_screen + bl FadeScreen movs r0, 0x4 strh r0, [r4, 0x8] b _080960F4 |