diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/field_control_avatar.s | 4 | ||||
| -rw-r--r-- | asm/field_screen_effect.s | 8 | ||||
| -rw-r--r-- | asm/overworld.s | 32 | ||||
| -rw-r--r-- | asm/wild_encounter.s | 6 |
4 files changed, 25 insertions, 25 deletions
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index 9c0677c09..842c9c33e 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -1822,11 +1822,11 @@ _0806D6EC: lsrs r0, 24 cmp r0, 0x1 bne _0806D704 - ldr r0, _0806D700 @ =gUnknown_81A8DFD + ldr r0, _0806D700 @ =EventScript_PoisonWhiteOut bl ScriptContext1_SetupScript b _0806D730 .align 2, 0 -_0806D700: .4byte gUnknown_81A8DFD +_0806D700: .4byte EventScript_PoisonWhiteOut _0806D704: bl ShouldEggHatch lsls r0, 24 diff --git a/asm/field_screen_effect.s b/asm/field_screen_effect.s index 079abee2c..f8c0970c9 100644 --- a/asm/field_screen_effect.s +++ b/asm/field_screen_effect.s @@ -985,25 +985,25 @@ _0807F5B6: bne _0807F5E4 adds r0, r6, 0 bl DestroyTask - ldr r0, _0807F5CC @ =gUnknown_81A8D97 + ldr r0, _0807F5CC @ =EventScript_AfterWhiteOutHeal bl ScriptContext1_SetupScript b _0807F5E4 .align 2, 0 -_0807F5CC: .4byte gUnknown_81A8D97 +_0807F5CC: .4byte EventScript_AfterWhiteOutHeal _0807F5D0: bl sub_807E418 cmp r0, 0x1 bne _0807F5E4 adds r0, r6, 0 bl DestroyTask - ldr r0, _0807F5EC @ =gUnknown_81A8DD8 + ldr r0, _0807F5EC @ =EventScript_MomHeal bl ScriptContext1_SetupScript _0807F5E4: pop {r4-r7} pop {r0} bx r0 .align 2, 0 -_0807F5EC: .4byte gUnknown_81A8DD8 +_0807F5EC: .4byte EventScript_MomHeal thumb_func_end sub_807F45C thumb_func_start sub_807F5F0 diff --git a/asm/overworld.s b/asm/overworld.s index d4993c154..1640bf2c4 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -15,7 +15,7 @@ sub_8054BC8: @ 8054BC8 movs r0, 0xA4 lsls r0, 2 adds r4, r0 - bl sub_8054C04 + bl ComputeWhiteOutMoneyLoss adds r1, r0, 0 adds r0, r4, 0 bl RemoveMoney @@ -31,17 +31,17 @@ _08054BFC: .4byte gUnknown_81A654B _08054C00: .4byte gSaveBlock1Ptr thumb_func_end sub_8054BC8 - thumb_func_start sub_8054C04 -sub_8054C04: @ 8054C04 + thumb_func_start ComputeWhiteOutMoneyLoss +ComputeWhiteOutMoneyLoss: @ 8054C04 push {r4,lr} - bl sub_8054C70 + bl CountBadgesForOverworldWhiteOutLossCalculation adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 bl GetPlayerPartyHighestLevel lsls r0, 24 lsrs r0, 24 - ldr r1, _08054C40 @ =gUnknown_826D294 + ldr r1, _08054C40 @ =sWhiteOutMoneyLossMultipliers adds r4, r1 ldrb r1, [r4] lsls r1, 2 @@ -62,14 +62,14 @@ _08054C38: pop {r1} bx r1 .align 2, 0 -_08054C40: .4byte gUnknown_826D294 +_08054C40: .4byte sWhiteOutMoneyLossMultipliers _08054C44: .4byte gSaveBlock1Ptr - thumb_func_end sub_8054C04 + thumb_func_end ComputeWhiteOutMoneyLoss - thumb_func_start sub_8054C48 -sub_8054C48: @ 8054C48 + thumb_func_start Special_OverworldWhiteOutGetMoneyLoss +Special_OverworldWhiteOutGetMoneyLoss: @ 8054C48 push {r4,r5,lr} - bl sub_8054C04 + bl ComputeWhiteOutMoneyLoss adds r4, r0, 0 ldr r5, _08054C6C @ =gStringVar1 bl CountDigits @@ -85,14 +85,14 @@ sub_8054C48: @ 8054C48 bx r0 .align 2, 0 _08054C6C: .4byte gStringVar1 - thumb_func_end sub_8054C48 + thumb_func_end Special_OverworldWhiteOutGetMoneyLoss - thumb_func_start sub_8054C70 -sub_8054C70: @ 8054C70 + thumb_func_start CountBadgesForOverworldWhiteOutLossCalculation +CountBadgesForOverworldWhiteOutLossCalculation: @ 8054C70 push {r4-r6,lr} movs r6, 0 movs r5, 0 - ldr r4, _08054C9C @ =gUnknown_826D29E + ldr r4, _08054C9C @ =sWhiteOutMoneyLossBadgeFlagIDs _08054C78: ldrh r0, [r4] bl FlagGet @@ -112,8 +112,8 @@ _08054C8A: pop {r1} bx r1 .align 2, 0 -_08054C9C: .4byte gUnknown_826D29E - thumb_func_end sub_8054C70 +_08054C9C: .4byte sWhiteOutMoneyLossBadgeFlagIDs + thumb_func_end CountBadgesForOverworldWhiteOutLossCalculation thumb_func_start sub_8054CA0 sub_8054CA0: @ 8054CA0 diff --git a/asm/wild_encounter.s b/asm/wild_encounter.s index b7ac02d0a..dedcfa761 100644 --- a/asm/wild_encounter.s +++ b/asm/wild_encounter.s @@ -966,8 +966,8 @@ _08082E48: bx r1 thumb_func_end sub_8082CBC - thumb_func_start sub_8082E54 -sub_8082E54: @ 8082E54 + thumb_func_start Special_RockSmashEncounter +Special_RockSmashEncounter: @ 8082E54 push {r4,lr} bl sub_8082934 lsls r0, 16 @@ -1018,7 +1018,7 @@ _08082EB6: bx r0 .align 2, 0 _08082EBC: .4byte gSpecialVar_Result - thumb_func_end sub_8082E54 + thumb_func_end Special_RockSmashEncounter thumb_func_start SweetScentWildEncounter SweetScentWildEncounter: @ 8082EC0 |