9 files changed, 449 insertions, 449 deletions

diff --git a/src/data/attack_animations.asm b/src/data/attack_animations.asm
index b8a3e77..d0bc93b 100644
--- a/src/data/attack_animations.asm
+++ b/src/data/attack_animations.asm
@@ -21,7 +21,7 @@ anim_end2: MACRO
 ENDM

 

 PointerTable_AttackAnimation:

-	dw $0000                               ; ATK_ANIM_NONE

+	dw NULL                                ; ATK_ANIM_NONE

 	dw AttackAnimation_Hit                 ; ATK_ANIM_HIT

 	dw AttackAnimation_BigHit              ; ATK_ANIM_BIG_HIT

 	dw AttackAnimation_Hit                 ; ATK_ANIM_3

diff --git a/src/data/booster_packs.asm b/src/data/booster_packs.asm
index 44a401f..51bb8c2 100644
--- a/src/data/booster_packs.asm
+++ b/src/data/booster_packs.asm
@@ -14,7 +14,7 @@ ENDM
 ; For the energy or energy generation function, there are three options:
 ; - Pointer to a function that generates energies (some generate one, some generate a full pack)
 ; - A single energy of a specific type
-; - $0000 if no card in the pack is an energy
+; - NULL if no card in the pack is an energy
 
 ; As for Card Type Chances, note that whenever one card of the 10 is drawn, the chances of
 ; the type of that card are reduced by the original average of all 8 types (capping the result at 1).
@@ -232,7 +232,7 @@ BoosterPack_EvolutionTrainer:: ; 1e580 (7:6580)
 
 BoosterPack_MysteryNeutral:: ; 1e58c (7:658c)
 	booster_set MYSTERY ; booster pack set
-	dw $0000 ; energy or energy generation function
+	dw NULL ; energy or energy generation function
 
 ; Card Type Chances
 	db 17 ; Grass Type Chance
@@ -247,7 +247,7 @@ BoosterPack_MysteryNeutral:: ; 1e58c (7:658c)
 
 BoosterPack_MysteryGrassColorless:: ; 1e598 (7:6598)
 	booster_set MYSTERY ; booster pack set
-	dw $0000 ; energy or energy generation function
+	dw NULL ; energy or energy generation function
 
 ; Card Type Chances
 	db 48 ; Grass Type Chance
@@ -262,7 +262,7 @@ BoosterPack_MysteryGrassColorless:: ; 1e598 (7:6598)
 
 BoosterPack_MysteryWaterColorless:: ; 1e5a4 (7:65a4)
 	booster_set MYSTERY ; booster pack set
-	dw $0000 ; energy or energy generation function
+	dw NULL ; energy or energy generation function
 
 ; Card Type Chances
 	db 12 ; Grass Type Chance
@@ -277,7 +277,7 @@ BoosterPack_MysteryWaterColorless:: ; 1e5a4 (7:65a4)
 
 BoosterPack_MysteryLightningColorless:: ; 1e5b0 (7:65b0)
 	booster_set MYSTERY ; booster pack set
-	dw $0000 ; energy or energy generation function
+	dw NULL ; energy or energy generation function
 
 ; Card Type Chances
 	db 12 ; Grass Type Chance
@@ -292,7 +292,7 @@ BoosterPack_MysteryLightningColorless:: ; 1e5b0 (7:65b0)
 
 BoosterPack_MysteryFightingColorless:: ; 1e5bc (7:65bc)
 	booster_set MYSTERY ; booster pack set
-	dw $0000 ; energy or energy generation function
+	dw NULL ; energy or energy generation function
 
 ; Card Type Chances
 	db 12 ; Grass Type Chance
@@ -307,7 +307,7 @@ BoosterPack_MysteryFightingColorless:: ; 1e5bc (7:65bc)
 
 BoosterPack_MysteryTrainerColorless:: ; 1e5c8 (7:65c8)
 	booster_set MYSTERY ; booster pack set
-	dw $0000 ; energy or energy generation function
+	dw NULL ; energy or energy generation function
 
 ; Card Type Chances
 	db 12 ; Grass Type Chance
@@ -322,7 +322,7 @@ BoosterPack_MysteryTrainerColorless:: ; 1e5c8 (7:65c8)
 
 BoosterPack_LaboratoryMostlyNeutral:: ; 1e5d4 (7:65d4)
 	booster_set LABORATORY ; booster pack set
-	dw $0000 ; energy or energy generation function
+	dw NULL ; energy or energy generation function
 
 ; Card Type Chances
 	db 20 ; Grass Type Chance
@@ -337,7 +337,7 @@ BoosterPack_LaboratoryMostlyNeutral:: ; 1e5d4 (7:65d4)
 
 BoosterPack_LaboratoryGrass:: ; 1e5e0 (7:65e0)
 	booster_set LABORATORY ; booster pack set
-	dw $0000 ; energy or energy generation function
+	dw NULL ; energy or energy generation function
 
 ; Card Type Chances
 	db 48 ; Grass Type Chance
@@ -352,7 +352,7 @@ BoosterPack_LaboratoryGrass:: ; 1e5e0 (7:65e0)
 
 BoosterPack_LaboratoryWater:: ; 1e5ec (7:65ec)
 	booster_set LABORATORY ; booster pack set
-	dw $0000 ; energy or energy generation function
+	dw NULL ; energy or energy generation function
 
 ; Card Type Chances
 	db 16 ; Grass Type Chance
@@ -367,7 +367,7 @@ BoosterPack_LaboratoryWater:: ; 1e5ec (7:65ec)
 
 BoosterPack_LaboratoryPsychic:: ; 1e5f8 (7:65f8)
 	booster_set LABORATORY ; booster pack set
-	dw $0000 ; energy or energy generation function
+	dw NULL ; energy or energy generation function
 
 ; Card Type Chances
 	db 16 ; Grass Type Chance
@@ -382,7 +382,7 @@ BoosterPack_LaboratoryPsychic:: ; 1e5f8 (7:65f8)
 
 BoosterPack_LaboratoryTrainer:: ; 1e604 (7:6604)
 	booster_set LABORATORY ; booster pack set
