Continue documenting NPC struct

6 files changed, 860 insertions, 699 deletions

diff --git a/src/constants/npc_constants.asm b/src/constants/npc_constants.asm
index 12d3fe1..afc98bc 100644
--- a/src/constants/npc_constants.asm
+++ b/src/constants/npc_constants.asm
@@ -41,46 +41,118 @@
 	const STEPHANIE_PIC ; $28
 	const AARON_PIC     ; $29
 
-RONALD    EQU $02
-IMAKUNI   EQU $04
-SAM       EQU $07
-CHRIS     EQU $17
-MICHAEL   EQU $18
-JESSICA   EQU $19
-MITCH     EQU $1A
-MATTHEW   EQU $1B
-RYAN      EQU $1C
-ANDREW    EQU $1D
-GENE      EQU $1E
-SARA      EQU $1F
-AMANDA    EQU $20
-JOSHUA    EQU $21
-AMY       EQU $22
-JENNIFER  EQU $23
-NICHOLAS  EQU $24
-BRANDON   EQU $25
-ISAAC     EQU $26
-BRITTANY  EQU $27
-KRISTIN   EQU $28
-HEATHER   EQU $29
-NIKKI     EQU $2A
-ROBERT    EQU $2B
-DANIEL    EQU $2C
-STEPHANIE EQU $2D
-MURRAY    EQU $2E
-JOSEPH    EQU $2F
-DAVID     EQU $30
-ERIK      EQU $31
-RICK      EQU $32
-JOHN      EQU $33
-ADAM      EQU $34
-JONATHAN  EQU $35
-KEN       EQU $36
-COURTNEY  EQU $37
-STEVE     EQU $38
-JACK      EQU $39
-ROD       EQU $3A
-AARON     EQU $63
-MURRAY2   EQU $70
-RONALD2   EQU $71
-RONALD3   EQU $72
+	const_def 1
+	const NPC_DRMASON   ; $01
+	const NPC_RONALD    ; $02
+	const NPC_ISHIHARA  ; $03
+	const NPC_IMAKUNI   ; $04
+	const NPC_05        ; $05 (unused)
+	const NPC_06        ; $06 (unused)
+	const NPC_SAM       ; $07
+	const NPC_TECH1     ; $08
+	const NPC_TECH2     ; $09
+	const NPC_TECH3     ; $0A
+	const NPC_TECH4     ; $0B
+	const NPC_TECH5     ; $0C
+	const NPC_TECH6     ; $0D
+	const NPC_CLERK1    ; $0E
+	const NPC_CLERK2    ; $0F
+	const NPC_CLERK3    ; $10
+	const NPC_CLERK4    ; $11
+	const NPC_CLERK5    ; $12
+	const NPC_CLERK6    ; $13
+	const NPC_CLERK7    ; $14
+	const NPC_CLERK8    ; $15
+	const NPC_CLERK9    ; $16
+	const NPC_CHRIS     ; $17
+	const NPC_MICHAEL   ; $18
+	const NPC_JESSICA   ; $19
+	const NPC_MITCH     ; $1A
+	const NPC_MATTHEW   ; $1B
+	const NPC_RYAN      ; $1C
+	const NPC_ANDREW    ; $1D
+	const NPC_GENE      ; $1E
+	const NPC_SARA      ; $1F
+	const NPC_AMANDA    ; $20
+	const NPC_JOSHUA    ; $21
+	const NPC_AMY       ; $22
+	const NPC_JENNIFER  ; $23
+	const NPC_NICHOLAS  ; $24
+	const NPC_BRANDON   ; $25
+	const NPC_ISAAC     ; $26
+	const NPC_BRITTANY  ; $27
+	const NPC_KRISTIN   ; $28
+	const NPC_HEATHER   ; $29
+	const NPC_NIKKI     ; $2A
+	const NPC_ROBERT    ; $2B
+	const NPC_DANIEL    ; $2C
+	const NPC_STEPHANIE ; $2D
+	const NPC_MURRAY    ; $2E
+	const NPC_JOSEPH    ; $2F
+	const NPC_DAVID     ; $30
+	const NPC_ERIK      ; $31
+	const NPC_RICK      ; $32
+	const NPC_JOHN      ; $33
+	const NPC_ADAM      ; $34
+	const NPC_JONATHAN  ; $35
+	const NPC_KEN       ; $36
+	const NPC_COURTNEY  ; $37
+	const NPC_STEVE     ; $38
+	const NPC_JACK      ; $39
+	const NPC_ROD       ; $3A
+	const NPC_CLERK10   ; $3B
+	const NPC_CLERK11   ; $3C
+	const NPC_MAN1      ; $3D
+	const NPC_WOMAN1    ; $3E
+	const NPC_CHAP1     ; $3F
+	const NPC_GAL1      ; $40
+	const NPC_LASS1     ; $41
+	const NPC_CHAP2     ; $42
+	const NPC_LASS2     ; $43
+	const NPC_PAPPY1    ; $44
+	const NPC_LAD1      ; $45
+	const NPC_LAD2      ; $46
+	const NPC_CHAP3     ; $47
+	const NPC_CLERK12   ; $48
+	const NPC_CLERK13   ; $49
+	const NPC_HOST      ; $4A
+	const NPC_SPECS1    ; $4B
+	const NPC_BUTCH     ; $4C
+	const NPC_GRANNY1   ; $4D
+	const NPC_LASS3     ; $4E
+	const NPC_MAN2      ; $4F
+	const NPC_PAPPY2    ; $50
+	const NPC_LASS4     ; $51
+	const NPC_HOOD1     ; $52
+	const NPC_GRANNY2   ; $53
+	const NPC_GAL2      ; $54
+	const NPC_LAD3      ; $55
+	const NPC_GAL3      ; $56
+	const NPC_CHAP4     ; $57
+	const NPC_MAN3      ; $58
+	const NPC_SPECS2    ; $59
+	const NPC_SPECS3    ; $5A
+	const NPC_WOMAN2    ; $5B
+	const NPC_MANIA     ; $5C
+	const NPC_PAPPY3    ; $5D
+	const NPC_GAL4      ; $5E
+	const NPC_CHAMP     ; $5F
+	const NPC_HOOD2     ; $60
+	const NPC_LASS5     ; $61
+	const NPC_CHAP5     ; $62
+	const NPC_AARON     ; $63
+	const NPC_GUIDE     ; $64
+	const NPC_TECH7     ; $65
+	const NPC_TECH8     ; $66
+	const NPC_TORCH     ; $67
+	const NPC_LEGENDARY_CARD_TOP_LEFT            ; $68
+	const NPC_LEGENDARY_CARD_TOP_RIGHT           ; $69
+	const NPC_LEGENDARY_CARD_BOTTOM_LEFT         ; $6A
+	const NPC_LEGENDARY_CARD_BOTTOM_CENTER_LEFT  ; $6B
+	const NPC_LEGENDARY_CARD_BOTTOM_CENTER_RIGHT ; $6C
+	const NPC_LEGENDARY_CARD_BOTTOM_RIGHT        ; $6D
+	const NPC_6E        ; $6E (unused)
+	const NPC_6F        ; $6F (unused)
+	const NPC_MURRAY2   ; $70
+	const NPC_RONALD2   ; $71
+	const NPC_RONALD3   ; $72
diff --git a/src/constants/sprite_constants.asm b/src/constants/sprite_constants.asm
index dc051d9..c4d219d 100644
--- a/src/constants/sprite_constants.asm
+++ b/src/constants/sprite_constants.asm
@@ -20,3 +20,41 @@ SPRITE_ANIM_BUFFER_CAPACITY EQU 16 ; sprites
 	const SPRITE_ANIM_MOVEMENT_COUNTER
 	const SPRITE_ANIM_FIELD_0F
 SPRITE_ANIM_LENGTH EQU const_value
