summaryrefslogtreecommitdiff
path: root/src/data
diff options
context:
space:
mode:
Diffstat (limited to 'src/data')
-rw-r--r--src/data/map_scripts.asm28
-rw-r--r--src/data/npc_map_data.asm104
-rw-r--r--src/data/npcs.asm4
3 files changed, 68 insertions, 68 deletions
diff --git a/src/data/map_scripts.asm b/src/data/map_scripts.asm
index ff4e608..0ee337d 100644
--- a/src/data/map_scripts.asm
+++ b/src/data/map_scripts.asm
@@ -38,9 +38,9 @@ MapScripts: ; 1162a (4:562a)
dw DeckMachineRoomObjects
dw NULL
dw NULL
- dw $589f
+ dw DeckMachineRoomAfterDuel
dw NULL
- dw $58ad
+ dw DeckMachineRoomCloseTextBox
; ISHIHARAS_HOUSE
dw IshiharasHouseNPCS
@@ -108,7 +108,7 @@ MapScripts: ; 1162a (4:562a)
dw NULL
dw NULL
dw NULL
- dw $5fd6
+ dw RockClubAfterDuel
dw NULL
dw NULL
@@ -168,7 +168,7 @@ MapScripts: ; 1162a (4:562a)
dw NULL
dw NULL
dw NULL
- dw $63e8
+ dw LightningClubAfterDuel
dw NULL
dw NULL
@@ -198,7 +198,7 @@ MapScripts: ; 1162a (4:562a)
dw NULL
dw NULL
dw NULL
- dw $66e7
+ dw GrassClubAfterDuel
dw NULL
dw NULL
@@ -217,7 +217,7 @@ MapScripts: ; 1162a (4:562a)
dw NULL
dw PsychicClubLobbyObjects
dw NULL
- dw $6971
+ dw PsychicClubLobbyLoadMap
dw PsychicClubLobbyAfterDuel
dw NULL
dw NULL
@@ -228,7 +228,7 @@ MapScripts: ; 1162a (4:562a)
dw NULL
dw NULL
dw NULL
- dw $6a46
+ dw PsychicClubAfterDuel
dw NULL
dw NULL
@@ -258,7 +258,7 @@ MapScripts: ; 1162a (4:562a)
dw NULL
dw NULL
dw NULL
- dw $6bf1
+ dw ScienceClubAfterDuel
dw NULL
dw NULL
@@ -327,20 +327,20 @@ MapScripts: ; 1162a (4:562a)
dw NULL
dw PokemonDomeEntranceObjects
dw NULL
- dw $7607
+ dw PokemonDomeEntranceLoadMap
dw NULL
dw NULL
- dw $762a
+ dw PokemonDomeEntranceCloseTextBox
; POKEMON_DOME
dw PokemonDomeNPCS
dw NULL
dw NULL
dw NULL
- dw $7706
- dw $76e0
- dw $76c6
- dw $7718
+ dw PokemonDomeLoadMap
+ dw PokemonDomeAfterDuel
+ dw PokemonDomeMovePlayer
+ dw PokemonDomeCloseTextBox
; HALL_OF_HONOR
dw HallOfHonorNPCS
diff --git a/src/data/npc_map_data.asm b/src/data/npc_map_data.asm
index bf26269..adcbee2 100644
--- a/src/data/npc_map_data.asm
+++ b/src/data/npc_map_data.asm
@@ -4,9 +4,9 @@
; 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 NULL
db NPC_TECH2, $16, $14, SOUTH
@@ -16,7 +16,7 @@ MasonLabNPCS: ; 772f (4:1372f)
db NPC_TECH4, $0a, $16, EAST
dw NULL
db NPC_TECH5, $06, $04, SOUTH
- dw $55eb
+ dw Preload_Tech5
db $00
DeckMachineRoomNPCS: ; 775a (4:1375a)
@@ -43,24 +43,24 @@ FightingClubEntranceNPCS: ; 7786 (4:13786)
db NPC_CLERK1, $06, $02, SOUTH
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 NULL
db NPC_IMAKUNI, $12, $02, NORTH
- dw $5ceb
+ dw Preload_ImakuniInFightingClubLobby
db NPC_SPECS1, $12, $10, EAST
dw NULL
db NPC_BUTCH, $14, $10, WEST
dw NULL
db NPC_GRANNY1, $04, $10, WEST
- dw $5d98
+ dw Preload_Granny1
db NPC_CLERK10, $06, $04, SOUTH
dw NULL
db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH
@@ -69,11 +69,11 @@ FightingClubLobbyNPCS: ; 779f (4:1379f)
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 NULL
db $00
@@ -82,16 +82,16 @@ RockClubEntranceNPCS: ; 77e3 (4:137e3)
db NPC_CLERK2, $06, $02, SOUTH
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 NULL
db NPC_WOMAN1, $14, $12, NORTH
@@ -99,7 +99,7 @@ RockClubLobbyNPCS: ; 77fc (4:137fc)
db NPC_CHAP1, $0e, $10, EAST
dw NULL
db NPC_LASS3, $10, $04, SOUTH
- dw $5fcb
+ dw Preload_Lass3
db NPC_CLERK10, $06, $04, SOUTH
dw NULL
db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH
@@ -119,11 +119,11 @@ WaterClubEntranceNPCS: ; 783a (4:1383a)
db NPC_CLERK3, $06, $02, SOUTH
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)
@@ -134,7 +134,7 @@ WaterClubLobbyNPCS: ; 7853 (4:13853)
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 NULL
db NPC_CLERK10, $06, $04, SOUTH
@@ -158,18 +158,18 @@ LightningClubEntranceNPCS: ; 7897 (4:13897)
db NPC_CLERK4, $06, $02, SOUTH
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 NULL
db NPC_IMAKUNI, $12, $02, NORTH
- dw $637b
+ dw Preload_ImakuniInLightningClubLobby
db NPC_LASS4, $08, $0c, SOUTH
dw NULL
db NPC_HOOD1, $14, $08, SOUTH
@@ -188,20 +188,20 @@ LightningClubNPCS: ; 78d5 (4:138d5)
db NPC_BRANDON, $16, $0c, NORTH
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 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)
@@ -212,7 +212,7 @@ GrassClubLobbyNPCS: ; 790d (4:1390d)
db NPC_GRANNY2, $04, $10, EAST
dw NULL
db NPC_GAL2, $14, $10, NORTH
- dw $66dc
+ dw Preload_Gal2
db NPC_CLERK10, $06, $04, SOUTH
dw NULL
db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH
@@ -225,18 +225,18 @@ GrassClubNPCS: ; 7932 (4:13932)
db NPC_HEATHER, $0e, $10, SOUTH
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 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 NULL
db $00
@@ -247,7 +247,7 @@ PsychicClubLobbyNPCS: ; 7964 (4:13964)
db NPC_PAPPY1, $04, $10, EAST
dw NULL
db NPC_RONALD1, $0c, $0a, EAST
- dw $69f7
+ dw Preload_Ronald1InPsychicClubLobby
db NPC_GAL3, $10, $0e, WEST
dw NULL
db NPC_CHAP4, $18, $10, SOUTH
@@ -264,27 +264,27 @@ PsychicClubNPCS: ; 798f (4:1398f)
db NPC_STEPHANIE, $16, $0c, EAST
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 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 NULL
db NPC_IMAKUNI, $12, $02, NORTH
- dw $6b65
+ dw Preload_ImakuniInScienceClubLobby
db NPC_MAN3, $04, $0e, WEST
dw NULL
db NPC_SPECS2, $0c, $0e, WEST
@@ -299,7 +299,7 @@ ScienceClubLobbyNPCS: ; 79c1 (4:139c1)
ScienceClubNPCS: ; 79ec (4:139ec)
db NPC_JOSEPH, $08, $0a, SOUTH
- dw $6cc4
+ dw Preload_Joseph
db NPC_DAVID, $14, $04, NORTH
dw NULL
db NPC_ERIK, $06, $12, SOUTH
@@ -312,18 +312,18 @@ FireClubEntranceNPCS: ; 7a05 (4:13a05)
db NPC_CLERK8, $06, $02, SOUTH
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 NULL
db NPC_MANIA, $14, $12, NORTH
@@ -391,15 +391,15 @@ PokemonDomeEntranceNPCS: ; 7ab9 (4:13ab9)
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)
diff --git a/src/data/npcs.asm b/src/data/npcs.asm
index 7880a8b..c083d32 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
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-29 16:27:15 +0000