From 7040e8e9568a21ef8417c7de6e47fd636dcd7865 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 8 Oct 2018 12:10:33 -0400
Subject: sub_8146C30

---
 src/menews_jisan.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 src/menews_jisan.c

(limited to 'src')

diff --git a/src/menews_jisan.c b/src/menews_jisan.c
new file mode 100644
index 000000000..afaef7cf9
--- /dev/null
+++ b/src/menews_jisan.c
@@ -0,0 +1,74 @@
+#include "global.h"
+#include "mevent.h"
+#include "random.h"
+
+#ifdef NONMATCHING
+void sub_8146C30(u32 a0)
+{
+    struct MysteryEventStruct *r5 = sub_8143D94();
+
+    r5->unk_0_0 = a0;
+    asm_comment("The switch logic does not match.  Specifically, the \"bhi\" is replaced with a \"bls\" and the comparisons with 1 and 3 are swapped chronologically.");
+    switch (a0)
+    {
+        case 0:
+            r5->unk_1 = (Random() % 15) + 16;
+            break;
+        case 1:
+            break;
+        case 2:
+            break;
+        case 3:
+            r5->unk_1 = (Random() % 15) + 1;
+            break;
+    }
+}
+#else
+NAKED
+void sub_8146C30(u32 a0)
+{
+    asm_unified("\tpush {r4,r5,lr}\n"
+                "\tadds r4, r0, 0\n"
+                "\tbl sub_8143D94\n"
+                "\tadds r5, r0, 0\n"
+                "\tmovs r0, 0x3\n"
+                "\tadds r1, r4, 0\n"
+                "\tands r1, r0\n"
+                "\tldrb r2, [r5]\n"
+                "\tmovs r0, 0x4\n"
+                "\tnegs r0, r0\n"
+                "\tands r0, r2\n"
+                "\torrs r0, r1\n"
+                "\tstrb r0, [r5]\n"
+                "\tcmp r4, 0x2\n"
+                "\tbhi _08146C56\n"
+                "\tcmp r4, 0x1\n"
+                "\tbcs _08146C5C\n"
+                "\tb _08146C80\n"
+                "_08146C56:\n"
+                "\tcmp r4, 0x3\n"
+                "\tbeq _08146C6E\n"
+                "\tb _08146C80\n"
+                "_08146C5C:\n"
+                "\tbl Random\n"
+                "\tlsls r0, 16\n"
+                "\tlsrs r0, 16\n"
+                "\tmovs r1, 0xF\n"
+                "\tbl __umodsi3\n"
+                "\tadds r0, 0x10\n"
+                "\tb _08146C7E\n"
+                "_08146C6E:\n"
+                "\tbl Random\n"
+                "\tlsls r0, 16\n"
+                "\tlsrs r0, 16\n"
+                "\tmovs r1, 0xF\n"
+                "\tbl __umodsi3\n"
+                "\tadds r0, 0x1\n"
+                "_08146C7E:\n"
+                "\tstrb r0, [r5, 0x1]\n"
+                "_08146C80:\n"
+                "\tpop {r4,r5}\n"
+                "\tpop {r0}\n"
+                "\tbx r0");
+}
+#endif
-- 
cgit v1.2.3


From 4dd5029fdc505636d8ac00add5425bb22fd082ba Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 8 Oct 2018 14:24:44 -0400
Subject: sub_8146CA4

---
 src/menews_jisan.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'src')

diff --git a/src/menews_jisan.c b/src/menews_jisan.c
index afaef7cf9..6e9be8318 100644
--- a/src/menews_jisan.c
+++ b/src/menews_jisan.c
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "mevent.h"
 #include "random.h"
+#include "event_data.h"
 
 #ifdef NONMATCHING
 void sub_8146C30(u32 a0)
@@ -72,3 +73,27 @@ void sub_8146C30(u32 a0)
                 "\tbx r0");
 }
 #endif
+
+void sub_8146C88(void)
+{
+    struct MysteryEventStruct *r5 = sub_8143D94();
+
+    r5->unk_0_0 = 0;
+    r5->unk_0_2 = 0;
+    r5->unk_0_5 = 0;
+    r5->unk_1 = 0;
+    VarSet(0x4028, 0);
+}
+
+void sub_8146CA4(void)
+{
+    u16 *r4 = sub_806E454(0x4028);
+    struct MysteryEventStruct *r5 = sub_8143D94();
+    struct MysteryEventStruct r0 = *r5;
+
+    if ((u8)r0.unk_0_5 > 4 && ++(*r4) > 0x1f3)
+    {
+        r5->unk_0_5 = 0;
+        *r4 = 0;
+    }
+}
-- 
cgit v1.2.3


