Finished extracting Challenge Hall scripts

3 files changed, 33 insertions, 33 deletions

diff --git a/src/data/map_scripts.asm b/src/data/map_scripts.asm
index f75d963..f969d45 100644
--- a/src/data/map_scripts.asm
+++ b/src/data/map_scripts.asm
@@ -307,7 +307,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 	dw ChallengeHallLobbyObjects
 	dw $0000
-	dw $7088
+	dw ChallengeHallLobbyLoadMap
 	dw $0000
 	dw $0000
 	dw $0000
diff --git a/src/data/npc_map_data.asm b/src/data/npc_map_data.asm
index a66c149..05663c3 100644
--- a/src/data/npc_map_data.asm
+++ b/src/data/npc_map_data.asm
@@ -347,24 +347,24 @@ FireClubNPCS: ; 7a43 (4:13a43)
 
 ChallengeHallEntranceNPCS: ; 7a5c (4:13a5c)
 	db CLERK9, $06, $02, SOUTH
-	dw $6f96
+	dw Preload_Clerk9
 	db $00
 
 ChallengeHallLobbyNPCS: ; 7a63 (4:13a63)
 	db PAPPY3, $06, $0e, EAST
-	dw $707a
+	dw Preload_ChallengeHallNPCs1
 	db CHAMP, $10, $12, WEST
-	dw $707a
+	dw Preload_ChallengeHallNPCs1
 	db HOOD2, $14, $08, SOUTH
-	dw $707a
+	dw Preload_ChallengeHallNPCs1
 	db LASS5, $16, $10, WEST
-	dw $707a
+	dw Preload_ChallengeHallNPCs1
 	db GAL4, $0c, $0e, EAST
-	dw $7075
+	dw Preload_ChallengeHallNPCs2
 	db CHAP5, $10, $08, WEST
-	dw $7075
+	dw Preload_ChallengeHallNPCs2
 	db RONALD1, $08, $0c, SOUTH
-	dw $70b4
+	dw Preload_ChallengeHallLobbyRonald1
 	db CLERK10, $06, $04, SOUTH
 	dw $0000
 	db GIFT_CENTER_CLERK, $0a, $04, SOUTH
@@ -373,15 +373,15 @@ ChallengeHallLobbyNPCS: ; 7a63 (4:13a63)
 
 ChallengeHallNPCS: ; 7a9a (4:13a9a)
 	db CLERK12, $0a, $12, SOUTH
-	dw $707a
+	dw Preload_ChallengeHallNPCs1
 	db CLERK13, $14, $12, SOUTH
-	dw $707a
+	dw Preload_ChallengeHallNPCs1
 	db GUIDE, $0e, $14, SOUTH
 	dw Preload_Guide
 	db HOST, $0e, $04, SOUTH
-	dw $707a
+	dw Preload_ChallengeHallNPCs1
 	db $ff, $12, $08, WEST ; pre-load function chooses NPC to load
-	dw $7559
+	dw Preload_ChallengeHallOpponent
 	db $00
 
 PokemonDomeEntranceNPCS: ; 7ab9 (4:13ab9)
diff --git a/src/data/npcs.asm b/src/data/npcs.asm
index 1ef61e9..4e5ffe7 100644
--- a/src/data/npcs.asm
+++ b/src/data/npcs.asm
@@ -376,7 +376,7 @@ Clerk9Data:
 	db $0a
 	db $30
 	db $00
-	dw $7025 ; Pointer to OWScript
+	dw OWSequence_Clerk9 ; Pointer to OWScript
 	tx Text03b3
 	db $00
 	db $00
@@ -832,7 +832,7 @@ Clerk10Data:
 	db $0a
 	db $30
 	db $00
-	dw $4c3e ; Pointer to OWScript
+	dw NoOverworldSequence ; Pointer to OWScript
 	tx Text03b0
 	db $00
 	db $00
@@ -844,7 +844,7 @@ GiftCenterClerkData:
 	db $0a
 	db $30
 	db $00
-	dw $4c3e ; Pointer to OWScript
+	dw NoOverworldSequence ; Pointer to OWScript
 	tx Text03b0
 	db $00
 	db $00
@@ -988,7 +988,7 @@ Clerk12Data:
 	db $00
 	db $16
 	db $00
