changed OWScript to ScriptCommand and OWSequence to Script

4 files changed, 1185 insertions, 1185 deletions

diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm
index 80722f7..7fb9ee9 100644
--- a/src/engine/bank03.asm
+++ b/src/engine/bank03.asm
@@ -96,8 +96,8 @@ HandleOverworldMode: ; c0ce (3:40ce)
 OverworldModePointers: ; c0e0 (3:40e0)
 	dw Func_c0e8         ; on map
 	dw CallHandlePlayerMoveMode
-	dw SetOWSequenceData
-	dw EnterOWSequence
+	dw SetScriptData
+	dw EnterScript
 
 Func_c0e8: ; c0e8 (3:40e8)
 	farcall Func_10e55
@@ -107,20 +107,20 @@ CallHandlePlayerMoveMode: ; c0ed (3:40ed)
 	call HandlePlayerMoveMode
 	ret
 
-SetOWSequenceData: ; c0f1 (3:40f1)
+SetScriptData: ; c0f1 (3:40f1)
 	ld a, [wScriptNPC]
 	ld [wLoadedNPCTempIndex], a
-	farcall SetNewOWSequenceNPC
+	farcall SetNewScriptNPC
 	ld a, c
-	ld [wNextOWSequence], a
+	ld [wNextScript], a
 	ld a, b
-	ld [wNextOWSequence+1], a
+	ld [wNextScript+1], a
 	ld a, $3
 	ld [wOverworldMode], a
-	jr EnterOWSequence
+	jr EnterScript
 
-EnterOWSequence: ; c10a (3:410a)
-	ld hl, wNextOWSequence
+EnterScript: ; c10a (3:410a)
+	ld hl, wNextScript
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -758,7 +758,7 @@ AttemptPlayerMovementFromDirection: ; c5fe (3:45fe)
 	pop bc
 	ret
 
-StartScriptedMovement: ; c607 (3:4607)
+StartScript_dMovement: ; c607 (3:4607)
 	push bc
 	ld a, [wPlayerSpriteIndex]
 	ld [wWhichSprite], a
@@ -1204,18 +1204,18 @@ Func_c915: ; c915 (3:4915)
 	pop bc
 	ret
 
-SetNextNPCAndOWSequence: ; c926 (3:4926)
+SetNextNPCAndScript: ; c926 (3:4926)
 	push bc
 	call FindLoadedNPC
 	ld a, [wLoadedNPCTempIndex]
 	ld [wScriptNPC], a
-	farcall SetNewOWSequenceNPC
+	farcall SetNewScriptNPC
 	pop bc
 ;	fallthrough
 
-SetNextOWSequence: ; c935 (3:4935)
+SetNextScript: ; c935 (3:4935)
 	push hl
-	ld hl, wNextOWSequence
+	ld hl, wNextScript
 	ld [hl], c
 	inc hl
 	ld [hl], b
@@ -1732,67 +1732,67 @@ Func_cc32: ; cc32 (3:4c32)
 	call Func_c8ba
 	ret
 
-; Used for things that are represented as NPCs but don't have an OWSequence
+; Used for things that are represented as NPCs but don't have a Script
 ; EX: Clerks and legendary cards that interact through Level Objects
 NoOverworldSequence: ; cc3e (3:4c3e)
 	call CloseAdvancedDialogueBox
 	ret
 
-; Enters into the script loop, continuing until wBreakOWScriptLoop > 0
+; Enters into the script loop, continuing until wBreakScriptLoop > 0
 ; When the loop is broken, it resumes normal code execution where script ended
 ; Note: Some scripts "double return" and skip this.
 RST20: ; cc42 (3:4c42)
 	pop hl
 	ld a, l
-	ld [wOWScriptPointer], a
+	ld [wScriptPointer], a
 	ld a, h
-	ld [wOWScriptPointer+1], a
+	ld [wScriptPointer+1], a
 	xor a
-	ld [wBreakOWScriptLoop], a
+	ld [wBreakScriptLoop], a
 .continueScriptLoop
 	call RunOverworldScript
-	ld a, [wBreakOWScriptLoop] ; if you break out, it jumps
+	ld a, [wBreakScriptLoop] ; if you break out, it jumps
 	or a
 	jr z, .continueScriptLoop
-	ld hl, wOWScriptPointer
+	ld hl, wScriptPointer
 	ld a, [hli]
 	ld c, a
 	ld b, [hl]
 	retbc
 
-IncreaseOWScriptPointerBy1: ; cc60 (3:4c60)
+IncreaseScriptPointerBy1: ; cc60 (3:4c60)
 	ld a, 1
-	jr IncreaseOWScriptPointer
-IncreaseOWScriptPointerBy2: ; cc64 (3:4c64)
+	jr IncreaseScriptPointer
+IncreaseScriptPointerBy2: ; cc64 (3:4c64)
 	ld a, 2
-	jr IncreaseOWScriptPointer
-IncreaseOWScriptPointerBy4: ; cc68 (3:4c68)
+	jr IncreaseScriptPointer
+IncreaseScriptPointerBy4: ; cc68 (3:4c68)
 	ld a, 4
-	jr IncreaseOWScriptPointer
-IncreaseOWScriptPointerBy5: ; cc6c (3:4c6c)
+	jr IncreaseScriptPointer
+IncreaseScriptPointerBy5: ; cc6c (3:4c6c)
 	ld a, 5
-	jr IncreaseOWScriptPointer
-IncreaseOWScriptPointerBy6: ; cc70 (3:4c70)
+	jr IncreaseScriptPointer
+IncreaseScriptPointerBy6: ; cc70 (3:4c70)
 	ld a, 6
-	jr IncreaseOWScriptPointer
-IncreaseOWScriptPointerBy7: ; cc74 (3:4c74)
+	jr IncreaseScriptPointer
+IncreaseScriptPointerBy7: ; cc74 (3:4c74)
 	ld a, 7
-	jr IncreaseOWScriptPointer
-IncreaseOWScriptPointerBy3: ; cc78 (3:4c78)
+	jr IncreaseScriptPointer
+IncreaseScriptPointerBy3: ; cc78 (3:4c78)
 	ld a, 3
 
-IncreaseOWScriptPointer: ; cc7a (3:4c7a)
+IncreaseScriptPointer: ; cc7a (3:4c7a)
 	ld c, a
-	ld a, [wOWScriptPointer]
+	ld a, [wScriptPointer]
 	add c
-	ld [wOWScriptPointer], a
-	ld a, [wOWScriptPointer+1]
+	ld [wScriptPointer], a
+	ld a, [wScriptPointer+1]
 	adc 0
-	ld [wOWScriptPointer+1], a
+	ld [wScriptPointer+1], a
 	ret
 
-SetOWScriptPointer: ; cc8b (3:4c8b)
-	ld hl, wOWScriptPointer
+SetScriptPointer: ; cc8b (3:4c8b)
+	ld hl, wScriptPointer
 	ld [hl], c
 	inc hl
 	ld [hl], b
@@ -1801,23 +1801,23 @@ SetOWScriptPointer: ; cc8b (3:4c8b)
 
 	INCROM $cc92, $cc96
 
-GetOWSArgs1AfterPointer: ; cc96 (3:4c96)
+GetScriptArgs1AfterPointer: ; cc96 (3:4c96)
 	ld a, $1
-	jr GetOWSArgsAfterPointer
+	jr GetScriptArgsAfterPointer
 
-GetOWSArgs2AfterPointer: ; cc9a (3:4c9a)
+GetScriptArgs2AfterPointer: ; cc9a (3:4c9a)
 	ld a, $2
-	jr GetOWSArgsAfterPointer
-GetOWSArgs3AfterPointer: ; cc9e (3:4c9e)
+	jr GetScriptArgsAfterPointer
+GetScriptArgs3AfterPointer: ; cc9e (3:4c9e)
 	ld a, $3
 
-GetOWSArgsAfterPointer: ; cca0 (3:4ca0)
+GetScriptArgsAfterPointer: ; cca0 (3:4ca0)
 	push hl
 	ld l, a
-	ld a, [wOWScriptPointer]
+	ld a, [wScriptPointer]
 	add l
 	ld l, a
-	ld a, [wOWScriptPointer+1]
+	ld a, [wScriptPointer+1]
 	adc $0
 	ld h, a
 	ld a, [hli]
@@ -1838,67 +1838,67 @@ SetScriptControlByteFail: ; ccb9 (3:4cb9)
 	ret
 
 ; Exits Script mode and runs the next instruction like normal
-OWScript_EndScriptLoop1: ; ccbe (3:4cbe)
-OWScript_EndScriptLoop2: ; ccbe (3:4cbe)
-OWScript_EndScriptLoop3: ; ccbe (3:4cbe)
-OWScript_EndScriptLoop4: ; ccbe (3:4cbe)
-OWScript_EndScriptLoop5: ; ccbe (3:4cbe)
-OWScript_EndScriptLoop6: ; ccbe (3:4cbe)
-OWScript_EndScriptLoop7: ; ccbe (3:4cbe)
-OWScript_EndScriptLoop8: ; ccbe (3:4cbe)
-OWScript_EndScriptLoop9: ; ccbe (3:4cbe)
-OWScript_EndScriptLoop10: ; ccbe (3:4cbe)
+ScriptCommand_EndScriptLoop1: ; ccbe (3:4cbe)
+ScriptCommand_EndScriptLoop2: ; ccbe (3:4cbe)
+ScriptCommand_EndScriptLoop3: ; ccbe (3:4cbe)
+ScriptCommand_EndScriptLoop4: ; ccbe (3:4cbe)
+ScriptCommand_EndScriptLoop5: ; ccbe (3:4cbe)
+ScriptCommand_EndScriptLoop6: ; ccbe (3:4cbe)
+ScriptCommand_EndScriptLoop7: ; ccbe (3:4cbe)
+ScriptCommand_EndScriptLoop8: ; ccbe (3:4cbe)
+ScriptCommand_EndScriptLoop9: ; ccbe (3:4cbe)
+ScriptCommand_EndScriptLoop10: ; ccbe (3:4cbe)
 	ld a, $01
-	ld [wBreakOWScriptLoop], a
-	jp IncreaseOWScriptPointerBy1
+	ld [wBreakScriptLoop], a
+	jp IncreaseScriptPointerBy1
 
-OWScript_CloseAdvancedTextBox: ; ccc6 (3:4cc6)
+ScriptCommand_CloseAdvancedTextBox: ; ccc6 (3:4cc6)
 	call CloseAdvancedDialogueBox
-	jp IncreaseOWScriptPointerBy1
+	jp IncreaseScriptPointerBy1
 
-OWScript_QuitScriptFully: ; cccc (3:4ccc)
-	call OWScript_CloseAdvancedTextBox
-	call OWScript_EndScriptLoop1
+ScriptCommand_QuitScriptFully: ; cccc (3:4ccc)
+	call ScriptCommand_CloseAdvancedTextBox
+	call ScriptCommand_EndScriptLoop1
 	pop hl
 	ret
 
 ; args: 2-Text String Index
-OWScript_PrintTextString: ; ccd4 (3:4cd4)
+ScriptCommand_PrintTextString: ; ccd4 (3:4cd4)
 	ld l, c
 	ld h, b
 	call Func_cc32
-	jp IncreaseOWScriptPointerBy3
+	jp IncreaseScriptPointerBy3
 
 Func_ccdc: ; ccdc (3:4cdc)
 	ld l, c
 	ld h, b
 	call Func_c891
-	jp IncreaseOWScriptPointerBy3
+	jp IncreaseScriptPointerBy3
 
-OWScript_AskQuestionJumpDefaultYes: ; cce4 (3:4ce4)
+ScriptCommand_AskQuestionJumpDefaultYes: ; cce4 (3:4ce4)
 	ld a, $1
 	ld [wDefaultYesOrNo], a
 ;	fallthrough
 
 ; Asks the player a question then jumps if they answer yes. Seem to be able to
 ; take a text of 0000 to overwrite last with (yes no) prompt at the bottom
-OWScript_AskQuestionJump: ; cce9 (3:4ce9)
+ScriptCommand_AskQuestionJump: ; cce9 (3:4ce9)
 	ld l, c
 	ld h, b
 	call Func_c8ed
 	ld a, [hCurMenuItem]
 	ld [wScriptControlByte], a
 	jr c, .asm_ccfe
-	call GetOWSArgs3AfterPointer
+	call GetScriptArgs3AfterPointer
 	jr z, .asm_ccfe
-	jp SetOWScriptPointer
+	jp SetScriptPointer
 
 .asm_ccfe
-	jp IncreaseOWScriptPointerBy5
+	jp IncreaseScriptPointerBy5
 
 ; args - prize cards, deck id, duel theme index
 ; sets a battle up, doesn't start until we break out of the script system.
-OWScript_StartBattle: ; cd01 (3:4d01)
+ScriptCommand_StartBattle: ; cd01 (3:4d01)
 	call Func_cd66
 	ld a, [wScriptNPC]
 	ld l, LOADED_NPC_ID
@@ -1932,7 +1932,7 @@ asm_cd2f
 	ld [wGameEvent], a
 	ld hl, wd0b4
 	set 6, [hl]
-	jp IncreaseOWScriptPointerBy4
+	jp IncreaseScriptPointerBy4
 
 Func_cd4f: ; cd4f (3:4d4f)
 	call Func_cd66
@@ -1953,7 +1953,7 @@ Func_cd66: ; cd66 (3:4d66)
 	ld [wcc18], a
 	ld a, b
 	ld [wcc19], a
-	call GetOWSArgs3AfterPointer
+	call GetScriptArgs3AfterPointer
 	ld a, c
 	ld [wDuelTheme], a
 	ret
@@ -1963,19 +1963,19 @@ Func_cd76: ; cd76 (3:4d76)
 	ld [wGameEvent], a
 	ld hl, wd0b4
 	set 6, [hl]
-	jp IncreaseOWScriptPointerBy1
+	jp IncreaseScriptPointerBy1
 
 ; prints text arg 1 or arg 2 depending on wScriptControlByte.
-OWScript_PrintVariableText: ; cd83 (3:4d83)
+ScriptCommand_PrintVariableText: ; cd83 (3:4d83)
 	ld a, [wScriptControlByte]
 	or a
 	jr nz, .printText
-	call GetOWSArgs3AfterPointer
+	call GetScriptArgs3AfterPointer
 .printText
 	ld l, c
 	ld h, b
 	call Func_cc32
-	jp IncreaseOWScriptPointerBy5
+	jp IncreaseScriptPointerBy5
 
 Func_cd94: ; cd94 (3:4d94)
 	get_flag_value EVENT_FLAG_44
@@ -1984,32 +1984,32 @@ Unknown_cd98:
 	and $3
 	add a
 	inc a
-	call GetOWSArgsAfterPointer
+	call GetScriptArgsAfterPointer
 	ld l, c
 	ld h, b
 	call Func_cc32
-	jp IncreaseOWScriptPointerBy7
+	jp IncreaseScriptPointerBy7
 
 Func_cda8: ; cda8 (3:4da8)
 	ld a, [wScriptControlByte]
 	or a
 	jr nz, .asm_cdb1
-	call GetOWSArgs3AfterPointer
+	call GetScriptArgs3AfterPointer
 .asm_cdb1
 	ld l, c
 	ld h, b
 	call Func_c891
-	jp IncreaseOWScriptPointerBy5
+	jp IncreaseScriptPointerBy5
 
 ; Does not return to RST20 - pops an extra time to skip that.
-OWScript_PrintTextQuitFully: ; cdb9 (3:4db9)
+ScriptCommand_PrintTextQuitFully: ; cdb9 (3:4db9)
 	ld l, c
 	ld h, b
 	call Func_cc32
 	call CloseAdvancedDialogueBox
 	ld a, $1
-	ld [wBreakOWScriptLoop], a
-	call IncreaseOWScriptPointerBy3
+	ld [wBreakScriptLoop], a
+	call IncreaseScriptPointerBy3
 	pop hl
 	ret
 
@@ -2018,7 +2018,7 @@ Func_cdcb: ; cdcb (3:4dcb)
 	ld [wLoadedNPCTempIndex], a
 Func_cdd1: ; cdd1 (3:4dd1)
 	farcall Func_1c50a
-	jp IncreaseOWScriptPointerBy1
+	jp IncreaseScriptPointerBy1
 
 Func_cdd8: ; cdd8 (3:4dd8)
 	ld a, [wLoadedNPCTempIndex]
@@ -2055,11 +2055,11 @@ Func_cdf5: ; cdf5 (3:4df5)
 	ld [wTempNPC], a
 	pop af
 	ld [wLoadedNPCTempIndex], a
-	jp IncreaseOWScriptPointerBy3
+	jp IncreaseScriptPointerBy3
 
 ; Finds and executes an NPCMovement script in the table provided in bc
 ; based on the active NPC's current direction
-OWScript_MoveActiveNPCByDirection: ; ce26 (3:4e26)
+ScriptCommand_MoveActiveNPCByDirection: ; ce26 (3:4e26)
 	ld a, [wScriptNPC]
 	ld [wLoadedNPCTempIndex], a
 	farcall GetNPCDirection
@@ -2082,18 +2082,18 @@ ExecuteNPCMovement: ; ce3a (3:4e3a)
 	call DoFrameIfLCDEnabled
 	farcall Func_1c7de
 	jr nz, .asm_ce3e
-	jp IncreaseOWScriptPointerBy3
+	jp IncreaseScriptPointerBy3
 
 ; Begin a series of NPC movements on the currently talking NPC
 ; based on the series of directions pointed to by bc
-OWScript_MoveActiveNPC: ; ce4a (3:4e4a)
+ScriptCommand_MoveActiveNPC: ; ce4a (3:4e4a)
 	ld a, [wScriptNPC]
 	ld [wLoadedNPCTempIndex], a
 	jr ExecuteNPCMovement
 
 ; Begin a series of NPC movements on an arbitrary NPC
 ; based on the series of directions pointed to by bc
-OWScript_MoveWramNPC: ; ce52 (3:4e52)
+ScriptCommand_MoveWramNPC: ; ce52 (3:4e52)
 	ld a, [wLoadedNPCTempIndex]
 	push af
 	ld a, [wTempNPC]
@@ -2113,26 +2113,26 @@ ExecuteArbitraryNPCMovementFromStack
 	ld [wLoadedNPCTempIndex], a
 	ret
 
-OWScript_MoveArbitraryNPC: ; ce6f (3:4e6f)
+ScriptCommand_MoveArbitraryNPC: ; ce6f (3:4e6f)
 	ld a, [wLoadedNPCTempIndex]
 	push af
 	ld a, [wTempNPC]
 	push af
 	ld a, c
 	push af
-	call GetOWSArgs2AfterPointer
+	call GetScriptArgs2AfterPointer
 	push bc
