From fda59356c20813bb57d59de8d9b2b100f0fe275d Mon Sep 17 00:00:00 2001
From: Andrew Martinek <andrewrmartinek@gmail.com>
Date: Sun, 6 Oct 2019 11:24:18 -0400
Subject: Uncovered a lot of NPC map data and loading functions.

---
 src/data/npc_map_data.asm | 418 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 418 insertions(+)
 create mode 100644 src/data/npc_map_data.asm

(limited to 'src/data/npc_map_data.asm')

diff --git a/src/data/npc_map_data.asm b/src/data/npc_map_data.asm
new file mode 100644
index 0000000..7bc69cb
--- /dev/null
+++ b/src/data/npc_map_data.asm
@@ -0,0 +1,418 @@
+; NPC Map data. Format:
+; NPC, X position, Y Position, Direction,
+; pre-load function. (Resets c flag if NPC should not be loaded)
+NPCData_772f: ; 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
+
+NPCData_775a: ; 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
+
+NPCData_7773: ; 7773 (4:13773)
+	db NIKKI, $04, $04, NORTH
+	dw $5add
+	db ISHIHARA, $08, $08, SOUTH
+	dw $5b3d
+	db RONALD1, $02, $04, WEST
+	dw $5c43
+	db $00
+
+NPCData_7786: ; 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
+
+NPCData_779f: ; 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 CLERK11, $0a, $04, SOUTH
+	dw $7c6c
+	db $00
+
+NPCData_77ca: ; 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
+
+NPCData_77e3: ; 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
+
+NPCData_77fc: ; 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 CLERK11, $0a, $04, SOUTH
+	dw $7c6c
+	db $00
+
+NPCData_7827: ; 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
+
+NPCData_783a: ; 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
+
+NPCData_7853: ; 7853 (4:13853)
+	db GAL1, $06, $0e, SOUTH
+	dw $0000
+	db LASS1, $10, $0a, SOUTH
+	dw $0000
+	db IMAKUNI, $12, $02, NORTH
+	dw $60b0
+	db MAN2, $04, $12, EAST
+	dw $6130
+	db PAPPY2, $16, $10, NORTH
+	dw $0000
+	db CLERK10, $06, $04, SOUTH
+	dw $0000
+	db CLERK11, $0a, $04, SOUTH
+	dw $7c6c
+	db $00
+
+NPCData_787e: ; 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 $62ad
+	db $00
+
+NPCData_7897: ; 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
+
+NPCData_78b0: ; 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 CLERK11, $0a, $04, SOUTH
+	dw $7c6c
+	db $00
+
+NPCData_78d5: ; 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
+
+NPCData_78ee: ; 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
+
+NPCData_790d: ; 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 CLERK11, $0a, $04, SOUTH
+	dw $7c6c
+	db $00
+
+NPCData_7932: ; 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
+
+NPCData_7945: ; 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
+
+NPCData_7964: ; 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 CLERK11, $0a, $04, SOUTH
+	dw $7c6c
+	db $00
+
+NPCData_798f: ; 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
+
+NPCData_79a8: ; 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
+
+NPCData_79c1: ; 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 CLERK11, $0a, $04, SOUTH
+	dw $7c6c
+	db $00
+
+NPCData_79ec: ; 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
+
+NPCData_7a05: ; 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
+
+NPCData_7a1e: ; 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 CLERK11, $0a, $04, SOUTH
+	dw $7c6c
+	db $00
+
+NPCData_7a43: ; 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
+
+NPCData_7a5c: ; 7a5c (4:13a5c)
+	db CLERK9, $06, $02, SOUTH
+	dw $6f96
+	db $00
+
+NPCData_7a63: ; 7a63 (4:13a63)
+	db PAPPY3, $06, $0e, EAST
+	dw $707a
+	db CHAMP, $10, $12, WEST
+	dw $707a
+	db HOOD2, $14, $08, SOUTH
+	dw $707a
+	db LASS5, $16, $10, WEST
+	dw $707a
+	db GAL4, $0c, $0e, EAST
+	dw $7075
+	db CHAP5, $10, $08, WEST
+	dw $7075
+	db RONALD1, $08, $0c, SOUTH
+	dw $70b4
+	db CLERK10, $06, $04, SOUTH
+	dw $0000
+	db CLERK11, $0a, $04, SOUTH
+	dw $7c6c
+	db $00
+
+NPCData_7a9a: ; 7a9a (4:13a9a)
+	db CLERK12, $0a, $12, SOUTH
+	dw $707a
+	db CLERK13, $14, $12, SOUTH
+	dw $707a
+	db GUIDE, $0e, $14, SOUTH
+	dw $7270
+	db HOST, $0e, $04, SOUTH
+	dw $707a
+	db $ff, $12, $08, WEST ; pre-load function chooses NPC to load
+	dw $7559
+	db $00
+
+NPCData_7ab9: ; 7ab9 (4:13ab9)
+	db RONALD1, $0e, $12, SOUTH
+	dw $0000
+	db $00
+
+NPCData_7ac0: ; 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
+
+NPCData_7adf: ; 7adf (4:13adf)
+	db _11F1F, $0a, $08, SOUTH
+	dw $0000
+	db _11F26, $0c, $08, SOUTH
+	dw $0000
+	db _11F2D, $08, $0a, SOUTH
+	dw $0000
+	db _11F34, $0a, $0a, SOUTH
+	dw $0000
+	db _11F3B, $0c, $0a, SOUTH
+	dw $0000
+	db _11F42, $0e, $0a, SOUTH
+	dw $0000
+	db $00
+
-- 
cgit v1.2.3


From cb88ee5a13498f060da1be80eb0cc0fcd1357a05 Mon Sep 17 00:00:00 2001
From: Andrew Martinek <andrewrmartinek@gmail.com>
Date: Tue, 8 Oct 2019 00:20:52 -0400
Subject: Created python script to calculate progress and documented some
 scripts

---
 src/data/npc_map_data.asm | 66 +++++++++++++++++++++++------------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

(limited to 'src/data/npc_map_data.asm')

diff --git a/src/data/npc_map_data.asm b/src/data/npc_map_data.asm
index 7bc69cb..bae46d1 100644
--- a/src/data/npc_map_data.asm
+++ b/src/data/npc_map_data.asm
@@ -1,7 +1,7 @@
 ; NPC Map data. Format:
 ; NPC, X position, Y Position, Direction,
 ; pre-load function. (Resets c flag if NPC should not be loaded)
-NPCData_772f: ; 772f (4:1372f)
+MasonLabNPCS: ; 772f (4:1372f)
 	db DRMASON, $0e, $06, SOUTH
 	dw $5710
 	db SAM, $04, $0e, EAST
@@ -18,7 +18,7 @@ NPCData_772f: ; 772f (4:1372f)
 	dw $55eb
 	db $00
 
-NPCData_775a: ; 775a (4:1375a)
+DeckMachineRoomNPCS: ; 775a (4:1375a)
 	db TECH6, $06, $08, SOUTH
 	dw $0000
 	db TECH7, $06, $16, WEST
@@ -29,7 +29,7 @@ NPCData_775a: ; 775a (4:1375a)
 	dw $0000
 	db $00
 
-NPCData_7773: ; 7773 (4:13773)
+IshiharasHouseNPCS: ; 7773 (4:13773)
 	db NIKKI, $04, $04, NORTH
 	dw $5add
 	db ISHIHARA, $08, $08, SOUTH
