diff options
author | Seth Barberee <seth.barberee@gmail.com> | 2021-05-23 16:19:35 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-23 16:19:35 -0500 |
commit | eaa141c612dd1689936a21bd57018a55ff686b69 (patch) | |
tree | fafe2a9a562af6a8e36716ff76a5b3e8b30d4411 /src/code_8048480.c | |
parent | f402e46cd3c8b7236673d6edbae77903a7cc0618 (diff) |
Keep on keepin on (#38)
* end of may dump of work
* move save text to src
* decomp a little more
Diffstat (limited to 'src/code_8048480.c')
-rw-r--r-- | src/code_8048480.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/src/code_8048480.c b/src/code_8048480.c index efac5df..2995170 100644 --- a/src/code_8048480.c +++ b/src/code_8048480.c @@ -15,16 +15,16 @@ extern void sub_8075FCC(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C extern void sub_8077AE4(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1, u32 r2); extern void sub_8072008(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1, u32 r2, u8 r3, u32); extern void sub_8076D10(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1); -extern void sub_807232C(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1, u32 r2); +extern void LevelDownTarget(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1, u32 r2); extern void sub_8045B94(u8 *r0, struct unkDungeon_8041D5C *r1, u32); extern void sub_807A290(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1); extern void sub_80522F4(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1, u32); -extern void sub_8079270(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1); +extern void RestoreVisionTarget(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1); extern void sub_8077910(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1, u32, u32); extern void sub_80791D8(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1); -extern void sub_8079140(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1); -extern void sub_8077C44(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1, s16, s16, u32); +extern void BlindTarget(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1); +extern void HealTargetHP(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1, s16, s16, u32); extern void sub_80792F8(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1, u32); extern void sub_8079F20(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1, u32, u8); extern void sub_806F370(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1, u32, u32, u32, u32, u32, u32, u32, u32); @@ -41,13 +41,12 @@ void sub_8048364(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1, u void sub_8048374(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) { - sub_8077C44(r0, r1, gUnknown_80F4FB6, gUnknown_80F4FB8, 1); + HealTargetHP(r0, r1, gUnknown_80F4FB6, gUnknown_80F4FB8, 1); } - void sub_804839C(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) { - sub_8077C44(r0, r1, gUnknown_80F4FBA, gUnknown_80F4FBC, 1); + HealTargetHP(r0, r1, gUnknown_80F4FBA, gUnknown_80F4FBC, 1); } void sub_80483C4(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) @@ -57,12 +56,12 @@ void sub_80483C4(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) void sub_80483D4(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) { - sub_8077C44(r0, r1, 0, gUnknown_80F4FBE, 1); + HealTargetHP(r0, r1, 0, gUnknown_80F4FBE, 1); } void sub_80483F4(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) { - sub_8079140(r0, r1); + BlindTarget(r0, r1); } void sub_8048400(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) @@ -77,12 +76,12 @@ void sub_804840C(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) void sub_804841C(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) { - sub_8079270(r0, r1); + RestoreVisionTarget(r0, r1); } void sub_8048428(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) { - if(r1->unk70->unkAC == 4) + if(r1->unk70->statusCondition == 4) // 4 - Paralyzed?? sub_807A290(r0, r1); else // Pointer to "But nothing happened!" @@ -91,7 +90,7 @@ void sub_8048428(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) void sub_8048450(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) { - if((u8)(r1->unk70->unkAC - 2) <= 1) + if((u8)(r1->unk70->statusCondition - 2) <= 1) sub_807A290(r0, r1); else // Pointer to "But nothing happened!" @@ -131,12 +130,12 @@ void sub_80484C8(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) void sub_80484DC(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) { - sub_807232C(r0, r1, 1); + LevelDownTarget(r0, r1, 1); } void sub_80484E8(struct unkDungeon_8041D5C *r0, struct unkDungeon_8041D5C *r1) { - if(r1->unk70->unkAC == 1) + if(r1->unk70->statusCondition == 1) // 1 - Burn?? sub_807A290(r0, r1); else { |