some more splitting and decomping

2 files changed, 226 insertions, 0 deletions

diff --git a/src/code_801D760.c b/src/code_801D760.c
new file mode 100644
index 0000000..89cd661
--- /dev/null
+++ b/src/code_801D760.c
@@ -0,0 +1,60 @@
+#include "global.h"
+
+extern u32 sub_8022860();
+extern void sub_8022908();
+extern void sub_801D208(u8);
+extern void sub_8027168();
+extern u32 sub_80270A4();
+extern u32 sub_8025F68();
+extern u8 sub_802604C();
+extern void sub_8026058();
+
+struct unk_203B250
+{
+    u32 unk0;
+    u16 unk4;
+    u8 unk6;
+    u8 unk7;
+};
+
+struct unk_203B250 *gUnknown_203B250;
+
+void sub_801D760()
+{
+    u32 temp;
+    temp = sub_8022860();
+    if (temp <= 1)
+        return;
+    if (temp > 3)
+        return;
+    sub_8022908();
+    sub_801D208(1);
+
+}
+
+void sub_801D77C()
+{
+    u32 temp;
+    temp = sub_80270A4();
+    if (temp <= 1)
+        return;
+    if (temp > 3)
+        return;
+    sub_8027168();
+    sub_801D208(1);
+
+}
+
+void sub_801D798(void)
+{
+    u32 temp;
+    temp = sub_8025F68();
+    if (temp <= 1)
+        return;
+    if (temp > 3)
+        return;
+    if(sub_802604C() != 0)
+        gUnknown_203B250->unk7 = gUnknown_203B250->unk6;
+    sub_8026058();
+    sub_801D208(2);
+}
diff --git a/src/code_8098BDC.c b/src/code_8098BDC.c
new file mode 100644
index 0000000..bd56fb3
--- /dev/null
+++ b/src/code_8098BDC.c
@@ -0,0 +1,166 @@
+#include "global.h"
+
+extern u32 gUnknown_203B47C;
+
+extern void sub_809B57C();
+extern void GroundScript_Unlock();
+extern void sub_809D25C();
+extern void sub_80A59DC();
+extern void sub_809B614();
+extern void sub_809CA20();
+extern void sub_80A6E80();
+extern void sub_8099BE4();
+extern void sub_8099744();
+extern void sub_8011860();
+extern void sub_8094FB4(u32 r0);
+extern void sub_800CB20();
+extern void sub_800485C();
+extern void nullsub_120();
+extern void sub_80A5E70();
+extern void sub_809B638();
+extern void nullsub_106();
+extern void sub_80A73EC();
+extern void sub_8099750();
+extern void sub_8009908();
+extern void xxx_call_update_bg_sound_input();
+extern void sub_80A6E68();
+extern void GroundMap_Action();
+extern void nullsub_124();
+extern void GroundLives_Action();
+extern void GroundObject_Action();
+extern void GroundEffect_Action();
+
+extern s32 sub_8001658(u8, u8);
+extern s32 sub_8001784(u8, u8, u8);
+extern void sub_809CB8C();
+extern void sub_8001D88();
+extern void sub_80015C0(u8, u8);
+extern void sub_80018D8(u8, u8, u32);
+extern void sub_800199C(u8, u8, u8, s32);
+extern void sub_8098CC8();
+extern void sub_809674C();
+extern void sub_80961B4();
+extern void sub_8091FB4();
+extern u8 sub_8001CC4(u8, u8, u8);
+extern void sub_8091980(u32);
+
+void sub_8098BDC(void)
+{
+    sub_809B57C();
+    GroundScript_Unlock();
+    sub_809D25C();
+    sub_80A59DC();
+    sub_809B614();
+    sub_809CA20();
+    sub_80A6E80();
+    sub_8099BE4();
+    sub_8099744();
+    sub_8011860();
+    sub_8094FB4(gUnknown_203B47C);
+    sub_800CB20();
+    sub_800485C();
+    nullsub_120();
+    sub_80A5E70();
+    sub_809B638();
+    nullsub_106();
+    sub_80A73EC();
+    sub_8099750();
+    sub_8009908();
+    xxx_call_update_bg_sound_input();
+    sub_80A6E68();
+    GroundMap_Action();
+    nullsub_124();
+    GroundLives_Action();
+    GroundObject_Action();
+    GroundEffect_Action();
+}
+
+void sub_8098C58(void)
+{
+    s32 temp;
+    sub_80015C0(0, 0x36);
+    sub_80015C0(0, 0x39);
+    sub_809CB8C();
+    sub_8001D88();
+
+    if(sub_8001658(0, 0x2A) != 0)
+    {
+        temp = sub_8001658(0, 0x29);
+        temp++;
+        if(temp > 0xF){
+            temp = 0;
+        }
+        sub_80018D8(0, 0x29, temp);
+        sub_80018D8(0, 0x2A, 0);
+    }
+
+    // TODO this uses r2 but it should be r3
+    // Else this matches so nonmatch for now
+#ifdef NONMATCHING
+    temp = sub_8001784(0, 0x42, 0);
+    if(temp <= 0)
+    {
+        temp = 1;
+    }
+    sub_800199C(0, 0x42, 0, temp - 1);
+#else
+    asm_unified("\tmovs r0, 0\n"
+	"\tmovs r1, 0x42\n"
+	"\tmovs r2, 0\n"
+	"\tbl sub_8001784\n"
+	"\tadds r3, r0, 0\n"
+	"\tcmp r3, 0\n"
+	"\tbgt _08098CB4\n"
+	"\tmovs r3, 0x1\n"
+"_08098CB4:\n"
+	"\tsubs r3, 0x1\n"
+	"\tmovs r0, 0\n"
+	"\tmovs r1, 0x42\n"
+	"\tmovs r2, 0\n"
+	"\tbl sub_800199C");
+#endif
+
+    sub_8098CC8();
+}
+
+void sub_8098CC8(void)
+{
+    u32 temp;
+    if(sub_8001CC4(0x3, 0xB, 0) != 0)
+    {
+        temp = 0;
+    }
+    else if(sub_8001CC4(0x3, 0xF, 0) != 0)
+    {
+        temp = 1;
+    }
+    else if(sub_8001CC4(0x3, 0x12, 0) != 0)
+    {
+        temp = 2;
+    }
+    else
+    {
+        temp = 3;
+    }
+    sub_8091980(temp);
+    sub_809674C();
+    sub_80961B4();
+    sub_8091FB4();
+}
+
+// TODO lsrs should be asrs on my first arg
+//u8 sub_8098D1C(u16 r0, u32 r1, s32 r2)
+//{
+//    if(gUnknown_20398A8 == 0)
+//    {
+//        Log(0, &gUnknown_8115F5C, r0, r2);
+//        gUnknown_20398A8 = 1;
+//        gUnknown_20398AC = 1;
+//        gUnknown_20398B0 = r2;
+//        gUnknown_20398B4 = 2;
+//        gUnknown_20398BE = r0;
+//        gUnknown_20398C0 = r1;
+//        return 1;
+//    }
+//    return 0;
+//}