Added NPC_ Prefix, Changed Level to Map in some places

9 files changed, 437 insertions, 437 deletions

diff --git a/src/constants/map_constants.asm b/src/constants/map_constants.asm
index 92eaf4c..d8637d6 100644
--- a/src/constants/map_constants.asm
+++ b/src/constants/map_constants.asm
@@ -35,10 +35,10 @@
 	const HALL_OF_HONOR           ; $21
 
 
-; Size of map data. See data/npc_map_data.asm and data/level_objects.asm
+; Size of map data. See data/npc_map_data.asm and data/map_objects.asm
 ; for more info on what these represent
 NPC_MAP_SIZE          EQU $06
-LEVEL_OBJECT_SIZE     EQU $09
+MAP_OBJECT_SIZE       EQU $09
 
 ; Most of these aren't fully understood so the names aren't great
 MAP_SCRIPT_SIZE          EQU $0f
diff --git a/src/constants/npc_constants.asm b/src/constants/npc_constants.asm
index 5ae8f99..e51dfb9 100644
--- a/src/constants/npc_constants.asm
+++ b/src/constants/npc_constants.asm
@@ -19,9 +19,9 @@ LOADED_NPC_LENGTH EQU const_value
 ; npc_struct constants
 	const_def
 	const NPC_TRAINER_ID
-	const NPC_DATA_FIELD_01 ; Sprite
-	const NPC_DATA_FIELD_02 ; DMG/SGB pal
-	const NPC_DATA_FIELD_03 ; CGB pal
+	const NPC_DATA_FIELD_01 ; 01-03 Seem to relate to sprites
+	const NPC_DATA_FIELD_02
+	const NPC_DATA_FIELD_03
 	const NPC_DATA_FIELD_04
 	const NPC_DATA_OWSEQUENCE_PTR
 const_value = const_value+1
@@ -77,119 +77,119 @@ NPC_DATA_LENGTH EQU const_value
 	const AARON_PIC     ; $29
 
 	const_def 1
-	const DRMASON                     ; $01
-	const RONALD1                     ; $02
-	const ISHIHARA                    ; $03
-	const IMAKUNI                     ; $04
+	const NPC_DRMASON                     ; $01
+	const NPC_RONALD1                     ; $02
+	const NPC_ISHIHARA                    ; $03
+	const NPC_IMAKUNI                     ; $04
 const_value = const_value+1 ; DRMASON duplicate
 const_value = const_value+1 ; DRMASON duplicate
-	const SAM                         ; $07
-	const TECH1                       ; $08
-	const TECH2                       ; $09
-	const TECH3                       ; $0a
-	const TECH4                       ; $0b
-	const TECH5                       ; $0c
-	const TECH6                       ; $0d
-	const CLERK1                      ; $0e
-	const CLERK2                      ; $0f
-	const CLERK3                      ; $10
-	const CLERK4                      ; $11
-	const CLERK5                      ; $12
-	const CLERK6                      ; $13
-	const CLERK7                      ; $14
-	const CLERK8                      ; $15
-	const CLERK9                      ; $16
-	const CHRIS                       ; $17
-	const MICHAEL                     ; $18
-	const JESSICA                     ; $19
-	const MITCH                       ; $1a
-	const MATTHEW                     ; $1b
-	const RYAN                        ; $1c
-	const ANDREW                      ; $1d
-	const GENE                        ; $1e
-	const SARA                        ; $1f
-	const AMANDA                      ; $20
-	const JOSHUA                      ; $21
-	const AMY                         ; $22
-	const JENNIFER                    ; $23
-	const NICHOLAS                    ; $24
-	const BRANDON                     ; $25
-	const ISAAC                       ; $26
-	const BRITTANY                    ; $27
-	const KRISTIN                     ; $28
-	const HEATHER                     ; $29
-	const NIKKI                       ; $2a
-	const ROBERT                      ; $2b
-	const DANIEL                      ; $2c
-	const STEPHANIE                   ; $2d
-	const MURRAY1                     ; $2e
-	const JOSEPH                      ; $2f
-	const DAVID                       ; $30
-	const ERIK                        ; $31
-	const RICK                        ; $32
-	const JOHN                        ; $33
-	const ADAM                        ; $34
-	const JONATHAN                    ; $35
-	const KEN                         ; $36
-	const COURTNEY                    ; $37
-	const STEVE                       ; $38
-	const JACK                        ; $39
-	const ROD                         ; $3a
-	const CLERK10                     ; $3b
-	const GIFT_CENTER_CLERK           ; $3c
-	const MAN1                        ; $3d
-	const WOMAN1                      ; $3e
-	const CHAP1                       ; $3f
-	const GAL1                        ; $40
-	const LASS1                       ; $41
-	const CHAP2                       ; $42
-	const LASS2                       ; $43
-	const PAPPY1                      ; $44
-	const LAD1                        ; $45
-	const LAD2                        ; $46
-	const CHAP3                       ; $47
-	const CLERK12                     ; $48
-	const CLERK13                     ; $49
-	const HOST                        ; $4a
-	const SPECS1                      ; $4b
-	const BUTCH                       ; $4c
-	const GRANNY1                     ; $4d
-	const LASS3                       ; $4e
-	const MAN2                        ; $4f
-	const PAPPY2                      ; $50
-	const LASS4                       ; $51
-	const HOOD1                       ; $52
-	const GRANNY2                     ; $53
-	const GAL2                        ; $54
-	const LAD3                        ; $55
-	const GAL3                        ; $56
-	const CHAP4                       ; $57
-	const MAN3                        ; $58
-	const SPECS2                      ; $59
-	const SPECS3                      ; $5a
-	const WOMAN2                      ; $5b
-	const MANIA                       ; $5c
-	const PAPPY3                      ; $5d
-	const GAL4                        ; $5e
-	const CHAMP                       ; $5f
-	const HOOD2                       ; $60
-	const LASS5                       ; $61
-	const CHAP5                       ; $62
-	const AARON                       ; $63
-	const GUIDE                       ; $64
-	const TECH7                       ; $65
-	const TECH8                       ; $66
-	const _11F18                      ; $67
-	const LEGEND_CARDS_TOP_LEFT       ; $68
-	const LEGEND_CARDS_TOP_RIGHT      ; $69
-	const LEGEND_CARDS_LEFT_SPARK     ; $6a
-	const LEGEND_CARDS_BOTTOM_LEFT    ; $6b
-	const LEGEND_CARDS_BOTTOM_RIGHT   ; $6c
-	const LEGEND_CARDS_RIGHT_SPARK    ; $6d
-	const _11F49                      ; $6e
-const_value = const_value+1 ; _11F49 duplicate
-	const MURRAY2                     ; $70
-	const RONALD2                     ; $71
-	const RONALD3                     ; $72
-const_value = const_value+1 ; _11f49 duplicate
+	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_MURRAY1                     ; $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_GIFT_CENTER_CLERK           ; $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_11F18                       ; $67
+	const NPC_LEGEND_CARDS_TOP_LEFT       ; $68
+	const NPC_LEGEND_CARDS_TOP_RIGHT      ; $69
+	const NPC_LEGEND_CARDS_LEFT_SPARK     ; $6a
+	const NPC_LEGEND_CARDS_BOTTOM_LEFT    ; $6b
+	const NPC_LEGEND_CARDS_BOTTOM_RIGHT   ; $6c
+	const NPC_LEGEND_CARDS_RIGHT_SPARK    ; $6d
+	const NPC_11F49                       ; $6e
+const_value = const_value+1 ; NPC_11F49 duplicate
+	const NPC_MURRAY2                     ; $70
+	const NPC_RONALD2                     ; $71
+	const NPC_RONALD3                     ; $72
+const_value = const_value+1 ; NPC_11f49 duplicate
 
