4 files changed, 1716 insertions, 789 deletions

diff --git a/src/data/level_objects.asm b/src/data/level_objects.asm
new file mode 100644
index 0000000..0756f7f
--- /dev/null
+++ b/src/data/level_objects.asm
@@ -0,0 +1,610 @@
+; Objects around maps that can be interacted with but are not represented
+; by NPCs. Things like Deck Machines and the PCs.
+; Format:
+; Direction you need to face, X coord, Y coord
+; Routine that gets called when you hit A in front of it
+; Object Name, and Object default Text
+MasonLabObjects: ; 13b04 (3:7b04)
+	db NORTH, 18, 2
+	dw PrintInteractableObjectText
+	tx Text04a0
+	tx Text049f
+
+	db NORTH, 20, 2
+	dw PrintInteractableObjectText
+	tx Text04a2
+	tx Text04a1
+
+	db NORTH, 22, 2
+	dw PrintInteractableObjectText
+	tx Text04a4
+	tx Text04a3
+
+	db NORTH, 24, 2
+	dw PrintInteractableObjectText
+	tx Text04a6
+	tx Text04a5
+
+	db NORTH, 20, 14
+	dw PrintInteractableObjectText
+	tx Text04a8
+	tx Text04a7
+
+	db NORTH, 22, 14
+	dw PrintInteractableObjectText
+	tx Text04aa
+	tx Text04a9
+
+	db NORTH, 24, 14
+	dw PrintInteractableObjectText
+	tx Text04ac
+	tx Text04ab
+
+	db NORTH, 2, 2
+	dw PC_c7ea
+	tx Text041b
+	tx Text041a
+
+	db $ff
+
+ 
+DeckMachineRoomObjects: ; 13b4d (3:7b4d)
+	db NORTH, 2, 2
+	dw OWSequence_d932
+	tx Text041b
+	tx Text041a
+
+	db NORTH, 4, 2
+	dw OWSequence_d932
+	tx Text041b
+	tx Text041a
+
+	db NORTH, 6, 2
+	dw $593f
+	tx Text041b
+	tx Text041a
+
+	db NORTH, 8, 2
+	dw $593f
+	tx Text041b
+	tx Text041a
+
+	db NORTH, 10, 2
+	dw $5995
+	tx Text041b
+	tx Text041a
+
+	db NORTH, 12, 2
+	dw $5995
+	tx Text041b
+	tx Text041a
+
+	db NORTH, 14, 2
+	dw $59c2
+	tx Text041b
+	tx Text041a
+
+	db NORTH, 16, 2
+	dw $59c2
+	tx Text041b
+	tx Text041a
+
+	db NORTH, 18, 2
+	dw $59ef
+	tx Text041b
+	tx Text041a
+
+	db NORTH, 20, 2
+	dw $59ef
+	tx Text041b
+	tx Text041a
+
+	db NORTH, 14, 10
+	dw $5a1c
+	tx Text041b
+	tx Text041a
+
+	db NORTH, 16, 10
+	dw $5a1c
+	tx Text041b
+	tx Text041a
+
+	db NORTH, 18, 10
+	dw $5a49
+	tx Text041b
+	tx Text041a
+
+	db NORTH, 20, 10
+	dw $5a49
+	tx Text041b
+	tx Text041a
+
+	db NORTH, 14, 18
+	dw $5a76
+	tx Text041b
+	tx Text041a
+
+	db NORTH, 16, 18
+	dw $5a76
+	tx Text041b
+	tx Text041a
+
+	db NORTH, 18, 18
+	dw $5aa3
+	tx Text041b
+	tx Text041a
+
+	db NORTH, 20, 18
+	dw $5aa3
+	tx Text041b
+	tx Text041a
+
+	db NORTH, 2, 18
+	dw $5ad0
+	tx Text041b
+	tx Text041a
+
+	db NORTH, 4, 18
+	dw $5ad0
+	tx Text041b
+	tx Text041a
+
+	db $ff
+
+ 
+IshiharasHouseObjects: ; 13c02 (3:7c02)
+	db NORTH, 6, 2
+	dw PrintInteractableObjectText
+	tx Text04ae
+	tx Text04ad
+
+	db NORTH, 8, 2
+	dw PrintInteractableObjectText
+	tx Text04b0
+	tx Text04af
+
+	db NORTH, 10, 2
+	dw PrintInteractableObjectText
+	tx Text04b2
+	tx Text04b1
+
+	db NORTH, 12, 2
+	dw PrintInteractableObjectText
+	tx Text04b4
+	tx Text04b3
+
+	db NORTH, 14, 2
+	dw PrintInteractableObjectText
+	tx Text04b6
+	tx Text04b5
+
+	db NORTH, 16, 2
+	dw PrintInteractableObjectText
+	tx Text04b8
+	tx Text04b7
+
+	db NORTH, 2, 12
+	dw PrintInteractableObjectText
+	tx Text04ba
+	tx Text04b9
+
+	db NORTH, 4, 12
+	dw PrintInteractableObjectText
+	tx Text04bc
+	tx Text04bb
+
+	db NORTH, 6, 12
+	dw PrintInteractableObjectText
+	tx Text04be
+	tx Text04bd
+
+	db NORTH, 12, 12
+	dw PrintInteractableObjectText
+	tx Text04c0
+	tx Text04bf
+
+	db NORTH, 14, 12
+	dw PrintInteractableObjectText
+	tx Text04c2
+	tx Text04c1
+
+	db NORTH, 16, 12
+	dw PrintInteractableObjectText
+	tx Text04c4
+	tx Text04c3
+
+	db $ff
+
+ 
+FightingClubLobbyObjects: ; 13c6f (3:7c6f)
+	db NORTH, 20, 2
+	dw PrintInteractableObjectText
+	tx Text04c6
+	tx Text04c5
+
+	db NORTH, 22, 2
+	dw PrintInteractableObjectText
+	tx Text04c8
+	tx Text04c7
+
+	db NORTH, 24, 2
+	dw PrintInteractableObjectText
+	tx Text04ca
+	tx Text04c9
+
+	db NORTH, 2, 8
+	dw PC_c7ea
+	tx Text041b
+	tx Text041a
+
+	db NORTH, 6, 6
+	dw OWSequence_fc52
+	tx Text041b
+	tx Text03b0
+
+	db NORTH, 10, 6
+	dw Func_fc7a
+	tx Text041b
+	tx Text03b0
+
+	db $ff
+
+ 
+RockClubLobbyObjects: ; 13ca6 (3:7ca6)
+	db NORTH, 20, 2
+	dw PrintInteractableObjectText
+	tx Text04cc
+	tx Text04cb
+
+	db NORTH, 22, 2
+	dw PrintInteractableObjectText
+	tx Text04ce
+	tx Text04cd
+
+	db NORTH, 24, 2
+	dw PrintInteractableObjectText
+	tx Text04d0
+	tx Text04cf
+
+	db NORTH, 2, 8
+	dw PC_c7ea
+	tx Text041b
+	tx Text041a
+
+	db NORTH, 6, 6
+	dw OWSequence_fc52
+	tx Text041b
+	tx Text03b0
+
+	db NORTH, 10, 6
+	dw Func_fc7a
+	tx Text041b
+	tx Text03b0
+
+	db $ff
+
+ 
+WaterClubLobbyObjects: ; 13cdd (3:7cdd)
+	db NORTH, 20, 2
+	dw PrintInteractableObjectText
+	tx Text04d2
+	tx Text04d1
+
+	db NORTH, 22, 2
+	dw PrintInteractableObjectText
+	tx Text04d4
+	tx Text04d3
+
+	db NORTH, 24, 2
+	dw PrintInteractableObjectText
+	tx Text04d6
+	tx Text04d5
+
+	db NORTH, 2, 8
+	dw PC_c7ea
+	tx Text041b
+	tx Text041a
+
+	db NORTH, 6, 6
+	dw OWSequence_fc52
+	tx Text041b
+	tx Text03b0
+
+	db NORTH, 10, 6
+	dw Func_fc7a
+	tx Text041b
+	tx Text03b0
+
+	db $ff
+
+ 
+LightningClubLobbyObjects: ; 13d14 (3:7d14)
+	db NORTH, 20, 2
+	dw PrintInteractableObjectText
+	tx Text04d8
+	tx Text04d7
+
+	db NORTH, 22, 2
+	dw PrintInteractableObjectText
+	tx Text04da
+	tx Text04d9
+
+	db NORTH, 24, 2
+	dw PrintInteractableObjectText
+	tx Text04dc
+	tx Text04db
+
+	db NORTH, 2, 8
+	dw PC_c7ea
+	tx Text041b
+	tx Text041a
+
+	db NORTH, 6, 6
+	dw OWSequence_fc52
+	tx Text041b
+	tx Text03b0
+
+	db NORTH, 10, 6
+	dw Func_fc7a
+	tx Text041b
+	tx Text03b0
+
+	db $ff
+
+ 
+GrassClubLobbyObjects: ; 13d4b (3:7d4b)
+	db NORTH, 20, 2
+	dw PrintInteractableObjectText
+	tx Text04de
+	tx Text04dd
+
+	db NORTH, 22, 2
+	dw PrintInteractableObjectText
+	tx Text04e0
+	tx Text04df
+
+	db NORTH, 24, 2
+	dw PrintInteractableObjectText
+	tx Text04e2
+	tx Text04e1
+
+	db NORTH, 2, 8
+	dw PC_c7ea
+	tx Text041b
+	tx Text041a
+
+	db NORTH, 6, 6
+	dw OWSequence_fc52
+	tx Text041b
+	tx Text03b0
+
+	db NORTH, 10, 6
+	dw Func_fc7a
+	tx Text041b
+	tx Text03b0
+
+	db $ff
+
+ 
+PsychicClubLobbyObjects: ; 13d82 (3:7d82)
+	db NORTH, 20, 2
+	dw PrintInteractableObjectText
+	tx Text04e4
+	tx Text04e3
+
+	db NORTH, 22, 2
+	dw PrintInteractableObjectText
+	tx Text04e6
+	tx Text04e5
+
+	db NORTH, 24, 2
+	dw PrintInteractableObjectText
+	tx Text04e8
+	tx Text04e7
+
+	db NORTH, 2, 8
+	dw PC_c7ea
+	tx Text041b
+	tx Text041a
+
+	db NORTH, 6, 6
+	dw OWSequence_fc52
+	tx Text041b
+	tx Text03b0
+
+	db NORTH, 10, 6
+	dw Func_fc7a
+	tx Text041b
+	tx Text03b0
+
+	db $ff
+
+ 
+ScienceClubLobbyObjects: ; 13db9 (3:7db9)
+	db NORTH, 20, 2
+	dw PrintInteractableObjectText
+	tx Text04ea
+	tx Text04e9
+
+	db NORTH, 22, 2
+	dw PrintInteractableObjectText
+	tx Text04ec
+	tx Text04eb
+
+	db NORTH, 24, 2
+	dw PrintInteractableObjectText
+	tx Text04ee
+	tx Text04ed
+
+	db NORTH, 2, 8
+	dw PC_c7ea
+	tx Text041b
+	tx Text041a
+
+	db NORTH, 6, 6
+	dw OWSequence_fc52
+	tx Text041b
+	tx Text03b0
+
+	db NORTH, 10, 6
+	dw Func_fc7a
+	tx Text041b
+	tx Text03b0
+
+	db $ff
+
+ 
+FireClubLobbyObjects: ; 13df0 (3:7df0)
+	db NORTH, 20, 2
+	dw PrintInteractableObjectText
+	tx Text04f0
+	tx Text04ef
+
+	db NORTH, 22, 2
+	dw PrintInteractableObjectText
+	tx Text04f2
+	tx Text04f1
+
+	db NORTH, 24, 2
+	dw PrintInteractableObjectText
+	tx Text04f4
+	tx Text04f3
+
+	db NORTH, 2, 8
+	dw PC_c7ea
+	tx Text041b
+	tx Text041a
+
+	db NORTH, 6, 6
+	dw OWSequence_fc52
+	tx Text041b
+	tx Text03b0
+
+	db NORTH, 10, 6
+	dw Func_fc7a
+	tx Text041b
+	tx Text03b0
+
+	db $ff
+
+ 
+ChallengeHallLobbyObjects: ; 13e27 (3:7e27)
+	db NORTH, 20, 2
+	dw PrintInteractableObjectText
+	tx Text04f6
+	tx Text04f5
+
+	db NORTH, 22, 2
+	dw PrintInteractableObjectText
+	tx Text04f8
+	tx Text04f7
+
+	db NORTH, 24, 2
+	dw PrintInteractableObjectText
+	tx Text04fa
+	tx Text04f9
+
+	db NORTH, 2, 8
+	dw PC_c7ea
+	tx Text041b
+	tx Text041a
+
+	db NORTH, 6, 6
+	dw OWSequence_fc52
+	tx Text041b
+	tx Text03b0
+
+	db NORTH, 10, 6
+	dw Func_fc7a
+	tx Text041b
+	tx Text03b0
+
+	db $ff
+
+ 
+PokemonDomeEntranceObjects: ; 13e5e (3:7e5e)
+	db NORTH, 2, 2
+	dw PrintInteractableObjectText
+	tx Text04fc
+	tx Text04fb
+
+	db NORTH, 4, 2
+	dw PrintInteractableObjectText
+	tx Text04fe
+	tx Text04fd
+
+	db NORTH, 6, 2
+	dw PrintInteractableObjectText
+	tx Text0500
+	tx Text04ff
+
+
+	db NORTH, 2, 8
+	dw PrintInteractableObjectText
+	tx Text0502
+	tx Text0501
+
+	db NORTH, 4, 8
+	dw PrintInteractableObjectText
+	tx Text0504
+	tx Text0503
+
+	db NORTH, 6, 8
+	dw PrintInteractableObjectText
+	tx Text0506
+	tx Text0505
+
+	db NORTH, 18, 0
+	dw OWSequence_f631
+	tx Text0508
+	tx Text0507
+
+	db NORTH, 20, 0
+	dw OWSequence_f631
+	tx Text0508
+	tx Text0507
+
+	db NORTH, 22, 0
+	dw $76af
+	tx Text0558
+	tx Text0509
+
+	db NORTH, 24, 0
+	dw $76af
+	tx Text0558
+	tx Text0509
+
+	db NORTH, 28, 2
+	dw PC_c7ea
+	tx Text041b
+	tx Text041a
+
+	db $ff
+
+ 
+HallOfHonorObjects: ; 13ec2 (3:7ec2)
+	; Legendary Cards
+	db NORTH, 10, 10
+	dw OWSequence_fbf1
+	dw $0000
+	dw $0000
+
+	; Legendary Cards
+	db NORTH, 12, 10
+	dw OWSequence_fbf1
+	dw $0000
+	dw $0000
+
+	db NORTH, 10, 2
+	dw $7be1
+	tx Text041b
+	tx Text041a
+
+	db NORTH, 12, 2
+	dw $7be1
+	tx Text041b
+	tx Text041a
+
+	db $ff
+
+ 
diff --git a/src/data/map_scripts.asm b/src/data/map_scripts.asm
index ae4e355..f969d45 100644
--- a/src/data/map_scripts.asm
+++ b/src/data/map_scripts.asm
@@ -2,10 +2,10 @@
 ; scripts are referenced with ids [0,2,4,6,8,a,c,e]
 ; each script id is used for a specific event
 ; if a script pointer is $0000, that map has no script for that event
