diff options
| -rw-r--r-- | asm/code_801DD5C8_asm.s | 3 | ||||
| -rw-r--r-- | include/code_801DD5C8.h | 40 | ||||
| -rw-r--r-- | obj_files.mk | 1 | ||||
| -rw-r--r-- | src/code_801DD5C8.cpp | 33 |
4 files changed, 41 insertions, 36 deletions
diff --git a/asm/code_801DD5C8_asm.s b/asm/code_801DD5C8_asm.s deleted file mode 100644 index 4ea72fe..0000000 --- a/asm/code_801DD5C8_asm.s +++ /dev/null @@ -1,3 +0,0 @@ -.include "macros.inc"
-
-.section .text, "ax" # 0x80006980 - 0x803E1E60
diff --git a/include/code_801DD5C8.h b/include/code_801DD5C8.h new file mode 100644 index 0000000..55499b2 --- /dev/null +++ b/include/code_801DD5C8.h @@ -0,0 +1,40 @@ +#ifndef POKEREVO_CODE_801DD5C8_H
+#define POKEREVO_CODE_801DD5C8_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// TODO: identify data structures
+
+struct gUnkClass9
+{
+ u8 pad[0xC];
+ void (*unkC)(u32, gUnkClass9*, u32, float);
+};
+
+struct gUnkClass8
+{
+ u8 pad[0x2];
+ u16 unk2;
+ gUnkClass9* unk4;
+ float unk8;
+};
+
+struct gUnkClass7
+{
+ gUnkClass8* unk0;
+ u16 unk4;
+ u16 unk6;
+ float unk8;
+ float unkC;
+};
+
+void func_801DD5C8(gUnkClass7* p1, float p2);
+void func_801DD7FC(gUnkClass7* p1, u32 p2, u32 p3);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif //POKEREVO_CODE_801DD5C8_H
diff --git a/obj_files.mk b/obj_files.mk index f55ff41..a7451e0 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -228,7 +228,6 @@ SPLIT_O_FILES := \ $(BUILD_DIR)/src/code_801DBE90.o \ $(BUILD_DIR)/src/code_801DCE6C.o \ $(BUILD_DIR)/src/code_801DD5C8.o \ - $(BUILD_DIR)/asm/code_801DD5C8_asm.o \ $(BUILD_DIR)/asm/code_801DD8C0.o \ $(BUILD_DIR)/asm/code_801DDF78.o \ $(BUILD_DIR)/asm/code_801DF040.o \ diff --git a/src/code_801DD5C8.cpp b/src/code_801DD5C8.cpp index 4918115..f91832a 100644 --- a/src/code_801DD5C8.cpp +++ b/src/code_801DD5C8.cpp @@ -1,36 +1,5 @@ #include "ctorStruct.h"
-
-namespace
-{
- struct gUnkClass9;
-
- typedef void (*FuncPtr)(u32, gUnkClass9*, u32, float);
-
- // TODO: internal?
- struct gUnkClass9
- {
- u8 pad[0xC];
- FuncPtr unkC;
- };
-
- // TODO: internal?
- struct gUnkClass8
- {
- u8 pad[0x2];
- u16 unk2;
- gUnkClass9* unk4;
- float unk8;
- };
-}
-
-struct gUnkClass7
-{
- gUnkClass8* unk0;
- u16 unk4;
- u16 unk6;
- float unk8;
- float unkC;
-};
+#include "code_801DD5C8.h"
static ctorStruct gUnk8063F348(1, 4, 0);
|