-	dw $0000 ; energy or energy generation function
+	dw NULL ; energy or energy generation function
 
 ; Card Type Chances
 	db 16 ; Grass Type Chance
diff --git a/src/data/cards.asm b/src/data/cards.asm
index a045188..9c1ae11 100644
--- a/src/data/cards.asm
+++ b/src/data/cards.asm
@@ -2,7 +2,7 @@
 ; convenience once the meaning of all fields is figured out.
 
 CardPointers: ; 30c5c (c:4c5c)
-	dw $0000
+	dw NULL
 	dw GrassEnergyCard
 	dw FireEnergyCard
 	dw WaterEnergyCard
@@ -231,7 +231,7 @@ CardPointers: ; 30c5c (c:4c5c)
 	dw PokemonFluteCard
 	dw GamblerCard
 	dw RecycleCard
-	dw $0000
+	dw NULL
 
 BulbasaurCard: ; 30e28 (c:4e28)
 	db TYPE_PKMN_GRASS ; type
diff --git a/src/data/decks.asm b/src/data/decks.asm
index 424874b..8b800f4 100644
--- a/src/data/decks.asm
+++ b/src/data/decks.asm
@@ -54,7 +54,7 @@ DeckPointers: ; 30000 (c:4000)
 	dw FlamethrowerDeck
 	dw ReshuffleDeck
 	dw ImakuniDeck
-	dw $0000
+	dw NULL
 
 UnnamedDeck: ; 30070 (c:4070)
 	db 20, PSYCHIC_ENERGY
diff --git a/src/data/map_objects.asm b/src/data/map_objects.asm
index 069b12d..046c20f 100644
--- a/src/data/map_objects.asm
+++ b/src/data/map_objects.asm
@@ -8,7 +8,7 @@ MasonLabObjects: ; 13b04 (3:7b04)
 	db NORTH, 18, 2
 	dw PrintInteractableObjectText
 	tx Text04a0
-	tx Text049f
+	tx WhatIsADeckText
 
 	db NORTH, 20, 2
 	dw PrintInteractableObjectText
@@ -42,8 +42,8 @@ MasonLabObjects: ; 13b04 (3:7b04)
 
 	db NORTH, 2, 2
 	dw PC_c7ea
-	tx Text041b
-	tx Text041a
+	tx PlaceholderMessageText
+	tx PokemonTradingCards101Text
 
 	db $ff
 
@@ -51,103 +51,103 @@ MasonLabObjects: ; 13b04 (3:7b04)
 DeckMachineRoomObjects: ; 13b4d (3:7b4d)
 	db NORTH, 2, 2
 	dw Script_d932
-	tx Text041b
-	tx Text041a
+	tx PlaceholderMessageText
+	tx PokemonTradingCards101Text
 
 	db NORTH, 4, 2
 	dw Script_d932
-	tx Text041b
-	tx Text041a
+	tx PlaceholderMessageText
+	tx PokemonTradingCards101Text
 
 	db NORTH, 6, 2
-	dw $593f
-	tx Text041b
-	tx Text041a
+	dw Script_d93f
+	tx PlaceholderMessageText
+	tx PokemonTradingCards101Text
 
 	db NORTH, 8, 2
-	dw $593f
-	tx Text041b
-	tx Text041a
+	dw Script_d93f
+	tx PlaceholderMessageText
+	tx PokemonTradingCards101Text
 
 	db NORTH, 10, 2
-	dw $5995
-	tx Text041b
-	tx Text041a
+	dw Script_d995
+	tx PlaceholderMessageText
+	tx PokemonTradingCards101Text
 
 	db NORTH, 12, 2
-	dw $5995
-	tx Text041b
-	tx Text041a
+	dw Script_d995
+	tx PlaceholderMessageText
+	tx PokemonTradingCards101Text
 
 	db NORTH, 14, 2
-	dw $59c2
-	tx Text041b
-	tx Text041a
+	dw Script_d9c2
+	tx PlaceholderMessageText
+	tx PokemonTradingCards101Text
 
 	db NORTH, 16, 2
-	dw $59c2
-	tx Text041b
-	tx Text041a
+	dw Script_d9c2
+	tx PlaceholderMessageText
+	tx PokemonTradingCards101Text
 
 	db NORTH, 18, 2
-	dw $59ef
-	tx Text041b
-	tx Text041a
+	dw Script_d9ef
+	tx PlaceholderMessageText
+	tx PokemonTradingCards101Text
 
 	db NORTH, 20, 2
-	dw $59ef
-	tx Text041b
-	tx Text041a
+	dw Script_d9ef
+	tx PlaceholderMessageText
+	tx PokemonTradingCards101Text
 
 	db NORTH, 14, 10
-	dw $5a1c
-	tx Text041b
-	tx Text041a
+	dw Script_da1c
+	tx PlaceholderMessageText
+	tx PokemonTradingCards101Text
 
 	db NORTH, 16, 10
-	dw $5a1c
-	tx Text041b
-	tx Text041a
+	dw Script_da1c
+	tx PlaceholderMessageText
+	tx PokemonTradingCards101Text
 
 	db NORTH, 18, 10
-	dw $5a49
-	tx Text041b
-	tx Text041a
+	dw Script_da49
+	tx PlaceholderMessageText
+	tx PokemonTradingCards101Text
 
 	db NORTH, 20, 10
-	dw $5a49
-	tx Text041b
-	tx Text041a
+	dw Script_da49
+	tx PlaceholderMessageText
+	tx PokemonTradingCards101Text
 
 	db NORTH, 14, 18
-	dw $5a76
-	tx Text041b
-	tx Text041a
+	dw Script_da76
+	tx PlaceholderMessageText
+	tx PokemonTradingCards101Text
 
 	db NORTH, 16, 18
-	dw $5a76
-	tx Text041b
-	tx Text041a
+	dw Script_da76
+	tx PlaceholderMessageText
+	tx PokemonTradingCards101Text
 
 	db NORTH, 18, 18
