rename some script functions

4 files changed, 282 insertions, 282 deletions

diff --git a/asm/rom4.s b/asm/rom4.s
index aa8f661af..90882d660 100644
--- a/asm/rom4.s
+++ b/asm/rom4.s
@@ -271,7 +271,7 @@ _08052E7E:
 	bl sub_8145A78
 	bl sub_8052E04
 	ldr r0, _08052F58
-	bl script_env_2_execute_new_script
+	bl ScriptContext2_RunNewScript
 	pop {r4,r5}
 	pop {r0}
 	bx r0
@@ -290,7 +290,7 @@ _08052F58: .4byte gUnknown_0819FA81
 sub_8052F5C: @ 8052F5C
 	push {lr}
 	ldr r0, _08052F88
-	bl script_env_2_execute_new_script
+	bl ScriptContext2_RunNewScript
 	ldr r1, _08052F8C
 	movs r0, 0x92
 	lsls r0, 3
@@ -348,7 +348,7 @@ new_game: @ 8052FCC
 	ldr r0, _0805300C
 	bl FlagReset
 	ldr r0, _08053010
-	bl script_env_2_execute_new_script
+	bl ScriptContext2_RunNewScript
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -3000,7 +3000,7 @@ c1_overworld_normal: @ 80542F8
 	adds r1, r5, 0
 	adds r2, r4, 0
 	bl process_overworld_input
-	bl script_env_2_is_enabled
+	bl ScriptContext2_IsEnabled
 	lsls r0, 24
 	cmp r0, 0
 	bne _08054346
@@ -3008,7 +3008,7 @@ c1_overworld_normal: @ 80542F8
 	bl sub_8068024
 	cmp r0, 0x1
 	bne _0805433C
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	bl HideMapNamePopUpWindow
 	b _08054346
 _0805433C:
@@ -3045,7 +3045,7 @@ _0805436C: .4byte c2_overworld
 	thumb_func_start c2_overworld_basic
 c2_overworld_basic: @ 8054370
 	push {lr}
-	bl script_env_2_run_current_script
+	bl ScriptContext2_RunScript
 	bl RunTasks
 	bl AnimateSprites
 	bl CameraUpdate
@@ -3139,8 +3139,8 @@ CB2_NewGame: @ 8054410
 	bl NewGameInitData
 	bl player_avatar_init_params_reset
 	bl PlayTimeCounter_Start
-	bl script_env_1_init
-	bl script_env_2_disable
+	bl ScriptContext1_Init
+	bl ScriptContext2_Disable
 	ldr r1, _08054454
 	ldr r0, _08054458
 	str r0, [r1]
@@ -3180,8 +3180,8 @@ c2_whiteout: @ 8054468
 	bl ResetSafariZoneFlag_
 	bl sub_8052F5C
 	bl player_avatar_init_params_reset
-	bl script_env_1_init
-	bl script_env_2_disable
+	bl ScriptContext1_Init
+	bl ScriptContext2_Disable
 	ldr r1, _080544CC
 	ldr r0, _080544D0
 	str r0, [r1]
@@ -3212,8 +3212,8 @@ _080544D8: .4byte c2_overworld
 CB2_LoadMap: @ 80544DC
 	push {lr}
 	bl FieldClearVBlankHBlankCallbacks
-	bl script_env_1_init
-	bl script_env_2_disable
+	bl ScriptContext1_Init
+	bl ScriptContext2_Disable
 	movs r0, 0
 	bl set_callback1
 	ldr r0, _08054500
@@ -3257,8 +3257,8 @@ sub_8054534: @ 8054534
 	cmp r0, 0
 	bne _08054554
 	bl FieldClearVBlankHBlankCallbacks
-	bl script_env_1_init
-	bl script_env_2_disable
+	bl ScriptContext1_Init
+	bl ScriptContext2_Disable
 	movs r0, 0
 	bl set_callback1
 _08054554:
@@ -3397,8 +3397,8 @@ sub_805465C: @ 805465C
 	ldr r1, _08054694
 	ldr r0, _08054698
 	str r0, [r1]
-	bl script_env_1_init
-	bl script_env_2_disable
+	bl ScriptContext1_Init
+	bl ScriptContext2_Disable
 	bl c2_exit_to_overworld_2_switch
 	pop {r0}
 	bx r0
@@ -3503,8 +3503,8 @@ CB2_ContinueSavedGame: @ 8054734
 	bl sub_805308C
 	bl sub_8055FC0
 	bl PlayTimeCounter_Start
-	bl script_env_1_init
-	bl script_env_2_disable
+	bl ScriptContext1_Init
+	bl ScriptContext2_Disable
 	bl sub_80479F8
 	cmp r0, 0x1
 	bne _08054788
@@ -3639,8 +3639,8 @@ _08054854:
 	.4byte _08054930
 _0805488C:
 	bl FieldClearVBlankHBlankCallbacks
-	bl script_env_1_init
-	bl script_env_2_disable
+	bl ScriptContext1_Init
+	bl ScriptContext2_Disable
 	bl sub_8054F70
 	bl sub_8054BA8
 	b _08054928
@@ -5015,7 +5015,7 @@ _0805538C: .4byte 0x03000584
 sub_8055390: @ 8055390
 	push {r4,lr}
 	adds r4, r0, 0
-	bl script_env_2_is_enabled
+	bl ScriptContext2_IsEnabled
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -5064,7 +5064,7 @@ sub_80553E0: @ 80553E0
 	thumb_func_start sub_80553E4
 sub_80553E4: @ 80553E4
 	push {r4,lr}
-	bl script_env_2_is_enabled
+	bl ScriptContext2_IsEnabled
 	lsls r0, 24
 	lsrs r0, 24
 	movs r4, 0x11
@@ -5093,7 +5093,7 @@ sub_8055408: @ 8055408
 	cmp r0, 0x2
 	bhi _08055424
 	movs r4, 0x1A
-	bl script_env_2_disable
+	bl ScriptContext2_Disable
 	ldr r0, _08055434
 	bl sub_80543DC
 _08055424:
@@ -5118,7 +5118,7 @@ sub_8055438: @ 8055438
 	cmp r0, 0x2
 	bhi _08055454
 	movs r4, 0x1A
-	bl script_env_2_disable
+	bl ScriptContext2_Disable
 	ldr r0, _08055464
 	bl sub_80543DC
 _08055454:
@@ -5193,7 +5193,7 @@ sub_80554BC: @ 80554BC
 	cmp r0, 0x1
 	bne _080554D4
 	ldr r0, _080554DC
-	bl script_env_1_execute_new_script
+	bl ScriptContext1_SetupScript
 	ldr r0, _080554E0
 	bl sub_80543DC
 _080554D4:
@@ -5621,7 +5621,7 @@ _080557E2:
 	thumb_func_start sub_80557E8
 sub_80557E8: @ 80557E8
 	push {lr}
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	pop {r0}
 	bx r0
 	thumb_func_end sub_80557E8
@@ -5632,7 +5632,7 @@ sub_80557F4: @ 80557F4
 	movs r0, 0x6
 	bl audio_play
 	bl sub_8071310
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	pop {r0}
 	bx r0
 	thumb_func_end sub_80557F4
@@ -5644,8 +5644,8 @@ sub_8055808: @ 8055808
 	movs r0, 0x5
 	bl audio_play
 	adds r0, r4, 0
-	bl script_env_1_execute_new_script
-	bl script_env_2_enable
+	bl ScriptContext1_SetupScript
+	bl ScriptContext2_Enable
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -5657,8 +5657,8 @@ sub_8055824: @ 8055824
 	movs r0, 0x6
 	bl audio_play
 	ldr r0, _0805583C
-	bl script_env_1_execute_new_script
-	bl script_env_2_enable
+	bl ScriptContext1_SetupScript
+	bl ScriptContext2_Enable
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -5672,8 +5672,8 @@ sub_8055840: @ 8055840
 	movs r0, 0x5
 	bl audio_play
 	adds r0, r4, 0
-	bl script_env_1_execute_new_script
-	bl script_env_2_enable
+	bl ScriptContext1_SetupScript
+	bl ScriptContext2_Enable
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -5683,8 +5683,8 @@ sub_8055840: @ 8055840
 sub_805585C: @ 805585C
 	push {lr}
 	ldr r0, _0805586C
-	bl script_env_1_execute_new_script
-	bl script_env_2_enable
+	bl ScriptContext1_SetupScript
+	bl ScriptContext2_Enable
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -16055,7 +16055,7 @@ _08059E80: .4byte 0x0202e858
 sub_8059E84: @ 8059E84
 	push {r4,lr}
 	adds r4, r0, 0
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	ldr r1, _08059EA0
 	movs r0, 0x1
 	strb r0, [r1, 0x6]
@@ -16163,7 +16163,7 @@ sub_8059F40: @ 8059F40
 	ldr r1, _08059F8C
 	movs r0, 0
 	strb r0, [r1, 0x6]
-	bl script_env_2_disable
+	bl ScriptContext2_Disable
 	ldr r0, _08059F90
 	bl FindTaskIdByFunc
 	lsls r0, 24
@@ -16355,7 +16355,7 @@ sub_805A0D8: @ 805A0D8
 	ldr r1, _0805A0FC
 	movs r0, 0x1
 	strb r0, [r1, 0x6]
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	movs r0, 0x2D
 	bl audio_play
 	movs r0, 0x1
@@ -16478,7 +16478,7 @@ sub_805A1B8: @ 805A1B8
 	lsrs r1, 24
 	adds r0, r5, 0
 	bl FieldObjectSetSpecialAnim
