Mirror/UltimateTrainingModpack
1
0
Fork 0
mirror of https://github.com/jugeeya/UltimateTrainingModpack.git synced 2025-06-07 20:10:35 +00:00
Code Issues Activity

fix for grab OoS

Browse source
This commit is contained in:
jugeeya 2019-12-15 19:56:05 -08:00
parent 62442e7cae
commit 4d26d3741c
1 changed files with 5 additions and 1 deletions

6
source/training/mash.h
View file

@ -47,7 +47,7 @@ void get_command_flag_cat(u64 module_accessor, int category, int& flag) {
if (category == FIGHTER_PAD_COMMAND_CATEGORY1) if (category == FIGHTER_PAD_COMMAND_CATEGORY1)
flag |= FIGHTER_PAD_CMD_CAT1_FLAG_ESCAPE; flag |= FIGHTER_PAD_CMD_CAT1_FLAG_ESCAPE;
if (menu.MASH_STATE == MASH_ATTACK) if (menu.MASH_STATE == MASH_ATTACK) {
if (category == FIGHTER_PAD_COMMAND_CATEGORY1) { if (category == FIGHTER_PAD_COMMAND_CATEGORY1) {
switch (menu.ATTACK_STATE) { switch (menu.ATTACK_STATE) {
case MASH_NAIR: case MASH_NAIR:
@ -79,7 +79,11 @@ void get_command_flag_cat(u64 module_accessor, int category, int& flag) {
flag |= FIGHTER_PAD_CMD_CAT1_FLAG_CATCH; flag |= FIGHTER_PAD_CMD_CAT1_FLAG_CATCH;
break; break;
} }
} else if (category == 1) {
if (menu.ATTACK_STATE == MASH_GRAB)
flag |= FIGHTER_PAD_CMD_CAT1_FLAG_CATCH;
} }
}
if (menu.MASH_STATE == MASH_RANDOM) if (menu.MASH_STATE == MASH_RANDOM)
if (category == FIGHTER_PAD_COMMAND_CATEGORY1) { if (category == FIGHTER_PAD_COMMAND_CATEGORY1) {