@@ -38,7 +38,7 @@ NPCData_7773: ; 7773 (4:13773)
 	dw $5c43
 	db $00
 
-NPCData_7786: ; 7786 (4:13786)
+FightingClubEntranceNPCS: ; 7786 (4:13786)
 	db CLERK1, $06, $02, SOUTH
 	dw $0000
 	db RONALD1, $08, $fe, SOUTH
@@ -49,7 +49,7 @@ NPCData_7786: ; 7786 (4:13786)
 	dw $6915
 	db $00
 
-NPCData_779f: ; 779f (4:1379f)
+FightingClubLobbyNPCS: ; 779f (4:1379f)
 	db MAN1, $0c, $0e, WEST
 	dw $0000
 	db IMAKUNI, $12, $02, NORTH
@@ -66,7 +66,7 @@ NPCData_779f: ; 779f (4:1379f)
 	dw $7c6c
 	db $00
 
-NPCData_77ca: ; 77ca (4:137ca)
+FightingClubNPCS: ; 77ca (4:137ca)
 	db CHRIS, $04, $08, SOUTH
 	dw $5e43
 	db MICHAEL, $0e, $0a, SOUTH
@@ -77,7 +77,7 @@ NPCData_77ca: ; 77ca (4:137ca)
 	dw $0000
 	db $00
 
-NPCData_77e3: ; 77e3 (4:137e3)
+RockClubEntranceNPCS: ; 77e3 (4:137e3)
 	db CLERK2, $06, $02, SOUTH
 	dw $0000
 	db RONALD1, $08, $fe, SOUTH
@@ -88,7 +88,7 @@ NPCData_77e3: ; 77e3 (4:137e3)
 	dw $6915
 	db $00
 
-NPCData_77fc: ; 77fc (4:137fc)
+RockClubLobbyNPCS: ; 77fc (4:137fc)
 	db CHRIS, $12, $08, WEST
 	dw $5ee9
 	db MATTHEW, $06, $0e, EAST
@@ -105,7 +105,7 @@ NPCData_77fc: ; 77fc (4:137fc)
 	dw $7c6c
 	db $00
 
-NPCData_7827: ; 7827 (4:13827)
+RockClubNPCS: ; 7827 (4:13827)
 	db RYAN, $14, $0e, EAST
 	dw $0000
 	db ANDREW, $06, $14, NORTH
@@ -114,7 +114,7 @@ NPCData_7827: ; 7827 (4:13827)
 	dw $0000
 	db $00
 
-NPCData_783a: ; 783a (4:1383a)
+WaterClubEntranceNPCS: ; 783a (4:1383a)
 	db CLERK3, $06, $02, SOUTH
 	dw $0000
 	db RONALD1, $08, $fe, SOUTH
@@ -125,7 +125,7 @@ NPCData_783a: ; 783a (4:1383a)
 	dw $6915
 	db $00
 
-NPCData_7853: ; 7853 (4:13853)
+WaterClubLobbyNPCS: ; 7853 (4:13853)
 	db GAL1, $06, $0e, SOUTH
 	dw $0000
 	db LASS1, $10, $0a, SOUTH
@@ -142,7 +142,7 @@ NPCData_7853: ; 7853 (4:13853)
 	dw $7c6c
 	db $00
 
-NPCData_787e: ; 787e (4:1387e)
+WaterClubNPCS: ; 787e (4:1387e)
 	db SARA, $06, $12, EAST
 	dw $0000
 	db AMANDA, $16, $14, WEST
@@ -153,7 +153,7 @@ NPCData_787e: ; 787e (4:1387e)
 	dw $62ad
 	db $00
 
-NPCData_7897: ; 7897 (4:13897)
+LightningClubEntranceNPCS: ; 7897 (4:13897)
 	db CLERK4, $06, $02, SOUTH
 	dw $0000
 	db RONALD1, $08, $fe, SOUTH
@@ -164,7 +164,7 @@ NPCData_7897: ; 7897 (4:13897)
 	dw $6915
 	db $00
 
-NPCData_78b0: ; 78b0 (4:138b0)
+LightningClubLobbyNPCS: ; 78b0 (4:138b0)
 	db CHAP2, $12, $10, WEST
 	dw $0000
 	db IMAKUNI, $12, $02, NORTH
@@ -179,7 +179,7 @@ NPCData_78b0: ; 78b0 (4:138b0)
 	dw $7c6c
 	db $00
 
-NPCData_78d5: ; 78d5 (4:138d5)
+LightningClubNPCS: ; 78d5 (4:138d5)
 	db JENNIFER, $0e, $12, SOUTH
 	dw $0000
 	db NICHOLAS, $06, $0a, SOUTH
@@ -190,7 +190,7 @@ NPCData_78d5: ; 78d5 (4:138d5)
 	dw $6494
 	db $00
 
-NPCData_78ee: ; 78ee (4:138ee)
+GrassClubEntranceNPCS: ; 78ee (4:138ee)
 	db CLERK5, $06, $02, SOUTH
 	dw $0000
 	db MICHAEL, $0e, $08, SOUTH
@@ -203,7 +203,7 @@ NPCData_78ee: ; 78ee (4:138ee)
 	dw $6915
 	db $00
 
-NPCData_790d: ; 790d (4:1390d)
+GrassClubLobbyNPCS: ; 790d (4:1390d)
 	db BRITTANY, $0c, $0e, WEST
 	dw $0000
 	db LASS2, $12, $08, SOUTH
@@ -218,7 +218,7 @@ NPCData_790d: ; 790d (4:1390d)
 	dw $7c6c
 	db $00
 
-NPCData_7932: ; 7932 (4:13932)
+GrassClubNPCS: ; 7932 (4:13932)
 	db KRISTIN, $04, $0a, EAST
 	dw $0000
 	db HEATHER, $0e, $10, SOUTH
@@ -227,7 +227,7 @@ NPCData_7932: ; 7932 (4:13932)
 	dw $6796
 	db $00
 
-NPCData_7945: ; 7945 (4:13945)
+PsychicClubEntranceNPCS: ; 7945 (4:13945)
 	db CLERK6, $06, $02, SOUTH
 	dw $0000
 	db RONALD1, $08, $fe, SOUTH
@@ -240,7 +240,7 @@ NPCData_7945: ; 7945 (4:13945)
 	dw $0000
 	db $00
 
-NPCData_7964: ; 7964 (4:13964)
+PsychicClubLobbyNPCS: ; 7964 (4:13964)
 	db ROBERT, $14, $08, NORTH
 	dw $0000
 	db PAPPY1, $04, $10, EAST
@@ -257,7 +257,7 @@ NPCData_7964: ; 7964 (4:13964)
 	dw $7c6c
 	db $00
 
-NPCData_798f: ; 798f (4:1398f)
+PsychicClubNPCS: ; 798f (4:1398f)
 	db DANIEL, $08, $08, NORTH
 	dw $0000
 	db STEPHANIE, $16, $0c, EAST
@@ -268,7 +268,7 @@ NPCData_798f: ; 798f (4:1398f)
 	dw $6ada
 	db $00
 
-NPCData_79a8: ; 79a8 (4:139a8)
+ScienceClubEntranceNPCS: ; 79a8 (4:139a8)
 	db CLERK7, $06, $02, SOUTH
 	dw $0000
 	db RONALD1, $08, $fe, SOUTH