-	bl script_env_2_disable
+	bl ScriptContext2_Disable
 	ldr r1, _0805A204
 	movs r0, 0
 	strb r0, [r1, 0x6]
@@ -16503,7 +16503,7 @@ sub_805A20C: @ 805A20C
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	bl sav1_reset_battle_music_maybe
 	bl sub_8053F84
 	ldr r2, _0805A258
@@ -16623,7 +16623,7 @@ sub_805A2D0: @ 805A2D0
 	bl FieldObjectSetSpecialAnim
 	movs r0, 0
 	strb r0, [r6, 0x6]
-	bl script_env_2_disable
+	bl ScriptContext2_Disable
 	ldrb r1, [r4, 0x1A]
 	lsls r0, r1, 4
 	adds r0, r1
@@ -16704,7 +16704,7 @@ _0805A3B0: .4byte 0x03004b20
 sub_805A3B4: @ 805A3B4
 	push {r4,lr}
 	adds r4, r0, 0
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	ldr r1, _0805A3D0
 	movs r0, 0x1
 	strb r0, [r1, 0x6]
@@ -17204,7 +17204,7 @@ _0805A780:
 	ldr r1, _0805A7B4
 	movs r0, 0
 	strb r0, [r1, 0x6]
-	bl script_env_2_disable
+	bl ScriptContext2_Disable
 	ldrh r0, [r5, 0x26]
 	lsls r0, 24
 	lsrs r0, 24
@@ -17403,7 +17403,7 @@ fishF: @ 805A914
 	ldr r1, _0805A94C
 	movs r0, 0
 	strb r0, [r1, 0x6]
-	bl script_env_2_disable
+	bl ScriptContext2_Disable
 	bl sub_806451C
 	bl MenuZeroFillScreen
 	movs r0, 0
diff --git a/asm/rom5.s b/asm/rom5.s
index 71ce6d1aa..f4dda2c3f 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -6891,7 +6891,7 @@ _0807E344:
 _0807E34C: .4byte REG_BLDCNT
 _0807E350: .4byte REG_WININ
 _0807E354:
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 	adds r0, r4, 0
 	bl DestroyTask
 _0807E35E:
@@ -11867,7 +11867,7 @@ task0A_asap_script_env_2_enable_and_set_ctx_running: @ 8080970
 	bne _08080988
 	adds r0, r4, 0
 	bl DestroyTask
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 _08080988:
 	pop {r4}
 	pop {r0}
@@ -11877,7 +11877,7 @@ _08080988:
 	thumb_func_start sub_8080990
 sub_8080990: @ 8080990
 	push {lr}
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	bl sub_8053E90
 	bl pal_fill_black
 	ldr r0, _080809AC
@@ -11892,7 +11892,7 @@ _080809AC: .4byte task0A_asap_script_env_2_enable_and_set_ctx_running
 	thumb_func_start sub_80809B0
 sub_80809B0: @ 80809B0
 	push {lr}
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	bl pal_fill_black
 	ldr r0, _080809C8
 	movs r1, 0xA
@@ -11954,7 +11954,7 @@ _08080A24:
 	bl sub_8080E70
 	cmp r0, 0x1
 	bne _08080A36
-	bl script_env_2_disable
+	bl ScriptContext2_Disable
 	adds r0, r5, 0
 	bl DestroyTask
 _08080A36:
@@ -11966,7 +11966,7 @@ _08080A36:
 	thumb_func_start sub_8080A3C
 sub_8080A3C: @ 8080A3C
 	push {lr}
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	bl sub_8053E90
 	bl palette_bg_faded_fill_white
 	ldr r0, _08080A58
@@ -12022,7 +12022,7 @@ _08080AA6:
 	cmp r0, 0x1
 	bne _08080ABC
 	bl sub_8007B14
-	bl script_env_2_disable
+	bl ScriptContext2_Disable
 	adds r0, r5, 0
 	bl DestroyTask
 _08080ABC:
@@ -12034,7 +12034,7 @@ _08080ABC:
 	thumb_func_start sub_8080AC4
 sub_8080AC4: @ 8080AC4
 	push {lr}
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	bl sub_8053E90
 	bl palette_bg_faded_fill_white
 	ldr r0, _08080AE0
@@ -12101,7 +12101,7 @@ mapldr_default: @ 8080B48
 	bl sub_8053E90
 	bl pal_fill_for_maplights
 	bl sub_8080AE4
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	pop {r0}
 	bx r0
 	thumb_func_end mapldr_default
@@ -12112,7 +12112,7 @@ sub_8080B60: @ 8080B60
 	bl sub_8053E90
 	bl pal_fill_black
 	bl sub_8080AE4
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	pop {r0}
 	bx r0
 	thumb_func_end sub_8080B60
@@ -12127,7 +12127,7 @@ sub_8080B78: @ 8080B78
 	ldr r0, _08080B98
 	movs r1, 0xA
 	bl CreateTask
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -12257,7 +12257,7 @@ _08080C9A:
 	strh r0, [r5, 0x8]
 	b _08080CAE
 _08080CA4:
-	bl script_env_2_disable
+	bl ScriptContext2_Disable
 	adds r0, r4, 0
 	bl DestroyTask
 _08080CAE:
@@ -12348,7 +12348,7 @@ _08080D50:
 	strh r0, [r5, 0x8]
 	b _08080D6E
 _08080D64:
-	bl script_env_2_disable
+	bl ScriptContext2_Disable
 	adds r0, r4, 0
 	bl DestroyTask
 _08080D6E:
@@ -12378,7 +12378,7 @@ task_map_chg_seq_0807E2CC: @ 8080D74
 _08080D94: .4byte 0x03004b20
 _08080D98:
 	bl player_bitmagic
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	ldrh r0, [r4, 0x8]
 	adds r0, 0x1
 	strh r0, [r4, 0x8]
@@ -12388,7 +12388,7 @@ _08080DA8:
 	cmp r0, 0
 	beq _08080DBE
 	bl sub_806451C
-	bl script_env_2_disable
+	bl ScriptContext2_Disable
 	adds r0, r5, 0
 	bl DestroyTask
 _08080DBE:
@@ -12424,7 +12424,7 @@ atk17_seteffectuser: @ 8080DEC
 	bl pal_fill_black
 	ldr r0, _08080E00
 	bl sub_8071284
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -12439,7 +12439,7 @@ task_mpl_807E3C8: @ 8080E04
 	bl sub_8080E70
 	cmp r0, 0x1
 	bne _08080E20
-	bl script_env_2_disable
+	bl ScriptContext2_Disable
 	adds r0, r4, 0
 	bl DestroyTask
 	bl sub_8064E2C
@@ -12452,7 +12452,7 @@ _08080E20:
 	thumb_func_start sub_8080E28
 sub_8080E28: @ 8080E28
 	push {lr}
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	bl pal_fill_black
 	ldr r0, _08080E40
 	movs r1, 0xA
@@ -12466,7 +12466,7 @@ _08080E40: .4byte task_mpl_807E3C8
 	thumb_func_start sub_8080E44
 sub_8080E44: @ 8080E44
 	push {lr}
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	bl sub_8053E90
 	bl pal_fill_black
 	ldr r0, _08080E60
@@ -12508,7 +12508,7 @@ _08080E84:
 	thumb_func_start sub_8080E88
 sub_8080E88: @ 8080E88
 	push {lr}
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	bl sub_8053FF8
 	bl sub_8080918
 	bl play_some_sound
@@ -12531,7 +12531,7 @@ _08080EBC: .4byte task0A_fade_n_map_maybe
 	thumb_func_start sp13E_warp_to_last_warp
 sp13E_warp_to_last_warp: @ 8080EC0
 	push {lr}
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	bl sub_8053FF8
 	bl sub_8080918
 	bl play_some_sound
@@ -12552,7 +12552,7 @@ _08080EEC: .4byte task0A_fade_n_map_maybe
 	thumb_func_start sub_8080EF0
 sub_8080EF0: @ 8080EF0
 	push {lr}
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	ldr r0, _08080F08
 	ldr r1, _08080F0C
 	str r1, [r0]
@@ -12587,7 +12587,7 @@ sub_8080F2C: @ 8080F2C
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	adds r0, r4, 0
 	movs r1, 0xA
 	bl sub_8086A2C
@@ -12599,7 +12599,7 @@ sub_8080F2C: @ 8080F2C
 	thumb_func_start sub_8080F48
 sub_8080F48: @ 8080F48
 	push {lr}
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	movs r0, 0xA
 	bl sub_80871B8
 	pop {r0}
@@ -12609,7 +12609,7 @@ sub_8080F48: @ 8080F48
 	thumb_func_start sub_8080F58
 sub_8080F58: @ 8080F58
 	push {lr}
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	movs r0, 0xA
 	bl sub_8087654
 	pop {r0}
@@ -12619,7 +12619,7 @@ sub_8080F58: @ 8080F58
 	thumb_func_start sub_8080F68
 sub_8080F68: @ 8080F68
 	push {lr}
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	bl sub_8053FF8
 	bl sub_8080918
 	movs r0, 0x2D
@@ -12641,7 +12641,7 @@ _08080F98: .4byte sub_8080B78
 	thumb_func_start sub_8080F9C
 sub_8080F9C: @ 8080F9C
 	push {lr}
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	bl sub_8080918
 	ldr r0, _08080FB8
 	movs r1, 0xA