-; 0: load texts
-; 2: unused
-; 4: pressed A button
-; 6: pressed A button
+; 0: NPC data
+; 2: Called after every NPC is loaded (unused)
+; 4: Interactable Objects
+; 6: pressed A button (if nothing interactable is found)
 ; 8: load map
 ; a: after duel
 ; c: moved player
@@ -17,25 +17,25 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 	dw $0000
 	dw $0000
-	dw $54ec
+	dw LoadOverworld
 	dw $0000
 	dw $0000
 	dw $0000
 
 ; MASON_LABORATORY
-	dw $772f
+	dw MasonLabNPCS
 	dw $0000
-	dw $7b04
-	dw $5565
-	dw $5549
-	dw $553b
+	dw MasonLabObjects
+	dw MasonLabPressedA
+	dw MasonLabLoadMap
+	dw MasonLaboratoryAfterDuel
 	dw $0000
-	dw $555e
+	dw MasonLabCloseTextBox
 
 ; DECK_MACHINE_ROOM
-	dw $775a
+	dw DeckMachineRoomNPCS
 	dw $0000
-	dw $7b4d
+	dw DeckMachineRoomObjects
 	dw $0000
 	dw $0000
 	dw $589f
@@ -43,9 +43,9 @@ MapScripts: ; 1162a (4:562a)
 	dw $58ad
 
 ; ISHIHARAS_HOUSE
-	dw $7773
+	dw IshiharasHouseNPCS
 	dw $0000
-	dw $7c02
+	dw IshiharasHouseObjects
 	dw $0000
 	dw $0000
 	dw $0000
@@ -53,27 +53,27 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; FIGHTING_CLUB_ENTRANCE
-	dw $7786
+	dw FightingClubEntranceNPCS
 	dw $0000
 	dw $0000
 	dw $0000
-	dw $6809
-	dw $67f6
+	dw LoadClubEntrance
+	dw ClubEntranceAfterDuel
 	dw $0000
 	dw $0000
 
 ; FIGHTING_CLUB_LOBBY
-	dw $779f
+	dw FightingClubLobbyNPCS
 	dw $0000
-	dw $7c6f
+	dw FightingClubLobbyObjects
 	dw $0000
 	dw $0000
-	dw $5c68
+	dw FightingClubLobbyAfterDuel
 	dw $0000
 	dw $0000
 
 ; FIGHTING_CLUB
-	dw $77ca
+	dw FightingClubNPCS
 	dw $0000
 	dw $0000
 	dw $0000
@@ -83,19 +83,19 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; ROCK_CLUB_ENTRANCE
-	dw $77e3
+	dw RockClubEntranceNPCS
 	dw $0000
 	dw $0000
 	dw $0000
-	dw $6809
-	dw $67f6
+	dw LoadClubEntrance
+	dw ClubEntranceAfterDuel
 	dw $0000
 	dw $0000
 
 ; ROCK_CLUB_LOBBY
-	dw $77fc
+	dw RockClubLobbyNPCS
 	dw $0000
-	dw $7ca6
+	dw RockClubLobbyObjects
 	dw $0000
 	dw $0000
 	dw $5ed5
@@ -103,7 +103,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; ROCK_CLUB
-	dw $7827
+	dw RockClubNPCS
 	dw $0000
 	dw $0000
 	dw $0000
@@ -113,19 +113,19 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; WATER_CLUB_ENTRANCE
-	dw $783a
+	dw WaterClubEntranceNPCS
 	dw $0000
 	dw $0000
 	dw $0000
-	dw $6809
-	dw $67f6
+	dw LoadClubEntrance
+	dw ClubEntranceAfterDuel
 	dw $0000
 	dw $0000
 
 ; WATER_CLUB_LOBBY
-	dw $7853
+	dw WaterClubLobbyNPCS
 	dw $0000
-	dw $7cdd
+	dw WaterClubLobbyObjects
 	dw $0000
 	dw $0000
 	dw $60a2
@@ -133,7 +133,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; WATER_CLUB
-	dw $787e
+	dw WaterClubNPCS
 	dw $0000
 	dw $0000
 	dw $0000
@@ -143,19 +143,19 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; LIGHTNING_CLUB_ENTRANCE
-	dw $7897
+	dw LightningClubEntranceNPCS
 	dw $0000
 	dw $0000
 	dw $0000
-	dw $6809
-	dw $67f6
+	dw LoadClubEntrance
+	dw ClubEntranceAfterDuel
 	dw $0000
 	dw $0000
 
 ; LIGHTNING_CLUB_LOBBY
-	dw $78b0
+	dw LightningClubLobbyNPCS
 	dw $0000
-	dw $7d14
+	dw LightningClubLobbyObjects
 	dw $0000
 	dw $0000
 	dw $636d
@@ -163,7 +163,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; LIGHTNING_CLUB
-	dw $78d5
+	dw LightningClubNPCS
 	dw $0000
 	dw $0000
 	dw $0000
@@ -173,27 +173,27 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; GRASS_CLUB_ENTRANCE
-	dw $78ee
+	dw GrassClubEntranceNPCS
 	dw $0000
 	dw $0000
 	dw $0000
-	dw $6809
-	dw $6525
+	dw LoadClubEntrance
+	dw GrassClubEntranceAfterDuel
 	dw $0000
 	dw $0000
 
 ; GRASS_CLUB_LOBBY
-	dw $790d
+	dw GrassClubLobbyNPCS
 	dw $0000
-	dw $7d4b
+	dw GrassClubLobbyObjects
 	dw $0000
 	dw $0000
-	dw $65c4
+	dw GrassClubLobbyAfterDuel
 	dw $0000
 	dw $0000
 
 ; GRASS_CLUB
-	dw $7932
+	dw GrassClubNPCS
 	dw $0000
 	dw $0000
 	dw $0000
@@ -203,19 +203,19 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; PSYCHIC_CLUB_ENTRANCE
-	dw $7945
+	dw PsychicClubEntranceNPCS
 	dw $0000
 	dw $0000
 	dw $0000
-	dw $6809
-	dw $67f6
+	dw LoadClubEntrance
+	dw ClubEntranceAfterDuel
 	dw $0000
 	dw $0000
 
 ; PSYCHIC_CLUB_LOBBY
-	dw $7964
+	dw PsychicClubLobbyNPCS
 	dw $0000
-	dw $7d82
+	dw PsychicClubLobbyObjects
 	dw $0000
 	dw $6971
 	dw $6963
