From fd42d60aad404420dbd84a9649ee109234d8c81d Mon Sep 17 00:00:00 2001
From: Joshua Filby <joshua@filby.me>
Date: Sat, 12 Mar 2022 08:10:23 -0600
Subject: [PATCH] Update names

---
 README.md                                     |  68 ++++----
 scripts/[clientscript,buff_bar_2_init].cs2    |   3 +
 ...[clientscript,buff_bar_display_timer].cs2} |   2 +-
 .../[clientscript,buff_bar_layout_redraw].cs2 |   3 +
 ....cs2 => [clientscript,buff_bar_start].cs2} |   6 +-
 ...clientscript,buff_bar_transmit_value].cs2} |   8 +-
 .../[clientscript,build_makeover_feet].cs2    |   2 +-
 ...2 => [clientscript,ge_offers_pulsate].cs2} |   2 +-
 ...2 => [clientscript,ge_offers_setdesc].cs2} |   2 +-
 ... [clientscript,gim_settings_editable].cs2} |   2 +-
 ...ntscript,gim_settings_editable_hover].cs2} |   2 +-
 ...clientscript,gim_settings_editable_op].cs2 |  12 ++
 ...ntscript,gim_settings_editable_reset].cs2} |   2 +-
 scripts/[clientscript,script3166].cs2         |   2 +-
 scripts/[clientscript,script5514].cs2         |  12 --
 scripts/[clientscript,script5879].cs2         |   3 -
 scripts/[clientscript,script5929].cs2         |   3 -
 scripts/[clientscript,script5937].cs2         |   3 -
 ...ientscript,speedrunning_helper_update].cs2 |   3 +
 ...ript,speedrunning_helper_update_time].cs2} |   2 +-
 ...,stat_boosts_hud_mobile_timertooltip].cs2} |   4 +-
 ...boosts_hud_mobile_timertooltip_timer].cs2} |   2 +-
 ...pt5930].cs2 => [proc,buff_bar_2_init].cs2} |  10 +-
 ...2 => [proc,buff_bar_dynamic_graphic2].cs2} |   2 +-
 ...s2 => [proc,buff_bar_dynamic_graphic].cs2} |   2 +-
 ...8].cs2 => [proc,buff_bar_dynamic_obj].cs2} |   2 +-
 ...s2 => [proc,buff_bar_dynamic_tooltip].cs2} |   2 +-
 ...923].cs2 => [proc,buff_bar_get_value].cs2} |   2 +-
 ....cs2 => [proc,buff_bar_layout_redraw].cs2} |   2 +-
 ...ipt5932].cs2 => [proc,buff_bar_start].cs2} |   4 +-
 scripts/[proc,ge_offer_side_draw].cs2         |   2 +-
 scripts/[proc,ge_offers_setup_draw].cs2       |   2 +-
 .../[proc,questlist_showprogress_grey].cs2    |   2 +-
 ...].cs2 => [proc,rebuild_makeover_feet].cs2} |   2 +-
 scripts/[proc,script5512].cs2                 |   6 +-
 scripts/[proc,script5519].cs2                 |   2 +-
 scripts/[proc,script5890].cs2                 |  12 --
 scripts/[proc,script5909].cs2                 |   2 +-
 scripts/[proc,script5924].cs2                 | 148 +++++++++---------
 scripts/[proc,script5936].cs2                 |   2 +-
 scripts/[proc,script5947].cs2                 |   8 +-
 scripts/[proc,settings_buff_ammo].cs2         |   2 +-
 ...[proc,settings_buff_antifire_duration].cs2 |   2 +-
 ...roc,settings_buff_antipoison_duration].cs2 |   2 +-
 ...2 => [proc,settings_buff_cannon_ammo].cs2} |   4 +-
 scripts/[proc,settings_buff_charge_spell].cs2 |   2 +-
 scripts/[proc,settings_buff_corruption].cs2   |   2 +-
 scripts/[proc,settings_buff_death_charge].cs2 |   2 +-
 ...,settings_buff_divine_potion_duration].cs2 |   2 +-
 ...tings_buff_dragonfire_shield_cooldown].cs2 |   2 +-
 .../[proc,settings_buff_freeze_duration].cs2  |   2 +-
 .../[proc,settings_buff_godwars_altar].cs2    |   2 +-
 .../[proc,settings_buff_home_teleport].cs2    |   2 +-
 ...c,settings_buff_imbued_heart_cooldown].cs2 |   2 +-
 scripts/[proc,settings_buff_leagues].cs2      |   2 +-
 ...oc,settings_buff_magic_imbue_duration].cs2 |   2 +-
 .../[proc,settings_buff_mark_of_darkness].cs2 |   2 +-
 ...[proc,settings_buff_minigame_teleport].cs2 |   2 +-
 ...[proc,settings_buff_overload_duration].cs2 |   2 +-
 .../[proc,settings_buff_poison_damage].cs2    |   2 +-
 ...settings_buff_prayer_enhance_duration].cs2 |   2 +-
 scripts/[proc,settings_buff_resurrection].cs2 |   2 +-
 scripts/[proc,settings_buff_shadow_veil].cs2  |   2 +-
 ...proc,settings_buff_sire_stun_duration].cs2 |   2 +-
 .../[proc,settings_buff_sotd_duration].cs2    |   2 +-
 .../[proc,settings_buff_stamina_duration].cs2 |   2 +-
 scripts/[proc,settings_buff_teleblock].cs2    |   2 +-
 .../[proc,settings_buff_vengeance_active].cs2 |   2 +-
 ...proc,settings_buff_vengeance_cooldown].cs2 |   2 +-
 .../[proc,settings_buff_ward_of_arceuus].cs2  |   2 +-
 scripts/[proc,settings_clicked_toggle].cs2    |   2 +-
 ...s2 => [proc,speedrunning_helper_draw].cs2} |   4 +-
 ...proc,speedrunning_helper_update_time].cs2} |   4 +-
 ...2 => [proc,speedrunning_misc_unlocks].cs2} |   2 +-
 ... => [proc,speedrunning_points_update].cs2} |   2 +-
 ... => [proc,speedrunning_quest_enabled].cs2} |   2 +-
 scripts/[proc,speedrunning_stats_update].cs2  |   4 +-
 ...=> [proc,speedrunning_total_trophies].cs2} |   2 +-
 .../[proc,speedrunning_trophies_update].cs2   |  12 ++
 ...2 => [proc,speedrunning_trophy_check].cs2} |   2 +-
 ... => [proc,speedrunning_trophy_update].cs2} |   2 +-
 .../[proc,stat_boosts_hud_timer_tooltip].cs2  |   2 +-
 82 files changed, 231 insertions(+), 231 deletions(-)
 create mode 100644 scripts/[clientscript,buff_bar_2_init].cs2
 rename scripts/{[clientscript,script5939].cs2 => [clientscript,buff_bar_display_timer].cs2} (94%)
 create mode 100644 scripts/[clientscript,buff_bar_layout_redraw].cs2
 rename scripts/{[clientscript,script5931].cs2 => [clientscript,buff_bar_start].cs2} (63%)
 rename scripts/{[clientscript,script5933].cs2 => [clientscript,buff_bar_transmit_value].cs2} (79%)
 rename scripts/{[clientscript,script811].cs2 => [clientscript,ge_offers_pulsate].cs2} (75%)
 rename scripts/{[clientscript,script5730].cs2 => [clientscript,ge_offers_setdesc].cs2} (92%)
 rename scripts/{[clientscript,script5509].cs2 => [clientscript,gim_settings_editable].cs2} (96%)
 rename scripts/{[clientscript,script5513].cs2 => [clientscript,gim_settings_editable_hover].cs2} (73%)
 create mode 100644 scripts/[clientscript,gim_settings_editable_op].cs2
 rename scripts/{[clientscript,script5515].cs2 => [clientscript,gim_settings_editable_reset].cs2} (70%)
 delete mode 100644 scripts/[clientscript,script5514].cs2
 delete mode 100644 scripts/[clientscript,script5879].cs2
 delete mode 100644 scripts/[clientscript,script5929].cs2
 delete mode 100644 scripts/[clientscript,script5937].cs2
 create mode 100644 scripts/[clientscript,speedrunning_helper_update].cs2
 rename scripts/{[clientscript,script5882].cs2 => [clientscript,speedrunning_helper_update_time].cs2} (54%)
 rename scripts/{[clientscript,script5553].cs2 => [clientscript,stat_boosts_hud_mobile_timertooltip].cs2} (55%)
 rename scripts/{[clientscript,script5554].cs2 => [clientscript,stat_boosts_hud_mobile_timertooltip_timer].cs2} (69%)
 rename scripts/{[proc,script5930].cs2 => [proc,buff_bar_2_init].cs2} (78%)
 rename scripts/{[proc,script5848].cs2 => [proc,buff_bar_dynamic_graphic2].cs2} (88%)
 rename scripts/{[proc,script5847].cs2 => [proc,buff_bar_dynamic_graphic].cs2} (88%)
 rename scripts/{[proc,script5928].cs2 => [proc,buff_bar_dynamic_obj].cs2} (78%)
 rename scripts/{[proc,script5846].cs2 => [proc,buff_bar_dynamic_tooltip].cs2} (88%)
 rename scripts/{[proc,script5923].cs2 => [proc,buff_bar_get_value].cs2} (99%)
 rename scripts/{[proc,script5938].cs2 => [proc,buff_bar_layout_redraw].cs2} (97%)
 rename scripts/{[proc,script5932].cs2 => [proc,buff_bar_start].cs2} (73%)
 rename scripts/{[proc,script3165].cs2 => [proc,rebuild_makeover_feet].cs2} (93%)
 delete mode 100644 scripts/[proc,script5890].cs2
 rename scripts/{[proc,script5922].cs2 => [proc,settings_buff_cannon_ammo].cs2} (59%)
 rename scripts/{[proc,script5880].cs2 => [proc,speedrunning_helper_draw].cs2} (93%)
 rename scripts/{[proc,script5881].cs2 => [proc,speedrunning_helper_update_time].cs2} (65%)
 rename scripts/{[proc,script5868].cs2 => [proc,speedrunning_misc_unlocks].cs2} (58%)
 rename scripts/{[proc,script5889].cs2 => [proc,speedrunning_points_update].cs2} (72%)
 rename scripts/{[proc,script5894].cs2 => [proc,speedrunning_quest_enabled].cs2} (76%)
 rename scripts/{[proc,script5893].cs2 => [proc,speedrunning_total_trophies].cs2} (83%)
 create mode 100644 scripts/[proc,speedrunning_trophies_update].cs2
 rename scripts/{[proc,script5892].cs2 => [proc,speedrunning_trophy_check].cs2} (58%)
 rename scripts/{[proc,script5891].cs2 => [proc,speedrunning_trophy_update].cs2} (87%)

diff --git a/README.md b/README.md
index 49eef27a3..98f3039b6 100644
--- a/README.md
+++ b/README.md
@@ -811,7 +811,7 @@
 [**808**](scripts/[clientscript,ge_offers_priceicon].cs2) `[clientscript,ge_offers_priceicon]`  
 [**809**](scripts/[proc,ge_offers_priceicon].cs2) `[proc,ge_offers_priceicon]`  
 [**810**](scripts/[proc,ge_textbox].cs2) `[proc,ge_textbox]`  
-[**811**](scripts/[clientscript,script811].cs2)  
+[**811**](scripts/[clientscript,ge_offers_pulsate].cs2) `[clientscript,ge_offers_pulsate]`  
 [**812**](scripts/[proc,script812].cs2)  
 [**813**](scripts/[proc,ge_offers_checkavailable].cs2) `[proc,ge_offers_checkavailable]`  
 [**814**](scripts/[clientscript,confirmdestroy_init].cs2) `[clientscript,confirmdestroy_init]`  
