Finish porting/decompiling field_effect.c

This commit is contained in:
Diegoisawesome
2018-05-10 18:36:57 -05:00
parent 80062972ae
commit 416d67c832
41 changed files with 3234 additions and 7190 deletions
-6598
View File
File diff suppressed because it is too large Load Diff
+4 -4
View File
@@ -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
+2 -2
View File
@@ -3155,7 +3155,7 @@ SetRoute119Weather: @ 8139648
bl get_map_light_from_warp0
lsls r0, 24
lsrs r0, 24
bl is_light_level_1_2_3_5_or_6
bl is_map_type_1_2_3_5_or_6
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3173,7 +3173,7 @@ SetRoute123Weather: @ 8139668
bl get_map_light_from_warp0
lsls r0, 24
lsrs r0, 24
bl is_light_level_1_2_3_5_or_6
bl is_map_type_1_2_3_5_or_6
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
+2 -2
View File
@@ -10231,7 +10231,7 @@ task_launch_hm_phase_2: @ 81B5750
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl sub_80ABDFC
bl IsWeatherNotFadingIn
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -17337,7 +17337,7 @@ task_hm_without_phase_2: @ 81B93E0
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
bl sub_80ABDFC
bl IsWeatherNotFadingIn
lsls r0, 24
cmp r0, 0
beq _081B93FE
+1 -1
View File
@@ -245,7 +245,7 @@ _080C72AC:
b _080C7318
.pool
_080C730C:
bl sub_80ABDFC
bl IsWeatherNotFadingIn
lsls r0, 24
cmp r0, 0
bne _080C7318
+1 -1
View File
@@ -316,7 +316,7 @@ Task_ExitSellMenu: @ 80DFCF8
lsls r0, 24
lsrs r4, r0, 24
adds r5, r4, 0
bl sub_80ABDFC
bl IsWeatherNotFadingIn
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1