@@ -223,7 +223,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; PSYCHIC_CLUB
-	dw $798f
+	dw PsychicClubNPCS
 	dw $0000
 	dw $0000
 	dw $0000
@@ -233,19 +233,19 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; SCIENCE_CLUB_ENTRANCE
-	dw $79a8
+	dw ScienceClubEntranceNPCS
 	dw $0000
 	dw $0000
 	dw $0000
-	dw $6809
-	dw $67f6
+	dw LoadClubEntrance
+	dw ClubEntranceAfterDuel
 	dw $0000
 	dw $0000
 
 ; SCIENCE_CLUB_LOBBY
-	dw $79c1
+	dw ScienceClubLobbyNPCS
 	dw $0000
-	dw $7db9
+	dw ScienceClubLobbyObjects
 	dw $0000
 	dw $0000
 	dw $6b57
@@ -253,7 +253,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; SCIENCE_CLUB
-	dw $79ec
+	dw ScienceClubNPCS
 	dw $0000
 	dw $0000
 	dw $0000
@@ -263,27 +263,27 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; FIRE_CLUB_ENTRANCE
-	dw $7a05
+	dw FireClubEntranceNPCS
 	dw $0000
 	dw $0000
 	dw $0000
-	dw $6809
-	dw $67f6
+	dw LoadClubEntrance
+	dw ClubEntranceAfterDuel
 	dw $0000
 	dw $0000
 
 ; FIRE_CLUB_LOBBY
-	dw $7a1e
+	dw FireClubLobbyNPCS
 	dw $0000
-	dw $7df0
-	dw $6d57
+	dw FireClubLobbyObjects
+	dw FireClubPressedA
 	dw $0000
 	dw $6d49
 	dw $0000
 	dw $0000
 
 ; FIRE_CLUB
-	dw $7a43
+	dw FireClubNPCS
 	dw $0000
 	dw $0000
 	dw $0000
@@ -293,7 +293,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; CHALLENGE_HALL_ENTRANCE
-	dw $7a5c
+	dw ChallengeHallEntranceNPCS
 	dw $0000
 	dw $0000
 	dw $0000
@@ -303,29 +303,29 @@ MapScripts: ; 1162a (4:562a)
 	dw $0000
 
 ; CHALLENGE_HALL_LOBBY
-	dw $7a63
+	dw ChallengeHallLobbyNPCS
 	dw $0000
-	dw $7e27
+	dw ChallengeHallLobbyObjects
 	dw $0000
-	dw $7088
+	dw ChallengeHallLobbyLoadMap
 	dw $0000
 	dw $0000
 	dw $0000
 
 ; CHALLENGE_HALL
-	dw $7a9a
+	dw ChallengeHallNPCS
 	dw $0000
 	dw $0000
 	dw $0000
-	dw $7258
-	dw $7239
+	dw ChallengeHallLoadMap
+	dw ChallengeHallAfterDuel
 	dw $0000
 	dw $0000
 
 ; POKEMON_DOME_ENTRANCE
-	dw $7ab9
+	dw PokemonDomeEntranceNPCS
 	dw $0000
-	dw $7e5e
+	dw PokemonDomeEntranceObjects
 	dw $0000
 	dw $7607
 	dw $0000
@@ -333,7 +333,7 @@ MapScripts: ; 1162a (4:562a)
 	dw $762a
 
 ; POKEMON_DOME
-	dw $7ac0
+	dw PokemonDomeNPCS
 	dw $0000
 	dw $0000
 	dw $0000
@@ -343,11 +343,11 @@ MapScripts: ; 1162a (4:562a)
 	dw $7718
 
 ; HALL_OF_HONOR
-	dw $7adf
+	dw HallOfHonorNPCS
 	dw $0000
-	dw $7ec2
+	dw HallOfHonorObjects
 	dw $0000
-	dw $7bdb
+	dw HallOfHonorLoadMap
 	dw $0000
 	dw $0000
 	dw $0000
