Merge pull request #360 from tgsm/scrcmd_23

Decompile scrcmd_23

5 files changed, 219 insertions, 515 deletions

diff --git a/arm9/asm/scrcmd_23.s b/arm9/asm/scrcmd_23.s
deleted file mode 100644
index 3d38b510..00000000
--- a/arm9/asm/scrcmd_23.s
+++ /dev/null
@@ -1,483 +0,0 @@
-    .include "asm/macros.inc"
-    .include "global.inc"
-
-	.text
-
-	thumb_func_start FUN_02045958
-FUN_02045958: ; 0x02045958
-	push {r4-r6, lr}
-	add r4, r0, #0x0
-	add r1, r4, #0x0
-	add r1, #0x80
-	ldr r1, [r1, #0x0]
-	ldr r5, [r1, #0xc]
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r6, r0, #0x0
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r4, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r4, #0x0]
-	bl GetVarPointer
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	bl FUN_02026CC4
-	add r1, r6, #0x0
-	bl FUN_02025D6C
-	strh r0, [r4, #0x0]
-	mov r0, #0x0
-	pop {r4-r6, pc}
-
-	thumb_func_start FUN_020459AC
-FUN_020459AC: ; 0x020459AC
-	push {r4, lr}
-	add r4, r0, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r4, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r4, #0x0]
-	bl GetVarPointer
-	mov r0, #0x0
-	pop {r4, pc}
-	.balign 4
-
-	thumb_func_start FUN_020459E8
-FUN_020459E8: ; 0x020459E8
-	push {r4-r6, lr}
-	add r4, r0, #0x0
-	add r1, r4, #0x0
-	add r1, #0x80
-	ldr r1, [r1, #0x0]
-	ldr r5, [r1, #0xc]
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r6, r0, #0x0
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r4, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r4, #0x0]
-	bl GetVarPointer
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	bl FUN_02026CC4
-	add r1, r6, #0x0
-	bl FUN_02025D94
-	strh r0, [r4, #0x0]
-	mov r0, #0x0
-	pop {r4-r6, pc}
-
-	thumb_func_start FUN_02045A3C
-FUN_02045A3C: ; 0x02045A3C
-	push {r4, lr}
-	add r4, r0, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r4, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r4, #0x0]
-	bl GetVarPointer
-	mov r0, #0x0
-	pop {r4, pc}
-	.balign 4
-
-	thumb_func_start FUN_02045A78
-FUN_02045A78: ; 0x02045A78
-	push {r4-r6, lr}
-	add r4, r0, #0x0
-	add r1, r4, #0x0
-	add r1, #0x80
-	ldr r1, [r1, #0x0]
-	ldr r5, [r1, #0xc]
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r6, r0, #0x0
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r4, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r4, #0x0]
-	bl GetVarPointer
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	bl FUN_02026CC4
-	add r1, r6, #0x0
-	bl FUN_02026298
-	strh r0, [r4, #0x0]
-	mov r0, #0x0
-	pop {r4-r6, pc}
-
-	thumb_func_start FUN_02045ACC
-FUN_02045ACC: ; 0x02045ACC
-	push {r4, lr}
-	add r4, r0, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r4, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r4, #0x0]
-	bl GetVarPointer
-	mov r0, #0x0
-	pop {r4, pc}
-	.balign 4
-
-	thumb_func_start FUN_02045B08
-FUN_02045B08: ; 0x02045B08
-	push {r4, lr}
-	add r4, r0, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r4, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r4, #0x0]
-	bl GetVarPointer
-	mov r0, #0x0
-	pop {r4, pc}
-	.balign 4
-
-	thumb_func_start FUN_02045B44
-FUN_02045B44: ; 0x02045B44
-	push {r4, lr}
-	add r4, r0, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r4, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r4, #0x0]
-	bl GetVarPointer
-	mov r0, #0x0
-	pop {r4, pc}
-	.balign 4
-
-	thumb_func_start FUN_02045B80
-FUN_02045B80: ; 0x02045B80
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	add r1, r5, #0x0
-	add r1, #0x80
-	ldr r1, [r1, #0x0]
-	ldr r4, [r1, #0xc]
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r0, r5, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r0, r5, #0x0
-	bl ScriptReadHalfword
-	add r5, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r5, #0x0]
-	bl GetVarPointer
-	add r0, r4, #0x0
-	bl FUN_02026CC4
-	mov r0, #0x0
-	pop {r3-r5, pc}
-
-	thumb_func_start FUN_02045BC8
-FUN_02045BC8: ; 0x02045BC8
-	push {r4, lr}
-	add r4, r0, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r4, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r4, #0x0]
-	bl GetVarPointer
-	mov r0, #0x0
-	pop {r4, pc}
-	.balign 4
-
-	thumb_func_start FUN_02045C04
-FUN_02045C04: ; 0x02045C04
-	push {r4, lr}
-	add r4, r0, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r4, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r4, #0x0]
-	bl GetVarPointer
-	mov r0, #0x0
-	pop {r4, pc}
-	.balign 4
-
-	thumb_func_start FUN_02045C40
-FUN_02045C40: ; 0x02045C40
-	push {r4, lr}
-	add r4, r0, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r4, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r4, #0x0]
-	bl GetVarPointer
-	mov r0, #0x0
-	pop {r4, pc}
-	.balign 4
-
-	thumb_func_start FUN_02045C7C
-FUN_02045C7C: ; 0x02045C7C
-	push {r3-r7, lr}
-	add r4, r0, #0x0
-	add r1, r4, #0x0
-	add r1, #0x80
-	ldr r1, [r1, #0x0]
-	ldr r5, [r1, #0xc]
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r6, r0, #0x0
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r7, r0, #0x0
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r4, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r4, #0x0]
-	bl GetVarPointer
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	bl FUN_02026CC4
-	add r1, r6, #0x0
-	add r2, r7, #0x0
-	bl FUN_020260C4
-	strh r0, [r4, #0x0]
-	mov r0, #0x0
-	pop {r3-r7, pc}
-
-	thumb_func_start FUN_02045CD4
-FUN_02045CD4: ; 0x02045CD4
-	push {r4, lr}
-	add r4, r0, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r4, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r4, #0x0]
-	bl GetVarPointer
-	mov r0, #0x0
-	pop {r4, pc}
-	.balign 4
-
-	thumb_func_start FUN_02045D10
-FUN_02045D10: ; 0x02045D10
-	push {r4, lr}
-	add r4, r0, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r4, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r4, #0x0]
-	bl GetVarPointer
-	mov r0, #0x0
-	pop {r4, pc}
-	.balign 4
-
-	thumb_func_start FUN_02045D4C
-FUN_02045D4C: ; 0x02045D4C
-	push {r4, lr}
-	add r4, r0, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r4, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r0, r4, #0x0
-	bl ScriptReadHalfword
-	add r4, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r4, #0x0]
-	bl GetVarPointer
-	mov r0, #0x0
-	pop {r4, pc}
-	.balign 4
diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s
index dbdfba49..08416fc7 100644
--- a/arm9/asm/unk_02038C78.s
+++ b/arm9/asm/unk_02038C78.s
@@ -280,22 +280,22 @@ gScriptCmdTable: ; 0x020F355C
     .word ScrCmd_GetItemPocketId
     .word ScrCmd_Unk0081
     .word ScrCmd_Unk0082
-    .word FUN_02045958
-    .word FUN_020459AC
-    .word FUN_020459E8
-    .word FUN_02045A3C
-    .word FUN_02045A78
-    .word FUN_02045ACC
-    .word FUN_02045B08
-    .word FUN_02045B44
-    .word FUN_02045B80
-    .word FUN_02045BC8
-    .word FUN_02045C04
-    .word FUN_02045C40
-    .word FUN_02045C7C
-    .word FUN_02045CD4
-    .word FUN_02045D10
-    .word FUN_02045D4C
+    .word ScrCmd_Unk0083
+    .word ScrCmd_Unk0084
+    .word ScrCmd_Unk0085
+    .word ScrCmd_Unk0086
+    .word ScrCmd_Unk0087
+    .word ScrCmd_Unk0088
+    .word ScrCmd_Unk0089
+    .word ScrCmd_Unk008A
+    .word ScrCmd_Unk008B
+    .word ScrCmd_Unk008C
+    .word ScrCmd_Unk008D
+    .word ScrCmd_Unk008E
+    .word ScrCmd_Unk008F
+    .word ScrCmd_Unk0090
+    .word ScrCmd_Unk0091
+    .word ScrCmd_Unk0092
     .word FUN_0203B81C
     .word FUN_0203B85C
     .word FUN_0203B8A0
diff --git a/arm9/global.inc b/arm9/global.inc
index 084ddd40..9df9973e 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -3386,22 +3386,22 @@
 .extern ScrCmd_GetItemPocketId
 .extern ScrCmd_Unk0081
 .extern ScrCmd_Unk0082
-.extern FUN_02045958
-.extern FUN_020459AC
-.extern FUN_020459E8
-.extern FUN_02045A3C
-.extern FUN_02045A78
-.extern FUN_02045ACC
-.extern FUN_02045B08
-.extern FUN_02045B44
-.extern FUN_02045B80
-.extern FUN_02045BC8
-.extern FUN_02045C04
-.extern FUN_02045C40
-.extern FUN_02045C7C
-.extern FUN_02045CD4
-.extern FUN_02045D10
-.extern FUN_02045D4C
+.extern ScrCmd_Unk0083
+.extern ScrCmd_Unk0084
+.extern ScrCmd_Unk0085
+.extern ScrCmd_Unk0086
+.extern ScrCmd_Unk0087
+.extern ScrCmd_Unk0088
+.extern ScrCmd_Unk0089
+.extern ScrCmd_Unk008A
+.extern ScrCmd_Unk008B
+.extern ScrCmd_Unk008C
+.extern ScrCmd_Unk008D
+.extern ScrCmd_Unk008E
+.extern ScrCmd_Unk008F
+.extern ScrCmd_Unk0090
+.extern ScrCmd_Unk0091
+.extern ScrCmd_Unk0092
 .extern FUN_02045D88
 .extern FUN_02045DD0
 .extern FUN_02045E1C
diff --git a/arm9/src/scrcmd_23.c b/arm9/src/scrcmd_23.c
new file mode 100644
index 00000000..0c9907a5
--- /dev/null
+++ b/arm9/src/scrcmd_23.c
@@ -0,0 +1,169 @@
+#include "scrcmd.h"
+
+extern BOOL FUN_02025D6C(void*, u16);
+extern BOOL FUN_02025D94(void*, u16);
+extern BOOL FUN_02026298(void*, u16);
+extern void* FUN_02026CC4(struct SaveBlock2* sav2);
+extern BOOL FUN_020260C4(void*, u16, u16);
+
+THUMB_FUNC BOOL ScrCmd_Unk0083(struct ScriptContext* ctx)
+{
+    struct SaveBlock2* sav2 = ctx->unk80->saveBlock2;
+    u16 unk1 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    u16 unused = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    u16* ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
+    void* unk2 = FUN_02026CC4(sav2);
+
+    *ret_ptr = (u16)FUN_02025D6C(unk2, unk1);
+
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_Unk0084(struct ScriptContext* ctx)
+{
+    u16 unused1 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    u16 unused2 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    u16* ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
+
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_Unk0085(struct ScriptContext* ctx)
+{
+    struct SaveBlock2* sav2 = ctx->unk80->saveBlock2;
+    u16 unk1 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    u16 unused = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    u16* ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
+    void* unk2 = FUN_02026CC4(sav2);
+
+    *ret_ptr = (u16)FUN_02025D94(unk2, unk1);
+
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_Unk0086(struct ScriptContext* ctx)
+{
+    u16 unused1 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    u16 unused2 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    u16* ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
+
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_Unk0087(struct ScriptContext* ctx)
+{
+    struct SaveBlock2* sav2 = ctx->unk80->saveBlock2;
+    u16 unk1 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    u16 unused = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    u16* ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
+    void* unk2 = FUN_02026CC4(sav2);
+
+    *ret_ptr = (u16)FUN_02026298(unk2, unk1);
+
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_Unk0088(struct ScriptContext* ctx)
+{
+    u16 unused1 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    u16 unused2 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    u16* ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
+
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_Unk0089(struct ScriptContext* ctx)
+{
+    u16 unused1 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    u16 unused2 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    u16* ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
+
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_Unk008A(struct ScriptContext* ctx)
+{
+    u16 unused1 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    u16 unused2 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    u16* ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
+
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_Unk008B(struct ScriptContext* ctx)
+{
+    struct SaveBlock2* sav2 = ctx->unk80->saveBlock2;
+    u16 unused1 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    u16 unused2 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    u16* ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
+    void* unused3 = FUN_02026CC4(sav2);
+
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_Unk008C(struct ScriptContext* ctx)
+{
+    u16 unused1 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    u16 unused2 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    u16* ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
+
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_Unk008D(struct ScriptContext* ctx)
+{
+    u16 unused1 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    u16 unused2 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    u16* ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
+
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_Unk008E(struct ScriptContext* ctx)
+{
+    u16 unused1 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    u16 unused2 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    u16* ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
+
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_Unk008F(struct ScriptContext* ctx)
+{
+    struct SaveBlock2* sav2 = ctx->unk80->saveBlock2;
+    u16 unk1 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    u16 unk2 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    u16* ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
+    void* unk3 = FUN_02026CC4(sav2);
+
+    *ret_ptr = (u16)FUN_020260C4(unk3, unk1, unk2);
+
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_Unk0090(struct ScriptContext* ctx)
+{
+    u16 unused1 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    u16 unused2 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    u16* ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
+
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_Unk0091(struct ScriptContext* ctx)
+{
+    u16 unused1 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    u16 unused2 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    u16* ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
+
+    return FALSE;
+}
+
+THUMB_FUNC BOOL ScrCmd_Unk0092(struct ScriptContext* ctx)
+{
+    u16 unused1 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    u16 unused2 = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    u16* ret_ptr = GetVarPointer(ctx->unk80, ScriptReadHalfword(ctx));
+
+    return FALSE;
+}
diff --git a/include/scrcmd.h b/include/scrcmd.h
index c47e909d..120a0c96 100644
--- a/include/scrcmd.h
+++ b/include/scrcmd.h
@@ -230,6 +230,24 @@ BOOL ScrCmd_GetItemPocketId(struct ScriptContext* ctx);
 BOOL ScrCmd_Unk0081(struct ScriptContext* ctx);
 BOOL ScrCmd_Unk0082(struct ScriptContext* ctx);
 
+//scrcmd_23.c
+BOOL ScrCmd_Unk0083(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk0084(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk0085(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk0086(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk0087(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk0088(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk0089(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk008A(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk008B(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk008C(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk008D(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk008E(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk008F(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk0090(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk0091(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk0092(struct ScriptContext* ctx);
+
 //scrcmd_25.c
 BOOL ScrCmd_Unk023F(struct ScriptContext* ctx);
 BOOL ScrCmd_Unk0240(struct ScriptContext* ctx);