Moved around more static methods, nothing final

Some of these are "incorrect" - I wanted to decrease the # of static classes first by grouping them if they're slightly related.
Then I'll do a second pass in each class to reorganize later.
This commit is contained in:
Pazaz 2022-05-16 01:13:34 -04:00
parent c988509e8e
commit ba4debb0d3
No known key found for this signature in database
GPG key ID: 8658637376F9B835
150 changed files with 2805 additions and 3034 deletions

View file

@ -77,4 +77,38 @@ public class VarpDomain {
local25 <<= local16;
method2766(local19, local25 & arg1 << local16 | activeVarps[local19] & ~local25);
}
@OriginalMember(owner = "client!wd", name = "a", descriptor = "(BII)V")
public static void setVarbit(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
@Pc(14) VarbitType local14 = VarbitTypeList.get(arg1);
@Pc(17) int local17 = local14.baseVar;
@Pc(20) int local20 = local14.endBit;
@Pc(23) int local23 = local14.startBit;
@Pc(29) int local29 = Song_Class3_Sub9.anIntArray135[local20 - local23];
if (arg0 < 0 || local29 < arg0) {
arg0 = 0;
}
local29 <<= local23;
set(arg0 << local23 & local29 | ~local29 & varp[local17], local17);
}
@OriginalMember(owner = "client!gl", name = "a", descriptor = "(II)V")
public static void refreshMagicVarp(@OriginalArg(1) int arg0) {
InterfaceList.redrawActiveInterfaces();
AreaSoundManager.updateMulti();
@Pc(17) int local17 = VarpTypeList.get(arg0).clientCode;
if (local17 == 0) {
return;
}
@Pc(25) int local25 = activeVarps[arg0];
if (local17 == 6) {
Static79.anInt2157 = local25;
}
if (local17 == 5) {
Static116.anInt2952 = local25;
}
if (local17 == 9) {
Static179.anInt4254 = local25;
}
}
}