diff --git a/src/data/npc_map_data.asm b/src/data/npc_map_data.asm
new file mode 100644
index 0000000..05663c3
--- /dev/null
+++ b/src/data/npc_map_data.asm
@@ -0,0 +1,419 @@
+; NPC Map data. Note: pre-load functions also run after battles
+; Format:
+; NPC, X position, Y Position, Direction,
+; pre-load function. (Resets c flag if NPC should not be loaded)
+MasonLabNPCS: ; 772f (4:1372f)
+	db DRMASON, $0e, $06, SOUTH
+	dw $5710
+	db SAM, $04, $0e, EAST
+	dw $5604
+	db TECH1, $16, $08, WEST
+	dw $0000
+	db TECH2, $16, $14, SOUTH
+	dw $0000
+	db TECH3, $16, $16, WEST
+	dw $0000
+	db TECH4, $0a, $16, EAST
+	dw $0000
+	db TECH5, $06, $04, SOUTH
+	dw $55eb
+	db $00
+
+DeckMachineRoomNPCS: ; 775a (4:1375a)
+	db TECH6, $06, $08, SOUTH
+	dw $0000
+	db TECH7, $06, $16, WEST
+	dw $0000
+	db TECH8, $0a, $12, WEST
+	dw $0000
+	db AARON, $0c, $0c, WEST
+	dw $0000
+	db $00
+
+IshiharasHouseNPCS: ; 7773 (4:13773)
+	db NIKKI, $04, $04, NORTH
+	dw Preload_NikkiInIshiharasHouse
+	db ISHIHARA, $08, $08, SOUTH
+	dw Preload_IshiharaInIshiharasHouse
+	db RONALD1, $02, $04, WEST
+	dw Preload_Ronald1InIshiharasHouse
+	db $00
+
+FightingClubEntranceNPCS: ; 7786 (4:13786)
+	db CLERK1, $06, $02, SOUTH
+	dw $0000
+	db RONALD1, $08, $fe, SOUTH
+	dw $685b
+	db RONALD2, $fe, $08, NORTH
+	dw $689a
+	db RONALD3, $fe, $08, NORTH
+	dw $6915
+	db $00
+
+FightingClubLobbyNPCS: ; 779f (4:1379f)
+	db MAN1, $0c, $0e, WEST
+	dw $0000
+	db IMAKUNI, $12, $02, NORTH
+	dw $5ceb
+	db SPECS1, $12, $10, EAST
+	dw $0000
+	db BUTCH, $14, $10, WEST
+	dw $0000
+	db GRANNY1, $04, $10, WEST
+	dw $5d98
+	db CLERK10, $06, $04, SOUTH
+	dw $0000
+	db GIFT_CENTER_CLERK, $0a, $04, SOUTH
+	dw Preload_GiftCenterClerk
+	db $00
+
+FightingClubNPCS: ; 77ca (4:137ca)
+	db CHRIS, $04, $08, SOUTH
+	dw $5e43
+	db MICHAEL, $0e, $0a, SOUTH
+	dw $5e79
+	db JESSICA, $12, $06, EAST
+	dw $5ea5
+	db MITCH, $0a, $04, SOUTH
+	dw $0000
+	db $00
+
+RockClubEntranceNPCS: ; 77e3 (4:137e3)
+	db CLERK2, $06, $02, SOUTH
+	dw $0000
+	db RONALD1, $08, $fe, SOUTH
+	dw $685b
+	db RONALD2, $fe, $08, NORTH
+	dw $689a
+	db RONALD3, $fe, $08, NORTH
+	dw $6915
+	db $00
+
+RockClubLobbyNPCS: ; 77fc (4:137fc)
+	db CHRIS, $12, $08, WEST
+	dw $5ee9
+	db MATTHEW, $06, $0e, EAST
+	dw $0000
+	db WOMAN1, $14, $12, NORTH
+	dw $0000
+	db CHAP1, $0e, $10, EAST
+	dw $0000
+	db LASS3, $10, $04, SOUTH
+	dw $5fcb
+	db CLERK10, $06, $04, SOUTH
+	dw $0000
+	db GIFT_CENTER_CLERK, $0a, $04, SOUTH
+	dw Preload_GiftCenterClerk
+	db $00
+
+RockClubNPCS: ; 7827 (4:13827)
+	db RYAN, $14, $0e, EAST
+	dw $0000
+	db ANDREW, $06, $14, NORTH
+	dw $0000
+	db GENE, $0c, $06, NORTH
+	dw $0000
+	db $00
+
+WaterClubEntranceNPCS: ; 783a (4:1383a)
+	db CLERK3, $06, $02, SOUTH
+	dw $0000
+	db RONALD1, $08, $fe, SOUTH
+	dw $685b
+	db RONALD2, $fe, $08, NORTH
+	dw $689a
+	db RONALD3, $fe, $08, NORTH
+	dw $6915
+	db $00
+
+WaterClubLobbyNPCS: ; 7853 (4:13853)
+	db GAL1, $06, $0e, SOUTH
+	dw $0000
+	db LASS1, $10, $0a, SOUTH
+	dw $0000
+	db IMAKUNI, $12, $02, NORTH
+	dw Preload_ImakuniInWaterClubLobby
+	db MAN2, $04, $12, EAST
+	dw Preload_Man2InWaterClubLobby
+	db PAPPY2, $16, $10, NORTH
+	dw $0000
+	db CLERK10, $06, $04, SOUTH
+	dw $0000
+	db GIFT_CENTER_CLERK, $0a, $04, SOUTH
+	dw Preload_GiftCenterClerk
+	db $00
+
+WaterClubNPCS: ; 787e (4:1387e)
+	db SARA, $06, $12, EAST
+	dw $0000
+	db AMANDA, $16, $14, WEST
+	dw $0000
+	db JOSHUA, $16, $08, SOUTH
+	dw $0000
+	db AMY, $16, $04, SOUTH
+	dw Preload_Amy
+	db $00
+
+LightningClubEntranceNPCS: ; 7897 (4:13897)
+	db CLERK4, $06, $02, SOUTH
+	dw $0000
+	db RONALD1, $08, $fe, SOUTH
+	dw $685b
+	db RONALD2, $fe, $08, NORTH
+	dw $689a
+	db RONALD3, $fe, $08, NORTH
+	dw $6915
+	db $00
+
+LightningClubLobbyNPCS: ; 78b0 (4:138b0)
+	db CHAP2, $12, $10, WEST
+	dw $0000
+	db IMAKUNI, $12, $02, NORTH
+	dw $637b
+	db LASS4, $08, $0c, SOUTH
+	dw $0000
+	db HOOD1, $14, $08, SOUTH
+	dw $0000
+	db CLERK10, $06, $04, SOUTH
+	dw $0000
+	db GIFT_CENTER_CLERK, $0a, $04, SOUTH
+	dw Preload_GiftCenterClerk
+	db $00
+
+LightningClubNPCS: ; 78d5 (4:138d5)
+	db JENNIFER, $0e, $12, SOUTH
+	dw $0000
+	db NICHOLAS, $06, $0a, SOUTH
+	dw $0000
+	db BRANDON, $16, $0c, NORTH
+	dw $0000
+	db ISAAC, $0c, $04, NORTH
+	dw $6494
+	db $00
+
+GrassClubEntranceNPCS: ; 78ee (4:138ee)
+	db CLERK5, $06, $02, SOUTH
+	dw $0000
+	db MICHAEL, $0e, $08, SOUTH
+	dw $656a
+	db RONALD1, $08, $fe, SOUTH
+	dw $685b
+	db RONALD2, $fe, $08, NORTH
+	dw $689a
+	db RONALD3, $fe, $08, NORTH
+	dw $6915
+	db $00
+
+GrassClubLobbyNPCS: ; 790d (4:1390d)
+	db BRITTANY, $0c, $0e, WEST
+	dw $0000
+	db LASS2, $12, $08, SOUTH
+	dw $0000
+	db GRANNY2, $04, $10, EAST
+	dw $0000
+	db GAL2, $14, $10, NORTH
+	dw $66dc
+	db CLERK10, $06, $04, SOUTH
+	dw $0000
+	db GIFT_CENTER_CLERK, $0a, $04, SOUTH
+	dw Preload_GiftCenterClerk
+	db $00
+
+GrassClubNPCS: ; 7932 (4:13932)
+	db KRISTIN, $04, $0a, EAST
+	dw $0000
+	db HEATHER, $0e, $10, SOUTH
+	dw $0000
+	db NIKKI, $0c, $04, SOUTH
+	dw $6796
+	db $00
+
+PsychicClubEntranceNPCS: ; 7945 (4:13945)
+	db CLERK6, $06, $02, SOUTH
+	dw $0000
+	db RONALD1, $08, $fe, SOUTH
+	dw $685b
+	db RONALD2, $fe, $08, NORTH
+	dw $689a
+	db RONALD3, $fe, $08, NORTH
+	dw $6915
+	db LAD3, $0e, $04, SOUTH
+	dw $0000
+	db $00
+
+PsychicClubLobbyNPCS: ; 7964 (4:13964)
+	db ROBERT, $14, $08, NORTH
+	dw $0000
+	db PAPPY1, $04, $10, EAST
+	dw $0000
+	db RONALD1, $0c, $0a, EAST
+	dw $69f7
+	db GAL3, $10, $0e, WEST
+	dw $0000
+	db CHAP4, $18, $10, SOUTH
+	dw $0000
+	db CLERK10, $06, $04, SOUTH
+	dw $0000
+	db GIFT_CENTER_CLERK, $0a, $04, SOUTH
+	dw Preload_GiftCenterClerk
+	db $00
+
+PsychicClubNPCS: ; 798f (4:1398f)
+	db DANIEL, $08, $08, NORTH
+	dw $0000
+	db STEPHANIE, $16, $0c, EAST
+	dw $0000
+	db MURRAY2, $02, $02, WEST
+	dw $6ad0
+	db MURRAY1, $0c, $06, SOUTH
+	dw $6ada
+	db $00
+
+ScienceClubEntranceNPCS: ; 79a8 (4:139a8)
+	db CLERK7, $06, $02, SOUTH
+	dw $0000
+	db RONALD1, $08, $fe, SOUTH
+	dw $685b
+	db RONALD2, $fe, $08, NORTH
+	dw $689a
+	db RONALD3, $fe, $08, NORTH
+	dw $6915
+	db $00
+
+ScienceClubLobbyNPCS: ; 79c1 (4:139c1)
+	db LAD1, $12, $12, NORTH
+	dw $0000
+	db IMAKUNI, $12, $02, NORTH
+	dw $6b65
+	db MAN3, $04, $0e, WEST
+	dw $0000
+	db SPECS2, $0c, $0e, WEST
+	dw $0000
+	db SPECS3, $16, $08, SOUTH
+	dw $0000
+	db CLERK10, $06, $04, SOUTH
+	dw $0000
+	db GIFT_CENTER_CLERK, $0a, $04, SOUTH
+	dw Preload_GiftCenterClerk
+	db $00
+
+ScienceClubNPCS: ; 79ec (4:139ec)
+	db JOSEPH, $08, $0a, SOUTH
+	dw $6cc4
+	db DAVID, $14, $04, NORTH
+	dw $0000
+	db ERIK, $06, $12, SOUTH
+	dw $0000
+	db RICK, $04, $04, NORTH
+	dw $0000
+	db $00
+
+FireClubEntranceNPCS: ; 7a05 (4:13a05)
+	db CLERK8, $06, $02, SOUTH
+	dw $0000
+	db RONALD1, $08, $fe, SOUTH
+	dw $685b
+	db RONALD2, $fe, $08, NORTH
+	dw $689a
+	db RONALD3, $fe, $08, NORTH
+	dw $6915
+	db $00
+
+FireClubLobbyNPCS: ; 7a1e (4:13a1e)
+	db JESSICA, $0c, $0e, WEST
+	dw $6d8d
+	db LAD2, $12, $06, EAST
+	dw $6e25
+	db CHAP3, $06, $0a, NORTH
+	dw $0000
+	db MANIA, $14, $12, NORTH
+	dw $0000
+	db CLERK10, $06, $04, SOUTH
+	dw $0000
+	db GIFT_CENTER_CLERK, $0a, $04, SOUTH
+	dw Preload_GiftCenterClerk
+	db $00
+
+FireClubNPCS: ; 7a43 (4:13a43)
+	db JOHN, $0c, $12, SOUTH
+	dw $0000
+	db ADAM, $08, $0e, SOUTH
+	dw $0000
+	db JONATHAN, $12, $0a, SOUTH
+	dw $0000
+	db KEN, $0e, $04, SOUTH
+	dw $0000
+	db $00
+
+ChallengeHallEntranceNPCS: ; 7a5c (4:13a5c)
+	db CLERK9, $06, $02, SOUTH
+	dw Preload_Clerk9
+	db $00
+
+ChallengeHallLobbyNPCS: ; 7a63 (4:13a63)
+	db PAPPY3, $06, $0e, EAST
+	dw Preload_ChallengeHallNPCs1
+	db CHAMP, $10, $12, WEST
+	dw Preload_ChallengeHallNPCs1
+	db HOOD2, $14, $08, SOUTH
+	dw Preload_ChallengeHallNPCs1
+	db LASS5, $16, $10, WEST
+	dw Preload_ChallengeHallNPCs1
+	db GAL4, $0c, $0e, EAST
+	dw Preload_ChallengeHallNPCs2
+	db CHAP5, $10, $08, WEST
+	dw Preload_ChallengeHallNPCs2
+	db RONALD1, $08, $0c, SOUTH
+	dw Preload_ChallengeHallLobbyRonald1
+	db CLERK10, $06, $04, SOUTH
+	dw $0000
+	db GIFT_CENTER_CLERK, $0a, $04, SOUTH
+	dw Preload_GiftCenterClerk
+	db $00
+
+ChallengeHallNPCS: ; 7a9a (4:13a9a)
+	db CLERK12, $0a, $12, SOUTH
+	dw Preload_ChallengeHallNPCs1
+	db CLERK13, $14, $12, SOUTH
+	dw Preload_ChallengeHallNPCs1
+	db GUIDE, $0e, $14, SOUTH
+	dw Preload_Guide
+	db HOST, $0e, $04, SOUTH
+	dw Preload_ChallengeHallNPCs1
+	db $ff, $12, $08, WEST ; pre-load function chooses NPC to load
+	dw Preload_ChallengeHallOpponent
+	db $00
+
+PokemonDomeEntranceNPCS: ; 7ab9 (4:13ab9)
+	db RONALD1, $0e, $12, SOUTH
+	dw $0000
+	db $00
+
+PokemonDomeNPCS: ; 7ac0 (4:13ac0)
+	db COURTNEY, $12, $02, SOUTH
+	dw $774b
+	db STEVE, $16, $02, SOUTH
+	dw $778c
+	db JACK, $08, $02, SOUTH
+	dw $77a3
+	db ROD, $0c, $02, SOUTH
+	dw $77ba
+	db RONALD1, $1e, $00, SOUTH
+	dw $77d6
+	db $00
+
+HallOfHonorNPCS: ; 7adf (4:13adf)
+	db LEGEND_CARDS_TOP_LEFT, $0a, $08, SOUTH
+	dw $0000
+	db LEGEND_CARDS_TOP_RIGHT, $0c, $08, SOUTH
+	dw $0000
+	db LEGEND_CARDS_LEFT_SPARK, $08, $0a, SOUTH
+	dw $0000
+	db LEGEND_CARDS_BOTTOM_LEFT, $0a, $0a, SOUTH
+	dw $0000
+	db LEGEND_CARDS_BOTTOM_RIGHT, $0c, $0a, SOUTH
+	dw $0000
+	db LEGEND_CARDS_RIGHT_SPARK, $0e, $0a, SOUTH
+	dw $0000
+	db $00
+
diff --git a/src/data/npcs.asm b/src/data/npcs.asm
index caa11af..4e5ffe7 100644
--- a/src/data/npcs.asm
+++ b/src/data/npcs.asm
@@ -1,110 +1,111 @@
 ; When you press the A button in front of something it will find a data entry somewhere on this list
 ; it will then jump to the pointer in the data item. All jumps lead to an RST20 operation.
-PointerTable_118f5:
-	dw Data_119dd
-	dw Data_119dd
-	dw Data_119ea
-	dw Data_11a11
-	dw Data_11a1e
-	dw Data_119dd
-	dw Data_119dd
-	dw Data_11a2b
-	dw Data_11a38
-	dw Data_11a45
-	dw Data_11a52
-	dw Data_11a5f
-	dw Data_11a6c
-	dw Data_11a79
-	dw Data_11a86
-	dw Data_11a93
-	dw Data_11aa0
-	dw Data_11aad
-	dw Data_11aba
-	dw Data_11ac7
-	dw Data_11ad4
-	dw Data_11ae1
-	dw Data_11aee
-	dw Data_11afb
-	dw Data_11b08
-	dw Data_11b15
-	dw Data_11b22
-	dw Data_11b2f
-	dw Data_11b3c
-	dw Data_11b49
-	dw Data_11b56
+; The Deck IDs are used for the challenge hall
+NPCDataTable:
+	dw DrMasonData
+	dw DrMasonData
+	dw Ronald1Data
+	dw IshiharaData
+	dw ImakuniData
+	dw DrMasonData
+	dw DrMasonData
+	dw SamData
+	dw Tech1Data
+	dw Tech2Data
+	dw Tech3Data
+	dw Tech4Data
+	dw Tech5Data
+	dw Tech6Data
+	dw Clerk1Data
+	dw Clerk2Data
+	dw Clerk3Data
+	dw Clerk4Data
+	dw Clerk5Data
+	dw Clerk6Data
+	dw Clerk7Data
+	dw Clerk8Data
+	dw Clerk9Data
+	dw ChrisData
+	dw MichaelData
+	dw JessicaData
+	dw MitchData
+	dw MatthewData
+	dw RyanData
+	dw AndrewData
+	dw GeneData
 	dw SaraData
 	dw AmandaData
