diff --git a/runelite-api/src/main/java/net/runelite/api/NpcID.java b/runelite-api/src/main/java/net/runelite/api/NpcID.java index 831dcdc155..bf68267442 100644 --- a/runelite-api/src/main/java/net/runelite/api/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java @@ -3120,7 +3120,7 @@ public final class NpcID public static final int COMBAT_INSTRUCTOR = 3307; public static final int GIELINOR_GUIDE = 3308; public static final int MAGIC_INSTRUCTOR = 3309; - public static final int FINANCIAL_ADVISOR = 3310; + public static final int ACCOUNT_GUIDE = 3310; public static final int MINING_INSTRUCTOR = 3311; public static final int QUEST_GUIDE = 3312; public static final int GIANT_RAT_3313 = 3313; @@ -7468,12 +7468,12 @@ public final class NpcID public static final int JAMES = 8193; public static final int GROWTHLING = 8194; public static final int BRYOPHYTA = 8195; - public static final int DOGADILE = 8196; + public static final int PUPPADILE = 8196; public static final int TEKTONNE = 8197; public static final int VANGUARD_8198 = 8198; public static final int MINI_NISTIRIO = 8199; public static final int VESPINA = 8200; - public static final int PUPPADILE = 8201; + public static final int PUPPADILE_8201 = 8201; public static final int TEKTINY = 8202; public static final int VANGUARD_8203 = 8203; public static final int VASA_MINIRIO = 8204; diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java index 1ac37c780a..068bd32612 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java @@ -123,11 +123,11 @@ public class WidgetID static class WorldMap { - static final int MAPVIEW = 4; - static final int OVERVIEW_MAP = 7; - static final int SEARCH = 22; - static final int SURFACE_SELECTOR = 30; - static final int TOOLTIP = 36; + static final int MAPVIEW = 6; + static final int OVERVIEW_MAP = 9; + static final int SEARCH = 24; + static final int SURFACE_SELECTOR = 25; + static final int TOOLTIP = 38; static final int OPTION = 42; } @@ -291,7 +291,7 @@ public class WidgetID static class LoginClickToPlayScreen { - static final int MESSAGE_OF_THE_DAY = 4; + static final int MESSAGE_OF_THE_DAY = 7; } static class Viewport diff --git a/runelite-client/src/main/scripts/BankSearchLayout.hash b/runelite-client/src/main/scripts/BankSearchLayout.hash index df4dc9da58..36c3000296 100644 --- a/runelite-client/src/main/scripts/BankSearchLayout.hash +++ b/runelite-client/src/main/scripts/BankSearchLayout.hash @@ -1 +1 @@ -1F866A32ECF9F03F05E132A98706DE8F4B5B45B84B61344EDEF5C342AF3A0500 \ No newline at end of file +81FBDB7DE85B5B435E3DB440EE220AC3BF1AB8A3F91C2DE280894E232F62F793 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/BankSearchLayout.rs2asm b/runelite-client/src/main/scripts/BankSearchLayout.rs2asm index b9293a0726..99522969df 100644 --- a/runelite-client/src/main/scripts/BankSearchLayout.rs2asm +++ b/runelite-client/src/main/scripts/BankSearchLayout.rs2asm @@ -1,7 +1,7 @@ .id 277 .int_stack_count 13 .string_stack_count 0 -.int_var_count 30 +.int_var_count 31 .string_var_count 1 get_varbit 5102 load_int 1 @@ -105,7 +105,7 @@ LABEL80: load_int 1 iload 1 widget_put_size_widget - load_int 374 + load_int 460 load_int 39 load_int 0 load_int 1 @@ -134,7 +134,7 @@ LABEL110: load_int 1 iload 1 widget_put_size_widget - load_int 374 + load_int 460 load_int 81 load_int 0 load_int 1 @@ -194,16 +194,20 @@ LABEL165: istore 17 iload 3 widget_get_width_widget + load_int 51 + isub + load_int 35 + isub + istore 18 + iload 18 load_int 8 load_int 36 imul isub iload 17 idiv - istore 18 - load_int -1 istore 19 - load_int 0 + load_int -1 istore 20 load_int 0 istore 21 @@ -211,87 +215,89 @@ LABEL165: istore 22 load_int 0 istore 23 - load_int -1 - istore 24 load_int 0 + istore 24 + load_int -1 istore 25 + load_int 0 + istore 26 load_string "" sstore 0 get_varbit 4150 load_int 0 - if_icmple LABEL203 + if_icmple LABEL209 get_varbit 4150 load_int 9 - if_icmpgt LABEL203 - jump LABEL652 -LABEL203: + if_icmpgt LABEL209 + jump LABEL658 +LABEL209: iload 15 load_int 816 - if_icmplt LABEL207 - jump LABEL232 -LABEL207: + if_icmplt LABEL213 + jump LABEL238 +LABEL213: iload 3 iload 15 widget_load_child load_int 1 - if_icmpeq LABEL213 - jump LABEL215 -LABEL213: + if_icmpeq LABEL219 + jump LABEL221 +LABEL219: load_int 1 widget_put_hidden -LABEL215: +LABEL221: load_int 95 iload 15 get_itemcontainer_itemid load_int -1 - if_icmpne LABEL221 - jump LABEL227 -LABEL221: - iload 23 - load_int 1 - iadd - iload 15 - istore 24 - istore 23 + if_icmpne LABEL227 + jump LABEL233 LABEL227: - iload 15 - load_int 1 - iadd - istore 15 - jump LABEL203 -LABEL232: - get_varbit 4171 - get_varbit 4172 - iadd - get_varbit 4173 - iadd - get_varbit 4174 - iadd - get_varbit 4175 - iadd - get_varbit 4176 - iadd - get_varbit 4177 - iadd - get_varbit 4178 - iadd - get_varbit 4179 - iadd - istore 25 - iload 25 - load_int 0 - if_icmple LABEL254 - jump LABEL258 -LABEL254: - load_int 816 - load_int 1 - isub - istore 24 -LABEL258: - iload 25 iload 24 load_int 1 iadd + iload 15 + istore 25 + istore 24 +LABEL233: + iload 15 + load_int 1 + iadd + istore 15 + jump LABEL209 +LABEL238: + get_varbit 4171 + get_varbit 4172 + iadd + get_varbit 4173 + iadd + get_varbit 4174 + iadd + get_varbit 4175 + iadd + get_varbit 4176 + iadd + get_varbit 4177 + iadd + get_varbit 4178 + iadd + get_varbit 4179 + iadd + istore 26 + iload 26 + load_int 0 + if_icmple LABEL260 + jump LABEL264 +LABEL260: + load_int 816 + load_int 1 + isub + istore 25 +LABEL264: + iload 26 + iload 25 + load_int 1 + iadd load_int 0 iload 3 iload 4 @@ -299,26 +305,26 @@ LABEL258: iload 11 iload 12 iload 14 - iload 18 + iload 19 iload 17 iload 13 invoke 509 - istore 20 - istore 22 - iload 21 - iload 20 - iadd istore 21 + istore 23 + iload 22 + iload 21 + iadd + istore 22 load_int 0 istore 15 get_varbit 4171 load_int 0 - if_icmpgt LABEL285 - jump LABEL315 -LABEL285: + if_icmpgt LABEL291 + jump LABEL321 +LABEL291: load_int 1 iload 3 - iload 22 + iload 23 invoke 510 istore 14 iload 15 @@ -332,29 +338,29 @@ LABEL285: iload 11 iload 12 iload 14 - iload 18 + iload 19 iload 17 iload 13 invoke 509 - istore 20 - istore 22 - iload 21 - iload 20 - iadd istore 21 + istore 23 + iload 22 + iload 21 + iadd + istore 22 iload 15 get_varbit 4171 iadd istore 15 -LABEL315: +LABEL321: get_varbit 4172 load_int 0 - if_icmpgt LABEL319 - jump LABEL349 -LABEL319: + if_icmpgt LABEL325 + jump LABEL355 +LABEL325: load_int 2 iload 3 - iload 22 + iload 23 invoke 510 istore 14 iload 15 @@ -368,29 +374,29 @@ LABEL319: iload 11 iload 12 iload 14 - iload 18 + iload 19 iload 17 iload 13 invoke 509 - istore 20 - istore 22 - iload 21 - iload 20 - iadd istore 21 + istore 23 + iload 22 + iload 21 + iadd + istore 22 iload 15 get_varbit 4172 iadd istore 15 -LABEL349: +LABEL355: get_varbit 4173 load_int 0 - if_icmpgt LABEL353 - jump LABEL383 -LABEL353: + if_icmpgt LABEL359 + jump LABEL389 +LABEL359: load_int 3 iload 3 - iload 22 + iload 23 invoke 510 istore 14 iload 15 @@ -404,29 +410,29 @@ LABEL353: iload 11 iload 12 iload 14 - iload 18 + iload 19 iload 17 iload 13 invoke 509 - istore 20 - istore 22 - iload 21 - iload 20 - iadd istore 21 + istore 23 + iload 22 + iload 21 + iadd + istore 22 iload 15 get_varbit 4173 iadd istore 15 -LABEL383: +LABEL389: get_varbit 4174 load_int 0 - if_icmpgt LABEL387 - jump LABEL417 -LABEL387: + if_icmpgt LABEL393 + jump LABEL423 +LABEL393: load_int 4 iload 3 - iload 22 + iload 23 invoke 510 istore 14 iload 15 @@ -440,29 +446,29 @@ LABEL387: iload 11 iload 12 iload 14 - iload 18 + iload 19 iload 17 iload 13 invoke 509 - istore 20 - istore 22 - iload 21 - iload 20 - iadd istore 21 + istore 23 + iload 22 + iload 21 + iadd + istore 22 iload 15 get_varbit 4174 iadd istore 15 -LABEL417: +LABEL423: get_varbit 4175 load_int 0 - if_icmpgt LABEL421 - jump LABEL451 -LABEL421: + if_icmpgt LABEL427 + jump LABEL457 +LABEL427: load_int 5 iload 3 - iload 22 + iload 23 invoke 510 istore 14 iload 15 @@ -476,29 +482,29 @@ LABEL421: iload 11 iload 12 iload 14 - iload 18 + iload 19 iload 17 iload 13 invoke 509 - istore 20 - istore 22 - iload 21 - iload 20 - iadd istore 21 + istore 23 + iload 22 + iload 21 + iadd + istore 22 iload 15 get_varbit 4175 iadd istore 15 -LABEL451: +LABEL457: get_varbit 4176 load_int 0 - if_icmpgt LABEL455 - jump LABEL485 -LABEL455: + if_icmpgt LABEL461 + jump LABEL491 +LABEL461: load_int 6 iload 3 - iload 22 + iload 23 invoke 510 istore 14 iload 15 @@ -512,29 +518,29 @@ LABEL455: iload 11 iload 12 iload 14 - iload 18 + iload 19 iload 17 iload 13 invoke 509 - istore 20 - istore 22 - iload 21 - iload 20 - iadd istore 21 + istore 23 + iload 22 + iload 21 + iadd + istore 22 iload 15 get_varbit 4176 iadd istore 15 -LABEL485: +LABEL491: get_varbit 4177 load_int 0 - if_icmpgt LABEL489 - jump LABEL519 -LABEL489: + if_icmpgt LABEL495 + jump LABEL525 +LABEL495: load_int 7 iload 3 - iload 22 + iload 23 invoke 510 istore 14 iload 15 @@ -548,29 +554,29 @@ LABEL489: iload 11 iload 12 iload 14 - iload 18 + iload 19 iload 17 iload 13 invoke 509 - istore 20 - istore 22 - iload 21 - iload 20 - iadd istore 21 + istore 23 + iload 22 + iload 21 + iadd + istore 22 iload 15 get_varbit 4177 iadd istore 15 -LABEL519: +LABEL525: get_varbit 4178 load_int 0 - if_icmpgt LABEL523 - jump LABEL553 -LABEL523: + if_icmpgt LABEL529 + jump LABEL559 +LABEL529: load_int 8 iload 3 - iload 22 + iload 23 invoke 510 istore 14 iload 15 @@ -584,29 +590,29 @@ LABEL523: iload 11 iload 12 iload 14 - iload 18 + iload 19 iload 17 iload 13 invoke 509 - istore 20 - istore 22 - iload 21 - iload 20 - iadd istore 21 + istore 23 + iload 22 + iload 21 + iadd + istore 22 iload 15 get_varbit 4178 iadd istore 15 -LABEL553: +LABEL559: get_varbit 4179 load_int 0 - if_icmpgt LABEL557 - jump LABEL587 -LABEL557: + if_icmpgt LABEL563 + jump LABEL593 +LABEL563: load_int 9 iload 3 - iload 22 + iload 23 invoke 510 istore 14 iload 15 @@ -620,35 +626,35 @@ LABEL557: iload 11 iload 12 iload 14 - iload 18 + iload 19 iload 17 iload 13 invoke 509 - istore 20 - istore 22 - iload 21 - iload 20 - iadd istore 21 + istore 23 + iload 22 + iload 21 + iadd + istore 22 iload 15 get_varbit 4179 iadd istore 15 -LABEL587: +LABEL593: invoke 514 load_int 1 - if_icmpeq LABEL591 - jump LABEL632 -LABEL591: + if_icmpeq LABEL597 + jump LABEL638 +LABEL597: get_varc_string 22 ; Skip truncating of varcstr 22 by not calling 280 - tolowercase ; instead get the var directly and lowercase it + tolowercase ; instead get the var directly and lowercase it sstore 0 sload 0 string_length load_int 0 - if_icmpgt LABEL598 - jump LABEL617 -LABEL598: + if_icmpgt LABEL604 + jump LABEL623 +LABEL604: load_string "Showing items: " load_string "" sload 0 @@ -658,11 +664,11 @@ LABEL598: widget_put_text_widget get_varc 5 load_int 11 - if_icmpeq LABEL609 - jump LABEL616 -LABEL609: + if_icmpeq LABEL615 + jump LABEL622 +LABEL615: load_string "Show items whose names contain the following text: (" - iload 21 + iload 22 int_to_string load_string " found)" string_append 3 @@ -672,9 +678,9 @@ LABEL609: pop_int ; pop number of matches load_int 10616876 widget_put_text_widget -LABEL616: - jump LABEL631 -LABEL617: +LABEL622: + jump LABEL637 +LABEL623: load_string "Showing items: " load_string "" load_string "*" @@ -684,21 +690,21 @@ LABEL617: widget_put_text_widget get_varc 5 load_int 11 - if_icmpeq LABEL628 - jump LABEL631 -LABEL628: + if_icmpeq LABEL634 + jump LABEL637 +LABEL634: load_string "Show items whose names contain the following text:" load_string "setSearchBankInputText" ; load event name runelite_callback ; invoke callback load_int 10616876 widget_put_text_widget -LABEL631: - jump LABEL635 -LABEL632: +LABEL637: + jump LABEL641 +LABEL638: load_string "The Bank of Gielinor" iload 6 widget_put_text_widget -LABEL635: +LABEL641: iload 0 iload 1 iload 2 @@ -712,72 +718,72 @@ LABEL635: iload 10 iload 11 iload 12 - iload 22 iload 23 + iload 24 invoke 505 return -LABEL652: +LABEL658: invoke 514 load_int 1 - if_icmpeq LABEL656 - jump LABEL659 -LABEL656: + if_icmpeq LABEL662 + jump LABEL665 +LABEL662: load_int 1 load_int 1 invoke 299 -LABEL659: - load_int -1 - istore 26 +LABEL665: load_int -1 istore 27 + load_int -1 + istore 28 get_varbit 4150 invoke 513 - istore 27 - istore 26 - load_int 0 istore 28 + istore 27 load_int 0 istore 29 -LABEL671: + load_int 0 + istore 30 +LABEL677: iload 15 load_int 816 - if_icmplt LABEL675 - jump LABEL753 -LABEL675: + if_icmplt LABEL681 + jump LABEL761 +LABEL681: iload 3 iload 15 widget_load_child load_int 1 - if_icmpeq LABEL681 - jump LABEL748 -LABEL681: + if_icmpeq LABEL687 + jump LABEL756 +LABEL687: load_int 95 iload 15 get_itemcontainer_itemid - istore 19 - iload 19 + istore 20 + iload 20 load_int -1 - if_icmpne LABEL689 - jump LABEL693 -LABEL689: - iload 23 + if_icmpne LABEL695 + jump LABEL699 +LABEL695: + iload 24 load_int 1 iadd - istore 23 -LABEL693: - iload 15 - iload 26 - if_icmpge LABEL697 - jump LABEL746 -LABEL697: + istore 24 +LABEL699: iload 15 iload 27 - if_icmplt LABEL701 - jump LABEL746 -LABEL701: + if_icmpge LABEL703 + jump LABEL754 +LABEL703: + iload 15 + iload 28 + if_icmplt LABEL707 + jump LABEL754 +LABEL707: load_int 0 widget_put_hidden - iload 19 + iload 20 load_int 95 iload 15 get_itemcontainer_stacksize @@ -787,57 +793,59 @@ LABEL701: iload 11 iload 12 invoke 278 + iload 30 + load_int 36 + imul + istore 23 + load_int 51 iload 29 load_int 36 - imul - istore 22 - iload 28 - load_int 36 - iload 18 + iload 19 iadd imul - iload 22 + iadd + iload 23 load_int 0 load_int 0 widget_put_position - iload 22 + iload 23 load_int 32 iadd - istore 22 - iload 28 + istore 23 + iload 29 iload 17 - if_icmplt LABEL734 - jump LABEL739 -LABEL734: - iload 28 - load_int 1 - iadd - istore 28 - jump LABEL745 -LABEL739: - load_int 0 + if_icmplt LABEL742 + jump LABEL747 +LABEL742: iload 29 load_int 1 iadd istore 29 - istore 28 -LABEL745: - jump LABEL748 -LABEL746: + jump LABEL753 +LABEL747: + load_int 0 + iload 30 + load_int 1 + iadd + istore 30 + istore 29 +LABEL753: + jump LABEL756 +LABEL754: load_int 1 widget_put_hidden -LABEL748: +LABEL756: iload 15 load_int 1 iadd istore 15 - jump LABEL671 -LABEL753: + jump LABEL677 +LABEL761: get_varbit 4170 load_int 2 - if_icmpeq LABEL757 - jump LABEL767 -LABEL757: + if_icmpeq LABEL765 + jump LABEL775 +LABEL765: load_string "Tab " load_int 105 load_int 115 @@ -847,15 +855,15 @@ LABEL757: string_append 2 iload 6 widget_put_text_widget - jump LABEL773 -LABEL767: + jump LABEL781 +LABEL775: load_string "Tab " get_varbit 4150 int_to_string string_append 2 iload 6 widget_put_text_widget -LABEL773: +LABEL781: iload 0 iload 1 iload 2 @@ -869,7 +877,7 @@ LABEL773: iload 10 iload 11 iload 12 - iload 22 iload 23 + iload 24 invoke 505 return diff --git a/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.hash b/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.hash index 9e7c710225..f4a40ef439 100644 --- a/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.hash +++ b/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.hash @@ -1 +1 @@ -1E7CB366C4C56524B48B4521B0AFEBEF3A0A68E4D80F06991FA1AAC2983ACAA3 \ No newline at end of file +AA7DEC763D0B598D920956D8D46E890C502B71CB7D022A89F7930BD91E1F8468 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm b/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm index c0a6c409e7..b56ce6ba8f 100644 --- a/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm +++ b/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm @@ -19,7 +19,7 @@ load_int 128 isub istore 1 - load_int 17104905 + load_int 17104910 widget_get_width_widget load_int 17104911 widget_get_width_widget @@ -41,29 +41,29 @@ LABEL27: get_varc 74 load_int 128 - isub + isub iload 0 load_string "zoomExpToLin" - runelite_callback - pop_int + runelite_callback + pop_int iload 2 imul iload 0 - idiv + idiv istore 5 jump LABEL44 LABEL36: get_varc 73 load_int 128 - isub + isub iload 0 load_string "zoomExpToLin" - runelite_callback - pop_int + runelite_callback + pop_int iload 2 imul iload 1 - idiv + idiv istore 5 LABEL44: iload 5