@@ -3165,7 +3165,7 @@
 [**3162**](scripts/[clientscript,league_icon_flash].cs2) `[clientscript,league_icon_flash]`  
 [**3163**](scripts/[clientscript,league_flash_timer].cs2) `[clientscript,league_flash_timer]`  
 [**3164**](scripts/[proc,league_flashicon].cs2) `[proc,league_flashicon]`  
-[**3165**](scripts/[proc,script3165].cs2)  
+[**3165**](scripts/[proc,rebuild_makeover_feet].cs2) `[proc,rebuild_makeover_feet]`  
 [**3166**](scripts/[clientscript,script3166].cs2)  
 [**3167**](scripts/[clientscript,script3167].cs2)  
 [**3168**](scripts/[proc,script3168].cs2)  
@@ -5505,13 +5505,13 @@
 [**5506**](scripts/[proc,gim_icon_draw].cs2) `[proc,gim_icon_draw]`  
 [**5507**](scripts/[proc,script5507].cs2)  
 [**5508**](scripts/[clientscript,gim_settings_static].cs2) `[clientscript,gim_settings_static]`  
-[**5509**](scripts/[clientscript,script5509].cs2)  
+[**5509**](scripts/[clientscript,gim_settings_editable].cs2) `[clientscript,gim_settings_editable]`  
 [**5510**](scripts/[proc,gim_settings_setsize].cs2) `[proc,gim_settings_setsize]`  
 [**5511**](scripts/[clientscript,gim_settings_checksize].cs2) `[clientscript,gim_settings_checksize]`  
 [**5512**](scripts/[proc,script5512].cs2)  
-[**5513**](scripts/[clientscript,script5513].cs2)  
-[**5514**](scripts/[clientscript,script5514].cs2)  
-[**5515**](scripts/[clientscript,script5515].cs2)  
+[**5513**](scripts/[clientscript,gim_settings_editable_hover].cs2) `[clientscript,gim_settings_editable_hover]`  
+[**5514**](scripts/[clientscript,gim_settings_editable_op].cs2) `[clientscript,gim_settings_editable_op]`  
+[**5515**](scripts/[clientscript,gim_settings_editable_reset].cs2) `[clientscript,gim_settings_editable_reset]`  
 [**5516**](scripts/[proc,gim_sidepanel_drawchannel].cs2) `[proc,gim_sidepanel_drawchannel]`  
 [**5517**](scripts/[proc,chat_send].cs2) `[proc,chat_send]`  
 [**5518**](scripts/[proc,script5518].cs2)  
@@ -5548,8 +5548,8 @@
 [**5550**](scripts/[clientscript,stat_boosts_hud_mobile_tooltip].cs2) `[clientscript,stat_boosts_hud_mobile_tooltip]`  
 [**5551**](scripts/[clientscript,stat_boosts_hud_mobile_tooltip_remove].cs2) `[clientscript,stat_boosts_hud_mobile_tooltip_remove]`  
 [**5552**](scripts/[proc,stat_boosts_hud_timer_tooltip].cs2) `[proc,stat_boosts_hud_timer_tooltip]`  
-[**5553**](scripts/[clientscript,script5553].cs2)  
-[**5554**](scripts/[clientscript,script5554].cs2)  
+[**5553**](scripts/[clientscript,stat_boosts_hud_mobile_timertooltip].cs2) `[clientscript,stat_boosts_hud_mobile_timertooltip]`  
+[**5554**](scripts/[clientscript,stat_boosts_hud_mobile_timertooltip_timer].cs2) `[clientscript,stat_boosts_hud_mobile_timertooltip_timer]`  
 [**5555**](scripts/[proc,script5555].cs2)  
 [**5556**](scripts/[proc,script5556].cs2)  
 [**5557**](scripts/[clientscript,helper_agility_highlight_setup].cs2) `[clientscript,helper_agility_highlight_setup]`  
@@ -5725,7 +5725,7 @@
 [**5727**](scripts/[clientscript,helper_agility_mouseover].cs2) `[clientscript,helper_agility_mouseover]`  
 [**5728**](scripts/[proc,script5728].cs2)  
 [**5729**](scripts/[proc,helper_agility_requirements].cs2) `[proc,helper_agility_requirements]`  
-[**5730**](scripts/[clientscript,script5730].cs2)  
+[**5730**](scripts/[clientscript,ge_offers_setdesc].cs2) `[clientscript,ge_offers_setdesc]`  
 [**5731**](scripts/[proc,script5731].cs2)  
 [**5732**](scripts/[proc,script5732].cs2)  
 [**5733**](scripts/[proc,script5733].cs2)  
@@ -5839,9 +5839,9 @@
 [**5843**](scripts/[clientscript,if_fade].cs2) `[clientscript,if_fade]`  
 [**5844**](scripts/[clientscript,if_fade_timer].cs2) `[clientscript,if_fade_timer]`  
 [**5845**](scripts/[proc,script5845].cs2)  
-[**5846**](scripts/[proc,script5846].cs2)  
-[**5847**](scripts/[proc,script5847].cs2)  
-[**5848**](scripts/[proc,script5848].cs2)  
+[**5846**](scripts/[proc,buff_bar_dynamic_tooltip].cs2) `[proc,buff_bar_dynamic_tooltip]`  
+[**5847**](scripts/[proc,buff_bar_dynamic_graphic].cs2) `[proc,buff_bar_dynamic_graphic]`  
+[**5848**](scripts/[proc,buff_bar_dynamic_graphic2].cs2) `[proc,buff_bar_dynamic_graphic2]`  
 [**5849**](scripts/[proc,speedrunning_world].cs2) `[proc,speedrunning_world]`  
 [**5850**](scripts/[clientscript,script5850].cs2)  
 [**5851**](scripts/[proc,script5851].cs2)  
@@ -5861,7 +5861,7 @@
 [**5865**](scripts/[proc,script5865].cs2)  
 [**5866**](scripts/[clientscript,script5866].cs2)  
 [**5867**](scripts/[clientscript,script5867].cs2)  
-[**5868**](scripts/[proc,script5868].cs2)  
+[**5868**](scripts/[proc,speedrunning_misc_unlocks].cs2) `[proc,speedrunning_misc_unlocks]`  
 [**5869**](scripts/[proc,script5869].cs2)  
 [**5870**](scripts/[clientscript,script5870].cs2)  
 [**5871**](scripts/[clientscript,script5871].cs2)  
@@ -5872,22 +5872,22 @@
 [**5876**](scripts/[proc,script5876].cs2)  
 [**5877**](scripts/[proc,script5877].cs2)  
 [**5878**](scripts/[proc,script5878].cs2)  
-[**5879**](scripts/[clientscript,script5879].cs2)  
-[**5880**](scripts/[proc,script5880].cs2)  
-[**5881**](scripts/[proc,script5881].cs2)  
-[**5882**](scripts/[clientscript,script5882].cs2)  
+[**5879**](scripts/[clientscript,speedrunning_helper_update].cs2) `[clientscript,speedrunning_helper_update]`  
+[**5880**](scripts/[proc,speedrunning_helper_draw].cs2) `[proc,speedrunning_helper_draw]`  
+[**5881**](scripts/[proc,speedrunning_helper_update_time].cs2) `[proc,speedrunning_helper_update_time]`  
+[**5882**](scripts/[clientscript,speedrunning_helper_update_time].cs2) `[clientscript,speedrunning_helper_update_time]`  
 [**5883**](scripts/[proc,script5883].cs2)  
 [**5884**](scripts/[proc,script5884].cs2)  
 [**5885**](scripts/[proc,script5885].cs2)  
 [**5886**](scripts/[clientscript,speedrunning_init].cs2) `[clientscript,speedrunning_init]`  
 [**5887**](scripts/[clientscript,speedrunning_stats_update].cs2) `[clientscript,speedrunning_stats_update]`  
 [**5888**](scripts/[proc,speedrunning_stats_update].cs2) `[proc,speedrunning_stats_update]`  
-[**5889**](scripts/[proc,script5889].cs2)  
-[**5890**](scripts/[proc,script5890].cs2)  
-[**5891**](scripts/[proc,script5891].cs2)  
-[**5892**](scripts/[proc,script5892].cs2)  
-[**5893**](scripts/[proc,script5893].cs2)  
-[**5894**](scripts/[proc,script5894].cs2)  
+[**5889**](scripts/[proc,speedrunning_points_update].cs2) `[proc,speedrunning_points_update]`  
+[**5890**](scripts/[proc,speedrunning_trophies_update].cs2) `[proc,speedrunning_trophies_update]`  
+[**5891**](scripts/[proc,speedrunning_trophy_update].cs2) `[proc,speedrunning_trophy_update]`  
+[**5892**](scripts/[proc,speedrunning_trophy_check].cs2) `[proc,speedrunning_trophy_check]`  
+[**5893**](scripts/[proc,speedrunning_total_trophies].cs2) `[proc,speedrunning_total_trophies]`  
+[**5894**](scripts/[proc,speedrunning_quest_enabled].cs2) `[proc,speedrunning_quest_enabled]`  
 [**5895**](scripts/[proc,script5895].cs2)  
 [**5896**](scripts/[proc,script5896].cs2)  
 [**5897**](scripts/[proc,script5897].cs2)  
@@ -5915,24 +5915,24 @@
 [**5919**](scripts/[clientscript,script5919].cs2)  
 [**5920**](scripts/[clientscript,script5920].cs2)  
 [**5921**](scripts/[proc,script5921].cs2)  
-[**5922**](scripts/[proc,script5922].cs2)  
-[**5923**](scripts/[proc,script5923].cs2)  
+[**5922**](scripts/[proc,settings_buff_cannon_ammo].cs2) `[proc,settings_buff_cannon_ammo]`  
+[**5923**](scripts/[proc,buff_bar_get_value].cs2) `[proc,buff_bar_get_value]`  
 [**5924**](scripts/[proc,script5924].cs2)  
 [**5925**](scripts/[proc,script5925].cs2)  
 [**5926**](scripts/[clientscript,script5926].cs2)  
 [**5927**](scripts/[proc,script5927].cs2)  
-[**5928**](scripts/[proc,script5928].cs2)  
-[**5929**](scripts/[clientscript,script5929].cs2)  
-[**5930**](scripts/[proc,script5930].cs2)  
-[**5931**](scripts/[clientscript,script5931].cs2)  
-[**5932**](scripts/[proc,script5932].cs2)  
-[**5933**](scripts/[clientscript,script5933].cs2)  
+[**5928**](scripts/[proc,buff_bar_dynamic_obj].cs2) `[proc,buff_bar_dynamic_obj]`  
+[**5929**](scripts/[clientscript,buff_bar_2_init].cs2) `[clientscript,buff_bar_2_init]`  
+[**5930**](scripts/[proc,buff_bar_2_init].cs2) `[proc,buff_bar_2_init]`  
+[**5931**](scripts/[clientscript,buff_bar_start].cs2) `[clientscript,buff_bar_start]`  
+[**5932**](scripts/[proc,buff_bar_start].cs2) `[proc,buff_bar_start]`  
+[**5933**](scripts/[clientscript,buff_bar_transmit_value].cs2) `[clientscript,buff_bar_transmit_value]`  
 [**5934**](scripts/[proc,script5934].cs2)  
 [**5935**](scripts/[clientscript,script5935].cs2)  
 [**5936**](scripts/[proc,script5936].cs2)  
