Update names

scripts/[clientscript,add_overlaytimer_loc].cs2

@@ -18,7 +18,7 @@ switch_locshape ($locshape2) {
 		~debug_mes("Overlay Timers: No locfind overlay ID specified for loc_shape. Timer ID: <tostring($int3)>");
 		return;
 }
-$entityoverlay7 = _7204($coord0, $int8, 0, 1, 1, 0);
-if (_202($entityoverlay7) = ^true) {
+$entityoverlay7 = entityoverlay_create_coord($coord0, $int8, 0, 1, 1, 0);
+if (if_find_entityoverlay($entityoverlay7) = ^true) {
 	cc_setontimer("overlaytimer_loc_find($coord0, $loc1, $int3, clientclock, calc($int4 * 30), $colour5, $int6, $int8)");
 }

scripts/[clientscript,bugreport_textinput].cs2

@@ -1,10 +1,10 @@
 // 1905
-[clientscript,bugreport_textinput](int $int0)
+[clientscript,bugreport_textinput](component $component0)
 def_string $string0 = "";
 if (~on_mobile = true) {
-	if ($int0 = 10223631) {
+	if ($component0 = interface_156:15) {
 		$string0 = %varcstring372;
-	} else if ($int0 = 10223637) {
+	} else if ($component0 = interface_156:21) {
 		$string0 = %varcstring373;
 	}
 	~keyboard_show_string(0, 500, $string0);

scripts/[clientscript,script7237].cs2 → scripts/[clientscript,cabbage_lookup].cs2

@@ -1,5 +1,5 @@
 // 7237
-[clientscript,script7237]
+[clientscript,cabbage_lookup]
 def_int $int0 = 0;
 def_int $int1 = 0;
 $int0, $int1 = stockmarket_getvalue(cabbage_1965);

scripts/[clientscript,cannon_overlay_transmit].cs2

@@ -3,7 +3,7 @@
 if (%varbit14174 = $int1 & %varbit13672 = $int2 & %var3551 = $coord3) {
 	return;
 }
-if (_202($entityoverlay0) = ^true) {
+if (if_find_entityoverlay($entityoverlay0) = ^true) {
 	cc_setonvartransmit("cannon_overlay_transmit($entityoverlay0, %varbit14174, %varbit13672, %var3551, $coord4){var3417}");
 }
 ~cannon_overlay_create($entityoverlay0, $coord4);

scripts/[clientscript,cc_graphic_swapper_entityoverlay].cs2

@@ -0,0 +1,8 @@
+// 7121
+[clientscript,cc_graphic_swapper_entityoverlay](entityoverlay $entityoverlay0, int $comsubid1, graphic $graphic2, component $component3)
+if (cc_find_entityoverlay($entityoverlay0, $comsubid1) = ^true) {
+	cc_setgraphic($graphic2);
+}
+if ($component3 ! null) {
+	~deltooltip_action($component3);
+}

scripts/[clientscript,chatbox_open_input].cs2

@@ -4,5 +4,5 @@ if (~on_mobile = true) {
 	if (if_hassub(interface_162:559) = true | if_hassub(interface_162:558) = true | if_gethide(interface_162:37) = false) {
 		return;
 	}
-	_6522(%varcstring335, 80);
+	mobile_keyboardshowstring(%varcstring335, 80);
 }

scripts/[clientscript,chattimestamp].cs2

@@ -15,9 +15,9 @@ if ($int0 = 400) {
 }
 if ($int0 = 500) {
 	mes("Zooming Ui in 2x");
-	_6210(200);
+	uizoom_set(200);
 }
 if ($int0 = 501) {
 	mes("Resetting Ui Zoom");
-	_6212;
+	uizoom_reset;
 }

scripts/[clientscript,cluehelper_clear_highlights].cs2

@@ -1,6 +1,6 @@
 // 6493
 [clientscript,cluehelper_clear_highlights]
-_7039(9);
-_7014(9);
-_7009(9);
-_7004(9);
+highlight_tile_clear(9);
+highlight_loc_clear(9);
+highlight_npctype_clear(9);
+highlight_npc_clear(9);

scripts/[clientscript,cluehelper_key_npc_invtransmit].cs2

@@ -7,6 +7,6 @@ if ($int6 = 0 & inv_total(inv, $obj5) > 0) {
 	$int6 = 0;
 	~cluehelper_key_npc_draw($dbrow0, $dbrow1, $entityoverlay2, $int3, $npc_uid4, $obj5, $int6);
 }
-if (_202($entityoverlay2) = ^true) {
+if (if_find_entityoverlay($entityoverlay2) = ^true) {
 	cc_setoninvtransmit("cluehelper_key_npc_invtransmit($dbrow0, $dbrow1, $entityoverlay2, $int3, $npc_uid4, $obj5, $int6){inv}");
 }

scripts/[clientscript,cluehelper_key_npc_vartransmit].cs2

@@ -4,7 +4,7 @@ if (%varbit14189 = $int5 & %varbit14184 = $int6 & %var3546 = $dbrow0) {
 	return;
 }
 if (%var3546 ! $dbrow0) {
-	if (_202($entityoverlay2) = ^true) {
+	if (if_find_entityoverlay($entityoverlay2) = ^true) {
 		cc_setonvartransmit("loadnpc_cluehelper_generic_transmit($entityoverlay2, %var3546, $npc_uid4, $int3, %varbit14189){var3546, var3543}");
 	}
 	if (npc_finduid($npc_uid4) = true) {
@@ -13,6 +13,6 @@ if (%var3546 ! $dbrow0) {
 	return;
 }
 ~cluehelper_key_npc_draw($dbrow0, $dbrow1, $entityoverlay2, $int3, $npc_uid4, $obj7, $int8);
-if (_202($entityoverlay2) = ^true) {
+if (if_find_entityoverlay($entityoverlay2) = ^true) {
 	cc_setonvartransmit("cluehelper_key_npc_vartransmit($dbrow0, $dbrow1, $entityoverlay2, $int3, $npc_uid4, %varbit14189, %varbit14184, $obj7, $int8){var3546, var3543}");
 }

scripts/[clientscript,cluehelper_overlay_dig_transmit].cs2

@@ -1,10 +1,10 @@
 // 6504
 [clientscript,cluehelper_overlay_dig_transmit](dbrow $dbrow0, coord $coord1, obj $obj2, int $int3, npc_uid $npc_uid4, npc_uid $npc_uid5, npc_uid $npc_uid6, dbrow $dbrow7, int $int8, int $int9)
-if (_6951($coord1) = true) {
+if (tile_find($coord1) = true) {
 	if ($int3 = %varbit14189 & $dbrow0 = %var3546 & $npc_uid4 = %var3548 & $npc_uid5 = %var3549 & $npc_uid6 = %var3550 & $dbrow7 = %var3547 & %varbit14182 = $int8 & %varbit14184 = $int9) {
 		return;
 	} else if (%var3546 ! $dbrow0 | %varbit14182 = 0) {
-		_7214($coord1, 7);
+		entityoverlay_delete_coord($coord1, 7);
 		highlight_tile_off($coord1, 9, 1);
 	}
 	~cluehelper_overlay_dig_draw($dbrow0, $coord1, $obj2);

scripts/[clientscript,script6506].cs2 → scripts/[clientscript,cluehelper_overlay_loc_transmit].cs2

@@ -1,11 +1,11 @@
 // 6506
-[clientscript,script6506](entityoverlay $entityoverlay0, dbrow $dbrow1, loc $loc2, coord $coord3, obj $obj4, int $int5, npc_uid $npc_uid6, npc_uid $npc_uid7, npc_uid $npc_uid8, dbrow $dbrow9, int $int10, int $int11)
+[clientscript,cluehelper_overlay_loc_transmit](entityoverlay $entityoverlay0, dbrow $dbrow1, loc $loc2, coord $coord3, obj $obj4, int $int5, npc_uid $npc_uid6, npc_uid $npc_uid7, npc_uid $npc_uid8, dbrow $dbrow9, int $int10, int $int11)
 if (loc_find($coord3, $loc2) = true) {
 	if ($int5 = %varbit14189 & $dbrow1 = %var3546 & $npc_uid6 = %var3548 & $npc_uid7 = %var3549 & $npc_uid8 = %var3550 & $dbrow9 = %var3547 & %varbit14184 = $int10 & %varbit14182 = $int11) {
 		return;
 	} else if (%var3546 ! $dbrow1 | %varbit14182 = 0) {
-		_7211(5);
+		entityoverlay_delete_loc(5);
 		highlight_loc_off($loc2, $coord3, 9, 1);
 	}
-	~script6505($dbrow1, $loc2, $coord3, $obj4);
+	~cluehelper_overlay_loc_draw($dbrow1, $loc2, $coord3, $obj4);
 }

scripts/[clientscript,script6495].cs2 → scripts/[clientscript,cluehelper_overlay_mappost].cs2

@@ -1,5 +1,5 @@
 // 6495
-[clientscript,script6495]
+[clientscript,cluehelper_overlay_mappost]
 if (%varbit14182 = 0) {
 	return;
 }

scripts/[clientscript,fade_component].cs2

@@ -0,0 +1,3 @@
+// 7059
+[clientscript,fade_component](int $int0, int $int1, int $int2, component $component3)
+~fade_component($int0, $int1, $int2, $component3);

scripts/[clientscript,fade_component_update].cs2

@@ -0,0 +1,3 @@
+// 7061
+[clientscript,fade_component_update](int $int0, int $int1, int $int2, int $int3, component $component4)
+~fade_component_increment($int0, $int1, $int2, calc($int3 - clientclock), $component4);

scripts/[clientscript,fade_overlay].cs2

@@ -1,3 +1,3 @@
 // 948
 [clientscript,fade_overlay](int $int0, int $int1, int $int2, int $int3, int $int4)
-~script7058($int0, $int1, $int2, $int3, $int4, interface_174:1);
+~fade_overlay($int0, $int1, $int2, $int3, $int4, interface_174:1);

scripts/[clientscript,fade_overlay_specific].cs2

@@ -0,0 +1,3 @@
+// 7057
+[clientscript,fade_overlay_specific](int $int0, int $int1, int $int2, int $int3, int $int4, component $component5)
+~fade_overlay($int0, $int1, $int2, $int3, $int4, $component5);

scripts/[clientscript,fishing_spot_indicator_stattransmit].cs2

@@ -5,6 +5,6 @@ if ($lvl7 = $lvl2) {
 	return;
 }
 ~fishing_spot_indicator_create($entityoverlay0, $struct1, $npc_uid3, $int4, $loc5, $coord6);
-if (_202($entityoverlay0) = ^true) {
+if (if_find_entityoverlay($entityoverlay0) = ^true) {
 	cc_setonstattransmit("fishing_spot_indicator_stattransmit($entityoverlay0, $struct1, $lvl7, $npc_uid3, $int4, $loc5, $coord6){fishing, agility, strength}");
 }

scripts/[clientscript,fishing_spot_indicator_vartransmit].cs2

@@ -4,6 +4,6 @@ if ($int2 = %varbit12349 & $int3 = %varbit12350 & $int4 = %varbit12351) {
 	return;
 }
 ~fishing_spot_indicator_create($entityoverlay0, $struct1, $npc_uid5, $int6, $loc7, $coord8);
-if (_202($entityoverlay0) = ^true) {
+if (if_find_entityoverlay($entityoverlay0) = ^true) {
 	cc_setonvartransmit("fishing_spot_indicator_vartransmit($entityoverlay0, $struct1, %varbit12349, %varbit12350, %varbit12351, $npc_uid5, $int6, $loc7, $coord8){var2856, var3074}");
 }

scripts/[clientscript,ground_items_confirm].cs2

@@ -0,0 +1,3 @@
+// 7214
+[clientscript,ground_items_confirm]
+return;

scripts/[clientscript,script7234].cs2 → scripts/[clientscript,ground_items_filter].cs2

@@ -1,12 +1,12 @@
 // 7234
-[clientscript,script7234](obj $obj0)
-if (~script7225(stringvector_3, $obj0, 0) = 1) {
+[clientscript,ground_items_filter](obj $obj0)
+if (~script7225(stringvector_3, $obj0, false) = 1) {
 	~script7224(stringvector_3, $obj0, 1);
 } else {
-	if (~script7225(stringvector_4, $obj0, 0) = 1) {
+	if (~script7225(stringvector_4, $obj0, false) = 1) {
 		~script7224(stringvector_4, $obj0, 0);
 	}
-	if (~script7225(stringvector_4, $obj0, 1) = 1) {
+	if (~script7225(stringvector_4, $obj0, true) = 1) {
 		mes_typed(^chattype_spam, "<removetags(oc_name($obj0))> is being ignored via a wildcard entry.");
 	}
 	~script7223(stringvector_3, $obj0, 1);

scripts/[clientscript,ground_items_focus_changed].cs2

@@ -0,0 +1,10 @@
+// 7215
+[clientscript,ground_items_focus_changed](component $component0, int $comsubid1, stringvector $stringvector2)
+if ($comsubid1 ! -1) {
+	if (cc_find($component0, $comsubid1) = ^true & cc_input_getfocus = true) {
+		return;
+	}
+} else if (if_input_getfocus($component0) = true) {
+	return;
+}
+~script7216($component0, $comsubid1, $stringvector2);

scripts/[clientscript,script7233].cs2 → scripts/[clientscript,ground_items_highlight].cs2

@@ -1,12 +1,12 @@
 // 7233
-[clientscript,script7233](obj $obj0)
-if (~script7225(stringvector_4, $obj0, 0) = 1) {
+[clientscript,ground_items_highlight](obj $obj0)
+if (~script7225(stringvector_4, $obj0, false) = 1) {
 	~script7224(stringvector_4, $obj0, 1);
 } else {
-	if (~script7225(stringvector_3, $obj0, 0) = 1) {
+	if (~script7225(stringvector_3, $obj0, false) = 1) {
 		~script7224(stringvector_3, $obj0, 0);
 	}
-	if (~script7225(stringvector_3, $obj0, 1) = 1) {
+	if (~script7225(stringvector_3, $obj0, true) = 1) {
 		mes_typed(^chattype_spam, "<removetags(oc_name($obj0))> is being highlighted via a wildcard entry.");
 	}
 	~script7223(stringvector_4, $obj0, 1);

scripts/[clientscript,ground_items_init].cs2

@@ -0,0 +1,3 @@
+// 7205
+[clientscript,ground_items_init]
+~ground_items_build;

scripts/[clientscript,ground_items_key].cs2

@@ -0,0 +1,5 @@
+// 7230
+[clientscript,ground_items_key](int $key0, coord $coord1)
+if ($key0 = %varbit14877) {
+	~ground_items_setup($coord1);
+}

scripts/[clientscript,ground_items_toggle_op].cs2

@@ -0,0 +1,4 @@
+// 7207
+[clientscript,ground_items_toggle_op](component $component0, int $comsubid1)
+%varbit14869 = calc(1 - %varbit14869);
+~ground_items_toggle_synch($component0, $comsubid1);

scripts/[clientscript,ground_items_toggle_transmit].cs2

@@ -0,0 +1,3 @@
+// 7208
+[clientscript,ground_items_toggle_transmit](component $component0, int $comsubid1)
+~ground_items_toggle_synch($component0, $comsubid1);

scripts/[clientscript,ground_items_transmit].cs2

@@ -0,0 +1,3 @@
+// 7229
+[clientscript,ground_items_transmit](coord $coord0)
+~ground_items_setup($coord0);

scripts/[clientscript,helper_agility_stattransmit].cs2

@@ -7,6 +7,6 @@ if ($lvl1 = $lvl6 & $lvl2 = $lvl7 & $lvl3 = $lvl8) {
 	return;
 }
 ~script5724($entityoverlay0, $loc4, $coord5);
-if (_202($entityoverlay0) = ^true) {
+if (if_find_entityoverlay($entityoverlay0) = ^true) {
 	cc_setonstattransmit("helper_agility_stattransmit($entityoverlay0, $lvl6, $lvl7, $lvl8, $loc4, $coord5){ranged, agility, strength}");
 }

scripts/[clientscript,helper_agility_vartransmit].cs2

@@ -4,6 +4,6 @@ if ($int1 = %varbit13135 & $int2 = %varbit13136) {
 	return;
 }
 ~script5724($entityoverlay0, $loc3, $coord4);
-if (_202($entityoverlay0) = ^true) {
+if (if_find_entityoverlay($entityoverlay0) = ^true) {
 	~helper_agility_vartransmit($entityoverlay0, $loc3, $coord4);
 }

scripts/[clientscript,loadnpc_cluehelper_generic_transmit].cs2

@@ -3,7 +3,7 @@
 if (%varbit14189 = $int4 & $dbrow1 = %var3546) {
 	return;
 }
-if (_202($entityoverlay0) = ^true) {
+if (if_find_entityoverlay($entityoverlay0) = ^true) {
 	cc_setonvartransmit("loadnpc_cluehelper_generic_transmit($entityoverlay0, %var3546, $npc_uid2, $int3, %varbit14189){var3546, var3543}");
 }
 if (npc_finduid($npc_uid2) = true) {

scripts/[clientscript,loadnpc_cluehelper_uri_transmit].cs2

@@ -3,11 +3,11 @@
 if (%varbit14189 = $int3 & %var3548 = $npc_uid4 & %var3547 = $dbrow5 & %var3546 = $dbrow6) {
 	return;
 }
-if (_202($entityoverlay0) = ^true) {
+if (if_find_entityoverlay($entityoverlay0) = ^true) {
 	cc_setonvartransmit("loadnpc_cluehelper_uri_transmit($entityoverlay0, $npc_uid1, $int2, %varbit14189, %var3548, %var3547, %var3546){var3543, var3546, var3548, var3547}");
 }
 highlight_npc_off($npc_uid1, $int2, 9);
-_104($entityoverlay0);
+cc_deleteall_entityoverlay($entityoverlay0);
 if (npc_finduid($npc_uid1) = true) {
 	~loadnpc_cluehelper_uri_overlay($entityoverlay0, $npc_uid1, $int2);
 }

scripts/[clientscript,logout_timer_notifier].cs2

@@ -3,7 +3,7 @@
 if (calc(clientclock % 50) ! 0) {
 	return;
 }
-def_int $int0 = _3328;
+def_int $int0 = idletimer_get;
 if ($int0 < 30000) {
 	if (%varcint552 = 1) {
 		return;

scripts/[clientscript,script7128].cs2 → scripts/[clientscript,loottools_init].cs2

@@ -1,9 +1,9 @@
 // 7128
-[clientscript,script7128]
+[clientscript,loottools_init]
 ~script7166;
 ~script7133;
-~script7132;
-if_setonresize("script7131", interface_650:0);
+~loottools_size;
+if_setonresize("loottools_size", interface_650:0);
 ~questlist_settings_button_init(interface_650:17);
 def_component $component0 = interface_650:57;
 def_component $component1 = interface_650:58;

scripts/[clientscript,loottools_size].cs2

@@ -0,0 +1,3 @@
+// 7131
+[clientscript,loottools_size]
+~loottools_size;

scripts/[clientscript,loottracker_clear_data].cs2

@@ -0,0 +1,5 @@
+// 7189
+[clientscript,loottracker_clear_data]
+loottracker_clear_data;
+~script7166;
+~script7133;

scripts/[clientscript,script7079].cs2 → scripts/[clientscript,makeover_hover_colour].cs2

@@ -1,5 +1,5 @@
 // 7079
-[clientscript,script7079](component $component0, int $comsubid1, boolean $boolean2)
+[clientscript,makeover_hover_colour](component $component0, int $comsubid1, boolean $boolean2)
 if (cc_find($component0, $comsubid1) = ^true & cc_find($component0, calc($comsubid1 + 1)) = ^true) {
 	if ($boolean2 = true) {
 		cc_setcolour(^white);

scripts/[clientscript,script7078].cs2 → scripts/[clientscript,makeover_hover_item].cs2

@@ -1,5 +1,5 @@
 // 7078
-[clientscript,script7078](component $component0, int $comsubid1, boolean $boolean2)
+[clientscript,makeover_hover_item](component $component0, int $comsubid1, boolean $boolean2)
 if (cc_find($component0, $comsubid1) = ^true & cc_find($component0, calc($comsubid1 + 1)) = ^true) {
 	if ($boolean2 = true) {
 		cc_setcolour(^white);

scripts/[clientscript,makeover_info_mouseleave].cs2

@@ -0,0 +1,5 @@
+// 7089
+[clientscript,makeover_info_mouseleave](component $component0, int $comsubid1, int $colour2)
+if (cc_find($component0, $comsubid1) = ^true) {
+	cc_setcolour($colour2);
+}

scripts/[clientscript,script7088].cs2 → scripts/[clientscript,makeover_info_mouseover].cs2

@@ -1,5 +1,5 @@
 // 7088
-[clientscript,script7088](component $component0, int $comsubid1)
+[clientscript,makeover_info_mouseover](component $component0, int $comsubid1)
 if (cc_find($component0, $comsubid1) = ^true) {
 	cc_setcolour(^white);
 }

scripts/[clientscript,makeover_init].cs2

@@ -0,0 +1,16 @@
+// 6776
+[clientscript,makeover_init](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6, component $component7, component $component8, component $component9, component $component10)
+def_component $component11 = interface_516:1;
+def_component $component12 = interface_516:0;
+if ($component12 ! null) {
+	~makeover_size_check($component11, $component12, ^min_32bit_int, ^min_32bit_int, $component6, $component2);
+}
+~steelborder($component0, "Makeover", 0);
+~makeover_draw_content($component1, $component2, $component3, $component4, $component5, $component6, $component10);
+~makeover_draw_colours($component4);
+%varcint1148 = %var3788;
+%varcint1150 = 0;
+%varcint1151 = 0;
+%varcint1153 = 0;
+if_setonvartransmit("script7069($component1, $component2, $component3, $component4, $component5, $component6, $component10){var3787, var3789, var3788}", $component1);
+~script7083($component7, $component8, $component9, -1);

scripts/[clientscript,script7081].cs2 → scripts/[clientscript,makeover_op_colour].cs2

@@ -1,5 +1,5 @@
 // 7081
-[clientscript,script7081](component $component0, int $comsubid1)
+[clientscript,makeover_op_colour](component $component0, int $comsubid1)
 if (cc_find($component0, $comsubid1) = ^true) {
 	cc_settrans(125);
 	cc_setontimer("cc_settrans_temporarily_end($component0, $comsubid1, 0, calc(clientclock + 10))");

scripts/[clientscript,script7080].cs2 → scripts/[clientscript,makeover_op_item].cs2

@@ -1,5 +1,5 @@
 // 7080
-[clientscript,script7080](component $component0, int $comsubid1)
+[clientscript,makeover_op_item](component $component0, int $comsubid1)
 if (cc_find($component0, $comsubid1) = ^true) {
 	cc_settrans(125);
 	cc_setontimer("cc_settrans_temporarily_end($component0, $comsubid1, 0, calc(clientclock + 10))");

scripts/[clientscript,makeover_size_check].cs2

@@ -0,0 +1,3 @@
+// 7090
+[clientscript,makeover_size_check](component $component0, component $component1, int $width2, int $height3, component $component4, component $component5)
+~makeover_size_check($component0, $component1, $width2, $height3, $component4, $component5);

scripts/[clientscript,script7075].cs2 → scripts/[clientscript,makeover_spin].cs2

@@ -1,5 +1,5 @@
 // 7075
-[clientscript,script7075](component $component0, int $comsubid1)
+[clientscript,makeover_spin](component $component0, int $comsubid1)
 def_int $int2 = 0;
 if (cc_find($component0, $comsubid1) = ^true) {
 	if (%varcint1151 = 0) {

scripts/[clientscript,membership_benefits_prompt_banner].cs2

@@ -13,7 +13,7 @@ cc_setsize(0, 0, ^setsize_minus, ^setsize_minus);
 cc_setposition(0, 0, ^setpos_abs_centre, ^setpos_abs_centre);
 def_int $int11 = ~script7032($int0);
 def_string $string1 = ~script6066($int11);
-cc_setcrm_url($string1);
-cc_setcrm_textfont(0, b12_full);
-cc_setcrm_textfont(1, p11_full);
-cc_setoncrmviewload("script7033($component1, $graphic2, $component3, $graphic4, $graphic5, $x6, $y7, $width8, $height9, $string0)");
+cc_crmview_seturl($string1);
+cc_crmview_settextfont(0, b12_full);
+cc_crmview_settextfont(1, p11_full);
+cc_crmview_setonupdated("script7033($component1, $graphic2, $component3, $graphic4, $graphic5, $x6, $y7, $width8, $height9, $string0)");