-	dw Data_11b7d
-	dw Data_11b8a
-	dw Data_11b97
-	dw Data_11ba4
-	dw Data_11bb1
-	dw Data_11bbe
-	dw Data_11bcb
-	dw Data_11bd8
-	dw Data_11be5
-	dw Data_11bf2
-	dw Data_11bff
-	dw Data_11c0c
-	dw Data_11c19
-	dw Data_11c26
-	dw Data_11c40
-	dw Data_11c4d
-	dw Data_11c5a
-	dw Data_11c67
-	dw Data_11c74
-	dw Data_11c81
-	dw Data_11c8e
-	dw Data_11c9b
-	dw Data_11ca8
-	dw Data_11cb5
-	dw Data_11cc2
-	dw Data_11ccf
-	dw Data_11cdc
-	dw Data_11ce9
-	dw Data_11cf6
-	dw Data_11d03
-	dw Data_11d10
-	dw Data_11d1d
-	dw Data_11d2a
-	dw Data_11d37
-	dw Data_11d44
-	dw Data_11d51
-	dw Data_11d5e
-	dw Data_11d6b
-	dw Data_11d78
-	dw Data_11d85
-	dw Data_11d92
-	dw Data_11d9f
-	dw Data_11dac
-	dw Data_11db9
-	dw Data_11dc6
-	dw Data_11dd3
-	dw Data_11de0
-	dw Data_11ded
-	dw Data_11dfa
-	dw Data_11e07
-	dw Data_11e14
-	dw Data_11e21
-	dw Data_11e2e
-	dw Data_11e3b
-	dw Data_11e48
-	dw Data_11e55
-	dw Data_11e62
-	dw Data_11e6f
-	dw Data_11e7c
-	dw Data_11e89
-	dw Data_11e96
-	dw Data_11ea3
-	dw Data_11eb0
-	dw Data_11ebd
-	dw Data_11eca
-	dw Data_11ed7
-	dw Data_11ee4
-	dw Data_11ef1
-	dw Data_11efe
-	dw Data_11f0b
-	dw Data_11f18
+	dw JoshuaData
+	dw AmyData
+	dw JenniferData
+	dw NicholasData
+	dw BrandonData
+	dw IsaacData
+	dw BrittanyData
+	dw KristinData
+	dw HeatherData
+	dw NikkiData
+	dw RobertData
+	dw DanielData
+	dw StephanieData
+	dw Murray1Data
+	dw JosephData
+	dw DavidData
+	dw ErikData
+	dw RickData
+	dw JohnData
+	dw AdamData
+	dw JonathanData
+	dw KenData
+	dw CourtneyData
+	dw SteveData
+	dw JackData
+	dw RodData
+	dw Clerk10Data
+	dw GiftCenterClerkData
+	dw Man1Data
+	dw Woman1Data
+	dw Chap1Data
+	dw Gal1Data
+	dw Lass1Data
+	dw Chap2Data
+	dw Lass2Data
+	dw Pappy1Data
+	dw Lad1Data
+	dw Lad2Data
+	dw Chap3Data
+	dw Clerk12Data
+	dw Clerk13Data
+	dw HostData
+	dw Specs1Data
+	dw ButchData
+	dw Granny1Data
+	dw Lass3Data
+	dw Man2Data
+	dw Pappy2Data
+	dw Lass4Data
+	dw Hood1Data
+	dw Granny2Data
+	dw Gal2Data
+	dw Lad3Data
+	dw Gal3Data
+	dw Chap4Data
+	dw Man3Data
+	dw Specs2Data
+	dw Specs3Data
+	dw Woman2Data
+	dw ManiaData
+	dw Pappy3Data
+	dw Gal4Data
+	dw ChampData
+	dw Hood2Data
+	dw Lass5Data
+	dw Chap5Data
+	dw AaronData
+	dw GuideData
+	dw Tech7Data
+	dw Tech8Data
+	dw Data_11f18 ; these actually are used for the effects around the legendary cards
 	dw Data_11f1f
 	dw Data_11f26
 	dw Data_11f2d
@@ -113,411 +114,380 @@ PointerTable_118f5:
 	dw Data_11f42
 	dw Data_11f49
 	dw Data_11f49
-	dw Data_11c33
-	dw Data_119f7
-	dw Data_11a04
+	dw Murray2Data
+	dw Ronald2Data
+	dw Ronald3Data
 	dw Data_11f49
-Data_119dd:
-	db $01
+DrMasonData:
+	db DRMASON
 	db $02
 	db $00
 	db $26
 	db $00
-	dw $5727 ; Pointer to NPC Data
-	db $ac
-	db $03
+	dw $5727 ; Pointer to OWScript
+	tx Text03ac
 	db $00
 	db $00
 	db $00
 	db $00
-Data_119ea:
-	db $02
+Ronald1Data:
+	db RONALD1
 	db $01
 	db $04
 	db $0e
 	db $00
-	dw $5c4b ; Pointer to NPC Data
-	db $ad
-	db $03
-	db $02
-	db $1a
+	dw OWSequence_Ronald ; Pointer to OWScript
+	tx Text03ad
+	db RONALD_PIC
+	db INVINCIBLE_RONALD_DECK_ID
 	db $0f
 	db $16
-Data_119f7:
-	db $71
+Ronald2Data:
+	db RONALD2
 	db $01
 	db $04
 	db $0e
 	db $00
-	dw $5c4b ; Pointer to NPC Data
-	db $ad
-	db $03
-	db $02
-	db $1a
+	dw OWSequence_Ronald ; Pointer to OWScript
+	tx Text03ad
+	db RONALD_PIC
+	db INVINCIBLE_RONALD_DECK_ID
 	db $0f
 	db $16
-Data_11a04:
-	db $72
+Ronald3Data:
+	db RONALD3
 	db $01
 	db $04
 	db $0e
 	db $00
-	dw $5c4b ; Pointer to NPC Data
-	db $ad
-	db $03
-	db $02
-	db $1a
+	dw OWSequence_Ronald ; Pointer to OWScript
+	tx Text03ad
+	db RONALD_PIC
+	db INVINCIBLE_RONALD_DECK_ID
 	db $0f
 	db $16
-Data_11a11:
-	db $03
+IshiharaData:
+	db ISHIHARA
 	db $03
 	db $04
 	db $22
 	db $00
-	dw $5b4a ; Pointer to NPC Data
-	db $ae
-	db $03
+	dw OWSequence_Ishihara ; Pointer to OWScript
+	tx Text03ae
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11a1e:
-	db $04
+ImakuniData:
+	db IMAKUNI
 	db $04
 	db $00
 	db $0e
 	db $00
-	dw $5d0d ; Pointer to NPC Data
-	db $af
-	db $03
-	db $04
-	db $34
+	dw OWSequence_Imakuni ; Pointer to OWScript
+	tx Text03af
+	db IMAKUNI_PIC
+	db IMAKUNI_DECK_ID
 	db $10
 	db $15
-Data_11a2b:
-	db $07
+SamData:
+	db SAM
 	db $18
 	db $00
 	db $0e
 	db $00
-	dw $561d ; Pointer to NPC Data
-	db $b1
-	db $03
-	db $03
-	db $02
+	dw $561d ; Pointer to OWScript
+	tx Text03b1
+	db SAM_PIC
+	db SAMS_NORMAL_DECK_ID
 	db $02
 	db $15
-Data_11a38:
-	db $08
+Tech1Data:
+	db TECH1
 	db $18
 	db $00
 	db $0e
 	db $00
-	dw $5583 ; Pointer to NPC Data
-	db $b2
-	db $03
+	dw $5583 ; Pointer to OWScript
+	tx Text03b2
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11a45:
-	db $09
+Tech2Data:
+	db TECH2
 	db $18
 	db $00
 	db $0e
 	db $00
-	dw $55ca ; Pointer to NPC Data
-	db $b2
-	db $03
+	dw $55ca ; Pointer to OWScript
+	tx Text03b2
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11a52:
-	db $0a
+Tech3Data:
+	db TECH3
 	db $18
 	db $00
 	db $0e
 	db $00
-	dw $55d5 ; Pointer to NPC Data
-	db $b2
-	db $03
+	dw $55d5 ; Pointer to OWScript
+	tx Text03b2
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11a5f:
-	db $0b
+Tech4Data:
+	db TECH4
 	db $18
 	db $00
 	db $0e
 	db $00
-	dw $55e0 ; Pointer to NPC Data
-	db $b2
-	db $03
+	dw $55e0 ; Pointer to OWScript
+	tx Text03b2
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11a6c:
-	db $0c
+Tech5Data:
+	db TECH5
 	db $18
 	db $00
 	db $0e
 	db $00
-	dw $55f9 ; Pointer to NPC Data
-	db $b2
-	db $03
+	dw $55f9 ; Pointer to OWScript
+	tx Text03b2
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11a79:
-	db $0d
+Tech6Data:
+	db TECH6
 	db $18
 	db $00
 	db $0e
 	db $00
-	dw $58bb ; Pointer to NPC Data
-	db $b2
-	db $03
+	dw $58bb ; Pointer to OWScript
+	tx Text03b2
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11a86:
-	db $0e
+Clerk1Data:
+	db CLERK1
 	db $21
 	db $0a
 	db $30
 	db $00
-	dw $5c64 ; Pointer to NPC Data
-	db $b3
-	db $03
+	dw OWSequence_Clerk1 ; Pointer to OWScript
+	tx Text03b3
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11a93:
-	db $0f
+Clerk2Data:
+	db CLERK2
 	db $21
 	db $0a
 	db $30
 	db $00
-	dw $5ed1 ; Pointer to NPC Data
-	db $b3
-	db $03
+	dw $5ed1 ; Pointer to OWScript
+	tx Text03b3
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11aa0:
-	db $10
+Clerk3Data:
+	db CLERK3
 	db $21
 	db $0a
 	db $30
 	db $00
-	dw $609e ; Pointer to NPC Data
-	db $b3
-	db $03
+	dw $609e ; Pointer to OWScript
+	tx Text03b3
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11aad:
-	db $11
+Clerk4Data:
+	db CLERK4
 	db $21
 	db $0a
 	db $30
 	db $00
-	dw $6369 ; Pointer to NPC Data
-	db $b3
-	db $03
+	dw $6369 ; Pointer to OWScript
+	tx Text03b3
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11aba:
-	db $12
+Clerk5Data:
+	db CLERK5
 	db $21
 	db $0a
 	db $30
 	db $00
-	dw $6566 ; Pointer to NPC Data
-	db $b3
-	db $03
+	dw $6566 ; Pointer to OWScript
+	tx Text03b3
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11ac7:
-	db $13
+Clerk6Data:
+	db CLERK6
 	db $21
 	db $0a
 	db $30
 	db $00