-	dw $5aa3
-	tx Text041b
-	tx Text041a
+	dw Script_daa3
+	tx PlaceholderMessageText
+	tx PokemonTradingCards101Text
 
 	db NORTH, 20, 18
-	dw $5aa3
-	tx Text041b
-	tx Text041a
+	dw Script_daa3
+	tx PlaceholderMessageText
+	tx PokemonTradingCards101Text
 
 	db NORTH, 2, 18
-	dw $5ad0
-	tx Text041b
-	tx Text041a
+	dw Script_dad0
+	tx PlaceholderMessageText
+	tx PokemonTradingCards101Text
 
 	db NORTH, 4, 18
-	dw $5ad0
-	tx Text041b
-	tx Text041a
+	dw Script_dad0
+	tx PlaceholderMessageText
+	tx PokemonTradingCards101Text
 
 	db $ff
 
@@ -234,17 +234,17 @@ FightingClubLobbyObjects: ; 13c6f (3:7c6f)
 
 	db NORTH, 2, 8
 	dw PC_c7ea
-	tx Text041b
-	tx Text041a
+	tx PlaceholderMessageText
+	tx PokemonTradingCards101Text
 
 	db NORTH, 6, 6
 	dw Script_fc52
-	tx Text041b
+	tx PlaceholderMessageText
 	tx ClerkNPCName
 
 	db NORTH, 10, 6
 	dw Func_fc7a
-	tx Text041b
+	tx PlaceholderMessageText
 	tx ClerkNPCName
 
 	db $ff
@@ -268,17 +268,17 @@ RockClubLobbyObjects: ; 13ca6 (3:7ca6)
 
 	db NORTH, 2, 8
 	dw PC_c7ea
-	tx Text041b
-	tx Text041a
+	tx PlaceholderMessageText
+	tx PokemonTradingCards101Text
 
 	db NORTH, 6, 6
 	dw Script_fc52
-	tx Text041b
+	tx PlaceholderMessageText
 	tx ClerkNPCName
 
 	db NORTH, 10, 6
 	dw Func_fc7a
-	tx Text041b
+	tx PlaceholderMessageText
 	tx ClerkNPCName
 
 	db $ff
@@ -302,17 +302,17 @@ WaterClubLobbyObjects: ; 13cdd (3:7cdd)
 
 	db NORTH, 2, 8
 	dw PC_c7ea
-	tx Text041b
-	tx Text041a
+	tx PlaceholderMessageText
+	tx PokemonTradingCards101Text
 
 	db NORTH, 6, 6
 	dw Script_fc52
-	tx Text041b
+	tx PlaceholderMessageText
 	tx ClerkNPCName
 
 	db NORTH, 10, 6
 	dw Func_fc7a
-	tx Text041b
+	tx PlaceholderMessageText
 	tx ClerkNPCName
 
 	db $ff
@@ -336,17 +336,17 @@ LightningClubLobbyObjects: ; 13d14 (3:7d14)
 
 	db NORTH, 2, 8
 	dw PC_c7ea
-	tx Text041b
-	tx Text041a
+	tx PlaceholderMessageText
+	tx PokemonTradingCards101Text
 
 	db NORTH, 6, 6
 	dw Script_fc52
-	tx Text041b
+	tx PlaceholderMessageText
 	tx ClerkNPCName
 
 	db NORTH, 10, 6
 	dw Func_fc7a
-	tx Text041b
+	tx PlaceholderMessageText
 	tx ClerkNPCName
 
 	db $ff
@@ -370,17 +370,17 @@ GrassClubLobbyObjects: ; 13d4b (3:7d4b)
 
 	db NORTH, 2, 8
 	dw PC_c7ea
-	tx Text041b
-	tx Text041a
+	tx PlaceholderMessageText
+	tx PokemonTradingCards101Text
 
 	db NORTH, 6, 6
 	dw Script_fc52
-	tx Text041b
+	tx PlaceholderMessageText
 	tx ClerkNPCName
 
 	db NORTH, 10, 6
 	dw Func_fc7a
-	tx Text041b
+	tx PlaceholderMessageText
 	tx ClerkNPCName
 
 	db $ff
@@ -404,17 +404,17 @@ PsychicClubLobbyObjects: ; 13d82 (3:7d82)
 
 	db NORTH, 2, 8
 	dw PC_c7ea
-	tx Text041b
-	tx Text041a
+	tx PlaceholderMessageText
+	tx PokemonTradingCards101Text
 
 	db NORTH, 6, 6
 	dw Script_fc52
-	tx Text041b
+	tx PlaceholderMessageText
 	tx ClerkNPCName
 
 	db NORTH, 10, 6
 	dw Func_fc7a
-	tx Text041b
+	tx PlaceholderMessageText
 	tx ClerkNPCName
 
 	db $ff
@@ -438,17 +438,17 @@ ScienceClubLobbyObjects: ; 13db9 (3:7db9)
 
 	db NORTH, 2, 8
 	dw PC_c7ea
-	tx Text041b
-	tx Text041a
+	tx PlaceholderMessageText
+	tx PokemonTradingCards101Text
 
 	db NORTH, 6, 6
 	dw Script_fc52
-	tx Text041b
+	tx PlaceholderMessageText
 	tx ClerkNPCName
 
 	db NORTH, 10, 6
 	dw Func_fc7a
-	tx Text041b
+	tx PlaceholderMessageText
 	tx ClerkNPCName
 
 	db $ff
@@ -472,17 +472,17 @@ FireClubLobbyObjects: ; 13df0 (3:7df0)
 
 	db NORTH, 2, 8
 	dw PC_c7ea
-	tx Text041b
-	tx Text041a
+	tx PlaceholderMessageText
+	tx PokemonTradingCards101Text
 
 	db NORTH, 6, 6
 	dw Script_fc52
-	tx Text041b
+	tx PlaceholderMessageText
 	tx ClerkNPCName
 
 	db NORTH, 10, 6
 	dw Func_fc7a
-	tx Text041b
+	tx PlaceholderMessageText
 	tx ClerkNPCName
 
 	db $ff
@@ -506,17 +506,17 @@ ChallengeHallLobbyObjects: ; 13e27 (3:7e27)
 
 	db NORTH, 2, 8
 	dw PC_c7ea