diff --git a/src/data/level_objects.asm b/src/data/map_objects.asm
index 0756f7f..0756f7f 100644
--- a/src/data/level_objects.asm
+++ b/src/data/map_objects.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
 
diff --git a/src/data/npcs.asm b/src/data/npcs.asm
index 4e5ffe7..a8770fd 100644
--- a/src/data/npcs.asm
+++ b/src/data/npcs.asm
@@ -119,7 +119,7 @@ NPCDataTable:
 	dw Ronald3Data
 	dw Data_11f49
 DrMasonData:
-	db DRMASON
+	db NPC_DRMASON
 	db $02
 	db $00
 	db $26
@@ -131,7 +131,7 @@ DrMasonData:
 	db $00
 	db $00
 Ronald1Data:
-	db RONALD1
+	db NPC_RONALD1
 	db $01
 	db $04
 	db $0e
@@ -143,7 +143,7 @@ Ronald1Data:
 	db $0f
 	db $16
 Ronald2Data:
-	db RONALD2
+	db NPC_RONALD2
 	db $01
 	db $04
 	db $0e
@@ -155,7 +155,7 @@ Ronald2Data:
 	db $0f
 	db $16
 Ronald3Data:
-	db RONALD3
+	db NPC_RONALD3
 	db $01
 	db $04
 	db $0e
@@ -167,7 +167,7 @@ Ronald3Data:
 	db $0f
 	db $16
 IshiharaData:
-	db ISHIHARA
+	db NPC_ISHIHARA
 	db $03
 	db $04
 	db $22
@@ -179,7 +179,7 @@ IshiharaData:
 	db $00
 	db $00
 ImakuniData:
-	db IMAKUNI
+	db NPC_IMAKUNI
 	db $04
 	db $00
 	db $0e
@@ -191,7 +191,7 @@ ImakuniData:
 	db $10
 	db $15
 SamData:
-	db SAM
+	db NPC_SAM
 	db $18
 	db $00
 	db $0e
@@ -203,7 +203,7 @@ SamData:
 	db $02
 	db $15
 Tech1Data:
-	db TECH1
+	db NPC_TECH1
 	db $18
 	db $00
 	db $0e
@@ -215,7 +215,7 @@ Tech1Data:
 	db $00
 	db $00
 Tech2Data:
-	db TECH2
+	db NPC_TECH2
 	db $18
 	db $00
 	db $0e
@@ -227,7 +227,7 @@ Tech2Data:
 	db $00
 	db $00
 Tech3Data:
-	db TECH3
+	db NPC_TECH3
 	db $18
 	db $00
 	db $0e
@@ -239,7 +239,7 @@ Tech3Data:
 	db $00
 	db $00
 Tech4Data:
-	db TECH4
+	db NPC_TECH4
 	db $18
 	db $00
 	db $0e
@@ -251,7 +251,7 @@ Tech4Data:
 	db $00
 	db $00
 Tech5Data:
-	db TECH5
+	db NPC_TECH5
 	db $18
 	db $00
 	db $0e
@@ -263,7 +263,7 @@ Tech5Data:
 	db $00
 	db $00
 Tech6Data:
-	db TECH6
+	db NPC_TECH6
 	db $18
 	db $00
 	db $0e
@@ -275,7 +275,7 @@ Tech6Data:
 	db $00
 	db $00
 Clerk1Data:
-	db CLERK1
+	db NPC_CLERK1
 	db $21
 	db $0a
 	db $30
@@ -287,7 +287,7 @@ Clerk1Data:
 	db $00
 	db $00
 Clerk2Data:
