Merge pull request #7249 from alondero/master

Add support for Rumble when increase or decrease by the rumble value
This commit is contained in:
Twinaphex 2018-09-20 09:53:36 +02:00 committed by GitHub
commit 62b0722ec5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 1 deletions

View File

@ -6914,6 +6914,14 @@ MSG_HASH(
MENU_ENUM_LABEL_RUMBLE_TYPE_GT_VALUE,
"> Rumble Value"
)
MSG_HASH(
MENU_ENUM_LABEL_RUMBLE_TYPE_INCREASE_BY_VALUE,
"Increases by Rumble Value"
)
MSG_HASH(
MENU_ENUM_LABEL_RUMBLE_TYPE_DECREASE_BY_VALUE,
"Decreases by Rumble Value"
)
MSG_HASH(
MENU_ENUM_LABEL_CHEAT_MEMORY_SIZE_1,
"1-bit, max value = 0x01"

View File

@ -1067,6 +1067,12 @@ void cheat_manager_apply_rumble(struct item_cheat *cheat, unsigned int curr_valu
case RUMBLE_TYPE_GT_VALUE:
rumble = (curr_value > cheat->rumble_value) ;
break;
case RUMBLE_TYPE_INCREASE_BY_VALUE:
rumble = (curr_value == cheat->rumble_prev_value + cheat->rumble_value) ;
break ;
case RUMBLE_TYPE_DECREASE_BY_VALUE:
rumble = (curr_value == cheat->rumble_prev_value - cheat->rumble_value) ;
break ;
}
cheat->rumble_prev_value = curr_value ;

View File

@ -73,7 +73,9 @@ enum cheat_rumble_type
RUMBLE_TYPE_EQ_VALUE,
RUMBLE_TYPE_NEQ_VALUE,
RUMBLE_TYPE_LT_VALUE,
RUMBLE_TYPE_GT_VALUE
RUMBLE_TYPE_GT_VALUE,
RUMBLE_TYPE_INCREASE_BY_VALUE,
RUMBLE_TYPE_DECREASE_BY_VALUE
};
#define CHEAT_CODE_SCRATCH_SIZE 100

View File

@ -2054,6 +2054,8 @@ enum msg_hash_enums
MENU_ENUM_LABEL_RUMBLE_TYPE_NEQ_VALUE,
MENU_ENUM_LABEL_RUMBLE_TYPE_LT_VALUE,
MENU_ENUM_LABEL_RUMBLE_TYPE_GT_VALUE,
MENU_ENUM_LABEL_RUMBLE_TYPE_INCREASE_BY_VALUE,
MENU_ENUM_LABEL_RUMBLE_TYPE_DECREASE_BY_VALUE,
MENU_ENUM_LABEL_CHEAT_MEMORY_SIZE_1,
MENU_ENUM_LABEL_CHEAT_MEMORY_SIZE_2,
MENU_ENUM_LABEL_CHEAT_MEMORY_SIZE_4,