+
+	const_def 1
+	const SPRITE_RONALD   ; $01
+	const SPRITE_DRMASON  ; $02
+	const SPRITE_ISHIHARA ; $03
+	const SPRITE_IMAKUNI  ; $04
+	const SPRITE_NIKKI    ; $05
+	const SPRITE_RICK     ; $06
+	const SPRITE_KEN      ; $07
+	const SPRITE_AMY      ; $08
+	const SPRITE_ISAAC    ; $09
+	const SPRITE_MITCH    ; $0A
+	const SPRITE_GENE     ; $0B
+	const SPRITE_MURRAY   ; $0C
+	const SPRITE_COURTNEY ; $0D
+	const SPRITE_STEVE    ; $0E
+	const SPRITE_JACK     ; $0F
+	const SPRITE_ROD      ; $10
+	const SPRITE_BOY1     ; $11
+	const SPRITE_BOY2     ; $12
+	const SPRITE_BOY3     ; $13
+	const SPRITE_BUTCH    ; $14
+	const SPRITE_BOY4     ; $15
+	const SPRITE_JOSHUA   ; $16
+	const SPRITE_BOY5     ; $17
+	const SPRITE_TECH     ; $18
+	const SPRITE_CHAP     ; $19
+	const SPRITE_GUIDE    ; $1A
+	const SPRITE_PAPPY    ; $1B
+	const SPRITE_GIRL1    ; $1C
+	const SPRITE_GIRL2    ; $1D
+	const SPRITE_GIRL3    ; $1E
+	const SPRITE_GIRL4    ; $1F
+	const SPRITE_GIRL5    ; $20
+	const SPRITE_CLERK    ; $21
+	const SPRITE_HOST     ; $22
+	const SPRITE_WOMAN    ; $23
+	const SPRITE_GRANNY   ; $24
diff --git a/src/data/npcs.asm b/src/data/npcs.asm
index c7468f3..7ba2dde 100644
--- a/src/data/npcs.asm
+++ b/src/data/npcs.asm
@@ -1,138 +1,139 @@
 ; 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 RonaldData
-	dw Data_11a11
-	dw ImakuniData
-	dw Data_119dd
-	dw Data_119dd
-	dw SamData
-	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 ChrisData
-	dw MichaelData
-	dw JessicaData
-	dw MitchData
-	dw MatthewData
-	dw RyanData
-	dw AndrewData
-	dw GeneData
-	dw SaraData
-	dw AmandaData
-	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 MurrayData
-	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 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 AaronData
-	dw Data_11ef1
-	dw Data_11efe
-	dw Data_11f0b
-	dw Data_11f18
-	dw Data_11f1f
-	dw Data_11f26
-	dw Data_11f2d
-	dw Data_11f34
-	dw Data_11f3b
-	dw Data_11f42
-	dw Data_11f49
-	dw Data_11f49
-	dw Murray2Data
-	dw Ronald2Data
-	dw Ronald3Data
-	dw Data_11f49
-Data_119dd:
-	db $01
-	db $02
-	db $00
-	db $26
+NPCHeaderPointers:
+	dw DrMasonNPCHeader
+	dw DrMasonNPCHeader
+	dw RonaldNPCHeader
+	dw IshiharaNPCHeader
+	dw ImakuniNPCHeader
+	dw DrMasonNPCHeader
+	dw DrMasonNPCHeader
+	dw SamNPCHeader
+	dw Tech1NPCHeader
+	dw Tech2NPCHeader
+	dw Tech3NPCHeader
+	dw Tech4NPCHeader
+	dw Tech5NPCHeader
+	dw Tech6NPCHeader
+	dw Clerk1NPCHeader
+	dw Clerk2NPCHeader
+	dw Clerk3NPCHeader
+	dw Clerk4NPCHeader
+	dw Clerk5NPCHeader
+	dw Clerk6NPCHeader
+	dw Clerk7NPCHeader
+	dw Clerk8NPCHeader
+	dw Clerk9NPCHeader
+	dw ChrisNPCHeader
+	dw MichaelNPCHeader
+	dw JessicaNPCHeader
+	dw MitchNPCHeader
+	dw MatthewNPCHeader
+	dw RyanNPCHeader
+	dw AndrewNPCHeader
+	dw GeneNPCHeader
+	dw SaraNPCHeader
+	dw AmandaNPCHeader
+	dw JoshuaNPCHeader
+	dw AmyNPCHeader
+	dw JenniferNPCHeader
+	dw NicholasNPCHeader
+	dw BrandonNPCHeader
+	dw IsaacNPCHeader
+	dw BrittanyNPCHeader
+	dw KristinNPCHeader
+	dw HeatherNPCHeader
+	dw NikkiNPCHeader
+	dw RobertNPCHeader
+	dw DanielNPCHeader
+	dw StephanieNPCHeader
+	dw MurrayNPCHeader
+	dw JosephNPCHeader
+	dw DavidNPCHeader
+	dw ErikNPCHeader
+	dw RickNPCHeader
+	dw JohnNPCHeader
+	dw AdamNPCHeader
+	dw JonathanNPCHeader
+	dw KenNPCHeader
+	dw CourtneyNPCHeader
+	dw SteveNPCHeader
+	dw JackNPCHeader
+	dw RodNPCHeader
+	dw Clerk10NPCHeader
+	dw Clerk11NPCHeader
+	dw Man1NPCHeader
+	dw Woman1NPCHeader
+	dw Chap1NPCHeader
+	dw Gal1NPCHeader
+	dw Lass1NPCHeader
+	dw Chap2NPCHeader
+	dw Lass2NPCHeader
+	dw Pappy1NPCHeader
+	dw Lad1NPCHeader
+	dw Lad2NPCHeader
+	dw Chap3NPCHeader
+	dw Clerk12NPCHeader
+	dw Clerk13NPCHeader
+	dw HostNPCHeader
+	dw Specs1NPCHeader
+	dw ButchNPCHeader
+	dw Granny1NPCHeader
+	dw Lass3NPCHeader
+	dw Man2NPCHeader
+	dw Pappy2NPCHeader
+	dw Lass4NPCHeader
+	dw Hood1NPCHeader
+	dw Granny2NPCHeader
+	dw Gal2NPCHeader
+	dw Lad3NPCHeader
+	dw Gal3NPCHeader
+	dw Chap4NPCHeader
+	dw Man3NPCHeader
+	dw Specs2NPCHeader
+	dw Specs3NPCHeader
+	dw Woman2NPCHeader
+	dw ManiaNPCHeader
+	dw Pappy3NPCHeader
+	dw Gal4NPCHeader
+	dw ChampNPCHeader
+	dw Hood2NPCHeader
+	dw Lass5NPCHeader
+	dw Chap5NPCHeader
+	dw AaronNPCHeader
+	dw GuideNPCHeader
+	dw Tech7NPCHeader
+	dw Tech8NPCHeader
+	dw TorchNPCHeader
+	dw LegendaryCardTopLeftNPCHeader
+	dw LegendaryCardTopRightNPCHeader
+	dw LegendaryCardBottomLeftNPCHeader
+	dw LegendaryCardBottomCenterLeftNPCHeader
+	dw LegendaryCardBottomCenterRightNPCHeader
+	dw LegendaryCardBottomRightNPCHeader
+	dw DummyNPCHeader
+	dw DummyNPCHeader
+	dw Murray2NPCHeader
+	dw Ronald2NPCHeader
+	dw Ronald3NPCHeader
+	dw DummyNPCHeader
+
+DrMasonNPCHeader:
+	db NPC_DRMASON
+	db SPRITE_DRMASON
+	db $00
+	db $26 ; palette and animation
 	db $00
 	dw $5727 ; Pointer to NPC Data
-	db $ac
-	db $03
+	tx DrMasonNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-RonaldData:
-	db RONALD
-	db $01
+
+RonaldNPCHeader:
+	db NPC_RONALD
+	db SPRITE_RONALD
 	db $04
 	db $0e
 	db $00
@@ -140,11 +141,12 @@ RonaldData:
 	tx RonaldNPCName
 	db RONALD_PIC
 	db INVINCIBLE_RONALD_DECK_ID
-	db $0f
+	db MUSIC_RONALD
 	db MUSIC_MATCH_START_2
-Ronald2Data:
-	db RONALD2
-	db $01
+
+Ronald2NPCHeader:
+	db NPC_RONALD2
+	db SPRITE_RONALD
 	db $04
 	db $0e
 	db $00
@@ -152,11 +154,12 @@ Ronald2Data:
 	tx RonaldNPCName
 	db RONALD_PIC
 	db INVINCIBLE_RONALD_DECK_ID
-	db $0f
+	db MUSIC_RONALD
 	db MUSIC_MATCH_START_2
-Ronald3Data:
-	db RONALD3
-	db $01
+
+Ronald3NPCHeader:
+	db NPC_RONALD3
+	db SPRITE_RONALD
 	db $04
 	db $0e
 	db $00