-	db CLERK2
+	db NPC_CLERK2
 	db $21
 	db $0a
 	db $30
@@ -299,7 +299,7 @@ Clerk2Data:
 	db $00
 	db $00
 Clerk3Data:
-	db CLERK3
+	db NPC_CLERK3
 	db $21
 	db $0a
 	db $30
@@ -311,7 +311,7 @@ Clerk3Data:
 	db $00
 	db $00
 Clerk4Data:
-	db CLERK4
+	db NPC_CLERK4
 	db $21
 	db $0a
 	db $30
@@ -323,7 +323,7 @@ Clerk4Data:
 	db $00
 	db $00
 Clerk5Data:
-	db CLERK5
+	db NPC_CLERK5
 	db $21
 	db $0a
 	db $30
@@ -335,7 +335,7 @@ Clerk5Data:
 	db $00
 	db $00
 Clerk6Data:
-	db CLERK6
+	db NPC_CLERK6
 	db $21
 	db $0a
 	db $30
@@ -347,7 +347,7 @@ Clerk6Data:
 	db $00
 	db $00
 Clerk7Data:
-	db CLERK7
+	db NPC_CLERK7
 	db $21
 	db $0a
 	db $30
@@ -359,7 +359,7 @@ Clerk7Data:
 	db $00
 	db $00
 Clerk8Data:
-	db CLERK8
+	db NPC_CLERK8
 	db $21
 	db $0a
 	db $30
@@ -371,7 +371,7 @@ Clerk8Data:
 	db $00
 	db $00
 Clerk9Data:
-	db CLERK9
+	db NPC_CLERK9
 	db $21
 	db $0a
 	db $30
@@ -383,7 +383,7 @@ Clerk9Data:
 	db $00
 	db $00
 ChrisData:
-	db CHRIS
+	db NPC_CHRIS
 	db $15
 	db $00
 	db $26
@@ -395,7 +395,7 @@ ChrisData:
 	db $03
 	db $15
 MichaelData:
-	db MICHAEL
+	db NPC_MICHAEL
 	db $15
 	db $00
 	db $26
@@ -407,7 +407,7 @@ MichaelData:
 	db $03
 	db $15
 JessicaData:
-	db JESSICA
+	db NPC_JESSICA
 	db $1f
 	db $04
 	db $1a
@@ -419,7 +419,7 @@ JessicaData:
 	db $03
 	db $15
 MitchData:
-	db MITCH
+	db NPC_MITCH
 	db $0a
 	db $00
 	db $0e
@@ -431,7 +431,7 @@ MitchData:
 	db $03
 	db $16
 MatthewData:
-	db MATTHEW
+	db NPC_MATTHEW
 	db $15
 	db $00
 	db $16
@@ -443,7 +443,7 @@ MatthewData:
 	db $03
 	db $15
 RyanData:
-	db RYAN
+	db NPC_RYAN
 	db $11
 	db $00
 	db $26
@@ -455,7 +455,7 @@ RyanData:
 	db $03
 	db $15
 AndrewData:
-	db ANDREW
+	db NPC_ANDREW
 	db $1a
 	db $00
 	db $16
@@ -467,7 +467,7 @@ AndrewData:
 	db $03
 	db $15
 GeneData:
-	db GENE
+	db NPC_GENE
 	db $0b
 	db $04
 	db $1e
@@ -479,7 +479,7 @@ GeneData:
 	db $03
 	db $16
 SaraData:
-	db SARA
+	db NPC_SARA
 	db $20
 	db $00
 	db $0e
@@ -491,7 +491,7 @@ SaraData:
 	db $03
 	db $15
 AmandaData:
-	db AMANDA
+	db NPC_AMANDA
 	db $20
 	db $00
 	db $16
@@ -503,7 +503,7 @@ AmandaData:
 	db $03
 	db $15
 JoshuaData:
-	db JOSHUA
+	db NPC_JOSHUA
 	db $16
 	db $00
 	db $26
@@ -515,7 +515,7 @@ JoshuaData:
 	db $03
 	db $15
 AmyData:
-	db AMY
+	db NPC_AMY
 	db $08
 	db $08
 	db $2e
@@ -527,7 +527,7 @@ AmyData:
 	db $03
 	db $16
 JenniferData:
-	db JENNIFER
+	db NPC_JENNIFER
 	db $1c
 	db $04
 	db $0e
@@ -539,7 +539,7 @@ JenniferData:
 	db $03
 	db $15
 NicholasData:
-	db NICHOLAS
+	db NPC_NICHOLAS
 	db $17
 	db $04
 	db $1e
@@ -551,7 +551,7 @@ NicholasData:
 	db $03
 	db $15
 BrandonData:
-	db BRANDON
+	db NPC_BRANDON
 	db $17
 	db $04
 	db $1e
@@ -563,7 +563,7 @@ BrandonData:
 	db $03
 	db $15
 IsaacData:
-	db ISAAC
+	db NPC_ISAAC
 	db $09
 	db $00
 	db $16
@@ -575,7 +575,7 @@ IsaacData:
 	db $03
 	db $16
 BrittanyData:
-	db BRITTANY
+	db NPC_BRITTANY
 	db $1c
 	db $04
 	db $0e
@@ -587,7 +587,7 @@ BrittanyData:
 	db $03
 	db $15
 KristinData:
-	db KRISTIN
+	db NPC_KRISTIN
 	db $1e
 	db $00
 	db $1e
@@ -599,7 +599,7 @@ KristinData:
 	db $03
 	db $15
 HeatherData:
-	db HEATHER
+	db NPC_HEATHER
 	db $1d
 	db $04
 	db $22
@@ -611,7 +611,7 @@ HeatherData:
 	db $03
 	db $15
 NikkiData:
