diff --git a/asm/include/main_02014E00.inc b/asm/include/main_02014E38.inc similarity index 100% rename from asm/include/main_02014E00.inc rename to asm/include/main_02014E38.inc diff --git a/asm/main_02014E00.s b/asm/main_02014E38.s similarity index 99% rename from asm/main_02014E00.s rename to asm/main_02014E38.s index e9fd6d65..015fb7ea 100644 --- a/asm/main_02014E00.s +++ b/asm/main_02014E38.s @@ -1,26 +1,8 @@ .include "asm/macros.inc" - .include "main_02014E00.inc" + .include "main_02014E38.inc" .text - arm_func_start IsOneHitKoMove -IsOneHitKoMove: ; 0x02014E00 - cmp r0, #0x83 - moveq r0, #1 - bxeq lr - cmp r0, #0x96 - moveq r0, #1 - bxeq lr - cmp r0, #0xb1 - moveq r0, #1 - bxeq lr - cmp r0, #0xf7 - moveq r0, #1 - movne r0, #0 - and r0, r0, #0xff - bx lr - arm_func_end IsOneHitKoMove - arm_func_start IsNot2TurnsMoveOrSketch IsNot2TurnsMoveOrSketch: ; 0x02014E38 stmdb sp!, {r4, lr} diff --git a/include/main_02014CEC.h b/include/main_02014CEC.h index d2d4e7f4..184a9029 100644 --- a/include/main_02014CEC.h +++ b/include/main_02014CEC.h @@ -22,4 +22,7 @@ bool8 IsCopyingMove(enum move_id move_id); // Checks if the move is a trapping move bool8 IsTrappingMove(enum move_id move_id); +// Checks if the move is a one hit KO move +bool8 IsOneHitKoMove(enum move_id move_id); + #endif //PMDSKY_MAIN_02014CEC_H diff --git a/main.lsf b/main.lsf index 5836c600..fa108445 100644 --- a/main.lsf +++ b/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_02014E00.o + Object asm/main_02014E38.o Object src/main_020251AC.o Object asm/main_020251F0.o Object src/main_02025788.o diff --git a/src/main_02014CEC.c b/src/main_02014CEC.c index 03dc5076..8adce2f3 100644 --- a/src/main_02014CEC.c +++ b/src/main_02014CEC.c @@ -62,3 +62,13 @@ bool8 IsTrappingMove(enum move_id move_id) return FALSE; } + +bool8 IsOneHitKoMove(enum move_id move_id) +{ + if (move_id == MOVE_FISSURE) return TRUE; + if (move_id == MOVE_SHEER_COLD) return TRUE; + if (move_id == MOVE_HORN_DRILL) return TRUE; + if (move_id == MOVE_GUILLOTINE) return TRUE; + + return FALSE; +}