Merge pull request #67 from dannye/master

NPC Data and Scripts

2 files changed, 120 insertions, 120 deletions

diff --git a/src/text/text3.asm b/src/text/text3.asm
index 78c22de..4d3fccf 100644
--- a/src/text/text3.asm
+++ b/src/text/text3.asm
@@ -1620,243 +1620,243 @@ Text03ab: ; 3f663 (f:7663)
 	text "LABORATORY"
 	done
 
-Text03ac: ; 3f66f (f:766f)
+DrMasonNPCName: ; 3f66f (f:766f)
 	text "Dr. Mason"
 	done
 
-Text03ad: ; 3f67a (f:767a)
+RonaldNPCName: ; 3f67a (f:767a)
 	text "Ronald"
 	done
 
-Text03ae: ; 3f682 (f:7682)
+IshiharaNPCName: ; 3f682 (f:7682)
 	text "ISHIHARA"
 	done
 
-Text03af: ; 3f68c (f:768c)
+ImakuniNPCName: ; 3f68c (f:768c)
 	text "Imakuni?"
 	done
 
-Text03b0: ; 3f696 (f:7696)
+ClerkNPCName: ; 3f696 (f:7696)
 	text "CLERK"
 	done
 
-Text03b1: ; 3f69d (f:769d)
+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
 
-Text03b4: ; 3f6af (f:76af)
+ChrisNPCName: ; 3f6af (f:76af)
 	text "Chris"
 	done
 
-Text03b5: ; 3f6b6 (f:76b6)
+MichaelNPCName: ; 3f6b6 (f:76b6)
 	text "Michael"
 	done
 
-Text03b6: ; 3f6bf (f:76bf)
+JessicaNPCName: ; 3f6bf (f:76bf)
 	text "Jessica"
 	done
 
-Text03b7: ; 3f6c8 (f:76c8)
+MitchNPCName: ; 3f6c8 (f:76c8)
 	text "Mitch"
 	done
 
-Text03b8: ; 3f6cf (f:76cf)
+MatthewNPCName: ; 3f6cf (f:76cf)
 	text "Matthew"
 	done
 
-Text03b9: ; 3f6d8 (f:76d8)
+RyanNPCName: ; 3f6d8 (f:76d8)
 	text "Ryan"
 	done
 
-Text03ba: ; 3f6de (f:76de)
+AndrewNPCName: ; 3f6de (f:76de)
 	text "Andrew"
 	done
 
-Text03bb: ; 3f6e6 (f:76e6)
+GeneNPCName: ; 3f6e6 (f:76e6)
 	text "Gene"
 	done
 
-Text03bc: ; 3f6ec (f:76ec)
+SaraNPCName: ; 3f6ec (f:76ec)
 	text "Sara"
 	done
 
-Text03bd: ; 3f6f2 (f:76f2)
+AmandaNPCName: ; 3f6f2 (f:76f2)
 	text "Amanda"
 	done
 
-Text03be: ; 3f6fa (f:76fa)
+JoshuaNPCName: ; 3f6fa (f:76fa)
 	text "Joshua"
 	done
 
-Text03bf: ; 3f702 (f:7702)
+AmyNPCName: ; 3f702 (f:7702)
 	text "Amy"
 	done
 
-Text03c0: ; 3f707 (f:7707)
+JenniferNPCName: ; 3f707 (f:7707)
 	text "Jennifer"
 	done
 
-Text03c1: ; 3f711 (f:7711)
+NicholasNPCName: ; 3f711 (f:7711)
 	text "Nicholas"
 	done
 
-Text03c2: ; 3f71b (f:771b)
+BrandonNPCName: ; 3f71b (f:771b)
 	text "Brandon"
 	done
 
-Text03c3: ; 3f724 (f:7724)
+IsaacNPCName: ; 3f724 (f:7724)
 	text "Isaac"
 	done
 
-Text03c4: ; 3f72b (f:772b)
+BrittanyNPCName: ; 3f72b (f:772b)
 	text "Brittany"
 	done
 
-Text03c5: ; 3f735 (f:7735)
+KristinNPCName: ; 3f735 (f:7735)
 	text "Kristin"
 	done
 
-Text03c6: ; 3f73e (f:773e)
+HeatherNPCName: ; 3f73e (f:773e)
 	text "Heather"
 	done
 
