Remove run_scriptx

4 files changed, 32 insertions, 28 deletions

diff --git a/src/constants/overworld_script_constants.asm b/src/constants/overworld_script_constants.asm
index 073bd72..fed849d 100755
--- a/src/constants/overworld_script_constants.asm
+++ b/src/constants/overworld_script_constants.asm
@@ -1,6 +1,6 @@
 start_script EQUS "rst $20"
 
-OWScript_EndScriptLoop_0              EQU $00
+OWScript_EndScriptLoop1_index         EQU $00
 OWScript_CloseTextBox_index           EQU $01
 OWScript_PrintTextString_index        EQU $02
 Func_ccdc_index                       EQU $03
@@ -83,11 +83,11 @@ Func_cce4_index                       EQU $4f
 Func_d2f6_index                       EQU $50
 Func_d317_index                       EQU $51
 Func_d43d_index                       EQU $52
-OWScript_EndScriptLoop_53             EQU $53
-OWScript_EndScriptLoop_54             EQU $54
-OWScript_EndScriptLoop_55             EQU $55
-OWScript_EndScriptLoop_56             EQU $56
-OWScript_EndScriptLoop_57             EQU $57
+OWScript_EndScriptLoop2_index         EQU $53
+OWScript_EndScriptLoop3_index         EQU $54
+OWScript_EndScriptLoop4_index         EQU $55
+OWScript_EndScriptLoop5_index         EQU $56
+OWScript_EndScriptLoop6_index         EQU $57
 OWScript_CustomModifyEventFlags_index EQU $58
 Func_d460_index                       EQU $59
 OWScript_JumpIfFlagSet_index          EQU $5a
@@ -100,10 +100,10 @@ Func_d4c3_index                       EQU $60
 Func_d4ca_index                       EQU $61
 OWScript_JumpIfFlagNotSet_index       EQU $62
 Func_d452_index                       EQU $63
-OWScript_EndScriptLoop_64             EQU $64
-OWScript_EndScriptLoop_65             EQU $65
-OWScript_EndScriptLoop_66             EQU $66
-OWScript_EndScriptLoop_67             EQU $67
+OWScript_EndScriptLoop7_index         EQU $64
+OWScript_EndScriptLoop8_index         EQU $65
+OWScript_EndScriptLoop9_index         EQU $66
+OWScript_EndScriptLoop10_index        EQU $67
 
 ; Script Flags
 FLAG_BEAT_SARA      EQU $15
diff --git a/src/engine/bank3.asm b/src/engine/bank3.asm
index 82d8080..27f4400 100755
--- a/src/engine/bank3.asm
+++ b/src/engine/bank3.asm
@@ -1677,7 +1677,16 @@ Func_ccb9: ; ccb9 (3:4cb9)
 	ld [$d415], a
 	ret
 
-OWScript_EndScriptLoop: ; ccbe (3:4cbe)
+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)
 	ld a, $01
 	ld [wBreakOWScriptLoop], a
 	jp IncreaseOWScriptPointerBy1
@@ -1688,7 +1697,7 @@ OWScript_CloseTextBox: ; ccc6 (3:4cc6)
 
 OWScript_EndScriptCloseText: ; cccc (3:4ccc)
 	call OWScript_CloseTextBox
-	call OWScript_EndScriptLoop
+	call OWScript_EndScriptLoop1
 	pop hl
 	ret
 
@@ -2945,7 +2954,7 @@ OWSequence_d753: ; d753 (3:5753)
 	db $07
 	db $79
 	db $57
-	run_scriptx OWScript_EndScriptLoop_0
+	run_script OWScript_EndScriptLoop1
 	ret
 
 	start_script
diff --git a/src/engine/bank4.asm b/src/engine/bank4.asm
index 362a8bb..394804f 100755
--- a/src/engine/bank4.asm
+++ b/src/engine/bank4.asm
@@ -963,7 +963,7 @@ INCLUDE "data/unknownNPCData.asm"
 INCBIN "baserom.gbc",$11f4e,$1217b - $11f4e
 
 OverworldScriptTable: ; 1217b (4:617b)
-	dw OWScript_EndScriptLoop
+	dw OWScript_EndScriptLoop1
 	dw OWScript_CloseTextBox
 	dw OWScript_PrintTextString
 	dw Func_ccdc
@@ -1046,11 +1046,11 @@ OverworldScriptTable: ; 1217b (4:617b)
 	dw Func_d2f6
 	dw Func_d317
 	dw Func_d43d
-	dw OWScript_EndScriptLoop
-	dw OWScript_EndScriptLoop
-	dw OWScript_EndScriptLoop
-	dw OWScript_EndScriptLoop
-	dw OWScript_EndScriptLoop
+	dw OWScript_EndScriptLoop2
+	dw OWScript_EndScriptLoop3
+	dw OWScript_EndScriptLoop4
+	dw OWScript_EndScriptLoop5
+	dw OWScript_EndScriptLoop6
 	dw OWScript_CustomModifyEventFlags
 	dw Func_d460
 	dw OWScript_JumpIfFlagSet
@@ -1063,10 +1063,10 @@ OverworldScriptTable: ; 1217b (4:617b)
 	dw Func_d4ca
 	dw OWScript_JumpIfFlagNotSet
 	dw Func_d452
-	dw OWScript_EndScriptLoop
-	dw OWScript_EndScriptLoop
-	dw OWScript_EndScriptLoop
-	dw OWScript_EndScriptLoop
+	dw OWScript_EndScriptLoop7
+	dw OWScript_EndScriptLoop8
+	dw OWScript_EndScriptLoop9
+	dw OWScript_EndScriptLoop10
 
 INCBIN "baserom.gbc",$1224b,$1229f - $1224b
 
diff --git a/src/macros.asm b/src/macros.asm
index db39480..c22bc98 100755
--- a/src/macros.asm
+++ b/src/macros.asm
@@ -408,11 +408,6 @@ run_script: MACRO
 	db \1_index
 ENDM
 
-; for the repeated functions on the table, need to specify which one, unfortunately
-run_scriptx: MACRO
-	db \1
-ENDM
-
 argt: MACRO
 	dw \1_
 ENDM