@@ -279,7 +279,7 @@ NPCData_79a8: ; 79a8 (4:139a8)
 	dw $6915
 	db $00
 
-NPCData_79c1: ; 79c1 (4:139c1)
+ScienceClubLobbyNPCS: ; 79c1 (4:139c1)
 	db LAD1, $12, $12, NORTH
 	dw $0000
 	db IMAKUNI, $12, $02, NORTH
@@ -296,7 +296,7 @@ NPCData_79c1: ; 79c1 (4:139c1)
 	dw $7c6c
 	db $00
 
-NPCData_79ec: ; 79ec (4:139ec)
+ScienceClubNPCS: ; 79ec (4:139ec)
 	db JOSEPH, $08, $0a, SOUTH
 	dw $6cc4
 	db DAVID, $14, $04, NORTH
@@ -307,7 +307,7 @@ NPCData_79ec: ; 79ec (4:139ec)
 	dw $0000
 	db $00
 
-NPCData_7a05: ; 7a05 (4:13a05)
+FireClubEntranceNPCS: ; 7a05 (4:13a05)
 	db CLERK8, $06, $02, SOUTH
 	dw $0000
 	db RONALD1, $08, $fe, SOUTH
@@ -318,7 +318,7 @@ NPCData_7a05: ; 7a05 (4:13a05)
 	dw $6915
 	db $00
 
-NPCData_7a1e: ; 7a1e (4:13a1e)
+FireClubLobbyNPCS: ; 7a1e (4:13a1e)
 	db JESSICA, $0c, $0e, WEST
 	dw $6d8d
 	db LAD2, $12, $06, EAST
@@ -333,7 +333,7 @@ NPCData_7a1e: ; 7a1e (4:13a1e)
 	dw $7c6c
 	db $00
 
-NPCData_7a43: ; 7a43 (4:13a43)
+FireClubNPCS: ; 7a43 (4:13a43)
 	db JOHN, $0c, $12, SOUTH
 	dw $0000
 	db ADAM, $08, $0e, SOUTH
@@ -344,12 +344,12 @@ NPCData_7a43: ; 7a43 (4:13a43)
 	dw $0000
 	db $00
 
-NPCData_7a5c: ; 7a5c (4:13a5c)
+ChallengeHallEntranceNPCS: ; 7a5c (4:13a5c)
 	db CLERK9, $06, $02, SOUTH
 	dw $6f96
 	db $00
 
-NPCData_7a63: ; 7a63 (4:13a63)
+ChallengeHallLobbyNPCS: ; 7a63 (4:13a63)
 	db PAPPY3, $06, $0e, EAST
 	dw $707a
 	db CHAMP, $10, $12, WEST
@@ -370,7 +370,7 @@ NPCData_7a63: ; 7a63 (4:13a63)
 	dw $7c6c
 	db $00
 
-NPCData_7a9a: ; 7a9a (4:13a9a)
+ChallengeHallNPCS: ; 7a9a (4:13a9a)
 	db CLERK12, $0a, $12, SOUTH
 	dw $707a
 	db CLERK13, $14, $12, SOUTH
@@ -383,12 +383,12 @@ NPCData_7a9a: ; 7a9a (4:13a9a)
 	dw $7559
 	db $00
 
-NPCData_7ab9: ; 7ab9 (4:13ab9)
+PokemonDomeEntranceNPCS: ; 7ab9 (4:13ab9)
 	db RONALD1, $0e, $12, SOUTH
 	dw $0000
 	db $00
 
-NPCData_7ac0: ; 7ac0 (4:13ac0)
+PokemonDomeNPCS: ; 7ac0 (4:13ac0)
 	db COURTNEY, $12, $02, SOUTH
 	dw $774b
 	db STEVE, $16, $02, SOUTH
@@ -401,7 +401,7 @@ NPCData_7ac0: ; 7ac0 (4:13ac0)
 	dw $77d6
 	db $00
 
-NPCData_7adf: ; 7adf (4:13adf)
+HallOfHonorNPCS: ; 7adf (4:13adf)
 	db _11F1F, $0a, $08, SOUTH
 	dw $0000
 	db _11F26, $0c, $08, SOUTH
-- 
cgit v1.2.3


From 299f013b8b14184b9f06da3b89ba87ce2ba9e0f3 Mon Sep 17 00:00:00 2001
From: Andrew Martinek <andrewrmartinek@gmail.com>
Date: Sun, 13 Oct 2019 19:39:13 -0400
Subject: More scripts, start to figure out mapscripts

---
 src/data/npc_map_data.asm | 58 +++++++++++++++++++++++------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

(limited to 'src/data/npc_map_data.asm')

diff --git a/src/data/npc_map_data.asm b/src/data/npc_map_data.asm
index bae46d1..629eb91 100644
--- a/src/data/npc_map_data.asm
+++ b/src/data/npc_map_data.asm
@@ -31,11 +31,11 @@ DeckMachineRoomNPCS: ; 775a (4:1375a)
 
 IshiharasHouseNPCS: ; 7773 (4:13773)
 	db NIKKI, $04, $04, NORTH
-	dw $5add
+	dw Preload_NikkiInIshiharasHouse
 	db ISHIHARA, $08, $08, SOUTH
-	dw $5b3d
+	dw Preload_IshiharaInIshiharasHouse
 	db RONALD1, $02, $04, WEST
-	dw $5c43
+	dw Preload_Ronald1InIshiharasHouse
 	db $00
 
 FightingClubEntranceNPCS: ; 7786 (4:13786)
@@ -62,8 +62,8 @@ FightingClubLobbyNPCS: ; 779f (4:1379f)
 	dw $5d98
 	db CLERK10, $06, $04, SOUTH
 	dw $0000
-	db CLERK11, $0a, $04, SOUTH
-	dw $7c6c
+	db GIFT_CENTER_CLERK, $0a, $04, SOUTH
+	dw Preload_GiftCenterClerk
 	db $00
 
 FightingClubNPCS: ; 77ca (4:137ca)
@@ -101,8 +101,8 @@ RockClubLobbyNPCS: ; 77fc (4:137fc)
 	dw $5fcb
 	db CLERK10, $06, $04, SOUTH
 	dw $0000
-	db CLERK11, $0a, $04, SOUTH
-	dw $7c6c
+	db GIFT_CENTER_CLERK, $0a, $04, SOUTH
+	dw Preload_GiftCenterClerk
 	db $00
 
 RockClubNPCS: ; 7827 (4:13827)
@@ -131,15 +131,15 @@ WaterClubLobbyNPCS: ; 7853 (4:13853)
 	db LASS1, $10, $0a, SOUTH
 	dw $0000
 	db IMAKUNI, $12, $02, NORTH
-	dw $60b0
+	dw Preload_ImakuniInWaterClubLobby
 	db MAN2, $04, $12, EAST
-	dw $6130
+	dw Preload_Man2InWaterClubLobby
 	db PAPPY2, $16, $10, NORTH
 	dw $0000
 	db CLERK10, $06, $04, SOUTH
 	dw $0000
-	db CLERK11, $0a, $04, SOUTH
-	dw $7c6c
+	db GIFT_CENTER_CLERK, $0a, $04, SOUTH
+	dw Preload_GiftCenterClerk
 	db $00
 
 WaterClubNPCS: ; 787e (4:1387e)
