summaryrefslogtreecommitdiff
path: root/src/data
diff options
context:
space:
mode:
Diffstat (limited to 'src/data')
-rw-r--r--src/data/level_objects.asm602
-rw-r--r--src/data/npc_map_data.asm58
-rw-r--r--src/data/npcs.asm24
3 files changed, 643 insertions, 41 deletions
diff --git a/src/data/level_objects.asm b/src/data/level_objects.asm
new file mode 100644
index 0000000..a0d51cc
--- /dev/null
+++ b/src/data/level_objects.asm
@@ -0,0 +1,602 @@
+LevelObjects_13b04: ; 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
+
+
+LevelObjects_13b4d: ; 13b4d (3:7b4d)
+ db NORTH, 2, 2
+ dw OWSequence_d932
+ tx Text041b
+ tx Text041a
+
+ db NORTH, 4, 2
+ dw OWSequence_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
+
+
+LevelObjects_13c02: ; 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
+
+
+LevelObjects_13c6f: ; 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 OWSequence_fc52
+ tx Text041b
+ tx Text03b0
+
+ db NORTH, 10, 6
+ dw Func_fc7a
+ tx Text041b
+ tx Text03b0
+
+ db $ff
+
+
+LevelObjects_13ca6: ; 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 OWSequence_fc52
+ tx Text041b
+ tx Text03b0
+
+ db NORTH, 10, 6
+ dw Func_fc7a
+ tx Text041b
+ tx Text03b0
+
+ db $ff
+
+
+LevelObjects_13cdd: ; 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 OWSequence_fc52
+ tx Text041b
+ tx Text03b0
+
+ db NORTH, 10, 6
+ dw Func_fc7a
+ tx Text041b
+ tx Text03b0
+
+ db $ff
+
+
+LevelObjects_13d14: ; 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 OWSequence_fc52
+ tx Text041b
+ tx Text03b0
+
+ db NORTH, 10, 6
+ dw Func_fc7a
+ tx Text041b
+ tx Text03b0
+
+ db $ff
+
+
+LevelObjects_13d4b: ; 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 OWSequence_fc52
+ tx Text041b
+ tx Text03b0
+
+ db NORTH, 10, 6
+ dw Func_fc7a
+ tx Text041b
+ tx Text03b0
+
+ db $ff
+
+
+LevelObjects_13d82: ; 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 OWSequence_fc52
+ tx Text041b
+ tx Text03b0
+
+ db NORTH, 10, 6
+ dw Func_fc7a
+ tx Text041b
+ tx Text03b0
+
+ db $ff
+
+
+LevelObjects_13db9: ; 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 OWSequence_fc52
+ tx Text041b
+ tx Text03b0
+
+ db NORTH, 10, 6
+ dw Func_fc7a
+ tx Text041b
+ tx Text03b0
+
+ db $ff
+
+
+LevelObjects_13df0: ; 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 OWSequence_fc52
+ tx Text041b
+ tx Text03b0
+
+ db NORTH, 10, 6
+ dw Func_fc7a
+ tx Text041b
+ tx Text03b0
+
+ db $ff
+
+
+LevelObjects_13e27: ; 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 OWSequence_fc52
+ tx Text041b
+ tx Text03b0
+
+ db NORTH, 10, 6
+ dw Func_fc7a
+ tx Text041b
+ tx Text03b0
+
+ db $ff
+
+
+LevelObjects_13e5e: ; 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 OWSequence_f631
+ tx Text0508
+ tx Text0507
+
+ db NORTH, 20, 0
+ dw OWSequence_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
+
+
+LevelObjects_13ec2: ; 13ec2 (3:7ec2)
+ db NORTH, 10, 10
+ dw $7bf1
+ dw $0000
+ dw $0000
+
+ db NORTH, 12, 10
+ dw $7bf1
+ 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/npc_map_data.asm b/src/data/npc_map_data.asm
index bae46d1..629eb91 100644
--- a/src/data/npc_map_data.asm
+++ b/src/data/npc_map_data.asm
@@ -31,11 +31,11 @@ DeckMachineRoomNPCS: ; 775a (4:1375a)
IshiharasHouseNPCS: ; 7773 (4:13773)
db NIKKI, $04, $04, NORTH
- dw $5add
+ dw Preload_NikkiInIshiharasHouse
db ISHIHARA, $08, $08, SOUTH
- dw $5b3d
+ dw Preload_IshiharaInIshiharasHouse
db RONALD1, $02, $04, WEST
- dw $5c43
+ dw Preload_Ronald1InIshiharasHouse
db $00
FightingClubEntranceNPCS: ; 7786 (4:13786)
@@ -62,8 +62,8 @@ FightingClubLobbyNPCS: ; 779f (4:1379f)
dw $5d98
db CLERK10, $06, $04, SOUTH
dw $0000
- db CLERK11, $0a, $04, SOUTH
- dw $7c6c
+ db GIFT_CENTER_CLERK, $0a, $04, SOUTH
+ dw Preload_GiftCenterClerk
db $00
FightingClubNPCS: ; 77ca (4:137ca)
@@ -101,8 +101,8 @@ RockClubLobbyNPCS: ; 77fc (4:137fc)
dw $5fcb
db CLERK10, $06, $04, SOUTH
dw $0000
- db CLERK11, $0a, $04, SOUTH
- dw $7c6c
+ db GIFT_CENTER_CLERK, $0a, $04, SOUTH
+ dw Preload_GiftCenterClerk
db $00
RockClubNPCS: ; 7827 (4:13827)
@@ -131,15 +131,15 @@ WaterClubLobbyNPCS: ; 7853 (4:13853)
db LASS1, $10, $0a, SOUTH
dw $0000
db IMAKUNI, $12, $02, NORTH
- dw $60b0
+ dw Preload_ImakuniInWaterClubLobby
db MAN2, $04, $12, EAST
- dw $6130
+ dw Preload_Man2InWaterClubLobby
db PAPPY2, $16, $10, NORTH
dw $0000
db CLERK10, $06, $04, SOUTH
dw $0000
- db CLERK11, $0a, $04, SOUTH
- dw $7c6c
+ db GIFT_CENTER_CLERK, $0a, $04, SOUTH
+ dw Preload_GiftCenterClerk
db $00
WaterClubNPCS: ; 787e (4:1387e)
@@ -175,8 +175,8 @@ LightningClubLobbyNPCS: ; 78b0 (4:138b0)
dw $0000
db CLERK10, $06, $04, SOUTH
dw $0000
- db CLERK11, $0a, $04, SOUTH
- dw $7c6c
+ db GIFT_CENTER_CLERK, $0a, $04, SOUTH
+ dw Preload_GiftCenterClerk
db $00
LightningClubNPCS: ; 78d5 (4:138d5)
@@ -214,8 +214,8 @@ GrassClubLobbyNPCS: ; 790d (4:1390d)
dw $66dc
db CLERK10, $06, $04, SOUTH
dw $0000
- db CLERK11, $0a, $04, SOUTH
- dw $7c6c
+ db GIFT_CENTER_CLERK, $0a, $04, SOUTH
+ dw Preload_GiftCenterClerk
db $00
GrassClubNPCS: ; 7932 (4:13932)
@@ -253,8 +253,8 @@ PsychicClubLobbyNPCS: ; 7964 (4:13964)
dw $0000
db CLERK10, $06, $04, SOUTH
dw $0000
- db CLERK11, $0a, $04, SOUTH
- dw $7c6c
+ db GIFT_CENTER_CLERK, $0a, $04, SOUTH
+ dw Preload_GiftCenterClerk
db $00
PsychicClubNPCS: ; 798f (4:1398f)
@@ -292,8 +292,8 @@ ScienceClubLobbyNPCS: ; 79c1 (4:139c1)
dw $0000
db CLERK10, $06, $04, SOUTH
dw $0000
- db CLERK11, $0a, $04, SOUTH
- dw $7c6c
+ db GIFT_CENTER_CLERK, $0a, $04, SOUTH
+ dw Preload_GiftCenterClerk
db $00
ScienceClubNPCS: ; 79ec (4:139ec)
@@ -329,8 +329,8 @@ FireClubLobbyNPCS: ; 7a1e (4:13a1e)
dw $0000
db CLERK10, $06, $04, SOUTH
dw $0000
- db CLERK11, $0a, $04, SOUTH
- dw $7c6c
+ db GIFT_CENTER_CLERK, $0a, $04, SOUTH
+ dw Preload_GiftCenterClerk
db $00
FireClubNPCS: ; 7a43 (4:13a43)
@@ -366,8 +366,8 @@ ChallengeHallLobbyNPCS: ; 7a63 (4:13a63)
dw $70b4
db CLERK10, $06, $04, SOUTH
dw $0000
- db CLERK11, $0a, $04, SOUTH
- dw $7c6c
+ db GIFT_CENTER_CLERK, $0a, $04, SOUTH
+ dw Preload_GiftCenterClerk
db $00
ChallengeHallNPCS: ; 7a9a (4:13a9a)
@@ -402,17 +402,17 @@ PokemonDomeNPCS: ; 7ac0 (4:13ac0)
db $00
HallOfHonorNPCS: ; 7adf (4:13adf)
- db _11F1F, $0a, $08, SOUTH
+ db LEGEND_CARDS_TOP_LEFT, $0a, $08, SOUTH
dw $0000
- db _11F26, $0c, $08, SOUTH
+ db LEGEND_CARDS_TOP_RIGHT, $0c, $08, SOUTH
dw $0000
- db _11F2D, $08, $0a, SOUTH
+ db LEGEND_CARDS_LEFT_SPARK, $08, $0a, SOUTH
dw $0000
- db _11F34, $0a, $0a, SOUTH
+ db LEGEND_CARDS_BOTTOM_LEFT, $0a, $0a, SOUTH
dw $0000
- db _11F3B, $0c, $0a, SOUTH
+ db LEGEND_CARDS_BOTTOM_RIGHT, $0c, $0a, SOUTH
dw $0000
- db _11F42, $0e, $0a, SOUTH
+ db LEGEND_CARDS_RIGHT_SPARK, $0e, $0a, SOUTH
dw $0000
db $00
diff --git a/src/data/npcs.asm b/src/data/npcs.asm
index 4ff42c8..8fb8773 100644
--- a/src/data/npcs.asm
+++ b/src/data/npcs.asm
@@ -61,7 +61,7 @@ NPCDataTable:
dw JackData
dw RodData
dw Clerk10Data
- dw Clerk11Data
+ dw GiftCenterClerkData
dw Man1Data
dw Woman1Data
dw Chap1Data
@@ -135,7 +135,7 @@ Ronald1Data:
db $04
db $0e
db $00
- dw $5c4b ; Pointer to OWScript
+ dw OWSequence_Ronald ; Pointer to OWScript
tx Text03ad
db RONALD_PIC
db $1a
@@ -147,7 +147,7 @@ Ronald2Data:
db $04
db $0e
db $00
- dw $5c4b ; Pointer to OWScript
+ dw OWSequence_Ronald ; Pointer to OWScript
tx Text03ad
db RONALD_PIC
db $1a
@@ -159,7 +159,7 @@ Ronald3Data:
db $04
db $0e
db $00
- dw $5c4b ; Pointer to OWScript
+ dw OWSequence_Ronald ; Pointer to OWScript
tx Text03ad
db RONALD_PIC
db $1a
@@ -171,7 +171,7 @@ IshiharaData:
db $04
db $22
db $00
- dw $5b4a ; Pointer to OWScript
+ dw OWSequence_Ishihara ; Pointer to OWScript
tx Text03ae
db $00
db $00
@@ -279,7 +279,7 @@ Clerk1Data:
db $0a
db $30
db $00
- dw $5c64 ; Pointer to OWScript
+ dw OWSequence_Clerk1 ; Pointer to OWScript
tx Text03b3
db $00
db $00
@@ -837,8 +837,8 @@ Clerk10Data:
db $00
db $00
db $00
-Clerk11Data:
- db CLERK11
+GiftCenterClerkData:
+ db GIFT_CENTER_CLERK
db $21
db $0a
db $30
@@ -891,7 +891,7 @@ Gal1Data:
db $00
db $16
db $00
- dw $60cf ; Pointer to OWScript
+ dw OWSequence_Gal1 ; Pointer to OWScript
tx Text03db
db $00
db $00
@@ -903,7 +903,7 @@ Lass1Data:
db $00
db $1e
db $00
- dw $6111 ; Pointer to OWScript
+ dw OWSequence_Lass1 ; Pointer to OWScript
tx Text03dc
db $00
db $00
@@ -1071,7 +1071,7 @@ Man2Data:
db $00
db $16
db $00
- dw $6137 ; Pointer to OWScript
+ dw OWSequence_Man2 ; Pointer to OWScript
tx Text03d8
db $00
db $00
@@ -1083,7 +1083,7 @@ Pappy2Data:
db $00
db $22
db $00
- dw $613b ; Pointer to OWScript
+ dw OWSequence_Pappy2 ; Pointer to OWScript
tx Text03dd
db $00
db $00
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-09 15:29:49 +0000