finished menu_indicators

2019-07-03 12:40:04 +08:00
parent d97925df0e
commit 503086bc7d
19 changed files with 762 additions and 1269 deletions
@@ -46,7 +46,7 @@ _0807F65E:
 	ldr r0, _0807F68C @ =sub_800FD9C
 	bl SetMainCallback2
 	bl sub_806D7E8
-	bl DoPoisonFieldEffect_timer_set
+	bl ClearPoisonStepCounter
 	adds r0, r5, 0
 	bl DestroyTask
 _0807F686:
@@ -1901,8 +1901,8 @@ _0806D780: .4byte 0x00004021
 _0806D784: .4byte gPlayerParty
 	thumb_func_end AdjustFriendship_step

-	thumb_func_start DoPoisonFieldEffect_timer_set
-DoPoisonFieldEffect_timer_set: @ 806D788
+	thumb_func_start ClearPoisonStepCounter
+ClearPoisonStepCounter: @ 806D788
 	push {lr}
 	ldr r0, _0806D798 @ =0x00004022
 	movs r1, 0
@@ -1911,7 +1911,7 @@ DoPoisonFieldEffect_timer_set: @ 806D788
 	bx r0
 	.align 2, 0
 _0806D798: .4byte 0x00004022
-	thumb_func_end DoPoisonFieldEffect_timer_set
+	thumb_func_end ClearPoisonStepCounter

 	thumb_func_start DoPoisonFieldEffect_step
 DoPoisonFieldEffect_step: @ 806D79C