diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000..39c2b1c7d --- /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 b7dd45aac..468a92e4a 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 545a6d3ae..1cea6b459 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 3d01a2573..000000000 --- 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