Merge pull request #379 from red031000/master

literally one function

5 files changed, 23 insertions, 46 deletions

diff --git a/arm9/asm/scrcmd_asm.s b/arm9/asm/scrcmd_asm.s
index 3d6645c2..c1e91c9f 100644
--- a/arm9/asm/scrcmd_asm.s
+++ b/arm9/asm/scrcmd_asm.s
@@ -14,50 +14,6 @@ UNK_021C5A0C: ; 0x021C5A0C
 
 	.text
 
-	thumb_func_start FUN_0203AFC4
-FUN_0203AFC4: ; 0x0203AFC4
-	push {r4-r6, lr}
-	add r5, r0, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r6, r0, #0x0
-	add r0, r5, #0x0
-	bl ScriptReadWord
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	add r1, r6, #0x0
-	bl FUN_0203B120
-	add r6, r0, #0x0
-	bne _0203AFF6
-	bl ErrorHandling
-_0203AFF6:
-	ldr r1, [r5, #0x8]
-	add r0, r6, #0x0
-	add r1, r1, r4
-	bl FUN_0205AEA4
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	mov r1, #0x4
-	bl FUN_02039438
-	ldrb r1, [r0, #0x0]
-	add r5, #0x80
-	mov r2, #0x0
-	add r1, r1, #0x1
-	strb r1, [r0, #0x0]
-	ldr r0, [r5, #0x0]
-	add r1, r4, #0x0
-	bl FUN_0203B174
-	mov r0, #0x0
-	pop {r4-r6, pc}
-
 	thumb_func_start FUN_0203B024
 FUN_0203B024: ; 0x0203B024
 	push {r3-r7, lr}
diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s
index 38588cd5..3369ec2e 100644
--- a/arm9/asm/unk_02038C78.s
+++ b/arm9/asm/unk_02038C78.s
@@ -243,7 +243,7 @@ gScriptCmdTable: ; 0x020F355C
     .word ScrCmd_Unk005B
     .word ScrCmd_Unk005C
     .word ScrCmd_Unk005D
-    .word FUN_0203AFC4
+    .word ScrCmd_Unk005E
     .word FUN_0203B148
     .word FUN_0203B1F0
     .word FUN_0203B3B0
diff --git a/arm9/global.inc b/arm9/global.inc
index 38ec47f4..2a318a97 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -2783,7 +2783,7 @@
 .extern ScrCmd_Unk0048
 .extern ScrCmd_Unk02CF
 .extern ScrCmd_Unk02D0
-.extern FUN_0203AFC4
+.extern ScrCmd_Unk005E
 .extern FUN_0203B024
 .extern FUN_0203B148
 .extern FUN_0203B1F0
diff --git a/arm9/src/scrcmd.c b/arm9/src/scrcmd.c
index 4ad17e51..fb88da54 100644
--- a/arm9/src/scrcmd.c
+++ b/arm9/src/scrcmd.c
@@ -55,6 +55,10 @@ extern void MOD05_021E26CC(u32 param0, u8 param1);
 extern void MOD05_021E2B80(u32 param0, u8 param1);
 extern void MOD05_021E2B9C(u32 param0, u8 param1);
 
+extern u32 FUN_0203B120(struct UnkSavStruct80 *arg, u16 param1);
+extern u32 FUN_0205AEA4(u32 param0, const u8 *ptr);
+extern void FUN_0203B174(struct UnkSavStruct80 *arg, u32 param1, u32 param2);
+
 extern u8 *UNK_020F34E0;
 
 static BOOL RunPauseTimer(struct ScriptContext *ctx);
@@ -1298,3 +1302,19 @@ THUMB_FUNC BOOL ScrCmd_Unk02D0(struct ScriptContext *ctx)
     MOD05_021E2B9C(*unk, ScriptReadByte(ctx));
     return TRUE;
 }
+
+THUMB_FUNC BOOL ScrCmd_Unk005E(struct ScriptContext *ctx)
+{
+    u16 unk = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
+    u32 unk2 = ScriptReadWord(ctx);
+
+    u32 unk3 = FUN_0203B120(ctx->unk80, unk);
+    GF_ASSERT(unk3);
+
+    u32 unk4 = FUN_0205AEA4(unk3, ctx->scriptPtr + unk2);
+    u8 *unk5 = FUN_02039438(ctx->unk80, 4);
+    (*unk5)++;
+
+    FUN_0203B174(ctx->unk80, unk4, 0);
+    return FALSE;
+}
diff --git a/include/scrcmd.h b/include/scrcmd.h
index c246279d..c4a9631c 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);