-	call IncreaseOWScriptPointerBy1
+	call IncreaseScriptPointerBy1
 	pop bc
 	pop af
 	jr ExecuteArbitraryNPCMovementFromStack
 
-OWScript_CloseTextBox: ; ce84 (3:4e84)
+ScriptCommand_CloseTextBox: ; ce84 (3:4e84)
 	call CloseTextBox
-	jp IncreaseOWScriptPointerBy1
+	jp IncreaseScriptPointerBy1
 
 ; args: booster pack index, booster pack index, booster pack index
-OWScript_GiveBoosterPacks: ; ce8a (3:4e8a)
+ScriptCommand_GiveBoosterPacks: ; ce8a (3:4e8a)
 	xor a
 	ld [wd117], a
 	push bc
@@ -2148,16 +2148,16 @@ OWScript_GiveBoosterPacks: ; ce8a (3:4e8a)
 	cp NO_BOOSTER
 	jr z, .asm_ceb4
 	farcall BoosterPack_1031b
-	call GetOWSArgs3AfterPointer
+	call GetScriptArgs3AfterPointer
 	ld a, c
 	cp NO_BOOSTER
 	jr z, .asm_ceb4
 	farcall BoosterPack_1031b
 .asm_ceb4
 	call Func_c2d4
-	jp IncreaseOWScriptPointerBy4
+	jp IncreaseScriptPointerBy4
 
-OWScript_GiveOneOfEachTrainerBooster: ; ceba (3:4eba)
+ScriptCommand_GiveOneOfEachTrainerBooster: ; ceba (3:4eba)
 	xor a
 	ld [wd117], a
 	call Func_c2a3
@@ -2175,7 +2175,7 @@ OWScript_GiveOneOfEachTrainerBooster: ; ceba (3:4eba)
 	jr .giveBoosterLoop
 .done
 	call Func_c2d4
-	jp IncreaseOWScriptPointerBy1
+	jp IncreaseScriptPointerBy1
 
 .booster_type_table
 	db BOOSTER_COLOSSEUM_TRAINER
@@ -2186,7 +2186,7 @@ OWScript_GiveOneOfEachTrainerBooster: ; ceba (3:4eba)
 
 ; Shows the card received screen for a given promotional card
 ; arg can either be the card, $00 for a wram card, or $ff for the 4 legends
-OWScript_ShowCardReceivedScreen: ; cee2 (3:4ee2)
+ScriptCommand_ShowCardReceivedScreen: ; cee2 (3:4ee2)
 	call Func_c2a3
 	ld a, c
 	cp $ff
@@ -2204,7 +2204,7 @@ OWScript_ShowCardReceivedScreen: ; cee2 (3:4ee2)
 	call WhiteOutDMGPals
 	call DoFrameIfLCDEnabled
 	call Func_c2d4
-	jp IncreaseOWScriptPointerBy2
+	jp IncreaseScriptPointerBy2
 
 .asm_cf09
 	xor a
@@ -2225,20 +2225,20 @@ asm_cf16
 
 asm_cf19
 	call SetScriptControlByteFail
-	jp IncreaseOWScriptPointerBy4
+	jp IncreaseScriptPointerBy4
 
 asm_cf1f
 	call SetScriptControlBytePass
-	call GetOWSArgs2AfterPointer
+	call GetScriptArgs2AfterPointer
 	jr z, asm_cf2a
-	jp SetOWScriptPointer
+	jp SetScriptPointer
 
 asm_cf2a
-	jp IncreaseOWScriptPointerBy4
+	jp IncreaseScriptPointerBy4
 
 Func_cf2d: ; cf2d (3:4f2d)
 	push bc
-	call IncreaseOWScriptPointerBy1
+	call IncreaseScriptPointerBy1
 	pop bc
 	call GetRawAmountOfCardsOwned
 	ld a, h
@@ -2252,7 +2252,7 @@ Func_cf2d: ; cf2d (3:4f2d)
 	jr asm_cf19
 
 ; Gives the first arg as a card. If that's 0 pulls from wd697
-OWScript_GiveCard: ; cf3f (3:4f3f)
+ScriptCommand_GiveCard: ; cf3f (3:4f3f)
 	ld a, c
 	or a
 	jr nz, .giveCard
@@ -2260,12 +2260,12 @@ OWScript_GiveCard: ; cf3f (3:4f3f)
 
 .giveCard
 	call AddCardToCollection
-	jp IncreaseOWScriptPointerBy2
+	jp IncreaseScriptPointerBy2
 
-OWScript_TakeCard: ; cf4c (3:4f4c)
+ScriptCommand_TakeCard: ; cf4c (3:4f4c)
 	ld a, c
 	call RemoveCardFromCollection
-	jp IncreaseOWScriptPointerBy2
+	jp IncreaseScriptPointerBy2
 
 Func_cf53: ; cf53 (3:4f53)
 	ld c, $1
@@ -2284,16 +2284,16 @@ Func_cf53: ; cf53 (3:4f53)
 	jr nz, Func_cf6d
 Func_cf67: ; cf67 (3:4f67)
 	call SetScriptControlByteFail
-	jp IncreaseOWScriptPointerBy3
+	jp IncreaseScriptPointerBy3
 
 Func_cf6d: ; cf6d (3:4f6d)
 	call SetScriptControlBytePass
-	call GetOWSArgs1AfterPointer
+	call GetScriptArgs1AfterPointer
 	jr z, .asm_cf78
-	jp SetOWScriptPointer
+	jp SetScriptPointer
 
 .asm_cf78
-	jp IncreaseOWScriptPointerBy3
+	jp IncreaseScriptPointerBy3
 
 Func_cf7b: ; cf7b (3:4f7b)
 	ld c, $1
@@ -2315,7 +2315,7 @@ Func_cf7b: ; cf7b (3:4f7b)
 	ld a, c
 	cp $8
 	jr c, .asm_cf7d
-	jp IncreaseOWScriptPointerBy1
+	jp IncreaseScriptPointerBy1
 
 Func_cf96: ; cf96 (3:4f96)
 	ld c, $0
@@ -2341,19 +2341,19 @@ Func_cf96: ; cf96 (3:4f96)
 	ld a, c
 	rlca
 	add $3
-	call GetOWSArgsAfterPointer
-	jp SetOWScriptPointer
+	call GetScriptArgsAfterPointer
+	jp SetScriptPointer
 
 Func_cfc0: ; cfc0 (3:4fc0)
-	call GetOWSArgs1AfterPointer
-	jp SetOWScriptPointer
+	call GetScriptArgs1AfterPointer
+	jp SetScriptPointer
 
 Func_cfc6: ; cfc6 (3:4fc6)
 	ld a, [wScriptNPC]
 	ld [wLoadedNPCTempIndex], a
 	ld a, c
 	farcall Func_1c52e
-	jp IncreaseOWScriptPointerBy2
+	jp IncreaseScriptPointerBy2
 
 Func_cfd4: ; cfd4 (3:4fd4)
 	get_flag_value EVENT_FLAG_2D
@@ -2387,7 +2387,7 @@ Func_cfd4: ; cfd4 (3:4fd4)
 	add hl, bc
 	ld c, [hl]
 	set_flag_value EVENT_FLAG_2B
-	jp IncreaseOWScriptPointerBy1
+	jp IncreaseScriptPointerBy1
 
 Data_d006: ; d006 (3:5006)
 	INCROM $d006, $d00b
@@ -2406,7 +2406,7 @@ Func_d00b: ; d00b (3:500b)
 	ld [hl], e
 	inc hl
 	ld [hl], d
-	jp IncreaseOWScriptPointerBy2
+	jp IncreaseScriptPointerBy2
 
 Func_d025: ; d025 (3:5025)
 	get_flag_value EVENT_FLAG_2B
@@ -2423,29 +2423,29 @@ Func_d032: ; d032 (3:5032)
 Func_d03f: ; d03f (3:503f)
 	get_flag_value EVENT_FLAG_2B
 	call RemoveCardFromCollection
-	jp IncreaseOWScriptPointerBy1
+	jp IncreaseScriptPointerBy1
 
-OWScript_Jump: ; d049 (3:5049)
-	call GetOWSArgs1AfterPointer
-	jp SetOWScriptPointer
+ScriptCommand_Jump: ; d049 (3:5049)
+	call GetScriptArgs1AfterPointer
+	jp SetScriptPointer
 
-OWScript_TryGiveMedalPCPacks: ; d04f (3:504f)
+ScriptCommand_TryGiveMedalPCPacks: ; d04f (3:504f)
 	call TryGiveMedalPCPacks
-	jp IncreaseOWScriptPointerBy1
+	jp IncreaseScriptPointerBy1
 
-OWScript_SetPlayerDirection: ; d055 (3:5055)
+ScriptCommand_SetPlayerDirection: ; d055 (3:5055)
 	ld a, c
 	call UpdatePlayerDirection
-	jp IncreaseOWScriptPointerBy2
+	jp IncreaseScriptPointerBy2
 
 ; arg1 - Direction (index in PlayerMovementOffsetTable)
 ; arg2 - Tiles Moves (Speed)
-OWScript_MovePlayer: ; 505c (3:505c)
+ScriptCommand_MovePlayer: ; 505c (3:505c)
 	ld a, c
 	ld [wd339], a
 	ld a, b
 	ld [wd33a], a
-	call StartScriptedMovement
+	call StartScript_dMovement
 .asm_d067
 	call DoFrameIfLCDEnabled
 	call SetScreenScroll
@@ -2455,25 +2455,25 @@ OWScript_MovePlayer: ; 505c (3:505c)
 	jr nz, .asm_d067
 	call DoFrameIfLCDEnabled
 	call SetScreenScroll
-	jp IncreaseOWScriptPointerBy3
+	jp IncreaseScriptPointerBy3
 
-OWScript_SetDialogName: ; d080 (3:5080)
+ScriptCommand_SetDialogName: ; d080 (3:5080)
 	ld a, c
 	farcall SetNPCDialogName
-	jp IncreaseOWScriptPointerBy2
+	jp IncreaseScriptPointerBy2
 
-OWScript_SetNextNPCandOWSequence: ; d088 (3:5088)
+ScriptCommand_SetNextNPCandScript: ; d088 (3:5088)
 	ld a, c
 	ld [wTempNPC], a
-	call GetOWSArgs2AfterPointer
-	call SetNextNPCAndOWSequence
-	jp IncreaseOWScriptPointerBy4
+	call GetScriptArgs2AfterPointer
+	call SetNextNPCAndScript
+	jp IncreaseScriptPointerBy4
 
 Func_d095: ; d095 (3:5095)
 	ld a, [wScriptNPC]
 	ld [wLoadedNPCTempIndex], a
 	push bc
-	call GetOWSArgs3AfterPointer
+	call GetScriptArgs3AfterPointer
 	ld a, [wScriptNPC]
 	ld l, LOADED_NPC_FIELD_05
 	call GetItemInLoadedNPCIndex
@@ -2491,7 +2491,7 @@ Func_d095: ; d095 (3:5095)
 .asm_d0b6
 	ld a, e
 	farcall Func_1c57b
-	jp IncreaseOWScriptPointerBy4
+	jp IncreaseScriptPointerBy4
 
 Func_d0be: ; d0be (3:50be)
 	ld a, [wScriptNPC]
@@ -2500,15 +2500,15 @@ Func_d0be: ; d0be (3:50be)
 	ld c, b
 	ld b, a
 	farcall Func_1c461
-	jp IncreaseOWScriptPointerBy3
+	jp IncreaseScriptPointerBy3
 
-OWScript_DoFrames: ; d0ce (3:50ce)
+ScriptCommand_DoFrames: ; d0ce (3:50ce)
 	push bc
 	call DoFrameIfLCDEnabled
 	pop bc
 	dec c
-	jr nz, OWScript_DoFrames
-	jp IncreaseOWScriptPointerBy2
+	jr nz, ScriptCommand_DoFrames
+	jp IncreaseScriptPointerBy2
 
 Func_d0d9: ; d0d9 (3:50d9)
 	ld a, [wScriptNPC]
@@ -2524,7 +2524,7 @@ Func_d0d9: ; d0d9 (3:50d9)
 	jp nz, ScriptEventFailedNoJump
 	jp ScriptEventPassedTryJump
 
-OWScript_JumpIfPlayerCoordMatches: ; d0f2 (3:50f2)
+ScriptCommand_JumpIfPlayerCoordMatches: ; d0f2 (3:50f2)
 	ld a, [wPlayerXCoord]
 	cp c
 	jp nz, ScriptEventFailedNoJump
@@ -2562,7 +2562,7 @@ Func_d125: ; d125 (3:5125)
 	pop af
 	farcall Medal_1029e
 	call Func_c2d4
-	jp IncreaseOWScriptPointerBy2
+	jp IncreaseScriptPointerBy2
 
 Func_d135: ; d135 (3:5135)
 	sla c
@@ -2583,7 +2583,7 @@ Func_d135: ; d135 (3:5135)
 	ld [hl], e
 	inc hl
 	ld [hl], d
-	jp IncreaseOWScriptPointerBy2
+	jp IncreaseScriptPointerBy2
 
 	INCROM $d153, $d16b
 
@@ -2610,7 +2610,7 @@ Func_d16b: ; d16b (3:516b)
 	ld [hl], e
 	inc hl
 	ld [hl], d
-	jp IncreaseOWScriptPointerBy2
+	jp IncreaseScriptPointerBy2
 
 Func_d195: ; d195 (3:5195)
 	ld a, [wTempNPC]
@@ -2622,11 +2622,11 @@ Func_d195: ; d195 (3:5195)
 	call Func_f580
 	pop af
 	ld [wTempNPC], a
-	jp IncreaseOWScriptPointerBy1
+	jp IncreaseScriptPointerBy1
 
 Func_d1ad: ; d1ad (3:51ad)
 	call MainMenu_c75a
-	jp IncreaseOWScriptPointerBy1
+	jp IncreaseScriptPointerBy1
 
 Func_d1b3: ; d1b3 (3:51b3)
 	get_flag_value EVENT_FLAG_44
@@ -2653,7 +2653,7 @@ asm_d1c6
 	ld [wTxRam2], a
 	ld a, [hl]
 	ld [wTxRam2 + 1], a
-	jp IncreaseOWScriptPointerBy1
+	jp IncreaseScriptPointerBy1
 
 	INCROM $d1dc, $d209
 
@@ -2706,7 +2706,7 @@ Flags_d240: ; d240 (3:5240)
 Func_d244: ; d244 (3:5244)
 	ld a, c
 	farcall Func_80ba4
-	jp IncreaseOWScriptPointerBy2
+	jp IncreaseScriptPointerBy2
 
 Func_d24c: ; d24c (3:524c)
 	ld hl, $525e
@@ -2715,7 +2715,7 @@ Func_d24c: ; d24c (3:524c)
 	ld a, [wd695]
 	ld c, a
 	set_flag_value EVENT_FLAG_76
-	jp IncreaseOWScriptPointerBy1
+	jp IncreaseScriptPointerBy1
 
 	INCROM $d25e, $d271
 
@@ -2723,7 +2723,7 @@ Func_d271: ; d271 (3:5271)
 	ld hl, $527b
 	xor a
 	call Func_d28c
-	jp IncreaseOWScriptPointerBy1
+	jp IncreaseScriptPointerBy1
 ; 0xd27b
 
 	INCROM $d27b, $d28c
@@ -2813,7 +2813,7 @@ Func_d2f6: ; d2f6 (3:52f6)
 	set_flag_value EVENT_FLAG_75
 	xor a
 	ld [wd694], a
-	jp IncreaseOWScriptPointerBy1
+	jp IncreaseScriptPointerBy1
 ; 0xd30c
 
 	INCROM $d30c, $d317
@@ -2825,12 +2825,12 @@ Func_d317: ; d317 (3:5317)
 	ld a, [wd694]
 	ld c, a
 	set_flag_value EVENT_FLAG_75
-	jp IncreaseOWScriptPointerBy1
+	jp IncreaseScriptPointerBy1
 
 Unknown_d32b: ; d32b (3:532b)
 	INCROM $d32b, $d336
 
-OWScript_OpenDeckMachine: ; d336 (3:5336)
+ScriptCommand_OpenDeckMachine: ; d336 (3:5336)
 	push bc
 	call Func_c2a3
 	call PauseSong
@@ -2855,13 +2855,13 @@ OWScript_OpenDeckMachine: ; d336 (3:5336)
 .asm_d364
 	call ResumeSong
 	call Func_c2d4
-	jp IncreaseOWScriptPointerBy2
+	jp IncreaseScriptPointerBy2
 
 ; args: unused, room, new player x, new player y, new player direction
-OWScript_EnterMap: ; d36d (3:536d)
-	ld a, [wOWScriptPointer]
+ScriptCommand_EnterMap: ; d36d (3:536d)
+	ld a, [wScriptPointer]
 	ld l, a
-	ld a, [wOWScriptPointer+1]
+	ld a, [wScriptPointer+1]
 	ld h, a
 	inc hl
 	ld a, [hli]
@@ -2875,15 +2875,15 @@ OWScript_EnterMap: ; d36d (3:536d)
 	ld [wTempPlayerDirection], a
 	ld hl, wd0b4
 	set 4, [hl]
-	jp IncreaseOWScriptPointerBy6
+	jp IncreaseScriptPointerBy6
 
 Func_d38f: ; d38f (3:538f)
 	farcall Func_10c96
-	jp IncreaseOWScriptPointerBy2
+	jp IncreaseScriptPointerBy2
 
 Func_d396: ; d396 (3:5396)
 	farcall Func_1157c
-	jp IncreaseOWScriptPointerBy2
+	jp IncreaseScriptPointerBy2
 
 Func_d39d: ; d39d (3:539d)
 	ld a, c
@@ -2901,7 +2901,7 @@ Func_d39d: ; d39d (3:539d)
 	set 6, [hl]
 
 .asm_d3b6
-	jp IncreaseOWScriptPointerBy2
+	jp IncreaseScriptPointerBy2
 
 Func_d3b9: ; d3b9 (3:53b9)
 	call Func_3917
@@ -2909,20 +2909,20 @@ Func_d3b9: ; d3b9 (3:53b9)
 	ld [wGameEvent], a
 	ld hl, wd0b4
 	set 6, [hl]
-	jp IncreaseOWScriptPointerBy1
+	jp IncreaseScriptPointerBy1
 
-OWScript_TryGivePCPack: ; d3c9 (3:53c9)
+ScriptCommand_TryGivePCPack: ; d3c9 (3:53c9)
 	ld a, c
 	farcall TryGivePCPack
-	jp IncreaseOWScriptPointerBy2
+	jp IncreaseScriptPointerBy2
 