-	dw $684c ; Pointer to NPC Data
-	db $b3
-	db $03
+	dw $684c ; Pointer to OWScript
+	tx Text03b3
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11ad4:
-	db $14
+Clerk7Data:
+	db CLERK7
 	db $21
 	db $0a
 	db $30
 	db $00
-	dw $6b53 ; Pointer to NPC Data
-	db $b3
-	db $03
+	dw $6b53 ; Pointer to OWScript
+	tx Text03b3
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11ae1:
-	db $15
+Clerk8Data:
+	db CLERK8
 	db $21
 	db $0a
 	db $30
 	db $00
-	dw $6d45 ; Pointer to NPC Data
-	db $b3
-	db $03
+	dw $6d45 ; Pointer to OWScript
+	tx Text03b3
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11aee:
-	db $16
+Clerk9Data:
+	db CLERK9
 	db $21
 	db $0a
 	db $30
 	db $00
-	dw $7025 ; Pointer to NPC Data
-	db $b3
-	db $03
+	dw OWSequence_Clerk9 ; Pointer to OWScript
+	tx Text03b3
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11afb:
-	db $17
+ChrisData:
+	db CHRIS
 	db $15
 	db $00
 	db $26
 	db $00
-	dw $5ef2 ; Pointer to NPC Data
-	db $b4
-	db $03
-	db $1d
-	db $1c
+	dw $5ef2 ; Pointer to OWScript
+	tx Text03b4
+	db CHRIS_PIC
+	db MUSCLES_FOR_BRAINS_DECK_ID
 	db $03
 	db $15
-Data_11b08:
-	db $18
+MichaelData:
+	db MICHAEL
 	db $15
 	db $00
 	db $26
 	db $00
-	dw $6573 ; Pointer to NPC Data
-	db $b5
-	db $03
-	db $1e
-	db $1d
+	dw $6573 ; Pointer to OWScript
+	tx Text03b5
+	db MICHAEL_PIC
+	db HEATED_BATTLE_DECK_ID
 	db $03
 	db $15
-Data_11b15:
-	db $19
+JessicaData:
+	db JESSICA
 	db $1f
 	db $04
 	db $1a
 	db $00
-	dw $6d96 ; Pointer to NPC Data
-	db $b6
-	db $03
-	db $27
-	db $1e
+	dw $6d96 ; Pointer to OWScript
+	tx Text03b6
+	db JESSICA_PIC
+	db LOVE_TO_BATTLE_DECK_ID
 	db $03
 	db $15
-Data_11b22:
-	db $1a
+MitchData:
+	db MITCH
 	db $0a
 	db $00
 	db $0e
 	db $00
-	dw $5dc3 ; Pointer to NPC Data
-	db $b7
-	db $03
-	db $0a
-	db $10
+	dw $5dc3 ; Pointer to OWScript
+	tx Text03b7
+	db MITCH_PIC
+	db FIRST_STRIKE_DECK_ID
 	db $03
 	db $16
-Data_11b2f:
-	db $1b
+MatthewData:
+	db MATTHEW
 	db $15
 	db $00
 	db $16
 	db $00
-	dw $5f39 ; Pointer to NPC Data
-	db $b8
-	db $03
-	db $1a
-	db $21
+	dw $5f39 ; Pointer to OWScript
+	tx Text03b8
+	db MATTHEW_PIC
+	db HARD_POKEMON_DECK_ID
 	db $03
 	db $15
-Data_11b3c:
-	db $1c
+RyanData:
+	db RYAN
 	db $11
 	db $00
 	db $26
 	db $00
-	dw $5ff0 ; Pointer to NPC Data
-	db $b9
-	db $03
-	db $1b
-	db $1f
+	dw $5ff0 ; Pointer to OWScript
+	tx Text03b9
+	db RYAN_PIC
+	db EXCAVATION_DECK_ID
 	db $03
 	db $15
-Data_11b49:
-	db $1d
+AndrewData:
+	db ANDREW
 	db $1a
 	db $00
 	db $16
 	db $00
-	dw $6017 ; Pointer to NPC Data
-	db $ba
-	db $03
-	db $1c
-	db $20
+	dw $6017 ; Pointer to OWScript
+	tx Text03ba
+	db ANDREW_PIC
+	db BLISTERING_POKEMON_DECK_ID
 	db $03
 	db $15
-Data_11b56:
-	db $1e
+GeneData:
+	db GENE
 	db $0b
 	db $04
 	db $1e
 	db $00
-	dw $603e ; Pointer to NPC Data
-	db $bb
-	db $03
-	db $0b
-	db $11
+	dw $603e ; Pointer to OWScript
+	tx Text03bb
+	db GENE_PIC
+	db ROCK_CRUSHER_DECK_ID
 	db $03
 	db $16
 SaraData:
-	db SARA ; trainer id
+	db SARA
 	db $20
 	db $00
 	db $0e
 	db $00
-	dw OWSequence_Sara ; Pointer to NPC Data
-	db $bc
-	db $03
-	db SARA_PIC ; battle profile picture
-	db $22
+	dw OWSequence_Sara ; Pointer to OWScript
+	tx Text03bc
+	db SARA_PIC
+	db WATERFRONT_POKEMON_DECK_ID
 	db $03
 	db $15
 AmandaData:
@@ -526,932 +496,860 @@ AmandaData:
 	db $00
 	db $16
 	db $00
-	dw OWSequence_Amanda ; Pointer to NPC Data
-	db $bd
-	db $03
+	dw OWSequence_Amanda ; Pointer to OWScript
+	tx Text03bd
 	db AMANDA_PIC ; battle profile picture
-	db $23
+	db LONELY_FRIENDS_DECK_ID
 	db $03
 	db $15
-Data_11b7d:
-	db $21
+JoshuaData:
+	db JOSHUA
 	db $16
 	db $00
 	db $26
 	db $00
-	dw OWSequence_Joshua ; Pointer to NPC Data
-	db $be
-	db $03
-	db $17
-	db $24
+	dw OWSequence_Joshua ; Pointer to OWScript
+	tx Text03be
+	db JOSHUA_PIC
+	db SOUND_OF_THE_WAVES_DECK_ID
 	db $03
 	db $15
-Data_11b8a:
-	db $22
+AmyData:
+	db AMY
 	db $08
 	db $08
 	db $2e
 	db $10
-	dw $6304 ; Pointer to NPC Data
-	db $bf
-	db $03
-	db $08
-	db $12
+	dw OWSequence_Amy ; Pointer to OWScript
+	tx Text03bf
+	db AMY_PIC
+	db GO_GO_RAIN_DANCE_DECK_ID
 	db $03
 	db $16
-Data_11b97:
-	db $23
+JenniferData:
+	db JENNIFER
 	db $1c
 	db $04
 	db $0e
 	db $00
-	dw $6408 ; Pointer to NPC Data
-	db $c0
-	db $03
-	db $26
-	db $25
+	dw $6408 ; Pointer to OWScript
+	tx Text03c0
+	db JENNIFER_PIC
+	db PIKACHU_DECK_ID
 	db $03
 	db $15
-Data_11ba4:
-	db $24
+NicholasData:
+	db NICHOLAS
 	db $17
 	db $04
 	db $1e
 	db $00
-	dw $642f ; Pointer to NPC Data
-	db $c1
-	db $03
-	db $18
-	db $26
+	dw $642f ; Pointer to OWScript
+	tx Text03c1
+	db NICHOLAS_PIC
+	db BOOM_BOOM_SELFDESTRUCT_DECK_ID
 	db $03
 	db $15
-Data_11bb1:
-	db $25
+BrandonData:
+	db BRANDON
 	db $17
 	db $04
 	db $1e
 	db $00
-	dw $6456 ; Pointer to NPC Data
-	db $c2
-	db $03
-	db $19
-	db $27
+	dw $6456 ; Pointer to OWScript
+	tx Text03c2
+	db BRANDON_PIC
+	db POWER_GENERATOR_DECK_ID
 	db $03
 	db $15
-Data_11bbe:
-	db $26
+IsaacData:
+	db ISAAC
 	db $09
 	db $00
 	db $16
 	db $00
-	dw $64ad ; Pointer to NPC Data
-	db $c3
-	db $03
-	db $09
-	db $13
+	dw $64ad ; Pointer to OWScript
+	tx Text03c3
+	db ISAAC_PIC
+	db ZAPPING_SELFDESTRUCT_DECK_ID
 	db $03
 	db $16
-Data_11bcb:
-	db $27
+BrittanyData:
+	db BRITTANY
 	db $1c
 	db $04
 	db $0e
 	db $00
-	dw $65d2 ; Pointer to NPC Data
-	db $c4
-	db $03
-	db $21
-	db $28
+	dw OWSequence_Brittany ; Pointer to OWScript
+	tx Text03c4
+	db BRITTANY_PIC
+	db ETCETERA_DECK_ID
 	db $03
 	db $15
-Data_11bd8:
-	db $28
+KristinData:
+	db KRISTIN
 	db $1e
 	db $00
 	db $1e
 	db $00
-	dw $6701 ; Pointer to NPC Data
-	db $c5
-	db $03
-	db $22
-	db $29
+	dw $6701 ; Pointer to OWScript
+	tx Text03c5
+	db KRISTIN_PIC
+	db FLOWER_GARDEN_DECK_ID
 	db $03
 	db $15
-Data_11be5:
-	db $29
+HeatherData:
+	db HEATHER
 	db $1d
 	db $04
 	db $22
 	db $00
-	dw $6745 ; Pointer to NPC Data
-	db $c6
-	db $03
-	db $23
-	db $2a
+	dw $6745 ; Pointer to OWScript
+	tx Text03c6
+	db HEATHER_PIC
+	db KALEIDOSCOPE_DECK_ID
 	db $03
 	db $15
-Data_11bf2:
-	db $2a
+NikkiData:
+	db NIKKI
 	db $05
 	db $00
 	db $1a
 	db $00
-	dw $679e ; Pointer to NPC Data
-	db $c7
-	db $03
-	db $05
-	db $14
+	dw $679e ; Pointer to OWScript
+	tx Text03c7
+	db NIKKI_PIC
+	db FLOWER_POWER_DECK_ID
 	db $03
 	db $16
-Data_11bff:
-	db $2b
+RobertData:
+	db ROBERT
 	db $11
 	db $04
 	db $16
 	db $00
-	dw $6980 ; Pointer to NPC Data
-	db $c8
-	db $03
-	db $20
-	db $2b
+	dw $6980 ; Pointer to OWScript
+	tx Text03c8
+	db ROBERT_PIC
+	db GHOST_DECK_ID
 	db $03
 	db $15
-Data_11c0c:
-	db $2c
+DanielData:
+	db DANIEL
 	db $12
 	db $04
 	db $1a
 	db $00
-	dw $6a60 ; Pointer to NPC Data
-	db $c9
-	db $03
-	db $1f
-	db $2c
+	dw $6a60 ; Pointer to OWScript
+	tx Text03c9
+	db DANIEL_PIC
+	db NAP_TIME_DECK_ID
 	db $03
 	db $15
