summaryrefslogtreecommitdiff
path: root/src/data
diff options
context:
space:
mode:
Diffstat (limited to 'src/data')
-rw-r--r--src/data/deck_ai_pointers.asm55
-rw-r--r--src/data/effect_commands.asm6
-rw-r--r--src/data/map_objects.asm610
-rw-r--r--src/data/map_scripts.asm158
-rw-r--r--src/data/npc_map_data.asm419
-rw-r--r--src/data/npcs.asm259
6 files changed, 1296 insertions, 211 deletions
diff --git a/src/data/deck_ai_pointers.asm b/src/data/deck_ai_pointers.asm
new file mode 100644
index 0000000..4f00299
--- /dev/null
+++ b/src/data/deck_ai_pointers.asm
@@ -0,0 +1,55 @@
+DeckAIPointerTable: ; 14000 (05:4000)
+ dw AIActionTable_SamPractice ; SAMS_PRACTICE_DECK
+ dw AIActionTable_GeneralDecks ; PRACTICE_PLAYER_DECK
+ dw AIActionTable_GeneralDecks ; SAMS_NORMAL_DECK
+ dw AIActionTable_GeneralDecks ; CHARMANDER_AND_FRIENDS_DECK
+ dw AIActionTable_GeneralDecks ; CHARMANDER_EXTRA_DECK
+ dw AIActionTable_GeneralDecks ; SQUIRTLE_AND_FRIENDS_DECK
+ dw AIActionTable_GeneralDecks ; SQUIRTLE_EXTRA_DECK
+ dw AIActionTable_GeneralDecks ; BULBASAUR_AND_FRIENDS_DECK
+ dw AIActionTable_GeneralDecks ; BULBASAUR_EXTRA_DECK
+ dw AIActionTable_GeneralDecks ; LIGHTNING_AND_FIRE_DECK
+ dw AIActionTable_GeneralDecks ; WATER_AND_FIGHTING_DECK
+ dw AIActionTable_GeneralDecks ; GRASS_AND_PSYCHIC_DECK
+ dw AIActionTable_LegendaryMoltres ; LEGENDARY_MOLTRES_DECK
+ dw AIActionTable_LegendaryZapdos ; LEGENDARY_ZAPDOS_DECK
+ dw AIActionTable_LegendaryArticuno ; LEGENDARY_ARTICUNO_DECK
+ dw AIActionTable_LegendaryDragonite ; LEGENDARY_DRAGONITE_DECK
+ dw AIActionTable_FirstStrike ; FIRST_STRIKE_DECK
+ dw AIActionTable_RockCrusher ; ROCK_CRUSHER_DECK
+ dw AIActionTable_GoGoRainDance ; GO_GO_RAIN_DANCE_DECK
+ dw AIActionTable_ZappingSelfdestruct ; ZAPPING_SELFDESTRUCT_DECK
+ dw AIActionTable_FlowerPower ; FLOWER_POWER_DECK
+ dw AIActionTable_StrangePsyshock ; STRANGE_PSYSHOCK_DECK
+ dw AIActionTable_WondersOfScience ; WONDERS_OF_SCIENCE_DECK
+ dw AIActionTable_FireCharge ; FIRE_CHARGE_DECK
+ dw AIActionTable_ImRonald ; IM_RONALD_DECK
+ dw AIActionTable_PowerfulRonald ; POWERFUL_RONALD_DECK
+ dw AIActionTable_InvincibleRonald ; INVINCIBLE_RONALD_DECK
+ dw AIActionTable_LegendaryRonald ; LEGENDARY_RONALD_DECK
+ dw AIActionTable_GeneralNoRetreat ; MUSCLES_FOR_BRAINS_DECK
+ dw AIActionTable_GeneralDecks ; HEATED_BATTLE_DECK
+ dw AIActionTable_GeneralDecks ; LOVE_TO_BATTLE_DECK
+ dw AIActionTable_GeneralDecks ; EXCAVATION_DECK
+ dw AIActionTable_GeneralDecks ; BLISTERING_POKEMON_DECK
+ dw AIActionTable_GeneralDecks ; HARD_POKEMON_DECK
+ dw AIActionTable_GeneralDecks ; WATERFRONT_POKEMON_DECK
+ dw AIActionTable_GeneralDecks ; LONELY_FRIENDS_DECK
+ dw AIActionTable_GeneralDecks ; SOUND_OF_THE_WAVES_DECK
+ dw AIActionTable_GeneralDecks ; PIKACHU_DECK
+ dw AIActionTable_GeneralDecks ; BOOM_BOOM_SELFDESTRUCT_DECK
+ dw AIActionTable_GeneralDecks ; POWER_GENERATOR_DECK
+ dw AIActionTable_GeneralDecks ; ETCETERA_DECK
+ dw AIActionTable_GeneralDecks ; FLOWER_GARDEN_DECK
+ dw AIActionTable_GeneralDecks ; KALEIDOSCOPE_DECK
+ dw AIActionTable_GeneralDecks ; GHOST_DECK
+ dw AIActionTable_GeneralDecks ; NAP_TIME_DECK
+ dw AIActionTable_GeneralDecks ; STRANGE_POWER_DECK
+ dw AIActionTable_GeneralDecks ; FLYIN_POKEMON_DECK
+ dw AIActionTable_GeneralDecks ; LOVELY_NIDORAN_DECK
+ dw AIActionTable_GeneralDecks ; POISON_DECK
+ dw AIActionTable_GeneralDecks ; ANGER_DECK
+ dw AIActionTable_GeneralDecks ; FLAMETHROWER_DECK
+ dw AIActionTable_GeneralDecks ; RESHUFFLE_DECK
+ dw AIActionTable_GeneralNoRetreat ; IMAKUNI_DECK
+; 1406a
diff --git a/src/data/effect_commands.asm b/src/data/effect_commands.asm
index 0e1886e..171c241 100644
--- a/src/data/effect_commands.asm
+++ b/src/data/effect_commands.asm
@@ -42,9 +42,9 @@ EkansWrapEffectCommands:
db $00
ArbokTerrorStrikeEffectCommands:
- dbw EFFECTCMDTYPE_AFTER_DAMAGE, $4726
- dbw EFFECTCMDTYPE_REQUIRE_SELECTION, $470a
- dbw EFFECTCMDTYPE_SWITCH_DEFENDING_PKMN, $470a
+ dbw EFFECTCMDTYPE_AFTER_DAMAGE, TerrorStrike_SwitchDefendingPokemon
+ dbw EFFECTCMDTYPE_REQUIRE_SELECTION, TerrorStrike_50PercentSelectSwitchPokemon
+ dbw EFFECTCMDTYPE_SWITCH_DEFENDING_PKMN, TerrorStrike_50PercentSelectSwitchPokemon
db $00
ArbokPoisonFangEffectCommands:
diff --git a/src/data/map_objects.asm b/src/data/map_objects.asm
new file mode 100644
index 0000000..4e2570b
--- /dev/null
+++ b/src/data/map_objects.asm
@@ -0,0 +1,610 @@
+; Objects around maps that can be interacted with but are not represented
+; by NPCs. Things like Deck Machines and the PCs.
+; Format:
+; Direction you need to face, X coord, Y coord
+; Routine that gets called when you hit A in front of it
+; Object Name, and Object default Text
+MasonLabObjects: ; 13b04 (3:7b04)
+ db NORTH, 18, 2
+ dw PrintInteractableObjectText
+ tx Text04a0
+ tx Text049f
+
+ db NORTH, 20, 2
+ dw PrintInteractableObjectText
+ tx Text04a2
+ tx Text04a1
+
+ db NORTH, 22, 2
+ dw PrintInteractableObjectText
+ tx Text04a4
+ tx Text04a3
+
+ db NORTH, 24, 2
+ dw PrintInteractableObjectText
+ tx Text04a6
+ tx Text04a5
+
+ db NORTH, 20, 14
+ dw PrintInteractableObjectText
+ tx Text04a8
+ tx Text04a7
+
+ db NORTH, 22, 14
+ dw PrintInteractableObjectText
+ tx Text04aa
+ tx Text04a9
+
+ db NORTH, 24, 14
+ dw PrintInteractableObjectText
+ tx Text04ac
+ tx Text04ab
+
+ db NORTH, 2, 2
+ dw PC_c7ea
+ tx Text041b
+ tx Text041a
+
+ db $ff
+
+
+DeckMachineRoomObjects: ; 13b4d (3:7b4d)
+ db NORTH, 2, 2
+ dw Script_d932
+ tx Text041b
+ tx Text041a
+
+ db NORTH, 4, 2
+ dw Script_d932
+ tx Text041b
+ tx Text041a
+
+ db NORTH, 6, 2
+ dw $593f
+ tx Text041b
+ tx Text041a
+
+ db NORTH, 8, 2
+ dw $593f
+ tx Text041b
+ tx Text041a
+
+ db NORTH, 10, 2
+ dw $5995
+ tx Text041b
+ tx Text041a
+
+ db NORTH, 12, 2
+ dw $5995
+ tx Text041b
+ tx Text041a
+
+ db NORTH, 14, 2
+ dw $59c2
+ tx Text041b
+ tx Text041a
+
+ db NORTH, 16, 2
+ dw $59c2
+ tx Text041b
+ tx Text041a
+
+ db NORTH, 18, 2
+ dw $59ef
+ tx Text041b
+ tx Text041a
+
+ db NORTH, 20, 2
+ dw $59ef
+ tx Text041b
+ tx Text041a
+
+ db NORTH, 14, 10
+ dw $5a1c
+ tx Text041b
+ tx Text041a
+
+ db NORTH, 16, 10
+ dw $5a1c
+ tx Text041b
+ tx Text041a
+
+ db NORTH, 18, 10
+ dw $5a49
+ tx Text041b
+ tx Text041a
+
+ db NORTH, 20, 10
+ dw $5a49
+ tx Text041b
+ tx Text041a
+
+ db NORTH, 14, 18
+ dw $5a76
+ tx Text041b
+ tx Text041a
+
+ db NORTH, 16, 18
+ dw $5a76
+ tx Text041b
+ tx Text041a
+
+ db NORTH, 18, 18
+ dw $5aa3
+ tx Text041b
+ tx Text041a
+
+ db NORTH, 20, 18
+ dw $5aa3
+ tx Text041b
+ tx Text041a
+
+ db NORTH, 2, 18
+ dw $5ad0
+ tx Text041b
+ tx Text041a
+
+ db NORTH, 4, 18
+ dw $5ad0
+ tx Text041b
+ tx Text041a
+
+ db $ff
+
+
+IshiharasHouseObjects: ; 13c02 (3:7c02)
+ db NORTH, 6, 2
+ dw PrintInteractableObjectText
+ tx Text04ae
+ tx Text04ad
+
+ db NORTH, 8, 2
+ dw PrintInteractableObjectText
+ tx Text04b0
+ tx Text04af
+
+ db NORTH, 10, 2
+ dw PrintInteractableObjectText
+ tx Text04b2
+ tx Text04b1
+
+ db NORTH, 12, 2
+ dw PrintInteractableObjectText
+ tx Text04b4
+ tx Text04b3
+
+ db NORTH, 14, 2
+ dw PrintInteractableObjectText
+ tx Text04b6
+ tx Text04b5
+
+ db NORTH, 16, 2
+ dw PrintInteractableObjectText
+ tx Text04b8
+ tx Text04b7
+
+ db NORTH, 2, 12
+ dw PrintInteractableObjectText
+ tx Text04ba
+ tx Text04b9
+
+ db NORTH, 4, 12
+ dw PrintInteractableObjectText
+ tx Text04bc
+ tx Text04bb
+
+ db NORTH, 6, 12
+ dw PrintInteractableObjectText
+ tx Text04be
+ tx Text04bd
+
+ db NORTH, 12, 12
+ dw PrintInteractableObjectText
+ tx Text04c0
+ tx Text04bf
+
+ db NORTH, 14, 12
+ dw PrintInteractableObjectText
+ tx Text04c2
+ tx Text04c1
+
+ db NORTH, 16, 12
+ dw PrintInteractableObjectText
+ tx Text04c4
+ tx Text04c3
+
+ db $ff
+
+
+FightingClubLobbyObjects: ; 13c6f (3:7c6f)
+ db NORTH, 20, 2
+ dw PrintInteractableObjectText
+ tx Text04c6
+ tx Text04c5
+
+ db NORTH, 22, 2
+ dw PrintInteractableObjectText
+ tx Text04c8
+ tx Text04c7
+
+ db NORTH, 24, 2
+ dw PrintInteractableObjectText
+ tx Text04ca
+ tx Text04c9
+
+ db NORTH, 2, 8
+ dw PC_c7ea
+ tx Text041b
+ tx Text041a
+
+ db NORTH, 6, 6
+ dw Script_fc52
+ tx Text041b
+ tx ClerkNPCName
+
+ db NORTH, 10, 6
+ dw Func_fc7a
+ tx Text041b
+ tx ClerkNPCName
+
+ db $ff
+
+
+RockClubLobbyObjects: ; 13ca6 (3:7ca6)
+ db NORTH, 20, 2
+ dw PrintInteractableObjectText
+ tx Text04cc
+ tx Text04cb
+
+ db NORTH, 22, 2
+ dw PrintInteractableObjectText
+ tx Text04ce
+ tx Text04cd
+
+ db NORTH, 24, 2
+ dw PrintInteractableObjectText
+ tx Text04d0
+ tx Text04cf
+
+ db NORTH, 2, 8
+ dw PC_c7ea
+ tx Text041b
+ tx Text041a
+
+ db NORTH, 6, 6
+ dw Script_fc52
+ tx Text041b
+ tx ClerkNPCName
+
+ db NORTH, 10, 6
+ dw Func_fc7a
+ tx Text041b
+ tx ClerkNPCName
+
+ db $ff
+
+
+WaterClubLobbyObjects: ; 13cdd (3:7cdd)
+ db NORTH, 20, 2
+ dw PrintInteractableObjectText
+ tx Text04d2
+ tx Text04d1
+
+ db NORTH, 22, 2
+ dw PrintInteractableObjectText
+ tx Text04d4
+ tx Text04d3
+
+ db NORTH, 24, 2
+ dw PrintInteractableObjectText
+ tx Text04d6
+ tx Text04d5
+
+ db NORTH, 2, 8
+ dw PC_c7ea
+ tx Text041b
+ tx Text041a
+
+ db NORTH, 6, 6
+ dw Script_fc52
+ tx Text041b
+ tx ClerkNPCName
+
+ db NORTH, 10, 6
+ dw Func_fc7a
+ tx Text041b
+ tx ClerkNPCName
+
+ db $ff
+
+
+LightningClubLobbyObjects: ; 13d14 (3:7d14)
+ db NORTH, 20, 2
+ dw PrintInteractableObjectText
+ tx Text04d8
+ tx Text04d7
+
+ db NORTH, 22, 2
+ dw PrintInteractableObjectText
+ tx Text04da
+ tx Text04d9
+
+ db NORTH, 24, 2
+ dw PrintInteractableObjectText
+ tx Text04dc
+ tx Text04db
+
+ db NORTH, 2, 8
+ dw PC_c7ea
+ tx Text041b
+ tx Text041a
+
+ db NORTH, 6, 6
+ dw Script_fc52
+ tx Text041b
+ tx ClerkNPCName
+
+ db NORTH, 10, 6
+ dw Func_fc7a
+ tx Text041b
+ tx ClerkNPCName
+
+ db $ff
+
+
+GrassClubLobbyObjects: ; 13d4b (3:7d4b)
+ db NORTH, 20, 2
+ dw PrintInteractableObjectText
+ tx Text04de
+ tx Text04dd
+
+ db NORTH, 22, 2
+ dw PrintInteractableObjectText
+ tx Text04e0
+ tx Text04df
+
+ db NORTH, 24, 2
+ dw PrintInteractableObjectText
+ tx Text04e2
+ tx Text04e1
+
+ db NORTH, 2, 8
+ dw PC_c7ea
+ tx Text041b
+ tx Text041a
+
+ db NORTH, 6, 6
+ dw Script_fc52
+ tx Text041b
+ tx ClerkNPCName
+
+ db NORTH, 10, 6
+ dw Func_fc7a
+ tx Text041b
+ tx ClerkNPCName
+
+ db $ff
+
+
+PsychicClubLobbyObjects: ; 13d82 (3:7d82)
+ db NORTH, 20, 2
+ dw PrintInteractableObjectText
+ tx Text04e4
+ tx Text04e3
+
+ db NORTH, 22, 2
+ dw PrintInteractableObjectText
+ tx Text04e6
+ tx Text04e5
+
+ db NORTH, 24, 2
+ dw PrintInteractableObjectText
+ tx Text04e8
+ tx Text04e7
+
+ db NORTH, 2, 8
+ dw PC_c7ea
+ tx Text041b
+ tx Text041a
+
+ db NORTH, 6, 6
+ dw Script_fc52
+ tx Text041b
+ tx ClerkNPCName
+
+ db NORTH, 10, 6
+ dw Func_fc7a
+ tx Text041b
+ tx ClerkNPCName
+
+ db $ff
+
+
+ScienceClubLobbyObjects: ; 13db9 (3:7db9)
+ db NORTH, 20, 2
+ dw PrintInteractableObjectText
+ tx Text04ea
+ tx Text04e9
+
+ db NORTH, 22, 2
+ dw PrintInteractableObjectText
+ tx Text04ec
+ tx Text04eb
+
+ db NORTH, 24, 2
+ dw PrintInteractableObjectText
+ tx Text04ee
+ tx Text04ed
+
+ db NORTH, 2, 8
+ dw PC_c7ea
+ tx Text041b
+ tx Text041a
+
+ db NORTH, 6, 6
+ dw Script_fc52
+ tx Text041b
+ tx ClerkNPCName
+
+ db NORTH, 10, 6
+ dw Func_fc7a
+ tx Text041b
+ tx ClerkNPCName
+
+ db $ff
+
+
+FireClubLobbyObjects: ; 13df0 (3:7df0)
+ db NORTH, 20, 2
+ dw PrintInteractableObjectText
+ tx Text04f0
+ tx Text04ef
+
+ db NORTH, 22, 2
+ dw PrintInteractableObjectText
+ tx Text04f2
+ tx Text04f1
+
+ db NORTH, 24, 2
+ dw PrintInteractableObjectText
+ tx Text04f4
+ tx Text04f3
+
+ db NORTH, 2, 8
+ dw PC_c7ea
+ tx Text041b
+ tx Text041a
+
+ db NORTH, 6, 6
+ dw Script_fc52
+ tx Text041b
+ tx ClerkNPCName
+
+ db NORTH, 10, 6
+ dw Func_fc7a
+ tx Text041b
+ tx ClerkNPCName
+
+ db $ff
+
+
+ChallengeHallLobbyObjects: ; 13e27 (3:7e27)
+ db NORTH, 20, 2
+ dw PrintInteractableObjectText
+ tx Text04f6
+ tx Text04f5
+
+ db NORTH, 22, 2
+ dw PrintInteractableObjectText
+ tx Text04f8
+ tx Text04f7
+
+ db NORTH, 24, 2
+ dw PrintInteractableObjectText
+ tx Text04fa
+ tx Text04f9
+
+ db NORTH, 2, 8
+ dw PC_c7ea
+ tx Text041b
+ tx Text041a
+
+ db NORTH, 6, 6
+ dw Script_fc52
+ tx Text041b
+ tx ClerkNPCName
+
+ db NORTH, 10, 6
+ dw Func_fc7a
+ tx Text041b
+ tx ClerkNPCName
+
+ db $ff
+
+
+PokemonDomeEntranceObjects: ; 13e5e (3:7e5e)
+ db NORTH, 2, 2
+ dw PrintInteractableObjectText
+ tx Text04fc
+ tx Text04fb
+
+ db NORTH, 4, 2
+ dw PrintInteractableObjectText
+ tx Text04fe
+ tx Text04fd
+
+ db NORTH, 6, 2
+ dw PrintInteractableObjectText
+ tx Text0500
+ tx Text04ff
+
+
+ db NORTH, 2, 8
+ dw PrintInteractableObjectText
+ tx Text0502
+ tx Text0501
+
+ db NORTH, 4, 8
+ dw PrintInteractableObjectText
+ tx Text0504
+ tx Text0503
+
+ db NORTH, 6, 8
+ dw PrintInteractableObjectText
+ tx Text0506
+ tx Text0505
+
+ db NORTH, 18, 0
+ dw Script_f631
+ tx Text0508
+ tx Text0507
+
+ db NORTH, 20, 0
+ dw Script_f631
+ tx Text0508
+ tx Text0507
+
+ db NORTH, 22, 0
+ dw $76af
+ tx Text0558
+ tx Text0509
+
+ db NORTH, 24, 0
+ dw $76af
+ tx Text0558
+ tx Text0509
+
+ db NORTH, 28, 2
+ dw PC_c7ea
+ tx Text041b
+ tx Text041a
+
+ db $ff
+
+
+HallOfHonorObjects: ; 13ec2 (3:7ec2)
+ ; Legendary Cards
+ db NORTH, 10, 10
+ dw Script_fbf1
+ dw $0000
+ dw $0000
+
+ ; Legendary Cards
+ db NORTH, 12, 10
+ dw Script_fbf1
+ dw $0000
+ dw $0000
+
+ db NORTH, 10, 2
+ dw $7be1
+ tx Text041b
+ tx Text041a
+
+ db NORTH, 12, 2
+ dw $7be1
+ tx Text041b
+ tx Text041a
+
+ db $ff
+
+
diff --git a/src/data/map_scripts.asm b/src/data/map_scripts.asm
index ae4e355..f969d45 100644
--- a/src/data/map_scripts.asm
+++ b/src/data/map_scripts.asm
@@ -2,10 +2,10 @@
; 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
-; 0: load texts
-; 2: unused
-; 4: pressed A button
-; 6: pressed A button
+; 0: NPC data
+; 2: Called after every NPC is loaded (unused)
+; 4: Interactable Objects
+; 6: pressed A button (if nothing interactable is found)
; 8: load map
; a: after duel
; c: moved player
@@ -17,25 +17,25 @@ MapScripts: ; 1162a (4:562a)
dw $0000
dw $0000
dw $0000
- dw $54ec
+ dw LoadOverworld
dw $0000
dw $0000
dw $0000
; MASON_LABORATORY
- dw $772f
+ dw MasonLabNPCS
dw $0000
- dw $7b04
- dw $5565
- dw $5549
- dw $553b
+ dw MasonLabObjects
+ dw MasonLabPressedA
+ dw MasonLabLoadMap
+ dw MasonLaboratoryAfterDuel
dw $0000
- dw $555e
+ dw MasonLabCloseTextBox
; DECK_MACHINE_ROOM
- dw $775a
+ dw DeckMachineRoomNPCS
dw $0000
- dw $7b4d
+ dw DeckMachineRoomObjects
dw $0000
dw $0000
dw $589f
@@ -43,9 +43,9 @@ MapScripts: ; 1162a (4:562a)
dw $58ad
; ISHIHARAS_HOUSE
- dw $7773
+ dw IshiharasHouseNPCS
dw $0000
- dw $7c02
+ dw IshiharasHouseObjects
dw $0000
dw $0000
dw $0000
@@ -53,27 +53,27 @@ MapScripts: ; 1162a (4:562a)
dw $0000
; FIGHTING_CLUB_ENTRANCE
- dw $7786
+ dw FightingClubEntranceNPCS
dw $0000
dw $0000
dw $0000
- dw $6809
- dw $67f6
+ dw LoadClubEntrance
+ dw ClubEntranceAfterDuel
dw $0000
dw $0000
; FIGHTING_CLUB_LOBBY
- dw $779f
+ dw FightingClubLobbyNPCS
dw $0000
- dw $7c6f
+ dw FightingClubLobbyObjects
dw $0000
dw $0000
- dw $5c68
+ dw FightingClubLobbyAfterDuel
dw $0000
dw $0000
; FIGHTING_CLUB
- dw $77ca
+ dw FightingClubNPCS
dw $0000
dw $0000
dw $0000
@@ -83,19 +83,19 @@ MapScripts: ; 1162a (4:562a)
dw $0000
; ROCK_CLUB_ENTRANCE
- dw $77e3
+ dw RockClubEntranceNPCS
dw $0000
dw $0000
dw $0000
- dw $6809
- dw $67f6
+ dw LoadClubEntrance
+ dw ClubEntranceAfterDuel
dw $0000
dw $0000
; ROCK_CLUB_LOBBY
- dw $77fc
+ dw RockClubLobbyNPCS
dw $0000
- dw $7ca6
+ dw RockClubLobbyObjects
dw $0000
dw $0000
dw $5ed5
@@ -103,7 +103,7 @@ MapScripts: ; 1162a (4:562a)
dw $0000
; ROCK_CLUB
- dw $7827
+ dw RockClubNPCS
dw $0000
dw $0000
dw $0000
@@ -113,19 +113,19 @@ MapScripts: ; 1162a (4:562a)
dw $0000
; WATER_CLUB_ENTRANCE
- dw $783a
+ dw WaterClubEntranceNPCS
dw $0000
dw $0000
dw $0000
- dw $6809
- dw $67f6
+ dw LoadClubEntrance
+ dw ClubEntranceAfterDuel
dw $0000
dw $0000
; WATER_CLUB_LOBBY
- dw $7853
+ dw WaterClubLobbyNPCS
dw $0000
- dw $7cdd
+ dw WaterClubLobbyObjects
dw $0000
dw $0000
dw $60a2
@@ -133,7 +133,7 @@ MapScripts: ; 1162a (4:562a)
dw $0000
; WATER_CLUB
- dw $787e
+ dw WaterClubNPCS
dw $0000
dw $0000
dw $0000
@@ -143,19 +143,19 @@ MapScripts: ; 1162a (4:562a)
dw $0000
; LIGHTNING_CLUB_ENTRANCE
- dw $7897
+ dw LightningClubEntranceNPCS
dw $0000
dw $0000
dw $0000
- dw $6809
- dw $67f6
+ dw LoadClubEntrance
+ dw ClubEntranceAfterDuel
dw $0000
dw $0000
; LIGHTNING_CLUB_LOBBY
- dw $78b0
+ dw LightningClubLobbyNPCS
dw $0000
- dw $7d14
+ dw LightningClubLobbyObjects
dw $0000
dw $0000
dw $636d
@@ -163,7 +163,7 @@ MapScripts: ; 1162a (4:562a)
dw $0000
; LIGHTNING_CLUB
- dw $78d5
+ dw LightningClubNPCS
dw $0000
dw $0000
dw $0000
@@ -173,27 +173,27 @@ MapScripts: ; 1162a (4:562a)
dw $0000
; GRASS_CLUB_ENTRANCE
- dw $78ee
+ dw GrassClubEntranceNPCS
dw $0000
dw $0000
dw $0000
- dw $6809
- dw $6525
+ dw LoadClubEntrance
+ dw GrassClubEntranceAfterDuel
dw $0000
dw $0000
; GRASS_CLUB_LOBBY
- dw $790d
+ dw GrassClubLobbyNPCS
dw $0000
- dw $7d4b
+ dw GrassClubLobbyObjects
dw $0000
dw $0000
- dw $65c4
+ dw GrassClubLobbyAfterDuel
dw $0000
dw $0000
; GRASS_CLUB
- dw $7932
+ dw GrassClubNPCS
dw $0000
dw $0000
dw $0000
@@ -203,19 +203,19 @@ MapScripts: ; 1162a (4:562a)
dw $0000
; PSYCHIC_CLUB_ENTRANCE
- dw $7945
+ dw PsychicClubEntranceNPCS
dw $0000
dw $0000
dw $0000
- dw $6809
- dw $67f6
+ dw LoadClubEntrance
+ dw ClubEntranceAfterDuel
dw $0000
dw $0000
; PSYCHIC_CLUB_LOBBY
- dw $7964
+ dw PsychicClubLobbyNPCS
dw $0000
- dw $7d82
+ dw PsychicClubLobbyObjects
dw $0000
dw $6971
dw $6963
@@ -223,7 +223,7 @@ MapScripts: ; 1162a (4:562a)
dw $0000
; PSYCHIC_CLUB
- dw $798f
+ dw PsychicClubNPCS
dw $0000
dw $0000
dw $0000
@@ -233,19 +233,19 @@ MapScripts: ; 1162a (4:562a)
dw $0000
; SCIENCE_CLUB_ENTRANCE
- dw $79a8
+ dw ScienceClubEntranceNPCS
dw $0000
dw $0000
dw $0000
- dw $6809
- dw $67f6
+ dw LoadClubEntrance
+ dw ClubEntranceAfterDuel
dw $0000
dw $0000
; SCIENCE_CLUB_LOBBY
- dw $79c1
+ dw ScienceClubLobbyNPCS
dw $0000
- dw $7db9
+ dw ScienceClubLobbyObjects
dw $0000
dw $0000
dw $6b57
@@ -253,7 +253,7 @@ MapScripts: ; 1162a (4:562a)
dw $0000
; SCIENCE_CLUB
- dw $79ec
+ dw ScienceClubNPCS
dw $0000
dw $0000
dw $0000
@@ -263,27 +263,27 @@ MapScripts: ; 1162a (4:562a)
dw $0000
; FIRE_CLUB_ENTRANCE
- dw $7a05
+ dw FireClubEntranceNPCS
dw $0000
dw $0000
dw $0000
- dw $6809
- dw $67f6
+ dw LoadClubEntrance
+ dw ClubEntranceAfterDuel
dw $0000
dw $0000
; FIRE_CLUB_LOBBY
- dw $7a1e
+ dw FireClubLobbyNPCS
dw $0000
- dw $7df0
- dw $6d57
+ dw FireClubLobbyObjects
+ dw FireClubPressedA
dw $0000
dw $6d49
dw $0000
dw $0000
; FIRE_CLUB
- dw $7a43
+ dw FireClubNPCS
dw $0000
dw $0000
dw $0000
@@ -293,7 +293,7 @@ MapScripts: ; 1162a (4:562a)
dw $0000
; CHALLENGE_HALL_ENTRANCE
- dw $7a5c
+ dw ChallengeHallEntranceNPCS
dw $0000
dw $0000
dw $0000
@@ -303,29 +303,29 @@ MapScripts: ; 1162a (4:562a)
dw $0000
; CHALLENGE_HALL_LOBBY
- dw $7a63
+ dw ChallengeHallLobbyNPCS
dw $0000
- dw $7e27
+ dw ChallengeHallLobbyObjects
dw $0000
- dw $7088
+ dw ChallengeHallLobbyLoadMap
dw $0000
dw $0000
dw $0000
; CHALLENGE_HALL
- dw $7a9a
+ dw ChallengeHallNPCS
dw $0000
dw $0000
dw $0000
- dw $7258
- dw $7239
+ dw ChallengeHallLoadMap
+ dw ChallengeHallAfterDuel
dw $0000
dw $0000
; POKEMON_DOME_ENTRANCE
- dw $7ab9
+ dw PokemonDomeEntranceNPCS
dw $0000
- dw $7e5e
+ dw PokemonDomeEntranceObjects
dw $0000
dw $7607
dw $0000
@@ -333,7 +333,7 @@ MapScripts: ; 1162a (4:562a)
dw $762a
; POKEMON_DOME
- dw $7ac0
+ dw PokemonDomeNPCS
dw $0000
dw $0000
dw $0000
@@ -343,11 +343,11 @@ MapScripts: ; 1162a (4:562a)
dw $7718
; HALL_OF_HONOR
- dw $7adf
+ dw HallOfHonorNPCS
dw $0000
- dw $7ec2
+ dw HallOfHonorObjects
dw $0000
- dw $7bdb
+ dw HallOfHonorLoadMap
dw $0000
dw $0000
dw $0000
diff --git a/src/data/npc_map_data.asm b/src/data/npc_map_data.asm
new file mode 100644
index 0000000..bc09d07
--- /dev/null
+++ b/src/data/npc_map_data.asm
@@ -0,0 +1,419 @@
+; 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)
+ db NPC_DRMASON, $0e, $06, SOUTH
+ dw $5710
+ db NPC_SAM, $04, $0e, EAST
+ dw $5604
+ db NPC_TECH1, $16, $08, WEST
+ dw $0000
+ db NPC_TECH2, $16, $14, SOUTH
+ dw $0000
+ db NPC_TECH3, $16, $16, WEST
+ dw $0000
+ db NPC_TECH4, $0a, $16, EAST
+ dw $0000
+ db NPC_TECH5, $06, $04, SOUTH
+ dw $55eb
+ db $00
+
+DeckMachineRoomNPCS: ; 775a (4:1375a)
+ db NPC_TECH6, $06, $08, SOUTH
+ dw $0000
+ db NPC_TECH7, $06, $16, WEST
+ dw $0000
+ db NPC_TECH8, $0a, $12, WEST
+ dw $0000
+ db NPC_AARON, $0c, $0c, WEST
+ dw $0000
+ db $00
+
+IshiharasHouseNPCS: ; 7773 (4:13773)
+ db NPC_NIKKI, $04, $04, NORTH
+ dw Preload_NikkiInIshiharasHouse
+ db NPC_ISHIHARA, $08, $08, SOUTH
+ dw Preload_IshiharaInIshiharasHouse
+ db NPC_RONALD1, $02, $04, WEST
+ dw Preload_Ronald1InIshiharasHouse
+ db $00
+
+FightingClubEntranceNPCS: ; 7786 (4:13786)
+ db NPC_CLERK1, $06, $02, SOUTH
+ dw $0000
+ db NPC_RONALD1, $08, $fe, SOUTH
+ dw $685b
+ db NPC_RONALD2, $fe, $08, NORTH
+ dw $689a
+ db NPC_RONALD3, $fe, $08, NORTH
+ dw $6915
+ db $00
+
+FightingClubLobbyNPCS: ; 779f (4:1379f)
+ db NPC_MAN1, $0c, $0e, WEST
+ dw $0000
+ db NPC_IMAKUNI, $12, $02, NORTH
+ dw $5ceb
+ db NPC_SPECS1, $12, $10, EAST
+ dw $0000
+ db NPC_BUTCH, $14, $10, WEST
+ dw $0000
+ db NPC_GRANNY1, $04, $10, WEST
+ dw $5d98
+ db NPC_CLERK10, $06, $04, SOUTH
+ dw $0000
+ 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
+ db NPC_MICHAEL, $0e, $0a, SOUTH
+ dw $5e79
+ db NPC_JESSICA, $12, $06, EAST
+ dw $5ea5
+ db NPC_MITCH, $0a, $04, SOUTH
+ dw $0000
+ db $00
+
+RockClubEntranceNPCS: ; 77e3 (4:137e3)
+ db NPC_CLERK2, $06, $02, SOUTH
+ dw $0000
+ db NPC_RONALD1, $08, $fe, SOUTH
+ dw $685b
+ db NPC_RONALD2, $fe, $08, NORTH
+ dw $689a
+ db NPC_RONALD3, $fe, $08, NORTH
+ dw $6915
+ db $00
+
+RockClubLobbyNPCS: ; 77fc (4:137fc)
+ db NPC_CHRIS, $12, $08, WEST
+ dw $5ee9
+ db NPC_MATTHEW, $06, $0e, EAST
+ dw $0000
+ db NPC_WOMAN1, $14, $12, NORTH
+ dw $0000
+ db NPC_CHAP1, $0e, $10, EAST
+ dw $0000
+ db NPC_LASS3, $10, $04, SOUTH
+ dw $5fcb
+ db NPC_CLERK10, $06, $04, SOUTH
+ dw $0000
+ 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
+ db NPC_ANDREW, $06, $14, NORTH
+ dw $0000
+ db NPC_GENE, $0c, $06, NORTH
+ dw $0000
+ db $00
+
+WaterClubEntranceNPCS: ; 783a (4:1383a)
+ db NPC_CLERK3, $06, $02, SOUTH
+ dw $0000
+ db NPC_RONALD1, $08, $fe, SOUTH
+ dw $685b
+ db NPC_RONALD2, $fe, $08, NORTH
+ dw $689a
+ db NPC_RONALD3, $fe, $08, NORTH
+ dw $6915
+ db $00
+
+WaterClubLobbyNPCS: ; 7853 (4:13853)
+ db NPC_GAL1, $06, $0e, SOUTH
+ dw $0000
+ db NPC_LASS1, $10, $0a, SOUTH
+ dw $0000
+ db NPC_IMAKUNI, $12, $02, NORTH
+ dw Preload_ImakuniInWaterClubLobby
+ db NPC_MAN2, $04, $12, EAST
+ dw Preload_Man2InWaterClubLobby
+ db NPC_PAPPY2, $16, $10, NORTH
+ dw $0000
+ db NPC_CLERK10, $06, $04, SOUTH
+ dw $0000
+ 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
+ db NPC_AMANDA, $16, $14, WEST
+ dw $0000
+ db NPC_JOSHUA, $16, $08, SOUTH
+ dw $0000
+ db NPC_AMY, $16, $04, SOUTH
+ dw Preload_Amy
+ db $00
+
+LightningClubEntranceNPCS: ; 7897 (4:13897)
+ db NPC_CLERK4, $06, $02, SOUTH
+ dw $0000
+ db NPC_RONALD1, $08, $fe, SOUTH
+ dw $685b
+ db NPC_RONALD2, $fe, $08, NORTH
+ dw $689a
+ db NPC_RONALD3, $fe, $08, NORTH
+ dw $6915
+ db $00
+
+LightningClubLobbyNPCS: ; 78b0 (4:138b0)
+ db NPC_CHAP2, $12, $10, WEST
+ dw $0000
+ db NPC_IMAKUNI, $12, $02, NORTH
+ dw $637b
+ db NPC_LASS4, $08, $0c, SOUTH
+ dw $0000
+ db NPC_HOOD1, $14, $08, SOUTH
+ dw $0000
+ db NPC_CLERK10, $06, $04, SOUTH
+ dw $0000
+ 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
+ db NPC_NICHOLAS, $06, $0a, SOUTH
+ dw $0000
+ db NPC_BRANDON, $16, $0c, NORTH
+ dw $0000
+ db NPC_ISAAC, $0c, $04, NORTH
+ dw $6494
+ db $00
+
+GrassClubEntranceNPCS: ; 78ee (4:138ee)
+ db NPC_CLERK5, $06, $02, SOUTH
+ dw $0000
+ db NPC_MICHAEL, $0e, $08, SOUTH
+ dw $656a
+ db NPC_RONALD1, $08, $fe, SOUTH
+ dw $685b
+ db NPC_RONALD2, $fe, $08, NORTH
+ dw $689a
+ db NPC_RONALD3, $fe, $08, NORTH
+ dw $6915
+ db $00
+
+GrassClubLobbyNPCS: ; 790d (4:1390d)
+ db NPC_BRITTANY, $0c, $0e, WEST
+ dw $0000
+ db NPC_LASS2, $12, $08, SOUTH
+ dw $0000
+ db NPC_GRANNY2, $04, $10, EAST
+ dw $0000
+ db NPC_GAL2, $14, $10, NORTH
+ dw $66dc
+ db NPC_CLERK10, $06, $04, SOUTH
+ dw $0000
+ 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
+ db NPC_HEATHER, $0e, $10, SOUTH
+ dw $0000
+ db NPC_NIKKI, $0c, $04, SOUTH
+ dw $6796
+ db $00
+
+PsychicClubEntranceNPCS: ; 7945 (4:13945)
+ db NPC_CLERK6, $06, $02, SOUTH
+ dw $0000
+ db NPC_RONALD1, $08, $fe, SOUTH
+ dw $685b
+ db NPC_RONALD2, $fe, $08, NORTH
+ dw $689a
+ db NPC_RONALD3, $fe, $08, NORTH
+ dw $6915
+ db NPC_LAD3, $0e, $04, SOUTH
+ dw $0000
+ db $00
+
+PsychicClubLobbyNPCS: ; 7964 (4:13964)
+ db NPC_ROBERT, $14, $08, NORTH
+ dw $0000
+ db NPC_PAPPY1, $04, $10, EAST
+ dw $0000
+ db NPC_RONALD1, $0c, $0a, EAST
+ dw $69f7
+ db NPC_GAL3, $10, $0e, WEST
+ dw $0000
+ db NPC_CHAP4, $18, $10, SOUTH
+ dw $0000
+ db NPC_CLERK10, $06, $04, SOUTH
+ dw $0000
+ 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
+ db NPC_STEPHANIE, $16, $0c, EAST
+ dw $0000
+ db NPC_MURRAY2, $02, $02, WEST
+ dw $6ad0
+ db NPC_MURRAY1, $0c, $06, SOUTH
+ dw $6ada
+ db $00
+
+ScienceClubEntranceNPCS: ; 79a8 (4:139a8)
+ db NPC_CLERK7, $06, $02, SOUTH
+ dw $0000
+ db NPC_RONALD1, $08, $fe, SOUTH
+ dw $685b
+ db NPC_RONALD2, $fe, $08, NORTH
+ dw $689a
+ db NPC_RONALD3, $fe, $08, NORTH
+ dw $6915
+ db $00
+
+ScienceClubLobbyNPCS: ; 79c1 (4:139c1)
+ db NPC_LAD1, $12, $12, NORTH
+ dw $0000
+ db NPC_IMAKUNI, $12, $02, NORTH
+ dw $6b65
+ db NPC_MAN3, $04, $0e, WEST
+ dw $0000
+ db NPC_SPECS2, $0c, $0e, WEST
+ dw $0000
+ db NPC_SPECS3, $16, $08, SOUTH
+ dw $0000
+ db NPC_CLERK10, $06, $04, SOUTH
+ dw $0000
+ 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
+ db NPC_DAVID, $14, $04, NORTH
+ dw $0000
+ db NPC_ERIK, $06, $12, SOUTH
+ dw $0000
+ db NPC_RICK, $04, $04, NORTH
+ dw $0000
+ db $00
+
+FireClubEntranceNPCS: ; 7a05 (4:13a05)
+ db NPC_CLERK8, $06, $02, SOUTH
+ dw $0000
+ db NPC_RONALD1, $08, $fe, SOUTH
+ dw $685b
+ db NPC_RONALD2, $fe, $08, NORTH
+ dw $689a
+ db NPC_RONALD3, $fe, $08, NORTH
+ dw $6915
+ db $00
+
+FireClubLobbyNPCS: ; 7a1e (4:13a1e)
+ db NPC_JESSICA, $0c, $0e, WEST
+ dw $6d8d
+ db NPC_LAD2, $12, $06, EAST
+ dw $6e25
+ db NPC_CHAP3, $06, $0a, NORTH
+ dw $0000
+ db NPC_MANIA, $14, $12, NORTH
+ dw $0000
+ db NPC_CLERK10, $06, $04, SOUTH
+ dw $0000
+ 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
+ db NPC_ADAM, $08, $0e, SOUTH
+ dw $0000
+ db NPC_JONATHAN, $12, $0a, SOUTH
+ dw $0000
+ db NPC_KEN, $0e, $04, SOUTH
+ dw $0000
+ db $00
+
+ChallengeHallEntranceNPCS: ; 7a5c (4:13a5c)
+ db NPC_CLERK9, $06, $02, SOUTH
+ dw Preload_Clerk9
+ db $00
+
+ChallengeHallLobbyNPCS: ; 7a63 (4:13a63)
+ db NPC_PAPPY3, $06, $0e, EAST
+ dw Preload_ChallengeHallNPCs1
+ db NPC_CHAMP, $10, $12, WEST
+ dw Preload_ChallengeHallNPCs1
+ db NPC_HOOD2, $14, $08, SOUTH
+ dw Preload_ChallengeHallNPCs1
+ db NPC_LASS5, $16, $10, WEST
+ dw Preload_ChallengeHallNPCs1
+ db NPC_GAL4, $0c, $0e, EAST
+ dw Preload_ChallengeHallNPCs2
+ db NPC_CHAP5, $10, $08, WEST
+ dw Preload_ChallengeHallNPCs2
+ db NPC_RONALD1, $08, $0c, SOUTH
+ dw Preload_ChallengeHallLobbyRonald1
+ db NPC_CLERK10, $06, $04, SOUTH
+ dw $0000
+ db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH
+ dw Preload_GiftCenterClerk
+ db $00
+
+ChallengeHallNPCS: ; 7a9a (4:13a9a)
+ db NPC_CLERK12, $0a, $12, SOUTH
+ dw Preload_ChallengeHallNPCs1
+ db NPC_CLERK13, $14, $12, SOUTH
+ dw Preload_ChallengeHallNPCs1
+ db NPC_GUIDE, $0e, $14, SOUTH
+ dw Preload_Guide
+ 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 NPC_RONALD1, $0e, $12, SOUTH
+ dw $0000
+ db $00
+
+PokemonDomeNPCS: ; 7ac0 (4:13ac0)
+ db NPC_COURTNEY, $12, $02, SOUTH
+ dw $774b
+ db NPC_STEVE, $16, $02, SOUTH
+ dw $778c
+ db NPC_JACK, $08, $02, SOUTH
+ dw $77a3
+ db NPC_ROD, $0c, $02, SOUTH
+ dw $77ba
+ db NPC_RONALD1, $1e, $00, SOUTH
+ dw $77d6
+ db $00
+
+HallOfHonorNPCS: ; 7adf (4:13adf)
+ db NPC_LEGENDARY_CARD_TOP_LEFT, $0a, $08, SOUTH
+ dw $0000
+ db NPC_LEGENDARY_CARD_TOP_RIGHT, $0c, $08, SOUTH
+ dw $0000
+ db NPC_LEGENDARY_CARD_LEFT_SPARK, $08, $0a, SOUTH
+ dw $0000
+ db NPC_LEGENDARY_CARD_BOTTOM_LEFT, $0a, $0a, SOUTH
+ dw $0000
+ db NPC_LEGENDARY_CARD_BOTTOM_RIGHT, $0c, $0a, SOUTH
+ dw $0000
+ db NPC_LEGENDARY_CARD_RIGHT_SPARK, $0e, $0a, SOUTH
+ dw $0000
+ db $00
+
diff --git a/src/data/npcs.asm b/src/data/npcs.asm
index ea4f7d5..7880a8b 100644
--- a/src/data/npcs.asm
+++ b/src/data/npcs.asm
@@ -1,9 +1,10 @@
; When you press the A button in front of something it will find a data entry somewhere on this list
; it will then jump to the pointer in the data item. All jumps lead to an RST20 operation.
+; The Deck IDs are used for the challenge hall
NPCHeaderPointers:
dw DrMasonNPCHeader
dw DrMasonNPCHeader
- dw RonaldNPCHeader
+ dw Ronald1NPCHeader
dw IshiharaNPCHeader
dw ImakuniNPCHeader
dw DrMasonNPCHeader
@@ -47,7 +48,7 @@ NPCHeaderPointers:
dw RobertNPCHeader
dw DanielNPCHeader
dw StephanieNPCHeader
- dw MurrayNPCHeader
+ dw Murray1NPCHeader
dw JosephNPCHeader
dw DavidNPCHeader
dw ErikNPCHeader
@@ -61,7 +62,7 @@ NPCHeaderPointers:
dw JackNPCHeader
dw RodNPCHeader
dw Clerk10NPCHeader
- dw Clerk11NPCHeader
+ dw GiftCenterClerkNPCHeader
dw Man1NPCHeader
dw Woman1NPCHeader
dw Chap1NPCHeader
@@ -107,10 +108,10 @@ NPCHeaderPointers:
dw TorchNPCHeader
dw LegendaryCardTopLeftNPCHeader
dw LegendaryCardTopRightNPCHeader
+ dw LegendaryCardLeftSparkNPCHeader
dw LegendaryCardBottomLeftNPCHeader
- dw LegendaryCardBottomCenterLeftNPCHeader
- dw LegendaryCardBottomCenterRightNPCHeader
dw LegendaryCardBottomRightNPCHeader
+ dw LegendaryCardRightSparkNPCHeader
dw DummyNPCHeader
dw DummyNPCHeader
dw Murray2NPCHeader
@@ -124,20 +125,20 @@ DrMasonNPCHeader:
db $00
db $26 ; palette and animation
db $00
- dw DrMasonNPCScript
+ dw Script_DrMason
tx DrMasonNPCName
db $00
db $00
db $00
db $00
-RonaldNPCHeader:
- db NPC_RONALD
+Ronald1NPCHeader:
+ db NPC_RONALD1
db SPRITE_RONALD
db $04
db $0e
db $00
- dw RonaldNPCScript
+ dw Script_Ronald
tx RonaldNPCName
db RONALD_PIC
db INVINCIBLE_RONALD_DECK_ID
@@ -150,7 +151,7 @@ Ronald2NPCHeader:
db $04
db $0e
db $00
- dw Ronald2NPCScript
+ dw Script_Ronald
tx RonaldNPCName
db RONALD_PIC
db INVINCIBLE_RONALD_DECK_ID
@@ -163,7 +164,7 @@ Ronald3NPCHeader:
db $04
db $0e
db $00
- dw Ronald3NPCScript
+ dw Script_Ronald
tx RonaldNPCName
db RONALD_PIC
db INVINCIBLE_RONALD_DECK_ID
@@ -176,7 +177,7 @@ IshiharaNPCHeader:
db $04
db $22
db $00
- dw IshiharaNPCScript
+ dw Script_Ishihara
tx IshiharaNPCName
db $00
db $00
@@ -189,7 +190,7 @@ ImakuniNPCHeader:
db $00
db $0e
db $00
- dw ImakuniNPCScript
+ dw Script_Imakuni
tx ImakuniNPCName
db IMAKUNI_PIC
db IMAKUNI_DECK_ID
@@ -202,7 +203,7 @@ SamNPCHeader:
db $00
db $0e
db $00
- dw SamNPCScript
+ dw Script_Sam
tx SamNPCName
db SAM_PIC
db SAMS_NORMAL_DECK_ID
@@ -215,7 +216,7 @@ Tech1NPCHeader:
db $00
db $0e
db $00
- dw Tech1NPCScript
+ dw Script_Tech1
tx TechNPCName
db $00
db $00
@@ -228,7 +229,7 @@ Tech2NPCHeader:
db $00
db $0e
db $00
- dw Tech2NPCScript
+ dw Script_Tech2
tx TechNPCName
db $00
db $00
@@ -241,7 +242,7 @@ Tech3NPCHeader:
db $00
db $0e
db $00
- dw Tech3NPCScript
+ dw Script_Tech3
tx TechNPCName
db $00
db $00
@@ -254,7 +255,7 @@ Tech4NPCHeader:
db $00
db $0e
db $00
- dw Tech4NPCScript
+ dw Script_Tech4
tx TechNPCName
db $00
db $00
@@ -267,7 +268,7 @@ Tech5NPCHeader:
db $00
db $0e
db $00
- dw Tech5NPCScript
+ dw Script_Tech5
tx TechNPCName
db $00
db $00
@@ -280,7 +281,7 @@ Tech6NPCHeader:
db $00
db $0e
db $00
- dw Tech6NPCScript
+ dw Script_Tech6
tx TechNPCName
db $00
db $00
@@ -293,7 +294,7 @@ Clerk1NPCHeader:
db $0a
db $30
db $00
- dw Clerk1NPCScript
+ dw Script_Clerk1
tx ClerkNPCName2
db $00
db $00
@@ -306,7 +307,7 @@ Clerk2NPCHeader:
db $0a
db $30
db $00
- dw Clerk2NPCScript
+ dw Script_Clerk2
tx ClerkNPCName2
db $00
db $00
@@ -319,7 +320,7 @@ Clerk3NPCHeader:
db $0a
db $30
db $00
- dw Clerk3NPCScript
+ dw Script_Clerk3
tx ClerkNPCName2
db $00
db $00
@@ -332,7 +333,7 @@ Clerk4NPCHeader:
db $0a
db $30
db $00
- dw Clerk4NPCScript
+ dw Script_Clerk4
tx ClerkNPCName2
db $00
db $00
@@ -345,7 +346,7 @@ Clerk5NPCHeader:
db $0a
db $30
db $00
- dw Clerk5NPCScript
+ dw Script_Clerk5
tx ClerkNPCName2
db $00
db $00
@@ -358,7 +359,7 @@ Clerk6NPCHeader:
db $0a
db $30
db $00
- dw Clerk6NPCScript
+ dw Script_Clerk6
tx ClerkNPCName2
db $00
db $00
@@ -371,7 +372,7 @@ Clerk7NPCHeader:
db $0a
db $30
db $00
- dw Clerk7NPCScript
+ dw Script_Clerk7
tx ClerkNPCName2
db $00
db $00
@@ -384,7 +385,7 @@ Clerk8NPCHeader:
db $0a
db $30
db $00
- dw Clerk8NPCScript
+ dw Script_Clerk8
tx ClerkNPCName2
db $00
db $00
@@ -397,7 +398,7 @@ Clerk9NPCHeader:
db $0a
db $30
db $00
- dw Clerk9NPCScript
+ dw Script_Clerk9
tx ClerkNPCName2
db $00
db $00
@@ -410,7 +411,7 @@ ChrisNPCHeader:
db $00
db $26
db $00
- dw ChrisNPCScript
+ dw Script_Chris
tx ChrisNPCName
db CHRIS_PIC
db MUSCLES_FOR_BRAINS_DECK_ID
@@ -423,7 +424,7 @@ MichaelNPCHeader:
db $00
db $26
db $00
- dw MichaelNPCScript
+ dw Script_Michael
tx MichaelNPCName
db MICHAEL_PIC
db HEATED_BATTLE_DECK_ID
@@ -436,7 +437,7 @@ JessicaNPCHeader:
db $04
db $1a
db $00
- dw JessicaNPCScript
+ dw Script_Jessica
tx JessicaNPCName
db JESSICA_PIC
db LOVE_TO_BATTLE_DECK_ID
@@ -449,7 +450,7 @@ MitchNPCHeader:
db $00
db $0e
db $00
- dw MitchNPCScript
+ dw Script_Mitch
tx MitchNPCName
db MITCH_PIC
db FIRST_STRIKE_DECK_ID
@@ -462,7 +463,7 @@ MatthewNPCHeader:
db $00
db $16
db $00
- dw MatthewNPCScript
+ dw Script_Matthew
tx MatthewNPCName
db MATTHEW_PIC
db HARD_POKEMON_DECK_ID
@@ -475,7 +476,7 @@ RyanNPCHeader:
db $00
db $26
db $00
- dw RyanNPCScript
+ dw Script_Ryan
tx RyanNPCName
db RYAN_PIC
db EXCAVATION_DECK_ID
@@ -488,7 +489,7 @@ AndrewNPCHeader:
db $00
db $16
db $00
- dw AndrewNPCScript
+ dw Script_Andrew
tx AndrewNPCName
db ANDREW_PIC
db BLISTERING_POKEMON_DECK_ID
@@ -501,7 +502,7 @@ GeneNPCHeader:
db $04
db $1e
db $00
- dw GeneNPCScript
+ dw Script_Gene
tx GeneNPCName
db GENE_PIC
db ROCK_CRUSHER_DECK_ID
@@ -514,7 +515,7 @@ SaraNPCHeader:
db $00
db $0e
db $00
- dw SaraNPCScript
+ dw Script_Sara
tx SaraNPCName
db SARA_PIC
db WATERFRONT_POKEMON_DECK_ID
@@ -527,7 +528,7 @@ AmandaNPCHeader:
db $00
db $16
db $00
- dw AmandaNPCScript
+ dw Script_Amanda
tx AmandaNPCName
db AMANDA_PIC
db LONELY_FRIENDS_DECK_ID
@@ -540,7 +541,7 @@ JoshuaNPCHeader:
db $00
db $26
db $00
- dw JoshuaNPCScript
+ dw Script_Joshua
tx JoshuaNPCName
db JOSHUA_PIC
db SOUND_OF_THE_WAVES_DECK_ID
@@ -553,7 +554,7 @@ AmyNPCHeader:
db $08
db $2e
db $10
- dw AmyNPCScript
+ dw Script_Amy
tx AmyNPCName
db AMY_PIC
db GO_GO_RAIN_DANCE_DECK_ID
@@ -566,7 +567,7 @@ JenniferNPCHeader:
db $04
db $0e
db $00
- dw JenniferNPCScript
+ dw Script_Jennifer
tx JenniferNPCName
db JENNIFER_PIC
db PIKACHU_DECK_ID
@@ -579,7 +580,7 @@ NicholasNPCHeader:
db $04
db $1e
db $00
- dw NicholasNPCScript
+ dw Script_Nicholas
tx NicholasNPCName
db NICHOLAS_PIC
db BOOM_BOOM_SELFDESTRUCT_DECK_ID
@@ -592,7 +593,7 @@ BrandonNPCHeader:
db $04
db $1e
db $00
- dw BrandonNPCScript
+ dw Script_Brandon
tx BrandonNPCName
db BRANDON_PIC
db POWER_GENERATOR_DECK_ID
@@ -605,7 +606,7 @@ IsaacNPCHeader:
db $00
db $16
db $00
- dw IsaacNPCScript
+ dw Script_Isaac
tx IsaacNPCName
db ISAAC_PIC
db ZAPPING_SELFDESTRUCT_DECK_ID
@@ -618,7 +619,7 @@ BrittanyNPCHeader:
db $04
db $0e
db $00
- dw BrittanyNPCScript
+ dw Script_Brittany
tx BrittanyNPCName
db BRITTANY_PIC
db ETCETERA_DECK_ID
@@ -631,7 +632,7 @@ KristinNPCHeader:
db $00
db $1e
db $00
- dw KristinNPCScript
+ dw Script_Kristin
tx KristinNPCName
db KRISTIN_PIC
db FLOWER_GARDEN_DECK_ID
@@ -644,7 +645,7 @@ HeatherNPCHeader:
db $04
db $22
db $00
- dw HeatherNPCScript
+ dw Script_Heather
tx HeatherNPCName
db HEATHER_PIC
db KALEIDOSCOPE_DECK_ID
@@ -657,7 +658,7 @@ NikkiNPCHeader:
db $00
db $1a
db $00
- dw NikkiNPCScript
+ dw Script_Nikki
tx NikkiNPCName
db NIKKI_PIC
db FLOWER_POWER_DECK_ID
@@ -670,7 +671,7 @@ RobertNPCHeader:
db $04
db $16
db $00
- dw RobertNPCScript
+ dw Script_Robert
tx RobertNPCName
db ROBERT_PIC
db GHOST_DECK_ID
@@ -683,7 +684,7 @@ DanielNPCHeader:
db $04
db $1a
db $00
- dw DanielNPCScript
+ dw Script_Daniel
tx DanielNPCName
db DANIEL_PIC
db NAP_TIME_DECK_ID
@@ -696,20 +697,20 @@ StephanieNPCHeader:
db $04
db $0e
db $00
- dw StephanieNPCScript
+ dw Script_Stephanie
tx StephanieNPCName
db STEPHANIE_PIC
db STRANGE_POWER_DECK_ID
db MUSIC_DUEL_THEME_2
db MUSIC_MATCH_START_1
-MurrayNPCHeader:
- db NPC_MURRAY
+Murray1NPCHeader:
+ db NPC_MURRAY1
db SPRITE_MURRAY
db $00
db $12
db $00
- dw MurrayNPCScript
+ dw Script_Murray1
tx MurrayNPCName
db MURRAY_PIC
db STRANGE_PSYSHOCK_DECK_ID
@@ -722,7 +723,7 @@ Murray2NPCHeader:
db $03
db $15
db $10
- dw Murray2NPCScript
+ dw Script_Murray2
tx MurrayNPCName
db MURRAY_PIC
db STRANGE_PSYSHOCK_DECK_ID
@@ -735,7 +736,7 @@ JosephNPCHeader:
db $00
db $0e
db $00
- dw JosephNPCScript
+ dw Script_Joseph
tx JosephNPCName
db JOSEPH_PIC
db FLYIN_POKEMON_DECK_ID
@@ -748,7 +749,7 @@ DavidNPCHeader:
db $00
db $0e
db $00
- dw DavidNPCScript
+ dw Script_David
tx DavidNPCName
db DAVID_PIC
db LOVELY_NIDORAN_DECK_ID
@@ -761,7 +762,7 @@ ErikNPCHeader:
db $00
db $0e
db $00
- dw ErikNPCScript
+ dw Script_Erik
tx ErikNPCName
db ERIK_PIC
db POISON_DECK_ID
@@ -774,7 +775,7 @@ RickNPCHeader:
db $00
db $0e
db $00
- dw RickNPCScript
+ dw Script_Rick
tx RickNPCName
db RICK_PIC
db WONDERS_OF_SCIENCE_DECK_ID
@@ -787,7 +788,7 @@ JohnNPCHeader:
db $04
db $1a
db $00
- dw JohnNPCScript
+ dw Script_John
tx JohnNPCName
db JOHN_PIC
db ANGER_DECK_ID
@@ -800,7 +801,7 @@ AdamNPCHeader:
db $00
db $22
db $00
- dw AdamNPCScript
+ dw Script_Adam
tx AdamNPCName
db ADAM_PIC
db FLAMETHROWER_DECK_ID
@@ -813,7 +814,7 @@ JonathanNPCHeader:
db $04
db $16
db $00
- dw JonathanNPCScript
+ dw Script_Jonathan
tx JonathanNPCName
db JONATHAN_PIC
db RESHUFFLE_DECK_ID
@@ -826,7 +827,7 @@ KenNPCHeader:
db $04
db $1e
db $00
- dw KenNPCScript
+ dw Script_Ken
tx KenNPCName
db KEN_PIC
db FIRE_CHARGE_DECK_ID
@@ -839,7 +840,7 @@ CourtneyNPCHeader:
db $00
db $12
db $00
- dw CourtneyNPCScript
+ dw Script_Courtney
tx CourtneyNPCName
db COURTNEY_PIC
db LEGENDARY_MOLTRES_DECK_ID
@@ -852,7 +853,7 @@ SteveNPCHeader:
db $00
db $2a
db $00
- dw SteveNPCScript
+ dw Script_Steve
tx SteveNPCName
db STEVE_PIC
db LEGENDARY_ZAPDOS_DECK_ID
@@ -865,7 +866,7 @@ JackNPCHeader:
db $00
db $26
db $00
- dw JackNPCScript
+ dw Script_Jack
tx JackNPCName
db JACK_PIC
db LEGENDARY_ARTICUNO_DECK_ID
@@ -878,7 +879,7 @@ RodNPCHeader:
db $00
db $0e
db $00
- dw RodNPCScript
+ dw Script_Rod
tx RodNPCName
db ROD_PIC
db LEGENDARY_DRAGONITE_DECK_ID
@@ -891,20 +892,20 @@ Clerk10NPCHeader:
db $0a
db $30
db $00
- dw Clerk10NPCScript
+ dw Script_Clerk10
tx ClerkNPCName
db $00
db $00
db $00
db $00
-Clerk11NPCHeader:
- db NPC_CLERK11
+GiftCenterClerkNPCHeader:
+ db NPC_GIFT_CENTER_CLERK
db SPRITE_CLERK
db $0a
db $30
db $00
- dw Clerk11NPCScript
+ dw Script_GiftCenterClerk
tx ClerkNPCName
db $00
db $00
@@ -917,7 +918,7 @@ Man1NPCHeader:
db $00
db $16
db $00
- dw Man1NPCScript
+ dw Script_Man1
tx ManNPCName
db $00
db $00
@@ -930,7 +931,7 @@ Woman1NPCHeader:
db $04
db $1e
db $00
- dw Woman1NPCScript
+ dw Script_Woman1
tx WomanNPCName
db $00
db $00
@@ -943,7 +944,7 @@ Chap1NPCHeader:
db $00
db $1a
db $00
- dw Chap1NPCScript
+ dw Script_Chap1
tx ChapNPCName
db $00
db $00
@@ -956,7 +957,7 @@ Gal1NPCHeader:
db $00
db $16
db $00
- dw Gal1NPCScript
+ dw Script_Gal1
tx GalNPCName
db $00
db $00
@@ -969,7 +970,7 @@ Lass1NPCHeader:
db $00
db $1e
db $00
- dw Lass1NPCScript
+ dw Script_Lass1
tx LassNPCName
db $00
db $00
@@ -982,7 +983,7 @@ Chap2NPCHeader:
db $00
db $1a
db $00
- dw Chap2NPCScript
+ dw Script_Chap2
tx ChapNPCName
db $00
db $00
@@ -995,7 +996,7 @@ Lass2NPCHeader:
db $00
db $1e
db $00
- dw Lass2NPCScript
+ dw Script_Lass2
tx LassNPCName
db $00
db $00
@@ -1008,7 +1009,7 @@ Pappy1NPCHeader:
db $00
db $22
db $00
- dw Pappy1NPCScript
+ dw Script_Pappy1
tx PappyNPCName
db $00
db $00
@@ -1021,7 +1022,7 @@ Lad1NPCHeader:
db $04
db $1a
db $00
- dw Lad1NPCScript
+ dw Script_Lad1
tx LadNPCName
db $00
db $00
@@ -1034,7 +1035,7 @@ Lad2NPCHeader:
db $04
db $16
db $00
- dw Lad2NPCScript
+ dw Script_Lad2
tx LadNPCName
db $00
db $00
@@ -1047,7 +1048,7 @@ Chap3NPCHeader:
db $00
db $1a
db $00
- dw Chap3NPCScript
+ dw Script_Chap3
tx ChapNPCName
db $00
db $00
@@ -1060,7 +1061,7 @@ Clerk12NPCHeader:
db $00
db $16
db $00
- dw Clerk12NPCScript
+ dw Script_Clerk12
tx ClerkNPCName2
db $00
db $00
@@ -1073,7 +1074,7 @@ Clerk13NPCHeader:
db $00
db $16
db $00
- dw Clerk13NPCScript
+ dw Script_Clerk13
tx ClerkNPCName2
db $00
db $00
@@ -1086,7 +1087,7 @@ HostNPCHeader:
db $00
db $16
db $00
- dw HostNPCScript
+ dw Script_Host
tx HostNPCName
db $00
db $00
@@ -1099,7 +1100,7 @@ Specs1NPCHeader:
db $00
db $22
db $00
- dw Specs1NPCScript
+ dw Script_Specs1
tx SpecsNPCName
db $00
db $00
@@ -1112,7 +1113,7 @@ ButchNPCHeader:
db $00
db $16
db $00
- dw ButchNPCScript
+ dw Script_Butch
tx ButchNPCName
db $00
db $00
@@ -1125,7 +1126,7 @@ Granny1NPCHeader:
db $00
db $16
db $00
- dw Granny1NPCScript
+ dw Script_Granny1
tx GrannyNPCName
db $00
db $00
@@ -1138,7 +1139,7 @@ Lass3NPCHeader:
db $04
db $22
db $00
- dw Lass3NPCScript
+ dw Script_Lass3
tx LassNPCName
db $00
db $00
@@ -1151,7 +1152,7 @@ Man2NPCHeader:
db $00
db $16
db $00
- dw Man2NPCScript
+ dw Script_Man2
tx ManNPCName
db $00
db $00
@@ -1164,7 +1165,7 @@ Pappy2NPCHeader:
db $00
db $22
db $00
- dw Pappy2NPCScript
+ dw Script_Pappy2
tx PappyNPCName
db $00
db $00
@@ -1177,7 +1178,7 @@ Lass4NPCHeader:
db $04
db $22
db $00
- dw Lass4NPCScript
+ dw Script_Lass4
tx LassNPCName
db $00
db $00
@@ -1190,7 +1191,7 @@ Hood1NPCHeader:
db $04
db $1e
db $00
- dw Hood1NPCScript
+ dw Script_Hood1
tx HoodNPCName
db $00
db $00
@@ -1203,7 +1204,7 @@ Granny2NPCHeader:
db $00
db $16
db $00
- dw Granny2NPCScript
+ dw Script_Granny2
tx GrannyNPCName
db $00
db $00
@@ -1216,7 +1217,7 @@ Gal2NPCHeader:
db $00
db $16
db $00
- dw Gal2NPCScript
+ dw Script_Gal2
tx GalNPCName
db $00
db $00
@@ -1229,7 +1230,7 @@ Lad3NPCHeader:
db $04
db $1a
db $00
- dw Lad3NPCScript
+ dw Script_Lad3
tx LadNPCName
db $00
db $00
@@ -1242,7 +1243,7 @@ Gal3NPCHeader:
db $00
db $16
db $00
- dw Gal3NPCScript
+ dw Script_Gal3
tx GalNPCName
db $00
db $00
@@ -1255,7 +1256,7 @@ Chap4NPCHeader:
db $00
db $1a
db $00
- dw Chap4NPCScript
+ dw Script_Chap4
tx ChapNPCName
db $00
db $00
@@ -1268,7 +1269,7 @@ Man3NPCHeader:
db $00
db $16
db $00
- dw Man3NPCScript
+ dw Script_Man3
tx ManNPCName
db $00
db $00
@@ -1281,7 +1282,7 @@ Specs2NPCHeader:
db $00
db $0e
db $00
- dw Specs2NPCScript
+ dw Script_Specs2
tx SpecsNPCName
db $00
db $00
@@ -1294,7 +1295,7 @@ Specs3NPCHeader:
db $00
db $22
db $00
- dw Specs3NPCScript
+ dw Script_Specs3
tx SpecsNPCName
db $00
db $00
@@ -1307,7 +1308,7 @@ Woman2NPCHeader:
db $04
db $1e
db $00
- dw Woman2NPCScript
+ dw Script_Woman2
tx WomanNPCName
db $00
db $00
@@ -1320,7 +1321,7 @@ ManiaNPCHeader:
db $00
db $26
db $00
- dw ManiaNPCScript
+ dw Script_Mania
tx ManiaNPCName
db $00
db $00
@@ -1333,7 +1334,7 @@ Pappy3NPCHeader:
db $00
db $22
db $00
- dw Pappy3NPCScript
+ dw Script_Pappy3
tx PappyNPCName
db $00
db $00
@@ -1346,7 +1347,7 @@ Gal4NPCHeader:
db $00
db $16
db $00
- dw Gal4NPCScript
+ dw Script_Gal4
tx GalNPCName
db $00
db $00
@@ -1359,7 +1360,7 @@ ChampNPCHeader:
db $00
db $26
db $00
- dw ChampNPCScript
+ dw Script_Champ
tx ChampNPCName
db $00
db $00
@@ -1372,7 +1373,7 @@ Hood2NPCHeader:
db $04
db $1e
db $00
- dw Hood2NPCScript
+ dw Script_Hood2
tx HoodNPCName
db $00
db $00
@@ -1385,7 +1386,7 @@ Lass5NPCHeader:
db $04
db $1a
db $00
- dw Lass5NPCScript
+ dw Script_Lass5
tx LassNPCName
db $00
db $00
@@ -1398,7 +1399,7 @@ Chap5NPCHeader:
db $00
db $1a
db $00
- dw Chap5NPCScript
+ dw Script_Chap5
tx ChapNPCName
db $00
db $00
@@ -1411,7 +1412,7 @@ AaronNPCHeader:
db $00
db $0e
db $00
- dw AaronNPCScript
+ dw Script_Aaron
tx AaronNPCName
db AARON_PIC
db LIGHTNING_AND_FIRE_DECK_ID
@@ -1424,7 +1425,7 @@ GuideNPCHeader:
db $00
db $16
db $00
- dw GuideNPCScript
+ dw Script_Guide
tx GuideNPCName
db $00
db $00
@@ -1437,7 +1438,7 @@ Tech7NPCHeader:
db $00
db $0e
db $00
- dw Tech7NPCScript
+ dw Script_Tech7
tx TechNPCName
db $00
db $00
@@ -1450,7 +1451,7 @@ Tech8NPCHeader:
db $00
db $0e
db $00
- dw Tech8NPCScript
+ dw Script_Tech8
tx TechNPCName
db $00
db $00
@@ -1463,7 +1464,7 @@ TorchNPCHeader:
db $3a
db $3a
db $10
- dw TorchNPCScript
+ dw Script_Torch
LegendaryCardTopLeftNPCHeader:
db NPC_LEGENDARY_CARD_TOP_LEFT
@@ -1471,7 +1472,7 @@ LegendaryCardTopLeftNPCHeader:
db $3b
db $41
db $50
- dw LegendaryCardTopLeftNPCScript
+ dw Script_LegendaryCardTopLeft
LegendaryCardTopRightNPCHeader:
db NPC_LEGENDARY_CARD_TOP_RIGHT
@@ -1479,39 +1480,39 @@ LegendaryCardTopRightNPCHeader:
db $3c
db $42
db $50
- dw LegendaryCardTopRightNPCScript
+ dw Script_LegendaryCardTopRight
-LegendaryCardBottomLeftNPCHeader:
- db NPC_LEGENDARY_CARD_BOTTOM_LEFT
+LegendaryCardLeftSparkNPCHeader:
+ db NPC_LEGENDARY_CARD_LEFT_SPARK
db $27
db $3d
db $43
db $50
- dw LegendaryCardBottomLeftNPCScript
+ dw Script_LegendaryCardLeftSpark
-LegendaryCardBottomCenterLeftNPCHeader:
- db NPC_LEGENDARY_CARD_BOTTOM_CENTER_LEFT
+LegendaryCardBottomLeftNPCHeader:
+ db NPC_LEGENDARY_CARD_BOTTOM_LEFT
db $27
db $3e
db $44
db $50
- dw LegendaryCardBottomCenterLeftNPCScript
+ dw Script_LegendaryCardBottomLeft
-LegendaryCardBottomCenterRightNPCHeader:
- db NPC_LEGENDARY_CARD_BOTTOM_CENTER_RIGHT
+LegendaryCardBottomRightNPCHeader:
+ db NPC_LEGENDARY_CARD_BOTTOM_RIGHT
db $27
db $3f
db $45
db $50
- dw LegendaryCardBottomCenterRightNPCScript
+ dw Script_LegendaryCardBottomRight
-LegendaryCardBottomRightNPCHeader:
- db NPC_LEGENDARY_CARD_BOTTOM_RIGHT
+LegendaryCardRightSparkNPCHeader:
+ db NPC_LEGENDARY_CARD_RIGHT_SPARK
db $27
db $40
db $46
db $50
- dw LegendaryCardBottomRightNPCScript
+ dw Script_LegendaryCardRightSpark
DummyNPCHeader:
db $00
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-01 22:02:50 +0000