diff options
| author | Max <mparisi@stevens.edu> | 2020-10-17 20:10:05 -0400 |
|---|---|---|
| committer | Max <mparisi@stevens.edu> | 2020-10-17 20:10:05 -0400 |
| commit | a9e25ce7ed4e0ad2f53b520445eed63d476c1257 (patch) | |
| tree | 44c553aa38f758731d86dfea9c9a8629131e6fc0 | |
| parent | 22a4e6ed8e9d8ba302834639067e8fc999ffb182 (diff) | |
add note to ctors_2, and organize function/class declarations into headers
| -rw-r--r-- | asm/ctors_2.s | 1 | ||||
| -rw-r--r-- | include/code_801DAA30.h | 9 | ||||
| -rw-r--r-- | include/code_801DAAE0.h | 16 | ||||
| -rw-r--r-- | include/unkStruct.h | 17 | ||||
| -rw-r--r-- | src/code_801DAA30.cpp | 23 |
5 files changed, 46 insertions, 20 deletions
diff --git a/asm/ctors_2.s b/asm/ctors_2.s index 91916b8..ae5eae4 100644 --- a/asm/ctors_2.s +++ b/asm/ctors_2.s @@ -42,4 +42,5 @@ .4byte 0, 0, 0
# placed by the compiler it seems
+# commenting out for now and writing the padding in directly for OK
#.balign 0x20, 0
diff --git a/include/code_801DAA30.h b/include/code_801DAA30.h new file mode 100644 index 0000000..167f01c --- /dev/null +++ b/include/code_801DAA30.h @@ -0,0 +1,9 @@ +#ifndef POKEREVO_CODE_801DAA30_H
+#define POKEREVO_CODE_801DAA30_H
+
+void* operator new(size_t sz);
+void* operator new[](size_t sz);
+void operator delete(void* ptr);
+void operator delete[](void* ptr);
+
+#endif //POKEREVO_CODE_801DAA30_H
diff --git a/include/code_801DAAE0.h b/include/code_801DAAE0.h new file mode 100644 index 0000000..34bafa0 --- /dev/null +++ b/include/code_801DAAE0.h @@ -0,0 +1,16 @@ +#ifndef POKEREVO_CODE_801DAAE0_H
+#define POKEREVO_CODE_801DAAE0_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+BOOL func_801DAB28(void);
+void *func_801DAD64(size_t);
+void func_801DAEA4(void *);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif //POKEREVO_CODE_801DAAE0_H
diff --git a/include/unkStruct.h b/include/unkStruct.h new file mode 100644 index 0000000..aface6c --- /dev/null +++ b/include/unkStruct.h @@ -0,0 +1,17 @@ +#ifndef POKEREVO_CODE_UNKSTRUCT_H
+#define POKEREVO_CODE_UNKSTRUCT_H
+
+class unkStruct
+{
+ u8 unk0;
+ u16 unk2;
+ u8 unk4;
+ u8 unk5;
+ u8 unk6;
+ u8 unk7;
+public:
+ unkStruct(u8 p1, u16 p2, u8 p3)
+ : unk0(p1), unk2(p2), unk4(p3) { }
+};
+
+#endif //POKEREVO_CODE_UNKSTRUCT_H
diff --git a/src/code_801DAA30.cpp b/src/code_801DAA30.cpp index ecfe483..4a24614 100644 --- a/src/code_801DAA30.cpp +++ b/src/code_801DAA30.cpp @@ -1,24 +1,7 @@ #include "types.h"
-
-extern "C"
-{
- BOOL func_801DAB28(void);
- void *func_801DAD64(size_t);
- void func_801DAEA4(void *);
-}
-
-class unkStruct
-{
- u8 unk0;
- u16 unk2;
- u8 unk4;
- u8 unk5;
- u8 unk6;
- u8 unk7;
-public:
- unkStruct(u8 p1, u16 p2, u8 p3)
- : unk0(p1), unk2(p2), unk4(p3) { }
-};
+#include "unkStruct.h"
+#include "code_801DAAE0.h"
+#include "code_801DAA30.h"
unkStruct gUnk8063F2C8(1, 4, 0);
|