-	tx Text041b
-	tx Text041a
+	tx PlaceholderMessageText
+	tx PokemonTradingCards101Text
 
 	db NORTH, 6, 6
 	dw Script_fc52
-	tx Text041b
+	tx PlaceholderMessageText
 	tx ClerkNPCName
 
 	db NORTH, 10, 6
 	dw Func_fc7a
-	tx Text041b
+	tx PlaceholderMessageText
 	tx ClerkNPCName
 
 	db $ff
@@ -564,19 +564,19 @@ PokemonDomeEntranceObjects: ; 13e5e (3:7e5e)
 	tx Text0507
 
 	db NORTH, 22, 0
-	dw $76af
+	dw Script_f6af
 	tx Text0558
 	tx Text0509
 
 	db NORTH, 24, 0
-	dw $76af
+	dw Script_f6af
 	tx Text0558
 	tx Text0509
 
 	db NORTH, 28, 2
 	dw PC_c7ea
-	tx Text041b
-	tx Text041a
+	tx PlaceholderMessageText
+	tx PokemonTradingCards101Text
 
 	db $ff
 
@@ -585,23 +585,23 @@ HallOfHonorObjects: ; 13ec2 (3:7ec2)
 	; Legendary Cards
 	db NORTH, 10, 10
 	dw Script_fbf1
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
 
 	; Legendary Cards
 	db NORTH, 12, 10
 	dw Script_fbf1
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
 
 	db NORTH, 10, 2
-	dw $7be1
-	tx Text041b
-	tx Text041a
+	dw Script_fbe1
+	tx PlaceholderMessageText
+	tx PokemonTradingCards101Text
 
 	db NORTH, 12, 2
-	dw $7be1
-	tx Text041b
-	tx Text041a
+	dw Script_fbe1
+	tx PlaceholderMessageText
+	tx PokemonTradingCards101Text
 
 	db $ff
diff --git a/src/data/map_scripts.asm b/src/data/map_scripts.asm
index 3084f8b..0ee337d 100644
--- a/src/data/map_scripts.asm
+++ b/src/data/map_scripts.asm
@@ -1,7 +1,7 @@
 ; each map has a maximum of 8 scripts
 ; scripts are referenced with ids [0,2,4,6,8,a,c,e]
 ; each script id is used for a specific event
-; if a script pointer is $0000, that map has no script for that event
+; if a script pointer is NULL, that map has no script for that event
 ; 0: NPC data
 ; 2: Called after every NPC is loaded (unused)
 ; 4: Interactable Objects
@@ -13,341 +13,341 @@
 
 MapScripts: ; 1162a (4:562a)
 ; OVERWORLD_MAP
-	dw $0000
-	dw $0000
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
+	dw NULL
+	dw NULL
 	dw LoadOverworld
-	dw $0000
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
+	dw NULL
 
 ; MASON_LABORATORY
 	dw MasonLabNPCS
-	dw $0000
+	dw NULL
 	dw MasonLabObjects
 	dw MasonLabPressedA
 	dw MasonLabLoadMap
 	dw MasonLaboratoryAfterDuel
-	dw $0000
+	dw NULL
 	dw MasonLabCloseTextBox
 
 ; DECK_MACHINE_ROOM
 	dw DeckMachineRoomNPCS
-	dw $0000
+	dw NULL
 	dw DeckMachineRoomObjects
-	dw $0000
-	dw $0000
-	dw $589f
-	dw $0000
-	dw $58ad
+	dw NULL
+	dw NULL
+	dw DeckMachineRoomAfterDuel
+	dw NULL
+	dw DeckMachineRoomCloseTextBox
 
 ; ISHIHARAS_HOUSE
 	dw IshiharasHouseNPCS
-	dw $0000
+	dw NULL
 	dw IshiharasHouseObjects
-	dw $0000
-	dw $0000
-	dw $0000
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
+	dw NULL
+	dw NULL
+	dw NULL
 
 ; FIGHTING_CLUB_ENTRANCE
 	dw FightingClubEntranceNPCS
-	dw $0000
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
+	dw NULL
 	dw LoadClubEntrance
 	dw ClubEntranceAfterDuel
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
 
 ; FIGHTING_CLUB_LOBBY
 	dw FightingClubLobbyNPCS
-	dw $0000
+	dw NULL
 	dw FightingClubLobbyObjects
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
 	dw FightingClubLobbyAfterDuel
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
 
 ; FIGHTING_CLUB
 	dw FightingClubNPCS
-	dw $0000
-	dw $0000
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
+	dw NULL
+	dw NULL
 	dw FightingClubAfterDuel
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
 
 ; ROCK_CLUB_ENTRANCE
 	dw RockClubEntranceNPCS
-	dw $0000
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
+	dw NULL
 	dw LoadClubEntrance
 	dw ClubEntranceAfterDuel
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
 
 ; ROCK_CLUB_LOBBY
 	dw RockClubLobbyNPCS
-	dw $0000
+	dw NULL
 	dw RockClubLobbyObjects
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
 	dw RockClubLobbyAfterDuel
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
 
 ; ROCK_CLUB
 	dw RockClubNPCS
-	dw $0000
-	dw $0000
-	dw $0000
-	dw $0000
-	dw $5fd6
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
+	dw NULL
+	dw NULL
+	dw RockClubAfterDuel
+	dw NULL
+	dw NULL
 
 ; WATER_CLUB_ENTRANCE
 	dw WaterClubEntranceNPCS
-	dw $0000
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
+	dw NULL
 	dw LoadClubEntrance
 	dw ClubEntranceAfterDuel
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
 
 ; WATER_CLUB_LOBBY
 	dw WaterClubLobbyNPCS
-	dw $0000
+	dw NULL
 	dw WaterClubLobbyObjects
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
 	dw WaterClubLobbyAfterDuel
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
 
 ; WATER_CLUB
 	dw WaterClubNPCS
-	dw $0000
-	dw $0000
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
+	dw NULL
+	dw NULL
 	dw WaterClubAfterDuel
 	dw WaterClubMovePlayer
