diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-05-10 18:36:57 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-05-10 18:36:57 -0500 |
| commit | 416d67c8325758d01decad6e5648263aa7e906df (patch) | |
| tree | 2f3740b2c76e330d33379dd8ec70439561fc746f /asm/field_screen.s | |
| parent | 80062972aecfa0994e9176031ef1cf7b17ae5046 (diff) | |
Finish porting/decompiling field_effect.c
Diffstat (limited to 'asm/field_screen.s')
| -rw-r--r-- | asm/field_screen.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/field_screen.s b/asm/field_screen.s index d07fafbe4..e35c768dd 100644 --- a/asm/field_screen.s +++ b/asm/field_screen.s @@ -1764,8 +1764,8 @@ _080ABDE4: .pool thumb_func_end FadeScreen - thumb_func_start sub_80ABDFC -sub_80ABDFC: @ 80ABDFC + thumb_func_start IsWeatherNotFadingIn +IsWeatherNotFadingIn: @ 80ABDFC ldr r0, =gUnknown_02038454 ldr r1, =0x000006c6 adds r0, r1 @@ -1777,7 +1777,7 @@ sub_80ABDFC: @ 80ABDFC lsrs r0, 31 bx lr .pool - thumb_func_end sub_80ABDFC + thumb_func_end IsWeatherNotFadingIn thumb_func_start UpdateSpritePaletteWithWeather @ void UpdateSpritePaletteWithWeather(u8 a1) @@ -8702,7 +8702,7 @@ sub_80AF710: @ 80AF710 thumb_func_start sub_80AF71C sub_80AF71C: @ 80AF71C push {lr} - bl sub_80ABDFC + bl IsWeatherNotFadingIn lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 |