through Overworld_ResetStateAfterFly

2020-03-26 18:29:48 -04:00
parent b9c604b8d2
commit 84a69bf140
6 changed files with 98 additions and 171 deletions
@@ -5,155 +5,6 @@

 	.text

-	thumb_func_start sub_8054BC8
-sub_8054BC8: @ 8054BC8
-	push {r4,lr}
-	ldr r0, _08054BFC @ =EventScript_ResetEliteFourEnd
-	bl ScriptContext2_RunNewScript
-	ldr r0, _08054C00 @ =gSaveBlock1Ptr
-	ldr r4, [r0]
-	movs r0, 0xA4
-	lsls r0, 2
-	adds r4, r0
-	bl ComputeWhiteOutMoneyLoss
-	adds r1, r0, 0
-	adds r0, r4, 0
-	bl RemoveMoney
-	bl HealPlayerParty
-	bl sub_8054DD8
-	bl sub_80554BC
-	bl WarpIntoMap
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08054BFC: .4byte EventScript_ResetEliteFourEnd
-_08054C00: .4byte gSaveBlock1Ptr
-	thumb_func_end sub_8054BC8
-
-	thumb_func_start ComputeWhiteOutMoneyLoss
-ComputeWhiteOutMoneyLoss: @ 8054C04
-	push {r4,lr}
-	bl CountBadgesForOverworldWhiteOutLossCalculation
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	bl GetPlayerPartyHighestLevel
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, _08054C40 @ =sWhiteOutMoneyLossMultipliers
-	adds r4, r1
-	ldrb r1, [r4]
-	lsls r1, 2
-	adds r4, r0, 0
-	muls r4, r1
-	ldr r0, _08054C44 @ =gSaveBlock1Ptr
-	ldr r0, [r0]
-	movs r1, 0xA4
-	lsls r1, 2
-	adds r0, r1
-	bl GetMoney
-	cmp r4, r0
-	bls _08054C38
-	adds r4, r0, 0
-_08054C38:
-	adds r0, r4, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08054C40: .4byte sWhiteOutMoneyLossMultipliers
-_08054C44: .4byte gSaveBlock1Ptr
-	thumb_func_end ComputeWhiteOutMoneyLoss
-
-	thumb_func_start OverworldWhiteOutGetMoneyLoss
-OverworldWhiteOutGetMoneyLoss: @ 8054C48
-	push {r4,r5,lr}
-	bl ComputeWhiteOutMoneyLoss
-	adds r4, r0, 0
-	ldr r5, _08054C6C @ =gStringVar1
-	bl CountDigits
-	adds r3, r0, 0
-	lsls r3, 24
-	lsrs r3, 24
-	adds r0, r5, 0
-	adds r1, r4, 0
-	movs r2, 0
-	bl ConvertIntToDecimalStringN
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08054C6C: .4byte gStringVar1
-	thumb_func_end OverworldWhiteOutGetMoneyLoss
-
-	thumb_func_start CountBadgesForOverworldWhiteOutLossCalculation
-CountBadgesForOverworldWhiteOutLossCalculation: @ 8054C70
-	push {r4-r6,lr}
-	movs r6, 0
-	movs r5, 0
-	ldr r4, _08054C9C @ =sWhiteOutMoneyLossBadgeFlagIDs
-_08054C78:
-	ldrh r0, [r4]
-	bl FlagGet
-	lsls r0, 24
-	cmp r0, 0
-	beq _08054C8A
-	adds r0, r6, 0x1
-	lsls r0, 24
-	lsrs r6, r0, 24
-_08054C8A:
-	adds r4, 0x2
-	adds r5, 0x1
-	cmp r5, 0x7
-	bls _08054C78
-	adds r0, r6, 0
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08054C9C: .4byte sWhiteOutMoneyLossBadgeFlagIDs
-	thumb_func_end CountBadgesForOverworldWhiteOutLossCalculation
-
-	thumb_func_start Overworld_ResetStateAfterFly
-Overworld_ResetStateAfterFly: @ 8054CA0
-	push {lr}
-	bl ResetInitialPlayerAvatarState
-	movs r0, 0x83
-	lsls r0, 4
-	bl FlagClear
-	ldr r0, _08054CEC @ =0x0000405e
-	movs r1, 0
-	bl VarSet
-	ldr r0, _08054CF0 @ =0x00000802
-	bl FlagClear
-	movs r0, 0x80
-	lsls r0, 4
-	bl FlagClear
-	ldr r0, _08054CF4 @ =0x0000406e
-	movs r1, 0
-	bl VarSet
-	ldr r0, _08054CF8 @ =0x00000805
-	bl FlagClear
-	ldr r0, _08054CFC @ =0x00000806
-	bl FlagClear
-	ldr r0, _08054D00 @ =0x00000808
-	bl FlagClear
-	ldr r0, _08054D04 @ =0x0000404d
-	movs r1, 0
-	bl VarSet
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08054CEC: .4byte 0x0000405e
-_08054CF0: .4byte 0x00000802
-_08054CF4: .4byte 0x0000406e
-_08054CF8: .4byte 0x00000805
-_08054CFC: .4byte 0x00000806
-_08054D00: .4byte 0x00000808
-_08054D04: .4byte 0x0000404d
-	thumb_func_end Overworld_ResetStateAfterFly
-
 	thumb_func_start Overworld_ResetStateAfterTeleport
 Overworld_ResetStateAfterTeleport: @ 8054D08
 	push {lr}