-[**5937**](scripts/[clientscript,script5937].cs2)  
-[**5938**](scripts/[proc,script5938].cs2)  
-[**5939**](scripts/[clientscript,script5939].cs2)  
+[**5937**](scripts/[clientscript,buff_bar_layout_redraw].cs2) `[clientscript,buff_bar_layout_redraw]`  
+[**5938**](scripts/[proc,buff_bar_layout_redraw].cs2) `[proc,buff_bar_layout_redraw]`  
+[**5939**](scripts/[clientscript,buff_bar_display_timer].cs2) `[clientscript,buff_bar_display_timer]`  
 [**5940**](scripts/[proc,script5940].cs2)  
 [**5941**](scripts/[proc,script5941].cs2)  
 [**5942**](scripts/[proc,script5942].cs2)  
diff --git a/scripts/[clientscript,buff_bar_2_init].cs2 b/scripts/[clientscript,buff_bar_2_init].cs2
new file mode 100644
index 000000000..def0eeb43
--- /dev/null
+++ b/scripts/[clientscript,buff_bar_2_init].cs2
@@ -0,0 +1,3 @@
+// 5929
+[clientscript,buff_bar_2_init]
+~buff_bar_2_init(interface_651:2);
diff --git a/scripts/[clientscript,script5939].cs2 b/scripts/[clientscript,buff_bar_display_timer].cs2
similarity index 94%
rename from scripts/[clientscript,script5939].cs2
rename to scripts/[clientscript,buff_bar_display_timer].cs2
index 893c8a0bb..bedc8aa34 100644
--- a/scripts/[clientscript,script5939].cs2
+++ b/scripts/[clientscript,buff_bar_display_timer].cs2
@@ -1,5 +1,5 @@
 // 5939
-[clientscript,script5939]
+[clientscript,buff_bar_display_timer]
 def_component $component0 = interface_651:4;
 def_component $component1 = interface_651:2;
 def_int $int2 = 0;
diff --git a/scripts/[clientscript,buff_bar_layout_redraw].cs2 b/scripts/[clientscript,buff_bar_layout_redraw].cs2
new file mode 100644
index 000000000..70007a4fe
--- /dev/null
+++ b/scripts/[clientscript,buff_bar_layout_redraw].cs2
@@ -0,0 +1,3 @@
+// 5937
+[clientscript,buff_bar_layout_redraw]
+~buff_bar_layout_redraw;
diff --git a/scripts/[clientscript,script5931].cs2 b/scripts/[clientscript,buff_bar_start].cs2
similarity index 63%
rename from scripts/[clientscript,script5931].cs2
rename to scripts/[clientscript,buff_bar_start].cs2
index 58c7a2b6d..17441d472 100644
--- a/scripts/[clientscript,script5931].cs2
+++ b/scripts/[clientscript,buff_bar_start].cs2
@@ -1,9 +1,9 @@
 // 5931
-[clientscript,script5931](struct $struct0, int $int1)
+[clientscript,buff_bar_start](struct $struct0, int $int1)
 def_component $component2 = interface_651:2;
 def_int $comsubid3 = struct_param($struct0, param_1275);
 if (cc_find($component2, $comsubid3) = ^true) {
 	~script5927($struct0, $int1);
-	~script5932($struct0);
-	~script5938;
+	~buff_bar_start($struct0);
+	~buff_bar_layout_redraw;
 }
diff --git a/scripts/[clientscript,script5933].cs2 b/scripts/[clientscript,buff_bar_transmit_value].cs2
similarity index 79%
rename from scripts/[clientscript,script5933].cs2
rename to scripts/[clientscript,buff_bar_transmit_value].cs2
index f9aa63687..f76b1cf4a 100644
--- a/scripts/[clientscript,script5933].cs2
+++ b/scripts/[clientscript,buff_bar_transmit_value].cs2
@@ -1,11 +1,11 @@
 // 5933
-[clientscript,script5933](struct $struct0)
+[clientscript,buff_bar_transmit_value](struct $struct0)
 def_component $component1 = interface_651:2;
 def_int $comsubid2 = struct_param($struct0, param_1275);
 def_int $int3 = 0;
 def_int $int4 = 0;
 if (cc_find($component1, $comsubid2) = ^true) {
-	$int3 = ~script5923($struct0);
+	$int3 = ~buff_bar_get_value($struct0);
 	$int4 = cc_getcolour;
 	cc_setcolour($int3);
 	cc_setscrollsize(0, 0);
@@ -16,10 +16,10 @@ if (cc_find($component1, $comsubid2) = ^true) {
 				cc_settext(~script5943($struct0, $int3));
 			}
 		} else if ($int4 > struct_param($struct0, param_1540)) {
-			~script5938;
+			~buff_bar_layout_redraw;
 		}
 		if ($int4 <= struct_param($struct0, param_1540)) {
-			~script5938;
+			~buff_bar_layout_redraw;
 		}
 	}
 }
diff --git a/scripts/[clientscript,build_makeover_feet].cs2 b/scripts/[clientscript,build_makeover_feet].cs2
index 926321c6f..aa9363b9a 100644
--- a/scripts/[clientscript,build_makeover_feet].cs2
+++ b/scripts/[clientscript,build_makeover_feet].cs2
@@ -1,4 +1,4 @@
 // 3601
 [clientscript,build_makeover_feet](component $component0, component $component1, component $component2, component $component3)
 ~steelborder($component0, "Yrsa's Shoe Store", 0);
-~script3165($component1, $component2, $component3, -1);
+~rebuild_makeover_feet($component1, $component2, $component3, -1);
diff --git a/scripts/[clientscript,script811].cs2 b/scripts/[clientscript,ge_offers_pulsate].cs2
similarity index 75%
rename from scripts/[clientscript,script811].cs2
rename to scripts/[clientscript,ge_offers_pulsate].cs2
index 188cc39fa..fd1fea721 100644
--- a/scripts/[clientscript,script811].cs2
+++ b/scripts/[clientscript,ge_offers_pulsate].cs2
@@ -1,5 +1,5 @@
 // 811
