Merge pull request #345 from red031000/master

more scrcmd, struct changes

2 files changed, 16 insertions, 4 deletions

diff --git a/include/scrcmd.h b/include/scrcmd.h
index 2dacb9fb..44151627 100644
--- a/include/scrcmd.h
+++ b/include/scrcmd.h
@@ -84,6 +84,16 @@ BOOL ScrCmd_Unk0038(struct ScriptContext *ctx);
 BOOL ScrCmd_Unk0039(struct ScriptContext* ctx);
 BOOL ScrCmd_Unk003A(struct ScriptContext* ctx);
 BOOL ScrCmd_Unk003B(struct ScriptContext *ctx);
+BOOL ScrCmd_Menu(struct ScriptContext *ctx);
+BOOL ScrCmd_YesNoMenu(struct ScriptContext *ctx);
+BOOL ScrCmd_ShowSaveClock(struct ScriptContext *ctx);
+BOOL ScrCmd_HideSaveClock(struct ScriptContext *ctx);
+BOOL ScrCmd_Unk0040(struct ScriptContext *ctx);
+BOOL ScrCmd_Unk0041(struct ScriptContext *ctx);
+BOOL ScrCmd_Unk0042(struct ScriptContext *ctx);
+BOOL ScrCmd_Unk029D(struct ScriptContext *ctx);
+BOOL ScrCmd_Unk0043(struct ScriptContext *ctx);
+BOOL ScrCmd_Unk02B9(struct ScriptContext *ctx);
 
 //scrcmd_coins.c
 BOOL ScrCmd_Unk0075(struct ScriptContext* ctx);
diff --git a/include/script.h b/include/script.h
index ab126e09..9a7270c2 100644
--- a/include/script.h
+++ b/include/script.h
@@ -27,14 +27,16 @@ struct UnkSavStruct80
 {

     u8 padding[0x8];

     u32 unk08;

-    struct SaveBlock2 *saveBlock2;  //0xC

+    struct SaveBlock2 *saveBlock2; //0xC

     u8 padding2[0xC];

     u32 *mapId; //0x1C

     u8 padding3[0x18];

     u32 unk38;

     u8 padding4[0x24];

     u32 unk60;

-    u8 padding5[0x44];

+    u8 padding5[0x14];

+    u32 unk78;

+    u8 padding6[0x2C];

     struct UnkStruct_02046444 * unkA8;

 };

 

@@ -50,8 +52,8 @@ struct ScriptContext
     u32 cmdCount;

     u32 data[4];

     struct UnkStruct_0204639C *unk74;

-	struct MsgData *msgData;

-	u8 *unk7C;

+    struct MsgData *msgData;

+    u8 *unk7C;

     struct UnkSavStruct80 *unk80;

 };