@@ -12683,7 +12683,7 @@ _08080FEC:
 	beq _08081012
 	b _08081022
 _08080FF2:
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	b _0808100A
 _08080FF8:
 	bl sub_8080E64
@@ -12715,7 +12715,7 @@ _08081028: .4byte sub_8054588
 	thumb_func_start sub_808102C
 sub_808102C: @ 808102C
 	push {lr}
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	bl sub_8053FF8
 	bl sub_8080918
 	movs r0, 0x9
@@ -12835,7 +12835,7 @@ _08081118:
 	b _08081152
 _0808111E:
 	bl player_bitmagic
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	b _0808113A
 _08081128:
 	bl sub_8080E64
@@ -13063,7 +13063,7 @@ _080812F0:
 	b _0808132A
 _080812F6:
 	bl player_bitmagic
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	b _08081312
 _08081300:
 	bl sub_8080E64
@@ -13095,7 +13095,7 @@ _08081330: .4byte sub_8054534
 	thumb_func_start sub_8081334
 sub_8081334: @ 8081334
 	push {lr}
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	bl sub_8053FF8
 	bl sub_8080918
 	bl play_some_sound
@@ -13327,7 +13327,7 @@ sub_80814E8: @ 80814E8
 	lsls r0, 24
 	cmp r0, 0
 	bne _08081504
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 	adds r0, r4, 0
 	bl DestroyTask
 _08081504:
@@ -13438,7 +13438,7 @@ _080815AE:
 	movs r1, 0x50
 	bl sub_8081534
 	bl sub_8081510
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	add sp, 0x8
 	pop {r4,r5}
 	pop {r0}
@@ -13688,7 +13688,7 @@ _080817BC:
 	lsls r0, 24
 	cmp r0, 0
 	bne _08081892
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 	movs r0, 0x3
 	strh r0, [r7]
 	b _08081892
@@ -13781,7 +13781,7 @@ _08081852:
 	adds r1, 0x2
 	ldrh r0, [r7, 0x14]
 	strh r0, [r1]
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 	adds r0, r4, 0
 	bl DestroyTask
 _08081892:
@@ -13888,7 +13888,7 @@ task50_0807F0C8: @ 808193C
 	bne _08081958
 	adds r0, r4, 0
 	bl DestroyTask
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 _08081958:
 	pop {r4}
 	pop {r0}
@@ -13992,7 +13992,7 @@ _08081A14:
 	thumb_func_start sub_8081A18
 sub_8081A18: @ 8081A18
 	push {lr}
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	bl player_bitmagic
 	bl sub_80597F4
 	ldr r1, _08081A50
@@ -14021,7 +14021,7 @@ _08081A58: .4byte 0x020239f8
 	thumb_func_start sub_8081A5C
 sub_8081A5C: @ 8081A5C
 	push {lr}
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	bl player_bitmagic
 	bl sub_80597F4
 	ldr r1, _08081A98
@@ -14052,7 +14052,7 @@ _08081AA0: .4byte 0x020239f8
 	thumb_func_start sub_8081AA4
 sub_8081AA4: @ 8081AA4
 	push {lr}
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	bl player_bitmagic
 	bl sub_80597F4
 	ldr r1, _08081AD0
@@ -14098,7 +14098,7 @@ sub_8081AFC: @ 8081AFC
 	lsls r1, 1
 	movs r2, 0x5
 	bl CreateMaleMon
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	ldr r1, _08081B30
 	ldr r0, _08081B34
 	str r0, [r1, 0x8]
@@ -14122,7 +14122,7 @@ _08081B38: .4byte 0x020239f8
 	thumb_func_start sub_8081B3C
 sub_8081B3C: @ 8081B3C
 	push {lr}
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	ldr r1, _08081B6C
 	ldr r0, _08081B70
 	str r0, [r1, 0x8]
@@ -14149,7 +14149,7 @@ _08081B74: .4byte 0x020239f8
 	thumb_func_start sub_8081B78
 sub_8081B78: @ 8081B78
 	push {lr}
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	ldr r1, _08081BAC
 	ldr r0, _08081BB0
 	str r0, [r1, 0x8]
@@ -14178,7 +14178,7 @@ _08081BB4: .4byte 0x020239f8
 	thumb_func_start sub_8081BB8
 sub_8081BB8: @ 8081BB8
 	push {lr}
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	ldr r1, _08081BE8
 	ldr r0, _08081BEC
 	str r0, [r1, 0x8]
@@ -14206,7 +14206,7 @@ _08081BF4: .4byte 0x000001cf
 	thumb_func_start sub_8081BF8
 sub_8081BF8: @ 8081BF8
 	push {lr}
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	ldr r1, _08081C20
 	ldr r0, _08081C24
 	str r0, [r1, 0x8]
@@ -14247,7 +14247,7 @@ _08081C4C: .4byte 0x000001cf
 	thumb_func_start sub_8081C50
 sub_8081C50: @ 8081C50
 	push {lr}
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	ldr r1, _08081C80
 	ldr r0, _08081C84
 	str r0, [r1, 0x8]
@@ -15347,8 +15347,8 @@ SingleTrainerWantsBattle: @ 80824C0
 	adds r0, r1, 0
 	bl sub_80823C8
 	ldr r0, _08082500
-	bl script_env_1_execute_new_script
-	bl script_env_2_enable
+	bl ScriptContext1_SetupScript
+	bl ScriptContext2_Enable
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -15498,7 +15498,7 @@ sub_80825E4: @ 80825E4
 	ldr r0, _08082608
 	str r0, [r1, 0x8]
 	bl task_add_01_battle_start_with_music_and_stats
-	bl sub_80655F0
+	bl ScriptContext1_Stop
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -15594,7 +15594,7 @@ sub_80826B0: @ 80826B0
 	ldr r0, _080826D4
 	str r0, [r1, 0x8]
 	bl task_add_01_battle_start_with_music_and_stats
-	bl sub_80655F0
+	bl ScriptContext1_Stop
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -17305,7 +17305,7 @@ _0808335A:
 	ldrh r1, [r0]
 	ldr r0, _080833A0
 	bl sub_8082D4C
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 	adds r0, r5, 0
 	bl DestroyTask
 	b _080833B6
@@ -17342,7 +17342,7 @@ sub_80833C4: @ 80833C4
 	cmp r0, 0
 	bne _080833E0
 	bl sub_8082D4C
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 	adds r0, r4, 0
 	bl DestroyTask
 _080833E0:
@@ -17364,7 +17364,7 @@ sub_80833EC: @ 80833EC
 	strh r0, [r1]
 	bl sub_8082D4C
 	bl textbox_close
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 	adds r0, r4, 0
 	bl DestroyTask
 	pop {r4}
@@ -17385,7 +17385,7 @@ sub_8083418: @ 8083418
 	strh r0, [r1]
 	bl sub_8082D4C
 	bl textbox_close
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 	adds r0, r4, 0
 	bl DestroyTask
 	pop {r4}
@@ -17569,7 +17569,7 @@ _08083578:
 	cmp r1, r0
 	blt _08083578
 _08083586:
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 	adds r0, r5, 0
 	bl DestroyTask
 	b _080835CE
@@ -17596,7 +17596,7 @@ _080835BC:
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _080835CE
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 	adds r0, r5, 0
 	bl DestroyTask
 _080835CE:
@@ -18197,7 +18197,7 @@ _08083A68:
 	bl MenuZeroFillScreen
 	adds r0, r4, 0
 	bl DestroyTask
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 _08083A7E:
 	pop {r4,r5}
 	pop {r0}
@@ -18217,7 +18217,7 @@ sub_8083A84: @ 8083A84
 	adds r1, r4, 0
 	adds r2, r5, 0
 	bl SetTaskFuncWithFollowupFunc
-	bl sub_80655F0
+	bl ScriptContext1_Stop
 	pop {r4,r5}
 	pop {r0}
 	bx r0
@@ -18253,7 +18253,7 @@ _08083AD4:
 	beq _08083B20
 	b _08083B34
 _08083ADE:
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	movs r0, 0x1
 	movs r1, 0
 	bl fade_screen
@@ -18342,7 +18342,7 @@ _08083B7C: .4byte sub_8083AAC
 sub_8083B80: @ 8083B80
 	push {lr}
 	bl sub_8083B6C
-	bl sub_80655F0
+	bl ScriptContext1_Stop
 	pop {r0}
 	bx r0
 	thumb_func_end sub_8083B80
@@ -18376,7 +18376,7 @@ unref_sub_8083BB0: @ 8083BB0
 	ldr r2, _08083BD8
 	adds r1, r4, 0
 	bl SetTaskFuncWithFollowupFunc
-	bl sub_80655F0
+	bl ScriptContext1_Stop
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -18493,7 +18493,7 @@ sub_8083CA4: @ 8083CA4
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _08083CBC
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 	adds r0, r4, 0
 	bl DestroyTask
 _08083CBC:
@@ -19989,7 +19989,7 @@ sub_80847D8: @ 80847D8
 	lsls r0, 24
 	lsrs r0, 24
 	bl DestroyTask
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 	pop {r0}
 	bx r0
 	thumb_func_end sub_80847D8
@@ -21813,7 +21813,7 @@ sub_8085558: @ 8085558
 	cmp r4, 0
 	bne _08085590
 	ldr r0, _0808558C
-	bl script_env_1_execute_new_script
+	bl ScriptContext1_SetupScript
 	movs r0, 0x1
 	b _08085592
 	.align 2, 0
