more symbol name fixes

asm/berry_pouch.s

@@ -1694,7 +1694,7 @@ _0813DA9E:
 	ldr r4, _0813DAE0 @ =gUnknown_203F37A
 	subs r2, r4, 0x2
 	adds r1, r4, 0
-	bl get_coro_args_x18_x1A
+	bl ListMenuGetScrollAndRow
 	ldr r0, _0813DAE4 @ =gMain
 	ldrh r1, [r0, 0x2E]
 	movs r0, 0x4

asm/field_specials.s

@@ -2753,7 +2753,7 @@ sub_80CBADC: @ 80CBADC
 	ldr r4, _080CBB20 @ =gUnknown_3005378
 	adds r1, r4, 0
 	movs r2, 0
-	bl get_coro_args_x18_x1A
+	bl ListMenuGetScrollAndRow
 	ldr r1, _080CBB24 @ =gUnknown_2039A18
 	ldrh r0, [r4]
 	strh r0, [r1]

asm/item_menu.s

@@ -2313,7 +2313,7 @@ _08108FA0:
 	adds r4, 0x2
 	mov r1, sp
 	adds r2, r4, 0
-	bl get_coro_args_x18_x1A
+	bl ListMenuGetScrollAndRow
 	mov r0, sp
 	ldrh r1, [r0]
 	ldrh r0, [r4]
@@ -2353,7 +2353,7 @@ _08108FE4:
 	adds r3, r5, 0
 	adds r3, 0x8
 	adds r2, r3
-	bl get_coro_args_x18_x1A
+	bl ListMenuGetScrollAndRow
 	movs r0, 0x2
 	negs r0, r0
 	cmp r4, r0
@@ -2830,7 +2830,7 @@ sub_81093B8: @ 81093B8
 	mov r2, sp
 	adds r2, 0x16
 	add r1, sp, 0x14
-	bl get_coro_args_x18_x1A
+	bl ListMenuGetScrollAndRow
 	mov r2, r8
 	ldrb r0, [r2]
 	movs r1, 0x10
@@ -2942,7 +2942,7 @@ sub_81094B0: @ 81094B0
 	adds r1, r2, r1
 	adds r3, 0x8
 	adds r2, r3
-	bl get_coro_args_x18_x1A
+	bl ListMenuGetScrollAndRow
 	ldrb r0, [r4]
 	bl ListMenuGetYCoordForPrintingArrowCursor
 	adds r1, r0, 0
@@ -2967,7 +2967,7 @@ sub_81094B0: @ 81094B0
 	adds r4, 0x2
 	mov r1, sp
 	adds r2, r4, 0
-	bl get_coro_args_x18_x1A
+	bl ListMenuGetScrollAndRow
 	mov r0, sp
 	ldrh r1, [r0]
 	ldrh r0, [r4]
@@ -3001,7 +3001,7 @@ _08109558:
 	adds r4, 0x2
 	mov r1, sp
 	adds r2, r4, 0
-	bl get_coro_args_x18_x1A
+	bl ListMenuGetScrollAndRow
 	mov r0, sp
 	ldrh r1, [r0]
 	ldrh r0, [r4]
@@ -4573,7 +4573,7 @@ sub_810A288: @ 810A288
 	adds r6, 0x2
 	mov r1, sp
 	adds r2, r6, 0
-	bl get_coro_args_x18_x1A
+	bl ListMenuGetScrollAndRow
 	mov r0, sp
 	ldrh r0, [r0]
 	ldrh r1, [r6]

asm/item_pc.s

@@ -1403,7 +1403,7 @@ sub_810DEA0: @ 810DEA0
 	adds r4, 0x2
 	mov r1, sp
 	adds r2, r4, 0
-	bl get_coro_args_x18_x1A
+	bl ListMenuGetScrollAndRow
 	mov r0, sp
 	ldrh r1, [r0]
 	ldrh r0, [r4]
