summaryrefslogtreecommitdiff
path: root/src/data/npc_map_data.asm
diff options
context:
space:
mode:
authorAndrew Martinek <andrewrmartinek@gmail.com>2019-10-25 19:41:50 -0400
committerAndrew Martinek <andrewrmartinek@gmail.com>2019-10-25 19:41:50 -0400
commite58e93fdb14173ae7a9edcd782f70fe67402c42f (patch)
tree91ba1492ffe671b0e7da87e7bb63b6e366e168dd /src/data/npc_map_data.asm
parent2a3071d3fec01901f5e0122d47072495bcf54945 (diff)
a bit more scripting stuff, figured out more npc data
Diffstat (limited to 'src/data/npc_map_data.asm')
-rw-r--r--src/data/npc_map_data.asm5
1 files changed, 3 insertions, 2 deletions
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)