From d70ce81dcd7503b7b849ccfa2a08af4979b7d4e3 Mon Sep 17 00:00:00 2001 From: E Date: Sun, 13 Dec 2020 00:14:24 -0600 Subject: Adding Multichoice Textbox configuration data --- src/engine/bank03.asm | 90 +++++++++++++++++++++++++++++++++++++++------------ src/engine/bank04.asm | 71 +++++++++++++++++++++++++++++++++++++--- 2 files changed, 135 insertions(+), 26 deletions(-) (limited to 'src/engine') diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm index 58367e2..a89ecf9 100644 --- a/src/engine/bank03.asm +++ b/src/engine/bank03.asm @@ -2712,27 +2712,62 @@ Func_d244: ; d244 (3:5244) farcall Func_80ba4 jp IncreaseScriptPointerBy2 -Func_d24c: ; d24c (3:524c) - ld hl, $525e +Show_ChooseDeckToDuelAgainst_MultichoiceTextbox: ; d24c (3:524c) + ld hl, .multichoice_menu_args xor a - call Func_d28c + call ShowMultichoiceTextbox ld a, [wd695] ld c, a set_flag_value EVENT_FLAG_76 jp IncreaseScriptPointerBy1 - INCROM $d25e, $d271 +.multichoice_menu_args ;d25e + dw $0000 ;NPC title for textbox under menu + tx Text03f9 ;text for textbox under menu + dw MultichoiceTextbox_ConfigTable_ChooseDeckToDuelAgainst ;location of table configuration in bank 4 + db $03 ;the value to return when b is pressed + dw $d695 ;ram location to return result into + dw .text_entries ;location of table containing text entries -Func_d271: ; d271 (3:5271) - ld hl, $527b +.text_entries ;d269 + tx Text03f6 + tx Text03f7 + tx Text03f8 + + INCROM $d26f, $d271 + + +Show_ChooseStarterDeck_MultichoiceTextbox: ; d271 (3:5271) + ld hl, .multichoice_menu_args xor a - call Func_d28c + call ShowMultichoiceTextbox jp IncreaseScriptPointerBy1 ; 0xd27b - INCROM $d27b, $d28c - -Func_d28c: ; d28c (3:528c) +.multichoice_menu_args ;d27b + dw $0000 ;NPC title for textbox under menu + tx Text03fd ;text for textbox under menu + dw MultichoiceTextbox_ConfigTable_ChooseDeckStarterDeck ;location of table configuration in bank 4 + db $00 ;the value to return when b is pressed + dw $d693 ;ram location to return result into + dw .text_entries ;location of table containing text entries + +.text_entries + tx Text03fa + tx Text03fb + tx Text03fc + + +;displays a textbox with multiple choices and a cursor. +;takes as an argument in h1 a pointer to a table +; dw text id for NPC title for textbox under menu +; dw text id for textbox under menu +; dw location of table configuration in bank 4 +; db the value to return when b is pressed +; dw ram location to return result into +; dw location of table containing text entries (optional + +ShowMultichoiceTextbox: ; d28c (3:528c) ld [wd416], a push hl call Func_c241 @@ -2808,10 +2843,10 @@ Func_d28c: ; d28c (3:528c) .asm_d2f5 ret -Func_d2f6: ; d2f6 (3:52f6) - ld hl, $530c +ScriptCommand_ShowSamNormalMultichoice: ; d2f6 (3:52f6) + ld hl, .multichoice_menu_args xor a - call Func_d28c + call ShowMultichoiceTextbox ld a, [wd694] ld c, a set_flag_value EVENT_FLAG_75 @@ -2820,19 +2855,32 @@ Func_d2f6: ; d2f6 (3:52f6) jp IncreaseScriptPointerBy1 ; 0xd30c - INCROM $d30c, $d317 +.multichoice_menu_args ;d30c + tx SamNPCName ;NPC title for textbox under menu + tx Text03fe ;text for textbox under menu + dw SamNormalMultichoice_ConfigurationTable ;location of table configuration in bank 4 + db $03 ;the value to return when b is pressed + dw $d694 ;ram location to return result into + dw $0000 ;location of table containing text entries + -Func_d317: ; d317 (3:5317) - ld hl, $532b +ScriptCommand_ShowSamTutorialMultichoice: ; d317 (s) + ld hl, .multichoice_menu_args ld a, [wd694] - call Func_d28c + call ShowMultichoiceTextbox ld a, [wd694] ld c, a set_flag_value EVENT_FLAG_75 jp IncreaseScriptPointerBy1 -Unknown_d32b: ; d32b (3:532b) - INCROM $d32b, $d336 +.multichoice_menu_args ;d32b + dw $0000 ;NPC title for textbox under menu + dw $0000 ;text for textbox under menu + dw SamTutorialMultichoice_ConfigurationTable ;location of table configuration in bank 4 + db $07 ;the value to return when b is pressed + dw $d694 ;ram location to return result into + dw $0000 ;location of table containing text entries + ScriptCommand_OpenDeckMachine: ; d336 (3:5336) push bc @@ -3333,7 +3381,7 @@ Script_d794: ; d794 (3:5794) .ows_d7bc run_command ScriptCommand_CloseTextBox - run_command Func_d317 + run_command ScriptCommand_ShowSamTutorialMultichoice run_command ScriptCommand_CloseTextBox run_command ScriptCommand_JumpIfFlagEqual db EVENT_FLAG_75 @@ -3478,7 +3526,7 @@ AfterTutorialBattleScript: ; d834 (3:5834) run_command ScriptCommand_CloseTextBox run_command ScriptCommand_PrintTextString tx Text05f2 - run_command Func_d271 + run_command Show_ChooseStarterDeck_MultichoiceTextbox ; 0xd860 INCROM $d860, $d880 diff --git a/src/engine/bank04.asm b/src/engine/bank04.asm index a1e504f..98ed957 100644 --- a/src/engine/bank04.asm +++ b/src/engine/bank04.asm @@ -1023,9 +1023,9 @@ OverworldScriptTable: ; 1217b (4:617b) dw Func_d1b3 dw ScriptCommand_QuitScriptFully dw Func_d244 - dw Func_d24c + dw Show_ChooseDeckToDuelAgainst_MultichoiceTextbox dw ScriptCommand_OpenDeckMachine - dw Func_d271 + dw Show_ChooseStarterDeck_MultichoiceTextbox dw ScriptCommand_EnterMap dw ScriptCommand_MoveArbitraryNPC dw Func_d209 @@ -1048,8 +1048,8 @@ OverworldScriptTable: ; 1217b (4:617b) dw ScriptCommand_WaitForSongToFinish dw Func_d435 dw ScriptCommand_AskQuestionJumpDefaultYes - dw Func_d2f6 - dw Func_d317 + dw ScriptCommand_ShowSamNormalMultichoice + dw ScriptCommand_ShowSamTutorialMultichoice dw Func_d43d dw ScriptCommand_EndScriptLoop2 dw ScriptCommand_EndScriptLoop3 @@ -1073,7 +1073,68 @@ OverworldScriptTable: ; 1217b (4:617b) dw ScriptCommand_EndScriptLoop9 dw ScriptCommand_EndScriptLoop10 - INCROM $1224b, $1229f + +MultichoiceTextbox_ConfigTable_ChooseDeckToDuelAgainst: ;1224b + db $04, $00 ; x, y to start drawing box + db $10, $08 ; width, height of box + db $06, $02 ; x, y coordinate to start printing next text + tx Text03f6 ; text id to print next + db $06, $04 ; x, y coordinate to start printing next text + tx Text03f7 ; text id to print next + db $06, $06 ; x, y coordinate to start printing next text + tx Text03f8 ; text id to print next + db $ff ; marker byte -- end text entries + db $05, $02 ; cursor starting x, y + db $02 ; number of tiles the cursor moves per toggle + db $03 ; cursor max index + db $0f ; curor image + + db $00, $00, $00 ; marker bytes -- end of config table + +MultichoiceTextbox_ConfigTable_ChooseDeckStarterDeck: ;12264 + db $04, $00 ; x, y to start drawing box + db $10, $08 ; width, height of box + db $06, $02 ; x, y coordinate to start printing next text + tx Text03fa ; text id to print next + db $06, $04 ; x, y coordinate to start printing next text + tx Text03fb ; text id to print next + db $06, $06 ; x, y coordinate to start printing next text + tx Text03fc ; text id to print next + db $ff ; marker byte -- end text entries + db $05, $02 ; cursor starting x, y + db $02 ; number of tiles the cursor moves per toggle + db $03 ; cursor max index + db $0f ; curor image + + db $00, $00, $00 ; marker bytes -- end of config table + +SamNormalMultichoice_ConfigurationTable: ;1227d + db $0A, $00 ; x, y to start drawing box + db $0A, $0A ; width, height of box + db $0C, $02 ; x, y coordinate to start printing next text + tx Text03ff ; text id to print next + db $ff ; marker byte -- end text entries + db $0b, $02 ; cursor starting x, y + db $02 ; number of tiles the cursor moves per toggle + db $04 ; cursor max index + db $0f ; curor image + + db $00, $00, $00 ; marker bytes -- end of config table + +SamTutorialMultichoice_ConfigurationTable: ;1228e + db $06, $00 ; x, y to start drawing box + db $0E, $12 ; width, height of box + db $08, $02 ; x coordinate to start printing text + tx Text0400 ; text id to print next + db $ff ; marker byte -- end text entries + db $07, $02 ; cursor starting x, y + db $02 ; number of tiles the cursor moves per toggle + db $08 ; cursor max index + db $0f ; curor image + + db $00, $00, $00 ; marker bytes -- end of config table + + Unknown_1229f: ; 1229f (4:629f) INCROM $1229f, $126d1 -- cgit v1.2.3 From 45de771f8298595664346b95c812293b1f258ab8 Mon Sep 17 00:00:00 2001 From: E Date: Sun, 13 Dec 2020 00:21:46 -0600 Subject: Normalizing function names --- src/engine/bank03.asm | 6 +++--- src/engine/bank04.asm | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/engine') diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm index a89ecf9..2f922a6 100644 --- a/src/engine/bank03.asm +++ b/src/engine/bank03.asm @@ -2712,7 +2712,7 @@ Func_d244: ; d244 (3:5244) farcall Func_80ba4 jp IncreaseScriptPointerBy2 -Show_ChooseDeckToDuelAgainst_MultichoiceTextbox: ; d24c (3:524c) +ScriptCommand_ShowMultichoiceTextbox_ChooseDeckToDuelAgainst: ; d24c (3:524c) ld hl, .multichoice_menu_args xor a call ShowMultichoiceTextbox @@ -2737,7 +2737,7 @@ Show_ChooseDeckToDuelAgainst_MultichoiceTextbox: ; d24c (3:524c) INCROM $d26f, $d271 -Show_ChooseStarterDeck_MultichoiceTextbox: ; d271 (3:5271) +ScriptCommand_ShowMultichoiceTextbox_ChooseStarterDeck: ; d271 (3:5271) ld hl, .multichoice_menu_args xor a call ShowMultichoiceTextbox @@ -3526,7 +3526,7 @@ AfterTutorialBattleScript: ; d834 (3:5834) run_command ScriptCommand_CloseTextBox run_command ScriptCommand_PrintTextString tx Text05f2 - run_command Show_ChooseStarterDeck_MultichoiceTextbox + run_command ScriptCommand_ShowMultichoiceTextbox_ChooseStarterDeck ; 0xd860 INCROM $d860, $d880 diff --git a/src/engine/bank04.asm b/src/engine/bank04.asm index 98ed957..da26e55 100644 --- a/src/engine/bank04.asm +++ b/src/engine/bank04.asm @@ -1023,9 +1023,9 @@ OverworldScriptTable: ; 1217b (4:617b) dw Func_d1b3 dw ScriptCommand_QuitScriptFully dw Func_d244 - dw Show_ChooseDeckToDuelAgainst_MultichoiceTextbox + dw ScriptCommand_ShowMultichoiceTextbox_ChooseDeckToDuelAgainst dw ScriptCommand_OpenDeckMachine - dw Show_ChooseStarterDeck_MultichoiceTextbox + dw ScriptCommand_ShowMultichoiceTextbox_ChooseStarterDeck dw ScriptCommand_EnterMap dw ScriptCommand_MoveArbitraryNPC dw Func_d209 -- cgit v1.2.3 From 6214fab5eef5a788f88b03fb86b9b6b929ebd662 Mon Sep 17 00:00:00 2001 From: E Date: Tue, 15 Dec 2020 17:22:15 -0600 Subject: Updating comments + finishing after tutorial battle script --- src/engine/bank03.asm | 95 +++++++++++++++++++++++++++++++++------------------ src/engine/bank04.asm | 88 +++++++++++++++++++++++------------------------ 2 files changed, 106 insertions(+), 77 deletions(-) (limited to 'src/engine') diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm index 2f922a6..21977c8 100644 --- a/src/engine/bank03.asm +++ b/src/engine/bank03.asm @@ -1912,7 +1912,7 @@ ScriptCommand_StartBattle: ; cd01 (3:4d01) ld a, [wcc19] cp $ff jr nz, .asm_cd26 - ld a, [wd695] + ld a, [wMultichoiceTextboxResult_ChooseDeckToDuelAgainst] ld c, a ld b, $0 ld hl, AaronDeckIDs @@ -2716,18 +2716,18 @@ ScriptCommand_ShowMultichoiceTextbox_ChooseDeckToDuelAgainst: ; d24c (3:524c) ld hl, .multichoice_menu_args xor a call ShowMultichoiceTextbox - ld a, [wd695] + ld a, [wMultichoiceTextboxResult_ChooseDeckToDuelAgainst] ld c, a set_flag_value EVENT_FLAG_76 jp IncreaseScriptPointerBy1 .multichoice_menu_args ;d25e - dw $0000 ;NPC title for textbox under menu - tx Text03f9 ;text for textbox under menu - dw MultichoiceTextbox_ConfigTable_ChooseDeckToDuelAgainst ;location of table configuration in bank 4 - db $03 ;the value to return when b is pressed - dw $d695 ;ram location to return result into - dw .text_entries ;location of table containing text entries + dw $0000 ; NPC title for textbox under menu + tx Text03f9 ; text for textbox under menu + dw MultichoiceTextbox_ConfigTable_ChooseDeckToDuelAgainst ; location of table configuration in bank 4 + db $03 ; the value to return when b is pressed + dw wMultichoiceTextboxResult_ChooseDeckToDuelAgainst ; ram location to return result into + dw .text_entries ; location of table containing text entries .text_entries ;d269 tx Text03f6 @@ -2745,12 +2745,12 @@ ScriptCommand_ShowMultichoiceTextbox_ChooseStarterDeck: ; d271 (3:5271) ; 0xd27b .multichoice_menu_args ;d27b - dw $0000 ;NPC title for textbox under menu - tx Text03fd ;text for textbox under menu - dw MultichoiceTextbox_ConfigTable_ChooseDeckStarterDeck ;location of table configuration in bank 4 - db $00 ;the value to return when b is pressed - dw $d693 ;ram location to return result into - dw .text_entries ;location of table containing text entries + dw $0000 ; NPC title for textbox under menu + tx Text03fd ; text for textbox under menu + dw MultichoiceTextbox_ConfigTable_ChooseDeckStarterDeck ; location of table configuration in bank 4 + db $00 ; the value to return when b is pressed + dw $d693 ; ram location to return result into + dw .text_entries ; location of table containing text entries .text_entries tx Text03fa @@ -2765,7 +2765,7 @@ ScriptCommand_ShowMultichoiceTextbox_ChooseStarterDeck: ; d271 (3:5271) ; dw location of table configuration in bank 4 ; db the value to return when b is pressed ; dw ram location to return result into -; dw location of table containing text entries (optional +; dw location of table containing text entries (optional) ShowMultichoiceTextbox: ; d28c (3:528c) ld [wd416], a @@ -2847,39 +2847,39 @@ ScriptCommand_ShowSamNormalMultichoice: ; d2f6 (3:52f6) ld hl, .multichoice_menu_args xor a call ShowMultichoiceTextbox - ld a, [wd694] + ld a, [wMultichoiceTextboxResult_Sam] ld c, a set_flag_value EVENT_FLAG_75 xor a - ld [wd694], a + ld [wMultichoiceTextboxResult_Sam], a jp IncreaseScriptPointerBy1 ; 0xd30c .multichoice_menu_args ;d30c - tx SamNPCName ;NPC title for textbox under menu - tx Text03fe ;text for textbox under menu - dw SamNormalMultichoice_ConfigurationTable ;location of table configuration in bank 4 - db $03 ;the value to return when b is pressed - dw $d694 ;ram location to return result into - dw $0000 ;location of table containing text entries + tx SamNPCName ; NPC title for textbox under menu + tx Text03fe ; text for textbox under menu + dw SamNormalMultichoice_ConfigurationTable ; location of table configuration in bank 4 + db $03 ; the value to return when b is pressed + dw wMultichoiceTextboxResult_Sam ; ram location to return result into + dw $0000 ; location of table containing text entries ScriptCommand_ShowSamTutorialMultichoice: ; d317 (s) ld hl, .multichoice_menu_args - ld a, [wd694] + ld a, [wMultichoiceTextboxResult_Sam] call ShowMultichoiceTextbox - ld a, [wd694] + ld a, [wMultichoiceTextboxResult_Sam] ld c, a set_flag_value EVENT_FLAG_75 jp IncreaseScriptPointerBy1 .multichoice_menu_args ;d32b - dw $0000 ;NPC title for textbox under menu - dw $0000 ;text for textbox under menu - dw SamTutorialMultichoice_ConfigurationTable ;location of table configuration in bank 4 - db $07 ;the value to return when b is pressed - dw $d694 ;ram location to return result into - dw $0000 ;location of table containing text entries + dw $0000 ; NPC title for textbox under menu + dw $0000 ; text for textbox under menu + dw SamTutorialMultichoice_ConfigurationTable ; location of table configuration in bank 4 + db $07 ; the value to return when b is pressed + dw wMultichoiceTextboxResult_Sam ; ram location to return result into + dw $0000 ; location of table containing text entries ScriptCommand_OpenDeckMachine: ; d336 (3:5336) @@ -2978,6 +2978,7 @@ Func_d3d4: ; d3d4 (3:53d4) INCROM $d3dd, $d3e0 + Func_d3e0: ; d3e0 (3:53e0) ld a, $1 ld [wd32e], a @@ -3526,10 +3527,38 @@ AfterTutorialBattleScript: ; d834 (3:5834) run_command ScriptCommand_CloseTextBox run_command ScriptCommand_PrintTextString tx Text05f2 +.ows_d85f run_command ScriptCommand_ShowMultichoiceTextbox_ChooseStarterDeck -; 0xd860 + run_command ScriptCommand_CloseTextBox + run_command ScriptCommand_AskQuestionJump + tx Text05f3 + dw .ows_d869 + run_command ScriptCommand_Jump + dw .ows_d85f +; 0xd869 +.ows_d869 + run_command ScriptCommand_PrintTextString + tx Text05f4 + run_command ScriptCommand_CloseTextBox + run_command ScriptCommand_PauseSong + run_command Func_d40f + run_command ScriptCommand_TryGiveMedalPCPacks + run_command Func_ccdc + tx Text05f5 + run_command ScriptCommand_WaitForSongToFinish + run_command ScriptCommand_ResumeSong + run_command ScriptCommand_CloseTextBox + run_command ScriptCommand_SetFlagValue + db EVENT_FLAG_3E + db $03 + run_command Func_d3d4 + run_command ScriptCommand_PrintTextString + tx Text05f6 + run_command Func_d396 + db $00 + run_command ScriptCommand_QuitScriptFully +; 0xd880 - INCROM $d860, $d880 NPCMovement_d880: ; d880 (3:5880) db EAST diff --git a/src/engine/bank04.asm b/src/engine/bank04.asm index da26e55..8e62188 100644 --- a/src/engine/bank04.asm +++ b/src/engine/bank04.asm @@ -1075,62 +1075,62 @@ OverworldScriptTable: ; 1217b (4:617b) MultichoiceTextbox_ConfigTable_ChooseDeckToDuelAgainst: ;1224b - db $04, $00 ; x, y to start drawing box - db $10, $08 ; width, height of box - db $06, $02 ; x, y coordinate to start printing next text - tx Text03f6 ; text id to print next - db $06, $04 ; x, y coordinate to start printing next text - tx Text03f7 ; text id to print next - db $06, $06 ; x, y coordinate to start printing next text - tx Text03f8 ; text id to print next - db $ff ; marker byte -- end text entries - db $05, $02 ; cursor starting x, y - db $02 ; number of tiles the cursor moves per toggle - db $03 ; cursor max index - db $0f ; curor image + db $04, $00 ; x, y to start drawing box + db $10, $08 ; width, height of box + db $06, $02 ; x, y coordinate to start printing next text + tx Text03f6 ; text id to print next + db $06, $04 ; x, y coordinate to start printing next text + tx Text03f7 ; text id to print next + db $06, $06 ; x, y coordinate to start printing next text + tx Text03f8 ; text id to print next + db $ff ; marker byte -- end text entries + db $05, $02 ; cursor starting x, y + db $02 ; number of tiles the cursor moves per toggle + db $03 ; cursor max index + db $0f ; curor image db $00, $00, $00 ; marker bytes -- end of config table MultichoiceTextbox_ConfigTable_ChooseDeckStarterDeck: ;12264 - db $04, $00 ; x, y to start drawing box - db $10, $08 ; width, height of box - db $06, $02 ; x, y coordinate to start printing next text - tx Text03fa ; text id to print next - db $06, $04 ; x, y coordinate to start printing next text - tx Text03fb ; text id to print next - db $06, $06 ; x, y coordinate to start printing next text - tx Text03fc ; text id to print next - db $ff ; marker byte -- end text entries - db $05, $02 ; cursor starting x, y - db $02 ; number of tiles the cursor moves per toggle - db $03 ; cursor max index - db $0f ; curor image + db $04, $00 ; x, y to start drawing box + db $10, $08 ; width, height of box + db $06, $02 ; x, y coordinate to start printing next text + tx Text03fa ; text id to print next + db $06, $04 ; x, y coordinate to start printing next text + tx Text03fb ; text id to print next + db $06, $06 ; x, y coordinate to start printing next text + tx Text03fc ; text id to print next + db $ff ; marker byte -- end text entries + db $05, $02 ; cursor starting x, y + db $02 ; number of tiles the cursor moves per toggle + db $03 ; cursor max index + db $0f ; curor image db $00, $00, $00 ; marker bytes -- end of config table SamNormalMultichoice_ConfigurationTable: ;1227d - db $0A, $00 ; x, y to start drawing box - db $0A, $0A ; width, height of box - db $0C, $02 ; x, y coordinate to start printing next text - tx Text03ff ; text id to print next - db $ff ; marker byte -- end text entries - db $0b, $02 ; cursor starting x, y - db $02 ; number of tiles the cursor moves per toggle - db $04 ; cursor max index - db $0f ; curor image + db $0A, $00 ; x, y to start drawing box + db $0A, $0A ; width, height of box + db $0C, $02 ; x, y coordinate to start printing next text + tx Text03ff ; text id to print next + db $ff ; marker byte -- end text entries + db $0b, $02 ; cursor starting x, y + db $02 ; number of tiles the cursor moves per toggle + db $04 ; cursor max index + db $0f ; curor image db $00, $00, $00 ; marker bytes -- end of config table SamTutorialMultichoice_ConfigurationTable: ;1228e - db $06, $00 ; x, y to start drawing box - db $0E, $12 ; width, height of box - db $08, $02 ; x coordinate to start printing text - tx Text0400 ; text id to print next - db $ff ; marker byte -- end text entries - db $07, $02 ; cursor starting x, y - db $02 ; number of tiles the cursor moves per toggle - db $08 ; cursor max index - db $0f ; curor image + db $06, $00 ; x, y to start drawing box + db $0E, $12 ; width, height of box + db $08, $02 ; x coordinate to start printing text + tx Text0400 ; text id to print next + db $ff ; marker byte -- end text entries + db $07, $02 ; cursor starting x, y + db $02 ; number of tiles the cursor moves per toggle + db $08 ; cursor max index + db $0f ; curor image db $00, $00, $00 ; marker bytes -- end of config table -- cgit v1.2.3 From 07b56455e045fe722484e78e3ef16edaca7b5aa1 Mon Sep 17 00:00:00 2001 From: E Date: Tue, 15 Dec 2020 18:11:56 -0600 Subject: adding wram union + fixing location comment --- src/engine/bank03.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/engine') diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm index 21977c8..4e53dfd 100644 --- a/src/engine/bank03.asm +++ b/src/engine/bank03.asm @@ -1912,7 +1912,7 @@ ScriptCommand_StartBattle: ; cd01 (3:4d01) ld a, [wcc19] cp $ff jr nz, .asm_cd26 - ld a, [wMultichoiceTextboxResult_ChooseDeckToDuelAgainst] + ld a, [wd695] ld c, a ld b, $0 ld hl, AaronDeckIDs @@ -2864,7 +2864,7 @@ ScriptCommand_ShowSamNormalMultichoice: ; d2f6 (3:52f6) dw $0000 ; location of table containing text entries -ScriptCommand_ShowSamTutorialMultichoice: ; d317 (s) +ScriptCommand_ShowSamTutorialMultichoice: ; d317 (3:5317) ld hl, .multichoice_menu_args ld a, [wMultichoiceTextboxResult_Sam] call ShowMultichoiceTextbox -- cgit v1.2.3