From 948b270a83dce5f985cf347e88cd3ed0b110e1c1 Mon Sep 17 00:00:00 2001 From: Andrew Martinek Date: Thu, 12 Sep 2019 12:29:47 -0400 Subject: Script reversing --- src/data/npcs.asm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/data') diff --git a/src/data/npcs.asm b/src/data/npcs.asm index caa11af..41cd562 100644 --- a/src/data/npcs.asm +++ b/src/data/npcs.asm @@ -124,8 +124,7 @@ Data_119dd: db $26 db $00 dw $5727 ; Pointer to NPC Data - db $ac - db $03 + tx Text03ac db $00 db $00 db $00 -- cgit v1.2.3 From 751b28d4fee472af4d0de83ef22a1f11ec6fade6 Mon Sep 17 00:00:00 2001 From: Andrew Martinek Date: Sun, 15 Sep 2019 21:55:11 -0400 Subject: Lots of NPC data, some temp. comments on mapdatapointers --- src/data/npcs.asm | 1006 ++++++++++++++++++++++++----------------------------- 1 file changed, 452 insertions(+), 554 deletions(-) (limited to 'src/data') diff --git a/src/data/npcs.asm b/src/data/npcs.asm index 41cd562..23b4330 100644 --- a/src/data/npcs.asm +++ b/src/data/npcs.asm @@ -1,110 +1,110 @@ ; 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. PointerTable_118f5: - dw Data_119dd - dw Data_119dd - dw Data_119ea - dw Data_11a11 - dw Data_11a1e - dw Data_119dd - dw Data_119dd - dw Data_11a2b - dw Data_11a38 - dw Data_11a45 - dw Data_11a52 - dw Data_11a5f - dw Data_11a6c - dw Data_11a79 - dw Data_11a86 - dw Data_11a93 - dw Data_11aa0 - dw Data_11aad - dw Data_11aba - dw Data_11ac7 - dw Data_11ad4 - dw Data_11ae1 - dw Data_11aee - dw Data_11afb - dw Data_11b08 - dw Data_11b15 - dw Data_11b22 - dw Data_11b2f - dw Data_11b3c - dw Data_11b49 - dw Data_11b56 + dw DrMasonData + dw DrMasonData + dw Ronald1Data + dw IshiharaData + dw ImakuniData + dw DrMasonData + dw DrMasonData + dw SamData + dw Tech1Data + dw Tech2Data + dw Tech3Data + dw Tech4Data + dw Tech5Data + dw Tech6Data + dw Clerk1Data + dw Clerk2Data + dw Clerk3Data + dw Clerk4Data + dw Clerk5Data + dw Clerk6Data + dw Clerk7Data + dw Clerk8Data + dw Clerk9Data + dw ChrisData + dw MichaelData + dw JessicaData + dw MitchData + dw MatthewData + dw RyanData + dw AndrewData + dw GeneData dw SaraData dw AmandaData - dw Data_11b7d - dw Data_11b8a - dw Data_11b97 - dw Data_11ba4 - dw Data_11bb1 - dw Data_11bbe - dw Data_11bcb - dw Data_11bd8 - dw Data_11be5 - dw Data_11bf2 - dw Data_11bff - dw Data_11c0c - dw Data_11c19 - dw Data_11c26 - dw Data_11c40 - dw Data_11c4d - dw Data_11c5a - dw Data_11c67 - dw Data_11c74 - dw Data_11c81 - dw Data_11c8e - dw Data_11c9b - dw Data_11ca8 - dw Data_11cb5 - dw Data_11cc2 - dw Data_11ccf - dw Data_11cdc - dw Data_11ce9 - dw Data_11cf6 - dw Data_11d03 - dw Data_11d10 - dw Data_11d1d - dw Data_11d2a - dw Data_11d37 - dw Data_11d44 - dw Data_11d51 - dw Data_11d5e - dw Data_11d6b - dw Data_11d78 - dw Data_11d85 - dw Data_11d92 - dw Data_11d9f - dw Data_11dac - dw Data_11db9 - dw Data_11dc6 - dw Data_11dd3 - dw Data_11de0 - dw Data_11ded - dw Data_11dfa - dw Data_11e07 - dw Data_11e14 - dw Data_11e21 - dw Data_11e2e - dw Data_11e3b - dw Data_11e48 - dw Data_11e55 - dw Data_11e62 - dw Data_11e6f - dw Data_11e7c - dw Data_11e89 - dw Data_11e96 - dw Data_11ea3 - dw Data_11eb0 - dw Data_11ebd - dw Data_11eca - dw Data_11ed7 - dw Data_11ee4 - dw Data_11ef1 - dw Data_11efe - dw Data_11f0b - dw Data_11f18 + dw JoshuaData + dw AmyData + dw JenniferData + dw NicholasData + dw BrandonData + dw IsaacData + dw BrittanyData + dw KristinData + dw HeatherData + dw NikkiData + dw RobertData + dw DanielData + dw StephanieData + dw Murray1Data + dw JosephData + dw DavidData + dw ErikData + dw RickData + dw JohnData + dw AdamData + dw JonathanData + dw KenData + dw CourtneyData + dw SteveData + dw JackData + dw RodData + dw Clerk10Data + dw Clerk11Data + dw Man1Data + dw Woman1Data + dw Chap1Data + dw Gal1Data + dw Lass1Data + dw Chap2Data + dw Lass2Data + dw Pappy1Data + dw Lad1Data + dw Lad2Data + dw Chap3Data + dw Clerk12Data + dw Clerk13Data + dw HostData + dw Specs1Data + dw ButchData + dw Granny1Data + dw Lass3Data + dw Man2Data + dw Pappy2Data + dw Lass4Data + dw Hood1Data + dw Granny2Data + dw Gal2Data + dw Lad3Data + dw Gal3Data + dw Chap4Data + dw Man3Data + dw Specs2Data + dw Specs3Data + dw Woman2Data + dw ManiaData + dw Pappy3Data + dw Gal4Data + dw ChampData + dw Hood2Data + dw Lass5Data + dw Chap5Data + dw AaronData + dw GuideData + dw Tech7Data + dw Tech8Data + dw Data_11f18 ; these actually are used for the effects around the legendary cards dw Data_11f1f dw Data_11f26 dw Data_11f2d @@ -113,12 +113,12 @@ PointerTable_118f5: dw Data_11f42 dw Data_11f49 dw Data_11f49 - dw Data_11c33 - dw Data_119f7 - dw Data_11a04 + dw Murray2Data + dw Ronald2Data + dw Ronald3Data dw Data_11f49 -Data_119dd: - db $01 +DrMasonData: + db DRMASON db $02 db $00 db $26 @@ -129,393 +129,363 @@ Data_119dd: db $00 db $00 db $00 -Data_119ea: - db $02 +Ronald1Data: + db RONALD1 db $01 db $04 db $0e db $00 dw $5c4b ; Pointer to NPC Data - db $ad - db $03 - db $02 + tx Text03ad + db RONALD_PIC db $1a db $0f db $16 -Data_119f7: - db $71 +Ronald2Data: + db RONALD2 db $01 db $04 db $0e db $00 dw $5c4b ; Pointer to NPC Data - db $ad - db $03 - db $02 + tx Text03ad + db RONALD_PIC db $1a db $0f db $16 -Data_11a04: - db $72 +Ronald3Data: + db RONALD3 db $01 db $04 db $0e db $00 dw $5c4b ; Pointer to NPC Data - db $ad - db $03 - db $02 + tx Text03ad + db RONALD_PIC db $1a db $0f db $16 -Data_11a11: - db $03 +IshiharaData: + db ISHIHARA db $03 db $04 db $22 db $00 dw $5b4a ; Pointer to NPC Data - db $ae - db $03 + tx Text03ae db $00 db $00 db $00 db $00 -Data_11a1e: - db $04 +ImakuniData: + db IMAKUNI db $04 db $00 db $0e db $00 dw $5d0d ; Pointer to NPC Data - db $af - db $03 - db $04 + tx Text03af + db IMAKUNI_PIC db $34 db $10 db $15 -Data_11a2b: - db $07 +SamData: + db SAM db $18 db $00 db $0e db $00 dw $561d ; Pointer to NPC Data - db $b1 - db $03 - db $03 + tx Text03b1 + db SAM_PIC db $02 db $02 db $15 -Data_11a38: - db $08 +Tech1Data: + db TECH1 db $18 db $00 db $0e db $00 dw $5583 ; Pointer to NPC Data - db $b2 - db $03 + tx Text03b2 db $00 db $00 db $00 db $00 -Data_11a45: - db $09 +Tech2Data: + db TECH2 db $18 db $00 db $0e db $00 dw $55ca ; Pointer to NPC Data - db $b2 - db $03 + tx Text03b2 db $00 db $00 db $00 db $00 -Data_11a52: - db $0a +Tech3Data: + db TECH3 db $18 db $00 db $0e db $00 dw $55d5 ; Pointer to NPC Data - db $b2 - db $03 + tx Text03b2 db $00 db $00 db $00 db $00 -Data_11a5f: - db $0b +Tech4Data: + db TECH4 db $18 db $00 db $0e db $00 dw $55e0 ; Pointer to NPC Data - db $b2 - db $03 + tx Text03b2 db $00 db $00 db $00 db $00 -Data_11a6c: - db $0c +Tech5Data: + db TECH5 db $18 db $00 db $0e db $00 dw $55f9 ; Pointer to NPC Data - db $b2 - db $03 + tx Text03b2 db $00 db $00 db $00 db $00 -Data_11a79: - db $0d +Tech6Data: + db TECH6 db $18 db $00 db $0e db $00 dw $58bb ; Pointer to NPC Data - db $b2 - db $03 + tx Text03b2 db $00 db $00 db $00 db $00 -Data_11a86: - db $0e +Clerk1Data: + db CLERK1 db $21 db $0a db $30 db $00 dw $5c64 ; Pointer to NPC Data - db $b3 - db $03 + tx Text03b3 db $00 db $00 db $00 db $00 -Data_11a93: - db $0f +Clerk2Data: + db CLERK2 db $21 db $0a db $30 db $00 dw $5ed1 ; Pointer to NPC Data - db $b3 - db $03 + tx Text03b3 db $00 db $00 db $00 db $00 -Data_11aa0: - db $10 +Clerk3Data: + db CLERK3 db $21 db $0a db $30 db $00 dw $609e ; Pointer to NPC Data - db $b3 - db $03 + tx Text03b3 db $00 db $00 db $00 db $00 -Data_11aad: - db $11 +Clerk4Data: + db CLERK4 db $21 db $0a db $30 db $00 dw $6369 ; Pointer to NPC Data - db $b3 - db $03 + tx Text03b3 db $00 db $00 db $00 db $00 -Data_11aba: - db $12 +Clerk5Data: + db CLERK5 db $21 db $0a db $30 db $00 dw $6566 ; Pointer to NPC Data - db $b3 - db $03 + tx Text03b3 db $00 db $00 db $00 db $00 -Data_11ac7: - db $13 +Clerk6Data: + db CLERK6 db $21 db $0a db $30 db $00 dw $684c ; Pointer to NPC Data - db $b3 - db $03 + tx Text03b3 db $00 db $00 db $00 db $00 -Data_11ad4: - db $14 +Clerk7Data: + db CLERK7 db $21 db $0a db $30 db $00 dw $6b53 ; Pointer to NPC Data - db $b3 - db $03 + tx Text03b3 db $00 db $00 db $00 db $00 -Data_11ae1: - db $15 +Clerk8Data: + db CLERK8 db $21 db $0a db $30 db $00 dw $6d45 ; Pointer to NPC Data - db $b3 - db $03 + tx Text03b3 db $00 db $00 db $00 db $00 -Data_11aee: - db $16 +Clerk9Data: + db CLERK9 db $21 db $0a db $30 db $00 dw $7025 ; Pointer to NPC Data - db $b3 - db $03 + tx Text03b3 db $00 db $00 db $00 db $00 -Data_11afb: - db $17 +ChrisData: + db CHRIS db $15 db $00 db $26 db $00 dw $5ef2 ; Pointer to NPC Data - db $b4 - db $03 - db $1d + tx Text03b4 + db CHRIS_PIC db $1c db $03 db $15 -Data_11b08: - db $18 +MichaelData: + db MICHAEL db $15 db $00 db $26 db $00 dw $6573 ; Pointer to NPC Data - db $b5 - db $03 - db $1e + tx Text03b5 + db MICHAEL_PIC db $1d db $03 db $15 -Data_11b15: - db $19 +JessicaData: + db JESSICA db $1f db $04 db $1a db $00 dw $6d96 ; Pointer to NPC Data - db $b6 - db $03 - db $27 + tx Text03b6 + db JESSICA_PIC db $1e db $03 db $15 -Data_11b22: - db $1a +MitchData: + db MITCH db $0a db $00 db $0e db $00 dw $5dc3 ; Pointer to NPC Data - db $b7 - db $03 - db $0a + tx Text03b7 + db MITCH_PIC db $10 db $03 db $16 -Data_11b2f: - db $1b +MatthewData: + db MATTHEW db $15 db $00 db $16 db $00 dw $5f39 ; Pointer to NPC Data - db $b8 - db $03 - db $1a + tx Text03b8 + db MATTHEW_PIC db $21 db $03 db $15 -Data_11b3c: - db $1c +RyanData: + db RYAN db $11 db $00 db $26 db $00 dw $5ff0 ; Pointer to NPC Data - db $b9 - db $03 - db $1b + tx Text03b9 + db RYAN_PIC db $1f db $03 db $15 -Data_11b49: - db $1d +AndrewData: + db ANDREW db $1a db $00 db $16 db $00 dw $6017 ; Pointer to NPC Data - db $ba - db $03 - db $1c + tx Text03ba + db ANDREW_PIC db $20 db $03 db $15 -Data_11b56: - db $1e +GeneData: + db GENE db $0b db $04 db $1e db $00 dw $603e ; Pointer to NPC Data - db $bb - db $03 - db $0b + tx Text03bb + db GENE_PIC db $11 db $03 db $16 SaraData: - db SARA ; trainer id + db SARA db $20 db $00 db $0e db $00 dw OWSequence_Sara ; Pointer to NPC Data - db $bc - db $03 - db SARA_PIC ; battle profile picture + tx Text03bc + db SARA_PIC db $22 db $03 db $15 @@ -526,931 +496,859 @@ AmandaData: db $16 db $00 dw OWSequence_Amanda ; Pointer to NPC Data - db $bd - db $03 + tx Text03bd db AMANDA_PIC ; battle profile picture db $23 db $03 db $15 -Data_11b7d: - db $21 +JoshuaData: + db JOSHUA db $16 db $00 db $26 db $00 dw OWSequence_Joshua ; Pointer to NPC Data - db $be - db $03 - db $17 + tx Text03be + db JOSHUA_PIC db $24 db $03 db $15 -Data_11b8a: - db $22 +AmyData: + db AMY db $08 db $08 db $2e db $10 dw $6304 ; Pointer to NPC Data - db $bf - db $03 - db $08 + tx Text03bf + db AMY_PIC db $12 db $03 db $16 -Data_11b97: - db $23 +JenniferData: + db JENNIFER db $1c db $04 db $0e db $00 dw $6408 ; Pointer to NPC Data - db $c0 - db $03 - db $26 + tx Text03c0 + db JENNIFER_PIC db $25 db $03 db $15 -Data_11ba4: - db $24 +NicholasData: + db NICHOLAS db $17 db $04 db $1e db $00 dw $642f ; Pointer to NPC Data - db $c1 - db $03 - db $18 + tx Text03c1 + db NICHOLAS_PIC db $26 db $03 db $15 -Data_11bb1: - db $25 +BrandonData: + db BRANDON db $17 db $04 db $1e db $00 dw $6456 ; Pointer to NPC Data - db $c2 - db $03 - db $19 + tx Text03c2 + db BRANDON_PIC db $27 db $03 db $15 -Data_11bbe: - db $26 +IsaacData: + db ISAAC db $09 db $00 db $16 db $00 dw $64ad ; Pointer to NPC Data - db $c3 - db $03 - db $09 + tx Text03c3 + db ISAAC_PIC db $13 db $03 db $16 -Data_11bcb: - db $27 +BrittanyData: + db BRITTANY db $1c db $04 db $0e db $00 dw $65d2 ; Pointer to NPC Data - db $c4 - db $03 - db $21 + tx Text03c4 + db BRITTANY_PIC db $28 db $03 db $15 -Data_11bd8: - db $28 +KristinData: + db KRISTIN db $1e db $00 db $1e db $00 dw $6701 ; Pointer to NPC Data - db $c5 - db $03 - db $22 + tx Text03c5 + db KRISTIN_PIC db $29 db $03 db $15 -Data_11be5: - db $29 +HeatherData: + db HEATHER db $1d db $04 db $22 db $00 dw $6745 ; Pointer to NPC Data - db $c6 - db $03 - db $23 + tx Text03c6 + db HEATHER_PIC db $2a db $03 db $15 -Data_11bf2: - db $2a +NikkiData: + db NIKKI db $05 db $00 db $1a db $00 dw $679e ; Pointer to NPC Data - db $c7 - db $03 - db $05 + tx Text03c7 + db NIKKI_PIC db $14 db $03 db $16 -Data_11bff: - db $2b +RobertData: + db ROBERT db $11 db $04 db $16 db $00 dw $6980 ; Pointer to NPC Data - db $c8 - db $03 - db $20 + tx Text03c8 + db ROBERT_PIC db $2b db $03 db $15 -Data_11c0c: - db $2c +DanielData: + db DANIEL db $12 db $04 db $1a db $00 dw $6a60 ; Pointer to NPC Data - db $c9 - db $03 - db $1f + tx Text03c9 + db DANIEL_PIC db $2c db $03 db $15 -Data_11c19: - db $2d +StephanieData: + db STEPHANIE db $1c db $04 db $0e db $00 dw $6aa2 ; Pointer to NPC Data - db $ca - db $03 - db $28 + tx Text03ca + db STEPHANIE_PIC db $2d db $03 db $15 -Data_11c26: - db $2e +Murray1Data: + db MURRAY1 db $0c db $00 db $12 db $00 dw $6adf ; Pointer to NPC Data - db $cb - db $03 - db $0c + tx Text03cb + db MURRAY_PIC db $15 db $03 db $16 -Data_11c33: - db $70 +Murray2Data: + db MURRAY2 db $0c db $03 db $15 db $10 dw $6adf ; Pointer to NPC Data - db $cb - db $03 - db $0c + tx Text03cb + db MURRAY_PIC db $15 db $03 db $16 -Data_11c40: - db $2f +JosephData: + db JOSEPH db $18 db $00 db $0e db $00 dw $6cdb ; Pointer to NPC Data - db $cc - db $03 - db $11 + tx Text03cc + db JOSEPH_PIC db $2e db $03 db $15 -Data_11c4d: - db $30 +DavidData: + db DAVID db $18 db $00 db $0e db $00 dw $6c11 ; Pointer to NPC Data - db $cd - db $03 - db $12 + tx Text03cd + db DAVID_PIC db $2f db $03 db $15 -Data_11c5a: - db $31 +ErikData: + db ERIK db $18 db $00 db $0e db $00 dw $6c42 ; Pointer to NPC Data - db $ce - db $03 - db $13 + tx Text03ce + db ERIK_PIC db $30 db $03 db $15 -Data_11c67: - db $32 +RickData: + db RICK db $06 db $00 db $0e db $00 dw $6c67 ; Pointer to NPC Data - db $cf - db $03 - db $06 + tx Text03cf + db RICK_PIC db $16 db $03 db $16 -Data_11c74: - db $33 +JohnData: + db JOHN db $12 db $04 db $1a db $00 dw $6eb3 ; Pointer to NPC Data - db $d0 - db $03 - db $14 + tx Text03d0 + db JOHN_PIC db $31 db $03 db $15 -Data_11c81: - db $34 +AdamData: + db ADAM db $13 db $00 db $22 db $00 dw $6ed8 ; Pointer to NPC Data - db $d1 - db $03 - db $15 + tx Text03d1 + db ADAM_PIC db $32 db $03 db $15 -Data_11c8e: - db $35 +JonathanData: + db JONATHAN db $11 db $04 db $16 db $00 dw $6efd ; Pointer to NPC Data - db $d2 - db $03 - db $16 + tx Text03d2 + db JONATHAN_PIC db $33 db $03 db $15 -Data_11c9b: - db $36 +KenData: + db KEN db $07 db $04 db $1e db $00 dw $6f22 ; Pointer to NPC Data - db $d3 - db $03 - db $07 + tx Text03d3 + db KEN_PIC db $17 db $03 db $16 -Data_11ca8: - db $37 +CourtneyData: + db COURTNEY db $0d db $00 db $12 db $00 dw $771f ; Pointer to NPC Data - db $d4 - db $03 - db $0d + tx Text03d4 + db COURTNEY_PIC db $0c db $04 db $17 -Data_11cb5: - db $38 +SteveData: + db STEVE db $0e db $00 db $2a db $00 dw $772a ; Pointer to NPC Data - db $d5 - db $03 - db $0e + tx Text03d5 + db STEVE_PIC db $0d db $04 db $17 -Data_11cc2: - db $39 +JackData: + db JACK db $0f db $00 db $26 db $00 dw $7735 ; Pointer to NPC Data - db $d6 - db $03 - db $0f + tx Text03d6 + db JACK_PIC db $0e db $04 db $17 -Data_11ccf: - db $3a +RodData: + db ROD db $10 db $00 db $0e db $00 dw $7740 ; Pointer to NPC Data - db $d7 - db $03 - db $10 + tx Text03d7 + db ROD_PIC db $0f db $04 db $17 -Data_11cdc: - db $3b +Clerk10Data: + db CLERK10 db $21 db $0a db $30 db $00 dw $4c3e ; Pointer to NPC Data - db $b0 - db $03 + tx Text03b0 db $00 db $00 db $00 db $00 -Data_11ce9: - db $3c +Clerk11Data: + db CLERK11 db $21 db $0a db $30 db $00 dw $4c3e ; Pointer to NPC Data - db $b0 - db $03 + tx Text03b0 db $00 db $00 db $00 db $00 -Data_11cf6: - db $3d +Man1Data: + db MAN1 db $1a db $00 db $16 db $00 dw $5c76 ; Pointer to NPC Data - db $d8 - db $03 + tx Text03d8 db $00 db $00 db $00 db $00 -Data_11d03: - db $3e +Woman1Data: + db WOMAN1 db $23 db $04 db $1e db $00 dw $5f83 ; Pointer to NPC Data - db $d9 - db $03 + tx Text03d9 db $00 db $00 db $00 db $00 -Data_11d10: - db $3f +Chap1Data: + db CHAP1 db $19 db $00 db $1a db $00 dw $5fc0 ; Pointer to NPC Data - db $da - db $03 + tx Text03da db $00 db $00 db $00 db $00 -Data_11d1d: - db $40 +Gal1Data: + db GAL1 db $22 db $00 db $16 db $00 dw $60cf ; Pointer to NPC Data - db $db - db $03 + tx Text03db db $00 db $00 db $00 db $00 -Data_11d2a: - db $41 +Lass1Data: + db LASS1 db $1e db $00 db $1e db $00 dw $6111 ; Pointer to NPC Data - db $dc - db $03 + tx Text03dc db $00 db $00 db $00 db $00 -Data_11d37: - db $42 +Chap2Data: + db CHAP2 db $19 db $00 db $1a db $00 dw $639a ; Pointer to NPC Data - db $da - db $03 + tx Text03da db $00 db $00 db $00 db $00 -Data_11d44: - db $43 +Lass2Data: + db LASS2 db $1e db $00 db $1e db $00 dw $661f ; Pointer to NPC Data - db $dc - db $03 + tx Text03dc db $00 db $00 db $00 db $00 -Data_11d51: - db $44 +Pappy1Data: + db PAPPY1 db $1b db $00 db $22 db $00 dw $69a5 ; Pointer to NPC Data - db $dd - db $03 + tx Text03dd db $00 db $00 db $00 db $00 -Data_11d5e: - db $45 +Lad1Data: + db LAD1 db $12 db $04 db $1a db $00 dw $6b84 ; Pointer to NPC Data - db $de - db $03 + tx Text03de db $00 db $00 db $00 db $00 -Data_11d6b: - db $46 +Lad2Data: + db LAD2 db $11 db $04 db $16 db $00 dw $6e2c ; Pointer to NPC Data - db $de - db $03 + tx Text03de db $00 db $00 db $00 db $00 -Data_11d78: - db $47 +Chap3Data: + db CHAP3 db $19 db $00 db $1a db $00 dw $6de8 ; Pointer to NPC Data - db $da - db $03 + tx Text03da db $00 db $00 db $00 db $00 -Data_11d85: - db $48 +Clerk12Data: + db CLERK12 db $22 db $00 db $16 db $00 dw $7295 ; Pointer to NPC Data - db $b3 - db $03 + tx Text03b3 db $00 db $00 db $00 db $00 -Data_11d92: - db $49 +Clerk13Data: + db CLERK13 db $22 db $00 db $16 db $00 dw $726c ; Pointer to NPC Data - db $b3 - db $03 + tx Text03b3 db $00 db $00 db $00 db $00 -Data_11d9f: - db $4a +HostData: + db HOST db $22 db $00 db $16 db $00 dw $7352 ; Pointer to NPC Data - db $df - db $03 + tx Text03df db $00 db $00 db $00 db $00 -Data_11dac: - db $4b +Specs1Data: + db SPECS1 db $13 db $00 db $22 db $00 dw $5d82 ; Pointer to NPC Data - db $e0 - db $03 + tx Text03e0 db $00 db $00 db $00 db $00 -Data_11db9: - db $4c +ButchData: + db BUTCH db $14 db $00 db $16 db $00 dw $5d8d ; Pointer to NPC Data - db $e1 - db $03 + tx Text03e1 db $00 db $00 db $00 db $00 -Data_11dc6: - db $4d +Granny1Data: + db GRANNY1 db $24 db $00 db $16 db $00 dw $5d9f ; Pointer to NPC Data - db $e5 - db $03 + tx Text03e5 db $00 db $00 db $00 db $00 -Data_11dd3: - db $4e +Lass3Data: + db LASS3 db $1d db $04 db $22 db $00 dw $5fd2 ; Pointer to NPC Data - db $dc - db $03 + tx Text03dc db $00 db $00 db $00 db $00 -Data_11de0: - db $4f +Man2Data: + db MAN2 db $1a db $00 db $16 db $00 dw $6137 ; Pointer to NPC Data - db $d8 - db $03 + tx Text03d8 db $00 db $00 db $00 db $00 -Data_11ded: - db $50 +Pappy2Data: + db PAPPY2 db $1b db $00 db $22 db $00 dw $613b ; Pointer to NPC Data - db $dd - db $03 + tx Text03dd db $00 db $00 db $00 db $00 -Data_11dfa: - db $51 +Lass4Data: + db LASS4 db $1d db $04 db $22 db $00 dw $63d9 ; Pointer to NPC Data - db $dc - db $03 + tx Text03dc db $00 db $00 db $00 db $00 -Data_11e07: - db $52 +Hood1Data: + db HOOD1 db $17 db $04 db $1e db $00 dw $63dd ; Pointer to NPC Data - db $e2 - db $03 + tx Text03e2 db $00 db $00 db $00 db $00 -Data_11e14: - db $53 +Granny2Data: + db GRANNY2 db $24 db $00 db $16 db $00 dw $66d8 ; Pointer to NPC Data - db $e5 - db $03 + tx Text03e5 db $00 db $00 db $00 db $00 -Data_11e21: - db $54 +Gal2Data: + db GAL2 db $22 db $00 db $16 db $00 dw $66e3 ; Pointer to NPC Data - db $db - db $03 + tx Text03db db $00 db $00 db $00 db $00 -Data_11e2e: - db $55 +Lad3Data: + db LAD3 db $12 db $04 db $1a db $00 dw $6850 ; Pointer to NPC Data - db $de - db $03 + tx Text03de db $00 db $00 db $00 db $00 -Data_11e3b: - db $56 +Gal3Data: + db GAL3 db $22 db $00 db $16 db $00 dw $6a30 ; Pointer to NPC Data - db $db - db $03 + tx Text03db db $00 db $00 db $00 db $00 -Data_11e48: - db $57 +Chap4Data: + db CHAP4 db $19 db $00 db $1a db $00 dw $6a3b ; Pointer to NPC Data - db $da - db $03 + tx Text03da db $00 db $00 db $00 db $00 -Data_11e55: - db $58 +Man3Data: + db MAN3 db $1a db $00 db $16 db $00 dw $6bc1 ; Pointer to NPC Data - db $d8 - db $03 + tx Text03d8 db $00 db $00 db $00 db $00 -Data_11e62: - db $59 +Specs2Data: + db SPECS2 db $18 db $00 db $0e db $00 dw $6bc5 ; Pointer to NPC Data - db $e0 - db $03 + tx Text03e0 db $00 db $00 db $00 db $00 -Data_11e6f: - db $5a +Specs3Data: + db SPECS3 db $13 db $00 db $22 db $00 dw $6bed ; Pointer to NPC Data - db $e0 - db $03 + tx Text03e0 db $00 db $00 db $00 db $00 -Data_11e7c: - db $5b +Woman2Data: + db WOMAN2 db $23 db $04 db $1e db $00 dw $4c3e ; Pointer to NPC Data - db $d9 - db $03 + tx Text03d9 db $00 db $00 db $00 db $00 -Data_11e89: - db $5c +ManiaData: + db MANIA db $15 db $00 db $26 db $00 dw $6e88 ; Pointer to NPC Data - db $e4 - db $03 + tx Text03e4 db $00 db $00 db $00 db $00 -Data_11e96: - db $5d +Pappy3Data: + db PAPPY3 db $1b db $00 db $22 db $00 dw $709c ; Pointer to NPC Data - db $dd - db $03 + tx Text03dd db $00 db $00 db $00 db $00 -Data_11ea3: - db $5e +Gal4Data: + db GAL4 db $22 db $00 db $16 db $00 dw $70a0 ; Pointer to NPC Data - db $db - db $03 + tx Text03db db $00 db $00 db $00 db $00 -Data_11eb0: - db $5f +ChampData: + db CHAMP db $15 db $00 db $26 db $00 dw $70a4 ; Pointer to NPC Data - db $e3 - db $03 + tx Text03e3 db $00 db $00 db $00 db $00 -Data_11ebd: - db $60 +Hood2Data: + db HOOD2 db $17 db $04 db $1e db $00 dw $70a8 ; Pointer to NPC Data - db $e2 - db $03 + tx Text03e2 db $00 db $00 db $00 db $00 -Data_11eca: - db $61 +Lass5Data: + db LASS5 db $1f db $04 db $1a db $00 dw $70ac ; Pointer to NPC Data - db $dc - db $03 + tx Text03dc db $00 db $00 db $00 db $00 -Data_11ed7: - db $62 +Chap5Data: + db CHAP5 db $19 db $00 db $1a db $00 dw $70b0 ; Pointer to NPC Data - db $da - db $03 + tx Text03da db $00 db $00 db $00 db $00 -Data_11ee4: - db $63 +AaronData: + db AARON db $18 db $00 db $0e db $00 dw $58dd ; Pointer to NPC Data - db $e7 - db $03 - db $29 + tx Text03e7 + db AARON_PIC db $09 db $02 db $15 -Data_11ef1: - db $64 +GuideData: + db GUIDE db $1a db $00 db $16 db $00 dw $7283 ; Pointer to NPC Data - db $e6 - db $03 + tx Text03e6 db $00 db $00 db $00 db $00 -Data_11efe: - db $65 +Tech7Data: + db TECH7 db $18 db $00 db $0e db $00 dw $58c6 ; Pointer to NPC Data - db $b2 - db $03 + tx Text03b2 db $00 db $00 db $00 db $00 -Data_11f0b: - db $66 +Tech8Data: + db TECH8 db $18 db $00 db $0e db $00 dw $58d1 ; Pointer to NPC Data - db $b2 - db $03 + tx Text03b2 db $00 db $00 db $00 -- cgit v1.2.3 From f3f374e6b7e26bc93c8428c8cb7b8c210223b2f4 Mon Sep 17 00:00:00 2001 From: Andrew Martinek Date: Mon, 23 Sep 2019 12:27:12 -0400 Subject: Fleshed out flags a lot --- src/data/npcs.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/data') diff --git a/src/data/npcs.asm b/src/data/npcs.asm index 23b4330..f667077 100644 --- a/src/data/npcs.asm +++ b/src/data/npcs.asm @@ -519,7 +519,7 @@ AmyData: db $08 db $2e db $10 - dw $6304 ; Pointer to NPC Data + dw OWSequence_Amy ; Pointer to NPC Data tx Text03bf db AMY_PIC db $12 -- cgit v1.2.3 From 516f47dd3efc34ee938b14f74e4c7eda0c19fc2d Mon Sep 17 00:00:00 2001 From: Andrew Martinek Date: Wed, 2 Oct 2019 23:50:47 -0400 Subject: layout another NPC script, make some assumptions about flags --- src/data/npcs.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/data') diff --git a/src/data/npcs.asm b/src/data/npcs.asm index f667077..f1a6737 100644 --- a/src/data/npcs.asm +++ b/src/data/npcs.asm @@ -579,7 +579,7 @@ BrittanyData: db $04 db $0e db $00 - dw $65d2 ; Pointer to NPC Data + dw OWSequence_Brittany ; Pointer to NPC Data tx Text03c4 db BRITTANY_PIC db $28 -- cgit v1.2.3 From 8c416b556348fe9a98e28fd0ba5628b5c74edcc8 Mon Sep 17 00:00:00 2001 From: Andrew Martinek Date: Thu, 3 Oct 2019 22:04:51 -0400 Subject: Ronald scripts and overworld data routines. Also made script extractor better --- src/data/map_scripts.asm | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'src/data') diff --git a/src/data/map_scripts.asm b/src/data/map_scripts.asm index ae4e355..ec8c292 100644 --- a/src/data/map_scripts.asm +++ b/src/data/map_scripts.asm @@ -57,8 +57,8 @@ MapScripts: ; 1162a (4:562a) dw $0000 dw $0000 dw $0000 - dw $6809 - dw $67f6 + dw LoadClubEntrance + dw ClubEntranceAfterDuel dw $0000 dw $0000 @@ -87,8 +87,8 @@ MapScripts: ; 1162a (4:562a) dw $0000 dw $0000 dw $0000 - dw $6809 - dw $67f6 + dw LoadClubEntrance + dw ClubEntranceAfterDuel dw $0000 dw $0000 @@ -117,8 +117,8 @@ MapScripts: ; 1162a (4:562a) dw $0000 dw $0000 dw $0000 - dw $6809 - dw $67f6 + dw LoadClubEntrance + dw ClubEntranceAfterDuel dw $0000 dw $0000 @@ -147,8 +147,8 @@ MapScripts: ; 1162a (4:562a) dw $0000 dw $0000 dw $0000 - dw $6809 - dw $67f6 + dw LoadClubEntrance + dw ClubEntranceAfterDuel dw $0000 dw $0000 @@ -177,8 +177,8 @@ MapScripts: ; 1162a (4:562a) dw $0000 dw $0000 dw $0000 - dw $6809 - dw $6525 + dw LoadClubEntrance + dw GrassClubEntranceAfterDuel dw $0000 dw $0000 @@ -188,7 +188,7 @@ MapScripts: ; 1162a (4:562a) dw $7d4b dw $0000 dw $0000 - dw $65c4 + dw GrassClubLobbyAfterDuel dw $0000 dw $0000 @@ -207,8 +207,8 @@ MapScripts: ; 1162a (4:562a) dw $0000 dw $0000 dw $0000 - dw $6809 - dw $67f6 + dw LoadClubEntrance + dw ClubEntranceAfterDuel dw $0000 dw $0000 @@ -237,8 +237,8 @@ MapScripts: ; 1162a (4:562a) dw $0000 dw $0000 dw $0000 - dw $6809 - dw $67f6 + dw LoadClubEntrance + dw ClubEntranceAfterDuel dw $0000 dw $0000 @@ -267,8 +267,8 @@ MapScripts: ; 1162a (4:562a) dw $0000 dw $0000 dw $0000 - dw $6809 - dw $67f6 + dw LoadClubEntrance + dw ClubEntranceAfterDuel dw $0000 dw $0000 -- cgit v1.2.3 From fda59356c20813bb57d59de8d9b2b100f0fe275d Mon Sep 17 00:00:00 2001 From: Andrew Martinek Date: Sun, 6 Oct 2019 11:24:18 -0400 Subject: Uncovered a lot of NPC map data and loading functions. --- src/data/map_scripts.asm | 72 ++++---- src/data/npc_map_data.asm | 418 ++++++++++++++++++++++++++++++++++++++++++++++ src/data/npcs.asm | 222 ++++++++++++------------ 3 files changed, 565 insertions(+), 147 deletions(-) create mode 100644 src/data/npc_map_data.asm (limited to 'src/data') diff --git a/src/data/map_scripts.asm b/src/data/map_scripts.asm index ec8c292..e156a1c 100644 --- a/src/data/map_scripts.asm +++ b/src/data/map_scripts.asm @@ -2,8 +2,8 @@ ; 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 +; 0: NPC data +; 2: Called after every NPC is loaded (unused) ; 4: pressed A button ; 6: pressed A button ; 8: load map @@ -17,13 +17,13 @@ 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 NPCData_772f dw $0000 dw $7b04 dw $5565 @@ -33,7 +33,7 @@ MapScripts: ; 1162a (4:562a) dw $555e ; DECK_MACHINE_ROOM - dw $775a + dw NPCData_775a dw $0000 dw $7b4d dw $0000 @@ -43,7 +43,7 @@ MapScripts: ; 1162a (4:562a) dw $58ad ; ISHIHARAS_HOUSE - dw $7773 + dw NPCData_7773 dw $0000 dw $7c02 dw $0000 @@ -53,7 +53,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; FIGHTING_CLUB_ENTRANCE - dw $7786 + dw NPCData_7786 dw $0000 dw $0000 dw $0000 @@ -63,7 +63,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; FIGHTING_CLUB_LOBBY - dw $779f + dw NPCData_779f dw $0000 dw $7c6f dw $0000 @@ -73,7 +73,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; FIGHTING_CLUB - dw $77ca + dw NPCData_77ca dw $0000 dw $0000 dw $0000 @@ -83,7 +83,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; ROCK_CLUB_ENTRANCE - dw $77e3 + dw NPCData_77e3 dw $0000 dw $0000 dw $0000 @@ -93,7 +93,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; ROCK_CLUB_LOBBY - dw $77fc + dw NPCData_77fc dw $0000 dw $7ca6 dw $0000 @@ -103,7 +103,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; ROCK_CLUB - dw $7827 + dw NPCData_7827 dw $0000 dw $0000 dw $0000 @@ -113,7 +113,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; WATER_CLUB_ENTRANCE - dw $783a + dw NPCData_783a dw $0000 dw $0000 dw $0000 @@ -123,7 +123,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; WATER_CLUB_LOBBY - dw $7853 + dw NPCData_7853 dw $0000 dw $7cdd dw $0000 @@ -133,7 +133,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; WATER_CLUB - dw $787e + dw NPCData_787e dw $0000 dw $0000 dw $0000 @@ -143,7 +143,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; LIGHTNING_CLUB_ENTRANCE - dw $7897 + dw NPCData_7897 dw $0000 dw $0000 dw $0000 @@ -153,7 +153,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; LIGHTNING_CLUB_LOBBY - dw $78b0 + dw NPCData_78b0 dw $0000 dw $7d14 dw $0000 @@ -163,7 +163,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; LIGHTNING_CLUB - dw $78d5 + dw NPCData_78d5 dw $0000 dw $0000 dw $0000 @@ -173,7 +173,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; GRASS_CLUB_ENTRANCE - dw $78ee + dw NPCData_78ee dw $0000 dw $0000 dw $0000 @@ -183,7 +183,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; GRASS_CLUB_LOBBY - dw $790d + dw NPCData_790d dw $0000 dw $7d4b dw $0000 @@ -193,7 +193,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; GRASS_CLUB - dw $7932 + dw NPCData_7932 dw $0000 dw $0000 dw $0000 @@ -203,7 +203,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; PSYCHIC_CLUB_ENTRANCE - dw $7945 + dw NPCData_7945 dw $0000 dw $0000 dw $0000 @@ -213,7 +213,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; PSYCHIC_CLUB_LOBBY - dw $7964 + dw NPCData_7964 dw $0000 dw $7d82 dw $0000 @@ -223,7 +223,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; PSYCHIC_CLUB - dw $798f + dw NPCData_798f dw $0000 dw $0000 dw $0000 @@ -233,7 +233,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; SCIENCE_CLUB_ENTRANCE - dw $79a8 + dw NPCData_79a8 dw $0000 dw $0000 dw $0000 @@ -243,7 +243,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; SCIENCE_CLUB_LOBBY - dw $79c1 + dw NPCData_79c1 dw $0000 dw $7db9 dw $0000 @@ -253,7 +253,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; SCIENCE_CLUB - dw $79ec + dw NPCData_79ec dw $0000 dw $0000 dw $0000 @@ -263,7 +263,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; FIRE_CLUB_ENTRANCE - dw $7a05 + dw NPCData_7a05 dw $0000 dw $0000 dw $0000 @@ -273,7 +273,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; FIRE_CLUB_LOBBY - dw $7a1e + dw NPCData_7a1e dw $0000 dw $7df0 dw $6d57 @@ -283,7 +283,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; FIRE_CLUB - dw $7a43 + dw NPCData_7a43 dw $0000 dw $0000 dw $0000 @@ -293,7 +293,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; CHALLENGE_HALL_ENTRANCE - dw $7a5c + dw NPCData_7a5c dw $0000 dw $0000 dw $0000 @@ -303,7 +303,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; CHALLENGE_HALL_LOBBY - dw $7a63 + dw NPCData_7a63 dw $0000 dw $7e27 dw $0000 @@ -313,7 +313,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; CHALLENGE_HALL - dw $7a9a + dw NPCData_7a9a dw $0000 dw $0000 dw $0000 @@ -323,7 +323,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; POKEMON_DOME_ENTRANCE - dw $7ab9 + dw NPCData_7ab9 dw $0000 dw $7e5e dw $0000 @@ -333,7 +333,7 @@ MapScripts: ; 1162a (4:562a) dw $762a ; POKEMON_DOME - dw $7ac0 + dw NPCData_7ac0 dw $0000 dw $0000 dw $0000 @@ -343,7 +343,7 @@ MapScripts: ; 1162a (4:562a) dw $7718 ; HALL_OF_HONOR - dw $7adf + dw NPCData_7adf dw $0000 dw $7ec2 dw $0000 diff --git a/src/data/npc_map_data.asm b/src/data/npc_map_data.asm new file mode 100644 index 0000000..7bc69cb --- /dev/null +++ b/src/data/npc_map_data.asm @@ -0,0 +1,418 @@ +; NPC Map data. Format: +; NPC, X position, Y Position, Direction, +; pre-load function. (Resets c flag if NPC should not be loaded) +NPCData_772f: ; 772f (4:1372f) + db DRMASON, $0e, $06, SOUTH + dw $5710 + db SAM, $04, $0e, EAST + dw $5604 + db TECH1, $16, $08, WEST + dw $0000 + db TECH2, $16, $14, SOUTH + dw $0000 + db TECH3, $16, $16, WEST + dw $0000 + db TECH4, $0a, $16, EAST + dw $0000 + db TECH5, $06, $04, SOUTH + dw $55eb + db $00 + +NPCData_775a: ; 775a (4:1375a) + db TECH6, $06, $08, SOUTH + dw $0000 + db TECH7, $06, $16, WEST + dw $0000 + db TECH8, $0a, $12, WEST + dw $0000 + db AARON, $0c, $0c, WEST + dw $0000 + db $00 + +NPCData_7773: ; 7773 (4:13773) + db NIKKI, $04, $04, NORTH + dw $5add + db ISHIHARA, $08, $08, SOUTH + dw $5b3d + db RONALD1, $02, $04, WEST + dw $5c43 + db $00 + +NPCData_7786: ; 7786 (4:13786) + db CLERK1, $06, $02, SOUTH + dw $0000 + db RONALD1, $08, $fe, SOUTH + dw $685b + db RONALD2, $fe, $08, NORTH + dw $689a + db RONALD3, $fe, $08, NORTH + dw $6915 + db $00 + +NPCData_779f: ; 779f (4:1379f) + db MAN1, $0c, $0e, WEST + dw $0000 + db IMAKUNI, $12, $02, NORTH + dw $5ceb + db SPECS1, $12, $10, EAST + dw $0000 + db BUTCH, $14, $10, WEST + dw $0000 + db GRANNY1, $04, $10, WEST + dw $5d98 + db CLERK10, $06, $04, SOUTH + dw $0000 + db CLERK11, $0a, $04, SOUTH + dw $7c6c + db $00 + +NPCData_77ca: ; 77ca (4:137ca) + db CHRIS, $04, $08, SOUTH + dw $5e43 + db MICHAEL, $0e, $0a, SOUTH + dw $5e79 + db JESSICA, $12, $06, EAST + dw $5ea5 + db MITCH, $0a, $04, SOUTH + dw $0000 + db $00 + +NPCData_77e3: ; 77e3 (4:137e3) + db CLERK2, $06, $02, SOUTH + dw $0000 + db RONALD1, $08, $fe, SOUTH + dw $685b + db RONALD2, $fe, $08, NORTH + dw $689a + db RONALD3, $fe, $08, NORTH + dw $6915 + db $00 + +NPCData_77fc: ; 77fc (4:137fc) + db CHRIS, $12, $08, WEST + dw $5ee9 + db MATTHEW, $06, $0e, EAST + dw $0000 + db WOMAN1, $14, $12, NORTH + dw $0000 + db CHAP1, $0e, $10, EAST + dw $0000 + db LASS3, $10, $04, SOUTH + dw $5fcb + db CLERK10, $06, $04, SOUTH + dw $0000 + db CLERK11, $0a, $04, SOUTH + dw $7c6c + db $00 + +NPCData_7827: ; 7827 (4:13827) + db RYAN, $14, $0e, EAST + dw $0000 + db ANDREW, $06, $14, NORTH + dw $0000 + db GENE, $0c, $06, NORTH + dw $0000 + db $00 + +NPCData_783a: ; 783a (4:1383a) + db CLERK3, $06, $02, SOUTH + dw $0000 + db RONALD1, $08, $fe, SOUTH + dw $685b + db RONALD2, $fe, $08, NORTH + dw $689a + db RONALD3, $fe, $08, NORTH + dw $6915 + db $00 + +NPCData_7853: ; 7853 (4:13853) + db GAL1, $06, $0e, SOUTH + dw $0000 + db LASS1, $10, $0a, SOUTH + dw $0000 + db IMAKUNI, $12, $02, NORTH + dw $60b0 + db MAN2, $04, $12, EAST + dw $6130 + db PAPPY2, $16, $10, NORTH + dw $0000 + db CLERK10, $06, $04, SOUTH + dw $0000 + db CLERK11, $0a, $04, SOUTH + dw $7c6c + db $00 + +NPCData_787e: ; 787e (4:1387e) + db SARA, $06, $12, EAST + dw $0000 + db AMANDA, $16, $14, WEST + dw $0000 + db JOSHUA, $16, $08, SOUTH + dw $0000 + db AMY, $16, $04, SOUTH + dw $62ad + db $00 + +NPCData_7897: ; 7897 (4:13897) + db CLERK4, $06, $02, SOUTH + dw $0000 + db RONALD1, $08, $fe, SOUTH + dw $685b + db RONALD2, $fe, $08, NORTH + dw $689a + db RONALD3, $fe, $08, NORTH + dw $6915 + db $00 + +NPCData_78b0: ; 78b0 (4:138b0) + db CHAP2, $12, $10, WEST + dw $0000 + db IMAKUNI, $12, $02, NORTH + dw $637b + db LASS4, $08, $0c, SOUTH + dw $0000 + db HOOD1, $14, $08, SOUTH + dw $0000 + db CLERK10, $06, $04, SOUTH + dw $0000 + db CLERK11, $0a, $04, SOUTH + dw $7c6c + db $00 + +NPCData_78d5: ; 78d5 (4:138d5) + db JENNIFER, $0e, $12, SOUTH + dw $0000 + db NICHOLAS, $06, $0a, SOUTH + dw $0000 + db BRANDON, $16, $0c, NORTH + dw $0000 + db ISAAC, $0c, $04, NORTH + dw $6494 + db $00 + +NPCData_78ee: ; 78ee (4:138ee) + db CLERK5, $06, $02, SOUTH + dw $0000 + db MICHAEL, $0e, $08, SOUTH + dw $656a + db RONALD1, $08, $fe, SOUTH + dw $685b + db RONALD2, $fe, $08, NORTH + dw $689a + db RONALD3, $fe, $08, NORTH + dw $6915 + db $00 + +NPCData_790d: ; 790d (4:1390d) + db BRITTANY, $0c, $0e, WEST + dw $0000 + db LASS2, $12, $08, SOUTH + dw $0000 + db GRANNY2, $04, $10, EAST + dw $0000 + db GAL2, $14, $10, NORTH + dw $66dc + db CLERK10, $06, $04, SOUTH + dw $0000 + db CLERK11, $0a, $04, SOUTH + dw $7c6c + db $00 + +NPCData_7932: ; 7932 (4:13932) + db KRISTIN, $04, $0a, EAST + dw $0000 + db HEATHER, $0e, $10, SOUTH + dw $0000 + db NIKKI, $0c, $04, SOUTH + dw $6796 + db $00 + +NPCData_7945: ; 7945 (4:13945) + db CLERK6, $06, $02, SOUTH + dw $0000 + db RONALD1, $08, $fe, SOUTH + dw $685b + db RONALD2, $fe, $08, NORTH + dw $689a + db RONALD3, $fe, $08, NORTH + dw $6915 + db LAD3, $0e, $04, SOUTH + dw $0000 + db $00 + +NPCData_7964: ; 7964 (4:13964) + db ROBERT, $14, $08, NORTH + dw $0000 + db PAPPY1, $04, $10, EAST + dw $0000 + db RONALD1, $0c, $0a, EAST + dw $69f7 + db GAL3, $10, $0e, WEST + dw $0000 + db CHAP4, $18, $10, SOUTH + dw $0000 + db CLERK10, $06, $04, SOUTH + dw $0000 + db CLERK11, $0a, $04, SOUTH + dw $7c6c + db $00 + +NPCData_798f: ; 798f (4:1398f) + db DANIEL, $08, $08, NORTH + dw $0000 + db STEPHANIE, $16, $0c, EAST + dw $0000 + db MURRAY2, $02, $02, WEST + dw $6ad0 + db MURRAY1, $0c, $06, SOUTH + dw $6ada + db $00 + +NPCData_79a8: ; 79a8 (4:139a8) + db CLERK7, $06, $02, SOUTH + dw $0000 + db RONALD1, $08, $fe, SOUTH + dw $685b + db RONALD2, $fe, $08, NORTH + dw $689a + db RONALD3, $fe, $08, NORTH + dw $6915 + db $00 + +NPCData_79c1: ; 79c1 (4:139c1) + db LAD1, $12, $12, NORTH + dw $0000 + db IMAKUNI, $12, $02, NORTH + dw $6b65 + db MAN3, $04, $0e, WEST + dw $0000 + db SPECS2, $0c, $0e, WEST + dw $0000 + db SPECS3, $16, $08, SOUTH + dw $0000 + db CLERK10, $06, $04, SOUTH + dw $0000 + db CLERK11, $0a, $04, SOUTH + dw $7c6c + db $00 + +NPCData_79ec: ; 79ec (4:139ec) + db JOSEPH, $08, $0a, SOUTH + dw $6cc4 + db DAVID, $14, $04, NORTH + dw $0000 + db ERIK, $06, $12, SOUTH + dw $0000 + db RICK, $04, $04, NORTH + dw $0000 + db $00 + +NPCData_7a05: ; 7a05 (4:13a05) + db CLERK8, $06, $02, SOUTH + dw $0000 + db RONALD1, $08, $fe, SOUTH + dw $685b + db RONALD2, $fe, $08, NORTH + dw $689a + db RONALD3, $fe, $08, NORTH + dw $6915 + db $00 + +NPCData_7a1e: ; 7a1e (4:13a1e) + db JESSICA, $0c, $0e, WEST + dw $6d8d + db LAD2, $12, $06, EAST + dw $6e25 + db CHAP3, $06, $0a, NORTH + dw $0000 + db MANIA, $14, $12, NORTH + dw $0000 + db CLERK10, $06, $04, SOUTH + dw $0000 + db CLERK11, $0a, $04, SOUTH + dw $7c6c + db $00 + +NPCData_7a43: ; 7a43 (4:13a43) + db JOHN, $0c, $12, SOUTH + dw $0000 + db ADAM, $08, $0e, SOUTH + dw $0000 + db JONATHAN, $12, $0a, SOUTH + dw $0000 + db KEN, $0e, $04, SOUTH + dw $0000 + db $00 + +NPCData_7a5c: ; 7a5c (4:13a5c) + db CLERK9, $06, $02, SOUTH + dw $6f96 + db $00 + +NPCData_7a63: ; 7a63 (4:13a63) + db PAPPY3, $06, $0e, EAST + dw $707a + db CHAMP, $10, $12, WEST + dw $707a + db HOOD2, $14, $08, SOUTH + dw $707a + db LASS5, $16, $10, WEST + dw $707a + db GAL4, $0c, $0e, EAST + dw $7075 + db CHAP5, $10, $08, WEST + dw $7075 + db RONALD1, $08, $0c, SOUTH + dw $70b4 + db CLERK10, $06, $04, SOUTH + dw $0000 + db CLERK11, $0a, $04, SOUTH + dw $7c6c + db $00 + +NPCData_7a9a: ; 7a9a (4:13a9a) + db CLERK12, $0a, $12, SOUTH + dw $707a + db CLERK13, $14, $12, SOUTH + dw $707a + db GUIDE, $0e, $14, SOUTH + dw $7270 + db HOST, $0e, $04, SOUTH + dw $707a + db $ff, $12, $08, WEST ; pre-load function chooses NPC to load + dw $7559 + db $00 + +NPCData_7ab9: ; 7ab9 (4:13ab9) + db RONALD1, $0e, $12, SOUTH + dw $0000 + db $00 + +NPCData_7ac0: ; 7ac0 (4:13ac0) + db COURTNEY, $12, $02, SOUTH + dw $774b + db STEVE, $16, $02, SOUTH + dw $778c + db JACK, $08, $02, SOUTH + dw $77a3 + db ROD, $0c, $02, SOUTH + dw $77ba + db RONALD1, $1e, $00, SOUTH + dw $77d6 + db $00 + +NPCData_7adf: ; 7adf (4:13adf) + db _11F1F, $0a, $08, SOUTH + dw $0000 + db _11F26, $0c, $08, SOUTH + dw $0000 + db _11F2D, $08, $0a, SOUTH + dw $0000 + db _11F34, $0a, $0a, SOUTH + dw $0000 + db _11F3B, $0c, $0a, SOUTH + dw $0000 + db _11F42, $0e, $0a, SOUTH + dw $0000 + db $00 + diff --git a/src/data/npcs.asm b/src/data/npcs.asm index f1a6737..bda574f 100644 --- a/src/data/npcs.asm +++ b/src/data/npcs.asm @@ -1,6 +1,6 @@ ; 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. -PointerTable_118f5: +NPCDataTable: dw DrMasonData dw DrMasonData dw Ronald1Data @@ -123,7 +123,7 @@ DrMasonData: db $00 db $26 db $00 - dw $5727 ; Pointer to NPC Data + dw $5727 ; Pointer to OWScript tx Text03ac db $00 db $00 @@ -135,7 +135,7 @@ Ronald1Data: db $04 db $0e db $00 - dw $5c4b ; Pointer to NPC Data + dw $5c4b ; 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 NPC Data + dw $5c4b ; 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 NPC Data + dw $5c4b ; 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 NPC Data + dw $5b4a ; Pointer to OWScript tx Text03ae db $00 db $00 @@ -183,7 +183,7 @@ ImakuniData: db $00 db $0e db $00 - dw $5d0d ; Pointer to NPC Data + dw $5d0d ; Pointer to OWScript tx Text03af db IMAKUNI_PIC db $34 @@ -195,7 +195,7 @@ SamData: db $00 db $0e db $00 - dw $561d ; Pointer to NPC Data + dw $561d ; Pointer to OWScript tx Text03b1 db SAM_PIC db $02 @@ -207,7 +207,7 @@ Tech1Data: db $00 db $0e db $00 - dw $5583 ; Pointer to NPC Data + dw $5583 ; Pointer to OWScript tx Text03b2 db $00 db $00 @@ -219,7 +219,7 @@ Tech2Data: db $00 db $0e db $00 - dw $55ca ; Pointer to NPC Data + dw $55ca ; Pointer to OWScript tx Text03b2 db $00 db $00 @@ -231,7 +231,7 @@ Tech3Data: db $00 db $0e db $00 - dw $55d5 ; Pointer to NPC Data + dw $55d5 ; Pointer to OWScript tx Text03b2 db $00 db $00 @@ -243,7 +243,7 @@ Tech4Data: db $00 db $0e db $00 - dw $55e0 ; Pointer to NPC Data + dw $55e0 ; Pointer to OWScript tx Text03b2 db $00 db $00 @@ -255,7 +255,7 @@ Tech5Data: db $00 db $0e db $00 - dw $55f9 ; Pointer to NPC Data + dw $55f9 ; Pointer to OWScript tx Text03b2 db $00 db $00 @@ -267,7 +267,7 @@ Tech6Data: db $00 db $0e db $00 - dw $58bb ; Pointer to NPC Data + dw $58bb ; Pointer to OWScript tx Text03b2 db $00 db $00 @@ -279,7 +279,7 @@ Clerk1Data: db $0a db $30 db $00 - dw $5c64 ; Pointer to NPC Data + dw $5c64 ; Pointer to OWScript tx Text03b3 db $00 db $00 @@ -291,7 +291,7 @@ Clerk2Data: db $0a db $30 db $00 - dw $5ed1 ; Pointer to NPC Data + dw $5ed1 ; Pointer to OWScript tx Text03b3 db $00 db $00 @@ -303,7 +303,7 @@ Clerk3Data: db $0a db $30 db $00 - dw $609e ; Pointer to NPC Data + dw $609e ; Pointer to OWScript tx Text03b3 db $00 db $00 @@ -315,7 +315,7 @@ Clerk4Data: db $0a db $30 db $00 - dw $6369 ; Pointer to NPC Data + dw $6369 ; Pointer to OWScript tx Text03b3 db $00 db $00 @@ -327,7 +327,7 @@ Clerk5Data: db $0a db $30 db $00 - dw $6566 ; Pointer to NPC Data + dw $6566 ; Pointer to OWScript tx Text03b3 db $00 db $00 @@ -339,7 +339,7 @@ Clerk6Data: db $0a db $30 db $00 - dw $684c ; Pointer to NPC Data + dw $684c ; Pointer to OWScript tx Text03b3 db $00 db $00 @@ -351,7 +351,7 @@ Clerk7Data: db $0a db $30 db $00 - dw $6b53 ; Pointer to NPC Data + dw $6b53 ; Pointer to OWScript tx Text03b3 db $00 db $00 @@ -363,7 +363,7 @@ Clerk8Data: db $0a db $30 db $00 - dw $6d45 ; Pointer to NPC Data + dw $6d45 ; Pointer to OWScript tx Text03b3 db $00 db $00 @@ -375,7 +375,7 @@ Clerk9Data: db $0a db $30 db $00 - dw $7025 ; Pointer to NPC Data + dw $7025 ; Pointer to OWScript tx Text03b3 db $00 db $00 @@ -387,7 +387,7 @@ ChrisData: db $00 db $26 db $00 - dw $5ef2 ; Pointer to NPC Data + dw $5ef2 ; Pointer to OWScript tx Text03b4 db CHRIS_PIC db $1c @@ -399,7 +399,7 @@ MichaelData: db $00 db $26 db $00 - dw $6573 ; Pointer to NPC Data + dw $6573 ; Pointer to OWScript tx Text03b5 db MICHAEL_PIC db $1d @@ -411,7 +411,7 @@ JessicaData: db $04 db $1a db $00 - dw $6d96 ; Pointer to NPC Data + dw $6d96 ; Pointer to OWScript tx Text03b6 db JESSICA_PIC db $1e @@ -423,7 +423,7 @@ MitchData: db $00 db $0e db $00 - dw $5dc3 ; Pointer to NPC Data + dw $5dc3 ; Pointer to OWScript tx Text03b7 db MITCH_PIC db $10 @@ -435,7 +435,7 @@ MatthewData: db $00 db $16 db $00 - dw $5f39 ; Pointer to NPC Data + dw $5f39 ; Pointer to OWScript tx Text03b8 db MATTHEW_PIC db $21 @@ -447,7 +447,7 @@ RyanData: db $00 db $26 db $00 - dw $5ff0 ; Pointer to NPC Data + dw $5ff0 ; Pointer to OWScript tx Text03b9 db RYAN_PIC db $1f @@ -459,7 +459,7 @@ AndrewData: db $00 db $16 db $00 - dw $6017 ; Pointer to NPC Data + dw $6017 ; Pointer to OWScript tx Text03ba db ANDREW_PIC db $20 @@ -471,7 +471,7 @@ GeneData: db $04 db $1e db $00 - dw $603e ; Pointer to NPC Data + dw $603e ; Pointer to OWScript tx Text03bb db GENE_PIC db $11 @@ -483,7 +483,7 @@ SaraData: db $00 db $0e db $00 - dw OWSequence_Sara ; Pointer to NPC Data + dw OWSequence_Sara ; Pointer to OWScript tx Text03bc db SARA_PIC db $22 @@ -495,7 +495,7 @@ AmandaData: db $00 db $16 db $00 - dw OWSequence_Amanda ; Pointer to NPC Data + dw OWSequence_Amanda ; Pointer to OWScript tx Text03bd db AMANDA_PIC ; battle profile picture db $23 @@ -507,7 +507,7 @@ JoshuaData: db $00 db $26 db $00 - dw OWSequence_Joshua ; Pointer to NPC Data + dw OWSequence_Joshua ; Pointer to OWScript tx Text03be db JOSHUA_PIC db $24 @@ -519,7 +519,7 @@ AmyData: db $08 db $2e db $10 - dw OWSequence_Amy ; Pointer to NPC Data + dw OWSequence_Amy ; Pointer to OWScript tx Text03bf db AMY_PIC db $12 @@ -531,7 +531,7 @@ JenniferData: db $04 db $0e db $00 - dw $6408 ; Pointer to NPC Data + dw $6408 ; Pointer to OWScript tx Text03c0 db JENNIFER_PIC db $25 @@ -543,7 +543,7 @@ NicholasData: db $04 db $1e db $00 - dw $642f ; Pointer to NPC Data + dw $642f ; Pointer to OWScript tx Text03c1 db NICHOLAS_PIC db $26 @@ -555,7 +555,7 @@ BrandonData: db $04 db $1e db $00 - dw $6456 ; Pointer to NPC Data + dw $6456 ; Pointer to OWScript tx Text03c2 db BRANDON_PIC db $27 @@ -567,7 +567,7 @@ IsaacData: db $00 db $16 db $00 - dw $64ad ; Pointer to NPC Data + dw $64ad ; Pointer to OWScript tx Text03c3 db ISAAC_PIC db $13 @@ -579,7 +579,7 @@ BrittanyData: db $04 db $0e db $00 - dw OWSequence_Brittany ; Pointer to NPC Data + dw OWSequence_Brittany ; Pointer to OWScript tx Text03c4 db BRITTANY_PIC db $28 @@ -591,7 +591,7 @@ KristinData: db $00 db $1e db $00 - dw $6701 ; Pointer to NPC Data + dw $6701 ; Pointer to OWScript tx Text03c5 db KRISTIN_PIC db $29 @@ -603,7 +603,7 @@ HeatherData: db $04 db $22 db $00 - dw $6745 ; Pointer to NPC Data + dw $6745 ; Pointer to OWScript tx Text03c6 db HEATHER_PIC db $2a @@ -615,7 +615,7 @@ NikkiData: db $00 db $1a db $00 - dw $679e ; Pointer to NPC Data + dw $679e ; Pointer to OWScript tx Text03c7 db NIKKI_PIC db $14 @@ -627,7 +627,7 @@ RobertData: db $04 db $16 db $00 - dw $6980 ; Pointer to NPC Data + dw $6980 ; Pointer to OWScript tx Text03c8 db ROBERT_PIC db $2b @@ -639,7 +639,7 @@ DanielData: db $04 db $1a db $00 - dw $6a60 ; Pointer to NPC Data + dw $6a60 ; Pointer to OWScript tx Text03c9 db DANIEL_PIC db $2c @@ -651,7 +651,7 @@ StephanieData: db $04 db $0e db $00 - dw $6aa2 ; Pointer to NPC Data + dw $6aa2 ; Pointer to OWScript tx Text03ca db STEPHANIE_PIC db $2d @@ -663,7 +663,7 @@ Murray1Data: db $00 db $12 db $00 - dw $6adf ; Pointer to NPC Data + dw $6adf ; Pointer to OWScript tx Text03cb db MURRAY_PIC db $15 @@ -675,7 +675,7 @@ Murray2Data: db $03 db $15 db $10 - dw $6adf ; Pointer to NPC Data + dw $6adf ; Pointer to OWScript tx Text03cb db MURRAY_PIC db $15 @@ -687,7 +687,7 @@ JosephData: db $00 db $0e db $00 - dw $6cdb ; Pointer to NPC Data + dw $6cdb ; Pointer to OWScript tx Text03cc db JOSEPH_PIC db $2e @@ -699,7 +699,7 @@ DavidData: db $00 db $0e db $00 - dw $6c11 ; Pointer to NPC Data + dw $6c11 ; Pointer to OWScript tx Text03cd db DAVID_PIC db $2f @@ -711,7 +711,7 @@ ErikData: db $00 db $0e db $00 - dw $6c42 ; Pointer to NPC Data + dw $6c42 ; Pointer to OWScript tx Text03ce db ERIK_PIC db $30 @@ -723,7 +723,7 @@ RickData: db $00 db $0e db $00 - dw $6c67 ; Pointer to NPC Data + dw $6c67 ; Pointer to OWScript tx Text03cf db RICK_PIC db $16 @@ -735,7 +735,7 @@ JohnData: db $04 db $1a db $00 - dw $6eb3 ; Pointer to NPC Data + dw $6eb3 ; Pointer to OWScript tx Text03d0 db JOHN_PIC db $31 @@ -747,7 +747,7 @@ AdamData: db $00 db $22 db $00 - dw $6ed8 ; Pointer to NPC Data + dw $6ed8 ; Pointer to OWScript tx Text03d1 db ADAM_PIC db $32 @@ -759,7 +759,7 @@ JonathanData: db $04 db $16 db $00 - dw $6efd ; Pointer to NPC Data + dw $6efd ; Pointer to OWScript tx Text03d2 db JONATHAN_PIC db $33 @@ -771,7 +771,7 @@ KenData: db $04 db $1e db $00 - dw $6f22 ; Pointer to NPC Data + dw $6f22 ; Pointer to OWScript tx Text03d3 db KEN_PIC db $17 @@ -783,7 +783,7 @@ CourtneyData: db $00 db $12 db $00 - dw $771f ; Pointer to NPC Data + dw $771f ; Pointer to OWScript tx Text03d4 db COURTNEY_PIC db $0c @@ -795,7 +795,7 @@ SteveData: db $00 db $2a db $00 - dw $772a ; Pointer to NPC Data + dw $772a ; Pointer to OWScript tx Text03d5 db STEVE_PIC db $0d @@ -807,7 +807,7 @@ JackData: db $00 db $26 db $00 - dw $7735 ; Pointer to NPC Data + dw $7735 ; Pointer to OWScript tx Text03d6 db JACK_PIC db $0e @@ -819,7 +819,7 @@ RodData: db $00 db $0e db $00 - dw $7740 ; Pointer to NPC Data + dw $7740 ; Pointer to OWScript tx Text03d7 db ROD_PIC db $0f @@ -831,7 +831,7 @@ Clerk10Data: db $0a db $30 db $00 - dw $4c3e ; Pointer to NPC Data + dw $4c3e ; Pointer to OWScript tx Text03b0 db $00 db $00 @@ -843,7 +843,7 @@ Clerk11Data: db $0a db $30 db $00 - dw $4c3e ; Pointer to NPC Data + dw $4c3e ; Pointer to OWScript tx Text03b0 db $00 db $00 @@ -855,7 +855,7 @@ Man1Data: db $00 db $16 db $00 - dw $5c76 ; Pointer to NPC Data + dw $5c76 ; Pointer to OWScript tx Text03d8 db $00 db $00 @@ -867,7 +867,7 @@ Woman1Data: db $04 db $1e db $00 - dw $5f83 ; Pointer to NPC Data + dw $5f83 ; Pointer to OWScript tx Text03d9 db $00 db $00 @@ -879,7 +879,7 @@ Chap1Data: db $00 db $1a db $00 - dw $5fc0 ; Pointer to NPC Data + dw $5fc0 ; Pointer to OWScript tx Text03da db $00 db $00 @@ -891,7 +891,7 @@ Gal1Data: db $00 db $16 db $00 - dw $60cf ; Pointer to NPC Data + dw $60cf ; Pointer to OWScript tx Text03db db $00 db $00 @@ -903,7 +903,7 @@ Lass1Data: db $00 db $1e db $00 - dw $6111 ; Pointer to NPC Data + dw $6111 ; Pointer to OWScript tx Text03dc db $00 db $00 @@ -915,7 +915,7 @@ Chap2Data: db $00 db $1a db $00 - dw $639a ; Pointer to NPC Data + dw $639a ; Pointer to OWScript tx Text03da db $00 db $00 @@ -927,7 +927,7 @@ Lass2Data: db $00 db $1e db $00 - dw $661f ; Pointer to NPC Data + dw $661f ; Pointer to OWScript tx Text03dc db $00 db $00 @@ -939,7 +939,7 @@ Pappy1Data: db $00 db $22 db $00 - dw $69a5 ; Pointer to NPC Data + dw $69a5 ; Pointer to OWScript tx Text03dd db $00 db $00 @@ -951,7 +951,7 @@ Lad1Data: db $04 db $1a db $00 - dw $6b84 ; Pointer to NPC Data + dw $6b84 ; Pointer to OWScript tx Text03de db $00 db $00 @@ -963,7 +963,7 @@ Lad2Data: db $04 db $16 db $00 - dw $6e2c ; Pointer to NPC Data + dw $6e2c ; Pointer to OWScript tx Text03de db $00 db $00 @@ -975,7 +975,7 @@ Chap3Data: db $00 db $1a db $00 - dw $6de8 ; Pointer to NPC Data + dw $6de8 ; Pointer to OWScript tx Text03da db $00 db $00 @@ -987,7 +987,7 @@ Clerk12Data: db $00 db $16 db $00 - dw $7295 ; Pointer to NPC Data + dw $7295 ; Pointer to OWScript tx Text03b3 db $00 db $00 @@ -999,7 +999,7 @@ Clerk13Data: db $00 db $16 db $00 - dw $726c ; Pointer to NPC Data + dw $726c ; Pointer to OWScript tx Text03b3 db $00 db $00 @@ -1011,7 +1011,7 @@ HostData: db $00 db $16 db $00 - dw $7352 ; Pointer to NPC Data + dw $7352 ; Pointer to OWScript tx Text03df db $00 db $00 @@ -1023,7 +1023,7 @@ Specs1Data: db $00 db $22 db $00 - dw $5d82 ; Pointer to NPC Data + dw $5d82 ; Pointer to OWScript tx Text03e0 db $00 db $00 @@ -1035,7 +1035,7 @@ ButchData: db $00 db $16 db $00 - dw $5d8d ; Pointer to NPC Data + dw $5d8d ; Pointer to OWScript tx Text03e1 db $00 db $00 @@ -1047,7 +1047,7 @@ Granny1Data: db $00 db $16 db $00 - dw $5d9f ; Pointer to NPC Data + dw $5d9f ; Pointer to OWScript tx Text03e5 db $00 db $00 @@ -1059,7 +1059,7 @@ Lass3Data: db $04 db $22 db $00 - dw $5fd2 ; Pointer to NPC Data + dw $5fd2 ; Pointer to OWScript tx Text03dc db $00 db $00 @@ -1071,7 +1071,7 @@ Man2Data: db $00 db $16 db $00 - dw $6137 ; Pointer to NPC Data + dw $6137 ; Pointer to OWScript tx Text03d8 db $00 db $00 @@ -1083,7 +1083,7 @@ Pappy2Data: db $00 db $22 db $00 - dw $613b ; Pointer to NPC Data + dw $613b ; Pointer to OWScript tx Text03dd db $00 db $00 @@ -1095,7 +1095,7 @@ Lass4Data: db $04 db $22 db $00 - dw $63d9 ; Pointer to NPC Data + dw $63d9 ; Pointer to OWScript tx Text03dc db $00 db $00 @@ -1107,7 +1107,7 @@ Hood1Data: db $04 db $1e db $00 - dw $63dd ; Pointer to NPC Data + dw $63dd ; Pointer to OWScript tx Text03e2 db $00 db $00 @@ -1119,7 +1119,7 @@ Granny2Data: db $00 db $16 db $00 - dw $66d8 ; Pointer to NPC Data + dw $66d8 ; Pointer to OWScript tx Text03e5 db $00 db $00 @@ -1131,7 +1131,7 @@ Gal2Data: db $00 db $16 db $00 - dw $66e3 ; Pointer to NPC Data + dw $66e3 ; Pointer to OWScript tx Text03db db $00 db $00 @@ -1143,7 +1143,7 @@ Lad3Data: db $04 db $1a db $00 - dw $6850 ; Pointer to NPC Data + dw $6850 ; Pointer to OWScript tx Text03de db $00 db $00 @@ -1155,7 +1155,7 @@ Gal3Data: db $00 db $16 db $00 - dw $6a30 ; Pointer to NPC Data + dw $6a30 ; Pointer to OWScript tx Text03db db $00 db $00 @@ -1167,7 +1167,7 @@ Chap4Data: db $00 db $1a db $00 - dw $6a3b ; Pointer to NPC Data + dw $6a3b ; Pointer to OWScript tx Text03da db $00 db $00 @@ -1179,7 +1179,7 @@ Man3Data: db $00 db $16 db $00 - dw $6bc1 ; Pointer to NPC Data + dw $6bc1 ; Pointer to OWScript tx Text03d8 db $00 db $00 @@ -1191,7 +1191,7 @@ Specs2Data: db $00 db $0e db $00 - dw $6bc5 ; Pointer to NPC Data + dw $6bc5 ; Pointer to OWScript tx Text03e0 db $00 db $00 @@ -1203,7 +1203,7 @@ Specs3Data: db $00 db $22 db $00 - dw $6bed ; Pointer to NPC Data + dw $6bed ; Pointer to OWScript tx Text03e0 db $00 db $00 @@ -1215,7 +1215,7 @@ Woman2Data: db $04 db $1e db $00 - dw $4c3e ; Pointer to NPC Data + dw $4c3e ; Pointer to OWScript tx Text03d9 db $00 db $00 @@ -1227,7 +1227,7 @@ ManiaData: db $00 db $26 db $00 - dw $6e88 ; Pointer to NPC Data + dw $6e88 ; Pointer to OWScript tx Text03e4 db $00 db $00 @@ -1239,7 +1239,7 @@ Pappy3Data: db $00 db $22 db $00 - dw $709c ; Pointer to NPC Data + dw $709c ; Pointer to OWScript tx Text03dd db $00 db $00 @@ -1251,7 +1251,7 @@ Gal4Data: db $00 db $16 db $00 - dw $70a0 ; Pointer to NPC Data + dw $70a0 ; Pointer to OWScript tx Text03db db $00 db $00 @@ -1263,7 +1263,7 @@ ChampData: db $00 db $26 db $00 - dw $70a4 ; Pointer to NPC Data + dw $70a4 ; Pointer to OWScript tx Text03e3 db $00 db $00 @@ -1275,7 +1275,7 @@ Hood2Data: db $04 db $1e db $00 - dw $70a8 ; Pointer to NPC Data + dw $70a8 ; Pointer to OWScript tx Text03e2 db $00 db $00 @@ -1287,7 +1287,7 @@ Lass5Data: db $04 db $1a db $00 - dw $70ac ; Pointer to NPC Data + dw $70ac ; Pointer to OWScript tx Text03dc db $00 db $00 @@ -1299,7 +1299,7 @@ Chap5Data: db $00 db $1a db $00 - dw $70b0 ; Pointer to NPC Data + dw $70b0 ; Pointer to OWScript tx Text03da db $00 db $00 @@ -1311,7 +1311,7 @@ AaronData: db $00 db $0e db $00 - dw $58dd ; Pointer to NPC Data + dw $58dd ; Pointer to OWScript tx Text03e7 db AARON_PIC db $09 @@ -1323,7 +1323,7 @@ GuideData: db $00 db $16 db $00 - dw $7283 ; Pointer to NPC Data + dw $7283 ; Pointer to OWScript tx Text03e6 db $00 db $00 @@ -1335,7 +1335,7 @@ Tech7Data: db $00 db $0e db $00 - dw $58c6 ; Pointer to NPC Data + dw $58c6 ; Pointer to OWScript tx Text03b2 db $00 db $00 @@ -1347,7 +1347,7 @@ Tech8Data: db $00 db $0e db $00 - dw $58d1 ; Pointer to NPC Data + dw $58d1 ; Pointer to OWScript tx Text03b2 db $00 db $00 @@ -1359,49 +1359,49 @@ Data_11f18: db $3a db $3a db $10 - dw $4c3e ; Pointer to NPC Data + dw $4c3e ; Pointer to OWScript Data_11f1f: db $68 db $27 db $3b db $41 db $50 - dw $4c3e ; Pointer to NPC Data + dw $4c3e ; Pointer to OWScript Data_11f26: db $69 db $27 db $3c db $42 db $50 - dw $4c3e ; Pointer to NPC Data + dw $4c3e ; Pointer to OWScript Data_11f2d: db $6a db $27 db $3d db $43 db $50 - dw $4c3e ; Pointer to NPC Data + dw $4c3e ; Pointer to OWScript Data_11f34: db $6b db $27 db $3e db $44 db $50 - dw $4c3e ; Pointer to NPC Data + dw $4c3e ; Pointer to OWScript Data_11f3b: db $6c db $27 db $3f db $45 db $50 - dw $4c3e ; Pointer to NPC Data + dw $4c3e ; Pointer to OWScript Data_11f42: db $6d db $27 db $40 db $46 db $50 - dw $4c3e ; Pointer to NPC Data + dw $4c3e ; Pointer to OWScript Data_11f49: db $00 db $00 -- cgit v1.2.3 From cb88ee5a13498f060da1be80eb0cc0fcd1357a05 Mon Sep 17 00:00:00 2001 From: Andrew Martinek Date: Tue, 8 Oct 2019 00:20:52 -0400 Subject: Created python script to calculate progress and documented some scripts --- src/data/map_scripts.asm | 70 +++++++++++++++++++++++------------------------ src/data/npc_map_data.asm | 66 ++++++++++++++++++++++---------------------- src/data/npcs.asm | 2 +- 3 files changed, 69 insertions(+), 69 deletions(-) (limited to 'src/data') diff --git a/src/data/map_scripts.asm b/src/data/map_scripts.asm index e156a1c..bd0229d 100644 --- a/src/data/map_scripts.asm +++ b/src/data/map_scripts.asm @@ -23,17 +23,17 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; MASON_LABORATORY - dw NPCData_772f + dw MasonLabNPCS dw $0000 dw $7b04 dw $5565 dw $5549 - dw $553b + dw MasonLaboratoryAfterDuel dw $0000 dw $555e ; DECK_MACHINE_ROOM - dw NPCData_775a + dw DeckMachineRoomNPCS dw $0000 dw $7b4d dw $0000 @@ -43,7 +43,7 @@ MapScripts: ; 1162a (4:562a) dw $58ad ; ISHIHARAS_HOUSE - dw NPCData_7773 + dw IshiharasHouseNPCS dw $0000 dw $7c02 dw $0000 @@ -53,7 +53,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; FIGHTING_CLUB_ENTRANCE - dw NPCData_7786 + dw FightingClubEntranceNPCS dw $0000 dw $0000 dw $0000 @@ -63,17 +63,17 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; FIGHTING_CLUB_LOBBY - dw NPCData_779f + dw FightingClubLobbyNPCS dw $0000 dw $7c6f dw $0000 dw $0000 - dw $5c68 + dw FightingClubLobbyAfterDuel dw $0000 dw $0000 ; FIGHTING_CLUB - dw NPCData_77ca + dw FightingClubNPCS dw $0000 dw $0000 dw $0000 @@ -83,7 +83,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; ROCK_CLUB_ENTRANCE - dw NPCData_77e3 + dw RockClubEntranceNPCS dw $0000 dw $0000 dw $0000 @@ -93,7 +93,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; ROCK_CLUB_LOBBY - dw NPCData_77fc + dw RockClubLobbyNPCS dw $0000 dw $7ca6 dw $0000 @@ -103,7 +103,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; ROCK_CLUB - dw NPCData_7827 + dw RockClubNPCS dw $0000 dw $0000 dw $0000 @@ -113,7 +113,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; WATER_CLUB_ENTRANCE - dw NPCData_783a + dw WaterClubEntranceNPCS dw $0000 dw $0000 dw $0000 @@ -123,7 +123,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; WATER_CLUB_LOBBY - dw NPCData_7853 + dw WaterClubLobbyNPCS dw $0000 dw $7cdd dw $0000 @@ -133,7 +133,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; WATER_CLUB - dw NPCData_787e + dw WaterClubNPCS dw $0000 dw $0000 dw $0000 @@ -143,7 +143,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; LIGHTNING_CLUB_ENTRANCE - dw NPCData_7897 + dw LightningClubEntranceNPCS dw $0000 dw $0000 dw $0000 @@ -153,7 +153,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; LIGHTNING_CLUB_LOBBY - dw NPCData_78b0 + dw LightningClubLobbyNPCS dw $0000 dw $7d14 dw $0000 @@ -163,7 +163,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; LIGHTNING_CLUB - dw NPCData_78d5 + dw LightningClubNPCS dw $0000 dw $0000 dw $0000 @@ -173,7 +173,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; GRASS_CLUB_ENTRANCE - dw NPCData_78ee + dw GrassClubEntranceNPCS dw $0000 dw $0000 dw $0000 @@ -183,7 +183,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; GRASS_CLUB_LOBBY - dw NPCData_790d + dw GrassClubLobbyNPCS dw $0000 dw $7d4b dw $0000 @@ -193,7 +193,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; GRASS_CLUB - dw NPCData_7932 + dw GrassClubNPCS dw $0000 dw $0000 dw $0000 @@ -203,7 +203,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; PSYCHIC_CLUB_ENTRANCE - dw NPCData_7945 + dw PsychicClubEntranceNPCS dw $0000 dw $0000 dw $0000 @@ -213,7 +213,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; PSYCHIC_CLUB_LOBBY - dw NPCData_7964 + dw PsychicClubLobbyNPCS dw $0000 dw $7d82 dw $0000 @@ -223,7 +223,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; PSYCHIC_CLUB - dw NPCData_798f + dw PsychicClubNPCS dw $0000 dw $0000 dw $0000 @@ -233,7 +233,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; SCIENCE_CLUB_ENTRANCE - dw NPCData_79a8 + dw ScienceClubEntranceNPCS dw $0000 dw $0000 dw $0000 @@ -243,7 +243,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; SCIENCE_CLUB_LOBBY - dw NPCData_79c1 + dw ScienceClubLobbyNPCS dw $0000 dw $7db9 dw $0000 @@ -253,7 +253,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; SCIENCE_CLUB - dw NPCData_79ec + dw ScienceClubNPCS dw $0000 dw $0000 dw $0000 @@ -263,7 +263,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; FIRE_CLUB_ENTRANCE - dw NPCData_7a05 + dw FireClubEntranceNPCS dw $0000 dw $0000 dw $0000 @@ -273,7 +273,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; FIRE_CLUB_LOBBY - dw NPCData_7a1e + dw FireClubLobbyNPCS dw $0000 dw $7df0 dw $6d57 @@ -283,7 +283,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; FIRE_CLUB - dw NPCData_7a43 + dw FireClubNPCS dw $0000 dw $0000 dw $0000 @@ -293,7 +293,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; CHALLENGE_HALL_ENTRANCE - dw NPCData_7a5c + dw ChallengeHallEntranceNPCS dw $0000 dw $0000 dw $0000 @@ -303,7 +303,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; CHALLENGE_HALL_LOBBY - dw NPCData_7a63 + dw ChallengeHallLobbyNPCS dw $0000 dw $7e27 dw $0000 @@ -313,7 +313,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; CHALLENGE_HALL - dw NPCData_7a9a + dw ChallengeHallNPCS dw $0000 dw $0000 dw $0000 @@ -323,7 +323,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 ; POKEMON_DOME_ENTRANCE - dw NPCData_7ab9 + dw PokemonDomeEntranceNPCS dw $0000 dw $7e5e dw $0000 @@ -333,7 +333,7 @@ MapScripts: ; 1162a (4:562a) dw $762a ; POKEMON_DOME - dw NPCData_7ac0 + dw PokemonDomeNPCS dw $0000 dw $0000 dw $0000 @@ -343,7 +343,7 @@ MapScripts: ; 1162a (4:562a) dw $7718 ; HALL_OF_HONOR - dw NPCData_7adf + dw HallOfHonorNPCS dw $0000 dw $7ec2 dw $0000 diff --git a/src/data/npc_map_data.asm b/src/data/npc_map_data.asm index 7bc69cb..bae46d1 100644 --- a/src/data/npc_map_data.asm +++ b/src/data/npc_map_data.asm @@ -1,7 +1,7 @@ ; NPC Map data. Format: ; NPC, X position, Y Position, Direction, ; pre-load function. (Resets c flag if NPC should not be loaded) -NPCData_772f: ; 772f (4:1372f) +MasonLabNPCS: ; 772f (4:1372f) db DRMASON, $0e, $06, SOUTH dw $5710 db SAM, $04, $0e, EAST @@ -18,7 +18,7 @@ NPCData_772f: ; 772f (4:1372f) dw $55eb db $00 -NPCData_775a: ; 775a (4:1375a) +DeckMachineRoomNPCS: ; 775a (4:1375a) db TECH6, $06, $08, SOUTH dw $0000 db TECH7, $06, $16, WEST @@ -29,7 +29,7 @@ NPCData_775a: ; 775a (4:1375a) dw $0000 db $00 -NPCData_7773: ; 7773 (4:13773) +IshiharasHouseNPCS: ; 7773 (4:13773) db NIKKI, $04, $04, NORTH dw $5add db ISHIHARA, $08, $08, SOUTH @@ -38,7 +38,7 @@ NPCData_7773: ; 7773 (4:13773) dw $5c43 db $00 -NPCData_7786: ; 7786 (4:13786) +FightingClubEntranceNPCS: ; 7786 (4:13786) db CLERK1, $06, $02, SOUTH dw $0000 db RONALD1, $08, $fe, SOUTH @@ -49,7 +49,7 @@ NPCData_7786: ; 7786 (4:13786) dw $6915 db $00 -NPCData_779f: ; 779f (4:1379f) +FightingClubLobbyNPCS: ; 779f (4:1379f) db MAN1, $0c, $0e, WEST dw $0000 db IMAKUNI, $12, $02, NORTH @@ -66,7 +66,7 @@ NPCData_779f: ; 779f (4:1379f) dw $7c6c db $00 -NPCData_77ca: ; 77ca (4:137ca) +FightingClubNPCS: ; 77ca (4:137ca) db CHRIS, $04, $08, SOUTH dw $5e43 db MICHAEL, $0e, $0a, SOUTH @@ -77,7 +77,7 @@ NPCData_77ca: ; 77ca (4:137ca) dw $0000 db $00 -NPCData_77e3: ; 77e3 (4:137e3) +RockClubEntranceNPCS: ; 77e3 (4:137e3) db CLERK2, $06, $02, SOUTH dw $0000 db RONALD1, $08, $fe, SOUTH @@ -88,7 +88,7 @@ NPCData_77e3: ; 77e3 (4:137e3) dw $6915 db $00 -NPCData_77fc: ; 77fc (4:137fc) +RockClubLobbyNPCS: ; 77fc (4:137fc) db CHRIS, $12, $08, WEST dw $5ee9 db MATTHEW, $06, $0e, EAST @@ -105,7 +105,7 @@ NPCData_77fc: ; 77fc (4:137fc) dw $7c6c db $00 -NPCData_7827: ; 7827 (4:13827) +RockClubNPCS: ; 7827 (4:13827) db RYAN, $14, $0e, EAST dw $0000 db ANDREW, $06, $14, NORTH @@ -114,7 +114,7 @@ NPCData_7827: ; 7827 (4:13827) dw $0000 db $00 -NPCData_783a: ; 783a (4:1383a) +WaterClubEntranceNPCS: ; 783a (4:1383a) db CLERK3, $06, $02, SOUTH dw $0000 db RONALD1, $08, $fe, SOUTH @@ -125,7 +125,7 @@ NPCData_783a: ; 783a (4:1383a) dw $6915 db $00 -NPCData_7853: ; 7853 (4:13853) +WaterClubLobbyNPCS: ; 7853 (4:13853) db GAL1, $06, $0e, SOUTH dw $0000 db LASS1, $10, $0a, SOUTH @@ -142,7 +142,7 @@ NPCData_7853: ; 7853 (4:13853) dw $7c6c db $00 -NPCData_787e: ; 787e (4:1387e) +WaterClubNPCS: ; 787e (4:1387e) db SARA, $06, $12, EAST dw $0000 db AMANDA, $16, $14, WEST @@ -153,7 +153,7 @@ NPCData_787e: ; 787e (4:1387e) dw $62ad db $00 -NPCData_7897: ; 7897 (4:13897) +LightningClubEntranceNPCS: ; 7897 (4:13897) db CLERK4, $06, $02, SOUTH dw $0000 db RONALD1, $08, $fe, SOUTH @@ -164,7 +164,7 @@ NPCData_7897: ; 7897 (4:13897) dw $6915 db $00 -NPCData_78b0: ; 78b0 (4:138b0) +LightningClubLobbyNPCS: ; 78b0 (4:138b0) db CHAP2, $12, $10, WEST dw $0000 db IMAKUNI, $12, $02, NORTH @@ -179,7 +179,7 @@ NPCData_78b0: ; 78b0 (4:138b0) dw $7c6c db $00 -NPCData_78d5: ; 78d5 (4:138d5) +LightningClubNPCS: ; 78d5 (4:138d5) db JENNIFER, $0e, $12, SOUTH dw $0000 db NICHOLAS, $06, $0a, SOUTH @@ -190,7 +190,7 @@ NPCData_78d5: ; 78d5 (4:138d5) dw $6494 db $00 -NPCData_78ee: ; 78ee (4:138ee) +GrassClubEntranceNPCS: ; 78ee (4:138ee) db CLERK5, $06, $02, SOUTH dw $0000 db MICHAEL, $0e, $08, SOUTH @@ -203,7 +203,7 @@ NPCData_78ee: ; 78ee (4:138ee) dw $6915 db $00 -NPCData_790d: ; 790d (4:1390d) +GrassClubLobbyNPCS: ; 790d (4:1390d) db BRITTANY, $0c, $0e, WEST dw $0000 db LASS2, $12, $08, SOUTH @@ -218,7 +218,7 @@ NPCData_790d: ; 790d (4:1390d) dw $7c6c db $00 -NPCData_7932: ; 7932 (4:13932) +GrassClubNPCS: ; 7932 (4:13932) db KRISTIN, $04, $0a, EAST dw $0000 db HEATHER, $0e, $10, SOUTH @@ -227,7 +227,7 @@ NPCData_7932: ; 7932 (4:13932) dw $6796 db $00 -NPCData_7945: ; 7945 (4:13945) +PsychicClubEntranceNPCS: ; 7945 (4:13945) db CLERK6, $06, $02, SOUTH dw $0000 db RONALD1, $08, $fe, SOUTH @@ -240,7 +240,7 @@ NPCData_7945: ; 7945 (4:13945) dw $0000 db $00 -NPCData_7964: ; 7964 (4:13964) +PsychicClubLobbyNPCS: ; 7964 (4:13964) db ROBERT, $14, $08, NORTH dw $0000 db PAPPY1, $04, $10, EAST @@ -257,7 +257,7 @@ NPCData_7964: ; 7964 (4:13964) dw $7c6c db $00 -NPCData_798f: ; 798f (4:1398f) +PsychicClubNPCS: ; 798f (4:1398f) db DANIEL, $08, $08, NORTH dw $0000 db STEPHANIE, $16, $0c, EAST @@ -268,7 +268,7 @@ NPCData_798f: ; 798f (4:1398f) dw $6ada db $00 -NPCData_79a8: ; 79a8 (4:139a8) +ScienceClubEntranceNPCS: ; 79a8 (4:139a8) db CLERK7, $06, $02, SOUTH dw $0000 db RONALD1, $08, $fe, SOUTH @@ -279,7 +279,7 @@ NPCData_79a8: ; 79a8 (4:139a8) dw $6915 db $00 -NPCData_79c1: ; 79c1 (4:139c1) +ScienceClubLobbyNPCS: ; 79c1 (4:139c1) db LAD1, $12, $12, NORTH dw $0000 db IMAKUNI, $12, $02, NORTH @@ -296,7 +296,7 @@ NPCData_79c1: ; 79c1 (4:139c1) dw $7c6c db $00 -NPCData_79ec: ; 79ec (4:139ec) +ScienceClubNPCS: ; 79ec (4:139ec) db JOSEPH, $08, $0a, SOUTH dw $6cc4 db DAVID, $14, $04, NORTH @@ -307,7 +307,7 @@ NPCData_79ec: ; 79ec (4:139ec) dw $0000 db $00 -NPCData_7a05: ; 7a05 (4:13a05) +FireClubEntranceNPCS: ; 7a05 (4:13a05) db CLERK8, $06, $02, SOUTH dw $0000 db RONALD1, $08, $fe, SOUTH @@ -318,7 +318,7 @@ NPCData_7a05: ; 7a05 (4:13a05) dw $6915 db $00 -NPCData_7a1e: ; 7a1e (4:13a1e) +FireClubLobbyNPCS: ; 7a1e (4:13a1e) db JESSICA, $0c, $0e, WEST dw $6d8d db LAD2, $12, $06, EAST @@ -333,7 +333,7 @@ NPCData_7a1e: ; 7a1e (4:13a1e) dw $7c6c db $00 -NPCData_7a43: ; 7a43 (4:13a43) +FireClubNPCS: ; 7a43 (4:13a43) db JOHN, $0c, $12, SOUTH dw $0000 db ADAM, $08, $0e, SOUTH @@ -344,12 +344,12 @@ NPCData_7a43: ; 7a43 (4:13a43) dw $0000 db $00 -NPCData_7a5c: ; 7a5c (4:13a5c) +ChallengeHallEntranceNPCS: ; 7a5c (4:13a5c) db CLERK9, $06, $02, SOUTH dw $6f96 db $00 -NPCData_7a63: ; 7a63 (4:13a63) +ChallengeHallLobbyNPCS: ; 7a63 (4:13a63) db PAPPY3, $06, $0e, EAST dw $707a db CHAMP, $10, $12, WEST @@ -370,7 +370,7 @@ NPCData_7a63: ; 7a63 (4:13a63) dw $7c6c db $00 -NPCData_7a9a: ; 7a9a (4:13a9a) +ChallengeHallNPCS: ; 7a9a (4:13a9a) db CLERK12, $0a, $12, SOUTH dw $707a db CLERK13, $14, $12, SOUTH @@ -383,12 +383,12 @@ NPCData_7a9a: ; 7a9a (4:13a9a) dw $7559 db $00 -NPCData_7ab9: ; 7ab9 (4:13ab9) +PokemonDomeEntranceNPCS: ; 7ab9 (4:13ab9) db RONALD1, $0e, $12, SOUTH dw $0000 db $00 -NPCData_7ac0: ; 7ac0 (4:13ac0) +PokemonDomeNPCS: ; 7ac0 (4:13ac0) db COURTNEY, $12, $02, SOUTH dw $774b db STEVE, $16, $02, SOUTH @@ -401,7 +401,7 @@ NPCData_7ac0: ; 7ac0 (4:13ac0) dw $77d6 db $00 -NPCData_7adf: ; 7adf (4:13adf) +HallOfHonorNPCS: ; 7adf (4:13adf) db _11F1F, $0a, $08, SOUTH dw $0000 db _11F26, $0c, $08, SOUTH diff --git a/src/data/npcs.asm b/src/data/npcs.asm index bda574f..4ff42c8 100644 --- a/src/data/npcs.asm +++ b/src/data/npcs.asm @@ -183,7 +183,7 @@ ImakuniData: db $00 db $0e db $00 - dw $5d0d ; Pointer to OWScript + dw OWSequence_Imakuni ; Pointer to OWScript tx Text03af db IMAKUNI_PIC db $34 -- cgit v1.2.3 From 299f013b8b14184b9f06da3b89ba87ce2ba9e0f3 Mon Sep 17 00:00:00 2001 From: Andrew Martinek Date: Sun, 13 Oct 2019 19:39:13 -0400 Subject: More scripts, start to figure out mapscripts --- src/data/level_objects.asm | 602 +++++++++++++++++++++++++++++++++++++++++++++ src/data/npc_map_data.asm | 58 ++--- src/data/npcs.asm | 24 +- 3 files changed, 643 insertions(+), 41 deletions(-) create mode 100644 src/data/level_objects.asm (limited to 'src/data') 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 -- cgit v1.2.3 From 3ac91a513dc9351734927182e46b0acd010053cf Mon Sep 17 00:00:00 2001 From: Andrew Martinek Date: Thu, 24 Oct 2019 17:45:50 -0400 Subject: Uncovered NPC Movement and named OWObjects --- src/data/level_objects.asm | 40 ++++++++++++++++++++++++---------------- src/data/map_scripts.asm | 42 +++++++++++++++++++++--------------------- 2 files changed, 45 insertions(+), 37 deletions(-) (limited to 'src/data') diff --git a/src/data/level_objects.asm b/src/data/level_objects.asm index a0d51cc..0756f7f 100644 --- a/src/data/level_objects.asm +++ b/src/data/level_objects.asm @@ -1,4 +1,10 @@ -LevelObjects_13b04: ; 13b04 (3:7b04) +; 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 @@ -42,7 +48,7 @@ LevelObjects_13b04: ; 13b04 (3:7b04) db $ff -LevelObjects_13b4d: ; 13b4d (3:7b4d) +DeckMachineRoomObjects: ; 13b4d (3:7b4d) db NORTH, 2, 2 dw OWSequence_d932 tx Text041b @@ -146,7 +152,7 @@ LevelObjects_13b4d: ; 13b4d (3:7b4d) db $ff -LevelObjects_13c02: ; 13c02 (3:7c02) +IshiharasHouseObjects: ; 13c02 (3:7c02) db NORTH, 6, 2 dw PrintInteractableObjectText tx Text04ae @@ -210,7 +216,7 @@ LevelObjects_13c02: ; 13c02 (3:7c02) db $ff -LevelObjects_13c6f: ; 13c6f (3:7c6f) +FightingClubLobbyObjects: ; 13c6f (3:7c6f) db NORTH, 20, 2 dw PrintInteractableObjectText tx Text04c6 @@ -244,7 +250,7 @@ LevelObjects_13c6f: ; 13c6f (3:7c6f) db $ff -LevelObjects_13ca6: ; 13ca6 (3:7ca6) +RockClubLobbyObjects: ; 13ca6 (3:7ca6) db NORTH, 20, 2 dw PrintInteractableObjectText tx Text04cc @@ -278,7 +284,7 @@ LevelObjects_13ca6: ; 13ca6 (3:7ca6) db $ff -LevelObjects_13cdd: ; 13cdd (3:7cdd) +WaterClubLobbyObjects: ; 13cdd (3:7cdd) db NORTH, 20, 2 dw PrintInteractableObjectText tx Text04d2 @@ -312,7 +318,7 @@ LevelObjects_13cdd: ; 13cdd (3:7cdd) db $ff -LevelObjects_13d14: ; 13d14 (3:7d14) +LightningClubLobbyObjects: ; 13d14 (3:7d14) db NORTH, 20, 2 dw PrintInteractableObjectText tx Text04d8 @@ -346,7 +352,7 @@ LevelObjects_13d14: ; 13d14 (3:7d14) db $ff -LevelObjects_13d4b: ; 13d4b (3:7d4b) +GrassClubLobbyObjects: ; 13d4b (3:7d4b) db NORTH, 20, 2 dw PrintInteractableObjectText tx Text04de @@ -380,7 +386,7 @@ LevelObjects_13d4b: ; 13d4b (3:7d4b) db $ff -LevelObjects_13d82: ; 13d82 (3:7d82) +PsychicClubLobbyObjects: ; 13d82 (3:7d82) db NORTH, 20, 2 dw PrintInteractableObjectText tx Text04e4 @@ -414,7 +420,7 @@ LevelObjects_13d82: ; 13d82 (3:7d82) db $ff -LevelObjects_13db9: ; 13db9 (3:7db9) +ScienceClubLobbyObjects: ; 13db9 (3:7db9) db NORTH, 20, 2 dw PrintInteractableObjectText tx Text04ea @@ -448,7 +454,7 @@ LevelObjects_13db9: ; 13db9 (3:7db9) db $ff -LevelObjects_13df0: ; 13df0 (3:7df0) +FireClubLobbyObjects: ; 13df0 (3:7df0) db NORTH, 20, 2 dw PrintInteractableObjectText tx Text04f0 @@ -482,7 +488,7 @@ LevelObjects_13df0: ; 13df0 (3:7df0) db $ff -LevelObjects_13e27: ; 13e27 (3:7e27) +ChallengeHallLobbyObjects: ; 13e27 (3:7e27) db NORTH, 20, 2 dw PrintInteractableObjectText tx Text04f6 @@ -516,7 +522,7 @@ LevelObjects_13e27: ; 13e27 (3:7e27) db $ff -LevelObjects_13e5e: ; 13e5e (3:7e5e) +PokemonDomeEntranceObjects: ; 13e5e (3:7e5e) db NORTH, 2, 2 dw PrintInteractableObjectText tx Text04fc @@ -576,14 +582,16 @@ LevelObjects_13e5e: ; 13e5e (3:7e5e) db $ff -LevelObjects_13ec2: ; 13ec2 (3:7ec2) +HallOfHonorObjects: ; 13ec2 (3:7ec2) + ; Legendary Cards db NORTH, 10, 10 - dw $7bf1 + dw OWSequence_fbf1 dw $0000 dw $0000 + ; Legendary Cards db NORTH, 12, 10 - dw $7bf1 + dw OWSequence_fbf1 dw $0000 dw $0000 diff --git a/src/data/map_scripts.asm b/src/data/map_scripts.asm index bd0229d..8a3dad7 100644 --- a/src/data/map_scripts.asm +++ b/src/data/map_scripts.asm @@ -4,8 +4,8 @@ ; if a script pointer is $0000, that map has no script for that event ; 0: NPC data ; 2: Called after every NPC is loaded (unused) -; 4: pressed A button -; 6: pressed A button +; 4: Interactable Objects +; 6: pressed A button (if nothing interactable is found) ; 8: load map ; a: after duel ; c: moved player @@ -25,17 +25,17 @@ MapScripts: ; 1162a (4:562a) ; MASON_LABORATORY dw MasonLabNPCS dw $0000 - dw $7b04 - dw $5565 - dw $5549 + dw MasonLabObjects + dw MasonLabPressedA + dw MasonLabLoadMap dw MasonLaboratoryAfterDuel dw $0000 - dw $555e + dw MasonLabCloseTextBox ; DECK_MACHINE_ROOM dw DeckMachineRoomNPCS dw $0000 - dw $7b4d + dw DeckMachineRoomObjects dw $0000 dw $0000 dw $589f @@ -45,7 +45,7 @@ MapScripts: ; 1162a (4:562a) ; ISHIHARAS_HOUSE dw IshiharasHouseNPCS dw $0000 - dw $7c02 + dw IshiharasHouseObjects dw $0000 dw $0000 dw $0000 @@ -65,7 +65,7 @@ MapScripts: ; 1162a (4:562a) ; FIGHTING_CLUB_LOBBY dw FightingClubLobbyNPCS dw $0000 - dw $7c6f + dw FightingClubLobbyObjects dw $0000 dw $0000 dw FightingClubLobbyAfterDuel @@ -95,7 +95,7 @@ MapScripts: ; 1162a (4:562a) ; ROCK_CLUB_LOBBY dw RockClubLobbyNPCS dw $0000 - dw $7ca6 + dw RockClubLobbyObjects dw $0000 dw $0000 dw $5ed5 @@ -125,7 +125,7 @@ MapScripts: ; 1162a (4:562a) ; WATER_CLUB_LOBBY dw WaterClubLobbyNPCS dw $0000 - dw $7cdd + dw WaterClubLobbyObjects dw $0000 dw $0000 dw $60a2 @@ -155,7 +155,7 @@ MapScripts: ; 1162a (4:562a) ; LIGHTNING_CLUB_LOBBY dw LightningClubLobbyNPCS dw $0000 - dw $7d14 + dw LightningClubLobbyObjects dw $0000 dw $0000 dw $636d @@ -185,7 +185,7 @@ MapScripts: ; 1162a (4:562a) ; GRASS_CLUB_LOBBY dw GrassClubLobbyNPCS dw $0000 - dw $7d4b + dw GrassClubLobbyObjects dw $0000 dw $0000 dw GrassClubLobbyAfterDuel @@ -215,7 +215,7 @@ MapScripts: ; 1162a (4:562a) ; PSYCHIC_CLUB_LOBBY dw PsychicClubLobbyNPCS dw $0000 - dw $7d82 + dw PsychicClubLobbyObjects dw $0000 dw $6971 dw $6963 @@ -245,7 +245,7 @@ MapScripts: ; 1162a (4:562a) ; SCIENCE_CLUB_LOBBY dw ScienceClubLobbyNPCS dw $0000 - dw $7db9 + dw ScienceClubLobbyObjects dw $0000 dw $0000 dw $6b57 @@ -275,8 +275,8 @@ MapScripts: ; 1162a (4:562a) ; FIRE_CLUB_LOBBY dw FireClubLobbyNPCS dw $0000 - dw $7df0 - dw $6d57 + dw FireClubLobbyObjects + dw FireClubPressedA dw $0000 dw $6d49 dw $0000 @@ -305,7 +305,7 @@ MapScripts: ; 1162a (4:562a) ; CHALLENGE_HALL_LOBBY dw ChallengeHallLobbyNPCS dw $0000 - dw $7e27 + dw ChallengeHallLobbyObjects dw $0000 dw $7088 dw $0000 @@ -325,7 +325,7 @@ MapScripts: ; 1162a (4:562a) ; POKEMON_DOME_ENTRANCE dw PokemonDomeEntranceNPCS dw $0000 - dw $7e5e + dw PokemonDomeEntranceObjects dw $0000 dw $7607 dw $0000 @@ -345,9 +345,9 @@ MapScripts: ; 1162a (4:562a) ; HALL_OF_HONOR dw HallOfHonorNPCS dw $0000 - dw $7ec2 + dw HallOfHonorObjects dw $0000 - dw $7bdb + dw HallOfHonorLoadMap dw $0000 dw $0000 dw $0000 -- cgit v1.2.3 From e58e93fdb14173ae7a9edcd782f70fe67402c42f Mon Sep 17 00:00:00 2001 From: Andrew Martinek Date: Fri, 25 Oct 2019 19:41:50 -0400 Subject: a bit more scripting stuff, figured out more npc data --- src/data/npc_map_data.asm | 5 +-- src/data/npcs.asm | 87 ++++++++++++++++++++++++----------------------- 2 files changed, 47 insertions(+), 45 deletions(-) (limited to 'src/data') 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) diff --git a/src/data/npcs.asm b/src/data/npcs.asm index 8fb8773..5d091a1 100644 --- a/src/data/npcs.asm +++ b/src/data/npcs.asm @@ -1,5 +1,6 @@ ; 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 NPCDataTable: dw DrMasonData dw DrMasonData @@ -138,7 +139,7 @@ Ronald1Data: dw OWSequence_Ronald ; Pointer to OWScript tx Text03ad db RONALD_PIC - db $1a + db INVINCIBLE_RONALD_DECK_ID db $0f db $16 Ronald2Data: @@ -150,7 +151,7 @@ Ronald2Data: dw OWSequence_Ronald ; Pointer to OWScript tx Text03ad db RONALD_PIC - db $1a + db INVINCIBLE_RONALD_DECK_ID db $0f db $16 Ronald3Data: @@ -162,7 +163,7 @@ Ronald3Data: dw OWSequence_Ronald ; Pointer to OWScript tx Text03ad db RONALD_PIC - db $1a + db INVINCIBLE_RONALD_DECK_ID db $0f db $16 IshiharaData: @@ -186,7 +187,7 @@ ImakuniData: dw OWSequence_Imakuni ; Pointer to OWScript tx Text03af db IMAKUNI_PIC - db $34 + db IMAKUNI_DECK_ID db $10 db $15 SamData: @@ -198,7 +199,7 @@ SamData: dw $561d ; Pointer to OWScript tx Text03b1 db SAM_PIC - db $02 + db SAMS_NORMAL_DECK_ID db $02 db $15 Tech1Data: @@ -390,7 +391,7 @@ ChrisData: dw $5ef2 ; Pointer to OWScript tx Text03b4 db CHRIS_PIC - db $1c + db MUSCLES_FOR_BRAINS_DECK_ID db $03 db $15 MichaelData: @@ -402,7 +403,7 @@ MichaelData: dw $6573 ; Pointer to OWScript tx Text03b5 db MICHAEL_PIC - db $1d + db HEATED_BATTLE_DECK_ID db $03 db $15 JessicaData: @@ -414,7 +415,7 @@ JessicaData: dw $6d96 ; Pointer to OWScript tx Text03b6 db JESSICA_PIC - db $1e + db LOVE_TO_BATTLE_DECK_ID db $03 db $15 MitchData: @@ -426,7 +427,7 @@ MitchData: dw $5dc3 ; Pointer to OWScript tx Text03b7 db MITCH_PIC - db $10 + db FIRST_STRIKE_DECK_ID db $03 db $16 MatthewData: @@ -438,7 +439,7 @@ MatthewData: dw $5f39 ; Pointer to OWScript tx Text03b8 db MATTHEW_PIC - db $21 + db HARD_POKEMON_DECK_ID db $03 db $15 RyanData: @@ -450,7 +451,7 @@ RyanData: dw $5ff0 ; Pointer to OWScript tx Text03b9 db RYAN_PIC - db $1f + db EXCAVATION_DECK_ID db $03 db $15 AndrewData: @@ -462,7 +463,7 @@ AndrewData: dw $6017 ; Pointer to OWScript tx Text03ba db ANDREW_PIC - db $20 + db BLISTERING_POKEMON_DECK_ID db $03 db $15 GeneData: @@ -474,7 +475,7 @@ GeneData: dw $603e ; Pointer to OWScript tx Text03bb db GENE_PIC - db $11 + db ROCK_CRUSHER_DECK_ID db $03 db $16 SaraData: @@ -486,7 +487,7 @@ SaraData: dw OWSequence_Sara ; Pointer to OWScript tx Text03bc db SARA_PIC - db $22 + db WATERFRONT_POKEMON_DECK_ID db $03 db $15 AmandaData: @@ -498,7 +499,7 @@ AmandaData: dw OWSequence_Amanda ; Pointer to OWScript tx Text03bd db AMANDA_PIC ; battle profile picture - db $23 + db LONELY_FRIENDS_DECK_ID db $03 db $15 JoshuaData: @@ -510,7 +511,7 @@ JoshuaData: dw OWSequence_Joshua ; Pointer to OWScript tx Text03be db JOSHUA_PIC - db $24 + db SOUND_OF_THE_WAVES_DECK_ID db $03 db $15 AmyData: @@ -522,7 +523,7 @@ AmyData: dw OWSequence_Amy ; Pointer to OWScript tx Text03bf db AMY_PIC - db $12 + db GO_GO_RAIN_DANCE_DECK_ID db $03 db $16 JenniferData: @@ -534,7 +535,7 @@ JenniferData: dw $6408 ; Pointer to OWScript tx Text03c0 db JENNIFER_PIC - db $25 + db PIKACHU_DECK_ID db $03 db $15 NicholasData: @@ -546,7 +547,7 @@ NicholasData: dw $642f ; Pointer to OWScript tx Text03c1 db NICHOLAS_PIC - db $26 + db BOOM_BOOM_SELFDESTRUCT_DECK_ID db $03 db $15 BrandonData: @@ -558,7 +559,7 @@ BrandonData: dw $6456 ; Pointer to OWScript tx Text03c2 db BRANDON_PIC - db $27 + db POWER_GENERATOR_DECK_ID db $03 db $15 IsaacData: @@ -570,7 +571,7 @@ IsaacData: dw $64ad ; Pointer to OWScript tx Text03c3 db ISAAC_PIC - db $13 + db ZAPPING_SELFDESTRUCT_DECK_ID db $03 db $16 BrittanyData: @@ -582,7 +583,7 @@ BrittanyData: dw OWSequence_Brittany ; Pointer to OWScript tx Text03c4 db BRITTANY_PIC - db $28 + db ETCETERA_DECK_ID db $03 db $15 KristinData: @@ -594,7 +595,7 @@ KristinData: dw $6701 ; Pointer to OWScript tx Text03c5 db KRISTIN_PIC - db $29 + db FLOWER_GARDEN_DECK_ID db $03 db $15 HeatherData: @@ -606,7 +607,7 @@ HeatherData: dw $6745 ; Pointer to OWScript tx Text03c6 db HEATHER_PIC - db $2a + db KALEIDOSCOPE_DECK_ID db $03 db $15 NikkiData: @@ -618,7 +619,7 @@ NikkiData: dw $679e ; Pointer to OWScript tx Text03c7 db NIKKI_PIC - db $14 + db FLOWER_POWER_DECK_ID db $03 db $16 RobertData: @@ -630,7 +631,7 @@ RobertData: dw $6980 ; Pointer to OWScript tx Text03c8 db ROBERT_PIC - db $2b + db GHOST_DECK_ID db $03 db $15 DanielData: @@ -642,7 +643,7 @@ DanielData: dw $6a60 ; Pointer to OWScript tx Text03c9 db DANIEL_PIC - db $2c + db NAP_TIME_DECK_ID db $03 db $15 StephanieData: @@ -654,7 +655,7 @@ StephanieData: dw $6aa2 ; Pointer to OWScript tx Text03ca db STEPHANIE_PIC - db $2d + db STRANGE_POWER_DECK_ID db $03 db $15 Murray1Data: @@ -666,7 +667,7 @@ Murray1Data: dw $6adf ; Pointer to OWScript tx Text03cb db MURRAY_PIC - db $15 + db STRANGE_PSYSHOCK_DECK_ID db $03 db $16 Murray2Data: @@ -678,7 +679,7 @@ Murray2Data: dw $6adf ; Pointer to OWScript tx Text03cb db MURRAY_PIC - db $15 + db STRANGE_PSYSHOCK_DECK_ID db $03 db $16 JosephData: @@ -690,7 +691,7 @@ JosephData: dw $6cdb ; Pointer to OWScript tx Text03cc db JOSEPH_PIC - db $2e + db FLYIN_POKEMON_DECK_ID db $03 db $15 DavidData: @@ -702,7 +703,7 @@ DavidData: dw $6c11 ; Pointer to OWScript tx Text03cd db DAVID_PIC - db $2f + db LOVELY_NIDORAN_DECK_ID db $03 db $15 ErikData: @@ -714,7 +715,7 @@ ErikData: dw $6c42 ; Pointer to OWScript tx Text03ce db ERIK_PIC - db $30 + db POISON_DECK_ID db $03 db $15 RickData: @@ -726,7 +727,7 @@ RickData: dw $6c67 ; Pointer to OWScript tx Text03cf db RICK_PIC - db $16 + db WONDERS_OF_SCIENCE_DECK_ID db $03 db $16 JohnData: @@ -738,7 +739,7 @@ JohnData: dw $6eb3 ; Pointer to OWScript tx Text03d0 db JOHN_PIC - db $31 + db ANGER_DECK_ID db $03 db $15 AdamData: @@ -750,7 +751,7 @@ AdamData: dw $6ed8 ; Pointer to OWScript tx Text03d1 db ADAM_PIC - db $32 + db FLAMETHROWER_DECK_ID db $03 db $15 JonathanData: @@ -762,7 +763,7 @@ JonathanData: dw $6efd ; Pointer to OWScript tx Text03d2 db JONATHAN_PIC - db $33 + db RESHUFFLE_DECK_ID db $03 db $15 KenData: @@ -774,7 +775,7 @@ KenData: dw $6f22 ; Pointer to OWScript tx Text03d3 db KEN_PIC - db $17 + db FIRE_CHARGE_DECK_ID db $03 db $16 CourtneyData: @@ -786,7 +787,7 @@ CourtneyData: dw $771f ; Pointer to OWScript tx Text03d4 db COURTNEY_PIC - db $0c + db LEGENDARY_MOLTRES_DECK_ID db $04 db $17 SteveData: @@ -798,7 +799,7 @@ SteveData: dw $772a ; Pointer to OWScript tx Text03d5 db STEVE_PIC - db $0d + db LEGENDARY_ZAPDOS_DECK_ID db $04 db $17 JackData: @@ -810,7 +811,7 @@ JackData: dw $7735 ; Pointer to OWScript tx Text03d6 db JACK_PIC - db $0e + db LEGENDARY_ARTICUNO_DECK_ID db $04 db $17 RodData: @@ -822,7 +823,7 @@ RodData: dw $7740 ; Pointer to OWScript tx Text03d7 db ROD_PIC - db $0f + db LEGENDARY_DRAGONITE_DECK_ID db $04 db $17 Clerk10Data: @@ -1314,7 +1315,7 @@ AaronData: dw $58dd ; Pointer to OWScript tx Text03e7 db AARON_PIC - db $09 + db LIGHTNING_AND_FIRE_DECK_ID db $02 db $15 GuideData: -- cgit v1.2.3 From 3f99d5555ce7b8a2467aef9d24d7192f993343d9 Mon Sep 17 00:00:00 2001 From: Andrew Martinek Date: Mon, 28 Oct 2019 17:25:50 -0400 Subject: extracted a lot of challenge hall scripts --- src/data/map_scripts.asm | 4 ++-- src/data/npc_map_data.asm | 2 +- src/data/npcs.asm | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/data') diff --git a/src/data/map_scripts.asm b/src/data/map_scripts.asm index 8a3dad7..f75d963 100644 --- a/src/data/map_scripts.asm +++ b/src/data/map_scripts.asm @@ -317,8 +317,8 @@ MapScripts: ; 1162a (4:562a) dw $0000 dw $0000 dw $0000 - dw $7258 - dw $7239 + dw ChallengeHallLoadMap + dw ChallengeHallAfterDuel dw $0000 dw $0000 diff --git a/src/data/npc_map_data.asm b/src/data/npc_map_data.asm index d40e086..a66c149 100644 --- a/src/data/npc_map_data.asm +++ b/src/data/npc_map_data.asm @@ -377,7 +377,7 @@ ChallengeHallNPCS: ; 7a9a (4:13a9a) db CLERK13, $14, $12, SOUTH dw $707a db GUIDE, $0e, $14, SOUTH - dw $7270 + dw Preload_Guide db HOST, $0e, $04, SOUTH dw $707a db $ff, $12, $08, WEST ; pre-load function chooses NPC to load diff --git a/src/data/npcs.asm b/src/data/npcs.asm index 5d091a1..1ef61e9 100644 --- a/src/data/npcs.asm +++ b/src/data/npcs.asm @@ -928,7 +928,7 @@ Lass2Data: db $00 db $1e db $00 - dw $661f ; Pointer to OWScript + dw OWSequence_e61f ; Pointer to OWScript tx Text03dc db $00 db $00 @@ -1000,7 +1000,7 @@ Clerk13Data: db $00 db $16 db $00 - dw $726c ; Pointer to OWScript + dw OWSequence_Clerk13 ; Pointer to OWScript tx Text03b3 db $00 db $00 -- cgit v1.2.3 From adc5a467eeccb0e44f4fcd2ed14d2b185ca1c14c Mon Sep 17 00:00:00 2001 From: Andrew Martinek Date: Tue, 29 Oct 2019 16:35:04 -0400 Subject: Finished extracting Challenge Hall scripts --- src/data/map_scripts.asm | 2 +- src/data/npc_map_data.asm | 24 ++++++++++++------------ src/data/npcs.asm | 40 ++++++++++++++++++++-------------------- 3 files changed, 33 insertions(+), 33 deletions(-) (limited to 'src/data') diff --git a/src/data/map_scripts.asm b/src/data/map_scripts.asm index f75d963..f969d45 100644 --- a/src/data/map_scripts.asm +++ b/src/data/map_scripts.asm @@ -307,7 +307,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 dw ChallengeHallLobbyObjects dw $0000 - dw $7088 + dw ChallengeHallLobbyLoadMap dw $0000 dw $0000 dw $0000 diff --git a/src/data/npc_map_data.asm b/src/data/npc_map_data.asm index a66c149..05663c3 100644 --- a/src/data/npc_map_data.asm +++ b/src/data/npc_map_data.asm @@ -347,24 +347,24 @@ FireClubNPCS: ; 7a43 (4:13a43) ChallengeHallEntranceNPCS: ; 7a5c (4:13a5c) db CLERK9, $06, $02, SOUTH - dw $6f96 + dw Preload_Clerk9 db $00 ChallengeHallLobbyNPCS: ; 7a63 (4:13a63) db PAPPY3, $06, $0e, EAST - dw $707a + dw Preload_ChallengeHallNPCs1 db CHAMP, $10, $12, WEST - dw $707a + dw Preload_ChallengeHallNPCs1 db HOOD2, $14, $08, SOUTH - dw $707a + dw Preload_ChallengeHallNPCs1 db LASS5, $16, $10, WEST - dw $707a + dw Preload_ChallengeHallNPCs1 db GAL4, $0c, $0e, EAST - dw $7075 + dw Preload_ChallengeHallNPCs2 db CHAP5, $10, $08, WEST - dw $7075 + dw Preload_ChallengeHallNPCs2 db RONALD1, $08, $0c, SOUTH - dw $70b4 + dw Preload_ChallengeHallLobbyRonald1 db CLERK10, $06, $04, SOUTH dw $0000 db GIFT_CENTER_CLERK, $0a, $04, SOUTH @@ -373,15 +373,15 @@ ChallengeHallLobbyNPCS: ; 7a63 (4:13a63) ChallengeHallNPCS: ; 7a9a (4:13a9a) db CLERK12, $0a, $12, SOUTH - dw $707a + dw Preload_ChallengeHallNPCs1 db CLERK13, $14, $12, SOUTH - dw $707a + dw Preload_ChallengeHallNPCs1 db GUIDE, $0e, $14, SOUTH dw Preload_Guide db HOST, $0e, $04, SOUTH - dw $707a + dw Preload_ChallengeHallNPCs1 db $ff, $12, $08, WEST ; pre-load function chooses NPC to load - dw $7559 + dw Preload_ChallengeHallOpponent db $00 PokemonDomeEntranceNPCS: ; 7ab9 (4:13ab9) diff --git a/src/data/npcs.asm b/src/data/npcs.asm index 1ef61e9..4e5ffe7 100644 --- a/src/data/npcs.asm +++ b/src/data/npcs.asm @@ -376,7 +376,7 @@ Clerk9Data: db $0a db $30 db $00 - dw $7025 ; Pointer to OWScript + dw OWSequence_Clerk9 ; Pointer to OWScript tx Text03b3 db $00 db $00 @@ -832,7 +832,7 @@ Clerk10Data: db $0a db $30 db $00 - dw $4c3e ; Pointer to OWScript + dw NoOverworldSequence ; Pointer to OWScript tx Text03b0 db $00 db $00 @@ -844,7 +844,7 @@ GiftCenterClerkData: db $0a db $30 db $00 - dw $4c3e ; Pointer to OWScript + dw NoOverworldSequence ; Pointer to OWScript tx Text03b0 db $00 db $00 @@ -988,7 +988,7 @@ Clerk12Data: db $00 db $16 db $00 - dw $7295 ; Pointer to OWScript + dw OWSequence_Clerk12 ; Pointer to OWScript tx Text03b3 db $00 db $00 @@ -1012,7 +1012,7 @@ HostData: db $00 db $16 db $00 - dw $7352 ; Pointer to OWScript + dw OWSequence_HostStubbed ; Pointer to OWScript tx Text03df db $00 db $00 @@ -1216,7 +1216,7 @@ Woman2Data: db $04 db $1e db $00 - dw $4c3e ; Pointer to OWScript + dw NoOverworldSequence ; Pointer to OWScript tx Text03d9 db $00 db $00 @@ -1240,7 +1240,7 @@ Pappy3Data: db $00 db $22 db $00 - dw $709c ; Pointer to OWScript + dw OWSequence_Pappy3 ; Pointer to OWScript tx Text03dd db $00 db $00 @@ -1252,7 +1252,7 @@ Gal4Data: db $00 db $16 db $00 - dw $70a0 ; Pointer to OWScript + dw OWSequence_Gal4 ; Pointer to OWScript tx Text03db db $00 db $00 @@ -1264,7 +1264,7 @@ ChampData: db $00 db $26 db $00 - dw $70a4 ; Pointer to OWScript + dw OWSequence_Champ ; Pointer to OWScript tx Text03e3 db $00 db $00 @@ -1276,7 +1276,7 @@ Hood2Data: db $04 db $1e db $00 - dw $70a8 ; Pointer to OWScript + dw OWSequence_Hood2 ; Pointer to OWScript tx Text03e2 db $00 db $00 @@ -1288,7 +1288,7 @@ Lass5Data: db $04 db $1a db $00 - dw $70ac ; Pointer to OWScript + dw OWSequence_Lass5 ; Pointer to OWScript tx Text03dc db $00 db $00 @@ -1300,7 +1300,7 @@ Chap5Data: db $00 db $1a db $00 - dw $70b0 ; Pointer to OWScript + dw OWSequence_Chap5 ; Pointer to OWScript tx Text03da db $00 db $00 @@ -1324,7 +1324,7 @@ GuideData: db $00 db $16 db $00 - dw $7283 ; Pointer to OWScript + dw OWSequence_Guide ; Pointer to OWScript tx Text03e6 db $00 db $00 @@ -1360,49 +1360,49 @@ Data_11f18: db $3a db $3a db $10 - dw $4c3e ; Pointer to OWScript + dw NoOverworldSequence ; Pointer to OWScript Data_11f1f: db $68 db $27 db $3b db $41 db $50 - dw $4c3e ; Pointer to OWScript + dw NoOverworldSequence ; Pointer to OWScript Data_11f26: db $69 db $27 db $3c db $42 db $50 - dw $4c3e ; Pointer to OWScript + dw NoOverworldSequence ; Pointer to OWScript Data_11f2d: db $6a db $27 db $3d db $43 db $50 - dw $4c3e ; Pointer to OWScript + dw NoOverworldSequence ; Pointer to OWScript Data_11f34: db $6b db $27 db $3e db $44 db $50 - dw $4c3e ; Pointer to OWScript + dw NoOverworldSequence ; Pointer to OWScript Data_11f3b: db $6c db $27 db $3f db $45 db $50 - dw $4c3e ; Pointer to OWScript + dw NoOverworldSequence ; Pointer to OWScript Data_11f42: db $6d db $27 db $40 db $46 db $50 - dw $4c3e ; Pointer to OWScript + dw NoOverworldSequence ; Pointer to OWScript Data_11f49: db $00 db $00 -- cgit v1.2.3 From 085660d0799a85e18fa6a25f251875ce7c0db5d4 Mon Sep 17 00:00:00 2001 From: Andrew Martinek Date: Tue, 5 May 2020 21:29:47 -0400 Subject: Added NPC_ Prefix, Changed Level to Map in some places --- src/data/level_objects.asm | 610 --------------------------------------------- src/data/map_objects.asm | 610 +++++++++++++++++++++++++++++++++++++++++++++ src/data/npc_map_data.asm | 314 +++++++++++------------ src/data/npcs.asm | 220 ++++++++-------- 4 files changed, 877 insertions(+), 877 deletions(-) delete mode 100644 src/data/level_objects.asm create mode 100644 src/data/map_objects.asm (limited to 'src/data') diff --git a/src/data/level_objects.asm b/src/data/level_objects.asm deleted file mode 100644 index 0756f7f..0000000 --- a/src/data/level_objects.asm +++ /dev/null @@ -1,610 +0,0 @@ -; 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 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 - - -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 OWSequence_fc52 - tx Text041b - tx Text03b0 - - db NORTH, 10, 6 - dw Func_fc7a - tx Text041b - tx Text03b0 - - 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 OWSequence_fc52 - tx Text041b - tx Text03b0 - - db NORTH, 10, 6 - dw Func_fc7a - tx Text041b - tx Text03b0 - - 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 OWSequence_fc52 - tx Text041b - tx Text03b0 - - db NORTH, 10, 6 - dw Func_fc7a - tx Text041b - tx Text03b0 - - 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 OWSequence_fc52 - tx Text041b - tx Text03b0 - - db NORTH, 10, 6 - dw Func_fc7a - tx Text041b - tx Text03b0 - - 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 OWSequence_fc52 - tx Text041b - tx Text03b0 - - db NORTH, 10, 6 - dw Func_fc7a - tx Text041b - tx Text03b0 - - 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 OWSequence_fc52 - tx Text041b - tx Text03b0 - - db NORTH, 10, 6 - dw Func_fc7a - tx Text041b - tx Text03b0 - - 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 OWSequence_fc52 - tx Text041b - tx Text03b0 - - db NORTH, 10, 6 - dw Func_fc7a - tx Text041b - tx Text03b0 - - 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 OWSequence_fc52 - tx Text041b - tx Text03b0 - - db NORTH, 10, 6 - dw Func_fc7a - tx Text041b - tx Text03b0 - - 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 OWSequence_fc52 - tx Text041b - tx Text03b0 - - db NORTH, 10, 6 - dw Func_fc7a - tx Text041b - tx Text03b0 - - 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 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 - - -HallOfHonorObjects: ; 13ec2 (3:7ec2) - ; Legendary Cards - db NORTH, 10, 10 - dw OWSequence_fbf1 - dw $0000 - dw $0000 - - ; Legendary Cards - db NORTH, 12, 10 - dw OWSequence_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_objects.asm b/src/data/map_objects.asm new file mode 100644 index 0000000..0756f7f --- /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 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 + + +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 OWSequence_fc52 + tx Text041b + tx Text03b0 + + db NORTH, 10, 6 + dw Func_fc7a + tx Text041b + tx Text03b0 + + 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 OWSequence_fc52 + tx Text041b + tx Text03b0 + + db NORTH, 10, 6 + dw Func_fc7a + tx Text041b + tx Text03b0 + + 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 OWSequence_fc52 + tx Text041b + tx Text03b0 + + db NORTH, 10, 6 + dw Func_fc7a + tx Text041b + tx Text03b0 + + 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 OWSequence_fc52 + tx Text041b + tx Text03b0 + + db NORTH, 10, 6 + dw Func_fc7a + tx Text041b + tx Text03b0 + + 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 OWSequence_fc52 + tx Text041b + tx Text03b0 + + db NORTH, 10, 6 + dw Func_fc7a + tx Text041b + tx Text03b0 + + 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 OWSequence_fc52 + tx Text041b + tx Text03b0 + + db NORTH, 10, 6 + dw Func_fc7a + tx Text041b + tx Text03b0 + + 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 OWSequence_fc52 + tx Text041b + tx Text03b0 + + db NORTH, 10, 6 + dw Func_fc7a + tx Text041b + tx Text03b0 + + 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 OWSequence_fc52 + tx Text041b + tx Text03b0 + + db NORTH, 10, 6 + dw Func_fc7a + tx Text041b + tx Text03b0 + + 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 OWSequence_fc52 + tx Text041b + tx Text03b0 + + db NORTH, 10, 6 + dw Func_fc7a + tx Text041b + tx Text03b0 + + 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 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 + + +HallOfHonorObjects: ; 13ec2 (3:7ec2) + ; Legendary Cards + db NORTH, 10, 10 + dw OWSequence_fbf1 + dw $0000 + dw $0000 + + ; Legendary Cards + db NORTH, 12, 10 + dw OWSequence_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/npc_map_data.asm b/src/data/npc_map_data.asm index 05663c3..701171e 100644 --- a/src/data/npc_map_data.asm +++ b/src/data/npc_map_data.asm @@ -3,417 +3,417 @@ ; NPC, X position, Y Position, Direction, ; pre-load function. (Resets c flag if NPC should not be loaded) MasonLabNPCS: ; 772f (4:1372f) - db DRMASON, $0e, $06, SOUTH + db NPC_DRMASON, $0e, $06, SOUTH dw $5710 - db SAM, $04, $0e, EAST + db NPC_SAM, $04, $0e, EAST dw $5604 - db TECH1, $16, $08, WEST + db NPC_TECH1, $16, $08, WEST dw $0000 - db TECH2, $16, $14, SOUTH + db NPC_TECH2, $16, $14, SOUTH dw $0000 - db TECH3, $16, $16, WEST + db NPC_TECH3, $16, $16, WEST dw $0000 - db TECH4, $0a, $16, EAST + db NPC_TECH4, $0a, $16, EAST dw $0000 - db TECH5, $06, $04, SOUTH + db NPC_TECH5, $06, $04, SOUTH dw $55eb db $00 DeckMachineRoomNPCS: ; 775a (4:1375a) - db TECH6, $06, $08, SOUTH + db NPC_TECH6, $06, $08, SOUTH dw $0000 - db TECH7, $06, $16, WEST + db NPC_TECH7, $06, $16, WEST dw $0000 - db TECH8, $0a, $12, WEST + db NPC_TECH8, $0a, $12, WEST dw $0000 - db AARON, $0c, $0c, WEST + db NPC_AARON, $0c, $0c, WEST dw $0000 db $00 IshiharasHouseNPCS: ; 7773 (4:13773) - db NIKKI, $04, $04, NORTH + db NPC_NIKKI, $04, $04, NORTH dw Preload_NikkiInIshiharasHouse - db ISHIHARA, $08, $08, SOUTH + db NPC_ISHIHARA, $08, $08, SOUTH dw Preload_IshiharaInIshiharasHouse - db RONALD1, $02, $04, WEST + db NPC_RONALD1, $02, $04, WEST dw Preload_Ronald1InIshiharasHouse db $00 FightingClubEntranceNPCS: ; 7786 (4:13786) - db CLERK1, $06, $02, SOUTH + db NPC_CLERK1, $06, $02, SOUTH dw $0000 - db RONALD1, $08, $fe, SOUTH + db NPC_RONALD1, $08, $fe, SOUTH dw $685b - db RONALD2, $fe, $08, NORTH + db NPC_RONALD2, $fe, $08, NORTH dw $689a - db RONALD3, $fe, $08, NORTH + db NPC_RONALD3, $fe, $08, NORTH dw $6915 db $00 FightingClubLobbyNPCS: ; 779f (4:1379f) - db MAN1, $0c, $0e, WEST + db NPC_MAN1, $0c, $0e, WEST dw $0000 - db IMAKUNI, $12, $02, NORTH + db NPC_IMAKUNI, $12, $02, NORTH dw $5ceb - db SPECS1, $12, $10, EAST + db NPC_SPECS1, $12, $10, EAST dw $0000 - db BUTCH, $14, $10, WEST + db NPC_BUTCH, $14, $10, WEST dw $0000 - db GRANNY1, $04, $10, WEST + db NPC_GRANNY1, $04, $10, WEST dw $5d98 - db CLERK10, $06, $04, SOUTH + db NPC_CLERK10, $06, $04, SOUTH dw $0000 - db GIFT_CENTER_CLERK, $0a, $04, SOUTH + db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH dw Preload_GiftCenterClerk db $00 FightingClubNPCS: ; 77ca (4:137ca) - db CHRIS, $04, $08, SOUTH + db NPC_CHRIS, $04, $08, SOUTH dw $5e43 - db MICHAEL, $0e, $0a, SOUTH + db NPC_MICHAEL, $0e, $0a, SOUTH dw $5e79 - db JESSICA, $12, $06, EAST + db NPC_JESSICA, $12, $06, EAST dw $5ea5 - db MITCH, $0a, $04, SOUTH + db NPC_MITCH, $0a, $04, SOUTH dw $0000 db $00 RockClubEntranceNPCS: ; 77e3 (4:137e3) - db CLERK2, $06, $02, SOUTH + db NPC_CLERK2, $06, $02, SOUTH dw $0000 - db RONALD1, $08, $fe, SOUTH + db NPC_RONALD1, $08, $fe, SOUTH dw $685b - db RONALD2, $fe, $08, NORTH + db NPC_RONALD2, $fe, $08, NORTH dw $689a - db RONALD3, $fe, $08, NORTH + db NPC_RONALD3, $fe, $08, NORTH dw $6915 db $00 RockClubLobbyNPCS: ; 77fc (4:137fc) - db CHRIS, $12, $08, WEST + db NPC_CHRIS, $12, $08, WEST dw $5ee9 - db MATTHEW, $06, $0e, EAST + db NPC_MATTHEW, $06, $0e, EAST dw $0000 - db WOMAN1, $14, $12, NORTH + db NPC_WOMAN1, $14, $12, NORTH dw $0000 - db CHAP1, $0e, $10, EAST + db NPC_CHAP1, $0e, $10, EAST dw $0000 - db LASS3, $10, $04, SOUTH + db NPC_LASS3, $10, $04, SOUTH dw $5fcb - db CLERK10, $06, $04, SOUTH + db NPC_CLERK10, $06, $04, SOUTH dw $0000 - db GIFT_CENTER_CLERK, $0a, $04, SOUTH + db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH dw Preload_GiftCenterClerk db $00 RockClubNPCS: ; 7827 (4:13827) - db RYAN, $14, $0e, EAST + db NPC_RYAN, $14, $0e, EAST dw $0000 - db ANDREW, $06, $14, NORTH + db NPC_ANDREW, $06, $14, NORTH dw $0000 - db GENE, $0c, $06, NORTH + db NPC_GENE, $0c, $06, NORTH dw $0000 db $00 WaterClubEntranceNPCS: ; 783a (4:1383a) - db CLERK3, $06, $02, SOUTH + db NPC_CLERK3, $06, $02, SOUTH dw $0000 - db RONALD1, $08, $fe, SOUTH + db NPC_RONALD1, $08, $fe, SOUTH dw $685b - db RONALD2, $fe, $08, NORTH + db NPC_RONALD2, $fe, $08, NORTH dw $689a - db RONALD3, $fe, $08, NORTH + db NPC_RONALD3, $fe, $08, NORTH dw $6915 db $00 WaterClubLobbyNPCS: ; 7853 (4:13853) - db GAL1, $06, $0e, SOUTH + db NPC_GAL1, $06, $0e, SOUTH dw $0000 - db LASS1, $10, $0a, SOUTH + db NPC_LASS1, $10, $0a, SOUTH dw $0000 - db IMAKUNI, $12, $02, NORTH + db NPC_IMAKUNI, $12, $02, NORTH dw Preload_ImakuniInWaterClubLobby - db MAN2, $04, $12, EAST + db NPC_MAN2, $04, $12, EAST dw Preload_Man2InWaterClubLobby - db PAPPY2, $16, $10, NORTH + db NPC_PAPPY2, $16, $10, NORTH dw $0000 - db CLERK10, $06, $04, SOUTH + db NPC_CLERK10, $06, $04, SOUTH dw $0000 - db GIFT_CENTER_CLERK, $0a, $04, SOUTH + db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH dw Preload_GiftCenterClerk db $00 WaterClubNPCS: ; 787e (4:1387e) - db SARA, $06, $12, EAST + db NPC_SARA, $06, $12, EAST dw $0000 - db AMANDA, $16, $14, WEST + db NPC_AMANDA, $16, $14, WEST dw $0000 - db JOSHUA, $16, $08, SOUTH + db NPC_JOSHUA, $16, $08, SOUTH dw $0000 - db AMY, $16, $04, SOUTH + db NPC_AMY, $16, $04, SOUTH dw Preload_Amy db $00 LightningClubEntranceNPCS: ; 7897 (4:13897) - db CLERK4, $06, $02, SOUTH + db NPC_CLERK4, $06, $02, SOUTH dw $0000 - db RONALD1, $08, $fe, SOUTH + db NPC_RONALD1, $08, $fe, SOUTH dw $685b - db RONALD2, $fe, $08, NORTH + db NPC_RONALD2, $fe, $08, NORTH dw $689a - db RONALD3, $fe, $08, NORTH + db NPC_RONALD3, $fe, $08, NORTH dw $6915 db $00 LightningClubLobbyNPCS: ; 78b0 (4:138b0) - db CHAP2, $12, $10, WEST + db NPC_CHAP2, $12, $10, WEST dw $0000 - db IMAKUNI, $12, $02, NORTH + db NPC_IMAKUNI, $12, $02, NORTH dw $637b - db LASS4, $08, $0c, SOUTH + db NPC_LASS4, $08, $0c, SOUTH dw $0000 - db HOOD1, $14, $08, SOUTH + db NPC_HOOD1, $14, $08, SOUTH dw $0000 - db CLERK10, $06, $04, SOUTH + db NPC_CLERK10, $06, $04, SOUTH dw $0000 - db GIFT_CENTER_CLERK, $0a, $04, SOUTH + db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH dw Preload_GiftCenterClerk db $00 LightningClubNPCS: ; 78d5 (4:138d5) - db JENNIFER, $0e, $12, SOUTH + db NPC_JENNIFER, $0e, $12, SOUTH dw $0000 - db NICHOLAS, $06, $0a, SOUTH + db NPC_NICHOLAS, $06, $0a, SOUTH dw $0000 - db BRANDON, $16, $0c, NORTH + db NPC_BRANDON, $16, $0c, NORTH dw $0000 - db ISAAC, $0c, $04, NORTH + db NPC_ISAAC, $0c, $04, NORTH dw $6494 db $00 GrassClubEntranceNPCS: ; 78ee (4:138ee) - db CLERK5, $06, $02, SOUTH + db NPC_CLERK5, $06, $02, SOUTH dw $0000 - db MICHAEL, $0e, $08, SOUTH + db NPC_MICHAEL, $0e, $08, SOUTH dw $656a - db RONALD1, $08, $fe, SOUTH + db NPC_RONALD1, $08, $fe, SOUTH dw $685b - db RONALD2, $fe, $08, NORTH + db NPC_RONALD2, $fe, $08, NORTH dw $689a - db RONALD3, $fe, $08, NORTH + db NPC_RONALD3, $fe, $08, NORTH dw $6915 db $00 GrassClubLobbyNPCS: ; 790d (4:1390d) - db BRITTANY, $0c, $0e, WEST + db NPC_BRITTANY, $0c, $0e, WEST dw $0000 - db LASS2, $12, $08, SOUTH + db NPC_LASS2, $12, $08, SOUTH dw $0000 - db GRANNY2, $04, $10, EAST + db NPC_GRANNY2, $04, $10, EAST dw $0000 - db GAL2, $14, $10, NORTH + db NPC_GAL2, $14, $10, NORTH dw $66dc - db CLERK10, $06, $04, SOUTH + db NPC_CLERK10, $06, $04, SOUTH dw $0000 - db GIFT_CENTER_CLERK, $0a, $04, SOUTH + db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH dw Preload_GiftCenterClerk db $00 GrassClubNPCS: ; 7932 (4:13932) - db KRISTIN, $04, $0a, EAST + db NPC_KRISTIN, $04, $0a, EAST dw $0000 - db HEATHER, $0e, $10, SOUTH + db NPC_HEATHER, $0e, $10, SOUTH dw $0000 - db NIKKI, $0c, $04, SOUTH + db NPC_NIKKI, $0c, $04, SOUTH dw $6796 db $00 PsychicClubEntranceNPCS: ; 7945 (4:13945) - db CLERK6, $06, $02, SOUTH + db NPC_CLERK6, $06, $02, SOUTH dw $0000 - db RONALD1, $08, $fe, SOUTH + db NPC_RONALD1, $08, $fe, SOUTH dw $685b - db RONALD2, $fe, $08, NORTH + db NPC_RONALD2, $fe, $08, NORTH dw $689a - db RONALD3, $fe, $08, NORTH + db NPC_RONALD3, $fe, $08, NORTH dw $6915 - db LAD3, $0e, $04, SOUTH + db NPC_LAD3, $0e, $04, SOUTH dw $0000 db $00 PsychicClubLobbyNPCS: ; 7964 (4:13964) - db ROBERT, $14, $08, NORTH + db NPC_ROBERT, $14, $08, NORTH dw $0000 - db PAPPY1, $04, $10, EAST + db NPC_PAPPY1, $04, $10, EAST dw $0000 - db RONALD1, $0c, $0a, EAST + db NPC_RONALD1, $0c, $0a, EAST dw $69f7 - db GAL3, $10, $0e, WEST + db NPC_GAL3, $10, $0e, WEST dw $0000 - db CHAP4, $18, $10, SOUTH + db NPC_CHAP4, $18, $10, SOUTH dw $0000 - db CLERK10, $06, $04, SOUTH + db NPC_CLERK10, $06, $04, SOUTH dw $0000 - db GIFT_CENTER_CLERK, $0a, $04, SOUTH + db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH dw Preload_GiftCenterClerk db $00 PsychicClubNPCS: ; 798f (4:1398f) - db DANIEL, $08, $08, NORTH + db NPC_DANIEL, $08, $08, NORTH dw $0000 - db STEPHANIE, $16, $0c, EAST + db NPC_STEPHANIE, $16, $0c, EAST dw $0000 - db MURRAY2, $02, $02, WEST + db NPC_MURRAY2, $02, $02, WEST dw $6ad0 - db MURRAY1, $0c, $06, SOUTH + db NPC_MURRAY1, $0c, $06, SOUTH dw $6ada db $00 ScienceClubEntranceNPCS: ; 79a8 (4:139a8) - db CLERK7, $06, $02, SOUTH + db NPC_CLERK7, $06, $02, SOUTH dw $0000 - db RONALD1, $08, $fe, SOUTH + db NPC_RONALD1, $08, $fe, SOUTH dw $685b - db RONALD2, $fe, $08, NORTH + db NPC_RONALD2, $fe, $08, NORTH dw $689a - db RONALD3, $fe, $08, NORTH + db NPC_RONALD3, $fe, $08, NORTH dw $6915 db $00 ScienceClubLobbyNPCS: ; 79c1 (4:139c1) - db LAD1, $12, $12, NORTH + db NPC_LAD1, $12, $12, NORTH dw $0000 - db IMAKUNI, $12, $02, NORTH + db NPC_IMAKUNI, $12, $02, NORTH dw $6b65 - db MAN3, $04, $0e, WEST + db NPC_MAN3, $04, $0e, WEST dw $0000 - db SPECS2, $0c, $0e, WEST + db NPC_SPECS2, $0c, $0e, WEST dw $0000 - db SPECS3, $16, $08, SOUTH + db NPC_SPECS3, $16, $08, SOUTH dw $0000 - db CLERK10, $06, $04, SOUTH + db NPC_CLERK10, $06, $04, SOUTH dw $0000 - db GIFT_CENTER_CLERK, $0a, $04, SOUTH + db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH dw Preload_GiftCenterClerk db $00 ScienceClubNPCS: ; 79ec (4:139ec) - db JOSEPH, $08, $0a, SOUTH + db NPC_JOSEPH, $08, $0a, SOUTH dw $6cc4 - db DAVID, $14, $04, NORTH + db NPC_DAVID, $14, $04, NORTH dw $0000 - db ERIK, $06, $12, SOUTH + db NPC_ERIK, $06, $12, SOUTH dw $0000 - db RICK, $04, $04, NORTH + db NPC_RICK, $04, $04, NORTH dw $0000 db $00 FireClubEntranceNPCS: ; 7a05 (4:13a05) - db CLERK8, $06, $02, SOUTH + db NPC_CLERK8, $06, $02, SOUTH dw $0000 - db RONALD1, $08, $fe, SOUTH + db NPC_RONALD1, $08, $fe, SOUTH dw $685b - db RONALD2, $fe, $08, NORTH + db NPC_RONALD2, $fe, $08, NORTH dw $689a - db RONALD3, $fe, $08, NORTH + db NPC_RONALD3, $fe, $08, NORTH dw $6915 db $00 FireClubLobbyNPCS: ; 7a1e (4:13a1e) - db JESSICA, $0c, $0e, WEST + db NPC_JESSICA, $0c, $0e, WEST dw $6d8d - db LAD2, $12, $06, EAST + db NPC_LAD2, $12, $06, EAST dw $6e25 - db CHAP3, $06, $0a, NORTH + db NPC_CHAP3, $06, $0a, NORTH dw $0000 - db MANIA, $14, $12, NORTH + db NPC_MANIA, $14, $12, NORTH dw $0000 - db CLERK10, $06, $04, SOUTH + db NPC_CLERK10, $06, $04, SOUTH dw $0000 - db GIFT_CENTER_CLERK, $0a, $04, SOUTH + db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH dw Preload_GiftCenterClerk db $00 FireClubNPCS: ; 7a43 (4:13a43) - db JOHN, $0c, $12, SOUTH + db NPC_JOHN, $0c, $12, SOUTH dw $0000 - db ADAM, $08, $0e, SOUTH + db NPC_ADAM, $08, $0e, SOUTH dw $0000 - db JONATHAN, $12, $0a, SOUTH + db NPC_JONATHAN, $12, $0a, SOUTH dw $0000 - db KEN, $0e, $04, SOUTH + db NPC_KEN, $0e, $04, SOUTH dw $0000 db $00 ChallengeHallEntranceNPCS: ; 7a5c (4:13a5c) - db CLERK9, $06, $02, SOUTH + db NPC_CLERK9, $06, $02, SOUTH dw Preload_Clerk9 db $00 ChallengeHallLobbyNPCS: ; 7a63 (4:13a63) - db PAPPY3, $06, $0e, EAST + db NPC_PAPPY3, $06, $0e, EAST dw Preload_ChallengeHallNPCs1 - db CHAMP, $10, $12, WEST + db NPC_CHAMP, $10, $12, WEST dw Preload_ChallengeHallNPCs1 - db HOOD2, $14, $08, SOUTH + db NPC_HOOD2, $14, $08, SOUTH dw Preload_ChallengeHallNPCs1 - db LASS5, $16, $10, WEST + db NPC_LASS5, $16, $10, WEST dw Preload_ChallengeHallNPCs1 - db GAL4, $0c, $0e, EAST + db NPC_GAL4, $0c, $0e, EAST dw Preload_ChallengeHallNPCs2 - db CHAP5, $10, $08, WEST + db NPC_CHAP5, $10, $08, WEST dw Preload_ChallengeHallNPCs2 - db RONALD1, $08, $0c, SOUTH + db NPC_RONALD1, $08, $0c, SOUTH dw Preload_ChallengeHallLobbyRonald1 - db CLERK10, $06, $04, SOUTH + db NPC_CLERK10, $06, $04, SOUTH dw $0000 - db GIFT_CENTER_CLERK, $0a, $04, SOUTH + db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH dw Preload_GiftCenterClerk db $00 ChallengeHallNPCS: ; 7a9a (4:13a9a) - db CLERK12, $0a, $12, SOUTH + db NPC_CLERK12, $0a, $12, SOUTH dw Preload_ChallengeHallNPCs1 - db CLERK13, $14, $12, SOUTH + db NPC_CLERK13, $14, $12, SOUTH dw Preload_ChallengeHallNPCs1 - db GUIDE, $0e, $14, SOUTH + db NPC_GUIDE, $0e, $14, SOUTH dw Preload_Guide - db HOST, $0e, $04, SOUTH + 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 RONALD1, $0e, $12, SOUTH + db NPC_RONALD1, $0e, $12, SOUTH dw $0000 db $00 PokemonDomeNPCS: ; 7ac0 (4:13ac0) - db COURTNEY, $12, $02, SOUTH + db NPC_COURTNEY, $12, $02, SOUTH dw $774b - db STEVE, $16, $02, SOUTH + db NPC_STEVE, $16, $02, SOUTH dw $778c - db JACK, $08, $02, SOUTH + db NPC_JACK, $08, $02, SOUTH dw $77a3 - db ROD, $0c, $02, SOUTH + db NPC_ROD, $0c, $02, SOUTH dw $77ba - db RONALD1, $1e, $00, SOUTH + db NPC_RONALD1, $1e, $00, SOUTH dw $77d6 db $00 HallOfHonorNPCS: ; 7adf (4:13adf) - db LEGEND_CARDS_TOP_LEFT, $0a, $08, SOUTH + db NPC_LEGEND_CARDS_TOP_LEFT, $0a, $08, SOUTH dw $0000 - db LEGEND_CARDS_TOP_RIGHT, $0c, $08, SOUTH + db NPC_LEGEND_CARDS_TOP_RIGHT, $0c, $08, SOUTH dw $0000 - db LEGEND_CARDS_LEFT_SPARK, $08, $0a, SOUTH + db NPC_LEGEND_CARDS_LEFT_SPARK, $08, $0a, SOUTH dw $0000 - db LEGEND_CARDS_BOTTOM_LEFT, $0a, $0a, SOUTH + db NPC_LEGEND_CARDS_BOTTOM_LEFT, $0a, $0a, SOUTH dw $0000 - db LEGEND_CARDS_BOTTOM_RIGHT, $0c, $0a, SOUTH + db NPC_LEGEND_CARDS_BOTTOM_RIGHT, $0c, $0a, SOUTH dw $0000 - db LEGEND_CARDS_RIGHT_SPARK, $0e, $0a, SOUTH + db NPC_LEGEND_CARDS_RIGHT_SPARK, $0e, $0a, SOUTH dw $0000 db $00 diff --git a/src/data/npcs.asm b/src/data/npcs.asm index 4e5ffe7..a8770fd 100644 --- a/src/data/npcs.asm +++ b/src/data/npcs.asm @@ -119,7 +119,7 @@ NPCDataTable: dw Ronald3Data dw Data_11f49 DrMasonData: - db DRMASON + db NPC_DRMASON db $02 db $00 db $26 @@ -131,7 +131,7 @@ DrMasonData: db $00 db $00 Ronald1Data: - db RONALD1 + db NPC_RONALD1 db $01 db $04 db $0e @@ -143,7 +143,7 @@ Ronald1Data: db $0f db $16 Ronald2Data: - db RONALD2 + db NPC_RONALD2 db $01 db $04 db $0e @@ -155,7 +155,7 @@ Ronald2Data: db $0f db $16 Ronald3Data: - db RONALD3 + db NPC_RONALD3 db $01 db $04 db $0e @@ -167,7 +167,7 @@ Ronald3Data: db $0f db $16 IshiharaData: - db ISHIHARA + db NPC_ISHIHARA db $03 db $04 db $22 @@ -179,7 +179,7 @@ IshiharaData: db $00 db $00 ImakuniData: - db IMAKUNI + db NPC_IMAKUNI db $04 db $00 db $0e @@ -191,7 +191,7 @@ ImakuniData: db $10 db $15 SamData: - db SAM + db NPC_SAM db $18 db $00 db $0e @@ -203,7 +203,7 @@ SamData: db $02 db $15 Tech1Data: - db TECH1 + db NPC_TECH1 db $18 db $00 db $0e @@ -215,7 +215,7 @@ Tech1Data: db $00 db $00 Tech2Data: - db TECH2 + db NPC_TECH2 db $18 db $00 db $0e @@ -227,7 +227,7 @@ Tech2Data: db $00 db $00 Tech3Data: - db TECH3 + db NPC_TECH3 db $18 db $00 db $0e @@ -239,7 +239,7 @@ Tech3Data: db $00 db $00 Tech4Data: - db TECH4 + db NPC_TECH4 db $18 db $00 db $0e @@ -251,7 +251,7 @@ Tech4Data: db $00 db $00 Tech5Data: - db TECH5 + db NPC_TECH5 db $18 db $00 db $0e @@ -263,7 +263,7 @@ Tech5Data: db $00 db $00 Tech6Data: - db TECH6 + db NPC_TECH6 db $18 db $00 db $0e @@ -275,7 +275,7 @@ Tech6Data: db $00 db $00 Clerk1Data: - db CLERK1 + db NPC_CLERK1 db $21 db $0a db $30 @@ -287,7 +287,7 @@ Clerk1Data: db $00 db $00 Clerk2Data: - db CLERK2 + db NPC_CLERK2 db $21 db $0a db $30 @@ -299,7 +299,7 @@ Clerk2Data: db $00 db $00 Clerk3Data: - db CLERK3 + db NPC_CLERK3 db $21 db $0a db $30 @@ -311,7 +311,7 @@ Clerk3Data: db $00 db $00 Clerk4Data: - db CLERK4 + db NPC_CLERK4 db $21 db $0a db $30 @@ -323,7 +323,7 @@ Clerk4Data: db $00 db $00 Clerk5Data: - db CLERK5 + db NPC_CLERK5 db $21 db $0a db $30 @@ -335,7 +335,7 @@ Clerk5Data: db $00 db $00 Clerk6Data: - db CLERK6 + db NPC_CLERK6 db $21 db $0a db $30 @@ -347,7 +347,7 @@ Clerk6Data: db $00 db $00 Clerk7Data: - db CLERK7 + db NPC_CLERK7 db $21 db $0a db $30 @@ -359,7 +359,7 @@ Clerk7Data: db $00 db $00 Clerk8Data: - db CLERK8 + db NPC_CLERK8 db $21 db $0a db $30 @@ -371,7 +371,7 @@ Clerk8Data: db $00 db $00 Clerk9Data: - db CLERK9 + db NPC_CLERK9 db $21 db $0a db $30 @@ -383,7 +383,7 @@ Clerk9Data: db $00 db $00 ChrisData: - db CHRIS + db NPC_CHRIS db $15 db $00 db $26 @@ -395,7 +395,7 @@ ChrisData: db $03 db $15 MichaelData: - db MICHAEL + db NPC_MICHAEL db $15 db $00 db $26 @@ -407,7 +407,7 @@ MichaelData: db $03 db $15 JessicaData: - db JESSICA + db NPC_JESSICA db $1f db $04 db $1a @@ -419,7 +419,7 @@ JessicaData: db $03 db $15 MitchData: - db MITCH + db NPC_MITCH db $0a db $00 db $0e @@ -431,7 +431,7 @@ MitchData: db $03 db $16 MatthewData: - db MATTHEW + db NPC_MATTHEW db $15 db $00 db $16 @@ -443,7 +443,7 @@ MatthewData: db $03 db $15 RyanData: - db RYAN + db NPC_RYAN db $11 db $00 db $26 @@ -455,7 +455,7 @@ RyanData: db $03 db $15 AndrewData: - db ANDREW + db NPC_ANDREW db $1a db $00 db $16 @@ -467,7 +467,7 @@ AndrewData: db $03 db $15 GeneData: - db GENE + db NPC_GENE db $0b db $04 db $1e @@ -479,7 +479,7 @@ GeneData: db $03 db $16 SaraData: - db SARA + db NPC_SARA db $20 db $00 db $0e @@ -491,7 +491,7 @@ SaraData: db $03 db $15 AmandaData: - db AMANDA + db NPC_AMANDA db $20 db $00 db $16 @@ -503,7 +503,7 @@ AmandaData: db $03 db $15 JoshuaData: - db JOSHUA + db NPC_JOSHUA db $16 db $00 db $26 @@ -515,7 +515,7 @@ JoshuaData: db $03 db $15 AmyData: - db AMY + db NPC_AMY db $08 db $08 db $2e @@ -527,7 +527,7 @@ AmyData: db $03 db $16 JenniferData: - db JENNIFER + db NPC_JENNIFER db $1c db $04 db $0e @@ -539,7 +539,7 @@ JenniferData: db $03 db $15 NicholasData: - db NICHOLAS + db NPC_NICHOLAS db $17 db $04 db $1e @@ -551,7 +551,7 @@ NicholasData: db $03 db $15 BrandonData: - db BRANDON + db NPC_BRANDON db $17 db $04 db $1e @@ -563,7 +563,7 @@ BrandonData: db $03 db $15 IsaacData: - db ISAAC + db NPC_ISAAC db $09 db $00 db $16 @@ -575,7 +575,7 @@ IsaacData: db $03 db $16 BrittanyData: - db BRITTANY + db NPC_BRITTANY db $1c db $04 db $0e @@ -587,7 +587,7 @@ BrittanyData: db $03 db $15 KristinData: - db KRISTIN + db NPC_KRISTIN db $1e db $00 db $1e @@ -599,7 +599,7 @@ KristinData: db $03 db $15 HeatherData: - db HEATHER + db NPC_HEATHER db $1d db $04 db $22 @@ -611,7 +611,7 @@ HeatherData: db $03 db $15 NikkiData: - db NIKKI + db NPC_NIKKI db $05 db $00 db $1a @@ -623,7 +623,7 @@ NikkiData: db $03 db $16 RobertData: - db ROBERT + db NPC_ROBERT db $11 db $04 db $16 @@ -635,7 +635,7 @@ RobertData: db $03 db $15 DanielData: - db DANIEL + db NPC_DANIEL db $12 db $04 db $1a @@ -647,7 +647,7 @@ DanielData: db $03 db $15 StephanieData: - db STEPHANIE + db NPC_STEPHANIE db $1c db $04 db $0e @@ -659,7 +659,7 @@ StephanieData: db $03 db $15 Murray1Data: - db MURRAY1 + db NPC_MURRAY1 db $0c db $00 db $12 @@ -671,7 +671,7 @@ Murray1Data: db $03 db $16 Murray2Data: - db MURRAY2 + db NPC_MURRAY2 db $0c db $03 db $15 @@ -683,7 +683,7 @@ Murray2Data: db $03 db $16 JosephData: - db JOSEPH + db NPC_JOSEPH db $18 db $00 db $0e @@ -695,7 +695,7 @@ JosephData: db $03 db $15 DavidData: - db DAVID + db NPC_DAVID db $18 db $00 db $0e @@ -707,7 +707,7 @@ DavidData: db $03 db $15 ErikData: - db ERIK + db NPC_ERIK db $18 db $00 db $0e @@ -719,7 +719,7 @@ ErikData: db $03 db $15 RickData: - db RICK + db NPC_RICK db $06 db $00 db $0e @@ -731,7 +731,7 @@ RickData: db $03 db $16 JohnData: - db JOHN + db NPC_JOHN db $12 db $04 db $1a @@ -743,7 +743,7 @@ JohnData: db $03 db $15 AdamData: - db ADAM + db NPC_ADAM db $13 db $00 db $22 @@ -755,7 +755,7 @@ AdamData: db $03 db $15 JonathanData: - db JONATHAN + db NPC_JONATHAN db $11 db $04 db $16 @@ -767,7 +767,7 @@ JonathanData: db $03 db $15 KenData: - db KEN + db NPC_KEN db $07 db $04 db $1e @@ -779,7 +779,7 @@ KenData: db $03 db $16 CourtneyData: - db COURTNEY + db NPC_COURTNEY db $0d db $00 db $12 @@ -791,7 +791,7 @@ CourtneyData: db $04 db $17 SteveData: - db STEVE + db NPC_STEVE db $0e db $00 db $2a @@ -803,7 +803,7 @@ SteveData: db $04 db $17 JackData: - db JACK + db NPC_JACK db $0f db $00 db $26 @@ -815,7 +815,7 @@ JackData: db $04 db $17 RodData: - db ROD + db NPC_ROD db $10 db $00 db $0e @@ -827,7 +827,7 @@ RodData: db $04 db $17 Clerk10Data: - db CLERK10 + db NPC_CLERK10 db $21 db $0a db $30 @@ -839,7 +839,7 @@ Clerk10Data: db $00 db $00 GiftCenterClerkData: - db GIFT_CENTER_CLERK + db NPC_GIFT_CENTER_CLERK db $21 db $0a db $30 @@ -851,7 +851,7 @@ GiftCenterClerkData: db $00 db $00 Man1Data: - db MAN1 + db NPC_MAN1 db $1a db $00 db $16 @@ -863,7 +863,7 @@ Man1Data: db $00 db $00 Woman1Data: - db WOMAN1 + db NPC_WOMAN1 db $23 db $04 db $1e @@ -875,7 +875,7 @@ Woman1Data: db $00 db $00 Chap1Data: - db CHAP1 + db NPC_CHAP1 db $19 db $00 db $1a @@ -887,7 +887,7 @@ Chap1Data: db $00 db $00 Gal1Data: - db GAL1 + db NPC_GAL1 db $22 db $00 db $16 @@ -899,7 +899,7 @@ Gal1Data: db $00 db $00 Lass1Data: - db LASS1 + db NPC_LASS1 db $1e db $00 db $1e @@ -911,7 +911,7 @@ Lass1Data: db $00 db $00 Chap2Data: - db CHAP2 + db NPC_CHAP2 db $19 db $00 db $1a @@ -923,7 +923,7 @@ Chap2Data: db $00 db $00 Lass2Data: - db LASS2 + db NPC_LASS2 db $1e db $00 db $1e @@ -935,7 +935,7 @@ Lass2Data: db $00 db $00 Pappy1Data: - db PAPPY1 + db NPC_PAPPY1 db $1b db $00 db $22 @@ -947,7 +947,7 @@ Pappy1Data: db $00 db $00 Lad1Data: - db LAD1 + db NPC_LAD1 db $12 db $04 db $1a @@ -959,7 +959,7 @@ Lad1Data: db $00 db $00 Lad2Data: - db LAD2 + db NPC_LAD2 db $11 db $04 db $16 @@ -971,7 +971,7 @@ Lad2Data: db $00 db $00 Chap3Data: - db CHAP3 + db NPC_CHAP3 db $19 db $00 db $1a @@ -983,7 +983,7 @@ Chap3Data: db $00 db $00 Clerk12Data: - db CLERK12 + db NPC_CLERK12 db $22 db $00 db $16 @@ -995,7 +995,7 @@ Clerk12Data: db $00 db $00 Clerk13Data: - db CLERK13 + db NPC_CLERK13 db $22 db $00 db $16 @@ -1007,7 +1007,7 @@ Clerk13Data: db $00 db $00 HostData: - db HOST + db NPC_HOST db $22 db $00 db $16 @@ -1019,7 +1019,7 @@ HostData: db $00 db $00 Specs1Data: - db SPECS1 + db NPC_SPECS1 db $13 db $00 db $22 @@ -1031,7 +1031,7 @@ Specs1Data: db $00 db $00 ButchData: - db BUTCH + db NPC_BUTCH db $14 db $00 db $16 @@ -1043,7 +1043,7 @@ ButchData: db $00 db $00 Granny1Data: - db GRANNY1 + db NPC_GRANNY1 db $24 db $00 db $16 @@ -1055,7 +1055,7 @@ Granny1Data: db $00 db $00 Lass3Data: - db LASS3 + db NPC_LASS3 db $1d db $04 db $22 @@ -1067,7 +1067,7 @@ Lass3Data: db $00 db $00 Man2Data: - db MAN2 + db NPC_MAN2 db $1a db $00 db $16 @@ -1079,7 +1079,7 @@ Man2Data: db $00 db $00 Pappy2Data: - db PAPPY2 + db NPC_PAPPY2 db $1b db $00 db $22 @@ -1091,7 +1091,7 @@ Pappy2Data: db $00 db $00 Lass4Data: - db LASS4 + db NPC_LASS4 db $1d db $04 db $22 @@ -1103,7 +1103,7 @@ Lass4Data: db $00 db $00 Hood1Data: - db HOOD1 + db NPC_HOOD1 db $17 db $04 db $1e @@ -1115,7 +1115,7 @@ Hood1Data: db $00 db $00 Granny2Data: - db GRANNY2 + db NPC_GRANNY2 db $24 db $00 db $16 @@ -1127,7 +1127,7 @@ Granny2Data: db $00 db $00 Gal2Data: - db GAL2 + db NPC_GAL2 db $22 db $00 db $16 @@ -1139,7 +1139,7 @@ Gal2Data: db $00 db $00 Lad3Data: - db LAD3 + db NPC_LAD3 db $12 db $04 db $1a @@ -1151,7 +1151,7 @@ Lad3Data: db $00 db $00 Gal3Data: - db GAL3 + db NPC_GAL3 db $22 db $00 db $16 @@ -1163,7 +1163,7 @@ Gal3Data: db $00 db $00 Chap4Data: - db CHAP4 + db NPC_CHAP4 db $19 db $00 db $1a @@ -1175,7 +1175,7 @@ Chap4Data: db $00 db $00 Man3Data: - db MAN3 + db NPC_MAN3 db $1a db $00 db $16 @@ -1187,7 +1187,7 @@ Man3Data: db $00 db $00 Specs2Data: - db SPECS2 + db NPC_SPECS2 db $18 db $00 db $0e @@ -1199,7 +1199,7 @@ Specs2Data: db $00 db $00 Specs3Data: - db SPECS3 + db NPC_SPECS3 db $13 db $00 db $22 @@ -1211,7 +1211,7 @@ Specs3Data: db $00 db $00 Woman2Data: - db WOMAN2 + db NPC_WOMAN2 db $23 db $04 db $1e @@ -1223,7 +1223,7 @@ Woman2Data: db $00 db $00 ManiaData: - db MANIA + db NPC_MANIA db $15 db $00 db $26 @@ -1235,7 +1235,7 @@ ManiaData: db $00 db $00 Pappy3Data: - db PAPPY3 + db NPC_PAPPY3 db $1b db $00 db $22 @@ -1247,7 +1247,7 @@ Pappy3Data: db $00 db $00 Gal4Data: - db GAL4 + db NPC_GAL4 db $22 db $00 db $16 @@ -1259,7 +1259,7 @@ Gal4Data: db $00 db $00 ChampData: - db CHAMP + db NPC_CHAMP db $15 db $00 db $26 @@ -1271,7 +1271,7 @@ ChampData: db $00 db $00 Hood2Data: - db HOOD2 + db NPC_HOOD2 db $17 db $04 db $1e @@ -1283,7 +1283,7 @@ Hood2Data: db $00 db $00 Lass5Data: - db LASS5 + db NPC_LASS5 db $1f db $04 db $1a @@ -1295,7 +1295,7 @@ Lass5Data: db $00 db $00 Chap5Data: - db CHAP5 + db NPC_CHAP5 db $19 db $00 db $1a @@ -1307,7 +1307,7 @@ Chap5Data: db $00 db $00 AaronData: - db AARON + db NPC_AARON db $18 db $00 db $0e @@ -1319,7 +1319,7 @@ AaronData: db $02 db $15 GuideData: - db GUIDE + db NPC_GUIDE db $1a db $00 db $16 @@ -1331,7 +1331,7 @@ GuideData: db $00 db $00 Tech7Data: - db TECH7 + db NPC_TECH7 db $18 db $00 db $0e @@ -1343,7 +1343,7 @@ Tech7Data: db $00 db $00 Tech8Data: - db TECH8 + db NPC_TECH8 db $18 db $00 db $0e @@ -1355,49 +1355,49 @@ Tech8Data: db $00 db $00 Data_11f18: - db $67 + db NPC_11F18 db $26 db $3a db $3a db $10 dw NoOverworldSequence ; Pointer to OWScript Data_11f1f: - db $68 + db NPC_LEGEND_CARDS_TOP_LEFT db $27 db $3b db $41 db $50 dw NoOverworldSequence ; Pointer to OWScript Data_11f26: - db $69 + db NPC_LEGEND_CARDS_TOP_RIGHT db $27 db $3c db $42 db $50 dw NoOverworldSequence ; Pointer to OWScript Data_11f2d: - db $6a + db NPC_LEGEND_CARDS_LEFT_SPARK db $27 db $3d db $43 db $50 dw NoOverworldSequence ; Pointer to OWScript Data_11f34: - db $6b + db NPC_LEGEND_CARDS_BOTTOM_LEFT db $27 db $3e db $44 db $50 dw NoOverworldSequence ; Pointer to OWScript Data_11f3b: - db $6c + db NPC_LEGEND_CARDS_BOTTOM_RIGHT db $27 db $3f db $45 db $50 dw NoOverworldSequence ; Pointer to OWScript Data_11f42: - db $6d + db NPC_LEGEND_CARDS_RIGHT_SPARK db $27 db $40 db $46 -- cgit v1.2.3 From d1a545a71e996fac826e2e0d299ffa0dd1ef491a Mon Sep 17 00:00:00 2001 From: Andrew Martinek Date: Tue, 5 May 2020 21:37:55 -0400 Subject: Changed Unnamed NPC to TORCH --- src/data/npcs.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/data') diff --git a/src/data/npcs.asm b/src/data/npcs.asm index a8770fd..1db22ef 100644 --- a/src/data/npcs.asm +++ b/src/data/npcs.asm @@ -1355,7 +1355,7 @@ Tech8Data: db $00 db $00 Data_11f18: - db NPC_11F18 + db NPC_TORCH db $26 db $3a db $3a -- cgit v1.2.3 From a1f9dca9f563e6bc82c533f8e3a82edb954b8842 Mon Sep 17 00:00:00 2001 From: Andrew Martinek Date: Tue, 5 May 2020 22:45:50 -0400 Subject: changed wording when it comes to the legendary card sprite --- src/data/npc_map_data.asm | 12 ++++++------ src/data/npcs.asm | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/data') diff --git a/src/data/npc_map_data.asm b/src/data/npc_map_data.asm index 701171e..bc09d07 100644 --- a/src/data/npc_map_data.asm +++ b/src/data/npc_map_data.asm @@ -403,17 +403,17 @@ PokemonDomeNPCS: ; 7ac0 (4:13ac0) db $00 HallOfHonorNPCS: ; 7adf (4:13adf) - db NPC_LEGEND_CARDS_TOP_LEFT, $0a, $08, SOUTH + db NPC_LEGENDARY_CARD_TOP_LEFT, $0a, $08, SOUTH dw $0000 - db NPC_LEGEND_CARDS_TOP_RIGHT, $0c, $08, SOUTH + db NPC_LEGENDARY_CARD_TOP_RIGHT, $0c, $08, SOUTH dw $0000 - db NPC_LEGEND_CARDS_LEFT_SPARK, $08, $0a, SOUTH + db NPC_LEGENDARY_CARD_LEFT_SPARK, $08, $0a, SOUTH dw $0000 - db NPC_LEGEND_CARDS_BOTTOM_LEFT, $0a, $0a, SOUTH + db NPC_LEGENDARY_CARD_BOTTOM_LEFT, $0a, $0a, SOUTH dw $0000 - db NPC_LEGEND_CARDS_BOTTOM_RIGHT, $0c, $0a, SOUTH + db NPC_LEGENDARY_CARD_BOTTOM_RIGHT, $0c, $0a, SOUTH dw $0000 - db NPC_LEGEND_CARDS_RIGHT_SPARK, $0e, $0a, SOUTH + 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 1db22ef..0c184ea 100644 --- a/src/data/npcs.asm +++ b/src/data/npcs.asm @@ -1362,42 +1362,42 @@ Data_11f18: db $10 dw NoOverworldSequence ; Pointer to OWScript Data_11f1f: - db NPC_LEGEND_CARDS_TOP_LEFT + db NPC_LEGENDARY_CARD_TOP_LEFT db $27 db $3b db $41 db $50 dw NoOverworldSequence ; Pointer to OWScript Data_11f26: - db NPC_LEGEND_CARDS_TOP_RIGHT + db NPC_LEGENDARY_CARD_TOP_RIGHT db $27 db $3c db $42 db $50 dw NoOverworldSequence ; Pointer to OWScript Data_11f2d: - db NPC_LEGEND_CARDS_LEFT_SPARK + db NPC_LEGENDARY_CARD_LEFT_SPARK db $27 db $3d db $43 db $50 dw NoOverworldSequence ; Pointer to OWScript Data_11f34: - db NPC_LEGEND_CARDS_BOTTOM_LEFT + db NPC_LEGENDARY_CARD_BOTTOM_LEFT db $27 db $3e db $44 db $50 dw NoOverworldSequence ; Pointer to OWScript Data_11f3b: - db NPC_LEGEND_CARDS_BOTTOM_RIGHT + db NPC_LEGENDARY_CARD_BOTTOM_RIGHT db $27 db $3f db $45 db $50 dw NoOverworldSequence ; Pointer to OWScript Data_11f42: - db NPC_LEGEND_CARDS_RIGHT_SPARK + db NPC_LEGENDARY_CARD_RIGHT_SPARK db $27 db $40 db $46 -- cgit v1.2.3 From e02184fbcd4426fd0774d0dd80268c515d8aadd1 Mon Sep 17 00:00:00 2001 From: Andrew Martinek Date: Sat, 9 May 2020 15:36:16 -0400 Subject: changed OWScript to ScriptCommand and OWSequence to Script --- src/data/map_objects.asm | 30 +++---- src/data/npcs.asm | 220 +++++++++++++++++++++++------------------------ 2 files changed, 125 insertions(+), 125 deletions(-) (limited to 'src/data') diff --git a/src/data/map_objects.asm b/src/data/map_objects.asm index 0756f7f..1ac73fa 100644 --- a/src/data/map_objects.asm +++ b/src/data/map_objects.asm @@ -50,12 +50,12 @@ MasonLabObjects: ; 13b04 (3:7b04) DeckMachineRoomObjects: ; 13b4d (3:7b4d) db NORTH, 2, 2 - dw OWSequence_d932 + dw Script_d932 tx Text041b tx Text041a db NORTH, 4, 2 - dw OWSequence_d932 + dw Script_d932 tx Text041b tx Text041a @@ -238,7 +238,7 @@ FightingClubLobbyObjects: ; 13c6f (3:7c6f) tx Text041a db NORTH, 6, 6 - dw OWSequence_fc52 + dw Script_fc52 tx Text041b tx Text03b0 @@ -272,7 +272,7 @@ RockClubLobbyObjects: ; 13ca6 (3:7ca6) tx Text041a db NORTH, 6, 6 - dw OWSequence_fc52 + dw Script_fc52 tx Text041b tx Text03b0 @@ -306,7 +306,7 @@ WaterClubLobbyObjects: ; 13cdd (3:7cdd) tx Text041a db NORTH, 6, 6 - dw OWSequence_fc52 + dw Script_fc52 tx Text041b tx Text03b0 @@ -340,7 +340,7 @@ LightningClubLobbyObjects: ; 13d14 (3:7d14) tx Text041a db NORTH, 6, 6 - dw OWSequence_fc52 + dw Script_fc52 tx Text041b tx Text03b0 @@ -374,7 +374,7 @@ GrassClubLobbyObjects: ; 13d4b (3:7d4b) tx Text041a db NORTH, 6, 6 - dw OWSequence_fc52 + dw Script_fc52 tx Text041b tx Text03b0 @@ -408,7 +408,7 @@ PsychicClubLobbyObjects: ; 13d82 (3:7d82) tx Text041a db NORTH, 6, 6 - dw OWSequence_fc52 + dw Script_fc52 tx Text041b tx Text03b0 @@ -442,7 +442,7 @@ ScienceClubLobbyObjects: ; 13db9 (3:7db9) tx Text041a db NORTH, 6, 6 - dw OWSequence_fc52 + dw Script_fc52 tx Text041b tx Text03b0 @@ -476,7 +476,7 @@ FireClubLobbyObjects: ; 13df0 (3:7df0) tx Text041a db NORTH, 6, 6 - dw OWSequence_fc52 + dw Script_fc52 tx Text041b tx Text03b0 @@ -510,7 +510,7 @@ ChallengeHallLobbyObjects: ; 13e27 (3:7e27) tx Text041a db NORTH, 6, 6 - dw OWSequence_fc52 + dw Script_fc52 tx Text041b tx Text03b0 @@ -555,12 +555,12 @@ PokemonDomeEntranceObjects: ; 13e5e (3:7e5e) tx Text0505 db NORTH, 18, 0 - dw OWSequence_f631 + dw Script_f631 tx Text0508 tx Text0507 db NORTH, 20, 0 - dw OWSequence_f631 + dw Script_f631 tx Text0508 tx Text0507 @@ -585,13 +585,13 @@ PokemonDomeEntranceObjects: ; 13e5e (3:7e5e) HallOfHonorObjects: ; 13ec2 (3:7ec2) ; Legendary Cards db NORTH, 10, 10 - dw OWSequence_fbf1 + dw Script_fbf1 dw $0000 dw $0000 ; Legendary Cards db NORTH, 12, 10 - dw OWSequence_fbf1 + dw Script_fbf1 dw $0000 dw $0000 diff --git a/src/data/npcs.asm b/src/data/npcs.asm index 0c184ea..99979ce 100644 --- a/src/data/npcs.asm +++ b/src/data/npcs.asm @@ -124,7 +124,7 @@ DrMasonData: db $00 db $26 db $00 - dw $5727 ; Pointer to OWScript + dw $5727 ; Pointer to Script tx Text03ac db $00 db $00 @@ -136,7 +136,7 @@ Ronald1Data: db $04 db $0e db $00 - dw OWSequence_Ronald ; Pointer to OWScript + dw Script_Ronald ; Pointer to Script tx Text03ad db RONALD_PIC db INVINCIBLE_RONALD_DECK_ID @@ -148,7 +148,7 @@ Ronald2Data: db $04 db $0e db $00 - dw OWSequence_Ronald ; Pointer to OWScript + dw Script_Ronald ; Pointer to Script tx Text03ad db RONALD_PIC db INVINCIBLE_RONALD_DECK_ID @@ -160,7 +160,7 @@ Ronald3Data: db $04 db $0e db $00 - dw OWSequence_Ronald ; Pointer to OWScript + dw Script_Ronald ; Pointer to Script tx Text03ad db RONALD_PIC db INVINCIBLE_RONALD_DECK_ID @@ -172,7 +172,7 @@ IshiharaData: db $04 db $22 db $00 - dw OWSequence_Ishihara ; Pointer to OWScript + dw Script_Ishihara ; Pointer to Script tx Text03ae db $00 db $00 @@ -184,7 +184,7 @@ ImakuniData: db $00 db $0e db $00 - dw OWSequence_Imakuni ; Pointer to OWScript + dw Script_Imakuni ; Pointer to Script tx Text03af db IMAKUNI_PIC db IMAKUNI_DECK_ID @@ -196,7 +196,7 @@ SamData: db $00 db $0e db $00 - dw $561d ; Pointer to OWScript + dw $561d ; Pointer to Script tx Text03b1 db SAM_PIC db SAMS_NORMAL_DECK_ID @@ -208,7 +208,7 @@ Tech1Data: db $00 db $0e db $00 - dw $5583 ; Pointer to OWScript + dw $5583 ; Pointer to Script tx Text03b2 db $00 db $00 @@ -220,7 +220,7 @@ Tech2Data: db $00 db $0e db $00 - dw $55ca ; Pointer to OWScript + dw $55ca ; Pointer to Script tx Text03b2 db $00 db $00 @@ -232,7 +232,7 @@ Tech3Data: db $00 db $0e db $00 - dw $55d5 ; Pointer to OWScript + dw $55d5 ; Pointer to Script tx Text03b2 db $00 db $00 @@ -244,7 +244,7 @@ Tech4Data: db $00 db $0e db $00 - dw $55e0 ; Pointer to OWScript + dw $55e0 ; Pointer to Script tx Text03b2 db $00 db $00 @@ -256,7 +256,7 @@ Tech5Data: db $00 db $0e db $00 - dw $55f9 ; Pointer to OWScript + dw $55f9 ; Pointer to Script tx Text03b2 db $00 db $00 @@ -268,7 +268,7 @@ Tech6Data: db $00 db $0e db $00 - dw $58bb ; Pointer to OWScript + dw $58bb ; Pointer to Script tx Text03b2 db $00 db $00 @@ -280,7 +280,7 @@ Clerk1Data: db $0a db $30 db $00 - dw OWSequence_Clerk1 ; Pointer to OWScript + dw Script_Clerk1 ; Pointer to Script tx Text03b3 db $00 db $00 @@ -292,7 +292,7 @@ Clerk2Data: db $0a db $30 db $00 - dw $5ed1 ; Pointer to OWScript + dw $5ed1 ; Pointer to Script tx Text03b3 db $00 db $00 @@ -304,7 +304,7 @@ Clerk3Data: db $0a db $30 db $00 - dw $609e ; Pointer to OWScript + dw $609e ; Pointer to Script tx Text03b3 db $00 db $00 @@ -316,7 +316,7 @@ Clerk4Data: db $0a db $30 db $00 - dw $6369 ; Pointer to OWScript + dw $6369 ; Pointer to Script tx Text03b3 db $00 db $00 @@ -328,7 +328,7 @@ Clerk5Data: db $0a db $30 db $00 - dw $6566 ; Pointer to OWScript + dw $6566 ; Pointer to Script tx Text03b3 db $00 db $00 @@ -340,7 +340,7 @@ Clerk6Data: db $0a db $30 db $00 - dw $684c ; Pointer to OWScript + dw $684c ; Pointer to Script tx Text03b3 db $00 db $00 @@ -352,7 +352,7 @@ Clerk7Data: db $0a db $30 db $00 - dw $6b53 ; Pointer to OWScript + dw $6b53 ; Pointer to Script tx Text03b3 db $00 db $00 @@ -364,7 +364,7 @@ Clerk8Data: db $0a db $30 db $00 - dw $6d45 ; Pointer to OWScript + dw $6d45 ; Pointer to Script tx Text03b3 db $00 db $00 @@ -376,7 +376,7 @@ Clerk9Data: db $0a db $30 db $00 - dw OWSequence_Clerk9 ; Pointer to OWScript + dw Script_Clerk9 ; Pointer to Script tx Text03b3 db $00 db $00 @@ -388,7 +388,7 @@ ChrisData: db $00 db $26 db $00 - dw $5ef2 ; Pointer to OWScript + dw $5ef2 ; Pointer to Script tx Text03b4 db CHRIS_PIC db MUSCLES_FOR_BRAINS_DECK_ID @@ -400,7 +400,7 @@ MichaelData: db $00 db $26 db $00 - dw $6573 ; Pointer to OWScript + dw $6573 ; Pointer to Script tx Text03b5 db MICHAEL_PIC db HEATED_BATTLE_DECK_ID @@ -412,7 +412,7 @@ JessicaData: db $04 db $1a db $00 - dw $6d96 ; Pointer to OWScript + dw $6d96 ; Pointer to Script tx Text03b6 db JESSICA_PIC db LOVE_TO_BATTLE_DECK_ID @@ -424,7 +424,7 @@ MitchData: db $00 db $0e db $00 - dw $5dc3 ; Pointer to OWScript + dw $5dc3 ; Pointer to Script tx Text03b7 db MITCH_PIC db FIRST_STRIKE_DECK_ID @@ -436,7 +436,7 @@ MatthewData: db $00 db $16 db $00 - dw $5f39 ; Pointer to OWScript + dw $5f39 ; Pointer to Script tx Text03b8 db MATTHEW_PIC db HARD_POKEMON_DECK_ID @@ -448,7 +448,7 @@ RyanData: db $00 db $26 db $00 - dw $5ff0 ; Pointer to OWScript + dw $5ff0 ; Pointer to Script tx Text03b9 db RYAN_PIC db EXCAVATION_DECK_ID @@ -460,7 +460,7 @@ AndrewData: db $00 db $16 db $00 - dw $6017 ; Pointer to OWScript + dw $6017 ; Pointer to Script tx Text03ba db ANDREW_PIC db BLISTERING_POKEMON_DECK_ID @@ -472,7 +472,7 @@ GeneData: db $04 db $1e db $00 - dw $603e ; Pointer to OWScript + dw $603e ; Pointer to Script tx Text03bb db GENE_PIC db ROCK_CRUSHER_DECK_ID @@ -484,7 +484,7 @@ SaraData: db $00 db $0e db $00 - dw OWSequence_Sara ; Pointer to OWScript + dw Script_Sara ; Pointer to Script tx Text03bc db SARA_PIC db WATERFRONT_POKEMON_DECK_ID @@ -496,7 +496,7 @@ AmandaData: db $00 db $16 db $00 - dw OWSequence_Amanda ; Pointer to OWScript + dw Script_Amanda ; Pointer to Script tx Text03bd db AMANDA_PIC ; battle profile picture db LONELY_FRIENDS_DECK_ID @@ -508,7 +508,7 @@ JoshuaData: db $00 db $26 db $00 - dw OWSequence_Joshua ; Pointer to OWScript + dw Script_Joshua ; Pointer to Script tx Text03be db JOSHUA_PIC db SOUND_OF_THE_WAVES_DECK_ID @@ -520,7 +520,7 @@ AmyData: db $08 db $2e db $10 - dw OWSequence_Amy ; Pointer to OWScript + dw Script_Amy ; Pointer to Script tx Text03bf db AMY_PIC db GO_GO_RAIN_DANCE_DECK_ID @@ -532,7 +532,7 @@ JenniferData: db $04 db $0e db $00 - dw $6408 ; Pointer to OWScript + dw $6408 ; Pointer to Script tx Text03c0 db JENNIFER_PIC db PIKACHU_DECK_ID @@ -544,7 +544,7 @@ NicholasData: db $04 db $1e db $00 - dw $642f ; Pointer to OWScript + dw $642f ; Pointer to Script tx Text03c1 db NICHOLAS_PIC db BOOM_BOOM_SELFDESTRUCT_DECK_ID @@ -556,7 +556,7 @@ BrandonData: db $04 db $1e db $00 - dw $6456 ; Pointer to OWScript + dw $6456 ; Pointer to Script tx Text03c2 db BRANDON_PIC db POWER_GENERATOR_DECK_ID @@ -568,7 +568,7 @@ IsaacData: db $00 db $16 db $00 - dw $64ad ; Pointer to OWScript + dw $64ad ; Pointer to Script tx Text03c3 db ISAAC_PIC db ZAPPING_SELFDESTRUCT_DECK_ID @@ -580,7 +580,7 @@ BrittanyData: db $04 db $0e db $00 - dw OWSequence_Brittany ; Pointer to OWScript + dw Script_Brittany ; Pointer to Script tx Text03c4 db BRITTANY_PIC db ETCETERA_DECK_ID @@ -592,7 +592,7 @@ KristinData: db $00 db $1e db $00 - dw $6701 ; Pointer to OWScript + dw $6701 ; Pointer to Script tx Text03c5 db KRISTIN_PIC db FLOWER_GARDEN_DECK_ID @@ -604,7 +604,7 @@ HeatherData: db $04 db $22 db $00 - dw $6745 ; Pointer to OWScript + dw $6745 ; Pointer to Script tx Text03c6 db HEATHER_PIC db KALEIDOSCOPE_DECK_ID @@ -616,7 +616,7 @@ NikkiData: db $00 db $1a db $00 - dw $679e ; Pointer to OWScript + dw $679e ; Pointer to Script tx Text03c7 db NIKKI_PIC db FLOWER_POWER_DECK_ID @@ -628,7 +628,7 @@ RobertData: db $04 db $16 db $00 - dw $6980 ; Pointer to OWScript + dw $6980 ; Pointer to Script tx Text03c8 db ROBERT_PIC db GHOST_DECK_ID @@ -640,7 +640,7 @@ DanielData: db $04 db $1a db $00 - dw $6a60 ; Pointer to OWScript + dw $6a60 ; Pointer to Script tx Text03c9 db DANIEL_PIC db NAP_TIME_DECK_ID @@ -652,7 +652,7 @@ StephanieData: db $04 db $0e db $00 - dw $6aa2 ; Pointer to OWScript + dw $6aa2 ; Pointer to Script tx Text03ca db STEPHANIE_PIC db STRANGE_POWER_DECK_ID @@ -664,7 +664,7 @@ Murray1Data: db $00 db $12 db $00 - dw $6adf ; Pointer to OWScript + dw $6adf ; Pointer to Script tx Text03cb db MURRAY_PIC db STRANGE_PSYSHOCK_DECK_ID @@ -676,7 +676,7 @@ Murray2Data: db $03 db $15 db $10 - dw $6adf ; Pointer to OWScript + dw $6adf ; Pointer to Script tx Text03cb db MURRAY_PIC db STRANGE_PSYSHOCK_DECK_ID @@ -688,7 +688,7 @@ JosephData: db $00 db $0e db $00 - dw $6cdb ; Pointer to OWScript + dw $6cdb ; Pointer to Script tx Text03cc db JOSEPH_PIC db FLYIN_POKEMON_DECK_ID @@ -700,7 +700,7 @@ DavidData: db $00 db $0e db $00 - dw $6c11 ; Pointer to OWScript + dw $6c11 ; Pointer to Script tx Text03cd db DAVID_PIC db LOVELY_NIDORAN_DECK_ID @@ -712,7 +712,7 @@ ErikData: db $00 db $0e db $00 - dw $6c42 ; Pointer to OWScript + dw $6c42 ; Pointer to Script tx Text03ce db ERIK_PIC db POISON_DECK_ID @@ -724,7 +724,7 @@ RickData: db $00 db $0e db $00 - dw $6c67 ; Pointer to OWScript + dw $6c67 ; Pointer to Script tx Text03cf db RICK_PIC db WONDERS_OF_SCIENCE_DECK_ID @@ -736,7 +736,7 @@ JohnData: db $04 db $1a db $00 - dw $6eb3 ; Pointer to OWScript + dw $6eb3 ; Pointer to Script tx Text03d0 db JOHN_PIC db ANGER_DECK_ID @@ -748,7 +748,7 @@ AdamData: db $00 db $22 db $00 - dw $6ed8 ; Pointer to OWScript + dw $6ed8 ; Pointer to Script tx Text03d1 db ADAM_PIC db FLAMETHROWER_DECK_ID @@ -760,7 +760,7 @@ JonathanData: db $04 db $16 db $00 - dw $6efd ; Pointer to OWScript + dw $6efd ; Pointer to Script tx Text03d2 db JONATHAN_PIC db RESHUFFLE_DECK_ID @@ -772,7 +772,7 @@ KenData: db $04 db $1e db $00 - dw $6f22 ; Pointer to OWScript + dw $6f22 ; Pointer to Script tx Text03d3 db KEN_PIC db FIRE_CHARGE_DECK_ID @@ -784,7 +784,7 @@ CourtneyData: db $00 db $12 db $00 - dw $771f ; Pointer to OWScript + dw $771f ; Pointer to Script tx Text03d4 db COURTNEY_PIC db LEGENDARY_MOLTRES_DECK_ID @@ -796,7 +796,7 @@ SteveData: db $00 db $2a db $00 - dw $772a ; Pointer to OWScript + dw $772a ; Pointer to Script tx Text03d5 db STEVE_PIC db LEGENDARY_ZAPDOS_DECK_ID @@ -808,7 +808,7 @@ JackData: db $00 db $26 db $00 - dw $7735 ; Pointer to OWScript + dw $7735 ; Pointer to Script tx Text03d6 db JACK_PIC db LEGENDARY_ARTICUNO_DECK_ID @@ -820,7 +820,7 @@ RodData: db $00 db $0e db $00 - dw $7740 ; Pointer to OWScript + dw $7740 ; Pointer to Script tx Text03d7 db ROD_PIC db LEGENDARY_DRAGONITE_DECK_ID @@ -832,7 +832,7 @@ Clerk10Data: db $0a db $30 db $00 - dw NoOverworldSequence ; Pointer to OWScript + dw NoOverworldSequence ; Pointer to Script tx Text03b0 db $00 db $00 @@ -844,7 +844,7 @@ GiftCenterClerkData: db $0a db $30 db $00 - dw NoOverworldSequence ; Pointer to OWScript + dw NoOverworldSequence ; Pointer to Script tx Text03b0 db $00 db $00 @@ -856,7 +856,7 @@ Man1Data: db $00 db $16 db $00 - dw $5c76 ; Pointer to OWScript + dw $5c76 ; Pointer to Script tx Text03d8 db $00 db $00 @@ -868,7 +868,7 @@ Woman1Data: db $04 db $1e db $00 - dw $5f83 ; Pointer to OWScript + dw $5f83 ; Pointer to Script tx Text03d9 db $00 db $00 @@ -880,7 +880,7 @@ Chap1Data: db $00 db $1a db $00 - dw $5fc0 ; Pointer to OWScript + dw $5fc0 ; Pointer to Script tx Text03da db $00 db $00 @@ -892,7 +892,7 @@ Gal1Data: db $00 db $16 db $00 - dw OWSequence_Gal1 ; Pointer to OWScript + dw Script_Gal1 ; Pointer to Script tx Text03db db $00 db $00 @@ -904,7 +904,7 @@ Lass1Data: db $00 db $1e db $00 - dw OWSequence_Lass1 ; Pointer to OWScript + dw Script_Lass1 ; Pointer to Script tx Text03dc db $00 db $00 @@ -916,7 +916,7 @@ Chap2Data: db $00 db $1a db $00 - dw $639a ; Pointer to OWScript + dw $639a ; Pointer to Script tx Text03da db $00 db $00 @@ -928,7 +928,7 @@ Lass2Data: db $00 db $1e db $00 - dw OWSequence_e61f ; Pointer to OWScript + dw Script_e61f ; Pointer to Script tx Text03dc db $00 db $00 @@ -940,7 +940,7 @@ Pappy1Data: db $00 db $22 db $00 - dw $69a5 ; Pointer to OWScript + dw $69a5 ; Pointer to Script tx Text03dd db $00 db $00 @@ -952,7 +952,7 @@ Lad1Data: db $04 db $1a db $00 - dw $6b84 ; Pointer to OWScript + dw $6b84 ; Pointer to Script tx Text03de db $00 db $00 @@ -964,7 +964,7 @@ Lad2Data: db $04 db $16 db $00 - dw $6e2c ; Pointer to OWScript + dw $6e2c ; Pointer to Script tx Text03de db $00 db $00 @@ -976,7 +976,7 @@ Chap3Data: db $00 db $1a db $00 - dw $6de8 ; Pointer to OWScript + dw $6de8 ; Pointer to Script tx Text03da db $00 db $00 @@ -988,7 +988,7 @@ Clerk12Data: db $00 db $16 db $00 - dw OWSequence_Clerk12 ; Pointer to OWScript + dw Script_Clerk12 ; Pointer to Script tx Text03b3 db $00 db $00 @@ -1000,7 +1000,7 @@ Clerk13Data: db $00 db $16 db $00 - dw OWSequence_Clerk13 ; Pointer to OWScript + dw Script_Clerk13 ; Pointer to Script tx Text03b3 db $00 db $00 @@ -1012,7 +1012,7 @@ HostData: db $00 db $16 db $00 - dw OWSequence_HostStubbed ; Pointer to OWScript + dw Script_HostStubbed ; Pointer to Script tx Text03df db $00 db $00 @@ -1024,7 +1024,7 @@ Specs1Data: db $00 db $22 db $00 - dw $5d82 ; Pointer to OWScript + dw $5d82 ; Pointer to Script tx Text03e0 db $00 db $00 @@ -1036,7 +1036,7 @@ ButchData: db $00 db $16 db $00 - dw $5d8d ; Pointer to OWScript + dw $5d8d ; Pointer to Script tx Text03e1 db $00 db $00 @@ -1048,7 +1048,7 @@ Granny1Data: db $00 db $16 db $00 - dw $5d9f ; Pointer to OWScript + dw $5d9f ; Pointer to Script tx Text03e5 db $00 db $00 @@ -1060,7 +1060,7 @@ Lass3Data: db $04 db $22 db $00 - dw $5fd2 ; Pointer to OWScript + dw $5fd2 ; Pointer to Script tx Text03dc db $00 db $00 @@ -1072,7 +1072,7 @@ Man2Data: db $00 db $16 db $00 - dw OWSequence_Man2 ; Pointer to OWScript + dw Script_Man2 ; Pointer to Script tx Text03d8 db $00 db $00 @@ -1084,7 +1084,7 @@ Pappy2Data: db $00 db $22 db $00 - dw OWSequence_Pappy2 ; Pointer to OWScript + dw Script_Pappy2 ; Pointer to Script tx Text03dd db $00 db $00 @@ -1096,7 +1096,7 @@ Lass4Data: db $04 db $22 db $00 - dw $63d9 ; Pointer to OWScript + dw $63d9 ; Pointer to Script tx Text03dc db $00 db $00 @@ -1108,7 +1108,7 @@ Hood1Data: db $04 db $1e db $00 - dw $63dd ; Pointer to OWScript + dw $63dd ; Pointer to Script tx Text03e2 db $00 db $00 @@ -1120,7 +1120,7 @@ Granny2Data: db $00 db $16 db $00 - dw $66d8 ; Pointer to OWScript + dw $66d8 ; Pointer to Script tx Text03e5 db $00 db $00 @@ -1132,7 +1132,7 @@ Gal2Data: db $00 db $16 db $00 - dw $66e3 ; Pointer to OWScript + dw $66e3 ; Pointer to Script tx Text03db db $00 db $00 @@ -1144,7 +1144,7 @@ Lad3Data: db $04 db $1a db $00 - dw $6850 ; Pointer to OWScript + dw $6850 ; Pointer to Script tx Text03de db $00 db $00 @@ -1156,7 +1156,7 @@ Gal3Data: db $00 db $16 db $00 - dw $6a30 ; Pointer to OWScript + dw $6a30 ; Pointer to Script tx Text03db db $00 db $00 @@ -1168,7 +1168,7 @@ Chap4Data: db $00 db $1a db $00 - dw $6a3b ; Pointer to OWScript + dw $6a3b ; Pointer to Script tx Text03da db $00 db $00 @@ -1180,7 +1180,7 @@ Man3Data: db $00 db $16 db $00 - dw $6bc1 ; Pointer to OWScript + dw $6bc1 ; Pointer to Script tx Text03d8 db $00 db $00 @@ -1192,7 +1192,7 @@ Specs2Data: db $00 db $0e db $00 - dw $6bc5 ; Pointer to OWScript + dw $6bc5 ; Pointer to Script tx Text03e0 db $00 db $00 @@ -1204,7 +1204,7 @@ Specs3Data: db $00 db $22 db $00 - dw $6bed ; Pointer to OWScript + dw $6bed ; Pointer to Script tx Text03e0 db $00 db $00 @@ -1216,7 +1216,7 @@ Woman2Data: db $04 db $1e db $00 - dw NoOverworldSequence ; Pointer to OWScript + dw NoOverworldSequence ; Pointer to Script tx Text03d9 db $00 db $00 @@ -1228,7 +1228,7 @@ ManiaData: db $00 db $26 db $00 - dw $6e88 ; Pointer to OWScript + dw $6e88 ; Pointer to Script tx Text03e4 db $00 db $00 @@ -1240,7 +1240,7 @@ Pappy3Data: db $00 db $22 db $00 - dw OWSequence_Pappy3 ; Pointer to OWScript + dw Script_Pappy3 ; Pointer to Script tx Text03dd db $00 db $00 @@ -1252,7 +1252,7 @@ Gal4Data: db $00 db $16 db $00 - dw OWSequence_Gal4 ; Pointer to OWScript + dw Script_Gal4 ; Pointer to Script tx Text03db db $00 db $00 @@ -1264,7 +1264,7 @@ ChampData: db $00 db $26 db $00 - dw OWSequence_Champ ; Pointer to OWScript + dw Script_Champ ; Pointer to Script tx Text03e3 db $00 db $00 @@ -1276,7 +1276,7 @@ Hood2Data: db $04 db $1e db $00 - dw OWSequence_Hood2 ; Pointer to OWScript + dw Script_Hood2 ; Pointer to Script tx Text03e2 db $00 db $00 @@ -1288,7 +1288,7 @@ Lass5Data: db $04 db $1a db $00 - dw OWSequence_Lass5 ; Pointer to OWScript + dw Script_Lass5 ; Pointer to Script tx Text03dc db $00 db $00 @@ -1300,7 +1300,7 @@ Chap5Data: db $00 db $1a db $00 - dw OWSequence_Chap5 ; Pointer to OWScript + dw Script_Chap5 ; Pointer to Script tx Text03da db $00 db $00 @@ -1312,7 +1312,7 @@ AaronData: db $00 db $0e db $00 - dw $58dd ; Pointer to OWScript + dw $58dd ; Pointer to Script tx Text03e7 db AARON_PIC db LIGHTNING_AND_FIRE_DECK_ID @@ -1324,7 +1324,7 @@ GuideData: db $00 db $16 db $00 - dw OWSequence_Guide ; Pointer to OWScript + dw Script_Guide ; Pointer to Script tx Text03e6 db $00 db $00 @@ -1336,7 +1336,7 @@ Tech7Data: db $00 db $0e db $00 - dw $58c6 ; Pointer to OWScript + dw $58c6 ; Pointer to Script tx Text03b2 db $00 db $00 @@ -1348,7 +1348,7 @@ Tech8Data: db $00 db $0e db $00 - dw $58d1 ; Pointer to OWScript + dw $58d1 ; Pointer to Script tx Text03b2 db $00 db $00 @@ -1360,49 +1360,49 @@ Data_11f18: db $3a db $3a db $10 - dw NoOverworldSequence ; Pointer to OWScript + dw NoOverworldSequence ; Pointer to Script Data_11f1f: db NPC_LEGENDARY_CARD_TOP_LEFT db $27 db $3b db $41 db $50 - dw NoOverworldSequence ; Pointer to OWScript + dw NoOverworldSequence ; Pointer to Script Data_11f26: db NPC_LEGENDARY_CARD_TOP_RIGHT db $27 db $3c db $42 db $50 - dw NoOverworldSequence ; Pointer to OWScript + dw NoOverworldSequence ; Pointer to Script Data_11f2d: db NPC_LEGENDARY_CARD_LEFT_SPARK db $27 db $3d db $43 db $50 - dw NoOverworldSequence ; Pointer to OWScript + dw NoOverworldSequence ; Pointer to Script Data_11f34: db NPC_LEGENDARY_CARD_BOTTOM_LEFT db $27 db $3e db $44 db $50 - dw NoOverworldSequence ; Pointer to OWScript + dw NoOverworldSequence ; Pointer to Script Data_11f3b: db NPC_LEGENDARY_CARD_BOTTOM_RIGHT db $27 db $3f db $45 db $50 - dw NoOverworldSequence ; Pointer to OWScript + dw NoOverworldSequence ; Pointer to Script Data_11f42: db NPC_LEGENDARY_CARD_RIGHT_SPARK db $27 db $40 db $46 db $50 - dw NoOverworldSequence ; Pointer to OWScript + dw NoOverworldSequence ; Pointer to Script Data_11f49: db $00 db $00 -- cgit v1.2.3