From 4c3524cdeb62653623bea01f307e35c015cc8e9a Mon Sep 17 00:00:00 2001
From: darkruss48 <153812201+darkruss48@users.noreply.github.com>
Date: Tue, 15 Sep 2026 19:14:06 +0000
Subject: [PATCH] Address review

---
 include/main_0205283C.h | 5 +++--
 src/main_0202613C.c     | 7 ++++---
 src/main_02048C5C.c     | 2 +-
 src/main_0205283C.c     | 9 ++++-----
 src/moves_2.c           | 6 +++---
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/include/main_0205283C.h b/include/main_0205283C.h
index 14df8866..057b17c5 100644
--- a/include/main_0205283C.h
+++ b/include/main_0205283C.h
@@ -3,6 +3,7 @@
 
 #include "enums.h"
 #include "util.h"
+#include "monster_data.h"
 
 u8 GetShadowSize(s16 monster_id);
 s16 GetSpeedStatus(s16 monster_id);
@@ -23,7 +24,7 @@ enum ability_id GetAbility(s16 monster_id, u8 ability_idx);
 s16 GetRecruitRate2(s16 monster_id);
 s16 GetRecruitRate1(s16 monster_id);
 s32 GetExp(s16 monster_id, s32 level);
-void GetEvoParameters(u8 *evo_params, s16 monster_id);
-void GetTreasureBoxChances(s16 monster_id, u8 *chances);
+void GetEvoParameters(struct monster_evolution_parameters *evo_params, s16 monster_id);
+void GetTreasureBoxChances(s16 monster_id, s16 *chances);
 
 #endif //PMDSKY_MAIN_0205283C_H
diff --git a/src/main_0202613C.c b/src/main_0202613C.c
index afa71b4f..d1eb27e0 100644
--- a/src/main_0202613C.c
+++ b/src/main_0202613C.c
@@ -1,8 +1,9 @@
 #include "main_0202613C.h"
+#include "dungeon_mode.h"
 
 extern void sub_02020B14(void *p);
 
-extern void sub_02020B60(void *p, void *pair, u32 unk, void *pair2);
+extern void sub_02020B60(void *p, u32 *pair, u32 unk, u32 *pair2);
 
 
 
@@ -19,8 +20,8 @@ void sub_0202613C(struct unk_02026130* p)
 
 void sub_0202614C(struct unk_02026130* p, u32 a, u32 b)
 {
-    struct { u32 x; u32 y; } v;
-    void* r = &v;
+    struct pixel_position v;
+    u32 *r = (u32 *)&v;
     v.x = a;
     v.y = b;
     sub_02020B60((u8 *) p + 4, r, b, r);
diff --git a/src/main_02048C5C.c b/src/main_02048C5C.c
index ad7ba43b..a39e2568 100644
--- a/src/main_02048C5C.c
+++ b/src/main_02048C5C.c
@@ -8,7 +8,7 @@ extern char _022AAE78;
 
 void sub_02048C5C(void)
 {
-    MemsetSimple((u8 *)0x022AAE74, 0, 0x30);
+    MemsetSimple((u8 *)(&_022AAE78 - 4), 0, 0x30);
     _022AAE74.field_0x24 = 0x09011416;
     ReadStringSave(&_022AAE78);
     _022AAE74.field_0x28 = 0x000F1206;
diff --git a/src/main_0205283C.c b/src/main_0205283C.c
index 4ed6b02e..46a8082f 100644
--- a/src/main_0205283C.c
+++ b/src/main_0205283C.c
@@ -97,15 +97,14 @@ s32 GetExp(s16 monster_id, s32 level)
     return exp_yield + exp_yield * (level - 1) / 10;
 }
 
-void GetEvoParameters(u8 *evo_params, s16 monster_id)
+void GetEvoParameters(struct monster_evolution_parameters *evo_params, s16 monster_id)
 {
-    *(struct monster_evolution_parameters *)evo_params =
-        MONSTER_DATA_TABLE_PTR->entries[monster_id].evolution_param;
+    *evo_params = MONSTER_DATA_TABLE_PTR->entries[monster_id].evolution_param;
 }
 
-void GetTreasureBoxChances(s16 monster_id, u8 *chances)
+void GetTreasureBoxChances(s16 monster_id, s16 *chances)
 {
     s16 i;
     for (i = 0; i < 4; i++)
-        ((s16 *)chances)[i] = (&MONSTER_DATA_TABLE_PTR->entries[monster_id].unk_0x3c)[i];
+        chances[i] = (&MONSTER_DATA_TABLE_PTR->entries[monster_id].unk_0x3c)[i];
 }
diff --git a/src/moves_2.c b/src/moves_2.c
index b921a70a..a05df3f8 100644
--- a/src/moves_2.c
+++ b/src/moves_2.c
@@ -18,7 +18,7 @@ u8 *GetMovesetLevelUpPtr(s16 monster_id)
     s16 id = monster_id;
     if (id >= 0x258)
         id = (s16)(id - 0x258);
-    if (IsInvalidMoveset(id) != 0)
+    if (IsInvalidMoveset(id))
         return _02098D64;
     return DUNGEON_MOVE_TABLES.movesets[id].levelup_moves;
 }
@@ -40,7 +40,7 @@ u8 *GetMovesetHmTmPtr(s16 monster_id)
     s16 id = monster_id;
     if (id >= 0x258)
         id = (s16)(id - 0x258);
-    if (IsInvalidMoveset(id) != 0)
+    if (IsInvalidMoveset(id))
         return _02098D64;
     return DUNGEON_MOVE_TABLES.movesets[id].hmtm_moves;
 }
@@ -50,7 +50,7 @@ u8 *GetMovesetEggPtr(s16 monster_id)
     s16 id = monster_id;
     if (id >= 0x258)
         id = (s16)(id - 0x258);
-    if (IsInvalidMoveset(id) != 0)
+    if (IsInvalidMoveset(id))
         return _02098D64;
     return DUNGEON_MOVE_TABLES.movesets[id].egg_moves;
 }