From fada4b585398a4d4a9aa9302ea6dac43446deb83 Mon Sep 17 00:00:00 2001 From: Lucie Date: Sat, 15 Feb 2025 12:54:09 +0000 Subject: [PATCH 01/11] document isRunningTask and UpdateButtonManager --- include/overlay025/poketch_system.h | 4 ++-- src/overlay025/poketch_system.c | 22 +++++++++++----------- src/overlay027/ov27_022561C0.c | 2 +- src/overlay028/ov28_022561C0.c | 2 +- src/overlay029/ov29_022561C0.c | 4 ++-- src/overlay030/ov30_022561C0.c | 2 +- src/overlay034/ov34_022561C0.c | 4 ++-- src/overlay035/ov35_022561C0.c | 2 +- src/overlay036/ov36_022561C0.c | 2 +- src/overlay037/ov37_022561C0.c | 2 +- src/overlay039/ov39_022561C0.c | 2 +- src/overlay040/ov40_022561C0.c | 2 +- src/overlay041/ov41_022561C0.c | 4 ++-- src/overlay043/ov43_022561C0.c | 2 +- src/overlay044/ov44_022561C0.c | 2 +- src/overlay045/ov45_022561C0.c | 2 +- src/overlay046/ov46_022561C0.c | 2 +- src/overlay049/ov49_022561C0.c | 2 +- src/overlay050/ov50_022561C0.c | 2 +- src/overlay052/ov52_022561C0.c | 4 ++-- src/overlay053/ov53_022561C0.c | 2 +- src/overlay054/ov54_022561C0.c | 2 +- 22 files changed, 37 insertions(+), 37 deletions(-) diff --git a/include/overlay025/poketch_system.h b/include/overlay025/poketch_system.h index 07ff9d237c..7363eaab51 100644 --- a/include/overlay025/poketch_system.h +++ b/include/overlay025/poketch_system.h @@ -130,8 +130,8 @@ void PoketchSystem_PlaySoundEffect(u32 soundID); void ov25_02254444(u32 param0, u32 param1); 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); diff --git a/src/overlay025/poketch_system.c b/src/overlay025/poketch_system.c index 9ad1547f09..3bdf17c346 100644 --- a/src/overlay025/poketch_system.c +++ b/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 ov25_02254444(u32 param0, u32 param1) { PoketchSystem *poketchSys = PoketchSystem_GetFromFieldSystem(); - if (poketchSys->appChanging == FALSE && ov25_0225450C(poketchSys) == 0) { + if (poketchSys->appChanging == FALSE && PoketechSystem_IsRunningTask(poketchSys) == 0) { sub_02005844(param0, param1); } } @@ -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); } } diff --git a/src/overlay027/ov27_022561C0.c b/src/overlay027/ov27_022561C0.c index e4a7377089..386f225850 100644 --- a/src/overlay027/ov27_022561C0.c +++ b/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)) { diff --git a/src/overlay028/ov28_022561C0.c b/src/overlay028/ov28_022561C0.c index 3e9dadb215..726dac374e 100644 --- a/src/overlay028/ov28_022561C0.c +++ b/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); diff --git a/src/overlay029/ov29_022561C0.c b/src/overlay029/ov29_022561C0.c index be7ac50d00..cc51c58428 100644 --- a/src/overlay029/ov29_022561C0.c +++ b/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; } diff --git a/src/overlay030/ov30_022561C0.c b/src/overlay030/ov30_022561C0.c index 12f44307cd..29cfec1617 100644 --- a/src/overlay030/ov30_022561C0.c +++ b/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); diff --git a/src/overlay034/ov34_022561C0.c b/src/overlay034/ov34_022561C0.c index f67d5e2d38..01212fb28b 100644 --- a/src/overlay034/ov34_022561C0.c +++ b/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; diff --git a/src/overlay035/ov35_022561C0.c b/src/overlay035/ov35_022561C0.c index ca51dbf9bc..01511f17c7 100644 --- a/src/overlay035/ov35_022561C0.c +++ b/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); diff --git a/src/overlay036/ov36_022561C0.c b/src/overlay036/ov36_022561C0.c index 836c634f5f..6cb1ad8cb0 100644 --- a/src/overlay036/ov36_022561C0.c +++ b/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); diff --git a/src/overlay037/ov37_022561C0.c b/src/overlay037/ov37_022561C0.c index 6c22e07d82..c00814cff6 100644 --- a/src/overlay037/ov37_022561C0.c +++ b/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); diff --git a/src/overlay039/ov39_022561C0.c b/src/overlay039/ov39_022561C0.c index 81cd8b35d7..30af4cf29d 100644 --- a/src/overlay039/ov39_022561C0.c +++ b/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); diff --git a/src/overlay040/ov40_022561C0.c b/src/overlay040/ov40_022561C0.c index 64b142eb47..1c847efda4 100644 --- a/src/overlay040/ov40_022561C0.c +++ b/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)) { diff --git a/src/overlay041/ov41_022561C0.c b/src/overlay041/ov41_022561C0.c index 469d62a93e..13458955f1 100644 --- a/src/overlay041/ov41_022561C0.c +++ b/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; } diff --git a/src/overlay043/ov43_022561C0.c b/src/overlay043/ov43_022561C0.c index 70f589cf0e..f355a7c2cb 100644 --- a/src/overlay043/ov43_022561C0.c +++ b/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); diff --git a/src/overlay044/ov44_022561C0.c b/src/overlay044/ov44_022561C0.c index b24f09a1ee..67183a71f6 100644 --- a/src/overlay044/ov44_022561C0.c +++ b/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); diff --git a/src/overlay045/ov45_022561C0.c b/src/overlay045/ov45_022561C0.c index 51d3ab5c0b..23a37828e7 100644 --- a/src/overlay045/ov45_022561C0.c +++ b/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); diff --git a/src/overlay046/ov46_022561C0.c b/src/overlay046/ov46_022561C0.c index ad215e860e..5d60a85e6a 100644 --- a/src/overlay046/ov46_022561C0.c +++ b/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); diff --git a/src/overlay049/ov49_022561C0.c b/src/overlay049/ov49_022561C0.c index ac64ed3b76..2e4760287c 100644 --- a/src/overlay049/ov49_022561C0.c +++ b/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)) { diff --git a/src/overlay050/ov50_022561C0.c b/src/overlay050/ov50_022561C0.c index c7210dbfc4..a2a2abfd42 100644 --- a/src/overlay050/ov50_022561C0.c +++ b/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); diff --git a/src/overlay052/ov52_022561C0.c b/src/overlay052/ov52_022561C0.c index e947fe9483..f5539fcd08 100644 --- a/src/overlay052/ov52_022561C0.c +++ b/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)) { diff --git a/src/overlay053/ov53_022561C0.c b/src/overlay053/ov53_022561C0.c index 9a9e8db08d..41c99169dc 100644 --- a/src/overlay053/ov53_022561C0.c +++ b/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); diff --git a/src/overlay054/ov54_022561C0.c b/src/overlay054/ov54_022561C0.c index 1598fb0009..c115a341ec 100644 --- a/src/overlay054/ov54_022561C0.c +++ b/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); From d1dabfe13be75f46266a8f6c028d0a22f72696a2 Mon Sep 17 00:00:00 2001 From: Lucie Date: Sat, 15 Feb 2025 21:35:18 +0000 Subject: [PATCH 02/11] Document Poketch palette functions --- include/overlay025/ov25_02254560.h | 6 ++-- src/overlay025/ov25_02254560.c | 52 +++++++++++++++++------------- src/overlay025/ov25_02255090.c | 4 +-- src/overlay027/ov27_0225680C.c | 2 +- src/overlay028/ov28_0225697C.c | 2 +- src/overlay029/ov29_022566C8.c | 2 +- src/overlay030/ov30_022563EC.c | 6 ++-- src/overlay031/ov31_02256554.c | 2 +- src/overlay032/ov32_02256470.c | 2 +- src/overlay033/ov33_02256474.c | 2 +- src/overlay034/ov34_02256540.c | 4 +-- src/overlay035/ov35_02256410.c | 2 +- src/overlay036/ov36_02256404.c | 2 +- src/overlay037/ov37_022563D4.c | 2 +- src/overlay039/ov39_022563DC.c | 2 +- src/overlay040/ov40_0225645C.c | 2 +- src/overlay041/ov41_022567B0.c | 2 +- src/overlay042/ov42_022563D4.c | 2 +- src/overlay043/ov43_02256544.c | 2 +- src/overlay044/ov44_022565BC.c | 2 +- src/overlay045/ov45_022566EC.c | 2 +- src/overlay046/ov46_02256BCC.c | 2 +- src/overlay047/ov47_02256634.c | 2 +- src/overlay048/ov48_0225650C.c | 2 +- src/overlay049/ov49_022563D4.c | 4 +-- src/overlay050/ov50_02256510.c | 2 +- src/overlay052/ov52_02256694.c | 2 +- src/overlay053/ov53_02256420.c | 2 +- src/overlay054/ov54_0225642C.c | 2 +- 29 files changed, 64 insertions(+), 58 deletions(-) diff --git a/include/overlay025/ov25_02254560.h b/include/overlay025/ov25_02254560.h index 84679b4484..e6e5441c55 100644 --- a/include/overlay025/ov25_02254560.h +++ b/include/overlay025/ov25_02254560.h @@ -13,9 +13,9 @@ 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); +void Poketch_LoadActivePalette(u32 param0, u32 param1); +void Poketch_LoadActiveBacklightPalette(u32 param0, u32 param1); +void Poketch_CopuActivePalette(u16 *param0); 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); diff --git a/src/overlay025/ov25_02254560.c b/src/overlay025/ov25_02254560.c index 19e94fc8cc..5fca4ed7ec 100644 --- a/src/overlay025/ov25_02254560.c +++ b/src/overlay025/ov25_02254560.c @@ -24,6 +24,13 @@ #include "sys_task_manager.h" #include "unk_02005474.h" +#define POKETCH_PALETTE_NARC_IDX 0 +#define NUM_POKETCH_PALETTES 16 +#define NUM_POKETCH_PALETTE_COLOUR_SETS 8 +#define POKETCH_PALETTE_SIZE 0x20 +#define POKETCH_BACKLIGHT_PALETTE_OFFSET 16 +#define POKETCH_PALETTE_COLOUR_SET_LENGTH 32 + typedef struct { BOOL unk_00; UnkStruct_ov25_022555E8 *unk_04; @@ -47,7 +54,7 @@ struct UnkStruct_ov25_02254560_t { UnkStruct_ov25_02254DD8 unk_1D4; BgConfig *unk_1F8; PoketchSystem *poketchSys; - u16 unk_200[256]; + u16 poketchPalettes[256]; u16 unk_400[16]; }; @@ -57,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(UnkStruct_ov25_02255224 *param0); static void ov25_02254820(SysTask *param0, void *param1); @@ -107,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); ov25_02255090((*param0)->unk_04, 8); @@ -145,47 +152,46 @@ BgConfig *ov25_02254674(void) 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_POKETCH_PALETTES * POKETCH_PALETTE_SIZE); + DC_FlushRange(param0->poketchPalettes, NUM_POKETCH_PALETTES * POKETCH_PALETTE_SIZE); + 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 * POKETCH_PALETTE_COLOUR_SET_LENGTH], bgOffset * POKETCH_PALETTE_SIZE, POKETCH_PALETTE_SIZE); + GXS_LoadOBJPltt(&v0->poketchPalettes[screenColour * POKETCH_PALETTE_COLOUR_SET_LENGTH], objOffset, POKETCH_PALETTE_SIZE); } -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 * POKETCH_PALETTE_COLOUR_SET_LENGTH + POKETCH_BACKLIGHT_PALETTE_OFFSET], 0, POKETCH_PALETTE_SIZE); + GXS_LoadOBJPltt(&v0->poketchPalettes[screenColour * POKETCH_PALETTE_COLOUR_SET_LENGTH + POKETCH_BACKLIGHT_PALETTE_OFFSET], 0, POKETCH_PALETTE_SIZE); } -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 * POKETCH_PALETTE_COLOUR_SET_LENGTH], dest, POKETCH_PALETTE_SIZE); } void ov25_02254754(UnkStruct_ov25_02254560 *param0) @@ -607,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]; diff --git a/src/overlay025/ov25_02255090.c b/src/overlay025/ov25_02255090.c index 2a70120cfa..447c74d608 100644 --- a/src/overlay025/ov25_02255090.c +++ b/src/overlay025/ov25_02255090.c @@ -201,7 +201,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; @@ -230,7 +230,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; diff --git a/src/overlay027/ov27_0225680C.c b/src/overlay027/ov27_0225680C.c index e43ada31b0..7cb6295684 100644 --- a/src/overlay027/ov27_0225680C.c +++ b/src/overlay027/ov27_0225680C.c @@ -194,7 +194,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); { diff --git a/src/overlay028/ov28_0225697C.c b/src/overlay028/ov28_0225697C.c index a15deff3c7..5450873840 100644 --- a/src/overlay028/ov28_0225697C.c +++ b/src/overlay028/ov28_0225697C.c @@ -546,7 +546,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); diff --git a/src/overlay029/ov29_022566C8.c b/src/overlay029/ov29_022566C8.c index 7d503d3ca4..accbaab0f0 100644 --- a/src/overlay029/ov29_022566C8.c +++ b/src/overlay029/ov29_022566C8.c @@ -177,7 +177,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)); diff --git a/src/overlay030/ov30_022563EC.c b/src/overlay030/ov30_022563EC.c index 3e1b011ef7..b544efa6df 100644 --- a/src/overlay030/ov30_022563EC.c +++ b/src/overlay030/ov30_022563EC.c @@ -143,7 +143,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); @@ -167,9 +167,9 @@ static void ov30_02256568(SysTask *param0, void *param1) UnkStruct_ov30_022563EC *v0 = ov25_0225523C(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); diff --git a/src/overlay031/ov31_02256554.c b/src/overlay031/ov31_02256554.c index af99a4ed99..9a823111ac 100644 --- a/src/overlay031/ov31_02256554.c +++ b/src/overlay031/ov31_02256554.c @@ -107,7 +107,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); diff --git a/src/overlay032/ov32_02256470.c b/src/overlay032/ov32_02256470.c index aeccd5ff74..ee8e925b86 100644 --- a/src/overlay032/ov32_02256470.c +++ b/src/overlay032/ov32_02256470.c @@ -181,7 +181,7 @@ static void ov32_02256588(SysTask *param0, void *param1) v3 /= 0x20; Bg_FillTilemapRect(v2->unk_04, 6, 0x5, 0, 0, 32, 24, 0); - ov25_022546B8(0, 0); + Poketch_LoadActivePalette(0, 0); v2->unk_34 = v3; ov32_02256648(v2, v2->unk_00, v3); diff --git a/src/overlay033/ov33_02256474.c b/src/overlay033/ov33_02256474.c index 114935e259..a7db3baea9 100644 --- a/src/overlay033/ov33_02256474.c +++ b/src/overlay033/ov33_02256474.c @@ -220,7 +220,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); diff --git a/src/overlay034/ov34_02256540.c b/src/overlay034/ov34_02256540.c index e86b4479e5..28cbaac96f 100644 --- a/src/overlay034/ov34_02256540.c +++ b/src/overlay034/ov34_02256540.c @@ -184,10 +184,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)); diff --git a/src/overlay035/ov35_02256410.c b/src/overlay035/ov35_02256410.c index 589bf60f6e..dc23f10eca 100644 --- a/src/overlay035/ov35_02256410.c +++ b/src/overlay035/ov35_02256410.c @@ -179,7 +179,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(); diff --git a/src/overlay036/ov36_02256404.c b/src/overlay036/ov36_02256404.c index ce7dd0291c..36fbaccfd4 100644 --- a/src/overlay036/ov36_02256404.c +++ b/src/overlay036/ov36_02256404.c @@ -172,7 +172,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(); diff --git a/src/overlay037/ov37_022563D4.c b/src/overlay037/ov37_022563D4.c index 7c74d4f713..ad8c0fd35f 100644 --- a/src/overlay037/ov37_022563D4.c +++ b/src/overlay037/ov37_022563D4.c @@ -147,7 +147,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(); diff --git a/src/overlay039/ov39_022563DC.c b/src/overlay039/ov39_022563DC.c index 60497f80e7..8d3db94815 100644 --- a/src/overlay039/ov39_022563DC.c +++ b/src/overlay039/ov39_022563DC.c @@ -114,7 +114,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); diff --git a/src/overlay040/ov40_0225645C.c b/src/overlay040/ov40_0225645C.c index 82f00b01e3..a8f23f27cb 100644 --- a/src/overlay040/ov40_0225645C.c +++ b/src/overlay040/ov40_0225645C.c @@ -274,7 +274,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); diff --git a/src/overlay041/ov41_022567B0.c b/src/overlay041/ov41_022567B0.c index f02ef58adc..9ff0c73d38 100644 --- a/src/overlay041/ov41_022567B0.c +++ b/src/overlay041/ov41_022567B0.c @@ -226,7 +226,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)); diff --git a/src/overlay042/ov42_022563D4.c b/src/overlay042/ov42_022563D4.c index ea20fc6bbb..e67f83adff 100644 --- a/src/overlay042/ov42_022563D4.c +++ b/src/overlay042/ov42_022563D4.c @@ -155,7 +155,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(); diff --git a/src/overlay043/ov43_02256544.c b/src/overlay043/ov43_02256544.c index d23d664f6d..89552cafc1 100644 --- a/src/overlay043/ov43_02256544.c +++ b/src/overlay043/ov43_02256544.c @@ -244,7 +244,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); diff --git a/src/overlay044/ov44_022565BC.c b/src/overlay044/ov44_022565BC.c index 153228005a..f1e452ddd2 100644 --- a/src/overlay044/ov44_022565BC.c +++ b/src/overlay044/ov44_022565BC.c @@ -242,7 +242,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(); diff --git a/src/overlay045/ov45_022566EC.c b/src/overlay045/ov45_022566EC.c index d54c37c062..511185d9af 100644 --- a/src/overlay045/ov45_022566EC.c +++ b/src/overlay045/ov45_022566EC.c @@ -299,7 +299,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(); diff --git a/src/overlay046/ov46_02256BCC.c b/src/overlay046/ov46_02256BCC.c index 687882239c..2a138a864f 100644 --- a/src/overlay046/ov46_02256BCC.c +++ b/src/overlay046/ov46_02256BCC.c @@ -318,7 +318,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(); diff --git a/src/overlay047/ov47_02256634.c b/src/overlay047/ov47_02256634.c index 7e9724ad45..7828db4167 100644 --- a/src/overlay047/ov47_02256634.c +++ b/src/overlay047/ov47_02256634.c @@ -220,7 +220,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); diff --git a/src/overlay048/ov48_0225650C.c b/src/overlay048/ov48_0225650C.c index b63ec3b944..392c36175a 100644 --- a/src/overlay048/ov48_0225650C.c +++ b/src/overlay048/ov48_0225650C.c @@ -138,7 +138,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); diff --git a/src/overlay049/ov49_022563D4.c b/src/overlay049/ov49_022563D4.c index 59449bd35e..5e1fd1eb19 100644 --- a/src/overlay049/ov49_022563D4.c +++ b/src/overlay049/ov49_022563D4.c @@ -150,7 +150,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(); @@ -173,7 +173,7 @@ static void ov49_02256594(SysTask *param0, void *param1) const UnkStruct_ov49_022563D4_1 *v1 = ov25_02255240(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); } diff --git a/src/overlay050/ov50_02256510.c b/src/overlay050/ov50_02256510.c index 6fc8f713b7..d57946f5ef 100644 --- a/src/overlay050/ov50_02256510.c +++ b/src/overlay050/ov50_02256510.c @@ -176,7 +176,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); diff --git a/src/overlay052/ov52_02256694.c b/src/overlay052/ov52_02256694.c index 3e0940787e..2c14b2c56a 100644 --- a/src/overlay052/ov52_02256694.c +++ b/src/overlay052/ov52_02256694.c @@ -211,7 +211,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); diff --git a/src/overlay053/ov53_02256420.c b/src/overlay053/ov53_02256420.c index 9b5cca2e6a..21e3f1cf23 100644 --- a/src/overlay053/ov53_02256420.c +++ b/src/overlay053/ov53_02256420.c @@ -129,7 +129,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(); diff --git a/src/overlay054/ov54_0225642C.c b/src/overlay054/ov54_0225642C.c index 30fdff1d83..5811b31172 100644 --- a/src/overlay054/ov54_0225642C.c +++ b/src/overlay054/ov54_0225642C.c @@ -120,7 +120,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); From a7350f0f4a12058ab2e3da6ee505095627873df6 Mon Sep 17 00:00:00 2001 From: Lucie Date: Sun, 16 Feb 2025 00:54:35 +0000 Subject: [PATCH 03/11] Document Poketch get bgConfig func --- include/overlay025/ov25_02254560.h | 2 +- src/overlay025/ov25_02254560.c | 2 +- src/overlay029/ov29_022566C8.c | 2 +- src/overlay030/ov30_022563EC.c | 2 +- src/overlay031/ov31_02256554.c | 2 +- src/overlay032/ov32_02256470.c | 2 +- src/overlay033/ov33_02256474.c | 2 +- src/overlay034/ov34_02256540.c | 2 +- src/overlay035/ov35_02256410.c | 2 +- src/overlay036/ov36_02256404.c | 2 +- src/overlay037/ov37_022563D4.c | 2 +- src/overlay038/ov38_0225632C.c | 2 +- src/overlay039/ov39_022563DC.c | 2 +- src/overlay040/ov40_0225645C.c | 2 +- src/overlay041/ov41_022567B0.c | 2 +- src/overlay042/ov42_022563D4.c | 2 +- src/overlay043/ov43_02256544.c | 2 +- src/overlay044/ov44_022565BC.c | 2 +- src/overlay045/ov45_022566EC.c | 2 +- src/overlay046/ov46_02256BCC.c | 2 +- src/overlay047/ov47_02256634.c | 2 +- src/overlay048/ov48_0225650C.c | 2 +- src/overlay049/ov49_022563D4.c | 2 +- src/overlay050/ov50_02256510.c | 2 +- src/overlay051/ov51_0225632C.c | 2 +- src/overlay052/ov52_02256694.c | 2 +- src/overlay053/ov53_02256420.c | 2 +- src/overlay054/ov54_0225642C.c | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/include/overlay025/ov25_02254560.h b/include/overlay025/ov25_02254560.h index e6e5441c55..5f2c37ee54 100644 --- a/include/overlay025/ov25_02254560.h +++ b/include/overlay025/ov25_02254560.h @@ -12,7 +12,7 @@ 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); +BgConfig *Poketch_GetBgConfig(void); void Poketch_LoadActivePalette(u32 param0, u32 param1); void Poketch_LoadActiveBacklightPalette(u32 param0, u32 param1); void Poketch_CopuActivePalette(u16 *param0); diff --git a/src/overlay025/ov25_02254560.c b/src/overlay025/ov25_02254560.c index 5fca4ed7ec..e213c6c80c 100644 --- a/src/overlay025/ov25_02254560.c +++ b/src/overlay025/ov25_02254560.c @@ -146,7 +146,7 @@ UnkStruct_ov25_022555E8 *ov25_02254664(void) return v0->unk_1CC; } -BgConfig *ov25_02254674(void) +BgConfig *Poketch_GetBgConfig(void) { UnkStruct_ov25_02254560 *v0 = ov25_02254418(); return v0->unk_1F8; diff --git a/src/overlay029/ov29_022566C8.c b/src/overlay029/ov29_022566C8.c index accbaab0f0..1744872813 100644 --- a/src/overlay029/ov29_022566C8.c +++ b/src/overlay029/ov29_022566C8.c @@ -53,7 +53,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)); diff --git a/src/overlay030/ov30_022563EC.c b/src/overlay030/ov30_022563EC.c index b544efa6df..3f4efc4b35 100644 --- a/src/overlay030/ov30_022563EC.c +++ b/src/overlay030/ov30_022563EC.c @@ -52,7 +52,7 @@ BOOL ov30_022563EC(UnkStruct_ov30_022563EC **param0, const UnkStruct_ov30_022563 ov25_02255090(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) { diff --git a/src/overlay031/ov31_02256554.c b/src/overlay031/ov31_02256554.c index 9a823111ac..447d1cd472 100644 --- a/src/overlay031/ov31_02256554.c +++ b/src/overlay031/ov31_02256554.c @@ -35,7 +35,7 @@ BOOL ov31_02256554(UnkStruct_ov31_02256554 **param0, const UnkStruct_ov31_022565 ov25_02255090(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; diff --git a/src/overlay032/ov32_02256470.c b/src/overlay032/ov32_02256470.c index ee8e925b86..6c9f8a3e29 100644 --- a/src/overlay032/ov32_02256470.c +++ b/src/overlay032/ov32_02256470.c @@ -90,7 +90,7 @@ BOOL ov32_02256470(UnkStruct_ov32_02256470 **param0, const UnkStruct_ov32_022564 ov25_02255090(v0->unk_0C, 8); v0->unk_00 = param1; - v0->unk_04 = ov25_02254674(); + v0->unk_04 = Poketch_GetBgConfig(); v0->unk_08 = ov25_02254664(); v0->unk_38 = 0; v0->unk_F4 = NULL; diff --git a/src/overlay033/ov33_02256474.c b/src/overlay033/ov33_02256474.c index a7db3baea9..ad15d580c7 100644 --- a/src/overlay033/ov33_02256474.c +++ b/src/overlay033/ov33_02256474.c @@ -122,7 +122,7 @@ BOOL ov33_02256474(UnkStruct_ov33_02256474 **param0, const UnkStruct_ov33_022564 ov25_02255090(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; diff --git a/src/overlay034/ov34_02256540.c b/src/overlay034/ov34_02256540.c index 28cbaac96f..9f2d46b405 100644 --- a/src/overlay034/ov34_02256540.c +++ b/src/overlay034/ov34_02256540.c @@ -55,7 +55,7 @@ BOOL ov34_02256540(UnkStruct_ov34_02256540 **param0, const UnkStruct_ov34_022565 ov25_02255090(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; diff --git a/src/overlay035/ov35_02256410.c b/src/overlay035/ov35_02256410.c index dc23f10eca..be4c8d45f4 100644 --- a/src/overlay035/ov35_02256410.c +++ b/src/overlay035/ov35_02256410.c @@ -48,7 +48,7 @@ BOOL ov35_02256410(UnkStruct_ov35_02256410 **param0, const UnkStruct_ov35_022564 if (v0 != NULL) { ov25_02255090(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); diff --git a/src/overlay036/ov36_02256404.c b/src/overlay036/ov36_02256404.c index 36fbaccfd4..677987dbd4 100644 --- a/src/overlay036/ov36_02256404.c +++ b/src/overlay036/ov36_02256404.c @@ -45,7 +45,7 @@ BOOL ov36_02256404(UnkStruct_ov36_02256404 **param0, const UnkStruct_ov36_022564 if (v0 != NULL) { ov25_02255090(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; diff --git a/src/overlay037/ov37_022563D4.c b/src/overlay037/ov37_022563D4.c index ad8c0fd35f..a92b258069 100644 --- a/src/overlay037/ov37_022563D4.c +++ b/src/overlay037/ov37_022563D4.c @@ -44,7 +44,7 @@ BOOL ov37_022563D4(UnkStruct_ov37_022563D4 **param0, const UnkStruct_ov37_022563 if (v0 != NULL) { ov25_02255090(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; diff --git a/src/overlay038/ov38_0225632C.c b/src/overlay038/ov38_0225632C.c index 4a5f8c46b3..3649e2bac4 100644 --- a/src/overlay038/ov38_0225632C.c +++ b/src/overlay038/ov38_0225632C.c @@ -33,7 +33,7 @@ BOOL ov38_0225632C(UnkStruct_ov38_0225632C **param0, const UnkStruct_ov38_022563 ov25_02255090(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; diff --git a/src/overlay039/ov39_022563DC.c b/src/overlay039/ov39_022563DC.c index 8d3db94815..fbb484820d 100644 --- a/src/overlay039/ov39_022563DC.c +++ b/src/overlay039/ov39_022563DC.c @@ -36,7 +36,7 @@ BOOL ov39_022563DC(UnkStruct_ov39_022563DC **param0, const UnkStruct_ov39_022563 ov25_02255090(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; diff --git a/src/overlay040/ov40_0225645C.c b/src/overlay040/ov40_0225645C.c index a8f23f27cb..1aaeb98af3 100644 --- a/src/overlay040/ov40_0225645C.c +++ b/src/overlay040/ov40_0225645C.c @@ -61,7 +61,7 @@ BOOL ov40_0225645C(UnkStruct_ov40_0225645C **param0, const UnkStruct_ov40_022564 ov25_02255090(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); diff --git a/src/overlay041/ov41_022567B0.c b/src/overlay041/ov41_022567B0.c index 9ff0c73d38..c7ef998e61 100644 --- a/src/overlay041/ov41_022567B0.c +++ b/src/overlay041/ov41_022567B0.c @@ -62,7 +62,7 @@ BOOL ov41_022567B0(UnkStruct_ov41_022567B0 **param0, const UnkStruct_ov41_022567 ov25_02255090(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; diff --git a/src/overlay042/ov42_022563D4.c b/src/overlay042/ov42_022563D4.c index e67f83adff..edcee2d20d 100644 --- a/src/overlay042/ov42_022563D4.c +++ b/src/overlay042/ov42_022563D4.c @@ -50,7 +50,7 @@ BOOL ov42_022563D4(UnkStruct_ov42_022563D4 **param0, const UnkStruct_ov42_022563 if (v0 != NULL) { ov25_02255090(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); diff --git a/src/overlay043/ov43_02256544.c b/src/overlay043/ov43_02256544.c index 89552cafc1..241d8d3647 100644 --- a/src/overlay043/ov43_02256544.c +++ b/src/overlay043/ov43_02256544.c @@ -64,7 +64,7 @@ BOOL ov43_02256544(UnkStruct_ov43_02256544 **param0, const UnkStruct_ov43_022565 if (v0 != NULL) { ov25_02255090(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); diff --git a/src/overlay044/ov44_022565BC.c b/src/overlay044/ov44_022565BC.c index f1e452ddd2..d76aed7b05 100644 --- a/src/overlay044/ov44_022565BC.c +++ b/src/overlay044/ov44_022565BC.c @@ -64,7 +64,7 @@ BOOL ov44_022565BC(UnkStruct_ov44_022565BC **param0, const UnkStruct_ov44_022565 if (v0 != NULL) { ov25_02255090(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; diff --git a/src/overlay045/ov45_022566EC.c b/src/overlay045/ov45_022566EC.c index 511185d9af..cb26a22b7f 100644 --- a/src/overlay045/ov45_022566EC.c +++ b/src/overlay045/ov45_022566EC.c @@ -53,7 +53,7 @@ BOOL ov45_022566EC(UnkStruct_ov45_022566EC **param0, const UnkStruct_ov45_022566 if (v0 != NULL) { ov25_02255090(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; diff --git a/src/overlay046/ov46_02256BCC.c b/src/overlay046/ov46_02256BCC.c index 2a138a864f..7abd7aafd9 100644 --- a/src/overlay046/ov46_02256BCC.c +++ b/src/overlay046/ov46_02256BCC.c @@ -57,7 +57,7 @@ BOOL ov46_02256BCC(UnkStruct_ov46_02256BCC **param0, const UnkStruct_ov46_02256B ov25_02255090(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); diff --git a/src/overlay047/ov47_02256634.c b/src/overlay047/ov47_02256634.c index 7828db4167..56085ed548 100644 --- a/src/overlay047/ov47_02256634.c +++ b/src/overlay047/ov47_02256634.c @@ -50,7 +50,7 @@ BOOL ov47_02256634(UnkStruct_ov47_02256634 **param0, const UnkStruct_ov47_022566 ov25_02255090(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); diff --git a/src/overlay048/ov48_0225650C.c b/src/overlay048/ov48_0225650C.c index 392c36175a..4996988bb7 100644 --- a/src/overlay048/ov48_0225650C.c +++ b/src/overlay048/ov48_0225650C.c @@ -59,7 +59,7 @@ BOOL ov48_0225650C(UnkStruct_ov48_0225650C **param0, const UnkStruct_ov48_022565 if (v0 != NULL) { ov25_02255090(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; diff --git a/src/overlay049/ov49_022563D4.c b/src/overlay049/ov49_022563D4.c index 5e1fd1eb19..c0f468e065 100644 --- a/src/overlay049/ov49_022563D4.c +++ b/src/overlay049/ov49_022563D4.c @@ -44,7 +44,7 @@ BOOL ov49_022563D4(UnkStruct_ov49_022563D4 **param0, const UnkStruct_ov49_022563 if (v0 != NULL) { ov25_02255090(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; diff --git a/src/overlay050/ov50_02256510.c b/src/overlay050/ov50_02256510.c index d57946f5ef..61ade351cd 100644 --- a/src/overlay050/ov50_02256510.c +++ b/src/overlay050/ov50_02256510.c @@ -49,7 +49,7 @@ BOOL ov50_02256510(UnkStruct_ov50_02256510 **param0, const UnkStruct_ov50_022565 if (v0 != NULL) { ov25_02255090(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; diff --git a/src/overlay051/ov51_0225632C.c b/src/overlay051/ov51_0225632C.c index f61945f603..e674168a33 100644 --- a/src/overlay051/ov51_0225632C.c +++ b/src/overlay051/ov51_0225632C.c @@ -33,7 +33,7 @@ BOOL ov51_0225632C(UnkStruct_ov51_0225632C **param0, const UnkStruct_ov51_022563 ov25_02255090(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; diff --git a/src/overlay052/ov52_02256694.c b/src/overlay052/ov52_02256694.c index 2c14b2c56a..24f6683b34 100644 --- a/src/overlay052/ov52_02256694.c +++ b/src/overlay052/ov52_02256694.c @@ -61,7 +61,7 @@ BOOL ov52_02256694(UnkStruct_ov52_02256694 **param0, const UnkStruct_ov52_022566 if (v0 != NULL) { ov25_02255090(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); diff --git a/src/overlay053/ov53_02256420.c b/src/overlay053/ov53_02256420.c index 21e3f1cf23..1e190e822f 100644 --- a/src/overlay053/ov53_02256420.c +++ b/src/overlay053/ov53_02256420.c @@ -55,7 +55,7 @@ BOOL ov53_02256420(UnkStruct_ov53_02256420 **param0, const UnkStruct_ov53_022564 if (v0 != NULL) { ov25_02255090(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; diff --git a/src/overlay054/ov54_0225642C.c b/src/overlay054/ov54_0225642C.c index 5811b31172..3104b2cd78 100644 --- a/src/overlay054/ov54_0225642C.c +++ b/src/overlay054/ov54_0225642C.c @@ -47,7 +47,7 @@ BOOL ov54_0225642C(UnkStruct_ov54_0225642C **param0, const UnkStruct_ov54_022564 if (v0 != NULL) { ov25_02255090(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; From 86d26d19488600c1b5f00afa0d828dd6d4ad1652 Mon Sep 17 00:00:00 2001 From: Lucie Date: Sun, 16 Feb 2025 00:57:54 +0000 Subject: [PATCH 04/11] make format --- src/overlay025/ov25_02254560.c | 10 +++---- src/overlay025/ov25_02255090.c | 52 ++++++++++++++++------------------ 2 files changed, 30 insertions(+), 32 deletions(-) diff --git a/src/overlay025/ov25_02254560.c b/src/overlay025/ov25_02254560.c index e213c6c80c..8899f6445a 100644 --- a/src/overlay025/ov25_02254560.c +++ b/src/overlay025/ov25_02254560.c @@ -24,11 +24,11 @@ #include "sys_task_manager.h" #include "unk_02005474.h" -#define POKETCH_PALETTE_NARC_IDX 0 -#define NUM_POKETCH_PALETTES 16 -#define NUM_POKETCH_PALETTE_COLOUR_SETS 8 -#define POKETCH_PALETTE_SIZE 0x20 -#define POKETCH_BACKLIGHT_PALETTE_OFFSET 16 +#define POKETCH_PALETTE_NARC_IDX 0 +#define NUM_POKETCH_PALETTES 16 +#define NUM_POKETCH_PALETTE_COLOUR_SETS 8 +#define POKETCH_PALETTE_SIZE 0x20 +#define POKETCH_BACKLIGHT_PALETTE_OFFSET 16 #define POKETCH_PALETTE_COLOUR_SET_LENGTH 32 typedef struct { diff --git a/src/overlay025/ov25_02255090.c b/src/overlay025/ov25_02255090.c index 447c74d608..29e2e68068 100644 --- a/src/overlay025/ov25_02255090.c +++ b/src/overlay025/ov25_02255090.c @@ -39,7 +39,7 @@ void ov25_02255090(u32 *param0, u32 param1) } } -static BOOL ov25_022550B0(u32 *param0, u32 param1) +static BOOL ov25_022550B0(u32 *param0, u32 functionID) { u32 v0; @@ -47,12 +47,12 @@ static BOOL ov25_022550B0(u32 *param0, u32 param1) for (v0 = 0; v0 < param0[0]; v0++) { if (param0[2 + v0] == 0xffffffff) { - param0[2 + v0] = param1; - return 1; + param0[2 + v0] = functionID; + return TRUE; } } - return 0; + return FALSE; } static void ov25_022550F0(u32 *param0, u32 param1) @@ -77,11 +77,11 @@ BOOL ov25_02255130(u32 *param0, u32 param1) for (v0 = 0; v0 < param0[0]; v0++) { if (param0[2 + v0] == param1) { - return 0; + return FALSE; } } - return 1; + return TRUE; } BOOL ov25_02255154(u32 *param0) @@ -97,37 +97,35 @@ BOOL ov25_02255154(u32 *param0) return 1; } -void ov25_0225517C(const UnkStruct_ov25_0225517C *param0, u32 param1, void *param2, const void *param3, u32 *param4, u32 param5, u32 param6) +void ov25_0225517C(const UnkStruct_ov25_0225517C *functionList, u32 functionID, void *param2, const void *param3, u32 *param4, u32 priority, u32 heapID) { - u32 v0; + u32 idx; - for (v0 = 0; param0[v0].unk_00 != 0xffffffff; v0++) { - if (param0[v0].unk_00 == param1) { - UnkStruct_ov25_02255224 *v1; - u32 v2; + for (idx = 0; functionList[idx].unk_00 != 0xffffffff; idx++) { + if (functionList[idx].unk_00 == functionID) { + u32 size = sizeof(UnkStruct_ov25_02255224) + functionList[idx].unk_08; - v2 = sizeof(UnkStruct_ov25_02255224) + param0[v0].unk_08; - v1 = Heap_AllocFromHeap(param6, v2); + UnkStruct_ov25_02255224 *sysTaskData = Heap_AllocFromHeap(heapID, size); - if (v1 != NULL) { - if (param0[v0].unk_08 != 0) { - v1->unk_0C = ((u8 *)v1) + sizeof(UnkStruct_ov25_02255224); + if (sysTaskData != NULL) { + if (functionList[idx].unk_08 != 0) { + sysTaskData->unk_0C = ((u8 *)sysTaskData) + sizeof(UnkStruct_ov25_02255224); } else { - v1->unk_0C = NULL; + sysTaskData->unk_0C = NULL; } - if (ov25_022550B0(param4, param1)) { - v1->unk_08 = param2; - v1->unk_04 = 0; - v1->unk_00 = param1; - v1->unk_10 = param3; - v1->unk_14 = SysTask_Start(param0[v0].unk_04, v1, param5); + if (ov25_022550B0(param4, functionID)) { + sysTaskData->unk_08 = param2; + sysTaskData->unk_04 = 0; + sysTaskData->unk_00 = functionID; + sysTaskData->unk_10 = param3; + sysTaskData->unk_14 = SysTask_Start(functionList[idx].unk_04, sysTaskData, priority); - if (v1->unk_14) { - param0[v0].unk_04(v1->unk_14, v1); + if (sysTaskData->unk_14) { + functionList[idx].unk_04(sysTaskData->unk_14, sysTaskData); } } else { - Heap_FreeToHeap(v1); + Heap_FreeToHeap(sysTaskData); } return; From 6ccbd3f7c69de0c07400302632e4012943b7fe1e Mon Sep 17 00:00:00 2001 From: Lucie Date: Sun, 16 Feb 2025 01:02:43 +0000 Subject: [PATCH 05/11] make format take two --- src/overlay025/ov25_02254560.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/overlay025/ov25_02254560.c b/src/overlay025/ov25_02254560.c index e213c6c80c..8899f6445a 100644 --- a/src/overlay025/ov25_02254560.c +++ b/src/overlay025/ov25_02254560.c @@ -24,11 +24,11 @@ #include "sys_task_manager.h" #include "unk_02005474.h" -#define POKETCH_PALETTE_NARC_IDX 0 -#define NUM_POKETCH_PALETTES 16 -#define NUM_POKETCH_PALETTE_COLOUR_SETS 8 -#define POKETCH_PALETTE_SIZE 0x20 -#define POKETCH_BACKLIGHT_PALETTE_OFFSET 16 +#define POKETCH_PALETTE_NARC_IDX 0 +#define NUM_POKETCH_PALETTES 16 +#define NUM_POKETCH_PALETTE_COLOUR_SETS 8 +#define POKETCH_PALETTE_SIZE 0x20 +#define POKETCH_BACKLIGHT_PALETTE_OFFSET 16 #define POKETCH_PALETTE_COLOUR_SET_LENGTH 32 typedef struct { From 10abfa517f42841a77315fdd8750dcab1d876a88 Mon Sep 17 00:00:00 2001 From: Lucie Date: Sun, 16 Feb 2025 01:10:00 +0000 Subject: [PATCH 06/11] undo things i didn't mean to push --- src/overlay025/ov25_02255090.c | 52 ++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/src/overlay025/ov25_02255090.c b/src/overlay025/ov25_02255090.c index 29e2e68068..447c74d608 100644 --- a/src/overlay025/ov25_02255090.c +++ b/src/overlay025/ov25_02255090.c @@ -39,7 +39,7 @@ void ov25_02255090(u32 *param0, u32 param1) } } -static BOOL ov25_022550B0(u32 *param0, u32 functionID) +static BOOL ov25_022550B0(u32 *param0, u32 param1) { u32 v0; @@ -47,12 +47,12 @@ static BOOL ov25_022550B0(u32 *param0, u32 functionID) for (v0 = 0; v0 < param0[0]; v0++) { if (param0[2 + v0] == 0xffffffff) { - param0[2 + v0] = functionID; - return TRUE; + param0[2 + v0] = param1; + return 1; } } - return FALSE; + return 0; } static void ov25_022550F0(u32 *param0, u32 param1) @@ -77,11 +77,11 @@ BOOL ov25_02255130(u32 *param0, u32 param1) for (v0 = 0; v0 < param0[0]; v0++) { if (param0[2 + v0] == param1) { - return FALSE; + return 0; } } - return TRUE; + return 1; } BOOL ov25_02255154(u32 *param0) @@ -97,35 +97,37 @@ BOOL ov25_02255154(u32 *param0) return 1; } -void ov25_0225517C(const UnkStruct_ov25_0225517C *functionList, u32 functionID, void *param2, const void *param3, u32 *param4, u32 priority, u32 heapID) +void ov25_0225517C(const UnkStruct_ov25_0225517C *param0, u32 param1, void *param2, const void *param3, u32 *param4, u32 param5, u32 param6) { - u32 idx; + u32 v0; - for (idx = 0; functionList[idx].unk_00 != 0xffffffff; idx++) { - if (functionList[idx].unk_00 == functionID) { - u32 size = sizeof(UnkStruct_ov25_02255224) + functionList[idx].unk_08; + for (v0 = 0; param0[v0].unk_00 != 0xffffffff; v0++) { + if (param0[v0].unk_00 == param1) { + UnkStruct_ov25_02255224 *v1; + u32 v2; - UnkStruct_ov25_02255224 *sysTaskData = Heap_AllocFromHeap(heapID, size); + v2 = sizeof(UnkStruct_ov25_02255224) + param0[v0].unk_08; + v1 = Heap_AllocFromHeap(param6, v2); - if (sysTaskData != NULL) { - if (functionList[idx].unk_08 != 0) { - sysTaskData->unk_0C = ((u8 *)sysTaskData) + sizeof(UnkStruct_ov25_02255224); + if (v1 != NULL) { + if (param0[v0].unk_08 != 0) { + v1->unk_0C = ((u8 *)v1) + sizeof(UnkStruct_ov25_02255224); } else { - sysTaskData->unk_0C = NULL; + v1->unk_0C = NULL; } - if (ov25_022550B0(param4, functionID)) { - sysTaskData->unk_08 = param2; - sysTaskData->unk_04 = 0; - sysTaskData->unk_00 = functionID; - sysTaskData->unk_10 = param3; - sysTaskData->unk_14 = SysTask_Start(functionList[idx].unk_04, sysTaskData, priority); + if (ov25_022550B0(param4, param1)) { + v1->unk_08 = param2; + v1->unk_04 = 0; + v1->unk_00 = param1; + v1->unk_10 = param3; + v1->unk_14 = SysTask_Start(param0[v0].unk_04, v1, param5); - if (sysTaskData->unk_14) { - functionList[idx].unk_04(sysTaskData->unk_14, sysTaskData); + if (v1->unk_14) { + param0[v0].unk_04(v1->unk_14, v1); } } else { - Heap_FreeToHeap(sysTaskData); + Heap_FreeToHeap(v1); } return; From 029f8f48e0f279f1a892075d2e10bc52bb0898a9 Mon Sep 17 00:00:00 2001 From: Lucie Date: Sun, 16 Feb 2025 01:19:15 +0000 Subject: [PATCH 07/11] updated header file --- include/overlay025/ov25_02254560.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/overlay025/ov25_02254560.h b/include/overlay025/ov25_02254560.h index 5f2c37ee54..5bfe209454 100644 --- a/include/overlay025/ov25_02254560.h +++ b/include/overlay025/ov25_02254560.h @@ -13,9 +13,9 @@ BOOL ov25_02254560(UnkStruct_ov25_02254560 **param0, const UnkStruct_ov25_02254560_1 *param1, NNSG2dOamManagerInstance *param2, PoketchSystem *poketchSys); UnkStruct_ov25_022555E8 *ov25_02254664(void); BgConfig *Poketch_GetBgConfig(void); -void Poketch_LoadActivePalette(u32 param0, u32 param1); -void Poketch_LoadActiveBacklightPalette(u32 param0, u32 param1); -void Poketch_CopuActivePalette(u16 *param0); +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); From 1c86e2565669f077266b23a602d5bd45b8f7e45d Mon Sep 17 00:00:00 2001 From: Lucie Date: Sun, 16 Feb 2025 01:35:50 +0000 Subject: [PATCH 08/11] fixed func rename in ov26 --- src/overlay026/ov26_022561C0.c | 2 +- src/overlay026/ov26_02256404.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/overlay026/ov26_022561C0.c b/src/overlay026/ov26_022561C0.c index 4b242f7747..0493571699 100644 --- a/src/overlay026/ov26_022561C0.c +++ b/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); diff --git a/src/overlay026/ov26_02256404.c b/src/overlay026/ov26_02256404.c index 179cb1037a..8ec86a0511 100644 --- a/src/overlay026/ov26_02256404.c +++ b/src/overlay026/ov26_02256404.c @@ -41,7 +41,7 @@ BOOL ov26_02256404(UnkStruct_ov26_02256404 **param0, const UnkStruct_ov26_022564 ov25_02255090(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); @@ -139,7 +139,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); @@ -163,9 +163,9 @@ static void ov26_022565AC(SysTask *param0, void *param1) UnkStruct_ov26_02256404 *v0 = ov25_0225523C(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); From fa0cd1b09e9d15689aeea710498f80072f904317 Mon Sep 17 00:00:00 2001 From: Lucie Date: Sun, 16 Feb 2025 18:20:06 +0000 Subject: [PATCH 09/11] Updated Macros --- src/overlay025/ov25_02254560.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/src/overlay025/ov25_02254560.c b/src/overlay025/ov25_02254560.c index 8899f6445a..c8b3540fcf 100644 --- a/src/overlay025/ov25_02254560.c +++ b/src/overlay025/ov25_02254560.c @@ -23,13 +23,15 @@ #include "sys_task.h" #include "sys_task_manager.h" #include "unk_02005474.h" +#include "palette.h" -#define POKETCH_PALETTE_NARC_IDX 0 -#define NUM_POKETCH_PALETTES 16 -#define NUM_POKETCH_PALETTE_COLOUR_SETS 8 -#define POKETCH_PALETTE_SIZE 0x20 -#define POKETCH_BACKLIGHT_PALETTE_OFFSET 16 -#define POKETCH_PALETTE_COLOUR_SET_LENGTH 32 +#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; @@ -54,7 +56,7 @@ struct UnkStruct_ov25_02254560_t { UnkStruct_ov25_02254DD8 unk_1D4; BgConfig *unk_1F8; PoketchSystem *poketchSys; - u16 poketchPalettes[256]; + u16 poketchPalettes[NUM_PALETTE_COLOUR_SETS * SLOTS_PER_PALETTE_COLOUR_SET]; u16 unk_400[16]; }; @@ -159,8 +161,8 @@ static void Poketch_InitPaletteData(UnkStruct_ov25_02254560 *param0) void *poketchPalettes = Graphics_GetPlttData(NARC_INDEX_GRAPHIC__POKETCH, POKETCH_PALETTE_NARC_IDX, &paletteData, HEAP_ID_POKETCH_MAIN); if (poketchPalettes) { - MI_CpuCopy32(paletteData->pRawData, param0->poketchPalettes, NUM_POKETCH_PALETTES * POKETCH_PALETTE_SIZE); - DC_FlushRange(param0->poketchPalettes, NUM_POKETCH_PALETTES * POKETCH_PALETTE_SIZE); + MI_CpuCopy32(paletteData->pRawData, param0->poketchPalettes, NUM_PALETTES * PALETTE_SIZE_BYTES); + DC_FlushRange(param0->poketchPalettes, NUM_PALETTES * PALETTE_SIZE_BYTES); Heap_FreeToHeap(poketchPalettes); } } @@ -171,8 +173,8 @@ void Poketch_LoadActivePalette(u32 bgOffset, u32 objOffset) Poketch *poketch = PoketchSystem_GetPoketchData(v0->poketchSys); u32 screenColour = Poketch_CurrentScreenColor(poketch); - GXS_LoadBGPltt(&v0->poketchPalettes[screenColour * POKETCH_PALETTE_COLOUR_SET_LENGTH], bgOffset * POKETCH_PALETTE_SIZE, POKETCH_PALETTE_SIZE); - GXS_LoadOBJPltt(&v0->poketchPalettes[screenColour * POKETCH_PALETTE_COLOUR_SET_LENGTH], objOffset, POKETCH_PALETTE_SIZE); + 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 Poketch_LoadActiveBacklightPalette(u32 unused_1, u32 unused_2) @@ -181,8 +183,8 @@ void Poketch_LoadActiveBacklightPalette(u32 unused_1, u32 unused_2) Poketch *poketch = PoketchSystem_GetPoketchData(v0->poketchSys); u32 screenColour = Poketch_CurrentScreenColor(poketch); - GXS_LoadBGPltt(&v0->poketchPalettes[screenColour * POKETCH_PALETTE_COLOUR_SET_LENGTH + POKETCH_BACKLIGHT_PALETTE_OFFSET], 0, POKETCH_PALETTE_SIZE); - GXS_LoadOBJPltt(&v0->poketchPalettes[screenColour * POKETCH_PALETTE_COLOUR_SET_LENGTH + POKETCH_BACKLIGHT_PALETTE_OFFSET], 0, POKETCH_PALETTE_SIZE); + 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 Poketch_CopyActivePalette(u16 *dest) @@ -191,7 +193,7 @@ void Poketch_CopyActivePalette(u16 *dest) Poketch *poketch = PoketchSystem_GetPoketchData(v0->poketchSys); u32 screenColour = Poketch_CurrentScreenColor(poketch); - MI_CpuCopy16(&v0->poketchPalettes[screenColour * POKETCH_PALETTE_COLOUR_SET_LENGTH], dest, POKETCH_PALETTE_SIZE); + MI_CpuCopy16(&v0->poketchPalettes[screenColour * SLOTS_PER_PALETTE_COLOUR_SET], dest, PALETTE_SIZE_BYTES); } void ov25_02254754(UnkStruct_ov25_02254560 *param0) From 8264020d534913b5b3262730f4d104c316e86698 Mon Sep 17 00:00:00 2001 From: Lucie Date: Sun, 16 Feb 2025 18:24:37 +0000 Subject: [PATCH 10/11] make format --- src/overlay025/ov25_02254560.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/overlay025/ov25_02254560.c b/src/overlay025/ov25_02254560.c index c8b3540fcf..8b1758a325 100644 --- a/src/overlay025/ov25_02254560.c +++ b/src/overlay025/ov25_02254560.c @@ -19,19 +19,19 @@ #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" -#include "palette.h" #define POKETCH_PALETTE_NARC_IDX 0 -#define NUM_PALETTES 16 +#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) +#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; From 7606eddc2f4e40972e923164c61edc44b54ba132 Mon Sep 17 00:00:00 2001 From: Lucie Date: Sun, 16 Feb 2025 21:09:14 +0000 Subject: [PATCH 11/11] fix merge --- src/overlay025/ov25_02254560.c | 1 - src/overlay025/poketch_system.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/overlay025/ov25_02254560.c b/src/overlay025/ov25_02254560.c index 343b2c1a6f..4281b3c3f7 100644 --- a/src/overlay025/ov25_02254560.c +++ b/src/overlay025/ov25_02254560.c @@ -146,7 +146,6 @@ UnkStruct_ov25_022555E8 *ov25_02254664(void) return v0->unk_1CC; } - BgConfig *Poketch_GetBgConfig(void) { UnkStruct_ov25_02254560 *v0 = ov25_02254418(); diff --git a/src/overlay025/poketch_system.c b/src/overlay025/poketch_system.c index 0794702be5..149684c67c 100644 --- a/src/overlay025/poketch_system.c +++ b/src/overlay025/poketch_system.c @@ -675,7 +675,7 @@ void PoketchSystem_PlayCry(u32 species, u32 form) PoketchSystem *poketchSys = PoketchSystem_GetFromFieldSystem(); if (poketchSys->appChanging == FALSE && PoketechSystem_IsRunningTask(poketchSys) == 0) { - sub_02005844(param0, param1); + sub_02005844(species, form); } }