-	dw $0000
+	dw NULL
 
 ; LIGHTNING_CLUB_ENTRANCE
 	dw LightningClubEntranceNPCS
-	dw $0000
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
+	dw NULL
 	dw LoadClubEntrance
 	dw ClubEntranceAfterDuel
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
 
 ; LIGHTNING_CLUB_LOBBY
 	dw LightningClubLobbyNPCS
-	dw $0000
+	dw NULL
 	dw LightningClubLobbyObjects
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
 	dw LightningClubLobbyAfterDuel
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
 
 ; LIGHTNING_CLUB
 	dw LightningClubNPCS
-	dw $0000
-	dw $0000
-	dw $0000
-	dw $0000
-	dw $63e8
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
+	dw NULL
+	dw NULL
+	dw LightningClubAfterDuel
+	dw NULL
+	dw NULL
 
 ; GRASS_CLUB_ENTRANCE
 	dw GrassClubEntranceNPCS
-	dw $0000
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
+	dw NULL
 	dw LoadClubEntrance
 	dw GrassClubEntranceAfterDuel
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
 
 ; GRASS_CLUB_LOBBY
 	dw GrassClubLobbyNPCS
-	dw $0000
+	dw NULL
 	dw GrassClubLobbyObjects
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
 	dw GrassClubLobbyAfterDuel
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
 
 ; GRASS_CLUB
 	dw GrassClubNPCS
-	dw $0000
-	dw $0000
-	dw $0000
-	dw $0000
-	dw $66e7
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
+	dw NULL
+	dw NULL
+	dw GrassClubAfterDuel
+	dw NULL
+	dw NULL
 
 ; PSYCHIC_CLUB_ENTRANCE
 	dw PsychicClubEntranceNPCS
-	dw $0000
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
+	dw NULL
 	dw LoadClubEntrance
 	dw ClubEntranceAfterDuel
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
 
 ; PSYCHIC_CLUB_LOBBY
 	dw PsychicClubLobbyNPCS
-	dw $0000
+	dw NULL
 	dw PsychicClubLobbyObjects
-	dw $0000
-	dw $6971
+	dw NULL
+	dw PsychicClubLobbyLoadMap
 	dw PsychicClubLobbyAfterDuel
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
 
 ; PSYCHIC_CLUB
 	dw PsychicClubNPCS
-	dw $0000
-	dw $0000
-	dw $0000
-	dw $0000
-	dw $6a46
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
+	dw NULL
+	dw NULL
+	dw PsychicClubAfterDuel
+	dw NULL
+	dw NULL
 
 ; SCIENCE_CLUB_ENTRANCE
 	dw ScienceClubEntranceNPCS
-	dw $0000
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
+	dw NULL
 	dw LoadClubEntrance
 	dw ClubEntranceAfterDuel
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
 
 ; SCIENCE_CLUB_LOBBY
 	dw ScienceClubLobbyNPCS
-	dw $0000
+	dw NULL
 	dw ScienceClubLobbyObjects
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
 	dw ScienceClubLobbyAfterDuel
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
 
 ; SCIENCE_CLUB
 	dw ScienceClubNPCS
-	dw $0000
-	dw $0000
-	dw $0000
-	dw $0000
-	dw $6bf1
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
+	dw NULL
+	dw NULL
+	dw ScienceClubAfterDuel
+	dw NULL
+	dw NULL
 
 ; FIRE_CLUB_ENTRANCE
 	dw FireClubEntranceNPCS
-	dw $0000
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
+	dw NULL
 	dw LoadClubEntrance
 	dw ClubEntranceAfterDuel
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
 
 ; FIRE_CLUB_LOBBY
 	dw FireClubLobbyNPCS
-	dw $0000
+	dw NULL
 	dw FireClubLobbyObjects
 	dw FireClubPressedA
-	dw $0000
+	dw NULL
 	dw FireClubLobbyAfterDuel
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
 
 ; FIRE_CLUB
 	dw FireClubNPCS
-	dw $0000
-	dw $0000
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
+	dw NULL
+	dw NULL
 	dw FireClubAfterDuel
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
 
 ; CHALLENGE_HALL_ENTRANCE
 	dw ChallengeHallEntranceNPCS
-	dw $0000
-	dw $0000
-	dw $0000
-	dw $0000
-	dw $0000
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
+	dw NULL
+	dw NULL
+	dw NULL
+	dw NULL
+	dw NULL
 
 ; CHALLENGE_HALL_LOBBY
 	dw ChallengeHallLobbyNPCS
-	dw $0000
+	dw NULL
 	dw ChallengeHallLobbyObjects
-	dw $0000
+	dw NULL
 	dw ChallengeHallLobbyLoadMap
-	dw $0000
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
+	dw NULL
 
 ; CHALLENGE_HALL
 	dw ChallengeHallNPCS
-	dw $0000
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
+	dw NULL
 	dw ChallengeHallLoadMap
 	dw ChallengeHallAfterDuel
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
 
 ; POKEMON_DOME_ENTRANCE
 	dw PokemonDomeEntranceNPCS
-	dw $0000
+	dw NULL
 	dw PokemonDomeEntranceObjects
-	dw $0000
-	dw $7607
-	dw $0000
-	dw $0000
-	dw $762a
+	dw NULL
+	dw PokemonDomeEntranceLoadMap
+	dw NULL
+	dw NULL
+	dw PokemonDomeEntranceCloseTextBox
 
 ; POKEMON_DOME
 	dw PokemonDomeNPCS
-	dw $0000
-	dw $0000
-	dw $0000
-	dw $7706
-	dw $76e0
-	dw $76c6
-	dw $7718
+	dw NULL
+	dw NULL
+	dw NULL
+	dw PokemonDomeLoadMap
+	dw PokemonDomeAfterDuel
+	dw PokemonDomeMovePlayer
+	dw PokemonDomeCloseTextBox
 
 ; HALL_OF_HONOR
 	dw HallOfHonorNPCS
-	dw $0000
+	dw NULL
 	dw HallOfHonorObjects