From 6b27e999f242f51a81bef70c40a378d5adbaf9e2 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 8 Oct 2018 14:40:46 -0400
Subject: through sub_8146D94

---
 src/menews_jisan.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 65 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/menews_jisan.c b/src/menews_jisan.c
index 6e9be8318..93f98ab7a 100644
--- a/src/menews_jisan.c
+++ b/src/menews_jisan.c
@@ -3,6 +3,14 @@
 #include "random.h"
 #include "event_data.h"
 
+extern EWRAM_DATA u16 gUnknown_20370D0;
+
+u32 sub_8146D74(struct MysteryEventStruct *);
+void sub_8146DD8(struct MysteryEventStruct *);
+u16 sub_8146E0C(struct MysteryEventStruct *);
+void sub_8146DA0(struct MysteryEventStruct *);
+void sub_8146D94(struct MysteryEventStruct *);
+
 #ifdef NONMATCHING
 void sub_8146C30(u32 a0)
 {
@@ -88,12 +96,66 @@ void sub_8146C88(void)
 void sub_8146CA4(void)
 {
     u16 *r4 = sub_806E454(0x4028);
-    struct MysteryEventStruct *r5 = sub_8143D94();
-    struct MysteryEventStruct r0 = *r5;
+    struct MysteryEventStruct *r2 = sub_8143D94();
+    struct MysteryEventStruct r0 = *r2;
 
     if ((u8)r0.unk_0_5 > 4 && ++(*r4) > 0x1f3)
     {
-        r5->unk_0_5 = 0;
+        r2->unk_0_5 = 0;
         *r4 = 0;
     }
 }
+
+u16 sub_8146CE8(void)
+{
+    u16 *r6 = &gUnknown_20370D0;
+    struct MysteryEventStruct *r4 = sub_8143D94();
+    u16 r5;
+
+    if (!sub_806E2BC() || !sub_8143E1C())
+        return 0;
+
+    r5 = sub_8146E0C(r4);
+
+    switch (r5)
+    {
+        case 0:
+            break;
+        case 1:
+            *r6 = sub_8146D74(r4);
+            break;
+        case 2:
+            *r6 = sub_8146D74(r4);
+            break;
+        case 3:
+            break;
+        case 4:
+            *r6 = sub_8146D74(r4);
+            sub_8146DA0(r4);
+            break;
+        case 5:
+            *r6 = sub_8146D74(r4);
+            sub_8146D94(r4);
+            break;
+        case 6:
+            break;
+    }
+
+    return r5;
+}
+
+u32 sub_8146D74(struct MysteryEventStruct *a0)
+{
+    u32 r4;
+
+    a0->unk_0_0 = 0;
+    r4 = a0->unk_1 + 0x84;
+    a0->unk_1 = 0;
+    sub_8146DD8(a0);
+    return r4;
+}
+
+void sub_8146D94(struct MysteryEventStruct *a0)
+{
+    a0->unk_0_2 = 0;
+}
-- 
cgit v1.2.3


From d348c44eb66a30d50a742d900760826a863c5759 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 8 Oct 2018 14:58:51 -0400
Subject: Finish decompile of menews_jisan.s

---
 src/menews_jisan.c | 41 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/menews_jisan.c b/src/menews_jisan.c
index 93f98ab7a..6c3f669eb 100644
--- a/src/menews_jisan.c
+++ b/src/menews_jisan.c
@@ -7,7 +7,7 @@ extern EWRAM_DATA u16 gUnknown_20370D0;
 
 u32 sub_8146D74(struct MysteryEventStruct *);
 void sub_8146DD8(struct MysteryEventStruct *);
-u16 sub_8146E0C(struct MysteryEventStruct *);
+u32 sub_8146E0C(struct MysteryEventStruct *);
 void sub_8146DA0(struct MysteryEventStruct *);
 void sub_8146D94(struct MysteryEventStruct *);
 
@@ -159,3 +159,42 @@ void sub_8146D94(struct MysteryEventStruct *a0)
 {
     a0->unk_0_2 = 0;
 }
+
+void sub_8146DA0(struct MysteryEventStruct *a0)
+{
+    a0->unk_0_2++;
+    if ((u8)a0->unk_0_2 > 4)
+        a0->unk_0_2 = 4;
+}
+
+void sub_8146DD8(struct MysteryEventStruct *a0)
+{
+    a0->unk_0_5++;
+    if ((u8)a0->unk_0_5 > 5)
+        a0->unk_0_5 = 5;
+}
+
+u32 sub_8146E0C(struct MysteryEventStruct *a0)
+{
+    struct MysteryEventStruct r0;
+    if ((u8)a0->unk_0_5 == 5)
+        return 6;
+
+    r0 = *a0;
+    switch (r0.unk_0_0)
+    {
+        case 0:
+            return 3;
+        case 1:
+            return 1;
+        case 2:
+            return 2;
+        case 3:
+            if ((u8)r0.unk_0_2 < 3)
+                return 4;
+            return 5;
+        default:
+            AGBAssert("C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/menews_jisan.c", 383, "0", 1);
+            return 0;
+    }
+}
-- 
cgit v1.2.3


From eda4a9f9406aa2ef3fe91006e134f44b07035081 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 8 Oct 2018 14:59:48 -0400
Subject: Use the macro ya dummy

---
 src/menews_jisan.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/menews_jisan.c b/src/menews_jisan.c
index 6c3f669eb..dd1376c26 100644
--- a/src/menews_jisan.c
+++ b/src/menews_jisan.c
@@ -194,7 +194,7 @@ u32 sub_8146E0C(struct MysteryEventStruct *a0)
                 return 4;
             return 5;
         default:
-            AGBAssert("C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/menews_jisan.c", 383, "0", 1);
+            AGB_ASSERT_EX(0, "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/menews_jisan.c", 383);
             return 0;
     }
 }
