Merge pull request #387 from lucie-sharpe/Poketch

Documented some Poketch functions

include/overlay025/ov25_02254560.h

@@ -12,10 +12,10 @@
 
 BOOL ov25_02254560(UnkStruct_ov25_02254560 **param0, const UnkStruct_ov25_02254560_1 *param1, NNSG2dOamManagerInstance *param2, PoketchSystem *poketchSys);
 UnkStruct_ov25_022555E8 *ov25_02254664(void);
-BgConfig *ov25_02254674(void);
-void ov25_022546B8(u32 param0, u32 param1);
-void ov25_022546F0(u32 param0, u32 param1);
-void ov25_02254728(u16 *param0);
+BgConfig *Poketch_GetBgConfig(void);
+void Poketch_LoadActivePalette(u32 bgOffset, u32 objOffset);
+void Poketch_LoadActiveBacklightPalette(u32 unused_1, u32 unused_2);
+void Poketch_CopyActivePalette(u16 *dest);
 void ov25_02254754(UnkStruct_ov25_02254560 *param0);
 void ov25_022547D0(UnkStruct_ov25_02254560 *param0, u32 param1);
 BOOL ov25_022547F4(UnkStruct_ov25_02254560 *param0, u32 param1);

include/overlay025/poketch_system.h

@@ -130,8 +130,8 @@ void PoketchSystem_PlaySoundEffect(u32 soundID);
 void PoketchSystem_PlayCry(u32 species, u32 form);
 BOOL PoketchSystem_GetDisplayHeldCoords(u32 *x, u32 *y);
 BOOL PoketchSystem_GetDisplayTappedCoords(u32 *x, u32 *y);
-BOOL ov25_0225450C(const PoketchSystem *poketchSys);
-void ov25_02254518(const PoketchSystem *poketchSys, PoketchButtonManager *buttonManager);
+BOOL PoketechSystem_IsRunningTask(const PoketchSystem *poketchSys);
+void PoketechSystem_UpdateButtonManager(const PoketchSystem *poketchSys, PoketchButtonManager *buttonManager);
 BOOL PoketchSystem_IsPlayerMoving(const PoketchSystem *poketchSys);
 BOOL PoketchSystem_PedometerUpdated(const PoketchSystem *poketchSys);
 FieldSystem *PoketchSystem_GetFieldSystem(const PoketchSystem *poketchSys);

src/overlay025/ov25_02254560.c

@@ -17,11 +17,20 @@
 #include "graphics.h"
 #include "gx_layers.h"
 #include "heap.h"
+#include "palette.h"
 #include "poketch.h"
 #include "sys_task.h"
 #include "sys_task_manager.h"
 #include "unk_02005474.h"
 