@@ -24003,7 +24003,7 @@ mapldr_080842E8: @ 80865DC
 	ldr r0, _080865FC
 	movs r1, 0
 	bl CreateTask
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	bl player_bitmagic
 	ldr r1, _08086600
 	movs r0, 0
@@ -24106,7 +24106,7 @@ mapldr_08084390: @ 8086684
 	movs r1, 0x3
 	bl FieldObjectTurn
 _080866C6:
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	bl player_bitmagic
 	ldr r1, _080866E8
 	movs r0, 0
@@ -24153,7 +24153,7 @@ _0808671E:
 	lsls r0, 24
 	cmp r0, 0
 	bne _08086738
-	bl script_env_2_disable
+	bl ScriptContext2_Disable
 	bl sub_806451C
 	adds r0, r5, 0
 	bl DestroyTask
@@ -24171,7 +24171,7 @@ sub_8086748: @ 8086748
 	push {lr}
 	bl sub_8053E90
 	bl pal_fill_for_maplights
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	bl player_bitmagic
 	ldr r0, _0808676C
 	movs r1, 0
@@ -24527,7 +24527,7 @@ sub_80869F8: @ 80869F8
 	ldr r1, _08086A24
 	movs r0, 0
 	strb r0, [r1, 0x6]
-	bl script_env_2_disable
+	bl ScriptContext2_Disable
 	bl CameraObjectReset1
 	bl sub_806451C
 	bl InstallCameraPanAheadCallback
@@ -24869,7 +24869,7 @@ sub_8086C94: @ 8086C94
 	push {lr}
 	bl sub_8053E90
 	bl pal_fill_for_maplights
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	ldr r0, _08086CB4
 	movs r1, 0
 	bl CreateTask
@@ -25177,7 +25177,7 @@ sub_8086ED4: @ 8086ED4
 	cmp r0, 0
 	beq _08086F18
 	bl CameraObjectReset1
-	bl script_env_2_disable
+	bl ScriptContext2_Disable
 	movs r0, 0x4
 	bl GetGoSpeed0AnimId
 	adds r1, r0, 0
@@ -25272,7 +25272,7 @@ _08086FAC: .4byte 0x030048a0
 sub_8086FB0: @ 8086FB0
 	push {r4,lr}
 	adds r4, r0, 0
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	ldr r1, _08086FCC
 	movs r0, 0x1
 	strb r0, [r1, 0x6]
@@ -25292,7 +25292,7 @@ waterfall_1_do_anim_probably: @ 8086FD0
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	adds r0, r5, 0
 	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
 	lsls r0, 24
@@ -25380,7 +25380,7 @@ _0808706E:
 	lsrs r4, r0, 24
 	cmp r4, 0
 	bne _080870A4
-	bl script_env_2_disable
+	bl ScriptContext2_Disable
 	ldr r0, _0808709C
 	strb r4, [r0, 0x6]
 	ldr r0, _080870A0
@@ -25483,7 +25483,7 @@ _08087134: .4byte 0x0202e858
 dive_2_unknown: @ 8087138
 	push {r4,lr}
 	adds r4, r0, 0
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	ldr r1, _0808715C
 	movs r2, 0x26
 	ldrsh r0, [r4, r2]
@@ -25888,7 +25888,7 @@ mapldr_080851BC: @ 8087448
 	push {lr}
 	bl sub_8053E90
 	bl pal_fill_for_maplights
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	ldr r0, _08087468
 	movs r1, 0
 	str r1, [r0]
@@ -26067,7 +26067,7 @@ sub_808759C: @ 808759C
 	ldr r1, _080875CC
 	movs r0, 0
 	strb r0, [r1, 0x6]
-	bl script_env_2_disable
+	bl ScriptContext2_Disable
 	bl sub_806451C
 	ldr r0, _080875D0
 	bl FindTaskIdByFunc
@@ -26457,7 +26457,7 @@ _080878A4:
 	thumb_func_start sub_80878A8
 sub_80878A8: @ 80878A8
 	push {lr}
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	bl player_bitmagic
 	ldr r0, _080878C0
 	movs r1, 0x50
@@ -26642,7 +26642,7 @@ mapldr_080859D4: @ 8087A28
 	push {lr}
 	bl sub_8053E90
 	bl pal_fill_for_maplights
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	bl player_bitmagic
 	ldr r1, _08087A64
 	movs r0, 0
@@ -26770,7 +26770,7 @@ _08087B12:
 	negs r0, r0
 	ands r0, r1
 	strb r0, [r6, 0x1]
-	bl script_env_2_disable
+	bl ScriptContext2_Disable
 	bl sub_806451C
 	ldr r0, _08087B58
 	bl FindTaskIdByFunc
@@ -26866,7 +26866,7 @@ _08087BE8: .4byte 0x03004b20
 sub_8087BEC: @ 8087BEC
 	push {r4,lr}
 	adds r4, r0, 0
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	bl player_bitmagic
 	bl CameraObjectReset2
 	bl player_get_direction_lower_nybble
@@ -27102,7 +27102,7 @@ mapldr_08085D88: @ 8087DCC
 	push {lr}
 	bl sub_8053E90
 	bl pal_fill_for_maplights
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	bl player_bitmagic
 	ldr r1, _08087E0C
 	movs r0, 0
@@ -27403,7 +27403,7 @@ sub_8087FDC: @ 8087FDC
 	lsrs r0, 28
 	cmp r1, r0
 	bne _08088050
-	bl script_env_2_disable
+	bl ScriptContext2_Disable
 	bl CameraObjectReset1
 	bl sub_806451C
 	ldr r0, _08088064
@@ -28620,7 +28620,7 @@ sub_8088984: @ 8088984
 	mov r6, r8
 	push {r6}
 	adds r4, r0, 0
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	bl player_bitmagic
 	ldr r5, _080889DC
 	movs r0, 0x1
@@ -28825,7 +28825,7 @@ sub_8088AF4: @ 8088AF4
 	movs r1, 0x1
 	bl sub_8127ED0
 	bl sub_806451C
-	bl script_env_2_disable
+	bl ScriptContext2_Disable
 	movs r0, 0x9
 	bl FieldEffectActiveListRemove
 	ldr r0, _08088B64
@@ -55547,8 +55547,8 @@ _08095FC8:
 	movs r2, 0xD
 	movs r3, 0x9
 	bl MenuZeroFillWindowRect
-	bl script_env_2_disable
-	bl script_env_2_enable_and_set_ctx_running
+	bl ScriptContext2_Disable
+	bl EnableBothScriptContexts
 	adds r0, r5, 0
 	bl DestroyTask
 	b _080960F4
@@ -55705,7 +55705,7 @@ sub_8096100: @ 8096100
 	movs r0, 0
 	strh r0, [r1, 0x8]
 	strh r0, [r1, 0xA]
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -80663,7 +80663,7 @@ sub_80A2634: @ 80A2634
 	ldrb r0, [r0]
 	str r0, [r1]
 	ldr r0, _080A2650
-	bl script_env_1_execute_new_script
+	bl ScriptContext1_SetupScript
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -81271,7 +81271,7 @@ _080A2ABC:
 	movs r1, 0x3A
 	bl FieldEffectStop
 	bl sub_8064E2C
-	bl script_env_2_disable
+	bl ScriptContext2_Disable
 	pop {r4-r6}
 	pop {r0}
 	bx r0
@@ -81287,7 +81287,7 @@ sub_80A2B00: @ 80A2B00
 	bl audio_play
 	movs r0, 0x2
 	bl FieldEffectActiveListRemove
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 	pop {r0}
 	bx r0
 	thumb_func_end sub_80A2B00
@@ -87595,7 +87595,7 @@ sub_80A5C9C: @ 80A5C9C
 	adds r0, r4, 0
 	bl DestroyTask
 	bl sub_8064E2C
-	bl script_env_2_disable
+	bl ScriptContext2_Disable
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -89642,7 +89642,7 @@ sub_80A6D1C: @ 80A6D1C
 	lsrs r5, r0, 24
 	cmp r5, 0x1
 	bne _080A6D80
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	bl player_bitmagic
 	bl sub_80594C0
 	bl sub_80597F4
@@ -89672,7 +89672,7 @@ _080A6D80:
 	strh r0, [r4]
 _080A6D84:
 	ldr r0, _080A6D94
-	bl script_env_1_execute_new_script
+	bl ScriptContext1_SetupScript
 _080A6D8A:
 	movs r0, 0x1
 	pop {r4,r5}
@@ -104300,8 +104300,8 @@ _080AE00C: .4byte c2_exit_to_overworld_2_switch
 	thumb_func_start sub_80AE010
 sub_80AE010: @ 80AE010
 	push {lr}
-	bl script_env_2_disable
-	bl script_env_2_enable_and_set_ctx_running
+	bl ScriptContext2_Disable
+	bl EnableBothScriptContexts
 	pop {r0}
 	bx r0
 	thumb_func_end sub_80AE010
@@ -114433,7 +114433,7 @@ CreateShopMenu: @ 80B2D54
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	ldr r1, _080B2D90
 	movs r0, 0
 	strb r4, [r1, 0xC]
@@ -114703,7 +114703,7 @@ HandleShopMenuQuit: @ 80B2F64
 	movs r3, 0x8
 	bl MenuZeroFillWindowRect
 	bl sub_80BE3BC
-	bl script_env_2_disable
+	bl ScriptContext2_Disable
 	adds r0, r4, 0
 	bl DestroyTask
 	ldr r0, _080B2F9C