@@ -175,8 +175,8 @@ LightningClubLobbyNPCS: ; 78b0 (4:138b0)
 	dw $0000
 	db CLERK10, $06, $04, SOUTH
 	dw $0000
-	db CLERK11, $0a, $04, SOUTH
-	dw $7c6c
+	db GIFT_CENTER_CLERK, $0a, $04, SOUTH
+	dw Preload_GiftCenterClerk
 	db $00
 
 LightningClubNPCS: ; 78d5 (4:138d5)
@@ -214,8 +214,8 @@ GrassClubLobbyNPCS: ; 790d (4:1390d)
 	dw $66dc
 	db CLERK10, $06, $04, SOUTH
 	dw $0000
-	db CLERK11, $0a, $04, SOUTH
-	dw $7c6c
+	db GIFT_CENTER_CLERK, $0a, $04, SOUTH
+	dw Preload_GiftCenterClerk
 	db $00
 
 GrassClubNPCS: ; 7932 (4:13932)
@@ -253,8 +253,8 @@ PsychicClubLobbyNPCS: ; 7964 (4:13964)
 	dw $0000
 	db CLERK10, $06, $04, SOUTH
 	dw $0000
-	db CLERK11, $0a, $04, SOUTH
-	dw $7c6c
+	db GIFT_CENTER_CLERK, $0a, $04, SOUTH
+	dw Preload_GiftCenterClerk
 	db $00
 
 PsychicClubNPCS: ; 798f (4:1398f)
@@ -292,8 +292,8 @@ ScienceClubLobbyNPCS: ; 79c1 (4:139c1)
 	dw $0000
 	db CLERK10, $06, $04, SOUTH
 	dw $0000
-	db CLERK11, $0a, $04, SOUTH
-	dw $7c6c
+	db GIFT_CENTER_CLERK, $0a, $04, SOUTH
+	dw Preload_GiftCenterClerk
 	db $00
 
 ScienceClubNPCS: ; 79ec (4:139ec)
@@ -329,8 +329,8 @@ FireClubLobbyNPCS: ; 7a1e (4:13a1e)
 	dw $0000
 	db CLERK10, $06, $04, SOUTH
 	dw $0000
-	db CLERK11, $0a, $04, SOUTH
-	dw $7c6c
+	db GIFT_CENTER_CLERK, $0a, $04, SOUTH
+	dw Preload_GiftCenterClerk
 	db $00
 
 FireClubNPCS: ; 7a43 (4:13a43)
@@ -366,8 +366,8 @@ ChallengeHallLobbyNPCS: ; 7a63 (4:13a63)
 	dw $70b4
 	db CLERK10, $06, $04, SOUTH
 	dw $0000
-	db CLERK11, $0a, $04, SOUTH
-	dw $7c6c
+	db GIFT_CENTER_CLERK, $0a, $04, SOUTH
+	dw Preload_GiftCenterClerk
 	db $00
 
 ChallengeHallNPCS: ; 7a9a (4:13a9a)
@@ -402,17 +402,17 @@ PokemonDomeNPCS: ; 7ac0 (4:13ac0)
 	db $00
 
 HallOfHonorNPCS: ; 7adf (4:13adf)
-	db _11F1F, $0a, $08, SOUTH
+	db LEGEND_CARDS_TOP_LEFT, $0a, $08, SOUTH
 	dw $0000
-	db _11F26, $0c, $08, SOUTH
+	db LEGEND_CARDS_TOP_RIGHT, $0c, $08, SOUTH
 	dw $0000
-	db _11F2D, $08, $0a, SOUTH
+	db LEGEND_CARDS_LEFT_SPARK, $08, $0a, SOUTH
 	dw $0000
-	db _11F34, $0a, $0a, SOUTH
+	db LEGEND_CARDS_BOTTOM_LEFT, $0a, $0a, SOUTH
 	dw $0000
-	db _11F3B, $0c, $0a, SOUTH
+	db LEGEND_CARDS_BOTTOM_RIGHT, $0c, $0a, SOUTH
 	dw $0000
-	db _11F42, $0e, $0a, SOUTH
+	db LEGEND_CARDS_RIGHT_SPARK, $0e, $0a, SOUTH
 	dw $0000
 	db $00
 
-- 
cgit v1.2.3


From e58e93fdb14173ae7a9edcd782f70fe67402c42f Mon Sep 17 00:00:00 2001
From: Andrew Martinek <andrewrmartinek@gmail.com>
Date: Fri, 25 Oct 2019 19:41:50 -0400
Subject: a bit more scripting stuff, figured out more npc data

---
 src/data/npc_map_data.asm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/data/npc_map_data.asm')

diff --git a/src/data/npc_map_data.asm b/src/data/npc_map_data.asm
index 629eb91..d40e086 100644
--- a/src/data/npc_map_data.asm
+++ b/src/data/npc_map_data.asm
@@ -1,4 +1,5 @@
-; NPC Map data. Format:
+; 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)
@@ -150,7 +151,7 @@ WaterClubNPCS: ; 787e (4:1387e)
 	db JOSHUA, $16, $08, SOUTH
 	dw $0000
 	db AMY, $16, $04, SOUTH
-	dw $62ad
+	dw Preload_Amy
 	db $00
 
 LightningClubEntranceNPCS: ; 7897 (4:13897)
-- 
cgit v1.2.3


From 3f99d5555ce7b8a2467aef9d24d7192f993343d9 Mon Sep 17 00:00:00 2001
From: Andrew Martinek <andrewrmartinek@gmail.com>
Date: Mon, 28 Oct 2019 17:25:50 -0400
Subject: extracted a lot of challenge hall scripts

---
 src/data/npc_map_data.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/data/npc_map_data.asm')

diff --git a/src/data/npc_map_data.asm b/src/data/npc_map_data.asm
index d40e086..a66c149 100644
--- a/src/data/npc_map_data.asm
+++ b/src/data/npc_map_data.asm
@@ -377,7 +377,7 @@ ChallengeHallNPCS: ; 7a9a (4:13a9a)
 	db CLERK13, $14, $12, SOUTH
 	dw $707a
 	db GUIDE, $0e, $14, SOUTH
-	dw $7270
+	dw Preload_Guide
 	db HOST, $0e, $04, SOUTH
 	dw $707a
 	db $ff, $12, $08, WEST ; pre-load function chooses NPC to load
-- 
cgit v1.2.3


From adc5a467eeccb0e44f4fcd2ed14d2b185ca1c14c Mon Sep 17 00:00:00 2001
From: Andrew Martinek <andrewrmartinek@gmail.com>
Date: Tue, 29 Oct 2019 16:35:04 -0400
Subject: Finished extracting Challenge Hall scripts

---
 src/data/npc_map_data.asm | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/data/npc_map_data.asm')

diff --git a/src/data/npc_map_data.asm b/src/data/npc_map_data.asm
index a66c149..05663c3 100644
--- a/src/data/npc_map_data.asm
+++ b/src/data/npc_map_data.asm
@@ -347,24 +347,24 @@ FireClubNPCS: ; 7a43 (4:13a43)
 
 ChallengeHallEntranceNPCS: ; 7a5c (4:13a5c)
 	db CLERK9, $06, $02, SOUTH
-	dw $6f96
+	dw Preload_Clerk9
 	db $00
 
 ChallengeHallLobbyNPCS: ; 7a63 (4:13a63)
 	db PAPPY3, $06, $0e, EAST