-OWScript_nop: ; d3d1 (3:53d1)
-    jp IncreaseOWScriptPointerBy1
+ScriptCommand_nop: ; d3d1 (3:53d1)
+    jp IncreaseScriptPointerBy1
 
 Func_d3d4: ; d3d4 (3:53d4)
 	ld a, [wd693]
 	bank1call Func_7576
-	jp IncreaseOWScriptPointerBy1
+	jp IncreaseScriptPointerBy1
 
 	INCROM $d3dd, $d3e0
 
@@ -2937,65 +2937,65 @@ Func_d3e0: ; d3e0 (3:53e0)
 	cp $2
 	jr nz, .asm_d3e9
 	farcall Func_10f2e
-	jp IncreaseOWScriptPointerBy1
+	jp IncreaseScriptPointerBy1
 
 Func_d3fe: ; d3fe (3:53fe)
 	ld a, c
 	ld [wd112], a
 	call PlaySong
-	jp IncreaseOWScriptPointerBy2
+	jp IncreaseScriptPointerBy2
 
 Func_d408: ; d408 (3:5408)
 	ld a, c
 	ld [wd111], a
-	jp IncreaseOWScriptPointerBy2
+	jp IncreaseScriptPointerBy2
 
 Func_d40f: ; d40f (3:540f)
 	ld a, c
 	call CallPlaySong
-	jp IncreaseOWScriptPointerBy2
+	jp IncreaseScriptPointerBy2
 
-OWScript_PlaySFX: ; d416 (3:5416)
+ScriptCommand_PlaySFX: ; d416 (3:5416)
 	ld a, c
 	call PlaySFX
-	jp IncreaseOWScriptPointerBy2
+	jp IncreaseScriptPointerBy2
 
 Func_d41d: ; d41d (3:541d)
 	call Func_39fc
-	jp IncreaseOWScriptPointerBy1
+	jp IncreaseScriptPointerBy1
 
-OWScript_PauseSong: ; d423 (3:5423)
+ScriptCommand_PauseSong: ; d423 (3:5423)
 	call PauseSong
-	jp IncreaseOWScriptPointerBy1
+	jp IncreaseScriptPointerBy1
 
-OWScript_ResumeSong: ; d429 (3:5429)
+ScriptCommand_ResumeSong: ; d429 (3:5429)
 	call ResumeSong
-	jp IncreaseOWScriptPointerBy1
+	jp IncreaseScriptPointerBy1
 
-OWScript_WaitForSongToFinish: ; d42f (3:542f)
+ScriptCommand_WaitForSongToFinish: ; d42f (3:542f)
 	call WaitForSongToFinish
-	jp IncreaseOWScriptPointerBy1
+	jp IncreaseScriptPointerBy1
 
 Func_d435: ; d435 (3:5435)
 	ld a, c
 	farcall Func_1c83d
-	jp IncreaseOWScriptPointerBy2
+	jp IncreaseScriptPointerBy2
 
 Func_d43d: ; d43d (3:543d)
 	ld a, GAME_EVENT_CHALLENGE_MACHINE
 	ld [wGameEvent], a
 	ld hl, wd0b4
 	set 6, [hl]
-	jp IncreaseOWScriptPointerBy1
+	jp IncreaseScriptPointerBy1
 
 ; sets the event flag in arg 1 to the value in arg 2
-OWScript_SetFlagValue: ; d44a (3:544a)
+ScriptCommand_SetFlagValue: ; d44a (3:544a)
 	ld a, c
 	ld c, b
 	call SetEventFlagValue
-	jp IncreaseOWScriptPointerBy3
+	jp IncreaseScriptPointerBy3
 
-OWScript_IncrementFlagValue: ; d452 (3:5452)
+ScriptCommand_IncrementFlagValue: ; d452 (3:5452)
 	ld a, c
 	push af
 	call GetEventFlagValue
@@ -3003,72 +3003,72 @@ OWScript_IncrementFlagValue: ; d452 (3:5452)
 	ld c, a
 	pop af
 	call SetEventFlagValue
-	jp IncreaseOWScriptPointerBy2
+	jp IncreaseScriptPointerBy2
 
-OWScript_JumpIfFlagZero1: ; d460 (3:5460)
+ScriptCommand_JumpIfFlagZero1: ; d460 (3:5460)
 	ld a, c
 	call GetEventFlagValue
 	or a
-	jr z, OWScript_JumpIfFlagZero1.passTryJump
+	jr z, ScriptCommand_JumpIfFlagZero1.passTryJump
 
 .fail
 	call SetScriptControlByteFail
-	jp IncreaseOWScriptPointerBy4
+	jp IncreaseScriptPointerBy4
 
 .passTryJump
 	call SetScriptControlBytePass
-	call GetOWSArgs2AfterPointer
+	call GetScriptArgs2AfterPointer
 	jr z, .noJumpTarget
-	jp SetOWScriptPointer
+	jp SetScriptPointer
 
 .noJumpTarget
-	jp IncreaseOWScriptPointerBy4
+	jp IncreaseScriptPointerBy4
 
-OWScript_JumpIfFlagNonzero1: ; d47b (3:547b)
+ScriptCommand_JumpIfFlagNonzero1: ; d47b (3:547b)
 	ld a, c
 	call GetEventFlagValue
 	or a
-	jr nz, OWScript_JumpIfFlagZero1.passTryJump
-	jr OWScript_JumpIfFlagZero1.fail
+	jr nz, ScriptCommand_JumpIfFlagZero1.passTryJump
+	jr ScriptCommand_JumpIfFlagZero1.fail
 
 ; args - event flag, value, jump address
-OWScript_JumpIfFlagEqual: ; d484 (3:5484)
+ScriptCommand_JumpIfFlagEqual: ; d484 (3:5484)
 	call GetEventFlagValueBC
 	cp c
 	jr z, ScriptEventPassedTryJump
 
 ScriptEventFailedNoJump ; d48a (3:548a)
 	call SetScriptControlByteFail
-	jp IncreaseOWScriptPointerBy5
+	jp IncreaseScriptPointerBy5
 
 ScriptEventPassedTryJump ; d490 (3:5490)
 	call SetScriptControlBytePass
-	call GetOWSArgs3AfterPointer
+	call GetScriptArgs3AfterPointer
 	jr z, .noJumpAddress
-	jp SetOWScriptPointer
+	jp SetScriptPointer
 
 .noJumpAddress
-	jp IncreaseOWScriptPointerBy5
+	jp IncreaseScriptPointerBy5
 
-OWScript_JumpIfFlagNotEqual: ; d49e (3:549e)
+ScriptCommand_JumpIfFlagNotEqual: ; d49e (3:549e)
 	call GetEventFlagValueBC
 	cp c
 	jr nz, ScriptEventPassedTryJump
 	jr ScriptEventFailedNoJump
 
-OWScript_JumpIfFlagNotLessThan: ; d4a6 (3:54a6)
+ScriptCommand_JumpIfFlagNotLessThan: ; d4a6 (3:54a6)
 	call GetEventFlagValueBC
 	cp c
 	jr nc, ScriptEventPassedTryJump
 	jr ScriptEventFailedNoJump
 
-OWScript_JumpIfFlagLessThan: ; d4ae (3:54ae)
+ScriptCommand_JumpIfFlagLessThan: ; d4ae (3:54ae)
 	call GetEventFlagValueBC
 	cp c
 	jr c, ScriptEventPassedTryJump
 	jr ScriptEventFailedNoJump
 
-; Gets event flag at c (OWScript defaults)
+; Gets event flag at c (Script defaults)
 ; c takes on the value of b as a side effect
 GetEventFlagValueBC: ; d4b6 (3:54b6)
 	ld a, c
@@ -3076,39 +3076,39 @@ GetEventFlagValueBC: ; d4b6 (3:54b6)
 	call GetEventFlagValue
 	ret
 
-OWScript_MaxOutFlagValue: ; d4bc (3:54bc)
+ScriptCommand_MaxOutFlagValue: ; d4bc (3:54bc)
 	ld a, c
 	call MaxOutEventFlag
-	jp IncreaseOWScriptPointerBy2
+	jp IncreaseScriptPointerBy2
 
-OWScript_ZeroOutFlagValue: ; d4c3 (3:54c3)
+ScriptCommand_ZeroOutFlagValue: ; d4c3 (3:54c3)
 	ld a, c
 	call ZeroOutEventFlag
-	jp IncreaseOWScriptPointerBy2
+	jp IncreaseScriptPointerBy2
 
-OWScript_JumpIfFlagNonzero2: ; d4ca (3:54ca)
+ScriptCommand_JumpIfFlagNonzero2: ; d4ca (3:54ca)
 	ld a, c
 	call GetEventFlagValue
 	or a
-	jr z, OWScript_JumpIfFlagZero2.fail
+	jr z, ScriptCommand_JumpIfFlagZero2.fail
 
 .passTryJump:
 	call SetScriptControlBytePass
-	call GetOWSArgs2AfterPointer
+	call GetScriptArgs2AfterPointer
 	jr z, .noJumpArgs
-	jp SetOWScriptPointer
+	jp SetScriptPointer
 .noJumpArgs
-	jp IncreaseOWScriptPointerBy4
+	jp IncreaseScriptPointerBy4
 
-OWScript_JumpIfFlagZero2:
+ScriptCommand_JumpIfFlagZero2:
 	ld a, c
 	call GetEventFlagValue
 	or a
-	jr z, OWScript_JumpIfFlagNonzero2.passTryJump
+	jr z, ScriptCommand_JumpIfFlagNonzero2.passTryJump
 
 .fail
 	call SetScriptControlByteFail
-	jp IncreaseOWScriptPointerBy4
+	jp IncreaseScriptPointerBy4
 ; 0xd4ec
 
 LoadOverworld: ; d4ec (3:54ec)
@@ -3116,8 +3116,8 @@ LoadOverworld: ; d4ec (3:54ec)
 	get_flag_value EVENT_FLAG_3E
 	or a
 	ret nz
-	ld bc, OWSequence_BeginGame
-	jp SetNextOWSequence
+	ld bc, Script_BeginGame
+	jp SetNextScript
 
 Func_d4fb: ; d4fb (3:54fb)
 	zero_flag_value EVENT_FLAG_59
@@ -3143,20 +3143,20 @@ Func_d4fb: ; d4fb (3:54fb)
 	set_flag_value EVENT_FLAG_3F
 	ret
 
-OWSequence_BeginGame: ; d52e (3:552e)
+Script_BeginGame: ; d52e (3:552e)
 	start_script
-	run_script OWScript_DoFrames
+	run_script ScriptCommand_DoFrames
 	db $3c
 	run_script Func_d3e0
-	run_script OWScript_DoFrames
+	run_script ScriptCommand_DoFrames
 	db $78
-	run_script OWScript_EnterMap
+	run_script ScriptCommand_EnterMap
 	db $02
 	db MASON_LABORATORY
 	db 14
 	db 26
 	db NORTH
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 
 MasonLaboratoryAfterDuel: ; d53b (3:553b)
 	ld hl, .after_duel_table
@@ -3177,8 +3177,8 @@ MasonLabLoadMap: ; d549 (3:5549)
 	ld a, NPC_DRMASON
 	ld [wTempNPC], a
 	call FindLoadedNPC
-	ld bc, OWSequence_EnterLabFirstTime
-	jp SetNextNPCAndOWSequence
+	ld bc, Script_EnterLabFirstTime
+	jp SetNextNPCAndScript
 
 MasonLabCloseTextBox: ; d55e (3:555e)
 	ld a, $0a
@@ -3196,224 +3196,224 @@ MasonLabPressedA: ; d565 (3:5565)
 
 ChallengeMachineObjectTable: ; d572 (3:5572)
 	db 10, 4, NORTH
-	dw OWSequence_ChallengeMachine
+	dw Script_ChallengeMachine
 	db 12, 4, NORTH
-	dw OWSequence_ChallengeMachine
+	dw Script_ChallengeMachine
 	db $00
 
-OWSequence_ChallengeMachine: ; d57d (3:557d)
+Script_ChallengeMachine: ; d57d (3:557d)
 	start_script
 	run_script Func_ccdc
 	tx Text05bd
 	run_script Func_d43d
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 
 	INCROM $d583, $d753
 
-OWSequence_EnterLabFirstTime: ; d753 (3:5753)
+Script_EnterLabFirstTime: ; d753 (3:5753)
 	start_script
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db NORTH
 	db $02
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db NORTH
 	db $02
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db NORTH
 	db $02
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db NORTH
 	db $02
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db NORTH
 	db $02
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db NORTH
 	db $02
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db NORTH
 	db $02
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db NORTH
 	db $02
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db NORTH
 	db $02
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text05e3
-	run_script OWScript_CloseAdvancedTextBox
-	run_script OWScript_SetNextNPCandOWSequence
+	run_script ScriptCommand_CloseAdvancedTextBox
+	run_script ScriptCommand_SetNextNPCandScript
 	db NPC_SAM
-	dw OWSequence_d779
-	run_script OWScript_EndScriptLoop1
+	dw Script_d779
+	run_script ScriptCommand_EndScriptLoop1
 	ret
 
-OWSequence_d779: ; d779 (03:5779)
+Script_d779: ; d779 (03:5779)
 	start_script
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_d880
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text05e4
-	run_script OWScript_SetDialogName
+	run_script ScriptCommand_SetDialogName
 	db NPC_DRMASON
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text05e5
-	run_script OWScript_CloseTextBox
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_CloseTextBox
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_d882
 	run_script Func_cfc6
 	db $01
-	run_script OWScript_SetPlayerDirection
+	run_script ScriptCommand_SetPlayerDirection
 	db $03
-	run_script OWScript_CloseAdvancedTextBox
-	run_script OWScript_SetNextNPCandOWSequence
+	run_script ScriptCommand_CloseAdvancedTextBox
+	run_script ScriptCommand_SetNextNPCandScript
 	db NPC_DRMASON
-	dw OWSequence_d794
-	run_script OWScript_EndScriptLoop1
+	dw Script_d794
+	run_script ScriptCommand_EndScriptLoop1
 	ret
 
-OWSequence_d794: ; d794 (3:5794)
+Script_d794: ; d794 (3:5794)
 	start_script
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_d88b
-	run_script OWScript_DoFrames
+	run_script ScriptCommand_DoFrames
 	db 40
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text05e6
-	run_script OWScript_CloseTextBox
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_CloseTextBox
+	run_script ScriptCommand_MovePlayer
 	db WEST
 	db $01
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db WEST
 	db $01
-	run_script OWScript_SetPlayerDirection
+	run_script ScriptCommand_SetPlayerDirection
 	db SOUTH
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db SOUTH
 	db $01
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db SOUTH
 	db $01
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db SOUTH
 	db $01
-	run_script OWScript_SetPlayerDirection
+	run_script ScriptCommand_SetPlayerDirection
 	db WEST
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_d894
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text05e7
-	run_script OWScript_SetDialogName
+	run_script ScriptCommand_SetDialogName
 	db $07
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text05e8
 
 .ows_d7bc
-	run_script OWScript_CloseTextBox
+	run_script ScriptCommand_CloseTextBox
 	run_script Func_d317
-	run_script OWScript_CloseTextBox
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_CloseTextBox
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_75
 	db $07
 	dw .ows_d80c
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_75
 	db $01
 	dw .ows_d7e8
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_75
 	db $02
 	dw .ows_d7ee
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_75
 	db $03
 	dw .ows_d7f4
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_75
 	db $04
 	dw .ows_d7fa
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_75
 	db $05
 	dw .ows_d800
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_75
 	db $06
 	dw .ows_d806
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text05d6
-	run_script OWScript_Jump
+	run_script ScriptCommand_Jump
 	dw .ows_d7bc
 
 .ows_d7e8
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text05d7
-	run_script OWScript_Jump
+	run_script ScriptCommand_Jump
 	dw .ows_d7bc
 
 .ows_d7ee
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text05d8
-	run_script OWScript_Jump
+	run_script ScriptCommand_Jump
 	dw .ows_d7bc
 
 .ows_d7f4
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text05d9
-	run_script OWScript_Jump
+	run_script ScriptCommand_Jump
 	dw .ows_d7bc
 
 .ows_d7fa
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text05da
-	run_script OWScript_Jump
+	run_script ScriptCommand_Jump
 	dw .ows_d7bc
 
 .ows_d800
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text05db
-	run_script OWScript_Jump
+	run_script ScriptCommand_Jump
 	dw .ows_d7bc
 
 .ows_d806
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text05dc
-	run_script OWScript_Jump
+	run_script ScriptCommand_Jump
 	dw .ows_d7bc
 
 .ows_d80c
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text05e9
-	run_script OWScript_AskQuestionJumpDefaultYes
+	run_script ScriptCommand_AskQuestionJumpDefaultYes
 	dw 0000
 	dw .ows_d817
-	run_script OWScript_Jump
+	run_script ScriptCommand_Jump
 	dw .ows_d7bc
 
 .ows_d817
-	run_script OWScript_SetDialogName
+	run_script ScriptCommand_SetDialogName
 	db $01
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text05ea
-	run_script OWScript_nop
-	run_script OWScript_SetFlagValue
+	run_script ScriptCommand_nop
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_FLAG_3E
 	db $01
-	run_script OWScript_CloseAdvancedTextBox
-	run_script OWScript_SetNextNPCandOWSequence
+	run_script ScriptCommand_CloseAdvancedTextBox
+	run_script ScriptCommand_SetNextNPCandScript
 	db NPC_SAM
-	dw OWSequence_d827
-	run_script OWScript_EndScriptLoop1
+	dw Script_d827
+	run_script ScriptCommand_EndScriptLoop1
 	ret
 
-OWSequence_d827: ; d827 (3:5827)
+Script_d827: ; d827 (3:5827)
 	start_script
-	run_script OWScript_StartBattle
+	run_script ScriptCommand_StartBattle
 	db PRIZES_2
 	db SAMS_PRACTICE_DECK_ID
 	db MUSIC_DUEL_THEME_1
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 ; 0xd82d
 
 	INCROM $d82d, $d880
@@ -3450,19 +3450,19 @@ NPCMovement_d894: ; d894 (4:5894)
 
 	INCROM $d896, $d932
 
-OWSequence_d932: ; d932 (3:5932)
+Script_d932: ; d932 (3:5932)
 	start_script
 	run_script Func_ccdc
 	tx Text0605
-	run_script OWScript_AskQuestionJumpDefaultYes
+	run_script ScriptCommand_AskQuestionJumpDefaultYes
 	tx Text0606
 	dw .ows_d93c
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 
 .ows_d93c
-	run_script OWScript_OpenDeckMachine
+	run_script ScriptCommand_OpenDeckMachine
 	db $09
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 ; 0xd93f
 
 	INCROM $d93f, $dadd
@@ -3488,232 +3488,232 @@ Preload_IshiharaInIshiharasHouse: ; db3d (3:5b3d)
 	cp $08
 	ret
 