@@ -117427,7 +117427,7 @@ CreatePokemartMenu: @ 80B4550
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080B4570: .4byte script_env_2_enable_and_set_ctx_running
+_080B4570: .4byte EnableBothScriptContexts
 	thumb_func_end CreatePokemartMenu
 
 	thumb_func_start CreateDecorationShop1Menu
@@ -117444,7 +117444,7 @@ CreateDecorationShop1Menu: @ 80B4574
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080B4590: .4byte script_env_2_enable_and_set_ctx_running
+_080B4590: .4byte EnableBothScriptContexts
 	thumb_func_end CreateDecorationShop1Menu
 
 	thumb_func_start CreateDecorationShop2Menu
@@ -117461,7 +117461,7 @@ CreateDecorationShop2Menu: @ 80B4594
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080B45B0: .4byte script_env_2_enable_and_set_ctx_running
+_080B45B0: .4byte EnableBothScriptContexts
 	thumb_func_end CreateDecorationShop2Menu
 
 	thumb_func_start sub_80B45B4
@@ -119307,7 +119307,7 @@ _080B532C:
 	bl MenuZeroFillWindowRect
 	adds r0, r4, 0
 	bl DestroyTask
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 _080B534E:
 	pop {r4,r5}
 	pop {r0}
@@ -119589,7 +119589,7 @@ _080B5542:
 	bl MenuZeroFillWindowRect
 	adds r0, r4, 0
 	bl DestroyTask
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 _080B556A:
 	pop {r4}
 	pop {r0}
@@ -119785,7 +119785,7 @@ _080B56D2:
 	bl MenuZeroFillWindowRect
 	adds r0, r5, 0
 	bl DestroyTask
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 _080B56F4:
 	pop {r4,r5}
 	pop {r0}
@@ -128240,7 +128240,7 @@ _080B95C0:
 	bl MenuZeroFillScreen
 	adds r0, r5, 0
 	bl DestroyTask
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 _080B95E6:
 	pop {r4,r5}
 	pop {r0}
@@ -133002,7 +133002,7 @@ sub_80BBB50: @ 80BBB50
 	lsrs r0, 24
 	cmp r0, 0x1
 	bne _080BBB80
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 	adds r0, r4, 0
 	bl DestroyTask
 _080BBB80:
@@ -133018,7 +133018,7 @@ _080BBB8C: .4byte 0x030048a0
 sub_80BBB90: @ 80BBB90
 	push {r4,lr}
 	sub sp, 0x4
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	bl HideMapNamePopUpWindow
 	mov r4, sp
 	adds r4, 0x2
@@ -133602,7 +133602,7 @@ sub_80BC038: @ 80BC038
 	bl sub_80BBFD8
 	bl sub_80BB5E4
 	ldr r0, _080BC04C
-	bl script_env_1_execute_new_script
+	bl ScriptContext1_SetupScript
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -133655,7 +133655,7 @@ _080BC09C:
 	beq _080BC0C4
 	b _080BC0E4
 _080BC0A2:
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	movs r0, 0x1
 	strh r0, [r4, 0x8]
 	b _080BC0E4
@@ -133680,7 +133680,7 @@ _080BC0C4:
 	str r1, [r0]
 	ldr r0, _080BC0F4
 	bl SetMainCallback2
-	bl script_env_2_disable
+	bl ScriptContext2_Disable
 	adds r0, r5, 0
 	bl DestroyTask
 _080BC0E4:
@@ -134378,7 +134378,7 @@ sub_80BC62C: @ 80BC62C
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	bl sub_80F944C
 	bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed
 	lsls r0, r5, 2
@@ -135162,14 +135162,14 @@ sub_80BCC54: @ 80BCC54
 	cmp r4, 0
 	bne _080BCC8C
 	ldr r0, _080BCC88
-	bl script_env_1_execute_new_script
+	bl ScriptContext1_SetupScript
 	b _080BCC92
 	.align 2, 0
 _080BCC84: .4byte 0x00004054
 _080BCC88: .4byte gUnknown_0815F399
 _080BCC8C:
 	ldr r0, _080BCCA0
-	bl script_env_1_execute_new_script
+	bl ScriptContext1_SetupScript
 _080BCC92:
 	adds r0, r5, 0
 	bl DestroyTask
@@ -150782,7 +150782,7 @@ _080C48C4: .4byte sub_80C488C
 sub_80C48C8: @ 80C48C8
 	push {lr}
 	sub sp, 0x4
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	ldr r0, _080C48F0
 	movs r1, 0xA
 	bl CreateTask
@@ -150844,7 +150844,7 @@ _080C493C: .4byte sub_80C2358
 sub_80C4940: @ 80C4940
 	push {lr}
 	sub sp, 0x4
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	ldr r0, _080C4968
 	movs r1, 0xA
 	bl CreateTask
@@ -150880,7 +150880,7 @@ sub_80C4980: @ 80C4980
 	adds r5, r0, 0
 	lsls r5, 24
 	lsrs r5, 24
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	ldr r6, _080C49B8
 	adds r0, r6, 0
 	movs r1, 0
@@ -151148,8 +151148,8 @@ _080C4B8C: .4byte sub_80C4BA4
 _080C4B90:
 	adds r0, r4, 0
 	bl DestroyTask
-	bl script_env_2_disable
-	bl script_env_2_enable_and_set_ctx_running
+	bl ScriptContext2_Disable
+	bl EnableBothScriptContexts
 _080C4B9E:
 	pop {r4}
 	pop {r0}
@@ -151189,8 +151189,8 @@ sub_80C4BCC: @ 80C4BCC
 	bne _080C4BE8
 	adds r0, r1, 0
 	bl DestroyTask
-	bl script_env_2_disable
-	bl script_env_2_enable_and_set_ctx_running
+	bl ScriptContext2_Disable
+	bl EnableBothScriptContexts
 _080C4BE8:
 	pop {r0}
 	bx r0
@@ -152800,7 +152800,7 @@ _080C580C:
 	ldr r0, _080C5820
 	strh r1, [r0]
 _080C5810:
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 	adds r0, r5, 0
 	bl DestroyTask
 _080C581A:
@@ -152817,7 +152817,7 @@ sub_80C5824: @ 80C5824
 	ldr r0, _080C5838
 	movs r1, 0x50
 	bl CreateTask
-	bl sub_80655F0
+	bl ScriptContext1_Stop
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -154288,7 +154288,7 @@ sub_80C639C: @ 80C639C
 	ldrb r0, [r0]
 	str r0, [r1]
 	ldr r0, _080C63B8
-	bl script_env_1_execute_new_script
+	bl ScriptContext1_SetupScript
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -154420,7 +154420,7 @@ sub_80C6498: @ 80C6498
 	push {lr}
 	movs r1, 0x37
 	bl FieldEffectStop
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 	pop {r0}
 	bx r0
 	thumb_func_end sub_80C6498
@@ -154433,7 +154433,7 @@ sub_80C64A8: @ 80C64A8
 	ldrb r0, [r0]
 	str r0, [r1]
 	ldr r0, _080C64C4
-	bl script_env_1_execute_new_script
+	bl ScriptContext1_SetupScript
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -154607,7 +154607,7 @@ sub_80C65FC: @ 80C65FC
 	push {lr}
 	movs r1, 0x38
 	bl FieldEffectStop
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 	pop {r0}
 	bx r0
 	thumb_func_end sub_80C65FC
@@ -154620,7 +154620,7 @@ sub_80C660C: @ 80C660C
 	ldrb r0, [r0]
 	str r0, [r1]
 	ldr r0, _080C6628
-	bl script_env_1_execute_new_script
+	bl ScriptContext1_SetupScript
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -154752,7 +154752,7 @@ sub_80C6708: @ 80C6708
 	push {lr}
 	movs r1, 0x39
 	bl FieldEffectStop
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 	pop {r0}
 	bx r0
 	thumb_func_end sub_80C6708
@@ -154874,7 +154874,7 @@ _080C6800:
 	bl CurrentMapDrawMetatileAt
 	movs r0, 0x3D
 	bl FieldEffectActiveListRemove
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 	adds r0, r5, 0
 	bl DestroyTask
 	b _080C6834
@@ -155500,7 +155500,7 @@ _080C6D38: .4byte sub_80C6C64
 sub_80C6D3C: @ 80C6D3C
 	push {r4,lr}
 	sub sp, 0x4
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	mov r4, sp
 	adds r4, 0x2
 	mov r0, sp
@@ -155734,7 +155734,7 @@ sub_80C6F28: @ 80C6F28
 	push {lr}
 	movs r1, 0x34
 	bl FieldEffectStop
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 	pop {r0}
 	bx r0
 	thumb_func_end sub_80C6F28
@@ -156063,7 +156063,7 @@ sub_80C71A0: @ 80C71A0
 	bl SetPlayerAvatarTransitionFlags
 	adds r0, r4, 0
 	bl DestroyTask
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -156673,7 +156673,7 @@ _080C7652:
 	bl audio_play
 	adds r0, r5, 0
 	bl DestroyTask
-	bl script_env_2_disable
+	bl ScriptContext2_Disable
 _080C7698:
 	pop {r4,r5}
 	pop {r0}
@@ -156697,7 +156697,7 @@ sub_80C76A0: @ 80C76A0
 	movs r1, 0xA
 	bl MapGridSetMetatileIdAt
 	bl DrawWholeMapView
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	movs r0, 0
 	str r0, [sp]
 	ldr r1, _080C76F4