-	dw $707a
+	dw Preload_ChallengeHallNPCs1
 	db CHAMP, $10, $12, WEST
-	dw $707a
+	dw Preload_ChallengeHallNPCs1
 	db HOOD2, $14, $08, SOUTH
-	dw $707a
+	dw Preload_ChallengeHallNPCs1
 	db LASS5, $16, $10, WEST
-	dw $707a
+	dw Preload_ChallengeHallNPCs1
 	db GAL4, $0c, $0e, EAST
-	dw $7075
+	dw Preload_ChallengeHallNPCs2
 	db CHAP5, $10, $08, WEST
-	dw $7075
+	dw Preload_ChallengeHallNPCs2
 	db RONALD1, $08, $0c, SOUTH
-	dw $70b4
+	dw Preload_ChallengeHallLobbyRonald1
 	db CLERK10, $06, $04, SOUTH
 	dw $0000
 	db GIFT_CENTER_CLERK, $0a, $04, SOUTH
@@ -373,15 +373,15 @@ ChallengeHallLobbyNPCS: ; 7a63 (4:13a63)
 
 ChallengeHallNPCS: ; 7a9a (4:13a9a)
 	db CLERK12, $0a, $12, SOUTH
-	dw $707a
+	dw Preload_ChallengeHallNPCs1
 	db CLERK13, $14, $12, SOUTH
-	dw $707a
+	dw Preload_ChallengeHallNPCs1
 	db GUIDE, $0e, $14, SOUTH
 	dw Preload_Guide
 	db HOST, $0e, $04, SOUTH
-	dw $707a
+	dw Preload_ChallengeHallNPCs1
 	db $ff, $12, $08, WEST ; pre-load function chooses NPC to load
-	dw $7559
+	dw Preload_ChallengeHallOpponent
 	db $00
 
 PokemonDomeEntranceNPCS: ; 7ab9 (4:13ab9)
-- 
cgit v1.2.3


From 085660d0799a85e18fa6a25f251875ce7c0db5d4 Mon Sep 17 00:00:00 2001
From: Andrew Martinek <andrewrmartinek@gmail.com>
Date: Tue, 5 May 2020 21:29:47 -0400
Subject: Added NPC_ Prefix, Changed Level to Map in some places

---
 src/data/npc_map_data.asm | 314 +++++++++++++++++++++++-----------------------
 1 file changed, 157 insertions(+), 157 deletions(-)

(limited to 'src/data/npc_map_data.asm')

diff --git a/src/data/npc_map_data.asm b/src/data/npc_map_data.asm
index 05663c3..701171e 100644
--- a/src/data/npc_map_data.asm
+++ b/src/data/npc_map_data.asm
@@ -3,417 +3,417 @@
 ; 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
+	db NPC_DRMASON, $0e, $06, SOUTH
 	dw $5710
-	db SAM, $04, $0e, EAST
+	db NPC_SAM, $04, $0e, EAST
 	dw $5604
-	db TECH1, $16, $08, WEST
+	db NPC_TECH1, $16, $08, WEST
 	dw $0000
-	db TECH2, $16, $14, SOUTH
+	db NPC_TECH2, $16, $14, SOUTH
 	dw $0000
-	db TECH3, $16, $16, WEST
+	db NPC_TECH3, $16, $16, WEST
 	dw $0000
-	db TECH4, $0a, $16, EAST
+	db NPC_TECH4, $0a, $16, EAST
 	dw $0000
-	db TECH5, $06, $04, SOUTH
+	db NPC_TECH5, $06, $04, SOUTH
 	dw $55eb
 	db $00
 
 DeckMachineRoomNPCS: ; 775a (4:1375a)
-	db TECH6, $06, $08, SOUTH
+	db NPC_TECH6, $06, $08, SOUTH
 	dw $0000
-	db TECH7, $06, $16, WEST
+	db NPC_TECH7, $06, $16, WEST
 	dw $0000
-	db TECH8, $0a, $12, WEST
+	db NPC_TECH8, $0a, $12, WEST
 	dw $0000
-	db AARON, $0c, $0c, WEST
+	db NPC_AARON, $0c, $0c, WEST
 	dw $0000
 	db $00
 
 IshiharasHouseNPCS: ; 7773 (4:13773)
-	db NIKKI, $04, $04, NORTH
+	db NPC_NIKKI, $04, $04, NORTH
 	dw Preload_NikkiInIshiharasHouse
-	db ISHIHARA, $08, $08, SOUTH
+	db NPC_ISHIHARA, $08, $08, SOUTH
 	dw Preload_IshiharaInIshiharasHouse
-	db RONALD1, $02, $04, WEST
+	db NPC_RONALD1, $02, $04, WEST
 	dw Preload_Ronald1InIshiharasHouse
 	db $00
 
 FightingClubEntranceNPCS: ; 7786 (4:13786)
-	db CLERK1, $06, $02, SOUTH
+	db NPC_CLERK1, $06, $02, SOUTH
 	dw $0000
-	db RONALD1, $08, $fe, SOUTH
+	db NPC_RONALD1, $08, $fe, SOUTH
 	dw $685b
-	db RONALD2, $fe, $08, NORTH
+	db NPC_RONALD2, $fe, $08, NORTH
 	dw $689a
-	db RONALD3, $fe, $08, NORTH
+	db NPC_RONALD3, $fe, $08, NORTH
 	dw $6915
 	db $00
 
 FightingClubLobbyNPCS: ; 779f (4:1379f)
-	db MAN1, $0c, $0e, WEST
+	db NPC_MAN1, $0c, $0e, WEST
 	dw $0000
-	db IMAKUNI, $12, $02, NORTH
+	db NPC_IMAKUNI, $12, $02, NORTH
 	dw $5ceb
-	db SPECS1, $12, $10, EAST
+	db NPC_SPECS1, $12, $10, EAST
 	dw $0000
-	db BUTCH, $14, $10, WEST
+	db NPC_BUTCH, $14, $10, WEST
 	dw $0000
-	db GRANNY1, $04, $10, WEST
+	db NPC_GRANNY1, $04, $10, WEST
 	dw $5d98
-	db CLERK10, $06, $04, SOUTH
+	db NPC_CLERK10, $06, $04, SOUTH
 	dw $0000
-	db GIFT_CENTER_CLERK, $0a, $04, SOUTH
+	db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH
 	dw Preload_GiftCenterClerk
 	db $00
 
 FightingClubNPCS: ; 77ca (4:137ca)
-	db CHRIS, $04, $08, SOUTH
+	db NPC_CHRIS, $04, $08, SOUTH
 	dw $5e43
-	db MICHAEL, $0e, $0a, SOUTH
+	db NPC_MICHAEL, $0e, $0a, SOUTH
 	dw $5e79
-	db JESSICA, $12, $06, EAST
+	db NPC_JESSICA, $12, $06, EAST
 	dw $5ea5
-	db MITCH, $0a, $04, SOUTH
+	db NPC_MITCH, $0a, $04, SOUTH
 	dw $0000
 	db $00
 
 RockClubEntranceNPCS: ; 77e3 (4:137e3)
-	db CLERK2, $06, $02, SOUTH
+	db NPC_CLERK2, $06, $02, SOUTH
 	dw $0000
-	db RONALD1, $08, $fe, SOUTH
+	db NPC_RONALD1, $08, $fe, SOUTH
 	dw $685b
-	db RONALD2, $fe, $08, NORTH
+	db NPC_RONALD2, $fe, $08, NORTH
 	dw $689a