-	db NIKKI
+	db NPC_NIKKI
 	db $05
 	db $00
 	db $1a
@@ -623,7 +623,7 @@ NikkiData:
 	db $03
 	db $16
 RobertData:
-	db ROBERT
+	db NPC_ROBERT
 	db $11
 	db $04
 	db $16
@@ -635,7 +635,7 @@ RobertData:
 	db $03
 	db $15
 DanielData:
-	db DANIEL
+	db NPC_DANIEL
 	db $12
 	db $04
 	db $1a
@@ -647,7 +647,7 @@ DanielData:
 	db $03
 	db $15
 StephanieData:
-	db STEPHANIE
+	db NPC_STEPHANIE
 	db $1c
 	db $04
 	db $0e
@@ -659,7 +659,7 @@ StephanieData:
 	db $03
 	db $15
 Murray1Data:
-	db MURRAY1
+	db NPC_MURRAY1
 	db $0c
 	db $00
 	db $12
@@ -671,7 +671,7 @@ Murray1Data:
 	db $03
 	db $16
 Murray2Data:
-	db MURRAY2
+	db NPC_MURRAY2
 	db $0c
 	db $03
 	db $15
@@ -683,7 +683,7 @@ Murray2Data:
 	db $03
 	db $16
 JosephData:
-	db JOSEPH
+	db NPC_JOSEPH
 	db $18
 	db $00
 	db $0e
@@ -695,7 +695,7 @@ JosephData:
 	db $03
 	db $15
 DavidData:
-	db DAVID
+	db NPC_DAVID
 	db $18
 	db $00
 	db $0e
@@ -707,7 +707,7 @@ DavidData:
 	db $03
 	db $15
 ErikData:
-	db ERIK
+	db NPC_ERIK
 	db $18
 	db $00
 	db $0e
@@ -719,7 +719,7 @@ ErikData:
 	db $03
 	db $15
 RickData:
-	db RICK
+	db NPC_RICK
 	db $06
 	db $00
 	db $0e
@@ -731,7 +731,7 @@ RickData:
 	db $03
 	db $16
 JohnData:
-	db JOHN
+	db NPC_JOHN
 	db $12
 	db $04
 	db $1a
@@ -743,7 +743,7 @@ JohnData:
 	db $03
 	db $15
 AdamData:
-	db ADAM
+	db NPC_ADAM
 	db $13
 	db $00
 	db $22
@@ -755,7 +755,7 @@ AdamData:
 	db $03
 	db $15
 JonathanData:
-	db JONATHAN
+	db NPC_JONATHAN
 	db $11
 	db $04
 	db $16
@@ -767,7 +767,7 @@ JonathanData:
 	db $03
 	db $15
 KenData:
-	db KEN
+	db NPC_KEN
 	db $07
 	db $04
 	db $1e
@@ -779,7 +779,7 @@ KenData:
 	db $03
 	db $16
 CourtneyData:
-	db COURTNEY
+	db NPC_COURTNEY
 	db $0d
 	db $00
 	db $12
@@ -791,7 +791,7 @@ CourtneyData:
 	db $04
 	db $17
 SteveData:
-	db STEVE
+	db NPC_STEVE
 	db $0e
 	db $00
 	db $2a
@@ -803,7 +803,7 @@ SteveData:
 	db $04
 	db $17
 JackData:
-	db JACK
+	db NPC_JACK
 	db $0f
 	db $00
 	db $26
@@ -815,7 +815,7 @@ JackData:
 	db $04
 	db $17
 RodData:
-	db ROD
+	db NPC_ROD
 	db $10
 	db $00
 	db $0e
@@ -827,7 +827,7 @@ RodData:
 	db $04
 	db $17
 Clerk10Data:
-	db CLERK10
+	db NPC_CLERK10
 	db $21
 	db $0a
 	db $30
@@ -839,7 +839,7 @@ Clerk10Data:
 	db $00
 	db $00
 GiftCenterClerkData:
-	db GIFT_CENTER_CLERK
+	db NPC_GIFT_CENTER_CLERK
 	db $21
 	db $0a
 	db $30
@@ -851,7 +851,7 @@ GiftCenterClerkData:
 	db $00
 	db $00
 Man1Data:
-	db MAN1
+	db NPC_MAN1
 	db $1a
 	db $00
 	db $16
@@ -863,7 +863,7 @@ Man1Data:
 	db $00
 	db $00
 Woman1Data:
-	db WOMAN1
+	db NPC_WOMAN1
 	db $23
 	db $04
 	db $1e
@@ -875,7 +875,7 @@ Woman1Data:
 	db $00
 	db $00
 Chap1Data:
-	db CHAP1
+	db NPC_CHAP1
 	db $19
 	db $00
 	db $1a
@@ -887,7 +887,7 @@ Chap1Data:
 	db $00
 	db $00
 Gal1Data:
-	db GAL1
+	db NPC_GAL1
 	db $22
 	db $00
 	db $16
@@ -899,7 +899,7 @@ Gal1Data:
 	db $00
 	db $00
 Lass1Data:
-	db LASS1
+	db NPC_LASS1
 	db $1e
 	db $00
 	db $1e
@@ -911,7 +911,7 @@ Lass1Data:
 	db $00
 	db $00
 Chap2Data:
-	db CHAP2
+	db NPC_CHAP2
 	db $19
 	db $00
 	db $1a
@@ -923,7 +923,7 @@ Chap2Data:
 	db $00
 	db $00
 Lass2Data:
-	db LASS2
+	db NPC_LASS2
 	db $1e
 	db $00
 	db $1e
@@ -935,7 +935,7 @@ Lass2Data:
 	db $00
 	db $00
 Pappy1Data:
