From a13f3a5f4fb4052a8e2b2ea47168ba17df1b5db1 Mon Sep 17 00:00:00 2001 From: E Date: Thu, 3 Dec 2020 19:47:40 -0600 Subject: Ken interaction script --- src/data/npcs.asm | 2 +- src/engine/bank03.asm | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 75 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/data/npcs.asm b/src/data/npcs.asm index 99979ce..fac14bf 100644 --- a/src/data/npcs.asm +++ b/src/data/npcs.asm @@ -772,7 +772,7 @@ KenData: db $04 db $1e db $00 - dw $6f22 ; Pointer to Script + dw ScriptKen ; Pointer to Script tx Text03d3 db KEN_PIC db FIRE_CHARGE_DECK_ID diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm index 1f1e690..ea909f3 100644 --- a/src/engine/bank03.asm +++ b/src/engine/bank03.asm @@ -5235,7 +5235,80 @@ Script_ee76: ; ee76 (3:6e76) run_command ScriptCommand_QuitScriptFully ; 0xee88 - INCROM $ee88, $ef96 + INCROM $ee88, $ef22 + +ScriptKen: ; ef22 (3:6f22) + start_script + run_command ScriptCommand_TryGivePCPack + db $09 + run_command ScriptCommand_JumpIfFlagNonzero2 + db EVENT_FLAG_23 + dw .ows_ef3b + run_command Func_cf2d + db $2c + db $01 + db $3b + db $6f + run_command ScriptCommand_JumpIfFlagZero1 + db EVENT_FLAG_24 + dw NO_JUMP + run_command ScriptCommand_PrintVariableText + tx Text06ba + tx Text06bb + run_command ScriptCommand_SetFlagValue + db EVENT_FLAG_24 + db $01 + run_command ScriptCommand_QuitScriptFully +; 0xef3b +.ows_ef3b + run_command ScriptCommand_MaxOutFlagValue + db EVENT_FLAG_23 + run_command ScriptCommand_JumpIfFlagNonzero2 + db EVENT_FLAG_0A + dw .ows_ef83 + run_command ScriptCommand_JumpIfFlagZero1 + db EVENT_FLAG_24 + dw NO_JUMP + run_command ScriptCommand_PrintVariableText + tx Text06bc + tx Text06bd + run_command ScriptCommand_SetFlagValue + db EVENT_FLAG_24 + db $01 + run_command ScriptCommand_AskQuestionJump + tx Text06be + dw .ows_ef56 + run_command ScriptCommand_PrintTextString + tx Text06bf + run_command ScriptCommand_QuitScriptFully +; 0xef56 +.ows_ef56 + run_command ScriptCommand_PrintTextString + tx Text06c0 + run_command ScriptCommand_StartBattle + db PRIZES_6 + db FIRE_CHARGE_DECK_ID + db MUSIC_DUEL_THEME_2 + run_command ScriptCommand_QuitScriptFully +; 0xef5e +.ows_ef83 + run_command ScriptCommand_PrintTextString + tx Text06c6 + run_command ScriptCommand_AskQuestionJump + tx Text06be + dw .ows_ef8e + run_command ScriptCommand_PrintTextQuitFully + tx Text06bf +; 0xef8e +.ows_ef8e + run_command ScriptCommand_PrintTextString + tx Text06c7 + run_command ScriptCommand_StartBattle + db PRIZES_6 + db FIRE_CHARGE_DECK_ID + db MUSIC_DUEL_THEME_2 + run_command ScriptCommand_QuitScriptFully +; 0xef96 Preload_Clerk9: ; ef96 (3:6f96) call TryGiveMedalPCPacks -- cgit v1.2.3 From 9f4c89f35717a703e00be12eb1a429f7d6ca2ed5 Mon Sep 17 00:00:00 2001 From: E Date: Thu, 3 Dec 2020 21:09:31 -0600 Subject: Updating friendly name for Func_cf0c and Func_cf12 --- src/data/npcs.asm | 2 +- src/engine/bank03.asm | 34 +++++++++++++++++----------------- src/engine/bank04.asm | 4 ++-- src/macros/scripts.asm | 4 ++-- 4 files changed, 22 insertions(+), 22 deletions(-) (limited to 'src') diff --git a/src/data/npcs.asm b/src/data/npcs.asm index fac14bf..8969296 100644 --- a/src/data/npcs.asm +++ b/src/data/npcs.asm @@ -772,7 +772,7 @@ KenData: db $04 db $1e db $00 - dw ScriptKen ; Pointer to Script + dw Script_Ken ; Pointer to Script tx Text03d3 db KEN_PIC db FIRE_CHARGE_DECK_ID diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm index ea909f3..ecf6d2d 100644 --- a/src/engine/bank03.asm +++ b/src/engine/bank03.asm @@ -2210,12 +2210,12 @@ ScriptCommand_ShowCardReceivedScreen: ; cee2 (3:4ee2) xor a jr .asm_cef0 -Func_cf0c: ; cf0c (3:4f0c) +ScriptCommand_CheckIfCardInCollectionOrDecks: ; cf0c (3:4f0c) ld a, c call GetCardCountInCollectionAndDecks jr asm_cf16 -Func_cf12: ; cf12 (3:4f12) +ScriptCommand_CheckIfCardInCollection: ; cf12 (3:4f12) ld a, c call GetCardCountInCollection @@ -3627,14 +3627,14 @@ Script_Ishihara: ; db4a (3:5b4a) tx Text072c .ows_dba8 - run_command Func_cf0c + run_command ScriptCommand_CheckIfCardInCollectionOrDecks db $ac dw .ows_dbaf run_command ScriptCommand_PrintTextQuitFully tx Text072d .ows_dbaf - run_command Func_cf12 + run_command ScriptCommand_CheckIfCardInCollection db $ac dw .ows_dbb6 run_command ScriptCommand_PrintTextQuitFully @@ -3679,14 +3679,14 @@ Script_Ishihara: ; db4a (3:5b4a) tx Text072c .ows_dbe1 - run_command Func_cf0c + run_command ScriptCommand_CheckIfCardInCollectionOrDecks db $bb dw .ows_dbe8 run_command ScriptCommand_PrintTextQuitFully tx Text0734 .ows_dbe8 - run_command Func_cf12 + run_command ScriptCommand_CheckIfCardInCollection db $bb dw .ows_dbef run_command ScriptCommand_PrintTextQuitFully @@ -3731,14 +3731,14 @@ Script_Ishihara: ; db4a (3:5b4a) tx Text072c .ows_dc1a - run_command Func_cf0c + run_command ScriptCommand_CheckIfCardInCollectionOrDecks db $b8 dw .ows_dc21 run_command ScriptCommand_PrintTextQuitFully tx Text073a .ows_dc21 - run_command Func_cf12 + run_command ScriptCommand_CheckIfCardInCollection db $b8 dw .ows_dc28 run_command ScriptCommand_PrintTextQuitFully @@ -3988,7 +3988,7 @@ Script_Gal1: ; e0cf (3:60cf) run_command ScriptCommand_QuitScriptFully .ows_e0eb - run_command Func_cf0c + run_command ScriptCommand_CheckIfCardInCollectionOrDecks db $59 dw .ows_e0f3 run_command ScriptCommand_PrintTextString @@ -3996,7 +3996,7 @@ Script_Gal1: ; e0cf (3:60cf) run_command ScriptCommand_QuitScriptFully .ows_e0f3 - run_command Func_cf12 + run_command ScriptCommand_CheckIfCardInCollection db $59 dw .ows_e0fb run_command ScriptCommand_PrintTextString @@ -4755,14 +4755,14 @@ Script_e61f: ; e61f (3:661f) tx Text06ee .ows_e648 - run_command Func_cf0c + run_command ScriptCommand_CheckIfCardInCollectionOrDecks db $1c dw .ows_e64f run_command ScriptCommand_PrintTextQuitFully tx Text06ef .ows_e64f - run_command Func_cf12 + run_command ScriptCommand_CheckIfCardInCollection db $1c dw .ows_e656 run_command ScriptCommand_PrintTextQuitFully @@ -4805,14 +4805,14 @@ Script_e61f: ; e61f (3:661f) tx Text06f6 .ows_e67f - run_command Func_cf0c + run_command ScriptCommand_CheckIfCardInCollectionOrDecks db $ab dw .ows_e686 run_command ScriptCommand_PrintTextQuitFully tx Text06f7 .ows_e686 - run_command Func_cf12 + run_command ScriptCommand_CheckIfCardInCollection db $ab dw .ows_e68d run_command ScriptCommand_PrintTextQuitFully @@ -4855,14 +4855,14 @@ Script_e61f: ; e61f (3:661f) tx Text06fd .ows_e6b6 - run_command Func_cf0c + run_command ScriptCommand_CheckIfCardInCollectionOrDecks db $32 dw .ows_e6bd run_command ScriptCommand_PrintTextQuitFully tx Text06fe .ows_e6bd - run_command Func_cf12 + run_command ScriptCommand_CheckIfCardInCollection db $32 dw .ows_e6c4 run_command ScriptCommand_PrintTextQuitFully @@ -5237,7 +5237,7 @@ Script_ee76: ; ee76 (3:6e76) INCROM $ee88, $ef22 -ScriptKen: ; ef22 (3:6f22) +Script_Ken: ; ef22 (3:6f22) start_script run_command ScriptCommand_TryGivePCPack db $09 diff --git a/src/engine/bank04.asm b/src/engine/bank04.asm index 13df81b..3a9605e 100644 --- a/src/engine/bank04.asm +++ b/src/engine/bank04.asm @@ -982,8 +982,8 @@ OverworldScriptTable: ; 1217b (4:617b) dw ScriptCommand_MoveActiveNPCByDirection dw ScriptCommand_CloseTextBox dw ScriptCommand_GiveBoosterPacks - dw Func_cf0c - dw Func_cf12 + dw ScriptCommand_CheckIfCardInCollectionOrDecks + dw ScriptCommand_CheckIfCardInCollection dw ScriptCommand_GiveCard dw ScriptCommand_TakeCard dw Func_cf53 diff --git a/src/macros/scripts.asm b/src/macros/scripts.asm index bd1a58f..032299d 100644 --- a/src/macros/scripts.asm +++ b/src/macros/scripts.asm @@ -27,8 +27,8 @@ ENDM const ScriptCommand_MoveActiveNPCByDirection_index ; $0a const ScriptCommand_CloseTextBox_index ; $0b const ScriptCommand_GiveBoosterPacks_index ; $0c - const Func_cf0c_index ; $0d - const Func_cf12_index ; $0e + const ScriptCommand_CheckIfCardInCollectionOrDecks_index ; $0d + const ScriptCommand_CheckIfCardInCollection_index ; $0e const ScriptCommand_GiveCard_index ; $0f const ScriptCommand_TakeCard_index ; $10 const Func_cf53_index ; $11 -- cgit v1.2.3 From 223804e09e70a49226ecebc5af782be5882e6aea Mon Sep 17 00:00:00 2001 From: E Date: Thu, 3 Dec 2020 23:19:04 -0600 Subject: Adding Fire Club after duel table + scripts + friendly names --- src/engine/bank03.asm | 102 +++++++++++++++++++++++++++++++++++++++++--------- src/engine/bank04.asm | 2 +- 2 files changed, 85 insertions(+), 19 deletions(-) (limited to 'src') diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm index ecf6d2d..24dfedd 100644 --- a/src/engine/bank03.asm +++ b/src/engine/bank03.asm @@ -2236,7 +2236,7 @@ asm_cf1f asm_cf2a jp IncreaseScriptPointerBy4 -Func_cf2d: ; cf2d (3:4f2d) +ScriptCommand_CheckRawAmountOfCardsOwned: ; cf2d (3:4f2d) push bc call IncreaseScriptPointerBy1 pop bc @@ -5235,7 +5235,38 @@ Script_ee76: ; ee76 (3:6e76) run_command ScriptCommand_QuitScriptFully ; 0xee88 - INCROM $ee88, $ef22 + INCROM $ee88, $ee93 + +FireClubAfterDuel: ; ee93 (3:6e93) + ld hl, .after_duel_table + call FindEndOfBattleScript + ret + +.after_duel_table + db NPC_JOHN + db NPC_JOHN + dw $6ec8 + dw $6ed4 + + db NPC_ADAM + db NPC_ADAM + dw $6eed + dw $6ef9 + + db NPC_JONATHAN + db NPC_JONATHAN + dw $6f12 + dw $6f1e + + db NPC_KEN + db NPC_KEN + dw Script_BeatKen + dw Script_LoseToKen + + db $00 +; 0xeeb3 + + INCROM $eeb3, $ef22 Script_Ken: ; ef22 (3:6f22) start_script @@ -5243,12 +5274,10 @@ Script_Ken: ; ef22 (3:6f22) db $09 run_command ScriptCommand_JumpIfFlagNonzero2 db EVENT_FLAG_23 - dw .ows_ef3b - run_command Func_cf2d - db $2c - db $01 - db $3b - db $6f + dw .have_300_cards + run_command ScriptCommand_CheckRawAmountOfCardsOwned + dw $012c ; 300 cards required + dw .have_300_cards run_command ScriptCommand_JumpIfFlagZero1 db EVENT_FLAG_24 dw NO_JUMP @@ -5259,13 +5288,12 @@ Script_Ken: ; ef22 (3:6f22) db EVENT_FLAG_24 db $01 run_command ScriptCommand_QuitScriptFully -; 0xef3b -.ows_ef3b +.have_300_cards run_command ScriptCommand_MaxOutFlagValue db EVENT_FLAG_23 run_command ScriptCommand_JumpIfFlagNonzero2 db EVENT_FLAG_0A - dw .ows_ef83 + dw Script_KenBattle_AlreadyHaveMedal run_command ScriptCommand_JumpIfFlagZero1 db EVENT_FLAG_24 dw NO_JUMP @@ -5277,12 +5305,11 @@ Script_Ken: ; ef22 (3:6f22) db $01 run_command ScriptCommand_AskQuestionJump tx Text06be - dw .ows_ef56 + dw .do_battle run_command ScriptCommand_PrintTextString tx Text06bf run_command ScriptCommand_QuitScriptFully -; 0xef56 -.ows_ef56 +.do_battle run_command ScriptCommand_PrintTextString tx Text06c0 run_command ScriptCommand_StartBattle @@ -5291,16 +5318,55 @@ Script_Ken: ; ef22 (3:6f22) db MUSIC_DUEL_THEME_2 run_command ScriptCommand_QuitScriptFully ; 0xef5e -.ows_ef83 + +Script_BeatKen: ; ef5e (3:6f5e) + start_script + run_command ScriptCommand_PrintTextString + tx Text06c1 + run_command ScriptCommand_JumpIfFlagNonzero2 + db EVENT_FLAG_0A + dw .give_booster_packs + run_command ScriptCommand_MaxOutFlagValue + db EVENT_FLAG_0A + run_command ScriptCommand_TryGiveMedalPCPacks + run_command Func_d125 + db $0a + run_command Func_d435 + db $08 + run_command ScriptCommand_PrintTextString + tx Text06c2 +.give_booster_packs + run_command ScriptCommand_GiveBoosterPacks + db BOOSTER_MYSTERY_NEUTRAL + db BOOSTER_MYSTERY_NEUTRAL + db NO_BOOSTER + run_command ScriptCommand_PrintTextString + tx Text06c3 + run_command ScriptCommand_QuitScriptFully +; 0xef78 + + + +Script_LoseToKen: ; ef78 (3:6f78) + start_script + run_command ScriptCommand_JumpIfFlagZero2 + db EVENT_FLAG_0A + dw NO_JUMP + run_command ScriptCommand_PrintVariableText + tx Text06c4 + tx Text06c5 + run_command ScriptCommand_QuitScriptFully +; 0xef83 + +Script_KenBattle_AlreadyHaveMedal; ef83 (3:6f83) run_command ScriptCommand_PrintTextString tx Text06c6 run_command ScriptCommand_AskQuestionJump tx Text06be - dw .ows_ef8e + dw .do_battle run_command ScriptCommand_PrintTextQuitFully tx Text06bf -; 0xef8e -.ows_ef8e +.do_battle run_command ScriptCommand_PrintTextString tx Text06c7 run_command ScriptCommand_StartBattle diff --git a/src/engine/bank04.asm b/src/engine/bank04.asm index 3a9605e..76ba2a3 100644 --- a/src/engine/bank04.asm +++ b/src/engine/bank04.asm @@ -988,7 +988,7 @@ OverworldScriptTable: ; 1217b (4:617b) dw ScriptCommand_TakeCard dw Func_cf53 dw Func_cf7b - dw Func_cf2d + dw ScriptCommand_CheckRawAmountOfCardsOwned dw Func_cf96 dw Func_cfc6 dw Func_cfd4 -- cgit v1.2.3 From c0a9ff35550233df184cd7b7067bddde2c2fde84 Mon Sep 17 00:00:00 2001 From: E Date: Thu, 3 Dec 2020 23:22:50 -0600 Subject: fix INCROM indentation --- src/engine/bank03.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm index 24dfedd..546572b 100644 --- a/src/engine/bank03.asm +++ b/src/engine/bank03.asm @@ -5235,7 +5235,7 @@ Script_ee76: ; ee76 (3:6e76) run_command ScriptCommand_QuitScriptFully ; 0xee88 - INCROM $ee88, $ee93 + INCROM $ee88, $ee93 FireClubAfterDuel: ; ee93 (3:6e93) ld hl, .after_duel_table -- cgit v1.2.3 From 8a22bc67c3ba83fc472b7656602109fb99dcb562 Mon Sep 17 00:00:00 2001 From: E Date: Sat, 5 Dec 2020 17:39:37 -0600 Subject: Adding Mitch interaction + Fighting club after duel table --- src/data/map_scripts.asm | 2 +- src/data/npcs.asm | 4 +- src/engine/bank03.asm | 164 ++++++++++++++++++++++++++++++++++++++++++++++- src/macros/scripts.asm | 2 +- 4 files changed, 167 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/data/map_scripts.asm b/src/data/map_scripts.asm index f969d45..1b9906c 100644 --- a/src/data/map_scripts.asm +++ b/src/data/map_scripts.asm @@ -78,7 +78,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 dw $0000 dw $0000 - dw $5da3 + dw FightingClubAfterDuel dw $0000 dw $0000 diff --git a/src/data/npcs.asm b/src/data/npcs.asm index 8969296..dac4cf0 100644 --- a/src/data/npcs.asm +++ b/src/data/npcs.asm @@ -424,7 +424,7 @@ MitchData: db $00 db $0e db $00 - dw $5dc3 ; Pointer to Script + dw Script_Mitch ; Pointer to Script tx Text03b7 db MITCH_PIC db FIRST_STRIKE_DECK_ID @@ -772,7 +772,7 @@ KenData: db $04 db $1e db $00 - dw Script_Ken ; Pointer to Script + dw ScriptCommand_CheckIfCardInCollection ; Pointer to Script tx Text03d3 db KEN_PIC db FIRE_CHARGE_DECK_ID diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm index 546572b..5033048 100644 --- a/src/engine/bank03.asm +++ b/src/engine/bank03.asm @@ -3943,7 +3943,169 @@ NPCMovement_dd78 ; dd78 (3:5d78) db EAST db $ff - INCROM $dd82, $e0b0 + INCROM $dd82, $dda3 + +FightingClubAfterDuel: ; dda3 (3:5da3) + ld hl, .after_duel_table + call FindEndOfBattleScript + ret +; 0xddaa + +.after_duel_table + db NPC_CHRIS + db NPC_CHRIS + dw $5e69 + dw $5e75 + + db NPC_MICHAEL + db NPC_MICHAEL + dw $5e95 + dw $5ea1 + + db NPC_JESSICA + db NPC_JESSICA + dw $c15e + dw $cd5e + + db NPC_MITCH + db NPC_MITCH + dw Script_BeatMitch + dw Script_LoseToMitch + + db $00 +; ddc3 + +Script_Mitch: ; ddc3 (3:5dc3) + start_script + run_command ScriptCommand_TryGivePCPack + db $02 + run_command ScriptCommand_JumpIfFlagNonzero2 + db EVENT_FLAG_0F + dw Script_Mitch_AlreadyHaveMedal + run_command Func_cf96 + dw .first_interaction + dw .three_pupils_remaining + dw .two_pupils_remaining + dw .one_pupil_remaining + dw .all_pupils_defeated +.first_interaction + run_command ScriptCommand_PrintTextString + tx Text0477 + run_command ScriptCommand_SetFlagValue + db EVENT_FLAG_11 + db $01 + run_command ScriptCommand_SetFlagValue + db EVENT_FLAG_17 + db $01 + run_command ScriptCommand_SetFlagValue + db EVENT_FLAG_20 + db $01 + run_command ScriptCommand_QuitScriptFully +; 0xdde2 +.three_pupils_remaining + run_command ScriptCommand_PrintTextQuitFully + tx Text0478 +; 0xdde5 +.two_pupils_remaining + run_command ScriptCommand_PrintTextQuitFully + tx Text0479 +; 0xdde8 +.one_pupil_remaining + run_command ScriptCommand_PrintTextQuitFully + tx Text047a +; 0xddeb +.all_pupils_defeated + run_command ScriptCommand_PrintTextString + tx Text047b + run_command ScriptCommand_AskQuestionJump + tx Text047c + dw .do_battle + run_command ScriptCommand_PrintTextString + tx Text047d + run_command ScriptCommand_QuitScriptFully +; 0xddf7 +.do_battle + run_command ScriptCommand_PrintTextString + tx Text047e + run_command ScriptCommand_StartBattle + db PRIZES_6 + db FIRST_STRIKE_DECK_ID + db MUSIC_DUEL_THEME_2 + run_command ScriptCommand_QuitScriptFully +; 0xddff + +Script_BeatMitch: ; ddff (3:5dff) + start_script + run_command ScriptCommand_JumpIfFlagNonzero2 + db EVENT_FLAG_0F + dw Script_Mitch_GiveBoosters + run_command ScriptCommand_PrintTextString + tx Text047f + run_command ScriptCommand_MaxOutFlagValue + db EVENT_FLAG_0F + run_command ScriptCommand_TryGiveMedalPCPacks + run_command Func_d125 + db $0f + run_command Func_d435 + db $01 + run_command ScriptCommand_PrintTextString + tx Text0480 + run_command ScriptCommand_GiveBoosterPacks + db BOOSTER_LABORATORY_NEUTRAL + db BOOSTER_LABORATORY_NEUTRAL + db NO_BOOSTER + run_command ScriptCommand_PrintTextString + tx Text0481 + run_command ScriptCommand_QuitScriptFully +; 0xde19 + +Script_LoseToMitch: ; de19 (3:5e19) + start_script + run_command ScriptCommand_JumpIfFlagNonzero2 + db EVENT_FLAG_0F + dw Script_Mitch_PrintTrainHarderText + run_command ScriptCommand_PrintTextQuitFully + tx Text0482 +; 0xde21 + +Script_Mitch_AlreadyHaveMedal; 0xde21 + run_command ScriptCommand_PrintTextString + tx Text0483 + run_command ScriptCommand_AskQuestionJump + tx Text047c + dw .do_battle + run_command ScriptCommand_PrintTextString + tx Text0484 + run_command ScriptCommand_QuitScriptFully +; 0xde2d +.do_battle + run_command ScriptCommand_PrintTextString + tx Text0485 + run_command ScriptCommand_StartBattle + db PRIZES_6 + db FIRST_STRIKE_DECK_ID + db MUSIC_DUEL_THEME_2 + run_command ScriptCommand_QuitScriptFully +; 0xde35 + +Script_Mitch_GiveBoosters + run_command ScriptCommand_PrintTextString + tx Text0486 + run_command ScriptCommand_GiveBoosterPacks + db BOOSTER_LABORATORY_NEUTRAL + db BOOSTER_LABORATORY_NEUTRAL + db NO_BOOSTER + run_command ScriptCommand_PrintTextString + tx Text0487 + run_command ScriptCommand_QuitScriptFully +; 0xde40 + +Script_Mitch_PrintTrainHarderText + run_command ScriptCommand_PrintTextQuitFully + tx Text0488 +; 0xde43 + + INCROM $de43, $e0b0 Preload_ImakuniInWaterClubLobby: ; e0b0 (3:60b0) get_flag_value EVENT_IMAKUNI_STATE diff --git a/src/macros/scripts.asm b/src/macros/scripts.asm index 032299d..083f213 100644 --- a/src/macros/scripts.asm +++ b/src/macros/scripts.asm @@ -33,7 +33,7 @@ ENDM const ScriptCommand_TakeCard_index ; $10 const Func_cf53_index ; $11 const Func_cf7b_index ; $12 - const Func_cf2d_index ; $13 + const ScriptCommand_CheckRawAmountOfCardsOwned_index ; $13 const Func_cf96_index ; $14 const Func_cfc6_index ; $15 const Func_cfd4_index ; $16 -- cgit v1.2.3 From d1ca8c6a6a425dc34c399ec3ed751e519d9ac397 Mon Sep 17 00:00:00 2001 From: E Date: Sat, 5 Dec 2020 17:43:18 -0600 Subject: Fixing some references --- src/data/map_scripts.asm | 2 +- src/data/npcs.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/data/map_scripts.asm b/src/data/map_scripts.asm index 1b9906c..3757b52 100644 --- a/src/data/map_scripts.asm +++ b/src/data/map_scripts.asm @@ -288,7 +288,7 @@ MapScripts: ; 1162a (4:562a) dw $0000 dw $0000 dw $0000 - dw $6e93 + dw FireClubAfterDuel dw $0000 dw $0000 diff --git a/src/data/npcs.asm b/src/data/npcs.asm index dac4cf0..334fd85 100644 --- a/src/data/npcs.asm +++ b/src/data/npcs.asm @@ -772,7 +772,7 @@ KenData: db $04 db $1e db $00 - dw ScriptCommand_CheckIfCardInCollection ; Pointer to Script + dw Script_Ken ; Pointer to Script tx Text03d3 db KEN_PIC db FIRE_CHARGE_DECK_ID -- cgit v1.2.3 From 488c10aea82907742629d560fb0b26bb13e19fb3 Mon Sep 17 00:00:00 2001 From: E Date: Sat, 5 Dec 2020 19:06:48 -0600 Subject: Adding FireClubLobbbyAfterDuel --- src/data/map_scripts.asm | 2 +- src/engine/bank03.asm | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/data/map_scripts.asm b/src/data/map_scripts.asm index 3757b52..b65b2b0 100644 --- a/src/data/map_scripts.asm +++ b/src/data/map_scripts.asm @@ -278,7 +278,7 @@ MapScripts: ; 1162a (4:562a) dw FireClubLobbyObjects dw FireClubPressedA dw $0000 - dw $6d49 + dw FireClubLobbbyAfterDuel dw $0000 dw $0000 diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm index 5033048..bb1c33c 100644 --- a/src/engine/bank03.asm +++ b/src/engine/bank03.asm @@ -5326,7 +5326,23 @@ ScriptJump_FinishedSecondRonaldFight ; e959 (3:6959) run_command ScriptCommand_QuitScriptFully ; 0xe963 - INCROM $e963, $ed57 + INCROM $e963, $ed49 + +FireClubLobbbyAfterDuel: ; ed49 (3:6d49) + ld hl, .after_duel_table + call FindEndOfBattleScript + ret +; 0xed50 + +.after_duel_table + db NPC_JESSICA + db NPC_JESSICA + dw $6dba + dw $6dce + db $00 + +; 0xed57 + FireClubPressedA: ; ed57 (3:6d57) ld hl, SlowpokePaintingObjectTable -- cgit v1.2.3 From 5b32b681bcaa7e4ab0cdd383c8d2c27cdc726275 Mon Sep 17 00:00:00 2001 From: E Date: Sat, 5 Dec 2020 19:12:09 -0600 Subject: Fixing spelling --- src/data/map_scripts.asm | 2 +- src/engine/bank03.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/data/map_scripts.asm b/src/data/map_scripts.asm index b65b2b0..b05eccd 100644 --- a/src/data/map_scripts.asm +++ b/src/data/map_scripts.asm @@ -278,7 +278,7 @@ MapScripts: ; 1162a (4:562a) dw FireClubLobbyObjects dw FireClubPressedA dw $0000 - dw FireClubLobbbyAfterDuel + dw FireClubLobbyAfterDuel dw $0000 dw $0000 diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm index bb1c33c..1005ffc 100644 --- a/src/engine/bank03.asm +++ b/src/engine/bank03.asm @@ -5328,7 +5328,7 @@ ScriptJump_FinishedSecondRonaldFight ; e959 (3:6959) INCROM $e963, $ed49 -FireClubLobbbyAfterDuel: ; ed49 (3:6d49) +FireClubLobbyAfterDuel: ; ed49 (3:6d49) ld hl, .after_duel_table call FindEndOfBattleScript ret -- cgit v1.2.3 From 6c71c05f0e8a703c04f27dd73116c873ec3d61d7 Mon Sep 17 00:00:00 2001 From: E Date: Sat, 5 Dec 2020 21:46:24 -0600 Subject: Adding the after duel tables to the rest of the club lobbies --- src/data/map_scripts.asm | 10 +++--- src/engine/bank03.asm | 91 ++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 93 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/data/map_scripts.asm b/src/data/map_scripts.asm index b05eccd..3084f8b 100644 --- a/src/data/map_scripts.asm +++ b/src/data/map_scripts.asm @@ -98,7 +98,7 @@ MapScripts: ; 1162a (4:562a) dw RockClubLobbyObjects dw $0000 dw $0000 - dw $5ed5 + dw RockClubLobbyAfterDuel dw $0000 dw $0000 @@ -128,7 +128,7 @@ MapScripts: ; 1162a (4:562a) dw WaterClubLobbyObjects dw $0000 dw $0000 - dw $60a2 + dw WaterClubLobbyAfterDuel dw $0000 dw $0000 @@ -158,7 +158,7 @@ MapScripts: ; 1162a (4:562a) dw LightningClubLobbyObjects dw $0000 dw $0000 - dw $636d + dw LightningClubLobbyAfterDuel dw $0000 dw $0000 @@ -218,7 +218,7 @@ MapScripts: ; 1162a (4:562a) dw PsychicClubLobbyObjects dw $0000 dw $6971 - dw $6963 + dw PsychicClubLobbyAfterDuel dw $0000 dw $0000 @@ -248,7 +248,7 @@ MapScripts: ; 1162a (4:562a) dw ScienceClubLobbyObjects dw $0000 dw $0000 - dw $6b57 + dw ScienceClubLobbyAfterDuel dw $0000 dw $0000 diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm index 1005ffc..62b0709 100644 --- a/src/engine/bank03.asm +++ b/src/engine/bank03.asm @@ -4105,7 +4105,45 @@ Script_Mitch_PrintTrainHarderText tx Text0488 ; 0xde43 - INCROM $de43, $e0b0 + INCROM $de43, $ded5 + + +RockClubLobbyAfterDuel; ded5 (3:5ed5) + ld hl, .after_duel_table + call FindEndOfBattleScript + ret +; 0xdedc + +.after_duel_table + + db NPC_CHRIS + db NPC_CHRIS + dw $5f0c + dw $5f20 + db $00 + + db NPC_MATTHEW + db NPC_MATTHEW + dw $5f63 + dw $5f78 + db $00 +; 0xdee9 + + INCROM $dee9, $e0a2 + +WaterClubLobbyAfterDuel: ; e0a2 (3:60a2) + ld hl, .after_duel_table + call FindEndOfBattleScript + ret +; 0xe0a9 + +.after_duel_table + db NPC_IMAKUNI + db NPC_IMAKUNI + dw Script_BeatImakuni + dw Script_LostToImakuni + db $00 +; 0xe0b0 Preload_ImakuniInWaterClubLobby: ; e0b0 (3:60b0) get_flag_value EVENT_IMAKUNI_STATE @@ -4742,7 +4780,23 @@ ScriptJump_TalkToAmyAgain: ; e356 (3:6356) run_command ScriptCommand_QuitScriptFully ; 0xe369 - INCROM $e369, $e525 + INCROM $e369, $e36d + +LightningClubLobbyAfterDuel: ; e36d (3:636d) + ld hl, .after_duel_table + call FindEndOfBattleScript + ret +; 0xe374 + +.after_duel_table + db NPC_IMAKUNI + db NPC_IMAKUNI + dw Script_BeatImakuni + dw Script_LostToImakuni + db $00 +; 0xe37B + + INCROM $e37B, $e525 GrassClubEntranceAfterDuel: ; e525 (3:6525) ld hl, GrassClubEntranceAfterDuelTable @@ -5326,7 +5380,38 @@ ScriptJump_FinishedSecondRonaldFight ; e959 (3:6959) run_command ScriptCommand_QuitScriptFully ; 0xe963 - INCROM $e963, $ed49 +PsychicClubLobbyAfterDuel: ; e963 (3:6963) + ld hl, .after_duel_table + call FindEndOfBattleScript + ret +; 0xe96a + +.after_duel_table + + db NPC_ROBERT + db NPC_ROBERT + dw $6995 + dw $69a1 + db $00 + + INCROM $e971, $eb57 + +ScienceClubLobbyAfterDuel; eb57 (3:6b57) + ld hl, .after_duel_table + call FindEndOfBattleScript + ret +; 0xeb5e + +.after_duel_table + + db NPC_IMAKUNI + db NPC_IMAKUNI + dw Script_BeatImakuni + dw Script_LostToImakuni + db $00 +; 0xeb65 + + INCROM $eb65, $ed49 FireClubLobbyAfterDuel: ; ed49 (3:6d49) ld hl, .after_duel_table -- cgit v1.2.3 From 16be3112f9843d61370b14615eb8cb1f4d36ad28 Mon Sep 17 00:00:00 2001 From: shealyrd Date: Wed, 9 Dec 2020 17:51:00 -0600 Subject: Update bank03.asm --- src/engine/bank03.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm index 47d9590..366feee 100644 --- a/src/engine/bank03.asm +++ b/src/engine/bank03.asm @@ -3662,14 +3662,14 @@ Script_Ishihara: ; db4a (3:5b4a) .ows_dba8 run_command ScriptCommand_CheckIfCardInCollectionOrDecks - db $ac + db CLEFABLE dw .ows_dbaf run_command ScriptCommand_PrintTextQuitFully tx Text072d .ows_dbaf run_command ScriptCommand_CheckIfCardInCollection - db $ac + db CLEFABLE dw .ows_dbb6 run_command ScriptCommand_PrintTextQuitFully tx Text072e @@ -3714,14 +3714,14 @@ Script_Ishihara: ; db4a (3:5b4a) .ows_dbe1 run_command ScriptCommand_CheckIfCardInCollectionOrDecks - db $bb + db DITTO dw .ows_dbe8 run_command ScriptCommand_PrintTextQuitFully tx Text0734 .ows_dbe8 run_command ScriptCommand_CheckIfCardInCollection - db $bb + db DITTO dw .ows_dbef run_command ScriptCommand_PrintTextQuitFully tx Text0735 @@ -5725,7 +5725,7 @@ Script_Ken: ; ef22 (3:6f22) db EVENT_FLAG_23 dw .have_300_cards run_command ScriptCommand_CheckRawAmountOfCardsOwned - dw $012c ; 300 cards required + dw 300; dw .have_300_cards run_command ScriptCommand_JumpIfFlagZero1 db EVENT_FLAG_24 -- cgit v1.2.3 From aa6e9646746d5fca6106c981055c119d4cf1da7b Mon Sep 17 00:00:00 2001 From: E Date: Wed, 9 Dec 2020 19:00:20 -0600 Subject: updating pull request according to changes --- src/engine/bank03.asm | 46 +++++++++++++++++++++++----------------------- src/engine/bank04.asm | 2 +- src/macros/scripts.asm | 2 +- 3 files changed, 25 insertions(+), 25 deletions(-) (limited to 'src') diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm index 366feee..cac4603 100644 --- a/src/engine/bank03.asm +++ b/src/engine/bank03.asm @@ -2321,7 +2321,7 @@ Func_cf7b: ; cf7b (3:4f7b) jr c, .asm_cf7d jp IncreaseScriptPointerBy1 -Func_cf96: ; cf96 (3:4f96) +ScriptCommand_JumpBasedOnFightingClubPupilStatus: ; cf96 (3:4f96) ld c, $0 get_flag_value EVENT_FLAG_11 or a @@ -3656,25 +3656,25 @@ Script_Ishihara: ; db4a (3:5b4a) db $02 run_command ScriptCommand_AskQuestionJump tx Text072b - dw .ows_dba8 + dw .check_ifhave_clefable_incollectionordecks run_command ScriptCommand_PrintTextQuitFully tx Text072c -.ows_dba8 +.check_ifhave_clefable_incollectionordecks run_command ScriptCommand_CheckIfCardInCollectionOrDecks db CLEFABLE - dw .ows_dbaf + dw .check_ifhave_clefable_incollectiononly run_command ScriptCommand_PrintTextQuitFully tx Text072d -.ows_dbaf +.check_ifhave_clefable_incollectiononly run_command ScriptCommand_CheckIfCardInCollection db CLEFABLE - dw .ows_dbb6 + dw .do_clefable_trade run_command ScriptCommand_PrintTextQuitFully tx Text072e -.ows_dbb6 +.do_clefable_trade run_command ScriptCommand_MaxOutFlagValue db EVENT_FLAG_00 run_command ScriptCommand_SetFlagValue @@ -3712,21 +3712,21 @@ Script_Ishihara: ; db4a (3:5b4a) run_command ScriptCommand_PrintTextQuitFully tx Text072c -.ows_dbe1 +.check_ifhave_clefable_incollectionordecks run_command ScriptCommand_CheckIfCardInCollectionOrDecks db DITTO dw .ows_dbe8 run_command ScriptCommand_PrintTextQuitFully tx Text0734 -.ows_dbe8 +.check_ifhave_ditto_incollectiononly run_command ScriptCommand_CheckIfCardInCollection db DITTO dw .ows_dbef run_command ScriptCommand_PrintTextQuitFully tx Text0735 -.ows_dbef +.do_ditto_trade run_command ScriptCommand_MaxOutFlagValue db EVENT_FLAG_00 run_command ScriptCommand_SetFlagValue @@ -3760,25 +3760,25 @@ Script_Ishihara: ; db4a (3:5b4a) db $06 run_command ScriptCommand_AskQuestionJump tx Text072b - dw .ows_dc1a + dw .check_ifhave_chansey_incollectionordecks run_command ScriptCommand_PrintTextQuitFully tx Text072c -.ows_dc1a +.check_ifhave_chansey_incollectionordecks run_command ScriptCommand_CheckIfCardInCollectionOrDecks - db $b8 - dw .ows_dc21 + db CHANSEY + dw .check_ifhave_chansey_incollectiononly run_command ScriptCommand_PrintTextQuitFully tx Text073a -.ows_dc21 +.check_ifhave_chansey_incollectiononly run_command ScriptCommand_CheckIfCardInCollection - db $b8 + db CHANSEY dw .ows_dc28 run_command ScriptCommand_PrintTextQuitFully tx Text073b -.ows_dc28 +.do_chansey_trade run_command ScriptCommand_MaxOutFlagValue db EVENT_FLAG_00 run_command ScriptCommand_SetFlagValue @@ -4015,7 +4015,7 @@ FightingClubAfterDuel: ; dda3 (3:5da3) db $00 ; ddc3 - +;ScriptCommand_JumpBasedOnFightingClubPupilStatus Script_Mitch: ; ddc3 (3:5dc3) start_script run_command ScriptCommand_TryGivePCPack @@ -4023,7 +4023,7 @@ Script_Mitch: ; ddc3 (3:5dc3) run_command ScriptCommand_JumpIfFlagNonzero2 db EVENT_FLAG_0F dw Script_Mitch_AlreadyHaveMedal - run_command Func_cf96 + run_command ScriptCommand_JumpBasedOnFightingClubPupilStatus dw .first_interaction dw .three_pupils_remaining dw .two_pupils_remaining @@ -4109,7 +4109,7 @@ Script_LoseToMitch: ; de19 (3:5e19) tx Text0482 ; 0xde21 -Script_Mitch_AlreadyHaveMedal; 0xde21 +Script_Mitch_AlreadyHaveMedal: ; 0xde21 run_command ScriptCommand_PrintTextString tx Text0483 run_command ScriptCommand_AskQuestionJump @@ -4129,7 +4129,7 @@ Script_Mitch_AlreadyHaveMedal; 0xde21 run_command ScriptCommand_QuitScriptFully ; 0xde35 -Script_Mitch_GiveBoosters +Script_Mitch_GiveBoosters: run_command ScriptCommand_PrintTextString tx Text0486 run_command ScriptCommand_GiveBoosterPacks @@ -4141,7 +4141,7 @@ Script_Mitch_GiveBoosters run_command ScriptCommand_QuitScriptFully ; 0xde40 -Script_Mitch_PrintTrainHarderText +Script_Mitch_PrintTrainHarderText: run_command ScriptCommand_PrintTextQuitFully tx Text0488 ; 0xde43 @@ -4152,7 +4152,7 @@ Script_Clerk2: ; ded1 (3:5ed1) INCROM $ded1, $ded5 -RockClubLobbyAfterDuel; ded5 (3:5ed5) +RockClubLobbyAfterDuel: ; ded5 (3:5ed5) ld hl, .after_duel_table call FindEndOfBattleScript ret diff --git a/src/engine/bank04.asm b/src/engine/bank04.asm index f52cd44..a1e504f 100644 --- a/src/engine/bank04.asm +++ b/src/engine/bank04.asm @@ -988,7 +988,7 @@ OverworldScriptTable: ; 1217b (4:617b) dw Func_cf53 dw Func_cf7b dw ScriptCommand_CheckRawAmountOfCardsOwned - dw Func_cf96 + dw ScriptCommand_JumpBasedOnFightingClubPupilStatus dw Func_cfc6 dw Func_cfd4 dw Func_d00b diff --git a/src/macros/scripts.asm b/src/macros/scripts.asm index 73bb09e..ed7b30d 100644 --- a/src/macros/scripts.asm +++ b/src/macros/scripts.asm @@ -34,7 +34,7 @@ ENDM const Func_cf53_index ; $11 const Func_cf7b_index ; $12 const ScriptCommand_CheckRawAmountOfCardsOwned_index ; $13 - const Func_cf96_index ; $14 + const ScriptCommand_JumpBasedOnFightingClubPupilStatus_index ; $14 const Func_cfc6_index ; $15 const Func_cfd4_index ; $16 const Func_d00b_index ; $17 -- cgit v1.2.3 From 159c3d07fe7479132bdab397325b2e1f7b3796e3 Mon Sep 17 00:00:00 2001 From: E Date: Wed, 9 Dec 2020 19:20:23 -0600 Subject: fixing incrom --- src/engine/bank03.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm index cac4603..bd83330 100644 --- a/src/engine/bank03.asm +++ b/src/engine/bank03.asm @@ -3712,7 +3712,7 @@ Script_Ishihara: ; db4a (3:5b4a) run_command ScriptCommand_PrintTextQuitFully tx Text072c -.check_ifhave_clefable_incollectionordecks +.check_ifhave_ditto_incollectionordecks run_command ScriptCommand_CheckIfCardInCollectionOrDecks db DITTO dw .ows_dbe8 @@ -3982,7 +3982,7 @@ Script_Butch: ; dd8d (3:5d8d) INCROM $dd8d, $dd9f Script_Granny1: ; dd9f (3:5d9f) - INCROM $dd9f, $ddc3 + INCROM $dd9f, $dda3 -- cgit v1.2.3 From cf81e292e46a47151003ce74b4f8b6d400aa9344 Mon Sep 17 00:00:00 2001 From: E Date: Wed, 9 Dec 2020 19:47:46 -0600 Subject: Fixing compilation issues --- src/engine/bank03.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm index bd83330..062eafd 100644 --- a/src/engine/bank03.asm +++ b/src/engine/bank03.asm @@ -3708,21 +3708,21 @@ Script_Ishihara: ; db4a (3:5b4a) db $04 run_command ScriptCommand_AskQuestionJump tx Text072b - dw .ows_dbe1 + dw .check_ifhave_ditto_incollectionordecks run_command ScriptCommand_PrintTextQuitFully tx Text072c .check_ifhave_ditto_incollectionordecks run_command ScriptCommand_CheckIfCardInCollectionOrDecks db DITTO - dw .ows_dbe8 + dw .check_ifhave_ditto_incollectiononly run_command ScriptCommand_PrintTextQuitFully tx Text0734 .check_ifhave_ditto_incollectiononly run_command ScriptCommand_CheckIfCardInCollection db DITTO - dw .ows_dbef + dw .do_ditto_trade run_command ScriptCommand_PrintTextQuitFully tx Text0735 @@ -3774,7 +3774,7 @@ Script_Ishihara: ; db4a (3:5b4a) .check_ifhave_chansey_incollectiononly run_command ScriptCommand_CheckIfCardInCollection db CHANSEY - dw .ows_dc28 + dw .do_chansey_trade run_command ScriptCommand_PrintTextQuitFully tx Text073b @@ -4171,9 +4171,9 @@ RockClubLobbyAfterDuel: ; ded5 (3:5ed5) dw $5f63 dw $5f78 db $00 -; 0xdee9 +; 0xdeea - INCROM $dee9, $def2 + INCROM $deea, $def2 Script_Chris: ; def2 (3:5ef2) INCROM $def2, $df39 -- cgit v1.2.3 From 8ed3bdae90bc13a921ceaccb55fb4eb37ecb79e1 Mon Sep 17 00:00:00 2001 From: shealyrd Date: Thu, 10 Dec 2020 10:55:31 -0600 Subject: Update bank03.asm --- src/engine/bank03.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm index 062eafd..3aa5dd2 100644 --- a/src/engine/bank03.asm +++ b/src/engine/bank03.asm @@ -4015,7 +4015,7 @@ FightingClubAfterDuel: ; dda3 (3:5da3) db $00 ; ddc3 -;ScriptCommand_JumpBasedOnFightingClubPupilStatus + Script_Mitch: ; ddc3 (3:5dc3) start_script run_command ScriptCommand_TryGivePCPack @@ -5538,7 +5538,7 @@ Script_Clerk7: ; eb53 (3:6b53) INCROM $eb53, $eb57 -ScienceClubLobbyAfterDuel; eb57 (3:6b57) +ScienceClubLobbyAfterDuel:; eb57 (3:6b57) ld hl, .after_duel_table call FindEndOfBattleScript ret @@ -5725,7 +5725,7 @@ Script_Ken: ; ef22 (3:6f22) db EVENT_FLAG_23 dw .have_300_cards run_command ScriptCommand_CheckRawAmountOfCardsOwned - dw 300; + dw 300 dw .have_300_cards run_command ScriptCommand_JumpIfFlagZero1 db EVENT_FLAG_24 @@ -5807,7 +5807,7 @@ Script_LoseToKen: ; ef78 (3:6f78) run_command ScriptCommand_QuitScriptFully ; 0xef83 -Script_KenBattle_AlreadyHaveMedal; ef83 (3:6f83) +Script_KenBattle_AlreadyHaveMedal: ; ef83 (3:6f83) run_command ScriptCommand_PrintTextString tx Text06c6 run_command ScriptCommand_AskQuestionJump -- cgit v1.2.3 From 2a777c9c4f5474226dc1d335cd9e4724e4fc8257 Mon Sep 17 00:00:00 2001 From: E Date: Thu, 10 Dec 2020 14:27:48 -0600 Subject: Fixing comparison issues --- src/engine/bank03.asm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm index 062eafd..1bda8fe 100644 --- a/src/engine/bank03.asm +++ b/src/engine/bank03.asm @@ -4005,8 +4005,8 @@ FightingClubAfterDuel: ; dda3 (3:5da3) db NPC_JESSICA db NPC_JESSICA - dw $c15e - dw $cd5e + dw $5ec1 + dw $5ecd db NPC_MITCH db NPC_MITCH @@ -4164,16 +4164,15 @@ RockClubLobbyAfterDuel: ; ded5 (3:5ed5) db NPC_CHRIS dw $5f0c dw $5f20 - db $00 db NPC_MATTHEW db NPC_MATTHEW dw $5f63 dw $5f78 db $00 -; 0xdeea +; 0xdee9 - INCROM $deea, $def2 + INCROM $dee9, $def2 Script_Chris: ; def2 (3:5ef2) INCROM $def2, $df39 -- cgit v1.2.3