@@ -1436,7 +1436,7 @@ _0810DF20:
 	ldrb r0, [r6]
 	ldr r1, _0810DF44 @ =gUnknown_203ADD0
 	adds r2, r1, 0x2
-	bl get_coro_args_x18_x1A
+	bl ListMenuGetScrollAndRow
 	movs r0, 0x2
 	negs r0, r0
 	cmp r4, r0
@@ -1630,7 +1630,7 @@ sub_810E0B4: @ 810E0B4
 	ldr r7, _0810E120 @ =gUnknown_203ADD0
 	adds r2, r7, 0x2
 	adds r1, r7, 0
-	bl get_coro_args_x18_x1A
+	bl ListMenuGetScrollAndRow
 	movs r5, 0x20
 	negs r5, r5
 	ldrb r0, [r4]

asm/learn_move.s

@@ -736,7 +736,7 @@ _080E4C7E:
 	adds r1, r2, r3
 	ldr r6, _080E4CD4 @ =0x00000a6a
 	adds r2, r6
-	bl get_coro_args_x18_x1A
+	bl ListMenuGetScrollAndRow
 	bl FreeAllWindowBuffers
 	ldr r0, _080E4CD8 @ =gPlayerParty
 	ldr r5, [r7]

asm/list_menu.s

@@ -563,8 +563,8 @@ _081072CA:
 _081072D0: .4byte gTasks+0x8
 	thumb_func_end sub_81072AC
 
-	thumb_func_start get_coro_args_x18_x1A
+	thumb_func_start ListMenuGetScrollAndRow
-get_coro_args_x18_x1A: @ 81072D4
+ListMenuGetScrollAndRow: @ 81072D4
 	push {lr}
 	adds r3, r1, 0
 	lsls r0, 24
@@ -588,7 +588,7 @@ _081072F6:
 	bx r0
 	.align 2, 0
 _081072FC: .4byte gTasks+0x8
-	thumb_func_end get_coro_args_x18_x1A
+	thumb_func_end ListMenuGetScrollAndRow
 
 	thumb_func_start ListMenuGetYCoordForPrintingArrowCursor
 ListMenuGetYCoordForPrintingArrowCursor: @ 8107300

asm/player_pc.s

@@ -1142,7 +1142,7 @@ sub_80EBF40: @ 80EBF40
 	mov r8, r1
 	adds r1, r7, 0
 	mov r2, r8
-	bl get_coro_args_x18_x1A
+	bl ListMenuGetScrollAndRow
 	movs r0, 0x2
 	negs r0, r0
 	cmp r6, r0

asm/pokedex_screen.s

@@ -593,7 +593,7 @@ _081029D0:
 	ldrb r0, [r1, 0x17]
 	adds r1, 0x62
 	movs r2, 0
-	bl get_coro_args_x18_x1A
+	bl ListMenuGetScrollAndRow
 	bl sub_806E25C
 	cmp r0, 0
 	beq _081029F4
@@ -627,7 +627,7 @@ _08102A14:
 	ldrb r0, [r1, 0x17]
 	adds r1, 0x62
 	movs r2, 0
-	bl get_coro_args_x18_x1A
+	bl ListMenuGetScrollAndRow
 	ldr r0, _08102A4C @ =gMain
 	ldrh r1, [r0, 0x2E]
 	movs r3, 0x1
@@ -1367,7 +1367,7 @@ _0810307C:
 	ldrb r0, [r1, 0x17]
 	adds r1, 0x62
 	movs r2, 0
-	bl get_coro_args_x18_x1A
+	bl ListMenuGetScrollAndRow
 	bl sub_81039F0
 	ldr r1, [r4]
 	adds r1, 0x60
@@ -1385,7 +1385,7 @@ _08103098:
 	ldrb r0, [r1, 0x17]
 	adds r1, 0x62
 	movs r2, 0
-	bl get_coro_args_x18_x1A
+	bl ListMenuGetScrollAndRow
 	ldr r0, _081030F0 @ =gMain
 	ldrh r1, [r0, 0x2E]
 	movs r3, 0x1