-	dw $0000
+	dw NULL
 	dw HallOfHonorLoadMap
-	dw $0000
-	dw $0000
-	dw $0000
+	dw NULL
+	dw NULL
+	dw NULL
diff --git a/src/data/npc_map_data.asm b/src/data/npc_map_data.asm
index 7c01e72..adcbee2 100644
--- a/src/data/npc_map_data.asm
+++ b/src/data/npc_map_data.asm
@@ -4,30 +4,30 @@
 ; pre-load function. (Resets c flag if NPC should not be loaded)
 MasonLabNPCS: ; 772f (4:1372f)
 	db NPC_DRMASON, $0e, $06, SOUTH
-	dw $5710
+	dw Preload_DrMason
 	db NPC_SAM, $04, $0e, EAST
-	dw $5604
+	dw Preload_Sam
 	db NPC_TECH1, $16, $08, WEST
-	dw $0000
+	dw NULL
 	db NPC_TECH2, $16, $14, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_TECH3, $16, $16, WEST
-	dw $0000
+	dw NULL
 	db NPC_TECH4, $0a, $16, EAST
-	dw $0000
+	dw NULL
 	db NPC_TECH5, $06, $04, SOUTH
-	dw $55eb
+	dw Preload_Tech5
 	db $00
 
 DeckMachineRoomNPCS: ; 775a (4:1375a)
 	db NPC_TECH6, $06, $08, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_TECH7, $06, $16, WEST
-	dw $0000
+	dw NULL
 	db NPC_TECH8, $0a, $12, WEST
-	dw $0000
+	dw NULL
 	db NPC_AARON, $0c, $0c, WEST
-	dw $0000
+	dw NULL
 	db $00
 
 IshiharasHouseNPCS: ; 7773 (4:13773)
@@ -41,308 +41,308 @@ IshiharasHouseNPCS: ; 7773 (4:13773)
 
 FightingClubEntranceNPCS: ; 7786 (4:13786)
 	db NPC_CLERK1, $06, $02, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_RONALD1, $08, $fe, SOUTH
-	dw $685b
+	dw Preload_Ronald1InClubEntrance
 	db NPC_RONALD2, $fe, $08, NORTH
-	dw $689a
+	dw Preload_Ronald2InClubEntrance
 	db NPC_RONALD3, $fe, $08, NORTH
-	dw $6915
+	dw Preload_Ronald3InClubEntrance
 	db $00
 
 FightingClubLobbyNPCS: ; 779f (4:1379f)
 	db NPC_MAN1, $0c, $0e, WEST
-	dw $0000
+	dw NULL
 	db NPC_IMAKUNI, $12, $02, NORTH
-	dw $5ceb
+	dw Preload_ImakuniInFightingClubLobby
 	db NPC_SPECS1, $12, $10, EAST
-	dw $0000
+	dw NULL
 	db NPC_BUTCH, $14, $10, WEST
-	dw $0000
+	dw NULL
 	db NPC_GRANNY1, $04, $10, WEST
-	dw $5d98
+	dw Preload_Granny1
 	db NPC_CLERK10, $06, $04, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH
 	dw Preload_GiftCenterClerk
 	db $00
 
 FightingClubNPCS: ; 77ca (4:137ca)
 	db NPC_CHRIS, $04, $08, SOUTH
-	dw $5e43
+	dw Preload_ChrisInFightingClub
 	db NPC_MICHAEL, $0e, $0a, SOUTH
-	dw $5e79
+	dw Preload_MichaelInFightingClub
 	db NPC_JESSICA, $12, $06, EAST
-	dw $5ea5
+	dw Preload_JessicaInFightingClub
 	db NPC_MITCH, $0a, $04, SOUTH
-	dw $0000
+	dw NULL
 	db $00
 
 RockClubEntranceNPCS: ; 77e3 (4:137e3)
 	db NPC_CLERK2, $06, $02, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_RONALD1, $08, $fe, SOUTH
-	dw $685b
+	dw Preload_Ronald1InClubEntrance
 	db NPC_RONALD2, $fe, $08, NORTH
-	dw $689a
+	dw Preload_Ronald2InClubEntrance
 	db NPC_RONALD3, $fe, $08, NORTH
-	dw $6915
+	dw Preload_Ronald3InClubEntrance
 	db $00
 
 RockClubLobbyNPCS: ; 77fc (4:137fc)
 	db NPC_CHRIS, $12, $08, WEST
-	dw $5ee9
+	dw Preload_ChrisInRockClubLobby
 	db NPC_MATTHEW, $06, $0e, EAST
-	dw $0000
+	dw NULL
 	db NPC_WOMAN1, $14, $12, NORTH
-	dw $0000
+	dw NULL
 	db NPC_CHAP1, $0e, $10, EAST
-	dw $0000
+	dw NULL
 	db NPC_LASS3, $10, $04, SOUTH
-	dw $5fcb
+	dw Preload_Lass3
 	db NPC_CLERK10, $06, $04, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH
 	dw Preload_GiftCenterClerk
 	db $00
 
 RockClubNPCS: ; 7827 (4:13827)
 	db NPC_RYAN, $14, $0e, EAST
-	dw $0000
+	dw NULL
 	db NPC_ANDREW, $06, $14, NORTH
-	dw $0000
+	dw NULL
 	db NPC_GENE, $0c, $06, NORTH
-	dw $0000
+	dw NULL
 	db $00
 
 WaterClubEntranceNPCS: ; 783a (4:1383a)
 	db NPC_CLERK3, $06, $02, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_RONALD1, $08, $fe, SOUTH
-	dw $685b
+	dw Preload_Ronald1InClubEntrance
 	db NPC_RONALD2, $fe, $08, NORTH
-	dw $689a
+	dw Preload_Ronald2InClubEntrance
 	db NPC_RONALD3, $fe, $08, NORTH
-	dw $6915
+	dw Preload_Ronald3InClubEntrance
 	db $00
 
 WaterClubLobbyNPCS: ; 7853 (4:13853)
 	db NPC_GAL1, $06, $0e, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_LASS1, $10, $0a, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_IMAKUNI, $12, $02, NORTH
 	dw Preload_ImakuniInWaterClubLobby
 	db NPC_MAN2, $04, $12, EAST