-	db RONALD3, $fe, $08, NORTH
+	db NPC_RONALD3, $fe, $08, NORTH
 	dw $6915
 	db $00
 
 RockClubLobbyNPCS: ; 77fc (4:137fc)
-	db CHRIS, $12, $08, WEST
+	db NPC_CHRIS, $12, $08, WEST
 	dw $5ee9
-	db MATTHEW, $06, $0e, EAST
+	db NPC_MATTHEW, $06, $0e, EAST
 	dw $0000
-	db WOMAN1, $14, $12, NORTH
+	db NPC_WOMAN1, $14, $12, NORTH
 	dw $0000
-	db CHAP1, $0e, $10, EAST
+	db NPC_CHAP1, $0e, $10, EAST
 	dw $0000
-	db LASS3, $10, $04, SOUTH
+	db NPC_LASS3, $10, $04, SOUTH
 	dw $5fcb
-	db CLERK10, $06, $04, SOUTH
+	db NPC_CLERK10, $06, $04, SOUTH
 	dw $0000
-	db GIFT_CENTER_CLERK, $0a, $04, SOUTH
+	db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH
 	dw Preload_GiftCenterClerk
 	db $00
 
 RockClubNPCS: ; 7827 (4:13827)
-	db RYAN, $14, $0e, EAST
+	db NPC_RYAN, $14, $0e, EAST
 	dw $0000
-	db ANDREW, $06, $14, NORTH
+	db NPC_ANDREW, $06, $14, NORTH
 	dw $0000
-	db GENE, $0c, $06, NORTH
+	db NPC_GENE, $0c, $06, NORTH
 	dw $0000
 	db $00
 
 WaterClubEntranceNPCS: ; 783a (4:1383a)
-	db CLERK3, $06, $02, SOUTH
+	db NPC_CLERK3, $06, $02, SOUTH
 	dw $0000
-	db RONALD1, $08, $fe, SOUTH
+	db NPC_RONALD1, $08, $fe, SOUTH
 	dw $685b
-	db RONALD2, $fe, $08, NORTH
+	db NPC_RONALD2, $fe, $08, NORTH
 	dw $689a
-	db RONALD3, $fe, $08, NORTH
+	db NPC_RONALD3, $fe, $08, NORTH
 	dw $6915
 	db $00
 
 WaterClubLobbyNPCS: ; 7853 (4:13853)
-	db GAL1, $06, $0e, SOUTH
+	db NPC_GAL1, $06, $0e, SOUTH
 	dw $0000
-	db LASS1, $10, $0a, SOUTH
+	db NPC_LASS1, $10, $0a, SOUTH
 	dw $0000
-	db IMAKUNI, $12, $02, NORTH
+	db NPC_IMAKUNI, $12, $02, NORTH
 	dw Preload_ImakuniInWaterClubLobby
-	db MAN2, $04, $12, EAST
+	db NPC_MAN2, $04, $12, EAST
 	dw Preload_Man2InWaterClubLobby
-	db PAPPY2, $16, $10, NORTH
+	db NPC_PAPPY2, $16, $10, NORTH
 	dw $0000
-	db CLERK10, $06, $04, SOUTH
+	db NPC_CLERK10, $06, $04, SOUTH
 	dw $0000
-	db GIFT_CENTER_CLERK, $0a, $04, SOUTH
+	db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH
 	dw Preload_GiftCenterClerk
 	db $00
 
 WaterClubNPCS: ; 787e (4:1387e)
-	db SARA, $06, $12, EAST
+	db NPC_SARA, $06, $12, EAST
 	dw $0000
-	db AMANDA, $16, $14, WEST
+	db NPC_AMANDA, $16, $14, WEST
 	dw $0000
-	db JOSHUA, $16, $08, SOUTH
+	db NPC_JOSHUA, $16, $08, SOUTH
 	dw $0000
-	db AMY, $16, $04, SOUTH
+	db NPC_AMY, $16, $04, SOUTH
 	dw Preload_Amy
 	db $00
 
 LightningClubEntranceNPCS: ; 7897 (4:13897)
-	db CLERK4, $06, $02, SOUTH
+	db NPC_CLERK4, $06, $02, SOUTH
 	dw $0000
-	db RONALD1, $08, $fe, SOUTH
+	db NPC_RONALD1, $08, $fe, SOUTH
 	dw $685b
-	db RONALD2, $fe, $08, NORTH
+	db NPC_RONALD2, $fe, $08, NORTH
 	dw $689a
-	db RONALD3, $fe, $08, NORTH
+	db NPC_RONALD3, $fe, $08, NORTH
 	dw $6915
 	db $00
 
 LightningClubLobbyNPCS: ; 78b0 (4:138b0)
-	db CHAP2, $12, $10, WEST
+	db NPC_CHAP2, $12, $10, WEST
 	dw $0000
-	db IMAKUNI, $12, $02, NORTH
+	db NPC_IMAKUNI, $12, $02, NORTH
 	dw $637b
-	db LASS4, $08, $0c, SOUTH
+	db NPC_LASS4, $08, $0c, SOUTH
 	dw $0000
-	db HOOD1, $14, $08, SOUTH
+	db NPC_HOOD1, $14, $08, SOUTH
 	dw $0000
-	db CLERK10, $06, $04, SOUTH
+	db NPC_CLERK10, $06, $04, SOUTH
 	dw $0000
-	db GIFT_CENTER_CLERK, $0a, $04, SOUTH
+	db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH
 	dw Preload_GiftCenterClerk
 	db $00
 
 LightningClubNPCS: ; 78d5 (4:138d5)
-	db JENNIFER, $0e, $12, SOUTH
+	db NPC_JENNIFER, $0e, $12, SOUTH
 	dw $0000
-	db NICHOLAS, $06, $0a, SOUTH
+	db NPC_NICHOLAS, $06, $0a, SOUTH
 	dw $0000
-	db BRANDON, $16, $0c, NORTH
+	db NPC_BRANDON, $16, $0c, NORTH
 	dw $0000
-	db ISAAC, $0c, $04, NORTH
+	db NPC_ISAAC, $0c, $04, NORTH
 	dw $6494
 	db $00
 
 GrassClubEntranceNPCS: ; 78ee (4:138ee)
-	db CLERK5, $06, $02, SOUTH
+	db NPC_CLERK5, $06, $02, SOUTH
 	dw $0000
-	db MICHAEL, $0e, $08, SOUTH
+	db NPC_MICHAEL, $0e, $08, SOUTH
 	dw $656a
-	db RONALD1, $08, $fe, SOUTH
+	db NPC_RONALD1, $08, $fe, SOUTH
 	dw $685b
-	db RONALD2, $fe, $08, NORTH
+	db NPC_RONALD2, $fe, $08, NORTH
 	dw $689a
-	db RONALD3, $fe, $08, NORTH
+	db NPC_RONALD3, $fe, $08, NORTH
 	dw $6915
 	db $00
 
 GrassClubLobbyNPCS: ; 790d (4:1390d)
-	db BRITTANY, $0c, $0e, WEST
+	db NPC_BRITTANY, $0c, $0e, WEST
 	dw $0000
-	db LASS2, $12, $08, SOUTH
+	db NPC_LASS2, $12, $08, SOUTH
 	dw $0000
-	db GRANNY2, $04, $10, EAST
+	db NPC_GRANNY2, $04, $10, EAST
 	dw $0000