-Data_11c19:
-	db $2d
+StephanieData:
+	db STEPHANIE
 	db $1c
 	db $04
 	db $0e
 	db $00
-	dw $6aa2 ; Pointer to NPC Data
-	db $ca
-	db $03
-	db $28
-	db $2d
+	dw $6aa2 ; Pointer to OWScript
+	tx Text03ca
+	db STEPHANIE_PIC
+	db STRANGE_POWER_DECK_ID
 	db $03
 	db $15
-Data_11c26:
-	db $2e
+Murray1Data:
+	db MURRAY1
 	db $0c
 	db $00
 	db $12
 	db $00
-	dw $6adf ; Pointer to NPC Data
-	db $cb
-	db $03
-	db $0c
-	db $15
+	dw $6adf ; Pointer to OWScript
+	tx Text03cb
+	db MURRAY_PIC
+	db STRANGE_PSYSHOCK_DECK_ID
 	db $03
 	db $16
-Data_11c33:
-	db $70
+Murray2Data:
+	db MURRAY2
 	db $0c
 	db $03
 	db $15
 	db $10
-	dw $6adf ; Pointer to NPC Data
-	db $cb
-	db $03
-	db $0c
-	db $15
+	dw $6adf ; Pointer to OWScript
+	tx Text03cb
+	db MURRAY_PIC
+	db STRANGE_PSYSHOCK_DECK_ID
 	db $03
 	db $16
-Data_11c40:
-	db $2f
+JosephData:
+	db JOSEPH
 	db $18
 	db $00
 	db $0e
 	db $00
-	dw $6cdb ; Pointer to NPC Data
-	db $cc
-	db $03
-	db $11
-	db $2e
+	dw $6cdb ; Pointer to OWScript
+	tx Text03cc
+	db JOSEPH_PIC
+	db FLYIN_POKEMON_DECK_ID
 	db $03
 	db $15
-Data_11c4d:
-	db $30
+DavidData:
+	db DAVID
 	db $18
 	db $00
 	db $0e
 	db $00
-	dw $6c11 ; Pointer to NPC Data
-	db $cd
-	db $03
-	db $12
-	db $2f
+	dw $6c11 ; Pointer to OWScript
+	tx Text03cd
+	db DAVID_PIC
+	db LOVELY_NIDORAN_DECK_ID
 	db $03
 	db $15
-Data_11c5a:
-	db $31
+ErikData:
+	db ERIK
 	db $18
 	db $00
 	db $0e
 	db $00
-	dw $6c42 ; Pointer to NPC Data
-	db $ce
-	db $03
-	db $13
-	db $30
+	dw $6c42 ; Pointer to OWScript
+	tx Text03ce
+	db ERIK_PIC
+	db POISON_DECK_ID
 	db $03
 	db $15
-Data_11c67:
-	db $32
+RickData:
+	db RICK
 	db $06
 	db $00
 	db $0e
 	db $00
-	dw $6c67 ; Pointer to NPC Data
-	db $cf
-	db $03
-	db $06
-	db $16
+	dw $6c67 ; Pointer to OWScript
+	tx Text03cf
+	db RICK_PIC
+	db WONDERS_OF_SCIENCE_DECK_ID
 	db $03
 	db $16
-Data_11c74:
-	db $33
+JohnData:
+	db JOHN
 	db $12
 	db $04
 	db $1a
 	db $00
-	dw $6eb3 ; Pointer to NPC Data
-	db $d0
-	db $03
-	db $14
-	db $31
+	dw $6eb3 ; Pointer to OWScript
+	tx Text03d0
+	db JOHN_PIC
+	db ANGER_DECK_ID
 	db $03
 	db $15
-Data_11c81:
-	db $34
+AdamData:
+	db ADAM
 	db $13
 	db $00
 	db $22
 	db $00
-	dw $6ed8 ; Pointer to NPC Data
-	db $d1
-	db $03
-	db $15
-	db $32
+	dw $6ed8 ; Pointer to OWScript
+	tx Text03d1
+	db ADAM_PIC
+	db FLAMETHROWER_DECK_ID
 	db $03
 	db $15
-Data_11c8e:
-	db $35
+JonathanData:
+	db JONATHAN
 	db $11
 	db $04
 	db $16
 	db $00
-	dw $6efd ; Pointer to NPC Data
-	db $d2
-	db $03
-	db $16
-	db $33
+	dw $6efd ; Pointer to OWScript
+	tx Text03d2
+	db JONATHAN_PIC
+	db RESHUFFLE_DECK_ID
 	db $03
 	db $15
-Data_11c9b:
-	db $36
+KenData:
+	db KEN
 	db $07
 	db $04
 	db $1e
 	db $00
-	dw $6f22 ; Pointer to NPC Data
-	db $d3
-	db $03
-	db $07
-	db $17
+	dw $6f22 ; Pointer to OWScript
+	tx Text03d3
+	db KEN_PIC
+	db FIRE_CHARGE_DECK_ID
 	db $03
 	db $16
-Data_11ca8:
-	db $37
+CourtneyData:
+	db COURTNEY
 	db $0d
 	db $00
 	db $12
 	db $00
-	dw $771f ; Pointer to NPC Data
-	db $d4
-	db $03
-	db $0d
-	db $0c
+	dw $771f ; Pointer to OWScript
+	tx Text03d4
+	db COURTNEY_PIC
+	db LEGENDARY_MOLTRES_DECK_ID
 	db $04
 	db $17
-Data_11cb5:
-	db $38
+SteveData:
+	db STEVE
 	db $0e
 	db $00
 	db $2a
 	db $00
-	dw $772a ; Pointer to NPC Data
-	db $d5
-	db $03
-	db $0e
-	db $0d
+	dw $772a ; Pointer to OWScript
+	tx Text03d5
+	db STEVE_PIC
+	db LEGENDARY_ZAPDOS_DECK_ID
 	db $04
 	db $17
-Data_11cc2:
-	db $39
+JackData:
+	db JACK
 	db $0f
 	db $00
 	db $26
 	db $00
-	dw $7735 ; Pointer to NPC Data
-	db $d6
-	db $03
-	db $0f
-	db $0e
+	dw $7735 ; Pointer to OWScript
+	tx Text03d6
+	db JACK_PIC
+	db LEGENDARY_ARTICUNO_DECK_ID
 	db $04
 	db $17
-Data_11ccf:
-	db $3a
+RodData:
+	db ROD
 	db $10
 	db $00
 	db $0e
 	db $00
-	dw $7740 ; Pointer to NPC Data
-	db $d7
-	db $03
-	db $10
-	db $0f
+	dw $7740 ; Pointer to OWScript
+	tx Text03d7
+	db ROD_PIC
+	db LEGENDARY_DRAGONITE_DECK_ID
 	db $04
 	db $17
-Data_11cdc:
-	db $3b
+Clerk10Data:
+	db CLERK10
 	db $21
 	db $0a
 	db $30
 	db $00
-	dw $4c3e ; Pointer to NPC Data
-	db $b0
-	db $03
+	dw NoOverworldSequence ; Pointer to OWScript
+	tx Text03b0
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11ce9:
-	db $3c
+GiftCenterClerkData:
+	db GIFT_CENTER_CLERK
 	db $21
 	db $0a
 	db $30
 	db $00
-	dw $4c3e ; Pointer to NPC Data
-	db $b0
-	db $03
+	dw NoOverworldSequence ; Pointer to OWScript
+	tx Text03b0
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11cf6:
-	db $3d
+Man1Data:
+	db MAN1
 	db $1a
 	db $00
 	db $16
 	db $00
-	dw $5c76 ; Pointer to NPC Data
-	db $d8
-	db $03
+	dw $5c76 ; Pointer to OWScript
+	tx Text03d8
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11d03:
-	db $3e
+Woman1Data:
+	db WOMAN1
 	db $23
 	db $04
 	db $1e
 	db $00
-	dw $5f83 ; Pointer to NPC Data
-	db $d9
-	db $03
+	dw $5f83 ; Pointer to OWScript
+	tx Text03d9
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11d10:
-	db $3f
+Chap1Data:
+	db CHAP1
 	db $19
 	db $00
 	db $1a
 	db $00
-	dw $5fc0 ; Pointer to NPC Data
-	db $da
-	db $03
+	dw $5fc0 ; Pointer to OWScript
+	tx Text03da
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11d1d:
-	db $40
+Gal1Data:
+	db GAL1
 	db $22
 	db $00
 	db $16
 	db $00
-	dw $60cf ; Pointer to NPC Data
-	db $db
-	db $03
+	dw OWSequence_Gal1 ; Pointer to OWScript
+	tx Text03db
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11d2a:
-	db $41
+Lass1Data:
+	db LASS1
 	db $1e
 	db $00
 	db $1e
 	db $00
-	dw $6111 ; Pointer to NPC Data
-	db $dc
-	db $03
+	dw OWSequence_Lass1 ; Pointer to OWScript
+	tx Text03dc
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11d37:
-	db $42
+Chap2Data:
+	db CHAP2
 	db $19
 	db $00
 	db $1a
 	db $00
-	dw $639a ; Pointer to NPC Data
-	db $da
-	db $03
+	dw $639a ; Pointer to OWScript
+	tx Text03da
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11d44:
-	db $43
+Lass2Data:
+	db LASS2
 	db $1e
 	db $00
 	db $1e
 	db $00
-	dw $661f ; Pointer to NPC Data
-	db $dc
-	db $03
+	dw OWSequence_e61f ; Pointer to OWScript
+	tx Text03dc
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11d51:
-	db $44
+Pappy1Data:
+	db PAPPY1
 	db $1b
 	db $00
 	db $22
 	db $00
-	dw $69a5 ; Pointer to NPC Data
-	db $dd
-	db $03
+	dw $69a5 ; Pointer to OWScript
+	tx Text03dd
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11d5e:
-	db $45
+Lad1Data:
+	db LAD1
 	db $12
 	db $04
 	db $1a
 	db $00
-	dw $6b84 ; Pointer to NPC Data
-	db $de
-	db $03
+	dw $6b84 ; Pointer to OWScript
+	tx Text03de
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11d6b:
-	db $46
+Lad2Data:
+	db LAD2
 	db $11
 	db $04
 	db $16
 	db $00
-	dw $6e2c ; Pointer to NPC Data
-	db $de
-	db $03
+	dw $6e2c ; Pointer to OWScript
+	tx Text03de
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11d78:
-	db $47
+Chap3Data:
+	db CHAP3
 	db $19
 	db $00
 	db $1a
 	db $00
-	dw $6de8 ; Pointer to NPC Data
-	db $da
-	db $03
+	dw $6de8 ; Pointer to OWScript
+	tx Text03da
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11d85:
-	db $48
+Clerk12Data:
+	db CLERK12
 	db $22
 	db $00
 	db $16
 	db $00
