diff options
author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-11-24 08:44:21 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-24 08:44:21 -0500 |
commit | bb8c712f75e6ed5ec66b2ee94c6da1157693c284 (patch) | |
tree | dc8d135873f6a7cc8ca1fad8bb5d1a7a84e4b0f7 /asm/field_effect.s | |
parent | 2177f1f40b4dda2091ac3be3522c1bc4f6690e88 (diff) | |
parent | 2b2dfa7e49a0d28983a4e516ca44aee8cb7c66bb (diff) |
Merge pull request #160 from jiangzhengwenjz/party_menu
party_menu
Diffstat (limited to 'asm/field_effect.s')
-rw-r--r-- | asm/field_effect.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/field_effect.s b/asm/field_effect.s index a8542fcc3..41c33c6fc 100644 --- a/asm/field_effect.s +++ b/asm/field_effect.s @@ -2014,7 +2014,7 @@ task00_8084310: @ 8084310 ldrsh r6, [r4, r0] cmp r6, 0 bne _08084350 - bl field_weather_is_fade_finished + bl IsWeatherNotFadingIn lsls r0, 24 cmp r0, 0 beq _08084376 @@ -2287,7 +2287,7 @@ _08084560: .4byte gSprites sub_8084564: @ 8084564 push {r4,lr} adds r4, r0, 0 - bl field_weather_is_fade_finished + bl IsWeatherNotFadingIn lsls r0, 24 cmp r0, 0 beq _08084578 @@ -4002,7 +4002,7 @@ sub_8085274: @ 8085274 adds r4, r0, 0 adds r5, r1, 0 adds r6, r2, 0 - bl field_weather_is_fade_finished + bl IsWeatherNotFadingIn lsls r0, 24 cmp r0, 0 beq _080852B4 @@ -5025,7 +5025,7 @@ _08085A50: .4byte gTasks sub_8085A54: @ 8085A54 push {r4,lr} adds r4, r0, 0 - bl field_weather_is_fade_finished + bl IsWeatherNotFadingIn lsls r0, 24 cmp r0, 0 beq _08085A78 @@ -5492,7 +5492,7 @@ _08085E08: .4byte gTasks sub_8085E0C: @ 8085E0C push {r4-r6,lr} adds r6, r0, 0 - bl field_weather_is_fade_finished + bl IsWeatherNotFadingIn lsls r0, 24 cmp r0, 0 beq _08085E82 |