-	db PAPPY1
+	db NPC_PAPPY1
 	db $1b
 	db $00
 	db $22
@@ -947,7 +947,7 @@ Pappy1Data:
 	db $00
 	db $00
 Lad1Data:
-	db LAD1
+	db NPC_LAD1
 	db $12
 	db $04
 	db $1a
@@ -959,7 +959,7 @@ Lad1Data:
 	db $00
 	db $00
 Lad2Data:
-	db LAD2
+	db NPC_LAD2
 	db $11
 	db $04
 	db $16
@@ -971,7 +971,7 @@ Lad2Data:
 	db $00
 	db $00
 Chap3Data:
-	db CHAP3
+	db NPC_CHAP3
 	db $19
 	db $00
 	db $1a
@@ -983,7 +983,7 @@ Chap3Data:
 	db $00
 	db $00
 Clerk12Data:
-	db CLERK12
+	db NPC_CLERK12
 	db $22
 	db $00
 	db $16
@@ -995,7 +995,7 @@ Clerk12Data:
 	db $00
 	db $00
 Clerk13Data:
-	db CLERK13
+	db NPC_CLERK13
 	db $22
 	db $00
 	db $16
@@ -1007,7 +1007,7 @@ Clerk13Data:
 	db $00
 	db $00
 HostData:
-	db HOST
+	db NPC_HOST
 	db $22
 	db $00
 	db $16
@@ -1019,7 +1019,7 @@ HostData:
 	db $00
 	db $00
 Specs1Data:
-	db SPECS1
+	db NPC_SPECS1
 	db $13
 	db $00
 	db $22
@@ -1031,7 +1031,7 @@ Specs1Data:
 	db $00
 	db $00
 ButchData:
-	db BUTCH
+	db NPC_BUTCH
 	db $14
 	db $00
 	db $16
@@ -1043,7 +1043,7 @@ ButchData:
 	db $00
 	db $00
 Granny1Data:
-	db GRANNY1
+	db NPC_GRANNY1
 	db $24
 	db $00
 	db $16
@@ -1055,7 +1055,7 @@ Granny1Data:
 	db $00
 	db $00
 Lass3Data:
-	db LASS3
+	db NPC_LASS3
 	db $1d
 	db $04
 	db $22
@@ -1067,7 +1067,7 @@ Lass3Data:
 	db $00
 	db $00
 Man2Data:
-	db MAN2
+	db NPC_MAN2
 	db $1a
 	db $00
 	db $16
@@ -1079,7 +1079,7 @@ Man2Data:
 	db $00
 	db $00
 Pappy2Data:
-	db PAPPY2
+	db NPC_PAPPY2
 	db $1b
 	db $00
 	db $22
@@ -1091,7 +1091,7 @@ Pappy2Data:
 	db $00
 	db $00
 Lass4Data:
-	db LASS4
+	db NPC_LASS4
 	db $1d
 	db $04
 	db $22
@@ -1103,7 +1103,7 @@ Lass4Data:
 	db $00
 	db $00
 Hood1Data:
-	db HOOD1
+	db NPC_HOOD1
 	db $17
 	db $04
 	db $1e
@@ -1115,7 +1115,7 @@ Hood1Data:
 	db $00
 	db $00
 Granny2Data:
-	db GRANNY2
+	db NPC_GRANNY2
 	db $24
 	db $00
 	db $16
@@ -1127,7 +1127,7 @@ Granny2Data:
 	db $00
 	db $00
 Gal2Data:
-	db GAL2
+	db NPC_GAL2
 	db $22
 	db $00
 	db $16
@@ -1139,7 +1139,7 @@ Gal2Data:
 	db $00
 	db $00
 Lad3Data:
-	db LAD3
+	db NPC_LAD3
 	db $12
 	db $04
 	db $1a
@@ -1151,7 +1151,7 @@ Lad3Data:
 	db $00
 	db $00
 Gal3Data:
-	db GAL3
+	db NPC_GAL3
 	db $22
 	db $00
 	db $16
@@ -1163,7 +1163,7 @@ Gal3Data:
 	db $00
 	db $00
 Chap4Data:
-	db CHAP4
+	db NPC_CHAP4
 	db $19
 	db $00
 	db $1a
@@ -1175,7 +1175,7 @@ Chap4Data:
 	db $00
 	db $00
 Man3Data:
-	db MAN3
+	db NPC_MAN3
 	db $1a
 	db $00
 	db $16
@@ -1187,7 +1187,7 @@ Man3Data:
 	db $00
 	db $00
 Specs2Data:
-	db SPECS2
+	db NPC_SPECS2
 	db $18
 	db $00
 	db $0e
@@ -1199,7 +1199,7 @@ Specs2Data:
 	db $00
 	db $00
 Specs3Data:
-	db SPECS3
+	db NPC_SPECS3
 	db $13
 	db $00
 	db $22
@@ -1211,7 +1211,7 @@ Specs3Data:
 	db $00
 	db $00
 Woman2Data:
-	db WOMAN2
+	db NPC_WOMAN2
 	db $23
 	db $04
 	db $1e
@@ -1223,7 +1223,7 @@ Woman2Data:
 	db $00
 	db $00
 ManiaData:
-	db MANIA
+	db NPC_MANIA
 	db $15
 	db $00
 	db $26
@@ -1235,7 +1235,7 @@ ManiaData:
 	db $00
 	db $00
 Pappy3Data:
-	db PAPPY3
+	db NPC_PAPPY3
 	db $1b
 	db $00
 	db $22
@@ -1247,7 +1247,7 @@ Pappy3Data:
 	db $00
 	db $00
 Gal4Data:
-	db GAL4
+	db NPC_GAL4
 	db $22
 	db $00
 	db $16