-OWSequence_Ishihara: ; db4a (3:5b4a)
+Script_Ishihara: ; db4a (3:5b4a)
 	start_script
-	run_script OWScript_MaxOutFlagValue
+	run_script ScriptCommand_MaxOutFlagValue
 	db EVENT_FLAG_1D
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_1F
 	db $00
 	dw .ows_db80
-	run_script OWScript_JumpIfFlagNonzero2
+	run_script ScriptCommand_JumpIfFlagNonzero2
 	db EVENT_FLAG_39
 	dw .ows_db5a
-	run_script OWScript_JumpIfFlagNonzero2
+	run_script ScriptCommand_JumpIfFlagNonzero2
 	db EVENT_RECEIVED_LEGENDARY_CARD
 	dw .ows_dc3e
 .ows_db5a
-	run_script OWScript_JumpIfFlagNonzero2
+	run_script ScriptCommand_JumpIfFlagNonzero2
 	db EVENT_FLAG_00
 	dw .ows_db90
-	run_script OWScript_JumpIfFlagZero2
+	run_script ScriptCommand_JumpIfFlagZero2
 	db EVENT_FLAG_38
 	dw .ows_db90
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_1F
 	db $01
 	dw .ows_db93
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_1F
 	db $02
 	dw .ows_db93
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_1F
 	db $03
 	dw .ows_dbcc
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_1F
 	db $04
 	dw .ows_dbcc
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_1F
 	db $05
 	dw .ows_dc05
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_1F
 	db $06
 	dw .ows_dc05
 .ows_db80
-	run_script OWScript_MaxOutFlagValue
+	run_script ScriptCommand_MaxOutFlagValue
 	db EVENT_FLAG_00
-	run_script OWScript_SetFlagValue
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_FLAG_1F
 	db $01
-	run_script OWScript_ZeroOutFlagValue
+	run_script ScriptCommand_ZeroOutFlagValue
 	db EVENT_FLAG_38
-	run_script OWScript_JumpIfFlagZero2
+	run_script ScriptCommand_JumpIfFlagZero2
 	db EVENT_RECEIVED_LEGENDARY_CARD
 	dw .ows_db8d
-	run_script OWScript_MaxOutFlagValue
+	run_script ScriptCommand_MaxOutFlagValue
 	db EVENT_FLAG_39
 .ows_db8d
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text0727
 
 .ows_db90
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text0728
 
 .ows_db93
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_1F
 	db $01
 	dw NO_JUMP
-	run_script OWScript_PrintVariableText
+	run_script ScriptCommand_PrintVariableText
 	tx Text0729
 	tx Text072a
-	run_script OWScript_SetFlagValue
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_FLAG_1F
 	db $02
-	run_script OWScript_AskQuestionJump
+	run_script ScriptCommand_AskQuestionJump
 	tx Text072b
 	dw .ows_dba8
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text072c
 
 .ows_dba8
 	run_script Func_cf0c
 	db $ac
 	dw .ows_dbaf
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text072d
 
 .ows_dbaf
 	run_script Func_cf12
 	db $ac
 	dw .ows_dbb6
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text072e
 
 .ows_dbb6
-	run_script OWScript_MaxOutFlagValue
+	run_script ScriptCommand_MaxOutFlagValue
 	db EVENT_FLAG_00
-	run_script OWScript_SetFlagValue
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_FLAG_1F
 	db $03
-	run_script OWScript_ZeroOutFlagValue
+	run_script ScriptCommand_ZeroOutFlagValue
 	db EVENT_FLAG_38
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text072f
 	run_script Func_ccdc
 	tx Text0730
-	run_script OWScript_TakeCard
+	run_script ScriptCommand_TakeCard
 	db CLEFABLE
-	run_script OWScript_GiveCard
+	run_script ScriptCommand_GiveCard
 	db SURFING_PIKACHU1
-	run_script OWScript_ShowCardReceivedScreen
+	run_script ScriptCommand_ShowCardReceivedScreen
 	db SURFING_PIKACHU1
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text0731
 
 .ows_dbcc
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_1F
 	db $03
 	dw NO_JUMP
-	run_script OWScript_PrintVariableText
+	run_script ScriptCommand_PrintVariableText
 	tx Text0732
 	tx Text0733
-	run_script OWScript_SetFlagValue
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_FLAG_1F
 	db $04
-	run_script OWScript_AskQuestionJump
+	run_script ScriptCommand_AskQuestionJump
 	tx Text072b
 	dw .ows_dbe1
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text072c
 
 .ows_dbe1
 	run_script Func_cf0c
 	db $bb
 	dw .ows_dbe8
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text0734
 
 .ows_dbe8
 	run_script Func_cf12
 	db $bb
 	dw .ows_dbef
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text0735
 
 .ows_dbef
-	run_script OWScript_MaxOutFlagValue
+	run_script ScriptCommand_MaxOutFlagValue
 	db EVENT_FLAG_00
-	run_script OWScript_SetFlagValue
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_FLAG_1F
 	db $05
-	run_script OWScript_ZeroOutFlagValue
+	run_script ScriptCommand_ZeroOutFlagValue
 	db EVENT_FLAG_38
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text072f
 	run_script Func_ccdc
 	tx Text0736
-	run_script OWScript_TakeCard
+	run_script ScriptCommand_TakeCard
 	db DITTO
-	run_script OWScript_GiveCard
+	run_script ScriptCommand_GiveCard
 	db FLYING_PIKACHU
-	run_script OWScript_ShowCardReceivedScreen
+	run_script ScriptCommand_ShowCardReceivedScreen
 	db FLYING_PIKACHU
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text0737
 
 .ows_dc05
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_1F
 	db $05
 	dw NO_JUMP
-	run_script OWScript_PrintVariableText
+	run_script ScriptCommand_PrintVariableText
 	tx Text0738
 	tx Text0739
-	run_script OWScript_SetFlagValue
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_FLAG_1F
 	db $06
-	run_script OWScript_AskQuestionJump
+	run_script ScriptCommand_AskQuestionJump
 	tx Text072b
 	dw .ows_dc1a
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text072c
 
 .ows_dc1a
 	run_script Func_cf0c
 	db $b8
 	dw .ows_dc21
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text073a
 
 .ows_dc21
 	run_script Func_cf12
 	db $b8
 	dw .ows_dc28
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text073b
 
 .ows_dc28
-	run_script OWScript_MaxOutFlagValue
+	run_script ScriptCommand_MaxOutFlagValue
 	db EVENT_FLAG_00
-	run_script OWScript_SetFlagValue
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_FLAG_1F
 	db $07
-	run_script OWScript_ZeroOutFlagValue
+	run_script ScriptCommand_ZeroOutFlagValue
 	db EVENT_FLAG_38
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text072f
 	run_script Func_ccdc
 	tx Text073c
-	run_script OWScript_TakeCard
+	run_script ScriptCommand_TakeCard
 	db CHANSEY
-	run_script OWScript_GiveCard
+	run_script ScriptCommand_GiveCard
 	db SURFING_PIKACHU2
-	run_script OWScript_ShowCardReceivedScreen
+	run_script ScriptCommand_ShowCardReceivedScreen
 	db SURFING_PIKACHU2
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text073d
 
 .ows_dc3e
-	run_script OWScript_MaxOutFlagValue
+	run_script ScriptCommand_MaxOutFlagValue
 	db EVENT_FLAG_39
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text073e
 
 Preload_Ronald1InIshiharasHouse: ; dc43 (3:5c43)
@@ -3722,27 +3722,27 @@ Preload_Ronald1InIshiharasHouse: ; dc43 (3:5c43)
 	ccf
 	ret
 
-OWSequence_Ronald: ; dc4b (3:5c4b)
+Script_Ronald: ; dc4b (3:5c4b)
 	start_script
-	run_script OWScript_JumpIfFlagNonzero2
+	run_script ScriptCommand_JumpIfFlagNonzero2
 	db EVENT_FLAG_4E
 	dw .ows_dc55
-	run_script OWScript_MaxOutFlagValue
+	run_script ScriptCommand_MaxOutFlagValue
 	db EVENT_FLAG_4E
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text073f
 
 .ows_dc55
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0740
-	run_script OWScript_AskQuestionJump
+	run_script ScriptCommand_AskQuestionJump
 	tx Text0741
 	dw .ows_dc60
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text0742
 
 .ows_dc60
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text0743
 ; 0xdc63
 
@@ -3750,9 +3750,9 @@ OWSequence_Ronald: ; dc4b (3:5c4b)
 	; someone thinking that the Ronald script ended with more code execution
 	ret
 
-OWSequence_Clerk1: ; dc64 (3:5c64)
+Script_Clerk1: ; dc64 (3:5c64)
 	start_script
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text045a
 
 FightingClubLobbyAfterDuel: ; dc68 (3:5c68)
@@ -3762,118 +3762,118 @@ FightingClubLobbyAfterDuel: ; dc68 (3:5c68)
 .after_duel_table
 	db NPC_IMAKUNI
 	db NPC_IMAKUNI
-	dw OWSequence_BeatImakuni
-	dw OWSequence_LostToImakuni
+	dw Script_BeatImakuni
+	dw Script_LostToImakuni
 	db $00
 
 	INCROM $dc76, $dd0d
 
-OWSequence_Imakuni: ; dd0d (3:5d0d)
+Script_Imakuni: ; dd0d (3:5d0d)
 	start_script
-	run_script OWScript_SetFlagValue
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_IMAKUNI_STATE
 	db IMAKUNI_TALKED
-	run_script OWScript_JumpIfFlagZero2
+	run_script ScriptCommand_JumpIfFlagZero2
 	db EVENT_TEMP_TALKED_TO_IMAKUNI
 	dw NO_JUMP
-	run_script OWScript_PrintVariableText
+	run_script ScriptCommand_PrintVariableText
 	tx Text0467
 	tx Text0468
-	run_script OWScript_MaxOutFlagValue
+	run_script ScriptCommand_MaxOutFlagValue
 	db EVENT_TEMP_TALKED_TO_IMAKUNI
-	run_script OWScript_AskQuestionJump
+	run_script ScriptCommand_AskQuestionJump
 	tx Text0469
 	dw .declineDuel
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text046a
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 
 .declineDuel
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text046b
-	run_script OWScript_StartBattle
+	run_script ScriptCommand_StartBattle
 	db PRIZES_6
 	db IMAKUNI_DECK_ID
 	db MUSIC_IMAKUNI
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 ; 0xdd2d
 
-OWSequence_BeatImakuni: ; dd2d (3:5d2d)
+Script_BeatImakuni: ; dd2d (3:5d2d)
 	start_script
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_IMAKUNI_WIN_COUNT
 	db $07
 	dw .giveBoosters
-	run_script OWScript_IncrementFlagValue
+	run_script ScriptCommand_IncrementFlagValue
 	db EVENT_IMAKUNI_WIN_COUNT
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_IMAKUNI_WIN_COUNT
 	db $03
 	dw .threeWins
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_IMAKUNI_WIN_COUNT
 	db $06
 	dw .sixWins
 .giveBoosters
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text046c
-	run_script OWScript_GiveOneOfEachTrainerBooster
-	run_script OWScript_Jump
+	run_script ScriptCommand_GiveOneOfEachTrainerBooster
+	run_script ScriptCommand_Jump
 	dw .done
 
 .threeWins
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text046d
-	run_script OWScript_Jump
+	run_script ScriptCommand_Jump
 	dw .giveImakuniCard
 
 .sixWins
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text046e
 .giveImakuniCard
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text046f
-	run_script OWScript_GiveCard
+	run_script ScriptCommand_GiveCard
 	db IMAKUNI_CARD
-	run_script OWScript_ShowCardReceivedScreen
+	run_script ScriptCommand_ShowCardReceivedScreen
 	db IMAKUNI_CARD
 .done
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0470
-	run_script OWScript_Jump
-	dw OWJump_ImakuniCommon
+	run_script ScriptCommand_Jump
+	dw ScriptJump_ImakuniCommon
 
-OWSequence_LostToImakuni: ; dd5c (3:5d5c)
+Script_LostToImakuni: ; dd5c (3:5d5c)
 	start_script
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0471
 
-OWJump_ImakuniCommon: ; dd60 (3:5d60)
-	run_script OWScript_CloseTextBox
-	run_script OWScript_JumpIfPlayerCoordMatches
+ScriptJump_ImakuniCommon: ; dd60 (3:5d60)
+	run_script ScriptCommand_CloseTextBox
+	run_script ScriptCommand_JumpIfPlayerCoordMatches
 	db 18
 	db 4
 	dw .ows_dd69
-	run_script OWScript_Jump
+	run_script ScriptCommand_Jump
 	dw .ows_dd6e
 
 .ows_dd69
-	run_script OWScript_SetPlayerDirection
+	run_script ScriptCommand_SetPlayerDirection
 	db EAST
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db WEST
 	db $01
 
 .ows_dd6e
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_dd78
 	run_script Func_cdcb
-	run_script OWScript_MaxOutFlagValue
+	run_script ScriptCommand_MaxOutFlagValue
 	db EVENT_TEMP_BATTLED_IMAKUNI
 	run_script Func_d408
 	db $09
 	run_script Func_d41d
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 ; 0xdd78
 
 NPCMovement_dd78 ; dd78 (3:5d78)
@@ -3909,96 +3909,96 @@ Preload_ImakuniInWaterClubLobby: ; e0b0 (3:60b0)
 	ret
 ; 0xe0cf
 
-OWSequence_Gal1: ; e0cf (3:60cf)
+Script_Gal1: ; e0cf (3:60cf)
 	start_script
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_12
 	db $02
 	dw .ows_e10e
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_12
 	db $00
 	dw NO_JUMP
-	run_script OWScript_PrintVariableText
+	run_script ScriptCommand_PrintVariableText
 	tx Text041d
 	tx Text041e
-	run_script OWScript_SetFlagValue
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_FLAG_12
 	db $01
-	run_script OWScript_AskQuestionJump
+	run_script ScriptCommand_AskQuestionJump
 	tx Text041f
 	dw .ows_e0eb
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0420
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 
 .ows_e0eb
 	run_script Func_cf0c
 	db $59
 	dw .ows_e0f3
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0421
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 
 .ows_e0f3
 	run_script Func_cf12
 	db $59
 	dw .ows_e0fb
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0422
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 
 .ows_e0fb
-	run_script OWScript_SetFlagValue
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_FLAG_12
 	db $02
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0423
 	run_script Func_ccdc
 	tx Text0424
-	run_script OWScript_TakeCard
+	run_script ScriptCommand_TakeCard
 	db LAPRAS
-	run_script OWScript_GiveCard
+	run_script ScriptCommand_GiveCard
 	db ARCANINE1
-	run_script OWScript_ShowCardReceivedScreen
+	run_script ScriptCommand_ShowCardReceivedScreen
 	db ARCANINE1
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0425
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 
 .ows_e10e
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text0426
 
-OWSequence_Lass1: ; e111 (3:6111)
+Script_Lass1: ; e111 (3:6111)
 	start_script
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_14
 	db $01
 	dw .ows_e121
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0427
-	run_script OWScript_SetFlagValue
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_FLAG_14
 	db $01
-	run_script OWScript_SetFlagValue
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_IMAKUNI_STATE
 	db IMAKUNI_MENTIONED
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 
 .ows_e121
-	run_script OWScript_JumpIfFlagNotEqual
+	run_script ScriptCommand_JumpIfFlagNotEqual
 	db EVENT_IMAKUNI_ROOM
 	db IMAKUNI_WATER_CLUB
 	dw .ows_e12d
-	run_script OWScript_JumpIfFlagNonzero2
+	run_script ScriptCommand_JumpIfFlagNonzero2
 	db EVENT_TEMP_BATTLED_IMAKUNI
 	dw .ows_e12d
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text0428
 
 .ows_e12d
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text0429
 
 Preload_Man2InWaterClubLobby: ; e130 (3:6130)
@@ -4006,14 +4006,14 @@ Preload_Man2InWaterClubLobby: ; e130 (3:6130)
 	cp JOSHUA_BEATEN
 	ret
 
-OWSequence_Man2: ; e137 (3:6137)
+Script_Man2: ; e137 (3:6137)
 	start_script
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text042a
 
-OWSequence_Pappy2: ; e13b (3:613b)
+Script_Pappy2: ; e13b (3:613b)
 	start_script
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text042b
 
 WaterClubMovePlayer: ; e13f (3:613f)
@@ -4025,8 +4025,8 @@ WaterClubMovePlayer: ; e13f (3:613f)
 	ret nc
 	ld a, NPC_JOSHUA
 	ld [wTempNPC], a
-	ld bc, OWSequence_NotReadyToSeeAmy
-	jp SetNextNPCAndOWSequence
+	ld bc, Script_NotReadyToSeeAmy
+	jp SetNextNPCAndScript
 
 WaterClubAfterDuel: ;e157 (3:6157)
 	ld hl, .after_duel_table
@@ -4036,159 +4036,159 @@ WaterClubAfterDuel: ;e157 (3:6157)
 .after_duel_table
 	db NPC_SARA
 	db NPC_SARA
-	dw OWSequence_BeatSara
-	dw OWSequence_LostToSara
+	dw Script_BeatSara
+	dw Script_LostToSara
 
 	db NPC_AMANDA
 	db NPC_AMANDA
-	dw OWSequence_BeatAmanda
-	dw OWSequence_LostToAmanda
+	dw Script_BeatAmanda
+	dw Script_LostToAmanda
 
 	db NPC_JOSHUA
 	db NPC_JOSHUA
-	dw OWSequence_BeatJoshua
-	dw OWSequence_LostToJoshua
+	dw Script_BeatJoshua
+	dw Script_LostToJoshua
 
 	db NPC_AMY
 	db NPC_AMY
-	dw OWSequence_BeatAmy
-	dw OWSequence_LostToAmy
+	dw Script_BeatAmy
+	dw Script_LostToAmy
 	db $00
 
-OWSequence_Sara: ; e177 (3:6177)
+Script_Sara: ; e177 (3:6177)
 	start_script
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text042c
-	run_script OWScript_AskQuestionJump
+	run_script ScriptCommand_AskQuestionJump
 	tx Text042d
 	dw .yes_duel
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text042e
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 .yes_duel
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text042f
-	run_script OWScript_StartBattle
+	run_script ScriptCommand_StartBattle
 	db PRIZES_2
 	db WATERFRONT_POKEMON_DECK_ID
 	db MUSIC_DUEL_THEME_1
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 
-OWSequence_BeatSara: ; e18c (3:618c)
+Script_BeatSara: ; e18c (3:618c)
 	start_script
