diff options
author | Cameron Hall <cameronghall@cox.net> | 2018-01-21 13:53:32 -0600 |
---|---|---|
committer | Cameron Hall <cameronghall@cox.net> | 2018-01-21 13:53:32 -0600 |
commit | 11a9371349e1743a18dce28cc60b69dd6a29b665 (patch) | |
tree | e696d1fda7556af8b5234eae833ea2fd146fc75d /asm | |
parent | 7383117626ebb2b3d993e5ad8855da5752c9cce8 (diff) | |
parent | 68a402883f780a61f54c2f0c8740429d0b2b3a81 (diff) |
resolve merge conflicts and make it compile
Diffstat (limited to 'asm')
-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 24117bc8c..b5f1f495f 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 |