@@ -157011,7 +157011,7 @@ sub_80C791C: @ 80C791C
 	ldr r0, _080C7954
 	movs r1, 0x50
 	bl CreateTask
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -158221,7 +158221,7 @@ _080C8224:
 _080C8228: .4byte 0x0203880a
 _080C822C:
 	ldr r0, _080C8238
-	bl script_env_1_execute_new_script
+	bl ScriptContext1_SetupScript
 	movs r0, 0x1
 _080C8234:
 	pop {r1}
@@ -158234,7 +158234,7 @@ _080C8238: .4byte gUnknown_081C3448
 sub_80C823C: @ 80C823C
 	push {lr}
 	ldr r0, _080C8248
-	bl script_env_1_execute_new_script
+	bl ScriptContext1_SetupScript
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -158260,7 +158260,7 @@ _080C8268:
 	cmp r0, 0x8
 	bne _080C829C
 	ldr r0, _080C828C
-	bl script_env_2_execute_new_script
+	bl ScriptContext2_RunNewScript
 	bl warp_in
 	ldr r1, _080C8290
 	ldr r0, _080C8294
@@ -158278,8 +158278,8 @@ _080C829C:
 	cmp r0, 0x7
 	bne _080C82B0
 	ldr r0, _080C82B4
-	bl script_env_1_execute_new_script
-	bl sub_80655F0
+	bl ScriptContext1_SetupScript
+	bl ScriptContext1_Stop
 	ldr r0, _080C82B8
 	bl SetMainCallback2
 _080C82B0:
@@ -160365,7 +160365,7 @@ _080C92B6:
 	bl GetOnOffBike
 _080C92CA:
 	bl sub_8064E2C
-	bl script_env_2_disable
+	bl ScriptContext2_Disable
 	adds r0, r5, 0
 	bl DestroyTask
 	pop {r4,r5}
@@ -160677,7 +160677,7 @@ sub_80C9520: @ 80C9520
 	movs r3, 0x13
 	bl MenuZeroFillWindowRect
 	bl sub_8064E2C
-	bl script_env_2_disable
+	bl ScriptContext2_Disable
 	adds r0, r4, 0
 	bl DestroyTask
 	pop {r4}
@@ -161728,9 +161728,9 @@ sub_80C9D00: @ 80C9D00
 	ldrh r0, [r0]
 	movs r1, 0x1
 	bl sub_80A9538
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	ldr r0, _080C9D2C
-	bl script_env_1_execute_new_script
+	bl ScriptContext1_SetupScript
 	adds r0, r4, 0
 	bl DestroyTask
 	pop {r4}
@@ -161783,9 +161783,9 @@ sub_80C9D74: @ 80C9D74
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	ldr r0, _080C9D94
-	bl script_env_1_execute_new_script
+	bl ScriptContext1_SetupScript
 	adds r0, r4, 0
 	bl DestroyTask
 	pop {r4}
@@ -256324,7 +256324,7 @@ sub_80F7C54: @ 80F7C54
 	ldrb r0, [r0]
 	bl sub_80F7F80
 	bl MenuDisplayMessageBox
-	bl sub_80655F0
+	bl ScriptContext1_Stop
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -257185,7 +257185,7 @@ _080F82D8:
 	ldr r0, _080F8308
 	movs r1, 0x2
 	bl sub_81DE0D0
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 	adds r0, r6, 0
 	bl DestroyTask
 	b _080F83C8
@@ -257915,7 +257915,7 @@ _080F8848:
 	bl MenuZeroFillWindowRect
 	adds r0, r6, 0
 	bl DestroyTask
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 _080F8862:
 	add sp, 0x8
 	pop {r4-r6}
@@ -260233,7 +260233,7 @@ _080F99C8: .4byte 0x02020004
 sub_80F99CC: @ 80F99CC
 	push {lr}
 	sub sp, 0x4
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	ldr r0, _080F9A04
 	movs r1, 0xA
 	bl CreateTask
@@ -260264,7 +260264,7 @@ _080F9A08: .4byte 0x03004b20
 sub_80F9A0C: @ 80F9A0C
 	push {lr}
 	sub sp, 0x4
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	ldr r0, _080F9A44
 	movs r1, 0xA
 	bl CreateTask
@@ -260295,7 +260295,7 @@ _080F9A48: .4byte 0x03004b20
 sub_80F9A4C: @ 80F9A4C
 	push {lr}
 	sub sp, 0x4
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	ldr r0, _080F9A84
 	movs r1, 0xA
 	bl CreateTask
@@ -269682,7 +269682,7 @@ sub_80FE220: @ 80FE220
 	ldr r1, _080FE238
 	movs r0, 0
 	strb r0, [r1]
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	bl sub_80FE1DC
 	bl sub_80FE394
 	pop {r0}
@@ -269910,7 +269910,7 @@ gpu_pal_decompress_alloc_tag_and_upload: @ 80FE3C4
 	cmp r0, 0
 	bne _080FE40C
 	ldr r0, _080FE408
-	bl script_env_1_execute_new_script
+	bl ScriptContext1_SetupScript
 	adds r0, r4, 0
 	bl DestroyTask
 	b _080FE412
@@ -273625,7 +273625,7 @@ _0810011C:
 	subs r0, 0x7
 	strh r0, [r2]
 	ldr r0, _08100168
-	bl script_env_1_execute_new_script
+	bl ScriptContext1_SetupScript
 _0810013C:
 	ldr r2, _0810016C
 	ldr r0, _08100170
@@ -273848,7 +273848,7 @@ c1_overworld_prev_quest: @ 81002BC
 	.align 2, 0
 _081002DC: .4byte 0x03004b20
 _081002E0:
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	ldr r0, _081002FC
 	ldrb r1, [r0, 0x7]
 	movs r0, 0x80
@@ -273913,7 +273913,7 @@ _08100360: .4byte sub_80FE948
 	thumb_func_start sub_8100364
 sub_8100364: @ 8100364
 	push {lr}
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed
 	bl pal_fill_black
 	ldr r0, _08100388
@@ -275200,7 +275200,7 @@ _08100CC4:
 	bne _08100D24
 	bl DrawWholeMapView
 	ldr r0, _08100CF0
-	bl script_env_1_execute_new_script
+	bl ScriptContext1_SetupScript
 	movs r0, 0
 	movs r1, 0
 	movs r2, 0x1D
@@ -275213,7 +275213,7 @@ _08100CC4:
 _08100CEC: .4byte 0x0202f388
 _08100CF0: .4byte gUnknown_081A2F8A
 _08100CF4:
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	adds r0, r4, 0
 	bl sub_80FED90
 	bl pal_fill_black
@@ -294253,7 +294253,7 @@ _08109B58:
 	bl MenuZeroFillWindowRect
 	adds r0, r4, 0
 	bl DestroyTask
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -294521,7 +294521,7 @@ _08109D8C:
 _08109D94:
 	adds r0, r6, 0
 	bl DestroyTask
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 	pop {r4-r6}
 	pop {r0}
 	bx r0
@@ -294547,7 +294547,7 @@ sub_8109DAC: @ 8109DAC
 	strh r0, [r1]
 	adds r0, r4, 0
 	bl DestroyTask
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -297263,7 +297263,7 @@ task08_080C9820: @ 810B34C
 	lsls r0, 24
 	lsrs r5, r0, 24
 	adds r6, r5, 0
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	ldr r1, _0810B3A0
 	movs r0, 0x1
 	strb r0, [r1, 0x6]
@@ -297507,7 +297507,7 @@ sub_810B53C: @ 810B53C
 	ldrb r0, [r0]
 	str r0, [r1]
 	ldr r0, _0810B558
-	bl script_env_1_execute_new_script
+	bl ScriptContext1_SetupScript
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -297548,7 +297548,7 @@ sub_810B58C: @ 810B58C
 	bl audio_play
 	movs r0, 0x25
 	bl FieldEffectActiveListRemove
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 	pop {r0}
 	bx r0
 	thumb_func_end sub_810B58C
@@ -300397,7 +300397,7 @@ sub_810CC34: @ 810CC34
 	ldr r0, _0810CC4C
 	bl FlagSet
 	ldr r0, _0810CC50
-	bl script_env_1_execute_new_script
+	bl ScriptContext1_SetupScript
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -301370,7 +301370,7 @@ sub_810D3C8: @ 810D3C8
 	lsls r0, 24
 	cmp r0, 0
 	beq _0810D3E2
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 	adds r0, r4, 0
 	bl DestroyTask
 _0810D3E2:
@@ -301688,7 +301688,7 @@ sub_810D618: @ 810D618
 	push {lr}
 	ldr r0, _0810D628
 	bl SetMainCallback2
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -301715,7 +301715,7 @@ _0810D648: .4byte mapldr_080CA5C0
 mapldr_080CA5C0: @ 810D64C
 	push {lr}
 	sub sp, 0x4
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	bl sub_8053E90
 	movs r0, 0x1
 	negs r0, r0
@@ -301761,7 +301761,7 @@ sub_810D6A4: @ 810D6A4
 	push {lr}
 	ldr r0, _0810D6B4
 	bl SetMainCallback2
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -301776,7 +301776,7 @@ sub_810D6B8: @ 810D6B8
 	str r1, [r0, 0x8]
 	ldr r0, _0810D6D8
 	bl SetMainCallback2
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -303024,7 +303024,7 @@ sub_810E09C: @ 810E09C
 	bne _0810E0FC
 	adds r0, r6, 0
 	bl DestroyTask
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 	b _0810E0FC
 	.align 2, 0
 _0810E0E4: .4byte gUnknown_083F8370