-	run_script OWScript_MaxOutFlagValue
+	run_script ScriptCommand_MaxOutFlagValue
 	db EVENT_BEAT_SARA
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0430
-	run_script OWScript_GiveBoosterPacks
+	run_script ScriptCommand_GiveBoosterPacks
 	db BOOSTER_COLOSSEUM_WATER
 	db BOOSTER_COLOSSEUM_WATER
 	db NO_BOOSTER
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0431
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 
-OWSequence_LostToSara: ; e19a (03:619a)
+Script_LostToSara: ; e19a (03:619a)
 	start_script
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text0432
 
-OWSequence_Amanda: ; e19e (03:619e)
+Script_Amanda: ; e19e (03:619e)
 	start_script
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0433
-	run_script OWScript_AskQuestionJump
+	run_script ScriptCommand_AskQuestionJump
 	tx Text0434
 	dw .yes_duel
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0435
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 .yes_duel
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0436
-	run_script OWScript_StartBattle
+	run_script ScriptCommand_StartBattle
 	db PRIZES_3
 	db LONELY_FRIENDS_DECK_ID
 	db MUSIC_DUEL_THEME_1
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 
-OWSequence_BeatAmanda: ; e1b3 (03:61b3)
+Script_BeatAmanda: ; e1b3 (03:61b3)
 	start_script
-	run_script OWScript_MaxOutFlagValue
+	run_script ScriptCommand_MaxOutFlagValue
 	db EVENT_BEAT_AMANDA
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0437
-	run_script OWScript_GiveBoosterPacks
+	run_script ScriptCommand_GiveBoosterPacks
 	db BOOSTER_MYSTERY_LIGHTNING_COLORLESS
 	db BOOSTER_MYSTERY_LIGHTNING_COLORLESS
 	db NO_BOOSTER
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0438
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 
-OWSequence_LostToAmanda: ; e1c1 (03:61c1)
+Script_LostToAmanda: ; e1c1 (03:61c1)
 	start_script
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text0439
 
-OWSequence_NotReadyToSeeAmy: ; e1c5 (03:61c5)
+Script_NotReadyToSeeAmy: ; e1c5 (03:61c5)
 	start_script
-	run_script OWScript_JumpIfPlayerCoordMatches
+	run_script ScriptCommand_JumpIfPlayerCoordMatches
 	db $12
 	db $08
 	dw .ows_e1ec
-	run_script OWScript_JumpIfPlayerCoordMatches
+	run_script ScriptCommand_JumpIfPlayerCoordMatches
 	db $14
 	db $08
 	dw .ows_e1f2
-	run_script OWScript_JumpIfPlayerCoordMatches
+	run_script ScriptCommand_JumpIfPlayerCoordMatches
 	db $18
 	db $08
 	dw .ows_e1f8
 .ows_e1d5
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db SOUTH
 	db $04
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_e213
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text043a
-	run_script OWScript_JumpIfPlayerCoordMatches
+	run_script ScriptCommand_JumpIfPlayerCoordMatches
 	db $12
 	db $0a
 	dw .ows_e1fe
-	run_script OWScript_JumpIfPlayerCoordMatches
+	run_script ScriptCommand_JumpIfPlayerCoordMatches
 	db $14
 	db $0a
 	dw .ows_e202
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_e215
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 
 .ows_e1ec
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_e206
-	run_script OWScript_Jump
+	run_script ScriptCommand_Jump
 	dw .ows_e1d5
 .ows_e1f2
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_e20b
-	run_script OWScript_Jump
+	run_script ScriptCommand_Jump
 	dw .ows_e1d5
 .ows_e1f8
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_e20f
-	run_script OWScript_Jump
+	run_script ScriptCommand_Jump
 	dw .ows_e1d5
 .ows_e1fe
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_e218
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 
 .ows_e202
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_e219
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 
 NPCMovement_e206: ; e206 (3:6206)
 	db NORTH
@@ -4227,121 +4227,121 @@ NPCMovement_e219: ; e219 (3:6219)
 	db SOUTH | NO_MOVE
 	db $ff
 
-OWSequence_Joshua: ; e21c (3:621c)
+Script_Joshua: ; e21c (3:621c)
 	start_script
-	run_script OWScript_JumpIfFlagZero2
+	run_script ScriptCommand_JumpIfFlagZero2
 	db EVENT_BEAT_AMANDA
 	dw .sara_and_amanda_not_beaten
-	run_script OWScript_JumpIfFlagZero2
+	run_script ScriptCommand_JumpIfFlagZero2
 	db EVENT_BEAT_SARA
 	dw .sara_and_amanda_not_beaten
-	run_script OWScript_Jump
+	run_script ScriptCommand_Jump
 	dw .beat_sara_and_amanda
 .sara_and_amanda_not_beaten
-	run_script OWScript_SetFlagValue
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_JOSHUA_STATE
 	db JOSHUA_TALKED
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text043b
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 
 .beat_sara_and_amanda
-	run_script OWScript_JumpIfFlagNonzero1
+	run_script ScriptCommand_JumpIfFlagNonzero1
 	db EVENT_JOSHUA_STATE
 	dw .already_talked
-	run_script OWScript_SetFlagValue
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_JOSHUA_STATE
 	db JOSHUA_TALKED
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text043b
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text043c
 .already_talked
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_JOSHUA_STATE
 	db JOSHUA_TALKED
 	dw NO_JUMP
-	run_script OWScript_PrintVariableText
+	run_script ScriptCommand_PrintVariableText
 	tx Text043d
 	tx Text043e
-	run_script OWScript_AskQuestionJump
+	run_script ScriptCommand_AskQuestionJump
 	tx Text043f
 	dw .startDuel
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_JOSHUA_STATE
 	db JOSHUA_TALKED
 	dw NO_JUMP
-	run_script OWScript_PrintVariableText
+	run_script ScriptCommand_PrintVariableText
 	tx Text0440
 	tx Text0441
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 
 .startDuel:
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0442
-	run_script OWScript_TryGivePCPack
+	run_script ScriptCommand_TryGivePCPack
 	db $04
-	run_script OWScript_StartBattle
+	run_script ScriptCommand_StartBattle
 	db PRIZES_4
 	db SOUND_OF_THE_WAVES_DECK_ID
 	db MUSIC_DUEL_THEME_1
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 
-OWSequence_LostToJoshua: ; e260 (3:6260)
+Script_LostToJoshua: ; e260 (3:6260)
 	start_script
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_JOSHUA_STATE
 	db JOSHUA_TALKED
 	dw NO_JUMP
-	run_script OWScript_PrintVariableText
+	run_script ScriptCommand_PrintVariableText
 	tx Text0443
 	tx Text0444
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 
-OWSequence_BeatJoshua: ; e26c (3:626c)
+Script_BeatJoshua: ; e26c (3:626c)
 	start_script
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_JOSHUA_STATE
 	db JOSHUA_TALKED
 	dw NO_JUMP
-	run_script OWScript_PrintVariableText
+	run_script ScriptCommand_PrintVariableText
 	tx Text0445
 	tx Text0446
-	run_script OWScript_GiveBoosterPacks
+	run_script ScriptCommand_GiveBoosterPacks
 	db BOOSTER_MYSTERY_WATER_COLORLESS
 	db BOOSTER_MYSTERY_WATER_COLORLESS
 	db NO_BOOSTER
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_JOSHUA_STATE
 	db JOSHUA_TALKED
 	dw NO_JUMP
-	run_script OWScript_PrintVariableText
+	run_script ScriptCommand_PrintVariableText
 	tx Text0447
 	tx Text0448
-	run_script OWScript_JumpIfFlagNotEqual
+	run_script ScriptCommand_JumpIfFlagNotEqual
 	db EVENT_JOSHUA_STATE
 	db JOSHUA_BEATEN
 	dw .firstJoshuaWin
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 
 .firstJoshuaWin:
-	run_script OWScript_SetFlagValue
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_JOSHUA_STATE
 	db JOSHUA_BEATEN
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0449
-	run_script OWScript_CloseTextBox
-	run_script OWScript_MoveActiveNPCByDirection
+	run_script ScriptCommand_CloseTextBox
+	run_script ScriptCommand_MoveActiveNPCByDirection
 	dw NPCMovementTable_e2a1
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text044a
 	run_script Func_cfc6
 	db $00
-	run_script OWScript_CloseAdvancedTextBox
-	run_script OWScript_SetNextNPCandOWSequence
+	run_script ScriptCommand_CloseAdvancedTextBox
+	run_script ScriptCommand_SetNextNPCandScript
 	db NPC_AMY
-	dw OWSequence_MeetAmy
-	run_script OWScript_EndScriptLoop1
+	dw Script_MeetAmy
+	run_script ScriptCommand_EndScriptLoop1
 	ret
 
 NPCMovementTable_e2a1: ; e2a1 (3:62a1)
@@ -4378,24 +4378,24 @@ Preload_Amy: ; e2ad (3:62ad)
 	scf
 	ret
 
-OWSequence_MeetAmy: ; e2d1 (3:62d1)
+Script_MeetAmy: ; e2d1 (3:62d1)
 	start_script
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text044b
-	run_script OWScript_SetDialogName
+	run_script ScriptCommand_SetDialogName
 	db NPC_JOSHUA
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text044c
-	run_script OWScript_SetDialogName
+	run_script ScriptCommand_SetDialogName
 	db NPC_AMY
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text044d
-	run_script OWScript_CloseTextBox
+	run_script ScriptCommand_CloseTextBox
 	run_script Func_d095
 	db $09
 	db $2f
 	db $10
-	run_script OWScript_DoFrames
+	run_script ScriptCommand_DoFrames
 	db $20
 	run_script Func_d095
 	db $04
@@ -4404,97 +4404,97 @@ OWSequence_MeetAmy: ; e2d1 (3:62d1)
 	run_script Func_d0be
 	db $14
 	db $04
-	run_script OWScript_SetPlayerDirection
+	run_script ScriptCommand_SetPlayerDirection
 	db $03
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db WEST
 	db $01
-	run_script OWScript_SetPlayerDirection
+	run_script ScriptCommand_SetPlayerDirection
 	db $00
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db NORTH
 	db $01
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db NORTH
 	db $01
-	run_script OWScript_MoveArbitraryNPC
+	run_script ScriptCommand_MoveArbitraryNPC
 	db NPC_JOSHUA
 	dw NPCMovement_e2ab
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text044e
-	run_script OWScript_Jump
-	dw OWSequence_Amy.askConfirmDuel
+	run_script ScriptCommand_Jump
+	dw Script_Amy.askConfirmDuel
 
-OWSequence_Amy: ; e304 (3:6304)
+Script_Amy: ; e304 (3:6304)
 	start_script
-	run_script OWScript_JumpIfFlagNonzero2
+	run_script ScriptCommand_JumpIfFlagNonzero2
 	db EVENT_BEAT_AMY
-	dw OWJump_TalkToAmyAgain
-	run_script OWScript_PrintTextString
+	dw ScriptJump_TalkToAmyAgain
+	run_script ScriptCommand_PrintTextString
 	tx Text044f
 .askConfirmDuel
-	run_script OWScript_AskQuestionJump
+	run_script ScriptCommand_AskQuestionJump
 	tx Text0450
 	dw .startDuel
 
 .denyDuel
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0451
 	run_script Func_d0d9
 	db $14
 	db $04
-	dw OWSequence_LostToAmy.ows_e34e
-	run_script OWScript_QuitScriptFully
+	dw Script_LostToAmy.ows_e34e
+	run_script ScriptCommand_QuitScriptFully
 
 .startDuel
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0452
-	run_script OWScript_StartBattle
+	run_script ScriptCommand_StartBattle
 	db PRIZES_6
 	db GO_GO_RAIN_DANCE_DECK_ID
 	db MUSIC_DUEL_THEME_2
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 
-OWSequence_BeatAmy: ; e322 (3:6322)
+Script_BeatAmy: ; e322 (3:6322)
 	start_script
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0453
-	run_script OWScript_JumpIfFlagNonzero2
+	run_script ScriptCommand_JumpIfFlagNonzero2
 	db EVENT_BEAT_AMY
 	dw .beatAmyCommon
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0454
-	run_script OWScript_MaxOutFlagValue
+	run_script ScriptCommand_MaxOutFlagValue
 	db EVENT_BEAT_AMY
-	run_script OWScript_TryGiveMedalPCPacks
+	run_script ScriptCommand_TryGiveMedalPCPacks
 	run_script Func_d125
 	db EVENT_BEAT_AMY
 	run_script Func_d435
 	db $03
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0455
 .beatAmyCommon
-	run_script OWScript_GiveBoosterPacks
+	run_script ScriptCommand_GiveBoosterPacks
 	db BOOSTER_LABORATORY_WATER
 	db BOOSTER_LABORATORY_WATER
 	db NO_BOOSTER
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0456
 	run_script Func_d0d9
 	db $14
 	db $04
-	dw OWSequence_LostToAmy.ows_e34e
-	run_script OWScript_QuitScriptFully
+	dw Script_LostToAmy.ows_e34e
+	run_script ScriptCommand_QuitScriptFully
 
-OWSequence_LostToAmy: ; e344 (3:6344)
+Script_LostToAmy: ; e344 (3:6344)
 	start_script
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0457
 	run_script Func_d0d9
 	db $14
 	db $04
 	dw .ows_e34e
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 
 .ows_e34e
 	run_script Func_d095
@@ -4504,25 +4504,25 @@ OWSequence_LostToAmy: ; e344 (3:6344)
 	run_script Func_d0be
 	db $16
 	db $04
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 
-OWJump_TalkToAmyAgain: ; e356 (3:6356)
-	run_script OWScript_PrintTextString
+ScriptJump_TalkToAmyAgain: ; e356 (3:6356)
+	run_script ScriptCommand_PrintTextString
 	tx Text0458
-	run_script OWScript_AskQuestionJump
+	run_script ScriptCommand_AskQuestionJump
 	tx Text0450
 	dw .startDuel
-	run_script OWScript_Jump
-	dw OWSequence_Amy.denyDuel
+	run_script ScriptCommand_Jump
+	dw Script_Amy.denyDuel
 
 .startDuel
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0459
-	run_script OWScript_StartBattle
+	run_script ScriptCommand_StartBattle
 	db PRIZES_6
 	db GO_GO_RAIN_DANCE_DECK_ID
 	db MUSIC_DUEL_THEME_2
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 ; 0xe369
 
 	INCROM $e369, $e525
@@ -4560,7 +4560,7 @@ FindEndOfBattleScript: ; e52c (3:652c)
 	ld c, [hl]
 	inc hl
 	ld b, [hl]
-	jp SetNextNPCAndOWSequence
+	jp SetNextNPCAndScript
 ; 0xe553
 
 GrassClubEntranceAfterDuelTable: ; e553 (3:6553)
@@ -4571,13 +4571,13 @@ GrassClubEntranceAfterDuelTable: ; e553 (3:6553)
 
 	db NPC_RONALD2
 	db NPC_RONALD2
-	dw OWSequence_BeatFirstRonaldFight
-	dw OWSequence_LostToFirstRonaldFight
+	dw Script_BeatFirstRonaldFight
+	dw Script_LostToFirstRonaldFight
 
 	db NPC_RONALD3
 	db NPC_RONALD3
-	dw OWSequence_BeatSecondRonaldFight
-	dw OWSequence_LostToSecondRonaldFight
+	dw Script_BeatSecondRonaldFight
+	dw Script_LostToSecondRonaldFight
 	db $00
 
 	INCROM $e566, $e5c4
@@ -4590,246 +4590,246 @@ GrassClubLobbyAfterDuel: ; e5c4 (3:65c4)
 .after_duel_table
 	db NPC_BRITTANY
 	db NPC_BRITTANY
-	dw OWSequence_BeatBrittany
-	dw OWSequence_LostToBrittany
+	dw Script_BeatBrittany
+	dw Script_LostToBrittany
 	db $00
 
-OWSequence_Brittany: ; e5d2 (3:65d2)
+Script_Brittany: ; e5d2 (3:65d2)
 	start_script
-	run_script OWScript_JumpIfFlagLessThan
+	run_script ScriptCommand_JumpIfFlagLessThan
 	db EVENT_FLAG_35
 	db $01
 	dw NO_JUMP
-	run_script OWScript_PrintVariableText
+	run_script ScriptCommand_PrintVariableText
 	tx Text06e0
 	tx Text06e1
-	run_script OWScript_AskQuestionJump
+	run_script ScriptCommand_AskQuestionJump
 	tx Text06e2
 	dw .wantToDuel
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text06e3
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 
 .wantToDuel
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text06e4
-	run_script OWScript_StartBattle
+	run_script ScriptCommand_StartBattle
 	db PRIZES_4
 	db ETCETERA_DECK_ID
 	db MUSIC_DUEL_THEME_1
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 
-OWSequence_BeatBrittany: ; e5ee (3:65ee)
+Script_BeatBrittany: ; e5ee (3:65ee)
 	start_script
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text06e5
-	run_script OWScript_GiveBoosterPacks
+	run_script ScriptCommand_GiveBoosterPacks
 	db BOOSTER_MYSTERY_GRASS_COLORLESS
 	db BOOSTER_MYSTERY_GRASS_COLORLESS
 	db NO_BOOSTER
-	run_script OWScript_JumpIfFlagLessThan
+	run_script ScriptCommand_JumpIfFlagLessThan
 	db EVENT_FLAG_35
 	db $02
 	dw NO_JUMP
-	run_script OWScript_PrintVariableText
+	run_script ScriptCommand_PrintVariableText
 	tx Text06e6
 	tx Text06e7
-	run_script OWScript_MaxOutFlagValue
+	run_script ScriptCommand_MaxOutFlagValue
 	db FLAG_BEAT_BRITTANY
-	run_script OWScript_JumpIfFlagNotLessThan
+	run_script ScriptCommand_JumpIfFlagNotLessThan
 	db EVENT_FLAG_35
 	db $02
 	dw .finishSequence
-	run_script OWScript_JumpIfFlagZero2
+	run_script ScriptCommand_JumpIfFlagZero2
 	db EVENT_FLAG_3A
 	dw .finishSequence
-	run_script OWScript_JumpIfFlagZero2
+	run_script ScriptCommand_JumpIfFlagZero2
 	db EVENT_FLAG_3B
 	dw .finishSequence
-	run_script OWScript_SetFlagValue
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_FLAG_35
 	db $01
-	run_script OWScript_MaxOutFlagValue
+	run_script ScriptCommand_MaxOutFlagValue
 	db EVENT_FLAG_1E
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text06e8
 .finishSequence
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 
-OWSequence_LostToBrittany: ; e618 (3:6618)
+Script_LostToBrittany: ; e618 (3:6618)
 	start_script
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text06e9
 ; 0xe61c
 
-OWSequence_e61c: ; e61c (3:661c)
-	run_script OWScript_PrintTextQuitFully
+Script_e61c: ; e61c (3:661c)
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text06ea
 
-OWSequence_e61f: ; e61f (3:661f)
+Script_e61f: ; e61f (3:661f)
 	start_script
