From 2a67d8b7e34a89bb50edae7f81bd5ac56d995101 Mon Sep 17 00:00:00 2001
From: red031000 <rubenru09@aol.com>
Date: Fri, 19 Mar 2021 19:42:00 +0000
Subject: fix asmproc

---
 arm9/asm/scrcmd_asm.s          | 14 --------------
 arm9/asm/unk_02038C78.s        |  2 +-
 arm9/global.inc                |  2 +-
 arm9/src/scrcmd.c              | 11 ++++++++++-
 include/scrcmd.h               |  1 +
 tools/asm_processor/compile.sh |  0
 6 files changed, 13 insertions(+), 17 deletions(-)
 mode change 100644 => 100755 tools/asm_processor/compile.sh

diff --git a/arm9/asm/scrcmd_asm.s b/arm9/asm/scrcmd_asm.s
index 95b132fd..dcf84948 100644
--- a/arm9/asm/scrcmd_asm.s
+++ b/arm9/asm/scrcmd_asm.s
@@ -15,20 +15,6 @@ UNK_021C5A0C: ; 0x021C5A0C
 
 	.text
 
-	thumb_func_start FUN_0203A9F0
-FUN_0203A9F0: ; 0x0203A9F0
-	push {r4, lr}
-	add r4, r0, #0x0
-	bl ScriptReadHalfword
-	str r0, [r4, #0x64]
-	ldr r1, _0203AA08 ; =FUN_0203AA0C
-	add r0, r4, #0x0
-	bl SetupNativeScript
-	mov r0, #0x1
-	pop {r4, pc}
-	nop
-_0203AA08: .word FUN_0203AA0C 
-
 	thumb_func_start FUN_0203AA0C
 FUN_0203AA0C: ; 0x0203AA0C
 	push {r3-r5, lr}
diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s
index 950ebd45..95ca2106 100644
--- a/arm9/asm/unk_02038C78.s
+++ b/arm9/asm/unk_02038C78.s
@@ -208,7 +208,7 @@ gScriptCmdTable: ; 0x020F355C
     .word ScrCmd_Unk0038
     .word ScrCmd_Unk0039
     .word ScrCmd_Unk003A
-    .word FUN_0203A9F0
+    .word ScrCmd_Unk003B
     .word FUN_0203AA90
     .word ScrCmd_ScrollBg
     .word FUN_0203AAA0
diff --git a/arm9/global.inc b/arm9/global.inc
index c9b785dc..ab44d83e 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -2770,7 +2770,7 @@
 .extern ScrCmd_Unk0038
 .extern ScrCmd_Unk0039
 .extern ScrCmd_Unk003A
-.extern FUN_0203A9F0
+.extern ScrCmd_Unk003B
 .extern FUN_0203AA90
 .extern FUN_0203AAA0
 .extern FUN_0203AB44
diff --git a/arm9/src/scrcmd.c b/arm9/src/scrcmd.c
index 478148bc..870d6353 100644
--- a/arm9/src/scrcmd.c
+++ b/arm9/src/scrcmd.c
@@ -53,6 +53,7 @@ static BOOL FUN_0203A570(struct ScriptContext *ctx);
 static BOOL FUN_0203A6C8(struct ScriptContext *ctx);
 static BOOL FUN_0203A8A0(struct ScriptContext *ctx);
 static BOOL FUN_0203A94C(struct ScriptContext *ctx);
+/*static*/ BOOL FUN_0203AA0C(struct ScriptContext *ctx);
 
 extern u8 sScriptConditionTable[6][3];
 
@@ -936,7 +937,7 @@ THUMB_FUNC BOOL ScrCmd_Unk003A(struct ScriptContext *ctx)
     return TRUE;
 }
 
-THUMB_FUNC static BOOL FUN_0203A94C(struct ScriptContext* ctx)
+THUMB_FUNC static BOOL FUN_0203A94C(struct ScriptContext *ctx)
 {
     struct UnkSavStruct80 *unk80 = ctx->unk80;
     u8 *unk1 = FUN_02039438(unk80, 3);
@@ -985,3 +986,11 @@ THUMB_FUNC static BOOL FUN_0203A94C(struct ScriptContext* ctx)
         return FALSE;
     }
 }
+
+THUMB_FUNC BOOL ScrCmd_Unk003B(struct ScriptContext *ctx)
+{
+    ctx->data[0] = ScriptReadHalfword(ctx);
+
+    SetupNativeScript(ctx, FUN_0203AA0C);
+    return TRUE;
+}
diff --git a/include/scrcmd.h b/include/scrcmd.h
index 4fa58f46..1e09095a 100644
--- a/include/scrcmd.h
+++ b/include/scrcmd.h
@@ -83,6 +83,7 @@ BOOL ScrCmd_Unk0037(struct ScriptContext* ctx);
 BOOL ScrCmd_Unk0038(struct ScriptContext *ctx);
 BOOL ScrCmd_Unk0039(struct ScriptContext* ctx);
 BOOL ScrCmd_Unk003A(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk003B(struct ScriptContext *ctx);
 
 //scrcmd_18.c
 BOOL ScrCmd_GiveMon(struct ScriptContext* ctx);
diff --git a/tools/asm_processor/compile.sh b/tools/asm_processor/compile.sh
old mode 100644
new mode 100755
-- 
cgit v1.2.3