@@ -1259,7 +1259,7 @@ Gal4Data:
 	db $00
 	db $00
 ChampData:
-	db CHAMP
+	db NPC_CHAMP
 	db $15
 	db $00
 	db $26
@@ -1271,7 +1271,7 @@ ChampData:
 	db $00
 	db $00
 Hood2Data:
-	db HOOD2
+	db NPC_HOOD2
 	db $17
 	db $04
 	db $1e
@@ -1283,7 +1283,7 @@ Hood2Data:
 	db $00
 	db $00
 Lass5Data:
-	db LASS5
+	db NPC_LASS5
 	db $1f
 	db $04
 	db $1a
@@ -1295,7 +1295,7 @@ Lass5Data:
 	db $00
 	db $00
 Chap5Data:
-	db CHAP5
+	db NPC_CHAP5
 	db $19
 	db $00
 	db $1a
@@ -1307,7 +1307,7 @@ Chap5Data:
 	db $00
 	db $00
 AaronData:
-	db AARON
+	db NPC_AARON
 	db $18
 	db $00
 	db $0e
@@ -1319,7 +1319,7 @@ AaronData:
 	db $02
 	db $15
 GuideData:
-	db GUIDE
+	db NPC_GUIDE
 	db $1a
 	db $00
 	db $16
@@ -1331,7 +1331,7 @@ GuideData:
 	db $00
 	db $00
 Tech7Data:
-	db TECH7
+	db NPC_TECH7
 	db $18
 	db $00
 	db $0e
@@ -1343,7 +1343,7 @@ Tech7Data:
 	db $00
 	db $00
 Tech8Data:
-	db TECH8
+	db NPC_TECH8
 	db $18
 	db $00
 	db $0e
@@ -1355,49 +1355,49 @@ Tech8Data:
 	db $00
 	db $00
 Data_11f18:
-	db $67
+	db NPC_11F18
 	db $26
 	db $3a
 	db $3a
 	db $10
 	dw NoOverworldSequence ; Pointer to OWScript
 Data_11f1f:
-	db $68
+	db NPC_LEGEND_CARDS_TOP_LEFT
 	db $27
 	db $3b
 	db $41
 	db $50
 	dw NoOverworldSequence ; Pointer to OWScript
 Data_11f26:
-	db $69
+	db NPC_LEGEND_CARDS_TOP_RIGHT
 	db $27
 	db $3c
 	db $42
 	db $50
 	dw NoOverworldSequence ; Pointer to OWScript
 Data_11f2d:
-	db $6a
+	db NPC_LEGEND_CARDS_LEFT_SPARK
 	db $27
 	db $3d
 	db $43
 	db $50
 	dw NoOverworldSequence ; Pointer to OWScript
 Data_11f34:
-	db $6b
+	db NPC_LEGEND_CARDS_BOTTOM_LEFT
 	db $27
 	db $3e
 	db $44
 	db $50
 	dw NoOverworldSequence ; Pointer to OWScript
 Data_11f3b:
-	db $6c
+	db NPC_LEGEND_CARDS_BOTTOM_RIGHT
 	db $27
 	db $3f
 	db $45
 	db $50
 	dw NoOverworldSequence ; Pointer to OWScript
 Data_11f42:
-	db $6d
+	db NPC_LEGEND_CARDS_RIGHT_SPARK
 	db $27
 	db $40
 	db $46
diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm
index 31d8846..eef0d46 100644
--- a/src/engine/bank03.asm
+++ b/src/engine/bank03.asm
@@ -3164,8 +3164,8 @@ MasonLaboratoryAfterDuel: ; d53b (3:553b)
 	ret
 
 .after_duel_table
-	db SAM
-	db SAM
+	db NPC_SAM
+	db NPC_SAM
 	dw $568a
 	dw $569f
 	db $00
@@ -3174,7 +3174,7 @@ MasonLabLoadMap: ; d549 (3:5549)
 	get_flag_value EVENT_FLAG_3E
 	cp $03
 	ret nc
-	ld a, DRMASON
+	ld a, NPC_DRMASON
 	ld [wTempNPC], a
 	call FindLoadedNPC
 	ld bc, OWSequence_EnterLabFirstTime
@@ -3243,7 +3243,7 @@ OWSequence_EnterLabFirstTime: ; d753 (3:5753)
 	tx Text05e3
 	run_script OWScript_CloseAdvancedTextBox
 	run_script OWScript_SetNextNPCandOWSequence
-	db SAM
+	db NPC_SAM
 	dw OWSequence_d779
 	run_script OWScript_EndScriptLoop1
 	ret
@@ -3255,7 +3255,7 @@ OWSequence_d779: ; d779 (03:5779)
 	run_script OWScript_PrintTextString
 	tx Text05e4
 	run_script OWScript_SetDialogName
-	db DRMASON
+	db NPC_DRMASON
 	run_script OWScript_PrintTextString
 	tx Text05e5
 	run_script OWScript_CloseTextBox
@@ -3267,7 +3267,7 @@ OWSequence_d779: ; d779 (03:5779)
 	db $03
 	run_script OWScript_CloseAdvancedTextBox
 	run_script OWScript_SetNextNPCandOWSequence
-	db DRMASON
+	db NPC_DRMASON
 	dw OWSequence_d794
 	run_script OWScript_EndScriptLoop1
 	ret
@@ -3402,7 +3402,7 @@ OWSequence_d794: ; d794 (3:5794)
 	db $01
 	run_script OWScript_CloseAdvancedTextBox
 	run_script OWScript_SetNextNPCandOWSequence
-	db SAM
+	db NPC_SAM
 	dw OWSequence_d827
 	run_script OWScript_EndScriptLoop1
 	ret