-	run_script OWScript_JumpIfFlagNonzero2
+	run_script ScriptCommand_JumpIfFlagNonzero2
 	db EVENT_FLAG_04
-	dw OWSequence_e61c
-	run_script OWScript_JumpIfFlagNotLessThan
+	dw Script_e61c
+	run_script ScriptCommand_JumpIfFlagNotLessThan
 	db EVENT_FLAG_37
 	db $06
-	dw OWSequence_e61c
-	run_script OWScript_JumpIfFlagNotLessThan
+	dw Script_e61c
+	run_script ScriptCommand_JumpIfFlagNotLessThan
 	db EVENT_FLAG_37
 	db $04
 	dw .ows_e6a1
-	run_script OWScript_JumpIfFlagNotLessThan
+	run_script ScriptCommand_JumpIfFlagNotLessThan
 	db EVENT_FLAG_37
 	db $02
 	dw .ows_e66a
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_37
 	db $00
 	dw NO_JUMP
-	run_script OWScript_PrintVariableText
+	run_script ScriptCommand_PrintVariableText
 	tx Text06eb
 	tx Text06ec
-	run_script OWScript_SetFlagValue
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_FLAG_37
 	db $01
-	run_script OWScript_AskQuestionJump
+	run_script ScriptCommand_AskQuestionJump
 	tx Text06ed
 	dw .ows_e648
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text06ee
 
 .ows_e648
 	run_script Func_cf0c
 	db $1c
 	dw .ows_e64f
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text06ef
 
 .ows_e64f
 	run_script Func_cf12
 	db $1c
 	dw .ows_e656
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text06f0
 
 .ows_e656
-	run_script OWScript_MaxOutFlagValue
+	run_script ScriptCommand_MaxOutFlagValue
 	db EVENT_FLAG_04
-	run_script OWScript_SetFlagValue
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_FLAG_37
 	db $02
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text06f1
 	run_script Func_ccdc
 	tx Text06f2
-	run_script OWScript_TakeCard
+	run_script ScriptCommand_TakeCard
 	db ODDISH
-	run_script OWScript_GiveCard
+	run_script ScriptCommand_GiveCard
 	db VILEPLUME
-	run_script OWScript_ShowCardReceivedScreen
+	run_script ScriptCommand_ShowCardReceivedScreen
 	db VILEPLUME
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text06f3
 
 .ows_e66a
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_37
 	db $02
 	dw NO_JUMP
-	run_script OWScript_PrintVariableText
+	run_script ScriptCommand_PrintVariableText
 	tx Text06f4
 	tx Text06f5
-	run_script OWScript_SetFlagValue
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_FLAG_37
 	db $03
-	run_script OWScript_AskQuestionJump
+	run_script ScriptCommand_AskQuestionJump
 	tx Text06ed
 	dw .ows_e67f
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text06f6
 
 .ows_e67f
 	run_script Func_cf0c
 	db $ab
 	dw .ows_e686
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text06f7
 
 .ows_e686
 	run_script Func_cf12
 	db $ab
 	dw .ows_e68d
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text06f8
 
 .ows_e68d
-	run_script OWScript_MaxOutFlagValue
+	run_script ScriptCommand_MaxOutFlagValue
 	db EVENT_FLAG_04
-	run_script OWScript_SetFlagValue
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_FLAG_37
 	db $04
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text06f9
 	run_script Func_ccdc
 	tx Text06fa
-	run_script OWScript_TakeCard
+	run_script ScriptCommand_TakeCard
 	db CLEFAIRY
-	run_script OWScript_GiveCard
+	run_script ScriptCommand_GiveCard
 	db PIKACHU3
-	run_script OWScript_ShowCardReceivedScreen
+	run_script ScriptCommand_ShowCardReceivedScreen
 	db PIKACHU3
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text06f3
 
 .ows_e6a1
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_37
 	db $04
 	dw NO_JUMP
-	run_script OWScript_PrintVariableText
+	run_script ScriptCommand_PrintVariableText
 	tx Text06fb
 	tx Text06fc
-	run_script OWScript_SetFlagValue
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_FLAG_37
 	db $05
-	run_script OWScript_AskQuestionJump
+	run_script ScriptCommand_AskQuestionJump
 	tx Text06ed
 	dw .ows_e6b6
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text06fd
 
 .ows_e6b6
 	run_script Func_cf0c
 	db $32
 	dw .ows_e6bd
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text06fe
 
 .ows_e6bd
 	run_script Func_cf12
 	db $32
 	dw .ows_e6c4
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text06ff
 
 .ows_e6c4
-	run_script OWScript_MaxOutFlagValue
+	run_script ScriptCommand_MaxOutFlagValue
 	db EVENT_FLAG_04
-	run_script OWScript_SetFlagValue
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_FLAG_37
 	db $06
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0700
 	run_script Func_ccdc
 	tx Text0701
-	run_script OWScript_TakeCard
+	run_script ScriptCommand_TakeCard
 	db CHARIZARD
-	run_script OWScript_GiveCard
+	run_script ScriptCommand_GiveCard
 	db BLASTOISE
-	run_script OWScript_ShowCardReceivedScreen
+	run_script ScriptCommand_ShowCardReceivedScreen
 	db BLASTOISE
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text06f3
 ; 0xe6d8
 
@@ -4842,13 +4842,13 @@ ClubEntranceAfterDuel: ; e7f6 (3:67f6)
 .after_duel_table
 	db NPC_RONALD2
 	db NPC_RONALD2
-	dw OWSequence_BeatFirstRonaldFight
-	dw OWSequence_LostToFirstRonaldFight
+	dw Script_BeatFirstRonaldFight
+	dw Script_LostToFirstRonaldFight
 
 	db NPC_RONALD3
 	db NPC_RONALD3
-	dw OWSequence_BeatSecondRonaldFight
-	dw OWSequence_LostToSecondRonaldFight
+	dw Script_BeatSecondRonaldFight
+	dw Script_LostToSecondRonaldFight
 	db $00
 
 ; A Ronald is already loaded or not loaded depending on Pre-Load scripts
@@ -4864,8 +4864,8 @@ TryFirstRonaldEncounter: ; e813 (3:6813)
 	ld [wTempNPC], a
 	call FindLoadedNPC
 	ret c
-	ld bc, OWSequence_FirstRonaldEncounter
-	jp SetNextNPCAndOWSequence
+	ld bc, Script_FirstRonaldEncounter
+	jp SetNextNPCAndScript
 
 TryFirstRonaldFight: ; e822 (3:6822)
 	ld a, NPC_RONALD2
@@ -4875,8 +4875,8 @@ TryFirstRonaldFight: ; e822 (3:6822)
 	get_flag_value EVENT_FLAG_4C
 	or a
 	ret nz
-	ld bc, OWSequence_FirstRonaldFight
-	jp SetNextNPCAndOWSequence
+	ld bc, Script_FirstRonaldFight
+	jp SetNextNPCAndScript
 
 TrySecondRonaldFight: ; e837 (3:6837)
 	ld a, NPC_RONALD3
@@ -4886,56 +4886,56 @@ TrySecondRonaldFight: ; e837 (3:6837)
 	get_flag_value EVENT_FLAG_4D
 	or a
 	ret nz
-	ld bc, OWSequenceSecondRonaldFight
-	jp SetNextNPCAndOWSequence
+	ld bc, ScriptSecondRonaldFight
+	jp SetNextNPCAndScript
 ; 0xe84c
 
 	INCROM $e84c, $e862
 
-OWSequence_FirstRonaldEncounter: ; e862 (3:6862)
+Script_FirstRonaldEncounter: ; e862 (3:6862)
 	start_script
-	run_script OWScript_MaxOutFlagValue
+	run_script ScriptCommand_MaxOutFlagValue
 	db EVENT_FLAG_4B
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_e894
 	run_script Func_d135
 	db $00
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0645
-	run_script OWScript_CloseTextBox
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_CloseTextBox
+	run_script ScriptCommand_MovePlayer
 	db NORTH
 	db $01
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db NORTH
 	db $01
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0646
-	run_script OWScript_AskQuestionJumpDefaultYes
+	run_script ScriptCommand_AskQuestionJumpDefaultYes
 	dw 0000
 	dw .ows_e882
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0647
-	run_script OWScript_Jump
+	run_script ScriptCommand_Jump
 	dw .ows_e885
 
 .ows_e882
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0648
 .ows_e885
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0649
-	run_script OWScript_CloseTextBox
-	run_script OWScript_SetPlayerDirection
+	run_script ScriptCommand_CloseTextBox
+	run_script ScriptCommand_SetPlayerDirection
 	db $03
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db EAST
 	db $04
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_e894
 	run_script Func_cdcb
 	run_script Func_d41d
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 
 NPCMovement_e894: ; e894 (3:6894)
 	db SOUTH
@@ -4948,72 +4948,72 @@ NPCMovement_e894: ; e894 (3:6894)
 
 	INCROM $e89a, $e8c0
 
-OWSequence_FirstRonaldFight: ; e8c0 (3:68c0)
+Script_FirstRonaldFight: ; e8c0 (3:68c0)
 	start_script
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_e905
-	run_script OWScript_DoFrames
+	run_script ScriptCommand_DoFrames
 	db $3c
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_e90d
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text064a
-	run_script OWScript_JumpIfPlayerCoordMatches
+	run_script ScriptCommand_JumpIfPlayerCoordMatches
 	db $08
 	db $02
 	dw $68d6
-	run_script OWScript_SetPlayerDirection
+	run_script ScriptCommand_SetPlayerDirection
 	db WEST
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db WEST
 	db $01
-	run_script OWScript_SetPlayerDirection
+	run_script ScriptCommand_SetPlayerDirection
 	db SOUTH
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db SOUTH
 	db $01
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db SOUTH
 	db $01
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text064b
-	run_script OWScript_SetFlagValue
+	run_script ScriptCommand_SetFlagValue
 	db $4c
 	db $01
-	run_script OWScript_StartBattle
+	run_script ScriptCommand_StartBattle
 	db PRIZES_6
 	db IM_RONALD_DECK_ID
 	db MUSIC_RONALD
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 
-OWSequence_BeatFirstRonaldFight: ; e8e9 (3:68e9)
+Script_BeatFirstRonaldFight: ; e8e9 (3:68e9)
 	start_script
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text064c
-	run_script OWScript_GiveCard
+	run_script ScriptCommand_GiveCard
 	db JIGGLYPUFF1
-	run_script OWScript_ShowCardReceivedScreen
+	run_script ScriptCommand_ShowCardReceivedScreen
 	db JIGGLYPUFF1
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text064d
-	run_script OWScript_Jump
-	dw OWJump_FinishedFirstRonaldFight
+	run_script ScriptCommand_Jump
+	dw ScriptJump_FinishedFirstRonaldFight
 
-OWSequence_LostToFirstRonaldFight: ; e8f7 (3:68f7)
+Script_LostToFirstRonaldFight: ; e8f7 (3:68f7)
 	start_script
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text064e
 
-OWJump_FinishedFirstRonaldFight
-	run_script OWScript_SetFlagValue
+ScriptJump_FinishedFirstRonaldFight
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_FLAG_4C
 	db $02
-	run_script OWScript_CloseTextBox
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_CloseTextBox
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_e90f
 	run_script Func_cdcb
 	run_script Func_d41d
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 
 NPCMovement_e905: ; e905 (3:6905)
 	db EAST
@@ -5040,73 +5040,73 @@ NPCMovement_e90f: ; e90f (3:690f)
 
 	INCROM $e915, $e91e
 
-OWSequenceSecondRonaldFight: ; e91e (3:691e)
+ScriptSecondRonaldFight: ; e91e (3:691e)
 	start_script
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_e905
-	run_script OWScript_DoFrames
+	run_script ScriptCommand_DoFrames
 	db 60
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_e90d
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text064f
-	run_script OWScript_JumpIfPlayerCoordMatches
+	run_script ScriptCommand_JumpIfPlayerCoordMatches
 	db $08
 	db $02
 	dw .ows_6934
-	run_script OWScript_SetPlayerDirection
+	run_script ScriptCommand_SetPlayerDirection
 	db WEST
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db WEST
 	db $01
 .ows_6934
-	run_script OWScript_SetPlayerDirection
+	run_script ScriptCommand_SetPlayerDirection
 	db SOUTH
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db SOUTH
 	db $01
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db SOUTH
 	db $01
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0650
-	run_script OWScript_SetFlagValue
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_FLAG_4D
 	db $01
-	run_script OWScript_StartBattle
+	run_script ScriptCommand_StartBattle
 	db PRIZES_6
 	db POWERFUL_RONALD_DECK_ID
 	db MUSIC_RONALD
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 
-OWSequence_BeatSecondRonaldFight: ; e947 (3:6947)
+Script_BeatSecondRonaldFight: ; e947 (3:6947)
 	start_script
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0651
-	run_script OWScript_GiveCard
+	run_script ScriptCommand_GiveCard
 	db SUPER_ENERGY_RETRIEVAL
-	run_script OWScript_ShowCardReceivedScreen
+	run_script ScriptCommand_ShowCardReceivedScreen
 	db SUPER_ENERGY_RETRIEVAL
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0652
-	run_script OWScript_Jump
-	dw OWJump_FinishedSecondRonaldFight
+	run_script ScriptCommand_Jump
+	dw ScriptJump_FinishedSecondRonaldFight
 
-OWSequence_LostToSecondRonaldFight: ; e955 (3:6955)
+Script_LostToSecondRonaldFight: ; e955 (3:6955)
 	start_script
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0653
 
-OWJump_FinishedSecondRonaldFight ; e959 (3:6959)
-	run_script OWScript_SetFlagValue
+ScriptJump_FinishedSecondRonaldFight ; e959 (3:6959)
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_FLAG_4D
 	db $02
-	run_script OWScript_CloseTextBox
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_CloseTextBox
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_e90f
 	run_script Func_cdcb
 	run_script Func_d41d
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 ; 0xe963
 
 	INCROM $e963, $ed57
@@ -5118,12 +5118,12 @@ FireClubPressedA: ; ed57 (3:6d57)
 
 SlowpokePaintingObjectTable: ; ed5e (3:6d5e)
 	db 16, 2, NORTH
-	dw OWSequence_ee76
+	dw Script_ee76
 	db $00
 
 ; Given a table with data of the form:
-;	X, Y, Dir, OWSequence
-; Searches to try to find a match, and starts an OWSequence if possible
+;	X, Y, Dir, Script
+; Searches to try to find a match, and starts a Script if possible
 FindExtraInteractableObjects: ; ed64 (3:6d64)
 	ld de, $5
 .findObjectMatchLoop
@@ -5152,32 +5152,32 @@ FindExtraInteractableObjects: ; ed64 (3:6d64)
 	inc hl
 	ld b, [hl]
 	pop hl
-	call SetNextOWSequence
+	call SetNextScript
 	scf
 	ret
 ; 0xed8d
 
 	INCROM $ed8d, $ee76
 
-OWSequence_ee76: ; ee76 (3:6e76)
+Script_ee76: ; ee76 (3:6e76)
 	start_script
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_21
 	db $01
 	dw .ows_ee7d
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 
 .ows_ee7d
-	run_script OWScript_SetFlagValue
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_FLAG_21
 	db $02
 	run_script Func_ccdc
 	tx Text06a2
-	run_script OWScript_GiveCard
+	run_script ScriptCommand_GiveCard
 	db SLOWPOKE1
-	run_script OWScript_ShowCardReceivedScreen
+	run_script ScriptCommand_ShowCardReceivedScreen
 	db SLOWPOKE1
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 ; 0xee88
 
 	INCROM $ee88, $ef96
@@ -5259,77 +5259,77 @@ Preload_Clerk9: ; ef96 (3:6f96)
 	scf
 	ret
 
-OWSequence_Clerk9: ; f025 (3:7025)
+Script_Clerk9: ; f025 (3:7025)
 	start_script
-	run_script OWScript_JumpIfFlagZero1
+	run_script ScriptCommand_JumpIfFlagZero1
 	db EVENT_FLAG_3F
 	dw .ows_f066
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_41
 	db $07
 	dw .ows_f069
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_41
 	db $03
 	dw .ows_f06f
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_41
 	db $02
 	dw .ows_f072
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_41
 	db $01
 	dw .ows_f06c
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_40
 	db $07
 	dw .ows_f069
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_40
 	db $03
 	dw .ows_f06f
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_40
 	db $02
 	dw .ows_f072
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_40
 	db $01
 	dw .ows_f06c
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_3F
 	db $07
 	dw .ows_f069
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_3F
 	db $03
 	dw .ows_f06f
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_3F
 	db $02
 	dw .ows_f072
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_3F
 	db $01
 	dw .ows_f06c
 .ows_f066
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text050a
 
 .ows_f069
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text050b
 
 .ows_f06c
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text050c
 
 .ows_f06f
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text050d
 
 .ows_f072
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text050e
 
 Preload_ChallengeHallNPCs2: ; f075 (3:7075)
@@ -5355,36 +5355,36 @@ ChallengeHallLobbyLoadMap: ; f088 (3:7088)
 	ld [wTempNPC], a
 	call FindLoadedNPC
 	ld bc, $7166
-	jp SetNextNPCAndOWSequence
+	jp SetNextNPCAndScript
 
-OWSequence_Pappy3: ; f09c (3:709c)
+Script_Pappy3: ; f09c (3:709c)
 	start_script
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text050f
 
-OWSequence_Gal4: ; f0a0 (3:70a0)
+Script_Gal4: ; f0a0 (3:70a0)
 	start_script
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text0510
 
-OWSequence_Champ: ; f0a4 (3:70a4)
+Script_Champ: ; f0a4 (3:70a4)
 	start_script
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text0511
 
-OWSequence_Hood2: ; f0a8 (3:70a8)
+Script_Hood2: ; f0a8 (3:70a8)
 	start_script
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text0512
 
-OWSequence_Lass5: ; f0ac (3:70ac)
+Script_Lass5: ; f0ac (3:70ac)
 	start_script
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text0513
 
-OWSequence_Chap5: ; f0b0 (3:70b0)
+Script_Chap5: ; f0b0 (3:70b0)
 	start_script
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text0514
 
 Preload_ChallengeHallLobbyRonald1: ; f0b4 (3:70b4)
@@ -5486,7 +5486,7 @@ ChallengeHallAfterDuel: ; f239 (3:7239)
 	ld b, [hl]
 	ld a, NPC_HOST
 	ld [wTempNPC], a
-	jp SetNextNPCAndOWSequence
+	jp SetNextNPCAndScript
 
 ChallengeHallAfterDuelTable:
 	dw WonAtChallengeHall
@@ -5499,12 +5499,12 @@ ChallengeHallLoadMap: ; f258 (3:7258)
 	ld a, NPC_HOST
 	ld [wTempNPC], a
 	call FindLoadedNPC