@@ -164,24 +167,25 @@ Ronald3Data:
 	tx RonaldNPCName
 	db RONALD_PIC
 	db INVINCIBLE_RONALD_DECK_ID
-	db $0f
+	db MUSIC_RONALD
 	db MUSIC_MATCH_START_2
-Data_11a11:
-	db $03
-	db $03
+
+IshiharaNPCHeader:
+	db NPC_ISHIHARA
+	db SPRITE_ISHIHARA
 	db $04
 	db $22
 	db $00
 	dw $5b4a ; Pointer to NPC Data
-	db $ae
-	db $03
+	tx IshiharaNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-ImakuniData:
-	db IMAKUNI
-	db $04
+
+ImakuniNPCHeader:
+	db NPC_IMAKUNI
+	db SPRITE_IMAKUNI
 	db $00
 	db $0e
 	db $00
@@ -189,11 +193,12 @@ ImakuniData:
 	tx ImakuniNPCName
 	db IMAKUNI_PIC
 	db IMAKUNI_DECK_ID
-	db $10
+	db MUSIC_IMAKUNI
 	db MUSIC_MATCH_START_1
-SamData:
-	db SAM
-	db $18 ; sprite ID
+
+SamNPCHeader:
+	db NPC_SAM
+	db SPRITE_TECH
 	db $00
 	db $0e
 	db $00
@@ -201,206 +206,207 @@ SamData:
 	tx SamNPCName
 	db SAM_PIC
 	db SAMS_NORMAL_DECK_ID
-	db $02
+	db MUSIC_DUEL_THEME_1
 	db MUSIC_MATCH_START_1
-Data_11a38:
-	db $08
-	db $18
+
+Tech1NPCHeader:
+	db NPC_TECH1
+	db SPRITE_TECH
 	db $00
 	db $0e
 	db $00
 	dw $5583 ; Pointer to NPC Data
-	db $b2
-	db $03
+	tx TechNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11a45:
-	db $09
-	db $18
+
+Tech2NPCHeader:
+	db NPC_TECH2
+	db SPRITE_TECH
 	db $00
 	db $0e
 	db $00
 	dw $55ca ; Pointer to NPC Data
-	db $b2
-	db $03
+	tx TechNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11a52:
-	db $0a
-	db $18
+
+Tech3NPCHeader:
+	db NPC_TECH3
+	db SPRITE_TECH
 	db $00
 	db $0e
 	db $00
 	dw $55d5 ; Pointer to NPC Data
-	db $b2
-	db $03
+	tx TechNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11a5f:
-	db $0b
-	db $18
+
+Tech4NPCHeader:
+	db NPC_TECH4
+	db SPRITE_TECH
 	db $00
 	db $0e
 	db $00
 	dw $55e0 ; Pointer to NPC Data
-	db $b2
-	db $03
+	tx TechNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11a6c:
-	db $0c
-	db $18
+
+Tech5NPCHeader:
+	db NPC_TECH5
+	db SPRITE_TECH
 	db $00
 	db $0e
 	db $00
 	dw $55f9 ; Pointer to NPC Data
-	db $b2
-	db $03
+	tx TechNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11a79:
-	db $0d
-	db $18
+
+Tech6NPCHeader:
+	db NPC_TECH6
+	db SPRITE_TECH
 	db $00
 	db $0e
 	db $00
 	dw $58bb ; Pointer to NPC Data
-	db $b2
-	db $03
+	tx TechNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11a86:
-	db $0e
-	db $21
+
+Clerk1NPCHeader:
+	db NPC_CLERK1
+	db SPRITE_CLERK
 	db $0a
 	db $30
 	db $00
 	dw $5c64 ; Pointer to NPC Data
-	db $b3
-	db $03
+	tx ClerkNPCName2
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11a93:
-	db $0f
-	db $21
+
+Clerk2NPCHeader:
+	db NPC_CLERK2
+	db SPRITE_CLERK
 	db $0a
 	db $30
 	db $00
 	dw $5ed1 ; Pointer to NPC Data
-	db $b3
-	db $03
+	tx ClerkNPCName2
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11aa0:
-	db $10
-	db $21
+
+Clerk3NPCHeader:
+	db NPC_CLERK3
+	db SPRITE_CLERK
 	db $0a
 	db $30
 	db $00
 	dw $609e ; Pointer to NPC Data
-	db $b3
-	db $03
+	tx ClerkNPCName2
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11aad:
-	db $11
-	db $21
+
+Clerk4NPCHeader:
+	db NPC_CLERK4
+	db SPRITE_CLERK
 	db $0a
 	db $30
 	db $00
 	dw $6369 ; Pointer to NPC Data
-	db $b3
-	db $03
+	tx ClerkNPCName2
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11aba:
-	db $12
-	db $21
+
+Clerk5NPCHeader:
+	db NPC_CLERK5
+	db SPRITE_CLERK
 	db $0a
 	db $30
 	db $00
 	dw $6566 ; Pointer to NPC Data
-	db $b3
-	db $03
+	tx ClerkNPCName2
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11ac7:
-	db $13
-	db $21
+
+Clerk6NPCHeader:
+	db NPC_CLERK6
+	db SPRITE_CLERK
 	db $0a
 	db $30
 	db $00
 	dw $684c ; Pointer to NPC Data
-	db $b3
-	db $03
+	tx ClerkNPCName2
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11ad4:
-	db $14
-	db $21
+
+Clerk7NPCHeader:
+	db NPC_CLERK7
+	db SPRITE_CLERK
 	db $0a
 	db $30
 	db $00
 	dw $6b53 ; Pointer to NPC Data
-	db $b3
-	db $03
+	tx ClerkNPCName2
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11ae1:
-	db $15
-	db $21
+
+Clerk8NPCHeader:
+	db NPC_CLERK8
+	db SPRITE_CLERK
 	db $0a
 	db $30
 	db $00
 	dw $6d45 ; Pointer to NPC Data
-	db $b3
-	db $03
+	tx ClerkNPCName2
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11aee:
-	db $16
-	db $21
+
+Clerk9NPCHeader:
+	db NPC_CLERK9
+	db SPRITE_CLERK
 	db $0a
 	db $30
 	db $00
 	dw $7025 ; Pointer to NPC Data
-	db $b3
-	db $03
+	tx ClerkNPCName2
 	db $00
 	db $00
 	db $00
 	db $00
-ChrisData:
-	db CHRIS
-	db $15
+
+ChrisNPCHeader:
+	db NPC_CHRIS
+	db SPRITE_BOY4
 	db $00
 	db $26
 	db $00
@@ -408,11 +414,12 @@ ChrisData:
 	tx ChrisNPCName
 	db CHRIS_PIC
 	db MUSCLES_FOR_BRAINS_DECK_ID
-	db $03
+	db MUSIC_DUEL_THEME_2
 	db MUSIC_MATCH_START_1
-MichaelData:
-	db MICHAEL
-	db $15
+
+MichaelNPCHeader:
+	db NPC_MICHAEL
+	db SPRITE_BOY4
 	db $00
 	db $26
 	db $00
@@ -420,11 +427,12 @@ MichaelData:
 	tx MichaelNPCName
 	db MICHAEL_PIC
 	db HEATED_BATTLE_DECK_ID
-	db $03
+	db MUSIC_DUEL_THEME_2
 	db MUSIC_MATCH_START_1
-JessicaData:
-	db JESSICA
-	db $1f
+
+JessicaNPCHeader:
+	db NPC_JESSICA
+	db SPRITE_GIRL4
 	db $04
 	db $1a
 	db $00
@@ -432,11 +440,12 @@ JessicaData:
 	tx JessicaNPCName
 	db JESSICA_PIC
 	db LOVE_TO_BATTLE_DECK_ID
-	db $03
+	db MUSIC_DUEL_THEME_2
 	db MUSIC_MATCH_START_1
-MitchData:
-	db MITCH
-	db $0a
+
+MitchNPCHeader:
+	db NPC_MITCH
+	db SPRITE_MITCH
 	db $00
 	db $0e
 	db $00
@@ -444,11 +453,12 @@ MitchData:
 	tx MitchNPCName
 	db MITCH_PIC
 	db FIRST_STRIKE_DECK_ID
-	db $03
+	db MUSIC_DUEL_THEME_2
 	db MUSIC_MATCH_START_2
-MatthewData:
-	db MATTHEW
-	db $15
+
+MatthewNPCHeader:
+	db NPC_MATTHEW
+	db SPRITE_BOY4
 	db $00
 	db $16
 	db $00