-Text03c7: ; 3f747 (f:7747)
+NikkiNPCName: ; 3f747 (f:7747)
 	text "Nikki"
 	done
 
-Text03c8: ; 3f74e (f:774e)
+RobertNPCName: ; 3f74e (f:774e)
 	text "Robert"
 	done
 
-Text03c9: ; 3f756 (f:7756)
+DanielNPCName: ; 3f756 (f:7756)
 	text "Daniel"
 	done
 
-Text03ca: ; 3f75e (f:775e)
+StephanieNPCName: ; 3f75e (f:775e)
 	text "Stephanie"
 	done
 
-Text03cb: ; 3f769 (f:7769)
+MurrayNPCName: ; 3f769 (f:7769)
 	text "Murray"
 	done
 
-Text03cc: ; 3f771 (f:7771)
+JosephNPCName: ; 3f771 (f:7771)
 	text "Joseph"
 	done
 
-Text03cd: ; 3f779 (f:7779)
+DavidNPCName: ; 3f779 (f:7779)
 	text "David"
 	done
 
-Text03ce: ; 3f780 (f:7780)
+ErikNPCName: ; 3f780 (f:7780)
 	text "Erik"
 	done
 
-Text03cf: ; 3f786 (f:7786)
+RickNPCName: ; 3f786 (f:7786)
 	text "Rick"
 	done
 
-Text03d0: ; 3f78c (f:778c)
+JohnNPCName: ; 3f78c (f:778c)
 	text "John"
 	done
 
-Text03d1: ; 3f792 (f:7792)
+AdamNPCName: ; 3f792 (f:7792)
 	text "Adam"
 	done
 
-Text03d2: ; 3f798 (f:7798)
+JonathanNPCName: ; 3f798 (f:7798)
 	text "Jonathan"
 	done
 
-Text03d3: ; 3f7a2 (f:77a2)
+KenNPCName: ; 3f7a2 (f:77a2)
 	text "Ken"
 	done
 
-Text03d4: ; 3f7a7 (f:77a7)
+CourtneyNPCName: ; 3f7a7 (f:77a7)
 	text "COURTNEY"
 	done
 
-Text03d5: ; 3f7b1 (f:77b1)
+SteveNPCName: ; 3f7b1 (f:77b1)
 	text "Steve"
 	done
 
-Text03d6: ; 3f7b8 (f:77b8)
+JackNPCName: ; 3f7b8 (f:77b8)
 	text "Jack"
 	done
 
-Text03d7: ; 3f7be (f:77be)
+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
 
-Text03e7: ; 3f823 (f:7823)
+AaronNPCName: ; 3f823 (f:7823)
 	text "Aaron"
 	done
 
diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm
index d027768..2f29a11 100644
--- a/src/text/text_offsets.asm
+++ b/src/text/text_offsets.asm
@@ -941,66 +941,66 @@ TextOffsets::                                                      ; 34000 (d:40
 	textpointer Text03a9                                           ; 0x03a9
 	textpointer Text03aa                                           ; 0x03aa
 	textpointer Text03ab                                           ; 0x03ab
-	textpointer Text03ac                                           ; 0x03ac
-	textpointer Text03ad                                           ; 0x03ad
-	textpointer Text03ae                                           ; 0x03ae
-	textpointer Text03af                                           ; 0x03af
-	textpointer Text03b0                                           ; 0x03b0
-	textpointer Text03b1                                           ; 0x03b1
-	textpointer Text03b2                                           ; 0x03b2
-	textpointer Text03b3                                           ; 0x03b3
-	textpointer Text03b4                                           ; 0x03b4
-	textpointer Text03b5                                           ; 0x03b5
-	textpointer Text03b6                                           ; 0x03b6
-	textpointer Text03b7                                           ; 0x03b7
-	textpointer Text03b8                                           ; 0x03b8
-	textpointer Text03b9                                           ; 0x03b9
-	textpointer Text03ba                                           ; 0x03ba
-	textpointer Text03bb                                           ; 0x03bb
-	textpointer Text03bc                                           ; 0x03bc
-	textpointer Text03bd                                           ; 0x03bd
-	textpointer Text03be                                           ; 0x03be
-	textpointer Text03bf                                           ; 0x03bf
-	textpointer Text03c0                                           ; 0x03c0
-	textpointer Text03c1                                           ; 0x03c1
-	textpointer Text03c2                                           ; 0x03c2
-	textpointer Text03c3                                           ; 0x03c3
-	textpointer Text03c4                                           ; 0x03c4
-	textpointer Text03c5                                           ; 0x03c5
-	textpointer Text03c6                                           ; 0x03c6
-	textpointer Text03c7                                           ; 0x03c7
-	textpointer Text03c8                                           ; 0x03c8
-	textpointer Text03c9                                           ; 0x03c9
-	textpointer Text03ca                                           ; 0x03ca
-	textpointer Text03cb                                           ; 0x03cb
-	textpointer Text03cc                                           ; 0x03cc
-	textpointer Text03cd                                           ; 0x03cd
-	textpointer Text03ce                                           ; 0x03ce
-	textpointer Text03cf                                           ; 0x03cf
-	textpointer Text03d0                                           ; 0x03d0
-	textpointer Text03d1                                           ; 0x03d1
-	textpointer Text03d2                                           ; 0x03d2
-	textpointer Text03d3                                           ; 0x03d3
-	textpointer Text03d4                                           ; 0x03d4
-	textpointer Text03d5                                           ; 0x03d5
-	textpointer Text03d6                                           ; 0x03d6
-	textpointer Text03d7                                           ; 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 Text03e7                                           ; 0x03e7
+	textpointer DrMasonNPCName                                     ; 0x03ac
+	textpointer RonaldNPCName                                      ; 0x03ad
+	textpointer IshiharaNPCName                                    ; 0x03ae
+	textpointer ImakuniNPCName                                     ; 0x03af
+	textpointer ClerkNPCName                                       ; 0x03b0
+	textpointer SamNPCName                                         ; 0x03b1
+	textpointer TechNPCName                                        ; 0x03b2
+	textpointer ClerkNPCName2                                      ; 0x03b3
+	textpointer ChrisNPCName                                       ; 0x03b4
+	textpointer MichaelNPCName                                     ; 0x03b5
+	textpointer JessicaNPCName                                     ; 0x03b6
+	textpointer MitchNPCName                                       ; 0x03b7
+	textpointer MatthewNPCName                                     ; 0x03b8
+	textpointer RyanNPCName                                        ; 0x03b9
+	textpointer AndrewNPCName                                      ; 0x03ba
+	textpointer GeneNPCName                                        ; 0x03bb
+	textpointer SaraNPCName                                        ; 0x03bc
+	textpointer AmandaNPCName                                      ; 0x03bd
+	textpointer JoshuaNPCName                                      ; 0x03be
+	textpointer AmyNPCName                                         ; 0x03bf
+	textpointer JenniferNPCName                                    ; 0x03c0
+	textpointer NicholasNPCName                                    ; 0x03c1
+	textpointer BrandonNPCName                                     ; 0x03c2
+	textpointer IsaacNPCName                                       ; 0x03c3
+	textpointer BrittanyNPCName                                    ; 0x03c4
+	textpointer KristinNPCName                                     ; 0x03c5
+	textpointer HeatherNPCName                                     ; 0x03c6
+	textpointer NikkiNPCName                                       ; 0x03c7
+	textpointer RobertNPCName                                      ; 0x03c8
+	textpointer DanielNPCName                                      ; 0x03c9
+	textpointer StephanieNPCName                                   ; 0x03ca
+	textpointer MurrayNPCName                                      ; 0x03cb
+	textpointer JosephNPCName                                      ; 0x03cc
+	textpointer DavidNPCName                                       ; 0x03cd
+	textpointer ErikNPCName                                        ; 0x03ce
+	textpointer RickNPCName                                        ; 0x03cf
+	textpointer JohnNPCName                                        ; 0x03d0
+	textpointer AdamNPCName                                        ; 0x03d1
+	textpointer JonathanNPCName                                    ; 0x03d2
+	textpointer KenNPCName                                         ; 0x03d3
+	textpointer CourtneyNPCName                                    ; 0x03d4
+	textpointer SteveNPCName                                       ; 0x03d5
+	textpointer JackNPCName                                        ; 0x03d6
+	textpointer RodNPCName                                         ; 0x03d7
+	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
 	textpointer Text03ea                                           ; 0x03ea