diff options
| author | dannye <33dannye@gmail.com> | 2021-10-15 17:09:10 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-10-15 17:09:10 -0500 |
| commit | c259f271d96c878d6c82a84378719790cc0b80b4 (patch) | |
| tree | 3933a8b31dcd0fce94afea888595c280d4eab3fc /src/engine/overworld | |
| parent | d9baef02df5210fcd829b15a6f1e14c87545934e (diff) | |
Split part of bank 4
Diffstat (limited to 'src/engine/overworld')
| -rw-r--r-- | src/engine/overworld/overworld.asm | 2 | ||||
| -rw-r--r-- | src/engine/overworld/scripting.asm | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/engine/overworld/overworld.asm b/src/engine/overworld/overworld.asm index 3ff69c3..273f275 100644 --- a/src/engine/overworld/overworld.asm +++ b/src/engine/overworld/overworld.asm @@ -242,7 +242,7 @@ Func_c1b1: call DetermineImakuniAndChallengeHall farcall Func_80b7a farcall ClearMasterBeatenList - farcall Func_131b3 + farcall ChallengeMachine_Reset xor a ld [wPlayTimeCounter + 0], a ld [wPlayTimeCounter + 1], a diff --git a/src/engine/overworld/scripting.asm b/src/engine/overworld/scripting.asm index 9150585..442bb7b 100644 --- a/src/engine/overworld/scripting.asm +++ b/src/engine/overworld/scripting.asm @@ -1575,7 +1575,7 @@ ScriptCommand_ChooseDeckToDuelAgainstMultichoice: set_event_value EVENT_AARON_DECK_MENU_CHOICE jp IncreaseScriptPointerBy1 -.multichoice_menu_args ; d25e +.multichoice_menu_args dw NULL ; NPC title for textbox under menu tx SelectDeckToDuelText ; text for textbox under menu dw MultichoiceTextbox_ConfigTable_ChooseDeckToDuelAgainst ; location of table configuration in bank 4 @@ -1583,7 +1583,7 @@ ScriptCommand_ChooseDeckToDuelAgainstMultichoice: dw wMultichoiceTextboxResult_ChooseDeckToDuelAgainst ; ram location to return result into dw .text_entries ; location of table containing text entries -.text_entries ; d269 +.text_entries tx LightningAndFireDeckChoiceText tx WaterAndFightingDeckChoiceText tx GrassAndPsychicDeckChoiceText @@ -1596,7 +1596,7 @@ ScriptCommand_ChooseStarterDeckMultichoice: call ShowMultichoiceTextbox jp IncreaseScriptPointerBy1 -.multichoice_menu_args ; d27b +.multichoice_menu_args dw NULL ; NPC title for textbox under menu tx SelectDeckToTakeText ; text for textbox under menu dw MultichoiceTextbox_ConfigTable_ChooseDeckStarterDeck ; location of table configuration in bank 4 @@ -1703,7 +1703,7 @@ ScriptCommand_ShowSamNormalMultichoice: ld [wMultichoiceTextboxResult_Sam], a jp IncreaseScriptPointerBy1 -.multichoice_menu_args ; d30c +.multichoice_menu_args tx SamNPCName ; NPC title for textbox under menu tx HowCanIHelpText ; text for textbox under menu dw SamNormalMultichoice_ConfigurationTable ; location of table configuration in bank 4 |