@@ -3760,8 +3760,8 @@ FightingClubLobbyAfterDuel: ; dc68 (3:5c68)
 	call FindEndOfBattleScript
 	ret
 .after_duel_table
-	db IMAKUNI
-	db IMAKUNI
+	db NPC_IMAKUNI
+	db NPC_IMAKUNI
 	dw OWSequence_BeatImakuni
 	dw OWSequence_LostToImakuni
 	db $00
@@ -4023,7 +4023,7 @@ WaterClubMovePlayer: ; e13f (3:613f)
 	get_flag_value EVENT_JOSHUA_STATE
 	cp $2
 	ret nc
-	ld a, JOSHUA
+	ld a, NPC_JOSHUA
 	ld [wTempNPC], a
 	ld bc, OWSequence_NotReadyToSeeAmy
 	jp SetNextNPCAndOWSequence
@@ -4034,23 +4034,23 @@ WaterClubAfterDuel: ;e157 (3:6157)
 	ret
 
 .after_duel_table
-	db SARA
-	db SARA
+	db NPC_SARA
+	db NPC_SARA
 	dw OWSequence_BeatSara
 	dw OWSequence_LostToSara
 
-	db AMANDA
-	db AMANDA
+	db NPC_AMANDA
+	db NPC_AMANDA
 	dw OWSequence_BeatAmanda
 	dw OWSequence_LostToAmanda
 
-	db JOSHUA
-	db JOSHUA
+	db NPC_JOSHUA
+	db NPC_JOSHUA
 	dw OWSequence_BeatJoshua
 	dw OWSequence_LostToJoshua
 
-	db AMY
-	db AMY
+	db NPC_AMY
+	db NPC_AMY
 	dw OWSequence_BeatAmy
 	dw OWSequence_LostToAmy
 	db $00
@@ -4339,7 +4339,7 @@ OWSequence_BeatJoshua: ; e26c (3:626c)
 	db $00
 	run_script OWScript_CloseAdvancedTextBox
 	run_script OWScript_SetNextNPCandOWSequence
-	db AMY
+	db NPC_AMY
 	dw OWSequence_MeetAmy
 	run_script OWScript_EndScriptLoop1
 	ret
@@ -4383,11 +4383,11 @@ OWSequence_MeetAmy: ; e2d1 (3:62d1)
 	run_script OWScript_PrintTextString
 	tx Text044b
 	run_script OWScript_SetDialogName
-	db JOSHUA
+	db NPC_JOSHUA
 	run_script OWScript_PrintTextString
 	tx Text044c
 	run_script OWScript_SetDialogName
-	db AMY
+	db NPC_AMY
 	run_script OWScript_PrintTextString
 	tx Text044d
 	run_script OWScript_CloseTextBox
@@ -4418,7 +4418,7 @@ OWSequence_MeetAmy: ; e2d1 (3:62d1)
 	db NORTH
 	db $01
 	run_script OWScript_MoveArbitraryNPC
-	db JOSHUA
+	db NPC_JOSHUA
 	dw NPCMovement_e2ab
 	run_script OWScript_PrintTextString
 	tx Text044e
@@ -4564,18 +4564,18 @@ FindEndOfBattleScript: ; e52c (3:652c)
 ; 0xe553
 
 GrassClubEntranceAfterDuelTable: ; e553 (3:6553)
-	db MICHAEL
-	db MICHAEL
+	db NPC_MICHAEL
+	db NPC_MICHAEL
 	dw $6597
 	dw $65ab
 
-	db RONALD2
-	db RONALD2
+	db NPC_RONALD2
+	db NPC_RONALD2
 	dw OWSequence_BeatFirstRonaldFight
 	dw OWSequence_LostToFirstRonaldFight
 
-	db RONALD3
-	db RONALD3
+	db NPC_RONALD3
+	db NPC_RONALD3
 	dw OWSequence_BeatSecondRonaldFight
 	dw OWSequence_LostToSecondRonaldFight
 	db $00
@@ -4588,8 +4588,8 @@ GrassClubLobbyAfterDuel: ; e5c4 (3:65c4)
 	ret
 
 .after_duel_table
-	db BRITTANY
-	db BRITTANY
+	db NPC_BRITTANY
+	db NPC_BRITTANY
 	dw OWSequence_BeatBrittany
 	dw OWSequence_LostToBrittany
 	db $00
@@ -4840,13 +4840,13 @@ ClubEntranceAfterDuel: ; e7f6 (3:67f6)
 	jp FindEndOfBattleScript
 
 .after_duel_table
-	db RONALD2
-	db RONALD2
+	db NPC_RONALD2
+	db NPC_RONALD2
 	dw OWSequence_BeatFirstRonaldFight
 	dw OWSequence_LostToFirstRonaldFight
 
-	db RONALD3
-	db RONALD3
+	db NPC_RONALD3
+	db NPC_RONALD3
 	dw OWSequence_BeatSecondRonaldFight
 	dw OWSequence_LostToSecondRonaldFight
 	db $00
@@ -4860,7 +4860,7 @@ LoadClubEntrance: ; e809 (3:6809)
 	ret
 
 TryFirstRonaldEncounter: ; e813 (3:6813)
-	ld a, RONALD1
+	ld a, NPC_RONALD1
 	ld [wTempNPC], a
 	call FindLoadedNPC
 	ret c
@@ -4868,7 +4868,7 @@ TryFirstRonaldEncounter: ; e813 (3:6813)
 	jp SetNextNPCAndOWSequence
 
 TryFirstRonaldFight: ; e822 (3:6822)
-	ld a, RONALD2
+	ld a, NPC_RONALD2
 	ld [$d3ab], a
 	call FindLoadedNPC
 	ret c