@@ -456,11 +466,12 @@ MatthewData:
 	tx MatthewNPCName
 	db MATTHEW_PIC
 	db HARD_POKEMON_DECK_ID
-	db $03
+	db MUSIC_DUEL_THEME_2
 	db MUSIC_MATCH_START_1
-RyanData:
-	db RYAN
-	db $11
+
+RyanNPCHeader:
+	db NPC_RYAN
+	db SPRITE_BOY1
 	db $00
 	db $26
 	db $00
@@ -468,11 +479,12 @@ RyanData:
 	tx RyanNPCName
 	db RYAN_PIC
 	db EXCAVATION_DECK_ID
-	db $03
+	db MUSIC_DUEL_THEME_2
 	db MUSIC_MATCH_START_1
-AndrewData:
-	db ANDREW
-	db $1a
+
+AndrewNPCHeader:
+	db NPC_ANDREW
+	db SPRITE_GUIDE
 	db $00
 	db $16
 	db $00
@@ -480,11 +492,12 @@ AndrewData:
 	tx AndrewNPCName
 	db ANDREW_PIC
 	db BLISTERING_POKEMON_DECK_ID
-	db $03
+	db MUSIC_DUEL_THEME_2
 	db MUSIC_MATCH_START_1
-GeneData:
-	db GENE
-	db $0b
+
+GeneNPCHeader:
+	db NPC_GENE
+	db SPRITE_GENE
 	db $04
 	db $1e
 	db $00
@@ -492,11 +505,12 @@ GeneData:
 	tx GeneNPCName
 	db GENE_PIC
 	db ROCK_CRUSHER_DECK_ID
-	db $03
+	db MUSIC_DUEL_THEME_2
 	db MUSIC_MATCH_START_2
-SaraData:
-	db SARA
-	db $20
+
+SaraNPCHeader:
+	db NPC_SARA
+	db SPRITE_GIRL5
 	db $00
 	db $0e
 	db $00
@@ -504,11 +518,12 @@ SaraData:
 	tx SaraNPCName
 	db SARA_PIC
 	db WATERFRONT_POKEMON_DECK_ID
-	db $03
+	db MUSIC_DUEL_THEME_2
 	db MUSIC_MATCH_START_1
-AmandaData:
-	db AMANDA
-	db $20
+
+AmandaNPCHeader:
+	db NPC_AMANDA
+	db SPRITE_GIRL5
 	db $00
 	db $16
 	db $00
@@ -516,11 +531,12 @@ AmandaData:
 	tx AmandaNPCName
 	db AMANDA_PIC
 	db LONELY_FRIENDS_DECK_ID
-	db $03
+	db MUSIC_DUEL_THEME_2
 	db MUSIC_MATCH_START_1
-JoshuaData:
-	db JOSHUA
-	db $16
+
+JoshuaNPCHeader:
+	db NPC_JOSHUA
+	db SPRITE_JOSHUA
 	db $00
 	db $26
 	db $00
@@ -528,11 +544,12 @@ JoshuaData:
 	tx JoshuaNPCName
 	db JOSHUA_PIC
 	db SOUND_OF_THE_WAVES_DECK_ID
-	db $03
+	db MUSIC_DUEL_THEME_2
 	db MUSIC_MATCH_START_1
-AmyData:
-	db AMY
-	db $08
+
+AmyNPCHeader:
+	db NPC_AMY
+	db SPRITE_AMY
 	db $08
 	db $2e
 	db $10
@@ -540,11 +557,12 @@ AmyData:
 	tx AmyNPCName
 	db AMY_PIC
 	db GO_GO_RAIN_DANCE_DECK_ID
-	db $03
+	db MUSIC_DUEL_THEME_2
 	db MUSIC_MATCH_START_2
-JenniferData:
-	db JENNIFER
-	db $1c
+
+JenniferNPCHeader:
+	db NPC_JENNIFER
+	db SPRITE_GIRL1
 	db $04
 	db $0e
 	db $00
@@ -552,11 +570,12 @@ JenniferData:
 	tx JenniferNPCName
 	db JENNIFER_PIC
 	db PIKACHU_DECK_ID
-	db $03
+	db MUSIC_DUEL_THEME_2
 	db MUSIC_MATCH_START_1
-NicholasData:
-	db NICHOLAS
-	db $17
+
+NicholasNPCHeader:
+	db NPC_NICHOLAS
+	db SPRITE_BOY5
 	db $04
 	db $1e
 	db $00
@@ -564,11 +583,12 @@ NicholasData:
 	tx NicholasNPCName
 	db NICHOLAS_PIC
 	db BOOM_BOOM_SELFDESTRUCT_DECK_ID
-	db $03
+	db MUSIC_DUEL_THEME_2
 	db MUSIC_MATCH_START_1
-BrandonData:
-	db BRANDON
-	db $17
+
+BrandonNPCHeader:
+	db NPC_BRANDON
+	db SPRITE_BOY5
 	db $04
 	db $1e
 	db $00
@@ -576,11 +596,12 @@ BrandonData:
 	tx BrandonNPCName
 	db BRANDON_PIC
 	db POWER_GENERATOR_DECK_ID
-	db $03
+	db MUSIC_DUEL_THEME_2
 	db MUSIC_MATCH_START_1
-IsaacData:
-	db ISAAC
-	db $09
+
+IsaacNPCHeader:
+	db NPC_ISAAC
+	db SPRITE_ISAAC
 	db $00
 	db $16
 	db $00
@@ -588,11 +609,12 @@ IsaacData:
 	tx IsaacNPCName
 	db ISAAC_PIC
 	db ZAPPING_SELFDESTRUCT_DECK_ID
-	db $03
+	db MUSIC_DUEL_THEME_2
 	db MUSIC_MATCH_START_2
-BrittanyData:
-	db BRITTANY
-	db $1c
+
+BrittanyNPCHeader:
+	db NPC_BRITTANY
+	db SPRITE_GIRL1
 	db $04
 	db $0e
 	db $00
@@ -600,11 +622,12 @@ BrittanyData:
 	tx BrittanyNPCName
 	db BRITTANY_PIC
 	db ETCETERA_DECK_ID
-	db $03
+	db MUSIC_DUEL_THEME_2
 	db MUSIC_MATCH_START_1
-KristinData:
-	db KRISTIN
-	db $1e
+
+KristinNPCHeader:
+	db NPC_KRISTIN
+	db SPRITE_GIRL3
 	db $00
 	db $1e
 	db $00
@@ -612,11 +635,12 @@ KristinData:
 	tx KristinNPCName
 	db KRISTIN_PIC
 	db FLOWER_GARDEN_DECK_ID
-	db $03
+	db MUSIC_DUEL_THEME_2
 	db MUSIC_MATCH_START_1
-HeatherData:
-	db HEATHER
-	db $1d
+
+HeatherNPCHeader:
+	db NPC_HEATHER
+	db SPRITE_GIRL2
 	db $04
 	db $22
 	db $00
@@ -624,11 +648,12 @@ HeatherData:
 	tx HeatherNPCName
 	db HEATHER_PIC
 	db KALEIDOSCOPE_DECK_ID
-	db $03
+	db MUSIC_DUEL_THEME_2
 	db MUSIC_MATCH_START_1
-NikkiData:
-	db NIKKI
-	db $05
+
+NikkiNPCHeader:
+	db NPC_NIKKI
+	db SPRITE_NIKKI
 	db $00
 	db $1a
 	db $00
@@ -636,11 +661,12 @@ NikkiData:
 	tx NikkiNPCName
 	db NIKKI_PIC
 	db FLOWER_POWER_DECK_ID
-	db $03
+	db MUSIC_DUEL_THEME_2
 	db MUSIC_MATCH_START_2
-RobertData:
-	db ROBERT
-	db $11
+
+RobertNPCHeader:
+	db NPC_ROBERT
+	db SPRITE_BOY1
 	db $04
 	db $16
 	db $00
@@ -648,11 +674,12 @@ RobertData:
 	tx RobertNPCName
 	db ROBERT_PIC
 	db GHOST_DECK_ID
-	db $03
+	db MUSIC_DUEL_THEME_2
 	db MUSIC_MATCH_START_1
-DanielData:
-	db DANIEL
-	db $12
+
+DanielNPCHeader:
+	db NPC_DANIEL
+	db SPRITE_BOY2
 	db $04
 	db $1a
 	db $00