-	dw Preload_Man2InWaterClubLobby
+	dw Preload_Man2
 	db NPC_PAPPY2, $16, $10, NORTH
-	dw $0000
+	dw NULL
 	db NPC_CLERK10, $06, $04, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH
 	dw Preload_GiftCenterClerk
 	db $00
 
 WaterClubNPCS: ; 787e (4:1387e)
 	db NPC_SARA, $06, $12, EAST
-	dw $0000
+	dw NULL
 	db NPC_AMANDA, $16, $14, WEST
-	dw $0000
+	dw NULL
 	db NPC_JOSHUA, $16, $08, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_AMY, $16, $04, SOUTH
 	dw Preload_Amy
 	db $00
 
 LightningClubEntranceNPCS: ; 7897 (4:13897)
 	db NPC_CLERK4, $06, $02, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_RONALD1, $08, $fe, SOUTH
-	dw $685b
+	dw Preload_Ronald1InClubEntrance
 	db NPC_RONALD2, $fe, $08, NORTH
-	dw $689a
+	dw Preload_Ronald2InClubEntrance
 	db NPC_RONALD3, $fe, $08, NORTH
-	dw $6915
+	dw Preload_Ronald3InClubEntrance
 	db $00
 
 LightningClubLobbyNPCS: ; 78b0 (4:138b0)
 	db NPC_CHAP2, $12, $10, WEST
-	dw $0000
+	dw NULL
 	db NPC_IMAKUNI, $12, $02, NORTH
-	dw $637b
+	dw Preload_ImakuniInLightningClubLobby
 	db NPC_LASS4, $08, $0c, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_HOOD1, $14, $08, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_CLERK10, $06, $04, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH
 	dw Preload_GiftCenterClerk
 	db $00
 
 LightningClubNPCS: ; 78d5 (4:138d5)
 	db NPC_JENNIFER, $0e, $12, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_NICHOLAS, $06, $0a, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_BRANDON, $16, $0c, NORTH
-	dw $0000
+	dw NULL
 	db NPC_ISAAC, $0c, $04, NORTH
-	dw $6494
+	dw Preload_Isaac
 	db $00
 
 GrassClubEntranceNPCS: ; 78ee (4:138ee)
 	db NPC_CLERK5, $06, $02, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_MICHAEL, $0e, $08, SOUTH
-	dw $656a
+	dw Preload_MichaelInGrassClubEntrance
 	db NPC_RONALD1, $08, $fe, SOUTH
-	dw $685b
+	dw Preload_Ronald1InClubEntrance
 	db NPC_RONALD2, $fe, $08, NORTH
-	dw $689a
+	dw Preload_Ronald2InClubEntrance
 	db NPC_RONALD3, $fe, $08, NORTH
-	dw $6915
+	dw Preload_Ronald3InClubEntrance
 	db $00
 
 GrassClubLobbyNPCS: ; 790d (4:1390d)
 	db NPC_BRITTANY, $0c, $0e, WEST
-	dw $0000
+	dw NULL
 	db NPC_LASS2, $12, $08, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_GRANNY2, $04, $10, EAST
-	dw $0000
+	dw NULL
 	db NPC_GAL2, $14, $10, NORTH
-	dw $66dc
+	dw Preload_Gal2
 	db NPC_CLERK10, $06, $04, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH
 	dw Preload_GiftCenterClerk
 	db $00
 
 GrassClubNPCS: ; 7932 (4:13932)
 	db NPC_KRISTIN, $04, $0a, EAST
-	dw $0000
+	dw NULL
 	db NPC_HEATHER, $0e, $10, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_NIKKI, $0c, $04, SOUTH
-	dw $6796
+	dw Preload_NikkiInGrassClub
 	db $00
 
 PsychicClubEntranceNPCS: ; 7945 (4:13945)
 	db NPC_CLERK6, $06, $02, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_RONALD1, $08, $fe, SOUTH
-	dw $685b
+	dw Preload_Ronald1InClubEntrance
 	db NPC_RONALD2, $fe, $08, NORTH
-	dw $689a
+	dw Preload_Ronald2InClubEntrance
 	db NPC_RONALD3, $fe, $08, NORTH
-	dw $6915
+	dw Preload_Ronald3InClubEntrance
 	db NPC_LAD3, $0e, $04, SOUTH
-	dw $0000
+	dw NULL
 	db $00
 
 PsychicClubLobbyNPCS: ; 7964 (4:13964)
 	db NPC_ROBERT, $14, $08, NORTH
-	dw $0000
+	dw NULL
 	db NPC_PAPPY1, $04, $10, EAST
-	dw $0000
+	dw NULL
 	db NPC_RONALD1, $0c, $0a, EAST
-	dw $69f7
+	dw Preload_Ronald1InPsychicClubLobby
 	db NPC_GAL3, $10, $0e, WEST
-	dw $0000
+	dw NULL
 	db NPC_CHAP4, $18, $10, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_CLERK10, $06, $04, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH
 	dw Preload_GiftCenterClerk
 	db $00
 
 PsychicClubNPCS: ; 798f (4:1398f)
 	db NPC_DANIEL, $08, $08, NORTH
-	dw $0000
+	dw NULL
 	db NPC_STEPHANIE, $16, $0c, EAST
-	dw $0000
+	dw NULL
 	db NPC_MURRAY2, $02, $02, WEST
-	dw $6ad0
+	dw Preload_Murray2
 	db NPC_MURRAY1, $0c, $06, SOUTH
-	dw $6ada
+	dw Preload_Murray1
 	db $00
 
 ScienceClubEntranceNPCS: ; 79a8 (4:139a8)
 	db NPC_CLERK7, $06, $02, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_RONALD1, $08, $fe, SOUTH
-	dw $685b
+	dw Preload_Ronald1InClubEntrance
 	db NPC_RONALD2, $fe, $08, NORTH
-	dw $689a
+	dw Preload_Ronald2InClubEntrance
 	db NPC_RONALD3, $fe, $08, NORTH