@@ -304074,7 +304074,7 @@ _0810E870: .4byte 0x03000760
 sub_810E874: @ 810E874
 	push {r4-r6,lr}
 	sub sp, 0x8
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	ldr r4, _0810E8B8
 	ldrb r0, [r4]
 	cmp r0, 0x5
@@ -304587,7 +304587,7 @@ sub_810EC9C: @ 810EC9C
 	lsls r0, 24
 	lsrs r0, 24
 	bl DestroyTask
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 	pop {r0}
 	bx r0
 	thumb_func_end sub_810EC9C
@@ -305095,7 +305095,7 @@ _0810F08C: .4byte 0x0202e8dc
 sub_810F090: @ 810F090
 	push {r4,r5,lr}
 	sub sp, 0x8
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	movs r0, 0
 	movs r1, 0
 	movs r2, 0xA
@@ -306085,7 +306085,7 @@ sub_810F814: @ 810F814
 	lsls r0, 24
 	lsrs r0, 24
 	bl DestroyTask
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 	pop {r0}
 	bx r0
 	thumb_func_end sub_810F814
@@ -321586,7 +321586,7 @@ sub_81175C0: @ 81175C0
 	lsls r4, 24
 	lsrs r4, 24
 	bl MenuZeroFillScreen
-	bl script_env_2_disable
+	bl ScriptContext2_Disable
 	adds r0, r4, 0
 	bl DestroyTask
 	pop {r4}
@@ -321623,7 +321623,7 @@ _08117608:
 	movs r0, 0x1
 	strh r0, [r1]
 	bl MenuZeroFillScreen
-	bl script_env_2_disable
+	bl ScriptContext2_Disable
 	adds r0, r4, 0
 	bl DestroyTask
 _0811761C:
@@ -321841,7 +321841,7 @@ _081177F8: .4byte sub_81175DC
 	thumb_func_start sub_81177FC
 sub_81177FC: @ 81177FC
 	push {lr}
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	ldr r0, _08117828
 	movs r1, 0
 	bl CreateTask
@@ -328255,7 +328255,7 @@ sub_811AA18: @ 811AA18
 	ldrb r0, [r0]
 	str r0, [r1]
 	ldr r0, _0811AA34
-	bl script_env_1_execute_new_script
+	bl ScriptContext1_SetupScript
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -328326,7 +328326,7 @@ sub_811AA9C: @ 811AA9C
 _0811AAAE:
 	movs r0, 0x28
 	bl FieldEffectActiveListRemove
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 _0811AAB8:
 	pop {r0}
 	bx r0
@@ -345344,8 +345344,8 @@ sub_81231C4: @ 81231C4
 	bne _081231E4
 	adds r0, r4, 0
 	bl DestroyTask
-	bl script_env_2_disable
-	bl script_env_2_enable_and_set_ctx_running
+	bl ScriptContext2_Disable
+	bl EnableBothScriptContexts
 _081231E4:
 	pop {r4}
 	pop {r0}
@@ -345380,7 +345380,7 @@ _08123214: .4byte sub_8123244
 sub_8123218: @ 8123218
 	push {lr}
 	sub sp, 0x4
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	ldr r0, _08123240
 	movs r1, 0x1
 	bl CreateTask
@@ -351420,10 +351420,10 @@ sub_81260EC: @ 81260EC
 	adds r5, r1, 0
 	ldr r1, _08126114
 	ldr r2, _08126118
-	bl script_env_init
+	bl InitScriptContext
 	adds r0, r4, 0
 	adds r1, r5, 0
-	bl script_setup_bytecode_script
+	bl SetupBytecodeScript
 	str r5, [r4, 0x64]
 	movs r0, 0
 	str r0, [r4, 0x68]
@@ -351441,7 +351441,7 @@ _08126118: .4byte gScriptFuncs_End
 sub_812611C: @ 812611C
 	push {r4,lr}
 	adds r4, r0, 0
-	bl sub_80653EC
+	bl RunScript
 	lsls r0, 24
 	cmp r0, 0
 	beq _08126134
@@ -351785,7 +351785,7 @@ _0812636E:
 	thumb_func_start script_status_stop_and_ret_1
 script_status_stop_and_ret_1: @ 8126374
 	push {lr}
-	bl script_stop
+	bl StopScript
 	movs r0, 0x1
 	pop {r1}
 	bx r1
@@ -351795,23 +351795,23 @@ script_status_stop_and_ret_1: @ 8126374
 sub_8126380: @ 8126380
 	push {r4-r7,lr}
 	adds r7, r0, 0
-	bl script_read_word
+	bl ScriptReadWord
 	str r0, [r7, 0x68]
 	adds r0, r7, 0
-	bl script_read_halfword
+	bl ScriptReadHalfword
 	adds r5, r0, 0
 	lsls r5, 16
 	lsrs r5, 16
 	adds r0, r7, 0
-	bl script_read_word
+	bl ScriptReadWord
 	adds r6, r0, 0
 	adds r0, r7, 0
-	bl script_read_halfword
+	bl ScriptReadHalfword
 	adds r4, r0, 0
 	lsls r4, 16
 	lsrs r4, 16
 	adds r0, r7, 0
-	bl script_read_word
+	bl ScriptReadWord
 	adds r3, r0, 0
 	adds r0, r5, 0
 	adds r1, r6, 0
@@ -351856,7 +351856,7 @@ sub_81263E4: @ 81263E4
 	adds r0, 0x1
 	str r0, [r4, 0x8]
 	adds r0, r4, 0
-	bl script_read_word
+	bl ScriptReadWord
 	ldr r1, [r4, 0x68]
 	subs r0, r1
 	ldr r1, [r4, 0x64]
@@ -351882,12 +351882,12 @@ _08126418: .4byte 0x020234cc
 sub_812641C: @ 812641C
 	push {r4,lr}
 	adds r4, r0, 0
-	bl script_read_word
+	bl ScriptReadWord
 	ldr r1, [r4, 0x68]
 	subs r0, r1
 	ldr r1, [r4, 0x64]
 	adds r0, r1
-	bl script_env_2_execute_new_script
+	bl ScriptContext2_RunNewScript
 	movs r0, 0
 	pop {r4}
 	pop {r1}
@@ -351903,7 +351903,7 @@ sub_8126438: @ 8126438
 	bl sub_80B4940
 	mov r8, r0
 	adds r0, r7, 0
-	bl script_read_word
+	bl ScriptReadWord
 	adds r4, r0, 0
 	ldr r0, [r7, 0x68]
 	subs r4, r0
@@ -352023,14 +352023,14 @@ sub_8126524: @ 8126524
 	adds r1, 0x1
 	str r1, [r4, 0x8]
 	adds r0, r4, 0
-	bl script_read_word
+	bl ScriptReadWord
 	adds r5, r0, 0
 	ldr r0, [r4, 0x68]
 	subs r5, r0
 	ldr r0, [r4, 0x64]
 	adds r5, r0
 	adds r0, r4, 0
-	bl script_read_word
+	bl ScriptReadWord
 	adds r1, r0, 0
 	ldr r0, [r4, 0x68]
 	subs r1, r0
@@ -352043,7 +352043,7 @@ sub_8126524: @ 8126524
 	adds r0, r5, 0
 	mov r2, r9
 	mov r3, r8
-	bl sub_80657A8
+	bl InitRamScript
 	movs r0, 0
 	add sp, 0x4
 	pop {r3,r4}
@@ -352106,7 +352106,7 @@ sub_81265DC: @ 81265DC
 	ldrb r4, [r1]
 	adds r1, 0x1
 	str r1, [r0, 0x8]
-	bl script_read_halfword
+	bl ScriptReadHalfword
 	adds r2, r0, 0
 	lsls r2, 16
 	lsrs r2, 16
@@ -352126,7 +352126,7 @@ sub_8126608: @ 8126608
 	push {r7}
 	sub sp, 0x88
 	adds r6, r0, 0
-	bl script_read_word
+	bl ScriptReadWord
 	ldr r1, [r6, 0x68]
 	subs r0, r1
 	ldr r1, [r6, 0x64]
@@ -352241,7 +352241,7 @@ _08126710: .4byte gOtherText_PokeWasSentOver
 sub_8126714: @ 8126714
 	push {r4,lr}
 	adds r4, r0, 0
-	bl script_read_word
+	bl ScriptReadWord
 	adds r1, r0, 0
 	ldr r0, [r4, 0x68]
 	subs r1, r0
@@ -352289,17 +352289,17 @@ _08126774: .4byte gSystemText_ClockAdjustmentUsable
 sub_8126778: @ 8126778
 	push {r4-r6,lr}
 	adds r6, r0, 0
-	bl script_read_word
+	bl ScriptReadWord
 	adds r5, r0, 0
 	adds r0, r6, 0
-	bl script_read_word
+	bl ScriptReadWord
 	adds r4, r0, 0
 	ldr r0, [r6, 0x68]
 	subs r4, r0
 	ldr r0, [r6, 0x64]
 	adds r4, r0
 	adds r0, r6, 0
-	bl script_read_word
+	bl ScriptReadWord
 	adds r1, r0, 0
 	ldr r0, [r6, 0x68]
 	subs r1, r0
@@ -352325,17 +352325,17 @@ _081267B6:
 sub_81267C0: @ 81267C0
 	push {r4-r6,lr}
 	adds r6, r0, 0
-	bl script_read_word
+	bl ScriptReadWord
 	adds r5, r0, 0
 	adds r0, r6, 0