-	ld bc, OWSequence_f433
-	jp SetNextNPCAndOWSequence
+	ld bc, Script_f433
+	jp SetNextNPCAndScript
 
-OWSequence_Clerk13: ; f26c (3:726c)
+Script_Clerk13: ; f26c (3:726c)
 	start_script
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text0525
 
 Preload_Guide: ; f270 (3:7270)
@@ -5520,195 +5520,195 @@ Preload_Guide: ; f270 (3:7270)
 	ret
 ; 0xf283
 
-OWSequence_Guide: ; f283 (3:7283)
+Script_Guide: ; f283 (3:7283)
 	start_script
-	run_script OWScript_JumpIfFlagZero2
+	run_script ScriptCommand_JumpIfFlagZero2
 	db EVENT_FLAG_42
 	dw .ows_f28b
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text0526
 
 .ows_f28b
-	run_script OWScript_JumpIfFlagZero1
+	run_script ScriptCommand_JumpIfFlagZero1
 	db $3f
 	dw .ows_f292
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text0527
 
 .ows_f292
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text0528
 
-OWSequence_Clerk12: ; f295 (3:7295)
+Script_Clerk12: ; f295 (3:7295)
 	start_script
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_41
 	db $03
 	dw .ows_f2c4
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_41
 	db $02
 	dw .ows_f2c1
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_40
 	db $03
 	dw .ows_f2c4
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_40
 	db $02
 	dw .ows_f2c1
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_3F
 	db $03
 	dw .ows_f2c4
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_3F
 	db $02
 	dw .ows_f2c1
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_44
 	db $02
 	dw .ows_f2cd
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_44
 	db $03
 	dw .ows_f2d3
-	run_script OWScript_Jump
+	run_script ScriptCommand_Jump
 	dw .ows_f2c7
 
 .ows_f2c1
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text0529
 
 .ows_f2c4
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text052a
 
 .ows_f2c7
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text052b
-	run_script OWScript_Jump
+	run_script ScriptCommand_Jump
 	dw .ows_f2d6
 
 .ows_f2cd
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text052c
-	run_script OWScript_Jump
+	run_script ScriptCommand_Jump
 	dw .ows_f2d6
 
 .ows_f2d3
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text052d
 .ows_f2d6
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text052e
-	run_script OWScript_AskQuestionJump
+	run_script ScriptCommand_AskQuestionJump
 	tx Text052f
 	dw .ows_f2e1
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text0530
 
 .ows_f2e1
-	run_script OWScript_MaxOutFlagValue
+	run_script ScriptCommand_MaxOutFlagValue
 	db EVENT_FLAG_59
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0531
-	run_script OWScript_CloseTextBox
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_CloseTextBox
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_f349
-	run_script OWScript_JumpIfPlayerCoordMatches
+	run_script ScriptCommand_JumpIfPlayerCoordMatches
 	db 8
 	db 18
 	dw .ows_f2fa
-	run_script OWScript_JumpIfPlayerCoordMatches
+	run_script ScriptCommand_JumpIfPlayerCoordMatches
 	db 12
 	db 18
 	dw .ows_f302
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db NORTH
 	db $02
-	run_script OWScript_Jump
+	run_script ScriptCommand_Jump
 	dw .ows_f307
 
 .ows_f2fa
-	run_script OWScript_SetPlayerDirection
+	run_script ScriptCommand_SetPlayerDirection
 	db EAST
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db EAST
 	db $02
-	run_script OWScript_Jump
+	run_script ScriptCommand_Jump
 	dw .ows_f307
 
 .ows_f302
-	run_script OWScript_SetPlayerDirection
+	run_script ScriptCommand_SetPlayerDirection
 	db WEST
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db WEST
 	db $02
 .ows_f307
-	run_script OWScript_SetPlayerDirection
+	run_script ScriptCommand_SetPlayerDirection
 	db NORTH
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db NORTH
 	db $01
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db NORTH
 	db $01
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db NORTH
 	db $01
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db NORTH
 	db $01
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db NORTH
 	db $01
-	run_script OWScript_JumpIfFlagNonzero2
+	run_script ScriptCommand_JumpIfFlagNonzero2
 	db EVENT_FLAG_43
 	dw .ows_f33a
-	run_script OWScript_MaxOutFlagValue
+	run_script ScriptCommand_MaxOutFlagValue
 	db EVENT_FLAG_43
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db NORTH
 	db $01
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db NORTH
 	db $01
-	run_script OWScript_SetPlayerDirection
+	run_script ScriptCommand_SetPlayerDirection
 	db EAST
-	run_script OWScript_DoFrames
+	run_script ScriptCommand_DoFrames
 	db 30
-	run_script OWScript_SetPlayerDirection
+	run_script ScriptCommand_SetPlayerDirection
 	db SOUTH
-	run_script OWScript_DoFrames
+	run_script ScriptCommand_DoFrames
 	db 20
-	run_script OWScript_SetPlayerDirection
+	run_script ScriptCommand_SetPlayerDirection
 	db EAST
-	run_script OWScript_DoFrames
+	run_script ScriptCommand_DoFrames
 	db 20
-	run_script OWScript_SetPlayerDirection
+	run_script ScriptCommand_SetPlayerDirection
 	db SOUTH
-	run_script OWScript_DoFrames
+	run_script ScriptCommand_DoFrames
 	db 30
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db SOUTH
 	db $01
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db SOUTH
 	db $01
 .ows_f33a
-	run_script OWScript_SetPlayerDirection
+	run_script ScriptCommand_SetPlayerDirection
 	db EAST
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db EAST
 	db $01
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_f34e
-	run_script OWScript_CloseAdvancedTextBox
-	run_script OWScript_SetNextNPCandOWSequence
+	run_script ScriptCommand_CloseAdvancedTextBox
+	run_script ScriptCommand_SetNextNPCandScript
 	db $4a
-	dw OWSequence_f353
-	run_script OWScript_EndScriptLoop1
+	dw Script_f353
+	run_script ScriptCommand_EndScriptLoop1
 	ret
 ; f349
 
@@ -5728,43 +5728,43 @@ NPCMovement_f34e: ; f34e (3:734e)
 	db SOUTH
 	db $ff
 
-OWSequence_HostStubbed: ; f352 (3:7352)
+Script_HostStubbed: ; f352 (3:7352)
 	ret
 
-OWSequence_f353: ; f353 (3:7353)
+Script_f353: ; f353 (3:7353)
 	start_script
-	run_script OWScript_DoFrames
+	run_script ScriptCommand_DoFrames
 	db 20
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_f37d
-	run_script OWScript_DoFrames
+	run_script ScriptCommand_DoFrames
 	db 20
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_f390
 	run_script Func_d16b
 	db $00
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0532
-	run_script OWScript_CloseTextBox
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_CloseTextBox
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_f37f
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0533
-	run_script OWScript_CloseTextBox
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_CloseTextBox
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_f388
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0534
-	run_script OWScript_CloseTextBox
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_CloseTextBox
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_f38e
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0535
 	run_script Func_cd4f
 	db $04
 	db $00
 	db $00
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 
 NPCMovement_f37d: ; f37d (3:737d)
 	db EAST | NO_MOVE
@@ -5805,115 +5805,115 @@ NPCMovement_f390: ; f390 (3:7390)
 
 LostAtChallengeHall: ; f392 (3:7392)
 	start_script
-	run_script OWScript_DoFrames
+	run_script ScriptCommand_DoFrames
 	db 20
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_f37d
-	run_script OWScript_DoFrames
+	run_script ScriptCommand_DoFrames
 	db 20
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_f390
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_45
 	db $02
-	dw OWJump_f410
-	run_script OWScript_JumpIfFlagEqual
+	dw ScriptJump_f410
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_45
 	db $03
-	dw OWJump_f410.ows_f41a
+	dw ScriptJump_f410.ows_f41a
 	run_script Func_d16b
 	db $00
 	run_script Func_d16b
 	db $01
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0536
 .ows_f3ae
-	run_script OWScript_CloseTextBox
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_CloseTextBox
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_f38b
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0537
-	run_script OWScript_CloseTextBox
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_CloseTextBox
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_f38e
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_44
 	db $02
 	dw .ows_f3ce
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_44
 	db $03
 	dw .ows_f3d9
-	run_script OWScript_SetFlagValue
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_FLAG_3F
 	db $03
-	run_script OWScript_SetFlagValue
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_FLAG_48
 	db $03
-	run_script OWScript_ZeroOutFlagValue
+	run_script ScriptCommand_ZeroOutFlagValue
 	db EVENT_FLAG_51
-	run_script OWScript_Jump
+	run_script ScriptCommand_Jump
 	dw .ows_f3e2
 .ows_f3ce
-	run_script OWScript_SetFlagValue
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_FLAG_40
 	db $03
-	run_script OWScript_SetFlagValue
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_FLAG_49
 	db $03
-	run_script OWScript_ZeroOutFlagValue
+	run_script ScriptCommand_ZeroOutFlagValue
 	db EVENT_FLAG_55
-	run_script OWScript_Jump
+	run_script ScriptCommand_Jump
 	dw .ows_f3e2
 .ows_f3d9
-	run_script OWScript_SetFlagValue
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_FLAG_41
 	db $03
-	run_script OWScript_SetFlagValue
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_FLAG_4A
 	db $03
-	run_script OWScript_Jump
+	run_script ScriptCommand_Jump
 	dw .ows_f3e2
 .ows_f3e2
-	run_script OWScript_CloseAdvancedTextBox
-	run_script OWScript_SetNextNPCandOWSequence
+	run_script ScriptCommand_CloseAdvancedTextBox
+	run_script ScriptCommand_SetNextNPCandScript
 	db NPC_CLERK12
-	dw OWSequence_f3e9
-	run_script OWScript_EndScriptLoop1
+	dw Script_f3e9
+	run_script ScriptCommand_EndScriptLoop1
 	ret
 
-OWSequence_f3e9: ; f3e9 (3:73e9)
+Script_f3e9: ; f3e9 (3:73e9)
 	start_script
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_f40a
-	run_script OWScript_SetPlayerDirection
+	run_script ScriptCommand_SetPlayerDirection
 	db WEST
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db WEST
 	db $01
-	run_script OWScript_SetPlayerDirection
+	run_script ScriptCommand_SetPlayerDirection
 	db SOUTH
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db SOUTH
 	db $01
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db SOUTH
 	db $01
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db SOUTH
 	db $01
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db SOUTH
 	db $01
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db SOUTH
 	db $01
-	run_script OWScript_MovePlayer
+	run_script ScriptCommand_MovePlayer
 	db SOUTH
 	db $01
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_f40d
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 
 NPCMovement_f40a: ; f40a (3:740a)
 	db WEST
@@ -5925,160 +5925,160 @@ NPCMovement_f40d: ; f40d (3:740d)
 	db SOUTH | NO_MOVE
 	db $ff
 
-OWJump_f410: ; f410 (4:7410)
+ScriptJump_f410: ; f410 (4:7410)
 	run_script Func_d16b
 	db $00
 	run_script Func_d16b
 	db $01
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0538
-	run_script OWScript_Jump
+	run_script ScriptCommand_Jump
 	dw LostAtChallengeHall.ows_f3ae
 
 .ows_f41a
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0539
-	run_script OWScript_SetDialogName
+	run_script ScriptCommand_SetDialogName
 	db NPC_RONALD1
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_44
 	db $03
 	dw .ows_f42e
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_44
 	db $01
 	dw NO_JUMP
-	run_script OWScript_PrintVariableText
+	run_script ScriptCommand_PrintVariableText
 	tx Text053a
 	tx Text053b
 .ows_f42e
-	run_script OWScript_SetDialogName
+	run_script ScriptCommand_SetDialogName
 	db NPC_HOST
-	run_script OWScript_Jump
+	run_script ScriptCommand_Jump
 	dw LostAtChallengeHall.ows_f3ae
 
-OWSequence_f433: ; f433 (3:7433)
+Script_f433: ; f433 (3:7433)
 	start_script
-	run_script OWScript_DoFrames
+	run_script ScriptCommand_DoFrames
 	db 20
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_f37d
-	run_script OWScript_DoFrames
+	run_script ScriptCommand_DoFrames
 	db 20
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_f390
-	run_script OWScript_Jump
+	run_script ScriptCommand_Jump
 	dw WonAtChallengeHall.ows_f4a4
 
 WonAtChallengeHall; f441 (3:7441)
 	start_script
-	run_script OWScript_DoFrames
+	run_script ScriptCommand_DoFrames
 	db 20
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_f37d
-	run_script OWScript_DoFrames
+	run_script ScriptCommand_DoFrames
 	db 20
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_f390
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_45
 	db $03
-	dw OWJump_f4db
-	run_script OWScript_JumpIfFlagEqual
+	dw ScriptJump_f4db
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_45
 	db $02
 	dw .ows_f456
 .ows_f456
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_45
 	db $01
 	dw NO_JUMP
-	run_script OWScript_PrintVariableText
+	run_script ScriptCommand_PrintVariableText
 	tx Text053c
 	tx Text053d
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_f37f
 	run_script Func_d16b
 	db $00
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text053e
-	run_script OWScript_CloseTextBox
-	run_script OWScript_MoveWramNPC
+	run_script ScriptCommand_CloseTextBox
+	run_script ScriptCommand_MoveWramNPC
 	dw NPCMovement_f4c8
 	run_script Func_cdd8
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text053f
-	run_script OWScript_CloseTextBox
+	run_script ScriptCommand_CloseTextBox
 	run_script Func_d195
 	run_script Func_cdf5
 	db $14
 	db $14
-	run_script OWScript_MoveWramNPC
+	run_script ScriptCommand_MoveWramNPC
 	dw NPCMovement_f4d0
 	run_script Func_d16b
 	db $00
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_45
 	db $02
 	dw NO_JUMP
-	run_script OWScript_PrintVariableText
+	run_script ScriptCommand_PrintVariableText
 	tx Text0540
 	tx Text0541
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_f383
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_45
 	db $02
 	dw .ows_f4a4
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_44
 	db $03
 	dw .ows_f4a1
-	run_script OWScript_CloseTextBox
-	run_script OWScript_SetDialogName
+	run_script ScriptCommand_CloseTextBox
+	run_script ScriptCommand_SetDialogName
 	db $02
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_44
 	db $01
 	dw NO_JUMP
-	run_script OWScript_PrintVariableText
+	run_script ScriptCommand_PrintVariableText
 	tx Text0542
 	tx Text0543
-	run_script OWScript_SetDialogName
+	run_script ScriptCommand_SetDialogName
 	db NPC_HOST
-	run_script OWScript_CloseTextBox
+	run_script ScriptCommand_CloseTextBox
 .ows_f4a1
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0544
 .ows_f4a4
-	run_script OWScript_ZeroOutFlagValue
+	run_script ScriptCommand_ZeroOutFlagValue
 	db EVENT_FLAG_47
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0545
-	run_script OWScript_AskQuestionJumpDefaultYes
+	run_script ScriptCommand_AskQuestionJumpDefaultYes
 	tx Text0546
 	dw .ows_f4bd
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_45
 	db $02
 	dw NO_JUMP
-	run_script OWScript_PrintVariableText
+	run_script ScriptCommand_PrintVariableText
 	tx Text0547
 	tx Text0548
 	run_script Func_cd4f
 	db $04
 	db $00
 	db $00
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 .ows_f4bd
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0549
-	run_script OWScript_CloseTextBox
-	run_script OWScript_MaxOutFlagValue
+	run_script ScriptCommand_CloseTextBox
+	run_script ScriptCommand_MaxOutFlagValue
 	db EVENT_FLAG_47
 	run_script Func_d1ad
-	run_script OWScript_CloseTextBox
-	run_script OWScript_Jump
+	run_script ScriptCommand_CloseTextBox
+	run_script ScriptCommand_Jump
 	dw .ows_f4a4
 
 NPCMovement_f4c8: ; f4c8 (3:74c8)
@@ -6107,111 +6107,111 @@ NPCMovement_f4d8: ; f4d8 (3:74d8)
 	db SOUTH | NO_MOVE
 	db $ff
 
-OWJump_f4db: ; f4db (3:74db)
-	run_script OWScript_PrintTextString
+ScriptJump_f4db: ; f4db (3:74db)
+	run_script ScriptCommand_PrintTextString
 	tx Text054a
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_f37f
 	run_script Func_d16b
 	db $00
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text054b
-	run_script OWScript_CloseTextBox
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_CloseTextBox
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_44
 	db $03
 	dw .ows_f513
-	run_script OWScript_SetDialogName
+	run_script ScriptCommand_SetDialogName
 	db $02
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_44
 	db $01
 	dw NO_JUMP
-	run_script OWScript_PrintVariableText
+	run_script ScriptCommand_PrintVariableText
 	tx Text054c
 	tx Text054d
-	run_script OWScript_MoveWramNPC
+	run_script ScriptCommand_MoveWramNPC
 	dw NPCMovement_f4d8
-	run_script OWScript_DoFrames
+	run_script ScriptCommand_DoFrames
 	db 40
-	run_script OWScript_MoveWramNPC
+	run_script ScriptCommand_MoveWramNPC
 	dw NPCMovement_f34c
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_44
 	db $01
 	dw NO_JUMP
-	run_script OWScript_PrintVariableText
+	run_script ScriptCommand_PrintVariableText
 	tx Text054e
 	tx Text054f
-	run_script OWScript_SetDialogName
+	run_script ScriptCommand_SetDialogName
 	db NPC_HOST
-	run_script OWScript_CloseTextBox
-	run_script OWScript_MoveWramNPC
+	run_script ScriptCommand_CloseTextBox
+	run_script ScriptCommand_MoveWramNPC
 	dw NPCMovement_f4c9
-	run_script OWScript_Jump
+	run_script ScriptCommand_Jump
 	dw .ows_f516
 .ows_f513
-	run_script OWScript_MoveWramNPC
+	run_script ScriptCommand_MoveWramNPC
 	dw NPCMovement_f4c8
 .ows_f516
 	run_script Func_cdd8
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_f383
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0550
-	run_script OWScript_CloseTextBox
-	run_script OWScript_MoveActiveNPC
+	run_script ScriptCommand_CloseTextBox
+	run_script ScriptCommand_MoveActiveNPC
 	dw NPCMovement_f38b
 	run_script Func_d1b3
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0551
-	run_script OWScript_GiveCard
+	run_script ScriptCommand_GiveCard
 	db $00
-	run_script OWScript_ShowCardReceivedScreen
+	run_script ScriptCommand_ShowCardReceivedScreen
 	db $00
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0552
-	run_script OWScript_CloseTextBox
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_CloseTextBox
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_44
 	db $02
 	dw .ows_f540
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_44
 	db $03
 	dw .ows_f549
