From 1ee2ec16ae0a597b0fb5dfb0b4f7571f58cac349 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Fri, 18 Sep 2020 00:00:39 -0500 Subject: further splitting and decompile one func --- src/code_80521D0.c | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/code_80521D0.c (limited to 'src/code_80521D0.c') diff --git a/src/code_80521D0.c b/src/code_80521D0.c new file mode 100644 index 0000000..bb4bd13 --- /dev/null +++ b/src/code_80521D0.c @@ -0,0 +1,8 @@ +#include "global.h" + +extern void sub_80526D0(u8 r0); + +void sub_805229C(void) +{ + return sub_80526D0(0x50); +} -- cgit v1.2.3 From 2f88c03e87af934f892e7433d385731c3f206d78 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Sun, 20 Sep 2020 20:13:04 -0500 Subject: some more decomping --- src/code_80521D0.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'src/code_80521D0.c') diff --git a/src/code_80521D0.c b/src/code_80521D0.c index bb4bd13..5a723c5 100644 --- a/src/code_80521D0.c +++ b/src/code_80521D0.c @@ -1,8 +1,29 @@ #include "global.h" extern void sub_80526D0(u8 r0); +extern u8 sub_8045888(u32 r0, u32 r1, u32 r2, u32 r3); +extern void sub_80523A8(u32 r0, u32 r1, u8 r2); void sub_805229C(void) { return sub_80526D0(0x50); } + +void sub_80522A8(u32 r0, u32 r1, u32 r2, u32 r3) +{ + if ((sub_8045888(r0, r1, r2, r3) << 24) != 0){ + sub_80523A8(r0, r1, 1); + } +} + +void sub_80522C8(u32 r0, u32 r1, u32 r2, u32 r3) +{ + if ((sub_8045888(r0, r1, r2, r3) << 24) != 0){ + sub_80523A8(r0, r1, 0); + } +} + +void sub_80522E8(u32 r0, u32 r1) +{ + sub_80523A8(r0, r1, 0); +} -- cgit v1.2.3 From 33b0b86f530d2156bd7c195e057753cf40863942 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Mon, 19 Oct 2020 22:35:02 -0500 Subject: a few more decomp'd funcs --- src/code_80521D0.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 66 insertions(+), 5 deletions(-) (limited to 'src/code_80521D0.c') diff --git a/src/code_80521D0.c b/src/code_80521D0.c index 5a723c5..914b02d 100644 --- a/src/code_80521D0.c +++ b/src/code_80521D0.c @@ -1,24 +1,26 @@ #include "global.h" extern void sub_80526D0(u8 r0); -extern u8 sub_8045888(u32 r0, u32 r1, u32 r2, u32 r3); +extern u8 sub_8045888(u32 r0); extern void sub_80523A8(u32 r0, u32 r1, u8 r2); +extern u8 sub_8052DC0(u32); +extern u8 sub_803F428(u32); void sub_805229C(void) { return sub_80526D0(0x50); } -void sub_80522A8(u32 r0, u32 r1, u32 r2, u32 r3) +void sub_80522A8(u32 r0, u32 r1) { - if ((sub_8045888(r0, r1, r2, r3) << 24) != 0){ + if (sub_8045888(r0) != 0){ sub_80523A8(r0, r1, 1); } } -void sub_80522C8(u32 r0, u32 r1, u32 r2, u32 r3) +void sub_80522C8(u32 r0, u32 r1) { - if ((sub_8045888(r0, r1, r2, r3) << 24) != 0){ + if (sub_8045888(r0) != 0){ sub_80523A8(r0, r1, 0); } } @@ -27,3 +29,62 @@ void sub_80522E8(u32 r0, u32 r1) { sub_80523A8(r0, r1, 0); } + +void sub_80522F4(u32 r0, u32 r1, u32 r2) +{ + u8 temp; + u32 temp_reg; + u32 temp2; + temp = sub_8045888(r0); + temp_reg = (-temp | temp); + temp2 = temp_reg >> 31; + if(sub_8052DC0(r1) != 0) + { + temp2 = 1; + } + if(temp2 != 0) + { + sub_80523A8(r0, r2, 1); + } +} + +void sub_805232C(u32 r0, u32 r1, u32 r2) +{ + u8 temp; + u32 temp_reg; + u32 temp2; + temp = sub_8045888(r0); + temp_reg = (-temp | temp); + temp2 = temp_reg >> 31; + if(sub_8052DC0(r1) != 0) + { + temp2 = 1; + } + if(temp2 != 0) + { + sub_80523A8(r0, r2, 0); + } +} + +void sub_8052364(u32 r0, u32 r1, u32 r2) +{ + u8 temp; + u32 temp_reg; + u32 temp2; + temp = sub_8045888(r0); + temp_reg = (-temp | temp); + temp2 = temp_reg >> 31; + if(sub_803F428(r1) != 0) + { + temp2 = 1; + } + if(temp2 != 0) + { + sub_80523A8(r0, r2, 1); + } +} + +void sub_805239C(u32 r0, u32 r1) +{ + sub_80523A8(r0, r1, 1); +} -- cgit v1.2.3