diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/bank03.asm | 4 | ||||
| -rw-r--r-- | src/wram.asm | 11 |
2 files changed, 13 insertions, 2 deletions
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 diff --git a/src/wram.asm b/src/wram.asm index 2d39fb7..a6a5604 100644 --- a/src/wram.asm +++ b/src/wram.asm @@ -2558,10 +2558,21 @@ wd693:: ; d693 wMultichoiceTextboxResult_Sam:: ; d694 ds $1 + +UNION wMultichoiceTextboxResult_ChooseDeckToDuelAgainst:: ; d695 ds $1 +NEXTU + +wd695:: ; d695 + ds $1 + +ENDU + + + wd696:: ; d696 ds $1 |