@@ -1687,7 +1687,7 @@ _08103344:
 	ldrb r0, [r1, 0x17]
 	adds r1, 0x62
 	movs r2, 0
-	bl get_coro_args_x18_x1A
+	bl ListMenuGetScrollAndRow
 	bl sub_81039F0
 	ldr r1, [r4]
 	adds r1, 0x60
@@ -1706,7 +1706,7 @@ _08103362:
 	ldrb r0, [r1, 0x17]
 	adds r1, 0x62
 	movs r2, 0
-	bl get_coro_args_x18_x1A
+	bl ListMenuGetScrollAndRow
 	ldr r0, _081033C4 @ =gMain
 	ldrh r1, [r0, 0x2E]
 	movs r2, 0x1

asm/shop.s

@@ -2170,7 +2170,7 @@ sub_809BBC0: @ 809BBC0
 	ldr r7, _0809BC08 @ =gUnknown_2039942
 	subs r2, r7, 0x2
 	adds r1, r7, 0
-	bl get_coro_args_x18_x1A
+	bl ListMenuGetScrollAndRow
 	movs r0, 0x2
 	negs r0, r0
 	cmp r4, r0

asm/teachy_tv.s

@@ -238,7 +238,7 @@ sub_815B2C0: @ 815B2C0
 	ldr r4, _0815B324 @ =gTeachyTV_StaticResources+6
 	adds r2, r4, 0x2
 	adds r1, r4, 0
-	bl get_coro_args_x18_x1A
+	bl ListMenuGetScrollAndRow
 	ldr r0, _0815B328 @ =gMain
 	ldrh r1, [r0, 0x2E]
 	movs r0, 0x4
@@ -1186,8 +1186,8 @@ _0815BA4E:
 	bx r0
 	thumb_func_end sub_815BA30
 
-	thumb_func_start TeachyTvTaskFunction
+	thumb_func_start TeachyTvPostBattleFadeControl
-TeachyTvTaskFunction: @ 815BA54
+TeachyTvPostBattleFadeControl: @ 815BA54
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -1223,7 +1223,7 @@ _0815BA90: .4byte gPaletteFade
 _0815BA94: .4byte gUnknown_8479390
 _0815BA98: .4byte gTeachyTV_StaticResources
 _0815BA9C: .4byte sub_815B4EC
-	thumb_func_end TeachyTvTaskFunction
+	thumb_func_end TeachyTvPostBattleFadeControl
 
 	thumb_func_start sub_815BAA0
 sub_815BAA0: @ 815BAA0

include/global.fieldmap.h

@@ -51,8 +51,8 @@ struct Tileset
     /*0x04*/ void *tiles;
     /*0x08*/ void *palettes;
     /*0x0c*/ void *metatiles;
-    /*0x14*/ TilesetCB callback;
+    /*0x10*/ TilesetCB callback;
-    /*0x10*/ void *metatileAttributes;
+    /*0x14*/ void *metatileAttributes;
 };
 
 struct MapData

include/list_menu.h

@@ -54,7 +54,7 @@ extern struct ListMenuTemplate gMultiuseListMenuTemplate;
 
 u8 ListMenuInit(struct ListMenuTemplate *template, u16 a1, u16 a2);
 s32 ListMenuHandleInput(u8 id);
-void get_coro_args_x18_x1A(u8 a0, u16 *a1, u16 *a2);
+void ListMenuGetScrollAndRow(u8 a0, u16 *a1, u16 *a2);
 void sub_81AE6C8(u8 a0, u16 *a1, u16 *a2);
 void DestroyListMenu(u8, u16 *, u16 *);
 u16 ListMenuGetYCoordForPrintingArrowCursor(u8);

src/.fuse_hidden00001c3f00000004

