summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/engine/bank03.asm6
-rw-r--r--src/engine/bank04.asm4
-rw-r--r--src/macros/scripts.asm4
3 files changed, 7 insertions, 7 deletions
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
diff --git a/src/macros/scripts.asm b/src/macros/scripts.asm
index 963d3e9..85f8764 100644
--- a/src/macros/scripts.asm
+++ b/src/macros/scripts.asm
@@ -69,9 +69,9 @@ ENDM
const Func_d1b3_index ; $34
const ScriptCommand_QuitScriptFully_index ; $35
const Func_d244_index ; $36
- const Show_ChooseDeckToDuelAgainst_MultichoiceTextbox_index ; $37
+ const ScriptCommand_ShowMultichoiceTextbox_ChooseDeckToDuelAgainst_index ; $37
const ScriptCommand_OpenDeckMachine_index ; $38
- const Show_ChooseStarterDeck_MultichoiceTextbox_index ; $39
+ const ScriptCommand_ShowMultichoiceTextbox_ChooseStarterDeck_index ; $39
const ScriptCommand_EnterMap_index ; $3a
const ScriptCommand_MoveArbitraryNPC_index ; $3b
const Func_d209_index ; $3c