@@ -660,11 +687,12 @@ DanielData:
 	tx DanielNPCName
 	db DANIEL_PIC
 	db NAP_TIME_DECK_ID
-	db $03
+	db MUSIC_DUEL_THEME_2
 	db MUSIC_MATCH_START_1
-StephanieData:
-	db STEPHANIE
-	db $1c
+
+StephanieNPCHeader:
+	db NPC_STEPHANIE
+	db SPRITE_GIRL1
 	db $04
 	db $0e
 	db $00
@@ -672,11 +700,12 @@ StephanieData:
 	tx StephanieNPCName
 	db STEPHANIE_PIC
 	db STRANGE_POWER_DECK_ID
-	db $03
+	db MUSIC_DUEL_THEME_2
 	db MUSIC_MATCH_START_1
-MurrayData:
-	db MURRAY
-	db $0c
+
+MurrayNPCHeader:
+	db NPC_MURRAY
+	db SPRITE_MURRAY
 	db $00
 	db $12
 	db $00
@@ -684,11 +713,12 @@ MurrayData:
 	tx MurrayNPCName
 	db MURRAY_PIC
 	db STRANGE_PSYSHOCK_DECK_ID
-	db $03
+	db MUSIC_DUEL_THEME_2
 	db MUSIC_MATCH_START_2
-Murray2Data:
-	db MURRAY2
-	db $0c
+
+Murray2NPCHeader:
+	db NPC_MURRAY2
+	db SPRITE_MURRAY
 	db $03
 	db $15
 	db $10
@@ -696,11 +726,12 @@ Murray2Data:
 	tx MurrayNPCName
 	db MURRAY_PIC
 	db STRANGE_PSYSHOCK_DECK_ID
-	db $03
+	db MUSIC_DUEL_THEME_2
 	db MUSIC_MATCH_START_2
-JosephData:
-	db JOSEPH
-	db $18
+
+JosephNPCHeader:
+	db NPC_JOSEPH
+	db SPRITE_TECH
 	db $00
 	db $0e
 	db $00
@@ -708,11 +739,12 @@ JosephData:
 	tx JosephNPCName
 	db JOSEPH_PIC
 	db FLYIN_POKEMON_DECK_ID
-	db $03
+	db MUSIC_DUEL_THEME_2
 	db MUSIC_MATCH_START_1
-DavidData:
-	db DAVID
-	db $18
+
+DavidNPCHeader:
+	db NPC_DAVID
+	db SPRITE_TECH
 	db $00
 	db $0e
 	db $00
@@ -720,11 +752,12 @@ DavidData:
 	tx DavidNPCName
 	db DAVID_PIC
 	db LOVELY_NIDORAN_DECK_ID
-	db $03
+	db MUSIC_DUEL_THEME_2
 	db MUSIC_MATCH_START_1
-ErikData:
-	db ERIK
-	db $18
+
+ErikNPCHeader:
+	db NPC_ERIK
+	db SPRITE_TECH
 	db $00
 	db $0e
 	db $00
@@ -732,11 +765,12 @@ ErikData:
 	tx ErikNPCName
 	db ERIK_PIC
 	db POISON_DECK_ID
-	db $03
+	db MUSIC_DUEL_THEME_2
 	db MUSIC_MATCH_START_1
-RickData:
-	db RICK
-	db $06
+
+RickNPCHeader:
+	db NPC_RICK
+	db SPRITE_RICK
 	db $00
 	db $0e
 	db $00
@@ -744,11 +778,12 @@ RickData:
 	tx RickNPCName
 	db RICK_PIC
 	db WONDERS_OF_SCIENCE_DECK_ID
-	db $03
+	db MUSIC_DUEL_THEME_2
 	db MUSIC_MATCH_START_2
-JohnData:
-	db JOHN
-	db $12
+
+JohnNPCHeader:
+	db NPC_JOHN
+	db SPRITE_BOY2
 	db $04
 	db $1a
 	db $00
@@ -756,11 +791,12 @@ JohnData:
 	tx JohnNPCName
 	db JOHN_PIC
 	db ANGER_DECK_ID
-	db $03
+	db MUSIC_DUEL_THEME_2
 	db MUSIC_MATCH_START_1
-AdamData:
-	db ADAM
-	db $13
+
+AdamNPCHeader:
+	db NPC_ADAM
+	db SPRITE_BOY3
 	db $00
 	db $22
 	db $00
@@ -768,11 +804,12 @@ AdamData:
 	tx AdamNPCName
 	db ADAM_PIC
 	db FLAMETHROWER_DECK_ID
-	db $03
+	db MUSIC_DUEL_THEME_2
 	db MUSIC_MATCH_START_1
-JonathanData:
-	db JONATHAN
-	db $11
+
+JonathanNPCHeader:
+	db NPC_JONATHAN
+	db SPRITE_BOY1
 	db $04
 	db $16
 	db $00
@@ -780,11 +817,12 @@ JonathanData:
 	tx JonathanNPCName
 	db JONATHAN_PIC
 	db RESHUFFLE_DECK_ID
-	db $03
+	db MUSIC_DUEL_THEME_2
 	db MUSIC_MATCH_START_1
-KenData:
-	db KEN
-	db $07
+
+KenNPCHeader:
+	db NPC_KEN
+	db SPRITE_KEN
 	db $04
 	db $1e
 	db $00
@@ -792,11 +830,12 @@ KenData:
 	tx KenNPCName
 	db KEN_PIC
 	db FIRE_CHARGE_DECK_ID
-	db $03
+	db MUSIC_DUEL_THEME_2
 	db MUSIC_MATCH_START_2
-CourtneyData:
-	db COURTNEY
-	db $0d
+
+CourtneyNPCHeader:
+	db NPC_COURTNEY
+	db SPRITE_COURTNEY
 	db $00
 	db $12
 	db $00
@@ -804,11 +843,12 @@ CourtneyData:
 	tx CourtneyNPCName
 	db COURTNEY_PIC
 	db LEGENDARY_MOLTRES_DECK_ID
-	db $04
+	db MUSIC_DUEL_THEME_3
 	db MUSIC_MATCH_START_3
-SteveData:
-	db STEVE
-	db $0e
+
+SteveNPCHeader:
+	db NPC_STEVE
+	db SPRITE_STEVE
 	db $00
 	db $2a
 	db $00
@@ -816,11 +856,12 @@ SteveData:
 	tx SteveNPCName
 	db STEVE_PIC
 	db LEGENDARY_ZAPDOS_DECK_ID
-	db $04
+	db MUSIC_DUEL_THEME_3
 	db MUSIC_MATCH_START_3
-JackData:
-	db JACK
-	db $0f
+
+JackNPCHeader:
+	db NPC_JACK
+	db SPRITE_JACK
 	db $00
 	db $26
 	db $00
@@ -828,11 +869,12 @@ JackData:
 	tx JackNPCName
 	db JACK_PIC
 	db LEGENDARY_ARTICUNO_DECK_ID
-	db $04
+	db MUSIC_DUEL_THEME_3
 	db MUSIC_MATCH_START_3
-RodData:
-	db ROD
-	db $10
+
+RodNPCHeader:
+	db NPC_ROD
+	db SPRITE_ROD
 	db $00
 	db $0e
 	db $00
@@ -840,531 +882,532 @@ RodData:
 	tx RodNPCName
 	db ROD_PIC
 	db LEGENDARY_DRAGONITE_DECK_ID
-	db $04
+	db MUSIC_DUEL_THEME_3
 	db MUSIC_MATCH_START_3
-Data_11cdc:
-	db $3b
-	db $21
+
+Clerk10NPCHeader:
+	db NPC_CLERK10
+	db SPRITE_CLERK
 	db $0a
 	db $30
 	db $00
 	dw $4c3e ; Pointer to NPC Data
-	db $b0
-	db $03
+	tx ClerkNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11ce9:
-	db $3c
-	db $21
+
+Clerk11NPCHeader:
+	db NPC_CLERK11
+	db SPRITE_CLERK
 	db $0a
 	db $30
 	db $00
 	dw $4c3e ; Pointer to NPC Data
-	db $b0
-	db $03
+	tx ClerkNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11cf6:
-	db $3d
-	db $1a
+
+Man1NPCHeader:
+	db NPC_MAN1
+	db SPRITE_GUIDE
 	db $00
 	db $16
 	db $00
 	dw $5c76 ; Pointer to NPC Data
