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

var names

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-06-06 14:04:39 +08:00
parent ea4d62e57a
commit 598a2fb60f
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/teachy_tv.c
+13 -14
View File
@@ -29,7 +29,6 @@
#include "battle.h" #include "battle.h"
#include "global.fieldmap.h" #include "global.fieldmap.h"
typedef struct Task Task;
typedef struct { typedef struct {
void (*callback)(); void (*callback)();
u8 mode; u8 mode;
@@ -127,18 +126,18 @@ void TeachyTvVblankHandler()
void sub_815ABC4(u8 mode, void (*cb)()) void sub_815ABC4(u8 mode, void (*cb)())
{ {
TeachyTv_s *v3 = &gTeachyTV_StaticResources; TeachyTv_s *resAddr = &gTeachyTV_StaticResources;
u16 v4 = 0; u16 v4 = 0;
v3->mode = mode; resAddr->mode = mode;
v3->callback = cb; resAddr->callback = cb;
if(!mode) if(!mode)
{ {
v3->scrollOffset = v4; resAddr->scrollOffset = v4;
v3->selectedRow = v4; resAddr->selectedRow = v4;
v3->optionChosen = 0; resAddr->optionChosen = 0;
} }
if(mode == 1) if(mode == 1)
v3->mode = 0; resAddr->mode = 0;
SetMainCallback2(TeachyTvMainCallback); SetMainCallback2(TeachyTvMainCallback);
} }
@@ -159,8 +158,8 @@ void TeachyTvMainCallback()
{ {
int state; int state;
int taskId; int taskId;
Task *taskAddr; struct Task *taskAddr;
u8 **v4; u8 **memBuf;
u32 x; u32 x;
state = gMain.state; state = gMain.state;
@@ -171,8 +170,8 @@ void TeachyTvMainCallback()
else else
return; return;
RESETANDLOAD: RESETANDLOAD:
v4 = (u8 **)&gUnknown_203F450; memBuf = (u8 **)&gUnknown_203F450;
(*v4) = (u8*)AllocZeroed(0x4008u); (*memBuf) = (u8*)AllocZeroed(0x4008u);
*(u32*)gUnknown_203F450 = (u32)state; *(u32*)gUnknown_203F450 = (u32)state;
*((u8*)gUnknown_203F450 + 0x4006) = state; *((u8*)gUnknown_203F450 + 0x4006) = state;
*((u8*)gUnknown_203F450 + 0x4007) = 0xFF; *((u8*)gUnknown_203F450 + 0x4007) = 0xFF;
@@ -296,8 +295,8 @@ void TeachyTvSetupScrollIndicatorArrowPair()
else { else {
u8 *temp, res; u8 *temp, res;
res = AddScrollIndicatorArrowPair( res = AddScrollIndicatorArrowPair(
&gUnknown_8479380, &gUnknown_8479380,
&(gTeachyTV_StaticResources.scrollOffset)); &(gTeachyTV_StaticResources.scrollOffset));
temp = (u8 *)gUnknown_203F450; temp = (u8 *)gUnknown_203F450;
*((u8 *)temp + 0x4007) = res; *((u8 *)temp + 0x4007) = res;
} }