mirror of
https://github.com/open-goal/jak-project
synced 2026-09-06 19:21:00 -04:00
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:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user