From 0829319ee532fb1c6ab0a9f8b5f6ecd5bc26d43d Mon Sep 17 00:00:00 2001
From: Seth Barberee <seth.barberee@gmail.com>
Date: Sun, 20 Feb 2022 09:08:42 -0800
Subject: these funcs have nothing to do with those so separate them

---
 ld_script.txt                |  4 +++
 src/code_8048DB8.c           | 86 ++++++++++++++++++++++++++++++++++++++++++++
 src/code_8073CF0.c           | 22 ++++++++++++
 src/code_8083288.c           |  9 +++++
 src/code_809447C.c           | 68 +++++++++++++++++++++++++++++++++++
 src/dungeon_ai_item_weight.c | 80 -----------------------------------------
 src/dungeon_ai_items.c       | 17 ---------
 src/dungeon_range.c          |  7 ----
 src/number_util.c            | 65 ---------------------------------
 9 files changed, 189 insertions(+), 169 deletions(-)
 create mode 100644 src/code_8048DB8.c
 create mode 100644 src/code_8073CF0.c
 create mode 100644 src/code_8083288.c
 create mode 100644 src/code_809447C.c

diff --git a/ld_script.txt b/ld_script.txt
index 1f95d54..59b191f 100755
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -198,6 +198,7 @@ SECTIONS {
         asm/code_8046CE4.o(.text);
         src/code_8048480.o(.text);
         asm/code_8048480.o(.text);
+        src/code_8048DB8.o(.text);
         src/dungeon_ai_item_weight.o(.text);
         src/dungeon_map_access.o(.text);
         asm/code_8049590.o(.text);
@@ -228,6 +229,7 @@ SECTIONS {
         src/dungeon_pokemon_attributes.o(.text);
         asm/code_80718D8.o(.text);
         src/dungeon_ai_items.o(.text);
+        src/code_8073CF0.o(.text);
         asm/code_8073CF0.o(.text);
         src/dungeon_ai_movement.o(.text);
         asm/code_8075BA4.o(.text);
@@ -237,6 +239,7 @@ SECTIONS {
         asm/code_807CABC.o(.text);
         src/targeting_flags.o(.text);
         asm/code_807CD9C.o(.text);
+        src/code_8083288.o(.text);
         src/dungeon_range.o(.text);
         asm/code_808333C.o(.text);
         src/dungeon_random.o(.text);
@@ -275,6 +278,7 @@ SECTIONS {
         src/moves_1.o(.text);
         asm/code_8094148.o(.text);
         src/number_util.o(.text);
+        src/code_809447C.o(.text);
         asm/code_809447C.o(.text);
         src/code_8092334.o(.text);
         src/game_options.o(.text);
diff --git a/src/code_8048DB8.c b/src/code_8048DB8.c
new file mode 100644
index 0000000..0a932ec
--- /dev/null
+++ b/src/code_8048DB8.c
@@ -0,0 +1,86 @@
+#include "global.h"
+#include "code_80521D0.h"
+#include "dungeon_random.h"
+
+
+extern void sub_803E708(u32, u32);
+extern void sub_80421C0(struct DungeonEntity *r0, u16 r1);
+extern void sub_8078B5C(struct DungeonEntity *, u32, u32, u32, u32);
+extern void sub_80763F8(struct DungeonEntity *, u32, u32);
+extern void sub_80769CC(struct DungeonEntity *, u32);
+extern void sub_8076210(struct DungeonEntity *, u32, u32, u32);
+extern void sub_8077780(struct DungeonEntity *, u32, u32);
+extern void sub_8076E20(struct DungeonEntity *, u32, u32, u32, u32, u32);
+
+extern u8 *gPtrMusicBoxPlayedCrumbledMessage[];
+extern u8 *gPtrWishStoneCrumbledMessage[];
+extern u8 *gPtrIcePartCrumbledMessage[];
+extern u8 *gPtrRockPartCrumbledMessage[];
+extern u8 *gPtrSteelPartCrumbledMessage[];
+extern u32 gUnknown_8106A4C;
+extern u32 gUnknown_8106A50;
+extern s16 gUnknown_80F4FAC;
+extern void sub_806F370(struct DungeonEntity *r0, struct DungeonEntity *r1, u32, u32, u8 *, u8, s32, u32, u32, u32);
+extern void sub_8051E7C(struct DungeonEntity *pokemon);
+
+
+void sub_8048DB8(struct DungeonEntity *pokemon, struct DungeonEntity *r1, u8 r2)
+{
+    u8 temp;
+    if(r2 != 0)
+        sub_806F370(pokemon, r1, gUnknown_80F4FAC, 1, &temp, 0, 0x217, 0, 0, 0);
+    else
+        sub_8051E7C(pokemon);
+}
+
+void sub_8048E04(struct DungeonEntity *pokemon, u32 r1)
+{
+    sub_8078B5C(pokemon, r1, 0x1E, 0, 1);
+    switch(DungeonRandomCapped(5))
+    {
+        case 0:
+            sub_80763F8(pokemon, r1, 1);
+            break;
+        case 1:
+            sub_80769CC(pokemon, r1);
+            break;
+        case 2:
+            sub_8076210(pokemon, r1, 1, 1);
+            break;
+        case 3:
+            sub_8077780(pokemon, r1, 1);
+            break;
+        case 4:
+            sub_8076E20(pokemon, r1, gUnknown_8106A4C, 3, 1, 1);
+            sub_8076E20(pokemon, r1, gUnknown_8106A50, 3, 1, 1);
+            break;
+    } 
+}
+
+void sub_8048EB0(struct DungeonEntity *pokemon)
+{
+    SendMessage(pokemon, *gPtrIcePartCrumbledMessage);
+}
+
+void sub_8048EC4(struct DungeonEntity *pokemon)
+{
+    SendMessage(pokemon, *gPtrRockPartCrumbledMessage);
+}
+
+void sub_8048ED8(struct DungeonEntity *pokemon)
+{
+    SendMessage(pokemon, *gPtrSteelPartCrumbledMessage);
+}
+
+void sub_8048EEC(struct DungeonEntity *pokemon)
+{
+    SendMessage(pokemon, *gPtrWishStoneCrumbledMessage);
+}
+
+void sub_8048F00(struct DungeonEntity *pokemon)
+{
+    sub_80421C0(pokemon, 0xD6);
+    SendMessage(pokemon, *gPtrMusicBoxPlayedCrumbledMessage);
+    sub_803E708(0x3C, 0x46);
+}
+
diff --git a/src/code_8073CF0.c b/src/code_8073CF0.c
new file mode 100644
index 0000000..f9bf10f
--- /dev/null
+++ b/src/code_8073CF0.c
@@ -0,0 +1,22 @@
+#include "global.h"
+#include "dungeon_entity.h"
+
+extern void sub_8067110(struct DungeonEntity *);
+extern void sub_80671A0(struct DungeonEntity *);
+extern void sub_8073D14(struct DungeonEntity *);
+
+void sub_8073CF0(struct DungeonEntity *pokemon)
+{
+    sub_8067110(pokemon);
+}
+
+void sub_8073CFC(struct DungeonEntity *pokemon)
+{
+    sub_80671A0(pokemon);
+}
+
+void sub_8073D08(struct DungeonEntity *pokemon)
+{
+    sub_8073D14(pokemon);
+}
+
diff --git a/src/code_8083288.c b/src/code_8083288.c
new file mode 100644
index 0000000..6ea3eb2
--- /dev/null
+++ b/src/code_8083288.c
@@ -0,0 +1,9 @@
+#include "global.h"
+
+extern void sub_8082FE0(u32, u32, u32);
+
+void sub_8083288(u32 r0, u32 r1, u32 r2)
+{
+    sub_8082FE0(r0, r1, r2);
+}
+
diff --git a/src/code_809447C.c b/src/code_809447C.c
new file mode 100644
index 0000000..816bf78
--- /dev/null
+++ b/src/code_809447C.c
@@ -0,0 +1,68 @@
+#include "global.h"
+#include "code_8092334.h"
+#include "item.h"
+#include "moves.h"
+
+struct unkStruct_8113080
+{
+    u8 unk0;
+    u8 *unk4; // some string
+};
+
+extern u8 gUnknown_202DE58[];
+extern u8 gAvailablePokemonNames[];
+extern u8 *gUnknown_811383C[];
+extern struct unkStruct_8113080 gUnknown_8113080[];
+
+struct unkStruct_80928C0
+{
+    u32 unk0;
+    s32 unk4;
+    u8 unk8;
+    u8 unk9;
+};
+
+void sub_80928C0(u8 *buffer, struct PokemonMove *move, struct unkStruct_80928C0 *param_3);
+extern void xxx_format_string(const char *, u8 *, void *, u32);
+
+void sub_809447C(struct unkStruct_8094924 *r0, u8 *r1)
+{
+    RestoreIntegerBits(r0, r1, 0x10);
+    RestoreIntegerBits(r0, r1 + 2, 0x10);
+}
+
+void sub_809449C(struct unkStruct_8094924 *r0, u8 *r1)
+{
+    SaveIntegerBits(r0, r1, 0x10);
+    SaveIntegerBits(r0, r1 + 2, 0x10);
+}
+
+void sub_80944BC(s16 moveID, u8 *arg2)
+{
+    u16 moveID_u16;
+    s32 moveID_s32 = moveID;
+    struct PokemonMove stack;
+
+    if (moveID_s32 < 0x1F4) {
+        // Needed this cast/variable to match
+        moveID_u16 = moveID_s32;
+        sub_8092AA8(&stack, moveID_u16);
+        sub_80928C0(gUnknown_202DE58, &stack, NULL);
+        xxx_format_string(*gUnknown_811383C, arg2, arg2 + 200, 0);
+    } else {
+        strncpy(arg2, gUnknown_8113080[moveID - 0x1F4].unk4, 200);
+    }
+}
+
+u8 sub_8094528(s16 moveID)
+{
+    if(moveID < 0x1F4)
+    {
+        return 1;
+    }
+    else
+    {
+        return gUnknown_8113080[moveID  - 0x1F4].unk0;
+    }
+}
+
diff --git a/src/dungeon_ai_item_weight.c b/src/dungeon_ai_item_weight.c
index 2309fa2..4179c8e 100644
--- a/src/dungeon_ai_item_weight.c
+++ b/src/dungeon_ai_item_weight.c
@@ -1,97 +1,17 @@
 #include "global.h"
 #include "dungeon_ai_item_weight.h"
 
-#include "code_80521D0.h"
 #include "constants/status.h"
 #include "constants/targeting.h"
 #include "dungeon_ai_1.h"
 #include "dungeon_map_access.h"
 #include "dungeon_pokemon_attributes.h"
-#include "dungeon_random.h"
 #include "dungeon_util.h"
 #include "moves.h"
 #include "number_util.h"
 #include "status_checks_1.h"
 
-extern void sub_803E708(u32, u32);
-extern void sub_80421C0(struct DungeonEntity *r0, u16 r1);
-extern void sub_8078B5C(struct DungeonEntity *, u32, u32, u32, u32);
-extern void sub_80763F8(struct DungeonEntity *, u32, u32);
-extern void sub_80769CC(struct DungeonEntity *, u32);
-extern void sub_8076210(struct DungeonEntity *, u32, u32, u32);
-extern void sub_8077780(struct DungeonEntity *, u32, u32);
-extern void sub_8076E20(struct DungeonEntity *, u32, u32, u32, u32, u32);
 
-extern u8 *gPtrMusicBoxPlayedCrumbledMessage[];
-extern u8 *gPtrWishStoneCrumbledMessage[];
-extern u8 *gPtrIcePartCrumbledMessage[];
-extern u8 *gPtrRockPartCrumbledMessage[];
-extern u8 *gPtrSteelPartCrumbledMessage[];
-extern u32 gUnknown_8106A4C;
-extern u32 gUnknown_8106A50;
-extern s16 gUnknown_80F4FAC;
-extern void sub_806F370(struct DungeonEntity *r0, struct DungeonEntity *r1, u32, u32, u8 *, u8, s32, u32, u32, u32);
-extern void sub_8051E7C(struct DungeonEntity *pokemon);
-
-void sub_8048DB8(struct DungeonEntity *pokemon, struct DungeonEntity *r1, u8 r2)
-{
-    u8 temp;
-    if(r2 != 0)
-        sub_806F370(pokemon, r1, gUnknown_80F4FAC, 1, &temp, 0, 0x217, 0, 0, 0);
-    else
-        sub_8051E7C(pokemon);
-}
-
-void sub_8048E04(struct DungeonEntity *pokemon, u32 r1)
-{
-    sub_8078B5C(pokemon, r1, 0x1E, 0, 1);
-    switch(DungeonRandomCapped(5))
-    {
-        case 0:
-            sub_80763F8(pokemon, r1, 1);
-            break;
-        case 1:
-            sub_80769CC(pokemon, r1);
-            break;
-        case 2:
-            sub_8076210(pokemon, r1, 1, 1);
-            break;
-        case 3:
-            sub_8077780(pokemon, r1, 1);
-            break;
-        case 4:
-            sub_8076E20(pokemon, r1, gUnknown_8106A4C, 3, 1, 1);
-            sub_8076E20(pokemon, r1, gUnknown_8106A50, 3, 1, 1);
-            break;
-    } 
-}
-
-void sub_8048EB0(struct DungeonEntity *pokemon)
-{
-    SendMessage(pokemon, *gPtrIcePartCrumbledMessage);
-}
-
-void sub_8048EC4(struct DungeonEntity *pokemon)
-{
-    SendMessage(pokemon, *gPtrRockPartCrumbledMessage);
-}
-
-void sub_8048ED8(struct DungeonEntity *pokemon)
-{
-    SendMessage(pokemon, *gPtrSteelPartCrumbledMessage);
-}
-
-void sub_8048EEC(struct DungeonEntity *pokemon)
-{
-    SendMessage(pokemon, *gPtrWishStoneCrumbledMessage);
-}
-
-void sub_8048F00(struct DungeonEntity *pokemon)
-{
-    sub_80421C0(pokemon, 0xD6);
-    SendMessage(pokemon, *gPtrMusicBoxPlayedCrumbledMessage);
-    sub_803E708(0x3C, 0x46);
-}
 
 u32 EvaluateItem(struct DungeonEntity *targetPokemon, struct ItemSlot *item, u32 itemTargetFlags)
 {
diff --git a/src/dungeon_ai_items.c b/src/dungeon_ai_items.c
index 35a5f14..f8401c5 100644
--- a/src/dungeon_ai_items.c
+++ b/src/dungeon_ai_items.c
@@ -37,9 +37,6 @@ enum ItemTargetFlag
 };
 
 extern void sub_8077274(struct DungeonEntity *, struct DungeonEntity *);
-extern void sub_8067110(struct DungeonEntity *);
-extern void sub_80671A0(struct DungeonEntity *);
-extern void sub_8073D14(struct DungeonEntity *);
 
 extern s32 gNumPotentialTargets;
 extern u32 gPotentialTargetWeights[NUM_DIRECTIONS];
@@ -432,17 +429,3 @@ void TargetThrownItem(struct DungeonEntity *pokemon, struct DungeonEntity *targe
     }
 }
 
-void sub_8073CF0(struct DungeonEntity *pokemon)
-{
-    sub_8067110(pokemon);
-}
-
-void sub_8073CFC(struct DungeonEntity *pokemon)
-{
-    sub_80671A0(pokemon);
-}
-
-void sub_8073D08(struct DungeonEntity *pokemon)
-{
-    sub_8073D14(pokemon);
-}
diff --git a/src/dungeon_range.c b/src/dungeon_range.c
index 8dd7ffa..facd71d 100644
--- a/src/dungeon_range.c
+++ b/src/dungeon_range.c
@@ -5,13 +5,6 @@
 #include "dungeon_map_access.h"
 #include "map.h"
 
-extern void sub_8082FE0(u32, u32, u32);
-
-void sub_8083288(u32 r0, u32 r1, u32 r2)
-{
-    sub_8082FE0(r0, r1, r2);
-}
-
 bool8 InSameRoom_2(struct Position *pos1, struct Position *pos2)
 {
     u8 pos1RoomIndex;
diff --git a/src/number_util.c b/src/number_util.c
index 004f149..357d132 100644
--- a/src/number_util.c
+++ b/src/number_util.c
@@ -1,30 +1,5 @@
 #include "global.h"
-#include "item.h"
 #include "number_util.h"
-#include "code_8092334.h"
-#include "moves.h"
-
-struct unkStruct_8113080
-{
-    u8 unk0;
-    u8 *unk4; // some string
-};
-
-extern u8 gUnknown_202DE58[];
-extern u8 gAvailablePokemonNames[];
-extern u8 *gUnknown_811383C[];
-extern struct unkStruct_8113080 gUnknown_8113080[];
-
-struct unkStruct_80928C0
-{
-    u32 unk0;
-    s32 unk4;
-    u8 unk8;
-    u8 unk9;
-};
-
-void sub_80928C0(u8 *buffer, struct PokemonMove *move, struct unkStruct_80928C0 *param_3);
-extern void xxx_format_string(const char *, u8 *, void *, u32);
 
 
 s32 RoundUpFixedPoint(s32 fixedPointNumber)
@@ -47,43 +22,3 @@ s32 RoundUpFixedPoint(s32 fixedPointNumber)
     }
 }
 
-void sub_809447C(struct unkStruct_8094924 *r0, u8 *r1)
-{
-    RestoreIntegerBits(r0, r1, 0x10);
-    RestoreIntegerBits(r0, r1 + 2, 0x10);
-}
-
-void sub_809449C(struct unkStruct_8094924 *r0, u8 *r1)
-{
-    SaveIntegerBits(r0, r1, 0x10);
-    SaveIntegerBits(r0, r1 + 2, 0x10);
-}
-
-void sub_80944BC(s16 moveID, u8 *arg2)
-{
-    u16 moveID_u16;
-    s32 moveID_s32 = moveID;
-    struct PokemonMove stack;
-
-    if (moveID_s32 < 0x1F4) {
-        // Needed this cast/variable to match
-        moveID_u16 = moveID_s32;
-        sub_8092AA8(&stack, moveID_u16);
-        sub_80928C0(gUnknown_202DE58, &stack, NULL);
-        xxx_format_string(*gUnknown_811383C, arg2, arg2 + 200, 0);
-    } else {
-        strncpy(arg2, gUnknown_8113080[moveID - 0x1F4].unk4, 200);
-    }
-}
-
-u8 sub_8094528(s16 moveID)
-{
-    if(moveID < 0x1F4)
-    {
-        return 1;
-    }
-    else
-    {
-        return gUnknown_8113080[moveID  - 0x1F4].unk0;
-    }
-}
-- 
cgit v1.2.3