diff --git a/runelite-api/src/main/java/net/runelite/api/ItemID.java b/runelite-api/src/main/java/net/runelite/api/ItemID.java index 66a1f9ea24..813c354a01 100644 --- a/runelite-api/src/main/java/net/runelite/api/ItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/ItemID.java @@ -10321,7 +10321,6 @@ public final class ItemID public static final int STARTER_SWORD = 22331; public static final int STARTER_BOW = 22333; public static final int STARTER_STAFF = 22335; - public static final int KINDLING_22350 = 22350; public static final int EGGSHELL_PLATEBODY = 22351; public static final int EGGSHELL_PLATELEGS = 22353; public static final int HOLY_HANDEGG = 22355; @@ -10792,13 +10791,5 @@ public final class ItemID public static final int TORMENTED_BRACELET_OR = 23444; public static final int GIANT_EASTER_EGG = 23446; public static final int BUNNYMAN_MASK = 23448; - public static final int DRIED_COCOA = 23450; - public static final int HOSIDIUS_MILK = 23451; - public static final int SPECIAL_SPICES = 23452; - public static final int CRATE_OF_BASKETS = 23453; - public static final int FINE_SILK = 23454; - public static final int FINE_RED_SILK = 23455; - public static final int CHOCOLATE_MIXTUREU = 23456; - public static final int CHOCO_SERUM = 23457; /* This file is automatically generated. Do not edit. */ } 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 c105b8339a..bc496b3cbe 100644 --- a/runelite-api/src/main/java/net/runelite/api/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java @@ -7847,27 +7847,6 @@ public final class NpcID public static final int DODGY_GEEZER = 8644; public static final int ARTHUR_THE_CLUE_HUNTER = 8665; public static final int BANKER_8666 = 8666; - public static final int EASTER_BUNNY = 8667; - public static final int CHOCCO = 8668; - public static final int MILKEE = 8669; - public static final int GOLDIE = 8670; - public static final int RABBIT_8671 = 8671; - public static final int BUGS_8672 = 8672; - public static final int CAERBANNOG = 8673; - public static final int BUNNY_MAN = 8674; - public static final int PETER_8675 = 8675; - public static final int CHOCOLATE_CHICKEN = 8676; - public static final int CHOCOLATE_CHICKEN_8677 = 8677; - public static final int CHOCOLATE_CHICKEN_8678 = 8678; - public static final int COLOSSAL_CHOCCO_CHICKEN = 8679; - public static final int COLOSSAL_CHOCCO_CHICKEN_8680 = 8680; - public static final int COLOSSAL_CHOCCO_CHICKEN_8681 = 8681; - public static final int COLOSSAL_CHOCCO_CHICKEN_8682 = 8682; - public static final int CHOCOLATE_CHICKEN_8683 = 8683; - public static final int EASTER_BUNNY_8684 = 8684; - public static final int EG = 8685; - public static final int EGG_8686 = 8686; - public static final int EGGY = 8687; - public static final int TRAVELLING_MERCHANT = 8694; + public static final int MOSOL_REI_8696 = 8696; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/NullItemID.java b/runelite-api/src/main/java/net/runelite/api/NullItemID.java index 4a69257b0e..1bc9028389 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullItemID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullItemID.java @@ -11842,6 +11842,7 @@ public final class NullItemID public static final int NULL_22347 = 22347; public static final int NULL_22348 = 22348; public static final int NULL_22349 = 22349; + public static final int NULL_22350 = 22350; public static final int NULL_22352 = 22352; public static final int NULL_22354 = 22354; public static final int NULL_22356 = 22356; @@ -12447,5 +12448,13 @@ public final class NullItemID public static final int NULL_23445 = 23445; public static final int NULL_23447 = 23447; public static final int NULL_23449 = 23449; + public static final int NULL_23450 = 23450; + public static final int NULL_23451 = 23451; + public static final int NULL_23452 = 23452; + public static final int NULL_23453 = 23453; + public static final int NULL_23454 = 23454; + public static final int NULL_23455 = 23455; + public static final int NULL_23456 = 23456; + public static final int NULL_23457 = 23457; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java index 16645b6d21..7d5c3edab5 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java @@ -16154,54 +16154,5 @@ public final class NullObjectID public static final int NULL_34738 = 34738; public static final int NULL_34739 = 34739; public static final int NULL_34740 = 34740; - public static final int NULL_34750 = 34750; - public static final int NULL_34751 = 34751; - public static final int NULL_34752 = 34752; - public static final int NULL_34753 = 34753; - public static final int NULL_34754 = 34754; - public static final int NULL_34755 = 34755; - public static final int NULL_34756 = 34756; - public static final int NULL_34758 = 34758; - public static final int NULL_34759 = 34759; - public static final int NULL_34760 = 34760; - public static final int NULL_34763 = 34763; - public static final int NULL_34764 = 34764; - public static final int NULL_34765 = 34765; - public static final int NULL_34766 = 34766; - public static final int NULL_34767 = 34767; - public static final int NULL_34768 = 34768; - public static final int NULL_34769 = 34769; - public static final int NULL_34770 = 34770; - public static final int NULL_34771 = 34771; - public static final int NULL_34772 = 34772; - public static final int NULL_34773 = 34773; - public static final int NULL_34774 = 34774; - public static final int NULL_34775 = 34775; - public static final int NULL_34776 = 34776; - public static final int NULL_34777 = 34777; - public static final int NULL_34778 = 34778; - public static final int NULL_34779 = 34779; - public static final int NULL_34781 = 34781; - public static final int NULL_34782 = 34782; - public static final int NULL_34784 = 34784; - public static final int NULL_34785 = 34785; - public static final int NULL_34786 = 34786; - public static final int NULL_34789 = 34789; - public static final int NULL_34790 = 34790; - public static final int NULL_34799 = 34799; - public static final int NULL_34800 = 34800; - public static final int NULL_34801 = 34801; - public static final int NULL_34802 = 34802; - public static final int NULL_34809 = 34809; - public static final int NULL_34810 = 34810; - public static final int NULL_34811 = 34811; - public static final int NULL_34815 = 34815; - public static final int NULL_34816 = 34816; - public static final int NULL_34817 = 34817; - public static final int NULL_34818 = 34818; - public static final int NULL_34819 = 34819; - public static final int NULL_34838 = 34838; - public static final int NULL_34839 = 34839; - public static final int NULL_34840 = 34840; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/ObjectID.java b/runelite-api/src/main/java/net/runelite/api/ObjectID.java index cfe1e04c32..5ceb5ee8bc 100644 --- a/runelite-api/src/main/java/net/runelite/api/ObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/ObjectID.java @@ -18575,56 +18575,5 @@ public final class ObjectID public static final int STRANGE_CASKET = 34733; public static final int INCONSPICUOUS_BUSH_BEGINNER = 34734; public static final int STASH_BEGINNER = 34735; - public static final int RABBIT_HOLE_34741 = 34741; - public static final int RABBIT_HOLE_34742 = 34742; - public static final int RABBIT_HOLE_34743 = 34743; - public static final int RABBIT_HOLE_34744 = 34744; - public static final int RABBIT_HOLE_34745 = 34745; - public static final int RABBIT_HOLE_34746 = 34746; - public static final int RABBIT_HOLE_34747 = 34747; - public static final int RABBIT_HOLE_34748 = 34748; - public static final int RABBIT_HOLE_34749 = 34749; - public static final int CHOCOLATE_DEPOSIT = 34757; - public static final int TUNNEL_34761 = 34761; - public static final int TUNNEL_34762 = 34762; - public static final int PIPES_34780 = 34780; - public static final int PIPES_34783 = 34783; - public static final int BREWING_VAT_34787 = 34787; - public static final int OUTPUT_TAP_34788 = 34788; - public static final int ROCK_SUPPORT = 34791; - public static final int WOODEN_SUPPORT = 34792; - public static final int NEST_GATE = 34793; - public static final int NEST_34794 = 34794; - public static final int NEST_34795 = 34795; - public static final int NEST_34796 = 34796; - public static final int NEST_34797 = 34797; - public static final int NEST_34798 = 34798; - public static final int VAT_34803 = 34803; - public static final int VAT_34804 = 34804; - public static final int SWEET_SHELF = 34805; - public static final int CRATE_34806 = 34806; - public static final int CRATE_34807 = 34807; - public static final int CRATE_34808 = 34808; - public static final int HOLE_34812 = 34812; - public static final int EGG_CUP = 34813; - public static final int EGG_CUP_34814 = 34814; - public static final int PLATFORM_34820 = 34820; - public static final int ROPE_34821 = 34821; - public static final int ROPE_34822 = 34822; - public static final int ROPE_34823 = 34823; - public static final int ROPE_34824 = 34824; - public static final int EASTER_EGG = 34825; - public static final int EGG_MOLD = 34826; - public static final int COOKING_RANGE_34827 = 34827; - public static final int BRONZE_PICKAXE_34828 = 34828; - public static final int BRONZE_AXE_34829 = 34829; - public static final int TINDERBOX_34830 = 34830; - public static final int CABBAGE_34831 = 34831; - public static final int PUDDLE_OF_VOMIT = 34832; - public static final int BURROW_34833 = 34833; - public static final int BURROW_34834 = 34834; - public static final int BURROW_34835 = 34835; - public static final int BURROW_34836 = 34836; - public static final int AGGIES_TOMATO = 34837; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-client/src/main/resources/item_variations.json b/runelite-client/src/main/resources/item_variations.json index e81a1c6651..81603408c9 100644 --- a/runelite-client/src/main/resources/item_variations.json +++ b/runelite-client/src/main/resources/item_variations.json @@ -6279,8 +6279,7 @@ ], "kindling": [ 9094, - 20799, - 22350 + 20799 ], "lunar helm": [ 9096, diff --git a/runelite-client/src/main/scripts/BankSearchLayout.hash b/runelite-client/src/main/scripts/BankSearchLayout.hash index 36c3000296..7ffe248325 100644 --- a/runelite-client/src/main/scripts/BankSearchLayout.hash +++ b/runelite-client/src/main/scripts/BankSearchLayout.hash @@ -1 +1 @@ -81FBDB7DE85B5B435E3DB440EE220AC3BF1AB8A3F91C2DE280894E232F62F793 \ No newline at end of file +EE35EDE5A14C6D9934C329F6921548C6E7C34810C0D441ECEE130276A38809EA \ 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 47dad19197..c5e48d23e5 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 +.int_stack_count 17 .string_stack_count 0 -.int_var_count 31 +.int_var_count 36 .string_var_count 1 get_varbit 5102 iconst 1 @@ -19,86 +19,189 @@ LABEL8: iload 12 invoke 41 LABEL13: + iconst 0 + istore 17 get_varbit 5364 iconst 1 - if_icmpeq LABEL17 - jump LABEL24 -LABEL17: + if_icmpeq LABEL19 + jump LABEL21 +LABEL19: + iconst 1 + istore 17 +LABEL21: + iload 17 + iload 15 + if_sethide + iload 17 + iload 16 + if_sethide + get_varbit 8352 + iconst 1 + if_icmpeq LABEL31 + jump LABEL34 +LABEL31: + iconst 1 + istore 17 + jump LABEL36 +LABEL34: + iconst 0 + istore 17 +LABEL36: + iload 17 + iload 13 + if_sethide + iload 17 + iload 14 + if_sethide + iconst 441 + iconst 0 + iconst 0 + iconst 0 + iload 15 + if_setposition + iconst 444 + iconst 7 + iconst 0 + iconst 0 + iload 16 + if_setposition + get_varbit 8352 + iconst 1 + if_icmpeq LABEL58 + jump LABEL85 +LABEL58: + get_varbit 5364 + iconst 0 + if_icmpeq LABEL62 + jump LABEL85 +LABEL62: + iload 13 + if_getx + iload 13 + if_gety + iconst 0 + iconst 0 + iload 15 + if_setposition + iload 14 + if_getx + iload 14 + if_gety + iconst 0 + iconst 0 + iload 16 + if_setposition iconst 37 iconst 37 iconst 1 iconst 0 iload 5 if_setsize - jump LABEL30 -LABEL24: + jump LABEL121 +LABEL85: + get_varbit 8352 + iconst 0 + if_icmpeq LABEL89 + jump LABEL100 +LABEL89: + get_varbit 5364 + iconst 1 + if_icmpeq LABEL93 + jump LABEL100 +LABEL93: + iconst 37 + iconst 37 + iconst 1 + iconst 0 + iload 5 + if_setsize + jump LABEL121 +LABEL100: + get_varbit 8352 + iconst 1 + if_icmpeq LABEL104 + jump LABEL115 +LABEL104: + get_varbit 5364 + iconst 1 + if_icmpeq LABEL108 + jump LABEL115 +LABEL108: + iconst 74 + iconst 37 + iconst 1 + iconst 0 + iload 5 + if_setsize + jump LABEL121 +LABEL115: iconst 0 iconst 37 iconst 1 iconst 0 iload 5 if_setsize -LABEL30: +LABEL121: iconst 1 iload 11 if_sethide iload 11 cc_deleteall iconst 0 - istore 13 + istore 18 get_varbit 4170 iconst 3 - if_icmpeq LABEL41 - jump LABEL74 -LABEL41: + if_icmpeq LABEL132 + jump LABEL165 +LABEL132: get_varbit 4171 iconst 0 - if_icmpgt LABEL69 + if_icmpgt LABEL160 get_varbit 4172 iconst 0 - if_icmpgt LABEL69 + if_icmpgt LABEL160 get_varbit 4173 iconst 0 - if_icmpgt LABEL69 + if_icmpgt LABEL160 get_varbit 4174 iconst 0 - if_icmpgt LABEL69 + if_icmpgt LABEL160 get_varbit 4175 iconst 0 - if_icmpgt LABEL69 + if_icmpgt LABEL160 get_varbit 4176 iconst 0 - if_icmpgt LABEL69 + if_icmpgt LABEL160 get_varbit 4177 iconst 0 - if_icmpgt LABEL69 + if_icmpgt LABEL160 get_varbit 4178 iconst 0 - if_icmpgt LABEL69 + if_icmpgt LABEL160 get_varbit 4179 iconst 0 - if_icmpgt LABEL69 - jump LABEL72 -LABEL69: + if_icmpgt LABEL160 + jump LABEL163 +LABEL160: iconst 0 - istore 13 - jump LABEL74 -LABEL72: + istore 18 + jump LABEL165 +LABEL163: iconst 1 - istore 13 -LABEL74: + istore 18 +LABEL165: iconst 0 - istore 14 - iload 13 + istore 19 + iload 18 iconst 1 - if_icmpeq LABEL80 - jump LABEL110 -LABEL80: + if_icmpeq LABEL171 + jump LABEL201 +LABEL171: iconst 1 iload 9 if_sethide iconst 11 - istore 14 + istore 19 iconst 0 iconst 26 iconst 1 @@ -123,8 +226,8 @@ LABEL80: iconst 0 iload 2 if_setposition - jump LABEL137 -LABEL110: + jump LABEL228 +LABEL201: iconst 0 iload 9 if_sethide @@ -152,120 +255,120 @@ LABEL110: iconst 0 iload 2 if_setposition -LABEL137: +LABEL228: iload 4 iload 3 invoke 231 iconst 816 - istore 15 + istore 20 iconst 816 iconst 9 iconst 3 multiply add - istore 16 -LABEL148: - iload 15 - iload 16 - if_icmple LABEL152 - jump LABEL165 -LABEL152: + istore 21 +LABEL239: + iload 20 + iload 21 + if_icmple LABEL243 + jump LABEL256 +LABEL243: iload 3 - iload 15 + iload 20 cc_find iconst 1 - if_icmpeq LABEL158 - jump LABEL160 -LABEL158: + if_icmpeq LABEL249 + jump LABEL251 +LABEL249: iconst 1 cc_sethide -LABEL160: - iload 15 +LABEL251: + iload 20 iconst 1 add - istore 15 - jump LABEL148 -LABEL165: + istore 20 + jump LABEL239 +LABEL256: iconst 0 - istore 15 + istore 20 iconst 8 iconst 1 sub - istore 17 + istore 22 iload 3 if_getwidth iconst 51 sub iconst 35 sub - istore 18 - iload 18 + istore 23 + iload 23 iconst 8 iconst 36 multiply sub - iload 17 + iload 22 div - istore 19 - iconst -1 - istore 20 - iconst 0 - istore 21 - iconst 0 - istore 22 - iconst 0 - istore 23 - iconst 0 istore 24 iconst -1 istore 25 iconst 0 istore 26 + iconst 0 + istore 27 + iconst 0 + istore 28 + iconst 0 + istore 29 + iconst -1 + istore 30 + iconst 0 + istore 31 sconst "" sstore 0 get_varbit 4150 iconst 0 - if_icmple LABEL209 + if_icmple LABEL300 get_varbit 4150 iconst 9 - if_icmpgt LABEL209 - jump LABEL658 -LABEL209: - iload 15 + if_icmpgt LABEL300 + jump LABEL753 +LABEL300: + iload 20 iconst 816 - if_icmplt LABEL213 - jump LABEL238 -LABEL213: + if_icmplt LABEL304 + jump LABEL329 +LABEL304: iload 3 - iload 15 + iload 20 cc_find iconst 1 - if_icmpeq LABEL219 - jump LABEL221 -LABEL219: + if_icmpeq LABEL310 + jump LABEL312 +LABEL310: iconst 1 cc_sethide -LABEL221: +LABEL312: iconst 95 - iload 15 + iload 20 inv_getobj iconst -1 - if_icmpne LABEL227 - jump LABEL233 -LABEL227: - iload 24 + if_icmpne LABEL318 + jump LABEL324 +LABEL318: + iload 29 iconst 1 add - iload 15 - istore 25 - istore 24 -LABEL233: - iload 15 + iload 20 + istore 30 + istore 29 +LABEL324: + iload 20 iconst 1 add - istore 15 - jump LABEL209 -LABEL238: + istore 20 + jump LABEL300 +LABEL329: get_varbit 4171 get_varbit 4172 add @@ -283,124 +386,124 @@ LABEL238: add get_varbit 4179 add - istore 26 - iload 26 + istore 31 + iload 31 iconst 0 - if_icmple LABEL260 - jump LABEL264 -LABEL260: + if_icmple LABEL351 + jump LABEL355 +LABEL351: iconst 816 iconst 1 sub - istore 25 -LABEL264: - iload 26 - iload 25 - iconst 1 - add - iconst 0 - iload 3 - iload 4 - iload 10 - iload 11 - iload 12 - iload 14 - iload 19 - iload 17 - iload 13 - invoke 509 - istore 21 - istore 23 - iload 22 - iload 21 - add - istore 22 - iconst 0 - istore 15 - get_varbit 4171 - iconst 0 - if_icmpgt LABEL291 - jump LABEL321 -LABEL291: - iconst 1 - iload 3 - iload 23 - invoke 510 - istore 14 - iload 15 - iload 15 - get_varbit 4171 - add - iconst 1 - iload 3 - iload 4 - iload 10 - iload 11 - iload 12 - iload 14 - iload 19 - iload 17 - iload 13 - invoke 509 - istore 21 - istore 23 - iload 22 - iload 21 - add - istore 22 - iload 15 - get_varbit 4171 - add - istore 15 -LABEL321: - get_varbit 4172 - iconst 0 - if_icmpgt LABEL325 - jump LABEL355 -LABEL325: - iconst 2 - iload 3 - iload 23 - invoke 510 - istore 14 - iload 15 - iload 15 - get_varbit 4172 - add - iconst 2 - iload 3 - iload 4 - iload 10 - iload 11 - iload 12 - iload 14 - iload 19 - iload 17 - iload 13 - invoke 509 - istore 21 - istore 23 - iload 22 - iload 21 - add - istore 22 - iload 15 - get_varbit 4172 - add - istore 15 + istore 30 LABEL355: + iload 31 + iload 30 + iconst 1 + add + iconst 0 + iload 3 + iload 4 + iload 10 + iload 11 + iload 12 + iload 19 + iload 24 + iload 22 + iload 18 + invoke 509 + istore 26 + istore 28 + iload 27 + iload 26 + add + istore 27 + iconst 0 + istore 20 + get_varbit 4171 + iconst 0 + if_icmpgt LABEL382 + jump LABEL412 +LABEL382: + iconst 1 + iload 3 + iload 28 + invoke 510 + istore 19 + iload 20 + iload 20 + get_varbit 4171 + add + iconst 1 + iload 3 + iload 4 + iload 10 + iload 11 + iload 12 + iload 19 + iload 24 + iload 22 + iload 18 + invoke 509 + istore 26 + istore 28 + iload 27 + iload 26 + add + istore 27 + iload 20 + get_varbit 4171 + add + istore 20 +LABEL412: + get_varbit 4172 + iconst 0 + if_icmpgt LABEL416 + jump LABEL446 +LABEL416: + iconst 2 + iload 3 + iload 28 + invoke 510 + istore 19 + iload 20 + iload 20 + get_varbit 4172 + add + iconst 2 + iload 3 + iload 4 + iload 10 + iload 11 + iload 12 + iload 19 + iload 24 + iload 22 + iload 18 + invoke 509 + istore 26 + istore 28 + iload 27 + iload 26 + add + istore 27 + iload 20 + get_varbit 4172 + add + istore 20 +LABEL446: get_varbit 4173 iconst 0 - if_icmpgt LABEL359 - jump LABEL389 -LABEL359: + if_icmpgt LABEL450 + jump LABEL480 +LABEL450: iconst 3 iload 3 - iload 23 + iload 28 invoke 510 - istore 14 - iload 15 - iload 15 + istore 19 + iload 20 + iload 20 get_varbit 4173 add iconst 3 @@ -409,34 +512,34 @@ LABEL359: iload 10 iload 11 iload 12 - iload 14 iload 19 - iload 17 - iload 13 - invoke 509 - istore 21 - istore 23 + iload 24 iload 22 - iload 21 + iload 18 + invoke 509 + istore 26 + istore 28 + iload 27 + iload 26 add - istore 22 - iload 15 + istore 27 + iload 20 get_varbit 4173 add - istore 15 -LABEL389: + istore 20 +LABEL480: get_varbit 4174 iconst 0 - if_icmpgt LABEL393 - jump LABEL423 -LABEL393: + if_icmpgt LABEL484 + jump LABEL514 +LABEL484: iconst 4 iload 3 - iload 23 + iload 28 invoke 510 - istore 14 - iload 15 - iload 15 + istore 19 + iload 20 + iload 20 get_varbit 4174 add iconst 4 @@ -445,34 +548,34 @@ LABEL393: iload 10 iload 11 iload 12 - iload 14 iload 19 - iload 17 - iload 13 - invoke 509 - istore 21 - istore 23 + iload 24 iload 22 - iload 21 + iload 18 + invoke 509 + istore 26 + istore 28 + iload 27 + iload 26 add - istore 22 - iload 15 + istore 27 + iload 20 get_varbit 4174 add - istore 15 -LABEL423: + istore 20 +LABEL514: get_varbit 4175 iconst 0 - if_icmpgt LABEL427 - jump LABEL457 -LABEL427: + if_icmpgt LABEL518 + jump LABEL548 +LABEL518: iconst 5 iload 3 - iload 23 + iload 28 invoke 510 - istore 14 - iload 15 - iload 15 + istore 19 + iload 20 + iload 20 get_varbit 4175 add iconst 5 @@ -481,34 +584,34 @@ LABEL427: iload 10 iload 11 iload 12 - iload 14 iload 19 - iload 17 - iload 13 - invoke 509 - istore 21 - istore 23 + iload 24 iload 22 - iload 21 + iload 18 + invoke 509 + istore 26 + istore 28 + iload 27 + iload 26 add - istore 22 - iload 15 + istore 27 + iload 20 get_varbit 4175 add - istore 15 -LABEL457: + istore 20 +LABEL548: get_varbit 4176 iconst 0 - if_icmpgt LABEL461 - jump LABEL491 -LABEL461: + if_icmpgt LABEL552 + jump LABEL582 +LABEL552: iconst 6 iload 3 - iload 23 + iload 28 invoke 510 - istore 14 - iload 15 - iload 15 + istore 19 + iload 20 + iload 20 get_varbit 4176 add iconst 6 @@ -517,34 +620,34 @@ LABEL461: iload 10 iload 11 iload 12 - iload 14 iload 19 - iload 17 - iload 13 - invoke 509 - istore 21 - istore 23 + iload 24 iload 22 - iload 21 + iload 18 + invoke 509 + istore 26 + istore 28 + iload 27 + iload 26 add - istore 22 - iload 15 + istore 27 + iload 20 get_varbit 4176 add - istore 15 -LABEL491: + istore 20 +LABEL582: get_varbit 4177 iconst 0 - if_icmpgt LABEL495 - jump LABEL525 -LABEL495: + if_icmpgt LABEL586 + jump LABEL616 +LABEL586: iconst 7 iload 3 - iload 23 + iload 28 invoke 510 - istore 14 - iload 15 - iload 15 + istore 19 + iload 20 + iload 20 get_varbit 4177 add iconst 7 @@ -553,34 +656,34 @@ LABEL495: iload 10 iload 11 iload 12 - iload 14 iload 19 - iload 17 - iload 13 - invoke 509 - istore 21 - istore 23 + iload 24 iload 22 - iload 21 + iload 18 + invoke 509 + istore 26 + istore 28 + iload 27 + iload 26 add - istore 22 - iload 15 + istore 27 + iload 20 get_varbit 4177 add - istore 15 -LABEL525: + istore 20 +LABEL616: get_varbit 4178 iconst 0 - if_icmpgt LABEL529 - jump LABEL559 -LABEL529: + if_icmpgt LABEL620 + jump LABEL650 +LABEL620: iconst 8 iload 3 - iload 23 + iload 28 invoke 510 - istore 14 - iload 15 - iload 15 + istore 19 + iload 20 + iload 20 get_varbit 4178 add iconst 8 @@ -589,34 +692,34 @@ LABEL529: iload 10 iload 11 iload 12 - iload 14 iload 19 - iload 17 - iload 13 - invoke 509 - istore 21 - istore 23 + iload 24 iload 22 - iload 21 + iload 18 + invoke 509 + istore 26 + istore 28 + iload 27 + iload 26 add - istore 22 - iload 15 + istore 27 + iload 20 get_varbit 4178 add - istore 15 -LABEL559: + istore 20 +LABEL650: get_varbit 4179 iconst 0 - if_icmpgt LABEL563 - jump LABEL593 -LABEL563: + if_icmpgt LABEL654 + jump LABEL684 +LABEL654: iconst 9 iload 3 - iload 23 + iload 28 invoke 510 - istore 14 - iload 15 - iload 15 + istore 19 + iload 20 + iload 20 get_varbit 4179 add iconst 9 @@ -625,36 +728,36 @@ LABEL563: iload 10 iload 11 iload 12 - iload 14 iload 19 - iload 17 - iload 13 - invoke 509 - istore 21 - istore 23 + iload 24 iload 22 - iload 21 + iload 18 + invoke 509 + istore 26 + istore 28 + iload 27 + iload 26 add - istore 22 - iload 15 + istore 27 + iload 20 get_varbit 4179 add - istore 15 -LABEL593: + istore 20 +LABEL684: invoke 514 iconst 1 - if_icmpeq LABEL597 - jump LABEL638 -LABEL597: + if_icmpeq LABEL688 + jump LABEL729 +LABEL688: get_varc_string 359 ; Skip truncating of varcstr 22 by not calling 280 lowercase ; instead get the var directly and lowercase it sstore 0 sload 0 string_length iconst 0 - if_icmpgt LABEL604 - jump LABEL623 -LABEL604: + if_icmpgt LABEL695 + jump LABEL714 +LABEL695: sconst "Showing items: " sconst "" sload 0 @@ -664,23 +767,23 @@ LABEL604: if_settext get_varc_int 5 iconst 11 - if_icmpeq LABEL615 - jump LABEL622 -LABEL615: + if_icmpeq LABEL706 + jump LABEL713 +LABEL706: sconst "Show items whose names contain the following text: (" - iload 22 + iload 27 tostring sconst " found)" join_string 3 - iload 21 ; load number of matches + iload 27 ; load number of matches sconst "setSearchBankInputTextFound" ; load event name runelite_callback ; invoke callback pop_int ; pop number of matches iconst 10616876 if_settext -LABEL622: - jump LABEL637 -LABEL623: +LABEL713: + jump LABEL728 +LABEL714: sconst "Showing items: " sconst "" sconst "*" @@ -690,23 +793,23 @@ LABEL623: if_settext get_varc_int 5 iconst 11 - if_icmpeq LABEL634 - jump LABEL637 -LABEL634: + if_icmpeq LABEL725 + jump LABEL728 +LABEL725: sconst "Show items whose names contain the following text:" sconst "setSearchBankInputText" ; load event name runelite_callback ; invoke callback iconst 10616876 if_settext -LABEL637: - jump LABEL641 -LABEL638: +LABEL728: + jump LABEL732 +LABEL729: sconst "The Bank of Gielinor" sconst "setBankTitle" ; runelite_callback ; iload 6 if_settext -LABEL641: +LABEL732: iload 0 iload 1 iload 2 @@ -720,74 +823,78 @@ LABEL641: iload 10 iload 11 iload 12 - iload 23 - iload 24 + iload 28 + iload 29 + iload 13 + iload 14 + iload 15 + iload 16 invoke 505 return -LABEL658: +LABEL753: invoke 514 iconst 1 - if_icmpeq LABEL662 - jump LABEL665 -LABEL662: + if_icmpeq LABEL757 + jump LABEL760 +LABEL757: iconst 1 iconst 1 invoke 299 -LABEL665: +LABEL760: iconst -1 - istore 27 + istore 32 iconst -1 - istore 28 + istore 33 get_varbit 4150 invoke 513 - istore 28 - istore 27 + istore 33 + istore 32 iconst 0 - istore 29 + istore 34 iconst 0 - istore 30 -LABEL677: - iload 15 + istore 35 +LABEL772: + iload 20 iconst 816 - if_icmplt LABEL681 - jump LABEL761 -LABEL681: + if_icmplt LABEL776 + jump LABEL856 +LABEL776: iload 3 - iload 15 + iload 20 cc_find iconst 1 - if_icmpeq LABEL687 - jump LABEL756 -LABEL687: + if_icmpeq LABEL782 + jump LABEL851 +LABEL782: iconst 95 - iload 15 - inv_getobj - istore 20 iload 20 + inv_getobj + istore 25 + iload 25 iconst -1 - if_icmpne LABEL695 - jump LABEL699 -LABEL695: - iload 24 + if_icmpne LABEL790 + jump LABEL794 +LABEL790: + iload 29 iconst 1 add - istore 24 -LABEL699: - iload 15 - iload 27 - if_icmpge LABEL703 - jump LABEL754 -LABEL703: - iload 15 - iload 28 - if_icmplt LABEL707 - jump LABEL754 -LABEL707: + istore 29 +LABEL794: + iload 20 + iload 32 + if_icmpge LABEL798 + jump LABEL849 +LABEL798: + iload 20 + iload 33 + if_icmplt LABEL802 + jump LABEL849 +LABEL802: iconst 0 cc_sethide - iload 20 + iload 25 iconst 95 - iload 15 + iload 20 inv_getnum iload 3 iload 4 @@ -795,59 +902,59 @@ LABEL707: iload 11 iload 12 invoke 278 - iload 30 + iload 35 iconst 36 multiply - istore 23 + istore 28 iconst 51 - iload 29 + iload 34 iconst 36 - iload 19 + iload 24 add multiply add - iload 23 + iload 28 iconst 0 iconst 0 cc_setposition - iload 23 + iload 28 iconst 32 add - istore 23 - iload 29 - iload 17 - if_icmplt LABEL742 - jump LABEL747 -LABEL742: - iload 29 + istore 28 + iload 34 + iload 22 + if_icmplt LABEL837 + jump LABEL842 +LABEL837: + iload 34 iconst 1 add - istore 29 - jump LABEL753 -LABEL747: + istore 34 + jump LABEL848 +LABEL842: iconst 0 - iload 30 + iload 35 iconst 1 add - istore 30 - istore 29 -LABEL753: - jump LABEL756 -LABEL754: + istore 35 + istore 34 +LABEL848: + jump LABEL851 +LABEL849: iconst 1 cc_sethide -LABEL756: - iload 15 +LABEL851: + iload 20 iconst 1 add - istore 15 - jump LABEL677 -LABEL761: + istore 20 + jump LABEL772 +LABEL856: get_varbit 4170 iconst 2 - if_icmpeq LABEL765 - jump LABEL775 -LABEL765: + if_icmpeq LABEL860 + jump LABEL870 +LABEL860: sconst "Tab " iconst 105 iconst 115 @@ -859,8 +966,8 @@ LABEL765: runelite_callback ; iload 6 if_settext - jump LABEL781 -LABEL775: + jump LABEL876 +LABEL870: sconst "Tab " get_varbit 4150 tostring @@ -869,7 +976,7 @@ LABEL775: runelite_callback ; iload 6 if_settext -LABEL781: +LABEL876: iload 0 iload 1 iload 2 @@ -883,7 +990,11 @@ LABEL781: iload 10 iload 11 iload 12 - iload 23 - iload 24 + iload 28 + iload 29 + iload 13 + iload 14 + iload 15 + iload 16 invoke 505 return diff --git a/runelite-client/src/main/scripts/TriggerBankLayout.hash b/runelite-client/src/main/scripts/TriggerBankLayout.hash index d4de8e0bbc..e4d5241bf6 100644 --- a/runelite-client/src/main/scripts/TriggerBankLayout.hash +++ b/runelite-client/src/main/scripts/TriggerBankLayout.hash @@ -1 +1 @@ -A5E68A8B5B344D82FAF2CC11FE88D43A150A60094C93E6C52DC5CDCB0BF576D0 \ No newline at end of file +DC2D875DFF91D7D0184670EC9CD4E5980C051D8D4BD0F591935FD603409A7369 \ No newline at end of file diff --git a/runelite-client/src/main/scripts/TriggerBankLayout.rs2asm b/runelite-client/src/main/scripts/TriggerBankLayout.rs2asm index a9fd094407..8fa0ed58a8 100644 --- a/runelite-client/src/main/scripts/TriggerBankLayout.rs2asm +++ b/runelite-client/src/main/scripts/TriggerBankLayout.rs2asm @@ -1,7 +1,7 @@ .id 276 -.int_stack_count 13 +.int_stack_count 17 .string_stack_count 0 -.int_var_count 13 +.int_var_count 17 .string_var_count 0 ; Check if we should allow server to relayout bank @@ -38,5 +38,9 @@ LABEL2: iload 10 iload 11 iload 12 + iload 13 + iload 14 + iload 15 + iload 16 invoke 277 return