From 08ca0fe91aecf110e2b060b2d6e3db7473d71bed Mon Sep 17 00:00:00 2001
From: Seth Barberee <seth.barberee@gmail.com>
Date: Sun, 27 Apr 2025 10:19:06 -0700
Subject: [PATCH] address review comments/add match from @DizzyEggg

---
 src/code_803C1B4.c | 31 ++++++++++---------------------
 src/ground_event.c |  2 +-
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/src/code_803C1B4.c b/src/code_803C1B4.c
index 100c8d969..1ba27ca1f 100644
--- a/src/code_803C1B4.c
+++ b/src/code_803C1B4.c
@@ -8,11 +8,11 @@ extern u8 *gMissionRankText[];
 extern s32 gUnknown_80E80A0[];
 void sub_803C37C(DungeonLocation *, u8, u8 *);
 
-s32 sub_803C1B4(DungeonLocation *dungeon, u8 r1)
+s32 sub_803C1B4(DungeonLocation *dungeon, u8 missionType)
 {
     s32 temp;
     temp = sub_80908D8(dungeon);
-    if(r1 == 2)
+    if(missionType == 2)
     {
         temp += 2;
     }
@@ -21,26 +21,15 @@ s32 sub_803C1B4(DungeonLocation *dungeon, u8 r1)
     return temp;
 }
 
-NAKED
-u8 sub_803C1D0(DungeonLocation *dungeon, u8 missionType)
+u8 sub_803C1D0(struct DungeonLocation *dungeon, u8 missionType)
 {
-    asm_unified(
-	"\tpush {lr}\n"
-	"\tlsls r1, 24\n"
-	"\tlsrs r1, 24\n"
-	"\tbl sub_803C1B4\n"
-	"\tadds r1, r0, 0\n"
-	"\tlsrs r0, r1, 31\n"
-	"\tadds r0, r1, r0\n"
-	"\tasrs r1, r0, 1\n"
-	"\tlsls r0, r1, 24\n"
-	"\tlsrs r0, 24\n"
-	"\tcmp r0, 0x6\n"
-	"\tbls _0803C1EC\n"
-	"\tmovs r0, 0x6\n"
-"_0803C1EC:\n"
-	"\tpop {r1}\n"
-	"\tbx r1");
+    s32 a = sub_803C1B4(dungeon, missionType);
+    a /= 2;
+    if ((u8)a >= 7) {
+        a = 6; 
+        return a;
+    }
+    return a;
 }
 
 u8 *GetMissionRankText(u8 index)
diff --git a/src/ground_event.c b/src/ground_event.c
index c031512a8..f7e296d53 100644
--- a/src/ground_event.c
+++ b/src/ground_event.c
@@ -31,7 +31,7 @@ void AllocGroundEvents(void) {
     DeleteGroundEvents();
 }
 
-void DeleteGroundEvents() {
+void DeleteGroundEvents(void) {
     s32 v1;
     struct GroundEvent_sub* current;