-	db GAL2, $14, $10, NORTH
+	db NPC_GAL2, $14, $10, NORTH
 	dw $66dc
-	db CLERK10, $06, $04, SOUTH
+	db NPC_CLERK10, $06, $04, SOUTH
 	dw $0000
-	db GIFT_CENTER_CLERK, $0a, $04, SOUTH
+	db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH
 	dw Preload_GiftCenterClerk
 	db $00
 
 GrassClubNPCS: ; 7932 (4:13932)
-	db KRISTIN, $04, $0a, EAST
+	db NPC_KRISTIN, $04, $0a, EAST
 	dw $0000
-	db HEATHER, $0e, $10, SOUTH
+	db NPC_HEATHER, $0e, $10, SOUTH
 	dw $0000
-	db NIKKI, $0c, $04, SOUTH
+	db NPC_NIKKI, $0c, $04, SOUTH
 	dw $6796
 	db $00
 
 PsychicClubEntranceNPCS: ; 7945 (4:13945)
-	db CLERK6, $06, $02, SOUTH
+	db NPC_CLERK6, $06, $02, SOUTH
 	dw $0000
-	db RONALD1, $08, $fe, SOUTH
+	db NPC_RONALD1, $08, $fe, SOUTH
 	dw $685b
-	db RONALD2, $fe, $08, NORTH
+	db NPC_RONALD2, $fe, $08, NORTH
 	dw $689a
-	db RONALD3, $fe, $08, NORTH
+	db NPC_RONALD3, $fe, $08, NORTH
 	dw $6915
-	db LAD3, $0e, $04, SOUTH
+	db NPC_LAD3, $0e, $04, SOUTH
 	dw $0000
 	db $00
 
 PsychicClubLobbyNPCS: ; 7964 (4:13964)
-	db ROBERT, $14, $08, NORTH
+	db NPC_ROBERT, $14, $08, NORTH
 	dw $0000
-	db PAPPY1, $04, $10, EAST
+	db NPC_PAPPY1, $04, $10, EAST
 	dw $0000
-	db RONALD1, $0c, $0a, EAST
+	db NPC_RONALD1, $0c, $0a, EAST
 	dw $69f7
-	db GAL3, $10, $0e, WEST
+	db NPC_GAL3, $10, $0e, WEST
 	dw $0000
-	db CHAP4, $18, $10, SOUTH
+	db NPC_CHAP4, $18, $10, SOUTH
 	dw $0000
-	db CLERK10, $06, $04, SOUTH
+	db NPC_CLERK10, $06, $04, SOUTH
 	dw $0000
-	db GIFT_CENTER_CLERK, $0a, $04, SOUTH
+	db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH
 	dw Preload_GiftCenterClerk
 	db $00
 
 PsychicClubNPCS: ; 798f (4:1398f)
-	db DANIEL, $08, $08, NORTH
+	db NPC_DANIEL, $08, $08, NORTH
 	dw $0000
-	db STEPHANIE, $16, $0c, EAST
+	db NPC_STEPHANIE, $16, $0c, EAST
 	dw $0000
-	db MURRAY2, $02, $02, WEST
+	db NPC_MURRAY2, $02, $02, WEST
 	dw $6ad0
-	db MURRAY1, $0c, $06, SOUTH
+	db NPC_MURRAY1, $0c, $06, SOUTH
 	dw $6ada
 	db $00
 
 ScienceClubEntranceNPCS: ; 79a8 (4:139a8)
-	db CLERK7, $06, $02, SOUTH
+	db NPC_CLERK7, $06, $02, SOUTH
 	dw $0000
-	db RONALD1, $08, $fe, SOUTH
+	db NPC_RONALD1, $08, $fe, SOUTH
 	dw $685b
-	db RONALD2, $fe, $08, NORTH
+	db NPC_RONALD2, $fe, $08, NORTH
 	dw $689a
-	db RONALD3, $fe, $08, NORTH
+	db NPC_RONALD3, $fe, $08, NORTH
 	dw $6915
 	db $00
 
 ScienceClubLobbyNPCS: ; 79c1 (4:139c1)
-	db LAD1, $12, $12, NORTH
+	db NPC_LAD1, $12, $12, NORTH
 	dw $0000
-	db IMAKUNI, $12, $02, NORTH
+	db NPC_IMAKUNI, $12, $02, NORTH
 	dw $6b65
-	db MAN3, $04, $0e, WEST
+	db NPC_MAN3, $04, $0e, WEST
 	dw $0000
-	db SPECS2, $0c, $0e, WEST
+	db NPC_SPECS2, $0c, $0e, WEST
 	dw $0000
-	db SPECS3, $16, $08, SOUTH
+	db NPC_SPECS3, $16, $08, SOUTH
 	dw $0000
-	db CLERK10, $06, $04, SOUTH
+	db NPC_CLERK10, $06, $04, SOUTH
 	dw $0000
-	db GIFT_CENTER_CLERK, $0a, $04, SOUTH
+	db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH
 	dw Preload_GiftCenterClerk
 	db $00
 
 ScienceClubNPCS: ; 79ec (4:139ec)
-	db JOSEPH, $08, $0a, SOUTH
+	db NPC_JOSEPH, $08, $0a, SOUTH
 	dw $6cc4
-	db DAVID, $14, $04, NORTH
+	db NPC_DAVID, $14, $04, NORTH
 	dw $0000
-	db ERIK, $06, $12, SOUTH
+	db NPC_ERIK, $06, $12, SOUTH
 	dw $0000
-	db RICK, $04, $04, NORTH
+	db NPC_RICK, $04, $04, NORTH
 	dw $0000
 	db $00
 
 FireClubEntranceNPCS: ; 7a05 (4:13a05)
-	db CLERK8, $06, $02, SOUTH
+	db NPC_CLERK8, $06, $02, SOUTH
 	dw $0000
-	db RONALD1, $08, $fe, SOUTH
+	db NPC_RONALD1, $08, $fe, SOUTH
 	dw $685b
-	db RONALD2, $fe, $08, NORTH
+	db NPC_RONALD2, $fe, $08, NORTH
 	dw $689a
-	db RONALD3, $fe, $08, NORTH
+	db NPC_RONALD3, $fe, $08, NORTH
 	dw $6915
 	db $00
 
 FireClubLobbyNPCS: ; 7a1e (4:13a1e)
-	db JESSICA, $0c, $0e, WEST
+	db NPC_JESSICA, $0c, $0e, WEST
 	dw $6d8d
-	db LAD2, $12, $06, EAST
+	db NPC_LAD2, $12, $06, EAST
 	dw $6e25
-	db CHAP3, $06, $0a, NORTH
+	db NPC_CHAP3, $06, $0a, NORTH
 	dw $0000
-	db MANIA, $14, $12, NORTH
+	db NPC_MANIA, $14, $12, NORTH
 	dw $0000
-	db CLERK10, $06, $04, SOUTH
+	db NPC_CLERK10, $06, $04, SOUTH
 	dw $0000
-	db GIFT_CENTER_CLERK, $0a, $04, SOUTH
+	db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH
 	dw Preload_GiftCenterClerk
 	db $00
 
 FireClubNPCS: ; 7a43 (4:13a43)
-	db JOHN, $0c, $12, SOUTH
+	db NPC_JOHN, $0c, $12, SOUTH
 	dw $0000