@@ -0,0 +1,346 @@
+#include "main.h"
+#include "global.h"
+#include "task.h"
+#include "menu.h"
+#include "palette.h"
+#include "sprite.h"
+#include "menu_helpers.h"
+#include "sound.h"
+#include "malloc.h"
+#include "sprite.h"
+#include "scanline_effect.h"
+#include "bg.h"
+#include "gpu_regs.h"
+#include "decompress.h"
+#include "window.h"
+#include "list_menu.h"
+#include "item.h"
+#include "menu_indicators.h"
+#include "field_map_obj.h"
+#include "random.h"
+#include "constants/songs.h"
+#include "constants/items.h"
+
+typedef struct {
+    void (*callback)();
+    u8 mode;
+    u8 param1;
+    u16 scrollOffset;
+    u16 selectedRow;
+    u8 param4;
+    u8 filler;
+} TeachyTv_s;
+
+extern TeachyTv_s gTeachyTV_StaticResources;
+extern void * gUnknown_203F450;
+void C2TeachyTv();
+void C2TeachyTvMainCallback();
+void VblankHandlerTeachyTv();
+void sub_815ABC4(u8 mode, void (*cb)());
+void CB2_ReturnToTeachyTV();
+extern void sub_815AC20();
+void TeachyTvCreateAndRenderRbox();
+void TeachyTvInitIo();
+u8 TeachyTvSetupObjEventAndOam();
+extern void TeachyTvConfigRboxAndObj(u8);
+u8 TeachyTvSetupWindow();
+void TeachyTvSetupScrollIndicatorArrowPair();
+void TeachyTvSetWindowRegs();
+void TeachyTvSetupBg();
+void TeachyTvLoadGraphic();
+extern void TeachyTvTaskFunction(u8);
+extern void sub_815B2C0(u8);
+extern void VblankHblankHandlerSetZero();
+extern void sub_812B1E0(u16);
+extern struct BgTemplate gUnknown_84792E0;
+extern void *gUnknown_203F450; // tilemap pointer location
+extern u8 gUnknown_8E86240; // tilemap
+extern u8 gUnknown_8E86BE8;
+extern u8 gUnknown_8E86D6C;
+extern u8 gUnknown_8E86F98; // pal
+extern struct SpritePalette gUnknown_83A5348;
+extern void sub_815BD80(void *);
+typedef struct Task Task;
+extern struct WindowTemplate gUnknown_84792F0;
+
+
+void C2TeachyTv()
+{
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+    do_scheduled_bg_tilemap_copies_to_vram();
+    UpdatePaletteFade();
+}
+
+void VblankHandlerTeachyTv()
+{
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+}
+
+void sub_815ABC4(u8 mode, void (*cb)())
+{
+    TeachyTv_s *v3 = &gTeachyTV_StaticResources;
+    u16 v4 = 0;
+    v3->mode = mode;
+    v3->callback = cb;
+    if(!mode) {
+        v3->scrollOffset = v4;
+        v3->selectedRow = v4;
+        v3->param1 = 0;
+    }
+    if(mode == 1)
+        v3->mode = 0;
+    SetMainCallback2(C2TeachyTvMainCallback);
+}
+
+void CB2_ReturnToTeachyTV()
+{
+    if(gTeachyTV_StaticResources.mode == 1)
+        sub_815ABC4(1,gTeachyTV_StaticResources.callback);
+    else
+        sub_815ABC4(2,gTeachyTV_StaticResources.callback);
+}
+
+void sub_815AC20()
+{
+    gTeachyTV_StaticResources.mode = 1;
+}
+
+void C2TeachyTvMainCallback()
+{
+    int state;
+    void *mallocPtr;
+    int taskId;
+    Task *taskAddr;
+    u8 **v4;
+    u32 x;
+
+    state = gMain.state;
+    // tried several ways to reproduce the control flow, but all failed. Now using goto
+    if ( state == 0 )
+        goto section_0;
+    else if ( state == 1 )
+        goto section_1;
+    else
+        return;
+    section_0:
+        v4 = (u8 **)&gUnknown_203F450;
+        (*v4) = (u8*)AllocZeroed(0x4008u);
+        *(u32*)gUnknown_203F450 = (u32)state;
+        *((u8*)gUnknown_203F450 + 0x4006) = state;
+        *((u8*)gUnknown_203F450 + 0x4007) = 0xFF;
+        VblankHblankHandlerSetZero();
+        clear_scheduled_bg_copies_to_vram();
+        ScanlineEffect_Stop();
+        FreeAllSpritePalettes();
+        ResetPaletteFade();
+        ResetSpriteData();
+        ResetTasks();
+        TeachyTvSetupBg();
+        TeachyTvLoadGraphic();
+        ++gMain.state;
+        return;
+    section_1:
+        if( free_temp_tile_data_buffers_if_possible() == 1 )
+            return;
+        TeachyTvCreateAndRenderRbox();
+        TeachyTvInitIo();
+        if ( gTeachyTV_StaticResources.mode == 2 )
+        {
+            taskId = CreateTask(TeachyTvTaskFunction, 0);
+            gTasks[taskId].data[1] = TeachyTvSetupObjEventAndOam();
+            TeachyTvConfigRboxAndObj(taskId);
+        }
+        else
+        {
+            taskId = CreateTask(sub_815B2C0, 0);
+            x = (u32)TeachyTvSetupWindow();
+            gTasks[taskId].data[0] = (x << 24) >> 24;
+            gTasks[taskId].data[1] = TeachyTvSetupObjEventAndOam();
+            TeachyTvSetupScrollIndicatorArrowPair();
+            PlayNewMapMusic(BGM_FRLG_TEACHY_TV);
+            TeachyTvSetWindowRegs();
+        }
+        schedule_bg_copy_tilemap_to_vram(0);
+        schedule_bg_copy_tilemap_to_vram(1u);
+        schedule_bg_copy_tilemap_to_vram(2u);
+        schedule_bg_copy_tilemap_to_vram(3u);
+        sub_812B1E0(9); // help system something
+        BlendPalettes(0xFFFFFFFF, 0x10u, 0);
+        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10u, 0, 0);
+        SetVBlankCallback(VblankHandlerTeachyTv);
+        SetMainCallback2(C2TeachyTv);
+}
+
+void TeachyTvSetupBg()
+{
+    InitBgReg();
+    ResetBgsAndClearDma3BusyFlags(0);
+    InitBgsFromTemplates(0, &gUnknown_84792E0, 4u);
+    SetBgTilemapBuffer(1u, (u8 *)gUnknown_203F450 + 4);
+    SetBgTilemapBuffer(2u, (u8 *)gUnknown_203F450 + 0x1004);
+    SetBgTilemapBuffer(3u, (u8 *)gUnknown_203F450 + 0x2004);
+    SetGpuReg(0, 0x3040u);
+    ShowBg(0);
+    ShowBg(1u);
+    ShowBg(2u);
+    ShowBg(3u);
+    ChangeBgX(3u, 0x1000u, 2u);
+    ChangeBgY(3u, 0x2800u, 1u);
+    *((u8 *)gUnknown_203F450 + 0x4004) = 0;
+    *((u8 *)gUnknown_203F450 + 0x4005) = 3;
+    SetGpuReg(0x50u, 0);
+}
+
+void TeachyTvLoadGraphic()
+{
+    u16 src;
+    src = 0;
+    reset_temp_tile_data_buffers();
+    decompress_and_copy_tile_data_to_vram(1u, &gUnknown_8E86240, 0, 0, 0);
+    LZDecompressWram((u8 *)&gUnknown_8E86BE8, (*(u8 **)&gUnknown_203F450) + 4);
+    LZDecompressWram((u8 *)&gUnknown_8E86D6C, (*(u8 **)&gUnknown_203F450) + 0x3004);
+    LoadCompressedPalette(&gUnknown_8E86F98, 0, 0x80u);
+    LoadPalette(&src, 0, 2u);
+    LoadSpritePalette((struct SpritePalette *)&gUnknown_83A5348);
+    sub_815BD80((u8 *)gUnknown_203F450 + 0x2004);
+}
+
+void TeachyTvCreateAndRenderRbox()
+{
+    InitWindows(&gUnknown_84792F0);
+    DeactivateAllTextPrinters();
+    FillWindowPixelBuffer(0, 0xCCu);
+    PutWindowTilemap(0);
+    PutWindowTilemap(1u);
+    CopyWindowToVram(0, 2u);
+}
+
+extern struct ListMenuTemplate gUnknown_8479368;
+extern struct ListMenuItem gUnknown_8479340;
+extern u8 ListMenuInitInternal(struct ListMenuTemplate *, u16 scrollOffset, u16 selectedRow); 
+void TeachyTvAudioByInput(s32, bool8, struct ListMenu *);
+
+u8 TeachyTvSetupWindow()
+{
+    int hasItem;
+    gMultiuseListMenuTemplate = gUnknown_8479368;
+    gMultiuseListMenuTemplate.windowId = 1;
+    gMultiuseListMenuTemplate.moveCursorFunc = TeachyTvAudioByInput;
+    hasItem = (u8)CheckBagHasItem(ITEM_TM_CASE, 1u);
+    if ( !(hasItem << 24) )
+    {
+        gMultiuseListMenuTemplate.items = &gUnknown_8479340;
+        gMultiuseListMenuTemplate.totalItems = 5;
+        gMultiuseListMenuTemplate.maxShowed = 5;
+        gMultiuseListMenuTemplate.upText_Y = (gMultiuseListMenuTemplate.upText_Y + 8) & 0xF;
+    }
+    return ListMenuInit(
+               &gMultiuseListMenuTemplate,
+               gTeachyTV_StaticResources.scrollOffset,
+               gTeachyTV_StaticResources.selectedRow);
+}
+
+extern const struct ScrollArrowsTemplate gUnknown_8479380;
+
+void TeachyTvSetupScrollIndicatorArrowPair()
+{
+    int hasItem;
+    hasItem = (u8)CheckBagHasItem(ITEM_TM_CASE, 1u);
+    if ( ! hasItem << 24 ) {
+        u8 * temp = (u8 *)gUnknown_203F450;
+        *((u8 *)temp + 0x4007) = 0xFF;
+    }
+
+    else {
+        u8 *temp, res;
+        res = AddScrollIndicatorArrowPair(
+                                                    &gUnknown_8479380,
+                                                    &(gTeachyTV_StaticResources.scrollOffset));
+        temp = (u8 *)gUnknown_203F450;
+        *((u8 *)temp + 0x4007) = res;
+        }
+}
+
+void TeachyTvRemoveScrollIndicatorArrowPair()
+{
+    u8 *temp = ((u8*)gUnknown_203F450 + 0x4007);
+    if ( *temp != 0xFF )
+    {
+        RemoveScrollIndicatorArrowPair(*temp);
+        *((u8*)gUnknown_203F450 + 0x4007) = 0xFF;
+    }
+}
+
+void TeachyTvAudioByInput(s32 notUsed, bool8 play, struct ListMenu *notUsedAlt)
+{
+    if ( play != 1 )
+        PlaySE(SE_SELECT);
+}
+
+void TeachyTvInitIo()
+{
+    SetGpuReg(0x48u, 0x3Fu);
+    SetGpuReg(0x4Au, 0x1Fu);
+    SetGpuReg(0x50u, 0xCCu);
+    SetGpuReg(0x54u, 5u);
+}
+
+u8 TeachyTvSetupObjEventAndOam()
+{
+    u8 temp = AddPseudoEventObject(90, SpriteCallbackDummy, 0, 0, 8);
+    gSprites[temp].oam.priority = 2;
+    gSprites[temp].invisible = 1;
+    return temp;
+}
+
+void TeachyTvSetSpriteCoordsAndSwitchFrame(u8 objId, u16 x, u16 y, u8 frame)
+{
+    gSprites[objId].pos2.x = x;
+    gSprites[objId].pos2.y = y;
+    gSprites[objId].invisible = 0;
+    StartSpriteAnim(&gSprites[objId], frame);
+}
+
+void TeachyTvSetWindowRegs()
+{
+    SetGpuReg(0x44u, 0xC64u);
+    SetGpuReg(0x40u, 0x1CD4u);
+}
+
+void TeachyTvClearWindowRegs()
+{
+    SetGpuReg(0x44u, 0);
+    SetGpuReg(0x40u, 0);
+}
+
+void TeachyTvBg2AnimController()
+{
+    u16 *tilemapBuffer;
+    u8 counter;
+    u32 offset2;
+    u32 offset;
+    u32 counter2;
+
+    tilemapBuffer = (u16 *)GetBgTilemapBuffer(2u);
+    counter = 1;
+    do
+    {
+        offset2 = 2;
+        offset = 0x20 * counter;
+        counter2 = counter + 1;
+        do
+        {
+            tilemapBuffer[offset + offset2] = ((Random() & 3) << 10) + 0x301F;
+            offset2 = (offset2 + 1) << 0x18 >> 0x18;
+        }
+        while ( offset2 <= 0x1B );
+        counter = counter2;
+    }
+    while ( counter2 << 0x18 >> 0x18 <= 0xCu );
+    schedule_bg_copy_tilemap_to_vram(2u);
+}
+

