Decomp CompareScriptVariablesVeneer

asm/include/overlay_11.inc

@@ -629,7 +629,7 @@
 .public CalcScriptVariablesVeneer
 .public UpdateScriptVarWithParam
 .public UpdateScriptVarWithVar
-.public sub_0204BF5C
+.public CompareScriptVariablesVeneer
 .public sub_0204BF68
 .public sub_0204BF88
 .public sub_0204C5DC

asm/main_0204BF68.s

@@ -1,16 +1,8 @@
 	.include "asm/macros.inc"
-	.include "main_0204BF5C.inc"
+	.include "main_0204BF68.inc"
 
 	.text
 
-	arm_func_start sub_0204BF5C
-sub_0204BF5C: ; 0x0204BF5C
-	ldr ip, _0204BF64 ; =CompareScriptVariables
-	bx ip
-	.align 2, 0
-_0204BF64: .word CompareScriptVariables
-	arm_func_end sub_0204BF5C
-
 	arm_func_start sub_0204BF68
 sub_0204BF68: ; 0x0204BF68
 	stmdb sp!, {r3, r4, r5, lr}

asm/overlay_11.s

@@ -3419,7 +3419,7 @@ _022DF0FC:
 	bl LoadScriptVariableValueSum
 	mov r1, r5
 	mov r2, r7
-	bl sub_0204BF5C
+	bl CompareScriptVariablesVeneer
 	cmp r0, #0
 	ldrneh r0, [r6, #6]
 	ldrne r1, [r4, #0x14]
@@ -9304,7 +9304,7 @@ _022E4448:
 	mov r1, sb
 	mov r0, r7
 	mov r2, fp
-	bl sub_0204BF5C
+	bl CompareScriptVariablesVeneer
 	cmp r0, #0
 	beq _022E44A0
 	ldrh r3, [r5, #4]
@@ -9332,7 +9332,7 @@ _022E44AC:
 	ldrh r2, [r5, #2]
 	mov r1, sb
 	mov r0, r7
-	bl sub_0204BF5C
+	bl CompareScriptVariablesVeneer
 	cmp r0, #0
 	beq _022E4508
 	ldrh r3, [r5, #6]
@@ -9364,7 +9364,7 @@ _022E4514:
 	mov r1, r0
 	ldrh r2, [r5, #2]
 	mov r0, r7
-	bl sub_0204BF5C
+	bl CompareScriptVariablesVeneer
 	cmp r0, #0
 	beq _022E4580
 	ldrh r3, [r5, #6]

include/scripting.h

@@ -46,5 +46,6 @@ bool8 CompareScriptVariables(s32 param_1, s32 param_2, enum compare_operation op
 s32 CalcScriptVariablesVeneer(s32 param_1, s32 param_2, enum script_calc_operation operation);
 void UpdateScriptVarWithParam(union script_var_value sv_local[], const enum script_var_id script_var_id, s32 param, enum script_calc_operation operation);
 void UpdateScriptVarWithVar(union script_var_value sv_local[], enum script_var_id sv_id_1, enum script_var_id sv_id_2, enum script_calc_operation operation);
+bool8 CompareScriptVariablesVeneer(s32 param_1, s32 param_2, enum compare_operation operation);
 
 #endif //PMDSKY_SCRIPTING_H

main.lsf

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

src/scripting.c

@@ -461,3 +461,8 @@ void UpdateScriptVarWithVar(union script_var_value sv_local[], enum script_var_i
     s32 result = CalcScriptVariables(value_1, value_2, operation);
     SaveScriptVariableValue(sv_local, sv_id_1, result);
 }
+
+bool8 CompareScriptVariablesVeneer(s32 param_1, s32 param_2, enum compare_operation operation)
+{
+    return CompareScriptVariables(param_1, param_2, operation);
+}