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

Rename teachy_tv static objects

Browse Source
This commit is contained in:
PikalaxALT
2019-06-11 10:25:33 -04:00
parent 75a89830a9
commit 423dc1aeb1
1 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/teachy_tv.c
+41 -41
View File
@@ -66,7 +66,7 @@ struct TeachyTvBuf
u8 scrollIndicatorArrowPairId; u8 scrollIndicatorArrowPairId;
}; };
static EWRAM_DATA struct TeachyTvCtrlBlk gTeachyTV_StaticResources = {0}; static EWRAM_DATA struct TeachyTvCtrlBlk sStaticResources = {0};
static EWRAM_DATA struct TeachyTvBuf * sResources = NULL; static EWRAM_DATA struct TeachyTvBuf * sResources = NULL;
static void TTVcmd_TransitionRenderBg2TeachyTvGraphicInitNpcPos(u8 taskId); static void TTVcmd_TransitionRenderBg2TeachyTvGraphicInitNpcPos(u8 taskId);
@@ -118,7 +118,7 @@ static void TeachyTvComputeSingleMapTileBlockFromTilesetAndMetaTiles(u8 *blockBu
static u16 TeachyTvComputePalIndexArrayEntryByMetaTile(u8 *palIndexArrayBuf, u16 metaTile); static u16 TeachyTvComputePalIndexArrayEntryByMetaTile(u8 *palIndexArrayBuf, u16 metaTile);
static void TeachyTvLoadMapPalette(const struct MapData * mStruct, const u8 *palIndexArray); static void TeachyTvLoadMapPalette(const struct MapData * mStruct, const u8 *palIndexArray);
static const struct BgTemplate gTeachyTvBgTemplateArray[] = static const struct BgTemplate sBgTemplates[] =
{ {
{ {
.bg = 0, .bg = 0,
@@ -158,7 +158,7 @@ static const struct BgTemplate gTeachyTvBgTemplateArray[] =
}, },
}; };
static const struct WindowTemplate gTeachyTvWindowTemplateArray[] = static const struct WindowTemplate sWindowTemplates[] =
{ {
{ {
.bg = 1, .bg = 1,
@@ -435,32 +435,32 @@ static void TeachyTvVblankHandler(void)
void InitTeachyTvController(u8 mode, MainCallback cb) void InitTeachyTvController(u8 mode, MainCallback cb)
{ {
gTeachyTV_StaticResources.mode = mode; sStaticResources.mode = mode;
gTeachyTV_StaticResources.callback = cb; sStaticResources.callback = cb;
if (mode == 0) if (mode == 0)
{ {
gTeachyTV_StaticResources.scrollOffset = 0; sStaticResources.scrollOffset = 0;
gTeachyTV_StaticResources.selectedRow = 0; sStaticResources.selectedRow = 0;
gTeachyTV_StaticResources.whichScript = TTVSCR_BATTLE; sStaticResources.whichScript = TTVSCR_BATTLE;
} }
if (mode == 1) if (mode == 1)
{ {
gTeachyTV_StaticResources.mode = 0; sStaticResources.mode = 0;
} }
SetMainCallback2(TeachyTvMainCallback); SetMainCallback2(TeachyTvMainCallback);
} }
void CB2_ReturnToTeachyTV(void) void CB2_ReturnToTeachyTV(void)
{ {
if (gTeachyTV_StaticResources.mode == 1) if (sStaticResources.mode == 1)
InitTeachyTvController(1, gTeachyTV_StaticResources.callback); InitTeachyTvController(1, sStaticResources.callback);
else else
InitTeachyTvController(2, gTeachyTV_StaticResources.callback); InitTeachyTvController(2, sStaticResources.callback);
} }
void SetTeachyTvControllerModeToResume(void) void SetTeachyTvControllerModeToResume(void)
{ {
gTeachyTV_StaticResources.mode = 1; sStaticResources.mode = 1;
} }
static void TeachyTvMainCallback(void) static void TeachyTvMainCallback(void)
@@ -491,7 +491,7 @@ static void TeachyTvMainCallback(void)
return; return;
TeachyTvCreateAndRenderRbox(); TeachyTvCreateAndRenderRbox();
TeachyTvInitIo(); TeachyTvInitIo();
if (gTeachyTV_StaticResources.mode == 2) if (sStaticResources.mode == 2)
{ {
taskId = CreateTask(TeachyTvPostBattleFadeControl, 0); taskId = CreateTask(TeachyTvPostBattleFadeControl, 0);
gTasks[taskId].data[1] = TeachyTvSetupObjEventAndOam(); gTasks[taskId].data[1] = TeachyTvSetupObjEventAndOam();
@@ -523,7 +523,7 @@ static void TeachyTvSetupBg(void)
{ {
InitBgReg(); InitBgReg();
ResetBgsAndClearDma3BusyFlags(0); ResetBgsAndClearDma3BusyFlags(0);
InitBgsFromTemplates(0, gTeachyTvBgTemplateArray, 4); InitBgsFromTemplates(0, sBgTemplates, 4);
SetBgTilemapBuffer(1, sResources->buffer1); SetBgTilemapBuffer(1, sResources->buffer1);
SetBgTilemapBuffer(2, sResources->buffer2); SetBgTilemapBuffer(2, sResources->buffer2);
SetBgTilemapBuffer(3, sResources->buffer3); SetBgTilemapBuffer(3, sResources->buffer3);
@@ -554,7 +554,7 @@ static void TeachyTvLoadGraphic(void)
static void TeachyTvCreateAndRenderRbox(void) static void TeachyTvCreateAndRenderRbox(void)
{ {
InitWindows(gTeachyTvWindowTemplateArray); InitWindows(sWindowTemplates);
DeactivateAllTextPrinters(); DeactivateAllTextPrinters();
FillWindowPixelBuffer(0, 0xCC); FillWindowPixelBuffer(0, 0xCC);
PutWindowTilemap(0); PutWindowTilemap(0);
@@ -576,8 +576,8 @@ static u8 TeachyTvSetupWindow(void)
} }
return ListMenuInit( return ListMenuInit(
&gMultiuseListMenuTemplate, &gMultiuseListMenuTemplate,
gTeachyTV_StaticResources.scrollOffset, sStaticResources.scrollOffset,
gTeachyTV_StaticResources.selectedRow sStaticResources.selectedRow
); );
} }
@@ -590,7 +590,7 @@ static void TeachyTvSetupScrollIndicatorArrowPair(void)
} }
else else
{ {
sResources->scrollIndicatorArrowPairId = AddScrollIndicatorArrowPair(&sScrollIndicatorArrowPair, &(gTeachyTV_StaticResources.scrollOffset)); sResources->scrollIndicatorArrowPairId = AddScrollIndicatorArrowPair(&sScrollIndicatorArrowPair, &(sStaticResources.scrollOffset));
} }
} }
@@ -666,7 +666,7 @@ static void TeachyTvSetupPostBattleWindowAndObj(u8 taskId)
ClearWindowTilemap(1); ClearWindowTilemap(1);
TeachyTvClearWindowRegs(); TeachyTvClearWindowRegs();
switch (gTeachyTV_StaticResources.whichScript) switch (sStaticResources.whichScript)
{ {
case TTVSCR_BATTLE: case TTVSCR_BATTLE:
case TTVSCR_STATUS: case TTVSCR_STATUS:
@@ -719,7 +719,7 @@ static void TeachyTvQuitFadeControlAndTaskDel(u8 taskId)
else else
{ {
sub_8055DC4(); sub_8055DC4();
SetMainCallback2(gTeachyTV_StaticResources.callback); SetMainCallback2(sStaticResources.callback);
} }
TeachyTvFree(); TeachyTvFree();
DestroyTask(taskId); DestroyTask(taskId);
@@ -735,8 +735,8 @@ static void TeachyTvOptionListController(u8 taskId)
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
input = ListMenuHandleInput(data[0]); input = ListMenuHandleInput(data[0]);
ListMenuGetScrollAndRow(data[0], &gTeachyTV_StaticResources.scrollOffset, &gTeachyTV_StaticResources.selectedRow); ListMenuGetScrollAndRow(data[0], &sStaticResources.scrollOffset, &sStaticResources.selectedRow);
if ((JOY_NEW(SELECT_BUTTON) && gTeachyTV_StaticResources.callback != UseFameCheckerFromMenu)) if ((JOY_NEW(SELECT_BUTTON) && sStaticResources.callback != UseFameCheckerFromMenu))
{ {
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
TeachyTvQuitBeginFade(taskId); TeachyTvQuitBeginFade(taskId);
@@ -753,8 +753,8 @@ static void TeachyTvOptionListController(u8 taskId)
break; break;
default: default:
PlaySE(SE_SELECT); PlaySE(SE_SELECT);
gTeachyTV_StaticResources.whichScript = input; sStaticResources.whichScript = input;
DestroyListMenu(data[0], &gTeachyTV_StaticResources.scrollOffset, &gTeachyTV_StaticResources.selectedRow); DestroyListMenu(data[0], &sStaticResources.scrollOffset, &sStaticResources.selectedRow);
TeachyTvClearWindowRegs(); TeachyTvClearWindowRegs();
ClearWindowTilemap(1); ClearWindowTilemap(1);
schedule_bg_copy_tilemap_to_vram(0); schedule_bg_copy_tilemap_to_vram(0);
@@ -846,7 +846,7 @@ static void TeachyTvRenderMsgAndSwitchClusterFuncs(u8 taskId)
sTMsScript, sTMsScript,
sRegisterKeyItemScript, sRegisterKeyItemScript,
}; };
void (*const *cluster)(u8) = array[gTeachyTV_StaticResources.whichScript]; void (*const *cluster)(u8) = array[sStaticResources.whichScript];
cluster[data[3]](taskId); cluster[data[3]](taskId);
} }
} }
@@ -862,7 +862,7 @@ static void TTVcmd_TextPrinterSwitchStringByOptionChosen(u8 taskId)
gTeachyTvText_TMsScript1, gTeachyTvText_TMsScript1,
gTeachyTvText_RegisterScript1, gTeachyTvText_RegisterScript1,
}; };
TeachyTvInitTextPrinter(texts[gTeachyTV_StaticResources.whichScript]); TeachyTvInitTextPrinter(texts[sStaticResources.whichScript]);
++data[3]; ++data[3];
} }
@@ -878,17 +878,17 @@ static void TTVcmd_TextPrinterSwitchStringByOptionChosen2(u8 taskId)
gTeachyTvText_TMsScript2, gTeachyTvText_TMsScript2,
gTeachyTvText_RegisterScript2, gTeachyTvText_RegisterScript2,
}; };
TeachyTvInitTextPrinter(texts[gTeachyTV_StaticResources.whichScript]); TeachyTvInitTextPrinter(texts[sStaticResources.whichScript]);
++data[3]; ++data[3];
} }
static const u16 gUnknown_8479590[] = static const u16 sBg1EndGraphic[] =
{ {
0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8,
0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE1, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8,
}; };
static const struct Subsprite gTeachyTvSubspriteArray[] = static const struct Subsprite sSubspriteArray[] =
{ {
{ {
.x = -0x8, .x = -0x8,
@@ -908,7 +908,7 @@ static const struct Subsprite gTeachyTvSubspriteArray[] =
}, },
}; };
static const struct SubspriteTable gTeachyTvSubspriteTableArray[] = static const struct SubspriteTable sSubspriteTableArray[] =
{ {
{ {
.subspriteCount = 0, .subspriteCount = 0,
@@ -916,11 +916,11 @@ static const struct SubspriteTable gTeachyTvSubspriteTableArray[] =
}, },
{ {
.subspriteCount = 2, .subspriteCount = 2,
.subsprites = gTeachyTvSubspriteArray, .subsprites = sSubspriteArray,
}, },
}; };
static const u8 gTeachyTvGrassAnimArray[] = static const u8 sGrassAnimArray[] =
{ {
0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0,
@@ -1039,7 +1039,7 @@ static void TTVcmd_RenderAndRemoveBg1EndGraphic(u8 taskId)
s16 *data = gTasks[taskId].data; s16 *data = gTasks[taskId].data;
if (!data[2]) if (!data[2])
{ {
CopyToBgTilemapBufferRect_ChangePalette(1, gUnknown_8479590, 20, 10, 8, 2, 0x11); CopyToBgTilemapBufferRect_ChangePalette(1, sBg1EndGraphic, 20, 10, 8, 2, 0x11);
schedule_bg_copy_tilemap_to_vram(1); schedule_bg_copy_tilemap_to_vram(1);
} }
if (++data[2] > 126) if (++data[2] > 126)
@@ -1084,7 +1084,7 @@ static void TTVcmd_End(u8 taskId)
static void TTVcmd_TaskBattleOrFadeByOptionChosen(u8 taskId) static void TTVcmd_TaskBattleOrFadeByOptionChosen(u8 taskId)
{ {
switch (gTeachyTV_StaticResources.whichScript) switch (sStaticResources.whichScript)
{ {
case TTVSCR_BATTLE: case TTVSCR_BATTLE:
case TTVSCR_STATUS: case TTVSCR_STATUS:
@@ -1102,7 +1102,7 @@ static void TTVcmd_TaskBattleOrFadeByOptionChosen(u8 taskId)
static void TeachyTvSetupBagItemsByOptionChosen(void) static void TeachyTvSetupBagItemsByOptionChosen(void)
{ {
if (gTeachyTV_StaticResources.whichScript == TTVSCR_TMS) if (sStaticResources.whichScript == TTVSCR_TMS)
sub_810B108(10); sub_810B108(10);
else else
sub_810B108(9); sub_810B108(9);
@@ -1113,7 +1113,7 @@ static void TeachyTvPostBattleFadeControl(u8 taskId)
s16 *data = gTasks[taskId].data; s16 *data = gTasks[taskId].data;
if (!(gPaletteFade.active)) if (!(gPaletteFade.active))
{ {
data[3] = sWhereToReturnToFromBattle[gTeachyTV_StaticResources.whichScript]; data[3] = sWhereToReturnToFromBattle[sStaticResources.whichScript];
gTasks[taskId].func = TeachyTvRenderMsgAndSwitchClusterFuncs; gTasks[taskId].func = TeachyTvRenderMsgAndSwitchClusterFuncs;
} }
} }
@@ -1138,7 +1138,7 @@ static void TeachyTvGrassAnimationMain(u8 taskId, s16 x, s16 y, u8 subpriority,
} }
else else
{ {
SetSubspriteTables(obj, gTeachyTvSubspriteTableArray); SetSubspriteTables(obj, sSubspriteTableArray);
obj->subspriteTableNum = 0; obj->subspriteTableNum = 0;
obj->subspriteMode = 1; obj->subspriteMode = 1;
} }
@@ -1179,7 +1179,7 @@ static u8 TeachyTvGrassAnimationCheckIfNeedsToGenerateGrassObj(s16 x, s16 y)
int high, low; int high, low;
if ((x < 0) || (y < 0)) if ((x < 0) || (y < 0))
return 0; return 0;
arr = gTeachyTvGrassAnimArray; arr = sGrassAnimArray;
high = ((y >> 4) + sResources->grassAnimCounterHi) << 4; high = ((y >> 4) + sResources->grassAnimCounterHi) << 4;
low = ((x >> 4) + sResources->grassAnimCounterLo); low = ((x >> 4) + sResources->grassAnimCounterLo);
return arr[high+low]; return arr[high+low];
@@ -1189,12 +1189,12 @@ static void TeachyTvPrepBattle(u8 taskId)
{ {
s16 *data = gTasks[taskId].data; s16 *data = gTasks[taskId].data;
TeachyTvFree(); TeachyTvFree();
gSpecialVar_0x8004 = gTeachyTV_StaticResources.whichScript; gSpecialVar_0x8004 = sStaticResources.whichScript;
gMain.savedCallback = TeachyTvRestorePlayerPartyCallback; gMain.savedCallback = TeachyTvRestorePlayerPartyCallback;
SavePlayerParty(); SavePlayerParty();
sub_8159F40(); sub_8159F40();
PlayMapChosenOrBattleBGM(MUS_DUMMY); PlayMapChosenOrBattleBGM(MUS_DUMMY);
if (gTeachyTV_StaticResources.whichScript == TTVSCR_BATTLE) if (sStaticResources.whichScript == TTVSCR_BATTLE)
data[6] = 9; data[6] = 9;
else else
data[6] = 8; data[6] = 8;