-[clientscript,script811](component $component0, int $comsubid1, int $int2, int $int3, int $int4)
+[clientscript,ge_offers_pulsate](component $component0, int $comsubid1, int $int2, int $int3, int $int4)
 def_int $int5 = calc((clientclock - $int2) % 100);
 if ($int5 >= 50) {
 	$int5 = calc(100 - $int5);
diff --git a/scripts/[clientscript,script5730].cs2 b/scripts/[clientscript,ge_offers_setdesc].cs2
similarity index 92%
rename from scripts/[clientscript,script5730].cs2
rename to scripts/[clientscript,ge_offers_setdesc].cs2
index d2fb62b96..b27161c96 100644
--- a/scripts/[clientscript,script5730].cs2
+++ b/scripts/[clientscript,ge_offers_setdesc].cs2
@@ -1,5 +1,5 @@
 // 5730
-[clientscript,script5730](component $component0, component $component1, string $string0, string $string1)
+[clientscript,ge_offers_setdesc](component $component0, component $component1, string $string0, string $string1)
 def_string $string2 = "";
 def_int $width2 = 0;
 def_int $int3 = 0;
diff --git a/scripts/[clientscript,script5509].cs2 b/scripts/[clientscript,gim_settings_editable].cs2
similarity index 96%
rename from scripts/[clientscript,script5509].cs2
rename to scripts/[clientscript,gim_settings_editable].cs2
index 132037614..f502f2632 100644
--- a/scripts/[clientscript,script5509].cs2
+++ b/scripts/[clientscript,gim_settings_editable].cs2
@@ -1,5 +1,5 @@
 // 5509
-[clientscript,script5509](component $component0, int $int1, int $int2, string $string0)
+[clientscript,gim_settings_editable](component $component0, int $int1, int $int2, string $string0)
 cc_deleteall($component0);
 def_int $int3 = 0;
 cc_create($component0, ^iftype_graphic, $int3);
diff --git a/scripts/[clientscript,script5513].cs2 b/scripts/[clientscript,gim_settings_editable_hover].cs2
similarity index 73%
rename from scripts/[clientscript,script5513].cs2
rename to scripts/[clientscript,gim_settings_editable_hover].cs2
index bf88563fa..075aba449 100644
--- a/scripts/[clientscript,script5513].cs2
+++ b/scripts/[clientscript,gim_settings_editable_hover].cs2
@@ -1,5 +1,5 @@
 // 5513
-[clientscript,script5513](boolean $boolean0, component $component1, int $comsubid2, int $trans3, int $trans4)
+[clientscript,gim_settings_editable_hover](boolean $boolean0, component $component1, int $comsubid2, int $trans3, int $trans4)
 if ($boolean0 = true) {
 	if (cc_find($component1, $comsubid2) = ^true) {
 		cc_settrans($trans3);
diff --git a/scripts/[clientscript,gim_settings_editable_op].cs2 b/scripts/[clientscript,gim_settings_editable_op].cs2
new file mode 100644
index 000000000..84f71d350
--- /dev/null
+++ b/scripts/[clientscript,gim_settings_editable_op].cs2
@@ -0,0 +1,12 @@
+// 5514
+[clientscript,gim_settings_editable_op](int $opindex0, component $component1, int $int2, int $int3, int $int4)
+if ($opindex0 ! 1) {
+	return;
+}
+sound_synth(interface_select1, 1, 0);
+if (cc_find($component1, $int2) = ^true) {
+	cc_settrans(0);
+}
+if_setonmouserepeat(null, $component1);
+if_setonmouseleave(null, $component1);
+if_setontimer("gim_settings_editable_reset($component1, $int2, calc(clientclock + 10), $int3, $int4)", $component1);
diff --git a/scripts/[clientscript,script5515].cs2 b/scripts/[clientscript,gim_settings_editable_reset].cs2
similarity index 70%
rename from scripts/[clientscript,script5515].cs2
rename to scripts/[clientscript,gim_settings_editable_reset].cs2
index 1cb7f34b5..ab4019b55 100644
--- a/scripts/[clientscript,script5515].cs2
+++ b/scripts/[clientscript,gim_settings_editable_reset].cs2
@@ -1,5 +1,5 @@
 // 5515
-[clientscript,script5515](component $component0, int $int1, int $clock2, int $int3, int $int4)
+[clientscript,gim_settings_editable_reset](component $component0, int $int1, int $clock2, int $int3, int $int4)
 if (clientclock < $clock2) {
 	return;
 }
diff --git a/scripts/[clientscript,script3166].cs2 b/scripts/[clientscript,script3166].cs2
index 6656a5c28..51e1f1f1d 100644
--- a/scripts/[clientscript,script3166].cs2
+++ b/scripts/[clientscript,script3166].cs2
@@ -17,7 +17,7 @@ while ($count6 < $count5 & $comsubid7 = -1) {
 cc_deleteall($component0);
 cc_deleteall($component1);
 cc_deleteall($component2);
-~script3165($component0, $component1, $component2, $comsubid7);
+~rebuild_makeover_feet($component0, $component1, $component2, $comsubid7);
 if (cc_find($component0, $comsubid7) = ^true) {
 	$int8 = cc_getx;
 	$int9 = cc_gety;
diff --git a/scripts/[clientscript,script5514].cs2 b/scripts/[clientscript,script5514].cs2
deleted file mode 100644
index 2aa73b9a8..000000000
--- a/scripts/[clientscript,script5514].cs2
+++ /dev/null
@@ -1,12 +0,0 @@
-// 5514
-[clientscript,script5514](int $opindex0, component $component1, int $int2, int $int3, int $int4)
-if ($opindex0 ! 1) {
-	return;
-}
-sound_synth(interface_select1, 1, 0);
-if (cc_find($component1, $int2) = ^true) {
-	cc_settrans(0);
-}
-if_setonmouserepeat(null, $component1);
-if_setonmouseleave(null, $component1);
-if_setontimer("script5515($component1, $int2, calc(clientclock + 10), $int3, $int4)", $component1);
diff --git a/scripts/[clientscript,script5879].cs2 b/scripts/[clientscript,script5879].cs2
deleted file mode 100644
index bc5e9334f..000000000
--- a/scripts/[clientscript,script5879].cs2
+++ /dev/null
@@ -1,3 +0,0 @@
-// 5879
-[clientscript,script5879](int $int0)
-~script5880($int0);
diff --git a/scripts/[clientscript,script5929].cs2 b/scripts/[clientscript,script5929].cs2
deleted file mode 100644
index f480b4c11..000000000
--- a/scripts/[clientscript,script5929].cs2
+++ /dev/null
@@ -1,3 +0,0 @@
-// 5929
-[clientscript,script5929]
-~script5930(interface_651:2);
diff --git a/scripts/[clientscript,script5937].cs2 b/scripts/[clientscript,script5937].cs2
deleted file mode 100644
index 9d700e774..000000000
--- a/scripts/[clientscript,script5937].cs2
+++ /dev/null
@@ -1,3 +0,0 @@
-// 5937
-[clientscript,script5937]
-~script5938;
diff --git a/scripts/[clientscript,speedrunning_helper_update].cs2 b/scripts/[clientscript,speedrunning_helper_update].cs2
new file mode 100644
index 000000000..bd786fe0a
--- /dev/null
+++ b/scripts/[clientscript,speedrunning_helper_update].cs2
@@ -0,0 +1,3 @@
+// 5879
+[clientscript,speedrunning_helper_update](int $int0)
+~speedrunning_helper_draw($int0);
diff --git a/scripts/[clientscript,script5882].cs2 b/scripts/[clientscript,speedrunning_helper_update_time].cs2
similarity index 54%
rename from scripts/[clientscript,script5882].cs2
rename to scripts/[clientscript,speedrunning_helper_update_time].cs2
index 24aa03505..d2823002c 100644
--- a/scripts/[clientscript,script5882].cs2
+++ b/scripts/[clientscript,speedrunning_helper_update_time].cs2
@@ -1,4 +1,4 @@
 // 5882
-[clientscript,script5882](int $int0, int $int1, int $int2, int $int3)
+[clientscript,speedrunning_helper_update_time](int $int0, int $int1, int $int2, int $int3)
 def_string $string0 = ~script5883($int1, $int2, $int3);
 ~helper_generic_update_text($int0, $string0);
diff --git a/scripts/[clientscript,script5553].cs2 b/scripts/[clientscript,stat_boosts_hud_mobile_timertooltip].cs2
similarity index 55%
rename from scripts/[clientscript,script5553].cs2
rename to scripts/[clientscript,stat_boosts_hud_mobile_timertooltip].cs2
index 35b0e609b..eee447d88 100644
--- a/scripts/[clientscript,script5553].cs2
+++ b/scripts/[clientscript,stat_boosts_hud_mobile_timertooltip].cs2
@@ -1,5 +1,5 @@
 // 5553
-[clientscript,script5553](component $component0, component $component1, component $component2)
+[clientscript,stat_boosts_hud_mobile_timertooltip](component $component0, component $component1, component $component2)
 %varcint949 = ~minmax(0, 1, calc(1 - %varcint949));
 if (%varcint949 = 1) {
 	if (%varcint948 ! -1) {
@@ -8,7 +8,7 @@ if (%varcint949 = 1) {
 		if_setontimer(null, $component0);
 	}
 	~script5555($component0, $component1);
-	if_setontimer("script5554($component1, calc(clientclock + 240), $component2, $component0)", $component2);
+	if_setontimer("stat_boosts_hud_mobile_timertooltip_timer($component1, calc(clientclock + 240), $component2, $component0)", $component2);
 } else {
 	~deltooltip_action($component1);
 	if_setontimer(null, $component2);
diff --git a/scripts/[clientscript,script5554].cs2 b/scripts/[clientscript,stat_boosts_hud_mobile_timertooltip_timer].cs2
similarity index 69%
rename from scripts/[clientscript,script5554].cs2
rename to scripts/[clientscript,stat_boosts_hud_mobile_timertooltip_timer].cs2
index 31e7f41bf..2d9e69c74 100644
--- a/scripts/[clientscript,script5554].cs2
+++ b/scripts/[clientscript,stat_boosts_hud_mobile_timertooltip_timer].cs2
@@ -1,5 +1,5 @@
 // 5554
-[clientscript,script5554](component $component0, int $clock1, component $component2, component $component3)
+[clientscript,stat_boosts_hud_mobile_timertooltip_timer](component $component0, int $clock1, component $component2, component $component3)
 if (%varcint949 = 0) {
 	if_setontimer(null, $component2);
 	return;
diff --git a/scripts/[proc,script5930].cs2 b/scripts/[proc,buff_bar_2_init].cs2
similarity index 78%
rename from scripts/[proc,script5930].cs2
rename to scripts/[proc,buff_bar_2_init].cs2
index 3e3172aee..e2d77f012 100644
--- a/scripts/[proc,script5930].cs2
+++ b/scripts/[proc,buff_bar_2_init].cs2
@@ -1,5 +1,5 @@
 // 5930
-[proc,script5930](component $component0)
+[proc,buff_bar_2_init](component $component0)
 def_int $count1 = 0;
 def_struct $struct2 = null;
 def_enum $enum3 = enum_4213;
@@ -19,13 +19,13 @@ while ($count1 < $count4) {
 		cc_setcolour(struct_param($struct2, param_1540));
 		if (cc_find($component0, $count1) = ^true) {
 			~script5924($struct2);
-			$int6 = ~script5923($struct2);
+			$int6 = ~buff_bar_get_value($struct2);
 			if ($int6 ! struct_param($struct2, param_1540)) {
-				~script5932($struct2);
+				~buff_bar_start($struct2);
 			}
 		}
 	}
 	$count1 = calc($count1 + 1);
 }
-if_setontimer("script5939", $component0);
-~script5938;
+if_setontimer("buff_bar_display_timer", $component0);
+~buff_bar_layout_redraw;
diff --git a/scripts/[proc,script5848].cs2 b/scripts/[proc,buff_bar_dynamic_graphic2].cs2
similarity index 88%
rename from scripts/[proc,script5848].cs2
rename to scripts/[proc,buff_bar_dynamic_graphic2].cs2
index 77f3b72eb..db1c5127a 100644
--- a/scripts/[proc,script5848].cs2
+++ b/scripts/[proc,buff_bar_dynamic_graphic2].cs2
@@ -1,5 +1,5 @@
 // 5848
-[proc,script5848](int $int0)(graphic)
+[proc,buff_bar_dynamic_graphic2](int $int0)(graphic)
 switch_int ($int0) {
 	case 50 :
 		return(~script5741(%varbit13395));
diff --git a/scripts/[proc,script5847].cs2 b/scripts/[proc,buff_bar_dynamic_graphic].cs2
similarity index 88%
rename from scripts/[proc,script5847].cs2
rename to scripts/[proc,buff_bar_dynamic_graphic].cs2
index 0dfb67054..3bb20743f 100644
--- a/scripts/[proc,script5847].cs2
+++ b/scripts/[proc,buff_bar_dynamic_graphic].cs2
@@ -1,5 +1,5 @@
 // 5847
-[proc,script5847](int $int0)(graphic)
+[proc,buff_bar_dynamic_graphic](int $int0)(graphic)
 switch_int ($int0) {
 	case 50 :
 		return(~script5740(%varbit13395));
diff --git a/scripts/[proc,script5928].cs2 b/scripts/[proc,buff_bar_dynamic_obj].cs2
similarity index 78%
rename from scripts/[proc,script5928].cs2
rename to scripts/[proc,buff_bar_dynamic_obj].cs2
index 45da90126..66276bc50 100644
--- a/scripts/[proc,script5928].cs2
+++ b/scripts/[proc,buff_bar_dynamic_obj].cs2
@@ -1,5 +1,5 @@
 // 5928
-[proc,script5928](int $int0)(namedobj)
+[proc,buff_bar_dynamic_obj](int $int0)(namedobj)
 switch_int ($int0) {
 	case 41 :
 		if (%var3158 ! null) {
diff --git a/scripts/[proc,script5846].cs2 b/scripts/[proc,buff_bar_dynamic_tooltip].cs2
similarity index 88%
rename from scripts/[proc,script5846].cs2
rename to scripts/[proc,buff_bar_dynamic_tooltip].cs2
index 756a5c9ad..00cb37ce1 100644
--- a/scripts/[proc,script5846].cs2
+++ b/scripts/[proc,buff_bar_dynamic_tooltip].cs2
@@ -1,5 +1,5 @@
 // 5846
-[proc,script5846](int $int0)(string)
+[proc,buff_bar_dynamic_tooltip](int $int0)(string)
 switch_int ($int0) {
 	case 50 :
 		return(~script5742(%varbit13395));
diff --git a/scripts/[proc,script5923].cs2 b/scripts/[proc,buff_bar_get_value].cs2
similarity index 99%
rename from scripts/[proc,script5923].cs2
rename to scripts/[proc,buff_bar_get_value].cs2
index dc5eed172..2b1b41d11 100644
--- a/scripts/[proc,script5923].cs2
+++ b/scripts/[proc,buff_bar_get_value].cs2
@@ -1,5 +1,5 @@
 // 5923
-[proc,script5923](struct $struct0)(int)
+[proc,buff_bar_get_value](struct $struct0)(int)
 switch_struct ($struct0) {
 	case buff_abyssal_sire_stun_3091 :
 		if (%varcint475 > 0) {
diff --git a/scripts/[proc,script5938].cs2 b/scripts/[proc,buff_bar_layout_redraw].cs2
similarity index 97%
rename from scripts/[proc,script5938].cs2
rename to scripts/[proc,buff_bar_layout_redraw].cs2
index 631dd770e..2cf4f898e 100644
--- a/scripts/[proc,script5938].cs2
+++ b/scripts/[proc,buff_bar_layout_redraw].cs2
@@ -1,5 +1,5 @@
 // 5938
-[proc,script5938]
+[proc,buff_bar_layout_redraw]
 def_component $component0 = interface_651:4;
 def_component $component1 = interface_651:2;
 def_component $component2 = interface_651:5;
diff --git a/scripts/[proc,script5932].cs2 b/scripts/[proc,buff_bar_start].cs2
similarity index 73%
rename from scripts/[proc,script5932].cs2
rename to scripts/[proc,buff_bar_start].cs2
index 9ec71c343..9194c9eac 100644
--- a/scripts/[proc,script5932].cs2
+++ b/scripts/[proc,buff_bar_start].cs2
@@ -1,7 +1,7 @@
 // 5932
-[proc,script5932](struct $struct0)
+[proc,buff_bar_start](struct $struct0)
 def_int $int1 = 0;
-$int1 = ~script5923($struct0);
+$int1 = ~buff_bar_get_value($struct0);
 cc_setcolour($int1);
 if (~script5945($struct0) = 1) {
 	cc_settext(~script5943($struct0, $int1));
diff --git a/scripts/[proc,ge_offer_side_draw].cs2 b/scripts/[proc,ge_offer_side_draw].cs2
index e5ccc5c51..a1088761f 100644
--- a/scripts/[proc,ge_offer_side_draw].cs2
+++ b/scripts/[proc,ge_offer_side_draw].cs2
@@ -16,7 +16,7 @@ while ($int4 < 4) {
 	if (cc_find($component1, $int4) = ^true) {
 		if ($int3 = 1) {
 			cc_settrans(240);
-			cc_setontimer("script811(event_com, event_comsubid, calc(clientclock + 3 - $int4 * 2), 240, 250)");
+			cc_setontimer("ge_offers_pulsate(event_com, event_comsubid, calc(clientclock + 3 - $int4 * 2), 240, 250)");
 			cc_sethide(false);
 		} else {
 			cc_sethide(true);
diff --git a/scripts/[proc,ge_offers_setup_draw].cs2 b/scripts/[proc,ge_offers_setup_draw].cs2
index c3adc28a0..1c2b4571f 100644
--- a/scripts/[proc,ge_offers_setup_draw].cs2
+++ b/scripts/[proc,ge_offers_setup_draw].cs2
@@ -50,7 +50,7 @@ if (%varbit4397 = 1) {
 	}
 	if (cc_find($component1, $comsubid7) = ^true) {
 		cc_settrans(100);
-		cc_setontimer("script811(event_com, event_comsubid, clientclock, 100, 250)");
+		cc_setontimer("ge_offers_pulsate(event_com, event_comsubid, clientclock, 100, 250)");
 	}
 	if (cc_find($component1, $comsubid13) = ^true) {
 		cc_sethide(false);
diff --git a/scripts/[proc,questlist_showprogress_grey].cs2 b/scripts/[proc,questlist_showprogress_grey].cs2
index 52fff810c..98629857e 100644
--- a/scripts/[proc,questlist_showprogress_grey].cs2
+++ b/scripts/[proc,questlist_showprogress_grey].cs2
@@ -7,7 +7,7 @@ if (~league_world = 1) {
 		return(1);
 	}
 }
-if (~speedrunning_world = 1 & ~script5894($struct0) = 0) {
+if (~speedrunning_world = 1 & ~speedrunning_quest_enabled($struct0) = 0) {
 	return(1);
 }
 return(0);
diff --git a/scripts/[proc,script3165].cs2 b/scripts/[proc,rebuild_makeover_feet].cs2
similarity index 93%
rename from scripts/[proc,script3165].cs2
rename to scripts/[proc,rebuild_makeover_feet].cs2
index ba4f5d779..b34bab35a 100644
--- a/scripts/[proc,script3165].cs2
+++ b/scripts/[proc,rebuild_makeover_feet].cs2
@@ -1,5 +1,5 @@
 // 3165
-[proc,script3165](component $component0, component $component1, component $component2, int $comsubid3)
+[proc,rebuild_makeover_feet](component $component0, component $component1, component $component2, int $comsubid3)
 def_enum $enum4 = enum(int, enum, enum_4217, %varbit4146);
 def_int $count5 = enum_getoutputcount($enum4);
 def_int $int6 = 0;
diff --git a/scripts/[proc,script5512].cs2 b/scripts/[proc,script5512].cs2
index 2a7a849d9..89060c22a 100644
--- a/scripts/[proc,script5512].cs2
+++ b/scripts/[proc,script5512].cs2
@@ -1,7 +1,7 @@
 // 5512
 [proc,script5512](component $component0, int $int1, int $int2, int $int3)
-if_setonop("script5514(event_opindex, event_com, $int1, $int2, $int3)", $component0);
+if_setonop("gim_settings_editable_op(event_opindex, event_com, $int1, $int2, $int3)", $component0);
 if (~on_mobile = false) {
-	if_setonmouserepeat("script5513(true, event_com, $int1, $int2, $int3)", $component0);
+	if_setonmouserepeat("gim_settings_editable_hover(true, event_com, $int1, $int2, $int3)", $component0);
 }
-if_setonmouseleave("script5513(false, event_com, $int1, $int2, $int3)", $component0);
+if_setonmouseleave("gim_settings_editable_hover(false, event_com, $int1, $int2, $int3)", $component0);
diff --git a/scripts/[proc,script5519].cs2 b/scripts/[proc,script5519].cs2
index 638b4e2fd..7c13d3c9f 100644
--- a/scripts/[proc,script5519].cs2
+++ b/scripts/[proc,script5519].cs2
@@ -4,4 +4,4 @@ if (~on_enhanced_any = 0) {
 	return;
 }
 %varbit13134 = calc(1 - %varbit13134);
-~script5938;
+~buff_bar_layout_redraw;
diff --git a/scripts/[proc,script5890].cs2 b/scripts/[proc,script5890].cs2
deleted file mode 100644
index cfaa20410..000000000
--- a/scripts/[proc,script5890].cs2
+++ /dev/null
@@ -1,12 +0,0 @@
-// 5890
-[proc,script5890](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6, component $component7, component $component8)
-~script5891($component0, struct_param(%var3373, param_1526), "speedrun_trophies,0", ~script5892(%var3373, 1));
-~script5891($component1, struct_param(%var3373, param_1527), "speedrun_trophies,1", ~script5892(%var3373, 2));
-~script5891($component2, struct_param(%var3373, param_1528), "speedrun_trophies,2", ~script5892(%var3373, 3));
-~script5891($component3, struct_param(%var3373, param_1529), "speedrun_trophies,3", ~script5892(%var3373, 4));
-def_string $string0 = ",";
-if_settext(~tostring_spacer(~script5893, $string0), $component4);
-if_settext(~tostring_spacer(~min(%varbit13632, 60000), $string0), $component5);
-if_settext(~tostring_spacer(~min(%varbit13633, 60000), $string0), $component6);
-if_settext(~tostring_spacer(~min(%varbit13634, 60000), $string0), $component7);
-if_settext(~tostring_spacer(~min(%varbit13635, 60000), $string0), $component8);
diff --git a/scripts/[proc,script5909].cs2 b/scripts/[proc,script5909].cs2
index 958f3c827..ab047b675 100644
--- a/scripts/[proc,script5909].cs2
+++ b/scripts/[proc,script5909].cs2
@@ -121,7 +121,7 @@ if ($stat14 ! null & $int15 > 1) {
 if ($int12 > 20) {
 	$int6, $int5 = ~script5912($component1, $int6, $int5, "Level <tostring($int12)> in all combat stats");
 }
-$int6, $int5 = ~script5868(%var3373, $component1, $int6, $int5);
+$int6, $int5 = ~speedrunning_misc_unlocks(%var3373, $component1, $int6, $int5);
 if ($int9 = 1) {
 	$int6, $int5 = ~script5912($component1, $int6, $int5, "Any requirements for the other quests unlocked");
 }
diff --git a/scripts/[proc,script5924].cs2 b/scripts/[proc,script5924].cs2
index a90994c16..71df428b4 100644
--- a/scripts/[proc,script5924].cs2
+++ b/scripts/[proc,script5924].cs2
@@ -3,155 +3,155 @@
 switch_struct ($struct0) {
 	case buff_abyssal_sire_stun_3091 :
 	case buff_bound_3092 :
-		cc_setonvartransmit("script5933($struct0){var1327}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var1327}");
 	case buff_staff_of_the_dead_special_3093 :
-		cc_setonvartransmit("script5933($struct0){var1327}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var1327}");
 	case buff_imbued_heart_cooldown_3083 :
-		cc_setonvartransmit("script5933($struct0){var277}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var277}");
 	case buff_dragonfire_shield_special_cooldown_3082 :
-		cc_setonvartransmit("script5933($struct0){var1327}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var1327}");
 	case buff_stamina_potion_3086 :
-		cc_setonvartransmit("script5933($struct0){var277}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var277}");
 	case buff_prayer_enhance_4150 :
-		cc_setonvartransmit("script5933($struct0){var1428}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var1428}");
 	case buff_prayer_enhance_3087 :
-		cc_setonvartransmit("script5933($struct0){var1428}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var1428}");
 	case buff_prayer_enhance_4151 :
-		cc_setonvartransmit("script5933($struct0){var1428}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var1428}");
 	case buff_overload_4152 :
-		cc_setonvartransmit("script5933($struct0){var1428}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var1428}");
 	case buff_overload_3089 :
-		cc_setonvartransmit("script5933($struct0){var1428}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var1428}");
 	case buff_overload_4153 :
-		cc_setonvartransmit("script5933($struct0){var1428}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var1428}");
 	case buff_overload_3088 :
-		cc_setonvartransmit("script5933($struct0){var1067}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var1067}");
 	case buff_antifire_3102 :
-		cc_setonvartransmit("script5933($struct0){var277}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var277}");
 	case buff_superior_antifire_3103 :
-		cc_setonvartransmit("script5933($struct0){var277}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var277}");
 	case buff_antipoison_3105 :
-		cc_setonvartransmit("script5933($struct0){var102}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var102}");
 	case buff_anti_venom_3104 :
-		cc_setonvartransmit("script5933($struct0){var102}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var102}");
 	case buff_charge_3080 :
-		cc_setonvartransmit("script5933($struct0){var272}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var272}");
 	case buff_magic_imbue_3090 :
-		cc_setonvartransmit("script5933($struct0){var439}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var439}");
 	case buff_godwars_altar_cooldown_3081 :
-		cc_setonvartransmit("script5933($struct0){var695}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var695}");
 	case buff_home_teleport_cooldown_3077 :
-		cc_setonvartransmit("script5933($struct0){var892}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var892}");
 	case buff_minigame_teleport_cooldown_3078 :
-		cc_setonvartransmit("script5933($struct0){var888}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var888}");
 	case buff_teleport_block_3079 :
-		cc_setonvartransmit("script5933($struct0){var2741}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var2741}");
 	case buff_divine_attack_potion_3094 :
-		cc_setonvartransmit("script5933($struct0){var2238, var3388}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var2238, var3388}");
 	case buff_divine_strength_potion_3101 :
-		cc_setonvartransmit("script5933($struct0){var2238, var3388}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var2238, var3388}");
 	case buff_divine_defence_potion_3098 :
-		cc_setonvartransmit("script5933($struct0){var2238, var3388}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var2238, var3388}");
 	case buff_divine_magic_potion_3099 :
-		cc_setonvartransmit("script5933($struct0){var2238, var2239, var3388}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var2238, var2239, var3388}");
 	case buff_divine_range_potion_3100 :
-		cc_setonvartransmit("script5933($struct0){var2238, var2239, var3388}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var2238, var2239, var3388}");
 	case buff_divine_bastion_potion_3095 :
-		cc_setonvartransmit("script5933($struct0){var3388}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var3388}");
 	case buff_divine_battlemage_potion_3096 :
-		cc_setonvartransmit("script5933($struct0){var3388}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var3388}");
 	case buff_divine_combat_potion_3097 :
-		cc_setonvartransmit("script5933($struct0){var3388}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var3388}");
 	case buff_vengeance_active_3085 :
-		cc_setonvartransmit("script5933($struct0){var439}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var439}");
 	case buff_vengeance_cast_cooldown_3084 :
-		cc_setonvartransmit("script5933($struct0){var439}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var439}");
 	case buff_lesser_corruption_3118 :
-		cc_setonvartransmit("script5933($struct0){var2972}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var2972}");
 	case buff_greater_corruption_4156 :
-		cc_setonvartransmit("script5933($struct0){var2972}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var2972}");
 	case buff_corruption_cooldown_3119 :
-		cc_setonvartransmit("script5933($struct0){var439}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var439}");
 	case buff_mark_of_darkness_3120 :
 	case buff_shadow_veil_3122 :
-		cc_setonvartransmit("script5933($struct0){var1042}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var1042}");
 	case buff_shadow_veil_cooldown_3121 :
-		cc_setonvartransmit("script5933($struct0){var439}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var439}");
 	case buff_death_charge_3124 :
-		cc_setonvartransmit("script5933($struct0){var1042}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var1042}");
 	case buff_death_charge_cooldown_3123 :
-		cc_setonvartransmit("script5933($struct0){var439}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var439}");
 	case buff_ward_of_arceuus_3126 :
-		cc_setonvartransmit("script5933($struct0){var439}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var439}");
 	case buff_ward_of_arceuus_cooldown_3125 :
-		cc_setonvartransmit("script5933($struct0){var439}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var439}");
 	case buff_resurrection_3128 :
-		cc_setonvartransmit("script5933($struct0){var1042}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var1042}");
 	case buff_resurrection_cooldown_3127 :
-		cc_setonvartransmit("script5933($struct0){var439}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var439}");
 	case buff_ammo_remaining_3659 :
-		cc_setoninvtransmit("script5933($struct0){worn}");
+		cc_setoninvtransmit("buff_bar_transmit_value($struct0){worn}");
 	case buff_ammo_remaining_3661 :
-		cc_setoninvtransmit("script5933($struct0){worn}");
+		cc_setoninvtransmit("buff_bar_transmit_value($struct0){worn}");
 	case buff_next_poison_hit_3740 :
-		cc_setonvartransmit("script5933($struct0){var102}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var102}");
 	case buff_next_venom_hit_3741 :
-		cc_setonvartransmit("script5933($struct0){var102}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var102}");
 	case buff_next_venom_hit_4157 :
-		cc_setonvartransmit("script5933($struct0){var102}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var102}");
 	case buff_desert_heat_timer_3763 :
-		cc_setonvartransmit("script5933($struct0){var3198}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var3198}");
 	case buff_imprisoned_3765 :
 	case buff_blood_siphon_3766 :
 	case buff_infected_3767 :
 	case buff_cannon_ammo_4158 :
-		cc_setonvartransmit("script5933($struct0){var3, var2, var259, var2903}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var3, var2, var259, var2903}");
 	case buff_cannon_ammo_granite_cannonball_4159 :
-		cc_setonvartransmit("script5933($struct0){var3, var2, var259, var2903}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var3, var2, var259, var2903}");
 	case buff_forinthry_surge_additional_15_accuracy_and_damage_to_the_revenants_4134 :
-		cc_setonvartransmit("script5933($struct0){var3347, var3348}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var3347, var3348}");
 	case buff_weapon_specialist_3773 :
-		cc_setonvartransmit("script5933($struct0){var3279, var1734}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var3279, var1734}");
 	case buff_weapon_specialist_3774 :
-		cc_setonvartransmit("script5933($struct0){var3280, var1734}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var3280, var1734}");
 	case buff_weapon_specialist_3775 :
-		cc_setonvartransmit("script5933($struct0){var3280, var1734}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var3280, var1734}");
 	case buff_weapon_specialist_3776 :
-		cc_setonvartransmit("script5933($struct0){var3280, var1734}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var3280, var1734}");
 	case buff_weapon_specialist_3777 :
-		cc_setonvartransmit("script5933($struct0){var3280, var1734}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var3280, var1734}");
 	case buff_weapon_specialist_3778 :
-		cc_setonvartransmit("script5933($struct0){var3281, var1734}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var3281, var1734}");
 	case buff_weapon_specialist_3779 :
-		cc_setonvartransmit("script5933($struct0){var3281, var1734}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var3281, var1734}");
 	case buff_twin_strikes_4099 :
-		cc_setonvartransmit("script5933($struct0){var3279, var3280, var3281}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var3279, var3280, var3281}");
 	case buff_double_tap_4100 :
-		cc_setonvartransmit("script5933($struct0){var3279, var3280, var3281}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var3279, var3280, var3281}");
 	case buff_chain_magic_4101 :
-		cc_setonvartransmit("script5933($struct0){var3279, var3280, var3281}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var3279, var3280, var3281}");
 	case buff_fast_metabolism_4102 :
-		cc_setonvartransmit("script5933($struct0){var3279, var3280, var3281}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var3279, var3280, var3281}");
 	case buff_drakans_touch_4103 :
-		cc_setonvartransmit("script5933($struct0){var3279, var3280, var3281}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var3279, var3280, var3281}");
 	case buff_absolute_unit_4104 :
-		cc_setonvartransmit("script5933($struct0){var3279, var3280, var3281}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var3279, var3280, var3281}");
 	case buff_knifes_edge_4105 :
-		cc_setonvartransmit("script5933($struct0){var3279, var3280, var3281}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var3279, var3280, var3281}");
 	case buff_unchained_talent_4106 :
-		cc_setonvartransmit("script5933($struct0){var3279, var3280, var3281}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var3279, var3280, var3281}");
 	case buff_the_alchemist_4107 :
-		cc_setonvartransmit("script5933($struct0){var3279, var3280, var3281}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var3279, var3280, var3281}");
 	case buff_the_craftsman_4108 :
-		cc_setonvartransmit("script5933($struct0){var3279, var3280, var3281}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var3279, var3280, var3281}");
 	case buff_greedy_gatherer_4109 :
-		cc_setonvartransmit("script5933($struct0){var3279, var3280, var3281}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var3279, var3280, var3281}");
 	case buff_personal_banker_4110 :
-		cc_setonvartransmit("script5933($struct0){var3279, var3280, var3281}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var3279, var3280, var3281}");
 	case buff_endless_knowledge_4111 :
-		cc_setonvartransmit("script5933($struct0){var3279, var3280, var3281}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var3279, var3280, var3281}");
 	case buff_last_recall_4112 :
-		cc_setonvartransmit("script5933($struct0){var3279, var3280, var3281}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var3279, var3280, var3281}");
 	case buff_trailblazer_4113 :
-		cc_setonvartransmit("script5933($struct0){var3279, var3280, var3281}");
+		cc_setonvartransmit("buff_bar_transmit_value($struct0){var3279, var3280, var3281}");
 }
diff --git a/scripts/[proc,script5936].cs2 b/scripts/[proc,script5936].cs2
index 7ef71f7f2..d8f98eeaa 100644
--- a/scripts/[proc,script5936].cs2
+++ b/scripts/[proc,script5936].cs2
@@ -47,7 +47,7 @@ if (calc($int4 % $int15) = 0) {
 			cc_setfillcolour(^black);
 			cc_settext("");
 			cc_setontimer(null);
-			~script5938;
+			~buff_bar_layout_redraw;
 		}
 	}
 }
diff --git a/scripts/[proc,script5947].cs2 b/scripts/[proc,script5947].cs2
index 042c8c006..f9ad0bd61 100644
--- a/scripts/[proc,script5947].cs2
+++ b/scripts/[proc,script5947].cs2
@@ -58,12 +58,12 @@ cc_setsize($int9, $int10, ^setsize_abs, ^setsize_abs);
 def_int $int11 = 0;
 def_graphic $graphic12 = null;
 def_namedobj $namedobj13 = struct_param($struct0, param_1281);
-def_namedobj $namedobj14 = ~script5928($int3);
+def_namedobj $namedobj14 = ~buff_bar_dynamic_obj($int3);
 if ($namedobj14 ! null) {
 	$namedobj13 = $namedobj14;
 }
 if (struct_param($struct0, param_1480) = true) {
-	$graphic12 = ~script5847($int3);
+	$graphic12 = ~buff_bar_dynamic_graphic($int3);
 } else {
 	$graphic12 = struct_param($struct0, param_1278);
 }
@@ -84,7 +84,7 @@ cc_setposition(calc($int6 + 1 + (37 - 5) / 2 - $int9 / 2 + coordx(struct_param($
 cc_setsize($int9, $int10, ^setsize_abs, ^setsize_abs);
 $graphic12 = null;
 if (struct_param($struct0, param_1481) = true) {
-	$graphic12 = ~script5848($int3);
+	$graphic12 = ~buff_bar_dynamic_graphic2($int3);
 } else {
 	$graphic12 = struct_param($struct0, param_1479);
 }
@@ -109,7 +109,7 @@ if (~script5945($struct0) = 1) {
 $int1 = calc($int1 + 1);
 def_component $component15 = interface_651:5;
 if (struct_param($struct0, param_1482) = true) {
-	~buff_bar_buff_create_tooltip($component2, $int1, $component15, ~script5846($int3), $int6, $int7);
+	~buff_bar_buff_create_tooltip($component2, $int1, $component15, ~buff_bar_dynamic_tooltip($int3), $int6, $int7);
 } else {
 	~buff_bar_buff_create_tooltip($component2, $int1, $component15, struct_param($struct0, param_1279), $int6, $int7);
 }
diff --git a/scripts/[proc,settings_buff_ammo].cs2 b/scripts/[proc,settings_buff_ammo].cs2
index 3cda2ec9f..3b80dc179 100644
--- a/scripts/[proc,settings_buff_ammo].cs2
+++ b/scripts/[proc,settings_buff_ammo].cs2
@@ -4,4 +4,4 @@ if (~on_enhanced_any = 0) {
 	return;
 }
 %varbit12985 = calc(1 - %varbit12985);
-~script5938;
+~buff_bar_layout_redraw;
diff --git a/scripts/[proc,settings_buff_antifire_duration].cs2 b/scripts/[proc,settings_buff_antifire_duration].cs2
index d50fdf68c..acc718a94 100644
--- a/scripts/[proc,settings_buff_antifire_duration].cs2
+++ b/scripts/[proc,settings_buff_antifire_duration].cs2
@@ -4,4 +4,4 @@ if (~on_enhanced_any = 0) {
 	return;
 }
 %varbit12370 = calc(1 - %varbit12370);
-~script5938;
+~buff_bar_layout_redraw;
diff --git a/scripts/[proc,settings_buff_antipoison_duration].cs2 b/scripts/[proc,settings_buff_antipoison_duration].cs2
index 8999d0355..6344c5600 100644
--- a/scripts/[proc,settings_buff_antipoison_duration].cs2
+++ b/scripts/[proc,settings_buff_antipoison_duration].cs2
@@ -4,4 +4,4 @@ if (~on_enhanced_any = 0) {
 	return;
 }
 %varbit12371 = calc(1 - %varbit12371);
-~script5938;
+~buff_bar_layout_redraw;
diff --git a/scripts/[proc,script5922].cs2 b/scripts/[proc,settings_buff_cannon_ammo].cs2
similarity index 59%
rename from scripts/[proc,script5922].cs2
rename to scripts/[proc,settings_buff_cannon_ammo].cs2
index 595ba2d49..e5da7ca52 100644
--- a/scripts/[proc,script5922].cs2
+++ b/scripts/[proc,settings_buff_cannon_ammo].cs2
@@ -1,7 +1,7 @@
 // 5922
-[proc,script5922]
+[proc,settings_buff_cannon_ammo]
 if (~on_enhanced_any = 0) {
 	return;
 }
 %varbit13667 = calc(1 - %varbit13667);
-~script5938;
+~buff_bar_layout_redraw;
diff --git a/scripts/[proc,settings_buff_charge_spell].cs2 b/scripts/[proc,settings_buff_charge_spell].cs2
index 91280a7ae..cd5b9e0ed 100644
--- a/scripts/[proc,settings_buff_charge_spell].cs2
+++ b/scripts/[proc,settings_buff_charge_spell].cs2
@@ -4,4 +4,4 @@ if (~on_enhanced_any = 0) {
 	return;
 }
 %varbit12356 = calc(1 - %varbit12356);
-~script5938;
+~buff_bar_layout_redraw;
diff --git a/scripts/[proc,settings_buff_corruption].cs2 b/scripts/[proc,settings_buff_corruption].cs2
index 2b9329085..844794e79 100644
--- a/scripts/[proc,settings_buff_corruption].cs2
+++ b/scripts/[proc,settings_buff_corruption].cs2
@@ -4,4 +4,4 @@ if (~on_enhanced_any = 0) {
 	return;
 }
 %varbit12405 = calc(1 - %varbit12405);
-~script5938;
+~buff_bar_layout_redraw;
diff --git a/scripts/[proc,settings_buff_death_charge].cs2 b/scripts/[proc,settings_buff_death_charge].cs2
index 0258837e9..98b2958a6 100644
--- a/scripts/[proc,settings_buff_death_charge].cs2
+++ b/scripts/[proc,settings_buff_death_charge].cs2
@@ -4,4 +4,4 @@ if (~on_enhanced_any = 0) {
 	return;
 }
 %varbit12408 = calc(1 - %varbit12408);
-~script5938;
+~buff_bar_layout_redraw;
diff --git a/scripts/[proc,settings_buff_divine_potion_duration].cs2 b/scripts/[proc,settings_buff_divine_potion_duration].cs2
index a695148e2..b32901360 100644
--- a/scripts/[proc,settings_buff_divine_potion_duration].cs2
+++ b/scripts/[proc,settings_buff_divine_potion_duration].cs2
@@ -4,4 +4,4 @@ if (~on_enhanced_any = 0) {
 	return;
 }
 %varbit12369 = calc(1 - %varbit12369);
-~script5938;
+~buff_bar_layout_redraw;
diff --git a/scripts/[proc,settings_buff_dragonfire_shield_cooldown].cs2 b/scripts/[proc,settings_buff_dragonfire_shield_cooldown].cs2
index 8a2b0cb6a..fa3d640a5 100644
--- a/scripts/[proc,settings_buff_dragonfire_shield_cooldown].cs2
+++ b/scripts/[proc,settings_buff_dragonfire_shield_cooldown].cs2
@@ -4,4 +4,4 @@ if (~on_enhanced_any = 0) {
 	return;
 }
 %varbit12358 = calc(1 - %varbit12358);
-~script5938;
+~buff_bar_layout_redraw;
diff --git a/scripts/[proc,settings_buff_freeze_duration].cs2 b/scripts/[proc,settings_buff_freeze_duration].cs2
index b1a87d2e9..976799eae 100644
--- a/scripts/[proc,settings_buff_freeze_duration].cs2
+++ b/scripts/[proc,settings_buff_freeze_duration].cs2
@@ -4,4 +4,4 @@ if (~on_enhanced_any = 0) {
 	return;
 }
 %varbit12367 = calc(1 - %varbit12367);
-~script5938;
+~buff_bar_layout_redraw;
diff --git a/scripts/[proc,settings_buff_godwars_altar].cs2 b/scripts/[proc,settings_buff_godwars_altar].cs2
index 11d562e64..ca2fc9297 100644
--- a/scripts/[proc,settings_buff_godwars_altar].cs2
+++ b/scripts/[proc,settings_buff_godwars_altar].cs2
@@ -4,4 +4,4 @@ if (~on_enhanced_any = 0) {
 	return;
 }
 %varbit12357 = calc(1 - %varbit12357);
-~script5938;
+~buff_bar_layout_redraw;
diff --git a/scripts/[proc,settings_buff_home_teleport].cs2 b/scripts/[proc,settings_buff_home_teleport].cs2
index 04e89e3f0..7759c1236 100644
--- a/scripts/[proc,settings_buff_home_teleport].cs2
+++ b/scripts/[proc,settings_buff_home_teleport].cs2
@@ -4,4 +4,4 @@ if (~on_enhanced_any = 0) {
 	return;
 }
 %varbit12353 = calc(1 - %varbit12353);
-~script5938;
+~buff_bar_layout_redraw;
diff --git a/scripts/[proc,settings_buff_imbued_heart_cooldown].cs2 b/scripts/[proc,settings_buff_imbued_heart_cooldown].cs2
index 32391e779..372420ade 100644
--- a/scripts/[proc,settings_buff_imbued_heart_cooldown].cs2
+++ b/scripts/[proc,settings_buff_imbued_heart_cooldown].cs2
@@ -4,4 +4,4 @@ if (~on_enhanced_any = 0) {
 	return;
 }
 %varbit12359 = calc(1 - %varbit12359);
-~script5938;
+~buff_bar_layout_redraw;
diff --git a/scripts/[proc,settings_buff_leagues].cs2 b/scripts/[proc,settings_buff_leagues].cs2
index e8acd428c..16f86f9a9 100644
--- a/scripts/[proc,settings_buff_leagues].cs2
+++ b/scripts/[proc,settings_buff_leagues].cs2
@@ -4,4 +4,4 @@ if (~league_world = 0) {
 	return;
 }
 %varbit12383 = calc(1 - %varbit12383);
-~script5938;
+~buff_bar_layout_redraw;
diff --git a/scripts/[proc,settings_buff_magic_imbue_duration].cs2 b/scripts/[proc,settings_buff_magic_imbue_duration].cs2
index b0fb7dd54..8aaa75dbb 100644
--- a/scripts/[proc,settings_buff_magic_imbue_duration].cs2
+++ b/scripts/[proc,settings_buff_magic_imbue_duration].cs2
@@ -4,4 +4,4 @@ if (~on_enhanced_any = 0) {
 	return;
 }
 %varbit12365 = calc(1 - %varbit12365);
-~script5938;
+~buff_bar_layout_redraw;
diff --git a/scripts/[proc,settings_buff_mark_of_darkness].cs2 b/scripts/[proc,settings_buff_mark_of_darkness].cs2
index 331ab1745..bdb2a3779 100644
--- a/scripts/[proc,settings_buff_mark_of_darkness].cs2
+++ b/scripts/[proc,settings_buff_mark_of_darkness].cs2
@@ -4,4 +4,4 @@ if (~on_enhanced_any = 0) {
 	return;
 }
 %varbit12406 = calc(1 - %varbit12406);
-~script5938;
+~buff_bar_layout_redraw;
diff --git a/scripts/[proc,settings_buff_minigame_teleport].cs2 b/scripts/[proc,settings_buff_minigame_teleport].cs2
index e516813d3..c6292a823 100644
--- a/scripts/[proc,settings_buff_minigame_teleport].cs2
+++ b/scripts/[proc,settings_buff_minigame_teleport].cs2
@@ -4,4 +4,4 @@ if (~on_enhanced_any = 0) {
 	return;
 }
 %varbit12354 = calc(1 - %varbit12354);
-~script5938;
+~buff_bar_layout_redraw;
diff --git a/scripts/[proc,settings_buff_overload_duration].cs2 b/scripts/[proc,settings_buff_overload_duration].cs2
index 97cf7728f..87ca139f7 100644
--- a/scripts/[proc,settings_buff_overload_duration].cs2
+++ b/scripts/[proc,settings_buff_overload_duration].cs2
@@ -4,4 +4,4 @@ if (~on_enhanced_any = 0) {
 	return;
 }
 %varbit12364 = calc(1 - %varbit12364);
-~script5938;
+~buff_bar_layout_redraw;
diff --git a/scripts/[proc,settings_buff_poison_damage].cs2 b/scripts/[proc,settings_buff_poison_damage].cs2
index 3d1546e2c..7d5cd3ef2 100644
--- a/scripts/[proc,settings_buff_poison_damage].cs2
+++ b/scripts/[proc,settings_buff_poison_damage].cs2
@@ -4,4 +4,4 @@ if (~on_enhanced_any = 0) {
 	return;
 }
 %varbit13084 = calc(1 - %varbit13084);
-~script5938;
+~buff_bar_layout_redraw;
diff --git a/scripts/[proc,settings_buff_prayer_enhance_duration].cs2 b/scripts/[proc,settings_buff_prayer_enhance_duration].cs2
index 45713623b..c916c5e32 100644
--- a/scripts/[proc,settings_buff_prayer_enhance_duration].cs2
+++ b/scripts/[proc,settings_buff_prayer_enhance_duration].cs2
@@ -4,4 +4,4 @@ if (~on_enhanced_any = 0) {
 	return;
 }
 %varbit12363 = calc(1 - %varbit12363);
-~script5938;
+~buff_bar_layout_redraw;
diff --git a/scripts/[proc,settings_buff_resurrection].cs2 b/scripts/[proc,settings_buff_resurrection].cs2
index e1a10d908..08a8db1d7 100644
--- a/scripts/[proc,settings_buff_resurrection].cs2
+++ b/scripts/[proc,settings_buff_resurrection].cs2
@@ -4,4 +4,4 @@ if (~on_enhanced_any = 0) {
 	return;
 }
 %varbit12410 = calc(1 - %varbit12410);
-~script5938;
+~buff_bar_layout_redraw;
diff --git a/scripts/[proc,settings_buff_shadow_veil].cs2 b/scripts/[proc,settings_buff_shadow_veil].cs2
index 35ca25b48..c0a781f28 100644
--- a/scripts/[proc,settings_buff_shadow_veil].cs2
+++ b/scripts/[proc,settings_buff_shadow_veil].cs2
@@ -4,4 +4,4 @@ if (~on_enhanced_any = 0) {
 	return;
 }
 %varbit12407 = calc(1 - %varbit12407);
-~script5938;
+~buff_bar_layout_redraw;
diff --git a/scripts/[proc,settings_buff_sire_stun_duration].cs2 b/scripts/[proc,settings_buff_sire_stun_duration].cs2
index dd7d8d440..4e45a2288 100644
--- a/scripts/[proc,settings_buff_sire_stun_duration].cs2
+++ b/scripts/[proc,settings_buff_sire_stun_duration].cs2
@@ -4,4 +4,4 @@ if (~on_enhanced_any = 0) {
 	return;
 }
 %varbit12366 = calc(1 - %varbit12366);
-~script5938;
+~buff_bar_layout_redraw;
diff --git a/scripts/[proc,settings_buff_sotd_duration].cs2 b/scripts/[proc,settings_buff_sotd_duration].cs2
index 3e2b5f856..b31358c3a 100644
--- a/scripts/[proc,settings_buff_sotd_duration].cs2
+++ b/scripts/[proc,settings_buff_sotd_duration].cs2
@@ -4,4 +4,4 @@ if (~on_enhanced_any = 0) {
 	return;
 }
 %varbit12368 = calc(1 - %varbit12368);
-~script5938;
+~buff_bar_layout_redraw;
diff --git a/scripts/[proc,settings_buff_stamina_duration].cs2 b/scripts/[proc,settings_buff_stamina_duration].cs2
index ef9d58a3d..033de2872 100644
--- a/scripts/[proc,settings_buff_stamina_duration].cs2
+++ b/scripts/[proc,settings_buff_stamina_duration].cs2
@@ -4,4 +4,4 @@ if (~on_enhanced_any = 0) {
 	return;
 }
 %varbit12362 = calc(1 - %varbit12362);
-~script5938;
+~buff_bar_layout_redraw;
diff --git a/scripts/[proc,settings_buff_teleblock].cs2 b/scripts/[proc,settings_buff_teleblock].cs2
index 7043a894f..394203dcc 100644
--- a/scripts/[proc,settings_buff_teleblock].cs2
+++ b/scripts/[proc,settings_buff_teleblock].cs2
@@ -4,4 +4,4 @@ if (~on_enhanced_any = 0) {
 	return;
 }
 %varbit12355 = calc(1 - %varbit12355);
-~script5938;
+~buff_bar_layout_redraw;
diff --git a/scripts/[proc,settings_buff_vengeance_active].cs2 b/scripts/[proc,settings_buff_vengeance_active].cs2
index 8340ddb62..83492b31f 100644
--- a/scripts/[proc,settings_buff_vengeance_active].cs2
+++ b/scripts/[proc,settings_buff_vengeance_active].cs2
@@ -4,4 +4,4 @@ if (~on_enhanced_any = 0) {
 	return;
 }
 %varbit12361 = calc(1 - %varbit12361);
-~script5938;
+~buff_bar_layout_redraw;
diff --git a/scripts/[proc,settings_buff_vengeance_cooldown].cs2 b/scripts/[proc,settings_buff_vengeance_cooldown].cs2
index b3f1f5a05..c258414f7 100644
--- a/scripts/[proc,settings_buff_vengeance_cooldown].cs2
+++ b/scripts/[proc,settings_buff_vengeance_cooldown].cs2
@@ -4,4 +4,4 @@ if (~on_enhanced_any = 0) {
 	return;
 }
 %varbit12360 = calc(1 - %varbit12360);
-~script5938;
+~buff_bar_layout_redraw;
diff --git a/scripts/[proc,settings_buff_ward_of_arceuus].cs2 b/scripts/[proc,settings_buff_ward_of_arceuus].cs2
index 558140ee4..f256cc57a 100644
--- a/scripts/[proc,settings_buff_ward_of_arceuus].cs2
+++ b/scripts/[proc,settings_buff_ward_of_arceuus].cs2
@@ -4,4 +4,4 @@ if (~on_enhanced_any = 0) {
 	return;
 }
 %varbit12409 = calc(1 - %varbit12409);
-~script5938;
+~buff_bar_layout_redraw;
diff --git a/scripts/[proc,settings_clicked_toggle].cs2 b/scripts/[proc,settings_clicked_toggle].cs2
index 4d9293d5d..082126535 100644
--- a/scripts/[proc,settings_clicked_toggle].cs2
+++ b/scripts/[proc,settings_clicked_toggle].cs2
@@ -266,5 +266,5 @@ switch_int ($int0) {
 	case 205 :
 		~script5522;
 	case 213 :
-		~script5922;
+		~settings_buff_cannon_ammo;
 }
diff --git a/scripts/[proc,script5880].cs2 b/scripts/[proc,speedrunning_helper_draw].cs2
similarity index 93%
rename from scripts/[proc,script5880].cs2
rename to scripts/[proc,speedrunning_helper_draw].cs2
index a06994cdc..293bb69e6 100644
--- a/scripts/[proc,script5880].cs2
+++ b/scripts/[proc,speedrunning_helper_draw].cs2
@@ -1,5 +1,5 @@
 // 5880
-[proc,script5880](int $int0)
+[proc,speedrunning_helper_draw](int $int0)
 def_struct $struct1 = %var3374;
 def_string $string0 = ~get_quest_name($struct1);
 if (enum(struct, boolean, enum_4209, $struct1) = true) {
@@ -22,7 +22,7 @@ def_string $string3 = ~time_convert_option($int3);
 ~script5310;
 ~helper_generic_set_bit(0);
 ~helper_generic_add_title($string0, 1);
-~script5881($int0);
+~speedrunning_helper_update_time($int0);
 if ($int2 > 0 & string_length($string1) > 0) {
 	~helper_generic_add_data("<$string1>: ", $string2);
 }
diff --git a/scripts/[proc,script5881].cs2 b/scripts/[proc,speedrunning_helper_update_time].cs2
similarity index 65%
rename from scripts/[proc,script5881].cs2
rename to scripts/[proc,speedrunning_helper_update_time].cs2
index 02446a640..a4af79070 100644
--- a/scripts/[proc,script5881].cs2
+++ b/scripts/[proc,speedrunning_helper_update_time].cs2
@@ -1,10 +1,10 @@
 // 5881
-[proc,script5881](int $int0)
+[proc,speedrunning_helper_update_time](int $int0)
 $int0 = calc($int0 * 30 - clientclock);
 def_int $int1 = 0;
 def_int $int2 = 0;
 def_string $string0 = ~script5883($int0, %varbit11866, %varbit11890);
 $int1, $int2 = ~helper_generic_add_data("Time: ", $string0);
 if (cc_find(interface_711:3, $int2) = ^true) {
-	cc_setontimer("script5882($int2, $int0, %varbit11866, %varbit11890)");
+	cc_setontimer("speedrunning_helper_update_time($int2, $int0, %varbit11866, %varbit11890)");
 }
diff --git a/scripts/[proc,script5868].cs2 b/scripts/[proc,speedrunning_misc_unlocks].cs2
similarity index 58%
rename from scripts/[proc,script5868].cs2
rename to scripts/[proc,speedrunning_misc_unlocks].cs2
index 432510d68..2fad5ad7f 100644
--- a/scripts/[proc,script5868].cs2
+++ b/scripts/[proc,speedrunning_misc_unlocks].cs2
@@ -1,5 +1,5 @@
 // 5868
-[proc,script5868](struct $struct0, component $component1, int $int2, int $int3)(int, int)
+[proc,speedrunning_misc_unlocks](struct $struct0, component $component1, int $int2, int $int3)(int, int)
 switch_struct ($struct0) {
 	case dragon_slayer_i_3139 :
 		$int2, $int3 = ~script5869($component1, $int2, $int3);
diff --git a/scripts/[proc,script5889].cs2 b/scripts/[proc,speedrunning_points_update].cs2
similarity index 72%
rename from scripts/[proc,script5889].cs2
rename to scripts/[proc,speedrunning_points_update].cs2
index f6e38b5fc..a54218d40 100644
--- a/scripts/[proc,script5889].cs2
+++ b/scripts/[proc,speedrunning_points_update].cs2
@@ -1,5 +1,5 @@
 // 5889
-[proc,script5889](component $component0, component $component1)
+[proc,speedrunning_points_update](component $component0, component $component1)
 def_string $string0 = ",";
 def_string $text1 = ~tostring_spacer(~min(%var3365, 800000), $string0);
 if_settext("Speedrun Points<br><col=ffffff><$text1></col>", $component0);
diff --git a/scripts/[proc,script5894].cs2 b/scripts/[proc,speedrunning_quest_enabled].cs2
similarity index 76%
rename from scripts/[proc,script5894].cs2
rename to scripts/[proc,speedrunning_quest_enabled].cs2
index e12971f75..059462ab4 100644
--- a/scripts/[proc,script5894].cs2
+++ b/scripts/[proc,speedrunning_quest_enabled].cs2
@@ -1,5 +1,5 @@
 // 5894
-[proc,script5894](struct $struct0)(int)
+[proc,speedrunning_quest_enabled](struct $struct0)(int)
 if (enum(struct, boolean, enum_4208, $struct0) = true) {
 	return(1);
 }
diff --git a/scripts/[proc,speedrunning_stats_update].cs2 b/scripts/[proc,speedrunning_stats_update].cs2
index 64ecbd388..fff8be19f 100644
--- a/scripts/[proc,speedrunning_stats_update].cs2
+++ b/scripts/[proc,speedrunning_stats_update].cs2
@@ -1,6 +1,6 @@
 // 5888
 [proc,speedrunning_stats_update](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6, component $component7, component $component8, component $component9, component $component10, component $component11)
-~script5889($component0, $component6);
-~script5890($component1, $component2, $component3, $component4, $component7, $component8, $component9, $component10, $component11);
+~speedrunning_points_update($component0, $component6);
+~speedrunning_trophies_update($component1, $component2, $component3, $component4, $component7, $component8, $component9, $component10, $component11);
 def_string $string0 = ",";
 if_settext(~tostring_spacer(~min(%var3367, 2000000000), $string0), $component5);
diff --git a/scripts/[proc,script5893].cs2 b/scripts/[proc,speedrunning_total_trophies].cs2
similarity index 83%
rename from scripts/[proc,script5893].cs2
rename to scripts/[proc,speedrunning_total_trophies].cs2
index 2aff96ba6..194c732ea 100644
--- a/scripts/[proc,script5893].cs2
+++ b/scripts/[proc,speedrunning_total_trophies].cs2
@@ -1,5 +1,5 @@
 // 5893
-[proc,script5893]()(int)
+[proc,speedrunning_total_trophies]()(int)
 def_int $int0 = ~min(%varbit13632, 60000);
 $int0 = calc($int0 + ~min(%varbit13633, 60000));
 $int0 = calc($int0 + ~min(%varbit13634, 60000));
diff --git a/scripts/[proc,speedrunning_trophies_update].cs2 b/scripts/[proc,speedrunning_trophies_update].cs2
new file mode 100644
index 000000000..87c0bdd59
--- /dev/null
+++ b/scripts/[proc,speedrunning_trophies_update].cs2
@@ -0,0 +1,12 @@
+// 5890
+[proc,speedrunning_trophies_update](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6, component $component7, component $component8)
+~speedrunning_trophy_update($component0, struct_param(%var3373, param_1526), "speedrun_trophies,0", ~speedrunning_trophy_check(%var3373, 1));
+~speedrunning_trophy_update($component1, struct_param(%var3373, param_1527), "speedrun_trophies,1", ~speedrunning_trophy_check(%var3373, 2));
+~speedrunning_trophy_update($component2, struct_param(%var3373, param_1528), "speedrun_trophies,2", ~speedrunning_trophy_check(%var3373, 3));
+~speedrunning_trophy_update($component3, struct_param(%var3373, param_1529), "speedrun_trophies,3", ~speedrunning_trophy_check(%var3373, 4));
+def_string $string0 = ",";
+if_settext(~tostring_spacer(~speedrunning_total_trophies, $string0), $component4);
+if_settext(~tostring_spacer(~min(%varbit13632, 60000), $string0), $component5);
+if_settext(~tostring_spacer(~min(%varbit13633, 60000), $string0), $component6);
+if_settext(~tostring_spacer(~min(%varbit13634, 60000), $string0), $component7);
+if_settext(~tostring_spacer(~min(%varbit13635, 60000), $string0), $component8);
diff --git a/scripts/[proc,script5892].cs2 b/scripts/[proc,speedrunning_trophy_check].cs2
similarity index 58%
rename from scripts/[proc,script5892].cs2
rename to scripts/[proc,speedrunning_trophy_check].cs2
index 1b8e2afcc..657e2a1ac 100644
--- a/scripts/[proc,script5892].cs2
+++ b/scripts/[proc,speedrunning_trophy_check].cs2
@@ -1,5 +1,5 @@
 // 5892
-[proc,script5892](struct $struct0, int $int1)(int)
+[proc,speedrunning_trophy_check](struct $struct0, int $int1)(int)
 def_int $int2 = ~script5885($struct0);
 if ($int2 >= $int1) {
 	return(1);
diff --git a/scripts/[proc,script5891].cs2 b/scripts/[proc,speedrunning_trophy_update].cs2
similarity index 87%
rename from scripts/[proc,script5891].cs2
rename to scripts/[proc,speedrunning_trophy_update].cs2
index 857fa9d85..2a82d134d 100644
--- a/scripts/[proc,script5891].cs2
+++ b/scripts/[proc,speedrunning_trophy_update].cs2
@@ -1,5 +1,5 @@
 // 5891
-[proc,script5891](component $component0, int $int1, graphic $graphic2, int $int3)
+[proc,speedrunning_trophy_update](component $component0, int $int1, graphic $graphic2, int $int3)
 cc_deleteall($component0);
 cc_create($component0, ^iftype_text, 0);
 cc_setposition(0, 4, ^setpos_abs_centre, ^setpos_abs_bottom);
diff --git a/scripts/[proc,stat_boosts_hud_timer_tooltip].cs2 b/scripts/[proc,stat_boosts_hud_timer_tooltip].cs2
index b80b49d2d..d811c3e3a 100644
--- a/scripts/[proc,stat_boosts_hud_timer_tooltip].cs2
+++ b/scripts/[proc,stat_boosts_hud_timer_tooltip].cs2
@@ -7,7 +7,7 @@ if (%varbit12374 = 0) {
 		if_setonclick(null, $component2);
 		if_setnoclickthrough(false, $component2);
 	} else {
-		if_setonclick("script5553($component0, $component1, $component2)", $component2);
+		if_setonclick("stat_boosts_hud_mobile_timertooltip($component0, $component1, $component2)", $component2);
 		if_setnoclickthrough(true, $component2);
 		if_setonmouserepeat(null, $component2);
 		if_setonmouseleave(null, $component2);