-- 
cgit v1.2.3


From 1d50bcb0b95e52fb43c22a3348ac033b3534f860 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 8 Oct 2018 16:02:11 -0400
Subject: Cleanup and create menews_jisan header

---
 src/menews_jisan.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/menews_jisan.c b/src/menews_jisan.c
index dd1376c26..7dfcee939 100644
--- a/src/menews_jisan.c
+++ b/src/menews_jisan.c
@@ -2,14 +2,13 @@
 #include "mevent.h"
 #include "random.h"
 #include "event_data.h"
+#include "menews_jisan.h"
 
-extern EWRAM_DATA u16 gUnknown_20370D0;
-
-u32 sub_8146D74(struct MysteryEventStruct *);
-void sub_8146DD8(struct MysteryEventStruct *);
-u32 sub_8146E0C(struct MysteryEventStruct *);
-void sub_8146DA0(struct MysteryEventStruct *);
-void sub_8146D94(struct MysteryEventStruct *);
+static u32 sub_8146D74(struct MysteryEventStruct *);
+static void sub_8146DD8(struct MysteryEventStruct *);
+static u32 sub_8146E0C(struct MysteryEventStruct *);
+static void sub_8146DA0(struct MysteryEventStruct *);
+static void sub_8146D94(struct MysteryEventStruct *);
 
 #ifdef NONMATCHING
 void sub_8146C30(u32 a0)
@@ -144,7 +143,7 @@ u16 sub_8146CE8(void)
     return r5;
 }
 
-u32 sub_8146D74(struct MysteryEventStruct *a0)
+static u32 sub_8146D74(struct MysteryEventStruct *a0)
 {
     u32 r4;
 
@@ -155,26 +154,26 @@ u32 sub_8146D74(struct MysteryEventStruct *a0)
     return r4;
 }
 
-void sub_8146D94(struct MysteryEventStruct *a0)
+static void sub_8146D94(struct MysteryEventStruct *a0)
 {
     a0->unk_0_2 = 0;
 }
 
-void sub_8146DA0(struct MysteryEventStruct *a0)
+static void sub_8146DA0(struct MysteryEventStruct *a0)
 {
     a0->unk_0_2++;
     if ((u8)a0->unk_0_2 > 4)
         a0->unk_0_2 = 4;
 }
 
-void sub_8146DD8(struct MysteryEventStruct *a0)
+static void sub_8146DD8(struct MysteryEventStruct *a0)
 {
     a0->unk_0_5++;
     if ((u8)a0->unk_0_5 > 5)
         a0->unk_0_5 = 5;
 }
 
-u32 sub_8146E0C(struct MysteryEventStruct *a0)
+static u32 sub_8146E0C(struct MysteryEventStruct *a0)
 {
     struct MysteryEventStruct r0;
     if ((u8)a0->unk_0_5 == 5)
-- 
cgit v1.2.3