Decomp CalcScriptVariablesVeneer

asm/include/main_0204BED8.inc

@@ -1,5 +1,6 @@
 #pragma once
 .public CalcScriptVariables
+.public CompareScriptVariables
 .public DEBUG_SPECIAL_EPISODE_NUMBER
 .public Debug_Print
 .public Debug_Print0
@@ -16,5 +17,4 @@
 .public _0209CF64
 .public _0209CF84
 .public _0209DFA0
-.public CompareScriptVariables
 .public sub_0204CBE8

asm/include/overlay_11.inc

@@ -626,7 +626,7 @@
 .public sub_0204AE80
 .public sub_0204AEE0
 .public sub_0204B3D0
-.public sub_0204BECC
+.public CalcScriptVariablesVeneer
 .public sub_0204BED8
 .public sub_0204BF10
 .public sub_0204BF5C

asm/main_0204BED8.s

@@ -1,16 +1,8 @@
 	.include "asm/macros.inc"
-	.include "main_0204BECC.inc"
+	.include "main_0204BED8.inc"
 
 	.text
 
-	arm_func_start sub_0204BECC
-sub_0204BECC: ; 0x0204BECC
-	ldr ip, _0204BED4 ; =CalcScriptVariables
-	bx ip
-	.align 2, 0
-_0204BED4: .word CalcScriptVariables
-	arm_func_end sub_0204BECC
-
 	arm_func_start sub_0204BED8
 sub_0204BED8: ; 0x0204BED8
 	stmdb sp!, {r3, r4, r5, r6, r7, lr}

asm/overlay_11.s

@@ -3616,7 +3616,7 @@ _022DF3DC:
 	bl LoadScriptVariableValue
 	mov r1, r5
 	mov r2, r7
-	bl sub_0204BECC
+	bl CalcScriptVariablesVeneer
 	mov r7, r0
 	b _022DF6FC
 _022DF424:
@@ -3641,7 +3641,7 @@ _022DF424:
 	mov r2, r7
 	mov r1, r0
 	mov r0, r5
-	bl sub_0204BECC
+	bl CalcScriptVariablesVeneer
 	mov r7, r0
 	b _022DF6FC
 _022DF484:

include/scripting.h

@@ -43,5 +43,6 @@ void SaveScriptVariableValueBytes(const enum script_var_id sv_id, u8* result, s3
 s32 ScriptVariablesEqual(union script_var_value sv_val_ptr_local[], enum script_var_id sv_id_1, enum script_var_id sv_id_2);
 s32 CalcScriptVariables(s32 param_1, s32 param_2, enum script_calc_operation operation);
 bool8 CompareScriptVariables(s32 param_1, s32 param_2, enum compare_operation operation);
+s32 CalcScriptVariablesVeneer(s32 param_1, s32 param_2, enum script_calc_operation operation);
 
 #endif //PMDSKY_SCRIPTING_H

main.lsf

@@ -82,7 +82,8 @@ Static main
 	Object asm/main_0204B018.o
 	Object src/scripting.o
 	Object asm/main_rodata_0209CECC.o
-	Object asm/main_0204BECC.o
+	Object src/main_0204BECC.o
+	Object asm/main_0204BED8.o
 	Object src/main_0204C938.o
 	Object asm/main_0204C94C.o
 	Object src/dungeon_recruitment_3.o

src/scripting.c

@@ -441,3 +441,8 @@ bool8 CompareScriptVariables(s32 param_1, s32 param_2, enum compare_operation op
             Debug_FatalError(&ppi, &EVENT_FLAG_RULE_ERROR, operation);
         }
 }
+
+s32 CalcScriptVariablesVeneer(s32 param_1, s32 param_2, enum script_calc_operation operation)
+{
+    return CalcScriptVariables(param_1, param_2, operation);
+}