Merge remote-tracking branch 'origin/master' into pikalax_work

3 files changed, 63 insertions, 0 deletions

diff --git a/include/scrcmd.h b/include/scrcmd.h
index c246279d..226bbb8c 100644
--- a/include/scrcmd.h
+++ b/include/scrcmd.h
@@ -105,6 +105,7 @@ BOOL ScrCmd_Unk0047(struct ScriptContext *ctx);
 BOOL ScrCmd_Unk0048(struct ScriptContext *ctx);
 BOOL ScrCmd_Unk02CF(struct ScriptContext *ctx);
 BOOL ScrCmd_Unk02D0(struct ScriptContext *ctx);
+BOOL ScrCmd_Unk005E(struct ScriptContext *ctx);
 
 //scrcmd_4.c
 BOOL ScrCmd_GetPlayerName(struct ScriptContext* ctx);
@@ -301,6 +302,19 @@ BOOL ScrCmd_Unk0090(struct ScriptContext* ctx);
 BOOL ScrCmd_Unk0091(struct ScriptContext* ctx);
 BOOL ScrCmd_Unk0092(struct ScriptContext* ctx);
 
+//scrcmd_24.c
+BOOL ScrCmd_Unk01C6(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk01C7(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk021E(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk021F(struct ScriptContext* ctx);
+void FUN_02045E74(struct ScriptContext* ctx, u8 a1, struct Pokemon* pokemon, void* a3);
+BOOL ScrCmd_Unk0220(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk0221(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk0224(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk0222(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk0223(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk0225(struct ScriptContext* ctx);
+
 //scrcmd_25.c
 BOOL ScrCmd_Unk023F(struct ScriptContext* ctx);
 BOOL ScrCmd_Unk0240(struct ScriptContext* ctx);
diff --git a/include/unk_020377F0.h b/include/unk_020377F0.h
new file mode 100644
index 00000000..91276889
--- /dev/null
+++ b/include/unk_020377F0.h
@@ -0,0 +1,30 @@
+#ifndef POKEDIAMOND_UNK_020377F0_H
+#define POKEDIAMOND_UNK_020377F0_H
+
+struct Options;
+struct PlayerParty;
+
+// This struct gets created from a bunch of places, not just 0x02037CF0. This was
+// just the first place I (tgsm) found it being created.
+struct UnkStruct_02037CF0
+{
+    struct PlayerParty* party;
+    struct Options* options;
+    u16* name_buf;
+    u32 trainer_id;
+    u8 gender;
+    u8 unk11;
+    u8 unk12;
+    u8 party_count;
+    u8 unk14;
+    u8 unk15;
+    u8 unk16;
+    u8 padding;
+    u16 unk18;
+    u8 padding2[0x2];
+    BOOL has_national_dex;
+    u8 padding3[0xC];
+    BOOL unk2C;
+};
+
+#endif
diff --git a/include/unk_02088DD8.h b/include/unk_02088DD8.h
new file mode 100644
index 00000000..318a98fb
--- /dev/null
+++ b/include/unk_02088DD8.h
@@ -0,0 +1,19 @@
+#ifndef POKEDIAMOND_UNK_02088DD8_H
+#define POKEDIAMOND_UNK_02088DD8_H
+
+struct Options;
+struct PlayerData;
+struct Pokemon;
+
+struct UnkStruct_02088DD8
+{
+    struct Pokemon* pokemon;
+    struct PlayerData* player;
+    struct Options* options;
+    void* unkC;
+    u8 padding[0x5];
+    u8 unk15;
+    u8 padding2[0x2];
+};
+
+#endif