From 45ddd7479e30bd18265ea6d177102f3ca1946d46 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Wed, 29 Apr 2020 01:18:42 -0500 Subject: Partially document duelist NPC struct --- src/constants/npc_constants.asm | 45 ++- src/data/npcs.asm | 637 +++++++++++++++++++--------------------- src/engine/bank04.asm | 4 +- src/text/text3.asm | 80 ++--- src/text/text_offsets.asm | 80 ++--- 5 files changed, 422 insertions(+), 424 deletions(-) (limited to 'src') diff --git a/src/constants/npc_constants.asm b/src/constants/npc_constants.asm index f4972dc..12d3fe1 100644 --- a/src/constants/npc_constants.asm +++ b/src/constants/npc_constants.asm @@ -41,5 +41,46 @@ const STEPHANIE_PIC ; $28 const AARON_PIC ; $29 -SARA EQU $1F -AMANDA EQU $20 +RONALD EQU $02 +IMAKUNI EQU $04 +SAM EQU $07 +CHRIS EQU $17 +MICHAEL EQU $18 +JESSICA EQU $19 +MITCH EQU $1A +MATTHEW EQU $1B +RYAN EQU $1C +ANDREW EQU $1D +GENE EQU $1E +SARA EQU $1F +AMANDA EQU $20 +JOSHUA EQU $21 +AMY EQU $22 +JENNIFER EQU $23 +NICHOLAS EQU $24 +BRANDON EQU $25 +ISAAC EQU $26 +BRITTANY EQU $27 +KRISTIN EQU $28 +HEATHER EQU $29 +NIKKI EQU $2A +ROBERT EQU $2B +DANIEL EQU $2C +STEPHANIE EQU $2D +MURRAY EQU $2E +JOSEPH EQU $2F +DAVID EQU $30 +ERIK EQU $31 +RICK EQU $32 +JOHN EQU $33 +ADAM EQU $34 +JONATHAN EQU $35 +KEN EQU $36 +COURTNEY EQU $37 +STEVE EQU $38 +JACK EQU $39 +ROD EQU $3A +AARON EQU $63 +MURRAY2 EQU $70 +RONALD2 EQU $71 +RONALD3 EQU $72 diff --git a/src/data/npcs.asm b/src/data/npcs.asm index caa11af..c7468f3 100644 --- a/src/data/npcs.asm +++ b/src/data/npcs.asm @@ -3,12 +3,12 @@ PointerTable_118f5: dw Data_119dd dw Data_119dd - dw Data_119ea + dw RonaldData dw Data_11a11 - dw Data_11a1e + dw ImakuniData dw Data_119dd dw Data_119dd - dw Data_11a2b + dw SamData dw Data_11a38 dw Data_11a45 dw Data_11a52 @@ -24,42 +24,42 @@ PointerTable_118f5: 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 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 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 MurrayData + 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 Data_11cdc dw Data_11ce9 dw Data_11cf6 @@ -100,7 +100,7 @@ PointerTable_118f5: dw Data_11ebd dw Data_11eca dw Data_11ed7 - dw Data_11ee4 + dw AaronData dw Data_11ef1 dw Data_11efe dw Data_11f0b @@ -113,9 +113,9 @@ 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 @@ -130,45 +130,42 @@ Data_119dd: db $00 db $00 db $00 -Data_119ea: - db $02 +RonaldData: + db RONALD db $01 db $04 db $0e db $00 dw $5c4b ; Pointer to NPC Data - db $ad - db $03 - db $02 - db $1a + tx RonaldNPCName + db RONALD_PIC + db INVINCIBLE_RONALD_DECK_ID db $0f - db $16 -Data_119f7: - db $71 + db MUSIC_MATCH_START_2 +Ronald2Data: + db RONALD2 db $01 db $04 db $0e db $00 dw $5c4b ; Pointer to NPC Data - db $ad - db $03 - db $02 - db $1a + tx RonaldNPCName + db RONALD_PIC + db INVINCIBLE_RONALD_DECK_ID db $0f - db $16 -Data_11a04: - db $72 + db MUSIC_MATCH_START_2 +Ronald3Data: + db RONALD3 db $01 db $04 db $0e db $00 dw $5c4b ; Pointer to NPC Data - db $ad - db $03 - db $02 - db $1a + tx RonaldNPCName + db RONALD_PIC + db INVINCIBLE_RONALD_DECK_ID db $0f - db $16 + db MUSIC_MATCH_START_2 Data_11a11: db $03 db $03 @@ -182,32 +179,30 @@ Data_11a11: 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 - db $34 + tx ImakuniNPCName + db IMAKUNI_PIC + db IMAKUNI_DECK_ID db $10 - db $15 -Data_11a2b: - db $07 - db $18 + db MUSIC_MATCH_START_1 +SamData: + db SAM + db $18 ; sprite ID db $00 db $0e db $00 dw $561d ; Pointer to NPC Data - db $b1 - db $03 - db $03 + tx SamNPCName + db SAM_PIC + db SAMS_NORMAL_DECK_ID db $02 - db $02 - db $15 + db MUSIC_MATCH_START_1 Data_11a38: db $08 db $18 @@ -403,123 +398,114 @@ Data_11aee: 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 - db $1c + tx ChrisNPCName + db CHRIS_PIC + db MUSCLES_FOR_BRAINS_DECK_ID db $03 - db $15 -Data_11b08: - db $18 + db MUSIC_MATCH_START_1 +MichaelData: + db MICHAEL db $15 db $00 db $26 db $00 dw $6573 ; Pointer to NPC Data - db $b5 + tx MichaelNPCName + db MICHAEL_PIC + db HEATED_BATTLE_DECK_ID db $03 - db $1e - db $1d - db $03 - db $15 -Data_11b15: - db $19 + db MUSIC_MATCH_START_1 +JessicaData: + db JESSICA db $1f db $04 db $1a db $00 dw $6d96 ; Pointer to NPC Data - db $b6 + tx JessicaNPCName + db JESSICA_PIC + db LOVE_TO_BATTLE_DECK_ID db $03 - db $27 - db $1e - db $03 - db $15 -Data_11b22: - db $1a + db MUSIC_MATCH_START_1 +MitchData: + db MITCH db $0a db $00 db $0e db $00 dw $5dc3 ; Pointer to NPC Data - db $b7 + tx MitchNPCName + db MITCH_PIC + db FIRST_STRIKE_DECK_ID db $03 - db $0a - db $10 - db $03 - db $16 -Data_11b2f: - db $1b + db MUSIC_MATCH_START_2 +MatthewData: + db MATTHEW db $15 db $00 db $16 db $00 dw $5f39 ; Pointer to NPC Data - db $b8 - db $03 - db $1a - db $21 + tx MatthewNPCName + db MATTHEW_PIC + db HARD_POKEMON_DECK_ID db $03 - db $15 -Data_11b3c: - db $1c + db MUSIC_MATCH_START_1 +RyanData: + db RYAN db $11 db $00 db $26 db $00 dw $5ff0 ; Pointer to NPC Data - db $b9 - db $03 - db $1b - db $1f + tx RyanNPCName + db RYAN_PIC + db EXCAVATION_DECK_ID db $03 - db $15 -Data_11b49: - db $1d + db MUSIC_MATCH_START_1 +AndrewData: + db ANDREW db $1a db $00 db $16 db $00 dw $6017 ; Pointer to NPC Data - db $ba - db $03 - db $1c - db $20 + tx AndrewNPCName + db ANDREW_PIC + db BLISTERING_POKEMON_DECK_ID db $03 - db $15 -Data_11b56: - db $1e + db MUSIC_MATCH_START_1 +GeneData: + db GENE db $0b db $04 db $1e db $00 dw $603e ; Pointer to NPC Data - db $bb - db $03 - db $0b - db $11 + tx GeneNPCName + db GENE_PIC + db ROCK_CRUSHER_DECK_ID db $03 - db $16 + db MUSIC_MATCH_START_2 SaraData: - db SARA ; trainer id + db SARA db $20 db $00 db $0e db $00 dw OWSequence_Sara ; Pointer to NPC Data - db $bc + tx SaraNPCName + db SARA_PIC + db WATERFRONT_POKEMON_DECK_ID db $03 - db SARA_PIC ; battle profile picture - db $22 - db $03 - db $15 + db MUSIC_MATCH_START_1 AmandaData: db AMANDA db $20 @@ -527,363 +513,335 @@ AmandaData: db $16 db $00 dw OWSequence_Amanda ; Pointer to NPC Data - db $bd - db $03 - db AMANDA_PIC ; battle profile picture - db $23 + tx AmandaNPCName + db AMANDA_PIC + db LONELY_FRIENDS_DECK_ID db $03 - db $15 -Data_11b7d: - db $21 + db MUSIC_MATCH_START_1 +JoshuaData: + db JOSHUA db $16 db $00 db $26 db $00 dw OWSequence_Joshua ; Pointer to NPC Data - db $be - db $03 - db $17 - db $24 + tx JoshuaNPCName + db JOSHUA_PIC + db SOUND_OF_THE_WAVES_DECK_ID db $03 - db $15 -Data_11b8a: - db $22 + db MUSIC_MATCH_START_1 +AmyData: + db AMY db $08 db $08 db $2e db $10 dw $6304 ; Pointer to NPC Data - db $bf + tx AmyNPCName + db AMY_PIC + db GO_GO_RAIN_DANCE_DECK_ID db $03 - db $08 - db $12 - db $03 - db $16 -Data_11b97: - db $23 + db MUSIC_MATCH_START_2 +JenniferData: + db JENNIFER db $1c db $04 db $0e db $00 dw $6408 ; Pointer to NPC Data - db $c0 - db $03 - db $26 - db $25 + tx JenniferNPCName + db JENNIFER_PIC + db PIKACHU_DECK_ID db $03 - db $15 -Data_11ba4: - db $24 + db MUSIC_MATCH_START_1 +NicholasData: + db NICHOLAS db $17 db $04 db $1e db $00 dw $642f ; Pointer to NPC Data - db $c1 + tx NicholasNPCName + db NICHOLAS_PIC + db BOOM_BOOM_SELFDESTRUCT_DECK_ID db $03 - db $18 - db $26 - db $03 - db $15 -Data_11bb1: - db $25 + db MUSIC_MATCH_START_1 +BrandonData: + db BRANDON db $17 db $04 db $1e db $00 dw $6456 ; Pointer to NPC Data - db $c2 + tx BrandonNPCName + db BRANDON_PIC + db POWER_GENERATOR_DECK_ID db $03 - db $19 - db $27 - db $03 - db $15 -Data_11bbe: - db $26 + db MUSIC_MATCH_START_1 +IsaacData: + db ISAAC db $09 db $00 db $16 db $00 dw $64ad ; Pointer to NPC Data - db $c3 - db $03 - db $09 - db $13 + tx IsaacNPCName + db ISAAC_PIC + db ZAPPING_SELFDESTRUCT_DECK_ID db $03 - db $16 -Data_11bcb: - db $27 + db MUSIC_MATCH_START_2 +BrittanyData: + db BRITTANY db $1c db $04 db $0e db $00 dw $65d2 ; Pointer to NPC Data - db $c4 - db $03 - db $21 - db $28 + tx BrittanyNPCName + db BRITTANY_PIC + db ETCETERA_DECK_ID db $03 - db $15 -Data_11bd8: - db $28 + db MUSIC_MATCH_START_1 +KristinData: + db KRISTIN db $1e db $00 db $1e db $00 dw $6701 ; Pointer to NPC Data - db $c5 + tx KristinNPCName + db KRISTIN_PIC + db FLOWER_GARDEN_DECK_ID db $03 - db $22 - db $29 - db $03 - db $15 -Data_11be5: - db $29 + db MUSIC_MATCH_START_1 +HeatherData: + db HEATHER db $1d db $04 db $22 db $00 dw $6745 ; Pointer to NPC Data - db $c6 - db $03 - db $23 - db $2a + tx HeatherNPCName + db HEATHER_PIC + db KALEIDOSCOPE_DECK_ID db $03 - db $15 -Data_11bf2: - db $2a + db MUSIC_MATCH_START_1 +NikkiData: + db NIKKI db $05 db $00 db $1a db $00 dw $679e ; Pointer to NPC Data - db $c7 + tx NikkiNPCName + db NIKKI_PIC + db FLOWER_POWER_DECK_ID db $03 - db $05 - db $14 - db $03 - db $16 -Data_11bff: - db $2b + db MUSIC_MATCH_START_2 +RobertData: + db ROBERT db $11 db $04 db $16 db $00 dw $6980 ; Pointer to NPC Data - db $c8 + tx RobertNPCName + db ROBERT_PIC + db GHOST_DECK_ID db $03 - db $20 - db $2b - db $03 - db $15 -Data_11c0c: - db $2c + db MUSIC_MATCH_START_1 +DanielData: + db DANIEL db $12 db $04 db $1a db $00 dw $6a60 ; Pointer to NPC Data - db $c9 + tx DanielNPCName + db DANIEL_PIC + db NAP_TIME_DECK_ID db $03 - db $1f - db $2c - db $03 - db $15 -Data_11c19: - db $2d + db MUSIC_MATCH_START_1 +StephanieData: + db STEPHANIE db $1c db $04 db $0e db $00 dw $6aa2 ; Pointer to NPC Data - db $ca + tx StephanieNPCName + db STEPHANIE_PIC + db STRANGE_POWER_DECK_ID db $03 - db $28 - db $2d - db $03 - db $15 -Data_11c26: - db $2e + db MUSIC_MATCH_START_1 +MurrayData: + db MURRAY db $0c db $00 db $12 db $00 dw $6adf ; Pointer to NPC Data - db $cb - db $03 - db $0c - db $15 + tx MurrayNPCName + db MURRAY_PIC + db STRANGE_PSYSHOCK_DECK_ID db $03 - db $16 -Data_11c33: - db $70 + db MUSIC_MATCH_START_2 +Murray2Data: + db MURRAY2 db $0c db $03 db $15 db $10 dw $6adf ; Pointer to NPC Data - db $cb - db $03 - db $0c - db $15 + tx MurrayNPCName + db MURRAY_PIC + db STRANGE_PSYSHOCK_DECK_ID db $03 - db $16 -Data_11c40: - db $2f + db MUSIC_MATCH_START_2 +JosephData: + db JOSEPH db $18 db $00 db $0e db $00 dw $6cdb ; Pointer to NPC Data - db $cc + tx JosephNPCName + db JOSEPH_PIC + db FLYIN_POKEMON_DECK_ID db $03 - db $11 - db $2e - db $03 - db $15 -Data_11c4d: - db $30 + db MUSIC_MATCH_START_1 +DavidData: + db DAVID db $18 db $00 db $0e db $00 dw $6c11 ; Pointer to NPC Data - db $cd + tx DavidNPCName + db DAVID_PIC + db LOVELY_NIDORAN_DECK_ID db $03 - db $12 - db $2f - db $03 - db $15 -Data_11c5a: - db $31 + db MUSIC_MATCH_START_1 +ErikData: + db ERIK db $18 db $00 db $0e db $00 dw $6c42 ; Pointer to NPC Data - db $ce - db $03 - db $13 - db $30 + tx ErikNPCName + db ERIK_PIC + db POISON_DECK_ID db $03 - db $15 -Data_11c67: - db $32 + db MUSIC_MATCH_START_1 +RickData: + db RICK db $06 db $00 db $0e db $00 dw $6c67 ; Pointer to NPC Data - db $cf + tx RickNPCName + db RICK_PIC + db WONDERS_OF_SCIENCE_DECK_ID db $03 - db $06 - db $16 - db $03 - db $16 -Data_11c74: - db $33 + db MUSIC_MATCH_START_2 +JohnData: + db JOHN db $12 db $04 db $1a db $00 dw $6eb3 ; Pointer to NPC Data - db $d0 + tx JohnNPCName + db JOHN_PIC + db ANGER_DECK_ID db $03 - db $14 - db $31 - db $03 - db $15 -Data_11c81: - db $34 + db MUSIC_MATCH_START_1 +AdamData: + db ADAM db $13 db $00 db $22 db $00 dw $6ed8 ; Pointer to NPC Data - db $d1 + tx AdamNPCName + db ADAM_PIC + db FLAMETHROWER_DECK_ID db $03 - db $15 - db $32 - db $03 - db $15 -Data_11c8e: - db $35 + db MUSIC_MATCH_START_1 +JonathanData: + db JONATHAN db $11 db $04 db $16 db $00 dw $6efd ; Pointer to NPC Data - db $d2 + tx JonathanNPCName + db JONATHAN_PIC + db RESHUFFLE_DECK_ID db $03 - db $16 - db $33 - db $03 - db $15 -Data_11c9b: - db $36 + db MUSIC_MATCH_START_1 +KenData: + db KEN db $07 db $04 db $1e db $00 dw $6f22 ; Pointer to NPC Data - db $d3 - db $03 - db $07 - db $17 + tx KenNPCName + db KEN_PIC + db FIRE_CHARGE_DECK_ID db $03 - db $16 -Data_11ca8: - db $37 + db MUSIC_MATCH_START_2 +CourtneyData: + db COURTNEY db $0d db $00 db $12 db $00 dw $771f ; Pointer to NPC Data - db $d4 - db $03 - db $0d - db $0c + tx CourtneyNPCName + db COURTNEY_PIC + db LEGENDARY_MOLTRES_DECK_ID db $04 - db $17 -Data_11cb5: - db $38 + db MUSIC_MATCH_START_3 +SteveData: + db STEVE db $0e db $00 db $2a db $00 dw $772a ; Pointer to NPC Data - db $d5 - db $03 - db $0e - db $0d + tx SteveNPCName + db STEVE_PIC + db LEGENDARY_ZAPDOS_DECK_ID db $04 - db $17 -Data_11cc2: - db $39 + db MUSIC_MATCH_START_3 +JackData: + db JACK db $0f db $00 db $26 db $00 dw $7735 ; Pointer to NPC Data - db $d6 - db $03 - db $0f - db $0e + tx JackNPCName + db JACK_PIC + db LEGENDARY_ARTICUNO_DECK_ID db $04 - db $17 -Data_11ccf: - db $3a + db MUSIC_MATCH_START_3 +RodData: + db ROD db $10 db $00 db $0e db $00 dw $7740 ; Pointer to NPC Data - db $d7 - db $03 - db $10 - db $0f + tx RodNPCName + db ROD_PIC + db LEGENDARY_DRAGONITE_DECK_ID db $04 - db $17 + db MUSIC_MATCH_START_3 Data_11cdc: db $3b db $21 @@ -1404,19 +1362,18 @@ Data_11ed7: 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 - db $09 + tx AaronNPCName + db AARON_PIC + db LIGHTNING_AND_FIRE_DECK_ID db $02 - db $15 + db MUSIC_MATCH_START_1 Data_11ef1: db $64 db $1a diff --git a/src/engine/bank04.asm b/src/engine/bank04.asm index e2ca66c..3119c7b 100644 --- a/src/engine/bank04.asm +++ b/src/engine/bank04.asm @@ -951,9 +951,9 @@ Func_118d3: ; 118d3 (4:58d3) cp $2 jr nz, .asm_118f2 ld a, [wCurMap] - cp $20 + cp POKEMON_DOME jr nz, .asm_118f2 - ld a, $17 + ld a, MUSIC_MATCH_START_3 ld [wMatchStartTheme], a .asm_118f2 diff --git a/src/text/text3.asm b/src/text/text3.asm index 78c22de..025fd2f 100644 --- a/src/text/text3.asm +++ b/src/text/text3.asm @@ -1624,7 +1624,7 @@ Text03ac: ; 3f66f (f:766f) text "Dr. Mason" done -Text03ad: ; 3f67a (f:767a) +RonaldNPCName: ; 3f67a (f:767a) text "Ronald" done @@ -1632,7 +1632,7 @@ Text03ae: ; 3f682 (f:7682) text "ISHIHARA" done -Text03af: ; 3f68c (f:768c) +ImakuniNPCName: ; 3f68c (f:768c) text "Imakuni?" done @@ -1640,7 +1640,7 @@ Text03b0: ; 3f696 (f:7696) text "CLERK" done -Text03b1: ; 3f69d (f:769d) +SamNPCName: ; 3f69d (f:769d) text "Sam" done @@ -1652,147 +1652,147 @@ Text03b3: ; 3f6a8 (f:76a8) text "CLERK" done -Text03b4: ; 3f6af (f:76af) +ChrisNPCName: ; 3f6af (f:76af) text "Chris" done -Text03b5: ; 3f6b6 (f:76b6) +MichaelNPCName: ; 3f6b6 (f:76b6) text "Michael" done -Text03b6: ; 3f6bf (f:76bf) +JessicaNPCName: ; 3f6bf (f:76bf) text "Jessica" done -Text03b7: ; 3f6c8 (f:76c8) +MitchNPCName: ; 3f6c8 (f:76c8) text "Mitch" done -Text03b8: ; 3f6cf (f:76cf) +MatthewNPCName: ; 3f6cf (f:76cf) text "Matthew" done -Text03b9: ; 3f6d8 (f:76d8) +RyanNPCName: ; 3f6d8 (f:76d8) text "Ryan" done -Text03ba: ; 3f6de (f:76de) +AndrewNPCName: ; 3f6de (f:76de) text "Andrew" done -Text03bb: ; 3f6e6 (f:76e6) +GeneNPCName: ; 3f6e6 (f:76e6) text "Gene" done -Text03bc: ; 3f6ec (f:76ec) +SaraNPCName: ; 3f6ec (f:76ec) text "Sara" done -Text03bd: ; 3f6f2 (f:76f2) +AmandaNPCName: ; 3f6f2 (f:76f2) text "Amanda" done -Text03be: ; 3f6fa (f:76fa) +JoshuaNPCName: ; 3f6fa (f:76fa) text "Joshua" done -Text03bf: ; 3f702 (f:7702) +AmyNPCName: ; 3f702 (f:7702) text "Amy" done -Text03c0: ; 3f707 (f:7707) +JenniferNPCName: ; 3f707 (f:7707) text "Jennifer" done -Text03c1: ; 3f711 (f:7711) +NicholasNPCName: ; 3f711 (f:7711) text "Nicholas" done -Text03c2: ; 3f71b (f:771b) +BrandonNPCName: ; 3f71b (f:771b) text "Brandon" done -Text03c3: ; 3f724 (f:7724) +IsaacNPCName: ; 3f724 (f:7724) text "Isaac" done -Text03c4: ; 3f72b (f:772b) +BrittanyNPCName: ; 3f72b (f:772b) text "Brittany" done -Text03c5: ; 3f735 (f:7735) +KristinNPCName: ; 3f735 (f:7735) text "Kristin" done -Text03c6: ; 3f73e (f:773e) +HeatherNPCName: ; 3f73e (f:773e) text "Heather" done -Text03c7: ; 3f747 (f:7747) +NikkiNPCName: ; 3f747 (f:7747) text "Nikki" done -Text03c8: ; 3f74e (f:774e) +RobertNPCName: ; 3f74e (f:774e) text "Robert" done -Text03c9: ; 3f756 (f:7756) +DanielNPCName: ; 3f756 (f:7756) text "Daniel" done -Text03ca: ; 3f75e (f:775e) +StephanieNPCName: ; 3f75e (f:775e) text "Stephanie" done -Text03cb: ; 3f769 (f:7769) +MurrayNPCName: ; 3f769 (f:7769) text "Murray" done -Text03cc: ; 3f771 (f:7771) +JosephNPCName: ; 3f771 (f:7771) text "Joseph" done -Text03cd: ; 3f779 (f:7779) +DavidNPCName: ; 3f779 (f:7779) text "David" done -Text03ce: ; 3f780 (f:7780) +ErikNPCName: ; 3f780 (f:7780) text "Erik" done -Text03cf: ; 3f786 (f:7786) +RickNPCName: ; 3f786 (f:7786) text "Rick" done -Text03d0: ; 3f78c (f:778c) +JohnNPCName: ; 3f78c (f:778c) text "John" done -Text03d1: ; 3f792 (f:7792) +AdamNPCName: ; 3f792 (f:7792) text "Adam" done -Text03d2: ; 3f798 (f:7798) +JonathanNPCName: ; 3f798 (f:7798) text "Jonathan" done -Text03d3: ; 3f7a2 (f:77a2) +KenNPCName: ; 3f7a2 (f:77a2) text "Ken" done -Text03d4: ; 3f7a7 (f:77a7) +CourtneyNPCName: ; 3f7a7 (f:77a7) text "COURTNEY" done -Text03d5: ; 3f7b1 (f:77b1) +SteveNPCName: ; 3f7b1 (f:77b1) text "Steve" done -Text03d6: ; 3f7b8 (f:77b8) +JackNPCName: ; 3f7b8 (f:77b8) text "Jack" done -Text03d7: ; 3f7be (f:77be) +RodNPCName: ; 3f7be (f:77be) text "Rod" done @@ -1856,7 +1856,7 @@ Text03e6: ; 3f81c (f:781c) text "Guide" done -Text03e7: ; 3f823 (f:7823) +AaronNPCName: ; 3f823 (f:7823) text "Aaron" done diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index 3149307..12ae8cd 100644 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -942,49 +942,49 @@ TextOffsets:: ; 34000 (d:40 textpointer Text03aa ; 0x03aa textpointer Text03ab ; 0x03ab textpointer Text03ac ; 0x03ac - textpointer Text03ad ; 0x03ad + textpointer RonaldNPCName ; 0x03ad textpointer Text03ae ; 0x03ae - textpointer Text03af ; 0x03af + textpointer ImakuniNPCName ; 0x03af textpointer Text03b0 ; 0x03b0 - textpointer Text03b1 ; 0x03b1 + textpointer SamNPCName ; 0x03b1 textpointer Text03b2 ; 0x03b2 textpointer Text03b3 ; 0x03b3 - textpointer Text03b4 ; 0x03b4 - textpointer Text03b5 ; 0x03b5 - textpointer Text03b6 ; 0x03b6 - textpointer Text03b7 ; 0x03b7 - textpointer Text03b8 ; 0x03b8 - textpointer Text03b9 ; 0x03b9 - textpointer Text03ba ; 0x03ba - textpointer Text03bb ; 0x03bb - textpointer Text03bc ; 0x03bc - textpointer Text03bd ; 0x03bd - textpointer Text03be ; 0x03be - textpointer Text03bf ; 0x03bf - textpointer Text03c0 ; 0x03c0 - textpointer Text03c1 ; 0x03c1 - textpointer Text03c2 ; 0x03c2 - textpointer Text03c3 ; 0x03c3 - textpointer Text03c4 ; 0x03c4 - textpointer Text03c5 ; 0x03c5 - textpointer Text03c6 ; 0x03c6 - textpointer Text03c7 ; 0x03c7 - textpointer Text03c8 ; 0x03c8 - textpointer Text03c9 ; 0x03c9 - textpointer Text03ca ; 0x03ca - textpointer Text03cb ; 0x03cb - textpointer Text03cc ; 0x03cc - textpointer Text03cd ; 0x03cd - textpointer Text03ce ; 0x03ce - textpointer Text03cf ; 0x03cf - textpointer Text03d0 ; 0x03d0 - textpointer Text03d1 ; 0x03d1 - textpointer Text03d2 ; 0x03d2 - textpointer Text03d3 ; 0x03d3 - textpointer Text03d4 ; 0x03d4 - textpointer Text03d5 ; 0x03d5 - textpointer Text03d6 ; 0x03d6 - textpointer Text03d7 ; 0x03d7 + textpointer ChrisNPCName ; 0x03b4 + textpointer MichaelNPCName ; 0x03b5 + textpointer JessicaNPCName ; 0x03b6 + textpointer MitchNPCName ; 0x03b7 + textpointer MatthewNPCName ; 0x03b8 + textpointer RyanNPCName ; 0x03b9 + textpointer AndrewNPCName ; 0x03ba + textpointer GeneNPCName ; 0x03bb + textpointer SaraNPCName ; 0x03bc + textpointer AmandaNPCName ; 0x03bd + textpointer JoshuaNPCName ; 0x03be + textpointer AmyNPCName ; 0x03bf + textpointer JenniferNPCName ; 0x03c0 + textpointer NicholasNPCName ; 0x03c1 + textpointer BrandonNPCName ; 0x03c2 + textpointer IsaacNPCName ; 0x03c3 + textpointer BrittanyNPCName ; 0x03c4 + textpointer KristinNPCName ; 0x03c5 + textpointer HeatherNPCName ; 0x03c6 + textpointer NikkiNPCName ; 0x03c7 + textpointer RobertNPCName ; 0x03c8 + textpointer DanielNPCName ; 0x03c9 + textpointer StephanieNPCName ; 0x03ca + textpointer MurrayNPCName ; 0x03cb + textpointer JosephNPCName ; 0x03cc + textpointer DavidNPCName ; 0x03cd + textpointer ErikNPCName ; 0x03ce + textpointer RickNPCName ; 0x03cf + textpointer JohnNPCName ; 0x03d0 + textpointer AdamNPCName ; 0x03d1 + textpointer JonathanNPCName ; 0x03d2 + textpointer KenNPCName ; 0x03d3 + textpointer CourtneyNPCName ; 0x03d4 + textpointer SteveNPCName ; 0x03d5 + textpointer JackNPCName ; 0x03d6 + textpointer RodNPCName ; 0x03d7 textpointer Text03d8 ; 0x03d8 textpointer Text03d9 ; 0x03d9 textpointer Text03da ; 0x03da @@ -1000,7 +1000,7 @@ TextOffsets:: ; 34000 (d:40 textpointer Text03e4 ; 0x03e4 textpointer Text03e5 ; 0x03e5 textpointer Text03e6 ; 0x03e6 - textpointer Text03e7 ; 0x03e7 + textpointer AaronNPCName ; 0x03e7 textpointer Text03e8 ; 0x03e8 textpointer Text03e9 ; 0x03e9 textpointer Text03ea ; 0x03ea -- cgit v1.2.3 From 4acb9e89dee9978b73b254e8be44644e9c1d0ce9 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sun, 3 May 2020 01:25:41 -0500 Subject: Continue documenting NPC struct --- src/constants/npc_constants.asm | 158 +++-- src/constants/sprite_constants.asm | 38 ++ src/data/npcs.asm | 1263 +++++++++++++++++++----------------- src/engine/bank04.asm | 20 +- src/text/text3.asm | 40 +- src/text/text_offsets.asm | 40 +- 6 files changed, 860 insertions(+), 699 deletions(-) (limited to 'src') diff --git a/src/constants/npc_constants.asm b/src/constants/npc_constants.asm index 12d3fe1..afc98bc 100644 --- a/src/constants/npc_constants.asm +++ b/src/constants/npc_constants.asm @@ -41,46 +41,118 @@ const STEPHANIE_PIC ; $28 const AARON_PIC ; $29 -RONALD EQU $02 -IMAKUNI EQU $04 -SAM EQU $07 -CHRIS EQU $17 -MICHAEL EQU $18 -JESSICA EQU $19 -MITCH EQU $1A -MATTHEW EQU $1B -RYAN EQU $1C -ANDREW EQU $1D -GENE EQU $1E -SARA EQU $1F -AMANDA EQU $20 -JOSHUA EQU $21 -AMY EQU $22 -JENNIFER EQU $23 -NICHOLAS EQU $24 -BRANDON EQU $25 -ISAAC EQU $26 -BRITTANY EQU $27 -KRISTIN EQU $28 -HEATHER EQU $29 -NIKKI EQU $2A -ROBERT EQU $2B -DANIEL EQU $2C -STEPHANIE EQU $2D -MURRAY EQU $2E -JOSEPH EQU $2F -DAVID EQU $30 -ERIK EQU $31 -RICK EQU $32 -JOHN EQU $33 -ADAM EQU $34 -JONATHAN EQU $35 -KEN EQU $36 -COURTNEY EQU $37 -STEVE EQU $38 -JACK EQU $39 -ROD EQU $3A -AARON EQU $63 -MURRAY2 EQU $70 -RONALD2 EQU $71 -RONALD3 EQU $72 + const_def 1 + const NPC_DRMASON ; $01 + const NPC_RONALD ; $02 + const NPC_ISHIHARA ; $03 + const NPC_IMAKUNI ; $04 + const NPC_05 ; $05 (unused) + const NPC_06 ; $06 (unused) + const NPC_SAM ; $07 + const NPC_TECH1 ; $08 + const NPC_TECH2 ; $09 + const NPC_TECH3 ; $0A + const NPC_TECH4 ; $0B + const NPC_TECH5 ; $0C + const NPC_TECH6 ; $0D + const NPC_CLERK1 ; $0E + const NPC_CLERK2 ; $0F + const NPC_CLERK3 ; $10 + const NPC_CLERK4 ; $11 + const NPC_CLERK5 ; $12 + const NPC_CLERK6 ; $13 + const NPC_CLERK7 ; $14 + const NPC_CLERK8 ; $15 + const NPC_CLERK9 ; $16 + const NPC_CHRIS ; $17 + const NPC_MICHAEL ; $18 + const NPC_JESSICA ; $19 + const NPC_MITCH ; $1A + const NPC_MATTHEW ; $1B + const NPC_RYAN ; $1C + const NPC_ANDREW ; $1D + const NPC_GENE ; $1E + const NPC_SARA ; $1F + const NPC_AMANDA ; $20 + const NPC_JOSHUA ; $21 + const NPC_AMY ; $22 + const NPC_JENNIFER ; $23 + const NPC_NICHOLAS ; $24 + const NPC_BRANDON ; $25 + const NPC_ISAAC ; $26 + const NPC_BRITTANY ; $27 + const NPC_KRISTIN ; $28 + const NPC_HEATHER ; $29 + const NPC_NIKKI ; $2A + const NPC_ROBERT ; $2B + const NPC_DANIEL ; $2C + const NPC_STEPHANIE ; $2D + const NPC_MURRAY ; $2E + const NPC_JOSEPH ; $2F + const NPC_DAVID ; $30 + const NPC_ERIK ; $31 + const NPC_RICK ; $32 + const NPC_JOHN ; $33 + const NPC_ADAM ; $34 + const NPC_JONATHAN ; $35 + const NPC_KEN ; $36 + const NPC_COURTNEY ; $37 + const NPC_STEVE ; $38 + const NPC_JACK ; $39 + const NPC_ROD ; $3A + const NPC_CLERK10 ; $3B + const NPC_CLERK11 ; $3C + const NPC_MAN1 ; $3D + const NPC_WOMAN1 ; $3E + const NPC_CHAP1 ; $3F + const NPC_GAL1 ; $40 + const NPC_LASS1 ; $41 + const NPC_CHAP2 ; $42 + const NPC_LASS2 ; $43 + const NPC_PAPPY1 ; $44 + const NPC_LAD1 ; $45 + const NPC_LAD2 ; $46 + const NPC_CHAP3 ; $47 + const NPC_CLERK12 ; $48 + const NPC_CLERK13 ; $49 + const NPC_HOST ; $4A + const NPC_SPECS1 ; $4B + const NPC_BUTCH ; $4C + const NPC_GRANNY1 ; $4D + const NPC_LASS3 ; $4E + const NPC_MAN2 ; $4F + const NPC_PAPPY2 ; $50 + const NPC_LASS4 ; $51 + const NPC_HOOD1 ; $52 + const NPC_GRANNY2 ; $53 + const NPC_GAL2 ; $54 + const NPC_LAD3 ; $55 + const NPC_GAL3 ; $56 + const NPC_CHAP4 ; $57 + const NPC_MAN3 ; $58 + const NPC_SPECS2 ; $59 + const NPC_SPECS3 ; $5A + const NPC_WOMAN2 ; $5B + const NPC_MANIA ; $5C + const NPC_PAPPY3 ; $5D + const NPC_GAL4 ; $5E + const NPC_CHAMP ; $5F + const NPC_HOOD2 ; $60 + const NPC_LASS5 ; $61 + const NPC_CHAP5 ; $62 + const NPC_AARON ; $63 + const NPC_GUIDE ; $64 + const NPC_TECH7 ; $65 + const NPC_TECH8 ; $66 + const NPC_TORCH ; $67 + const NPC_LEGENDARY_CARD_TOP_LEFT ; $68 + const NPC_LEGENDARY_CARD_TOP_RIGHT ; $69 + const NPC_LEGENDARY_CARD_BOTTOM_LEFT ; $6A + const NPC_LEGENDARY_CARD_BOTTOM_CENTER_LEFT ; $6B + const NPC_LEGENDARY_CARD_BOTTOM_CENTER_RIGHT ; $6C + const NPC_LEGENDARY_CARD_BOTTOM_RIGHT ; $6D + const NPC_6E ; $6E (unused) + const NPC_6F ; $6F (unused) + const NPC_MURRAY2 ; $70 + const NPC_RONALD2 ; $71 + const NPC_RONALD3 ; $72 diff --git a/src/constants/sprite_constants.asm b/src/constants/sprite_constants.asm index dc051d9..c4d219d 100644 --- a/src/constants/sprite_constants.asm +++ b/src/constants/sprite_constants.asm @@ -20,3 +20,41 @@ SPRITE_ANIM_BUFFER_CAPACITY EQU 16 ; sprites const SPRITE_ANIM_MOVEMENT_COUNTER const SPRITE_ANIM_FIELD_0F SPRITE_ANIM_LENGTH EQU const_value + + const_def 1 + const SPRITE_RONALD ; $01 + const SPRITE_DRMASON ; $02 + const SPRITE_ISHIHARA ; $03 + const SPRITE_IMAKUNI ; $04 + const SPRITE_NIKKI ; $05 + const SPRITE_RICK ; $06 + const SPRITE_KEN ; $07 + const SPRITE_AMY ; $08 + const SPRITE_ISAAC ; $09 + const SPRITE_MITCH ; $0A + const SPRITE_GENE ; $0B + const SPRITE_MURRAY ; $0C + const SPRITE_COURTNEY ; $0D + const SPRITE_STEVE ; $0E + const SPRITE_JACK ; $0F + const SPRITE_ROD ; $10 + const SPRITE_BOY1 ; $11 + const SPRITE_BOY2 ; $12 + const SPRITE_BOY3 ; $13 + const SPRITE_BUTCH ; $14 + const SPRITE_BOY4 ; $15 + const SPRITE_JOSHUA ; $16 + const SPRITE_BOY5 ; $17 + const SPRITE_TECH ; $18 + const SPRITE_CHAP ; $19 + const SPRITE_GUIDE ; $1A + const SPRITE_PAPPY ; $1B + const SPRITE_GIRL1 ; $1C + const SPRITE_GIRL2 ; $1D + const SPRITE_GIRL3 ; $1E + const SPRITE_GIRL4 ; $1F + const SPRITE_GIRL5 ; $20 + const SPRITE_CLERK ; $21 + const SPRITE_HOST ; $22 + const SPRITE_WOMAN ; $23 + const SPRITE_GRANNY ; $24 diff --git a/src/data/npcs.asm b/src/data/npcs.asm index c7468f3..7ba2dde 100644 --- a/src/data/npcs.asm +++ b/src/data/npcs.asm @@ -1,138 +1,139 @@ ; 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 RonaldData - dw Data_11a11 - dw ImakuniData - dw Data_119dd - dw Data_119dd - dw SamData - 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 ChrisData - dw MichaelData - dw JessicaData - dw MitchData - dw MatthewData - dw RyanData - dw AndrewData - dw GeneData - dw SaraData - dw AmandaData - 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 MurrayData - 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 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 AaronData - dw Data_11ef1 - dw Data_11efe - dw Data_11f0b - dw Data_11f18 - dw Data_11f1f - dw Data_11f26 - dw Data_11f2d - dw Data_11f34 - dw Data_11f3b - dw Data_11f42 - dw Data_11f49 - dw Data_11f49 - dw Murray2Data - dw Ronald2Data - dw Ronald3Data - dw Data_11f49 -Data_119dd: - db $01 - db $02 - db $00 - db $26 +NPCHeaderPointers: + dw DrMasonNPCHeader + dw DrMasonNPCHeader + dw RonaldNPCHeader + dw IshiharaNPCHeader + dw ImakuniNPCHeader + dw DrMasonNPCHeader + dw DrMasonNPCHeader + dw SamNPCHeader + dw Tech1NPCHeader + dw Tech2NPCHeader + dw Tech3NPCHeader + dw Tech4NPCHeader + dw Tech5NPCHeader + dw Tech6NPCHeader + dw Clerk1NPCHeader + dw Clerk2NPCHeader + dw Clerk3NPCHeader + dw Clerk4NPCHeader + dw Clerk5NPCHeader + dw Clerk6NPCHeader + dw Clerk7NPCHeader + dw Clerk8NPCHeader + dw Clerk9NPCHeader + dw ChrisNPCHeader + dw MichaelNPCHeader + dw JessicaNPCHeader + dw MitchNPCHeader + dw MatthewNPCHeader + dw RyanNPCHeader + dw AndrewNPCHeader + dw GeneNPCHeader + dw SaraNPCHeader + dw AmandaNPCHeader + dw JoshuaNPCHeader + dw AmyNPCHeader + dw JenniferNPCHeader + dw NicholasNPCHeader + dw BrandonNPCHeader + dw IsaacNPCHeader + dw BrittanyNPCHeader + dw KristinNPCHeader + dw HeatherNPCHeader + dw NikkiNPCHeader + dw RobertNPCHeader + dw DanielNPCHeader + dw StephanieNPCHeader + dw MurrayNPCHeader + dw JosephNPCHeader + dw DavidNPCHeader + dw ErikNPCHeader + dw RickNPCHeader + dw JohnNPCHeader + dw AdamNPCHeader + dw JonathanNPCHeader + dw KenNPCHeader + dw CourtneyNPCHeader + dw SteveNPCHeader + dw JackNPCHeader + dw RodNPCHeader + dw Clerk10NPCHeader + dw Clerk11NPCHeader + dw Man1NPCHeader + dw Woman1NPCHeader + dw Chap1NPCHeader + dw Gal1NPCHeader + dw Lass1NPCHeader + dw Chap2NPCHeader + dw Lass2NPCHeader + dw Pappy1NPCHeader + dw Lad1NPCHeader + dw Lad2NPCHeader + dw Chap3NPCHeader + dw Clerk12NPCHeader + dw Clerk13NPCHeader + dw HostNPCHeader + dw Specs1NPCHeader + dw ButchNPCHeader + dw Granny1NPCHeader + dw Lass3NPCHeader + dw Man2NPCHeader + dw Pappy2NPCHeader + dw Lass4NPCHeader + dw Hood1NPCHeader + dw Granny2NPCHeader + dw Gal2NPCHeader + dw Lad3NPCHeader + dw Gal3NPCHeader + dw Chap4NPCHeader + dw Man3NPCHeader + dw Specs2NPCHeader + dw Specs3NPCHeader + dw Woman2NPCHeader + dw ManiaNPCHeader + dw Pappy3NPCHeader + dw Gal4NPCHeader + dw ChampNPCHeader + dw Hood2NPCHeader + dw Lass5NPCHeader + dw Chap5NPCHeader + dw AaronNPCHeader + dw GuideNPCHeader + dw Tech7NPCHeader + dw Tech8NPCHeader + dw TorchNPCHeader + dw LegendaryCardTopLeftNPCHeader + dw LegendaryCardTopRightNPCHeader + dw LegendaryCardBottomLeftNPCHeader + dw LegendaryCardBottomCenterLeftNPCHeader + dw LegendaryCardBottomCenterRightNPCHeader + dw LegendaryCardBottomRightNPCHeader + dw DummyNPCHeader + dw DummyNPCHeader + dw Murray2NPCHeader + dw Ronald2NPCHeader + dw Ronald3NPCHeader + dw DummyNPCHeader + +DrMasonNPCHeader: + db NPC_DRMASON + db SPRITE_DRMASON + db $00 + db $26 ; palette and animation db $00 dw $5727 ; Pointer to NPC Data - db $ac - db $03 + tx DrMasonNPCName db $00 db $00 db $00 db $00 -RonaldData: - db RONALD - db $01 + +RonaldNPCHeader: + db NPC_RONALD + db SPRITE_RONALD db $04 db $0e db $00 @@ -140,11 +141,12 @@ RonaldData: tx RonaldNPCName db RONALD_PIC db INVINCIBLE_RONALD_DECK_ID - db $0f + db MUSIC_RONALD db MUSIC_MATCH_START_2 -Ronald2Data: - db RONALD2 - db $01 + +Ronald2NPCHeader: + db NPC_RONALD2 + db SPRITE_RONALD db $04 db $0e db $00 @@ -152,11 +154,12 @@ Ronald2Data: tx RonaldNPCName db RONALD_PIC db INVINCIBLE_RONALD_DECK_ID - db $0f + db MUSIC_RONALD db MUSIC_MATCH_START_2 -Ronald3Data: - db RONALD3 - db $01 + +Ronald3NPCHeader: + db NPC_RONALD3 + db SPRITE_RONALD db $04 db $0e db $00 @@ -164,24 +167,25 @@ Ronald3Data: tx RonaldNPCName db RONALD_PIC db INVINCIBLE_RONALD_DECK_ID - db $0f + db MUSIC_RONALD db MUSIC_MATCH_START_2 -Data_11a11: - db $03 - db $03 + +IshiharaNPCHeader: + db NPC_ISHIHARA + db SPRITE_ISHIHARA db $04 db $22 db $00 dw $5b4a ; Pointer to NPC Data - db $ae - db $03 + tx IshiharaNPCName db $00 db $00 db $00 db $00 -ImakuniData: - db IMAKUNI - db $04 + +ImakuniNPCHeader: + db NPC_IMAKUNI + db SPRITE_IMAKUNI db $00 db $0e db $00 @@ -189,11 +193,12 @@ ImakuniData: tx ImakuniNPCName db IMAKUNI_PIC db IMAKUNI_DECK_ID - db $10 + db MUSIC_IMAKUNI db MUSIC_MATCH_START_1 -SamData: - db SAM - db $18 ; sprite ID + +SamNPCHeader: + db NPC_SAM + db SPRITE_TECH db $00 db $0e db $00 @@ -201,206 +206,207 @@ SamData: tx SamNPCName db SAM_PIC db SAMS_NORMAL_DECK_ID - db $02 + db MUSIC_DUEL_THEME_1 db MUSIC_MATCH_START_1 -Data_11a38: - db $08 - db $18 + +Tech1NPCHeader: + db NPC_TECH1 + db SPRITE_TECH db $00 db $0e db $00 dw $5583 ; Pointer to NPC Data - db $b2 - db $03 + tx TechNPCName db $00 db $00 db $00 db $00 -Data_11a45: - db $09 - db $18 + +Tech2NPCHeader: + db NPC_TECH2 + db SPRITE_TECH db $00 db $0e db $00 dw $55ca ; Pointer to NPC Data - db $b2 - db $03 + tx TechNPCName db $00 db $00 db $00 db $00 -Data_11a52: - db $0a - db $18 + +Tech3NPCHeader: + db NPC_TECH3 + db SPRITE_TECH db $00 db $0e db $00 dw $55d5 ; Pointer to NPC Data - db $b2 - db $03 + tx TechNPCName db $00 db $00 db $00 db $00 -Data_11a5f: - db $0b - db $18 + +Tech4NPCHeader: + db NPC_TECH4 + db SPRITE_TECH db $00 db $0e db $00 dw $55e0 ; Pointer to NPC Data - db $b2 - db $03 + tx TechNPCName db $00 db $00 db $00 db $00 -Data_11a6c: - db $0c - db $18 + +Tech5NPCHeader: + db NPC_TECH5 + db SPRITE_TECH db $00 db $0e db $00 dw $55f9 ; Pointer to NPC Data - db $b2 - db $03 + tx TechNPCName db $00 db $00 db $00 db $00 -Data_11a79: - db $0d - db $18 + +Tech6NPCHeader: + db NPC_TECH6 + db SPRITE_TECH db $00 db $0e db $00 dw $58bb ; Pointer to NPC Data - db $b2 - db $03 + tx TechNPCName db $00 db $00 db $00 db $00 -Data_11a86: - db $0e - db $21 + +Clerk1NPCHeader: + db NPC_CLERK1 + db SPRITE_CLERK db $0a db $30 db $00 dw $5c64 ; Pointer to NPC Data - db $b3 - db $03 + tx ClerkNPCName2 db $00 db $00 db $00 db $00 -Data_11a93: - db $0f - db $21 + +Clerk2NPCHeader: + db NPC_CLERK2 + db SPRITE_CLERK db $0a db $30 db $00 dw $5ed1 ; Pointer to NPC Data - db $b3 - db $03 + tx ClerkNPCName2 db $00 db $00 db $00 db $00 -Data_11aa0: - db $10 - db $21 + +Clerk3NPCHeader: + db NPC_CLERK3 + db SPRITE_CLERK db $0a db $30 db $00 dw $609e ; Pointer to NPC Data - db $b3 - db $03 + tx ClerkNPCName2 db $00 db $00 db $00 db $00 -Data_11aad: - db $11 - db $21 + +Clerk4NPCHeader: + db NPC_CLERK4 + db SPRITE_CLERK db $0a db $30 db $00 dw $6369 ; Pointer to NPC Data - db $b3 - db $03 + tx ClerkNPCName2 db $00 db $00 db $00 db $00 -Data_11aba: - db $12 - db $21 + +Clerk5NPCHeader: + db NPC_CLERK5 + db SPRITE_CLERK db $0a db $30 db $00 dw $6566 ; Pointer to NPC Data - db $b3 - db $03 + tx ClerkNPCName2 db $00 db $00 db $00 db $00 -Data_11ac7: - db $13 - db $21 + +Clerk6NPCHeader: + db NPC_CLERK6 + db SPRITE_CLERK db $0a db $30 db $00 dw $684c ; Pointer to NPC Data - db $b3 - db $03 + tx ClerkNPCName2 db $00 db $00 db $00 db $00 -Data_11ad4: - db $14 - db $21 + +Clerk7NPCHeader: + db NPC_CLERK7 + db SPRITE_CLERK db $0a db $30 db $00 dw $6b53 ; Pointer to NPC Data - db $b3 - db $03 + tx ClerkNPCName2 db $00 db $00 db $00 db $00 -Data_11ae1: - db $15 - db $21 + +Clerk8NPCHeader: + db NPC_CLERK8 + db SPRITE_CLERK db $0a db $30 db $00 dw $6d45 ; Pointer to NPC Data - db $b3 - db $03 + tx ClerkNPCName2 db $00 db $00 db $00 db $00 -Data_11aee: - db $16 - db $21 + +Clerk9NPCHeader: + db NPC_CLERK9 + db SPRITE_CLERK db $0a db $30 db $00 dw $7025 ; Pointer to NPC Data - db $b3 - db $03 + tx ClerkNPCName2 db $00 db $00 db $00 db $00 -ChrisData: - db CHRIS - db $15 + +ChrisNPCHeader: + db NPC_CHRIS + db SPRITE_BOY4 db $00 db $26 db $00 @@ -408,11 +414,12 @@ ChrisData: tx ChrisNPCName db CHRIS_PIC db MUSCLES_FOR_BRAINS_DECK_ID - db $03 + db MUSIC_DUEL_THEME_2 db MUSIC_MATCH_START_1 -MichaelData: - db MICHAEL - db $15 + +MichaelNPCHeader: + db NPC_MICHAEL + db SPRITE_BOY4 db $00 db $26 db $00 @@ -420,11 +427,12 @@ MichaelData: tx MichaelNPCName db MICHAEL_PIC db HEATED_BATTLE_DECK_ID - db $03 + db MUSIC_DUEL_THEME_2 db MUSIC_MATCH_START_1 -JessicaData: - db JESSICA - db $1f + +JessicaNPCHeader: + db NPC_JESSICA + db SPRITE_GIRL4 db $04 db $1a db $00 @@ -432,11 +440,12 @@ JessicaData: tx JessicaNPCName db JESSICA_PIC db LOVE_TO_BATTLE_DECK_ID - db $03 + db MUSIC_DUEL_THEME_2 db MUSIC_MATCH_START_1 -MitchData: - db MITCH - db $0a + +MitchNPCHeader: + db NPC_MITCH + db SPRITE_MITCH db $00 db $0e db $00 @@ -444,11 +453,12 @@ MitchData: tx MitchNPCName db MITCH_PIC db FIRST_STRIKE_DECK_ID - db $03 + db MUSIC_DUEL_THEME_2 db MUSIC_MATCH_START_2 -MatthewData: - db MATTHEW - db $15 + +MatthewNPCHeader: + db NPC_MATTHEW + db SPRITE_BOY4 db $00 db $16 db $00 @@ -456,11 +466,12 @@ MatthewData: tx MatthewNPCName db MATTHEW_PIC db HARD_POKEMON_DECK_ID - db $03 + db MUSIC_DUEL_THEME_2 db MUSIC_MATCH_START_1 -RyanData: - db RYAN - db $11 + +RyanNPCHeader: + db NPC_RYAN + db SPRITE_BOY1 db $00 db $26 db $00 @@ -468,11 +479,12 @@ RyanData: tx RyanNPCName db RYAN_PIC db EXCAVATION_DECK_ID - db $03 + db MUSIC_DUEL_THEME_2 db MUSIC_MATCH_START_1 -AndrewData: - db ANDREW - db $1a + +AndrewNPCHeader: + db NPC_ANDREW + db SPRITE_GUIDE db $00 db $16 db $00 @@ -480,11 +492,12 @@ AndrewData: tx AndrewNPCName db ANDREW_PIC db BLISTERING_POKEMON_DECK_ID - db $03 + db MUSIC_DUEL_THEME_2 db MUSIC_MATCH_START_1 -GeneData: - db GENE - db $0b + +GeneNPCHeader: + db NPC_GENE + db SPRITE_GENE db $04 db $1e db $00 @@ -492,11 +505,12 @@ GeneData: tx GeneNPCName db GENE_PIC db ROCK_CRUSHER_DECK_ID - db $03 + db MUSIC_DUEL_THEME_2 db MUSIC_MATCH_START_2 -SaraData: - db SARA - db $20 + +SaraNPCHeader: + db NPC_SARA + db SPRITE_GIRL5 db $00 db $0e db $00 @@ -504,11 +518,12 @@ SaraData: tx SaraNPCName db SARA_PIC db WATERFRONT_POKEMON_DECK_ID - db $03 + db MUSIC_DUEL_THEME_2 db MUSIC_MATCH_START_1 -AmandaData: - db AMANDA - db $20 + +AmandaNPCHeader: + db NPC_AMANDA + db SPRITE_GIRL5 db $00 db $16 db $00 @@ -516,11 +531,12 @@ AmandaData: tx AmandaNPCName db AMANDA_PIC db LONELY_FRIENDS_DECK_ID - db $03 + db MUSIC_DUEL_THEME_2 db MUSIC_MATCH_START_1 -JoshuaData: - db JOSHUA - db $16 + +JoshuaNPCHeader: + db NPC_JOSHUA + db SPRITE_JOSHUA db $00 db $26 db $00 @@ -528,11 +544,12 @@ JoshuaData: tx JoshuaNPCName db JOSHUA_PIC db SOUND_OF_THE_WAVES_DECK_ID - db $03 + db MUSIC_DUEL_THEME_2 db MUSIC_MATCH_START_1 -AmyData: - db AMY - db $08 + +AmyNPCHeader: + db NPC_AMY + db SPRITE_AMY db $08 db $2e db $10 @@ -540,11 +557,12 @@ AmyData: tx AmyNPCName db AMY_PIC db GO_GO_RAIN_DANCE_DECK_ID - db $03 + db MUSIC_DUEL_THEME_2 db MUSIC_MATCH_START_2 -JenniferData: - db JENNIFER - db $1c + +JenniferNPCHeader: + db NPC_JENNIFER + db SPRITE_GIRL1 db $04 db $0e db $00 @@ -552,11 +570,12 @@ JenniferData: tx JenniferNPCName db JENNIFER_PIC db PIKACHU_DECK_ID - db $03 + db MUSIC_DUEL_THEME_2 db MUSIC_MATCH_START_1 -NicholasData: - db NICHOLAS - db $17 + +NicholasNPCHeader: + db NPC_NICHOLAS + db SPRITE_BOY5 db $04 db $1e db $00 @@ -564,11 +583,12 @@ NicholasData: tx NicholasNPCName db NICHOLAS_PIC db BOOM_BOOM_SELFDESTRUCT_DECK_ID - db $03 + db MUSIC_DUEL_THEME_2 db MUSIC_MATCH_START_1 -BrandonData: - db BRANDON - db $17 + +BrandonNPCHeader: + db NPC_BRANDON + db SPRITE_BOY5 db $04 db $1e db $00 @@ -576,11 +596,12 @@ BrandonData: tx BrandonNPCName db BRANDON_PIC db POWER_GENERATOR_DECK_ID - db $03 + db MUSIC_DUEL_THEME_2 db MUSIC_MATCH_START_1 -IsaacData: - db ISAAC - db $09 + +IsaacNPCHeader: + db NPC_ISAAC + db SPRITE_ISAAC db $00 db $16 db $00 @@ -588,11 +609,12 @@ IsaacData: tx IsaacNPCName db ISAAC_PIC db ZAPPING_SELFDESTRUCT_DECK_ID - db $03 + db MUSIC_DUEL_THEME_2 db MUSIC_MATCH_START_2 -BrittanyData: - db BRITTANY - db $1c + +BrittanyNPCHeader: + db NPC_BRITTANY + db SPRITE_GIRL1 db $04 db $0e db $00 @@ -600,11 +622,12 @@ BrittanyData: tx BrittanyNPCName db BRITTANY_PIC db ETCETERA_DECK_ID - db $03 + db MUSIC_DUEL_THEME_2 db MUSIC_MATCH_START_1 -KristinData: - db KRISTIN - db $1e + +KristinNPCHeader: + db NPC_KRISTIN + db SPRITE_GIRL3 db $00 db $1e db $00 @@ -612,11 +635,12 @@ KristinData: tx KristinNPCName db KRISTIN_PIC db FLOWER_GARDEN_DECK_ID - db $03 + db MUSIC_DUEL_THEME_2 db MUSIC_MATCH_START_1 -HeatherData: - db HEATHER - db $1d + +HeatherNPCHeader: + db NPC_HEATHER + db SPRITE_GIRL2 db $04 db $22 db $00 @@ -624,11 +648,12 @@ HeatherData: tx HeatherNPCName db HEATHER_PIC db KALEIDOSCOPE_DECK_ID - db $03 + db MUSIC_DUEL_THEME_2 db MUSIC_MATCH_START_1 -NikkiData: - db NIKKI - db $05 + +NikkiNPCHeader: + db NPC_NIKKI + db SPRITE_NIKKI db $00 db $1a db $00 @@ -636,11 +661,12 @@ NikkiData: tx NikkiNPCName db NIKKI_PIC db FLOWER_POWER_DECK_ID - db $03 + db MUSIC_DUEL_THEME_2 db MUSIC_MATCH_START_2 -RobertData: - db ROBERT - db $11 + +RobertNPCHeader: + db NPC_ROBERT + db SPRITE_BOY1 db $04 db $16 db $00 @@ -648,11 +674,12 @@ RobertData: tx RobertNPCName db ROBERT_PIC db GHOST_DECK_ID - db $03 + db MUSIC_DUEL_THEME_2 db MUSIC_MATCH_START_1 -DanielData: - db DANIEL - db $12 + +DanielNPCHeader: + db NPC_DANIEL + db SPRITE_BOY2 db $04 db $1a db $00 @@ -660,11 +687,12 @@ DanielData: tx DanielNPCName db DANIEL_PIC db NAP_TIME_DECK_ID - db $03 + db MUSIC_DUEL_THEME_2 db MUSIC_MATCH_START_1 -StephanieData: - db STEPHANIE - db $1c + +StephanieNPCHeader: + db NPC_STEPHANIE + db SPRITE_GIRL1 db $04 db $0e db $00 @@ -672,11 +700,12 @@ StephanieData: tx StephanieNPCName db STEPHANIE_PIC db STRANGE_POWER_DECK_ID - db $03 + db MUSIC_DUEL_THEME_2 db MUSIC_MATCH_START_1 -MurrayData: - db MURRAY - db $0c + +MurrayNPCHeader: + db NPC_MURRAY + db SPRITE_MURRAY db $00 db $12 db $00 @@ -684,11 +713,12 @@ MurrayData: tx MurrayNPCName db MURRAY_PIC db STRANGE_PSYSHOCK_DECK_ID - db $03 + db MUSIC_DUEL_THEME_2 db MUSIC_MATCH_START_2 -Murray2Data: - db MURRAY2 - db $0c + +Murray2NPCHeader: + db NPC_MURRAY2 + db SPRITE_MURRAY db $03 db $15 db $10 @@ -696,11 +726,12 @@ Murray2Data: tx MurrayNPCName db MURRAY_PIC db STRANGE_PSYSHOCK_DECK_ID - db $03 + db MUSIC_DUEL_THEME_2 db MUSIC_MATCH_START_2 -JosephData: - db JOSEPH - db $18 + +JosephNPCHeader: + db NPC_JOSEPH + db SPRITE_TECH db $00 db $0e db $00 @@ -708,11 +739,12 @@ JosephData: tx JosephNPCName db JOSEPH_PIC db FLYIN_POKEMON_DECK_ID - db $03 + db MUSIC_DUEL_THEME_2 db MUSIC_MATCH_START_1 -DavidData: - db DAVID - db $18 + +DavidNPCHeader: + db NPC_DAVID + db SPRITE_TECH db $00 db $0e db $00 @@ -720,11 +752,12 @@ DavidData: tx DavidNPCName db DAVID_PIC db LOVELY_NIDORAN_DECK_ID - db $03 + db MUSIC_DUEL_THEME_2 db MUSIC_MATCH_START_1 -ErikData: - db ERIK - db $18 + +ErikNPCHeader: + db NPC_ERIK + db SPRITE_TECH db $00 db $0e db $00 @@ -732,11 +765,12 @@ ErikData: tx ErikNPCName db ERIK_PIC db POISON_DECK_ID - db $03 + db MUSIC_DUEL_THEME_2 db MUSIC_MATCH_START_1 -RickData: - db RICK - db $06 + +RickNPCHeader: + db NPC_RICK + db SPRITE_RICK db $00 db $0e db $00 @@ -744,11 +778,12 @@ RickData: tx RickNPCName db RICK_PIC db WONDERS_OF_SCIENCE_DECK_ID - db $03 + db MUSIC_DUEL_THEME_2 db MUSIC_MATCH_START_2 -JohnData: - db JOHN - db $12 + +JohnNPCHeader: + db NPC_JOHN + db SPRITE_BOY2 db $04 db $1a db $00 @@ -756,11 +791,12 @@ JohnData: tx JohnNPCName db JOHN_PIC db ANGER_DECK_ID - db $03 + db MUSIC_DUEL_THEME_2 db MUSIC_MATCH_START_1 -AdamData: - db ADAM - db $13 + +AdamNPCHeader: + db NPC_ADAM + db SPRITE_BOY3 db $00 db $22 db $00 @@ -768,11 +804,12 @@ AdamData: tx AdamNPCName db ADAM_PIC db FLAMETHROWER_DECK_ID - db $03 + db MUSIC_DUEL_THEME_2 db MUSIC_MATCH_START_1 -JonathanData: - db JONATHAN - db $11 + +JonathanNPCHeader: + db NPC_JONATHAN + db SPRITE_BOY1 db $04 db $16 db $00 @@ -780,11 +817,12 @@ JonathanData: tx JonathanNPCName db JONATHAN_PIC db RESHUFFLE_DECK_ID - db $03 + db MUSIC_DUEL_THEME_2 db MUSIC_MATCH_START_1 -KenData: - db KEN - db $07 + +KenNPCHeader: + db NPC_KEN + db SPRITE_KEN db $04 db $1e db $00 @@ -792,11 +830,12 @@ KenData: tx KenNPCName db KEN_PIC db FIRE_CHARGE_DECK_ID - db $03 + db MUSIC_DUEL_THEME_2 db MUSIC_MATCH_START_2 -CourtneyData: - db COURTNEY - db $0d + +CourtneyNPCHeader: + db NPC_COURTNEY + db SPRITE_COURTNEY db $00 db $12 db $00 @@ -804,11 +843,12 @@ CourtneyData: tx CourtneyNPCName db COURTNEY_PIC db LEGENDARY_MOLTRES_DECK_ID - db $04 + db MUSIC_DUEL_THEME_3 db MUSIC_MATCH_START_3 -SteveData: - db STEVE - db $0e + +SteveNPCHeader: + db NPC_STEVE + db SPRITE_STEVE db $00 db $2a db $00 @@ -816,11 +856,12 @@ SteveData: tx SteveNPCName db STEVE_PIC db LEGENDARY_ZAPDOS_DECK_ID - db $04 + db MUSIC_DUEL_THEME_3 db MUSIC_MATCH_START_3 -JackData: - db JACK - db $0f + +JackNPCHeader: + db NPC_JACK + db SPRITE_JACK db $00 db $26 db $00 @@ -828,11 +869,12 @@ JackData: tx JackNPCName db JACK_PIC db LEGENDARY_ARTICUNO_DECK_ID - db $04 + db MUSIC_DUEL_THEME_3 db MUSIC_MATCH_START_3 -RodData: - db ROD - db $10 + +RodNPCHeader: + db NPC_ROD + db SPRITE_ROD db $00 db $0e db $00 @@ -840,531 +882,532 @@ RodData: tx RodNPCName db ROD_PIC db LEGENDARY_DRAGONITE_DECK_ID - db $04 + db MUSIC_DUEL_THEME_3 db MUSIC_MATCH_START_3 -Data_11cdc: - db $3b - db $21 + +Clerk10NPCHeader: + db NPC_CLERK10 + db SPRITE_CLERK db $0a db $30 db $00 dw $4c3e ; Pointer to NPC Data - db $b0 - db $03 + tx ClerkNPCName db $00 db $00 db $00 db $00 -Data_11ce9: - db $3c - db $21 + +Clerk11NPCHeader: + db NPC_CLERK11 + db SPRITE_CLERK db $0a db $30 db $00 dw $4c3e ; Pointer to NPC Data - db $b0 - db $03 + tx ClerkNPCName db $00 db $00 db $00 db $00 -Data_11cf6: - db $3d - db $1a + +Man1NPCHeader: + db NPC_MAN1 + db SPRITE_GUIDE db $00 db $16 db $00 dw $5c76 ; Pointer to NPC Data - db $d8 - db $03 + tx ManNPCName db $00 db $00 db $00 db $00 -Data_11d03: - db $3e - db $23 + +Woman1NPCHeader: + db NPC_WOMAN1 + db SPRITE_WOMAN db $04 db $1e db $00 dw $5f83 ; Pointer to NPC Data - db $d9 - db $03 + tx WomanNPCName db $00 db $00 db $00 db $00 -Data_11d10: - db $3f - db $19 + +Chap1NPCHeader: + db NPC_CHAP1 + db SPRITE_CHAP db $00 db $1a db $00 dw $5fc0 ; Pointer to NPC Data - db $da - db $03 + tx ChapNPCName db $00 db $00 db $00 db $00 -Data_11d1d: - db $40 - db $22 + +Gal1NPCHeader: + db NPC_GAL1 + db SPRITE_HOST db $00 db $16 db $00 dw $60cf ; Pointer to NPC Data - db $db - db $03 + tx GalNPCName db $00 db $00 db $00 db $00 -Data_11d2a: - db $41 - db $1e + +Lass1NPCHeader: + db NPC_LASS1 + db SPRITE_GIRL3 db $00 db $1e db $00 dw $6111 ; Pointer to NPC Data - db $dc - db $03 + tx LassNPCName db $00 db $00 db $00 db $00 -Data_11d37: - db $42 - db $19 + +Chap2NPCHeader: + db NPC_CHAP2 + db SPRITE_CHAP db $00 db $1a db $00 dw $639a ; Pointer to NPC Data - db $da - db $03 + tx ChapNPCName db $00 db $00 db $00 db $00 -Data_11d44: - db $43 - db $1e + +Lass2NPCHeader: + db NPC_LASS2 + db SPRITE_GIRL3 db $00 db $1e db $00 dw $661f ; Pointer to NPC Data - db $dc - db $03 + tx LassNPCName db $00 db $00 db $00 db $00 -Data_11d51: - db $44 - db $1b + +Pappy1NPCHeader: + db NPC_PAPPY1 + db SPRITE_PAPPY db $00 db $22 db $00 dw $69a5 ; Pointer to NPC Data - db $dd - db $03 + tx PappyNPCName db $00 db $00 db $00 db $00 -Data_11d5e: - db $45 - db $12 + +Lad1NPCHeader: + db NPC_LAD1 + db SPRITE_BOY2 db $04 db $1a db $00 dw $6b84 ; Pointer to NPC Data - db $de - db $03 + tx LadNPCName db $00 db $00 db $00 db $00 -Data_11d6b: - db $46 - db $11 + +Lad2NPCHeader: + db NPC_LAD2 + db SPRITE_BOY1 db $04 db $16 db $00 dw $6e2c ; Pointer to NPC Data - db $de - db $03 + tx LadNPCName db $00 db $00 db $00 db $00 -Data_11d78: - db $47 - db $19 + +Chap3NPCHeader: + db NPC_CHAP3 + db SPRITE_CHAP db $00 db $1a db $00 dw $6de8 ; Pointer to NPC Data - db $da - db $03 + tx ChapNPCName db $00 db $00 db $00 db $00 -Data_11d85: - db $48 - db $22 + +Clerk12NPCHeader: + db NPC_CLERK12 + db SPRITE_HOST db $00 db $16 db $00 dw $7295 ; Pointer to NPC Data - db $b3 - db $03 + tx ClerkNPCName2 db $00 db $00 db $00 db $00 -Data_11d92: - db $49 - db $22 + +Clerk13NPCHeader: + db NPC_CLERK13 + db SPRITE_HOST db $00 db $16 db $00 dw $726c ; Pointer to NPC Data - db $b3 - db $03 + tx ClerkNPCName2 db $00 db $00 db $00 db $00 -Data_11d9f: - db $4a - db $22 + +HostNPCHeader: + db NPC_HOST + db SPRITE_HOST db $00 db $16 db $00 dw $7352 ; Pointer to NPC Data - db $df - db $03 + tx HostNPCName db $00 db $00 db $00 db $00 -Data_11dac: - db $4b - db $13 + +Specs1NPCHeader: + db NPC_SPECS1 + db SPRITE_BOY3 db $00 db $22 db $00 dw $5d82 ; Pointer to NPC Data - db $e0 - db $03 + tx SpecsNPCName db $00 db $00 db $00 db $00 -Data_11db9: - db $4c - db $14 + +ButchNPCHeader: + db NPC_BUTCH + db SPRITE_BUTCH db $00 db $16 db $00 dw $5d8d ; Pointer to NPC Data - db $e1 - db $03 + tx ButchNPCName db $00 db $00 db $00 db $00 -Data_11dc6: - db $4d - db $24 + +Granny1NPCHeader: + db NPC_GRANNY1 + db SPRITE_GRANNY db $00 db $16 db $00 dw $5d9f ; Pointer to NPC Data - db $e5 - db $03 + tx GrannyNPCName db $00 db $00 db $00 db $00 -Data_11dd3: - db $4e - db $1d + +Lass3NPCHeader: + db NPC_LASS3 + db SPRITE_GIRL2 db $04 db $22 db $00 dw $5fd2 ; Pointer to NPC Data - db $dc - db $03 + tx LassNPCName db $00 db $00 db $00 db $00 -Data_11de0: - db $4f - db $1a + +Man2NPCHeader: + db NPC_MAN2 + db SPRITE_GUIDE db $00 db $16 db $00 dw $6137 ; Pointer to NPC Data - db $d8 - db $03 + tx ManNPCName db $00 db $00 db $00 db $00 -Data_11ded: - db $50 - db $1b + +Pappy2NPCHeader: + db NPC_PAPPY2 + db SPRITE_PAPPY db $00 db $22 db $00 dw $613b ; Pointer to NPC Data - db $dd - db $03 + tx PappyNPCName db $00 db $00 db $00 db $00 -Data_11dfa: - db $51 - db $1d + +Lass4NPCHeader: + db NPC_LASS4 + db SPRITE_GIRL2 db $04 db $22 db $00 dw $63d9 ; Pointer to NPC Data - db $dc - db $03 + tx LassNPCName db $00 db $00 db $00 db $00 -Data_11e07: - db $52 - db $17 + +Hood1NPCHeader: + db NPC_HOOD1 + db SPRITE_BOY5 db $04 db $1e db $00 dw $63dd ; Pointer to NPC Data - db $e2 - db $03 + tx HoodNPCName db $00 db $00 db $00 db $00 -Data_11e14: - db $53 - db $24 + +Granny2NPCHeader: + db NPC_GRANNY2 + db SPRITE_GRANNY db $00 db $16 db $00 dw $66d8 ; Pointer to NPC Data - db $e5 - db $03 + tx GrannyNPCName db $00 db $00 db $00 db $00 -Data_11e21: - db $54 - db $22 + +Gal2NPCHeader: + db NPC_GAL2 + db SPRITE_HOST db $00 db $16 db $00 dw $66e3 ; Pointer to NPC Data - db $db - db $03 + tx GalNPCName db $00 db $00 db $00 db $00 -Data_11e2e: - db $55 - db $12 + +Lad3NPCHeader: + db NPC_LAD3 + db SPRITE_BOY2 db $04 db $1a db $00 dw $6850 ; Pointer to NPC Data - db $de - db $03 + tx LadNPCName db $00 db $00 db $00 db $00 -Data_11e3b: - db $56 - db $22 + +Gal3NPCHeader: + db NPC_GAL3 + db SPRITE_HOST db $00 db $16 db $00 dw $6a30 ; Pointer to NPC Data - db $db - db $03 + tx GalNPCName db $00 db $00 db $00 db $00 -Data_11e48: - db $57 - db $19 + +Chap4NPCHeader: + db NPC_CHAP4 + db SPRITE_CHAP db $00 db $1a db $00 dw $6a3b ; Pointer to NPC Data - db $da - db $03 + tx ChapNPCName db $00 db $00 db $00 db $00 -Data_11e55: - db $58 - db $1a + +Man3NPCHeader: + db NPC_MAN3 + db SPRITE_GUIDE db $00 db $16 db $00 dw $6bc1 ; Pointer to NPC Data - db $d8 - db $03 + tx ManNPCName db $00 db $00 db $00 db $00 -Data_11e62: - db $59 - db $18 + +Specs2NPCHeader: + db NPC_SPECS2 + db SPRITE_TECH db $00 db $0e db $00 dw $6bc5 ; Pointer to NPC Data - db $e0 - db $03 + tx SpecsNPCName db $00 db $00 db $00 db $00 -Data_11e6f: - db $5a - db $13 + +Specs3NPCHeader: + db NPC_SPECS3 + db SPRITE_BOY3 db $00 db $22 db $00 dw $6bed ; Pointer to NPC Data - db $e0 - db $03 + tx SpecsNPCName db $00 db $00 db $00 db $00 -Data_11e7c: - db $5b - db $23 + +Woman2NPCHeader: + db NPC_WOMAN2 + db SPRITE_WOMAN db $04 db $1e db $00 dw $4c3e ; Pointer to NPC Data - db $d9 - db $03 + tx WomanNPCName db $00 db $00 db $00 db $00 -Data_11e89: - db $5c - db $15 + +ManiaNPCHeader: + db NPC_MANIA + db SPRITE_BOY4 db $00 db $26 db $00 dw $6e88 ; Pointer to NPC Data - db $e4 - db $03 + tx ManiaNPCName db $00 db $00 db $00 db $00 -Data_11e96: - db $5d - db $1b + +Pappy3NPCHeader: + db NPC_PAPPY3 + db SPRITE_PAPPY db $00 db $22 db $00 dw $709c ; Pointer to NPC Data - db $dd - db $03 + tx PappyNPCName db $00 db $00 db $00 db $00 -Data_11ea3: - db $5e - db $22 + +Gal4NPCHeader: + db NPC_GAL4 + db SPRITE_HOST db $00 db $16 db $00 dw $70a0 ; Pointer to NPC Data - db $db - db $03 + tx GalNPCName db $00 db $00 db $00 db $00 -Data_11eb0: - db $5f - db $15 + +ChampNPCHeader: + db NPC_CHAMP + db SPRITE_BOY4 db $00 db $26 db $00 dw $70a4 ; Pointer to NPC Data - db $e3 - db $03 + tx ChampNPCName db $00 db $00 db $00 db $00 -Data_11ebd: - db $60 - db $17 + +Hood2NPCHeader: + db NPC_HOOD2 + db SPRITE_BOY5 db $04 db $1e db $00 dw $70a8 ; Pointer to NPC Data - db $e2 - db $03 + tx HoodNPCName db $00 db $00 db $00 db $00 -Data_11eca: - db $61 - db $1f + +Lass5NPCHeader: + db NPC_LASS5 + db SPRITE_GIRL4 db $04 db $1a db $00 dw $70ac ; Pointer to NPC Data - db $dc - db $03 + tx LassNPCName db $00 db $00 db $00 db $00 -Data_11ed7: - db $62 - db $19 + +Chap5NPCHeader: + db NPC_CHAP5 + db SPRITE_CHAP db $00 db $1a db $00 dw $70b0 ; Pointer to NPC Data - db $da - db $03 + tx ChapNPCName db $00 db $00 db $00 db $00 -AaronData: - db AARON - db $18 + +AaronNPCHeader: + db NPC_AARON + db SPRITE_TECH db $00 db $0e db $00 @@ -1372,97 +1415,105 @@ AaronData: tx AaronNPCName db AARON_PIC db LIGHTNING_AND_FIRE_DECK_ID - db $02 + db MUSIC_DUEL_THEME_1 db MUSIC_MATCH_START_1 -Data_11ef1: - db $64 - db $1a + +GuideNPCHeader: + db NPC_GUIDE + db SPRITE_GUIDE db $00 db $16 db $00 dw $7283 ; Pointer to NPC Data - db $e6 - db $03 + tx GuideNPCName db $00 db $00 db $00 db $00 -Data_11efe: - db $65 - db $18 + +Tech7NPCHeader: + db NPC_TECH7 + db SPRITE_TECH db $00 db $0e db $00 dw $58c6 ; Pointer to NPC Data - db $b2 - db $03 + tx TechNPCName db $00 db $00 db $00 db $00 -Data_11f0b: - db $66 - db $18 + +Tech8NPCHeader: + db NPC_TECH8 + db SPRITE_TECH db $00 db $0e db $00 dw $58d1 ; Pointer to NPC Data - db $b2 - db $03 + tx TechNPCName db $00 db $00 db $00 db $00 -Data_11f18: - db $67 + +TorchNPCHeader: + db NPC_TORCH db $26 db $3a db $3a db $10 dw $4c3e ; Pointer to NPC Data -Data_11f1f: - db $68 + +LegendaryCardTopLeftNPCHeader: + db NPC_LEGENDARY_CARD_TOP_LEFT db $27 db $3b db $41 db $50 dw $4c3e ; Pointer to NPC Data -Data_11f26: - db $69 + +LegendaryCardTopRightNPCHeader: + db NPC_LEGENDARY_CARD_TOP_RIGHT db $27 db $3c db $42 db $50 dw $4c3e ; Pointer to NPC Data -Data_11f2d: - db $6a + +LegendaryCardBottomLeftNPCHeader: + db NPC_LEGENDARY_CARD_BOTTOM_LEFT db $27 db $3d db $43 db $50 dw $4c3e ; Pointer to NPC Data -Data_11f34: - db $6b + +LegendaryCardBottomCenterLeftNPCHeader: + db NPC_LEGENDARY_CARD_BOTTOM_CENTER_LEFT db $27 db $3e db $44 db $50 dw $4c3e ; Pointer to NPC Data -Data_11f3b: - db $6c + +LegendaryCardBottomCenterRightNPCHeader: + db NPC_LEGENDARY_CARD_BOTTOM_CENTER_RIGHT db $27 db $3f db $45 db $50 dw $4c3e ; Pointer to NPC Data -Data_11f42: - db $6d + +LegendaryCardBottomRightNPCHeader: + db NPC_LEGENDARY_CARD_BOTTOM_RIGHT db $27 db $40 db $46 db $50 dw $4c3e ; Pointer to NPC Data -Data_11f49: + +DummyNPCHeader: db $00 db $00 db $00 diff --git a/src/engine/bank04.asm b/src/engine/bank04.asm index 3119c7b..c50c8f1 100644 --- a/src/engine/bank04.asm +++ b/src/engine/bank04.asm @@ -838,13 +838,13 @@ Func_115a3: ; 115a3 (4:55a3) INCLUDE "data/map_scripts.asm" -; loads a pointer into hl found on PointerTable_118f5 -Func_1184a: ; 1184a (4:584a) +; loads a pointer into hl found on NPCHeaderPointers +GetNPCHeaderPointer: ; 1184a (4:584a) ; this may have been a macro rlca - add LOW(PointerTable_118f5) + add LOW(NPCHeaderPointers) ld l, a - ld a, HIGH(PointerTable_118f5) + ld a, HIGH(NPCHeaderPointers) adc $00 ld h, a ld a, [hli] @@ -855,7 +855,7 @@ Func_1184a: ; 1184a (4:584a) Func_11857: ; 11857 (4:5857) push hl push bc - call Func_1184a + call GetNPCHeaderPointer ld a, [hli] ld [wd3ab], a ld a, [hli] @@ -880,7 +880,7 @@ Func_11857: ; 11857 (4:5857) ; this appears to find data about the NPC we're talking to Func_1187d: ; 1187d (4:587d) push hl - call Func_1184a + call GetNPCHeaderPointer ld bc, $5 add hl, bc ld c, [hl] @@ -897,7 +897,7 @@ Func_1187d: ; 1187d (4:587d) Func_11893: ; 11893 (4:5893) push hl push bc - call Func_1184a + call GetNPCHeaderPointer ld bc, $0007 add hl, bc ld a, [hli] @@ -911,7 +911,7 @@ Func_11893: ; 11893 (4:5893) Func_118a7: ; 118a7 (4:58a7) push hl push bc - call Func_1184a + call GetNPCHeaderPointer ld bc, $0007 add hl, bc ld a, [hli] @@ -927,7 +927,7 @@ Func_118a7: ; 118a7 (4:58a7) Func_118bf: ; 118bf (4:58bf) push hl push bc - call Func_1184a + call GetNPCHeaderPointer ld bc, $000a add hl, bc ld a, [hli] @@ -942,7 +942,7 @@ Func_118d3: ; 118d3 (4:58d3) push hl push bc push af - call Func_1184a + call GetNPCHeaderPointer ld bc, $000c add hl, bc ld a, [hli] diff --git a/src/text/text3.asm b/src/text/text3.asm index 025fd2f..4d3fccf 100644 --- a/src/text/text3.asm +++ b/src/text/text3.asm @@ -1620,7 +1620,7 @@ Text03ab: ; 3f663 (f:7663) text "LABORATORY" done -Text03ac: ; 3f66f (f:766f) +DrMasonNPCName: ; 3f66f (f:766f) text "Dr. Mason" done @@ -1628,7 +1628,7 @@ RonaldNPCName: ; 3f67a (f:767a) text "Ronald" done -Text03ae: ; 3f682 (f:7682) +IshiharaNPCName: ; 3f682 (f:7682) text "ISHIHARA" done @@ -1636,7 +1636,7 @@ ImakuniNPCName: ; 3f68c (f:768c) text "Imakuni?" done -Text03b0: ; 3f696 (f:7696) +ClerkNPCName: ; 3f696 (f:7696) text "CLERK" done @@ -1644,11 +1644,11 @@ SamNPCName: ; 3f69d (f:769d) text "Sam" done -Text03b2: ; 3f6a2 (f:76a2) +TechNPCName: ; 3f6a2 (f:76a2) text "TECH" done -Text03b3: ; 3f6a8 (f:76a8) +ClerkNPCName2: ; 3f6a8 (f:76a8) text "CLERK" done @@ -1796,63 +1796,63 @@ RodNPCName: ; 3f7be (f:77be) text "Rod" done -Text03d8: ; 3f7c3 (f:77c3) +ManNPCName: ; 3f7c3 (f:77c3) text "Man" done -Text03d9: ; 3f7c8 (f:77c8) +WomanNPCName: ; 3f7c8 (f:77c8) text "Woman" done -Text03da: ; 3f7cf (f:77cf) +ChapNPCName: ; 3f7cf (f:77cf) text "CHAP" done -Text03db: ; 3f7d5 (f:77d5) +GalNPCName: ; 3f7d5 (f:77d5) text "GAL" done -Text03dc: ; 3f7da (f:77da) +LassNPCName: ; 3f7da (f:77da) text "Lass" done -Text03dd: ; 3f7e0 (f:77e0) +PappyNPCName: ; 3f7e0 (f:77e0) text "Pappy" done -Text03de: ; 3f7e7 (f:77e7) +LadNPCName: ; 3f7e7 (f:77e7) text "Lad" done -Text03df: ; 3f7ec (f:77ec) +HostNPCName: ; 3f7ec (f:77ec) text "HOST" done -Text03e0: ; 3f7f2 (f:77f2) +SpecsNPCName: ; 3f7f2 (f:77f2) text "Specs" done -Text03e1: ; 3f7f9 (f:77f9) +ButchNPCName: ; 3f7f9 (f:77f9) text "Butch" done -Text03e2: ; 3f800 (f:7800) +HoodNPCName: ; 3f800 (f:7800) text "Hood" done -Text03e3: ; 3f806 (f:7806) +ChampNPCName: ; 3f806 (f:7806) text "Champ" done -Text03e4: ; 3f80d (f:780d) +ManiaNPCName: ; 3f80d (f:780d) text "Mania" done -Text03e5: ; 3f814 (f:7814) +GrannyNPCName: ; 3f814 (f:7814) text "Granny" done -Text03e6: ; 3f81c (f:781c) +GuideNPCName: ; 3f81c (f:781c) text "Guide" done diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index 12ae8cd..493ed1d 100644 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -941,14 +941,14 @@ TextOffsets:: ; 34000 (d:40 textpointer Text03a9 ; 0x03a9 textpointer Text03aa ; 0x03aa textpointer Text03ab ; 0x03ab - textpointer Text03ac ; 0x03ac + textpointer DrMasonNPCName ; 0x03ac textpointer RonaldNPCName ; 0x03ad - textpointer Text03ae ; 0x03ae + textpointer IshiharaNPCName ; 0x03ae textpointer ImakuniNPCName ; 0x03af - textpointer Text03b0 ; 0x03b0 + textpointer ClerkNPCName ; 0x03b0 textpointer SamNPCName ; 0x03b1 - textpointer Text03b2 ; 0x03b2 - textpointer Text03b3 ; 0x03b3 + textpointer TechNPCName ; 0x03b2 + textpointer ClerkNPCName2 ; 0x03b3 textpointer ChrisNPCName ; 0x03b4 textpointer MichaelNPCName ; 0x03b5 textpointer JessicaNPCName ; 0x03b6 @@ -985,21 +985,21 @@ TextOffsets:: ; 34000 (d:40 textpointer SteveNPCName ; 0x03d5 textpointer JackNPCName ; 0x03d6 textpointer RodNPCName ; 0x03d7 - textpointer Text03d8 ; 0x03d8 - textpointer Text03d9 ; 0x03d9 - textpointer Text03da ; 0x03da - textpointer Text03db ; 0x03db - textpointer Text03dc ; 0x03dc - textpointer Text03dd ; 0x03dd - textpointer Text03de ; 0x03de - textpointer Text03df ; 0x03df - textpointer Text03e0 ; 0x03e0 - textpointer Text03e1 ; 0x03e1 - textpointer Text03e2 ; 0x03e2 - textpointer Text03e3 ; 0x03e3 - textpointer Text03e4 ; 0x03e4 - textpointer Text03e5 ; 0x03e5 - textpointer Text03e6 ; 0x03e6 + textpointer ManNPCName ; 0x03d8 + textpointer WomanNPCName ; 0x03d9 + textpointer ChapNPCName ; 0x03da + textpointer GalNPCName ; 0x03db + textpointer LassNPCName ; 0x03dc + textpointer PappyNPCName ; 0x03dd + textpointer LadNPCName ; 0x03de + textpointer HostNPCName ; 0x03df + textpointer SpecsNPCName ; 0x03e0 + textpointer ButchNPCName ; 0x03e1 + textpointer HoodNPCName ; 0x03e2 + textpointer ChampNPCName ; 0x03e3 + textpointer ManiaNPCName ; 0x03e4 + textpointer GrannyNPCName ; 0x03e5 + textpointer GuideNPCName ; 0x03e6 textpointer AaronNPCName ; 0x03e7 textpointer Text03e8 ; 0x03e8 textpointer Text03e9 ; 0x03e9 -- cgit v1.2.3 From e4f2842b0e3e6ecc51ef109f895a1f6f79c3956b Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sun, 3 May 2020 03:03:59 -0500 Subject: Add NPC script stubs --- src/data/npcs.asm | 220 +++++++++++++++++----------------- src/engine/bank03.asm | 321 ++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 421 insertions(+), 120 deletions(-) (limited to 'src') diff --git a/src/data/npcs.asm b/src/data/npcs.asm index 7ba2dde..ea4f7d5 100644 --- a/src/data/npcs.asm +++ b/src/data/npcs.asm @@ -124,7 +124,7 @@ DrMasonNPCHeader: db $00 db $26 ; palette and animation db $00 - dw $5727 ; Pointer to NPC Data + dw DrMasonNPCScript tx DrMasonNPCName db $00 db $00 @@ -137,7 +137,7 @@ RonaldNPCHeader: db $04 db $0e db $00 - dw $5c4b ; Pointer to NPC Data + dw RonaldNPCScript tx RonaldNPCName db RONALD_PIC db INVINCIBLE_RONALD_DECK_ID @@ -150,7 +150,7 @@ Ronald2NPCHeader: db $04 db $0e db $00 - dw $5c4b ; Pointer to NPC Data + dw Ronald2NPCScript tx RonaldNPCName db RONALD_PIC db INVINCIBLE_RONALD_DECK_ID @@ -163,7 +163,7 @@ Ronald3NPCHeader: db $04 db $0e db $00 - dw $5c4b ; Pointer to NPC Data + dw Ronald3NPCScript tx RonaldNPCName db RONALD_PIC db INVINCIBLE_RONALD_DECK_ID @@ -176,7 +176,7 @@ IshiharaNPCHeader: db $04 db $22 db $00 - dw $5b4a ; Pointer to NPC Data + dw IshiharaNPCScript tx IshiharaNPCName db $00 db $00 @@ -189,7 +189,7 @@ ImakuniNPCHeader: db $00 db $0e db $00 - dw $5d0d ; Pointer to NPC Data + dw ImakuniNPCScript tx ImakuniNPCName db IMAKUNI_PIC db IMAKUNI_DECK_ID @@ -202,7 +202,7 @@ SamNPCHeader: db $00 db $0e db $00 - dw $561d ; Pointer to NPC Data + dw SamNPCScript tx SamNPCName db SAM_PIC db SAMS_NORMAL_DECK_ID @@ -215,7 +215,7 @@ Tech1NPCHeader: db $00 db $0e db $00 - dw $5583 ; Pointer to NPC Data + dw Tech1NPCScript tx TechNPCName db $00 db $00 @@ -228,7 +228,7 @@ Tech2NPCHeader: db $00 db $0e db $00 - dw $55ca ; Pointer to NPC Data + dw Tech2NPCScript tx TechNPCName db $00 db $00 @@ -241,7 +241,7 @@ Tech3NPCHeader: db $00 db $0e db $00 - dw $55d5 ; Pointer to NPC Data + dw Tech3NPCScript tx TechNPCName db $00 db $00 @@ -254,7 +254,7 @@ Tech4NPCHeader: db $00 db $0e db $00 - dw $55e0 ; Pointer to NPC Data + dw Tech4NPCScript tx TechNPCName db $00 db $00 @@ -267,7 +267,7 @@ Tech5NPCHeader: db $00 db $0e db $00 - dw $55f9 ; Pointer to NPC Data + dw Tech5NPCScript tx TechNPCName db $00 db $00 @@ -280,7 +280,7 @@ Tech6NPCHeader: db $00 db $0e db $00 - dw $58bb ; Pointer to NPC Data + dw Tech6NPCScript tx TechNPCName db $00 db $00 @@ -293,7 +293,7 @@ Clerk1NPCHeader: db $0a db $30 db $00 - dw $5c64 ; Pointer to NPC Data + dw Clerk1NPCScript tx ClerkNPCName2 db $00 db $00 @@ -306,7 +306,7 @@ Clerk2NPCHeader: db $0a db $30 db $00 - dw $5ed1 ; Pointer to NPC Data + dw Clerk2NPCScript tx ClerkNPCName2 db $00 db $00 @@ -319,7 +319,7 @@ Clerk3NPCHeader: db $0a db $30 db $00 - dw $609e ; Pointer to NPC Data + dw Clerk3NPCScript tx ClerkNPCName2 db $00 db $00 @@ -332,7 +332,7 @@ Clerk4NPCHeader: db $0a db $30 db $00 - dw $6369 ; Pointer to NPC Data + dw Clerk4NPCScript tx ClerkNPCName2 db $00 db $00 @@ -345,7 +345,7 @@ Clerk5NPCHeader: db $0a db $30 db $00 - dw $6566 ; Pointer to NPC Data + dw Clerk5NPCScript tx ClerkNPCName2 db $00 db $00 @@ -358,7 +358,7 @@ Clerk6NPCHeader: db $0a db $30 db $00 - dw $684c ; Pointer to NPC Data + dw Clerk6NPCScript tx ClerkNPCName2 db $00 db $00 @@ -371,7 +371,7 @@ Clerk7NPCHeader: db $0a db $30 db $00 - dw $6b53 ; Pointer to NPC Data + dw Clerk7NPCScript tx ClerkNPCName2 db $00 db $00 @@ -384,7 +384,7 @@ Clerk8NPCHeader: db $0a db $30 db $00 - dw $6d45 ; Pointer to NPC Data + dw Clerk8NPCScript tx ClerkNPCName2 db $00 db $00 @@ -397,7 +397,7 @@ Clerk9NPCHeader: db $0a db $30 db $00 - dw $7025 ; Pointer to NPC Data + dw Clerk9NPCScript tx ClerkNPCName2 db $00 db $00 @@ -410,7 +410,7 @@ ChrisNPCHeader: db $00 db $26 db $00 - dw $5ef2 ; Pointer to NPC Data + dw ChrisNPCScript tx ChrisNPCName db CHRIS_PIC db MUSCLES_FOR_BRAINS_DECK_ID @@ -423,7 +423,7 @@ MichaelNPCHeader: db $00 db $26 db $00 - dw $6573 ; Pointer to NPC Data + dw MichaelNPCScript tx MichaelNPCName db MICHAEL_PIC db HEATED_BATTLE_DECK_ID @@ -436,7 +436,7 @@ JessicaNPCHeader: db $04 db $1a db $00 - dw $6d96 ; Pointer to NPC Data + dw JessicaNPCScript tx JessicaNPCName db JESSICA_PIC db LOVE_TO_BATTLE_DECK_ID @@ -449,7 +449,7 @@ MitchNPCHeader: db $00 db $0e db $00 - dw $5dc3 ; Pointer to NPC Data + dw MitchNPCScript tx MitchNPCName db MITCH_PIC db FIRST_STRIKE_DECK_ID @@ -462,7 +462,7 @@ MatthewNPCHeader: db $00 db $16 db $00 - dw $5f39 ; Pointer to NPC Data + dw MatthewNPCScript tx MatthewNPCName db MATTHEW_PIC db HARD_POKEMON_DECK_ID @@ -475,7 +475,7 @@ RyanNPCHeader: db $00 db $26 db $00 - dw $5ff0 ; Pointer to NPC Data + dw RyanNPCScript tx RyanNPCName db RYAN_PIC db EXCAVATION_DECK_ID @@ -488,7 +488,7 @@ AndrewNPCHeader: db $00 db $16 db $00 - dw $6017 ; Pointer to NPC Data + dw AndrewNPCScript tx AndrewNPCName db ANDREW_PIC db BLISTERING_POKEMON_DECK_ID @@ -501,7 +501,7 @@ GeneNPCHeader: db $04 db $1e db $00 - dw $603e ; Pointer to NPC Data + dw GeneNPCScript tx GeneNPCName db GENE_PIC db ROCK_CRUSHER_DECK_ID @@ -514,7 +514,7 @@ SaraNPCHeader: db $00 db $0e db $00 - dw OWSequence_Sara ; Pointer to NPC Data + dw SaraNPCScript tx SaraNPCName db SARA_PIC db WATERFRONT_POKEMON_DECK_ID @@ -527,7 +527,7 @@ AmandaNPCHeader: db $00 db $16 db $00 - dw OWSequence_Amanda ; Pointer to NPC Data + dw AmandaNPCScript tx AmandaNPCName db AMANDA_PIC db LONELY_FRIENDS_DECK_ID @@ -540,7 +540,7 @@ JoshuaNPCHeader: db $00 db $26 db $00 - dw OWSequence_Joshua ; Pointer to NPC Data + dw JoshuaNPCScript tx JoshuaNPCName db JOSHUA_PIC db SOUND_OF_THE_WAVES_DECK_ID @@ -553,7 +553,7 @@ AmyNPCHeader: db $08 db $2e db $10 - dw $6304 ; Pointer to NPC Data + dw AmyNPCScript tx AmyNPCName db AMY_PIC db GO_GO_RAIN_DANCE_DECK_ID @@ -566,7 +566,7 @@ JenniferNPCHeader: db $04 db $0e db $00 - dw $6408 ; Pointer to NPC Data + dw JenniferNPCScript tx JenniferNPCName db JENNIFER_PIC db PIKACHU_DECK_ID @@ -579,7 +579,7 @@ NicholasNPCHeader: db $04 db $1e db $00 - dw $642f ; Pointer to NPC Data + dw NicholasNPCScript tx NicholasNPCName db NICHOLAS_PIC db BOOM_BOOM_SELFDESTRUCT_DECK_ID @@ -592,7 +592,7 @@ BrandonNPCHeader: db $04 db $1e db $00 - dw $6456 ; Pointer to NPC Data + dw BrandonNPCScript tx BrandonNPCName db BRANDON_PIC db POWER_GENERATOR_DECK_ID @@ -605,7 +605,7 @@ IsaacNPCHeader: db $00 db $16 db $00 - dw $64ad ; Pointer to NPC Data + dw IsaacNPCScript tx IsaacNPCName db ISAAC_PIC db ZAPPING_SELFDESTRUCT_DECK_ID @@ -618,7 +618,7 @@ BrittanyNPCHeader: db $04 db $0e db $00 - dw $65d2 ; Pointer to NPC Data + dw BrittanyNPCScript tx BrittanyNPCName db BRITTANY_PIC db ETCETERA_DECK_ID @@ -631,7 +631,7 @@ KristinNPCHeader: db $00 db $1e db $00 - dw $6701 ; Pointer to NPC Data + dw KristinNPCScript tx KristinNPCName db KRISTIN_PIC db FLOWER_GARDEN_DECK_ID @@ -644,7 +644,7 @@ HeatherNPCHeader: db $04 db $22 db $00 - dw $6745 ; Pointer to NPC Data + dw HeatherNPCScript tx HeatherNPCName db HEATHER_PIC db KALEIDOSCOPE_DECK_ID @@ -657,7 +657,7 @@ NikkiNPCHeader: db $00 db $1a db $00 - dw $679e ; Pointer to NPC Data + dw NikkiNPCScript tx NikkiNPCName db NIKKI_PIC db FLOWER_POWER_DECK_ID @@ -670,7 +670,7 @@ RobertNPCHeader: db $04 db $16 db $00 - dw $6980 ; Pointer to NPC Data + dw RobertNPCScript tx RobertNPCName db ROBERT_PIC db GHOST_DECK_ID @@ -683,7 +683,7 @@ DanielNPCHeader: db $04 db $1a db $00 - dw $6a60 ; Pointer to NPC Data + dw DanielNPCScript tx DanielNPCName db DANIEL_PIC db NAP_TIME_DECK_ID @@ -696,7 +696,7 @@ StephanieNPCHeader: db $04 db $0e db $00 - dw $6aa2 ; Pointer to NPC Data + dw StephanieNPCScript tx StephanieNPCName db STEPHANIE_PIC db STRANGE_POWER_DECK_ID @@ -709,7 +709,7 @@ MurrayNPCHeader: db $00 db $12 db $00 - dw $6adf ; Pointer to NPC Data + dw MurrayNPCScript tx MurrayNPCName db MURRAY_PIC db STRANGE_PSYSHOCK_DECK_ID @@ -722,7 +722,7 @@ Murray2NPCHeader: db $03 db $15 db $10 - dw $6adf ; Pointer to NPC Data + dw Murray2NPCScript tx MurrayNPCName db MURRAY_PIC db STRANGE_PSYSHOCK_DECK_ID @@ -735,7 +735,7 @@ JosephNPCHeader: db $00 db $0e db $00 - dw $6cdb ; Pointer to NPC Data + dw JosephNPCScript tx JosephNPCName db JOSEPH_PIC db FLYIN_POKEMON_DECK_ID @@ -748,7 +748,7 @@ DavidNPCHeader: db $00 db $0e db $00 - dw $6c11 ; Pointer to NPC Data + dw DavidNPCScript tx DavidNPCName db DAVID_PIC db LOVELY_NIDORAN_DECK_ID @@ -761,7 +761,7 @@ ErikNPCHeader: db $00 db $0e db $00 - dw $6c42 ; Pointer to NPC Data + dw ErikNPCScript tx ErikNPCName db ERIK_PIC db POISON_DECK_ID @@ -774,7 +774,7 @@ RickNPCHeader: db $00 db $0e db $00 - dw $6c67 ; Pointer to NPC Data + dw RickNPCScript tx RickNPCName db RICK_PIC db WONDERS_OF_SCIENCE_DECK_ID @@ -787,7 +787,7 @@ JohnNPCHeader: db $04 db $1a db $00 - dw $6eb3 ; Pointer to NPC Data + dw JohnNPCScript tx JohnNPCName db JOHN_PIC db ANGER_DECK_ID @@ -800,7 +800,7 @@ AdamNPCHeader: db $00 db $22 db $00 - dw $6ed8 ; Pointer to NPC Data + dw AdamNPCScript tx AdamNPCName db ADAM_PIC db FLAMETHROWER_DECK_ID @@ -813,7 +813,7 @@ JonathanNPCHeader: db $04 db $16 db $00 - dw $6efd ; Pointer to NPC Data + dw JonathanNPCScript tx JonathanNPCName db JONATHAN_PIC db RESHUFFLE_DECK_ID @@ -826,7 +826,7 @@ KenNPCHeader: db $04 db $1e db $00 - dw $6f22 ; Pointer to NPC Data + dw KenNPCScript tx KenNPCName db KEN_PIC db FIRE_CHARGE_DECK_ID @@ -839,7 +839,7 @@ CourtneyNPCHeader: db $00 db $12 db $00 - dw $771f ; Pointer to NPC Data + dw CourtneyNPCScript tx CourtneyNPCName db COURTNEY_PIC db LEGENDARY_MOLTRES_DECK_ID @@ -852,7 +852,7 @@ SteveNPCHeader: db $00 db $2a db $00 - dw $772a ; Pointer to NPC Data + dw SteveNPCScript tx SteveNPCName db STEVE_PIC db LEGENDARY_ZAPDOS_DECK_ID @@ -865,7 +865,7 @@ JackNPCHeader: db $00 db $26 db $00 - dw $7735 ; Pointer to NPC Data + dw JackNPCScript tx JackNPCName db JACK_PIC db LEGENDARY_ARTICUNO_DECK_ID @@ -878,7 +878,7 @@ RodNPCHeader: db $00 db $0e db $00 - dw $7740 ; Pointer to NPC Data + dw RodNPCScript tx RodNPCName db ROD_PIC db LEGENDARY_DRAGONITE_DECK_ID @@ -891,7 +891,7 @@ Clerk10NPCHeader: db $0a db $30 db $00 - dw $4c3e ; Pointer to NPC Data + dw Clerk10NPCScript tx ClerkNPCName db $00 db $00 @@ -904,7 +904,7 @@ Clerk11NPCHeader: db $0a db $30 db $00 - dw $4c3e ; Pointer to NPC Data + dw Clerk11NPCScript tx ClerkNPCName db $00 db $00 @@ -917,7 +917,7 @@ Man1NPCHeader: db $00 db $16 db $00 - dw $5c76 ; Pointer to NPC Data + dw Man1NPCScript tx ManNPCName db $00 db $00 @@ -930,7 +930,7 @@ Woman1NPCHeader: db $04 db $1e db $00 - dw $5f83 ; Pointer to NPC Data + dw Woman1NPCScript tx WomanNPCName db $00 db $00 @@ -943,7 +943,7 @@ Chap1NPCHeader: db $00 db $1a db $00 - dw $5fc0 ; Pointer to NPC Data + dw Chap1NPCScript tx ChapNPCName db $00 db $00 @@ -956,7 +956,7 @@ Gal1NPCHeader: db $00 db $16 db $00 - dw $60cf ; Pointer to NPC Data + dw Gal1NPCScript tx GalNPCName db $00 db $00 @@ -969,7 +969,7 @@ Lass1NPCHeader: db $00 db $1e db $00 - dw $6111 ; Pointer to NPC Data + dw Lass1NPCScript tx LassNPCName db $00 db $00 @@ -982,7 +982,7 @@ Chap2NPCHeader: db $00 db $1a db $00 - dw $639a ; Pointer to NPC Data + dw Chap2NPCScript tx ChapNPCName db $00 db $00 @@ -995,7 +995,7 @@ Lass2NPCHeader: db $00 db $1e db $00 - dw $661f ; Pointer to NPC Data + dw Lass2NPCScript tx LassNPCName db $00 db $00 @@ -1008,7 +1008,7 @@ Pappy1NPCHeader: db $00 db $22 db $00 - dw $69a5 ; Pointer to NPC Data + dw Pappy1NPCScript tx PappyNPCName db $00 db $00 @@ -1021,7 +1021,7 @@ Lad1NPCHeader: db $04 db $1a db $00 - dw $6b84 ; Pointer to NPC Data + dw Lad1NPCScript tx LadNPCName db $00 db $00 @@ -1034,7 +1034,7 @@ Lad2NPCHeader: db $04 db $16 db $00 - dw $6e2c ; Pointer to NPC Data + dw Lad2NPCScript tx LadNPCName db $00 db $00 @@ -1047,7 +1047,7 @@ Chap3NPCHeader: db $00 db $1a db $00 - dw $6de8 ; Pointer to NPC Data + dw Chap3NPCScript tx ChapNPCName db $00 db $00 @@ -1060,7 +1060,7 @@ Clerk12NPCHeader: db $00 db $16 db $00 - dw $7295 ; Pointer to NPC Data + dw Clerk12NPCScript tx ClerkNPCName2 db $00 db $00 @@ -1073,7 +1073,7 @@ Clerk13NPCHeader: db $00 db $16 db $00 - dw $726c ; Pointer to NPC Data + dw Clerk13NPCScript tx ClerkNPCName2 db $00 db $00 @@ -1086,7 +1086,7 @@ HostNPCHeader: db $00 db $16 db $00 - dw $7352 ; Pointer to NPC Data + dw HostNPCScript tx HostNPCName db $00 db $00 @@ -1099,7 +1099,7 @@ Specs1NPCHeader: db $00 db $22 db $00 - dw $5d82 ; Pointer to NPC Data + dw Specs1NPCScript tx SpecsNPCName db $00 db $00 @@ -1112,7 +1112,7 @@ ButchNPCHeader: db $00 db $16 db $00 - dw $5d8d ; Pointer to NPC Data + dw ButchNPCScript tx ButchNPCName db $00 db $00 @@ -1125,7 +1125,7 @@ Granny1NPCHeader: db $00 db $16 db $00 - dw $5d9f ; Pointer to NPC Data + dw Granny1NPCScript tx GrannyNPCName db $00 db $00 @@ -1138,7 +1138,7 @@ Lass3NPCHeader: db $04 db $22 db $00 - dw $5fd2 ; Pointer to NPC Data + dw Lass3NPCScript tx LassNPCName db $00 db $00 @@ -1151,7 +1151,7 @@ Man2NPCHeader: db $00 db $16 db $00 - dw $6137 ; Pointer to NPC Data + dw Man2NPCScript tx ManNPCName db $00 db $00 @@ -1164,7 +1164,7 @@ Pappy2NPCHeader: db $00 db $22 db $00 - dw $613b ; Pointer to NPC Data + dw Pappy2NPCScript tx PappyNPCName db $00 db $00 @@ -1177,7 +1177,7 @@ Lass4NPCHeader: db $04 db $22 db $00 - dw $63d9 ; Pointer to NPC Data + dw Lass4NPCScript tx LassNPCName db $00 db $00 @@ -1190,7 +1190,7 @@ Hood1NPCHeader: db $04 db $1e db $00 - dw $63dd ; Pointer to NPC Data + dw Hood1NPCScript tx HoodNPCName db $00 db $00 @@ -1203,7 +1203,7 @@ Granny2NPCHeader: db $00 db $16 db $00 - dw $66d8 ; Pointer to NPC Data + dw Granny2NPCScript tx GrannyNPCName db $00 db $00 @@ -1216,7 +1216,7 @@ Gal2NPCHeader: db $00 db $16 db $00 - dw $66e3 ; Pointer to NPC Data + dw Gal2NPCScript tx GalNPCName db $00 db $00 @@ -1229,7 +1229,7 @@ Lad3NPCHeader: db $04 db $1a db $00 - dw $6850 ; Pointer to NPC Data + dw Lad3NPCScript tx LadNPCName db $00 db $00 @@ -1242,7 +1242,7 @@ Gal3NPCHeader: db $00 db $16 db $00 - dw $6a30 ; Pointer to NPC Data + dw Gal3NPCScript tx GalNPCName db $00 db $00 @@ -1255,7 +1255,7 @@ Chap4NPCHeader: db $00 db $1a db $00 - dw $6a3b ; Pointer to NPC Data + dw Chap4NPCScript tx ChapNPCName db $00 db $00 @@ -1268,7 +1268,7 @@ Man3NPCHeader: db $00 db $16 db $00 - dw $6bc1 ; Pointer to NPC Data + dw Man3NPCScript tx ManNPCName db $00 db $00 @@ -1281,7 +1281,7 @@ Specs2NPCHeader: db $00 db $0e db $00 - dw $6bc5 ; Pointer to NPC Data + dw Specs2NPCScript tx SpecsNPCName db $00 db $00 @@ -1294,7 +1294,7 @@ Specs3NPCHeader: db $00 db $22 db $00 - dw $6bed ; Pointer to NPC Data + dw Specs3NPCScript tx SpecsNPCName db $00 db $00 @@ -1307,7 +1307,7 @@ Woman2NPCHeader: db $04 db $1e db $00 - dw $4c3e ; Pointer to NPC Data + dw Woman2NPCScript tx WomanNPCName db $00 db $00 @@ -1320,7 +1320,7 @@ ManiaNPCHeader: db $00 db $26 db $00 - dw $6e88 ; Pointer to NPC Data + dw ManiaNPCScript tx ManiaNPCName db $00 db $00 @@ -1333,7 +1333,7 @@ Pappy3NPCHeader: db $00 db $22 db $00 - dw $709c ; Pointer to NPC Data + dw Pappy3NPCScript tx PappyNPCName db $00 db $00 @@ -1346,7 +1346,7 @@ Gal4NPCHeader: db $00 db $16 db $00 - dw $70a0 ; Pointer to NPC Data + dw Gal4NPCScript tx GalNPCName db $00 db $00 @@ -1359,7 +1359,7 @@ ChampNPCHeader: db $00 db $26 db $00 - dw $70a4 ; Pointer to NPC Data + dw ChampNPCScript tx ChampNPCName db $00 db $00 @@ -1372,7 +1372,7 @@ Hood2NPCHeader: db $04 db $1e db $00 - dw $70a8 ; Pointer to NPC Data + dw Hood2NPCScript tx HoodNPCName db $00 db $00 @@ -1385,7 +1385,7 @@ Lass5NPCHeader: db $04 db $1a db $00 - dw $70ac ; Pointer to NPC Data + dw Lass5NPCScript tx LassNPCName db $00 db $00 @@ -1398,7 +1398,7 @@ Chap5NPCHeader: db $00 db $1a db $00 - dw $70b0 ; Pointer to NPC Data + dw Chap5NPCScript tx ChapNPCName db $00 db $00 @@ -1411,7 +1411,7 @@ AaronNPCHeader: db $00 db $0e db $00 - dw $58dd ; Pointer to NPC Data + dw AaronNPCScript tx AaronNPCName db AARON_PIC db LIGHTNING_AND_FIRE_DECK_ID @@ -1424,7 +1424,7 @@ GuideNPCHeader: db $00 db $16 db $00 - dw $7283 ; Pointer to NPC Data + dw GuideNPCScript tx GuideNPCName db $00 db $00 @@ -1437,7 +1437,7 @@ Tech7NPCHeader: db $00 db $0e db $00 - dw $58c6 ; Pointer to NPC Data + dw Tech7NPCScript tx TechNPCName db $00 db $00 @@ -1450,7 +1450,7 @@ Tech8NPCHeader: db $00 db $0e db $00 - dw $58d1 ; Pointer to NPC Data + dw Tech8NPCScript tx TechNPCName db $00 db $00 @@ -1463,7 +1463,7 @@ TorchNPCHeader: db $3a db $3a db $10 - dw $4c3e ; Pointer to NPC Data + dw TorchNPCScript LegendaryCardTopLeftNPCHeader: db NPC_LEGENDARY_CARD_TOP_LEFT @@ -1471,7 +1471,7 @@ LegendaryCardTopLeftNPCHeader: db $3b db $41 db $50 - dw $4c3e ; Pointer to NPC Data + dw LegendaryCardTopLeftNPCScript LegendaryCardTopRightNPCHeader: db NPC_LEGENDARY_CARD_TOP_RIGHT @@ -1479,7 +1479,7 @@ LegendaryCardTopRightNPCHeader: db $3c db $42 db $50 - dw $4c3e ; Pointer to NPC Data + dw LegendaryCardTopRightNPCScript LegendaryCardBottomLeftNPCHeader: db NPC_LEGENDARY_CARD_BOTTOM_LEFT @@ -1487,7 +1487,7 @@ LegendaryCardBottomLeftNPCHeader: db $3d db $43 db $50 - dw $4c3e ; Pointer to NPC Data + dw LegendaryCardBottomLeftNPCScript LegendaryCardBottomCenterLeftNPCHeader: db NPC_LEGENDARY_CARD_BOTTOM_CENTER_LEFT @@ -1495,7 +1495,7 @@ LegendaryCardBottomCenterLeftNPCHeader: db $3e db $44 db $50 - dw $4c3e ; Pointer to NPC Data + dw LegendaryCardBottomCenterLeftNPCScript LegendaryCardBottomCenterRightNPCHeader: db NPC_LEGENDARY_CARD_BOTTOM_CENTER_RIGHT @@ -1503,7 +1503,7 @@ LegendaryCardBottomCenterRightNPCHeader: db $3f db $45 db $50 - dw $4c3e ; Pointer to NPC Data + dw LegendaryCardBottomCenterRightNPCScript LegendaryCardBottomRightNPCHeader: db NPC_LEGENDARY_CARD_BOTTOM_RIGHT @@ -1511,7 +1511,7 @@ LegendaryCardBottomRightNPCHeader: db $40 db $46 db $50 - dw $4c3e ; Pointer to NPC Data + dw LegendaryCardBottomRightNPCScript DummyNPCHeader: db $00 diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm index b33fd35..ac5117e 100644 --- a/src/engine/bank03.asm +++ b/src/engine/bank03.asm @@ -1574,9 +1574,19 @@ Func_cc32: ; cc32 (3:4c32) pop hl call Func_c8ba ret -; 0xcc3e - INCROM $cc3e, $cc42 +Clerk10NPCScript: ; cc3e (3:4c3e) +Clerk11NPCScript: ; cc3e (3:4c3e) +Woman2NPCScript: ; cc3e (3:4c3e) +TorchNPCScript: ; cc3e (3:4c3e) +LegendaryCardTopLeftNPCScript: ; cc3e (3:4c3e) +LegendaryCardTopRightNPCScript: ; cc3e (3:4c3e) +LegendaryCardBottomLeftNPCScript: ; cc3e (3:4c3e) +LegendaryCardBottomCenterLeftNPCScript: ; cc3e (3:4c3e) +LegendaryCardBottomCenterRightNPCScript: ; cc3e (3:4c3e) +LegendaryCardBottomRightNPCScript: ; cc3e (3:4c3e) + call CloseDialogueBox + ret ; called when pressing a in front of an object. creates a pointer to the data right after an RST20 ; was called, then runs RunOverworldScript to handle that data @@ -2916,7 +2926,28 @@ asm_d4e6 jp IncreaseOWScriptPointerBy4 ; 0xd4ec - INCROM $d4ec, $d753 + INCROM $d4ec, $d583 + +Tech1NPCScript: ; d583 (3:5583) + INCROM $d583, $d5ca + +Tech2NPCScript: ; d5ca (3:55ca) + INCROM $d5ca, $d5d5 + +Tech3NPCScript: ; d5d5 (3:55d5) + INCROM $d5d5, $d5e0 + +Tech4NPCScript: ; d5e0 (3:55e0) + INCROM $d5e0, $d5f9 + +Tech5NPCScript: ; d5f9 (3:55f9) + INCROM $d5f9, $d61d + +SamNPCScript: ; d61d (3:561d) + INCROM $d61d, $d727 + +DrMasonNPCScript: ; d727 (3:5727) + INCROM $d727, $d753 OWSequence_d753: ; d753 (3:5753) start_script @@ -2965,7 +2996,94 @@ OWSequence_d753: ; d753 (3:5753) ; there's more to this script but it hasn't been disassembled yet - INCROM $d77e, $e13f + INCROM $d77e, $d8bb + +Tech6NPCScript: ; d8bb (3:58bb) + INCROM $d8bb, $d8c6 + +Tech7NPCScript: ; d8c6 (3:58c6) + INCROM $d8c6, $d8d1 + +Tech8NPCScript: ; d8d1 (3:58d1) + INCROM $d8d1, $d8dd + +AaronNPCScript: ; d8dd (3:58dd) + INCROM $d8dd, $db4a + +IshiharaNPCScript: ; db4a (3:5b4a) + INCROM $db4a, $dc4b + +Ronald2NPCScript: ; dc4b (3:5c4b) + INCROM $dc4b, $dc4b + +Ronald3NPCScript: ; dc4b (3:5c4b) + INCROM $dc4b, $dc4b + +RonaldNPCScript: ; dc4b (3:5c4b) + INCROM $dc4b, $dc64 + +Clerk1NPCScript: ; dc64 (3:5c64) + INCROM $dc64, $dc76 + +Man1NPCScript: ; dc76 (3:5c76) + INCROM $dc76, $dd0d + +ImakuniNPCScript: ; dd0d (3:5d0d) + INCROM $dd0d, $dd82 + +Specs1NPCScript: ; dd82 (3:5d82) + INCROM $dd82, $dd8d + +ButchNPCScript: ; dd8d (3:5d8d) + INCROM $dd8d, $dd9f + +Granny1NPCScript: ; dd9f (3:5d9f) + INCROM $dd9f, $ddc3 + +MitchNPCScript: ; ddc3 (3:5dc3) + INCROM $ddc3, $ded1 + +Clerk2NPCScript: ; ded1 (3:5ed1) + INCROM $ded1, $def2 + +ChrisNPCScript: ; def2 (3:5ef2) + INCROM $def2, $df39 + +MatthewNPCScript: ; df39 (3:5f39) + INCROM $df39, $df83 + +Woman1NPCScript: ; df83 (3:5f83) + INCROM $df83, $dfc0 + +Chap1NPCScript: ; dfc0 (3:5fc0) + INCROM $dfc0, $dfd2 + +Lass3NPCScript: ; dfd2 (3:5fd2) + INCROM $dfd2, $dff0 + +RyanNPCScript: ; dff0 (3:5ff0) + INCROM $dff0, $e017 + +AndrewNPCScript: ; e017 (3:6017) + INCROM $e017, $e03e + +GeneNPCScript: ; e03e (3:603e) + INCROM $e03e, $e09e + +Clerk3NPCScript: ; e09e (3:609e) + INCROM $e09e, $e0cf + +Gal1NPCScript: ; e0cf (3:60cf) + INCROM $e0cf, $e111 + +Lass1NPCScript: ; e111 (3:6111) + INCROM $e111, $e137 + +Man2NPCScript: ; e137 (3:6137) + INCROM $e137, $e13b + +Pappy2NPCScript: ; e13b (3:613b) + INCROM $e13b, $e13f WaterClubMovePlayer: ; e13f (3:613f) ld a, [wPlayerYCoord] @@ -3003,7 +3121,7 @@ WaterClubAfterDuel: ;e157 (3:6157) dw $6344 db $00 -OWSequence_Sara: ; e177 (3:6177) +SaraNPCScript: ; e177 (3:6177) start_script run_script OWScript_PrintTextString tx Text042c @@ -3041,7 +3159,7 @@ OWSequence_LostToSara: ; e19a (03:619a) run_script OWScript_PrintTextCloseBox tx Text0432 -OWSequence_Amanda: ; e19e (03:619e) +AmandaNPCScript: ; e19e (03:619e) start_script run_script OWScript_PrintTextString tx Text0433 @@ -3082,7 +3200,7 @@ OWSequence_LostToAmanda: ; e1c1 (03:61c1) OWSequence_NotReadyToSeeAmy: INCROM $e1c5, $e21c -OWSequence_Joshua: +JoshuaNPCScript: ; e21c (3:621c) start_script run_script OWScript_JumpIfFlagNotSet db EVENT_BEAT_AMANDA @@ -3114,7 +3232,34 @@ OWSequence_Joshua: db $33 db $01 - INCROM $e23f, $e52c + INCROM $e23f, $e304 + +AmyNPCScript: ; e304 (3:6304) + INCROM $e304, $e369 + +Clerk4NPCScript: ; e369 (3:6369) + INCROM $e369, $e39a + +Chap2NPCScript: ; e39a (3:639a) + INCROM $e39a, $e3d9 + +Lass4NPCScript: ; e3d9 (3:63d9) + INCROM $e3d9, $e3dd + +Hood1NPCScript: ; e3dd (3:63dd) + INCROM $e3dd, $e408 + +JenniferNPCScript: ; e408 (3:6408) + INCROM $e408, $e42f + +NicholasNPCScript: ; e42f (3:642f) + INCROM $e42f, $e456 + +BrandonNPCScript: ; e456 (3:6456) + INCROM $e456, $e4ad + +IsaacNPCScript: ; e4ad (3:64ad) + INCROM $e4ad, $e52c FindEndOfBattleScript: ; e52c (3:652c) ld c, $0 @@ -3147,7 +3292,151 @@ FindEndOfBattleScript: ; e52c (3:652c) jp Func_c926 ; 0xe553 - INCROM $e553, $f580 + INCROM $e553, $e566 + +Clerk5NPCScript: ; e566 (3:6566) + INCROM $e566, $e573 + +MichaelNPCScript: ; e573 (3:6573) + INCROM $e573, $e5d2 + +BrittanyNPCScript: ; e5d2 (3:65d2) + INCROM $e5d2, $e61f + +Lass2NPCScript: ; e61f (3:661f) + INCROM $e61f, $e6d8 + +Granny2NPCScript: ; e6d8 (3:66d8) + INCROM $e6d8, $e6e3 + +Gal2NPCScript: ; e6e3 (3:66e3) + INCROM $e6e3, $e701 + +KristinNPCScript: ; e701 (3:6701) + INCROM $e701, $e745 + +HeatherNPCScript: ; e745 (3:6745) + INCROM $e745, $e79e + +NikkiNPCScript: ; e79e (3:679e) + INCROM $e79e, $e84c + +Clerk6NPCScript: ; e84c (3:684c) + INCROM $e84c, $e850 + +Lad3NPCScript: ; e850 (3:6850) + INCROM $e850, $e980 + +RobertNPCScript: ; e980 (3:6980) + INCROM $e980, $e9a5 + +Pappy1NPCScript: ; e9a5 (3:69a5) + INCROM $e9a5, $ea30 + +Gal3NPCScript: ; ea30 (3:6a30) + INCROM $ea30, $ea3b + +Chap4NPCScript: ; ea3b (3:6a3b) + INCROM $ea3b, $ea60 + +DanielNPCScript: ; ea60 (3:6a60) + INCROM $ea60, $eaa2 + +StephanieNPCScript: ; eaa2 (3:6aa2) + INCROM $eaa2, $eadf + +Murray2NPCScript: ; eadf (3:6adf) + INCROM $eadf, $eadf + +MurrayNPCScript: ; eadf (3:6adf) + INCROM $eadf, $eb53 + +Clerk7NPCScript: ; eb53 (3:6b53) + INCROM $eb53, $eb84 + +Lad1NPCScript: ; eb84 (3:6b84) + INCROM $eb84, $ebc1 + +Man3NPCScript: ; ebc1 (3:6bc1) + INCROM $ebc1, $ebc5 + +Specs2NPCScript: ; ebc5 (3:6bc5) + INCROM $ebc5, $ebed + +Specs3NPCScript: ; ebed (3:6bed) + INCROM $ebed, $ec11 + +DavidNPCScript: ; ec11 (3:6c11) + INCROM $ec11, $ec42 + +ErikNPCScript: ; ec42 (3:6c42) + INCROM $ec42, $ec67 + +RickNPCScript: ; ec67 (3:6c67) + INCROM $ec67, $ecdb + +JosephNPCScript: ; ecdb (3:6cdb) + INCROM $ecdb, $ed45 + +Clerk8NPCScript: ; ed45 (3:6d45) + INCROM $ed45, $ed96 + +JessicaNPCScript: ; ed96 (3:6d96) + INCROM $ed96, $ede8 + +Chap3NPCScript: ; ede8 (3:6de8) + INCROM $ede8, $ee2c + +Lad2NPCScript: ; ee2c (3:6e2c) + INCROM $ee2c, $ee88 + +ManiaNPCScript: ; ee88 (3:6e88) + INCROM $ee88, $eeb3 + +JohnNPCScript: ; eeb3 (3:6eb3) + INCROM $eeb3, $eed8 + +AdamNPCScript: ; eed8 (3:6ed8) + INCROM $eed8, $eefd + +JonathanNPCScript: ; eefd (3:6efd) + INCROM $eefd, $ef22 + +KenNPCScript: ; ef22 (3:6f22) + INCROM $ef22, $f025 + +Clerk9NPCScript: ; f025 (3:7025) + INCROM $f025, $f09c + +Pappy3NPCScript: ; f09c (3:709c) + INCROM $f09c, $f0a0 + +Gal4NPCScript: ; f0a0 (3:70a0) + INCROM $f0a0, $f0a4 + +ChampNPCScript: ; f0a4 (3:70a4) + INCROM $f0a4, $f0a8 + +Hood2NPCScript: ; f0a8 (3:70a8) + INCROM $f0a8, $f0ac + +Lass5NPCScript: ; f0ac (3:70ac) + INCROM $f0ac, $f0b0 + +Chap5NPCScript: ; f0b0 (3:70b0) + INCROM $f0b0, $f26c + +Clerk13NPCScript: ; f26c (3:726c) + INCROM $f26c, $f283 + +GuideNPCScript: ; f283 (3:7283) + INCROM $f283, $f295 + +Clerk12NPCScript: ; f295 (3:7295) + INCROM $f295, $f352 + +HostNPCScript: ; f352 (3:7352) + INCROM $f352, $f580 Func_f580: ; f580 (3:7580) call Func_ca69 @@ -3183,7 +3472,19 @@ Func_f580: ; f580 (3:7580) ret ; 0xf5b3 - INCROM $f5b3, $fc2b + INCROM $f5b3, $f71f + +CourtneyNPCScript: ; f71f (3:771f) + INCROM $f71f, $f72a + +SteveNPCScript: ; f72a (3:772a) + INCROM $f72a, $f735 + +JackNPCScript: ; f735 (3:7735) + INCROM $f735, $f740 + +RodNPCScript: ; f740 (3:7740) + INCROM $f740, $fc2b Func_fc2b: ; fc2b (3:7c2b) ld a, [wDuelResult] -- cgit v1.2.3