-	bl script_read_word
+	bl ScriptReadWord
 	adds r4, r0, 0
 	ldr r0, [r6, 0x68]
 	subs r4, r0
 	ldr r0, [r6, 0x64]
 	adds r4, r0
 	adds r0, r6, 0
-	bl script_read_word
+	bl ScriptReadWord
 	adds r1, r0, 0
 	ldr r0, [r6, 0x68]
 	subs r1, r0
@@ -364388,7 +364388,7 @@ sub_812C118: @ 812C118
 	cmp r0, 0
 	bne _0812C136
 	ldr r0, _0812C140
-	bl script_env_1_execute_new_script
+	bl ScriptContext1_SetupScript
 	adds r0, r4, 0
 	bl DestroyTask
 _0812C136:
@@ -377502,7 +377502,7 @@ sub_813265C: @ 813265C
 sub_8132670: @ 8132670
 	push {lr}
 	sub sp, 0x4
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	ldr r0, _08132698
 	movs r1, 0xA
 	bl CreateTask
@@ -392553,7 +392553,7 @@ sub_8139EF8: @ 8139EF8
 	cmp r0, 0
 	bne _08139F30
 	ldr r0, _08139F2C
-	bl script_env_1_execute_new_script
+	bl ScriptContext1_SetupScript
 	b _08139F4C
 	.align 2, 0
 _08139F24: .4byte 0x030007b4
@@ -392561,7 +392561,7 @@ _08139F28: .4byte gSaveBlock2
 _08139F2C: .4byte gUnknown_08152850
 _08139F30:
 	ldr r0, _08139F38
-	bl script_env_1_execute_new_script
+	bl ScriptContext1_SetupScript
 	b _08139F4C
 	.align 2, 0
 _08139F38: .4byte gUnknown_08152C75
@@ -392571,7 +392571,7 @@ _08139F3C:
 	movs r2, 0xA
 	movs r3, 0x9
 	bl MenuZeroFillWindowRect
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 _08139F4C:
 	adds r0, r4, 0
 	bl DestroyTask
@@ -419456,7 +419456,7 @@ sub_8147408: @ 8147408
 	bl audio_play
 	ldr r0, _08147474
 	bl FlagSet
-	bl script_env_2_disable
+	bl ScriptContext2_Disable
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -419584,7 +419584,7 @@ sub_8147514: @ 8147514
 	movs r0, 0x85
 	lsls r0, 4
 	bl FlagSet
-	bl script_env_2_disable
+	bl ScriptContext2_Disable
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -419708,7 +419708,7 @@ sub_814761C: @ 814761C
 	bl audio_play
 	ldr r0, _08147688
 	bl FlagSet
-	bl script_env_2_disable
+	bl ScriptContext2_Disable
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -419806,7 +419806,7 @@ _08147730:
 	bl sub_8064E2C
 	adds r0, r5, 0
 	bl DestroyTask
-	bl script_env_2_disable
+	bl ScriptContext2_Disable
 	b _0814776A
 _08147748:
 	ldrh r0, [r4, 0x2]
@@ -419821,7 +419821,7 @@ _08147748:
 _0814775A:
 	bl sub_8064E2C
 	ldr r0, _08147770
-	bl script_env_1_execute_new_script
+	bl ScriptContext1_SetupScript
 	adds r0, r5, 0
 	bl DestroyTask
 _0814776A:
@@ -419970,7 +419970,7 @@ sub_814782C: @ 814782C
 	bne _08147884
 	adds r0, r5, 0
 	bl DestroyTask
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 	bl InstallCameraPanAheadCallback
 _08147884:
 	pop {r4,r5}
diff --git a/asm/rom_8040EB4.s b/asm/rom_8040EB4.s
index fbc7d3d34..66d18c08c 100644
--- a/asm/rom_8040EB4.s
+++ b/asm/rom_8040EB4.s
@@ -3356,7 +3356,7 @@ _0804279C:
 	movs r2, 0x1D
 	movs r3, 0xD
 	bl MenuZeroFillWindowRect
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 	b _08042816
 	.align 2, 0
 _080427DC: .4byte 0x03005ce0
@@ -3381,7 +3381,7 @@ _080427E8:
 	movs r2, 0x1D
 	movs r3, 0xD
 	bl MenuZeroFillWindowRect
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 _08042816:
 	pop {r4,r5}
 	pop {r0}
@@ -3923,7 +3923,7 @@ sub_8042C6C: @ 8042C6C
 sub_8042C80: @ 8042C80
 	push {lr}
 	sub sp, 0x4
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	ldr r0, _08042CA8
 	movs r1, 0xA
 	bl CreateTask
@@ -26165,7 +26165,7 @@ _0804E170: .4byte sub_8047CD8
 sub_804E174: @ 804E174
 	push {lr}
 	sub sp, 0x4
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	ldr r0, _0804E19C
 	movs r1, 0xA
 	bl CreateTask
diff --git a/asm/rom_8065394.s b/asm/rom_8065394.s
index 8c270b3a5..6e7b07780 100644
--- a/asm/rom_8065394.s
+++ b/asm/rom_8065394.s
@@ -440,7 +440,7 @@ _08068208:
 	bl audio_play
 _0806822C:
 	adds r0, r4, 0
-	bl script_env_1_execute_new_script
+	bl ScriptContext1_SetupScript
 	movs r0, 0x1
 _08068234:
 	pop {r4}
@@ -675,7 +675,7 @@ _080683E8:
 	bl GetFieldObjectScriptPointerByFieldObjectId
 	adds r1, r0, 0
 	ldrb r0, [r4]
-	bl sub_806580C
+	bl GetRamScript
 	adds r1, r0, 0
 _0806840C:
 	pop {r4-r6}
@@ -1109,7 +1109,7 @@ sub_8068770: @ 8068770
 	cmp r0, 0x2
 	bne _0806879C
 	ldr r0, _08068798
-	bl script_env_1_execute_new_script
+	bl ScriptContext1_SetupScript
 	movs r0, 0x1
 	b _0806879E
 	.align 2, 0
@@ -1140,7 +1140,7 @@ sub_80687A4: @ 80687A4
 	cmp r0, 0x1
 	bne _080687DC
 	ldr r0, _080687D8
-	bl script_env_1_execute_new_script
+	bl ScriptContext1_SetupScript
 	movs r0, 0x1
 	b _080687DE
 	.align 2, 0
@@ -1216,7 +1216,7 @@ mapheader_trigger_activate_at__run_now: @ 806883C
 	bl mapheader_trigger_activate_at
 	cmp r0, 0
 	beq _08068868
-	bl script_env_1_execute_new_script
+	bl ScriptContext1_SetupScript
 	movs r0, 0x1
 	b _0806886A
 	.align 2, 0
@@ -1242,7 +1242,7 @@ sub_8068870: @ 8068870
 	b _0806888C
 _08068884:
 	ldr r0, _08068890
-	bl script_env_1_execute_new_script
+	bl ScriptContext1_SetupScript
 	movs r0, 0x1
 _0806888C:
 	pop {r1}
@@ -1291,7 +1291,7 @@ _080688CC:
 _080688E6:
 	ldr r0, _080688F4
 _080688E8:
-	bl script_env_1_execute_new_script
+	bl ScriptContext1_SetupScript
 _080688EC:
 	movs r0, 0x1
 _080688EE:
@@ -1579,7 +1579,7 @@ _08068B02:
 	cmp r0, 0x1
 	bne _08068B20
 	ldr r0, _08068B1C
-	bl script_env_1_execute_new_script
+	bl ScriptContext1_SetupScript
 	movs r0, 0x1
 	b _08068B2A
 	.align 2, 0
@@ -1931,7 +1931,7 @@ _08068D92:
 	b _08068DB4
 _08068DAC:
 	adds r0, r1, 0
-	bl script_env_2_execute_new_script
+	bl ScriptContext2_RunNewScript
 _08068DB2:
 	movs r0, 0
 _08068DB4:
@@ -2952,7 +2952,7 @@ sub_80694B8: @ 80694B8
 	lsls r1, 3
 	ldr r0, _080694E8
 	adds r4, r1, r0
-	bl script_env_2_is_enabled
+	bl ScriptContext2_IsEnabled
 	lsls r0, 24
 	cmp r0, 0
 	bne _080694E0
@@ -18934,7 +18934,7 @@ sub_8071310: @ 8071310
 _08071326:
 	ldr r0, _08071334
 	bl sub_8071284
-	bl script_env_2_enable
+	bl ScriptContext2_Enable
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -19310,7 +19310,7 @@ _080715F0: .4byte sub_8071338
 _080715F4:
 	bl MenuZeroFillScreen
 	bl sub_8064E2C
-	bl script_env_2_disable
+	bl ScriptContext2_Disable
 	movs r0, 0x1
 	b _08071606
 _08071604:
@@ -19439,7 +19439,7 @@ _080716E8:
 _080716EC:
 	adds r0, r4, 0
 	bl DestroyTask
-	bl script_env_2_enable_and_set_ctx_running
+	bl EnableBothScriptContexts
 _080716F6:
 	pop {r4}
 	pop {r0}
@@ -20140,7 +20140,7 @@ sub_8071C20: @ 8071C20
 	bl audio_play
 	bl MenuZeroFillScreen
 	bl sub_8064E2C
-	bl script_env_2_disable
+	bl ScriptContext2_Disable
 	bl sub_8072DEC
 	pop {r0}
 	bx r0