-	dw $6915
+	dw Preload_Ronald3InClubEntrance
 	db $00
 
 ScienceClubLobbyNPCS: ; 79c1 (4:139c1)
 	db NPC_LAD1, $12, $12, NORTH
-	dw $0000
+	dw NULL
 	db NPC_IMAKUNI, $12, $02, NORTH
-	dw $6b65
+	dw Preload_ImakuniInScienceClubLobby
 	db NPC_MAN3, $04, $0e, WEST
-	dw $0000
+	dw NULL
 	db NPC_SPECS2, $0c, $0e, WEST
-	dw $0000
+	dw NULL
 	db NPC_SPECS3, $16, $08, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_CLERK10, $06, $04, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH
 	dw Preload_GiftCenterClerk
 	db $00
 
 ScienceClubNPCS: ; 79ec (4:139ec)
 	db NPC_JOSEPH, $08, $0a, SOUTH
-	dw $6cc4
+	dw Preload_Joseph
 	db NPC_DAVID, $14, $04, NORTH
-	dw $0000
+	dw NULL
 	db NPC_ERIK, $06, $12, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_RICK, $04, $04, NORTH
-	dw $0000
+	dw NULL
 	db $00
 
 FireClubEntranceNPCS: ; 7a05 (4:13a05)
 	db NPC_CLERK8, $06, $02, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_RONALD1, $08, $fe, SOUTH
-	dw $685b
+	dw Preload_Ronald1InClubEntrance
 	db NPC_RONALD2, $fe, $08, NORTH
-	dw $689a
+	dw Preload_Ronald2InClubEntrance
 	db NPC_RONALD3, $fe, $08, NORTH
-	dw $6915
+	dw Preload_Ronald3InClubEntrance
 	db $00
 
 FireClubLobbyNPCS: ; 7a1e (4:13a1e)
 	db NPC_JESSICA, $0c, $0e, WEST
-	dw $6d8d
+	dw Preload_JessicaInFireClubLobby
 	db NPC_LAD2, $12, $06, EAST
-	dw $6e25
+	dw Preload_Lad2
 	db NPC_CHAP3, $06, $0a, NORTH
-	dw $0000
+	dw NULL
 	db NPC_MANIA, $14, $12, NORTH
-	dw $0000
+	dw NULL
 	db NPC_CLERK10, $06, $04, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH
 	dw Preload_GiftCenterClerk
 	db $00
 
 FireClubNPCS: ; 7a43 (4:13a43)
 	db NPC_JOHN, $0c, $12, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_ADAM, $08, $0e, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_JONATHAN, $12, $0a, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_KEN, $0e, $04, SOUTH
-	dw $0000
+	dw NULL
 	db $00
 
 ChallengeHallEntranceNPCS: ; 7a5c (4:13a5c)
@@ -366,7 +366,7 @@ ChallengeHallLobbyNPCS: ; 7a63 (4:13a63)
 	db NPC_RONALD1, $08, $0c, SOUTH
 	dw Preload_ChallengeHallLobbyRonald1
 	db NPC_CLERK10, $06, $04, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH
 	dw Preload_GiftCenterClerk
 	db $00
@@ -386,33 +386,33 @@ ChallengeHallNPCS: ; 7a9a (4:13a9a)
 
 PokemonDomeEntranceNPCS: ; 7ab9 (4:13ab9)
 	db NPC_RONALD1, $0e, $12, SOUTH
-	dw $0000
+	dw NULL
 	db $00
 
 PokemonDomeNPCS: ; 7ac0 (4:13ac0)
 	db NPC_COURTNEY, $12, $02, SOUTH
-	dw $774b
+	dw Preload_Courtney
 	db NPC_STEVE, $16, $02, SOUTH
-	dw $778c
+	dw Preload_Steve
 	db NPC_JACK, $08, $02, SOUTH
-	dw $77a3
+	dw Preload_Jack
 	db NPC_ROD, $0c, $02, SOUTH
-	dw $77ba
+	dw Preload_Rod
 	db NPC_RONALD1, $1e, $00, SOUTH
-	dw $77d6
+	dw Preload_Ronald1InPokemonDome
 	db $00
 
 HallOfHonorNPCS: ; 7adf (4:13adf)
 	db NPC_LEGENDARY_CARD_TOP_LEFT, $0a, $08, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_LEGENDARY_CARD_TOP_RIGHT, $0c, $08, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_LEGENDARY_CARD_LEFT_SPARK, $08, $0a, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_LEGENDARY_CARD_BOTTOM_LEFT, $0a, $0a, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_LEGENDARY_CARD_BOTTOM_RIGHT, $0c, $0a, SOUTH
-	dw $0000
+	dw NULL
 	db NPC_LEGENDARY_CARD_RIGHT_SPARK, $0e, $0a, SOUTH
-	dw $0000
+	dw NULL
 	db $00
diff --git a/src/data/npcs.asm b/src/data/npcs.asm
index d7280b6..34885d6 100644
--- a/src/data/npcs.asm
+++ b/src/data/npcs.asm
@@ -710,7 +710,7 @@ Murray1NPCHeader:
 	db $00
 	db $12
 	db $00
-	dw Script_Murray1
+	dw Script_Murray
 	tx MurrayNPCName
 	db MURRAY_PIC
 	db STRANGE_PSYSHOCK_DECK_ID
@@ -723,7 +723,7 @@ Murray2NPCHeader:
 	db $03
 	db $15
 	db $10
-	dw Script_Murray2
+	dw Script_Murray
 	tx MurrayNPCName
 	db MURRAY_PIC
 	db STRANGE_PSYSHOCK_DECK_ID
diff --git a/src/data/warps.asm b/src/data/warps.asm
index cb34721..cba8053 100644
--- a/src/data/warps.asm
+++ b/src/data/warps.asm
@@ -1,5 +1,5 @@
 WarpDataPointers: ; 1c099 (7:4099)
-	dw $0000
+	dw NULL
 	dw MasonLaboratoryWarpData
 	dw DeckMachineRoomWarpData
 	dw IshiharasHouseWarpData