-	run_script OWScript_SetFlagValue
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_FLAG_3F
 	db $02
-	run_script OWScript_SetFlagValue
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_FLAG_48
 	db $02
-	run_script OWScript_Jump
+	run_script ScriptCommand_Jump
 	dw .ows_f552
 .ows_f540
-	run_script OWScript_SetFlagValue
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_FLAG_40
 	db $02
-	run_script OWScript_SetFlagValue
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_FLAG_49
 	db $02
-	run_script OWScript_Jump
+	run_script ScriptCommand_Jump
 	dw .ows_f552
 .ows_f549
-	run_script OWScript_SetFlagValue
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_FLAG_41
 	db $02
-	run_script OWScript_SetFlagValue
+	run_script ScriptCommand_SetFlagValue
 	db EVENT_FLAG_4A
 	db $02
-	run_script OWScript_Jump
+	run_script ScriptCommand_Jump
 	dw .ows_f552
 .ows_f552
-	run_script OWScript_CloseAdvancedTextBox
-	run_script OWScript_SetNextNPCandOWSequence
+	run_script ScriptCommand_CloseAdvancedTextBox
+	run_script ScriptCommand_SetNextNPCandScript
 	db NPC_CLERK12
-	dw OWSequence_f3e9
-	run_script OWScript_EndScriptLoop1
+	dw Script_f3e9
+	run_script ScriptCommand_EndScriptLoop1
 	ret
 ; f559
 
@@ -6284,15 +6284,15 @@ Func_f5db: ; f5db (3:75db)
 Func_f602: ; f602 (3:7602)
 	INCROM $f602, $f631
 
-OWSequence_f631: ; f631 (3:7631)
+Script_f631: ; f631 (3:7631)
 	start_script
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text0508
-	run_script OWScript_CloseAdvancedTextBox
-	run_script OWScript_SetNextNPCandOWSequence
+	run_script ScriptCommand_CloseAdvancedTextBox
+	run_script ScriptCommand_SetNextNPCandScript
 	db $02
 	dw $763c
-	run_script OWScript_EndScriptLoop1
+	run_script ScriptCommand_EndScriptLoop1
 
 	ret
 ; 0xf63c
@@ -6307,24 +6307,24 @@ HallOfHonorLoadMap: ; fbdb (3:7bdb)
 
 	INCROM $fbe1, $fbf1
 
-OWSequence_fbf1: ; fbf1 (3:7bf1)
+Script_fbf1: ; fbf1 (3:7bf1)
 	start_script
-	run_script OWScript_JumpIfFlagNonzero2
+	run_script ScriptCommand_JumpIfFlagNonzero2
 	db EVENT_RECEIVED_LEGENDARY_CARD
 	dw .ows_fc10
-	run_script OWScript_MaxOutFlagValue
+	run_script ScriptCommand_MaxOutFlagValue
 	db EVENT_RECEIVED_LEGENDARY_CARD
 	run_script Func_ccdc
 	tx Text05b8
-	run_script OWScript_GiveCard
+	run_script ScriptCommand_GiveCard
 	db ZAPDOS3
-	run_script OWScript_GiveCard
+	run_script ScriptCommand_GiveCard
 	db MOLTRES2
-	run_script OWScript_GiveCard
+	run_script ScriptCommand_GiveCard
 	db ARTICUNO2
-	run_script OWScript_GiveCard
+	run_script ScriptCommand_GiveCard
 	db DRAGONITE1
-	run_script OWScript_ShowCardReceivedScreen
+	run_script ScriptCommand_ShowCardReceivedScreen
 	db $ff
 .ows_fc05
 	run_script Func_d38f
@@ -6337,21 +6337,21 @@ OWSequence_fbf1: ; fbf1 (3:7bf1)
 	run_script Func_d396
 	db $01
 	run_script Func_d3b9
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 
 .ows_fc10
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_71
 	db $0f
 	dw .ows_fc20
 	run_script Func_d209
 	run_script Func_ccdc
 	tx Text05ba
-	run_script OWScript_GiveCard
+	run_script ScriptCommand_GiveCard
 	db $00
-	run_script OWScript_ShowCardReceivedScreen
+	run_script ScriptCommand_ShowCardReceivedScreen
 	db $00
-	run_script OWScript_Jump
+	run_script ScriptCommand_Jump
 	dw .ows_fc05
 
 .ows_fc20
@@ -6361,7 +6361,7 @@ OWSequence_fbf1: ; fbf1 (3:7bf1)
 	db $00
 	run_script Func_ccdc
 	tx Text05bc
-	run_script OWScript_Jump
+	run_script ScriptCommand_Jump
 	dw .ows_fc0a
 
 Func_fc2b: ; fc2b (3:7c2b)
@@ -6382,26 +6382,26 @@ Func_fc2b: ; fc2b (3:7c2b)
 	ld [wCurrentNPCNameTx], a
 	ld a, $3
 	ld [wCurrentNPCNameTx+1], a
-	jp SetNextOWSequence
+	jp SetNextScript
 
 PointerTable_fc4c: ; fc4c (3:7c4c)
 	dw Unknown_fc64
 	dw Unknown_fc68
 	dw Unknown_fc60
 
-OWSequence_fc52: ; fc52 (3:7c52)
+Script_fc52: ; fc52 (3:7c52)
 	start_script
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text06c8
-	run_script OWScript_AskQuestionJumpDefaultYes
+	run_script ScriptCommand_AskQuestionJumpDefaultYes
 	dw $0000
 	dw .ows_fc5e
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text06c9
 
 .ows_fc5e
 	run_script Func_cd76
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 
 Unknown_fc60: ; fc60 (3:7c60)
 	INCROM $fc60, $fc64
@@ -6430,41 +6430,41 @@ Func_fc7a: ; fc7a (3:7c7a)
 	set_flag_value EVENT_FLAG_74
 
 	start_script
-	run_script OWScript_JumpIfFlagNotEqual
+	run_script ScriptCommand_JumpIfFlagNotEqual
 	db EVENT_FLAG_74
 	db $02
 	dw Func_fcad.ows_fcd5
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text06cd
 	run_script Func_d39d
 	db $00
-	run_script OWScript_JumpIfFlagNotLessThan
+	run_script ScriptCommand_JumpIfFlagNotLessThan
 	db EVENT_FLAG_72
 	db $04
 	dw Func_fc7a.ows_fcaa
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text06ce
-	run_script OWScript_AskQuestionJumpDefaultYes
+	run_script ScriptCommand_AskQuestionJumpDefaultYes
 	tx Text06cf
 	dw .ows_fca0
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text06d0
-	run_script OWScript_Jump
+	run_script ScriptCommand_Jump
 	dw Func_fc7a.ows_fcaa
 
 .ows_fca0
 	run_script Func_d396
 	db $00
-	run_script OWScript_PlaySFX
+	run_script ScriptCommand_PlaySFX
 	db $56
 	run_script Func_ccdc
 	tx Text06d1
 	run_script Func_d39d
 	db $01
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 
 .ows_fcaa
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text06d2
 
 Func_fcad: ; fcad (3:7cad)
@@ -6473,47 +6473,47 @@ Func_fcad: ; fcad (3:7cad)
 	set_flag_value EVENT_FLAG_72
 
 	start_script
-	run_script OWScript_PlaySFX
+	run_script ScriptCommand_PlaySFX
 	db $56
 	run_script Func_d396
 	db $00
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_72
 	db $00
 	dw .ows_fccc
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_72
 	db $02
 	dw .ows_fccf
-	run_script OWScript_JumpIfFlagEqual
+	run_script ScriptCommand_JumpIfFlagEqual
 	db EVENT_FLAG_72
 	db $03
 	dw .ows_fcd2
-	run_script OWScript_Jump
+	run_script ScriptCommand_Jump
 	dw Func_fc7a.ows_fcaa
 
 .ows_fccc
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text06d3
 
 .ows_fccf
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text06d4
 
 .ows_fcd2
-	run_script OWScript_PrintTextQuitFully
+	run_script ScriptCommand_PrintTextQuitFully
 	tx Text06d5
 
 .ows_fcd5
-	run_script OWScript_MoveArbitraryNPC
+	run_script ScriptCommand_MoveArbitraryNPC
 	db NPC_GIFT_CENTER_CLERK
 	dw NPCMovement_fce1
-	run_script OWScript_PrintTextString
+	run_script ScriptCommand_PrintTextString
 	tx Text06d6
-	run_script OWScript_MoveArbitraryNPC
+	run_script ScriptCommand_MoveArbitraryNPC
 	db NPC_GIFT_CENTER_CLERK
 	dw NPCMovement_fce3
-	run_script OWScript_QuitScriptFully
+	run_script ScriptCommand_QuitScriptFully
 
 NPCMovement_fce1: ; fce1 (3:7ce1)
 	db SOUTH | NO_MOVE
diff --git a/src/engine/bank04.asm b/src/engine/bank04.asm
index 7be9960..13df81b 100644
--- a/src/engine/bank04.asm
+++ b/src/engine/bank04.asm
@@ -878,8 +878,8 @@ LoadNPCSpriteData: ; 11857 (4:5857)
 	pop hl
 	ret
 
-; Loads Name into wCurrentNPCNameTx and gets OWSequence ptr into bc
-GetNPCNameAndOWSequence: ; 1187d (4:587d)
+; Loads Name into wCurrentNPCNameTx and gets Script ptr into bc
+GetNPCNameAndScript: ; 1187d (4:587d)
 	push hl
 	call GetNPCDataPointer
 	ld bc, NPC_DATA_OWSEQUENCE_PTR
@@ -969,23 +969,23 @@ Func_11f4e: ; 11f4e (4:5f4e)
 	INCROM $11f4e, $1217b
 
 OverworldScriptTable: ; 1217b (4:617b)
-	dw OWScript_EndScriptLoop1
-	dw OWScript_CloseAdvancedTextBox
-	dw OWScript_PrintTextString
+	dw ScriptCommand_EndScriptLoop1
+	dw ScriptCommand_CloseAdvancedTextBox
+	dw ScriptCommand_PrintTextString
 	dw Func_ccdc
-	dw OWScript_AskQuestionJump
-	dw OWScript_StartBattle
-	dw OWScript_PrintVariableText
+	dw ScriptCommand_AskQuestionJump
+	dw ScriptCommand_StartBattle
+	dw ScriptCommand_PrintVariableText
 	dw Func_cda8
-	dw OWScript_PrintTextQuitFully
+	dw ScriptCommand_PrintTextQuitFully
 	dw Func_cdcb
-	dw OWScript_MoveActiveNPCByDirection
-	dw OWScript_CloseTextBox
-	dw OWScript_GiveBoosterPacks
+	dw ScriptCommand_MoveActiveNPCByDirection
+	dw ScriptCommand_CloseTextBox
+	dw ScriptCommand_GiveBoosterPacks
 	dw Func_cf0c
 	dw Func_cf12
-	dw OWScript_GiveCard
-	dw OWScript_TakeCard
+	dw ScriptCommand_GiveCard
+	dw ScriptCommand_TakeCard
 	dw Func_cf53
 	dw Func_cf7b
 	dw Func_cf2d
@@ -996,83 +996,83 @@ OverworldScriptTable: ; 1217b (4:617b)
 	dw Func_d025
 	dw Func_d032
 	dw Func_d03f
-	dw OWScript_Jump
-	dw OWScript_TryGiveMedalPCPacks
-	dw OWScript_SetPlayerDirection
-	dw OWScript_MovePlayer
-	dw OWScript_ShowCardReceivedScreen
-	dw OWScript_SetDialogName
-	dw OWScript_SetNextNPCandOWSequence
+	dw ScriptCommand_Jump
+	dw ScriptCommand_TryGiveMedalPCPacks
+	dw ScriptCommand_SetPlayerDirection
+	dw ScriptCommand_MovePlayer
+	dw ScriptCommand_ShowCardReceivedScreen
+	dw ScriptCommand_SetDialogName
+	dw ScriptCommand_SetNextNPCandScript
 	dw Func_d095
 	dw Func_d0be
-	dw OWScript_DoFrames
+	dw ScriptCommand_DoFrames
 	dw Func_d0d9
-	dw OWScript_JumpIfPlayerCoordMatches
-	dw OWScript_MoveActiveNPC
-	dw OWScript_GiveOneOfEachTrainerBooster
+	dw ScriptCommand_JumpIfPlayerCoordMatches
+	dw ScriptCommand_MoveActiveNPC
+	dw ScriptCommand_GiveOneOfEachTrainerBooster
 	dw Func_d103
 	dw Func_d125
 	dw Func_d135
 	dw Func_d16b
 	dw Func_cd4f
 	dw Func_cd94
-	dw OWScript_MoveWramNPC
+	dw ScriptCommand_MoveWramNPC
 	dw Func_cdd8
 	dw Func_cdf5
 	dw Func_d195
 	dw Func_d1ad
 	dw Func_d1b3
-	dw OWScript_QuitScriptFully
+	dw ScriptCommand_QuitScriptFully
 	dw Func_d244
 	dw Func_d24c
-	dw OWScript_OpenDeckMachine
+	dw ScriptCommand_OpenDeckMachine
 	dw Func_d271
-	dw OWScript_EnterMap
-	dw OWScript_MoveArbitraryNPC
+	dw ScriptCommand_EnterMap
+	dw ScriptCommand_MoveArbitraryNPC
 	dw Func_d209
 	dw Func_d38f
 	dw Func_d396
 	dw Func_cd76
 	dw Func_d39d
 	dw Func_d3b9
-	dw OWScript_TryGivePCPack
-	dw OWScript_nop
+	dw ScriptCommand_TryGivePCPack
+	dw ScriptCommand_nop
 	dw Func_d3d4
 	dw Func_d3e0
 	dw Func_d3fe
 	dw Func_d408
 	dw Func_d40f
-	dw OWScript_PlaySFX
-	dw OWScript_PauseSong
-	dw OWScript_ResumeSong
+	dw ScriptCommand_PlaySFX
+	dw ScriptCommand_PauseSong
+	dw ScriptCommand_ResumeSong
 	dw Func_d41d
-	dw OWScript_WaitForSongToFinish
+	dw ScriptCommand_WaitForSongToFinish
 	dw Func_d435
-	dw OWScript_AskQuestionJumpDefaultYes
+	dw ScriptCommand_AskQuestionJumpDefaultYes
 	dw Func_d2f6
 	dw Func_d317
 	dw Func_d43d
-	dw OWScript_EndScriptLoop2
-	dw OWScript_EndScriptLoop3
-	dw OWScript_EndScriptLoop4
-	dw OWScript_EndScriptLoop5
-	dw OWScript_EndScriptLoop6
-	dw OWScript_SetFlagValue
-	dw OWScript_JumpIfFlagZero1
-	dw OWScript_JumpIfFlagNonzero1
-	dw OWScript_JumpIfFlagEqual
-	dw OWScript_JumpIfFlagNotEqual
-	dw OWScript_JumpIfFlagNotLessThan
-	dw OWScript_JumpIfFlagLessThan
-	dw OWScript_MaxOutFlagValue
-	dw OWScript_ZeroOutFlagValue
-	dw OWScript_JumpIfFlagNonzero2
-	dw OWScript_JumpIfFlagZero2
-	dw OWScript_IncrementFlagValue
-	dw OWScript_EndScriptLoop7
-	dw OWScript_EndScriptLoop8
-	dw OWScript_EndScriptLoop9
-	dw OWScript_EndScriptLoop10
+	dw ScriptCommand_EndScriptLoop2
+	dw ScriptCommand_EndScriptLoop3
+	dw ScriptCommand_EndScriptLoop4
+	dw ScriptCommand_EndScriptLoop5
+	dw ScriptCommand_EndScriptLoop6
+	dw ScriptCommand_SetFlagValue
+	dw ScriptCommand_JumpIfFlagZero1
+	dw ScriptCommand_JumpIfFlagNonzero1
+	dw ScriptCommand_JumpIfFlagEqual
+	dw ScriptCommand_JumpIfFlagNotEqual
+	dw ScriptCommand_JumpIfFlagNotLessThan
+	dw ScriptCommand_JumpIfFlagLessThan
+	dw ScriptCommand_MaxOutFlagValue
+	dw ScriptCommand_ZeroOutFlagValue
+	dw ScriptCommand_JumpIfFlagNonzero2
+	dw ScriptCommand_JumpIfFlagZero2
+	dw ScriptCommand_IncrementFlagValue
+	dw ScriptCommand_EndScriptLoop7
+	dw ScriptCommand_EndScriptLoop8
+	dw ScriptCommand_EndScriptLoop9
+	dw ScriptCommand_EndScriptLoop10
 
 	INCROM $1224b, $1229f
 
diff --git a/src/engine/bank07.asm b/src/engine/bank07.asm
index 6bad8c9..45cc8b1 100644
--- a/src/engine/bank07.asm
+++ b/src/engine/bank07.asm
@@ -438,9 +438,9 @@ FindNPCAtLocation: ; 1c72e (7:472e)
 	pop hl
 	ret
 
-; Probably needs a new name. Loads data for NPC that the next OWSequence is for
+; Probably needs a new name. Loads data for NPC that the next Script is for
 ; Sets direction, Loads Image data for it, loads name, and more
-SetNewOWSequenceNPC: ; 1c768 (7:4768)
+SetNewScriptNPC: ; 1c768 (7:4768)
 	push hl
 	ld a, [wLoadedNPCTempIndex]
 	ld l, LOADED_NPC_DIRECTION
@@ -454,7 +454,7 @@ SetNewOWSequenceNPC: ; 1c768 (7:4768)
 	ld a, [wLoadedNPCTempIndex]
 	call GetLoadedNPCID
 	ld a, [hl]
-	farcall GetNPCNameAndOWSequence
+	farcall GetNPCNameAndScript
 	pop hl
 	ret
 
diff --git a/src/engine/home.asm b/src/engine/home.asm
index 24cb61d..478aa39 100644
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -11087,9 +11087,9 @@ HandleMoveModeAPress: ; 3a5e (0:3a5e)
 	cp c
 	jr nz, .noMatch
 	ld a, [hli]
-	ld [wNextOWSequence], a
+	ld [wNextScript], a
 	ld a, [hli]
-	ld [wNextOWSequence+1], a
+	ld [wNextScript+1], a
 	ld a, [hli]
 	ld [wDefaultObjectText], a
 	ld a, [hli]
@@ -11159,9 +11159,9 @@ Func_3ae8: ; 3ae8 (0:3ae8)
 	ret
 ; 0x3aed
 
-; finds an OWScript from the first byte and puts the next two bytes (usually arguments?) into cb
+; finds a Script from the first byte and puts the next two bytes (usually arguments?) into cb
 RunOverworldScript: ; 3aed (0:3aed)
-	ld hl, wOWScriptPointer
+	ld hl, wScriptPointer
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a