@@ -4879,7 +4879,7 @@ TryFirstRonaldFight: ; e822 (3:6822)
 	jp SetNextNPCAndOWSequence
 
 TrySecondRonaldFight: ; e837 (3:6837)
-	ld a, RONALD3
+	ld a, NPC_RONALD3
 	ld [$d3ab], a
 	call FindLoadedNPC
 	ret c
@@ -5484,7 +5484,7 @@ ChallengeHallAfterDuel: ; f239 (3:7239)
 	ld c, [hl]
 	inc hl
 	ld b, [hl]
-	ld a, HOST
+	ld a, NPC_HOST
 	ld [wTempNPC], a
 	jp SetNextNPCAndOWSequence
 
@@ -5496,7 +5496,7 @@ ChallengeHallLoadMap: ; f258 (3:7258)
 	get_flag_value EVENT_FLAG_47
 	or a
 	ret z
-	ld a, HOST
+	ld a, NPC_HOST
 	ld [wTempNPC], a
 	call FindLoadedNPC
 	ld bc, OWSequence_f433
@@ -5877,7 +5877,7 @@ LostAtChallengeHall: ; f392 (3:7392)
 .ows_f3e2
 	run_script OWScript_CloseAdvancedTextBox
 	run_script OWScript_SetNextNPCandOWSequence
-	db CLERK12
+	db NPC_CLERK12
 	dw OWSequence_f3e9
 	run_script OWScript_EndScriptLoop1
 	ret
@@ -5939,7 +5939,7 @@ OWJump_f410: ; f410 (4:7410)
 	run_script OWScript_PrintTextString
 	tx Text0539
 	run_script OWScript_SetDialogName
-	db RONALD1
+	db NPC_RONALD1
 	run_script OWScript_JumpIfFlagEqual
 	db EVENT_FLAG_44
 	db $03
@@ -5953,7 +5953,7 @@ OWJump_f410: ; f410 (4:7410)
 	tx Text053b
 .ows_f42e
 	run_script OWScript_SetDialogName
-	db HOST
+	db NPC_HOST
 	run_script OWScript_Jump
 	dw LostAtChallengeHall.ows_f3ae
 
@@ -6045,7 +6045,7 @@ WonAtChallengeHall; f441 (3:7441)
 	tx Text0542
 	tx Text0543
 	run_script OWScript_SetDialogName
-	db HOST
+	db NPC_HOST
 	run_script OWScript_CloseTextBox
 .ows_f4a1
 	run_script OWScript_PrintTextString
@@ -6144,7 +6144,7 @@ OWJump_f4db: ; f4db (3:74db)
 	tx Text054e
 	tx Text054f
 	run_script OWScript_SetDialogName
-	db HOST
+	db NPC_HOST
 	run_script OWScript_CloseTextBox
 	run_script OWScript_MoveWramNPC
 	dw NPCMovement_f4c9
@@ -6209,7 +6209,7 @@ OWJump_f4db: ; f4db (3:74db)
 .ows_f552
 	run_script OWScript_CloseAdvancedTextBox
 	run_script OWScript_SetNextNPCandOWSequence
-	db CLERK12
+	db NPC_CLERK12
 	dw OWSequence_f3e9
 	run_script OWScript_EndScriptLoop1
 	ret
@@ -6506,12 +6506,12 @@ Func_fcad: ; fcad (3:7cad)
 
 .ows_fcd5
 	run_script OWScript_MoveArbitraryNPC
-	db GIFT_CENTER_CLERK
+	db NPC_GIFT_CENTER_CLERK
 	dw NPCMovement_fce1
 	run_script OWScript_PrintTextString
 	tx Text06d6
 	run_script OWScript_MoveArbitraryNPC
-	db GIFT_CENTER_CLERK
+	db NPC_GIFT_CENTER_CLERK
 	dw NPCMovement_fce3
 	run_script OWScript_QuitScriptFully
 
diff --git a/src/engine/bank04.asm b/src/engine/bank04.asm
index 1eeffab..7be9960 100644
--- a/src/engine/bank04.asm
+++ b/src/engine/bank04.asm
@@ -1591,7 +1591,7 @@ Func_13485: ; 13485 (4:7485)
 	INCROM $134b1, $1372f
 
 INCLUDE "data/npc_map_data.asm"
-INCLUDE "data/level_objects.asm"
+INCLUDE "data/map_objects.asm"
 
 rept $119
 	db $ff
diff --git a/src/engine/bank07.asm b/src/engine/bank07.asm
index 48d2565..6bad8c9 100644
--- a/src/engine/bank07.asm
+++ b/src/engine/bank07.asm
@@ -194,11 +194,11 @@ Func_1c485: ; 1c485 (7:4485)
 	ret
 
 Func_1c4fa: ; 1c4fa (7:44fa)
-	cp RONALD1
+	cp NPC_RONALD1
 	jr z, .asm_1c508
-	cp RONALD2
+	cp NPC_RONALD2
 	jr z, .asm_1c508
-	cp RONALD3
+	cp NPC_RONALD3
 	jr z, .asm_1c508
 	or a
 	ret
diff --git a/src/engine/home.asm b/src/engine/home.asm
index 1ec17fb..094127e 100644
--- a/src/engine/home.asm
+++ b/src/engine/home.asm
@@ -11106,7 +11106,7 @@ HandleMoveModeAPress: ; 3a5e (0:3a5e)
 	ret
 .noMatch
 	pop hl
-	ld bc, LEVEL_OBJECT_SIZE - 1
+	ld bc, MAP_OBJECT_SIZE - 1
 	add hl, bc
 	pop bc
 	jr .findAPressMatchLoop