Decomped DoMoveDefendOrder

Decomped by anonymous decomp.me user
This commit is contained in:
AnonymousRandomPerson
2024-10-28 20:51:21 -04:00
parent 395c122e2c
commit 1b2c71b3ef
5 changed files with 21 additions and 31 deletions

View File

@@ -1,7 +1,5 @@
#pragma once
.public AbilityIsActiveVeneer
.public ATK_STAT_IDX
.public BoostDefensiveStat
.public BoostOffensiveStat
.public BoostSpeedOneStage
.public CalcRecoilDamageFixed
@@ -13,20 +11,16 @@
.public EndFrozenStatus
.public EndNegativeStatusConditionWrapper
.public EndSleepClassStatus
.public EntityIsValid__0232E840
.public EntityIsValidMoveEffects__0232E250
.public EntityIsValid__0232E840
.public FIRE_FANG_CRINGE_CHANCE
.public FLARE_BLITZ_BURN_CHANCE
.public HEALING_WISH_HP_RESTORATION
.public LogMessageByIdWithPopupCheckUserTarget
.public LowerOffensiveStat
.public ov29_02318D98
.public ov29_0234AFFC
.public ov29_02353718
.public ResetHitChanceStat
.public RestoreAllMovePP
.public SPATK_STAT_IDX
.public sub_02054EC8
.public SubstitutePlaceholderStringTags
.public TryIncreaseHp
.public TryInflictBurnStatus
@@ -34,3 +28,7 @@
.public TryInflictMiracleEyeStatus
.public TryInflictTerrifiedStatus
.public TryRestoreHp
.public ov29_02318D98
.public ov29_0234AFFC
.public ov29_02353718
.public sub_02054EC8

View File

@@ -1,30 +1,8 @@
.include "asm/macros.inc"
.include "overlay_29_0232E274.inc"
.include "overlay_29_0232E2B8.inc"
.text
arm_func_start DoMoveDefendOrder
DoMoveDefendOrder: ; 0x0232E274
stmdb sp!, {r3, r4, r5, lr}
ldr r2, _0232E2B0 ; =ATK_STAT_IDX
mov r3, #1
ldr r2, [r2]
mov r5, r0
mov r4, r1
bl BoostDefensiveStat
ldr r1, _0232E2B4 ; =SPATK_STAT_IDX
mov r0, r5
ldr r2, [r1]
mov r1, r4
mov r3, #1
bl BoostDefensiveStat
mov r0, #1
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0232E2B0: .word ATK_STAT_IDX
_0232E2B4: .word SPATK_STAT_IDX
arm_func_end DoMoveDefendOrder
arm_func_start DoMoveFireFang
DoMoveFireFang: ; 0x0232E2B8
stmdb sp!, {r3, r4, r5, r6, r7, lr}

View File

@@ -7,5 +7,6 @@
// entity: entity pointer
// return: bool
u8 EntityIsValidMoveEffects__0232E250(struct entity *entity);
BOOL DoMoveDefendOrder(s32 param_1, s32 param_2, s32 param_3, s32 param_4);
#endif //PMDSKY_OVERLAY_29_0232E250_H

View File

@@ -302,7 +302,7 @@ Overlay OVY_29
Object src/overlay_29_0232C500.o
Object asm/overlay_29_0232C524.o
Object src/overlay_29_0232E250.o
Object asm/overlay_29_0232E274.o
Object asm/overlay_29_0232E2B8.o
Object src/overlay_29_0232E840.o
Object asm/overlay_29_0232E864.o
Object src/overlay_29_02333FAC.o

View File

@@ -1,5 +1,10 @@
#include "overlay_29_0232E250.h"
extern u32 *ATK_STAT_IDX;
extern u32 *SPATK_STAT_IDX;
extern void BoostDefensiveStat(s32 param_1, s32 param_2, s32 *param_3, BOOL param_4);
u8 EntityIsValidMoveEffects__0232E250(struct entity *entity)
{
if (entity == NULL)
@@ -8,3 +13,11 @@ u8 EntityIsValidMoveEffects__0232E250(struct entity *entity)
}
return entity->type != ENTITY_NOTHING;
}
BOOL DoMoveDefendOrder(s32 param_1, s32 param_2, s32 param_3, s32 param_4)
{
BoostDefensiveStat(param_1, param_2, ATK_STAT_IDX, TRUE);
BoostDefensiveStat(param_1, param_2, SPATK_STAT_IDX, TRUE);
return TRUE;
}