decomp: merge all s6-* remappings and finish training-obs | villagep-obs | lavatube-obs | rolling-robber | snow-obs (#1018)

* decompiler: merge all `s6-*` usages

* decomp: finish `training-obs`

* decomp: finish `rolling-robber`

* decomp: finish `villagep-obs`

* decomp: finish `lavatube-obs`

* skip function in `lavatube-obs` over #1029

* closes #1029

* kick nasm

* merge s6 and sp in variable naming pass

* revert my fix

* fix mistakes and a bad method signature

Co-authored-by: water111 <awaterford111445@gmail.com>
This commit is contained in:
Tyler Wilding
2021-12-28 23:16:42 -05:00
committed by GitHub
parent e8db0583c9
commit c6f0c5cd29
52 changed files with 17962 additions and 3047 deletions
+1 -1
View File
@@ -1572,7 +1572,7 @@ FormElement* SimpleExpressionElement::update_from_stack_logor_or_logand_helper(
if (m_expr.get_arg(1).is_var()) {
auto eti = env.dts->ts.try_enum_lookup(arg1_type.base_type());
if (eti) {
auto integer = get_goal_integer_constant(args.at(0), env);
auto integer = get_goal_integer_constant(strip_int_or_uint_cast(args.at(0)), env);
if (integer && ((s64)*integer) < 0) {
// clearing a bitfield.
auto elts = decompile_bitfield_enum_from_int(arg1_type, env.dts->ts, ~*integer);