dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

savedCallback field

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-06-11 07:24:12 +08:00
parent e87ae0c76d
commit 191f3f783f
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/teachy_tv.c
+5 -5
View File
@@ -46,7 +46,7 @@ struct TeachyTvCtrlBlk
struct TeachyTvBuf struct TeachyTvBuf
{ {
u32 state; MainCallback savedCallback;
u8 buffer1[0x1000]; u8 buffer1[0x1000];
u8 buffer2[0x1000]; u8 buffer2[0x1000];
u8 buffer3[0x1000]; u8 buffer3[0x1000];
@@ -476,7 +476,7 @@ void TeachyTvMainCallback(void)
{ {
case 0: case 0:
gUnknown_203F450 = AllocZeroed(sizeof(struct TeachyTvBuf)); gUnknown_203F450 = AllocZeroed(sizeof(struct TeachyTvBuf));
gUnknown_203F450->state = 0; gUnknown_203F450->savedCallback = NULL;
gUnknown_203F450->var_4006 = 0; gUnknown_203F450->var_4006 = 0;
gUnknown_203F450->var_4007 = 0xFF; gUnknown_203F450->var_4007 = 0xFF;
VblankHblankHandlerSetZero(); VblankHblankHandlerSetZero();
@@ -717,9 +717,9 @@ void TeachyTvQuitFadeControlAndTaskDel(u8 taskId)
{ {
if (!(gPaletteFade.active)) if (!(gPaletteFade.active))
{ {
if (gUnknown_203F450->state) if (gUnknown_203F450->savedCallback != NULL)
{ {
SetMainCallback2(*(void (**)())gUnknown_203F450); SetMainCallback2(gUnknown_203F450->savedCallback);
} }
else else
{ {
@@ -1094,7 +1094,7 @@ void TeachyTvClusFuncTaskBattleOrFadeByOptionChosen(u8 taskId)
} }
else if (op <= 5) else if (op <= 5)
{ {
*((void(**)())gUnknown_203F450) = TeachyTvSetupBagItemsByOptionChosen; gUnknown_203F450->savedCallback = TeachyTvSetupBagItemsByOptionChosen;
TeachyTvQuitBeginFade(taskId); TeachyTvQuitBeginFade(taskId);
} }
} }