diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-14 10:29:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-14 10:29:13 -0400 |
| commit | 8efae5c807bf6b27f5c90bfb0c5887dbde24f10d (patch) | |
| tree | 0680b08568c4c38b96b78d793e7426a85016dce6 /src/teachy_tv.c | |
| parent | 6bffe8613e2f764a03f551ad61b360dab9395eec (diff) | |
| parent | d4c9b7782835ec6e31fee4e7c18351658da087cd (diff) | |
Merge pull request #118 from PikalaxALT/start_menu
Decompile start_menu
Diffstat (limited to 'src/teachy_tv.c')
| -rw-r--r-- | src/teachy_tv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/teachy_tv.c b/src/teachy_tv.c index 18da0997c..aa273073b 100644 --- a/src/teachy_tv.c +++ b/src/teachy_tv.c @@ -510,7 +510,7 @@ static void TeachyTvMainCallback(void) ScheduleBgCopyTilemapToVram(1); ScheduleBgCopyTilemapToVram(2); ScheduleBgCopyTilemapToVram(3); - sub_812B1E0(9); // help system something + HelpSystem_SetSomeVariable(9); // help system something BlendPalettes(0xFFFFFFFF, 0x10, 0); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); SetVBlankCallback(TeachyTvVblankHandler); @@ -736,7 +736,7 @@ static void TeachyTvOptionListController(u8 taskId) { input = ListMenu_ProcessInput(data[0]); ListMenuGetScrollAndRow(data[0], &sStaticResources.scrollOffset, &sStaticResources.selectedRow); - if ((JOY_NEW(SELECT_BUTTON) && sStaticResources.callback != ReturnToBagFromKeyItem)) + if ((JOY_NEW(SELECT_BUTTON) && sStaticResources.callback != CB2_BagMenuFromStartMenu)) { PlaySE(SE_SELECT); TeachyTvQuitBeginFade(taskId); |