src/fame_checker.c

@@ -1270,7 +1270,7 @@ static void FC_MoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMenu *list
         struct Task *task = &gTasks[taskId];
         PlaySE(SE_SELECT);
         task->data[1] = 0;
-        get_coro_args_x18_x1A(sFameCheckerData->listMenuTaskId, &listMenuTopIdx, NULL);
+        ListMenuGetScrollAndRow(sFameCheckerData->listMenuTaskId, &listMenuTopIdx, NULL);
         sFameCheckerData->listMenuTopIdx = listMenuTopIdx;
         if (itemIndex != sFameCheckerData->numUnlockedPersons - 1)
         {
@@ -1339,7 +1339,7 @@ static void FC_DoMoveCursor(s32 itemIndex, bool8 onInit)
     u16 listY;
     u16 cursorY;
     u16 who;
-    get_coro_args_x18_x1A(sFameCheckerData->listMenuTaskId, &listY, &cursorY);
+    ListMenuGetScrollAndRow(sFameCheckerData->listMenuTaskId, &listY, &cursorY);
     who = listY + cursorY;
     AddTextPrinterParametrized2(FCWINDOWID_LIST, 2, 8, 14 * cursorY + 4, 0, 0, &sTextColor_Green, 0, sListMenuItems[itemIndex].name);
     if (!onInit)
@@ -1432,7 +1432,7 @@ static void FreeListMenuSelectorArrowPairResources(void)
 static u16 FameCheckerGetCursorY(void)
 {
     u16 listY, cursorY;
-    get_coro_args_x18_x1A(sFameCheckerData->listMenuTaskId, &listY, &cursorY);
+    ListMenuGetScrollAndRow(sFameCheckerData->listMenuTaskId, &listY, &cursorY);
     return listY + cursorY;
 }
 

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);
         }

src/tm_case.c

@@ -737,7 +737,7 @@ static void Task_TMCaseMain(u8 taskId)
         if (sub_80BF72C() != TRUE)
         {
             input = ListMenuHandleInput(data[0]);
-            get_coro_args_x18_x1A(data[0], &sTMCaseStaticResources.scrollOffset, &sTMCaseStaticResources.selectedRow);
+            ListMenuGetScrollAndRow(data[0], &sTMCaseStaticResources.scrollOffset, &sTMCaseStaticResources.selectedRow);
             if (JOY_NEW(SELECT_BUTTON) && sTMCaseStaticResources.unk_05 == 1)
             {
                 PlaySE(SE_SELECT);