Decomp IsNot2TurnsMoveOrSketch

asm/include/main_02014E64.inc

@@ -95,7 +95,6 @@
 .public GroupOamObjs
 .public InitOamInfo
 .public IqSkillFlagTest
-.public Is2TurnsMove
 .public LANGUAGE_INFO_DATA
 .public LoadFileFromRom
 .public LoadScriptVariableValue

asm/main_02014E64.s

@@ -1,23 +1,8 @@
 	.include "asm/macros.inc"
-	.include "main_02014E38.inc"
+	.include "main_02014E64.inc"
 
 	.text
 
-	arm_func_start IsNot2TurnsMoveOrSketch
-IsNot2TurnsMoveOrSketch: ; 0x02014E38
-	stmdb sp!, {r4, lr}
-	mov r4, r0
-	bl Is2TurnsMove
-	cmp r0, #0
-	movne r0, #0
-	ldmneia sp!, {r4, pc}
-	cmp r4, #0x8a
-	movne r0, #1
-	moveq r0, #0
-	and r0, r0, #0xff
-	ldmia sp!, {r4, pc}
-	arm_func_end IsNot2TurnsMoveOrSketch
-
 	arm_func_start IsRealMove
 IsRealMove: ; 0x02014E64
 	cmp r0, #0

include/main_02014CEC.h

@@ -25,4 +25,7 @@ bool8 IsTrappingMove(enum move_id move_id);
 // Checks if the move is a one hit KO move
 bool8 IsOneHitKoMove(enum move_id move_id);
 
+// Checks if the move is not a two turn move or sketch
+bool8 IsNot2TurnsMoveOrSketch(enum move_id move_id);
+
 #endif //PMDSKY_MAIN_02014CEC_H

main.lsf

@@ -79,7 +79,7 @@ Static main
 	Object src/main_02014A4C.o
 	Object asm/main_02014B1C.o
 	Object src/main_02014CEC.o
-	Object asm/main_02014E38.o
+	Object asm/main_02014E64.o
 	Object src/main_020251AC.o
 	Object asm/main_020251F0.o
 	Object src/main_02025788.o

src/main_02014CEC.c

@@ -72,3 +72,11 @@ bool8 IsOneHitKoMove(enum move_id move_id)
 
     return FALSE;
 }
+
+bool8 IsNot2TurnsMoveOrSketch(enum move_id move_id)
+{
+    if (Is2TurnsMove(move_id)) return FALSE;
+    if (move_id == MOVE_SKETCH) return FALSE;
+    
+    return TRUE;
+}