summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwho-knows-who <j.williams97@outlook.com>2021-02-27 16:39:57 +0000
committerwho-knows-who <j.williams97@outlook.com>2021-02-27 16:39:57 +0000
commitf2284a721b91fc2af49bd2b5d1d43ff24de46ba6 (patch)
treeec7069fcff87b7303d45dfc710e7e6ef568df8b1
parentaa968bb2de4d703376af43a0ef32a53ca46f489b (diff)
Remove unk_02029FBO.h (using o instead of 0)
-rw-r--r--.vscode/settings.json19
-rw-r--r--arm9/src/unk_0202C144.c3
-rw-r--r--include/unk_02029FB0.h7
-rw-r--r--include/unk_02029FBO.h10
4 files changed, 25 insertions, 14 deletions
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 00000000..39c2b1c7
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,19 @@
+{
+ "files.associations": {
+ "ratio": "c",
+ "array": "c",
+ "*.tcc": "c",
+ "bitset": "c",
+ "string": "c",
+ "vector": "c",
+ "string_view": "c",
+ "functional": "c",
+ "iomanip": "c",
+ "istream": "c",
+ "limits": "c",
+ "ostream": "c",
+ "sstream": "c",
+ "streambuf": "c",
+ "regex": "c"
+ }
+} \ No newline at end of file
diff --git a/arm9/src/unk_0202C144.c b/arm9/src/unk_0202C144.c
index b7dd45aa..468a92e4 100644
--- a/arm9/src/unk_0202C144.c
+++ b/arm9/src/unk_0202C144.c
@@ -6,9 +6,6 @@
#pragma thumb on
-extern struct UnkStruct_02029FB0 * FUN_02029FC8(struct SaveBlock2 * sav2);
-extern void FUN_0202A1C4(struct UnkStruct_02029FB0 * unk, struct Pokedex * pokedex, u16 species);
-
void FUN_0202C144(struct SaveBlock2 * sav2, struct Pokemon * mon)
{
u32 is_egg = GetMonData(mon, MON_DATA_IS_EGG, NULL);
diff --git a/include/unk_02029FB0.h b/include/unk_02029FB0.h
index 545a6d3a..1cea6b45 100644
--- a/include/unk_02029FB0.h
+++ b/include/unk_02029FB0.h
@@ -1,9 +1,14 @@
#ifndef POKEDIAMOND_UNK_02029FB0_H
#define POKEDIAMOND_UNK_02029FB0_H
+#include "save_block_2.h"
+#include "pokedex.h"
struct UnkStruct_02029FB0
{
u8 unk[0x14C];
};
-#endif
+struct UnkStruct_02029FB0 * FUN_02029FC8(struct SaveBlock2 * sav2);
+void FUN_0202A1C4(struct UnkStruct_02029FB0 * unk, struct Pokedex * pokedex, u16 species);
+
+#endif //POKEDIAMOND_UNK_02029FB0_H
diff --git a/include/unk_02029FBO.h b/include/unk_02029FBO.h
deleted file mode 100644
index 3d01a257..00000000
--- a/include/unk_02029FBO.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef POKEDIAMOND_UNK_02029FBO_H
-#define POKEDIAMOND_UNK_02029FBO_H
-
-#include "save_block_2.h"
-#include "pokedex.h"
-
-void *FUN_02029FC8(struct SaveBlock2 *sav2);
-void *FUN_0202A1C4(void *unkSavStruct, struct Pokedex *pokedex, u16 species);
-
-#endif //POKEDIAMOND_UNK_02029FBO_H \ No newline at end of file