summaryrefslogtreecommitdiff
path: root/src/teachy_tv.c
diff options
context:
space:
mode:
authorjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-06-04 00:00:21 +0800
committerjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-06-04 00:00:21 +0800
commitb6a166c45960e1963bf508f83b9da1a8d6a71df4 (patch)
tree39e06d47551a9a8f740a7ee3f180dfb96c152387 /src/teachy_tv.c
parent49a1de36d38b41b0f3f7c443acc636281314b749 (diff)
more symbol name fixes
Diffstat (limited to 'src/teachy_tv.c')
-rw-r--r--src/teachy_tv.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/teachy_tv.c b/src/teachy_tv.c
index 60b182575..9e34cdb70 100644
--- a/src/teachy_tv.c
+++ b/src/teachy_tv.c
@@ -18,13 +18,14 @@
#include "menu_indicators.h"
#include "field_map_obj.h"
#include "random.h"
+#include "text.h"
#include "constants/songs.h"
#include "constants/items.h"
typedef struct {
void (*callback)();
u8 mode;
- u8 param1;
+ u8 optionChosen;
u16 scrollOffset;
u16 selectedRow;
u8 param4;
@@ -48,7 +49,7 @@ void TeachyTvSetupScrollIndicatorArrowPair();
void TeachyTvSetWindowRegs();
void TeachyTvSetupBg();
void TeachyTvLoadGraphic();
-extern void TeachyTvTaskFunction(u8);
+extern void TeachyTvPostBattleFadeControl(u8);
extern void sub_815B2C0(u8);
extern void VblankHblankHandlerSetZero();
extern void sub_812B1E0(u16);
@@ -89,7 +90,7 @@ void sub_815ABC4(u8 mode, void (*cb)())
if(!mode) {
v3->scrollOffset = v4;
v3->selectedRow = v4;
- v3->param1 = 0;
+ v3->optionChosen = 0;
}
if(mode == 1)
v3->mode = 0;
@@ -112,7 +113,6 @@ void sub_815AC20()
void C2TeachyTvMainCallback()
{
int state;
- void *mallocPtr;
int taskId;
Task *taskAddr;
u8 **v4;
@@ -150,7 +150,7 @@ void C2TeachyTvMainCallback()
TeachyTvInitIo();
if ( gTeachyTV_StaticResources.mode == 2 )
{
- taskId = CreateTask(TeachyTvTaskFunction, 0);
+ taskId = CreateTask(TeachyTvPostBattleFadeControl, 0);
gTasks[taskId].data[1] = TeachyTvSetupObjEventAndOam();
TeachyTvSetupPostBattleWindowAndObj(taskId);
}