-	dw $7295 ; Pointer to NPC Data
-	db $b3
-	db $03
+	dw OWSequence_Clerk12 ; Pointer to OWScript
+	tx Text03b3
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11d92:
-	db $49
+Clerk13Data:
+	db CLERK13
 	db $22
 	db $00
 	db $16
 	db $00
-	dw $726c ; Pointer to NPC Data
-	db $b3
-	db $03
+	dw OWSequence_Clerk13 ; Pointer to OWScript
+	tx Text03b3
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11d9f:
-	db $4a
+HostData:
+	db HOST
 	db $22
 	db $00
 	db $16
 	db $00
-	dw $7352 ; Pointer to NPC Data
-	db $df
-	db $03
+	dw OWSequence_HostStubbed ; Pointer to OWScript
+	tx Text03df
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11dac:
-	db $4b
+Specs1Data:
+	db SPECS1
 	db $13
 	db $00
 	db $22
 	db $00
-	dw $5d82 ; Pointer to NPC Data
-	db $e0
-	db $03
+	dw $5d82 ; Pointer to OWScript
+	tx Text03e0
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11db9:
-	db $4c
+ButchData:
+	db BUTCH
 	db $14
 	db $00
 	db $16
 	db $00
-	dw $5d8d ; Pointer to NPC Data
-	db $e1
-	db $03
+	dw $5d8d ; Pointer to OWScript
+	tx Text03e1
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11dc6:
-	db $4d
+Granny1Data:
+	db GRANNY1
 	db $24
 	db $00
 	db $16
 	db $00
-	dw $5d9f ; Pointer to NPC Data
-	db $e5
-	db $03
+	dw $5d9f ; Pointer to OWScript
+	tx Text03e5
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11dd3:
-	db $4e
+Lass3Data:
+	db LASS3
 	db $1d
 	db $04
 	db $22
 	db $00
-	dw $5fd2 ; Pointer to NPC Data
-	db $dc
-	db $03
+	dw $5fd2 ; Pointer to OWScript
+	tx Text03dc
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11de0:
-	db $4f
+Man2Data:
+	db MAN2
 	db $1a
 	db $00
 	db $16
 	db $00
-	dw $6137 ; Pointer to NPC Data
-	db $d8
-	db $03
+	dw OWSequence_Man2 ; Pointer to OWScript
+	tx Text03d8
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11ded:
-	db $50
+Pappy2Data:
+	db PAPPY2
 	db $1b
 	db $00
 	db $22
 	db $00
-	dw $613b ; Pointer to NPC Data
-	db $dd
-	db $03
+	dw OWSequence_Pappy2 ; Pointer to OWScript
+	tx Text03dd
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11dfa:
-	db $51
+Lass4Data:
+	db LASS4
 	db $1d
 	db $04
 	db $22
 	db $00
-	dw $63d9 ; Pointer to NPC Data
-	db $dc
-	db $03
+	dw $63d9 ; Pointer to OWScript
+	tx Text03dc
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11e07:
-	db $52
+Hood1Data:
+	db HOOD1
 	db $17
 	db $04
 	db $1e
 	db $00
-	dw $63dd ; Pointer to NPC Data
-	db $e2
-	db $03
+	dw $63dd ; Pointer to OWScript
+	tx Text03e2
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11e14:
-	db $53
+Granny2Data:
+	db GRANNY2
 	db $24
 	db $00
 	db $16
 	db $00
-	dw $66d8 ; Pointer to NPC Data
-	db $e5
-	db $03
+	dw $66d8 ; Pointer to OWScript
+	tx Text03e5
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11e21:
-	db $54
+Gal2Data:
+	db GAL2
 	db $22
 	db $00
 	db $16
 	db $00
-	dw $66e3 ; Pointer to NPC Data
-	db $db
-	db $03
+	dw $66e3 ; Pointer to OWScript
+	tx Text03db
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11e2e:
-	db $55
+Lad3Data:
+	db LAD3
 	db $12
 	db $04
 	db $1a
 	db $00
-	dw $6850 ; Pointer to NPC Data
-	db $de
-	db $03
+	dw $6850 ; Pointer to OWScript
+	tx Text03de
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11e3b:
-	db $56
+Gal3Data:
+	db GAL3
 	db $22
 	db $00
 	db $16
 	db $00
-	dw $6a30 ; Pointer to NPC Data
-	db $db
-	db $03
+	dw $6a30 ; Pointer to OWScript
+	tx Text03db
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11e48:
-	db $57
+Chap4Data:
+	db CHAP4
 	db $19
 	db $00
 	db $1a
 	db $00
-	dw $6a3b ; Pointer to NPC Data
-	db $da
-	db $03
+	dw $6a3b ; Pointer to OWScript
+	tx Text03da
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11e55:
-	db $58
+Man3Data:
+	db MAN3
 	db $1a
 	db $00
 	db $16
 	db $00
-	dw $6bc1 ; Pointer to NPC Data
-	db $d8
-	db $03
+	dw $6bc1 ; Pointer to OWScript
+	tx Text03d8
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11e62:
-	db $59
+Specs2Data:
+	db SPECS2
 	db $18
 	db $00
 	db $0e
 	db $00
-	dw $6bc5 ; Pointer to NPC Data
-	db $e0
-	db $03
+	dw $6bc5 ; Pointer to OWScript
+	tx Text03e0
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11e6f:
-	db $5a
+Specs3Data:
+	db SPECS3
 	db $13
 	db $00
 	db $22
 	db $00
-	dw $6bed ; Pointer to NPC Data
-	db $e0
-	db $03
+	dw $6bed ; Pointer to OWScript
+	tx Text03e0
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11e7c:
-	db $5b
+Woman2Data:
+	db WOMAN2
 	db $23
 	db $04
 	db $1e
 	db $00
-	dw $4c3e ; Pointer to NPC Data
-	db $d9
-	db $03
+	dw NoOverworldSequence ; Pointer to OWScript
+	tx Text03d9
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11e89:
-	db $5c
+ManiaData:
+	db MANIA
 	db $15
 	db $00
 	db $26
 	db $00
-	dw $6e88 ; Pointer to NPC Data
-	db $e4
-	db $03
+	dw $6e88 ; Pointer to OWScript
+	tx Text03e4
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11e96:
-	db $5d
+Pappy3Data:
+	db PAPPY3
 	db $1b
 	db $00
 	db $22
 	db $00
-	dw $709c ; Pointer to NPC Data
-	db $dd
-	db $03
+	dw OWSequence_Pappy3 ; Pointer to OWScript
+	tx Text03dd
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11ea3:
-	db $5e
+Gal4Data:
+	db GAL4
 	db $22
 	db $00
 	db $16
 	db $00
-	dw $70a0 ; Pointer to NPC Data
-	db $db
-	db $03
+	dw OWSequence_Gal4 ; Pointer to OWScript
+	tx Text03db
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11eb0:
-	db $5f
+ChampData:
+	db CHAMP
 	db $15
 	db $00
 	db $26
 	db $00
-	dw $70a4 ; Pointer to NPC Data
-	db $e3
-	db $03
+	dw OWSequence_Champ ; Pointer to OWScript
+	tx Text03e3
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11ebd:
-	db $60
+Hood2Data:
+	db HOOD2
 	db $17
 	db $04
 	db $1e
 	db $00
-	dw $70a8 ; Pointer to NPC Data
-	db $e2
-	db $03
+	dw OWSequence_Hood2 ; Pointer to OWScript
+	tx Text03e2
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11eca:
-	db $61
+Lass5Data:
+	db LASS5
 	db $1f
 	db $04
 	db $1a
 	db $00
-	dw $70ac ; Pointer to NPC Data
-	db $dc
-	db $03
+	dw OWSequence_Lass5 ; Pointer to OWScript
+	tx Text03dc
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11ed7:
-	db $62
+Chap5Data:
+	db CHAP5
 	db $19
 	db $00
 	db $1a
 	db $00
-	dw $70b0 ; Pointer to NPC Data
-	db $da
-	db $03
+	dw OWSequence_Chap5 ; Pointer to OWScript
+	tx Text03da
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11ee4:
-	db $63
+AaronData:
+	db AARON
 	db $18
 	db $00
 	db $0e
 	db $00
-	dw $58dd ; Pointer to NPC Data
-	db $e7
-	db $03
-	db $29
-	db $09
+	dw $58dd ; Pointer to OWScript
+	tx Text03e7
+	db AARON_PIC
+	db LIGHTNING_AND_FIRE_DECK_ID
 	db $02
 	db $15
-Data_11ef1:
-	db $64
+GuideData:
+	db GUIDE
 	db $1a
 	db $00
 	db $16
 	db $00
-	dw $7283 ; Pointer to NPC Data
-	db $e6
-	db $03
+	dw OWSequence_Guide ; Pointer to OWScript
+	tx Text03e6
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11efe:
-	db $65
+Tech7Data:
+	db TECH7
 	db $18
 	db $00
 	db $0e
 	db $00
-	dw $58c6 ; Pointer to NPC Data
-	db $b2
-	db $03
+	dw $58c6 ; Pointer to OWScript
+	tx Text03b2
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11f0b:
-	db $66
+Tech8Data:
+	db TECH8
 	db $18
 	db $00
 	db $0e
 	db $00
-	dw $58d1 ; Pointer to NPC Data
-	db $b2
-	db $03
+	dw $58d1 ; Pointer to OWScript
+	tx Text03b2
 	db $00
 	db $00
 	db $00
@@ -1462,49 +1360,49 @@ Data_11f18:
 	db $3a
 	db $3a
 	db $10
-	dw $4c3e ; Pointer to NPC Data
+	dw NoOverworldSequence ; Pointer to OWScript
 Data_11f1f:
 	db $68
 	db $27
 	db $3b
 	db $41
 	db $50
-	dw $4c3e ; Pointer to NPC Data
+	dw NoOverworldSequence ; Pointer to OWScript
 Data_11f26:
 	db $69
 	db $27
 	db $3c
 	db $42
 	db $50
-	dw $4c3e ; Pointer to NPC Data
+	dw NoOverworldSequence ; Pointer to OWScript
 Data_11f2d:
 	db $6a
 	db $27
 	db $3d
 	db $43
 	db $50
-	dw $4c3e ; Pointer to NPC Data
+	dw NoOverworldSequence ; Pointer to OWScript
 Data_11f34:
 	db $6b
 	db $27
 	db $3e
 	db $44
 	db $50
-	dw $4c3e ; Pointer to NPC Data
+	dw NoOverworldSequence ; Pointer to OWScript
 Data_11f3b:
 	db $6c
 	db $27
 	db $3f
 	db $45
 	db $50
-	dw $4c3e ; Pointer to NPC Data
+	dw NoOverworldSequence ; Pointer to OWScript
 Data_11f42:
 	db $6d
 	db $27
 	db $40
 	db $46
 	db $50
-	dw $4c3e ; Pointer to NPC Data
+	dw NoOverworldSequence ; Pointer to OWScript
 Data_11f49:
 	db $00
 	db $00