Finish decomp of wild_encounter
This commit is contained in:
@@ -1725,7 +1725,7 @@ sub_806D5E8: @ 806D5E8
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
bne _0806D658
|
||||
bl sub_80830B8
|
||||
bl UpdateRepelCounter
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x1
|
||||
@@ -1956,7 +1956,7 @@ _0806D7E2:
|
||||
thumb_func_start RestartWildEncounterImmunitySteps
|
||||
RestartWildEncounterImmunitySteps: @ 806D7E8
|
||||
push {lr}
|
||||
bl sub_80832D4
|
||||
bl ResetEncounterRateModifiers
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end RestartWildEncounterImmunitySteps
|
||||
@@ -1964,7 +1964,7 @@ RestartWildEncounterImmunitySteps: @ 806D7E8
|
||||
thumb_func_start is_it_battle_time_3
|
||||
is_it_battle_time_3: @ 806D7F4
|
||||
push {lr}
|
||||
bl sub_80833B0
|
||||
bl TryStandardWildEncounter
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
pop {r1}
|
||||
|
||||
@@ -4481,7 +4481,7 @@ sub_805D508: @ 805D508
|
||||
ldrh r0, [r4, 0x8]
|
||||
adds r0, 0x1
|
||||
strh r0, [r4, 0x8]
|
||||
bl sub_8082F78
|
||||
bl DoesCurrentMapHaveFishingMons
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0805D53A
|
||||
@@ -4791,7 +4791,7 @@ _0805D788:
|
||||
ldrh r0, [r5, 0x26]
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
bl sub_8082FB0
|
||||
bl FishingWildEncounter
|
||||
ldr r0, _0805D7BC @ =sub_805D304
|
||||
bl FindTaskIdByFunc
|
||||
lsls r0, 24
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user