-	dw $7295 ; Pointer to OWScript
+	dw OWSequence_Clerk12 ; Pointer to OWScript
 	tx Text03b3
 	db $00
 	db $00
@@ -1012,7 +1012,7 @@ HostData:
 	db $00
 	db $16
 	db $00
-	dw $7352 ; Pointer to OWScript
+	dw OWSequence_HostStubbed ; Pointer to OWScript
 	tx Text03df
 	db $00
 	db $00
@@ -1216,7 +1216,7 @@ Woman2Data:
 	db $04
 	db $1e
 	db $00
-	dw $4c3e ; Pointer to OWScript
+	dw NoOverworldSequence ; Pointer to OWScript
 	tx Text03d9
 	db $00
 	db $00
@@ -1240,7 +1240,7 @@ Pappy3Data:
 	db $00
 	db $22
 	db $00
-	dw $709c ; Pointer to OWScript
+	dw OWSequence_Pappy3 ; Pointer to OWScript
 	tx Text03dd
 	db $00
 	db $00
@@ -1252,7 +1252,7 @@ Gal4Data:
 	db $00
 	db $16
 	db $00
-	dw $70a0 ; Pointer to OWScript
+	dw OWSequence_Gal4 ; Pointer to OWScript
 	tx Text03db
 	db $00
 	db $00
@@ -1264,7 +1264,7 @@ ChampData:
 	db $00
 	db $26
 	db $00
-	dw $70a4 ; Pointer to OWScript
+	dw OWSequence_Champ ; Pointer to OWScript
 	tx Text03e3
 	db $00
 	db $00
@@ -1276,7 +1276,7 @@ Hood2Data:
 	db $04
 	db $1e
 	db $00
-	dw $70a8 ; Pointer to OWScript
+	dw OWSequence_Hood2 ; Pointer to OWScript
 	tx Text03e2
 	db $00
 	db $00
@@ -1288,7 +1288,7 @@ Lass5Data:
 	db $04
 	db $1a
 	db $00
-	dw $70ac ; Pointer to OWScript
+	dw OWSequence_Lass5 ; Pointer to OWScript
 	tx Text03dc
 	db $00
 	db $00
@@ -1300,7 +1300,7 @@ Chap5Data:
 	db $00
 	db $1a
 	db $00
-	dw $70b0 ; Pointer to OWScript
+	dw OWSequence_Chap5 ; Pointer to OWScript
 	tx Text03da
 	db $00
 	db $00
@@ -1324,7 +1324,7 @@ GuideData:
 	db $00
 	db $16
 	db $00
-	dw $7283 ; Pointer to OWScript
+	dw OWSequence_Guide ; Pointer to OWScript
 	tx Text03e6
 	db $00
 	db $00
@@ -1360,49 +1360,49 @@ Data_11f18:
 	db $3a
 	db $3a
 	db $10
-	dw $4c3e ; Pointer to OWScript
+	dw NoOverworldSequence ; Pointer to OWScript
 Data_11f1f:
 	db $68
 	db $27
 	db $3b
 	db $41
 	db $50
-	dw $4c3e ; Pointer to OWScript
+	dw NoOverworldSequence ; Pointer to OWScript
 Data_11f26:
 	db $69
 	db $27
 	db $3c
 	db $42
 	db $50
-	dw $4c3e ; Pointer to OWScript
+	dw NoOverworldSequence ; Pointer to OWScript
 Data_11f2d:
 	db $6a
 	db $27
 	db $3d
 	db $43
 	db $50
-	dw $4c3e ; Pointer to OWScript
+	dw NoOverworldSequence ; Pointer to OWScript
 Data_11f34:
 	db $6b
 	db $27
 	db $3e
 	db $44
 	db $50
-	dw $4c3e ; Pointer to OWScript
+	dw NoOverworldSequence ; Pointer to OWScript
 Data_11f3b:
 	db $6c
 	db $27
 	db $3f
 	db $45
 	db $50
-	dw $4c3e ; Pointer to OWScript
+	dw NoOverworldSequence ; Pointer to OWScript
 Data_11f42:
 	db $6d
 	db $27
 	db $40
 	db $46
 	db $50
-	dw $4c3e ; Pointer to OWScript
+	dw NoOverworldSequence ; Pointer to OWScript
 Data_11f49:
 	db $00
 	db $00