diff options
| author | Akira Akashi <rubenru09@aol.com> | 2021-03-30 20:43:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-30 20:43:07 +0100 |
| commit | 3063fdd0e1f1cdfa7d5108a19ea4031009f71af0 (patch) | |
| tree | d5e28c92f4f1ef74310c628f9403d46443c63866 /include | |
| parent | 28f7626d24511428986ce9c47d29ecc28047b256 (diff) | |
| parent | d415e2a4e3f6c45cb83df3393c9d3b7ba66d5054 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'include')
| -rw-r--r-- | include/scrcmd.h | 14 | ||||
| -rw-r--r-- | include/unk_02025484.h | 18 |
2 files changed, 32 insertions, 0 deletions
diff --git a/include/scrcmd.h b/include/scrcmd.h index ef6a07af..dd43e586 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; @@ -137,6 +141,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); 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 + |