-	db ADAM, $08, $0e, SOUTH
+	db NPC_ADAM, $08, $0e, SOUTH
 	dw $0000
-	db JONATHAN, $12, $0a, SOUTH
+	db NPC_JONATHAN, $12, $0a, SOUTH
 	dw $0000
-	db KEN, $0e, $04, SOUTH
+	db NPC_KEN, $0e, $04, SOUTH
 	dw $0000
 	db $00
 
 ChallengeHallEntranceNPCS: ; 7a5c (4:13a5c)
-	db CLERK9, $06, $02, SOUTH
+	db NPC_CLERK9, $06, $02, SOUTH
 	dw Preload_Clerk9
 	db $00
 
 ChallengeHallLobbyNPCS: ; 7a63 (4:13a63)
-	db PAPPY3, $06, $0e, EAST
+	db NPC_PAPPY3, $06, $0e, EAST
 	dw Preload_ChallengeHallNPCs1
-	db CHAMP, $10, $12, WEST
+	db NPC_CHAMP, $10, $12, WEST
 	dw Preload_ChallengeHallNPCs1
-	db HOOD2, $14, $08, SOUTH
+	db NPC_HOOD2, $14, $08, SOUTH
 	dw Preload_ChallengeHallNPCs1
-	db LASS5, $16, $10, WEST
+	db NPC_LASS5, $16, $10, WEST
 	dw Preload_ChallengeHallNPCs1
-	db GAL4, $0c, $0e, EAST
+	db NPC_GAL4, $0c, $0e, EAST
 	dw Preload_ChallengeHallNPCs2
-	db CHAP5, $10, $08, WEST
+	db NPC_CHAP5, $10, $08, WEST
 	dw Preload_ChallengeHallNPCs2
-	db RONALD1, $08, $0c, SOUTH
+	db NPC_RONALD1, $08, $0c, SOUTH
 	dw Preload_ChallengeHallLobbyRonald1
-	db CLERK10, $06, $04, SOUTH
+	db NPC_CLERK10, $06, $04, SOUTH
 	dw $0000
-	db GIFT_CENTER_CLERK, $0a, $04, SOUTH
+	db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH
 	dw Preload_GiftCenterClerk
 	db $00
 
 ChallengeHallNPCS: ; 7a9a (4:13a9a)
-	db CLERK12, $0a, $12, SOUTH
+	db NPC_CLERK12, $0a, $12, SOUTH
 	dw Preload_ChallengeHallNPCs1
-	db CLERK13, $14, $12, SOUTH
+	db NPC_CLERK13, $14, $12, SOUTH
 	dw Preload_ChallengeHallNPCs1
-	db GUIDE, $0e, $14, SOUTH
+	db NPC_GUIDE, $0e, $14, SOUTH
 	dw Preload_Guide
-	db HOST, $0e, $04, SOUTH
+	db NPC_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
+	db NPC_RONALD1, $0e, $12, SOUTH
 	dw $0000
 	db $00
 
 PokemonDomeNPCS: ; 7ac0 (4:13ac0)
-	db COURTNEY, $12, $02, SOUTH
+	db NPC_COURTNEY, $12, $02, SOUTH
 	dw $774b
-	db STEVE, $16, $02, SOUTH
+	db NPC_STEVE, $16, $02, SOUTH
 	dw $778c
-	db JACK, $08, $02, SOUTH
+	db NPC_JACK, $08, $02, SOUTH
 	dw $77a3
-	db ROD, $0c, $02, SOUTH
+	db NPC_ROD, $0c, $02, SOUTH
 	dw $77ba
-	db RONALD1, $1e, $00, SOUTH
+	db NPC_RONALD1, $1e, $00, SOUTH
 	dw $77d6
 	db $00
 
 HallOfHonorNPCS: ; 7adf (4:13adf)
-	db LEGEND_CARDS_TOP_LEFT, $0a, $08, SOUTH
+	db NPC_LEGEND_CARDS_TOP_LEFT, $0a, $08, SOUTH
 	dw $0000
-	db LEGEND_CARDS_TOP_RIGHT, $0c, $08, SOUTH
+	db NPC_LEGEND_CARDS_TOP_RIGHT, $0c, $08, SOUTH
 	dw $0000
-	db LEGEND_CARDS_LEFT_SPARK, $08, $0a, SOUTH
+	db NPC_LEGEND_CARDS_LEFT_SPARK, $08, $0a, SOUTH
 	dw $0000
-	db LEGEND_CARDS_BOTTOM_LEFT, $0a, $0a, SOUTH
+	db NPC_LEGEND_CARDS_BOTTOM_LEFT, $0a, $0a, SOUTH
 	dw $0000
-	db LEGEND_CARDS_BOTTOM_RIGHT, $0c, $0a, SOUTH
+	db NPC_LEGEND_CARDS_BOTTOM_RIGHT, $0c, $0a, SOUTH
 	dw $0000
-	db LEGEND_CARDS_RIGHT_SPARK, $0e, $0a, SOUTH
+	db NPC_LEGEND_CARDS_RIGHT_SPARK, $0e, $0a, SOUTH
 	dw $0000
 	db $00
 
-- 
cgit v1.2.3


From a1f9dca9f563e6bc82c533f8e3a82edb954b8842 Mon Sep 17 00:00:00 2001
From: Andrew Martinek <andrewrmartinek@gmail.com>
Date: Tue, 5 May 2020 22:45:50 -0400
Subject: changed wording when it comes to the legendary card sprite

---
 src/data/npc_map_data.asm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/data/npc_map_data.asm')

diff --git a/src/data/npc_map_data.asm b/src/data/npc_map_data.asm
index 701171e..bc09d07 100644
--- a/src/data/npc_map_data.asm
+++ b/src/data/npc_map_data.asm
@@ -403,17 +403,17 @@ PokemonDomeNPCS: ; 7ac0 (4:13ac0)
 	db $00
 
 HallOfHonorNPCS: ; 7adf (4:13adf)
-	db NPC_LEGEND_CARDS_TOP_LEFT, $0a, $08, SOUTH
+	db NPC_LEGENDARY_CARD_TOP_LEFT, $0a, $08, SOUTH
 	dw $0000
-	db NPC_LEGEND_CARDS_TOP_RIGHT, $0c, $08, SOUTH
+	db NPC_LEGENDARY_CARD_TOP_RIGHT, $0c, $08, SOUTH
 	dw $0000
-	db NPC_LEGEND_CARDS_LEFT_SPARK, $08, $0a, SOUTH
+	db NPC_LEGENDARY_CARD_LEFT_SPARK, $08, $0a, SOUTH
 	dw $0000
-	db NPC_LEGEND_CARDS_BOTTOM_LEFT, $0a, $0a, SOUTH
+	db NPC_LEGENDARY_CARD_BOTTOM_LEFT, $0a, $0a, SOUTH
 	dw $0000
-	db NPC_LEGEND_CARDS_BOTTOM_RIGHT, $0c, $0a, SOUTH
+	db NPC_LEGENDARY_CARD_BOTTOM_RIGHT, $0c, $0a, SOUTH
 	dw $0000
-	db NPC_LEGEND_CARDS_RIGHT_SPARK, $0e, $0a, SOUTH
+	db NPC_LEGENDARY_CARD_RIGHT_SPARK, $0e, $0a, SOUTH
 	dw $0000
 	db $00
 
-- 
cgit v1.2.3