-	db $d8
-	db $03
+	tx ManNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11d03:
-	db $3e
-	db $23
+
+Woman1NPCHeader:
+	db NPC_WOMAN1
+	db SPRITE_WOMAN
 	db $04
 	db $1e
 	db $00
 	dw $5f83 ; Pointer to NPC Data
-	db $d9
-	db $03
+	tx WomanNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11d10:
-	db $3f
-	db $19
+
+Chap1NPCHeader:
+	db NPC_CHAP1
+	db SPRITE_CHAP
 	db $00
 	db $1a
 	db $00
 	dw $5fc0 ; Pointer to NPC Data
-	db $da
-	db $03
+	tx ChapNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11d1d:
-	db $40
-	db $22
+
+Gal1NPCHeader:
+	db NPC_GAL1
+	db SPRITE_HOST
 	db $00
 	db $16
 	db $00
 	dw $60cf ; Pointer to NPC Data
-	db $db
-	db $03
+	tx GalNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11d2a:
-	db $41
-	db $1e
+
+Lass1NPCHeader:
+	db NPC_LASS1
+	db SPRITE_GIRL3
 	db $00
 	db $1e
 	db $00
 	dw $6111 ; Pointer to NPC Data
-	db $dc
-	db $03
+	tx LassNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11d37:
-	db $42
-	db $19
+
+Chap2NPCHeader:
+	db NPC_CHAP2
+	db SPRITE_CHAP
 	db $00
 	db $1a
 	db $00
 	dw $639a ; Pointer to NPC Data
-	db $da
-	db $03
+	tx ChapNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11d44:
-	db $43
-	db $1e
+
+Lass2NPCHeader:
+	db NPC_LASS2
+	db SPRITE_GIRL3
 	db $00
 	db $1e
 	db $00
 	dw $661f ; Pointer to NPC Data
-	db $dc
-	db $03
+	tx LassNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11d51:
-	db $44
-	db $1b
+
+Pappy1NPCHeader:
+	db NPC_PAPPY1
+	db SPRITE_PAPPY
 	db $00
 	db $22
 	db $00
 	dw $69a5 ; Pointer to NPC Data
-	db $dd
-	db $03
+	tx PappyNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11d5e:
-	db $45
-	db $12
+
+Lad1NPCHeader:
+	db NPC_LAD1
+	db SPRITE_BOY2
 	db $04
 	db $1a
 	db $00
 	dw $6b84 ; Pointer to NPC Data
-	db $de
-	db $03
+	tx LadNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11d6b:
-	db $46
-	db $11
+
+Lad2NPCHeader:
+	db NPC_LAD2
+	db SPRITE_BOY1
 	db $04
 	db $16
 	db $00
 	dw $6e2c ; Pointer to NPC Data
-	db $de
-	db $03
+	tx LadNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11d78:
-	db $47
-	db $19
+
+Chap3NPCHeader:
+	db NPC_CHAP3
+	db SPRITE_CHAP
 	db $00
 	db $1a
 	db $00
 	dw $6de8 ; Pointer to NPC Data
-	db $da
-	db $03
+	tx ChapNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11d85:
-	db $48
-	db $22
+
+Clerk12NPCHeader:
+	db NPC_CLERK12
+	db SPRITE_HOST
 	db $00
 	db $16
 	db $00
 	dw $7295 ; Pointer to NPC Data
-	db $b3
-	db $03
+	tx ClerkNPCName2
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11d92:
-	db $49
-	db $22
+
+Clerk13NPCHeader:
+	db NPC_CLERK13
+	db SPRITE_HOST
 	db $00
 	db $16
 	db $00
 	dw $726c ; Pointer to NPC Data
-	db $b3
-	db $03
+	tx ClerkNPCName2
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11d9f:
-	db $4a
-	db $22
+
+HostNPCHeader:
+	db NPC_HOST
+	db SPRITE_HOST
 	db $00
 	db $16
 	db $00
 	dw $7352 ; Pointer to NPC Data
-	db $df
-	db $03
+	tx HostNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11dac:
-	db $4b
-	db $13
+
+Specs1NPCHeader:
+	db NPC_SPECS1
+	db SPRITE_BOY3
 	db $00
 	db $22
 	db $00
 	dw $5d82 ; Pointer to NPC Data
-	db $e0
-	db $03
+	tx SpecsNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11db9:
-	db $4c
-	db $14
+
+ButchNPCHeader:
+	db NPC_BUTCH
+	db SPRITE_BUTCH
 	db $00
 	db $16
 	db $00
 	dw $5d8d ; Pointer to NPC Data
-	db $e1
-	db $03
+	tx ButchNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11dc6:
-	db $4d
-	db $24
+
+Granny1NPCHeader:
+	db NPC_GRANNY1
+	db SPRITE_GRANNY
 	db $00
 	db $16
 	db $00
 	dw $5d9f ; Pointer to NPC Data
-	db $e5
-	db $03
+	tx GrannyNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11dd3:
-	db $4e
-	db $1d
+
+Lass3NPCHeader:
+	db NPC_LASS3
+	db SPRITE_GIRL2
 	db $04
 	db $22
 	db $00
 	dw $5fd2 ; Pointer to NPC Data
-	db $dc
-	db $03
+	tx LassNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11de0:
-	db $4f
-	db $1a
+
+Man2NPCHeader:
+	db NPC_MAN2
+	db SPRITE_GUIDE
 	db $00
 	db $16
 	db $00
 	dw $6137 ; Pointer to NPC Data
-	db $d8
-	db $03
+	tx ManNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11ded:
-	db $50
-	db $1b
+
+Pappy2NPCHeader:
+	db NPC_PAPPY2
+	db SPRITE_PAPPY
 	db $00
 	db $22
 	db $00
 	dw $613b ; Pointer to NPC Data
-	db $dd
-	db $03
+	tx PappyNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11dfa:
-	db $51
-	db $1d
+
+Lass4NPCHeader:
+	db NPC_LASS4
+	db SPRITE_GIRL2
 	db $04
 	db $22
 	db $00
 	dw $63d9 ; Pointer to NPC Data
-	db $dc
-	db $03
+	tx LassNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11e07:
-	db $52
-	db $17
+
+Hood1NPCHeader:
+	db NPC_HOOD1
+	db SPRITE_BOY5
 	db $04
 	db $1e
 	db $00
 	dw $63dd ; Pointer to NPC Data
-	db $e2
-	db $03
+	tx HoodNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11e14:
-	db $53
-	db $24
+
+Granny2NPCHeader:
+	db NPC_GRANNY2
+	db SPRITE_GRANNY
 	db $00
 	db $16
 	db $00
 	dw $66d8 ; Pointer to NPC Data
-	db $e5
-	db $03
+	tx GrannyNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11e21:
-	db $54
-	db $22
+
+Gal2NPCHeader:
+	db NPC_GAL2
+	db SPRITE_HOST
 	db $00
 	db $16
 	db $00
 	dw $66e3 ; Pointer to NPC Data
-	db $db
-	db $03
+	tx GalNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11e2e:
-	db $55
-	db $12
+
+Lad3NPCHeader:
+	db NPC_LAD3
+	db SPRITE_BOY2
 	db $04
 	db $1a
 	db $00
 	dw $6850 ; Pointer to NPC Data
-	db $de
-	db $03
+	tx LadNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11e3b:
-	db $56
-	db $22
+
+Gal3NPCHeader:
+	db NPC_GAL3
+	db SPRITE_HOST
 	db $00
 	db $16
 	db $00
 	dw $6a30 ; Pointer to NPC Data
-	db $db
-	db $03
+	tx GalNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11e48:
-	db $57
-	db $19
+
+Chap4NPCHeader:
+	db NPC_CHAP4
+	db SPRITE_CHAP
 	db $00
 	db $1a
 	db $00
 	dw $6a3b ; Pointer to NPC Data
-	db $da
-	db $03
+	tx ChapNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11e55:
-	db $58
-	db $1a
+
+Man3NPCHeader:
+	db NPC_MAN3
+	db SPRITE_GUIDE
 	db $00
 	db $16
 	db $00
 	dw $6bc1 ; Pointer to NPC Data
-	db $d8
-	db $03
+	tx ManNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11e62:
-	db $59
-	db $18
+
+Specs2NPCHeader:
+	db NPC_SPECS2
+	db SPRITE_TECH
 	db $00
 	db $0e
 	db $00
 	dw $6bc5 ; Pointer to NPC Data
