From 28f7626d24511428986ce9c47d29ecc28047b256 Mon Sep 17 00:00:00 2001 From: red031000 Date: Wed, 24 Mar 2021 22:38:46 +0000 Subject: more scrcmd --- include/scrcmd.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'include') diff --git a/include/scrcmd.h b/include/scrcmd.h index 44151627..ef6a07af 100644 --- a/include/scrcmd.h +++ b/include/scrcmd.h @@ -94,6 +94,13 @@ BOOL ScrCmd_Unk0042(struct ScriptContext *ctx); BOOL ScrCmd_Unk029D(struct ScriptContext *ctx); BOOL ScrCmd_Unk0043(struct ScriptContext *ctx); BOOL ScrCmd_Unk02B9(struct ScriptContext *ctx); +BOOL ScrCmd_Unk0044(struct ScriptContext *ctx); +BOOL ScrCmd_Unk0045(struct ScriptContext *ctx); +BOOL ScrCmd_Unk0046(struct ScriptContext *ctx); +BOOL ScrCmd_Unk0047(struct ScriptContext *ctx); +BOOL ScrCmd_Unk0048(struct ScriptContext *ctx); +BOOL ScrCmd_Unk02CF(struct ScriptContext *ctx); +BOOL ScrCmd_Unk02D0(struct ScriptContext *ctx); //scrcmd_coins.c BOOL ScrCmd_Unk0075(struct ScriptContext* ctx); -- cgit v1.2.3 From 5e505aa880f4e07dbd20ba698d2936965f6170f1 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Fri, 26 Mar 2021 18:37:38 -0500 Subject: decomp unk_02025484 --- include/unk_02025484.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 include/unk_02025484.h (limited to 'include') diff --git a/include/unk_02025484.h b/include/unk_02025484.h new file mode 100644 index 00000000..0412dda1 --- /dev/null +++ b/include/unk_02025484.h @@ -0,0 +1,18 @@ +#ifndef POKEDIAMOND_UNK_02025484_H +#define POKEDIAMOND_UNK_02025484_H + +struct unk_2025484 +{ + // size: 0x24 + u32 unk0; + u32 unk4; + u8 padding[0x1C]; +}; + +void FUN_02025484(struct unk_2025484 *r0, u32 r1); +u32 *FUN_02025490(struct unk_2025484 *r0, u32 r1); +u32 *FUN_020254A0(struct unk_2025484 *r0, u32 r1); +u32 FUN_020254B4(struct unk_2025484 *r0); + +#endif POKEDIAMOND_UNK_02025484_H + -- cgit v1.2.3 From 0cc774d83e739f041f92b10c9703e8520727795f Mon Sep 17 00:00:00 2001 From: tgsm Date: Tue, 30 Mar 2021 06:00:23 -0400 Subject: scrcmd: move some extern declarations into scrcmd.h Prevents us from having to copy and paste these over and over when decompiling more scrcmd files. --- include/scrcmd.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include') diff --git a/include/scrcmd.h b/include/scrcmd.h index 44151627..c463b01b 100644 --- a/include/scrcmd.h +++ b/include/scrcmd.h @@ -4,6 +4,10 @@ #include "global.h" #include "script.h" +extern u16 VarGet(struct UnkSavStruct80* arg, u16); +extern u16* GetVarPointer(struct UnkSavStruct80* arg, u16); +extern struct SaveBlock2* ScriptEnvironment_GetSav2Ptr(struct UnkSavStruct80* unk); + struct UnkStruct_0203A288 { u8 unk0; u8 unk1; -- cgit v1.2.3 From 14d341e09decfc061f567ef51f615d7bcb012ea8 Mon Sep 17 00:00:00 2001 From: tgsm Date: Tue, 30 Mar 2021 06:28:49 -0400 Subject: Decompile scrcmd_22 -> scrcmd_items --- include/scrcmd.h | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'include') diff --git a/include/scrcmd.h b/include/scrcmd.h index c463b01b..a1b3362f 100644 --- a/include/scrcmd.h +++ b/include/scrcmd.h @@ -134,6 +134,16 @@ BOOL ScrCmd_Unk01F3(struct ScriptContext* ctx); //scrcmd_20.c BOOL ScrCmd_Unk02A6(struct ScriptContext* ctx); +//scrcmd_items.c +BOOL ScrCmd_GiveItem(struct ScriptContext* ctx); +BOOL ScrCmd_TakeItem(struct ScriptContext* ctx); +BOOL ScrCmd_HasSpaceForItem(struct ScriptContext* ctx); +BOOL ScrCmd_HasItem(struct ScriptContext* ctx); +BOOL ScrCmd_ItemIdIsTMOrHM(struct ScriptContext* ctx); +BOOL ScrCmd_GetItemPocketId(struct ScriptContext* ctx); +BOOL ScrCmd_Unk0081(struct ScriptContext* ctx); +BOOL ScrCmd_Unk0082(struct ScriptContext* ctx); + //scrcmd_25.c BOOL ScrCmd_Unk02EF(struct ScriptContext* ctx); BOOL ScrCmd_Unk02F0(struct ScriptContext* ctx); -- cgit v1.2.3