diff --git a/runelite-client/src/main/scripts/ChatSplitBuilder.hash b/runelite-client/src/main/scripts/ChatSplitBuilder.hash index 9e67531c83..dae4dd64a2 100644 --- a/runelite-client/src/main/scripts/ChatSplitBuilder.hash +++ b/runelite-client/src/main/scripts/ChatSplitBuilder.hash @@ -1 +1 @@ -5BCAA21926CF079794AAF3DA80E512297DD6F8353741929302FE6490D17DDF8C \ No newline at end of file +2A7509A05B336AC79015C479B39CDB3E1D3F10A57C6B96B2162E87352B4F25A3 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm b/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm index 354aa42e71..ed561e82ef 100644 --- a/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm +++ b/runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm @@ -62,7 +62,7 @@ LABEL49: iconst 73 iconst 73 iload 6 - iconst 10551325 + iconst 10551326 enum if_getheight add @@ -361,9 +361,9 @@ CHAT_FILTER: iload 15 ; Load the messageType iload 12 ; Load the id of the messageNode sconst "chatFilterCheck" - runelite_callback - pop_int ; Pop the id of the messageNode - pop_int ; Pop the messageType + runelite_callback + pop_int ; Pop the id of the messageNode + pop_int ; Pop the messageType iconst 1 ; 2nd half of conditional sstore 0 ; Override the message with our filtered message if_icmpeq LABEL327 ; Check if we are building this message @@ -380,8 +380,8 @@ LABEL330: iload 12 ; Load the id of the messageNode sconst "" ; Push a container for the timestamp sconst "addTimestamp" ; Push event name - runelite_callback ; Invoke callback - pop_int ; Pop the id of the messageNode + runelite_callback ; Invoke callback + pop_int ; Pop the id of the messageNode sconst "From " sload 1 sconst ":" @@ -409,8 +409,8 @@ LABEL351: iload 12 ; Load the id of the messageNode sconst "" ; Push container for the timestamp sconst "addTimestamp" ; Push event name - runelite_callback ; Invoke callback - pop_int ; Pop the id of the messageNode + runelite_callback ; Invoke callback + pop_int ; Pop the id of the messageNode sconst "To " sload 1 sconst ":" @@ -438,8 +438,8 @@ LABEL372: iload 12 ; Load the id of the messageNode sconst "" ; Push a container for the timestamp sconst "addTimestamp" ; Push event name - runelite_callback ; Invoke callback - pop_int ; Pop the id of the messageNode + runelite_callback ; Invoke callback + pop_int ; Pop the id of the messageNode sload 0 ; Load the log in/out message join_string 2 ; Add the timestamp to the message iload 9 diff --git a/runelite-client/src/main/scripts/OptionsPanelRebuilder.hash b/runelite-client/src/main/scripts/OptionsPanelRebuilder.hash index 95e14db861..a90e9082b0 100644 --- a/runelite-client/src/main/scripts/OptionsPanelRebuilder.hash +++ b/runelite-client/src/main/scripts/OptionsPanelRebuilder.hash @@ -1 +1 @@ -1D663B889321070027599B4B8437A321C0C83336C703BBBA34BE22A183E1D7B9 \ No newline at end of file +A55D398EBF2C1CE70F2CFC6BEA21939307B69840DEBF46E0384EC2E7EFBBC58A \ No newline at end of file diff --git a/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm b/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm index afb820ff0f..9a2fbfe92f 100644 --- a/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm +++ b/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm @@ -12,19 +12,19 @@ iconst 73 iconst 73 iload 1 - iconst 10551306 + iconst 10551307 enum istore 3 iconst 73 iconst 73 iload 1 - iconst 10551301 + iconst 10551302 enum istore 4 iconst 73 iconst 73 iload 1 - iconst 10551308 + iconst 10551309 enum istore 5 iconst 103 @@ -76,14 +76,14 @@ LABEL70: iconst 0 iload 16 - iconst 39387148 + iconst 39387149 if_getwidth sub invoke 1045 istore 14 iconst 0 iload 17 - iconst 39387148 + iconst 39387149 if_getheight sub invoke 1045 @@ -248,7 +248,7 @@ LABEL163: iconst 73 iconst 73 iload 1 - iconst 10551307 + iconst 10551308 enum iload 5 iload 8 @@ -260,7 +260,7 @@ LABEL242: iconst 73 iconst 73 iload 1 - iconst 10551307 + iconst 10551308 enum iload 3 iconst 0 @@ -386,7 +386,7 @@ LABEL316: iconst 73 iconst 73 iload 1 - iconst 10551307 + iconst 10551308 enum iload 5 iload 8 @@ -398,7 +398,7 @@ LABEL359: iconst 73 iconst 73 iload 1 - iconst 10551307 + iconst 10551308 enum iload 3 iconst 0 @@ -408,7 +408,7 @@ LABEL369: iconst 73 iconst 73 iload 1 - iconst 10551309 + iconst 10551310 enum istore 18 iload 18 @@ -472,7 +472,7 @@ LABEL423: iconst 73 iconst 73 iload 1 - iconst 10551311 + iconst 10551312 enum istore 18 iconst 0 @@ -487,7 +487,7 @@ LABEL437: iconst 73 iconst 73 iload 1 - iconst 10551303 + iconst 10551304 enum if_hassub iconst 1 @@ -542,7 +542,7 @@ LABEL481: iconst 73 iconst 73 iload 1 - iconst 10551303 + iconst 10551304 enum istore 18 iconst 0 diff --git a/runelite-client/src/main/scripts/QuestListShowProgress.hash b/runelite-client/src/main/scripts/QuestListShowProgress.hash index d3899f1431..c235a4ae9b 100644 --- a/runelite-client/src/main/scripts/QuestListShowProgress.hash +++ b/runelite-client/src/main/scripts/QuestListShowProgress.hash @@ -1 +1 @@ -A6B3A7BFE7B688A08F69B91A7FD5C7184D71147D3DAF74B1262369D85DBB3A03 \ No newline at end of file +FC7F8B54745582D6DD530D5458E129B67D6B3CFF61BACD4BBE7BC8C40E26F3C6 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/QuestListShowProgress.rs2asm b/runelite-client/src/main/scripts/QuestListShowProgress.rs2asm index 275080edfc..ca43ff61b9 100644 --- a/runelite-client/src/main/scripts/QuestListShowProgress.rs2asm +++ b/runelite-client/src/main/scripts/QuestListShowProgress.rs2asm @@ -15,39 +15,49 @@ LABEL8: iload 5 iload 6 if_icmplt LABEL12 - jump LABEL56 + jump LABEL64 LABEL12: iload 0 iload 5 cc_find iconst 1 if_icmpeq LABEL18 - jump LABEL51 + jump LABEL59 LABEL18: iload 5 invoke 1357 istore 3 + iload 5 + invoke 3236 + iconst 1 + if_icmpeq LABEL26 + jump LABEL29 +LABEL26: + iconst 10461087 + istore 4 + jump LABEL45 +LABEL29: iload 3 iconst 2 - if_icmpeq LABEL25 - jump LABEL28 -LABEL25: + if_icmpeq LABEL33 + jump LABEL36 +LABEL33: iconst 901389 istore 4 - jump LABEL37 -LABEL28: + jump LABEL45 +LABEL36: iload 3 iconst 0 - if_icmpeq LABEL32 - jump LABEL35 -LABEL32: + if_icmpeq LABEL40 + jump LABEL43 +LABEL40: iconst 16776960 istore 4 - jump LABEL37 -LABEL35: + jump LABEL45 +LABEL43: iconst 16711680 istore 4 -LABEL37: +LABEL45: iload 4 cc_setcolour iconst 85 @@ -62,54 +72,64 @@ LABEL37: iload 4 sconst "Iii" cc_setonmouseleave -LABEL51: +LABEL59: iload 5 iconst 1 add istore 5 jump LABEL8 -LABEL56: +LABEL64: iconst 0 invoke 2245 istore 6 istore 5 -LABEL60: +LABEL68: iload 5 iload 6 - if_icmplt LABEL64 - jump LABEL108 -LABEL64: + if_icmplt LABEL72 + jump LABEL124 +LABEL72: iload 1 iload 5 cc_find iconst 1 - if_icmpeq LABEL70 - jump LABEL103 -LABEL70: + if_icmpeq LABEL78 + jump LABEL119 +LABEL78: iload 5 invoke 1358 istore 3 + iload 5 + invoke 3237 + iconst 1 + if_icmpeq LABEL86 + jump LABEL89 +LABEL86: + iconst 10461087 + istore 4 + jump LABEL105 +LABEL89: iload 3 iconst 2 - if_icmpeq LABEL77 - jump LABEL80 -LABEL77: + if_icmpeq LABEL93 + jump LABEL96 +LABEL93: iconst 901389 istore 4 - jump LABEL89 -LABEL80: + jump LABEL105 +LABEL96: iload 3 iconst 0 - if_icmpeq LABEL84 - jump LABEL87 -LABEL84: + if_icmpeq LABEL100 + jump LABEL103 +LABEL100: iconst 16776960 istore 4 - jump LABEL89 -LABEL87: + jump LABEL105 +LABEL103: iconst 16711680 istore 4 -LABEL89: +LABEL105: iload 4 cc_setcolour iconst 85 @@ -124,54 +144,64 @@ LABEL89: iload 4 sconst "Iii" cc_setonmouseleave -LABEL103: +LABEL119: iload 5 iconst 1 add istore 5 - jump LABEL60 -LABEL108: + jump LABEL68 +LABEL124: iconst 0 invoke 2265 istore 6 istore 5 -LABEL112: +LABEL128: iload 5 iload 6 - if_icmplt LABEL116 - jump LABEL160 -LABEL116: + if_icmplt LABEL132 + jump LABEL184 +LABEL132: iload 2 iload 5 cc_find iconst 1 - if_icmpeq LABEL122 - jump LABEL155 -LABEL122: + if_icmpeq LABEL138 + jump LABEL179 +LABEL138: iload 5 invoke 1359 istore 3 + iload 5 + invoke 3238 + iconst 1 + if_icmpeq LABEL146 + jump LABEL149 +LABEL146: + iconst 10461087 + istore 4 + jump LABEL165 +LABEL149: iload 3 iconst 2 - if_icmpeq LABEL129 - jump LABEL132 -LABEL129: + if_icmpeq LABEL153 + jump LABEL156 +LABEL153: iconst 901389 istore 4 - jump LABEL141 -LABEL132: + jump LABEL165 +LABEL156: iload 3 iconst 0 - if_icmpeq LABEL136 - jump LABEL139 -LABEL136: + if_icmpeq LABEL160 + jump LABEL163 +LABEL160: iconst 16776960 istore 4 - jump LABEL141 -LABEL139: + jump LABEL165 +LABEL163: iconst 16711680 istore 4 -LABEL141: +LABEL165: iload 4 cc_setcolour iconst 85 @@ -186,13 +216,13 @@ LABEL141: iload 4 sconst "Iii" cc_setonmouseleave -LABEL155: +LABEL179: iload 5 iconst 1 add istore 5 - jump LABEL112 -LABEL160: + jump LABEL128 +LABEL184: sconst "questProgressUpdated" runelite_callback return diff --git a/runelite-client/src/main/scripts/ResetChatboxInput.hash b/runelite-client/src/main/scripts/ResetChatboxInput.hash index 12bd3c5bb1..2c90f09832 100644 --- a/runelite-client/src/main/scripts/ResetChatboxInput.hash +++ b/runelite-client/src/main/scripts/ResetChatboxInput.hash @@ -1 +1 @@ -E8B1910003198AB024BADC89831AF1735A2C77256C23551212105F25439E022D \ No newline at end of file +9985AC752BF689CA5353232CF302B41E83EC1901D8615B507EA10DFAA9F5AF9A \ No newline at end of file diff --git a/runelite-client/src/main/scripts/ResetChatboxInput.rs2asm b/runelite-client/src/main/scripts/ResetChatboxInput.rs2asm index 40f4b02c6f..17070abc16 100644 --- a/runelite-client/src/main/scripts/ResetChatboxInput.rs2asm +++ b/runelite-client/src/main/scripts/ResetChatboxInput.rs2asm @@ -165,16 +165,18 @@ LABEL40: get_varc_int 41 iconst 1337 if_icmpeq LABEL154 - jump LABEL156 + jump LABEL158 LABEL154: invoke 2526 pop_int -LABEL156: + clientclock + set_varc_int 384 +LABEL158: invoke 1972 iconst 1 - if_icmpeq LABEL160 - jump LABEL161 -LABEL160: + if_icmpeq LABEL162 + jump LABEL163 +LABEL162: invoke 2581 -LABEL161: +LABEL163: return