-	db $e0
-	db $03
+	tx SpecsNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11e6f:
-	db $5a
-	db $13
+
+Specs3NPCHeader:
+	db NPC_SPECS3
+	db SPRITE_BOY3
 	db $00
 	db $22
 	db $00
 	dw $6bed ; Pointer to NPC Data
-	db $e0
-	db $03
+	tx SpecsNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11e7c:
-	db $5b
-	db $23
+
+Woman2NPCHeader:
+	db NPC_WOMAN2
+	db SPRITE_WOMAN
 	db $04
 	db $1e
 	db $00
 	dw $4c3e ; Pointer to NPC Data
-	db $d9
-	db $03
+	tx WomanNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11e89:
-	db $5c
-	db $15
+
+ManiaNPCHeader:
+	db NPC_MANIA
+	db SPRITE_BOY4
 	db $00
 	db $26
 	db $00
 	dw $6e88 ; Pointer to NPC Data
-	db $e4
-	db $03
+	tx ManiaNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11e96:
-	db $5d
-	db $1b
+
+Pappy3NPCHeader:
+	db NPC_PAPPY3
+	db SPRITE_PAPPY
 	db $00
 	db $22
 	db $00
 	dw $709c ; Pointer to NPC Data
-	db $dd
-	db $03
+	tx PappyNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11ea3:
-	db $5e
-	db $22
+
+Gal4NPCHeader:
+	db NPC_GAL4
+	db SPRITE_HOST
 	db $00
 	db $16
 	db $00
 	dw $70a0 ; Pointer to NPC Data
-	db $db
-	db $03
+	tx GalNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11eb0:
-	db $5f
-	db $15
+
+ChampNPCHeader:
+	db NPC_CHAMP
+	db SPRITE_BOY4
 	db $00
 	db $26
 	db $00
 	dw $70a4 ; Pointer to NPC Data
-	db $e3
-	db $03
+	tx ChampNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11ebd:
-	db $60
-	db $17
+
+Hood2NPCHeader:
+	db NPC_HOOD2
+	db SPRITE_BOY5
 	db $04
 	db $1e
 	db $00
 	dw $70a8 ; Pointer to NPC Data
-	db $e2
-	db $03
+	tx HoodNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11eca:
-	db $61
-	db $1f
+
+Lass5NPCHeader:
+	db NPC_LASS5
+	db SPRITE_GIRL4
 	db $04
 	db $1a
 	db $00
 	dw $70ac ; Pointer to NPC Data
-	db $dc
-	db $03
+	tx LassNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11ed7:
-	db $62
-	db $19
+
+Chap5NPCHeader:
+	db NPC_CHAP5
+	db SPRITE_CHAP
 	db $00
 	db $1a
 	db $00
 	dw $70b0 ; Pointer to NPC Data
-	db $da
-	db $03
+	tx ChapNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-AaronData:
-	db AARON
-	db $18
+
+AaronNPCHeader:
+	db NPC_AARON
+	db SPRITE_TECH
 	db $00
 	db $0e
 	db $00
@@ -1372,97 +1415,105 @@ AaronData:
 	tx AaronNPCName
 	db AARON_PIC
 	db LIGHTNING_AND_FIRE_DECK_ID
-	db $02
+	db MUSIC_DUEL_THEME_1
 	db MUSIC_MATCH_START_1
-Data_11ef1:
-	db $64
-	db $1a
+
+GuideNPCHeader:
+	db NPC_GUIDE
+	db SPRITE_GUIDE
 	db $00
 	db $16
 	db $00
 	dw $7283 ; Pointer to NPC Data
-	db $e6
-	db $03
+	tx GuideNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11efe:
-	db $65
-	db $18
+
+Tech7NPCHeader:
+	db NPC_TECH7
+	db SPRITE_TECH
 	db $00
 	db $0e
 	db $00
 	dw $58c6 ; Pointer to NPC Data
-	db $b2
-	db $03
+	tx TechNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11f0b:
-	db $66
-	db $18
+
+Tech8NPCHeader:
+	db NPC_TECH8
+	db SPRITE_TECH
 	db $00
 	db $0e
 	db $00
 	dw $58d1 ; Pointer to NPC Data
-	db $b2
-	db $03
+	tx TechNPCName
 	db $00
 	db $00
 	db $00
 	db $00
-Data_11f18:
-	db $67
+
+TorchNPCHeader:
+	db NPC_TORCH
 	db $26
 	db $3a
 	db $3a
 	db $10
 	dw $4c3e ; Pointer to NPC Data
-Data_11f1f:
-	db $68
+
+LegendaryCardTopLeftNPCHeader:
+	db NPC_LEGENDARY_CARD_TOP_LEFT
 	db $27
 	db $3b
 	db $41
 	db $50
 	dw $4c3e ; Pointer to NPC Data
-Data_11f26:
-	db $69
+
+LegendaryCardTopRightNPCHeader:
+	db NPC_LEGENDARY_CARD_TOP_RIGHT
 	db $27
 	db $3c
 	db $42
 	db $50
 	dw $4c3e ; Pointer to NPC Data
-Data_11f2d:
-	db $6a
+
+LegendaryCardBottomLeftNPCHeader:
+	db NPC_LEGENDARY_CARD_BOTTOM_LEFT
 	db $27
 	db $3d
 	db $43
 	db $50
 	dw $4c3e ; Pointer to NPC Data
-Data_11f34:
-	db $6b
+
+LegendaryCardBottomCenterLeftNPCHeader:
+	db NPC_LEGENDARY_CARD_BOTTOM_CENTER_LEFT
 	db $27
 	db $3e
 	db $44
 	db $50
 	dw $4c3e ; Pointer to NPC Data
-Data_11f3b:
-	db $6c
+
+LegendaryCardBottomCenterRightNPCHeader:
+	db NPC_LEGENDARY_CARD_BOTTOM_CENTER_RIGHT
 	db $27
 	db $3f
 	db $45
 	db $50
 	dw $4c3e ; Pointer to NPC Data
-Data_11f42:
-	db $6d
+
+LegendaryCardBottomRightNPCHeader:
+	db NPC_LEGENDARY_CARD_BOTTOM_RIGHT
 	db $27
 	db $40
 	db $46
 	db $50
 	dw $4c3e ; Pointer to NPC Data
-Data_11f49:
+
+DummyNPCHeader:
 	db $00
 	db $00
 	db $00
diff --git a/src/engine/bank04.asm b/src/engine/bank04.asm
index 3119c7b..c50c8f1 100644
--- a/src/engine/bank04.asm
+++ b/src/engine/bank04.asm
@@ -838,13 +838,13 @@ Func_115a3: ; 115a3 (4:55a3)
 
 INCLUDE "data/map_scripts.asm"
 
-; loads a pointer into hl found on PointerTable_118f5
-Func_1184a: ; 1184a (4:584a)
+; loads a pointer into hl found on NPCHeaderPointers
+GetNPCHeaderPointer: ; 1184a (4:584a)
 	; this may have been a macro
 	rlca
-	add LOW(PointerTable_118f5)
+	add LOW(NPCHeaderPointers)
 	ld l, a
-	ld a, HIGH(PointerTable_118f5)
+	ld a, HIGH(NPCHeaderPointers)
 	adc $00
 	ld h, a
 	ld a, [hli]
@@ -855,7 +855,7 @@ Func_1184a: ; 1184a (4:584a)
 Func_11857: ; 11857 (4:5857)
 	push hl
 	push bc
-	call Func_1184a
+	call GetNPCHeaderPointer
 	ld a, [hli]
 	ld [wd3ab], a
 	ld a, [hli]
@@ -880,7 +880,7 @@ Func_11857: ; 11857 (4:5857)
 ; this appears to find data about the NPC we're talking to
 Func_1187d: ; 1187d (4:587d)
 	push hl
-	call Func_1184a
+	call GetNPCHeaderPointer
 	ld bc, $5
 	add hl, bc
 	ld c, [hl]
@@ -897,7 +897,7 @@ Func_1187d: ; 1187d (4:587d)
 Func_11893: ; 11893 (4:5893)
 	push hl
 	push bc
-	call Func_1184a
+	call GetNPCHeaderPointer
 	ld bc, $0007
 	add hl, bc
 	ld a, [hli]
@@ -911,7 +911,7 @@ Func_11893: ; 11893 (4:5893)
 Func_118a7: ; 118a7 (4:58a7)
 	push hl
 	push bc