+#define POKETCH_PALETTE_NARC_IDX 0
+
+#define NUM_PALETTES                        16
+#define NUM_PALETTES_PER_PALETTE_COLOUR_SET 2
+#define NUM_PALETTE_COLOUR_SETS             (NUM_PALETTES / NUM_PALETTES_PER_PALETTE_COLOUR_SET)
+#define SLOTS_PER_PALETTE_COLOUR_SET        (SLOTS_PER_PALETTE * NUM_PALETTES_PER_PALETTE_COLOUR_SET)
+#define BACKLIGHT_PALETTE_SLOT_OFFSET       (SLOTS_PER_PALETTE)
+
 typedef struct {
     BOOL unk_00;
     UnkStruct_ov25_022555E8 *unk_04;
@@ -45,7 +54,7 @@ struct UnkStruct_ov25_02254560_t {
     UnkStruct_ov25_02254DD8 unk_1D4;
     BgConfig *unk_1F8;
     PoketchSystem *poketchSys;
-    u16 unk_200[256];
+    u16 poketchPalettes[NUM_PALETTE_COLOUR_SETS * SLOTS_PER_PALETTE_COLOUR_SET];
     u16 unk_400[16];
 };
 
@@ -55,7 +64,7 @@ typedef struct {
 } UnkStruct_ov25_02254944;
 
 static void ov25_02254654(SysTask *param0, void *param1);
-static void ov25_02254684(UnkStruct_ov25_02254560 *param0);
+static void Poketch_InitPaletteData(UnkStruct_ov25_02254560 *param0);
 static void ov25_02254798(u16 *param0, u32 param1, int param2, int param3);
 static void ov25_0225480C(PoketchTaskManager *param0);
 static void ov25_02254820(SysTask *param0, void *param1);
@@ -105,7 +114,7 @@ BOOL ov25_02254560(UnkStruct_ov25_02254560 **param0, const UnkStruct_ov25_022545
         v0->unk_1F8 = BgConfig_New(7);
         v0->poketchSys = poketchSys;
 
-        ov25_02254684(v0);
+        Poketch_InitPaletteData(v0);
         ov25_02254DD8(&v0->unk_1D4, v0->unk_1CC);
         PoketchTask_InitActiveTaskList((*param0)->unk_04, 8);
 
@@ -137,54 +146,52 @@ UnkStruct_ov25_022555E8 *ov25_02254664(void)
     return v0->unk_1CC;
 }
 
-// Gets BgConfig from PoketchSys via UnkStruct_ov25_02254560
-BgConfig *ov25_02254674(void)
+BgConfig *Poketch_GetBgConfig(void)
 {
     UnkStruct_ov25_02254560 *v0 = ov25_02254418();
     return v0->unk_1F8;
 }
 
-static void ov25_02254684(UnkStruct_ov25_02254560 *param0)
+static void Poketch_InitPaletteData(UnkStruct_ov25_02254560 *param0)
 {
-    NNSG2dPaletteData *v0;
-    void *v1;
+    NNSG2dPaletteData *paletteData;
 
-    v1 = Graphics_GetPlttData(12, 0, &v0, 7);
+    void *poketchPalettes = Graphics_GetPlttData(NARC_INDEX_GRAPHIC__POKETCH, POKETCH_PALETTE_NARC_IDX, &paletteData, HEAP_ID_POKETCH_MAIN);
 
-    if (v1) {
-        MI_CpuCopy32(v0->pRawData, param0->unk_200, 8 * 0x40);
-        DC_FlushRange(param0->unk_200, 8 * 0x40);
-        Heap_FreeToHeap(v1);
+    if (poketchPalettes) {
+        MI_CpuCopy32(paletteData->pRawData, param0->poketchPalettes, NUM_PALETTES * PALETTE_SIZE_BYTES);
+        DC_FlushRange(param0->poketchPalettes, NUM_PALETTES * PALETTE_SIZE_BYTES);
+        Heap_FreeToHeap(poketchPalettes);
     }
 }
 
-void ov25_022546B8(u32 param0, u32 param1)
+void Poketch_LoadActivePalette(u32 bgOffset, u32 objOffset)
 {
     UnkStruct_ov25_02254560 *v0 = ov25_02254418();
     Poketch *poketch = PoketchSystem_GetPoketchData(v0->poketchSys);
-    u32 v2 = Poketch_CurrentScreenColor(poketch);
+    u32 screenColour = Poketch_CurrentScreenColor(poketch);
 
-    GXS_LoadBGPltt(&v0->unk_200[v2 * 32], param0 * 0x20, 0x20);
-    GXS_LoadOBJPltt(&v0->unk_200[v2 * 32], param1, 0x20);
+    GXS_LoadBGPltt(&v0->poketchPalettes[screenColour * SLOTS_PER_PALETTE_COLOUR_SET], bgOffset * PALETTE_SIZE_BYTES, PALETTE_SIZE_BYTES);
+    GXS_LoadOBJPltt(&v0->poketchPalettes[screenColour * SLOTS_PER_PALETTE_COLOUR_SET], objOffset, PALETTE_SIZE_BYTES);
 }
 
-void ov25_022546F0(u32 param0, u32 param1)
+void Poketch_LoadActiveBacklightPalette(u32 unused_1, u32 unused_2)
 {
     UnkStruct_ov25_02254560 *v0 = ov25_02254418();
     Poketch *poketch = PoketchSystem_GetPoketchData(v0->poketchSys);
-    u32 v2 = Poketch_CurrentScreenColor(poketch);
+    u32 screenColour = Poketch_CurrentScreenColor(poketch);
 
-    GXS_LoadBGPltt(&v0->unk_200[v2 * 32 + 16], 0, 0x20);
-    GXS_LoadOBJPltt(&v0->unk_200[v2 * 32 + 16], 0, 0x20);
+    GXS_LoadBGPltt(&v0->poketchPalettes[screenColour * SLOTS_PER_PALETTE_COLOUR_SET + BACKLIGHT_PALETTE_SLOT_OFFSET], 0, PALETTE_SIZE_BYTES);
+    GXS_LoadOBJPltt(&v0->poketchPalettes[screenColour * SLOTS_PER_PALETTE_COLOUR_SET + BACKLIGHT_PALETTE_SLOT_OFFSET], 0, PALETTE_SIZE_BYTES);
 }
 
-void ov25_02254728(u16 *param0)
+void Poketch_CopyActivePalette(u16 *dest)
 {
     UnkStruct_ov25_02254560 *v0 = ov25_02254418();
     Poketch *poketch = PoketchSystem_GetPoketchData(v0->poketchSys);
-    u32 v2 = Poketch_CurrentScreenColor(poketch);
+    u32 screenColour = Poketch_CurrentScreenColor(poketch);
 
-    MI_CpuCopy16(&v0->unk_200[v2 * 32], param0, 0x20);
+    MI_CpuCopy16(&v0->poketchPalettes[screenColour * SLOTS_PER_PALETTE_COLOUR_SET], dest, PALETTE_SIZE_BYTES);
 }
 
 void ov25_02254754(UnkStruct_ov25_02254560 *param0)
@@ -606,7 +613,7 @@ static void ov25_02254E84(UnkStruct_ov25_02254560 *param0, u32 param1)
     Poketch *poketch = PoketchSystem_GetPoketchData(param0->poketchSys);
     u32 v2 = Poketch_CurrentScreenColor(poketch);
 
-    ov25_02254728(param0->unk_400);
+    Poketch_CopyActivePalette(param0->unk_400);
 
     {
         u16 v3 = param0->unk_400[1];

src/overlay025/ov25_02255090.c

@@ -185,7 +185,7 @@ void ov25_02255290(u16 *param0, u32 param1)
         };
         u32 v2, v3, v4, v5, v6;
 
-        ov25_02254728(v0);
+        Poketch_CopyActivePalette(v0);
 
         for (v2 = 0; v2 < param1; v2++) {
             v3 = (param0[v2] & GX_RGB_R_MASK) >> GX_RGB_R_SHIFT;
@@ -214,7 +214,7 @@ void ov25_02255308(u32 param0, u32 param1)
     if (v0) {
         u16 *v1 = Heap_AllocFromHeap(HEAP_ID_POKETCH_APP, 0x20);
 
-        ov25_02254728(v0);
+        Poketch_CopyActivePalette(v0);
 
         if (v1) {
             int v2;

src/overlay025/poketch_system.c

@@ -304,7 +304,7 @@ static void PoketchEvent_UpdateApp(PoketchSystem *poketchSys)
 {
     switch (poketchSys->subState) {
     case 0:
-        if (ov25_0225450C(poketchSys)) {
+        if (PoketechSystem_IsRunningTask(poketchSys)) {
             return;
         }
 
@@ -573,7 +573,7 @@ static void PoketchSystem_OnButtonEvent(u32 buttonID, u32 buttonEvent, u32 touch
 {
     PoketchSystem *poketchSys = (PoketchSystem *)system;
 
-    if (ov25_0225450C(poketchSys) == FALSE) {
+    if (PoketechSystem_IsRunningTask(poketchSys) == FALSE) {
         switch (touchEvent) {
         case BUTTON_TOUCH_RELEASED:
             poketchSys->touchingScreen = TRUE;
@@ -587,7 +587,7 @@ static void PoketchSystem_OnButtonEvent(u32 buttonID, u32 buttonEvent, u32 touch
     }
 
     if (buttonID == POKETCH_SYSTEM_MAIN_BUTTON_SCREEN) {
-        if (ov25_0225450C(poketchSys) && touchEvent == BUTTON_TOUCH_RELEASED) {
+        if (PoketechSystem_IsRunningTask(poketchSys) && touchEvent == BUTTON_TOUCH_RELEASED) {
             Sound_PlayEffect(SEQ_SE_DP_BEEP);
         }
     } else {
@@ -598,7 +598,7 @@ static void PoketchSystem_OnButtonEvent(u32 buttonID, u32 buttonEvent, u32 touch
             v1 = (buttonID == POKETCH_SYSTEM_MAIN_BUTTON_UP) ? 8 : 11;
             break;
         case BUTTON_TOUCH_RELEASED:
-            if (ov25_0225450C(poketchSys) || poketchSys->unk_06) {
+            if (PoketechSystem_IsRunningTask(poketchSys) || poketchSys->unk_06) {
                 v1 = (buttonID == POKETCH_SYSTEM_MAIN_BUTTON_UP) ? 6 : 9;
                 buttonEvent = 0;
             } else {
@@ -665,7 +665,7 @@ void PoketchSystem_PlaySoundEffect(u32 soundID)
 {
     PoketchSystem *poketchSys = PoketchSystem_GetFromFieldSystem();
 
-    if ((poketchSys->appChanging == FALSE) && (ov25_0225450C(poketchSys) == FALSE)) {
+    if ((poketchSys->appChanging == FALSE) && (PoketechSystem_IsRunningTask(poketchSys) == FALSE)) {
         Sound_PlayEffect(soundID);
     }
 }
@@ -674,7 +674,7 @@ void PoketchSystem_PlayCry(u32 species, u32 form)
 {
     PoketchSystem *poketchSys = PoketchSystem_GetFromFieldSystem();
 
-    if (poketchSys->appChanging == FALSE && ov25_0225450C(poketchSys) == 0) {
+    if (poketchSys->appChanging == FALSE && PoketechSystem_IsRunningTask(poketchSys) == 0) {
         sub_02005844(species, form);
     }
 }
@@ -693,7 +693,7 @@ BOOL PoketchSystem_GetDisplayHeldCoords(u32 *x, u32 *y)
     PoketchSystem *poketchSys = PoketchSystem_GetFromFieldSystem();
 
     if (!poketchSys->appChanging
-        && !ov25_0225450C(poketchSys)
+        && !PoketechSystem_IsRunningTask(poketchSys)
         && TouchScreen_GetHoldState(x, y)) {
         return PoketchSystem_InsideScreenBounds(*x, *y);
     }
@@ -706,7 +706,7 @@ BOOL PoketchSystem_GetDisplayTappedCoords(u32 *x, u32 *y)
     PoketchSystem *poketchSys = PoketchSystem_GetFromFieldSystem();
 
     if (!poketchSys->appChanging
-        && !ov25_0225450C(poketchSys)
+        && !PoketechSystem_IsRunningTask(poketchSys)
         && TouchScreen_GetTapState(x, y)) {
         return PoketchSystem_InsideScreenBounds(*x, *y);
     }
@@ -714,14 +714,14 @@ BOOL PoketchSystem_GetDisplayTappedCoords(u32 *x, u32 *y)
     return FALSE;
 }
 
-BOOL ov25_0225450C(const PoketchSystem *poketchSys)
+BOOL PoketechSystem_IsRunningTask(const PoketchSystem *poketchSys)
 {
     return FieldSystem_IsRunningTask(poketchSys->fieldSystem);
 }
 
-void ov25_02254518(const PoketchSystem *poketchSys, PoketchButtonManager *buttonManager)
+void PoketechSystem_UpdateButtonManager(const PoketchSystem *poketchSys, PoketchButtonManager *buttonManager)
 {
-    if (ov25_0225450C(poketchSys) == 0 && poketchSys->appChanging == FALSE) {
+    if (PoketechSystem_IsRunningTask(poketchSys) == FALSE && poketchSys->appChanging == FALSE) {
         PoketchButtonManager_Update(buttonManager);
     }
 }

src/overlay026/ov26_022561C0.c

@@ -126,7 +126,7 @@ static void ov26_022562BC(SysTask *param0, void *param1)
     UnkStruct_ov26_0225621C *v1 = (UnkStruct_ov26_0225621C *)param1;
 
     if (v1->unk_00 < NELEMS(v0)) {
-        ov25_02254518(v1->poketchSys, v1->buttonManager);
+        PoketechSystem_UpdateButtonManager(v1->poketchSys, v1->buttonManager);
 
         if (v0[v1->unk_00](v1)) {
             ov26_022562A4(v1);

src/overlay026/ov26_02256404.c

@@ -39,7 +39,7 @@ BOOL ov26_02256404(UnkStruct_ov26_02256404 **param0, const UnkStruct_ov26_022564
         PoketchTask_InitActiveTaskList(v0->unk_08, 8);
 
         v0->unk_00 = param1;
-        v0->unk_04 = ov25_02254674();
+        v0->unk_04 = Poketch_GetBgConfig();
 
         v2 = Graphics_GetScrnData(12, 25, 1, &v1, 8);
 
@@ -137,7 +137,7 @@ static void ov26_022564F8(SysTask *param0, void *param1)
     Graphics_LoadTilesToBgLayer(12, 23, v2->unk_04, 6, 0, 0, 1, 8);
     Graphics_LoadTilemapToBgLayer(12, 24, v2->unk_04, 6, 0, 0, 1, 8);
 
-    ov25_022546B8(0, 0);
+    Poketch_LoadActivePalette(0, 0);
     ov26_022565F4(v2);
 
     Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6);
@@ -161,9 +161,9 @@ static void ov26_022565AC(SysTask *param0, void *param1)
     UnkStruct_ov26_02256404 *v0 = PoketchTask_GetTaskData(param1);
 
     if (v0->unk_00->unk_0C) {
-        ov25_022546F0(0, 0);
+        Poketch_LoadActiveBacklightPalette(0, 0);
     } else {
-        ov25_022546B8(0, 0);
+        Poketch_LoadActivePalette(0, 0);
     }
 
     ov26_022564E4(param1);

src/overlay027/ov27_022561C0.c

@@ -165,7 +165,7 @@ static void ov27_022562FC(SysTask *param0, void *param1)
             v1->unk_02 = 0;
         }
 
-        ov25_02254518(v1->poketchSys, v1->buttonManager);
+        PoketechSystem_UpdateButtonManager(v1->poketchSys, v1->buttonManager);
         ov27_022566D8(v1, &(v1->unk_1C));
 
         if (v0[v1->unk_00](v1)) {

src/overlay027/ov27_0225680C.c

@@ -192,7 +192,7 @@ static void ov27_02256A18(SysTask *param0, void *param1)
     Graphics_LoadTilesToBgLayer(12, 21, v2->unk_04, 6, 0, 0, 1, 8);
     Graphics_LoadTilemapToBgLayer(12, 20, v2->unk_04, 6, 0, 0, 1, 8);
 
-    ov25_022546B8(0, 0);
+    Poketch_LoadActivePalette(0, 0);
     Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6);
 
     {

src/overlay028/ov28_022561C0.c

@@ -170,7 +170,7 @@ static void ov28_022562CC(SysTask *param0, void *param1)
 
     if (v1->unk_00 < NELEMS(v0)) {
         v1->unk_06 = 17;
-        ov25_02254518(v1->poketchSys, v1->buttonManager);
+        PoketechSystem_UpdateButtonManager(v1->poketchSys, v1->buttonManager);
 
         if (v0[v1->unk_00](v1)) {
             ov28_02256298(v1);

src/overlay028/ov28_0225697C.c

@@ -544,7 +544,7 @@ static void ov28_02256A08(SysTask *param0, void *param1)
     Graphics_LoadTilemapToBgLayer(12, 17, v3->unk_04, 6, 0, 0, 1, 8);
 
     ov28_02256AA4(v3);
-    ov25_022546B8(0, 0);
+    Poketch_LoadActivePalette(0, 0);
 
     Bg_CopyTilemapBufferToVRAM(v3->unk_04, 6);
 

src/overlay029/ov29_022561C0.c

@@ -111,7 +111,7 @@ static void ov29_022562AC(SysTask *param0, void *param1)
     UnkStruct_ov29_0225621C *v1 = (UnkStruct_ov29_0225621C *)param1;
 
     if (v1->unk_00 < NELEMS(v0)) {
-        ov25_02254518(v1->poketchSys, v1->buttonManager);
+        PoketechSystem_UpdateButtonManager(v1->poketchSys, v1->buttonManager);
 
         if (v0[v1->unk_00](v1)) {
             ov29_02256288(v1);
@@ -176,7 +176,7 @@ static BOOL ov29_0225638C(UnkStruct_ov29_0225621C *param0)
 
     switch (param0->unk_01) {
     case 0:
-        if (ov25_0225450C(param0->poketchSys)) {
+        if (PoketechSystem_IsRunningTask(param0->poketchSys)) {
             break;
         }
 

src/overlay029/ov29_022566C8.c

@@ -51,7 +51,7 @@ BOOL ov29_022566C8(UnkStruct_ov29_022566C8 **param0, const UnkStruct_ov29_022566
 
         GF_ASSERT(GF_heap_c_dummy_return_true(7));
         v0->unk_00 = param1;
-        v0->unk_04 = ov25_02254674();
+        v0->unk_04 = Poketch_GetBgConfig();
         v0->unk_50 = ov25_02254664();
 
         GF_ASSERT(GF_heap_c_dummy_return_true(7));
@@ -175,7 +175,7 @@ static void ov29_02256804(SysTask *param0, void *param1)
 
     Graphics_LoadTilesToBgLayer(12, 30, v3->unk_04, 6, 0, 0, 1, 8);
     Graphics_LoadTilemapToBgLayer(12, 31, v3->unk_04, 6, 0, 0, 1, 8);
-    ov25_022546B8(0, 0);
+    Poketch_LoadActivePalette(0, 0);
 
     GF_ASSERT(GF_heap_c_dummy_return_true(8));
 

src/overlay030/ov30_022561C0.c

@@ -123,7 +123,7 @@ static void ov30_022562B0(SysTask *param0, void *param1)
     UnkStruct_ov30_0225621C *v1 = (UnkStruct_ov30_0225621C *)param1;
 
     if (v1->unk_00 < NELEMS(v0)) {
-        ov25_02254518(v1->poketchSys, v1->buttonManager);
+        PoketechSystem_UpdateButtonManager(v1->poketchSys, v1->buttonManager);
 
         if (v0[v1->unk_00](v1)) {
             ov30_02256298(v1);

src/overlay030/ov30_022563EC.c

@@ -50,7 +50,7 @@ BOOL ov30_022563EC(UnkStruct_ov30_022563EC **param0, const UnkStruct_ov30_022563
         PoketchTask_InitActiveTaskList(v0->unk_08, 8);
 
         v0->unk_00 = param1;
-        v0->unk_04 = ov25_02254674();
+        v0->unk_04 = Poketch_GetBgConfig();
         v0->unk_48 = ov25_02254664();
 
         if (ov30_022565F4(v0) == 0) {
@@ -141,7 +141,7 @@ static void ov30_022564B4(SysTask *param0, void *param1)
     Graphics_LoadTilesToBgLayer(12, 23, v2->unk_04, 6, 0, 0, 1, 8);
     Graphics_LoadTilemapToBgLayer(12, 26, v2->unk_04, 6, 0, 0, 1, 8);
 
-    ov25_022546B8(0, 0);
+    Poketch_LoadActivePalette(0, 0);
     ov30_022565B0(v2);
 
     Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6);
@@ -165,9 +165,9 @@ static void ov30_02256568(SysTask *param0, void *param1)
     UnkStruct_ov30_022563EC *v0 = PoketchTask_GetTaskData(param1);
 
     if (v0->unk_00->unk_0C) {
-        ov25_022546F0(0, 0);
+        Poketch_LoadActiveBacklightPalette(0, 0);
     } else {
-        ov25_022546B8(0, 0);
+        Poketch_LoadActivePalette(0, 0);
     }
 
     ov30_022564A0(param1);

src/overlay031/ov31_02256554.c

@@ -33,7 +33,7 @@ BOOL ov31_02256554(UnkStruct_ov31_02256554 **param0, const UnkStruct_ov31_022565
         PoketchTask_InitActiveTaskList(v0->unk_08, 8);
 
         v0->unk_00 = param1;
-        v0->unk_04 = ov25_02254674();
+        v0->unk_04 = Poketch_GetBgConfig();
 
         if (v0->unk_04 != NULL) {
             *param0 = v0;
@@ -105,7 +105,7 @@ static void ov31_022565E0(SysTask *param0, void *param1)
 
     ov31_02256644(v2->unk_04);
     ov31_0225672C(v2->unk_04, v2->unk_00);
-    ov25_022546B8(0, 0);
+    Poketch_LoadActivePalette(0, 0);
 
     Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6);
 

src/overlay032/ov32_02256470.c

@@ -51,7 +51,7 @@ BOOL PartyStatusGraphics_New(PoketchPartyStatusGraphics **dest, const PlayerPart
         PoketchTask_InitActiveTaskList(graphicsData->activeTaskIds, 8);
 
         graphicsData->playerParty = playerParty;
-        graphicsData->bgConfig = ov25_02254674();
+        graphicsData->bgConfig = Poketch_GetBgConfig();
         graphicsData->unk_08 = ov25_02254664();
         graphicsData->partyCount = 0;
         graphicsData->bounceAnimTask = NULL;
@@ -142,7 +142,7 @@ static void DrawAppScreen(SysTask *param0, void *param1)
     v3 /= TILE_SIZE_4BPP;
 
     Bg_FillTilemapRect(v2->bgConfig, 6, 0x5, 0, 0, 32, 24, 0);
-    ov25_022546B8(0, 0);
+    Poketch_LoadActivePalette(0, 0);
 
     v2->hpBarBaseTile = v3;
     CreateHpBars(v2, v2->playerParty, v3);

src/overlay033/ov33_02256474.c

@@ -120,7 +120,7 @@ BOOL ov33_02256474(UnkStruct_ov33_02256474 **param0, const UnkStruct_ov33_022564
         PoketchTask_InitActiveTaskList(v0->unk_08, 8);
 
         v0->unk_00 = param1;
-        v0->unk_04 = ov25_02254674();
+        v0->unk_04 = Poketch_GetBgConfig();
         v0->unk_30 = ov25_02254664();
         v0->unk_B0 = NULL;
 
@@ -218,7 +218,7 @@ static void ov33_02256598(SysTask *param0, void *param1)
     Graphics_LoadTilesToBgLayer(12, 7, v2->unk_04, 6, 0, 0, 1, 8);
     Bg_FillTilemapRect(v2->unk_04, 6, 0, 0, 0, 32, 24, 0);
 
-    ov25_022546B8(0, 0);
+    Poketch_LoadActivePalette(0, 0);
     Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6);
 
     ov33_02256634(v2, v2->unk_00);

src/overlay034/ov34_022561C0.c

@@ -168,7 +168,7 @@ static BOOL ov34_022562F0(UnkStruct_ov34_0225621C *param0)
             break;
         }
 
-        if ((PoketchSystem_IsPlayerMoving(param0->poketchSys) == 1) || (ov25_0225450C(param0->poketchSys))) {
+        if ((PoketchSystem_IsPlayerMoving(param0->poketchSys) == 1) || (PoketechSystem_IsRunningTask(param0->poketchSys))) {
             ov34_02256A0C(param0->unk_48);
             param0->unk_01 = 2;
             break;
@@ -200,7 +200,7 @@ static BOOL ov34_022562F0(UnkStruct_ov34_0225621C *param0)
 
 static BOOL ov34_022563E4(UnkStruct_ov34_0225621C *param0, u32 *param1, u32 *param2)
 {
-    if (ov25_0225450C(param0->poketchSys) == 0) {
+    if (PoketechSystem_IsRunningTask(param0->poketchSys) == 0) {
         if (TouchScreen_GetTapState(param1, param2)) {
             if (((u32)((*param1) - 24) < (u32)(200 - 24)) & ((u32)((*param2) - 24) < (u32)(168 - 24))) {
                 return 1;

src/overlay034/ov34_02256540.c

@@ -53,7 +53,7 @@ BOOL ov34_02256540(UnkStruct_ov34_02256540 **param0, const UnkStruct_ov34_022565
         PoketchTask_InitActiveTaskList(v0->unk_08, 8);
 
         v0->unk_00 = param1;
-        v0->unk_04 = ov25_02254674();
+        v0->unk_04 = Poketch_GetBgConfig();
         v0->unk_6C = 0;
         v0->unk_30 = ov25_02254664();
         v0->unk_34 = NULL;
@@ -182,10 +182,10 @@ static void ov34_02256690(SysTask *param0, void *param1)
     Graphics_LoadTilesToBgLayer(12, 39, v2->unk_04, 6, 0, 0, 1, 8);
     Graphics_LoadTilemapToBgLayer(12, 38, v2->unk_04, 6, 0, 0, 1, 8);
 
-    ov25_022546B8(0, 0);
+    Poketch_LoadActivePalette(0, 0);
 
     {
-        ov25_02254728(v2->unk_70);
+        Poketch_CopyActivePalette(v2->unk_70);
 
         v2->unk_70[1] = v2->unk_70[8];
         DC_FlushRange(v2->unk_70, sizeof(v2->unk_70));

src/overlay035/ov35_022561C0.c

@@ -120,7 +120,7 @@ static void ov35_022562B0(SysTask *param0, void *param1)
     UnkStruct_ov35_0225621C *v1 = (UnkStruct_ov35_0225621C *)param1;
 
     if (v1->unk_00 < NELEMS(v0)) {
-        ov25_02254518(v1->poketchSys, v1->buttonManager);
+        PoketechSystem_UpdateButtonManager(v1->poketchSys, v1->buttonManager);
 
         if (v0[v1->unk_00](v1)) {
             ov35_0225628C(v1);

src/overlay035/ov35_02256410.c

@@ -46,7 +46,7 @@ BOOL ov35_02256410(UnkStruct_ov35_02256410 **param0, const UnkStruct_ov35_022564
     if (v0 != NULL) {
         PoketchTask_InitActiveTaskList(v0->unk_08, 4);
         v0->unk_00 = param1;
-        v0->unk_04 = ov25_02254674();
+        v0->unk_04 = Poketch_GetBgConfig();
         v0->unk_20 = ov25_02254664();
 
         ov35_02256460(v0, param1);
@@ -177,7 +177,7 @@ static void ov35_02256598(SysTask *param0, void *param1)
     Graphics_LoadTilesToBgLayer(12, 44, v2->unk_04, 6, 0, 0, 1, 8);
     Graphics_LoadTilemapToBgLayer(12, 43, v2->unk_04, 6, 0, 0, 1, 8);
 
-    ov25_022546B8(0, 0);
+    Poketch_LoadActivePalette(0, 0);
     Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6);
 
     v1 = GXS_GetDispCnt();

src/overlay036/ov36_022561C0.c

@@ -116,7 +116,7 @@ static void ov36_02256298(SysTask *param0, void *param1)
     UnkStruct_ov36_0225621C *v1 = (UnkStruct_ov36_0225621C *)param1;
 
     if (v1->unk_00 < NELEMS(v0)) {
-        ov25_02254518(v1->poketchSys, v1->buttonManager);
+        PoketechSystem_UpdateButtonManager(v1->poketchSys, v1->buttonManager);
 
         if (v0[v1->unk_00](v1)) {
             ov36_02256280(v1);

src/overlay036/ov36_02256404.c

@@ -43,7 +43,7 @@ BOOL ov36_02256404(UnkStruct_ov36_02256404 **param0, const UnkStruct_ov36_022564
     if (v0 != NULL) {
         PoketchTask_InitActiveTaskList(v0->unk_08, 4);
         v0->unk_00 = param1;
-        v0->unk_04 = ov25_02254674();
+        v0->unk_04 = Poketch_GetBgConfig();
         v0->unk_20 = ov25_02254664();
         ov36_02256454(v0, param1);
         *param0 = v0;
@@ -170,7 +170,7 @@ static void ov36_0225658C(SysTask *param0, void *param1)
     Graphics_LoadTilesToBgLayer(12, 49, v2->unk_04, 6, 0, 0, 1, 8);
     Graphics_LoadTilemapToBgLayer(12, 48, v2->unk_04, 6, 0, 0, 1, 8);
 
-    ov25_022546B8(0, 0);
+    Poketch_LoadActivePalette(0, 0);
     Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6);
 
     v1 = GXS_GetDispCnt();

src/overlay037/ov37_022561C0.c

@@ -113,7 +113,7 @@ static void ov37_022562A0(SysTask *param0, void *param1)
     UnkStruct_ov37_0225621C *v1 = (UnkStruct_ov37_0225621C *)param1;
 
     if (v1->unk_00 < NELEMS(v0)) {
-        ov25_02254518(v1->poketchSys, v1->buttonManager);
+        PoketechSystem_UpdateButtonManager(v1->poketchSys, v1->buttonManager);
 
         if (v0[v1->unk_00](v1)) {
             ov37_02256280(v1);

src/overlay037/ov37_022563D4.c

@@ -42,7 +42,7 @@ BOOL ov37_022563D4(UnkStruct_ov37_022563D4 **param0, const UnkStruct_ov37_022563
     if (v0 != NULL) {
         PoketchTask_InitActiveTaskList(v0->unk_08, 4);
         v0->unk_00 = param1;
-        v0->unk_04 = ov25_02254674();
+        v0->unk_04 = Poketch_GetBgConfig();
         v0->unk_20 = ov25_02254664();
         ov37_0225641C(v0, param1);
         *param0 = v0;
@@ -145,7 +145,7 @@ static void ov37_022564D8(SysTask *param0, void *param1)
     Graphics_LoadTilesToBgLayer(12, 101, v2->unk_04, 6, 0, 0, 1, 8);
     Graphics_LoadTilemapToBgLayer(12, 100, v2->unk_04, 6, 0, 0, 1, 8);
 
-    ov25_022546B8(0, 0);
+    Poketch_LoadActivePalette(0, 0);
     Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6);
 
     v1 = GXS_GetDispCnt();

src/overlay038/ov38_0225632C.c

@@ -31,7 +31,7 @@ BOOL ov38_0225632C(UnkStruct_ov38_0225632C **param0, const UnkStruct_ov38_022563
         PoketchTask_InitActiveTaskList(v0->unk_08, 8);
 
         v0->unk_00 = param1;
-        v0->unk_04 = ov25_02254674();
+        v0->unk_04 = Poketch_GetBgConfig();
 
         if (v0->unk_04 != NULL) {
             *param0 = v0;

src/overlay039/ov39_022561C0.c

@@ -121,7 +121,7 @@ static void ov39_0225628C(SysTask *param0, void *param1)
     UnkStruct_ov39_0225621C *v1 = (UnkStruct_ov39_0225621C *)param1;
 
     if (v1->unk_00 < NELEMS(v0)) {
-        ov25_02254518(v1->poketchSys, v1->buttonManager);
+        PoketechSystem_UpdateButtonManager(v1->poketchSys, v1->buttonManager);
 
         if (v0[v1->unk_00](v1)) {
             ov39_02256268(v1);

src/overlay039/ov39_022563DC.c

@@ -34,7 +34,7 @@ BOOL ov39_022563DC(UnkStruct_ov39_022563DC **param0, const UnkStruct_ov39_022563
         PoketchTask_InitActiveTaskList(v0->unk_08, 4);
 
         v0->unk_00 = param1;
-        v0->unk_04 = ov25_02254674();
+        v0->unk_04 = Poketch_GetBgConfig();
 
         if (v0->unk_04 != NULL) {
             *param0 = v0;
@@ -112,7 +112,7 @@ static void ov39_02256468(SysTask *param0, void *param1)
     Graphics_LoadTilesToBgLayer(12, 59, v2->unk_04, 6, 0, 0, 1, 8);
     Graphics_LoadTilemapToBgLayer(12, 58, v2->unk_04, 6, 0, 0, 1, 8);
 
-    ov25_022546B8(0, 0);
+    Poketch_LoadActivePalette(0, 0);
 
     for (v6 = 0; v6 < 6; v6++) {
         ov39_0225659C(v2, v6, v3->unk_04[v6], 0);

src/overlay040/ov40_022561C0.c

@@ -189,7 +189,7 @@ static BOOL ov40_02256354(UnkStruct_ov40_0225621C *param0)
 
 static BOOL ov40_02256388(UnkStruct_ov40_0225621C *param0)
 {
-    if (ov25_0225450C(param0->poketchSys) == 0) {
+    if (PoketechSystem_IsRunningTask(param0->poketchSys) == 0) {
         u32 v0, v1;
 
         if (TouchScreen_GetTapState(&v0, &v1)) {

src/overlay040/ov40_0225645C.c

@@ -59,7 +59,7 @@ BOOL ov40_0225645C(UnkStruct_ov40_0225645C **param0, const UnkStruct_ov40_022564
         PoketchTask_InitActiveTaskList(v0->unk_08, 4);
 
         v0->unk_00 = param1;
-        v0->unk_04 = ov25_02254674();
+        v0->unk_04 = Poketch_GetBgConfig();
         v0->unk_20 = ov25_02254664();
         v0->unk_88 = 0;
         v0->unk_8C = SysTask_ExecuteAfterVBlank(ov40_022567E0, v0, 0);
@@ -272,7 +272,7 @@ static void ov40_02256618(SysTask *param0, void *param1)
     Graphics_LoadTilesToBgLayer(12, 81, v2->unk_04, 6, 0, 0, 1, 8);
     Graphics_LoadTilemapToBgLayer(12, 80, v2->unk_04, 6, 0, 0, 1, 8);
 
-    ov25_022546B8(0, 0);
+    Poketch_LoadActivePalette(0, 0);
     Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6);
 
     G2S_SetBGMosaicSize(0, 0);

src/overlay041/ov41_022561C0.c

@@ -116,7 +116,7 @@ static void ov41_022562B8(SysTask *param0, void *param1)
     UnkStruct_ov41_02256220 *v1 = (UnkStruct_ov41_02256220 *)param1;
 
     if (v1->unk_00 < NELEMS(v0)) {
-        ov25_02254518(v1->poketchSys, v1->buttonManager);
+        PoketechSystem_UpdateButtonManager(v1->poketchSys, v1->buttonManager);
 
         if (v0[v1->unk_00](v1)) {
             ov41_02256294(v1);
@@ -177,7 +177,7 @@ static BOOL ov41_02256378(UnkStruct_ov41_02256220 *param0)
 
     switch (param0->unk_01) {
     case 0:
-        if (ov25_0225450C(param0->poketchSys)) {
+        if (PoketechSystem_IsRunningTask(param0->poketchSys)) {
             break;
         }
 

src/overlay041/ov41_022567B0.c

@@ -60,7 +60,7 @@ BOOL ov41_022567B0(UnkStruct_ov41_022567B0 **param0, const UnkStruct_ov41_022567
         PoketchTask_InitActiveTaskList(v0->unk_08, 4);
 
         v0->unk_00 = param1;
-        v0->unk_04 = ov25_02254674();
+        v0->unk_04 = Poketch_GetBgConfig();
         v0->unk_20 = ov25_02254664();
         v0->unk_68 = 0;
 
@@ -224,7 +224,7 @@ static void ov41_022568DC(SysTask *param0, void *param1)
     v4 /= 0x20;
 
     Graphics_LoadTilemapToBgLayer(12, 85, v3->unk_04, 6, 0, 0, 1, 8);
-    ov25_022546B8(0, 0);
+    Poketch_LoadActivePalette(0, 0);
 
     GF_ASSERT(GF_heap_c_dummy_return_true(8));
 

src/overlay042/ov42_022563D4.c

@@ -48,7 +48,7 @@ BOOL ov42_022563D4(UnkStruct_ov42_022563D4 **param0, const UnkStruct_ov42_022563
     if (v0 != NULL) {
         PoketchTask_InitActiveTaskList(v0->unk_08, 4);
         v0->unk_00 = param1;
-        v0->unk_04 = ov25_02254674();
+        v0->unk_04 = Poketch_GetBgConfig();
         v0->unk_20 = ov25_02254664();
 
         ov42_02256420(v0);
@@ -153,7 +153,7 @@ static void ov42_022564F0(SysTask *param0, void *param1)
     Graphics_LoadTilesToBgLayer(12, 54, v2->unk_04, 6, 0, 0, 1, 8);
     Graphics_LoadTilemapToBgLayer(12, 53, v2->unk_04, 6, 0, 0, 1, 8);
 
-    ov25_022546B8(0, 0);
+    Poketch_LoadActivePalette(0, 0);
     Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6);
 
     v1 = GXS_GetDispCnt();

src/overlay043/ov43_022561C0.c

@@ -125,7 +125,7 @@ static void ov43_022562CC(SysTask *param0, void *param1)
     UnkStruct_ov43_0225621C *v1 = (UnkStruct_ov43_0225621C *)param1;
 
     if (v1->unk_00 < NELEMS(v0)) {
-        ov25_02254518(v1->poketchSys, v1->buttonManager);
+        PoketechSystem_UpdateButtonManager(v1->poketchSys, v1->buttonManager);
 
         if (v0[v1->unk_00](v1)) {
             ov43_022562A8(v1);

src/overlay043/ov43_02256544.c

@@ -62,7 +62,7 @@ BOOL ov43_02256544(UnkStruct_ov43_02256544 **param0, const UnkStruct_ov43_022565
     if (v0 != NULL) {
         PoketchTask_InitActiveTaskList(v0->unk_08, 8);
         v0->unk_00 = param1;
-        v0->unk_04 = ov25_02254674();
+        v0->unk_04 = Poketch_GetBgConfig();
         v0->unk_30 = ov25_02254664();
         v0->unk_B4 = MessageLoader_Init(1, 26, 624, 8);
         v0->unk_B8 = MessageLoader_Init(1, 26, 456, 8);
@@ -242,7 +242,7 @@ static void ov43_02256700(SysTask *param0, void *param1)
 
     v6 = Graphics_LoadTilesToBgLayer(12, 61, v2->unk_04, 6, 0, 0, 1, 8);
     Graphics_LoadTilemapToBgLayer(12, 60, v2->unk_04, 6, 0, 0, 1, 8);
-    ov25_022546B8(0, 0);
+    Poketch_LoadActivePalette(0, 0);
 
     v6 /= 0x20;
     ov43_022567A4(v2, v3, v6);

src/overlay044/ov44_022561C0.c

@@ -143,7 +143,7 @@ static void ov44_02256338(SysTask *param0, void *param1)
     UnkStruct_ov44_0225621C *v1 = (UnkStruct_ov44_0225621C *)param1;
 
     if (v1->unk_00 < NELEMS(v0)) {
-        ov25_02254518(v1->poketchSys, v1->buttonManager);
+        PoketechSystem_UpdateButtonManager(v1->poketchSys, v1->buttonManager);
 
         if (v0[v1->unk_00](v1)) {
             ov44_02256314(v1);

src/overlay044/ov44_022565BC.c

@@ -62,7 +62,7 @@ BOOL ov44_022565BC(UnkStruct_ov44_022565BC **param0, const UnkStruct_ov44_022565
     if (v0 != NULL) {
         PoketchTask_InitActiveTaskList(v0->unk_08, 4);
         v0->unk_00 = param1;
-        v0->unk_04 = ov25_02254674();
+        v0->unk_04 = Poketch_GetBgConfig();
         v0->unk_20 = ov25_02254664();
         ov44_0225660C(v0, param1);
         *param0 = v0;
@@ -240,7 +240,7 @@ static void ov44_02256794(SysTask *param0, void *param1)
     Graphics_LoadTilesToBgLayer(12, 71, v2->unk_04, 6, 0, 0, 1, 8);
     Graphics_LoadTilemapToBgLayer(12, 70, v2->unk_04, 6, 0, 0, 1, 8);
 
-    ov25_022546B8(0, 0);
+    Poketch_LoadActivePalette(0, 0);
     Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6);
 
     v1 = GXS_GetDispCnt();

src/overlay045/ov45_022561C0.c

@@ -196,7 +196,7 @@ static void ov45_02256318(SysTask *param0, void *param1)
     UnkStruct_ov45_022561D4 *v1 = (UnkStruct_ov45_022561D4 *)param1;
 
     if (v1->unk_00 < NELEMS(v0)) {
-        ov25_02254518(v1->poketchSys, v1->buttonManager);
+        PoketechSystem_UpdateButtonManager(v1->poketchSys, v1->buttonManager);
 
         if (v0[v1->unk_00](v1)) {
             ov45_022562F8(v1);

src/overlay045/ov45_022566EC.c

@@ -51,7 +51,7 @@ BOOL ov45_022566EC(UnkStruct_ov45_022566EC **param0, const UnkStruct_ov45_022566
     if (v0 != NULL) {
         PoketchTask_InitActiveTaskList(v0->unk_08, 8);
         v0->unk_00 = param1;
-        v0->unk_04 = ov25_02254674();
+        v0->unk_04 = Poketch_GetBgConfig();
         v0->unk_30 = ov25_02254664();
         ov45_0225673C(v0, param1);
         *param0 = v0;
@@ -297,7 +297,7 @@ static void ov45_02256968(SysTask *param0, void *param1)
     Graphics_LoadTilesToBgLayer(12, 76, v2->unk_04, 6, 0, 0, 1, 8);
     Graphics_LoadTilemapToBgLayer(12, 75, v2->unk_04, 6, 0, 0, 1, 8);
 
-    ov25_022546B8(0, 0);
+    Poketch_LoadActivePalette(0, 0);
     Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6);
 
     v1 = GXS_GetDispCnt();

src/overlay046/ov46_022561C0.c

@@ -253,7 +253,7 @@ static void ov46_02256408(SysTask *param0, void *param1)
     UnkStruct_ov46_0225621C *v1 = (UnkStruct_ov46_0225621C *)param1;
 
     if (v1->unk_00 < NELEMS(v0)) {
-        ov25_02254518(v1->poketchSys, v1->buttonManager);
+        PoketechSystem_UpdateButtonManager(v1->poketchSys, v1->buttonManager);
 
         if (v1->unk_44) {
             ov46_02256D24(v1->unk_08, 4);

src/overlay046/ov46_02256BCC.c

@@ -55,7 +55,7 @@ BOOL ov46_02256BCC(UnkStruct_ov46_02256BCC **param0, const UnkStruct_ov46_02256B
         PoketchTask_InitActiveTaskList(v0->unk_08, 8);
 
         v0->unk_00 = param1;
-        v0->unk_04 = ov25_02254674();
+        v0->unk_04 = Poketch_GetBgConfig();
         v0->unk_30 = ov25_02254664();
 
         ov46_02256C20(v0, param1);
@@ -316,7 +316,7 @@ static void ov46_02256D74(SysTask *param0, void *param1)
     Graphics_LoadTilesToBgLayer(12, 91, v2->unk_04, 6, 0, 0, 1, 8);
     Graphics_LoadTilemapToBgLayer(12, 90, v2->unk_04, 6, 0, 0, 1, 8);
 
-    ov25_022546B8(0, 0);
+    Poketch_LoadActivePalette(0, 0);
     Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6);
 
     v1 = GXS_GetDispCnt();

src/overlay047/ov47_02256634.c

@@ -48,7 +48,7 @@ BOOL ov47_02256634(UnkStruct_ov47_02256634 **param0, const UnkStruct_ov47_022566
         PoketchTask_InitActiveTaskList(v0->unk_08, 4);
 
         v0->unk_00 = param1;
-        v0->unk_04 = ov25_02254674();
+        v0->unk_04 = Poketch_GetBgConfig();
         v0->unk_20 = ov25_02254664();
 
         ov47_02256684(v0, param1);
@@ -218,7 +218,7 @@ static void ov47_022568BC(SysTask *param0, void *param1)
     Graphics_LoadTilesToBgLayer(12, 117, v2->unk_04, 6, 0, 0, 1, 8);
     Graphics_LoadTilemapToBgLayer(12, 115, v2->unk_04, 6, 0, 0, 1, 8);
 
-    ov25_022546B8(0, 0);
+    Poketch_LoadActivePalette(0, 0);
 
     Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6);
 

src/overlay048/ov48_0225650C.c

@@ -57,7 +57,7 @@ BOOL ov48_0225650C(UnkStruct_ov48_0225650C **param0, const UnkStruct_ov48_022565
     if (v0 != NULL) {
         PoketchTask_InitActiveTaskList(v0->unk_08, 4);
         v0->unk_00 = param1;
-        v0->unk_04 = ov25_02254674();
+        v0->unk_04 = Poketch_GetBgConfig();
         v0->unk_20 = ov25_02254664();
         v0->unk_150 = param1->unk_8C;
         *param0 = v0;
@@ -136,7 +136,7 @@ static void ov48_022565A8(SysTask *param0, void *param1)
 
     Graphics_LoadTilemapToBgLayer(12, 116, v2->unk_04, 6, 0, 0, 1, 8);
 
-    ov25_022546B8(0, 0);
+    Poketch_LoadActivePalette(0, 0);
     ov48_02256650(v2, v4);
 
     Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6);

src/overlay049/ov49_022561C0.c

@@ -164,7 +164,7 @@ static BOOL ov49_022562FC(UnkStruct_ov49_0225621C *param0)
 
 static BOOL ov49_02256348(UnkStruct_ov49_0225621C *param0)
 {
-    if (ov25_0225450C(param0->poketchSys) == 0) {
+    if (PoketechSystem_IsRunningTask(param0->poketchSys) == 0) {
         u32 v0, v1;
 
         if (TouchScreen_GetHoldState(&v0, &v1)) {

src/overlay049/ov49_022563D4.c

@@ -42,7 +42,7 @@ BOOL ov49_022563D4(UnkStruct_ov49_022563D4 **param0, const UnkStruct_ov49_022563
     if (v0 != NULL) {
         PoketchTask_InitActiveTaskList(v0->unk_08, 4);
         v0->unk_00 = param1;
-        v0->unk_04 = ov25_02254674();
+        v0->unk_04 = Poketch_GetBgConfig();
         v0->unk_20 = ov25_02254664();
         ov49_02256410(v0, param1);
         *param0 = v0;
@@ -148,7 +148,7 @@ static void ov49_022564E4(SysTask *param0, void *param1)
     Graphics_LoadTilesToBgLayer(12, 66, v2->unk_04, 6, 0, 0, 1, 8);
     Graphics_LoadTilemapToBgLayer(12, 65, v2->unk_04, 6, 0, 0, 1, 8);
 
-    ov25_022546B8(0, 0);
+    Poketch_LoadActivePalette(0, 0);
     Bg_CopyTilemapBufferToVRAM(v2->unk_04, 6);
 
     v1 = GXS_GetDispCnt();
@@ -171,7 +171,7 @@ static void ov49_02256594(SysTask *param0, void *param1)
     const UnkStruct_ov49_022563D4_1 *v1 = PoketchTask_GetConstTaskData(param1);
 
     PoketchSystem_PlaySoundEffect(1635);
-    ov25_022546B8(0, 0);
+    Poketch_LoadActivePalette(0, 0);
     ov25_02255900(v0->unk_24, (56 + (16 * v1->unk_00)) << FX32_SHIFT, (148 << FX32_SHIFT));
     ov49_022564D0(param1);
 }

src/overlay050/ov50_022561C0.c

@@ -200,7 +200,7 @@ static void ov50_0225636C(SysTask *param0, void *param1)
     UnkStruct_ov50_022561D4 *v1 = (UnkStruct_ov50_022561D4 *)param1;
 
     if (v1->unk_00 < NELEMS(v0)) {
-        ov25_02254518(v1->poketchSys, v1->buttonManager);
+        PoketechSystem_UpdateButtonManager(v1->poketchSys, v1->buttonManager);
 
         if (v0[v1->unk_00](v1)) {
             ov50_02256340(v1);

src/overlay050/ov50_02256510.c

@@ -47,7 +47,7 @@ BOOL ov50_02256510(UnkStruct_ov50_02256510 **param0, const UnkStruct_ov50_022565
     if (v0 != NULL) {
         PoketchTask_InitActiveTaskList(v0->unk_08, 4);
         v0->unk_00 = param1;
-        v0->unk_04 = ov25_02254674();
+        v0->unk_04 = Poketch_GetBgConfig();
         v0->unk_20 = ov25_02254664();
         ov50_02256560(v0, param1);
         *param0 = v0;
@@ -174,7 +174,7 @@ static void ov50_0225664C(SysTask *param0, void *param1)
     ov50_022567F4(v3, v4);
 
     Graphics_LoadTilesToBgLayer(12, 111, v3->unk_04, 7, 0, 0, 1, 8);
-    ov25_022546B8(0, 0);
+    Poketch_LoadActivePalette(0, 0);
 
     Bg_CopyTilemapBufferToVRAM(v3->unk_04, 6);
     Bg_CopyTilemapBufferToVRAM(v3->unk_04, 7);

src/overlay051/ov51_0225632C.c

@@ -31,7 +31,7 @@ BOOL ov51_0225632C(UnkStruct_ov51_0225632C **param0, const UnkStruct_ov51_022563
         PoketchTask_InitActiveTaskList(v0->unk_08, 8);
 
         v0->unk_00 = param1;
-        v0->unk_04 = ov25_02254674();
+        v0->unk_04 = Poketch_GetBgConfig();
 
         if (v0->unk_04 != NULL) {
             *param0 = v0;

src/overlay052/ov52_022561C0.c

@@ -240,7 +240,7 @@ static BOOL ov52_02256364(UnkStruct_ov52_0225621C *param0)
 
 static BOOL ov52_02256430(UnkStruct_ov52_0225621C *param0)
 {
-    if (ov25_0225450C(param0->poketchSys)) {
+    if (PoketechSystem_IsRunningTask(param0->poketchSys)) {
         return 1;
     }
 
@@ -327,7 +327,7 @@ static BOOL ov52_02256508(UnkStruct_ov52_0225621C *param0)
 
 static BOOL ov52_02256554(UnkStruct_ov52_0225621C *param0)
 {
-    if (ov25_0225450C(param0->poketchSys) == 0) {
+    if (PoketechSystem_IsRunningTask(param0->poketchSys) == 0) {
         u32 v0, v1;
 
         if (TouchScreen_GetTapState(&v0, &v1)) {

src/overlay052/ov52_02256694.c

@@ -59,7 +59,7 @@ BOOL ov52_02256694(UnkStruct_ov52_02256694 **param0, const UnkStruct_ov52_022566
     if (v0 != NULL) {
         PoketchTask_InitActiveTaskList(v0->unk_08, 4);
         v0->unk_00 = param1;
-        v0->unk_04 = ov25_02254674();
+        v0->unk_04 = Poketch_GetBgConfig();
         v0->unk_30 = ov25_02254664();
         v0->unk_58 = MessageLoader_Init(1, 26, 461, 8);
         v0->unk_5C = Strbuf_Init(96, 8);
@@ -209,7 +209,7 @@ static void ov52_022567F4(SysTask *param0, void *param1)
     v5 /= 0x20;
 
     Graphics_LoadTilemapToBgLayer(12, 95, v2->unk_04, 6, 0, 0, 1, 8);
-    ov25_022546B8(0, 0);
+    Poketch_LoadActivePalette(0, 0);
 
     Window_Add(v2->unk_04, &v2->unk_20, 6, 2, 2, 24, 20, 0, v5);
     Window_PutToTilemap(&v2->unk_20);

src/overlay053/ov53_022561C0.c

@@ -135,7 +135,7 @@ static void ov53_022562D0(SysTask *param0, void *param1)
     UnkStruct_ov53_0225621C *v1 = (UnkStruct_ov53_0225621C *)param1;
 
     if (v1->unk_00 < NELEMS(v0)) {
-        ov25_02254518(v1->poketchSys, v1->buttonManager);
+        PoketechSystem_UpdateButtonManager(v1->poketchSys, v1->buttonManager);
 
         if (v0[v1->unk_00](v1)) {
             ov53_022562B8(v1);

src/overlay053/ov53_02256420.c

@@ -53,7 +53,7 @@ BOOL ov53_02256420(UnkStruct_ov53_02256420 **param0, const UnkStruct_ov53_022564
     if (v0 != NULL) {
         PoketchTask_InitActiveTaskList(v0->unk_08, 4);
         v0->unk_00 = param1;
-        v0->unk_04 = ov25_02254674();
+        v0->unk_04 = Poketch_GetBgConfig();
         v0->unk_20 = ov25_02254664();
         *param0 = v0;
 
@@ -127,7 +127,7 @@ static void ov53_022564B0(SysTask *param0, void *param1)
     Graphics_LoadTilesToBgLayer(12, 122, v2->unk_04, 6, 0, 0, 1, 8);
     Graphics_LoadTilemapToBgLayer(12, 121, v2->unk_04, 6, 0, 0, 1, 8);
 
-    ov25_022546B8(0, 0);
+    Poketch_LoadActivePalette(0, 0);
     ov53_022566AC(v2, v3);
 
     v1 = GXS_GetDispCnt();

src/overlay054/ov54_022561C0.c

@@ -160,7 +160,7 @@ static void ov54_022562F4(SysTask *param0, void *param1)
     UnkStruct_ov54_0225621C *v1 = (UnkStruct_ov54_0225621C *)param1;
 
     if (v1->unk_00 < NELEMS(v0)) {
-        ov25_02254518(v1->poketchSys, v1->buttonManager);
+        PoketechSystem_UpdateButtonManager(v1->poketchSys, v1->buttonManager);
 
         if (v0[v1->unk_00](v1)) {
             ov54_022562D4(v1);

src/overlay054/ov54_0225642C.c

@@ -45,7 +45,7 @@ BOOL ov54_0225642C(UnkStruct_ov54_0225642C **param0, const UnkStruct_ov54_022564
     if (v0 != NULL) {
         PoketchTask_InitActiveTaskList(v0->unk_08, 4);
         v0->unk_00 = param1;
-        v0->unk_04 = ov25_02254674();
+        v0->unk_04 = Poketch_GetBgConfig();
         v0->unk_20 = ov25_02254664();
         *param0 = v0;
 
@@ -118,7 +118,7 @@ static void ov54_022564BC(SysTask *param0, void *param1)
     Bg_FillTilesRange(v2->unk_04, 6, 4, 1, 0);
     Bg_FillTilemapRect(v2->unk_04, 6, 0, 0, 0, 32, 24, 0);
 
-    ov25_022546B8(0, 0);
+    Poketch_LoadActivePalette(0, 0);
 
     Window_Add(v2->unk_04, &v4, 6, 2, 2, 24, 2, 0, 1);
     Window_FillTilemap(&v4, 4);