diff options
Diffstat (limited to 'src/code_8057824.c')
-rw-r--r-- | src/code_8057824.c | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/src/code_8057824.c b/src/code_8057824.c index edc338d..27a546f 100644 --- a/src/code_8057824.c +++ b/src/code_8057824.c @@ -19,10 +19,10 @@ extern u8 sub_807EAA0(u32, u32); extern void sub_80522F4(struct unkDungeon_8041D5C *r1, struct unkDungeon_8041D5C *r2, u32); extern void sub_8079F20(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1, u32, u32); -extern u8 sub_805727C(u32, u32, s16); -extern u32 sub_8055640(u32, u32, u32, u32, u32); -extern void sub_80779F0(u32, u32, u32, u32); -extern void sub_8078968(); +extern u8 sub_805727C(struct unkDungeon_8041D5C *, struct unkDungeon_8041D5C *, s16); +extern u32 sub_8055640(struct unkDungeon_8041D5C *, struct unkDungeon_8041D5C *, u32, u32, u32); +extern void sub_80779F0(struct unkDungeon_8041D5C *, struct unkDungeon_8041D5C *, u32, u32); +extern void sub_8078968(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1); extern void sub_8079618(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1, u32, u32, u32); extern void sub_806F370(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1, u32, u32, u8 *, u8, s32, u32, u32, u32); @@ -33,51 +33,53 @@ extern u32 gUnknown_80FD018; extern s16 sub_8057600(u32, u32); extern u32 sub_8092B00(u32); -u32 sub_8057824(struct unkDungeon_8041D5C *param_1, struct unkDungeon_8041D5C *param_2) +bool32 sub_8057824(struct unkDungeon_8041D5C *param_1, struct unkDungeon_8041D5C *param_2) { + // Lower evasion? sub_80775DC(param_1,param_2,gUnknown_8106A50,1); - return 1; + return TRUE; } -u32 sub_805783C(struct unkDungeon_8041D5C *param_1, struct unkDungeon_8041D5C *param_2) +bool32 sub_805783C(struct unkDungeon_8041D5C *param_1, struct unkDungeon_8041D5C *param_2) { + // Lower attack? sub_80772C0(param_1,param_2,gUnknown_8106A4C,0x80,1); - return 1; + return TRUE; } -u32 sub_805785C(struct unkDungeon_8041D5C *param_1, struct unkDungeon_8041D5C *param_2) +bool32 sub_805785C(struct unkDungeon_8041D5C *param_1, struct unkDungeon_8041D5C *param_2) { gUnknown_203B418->unkE26B = gUnknown_80F4F42; if (sub_807EAA0(1,0) == '\0') { // The weather remains unchanged sub_80522F4(param_1,param_2,gUnknown_80FCF74); } - return 1; + return TRUE; } -u32 sub_80578A4(struct unkDungeon_8041D5C *param_1, struct unkDungeon_8041D5C *param_2) +bool32 sub_80578A4(struct unkDungeon_8041D5C *param_1, struct unkDungeon_8041D5C *param_2) { gUnknown_203B418->unkE26C = gUnknown_80F4F42; if (sub_807EAA0(1,0) == '\0') { // The weather remains unchanged sub_80522F4(param_1,param_2,gUnknown_80FCF80); } - return 1; + return TRUE; } -u32 sub_80578EC(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) +bool32 sub_80578EC(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) { sub_8079F20(r0, r1, 1, 0); - return 1; + return TRUE; } -u32 sub_80578FC(u32 param_1, u32 param_2, u32 param_3, u32 param_4) +bool32 sub_80578FC(struct unkDungeon_8041D5C *param_1, struct unkDungeon_8041D5C *param_2, u32 param_3, u32 param_4) { - u32 uVar3; + bool32 uVar3; uVar3 = 0; if (sub_8055640(param_1, param_2, param_3, 0x80 << 1, param_4) != 0) { - uVar3 = 1; + uVar3 = TRUE; if (sub_805727C(param_1,param_2, gUnknown_80F4DB6) != '\0') { sub_80779F0(param_1, param_2, 1, 0); } @@ -85,25 +87,25 @@ u32 sub_80578FC(u32 param_1, u32 param_2, u32 param_3, u32 param_4) return uVar3; } -u32 sub_8057948(void) +bool32 sub_8057948(struct unkDungeon_8041D5C *param_1, struct unkDungeon_8041D5C *param_2) { - sub_8078968(); - return 1; + sub_8078968(param_1, param_2); + return TRUE; } -u32 sub_8057954(struct unkDungeon_8041D5C *param_1, struct unkDungeon_8041D5C *param_2, u32 param_3) +bool32 sub_8057954(struct unkDungeon_8041D5C *param_1, struct unkDungeon_8041D5C *param_2, u32 param_3) { // $m0 is enraged sub_8079618(param_1,param_2,0xc,param_3,gUnknown_80FAC88); - return 1; + return TRUE; } -u8 sub_8057974(struct unkDungeon_8041D5C *param_1, struct unkDungeon_8041D5C *param_2, u32 param_3, u32 param_4) +bool32 sub_8057974(struct unkDungeon_8041D5C *param_1, struct unkDungeon_8041D5C *param_2, u32 param_3, u32 param_4) { s32 newHP; u8 local_24; - newHP = param_2->unk70->unkE / 2; + newHP = param_2->unk70->HP / 2; local_24 = 0; if (newHP != 0) { sub_806F370(param_1,param_2,newHP,1,&local_24,sub_8092B00(param_3),sub_8057600(param_3,param_4),0,1,0); |