-	call Func_1184a
+	call GetNPCHeaderPointer
 	ld bc, $0007
 	add hl, bc
 	ld a, [hli]
@@ -927,7 +927,7 @@ Func_118a7: ; 118a7 (4:58a7)
 Func_118bf: ; 118bf (4:58bf)
 	push hl
 	push bc
-	call Func_1184a
+	call GetNPCHeaderPointer
 	ld bc, $000a
 	add hl, bc
 	ld a, [hli]
@@ -942,7 +942,7 @@ Func_118d3: ; 118d3 (4:58d3)
 	push hl
 	push bc
 	push af
-	call Func_1184a
+	call GetNPCHeaderPointer
 	ld bc, $000c
 	add hl, bc
 	ld a, [hli]
diff --git a/src/text/text3.asm b/src/text/text3.asm
index 025fd2f..4d3fccf 100644
--- a/src/text/text3.asm
+++ b/src/text/text3.asm
@@ -1620,7 +1620,7 @@ Text03ab: ; 3f663 (f:7663)
 	text "LABORATORY"
 	done
 
-Text03ac: ; 3f66f (f:766f)
+DrMasonNPCName: ; 3f66f (f:766f)
 	text "Dr. Mason"
 	done
 
@@ -1628,7 +1628,7 @@ RonaldNPCName: ; 3f67a (f:767a)
 	text "Ronald"
 	done
 
-Text03ae: ; 3f682 (f:7682)
+IshiharaNPCName: ; 3f682 (f:7682)
 	text "ISHIHARA"
 	done
 
@@ -1636,7 +1636,7 @@ ImakuniNPCName: ; 3f68c (f:768c)
 	text "Imakuni?"
 	done
 
-Text03b0: ; 3f696 (f:7696)
+ClerkNPCName: ; 3f696 (f:7696)
 	text "CLERK"
 	done
 
@@ -1644,11 +1644,11 @@ SamNPCName: ; 3f69d (f:769d)
 	text "Sam"
 	done
 
-Text03b2: ; 3f6a2 (f:76a2)
+TechNPCName: ; 3f6a2 (f:76a2)
 	text "TECH"
 	done
 
-Text03b3: ; 3f6a8 (f:76a8)
+ClerkNPCName2: ; 3f6a8 (f:76a8)
 	text "CLERK"
 	done
 
@@ -1796,63 +1796,63 @@ RodNPCName: ; 3f7be (f:77be)
 	text "Rod"
 	done
 
-Text03d8: ; 3f7c3 (f:77c3)
+ManNPCName: ; 3f7c3 (f:77c3)
 	text "Man"
 	done
 
-Text03d9: ; 3f7c8 (f:77c8)
+WomanNPCName: ; 3f7c8 (f:77c8)
 	text "Woman"
 	done
 
-Text03da: ; 3f7cf (f:77cf)
+ChapNPCName: ; 3f7cf (f:77cf)
 	text "CHAP"
 	done
 
-Text03db: ; 3f7d5 (f:77d5)
+GalNPCName: ; 3f7d5 (f:77d5)
 	text "GAL"
 	done
 
-Text03dc: ; 3f7da (f:77da)
+LassNPCName: ; 3f7da (f:77da)
 	text "Lass"
 	done
 
-Text03dd: ; 3f7e0 (f:77e0)
+PappyNPCName: ; 3f7e0 (f:77e0)
 	text "Pappy"
 	done
 
-Text03de: ; 3f7e7 (f:77e7)
+LadNPCName: ; 3f7e7 (f:77e7)
 	text "Lad"
 	done
 
-Text03df: ; 3f7ec (f:77ec)
+HostNPCName: ; 3f7ec (f:77ec)
 	text "HOST"
 	done
 
-Text03e0: ; 3f7f2 (f:77f2)
+SpecsNPCName: ; 3f7f2 (f:77f2)
 	text "Specs"
 	done
 
-Text03e1: ; 3f7f9 (f:77f9)
+ButchNPCName: ; 3f7f9 (f:77f9)
 	text "Butch"
 	done
 
-Text03e2: ; 3f800 (f:7800)
+HoodNPCName: ; 3f800 (f:7800)
 	text "Hood"
 	done
 
-Text03e3: ; 3f806 (f:7806)
+ChampNPCName: ; 3f806 (f:7806)
 	text "Champ"
 	done
 
-Text03e4: ; 3f80d (f:780d)
+ManiaNPCName: ; 3f80d (f:780d)
 	text "Mania"
 	done
 
-Text03e5: ; 3f814 (f:7814)
+GrannyNPCName: ; 3f814 (f:7814)
 	text "Granny"
 	done
 
-Text03e6: ; 3f81c (f:781c)
+GuideNPCName: ; 3f81c (f:781c)
 	text "Guide"
 	done
 
diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm
index 12ae8cd..493ed1d 100644
--- a/src/text/text_offsets.asm
+++ b/src/text/text_offsets.asm
@@ -941,14 +941,14 @@ TextOffsets::                                                      ; 34000 (d:40
 	textpointer Text03a9                                           ; 0x03a9
 	textpointer Text03aa                                           ; 0x03aa
 	textpointer Text03ab                                           ; 0x03ab
-	textpointer Text03ac                                           ; 0x03ac
+	textpointer DrMasonNPCName                                     ; 0x03ac
 	textpointer RonaldNPCName                                      ; 0x03ad
-	textpointer Text03ae                                           ; 0x03ae
+	textpointer IshiharaNPCName                                    ; 0x03ae
 	textpointer ImakuniNPCName                                     ; 0x03af
-	textpointer Text03b0                                           ; 0x03b0
+	textpointer ClerkNPCName                                       ; 0x03b0
 	textpointer SamNPCName                                         ; 0x03b1
-	textpointer Text03b2                                           ; 0x03b2
-	textpointer Text03b3                                           ; 0x03b3
+	textpointer TechNPCName                                        ; 0x03b2
+	textpointer ClerkNPCName2                                      ; 0x03b3
 	textpointer ChrisNPCName                                       ; 0x03b4
 	textpointer MichaelNPCName                                     ; 0x03b5
 	textpointer JessicaNPCName                                     ; 0x03b6
@@ -985,21 +985,21 @@ TextOffsets::                                                      ; 34000 (d:40
 	textpointer SteveNPCName                                       ; 0x03d5
 	textpointer JackNPCName                                        ; 0x03d6
 	textpointer RodNPCName                                         ; 0x03d7
-	textpointer Text03d8                                           ; 0x03d8
-	textpointer Text03d9                                           ; 0x03d9
-	textpointer Text03da                                           ; 0x03da
-	textpointer Text03db                                           ; 0x03db
-	textpointer Text03dc                                           ; 0x03dc
-	textpointer Text03dd                                           ; 0x03dd
-	textpointer Text03de                                           ; 0x03de
-	textpointer Text03df                                           ; 0x03df
-	textpointer Text03e0                                           ; 0x03e0
-	textpointer Text03e1                                           ; 0x03e1
-	textpointer Text03e2                                           ; 0x03e2
-	textpointer Text03e3                                           ; 0x03e3
-	textpointer Text03e4                                           ; 0x03e4
-	textpointer Text03e5                                           ; 0x03e5
-	textpointer Text03e6                                           ; 0x03e6
+	textpointer ManNPCName                                         ; 0x03d8
+	textpointer WomanNPCName                                       ; 0x03d9
+	textpointer ChapNPCName                                        ; 0x03da
+	textpointer GalNPCName                                         ; 0x03db
+	textpointer LassNPCName                                        ; 0x03dc
+	textpointer PappyNPCName                                       ; 0x03dd
+	textpointer LadNPCName                                         ; 0x03de
+	textpointer HostNPCName                                        ; 0x03df
+	textpointer SpecsNPCName                                       ; 0x03e0
+	textpointer ButchNPCName                                       ; 0x03e1
+	textpointer HoodNPCName                                        ; 0x03e2
+	textpointer ChampNPCName                                       ; 0x03e3
+	textpointer ManiaNPCName                                       ; 0x03e4
+	textpointer GrannyNPCName                                      ; 0x03e5
+	textpointer GuideNPCName                                       ; 0x03e6
 	textpointer AaronNPCName                                       ; 0x03e7
 	textpointer Text03e8                                           ; 0x03e8
 	textpointer Text03e9                                           ; 0x03e9