Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-08-28 12:26:03 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

WIP mapping of EncounterEffect_Flash and brightness fade

Browse Source
This commit is contained in:
Fexty12573
2024-06-07 16:15:58 +02:00
parent dcf551d1c2
commit ff337f6dbd
23 changed files with 165 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/overlay005/encounter_effect.h
View File

@@ -112,9 +112,14 @@ typedef struct UnkStruct_ov5_021DED04 {
BOOL *unk_E4;
} UnkStruct_ov5_021DED04;
enum Screen {
SCREEN_TOP = 1,
SCREEN_BOTTOM,
};
void EncounterEffect_Start(enum EncEffectCutIn effect, FieldSystem *fieldSystem, BOOL *param2);
void ov5_021DDC28(EncounterEffect *param0, SysTask *param1);
void ov5_021DDC44(int param0, u32 param1, u32 param2, BOOL *param3, u32 param4);
void EncounterEffect_Finish(EncounterEffect *encEffect, SysTask *effectTask);
void EncounterEffect_Flash(enum Screen screen, u32 param1, u32 param2, BOOL *done, u32 numFlashes);
BOOL ov5_021DDD7C(EncounterEffect *param0);
void ov5_021DDD80(UnkStruct_ov5_021DDD80 *param0, int param1, int param2, int param3);
BOOL ov5_021DDD90(UnkStruct_ov5_021DDD80 *param0);
@@ -123,8 +128,8 @@ BOOL ov5_021DDDCC(UnkStruct_ov5_021DDDBC *param0);
void ov5_021DDE14(UnkStruct_ov5_021DDE14 *param0, fx32 param1, fx32 param2, fx32 param3, int param4);
BOOL ov5_021DDE74(UnkStruct_ov5_021DDE14 *param0);
void ov5_021DDEDC(int param0, int param1);
void ov5_021DDEFC(UnkStruct_ov5_021DDF24 *param0, int param1, int param2, int param3, int param4);
BOOL ov5_021DDF08(UnkStruct_ov5_021DDF24 *param0);
void BrightnessFadeTask_Init(BrightnessFadeTask *param0, int param1, int param2, int param3, int param4);
BOOL ov5_021DDF08(BrightnessFadeTask *param0);
UnkStruct_ov5_021DDF74 *ov5_021DDF38(void);
void ov5_021DDF74(UnkStruct_ov5_021DDF74 *param0);
void ov5_021DDF9C(EncounterEffect *param0, UnkStruct_ov5_021DDF74 *param1, u8 param2, u32 param3, int param4, int param5, fx32 param6);

6
include/overlay005/struct_ov5_021DDF24.h
View File

@@ -3,9 +3,9 @@
#include "overlay005/struct_ov5_021DDD80.h"
typedef struct {
typedef struct BrightnessFadeTask {
UnkStruct_ov5_021DDD80 unk_00;
int unk_14;
} UnkStruct_ov5_021DDF24;
int screen;
} BrightnessFadeTask;
#endif // POKEPLATINUM_STRUCT_OV5_021DDF24_H

2
include/unk_0200679C.h
View File

@@ -5,6 +5,6 @@
#include "functypes/sys_task_func.h"
SysTask * SysTask_StartAndAllocateParam(SysTaskFunc func, int paramSize, u32 param2, const u32 heapID);
void sub_020067D0(SysTask * param0);
void SysTask_FinishAndFreeParam(SysTask * param0);
#endif // POKEPLATINUM_UNK_0200679C_H

150
src/overlay005/encounter_effect.c
View File

@@ -57,18 +57,26 @@
#include "overlay005/ov5_021EF3A8.h"
#include "enc_effects.h"
enum ScreenFlashState {
SCREENFLASH_STATE_0,
SCREENFLASH_STATE_1,
SCREENFLASH_STATE_2,
SCREENFLASH_STATE_3,
SCREENFLASH_STATE_4,
SCREENFLASH_STATE_5,
};
typedef struct UnkStruct_ov5_021DDC44 {
int unk_00;
u32 unk_04;
typedef struct ScreenFlash {
enum ScreenFlashState state;
u32 numFlashes;
int unk_08;
int unk_0C;
enum Screen screen;
u32 unk_10;
u32 unk_14;
UnkStruct_ov5_021DDF24 unk_18;
UnkStruct_ov5_021DDF24 unk_30;
BOOL *unk_48;
} UnkStruct_ov5_021DDC44;
BrightnessFadeTask unk_18;
BrightnessFadeTask unk_30;
BOOL *done;
} ScreenFlash;
typedef struct UnkStruct_ov5_02202120 {
u16 unk_00;
@@ -85,7 +93,7 @@ typedef struct UnkStruct_ov5_02202120 {
static void ov5_021DE89C(Window *param0, s32 param1, s32 param2, s32 param3, s32 param4, u8 param5);
static void ov5_021DEB04(Window *param0, u16 param1, u16 param2, u8 param3);
static void ov5_021DDF24(SysTask *param0, void *param1);
static void ov5_021DDC88(SysTask *param0, void *param1);
static void EncounterEffect_ExecuteFlash(SysTask *param0, void *param1);
static void ov5_021DE028(SysTask *param0, void *param1);
static void ov5_021DE088(SysTask *param0, void *param1);
static void ov5_021DE14C(UnkStruct_ov5_021EF43C *param0, void *param1);
@@ -169,104 +177,104 @@ static UnkStruct_ov5_02202120 *Unk_ov5_02202120 = NULL;
void EncounterEffect_Start(enum EncEffectCutIn effect, FieldSystem *fieldSystem, BOOL *done)
{
SysTask *effectTask;
EncounterEffect *v1;
EncounterEffect *encEffect;
effectTask = SysTask_StartAndAllocateParam(sEncounterEffectTaskFuncs[effect], sizeof(EncounterEffect), 5, HEAP_ID_FIELD);
v1 = SysTask_GetParam(effectTask);
v1->fieldSystem = fieldSystem;
v1->done = done;
v1->narc = NARC_ctor(NARC_INDEX_GRAPHIC__FIELD_ENCOUNTEFFECT, 4);
encEffect = SysTask_GetParam(effectTask);
encEffect->fieldSystem = fieldSystem;
encEffect->done = done;
encEffect->narc = NARC_ctor(NARC_INDEX_GRAPHIC__FIELD_ENCOUNTEFFECT, 4);
if (v1->done != NULL) {
*(v1->done) = 0;
if (encEffect->done != NULL) {
*(encEffect->done) = 0;
}
v1->unk_18 = 0;
encEffect->unk_18 = 0;
}
void ov5_021DDC28(EncounterEffect *param0, SysTask *param1)
void EncounterEffect_Finish(EncounterEffect *encEffect, SysTask *effectTask)
{
NARC_dtor(param0->narc);
Heap_FreeToHeapExplicit(4, param0->unk_0C);
sub_020067D0(param1);
NARC_dtor(encEffect->narc);
Heap_FreeToHeapExplicit(4, encEffect->unk_0C);
SysTask_FinishAndFreeParam(effectTask);
}
void ov5_021DDC44(int param0, u32 param1, u32 param2, BOOL *param3, u32 param4)
void EncounterEffect_Flash(enum Screen screen, u32 param1, u32 param2, BOOL *done, u32 numFlashes)
{
SysTask *v0;
UnkStruct_ov5_021DDC44 *v1;
ScreenFlash *screenFlash;
v1 = Heap_AllocFromHeap(4, sizeof(UnkStruct_ov5_021DDC44));
memset(v1, 0, sizeof(UnkStruct_ov5_021DDC44));
SysTask_Start(ov5_021DDC88, v1, 5);
screenFlash = Heap_AllocFromHeap(4, sizeof(ScreenFlash));
memset(screenFlash, 0, sizeof(ScreenFlash));
SysTask_Start(EncounterEffect_ExecuteFlash, screenFlash, 5);
v1->unk_48 = param3;
screenFlash->done = done;
if (v1->unk_48 != NULL) {
*(v1->unk_48) = 0;
if (screenFlash->done != NULL) {
*(screenFlash->done) = 0;
}
v1->unk_0C = param0;
v1->unk_10 = param1;
v1->unk_14 = param2;
v1->unk_04 = param4;
screenFlash->screen = screen;
screenFlash->unk_10 = param1;
screenFlash->unk_14 = param2;
screenFlash->numFlashes = numFlashes;
}
static void ov5_021DDC88(SysTask *param0, void *param1)
static void EncounterEffect_ExecuteFlash(SysTask *task, void *param)
{
UnkStruct_ov5_021DDC44 *v0 = param1;
ScreenFlash *screenFlash = param;
switch (v0->unk_00) {
case 0:
if (v0->unk_0C == 1) {
ov5_021DDEFC(&v0->unk_30, 0, v0->unk_14, 2, 8);
switch (screenFlash->state) {
case SCREENFLASH_STATE_0:
if (screenFlash->screen == SCREEN_TOP) {
BrightnessFadeTask_Init(&screenFlash->unk_30, 0, screenFlash->unk_14, 2, 8);
} else {
if (v0->unk_0C == 2) {
ov5_021DDEFC(&v0->unk_30, 0, v0->unk_14, 1, 8);
if (screenFlash->screen == SCREEN_BOTTOM) {
BrightnessFadeTask_Init(&screenFlash->unk_30, 0, screenFlash->unk_14, 1, 8);
}
}
v0->unk_00++;
screenFlash->state++;
break;
case 1:
ov5_021DDEFC(&v0->unk_18, 0, v0->unk_10, v0->unk_0C, 3);
v0->unk_00++;
case SCREENFLASH_STATE_1:
BrightnessFadeTask_Init(&screenFlash->unk_18, 0, screenFlash->unk_10, screenFlash->screen, 3);
screenFlash->state++;
break;
case 2:
if (ov5_021DDF08(&v0->unk_18)) {
v0->unk_00++;
case SCREENFLASH_STATE_2:
if (ov5_021DDF08(&screenFlash->unk_18)) {
screenFlash->state++;
}
break;
case 3:
ov5_021DDEFC(&v0->unk_18, v0->unk_10, 0, v0->unk_0C, 3);
v0->unk_00++;
case SCREENFLASH_STATE_3:
BrightnessFadeTask_Init(&screenFlash->unk_18, screenFlash->unk_10, 0, screenFlash->screen, 3);
screenFlash->state++;
break;
case 4:
if (ov5_021DDF08(&v0->unk_18)) {
v0->unk_08++;
case SCREENFLASH_STATE_4:
if (ov5_021DDF08(&screenFlash->unk_18)) {
screenFlash->unk_08++;
if (v0->unk_08 == v0->unk_04) {
v0->unk_00 = 5;
if (screenFlash->unk_08 == screenFlash->numFlashes) {
screenFlash->state = SCREENFLASH_STATE_5;
} else {
v0->unk_00 = 1;
screenFlash->state = SCREENFLASH_STATE_1;
}
}
break;
case 5:
v0->unk_00 = 0;
v0->unk_08 = 0;
case SCREENFLASH_STATE_5:
screenFlash->state = 0;
screenFlash->unk_08 = 0;
if (v0->unk_48 != NULL) {
*(v0->unk_48) = 1;
if (screenFlash->done != NULL) {
*(screenFlash->done) = 1;
}
SysTask_Done(param0);
Heap_FreeToHeap(v0);
SysTask_Done(task);
Heap_FreeToHeap(screenFlash);
return;
}
ov5_021DDF08(&v0->unk_30);
ov5_021DDF08(&screenFlash->unk_30);
}
BOOL ov5_021DDD7C(EncounterEffect *param0)
@@ -383,13 +391,13 @@ void ov5_021DDEDC(int param0, int param1)
}
}
void ov5_021DDEFC(UnkStruct_ov5_021DDF24 *param0, int param1, int param2, int param3, int param4)
void BrightnessFadeTask_Init(BrightnessFadeTask *brightnessFade, int param1, int param2, int param3, int param4)
{
param0->unk_14 = param3;
ov5_021DDD80(&param0->unk_00, param1, param2, param4);
brightnessFade->screen = param3;
ov5_021DDD80(&brightnessFade->unk_00, param1, param2, param4);
}
BOOL ov5_021DDF08(UnkStruct_ov5_021DDF24 *param0)
BOOL ov5_021DDF08(BrightnessFadeTask *param0)
{
BOOL v0;
@@ -401,9 +409,9 @@ BOOL ov5_021DDF08(UnkStruct_ov5_021DDF24 *param0)
static void ov5_021DDF24(SysTask *param0, void *param1)
{
UnkStruct_ov5_021DDF24 *v0 = param1;
BrightnessFadeTask *v0 = param1;
ov5_021DDEDC(v0->unk_14, v0->unk_00.unk_00);
ov5_021DDEDC(v0->screen, v0->unk_00.unk_00);
SysTask_Done(param0);
}

2
src/overlay005/ov5_021E2098.c
View File

@@ -63,7 +63,7 @@ void ov5_021E20E8 (UnkStruct_ov5_021E20E8 ** param0, GXDispMode param1, GXBGMode
break;
}
sub_020067D0((*param0)->unk_34);
SysTask_FinishAndFreeParam((*param0)->unk_34);
*param0 = NULL;
}

102
src/overlay005/ov5_021E2338.c
View File

@@ -107,7 +107,7 @@ void ov5_021E2338 (SysTask * param0, void * param1)
v0->unk_00++;
break;
case 1:
ov5_021DDC44(1, 16, -16, &v0->unk_04, 2);
EncounterEffect_Flash(1, 16, -16, &v0->unk_04, 2);
v0->unk_00++;
break;
case 2:
@@ -153,7 +153,7 @@ void ov5_021E2338 (SysTask * param0, void * param1)
}
ov5_021DDF74(v1->unk_1C);
ov5_021DDC28(v0, param0);
EncounterEffect_Finish(v0, param0);
break;
default:
break;
@@ -176,7 +176,7 @@ void ov5_021E24A8 (SysTask * param0, void * param1)
v0->unk_00++;
break;
case 1:
ov5_021DDC44(1, -16, -16, &v0->unk_04, 2);
EncounterEffect_Flash(1, -16, -16, &v0->unk_04, 2);
v0->unk_00++;
break;
case 2:
@@ -222,7 +222,7 @@ void ov5_021E24A8 (SysTask * param0, void * param1)
}
ov5_021DDF74(v1->unk_1C);
ov5_021DDC28(v0, param0);
EncounterEffect_Finish(v0, param0);
break;
default:
break;
@@ -244,7 +244,7 @@ void ov5_021E261C (SysTask * param0, void * param1)
v0->unk_00++;
break;
case 1:
ov5_021DDC44(1, -16, -16, &v0->unk_04, 2);
EncounterEffect_Flash(1, -16, -16, &v0->unk_04, 2);
v1->unk_0C = 10;
v0->unk_00++;
break;
@@ -281,7 +281,7 @@ void ov5_021E261C (SysTask * param0, void * param1)
*(v0->done) = 1;
}
ov5_021DDC28(v0, param0);
EncounterEffect_Finish(v0, param0);
sub_0200F344(1, 0x0);
break;
}
@@ -302,7 +302,7 @@ void ov5_021E2748 (SysTask * param0, void * param1)
v0->unk_00++;
break;
case 1:
ov5_021DDC44(1, 16, -16, &v0->unk_04, 2);
EncounterEffect_Flash(1, 16, -16, &v0->unk_04, 2);
v1->unk_0C = 10;
v0->unk_00++;
break;
@@ -339,7 +339,7 @@ void ov5_021E2748 (SysTask * param0, void * param1)
*(v0->done) = 1;
}
ov5_021DDC28(v0, param0);
EncounterEffect_Finish(v0, param0);
sub_0200F344(1, 0x0);
break;
}
@@ -415,7 +415,7 @@ void ov5_021E2944 (SysTask * param0, void * param1)
v0->unk_00++;
break;
case 1:
ov5_021DDC44(1, -16, -16, &v0->unk_04, 2);
EncounterEffect_Flash(1, -16, -16, &v0->unk_04, 2);
v0->unk_00++;
break;
case 2:
@@ -448,7 +448,7 @@ void ov5_021E2944 (SysTask * param0, void * param1)
*(v0->done) = 1;
}
ov5_021DDC28(v0, param0);
EncounterEffect_Finish(v0, param0);
sub_0200F344(1, 0x0);
break;
}
@@ -468,7 +468,7 @@ void ov5_021E2A4C (SysTask * param0, void * param1)
v0->unk_00++;
break;
case 1:
ov5_021DDC44(1, 16, -16, &v0->unk_04, 2);
EncounterEffect_Flash(1, 16, -16, &v0->unk_04, 2);
v0->unk_00++;
break;
case 2:
@@ -501,7 +501,7 @@ void ov5_021E2A4C (SysTask * param0, void * param1)
*(v0->done) = 1;
}
ov5_021DDC28(v0, param0);
EncounterEffect_Finish(v0, param0);
sub_0200F344(1, 0x0);
break;
}
@@ -628,7 +628,7 @@ void ov5_021E2B54 (SysTask * param0, void * param1)
case 1:
ov5_021DDC44(1, -16, -16, &v0->unk_04, 2);
EncounterEffect_Flash(1, -16, -16, &v0->unk_04, 2);
v0->unk_00++;
break;
@@ -743,7 +743,7 @@ void ov5_021E2B54 (SysTask * param0, void * param1)
ov5_021DE5A4(&v1->unk_48, &v1->unk_1E8);
ov5_021DE4AC(&v1->unk_48);
ov5_021DDF74(v1->unk_44);
ov5_021DDC28(v0, param0);
EncounterEffect_Finish(v0, param0);
break;
}
@@ -791,7 +791,7 @@ void ov5_021E2EB0 (SysTask * param0, void * param1)
case 1:
ov5_021DDC44(1, 16, -16, &v0->unk_04, 2);
EncounterEffect_Flash(1, 16, -16, &v0->unk_04, 2);
v0->unk_00++;
break;
@@ -887,7 +887,7 @@ void ov5_021E2EB0 (SysTask * param0, void * param1)
ov5_021DE5A4(&v1->unk_2C, &v1->unk_1CC);
ov5_021DE4AC(&v1->unk_2C);
ov5_021DE218(v1->unk_28);
ov5_021DDC28(v0, param0);
EncounterEffect_Finish(v0, param0);
break;
}
@@ -936,7 +936,7 @@ void ov5_021E31A4 (SysTask * param0, void * param1)
case 1:
ov5_021DDC44(1, -16, -16, &v0->unk_04, 2);
EncounterEffect_Flash(1, -16, -16, &v0->unk_04, 2);
v0->unk_00++;
break;
@@ -1055,7 +1055,7 @@ void ov5_021E31A4 (SysTask * param0, void * param1)
ov5_021DE5A4(&v1->unk_50, &v1->unk_1F0);
ov5_021DE4AC(&v1->unk_50);
ov5_021DDC28(v0, param0);
EncounterEffect_Finish(v0, param0);
return;
}
@@ -1121,7 +1121,7 @@ void ov5_021E3560 (SysTask * param0, void * param1)
case 1:
ov5_021DDC44(1, 16, -16, &v0->unk_04, 2);
EncounterEffect_Flash(1, 16, -16, &v0->unk_04, 2);
v0->unk_00++;
break;
@@ -1243,7 +1243,7 @@ void ov5_021E3560 (SysTask * param0, void * param1)
sub_02019690(3, 32, 0, 4);
sub_02019EBC(v0->fieldSystem->unk_08, 3);
ov5_021DDC28(v0, param0);
EncounterEffect_Finish(v0, param0);
return;
}
@@ -1312,7 +1312,7 @@ void ov5_021E3AD0 (SysTask * param0, void * param1)
case 1:
ov5_021DDC44(1, -16, -16, &v0->unk_04, 2);
EncounterEffect_Flash(1, -16, -16, &v0->unk_04, 2);
v0->unk_00++;
break;
@@ -1397,7 +1397,7 @@ void ov5_021E3AD0 (SysTask * param0, void * param1)
sub_02021BD4(v1->unk_230);
ov5_021DE5A4(&v1->unk_5C, &v1->unk_1FC);
ov5_021DE4AC(&v1->unk_5C);
ov5_021DDC28(v0, param0);
EncounterEffect_Finish(v0, param0);
break;
}
@@ -1455,7 +1455,7 @@ void ov5_021E3D8C (SysTask * param0, void * param1)
case 1:
ov5_021DDC44(1, 16, -16, &v0->unk_04, 2);
EncounterEffect_Flash(1, 16, -16, &v0->unk_04, 2);
v0->unk_00++;
break;
@@ -1590,7 +1590,7 @@ void ov5_021E3D8C (SysTask * param0, void * param1)
sub_02019690(3, 32, 0, 4);
sub_02019EBC(v0->fieldSystem->unk_08, 3);
ov5_021DDC28(v0, param0);
EncounterEffect_Finish(v0, param0);
break;
}
@@ -1663,7 +1663,7 @@ void ov5_021E4260 (SysTask * param0, void * param1)
case 1:
ov5_021DDC44(1, 16, -16, &v0->unk_04, 2);
EncounterEffect_Flash(1, 16, -16, &v0->unk_04, 2);
v0->unk_00++;
break;
@@ -1739,7 +1739,7 @@ void ov5_021E4260 (SysTask * param0, void * param1)
sub_02021BD4(v1->unk_200);
ov5_021DE5A4(&v1->unk_2C, &v1->unk_1CC);
ov5_021DE4AC(&v1->unk_2C);
ov5_021DDC28(v0, param0);
EncounterEffect_Finish(v0, param0);
break;
}
@@ -1780,7 +1780,7 @@ void ov5_021E44C0 (SysTask * param0, void * param1)
case 1:
ov5_021DDC44(1, 16, -16, &v0->unk_04, 2);
EncounterEffect_Flash(1, 16, -16, &v0->unk_04, 2);
v0->unk_00++;
break;
@@ -1858,7 +1858,7 @@ void ov5_021E44C0 (SysTask * param0, void * param1)
ov5_021DE5A4(&v1->unk_00, &v1->unk_1A0);
ov5_021DE4AC(&v1->unk_00);
ov5_021DDC28(v0, param0);
EncounterEffect_Finish(v0, param0);
break;
}
@@ -1941,7 +1941,7 @@ void ov5_021E4738 (SysTask * param0, void * param1)
case 1:
ov5_021DDC44(1, -16, -16, &v0->unk_04, 2);
EncounterEffect_Flash(1, -16, -16, &v0->unk_04, 2);
v0->unk_00++;
break;
@@ -2026,7 +2026,7 @@ void ov5_021E4738 (SysTask * param0, void * param1)
ov5_021DE5A4(&v1->unk_00, &v1->unk_1A0);
ov5_021DE4AC(&v1->unk_00);
ov5_021DDC28(v0, param0);
EncounterEffect_Finish(v0, param0);
break;
}
@@ -2100,7 +2100,7 @@ void ov5_021E4B3C (SysTask * param0, void * param1)
case 1:
ov5_021DDC44(1, 16, -16, &v0->unk_04, 2);
EncounterEffect_Flash(1, 16, -16, &v0->unk_04, 2);
v0->unk_00++;
break;
@@ -2176,7 +2176,7 @@ void ov5_021E4B3C (SysTask * param0, void * param1)
G2_SetOBJMosaicSize(0, 0);
ov5_021DDC28(v0, param0);
EncounterEffect_Finish(v0, param0);
break;
}
@@ -2274,7 +2274,7 @@ void ov5_021E4E14 (SysTask * param0, void * param1)
break;
case 1:
ov5_021DDC44(1, 16, 16, &v0->unk_04, 1);
EncounterEffect_Flash(1, 16, 16, &v0->unk_04, 1);
v0->unk_00++;
break;
@@ -2335,7 +2335,7 @@ void ov5_021E4E14 (SysTask * param0, void * param1)
*(v0->done) = 1;
}
ov5_021DDC28(v0, param0);
EncounterEffect_Finish(v0, param0);
sub_0200F344(1, 0x7fff);
break;
}
@@ -2360,7 +2360,7 @@ void ov5_021E4F7C (SysTask * param0, void * param1)
break;
case 1:
ov5_021DDC44(1, 16, 16, &v0->unk_04, 1);
EncounterEffect_Flash(1, 16, 16, &v0->unk_04, 1);
v0->unk_00++;
break;
@@ -2443,7 +2443,7 @@ void ov5_021E4F7C (SysTask * param0, void * param1)
*(v0->done) = 1;
}
ov5_021DDC28(v0, param0);
EncounterEffect_Finish(v0, param0);
sub_0200F344(1, 0x7fff);
break;
}
@@ -2681,7 +2681,7 @@ static BOOL ov5_021E52A8 (EncounterEffect * param0, u32 param1, const UnkStruct_
case 1:
ov5_021DDC44(1, 16, 16, &param0->unk_04, 1);
EncounterEffect_Flash(1, 16, 16, &param0->unk_04, 1);
param0->unk_00++;
break;
@@ -2874,7 +2874,7 @@ void ov5_021E5760 (SysTask * param0, void * param1)
v1 = ov5_021E52A8(v0, 4, &Unk_ov5_021F9D34[0]);
if (v1 == 1) {
ov5_021DDC28(v0, param0);
EncounterEffect_Finish(v0, param0);
}
}
@@ -2886,7 +2886,7 @@ void ov5_021E5784 (SysTask * param0, void * param1)
v1 = ov5_021E52A8(v0, 4, &Unk_ov5_021F9D34[1]);
if (v1 == 1) {
ov5_021DDC28(v0, param0);
EncounterEffect_Finish(v0, param0);
}
}
@@ -2898,7 +2898,7 @@ void ov5_021E57A8 (SysTask * param0, void * param1)
v1 = ov5_021E52A8(v0, 4, &Unk_ov5_021F9D34[2]);
if (v1 == 1) {
ov5_021DDC28(v0, param0);
EncounterEffect_Finish(v0, param0);
}
}
@@ -2910,7 +2910,7 @@ void ov5_021E57CC (SysTask * param0, void * param1)
v1 = ov5_021E52A8(v0, 4, &Unk_ov5_021F9D34[3]);
if (v1 == 1) {
ov5_021DDC28(v0, param0);
EncounterEffect_Finish(v0, param0);
}
}
@@ -2922,7 +2922,7 @@ void ov5_021E57F0 (SysTask * param0, void * param1)
v1 = ov5_021E52A8(v0, 4, &Unk_ov5_021F9D34[4]);
if (v1 == 1) {
ov5_021DDC28(v0, param0);
EncounterEffect_Finish(v0, param0);
}
}
@@ -2934,7 +2934,7 @@ void ov5_021E5814 (SysTask * param0, void * param1)
v1 = ov5_021E52A8(v0, 4, &Unk_ov5_021F9D34[5]);
if (v1 == 1) {
ov5_021DDC28(v0, param0);
EncounterEffect_Finish(v0, param0);
}
}
@@ -2946,7 +2946,7 @@ void ov5_021E5838 (SysTask * param0, void * param1)
v1 = ov5_021E52A8(v0, 4, &Unk_ov5_021F9D34[6]);
if (v1 == 1) {
ov5_021DDC28(v0, param0);
EncounterEffect_Finish(v0, param0);
}
}
@@ -2958,7 +2958,7 @@ void ov5_021E585C (SysTask * param0, void * param1)
v1 = ov5_021E52A8(v0, 4, &Unk_ov5_021F9D34[7]);
if (v1 == 1) {
ov5_021DDC28(v0, param0);
EncounterEffect_Finish(v0, param0);
}
}
@@ -3051,7 +3051,7 @@ static BOOL ov5_021E5890 (EncounterEffect * param0, u32 param1, const UnkStruct_
case 2:
ov5_021DDC44(1, 16, 16, &param0->unk_04, 1);
EncounterEffect_Flash(1, 16, 16, &param0->unk_04, 1);
param0->unk_08 = 0;
param0->unk_00++;
break;
@@ -3359,7 +3359,7 @@ void ov5_021E6178 (SysTask * param0, void * param1)
v1 = ov5_021E5890(v0, 4, &Unk_ov5_021F9D0C[0]);
if (v1 == 1) {
ov5_021DDC28(v0, param0);
EncounterEffect_Finish(v0, param0);
}
}
@@ -3371,7 +3371,7 @@ void ov5_021E619C (SysTask * param0, void * param1)
v1 = ov5_021E5890(v0, 4, &Unk_ov5_021F9D0C[1]);
if (v1 == 1) {
ov5_021DDC28(v0, param0);
EncounterEffect_Finish(v0, param0);
}
}
@@ -3383,7 +3383,7 @@ void ov5_021E61C0 (SysTask * param0, void * param1)
v1 = ov5_021E5890(v0, 4, &Unk_ov5_021F9D0C[2]);
if (v1 == 1) {
ov5_021DDC28(v0, param0);
EncounterEffect_Finish(v0, param0);
}
}
@@ -3395,7 +3395,7 @@ void ov5_021E61E4 (SysTask * param0, void * param1)
v1 = ov5_021E5890(v0, 4, &Unk_ov5_021F9D0C[3]);
if (v1 == 1) {
ov5_021DDC28(v0, param0);
EncounterEffect_Finish(v0, param0);
}
}
@@ -3407,6 +3407,6 @@ void ov5_021E6208 (SysTask * param0, void * param1)
v1 = ov5_021E5890(v0, 4, &Unk_ov5_021F9D0C[4]);
if (v1 == 1) {
ov5_021DDC28(v0, param0);
EncounterEffect_Finish(v0, param0);
}
}

2
src/overlay010/ov10_0221F800.c
View File

@@ -1181,7 +1181,7 @@ static u8 ov10_02220A50 (SysTask * param0, UnkStruct_ov10_0221FB28 * param1)
sub_02002F54(param1->unk_08);
param1->unk_00->unk_2B = 1;
sub_020067D0(param0);
SysTask_FinishAndFreeParam(param0);
return 1;
}

2
src/overlay013/ov13_0221FC20.c
View File

@@ -1014,7 +1014,7 @@ static u8 ov13_02220BA4 (SysTask * param0, UnkStruct_ov13_022213F0 * param1)
sub_02002C60(2);
param1->unk_00->unk_36 = 1;
sub_020067D0(param0);
SysTask_FinishAndFreeParam(param0);
return 1;
}

2
src/overlay013/ov13_022264F4.c
View File

@@ -577,7 +577,7 @@ static u8 ov13_02226CFC (SysTask * param0, UnkStruct_ov13_02227244 * param1)
}
param1->unk_00->unk_26 = 1;
sub_020067D0(param0);
SysTask_FinishAndFreeParam(param0);
return 1;
}

4
src/overlay022/ov22_02255D44.c
View File

@@ -1048,7 +1048,7 @@ static void ov22_02256C70 (SysTask * param0, void * param1)
break;
case 9:
*v0->unk_04 = 1;
sub_020067D0(param0);
SysTask_FinishAndFreeParam(param0);
break;
default:
break;
@@ -1134,7 +1134,7 @@ static void ov22_02256DE0 (SysTask * param0, void * param1)
break;
case 9:
*v0->unk_04 = 1;
sub_020067D0(param0);
SysTask_FinishAndFreeParam(param0);
break;
default:
break;

2
src/overlay022/ov22_02257F50.c
View File

@@ -697,7 +697,7 @@ static void ov22_022586C4 (SysTask * param0, void * param1)
v0->unk_00->unk_00.unk_3C = 0;
Heap_FreeToHeap(v0->unk_28);
sub_020067D0(param0);
SysTask_FinishAndFreeParam(param0);
return;
default:

2
src/overlay022/ov22_022589E0.c
View File

@@ -474,7 +474,7 @@ static void ov22_02258FC0 (SysTask * param0, void * param1)
ov22_02255360();
}
sub_020067D0(param0);
SysTask_FinishAndFreeParam(param0);
} else {
ov22_022595F8(v0->unk_04, v1, v2);
}

2
src/overlay022/ov22_022597BC.c
View File

@@ -217,7 +217,7 @@ static void ov22_02259A4C (SysTask * param0, void * param1)
*v0->unk_34 = 1;
}
sub_020067D0(param0);
SysTask_FinishAndFreeParam(param0);
}
}

2
src/overlay023/ov23_02248F1C.c
View File

@@ -194,7 +194,7 @@ static void ov23_02248F1C (SysTask * param0, void * param1)
break;
case 8:
v0->fieldSystem->unk_6C = NULL;
sub_020067D0(param0);
SysTask_FinishAndFreeParam(param0);
break;
}
}

2
src/overlay056/ov56_022561C0.c
View File

@@ -276,7 +276,7 @@ void ov56_02256468 (UnkStruct_ov56_02256468 * param0)
ov56_022564E4(v0);
Heap_FreeToHeap(param0->unk_20);
sub_020067D0(param0->unk_2F8);
SysTask_FinishAndFreeParam(param0->unk_2F8);
} else {
GF_ASSERT(0);
}

4
src/overlay094/ov94_02243EF8.c
View File

@@ -136,7 +136,7 @@ static void ov94_0224400C (SysTask * param0, void * param1)
case 3:
Sound_PlayEffect(1549);
v1->unk_0C->unk_10F0 = 1;
sub_020067D0(param0);
SysTask_FinishAndFreeParam(param0);
break;
}
}
@@ -196,7 +196,7 @@ static void ov94_022440FC (SysTask * param0, void * param1)
break;
case 3:
v1->unk_0C->unk_10F0 = 1;
sub_020067D0(param0);
SysTask_FinishAndFreeParam(param0);
break;
}
}

2
src/overlay100/ov100_021D4E04.c
View File

@@ -140,7 +140,7 @@ void ov100_021D4F0C (UnkStruct_ov100_021D4F9C ** param0, GXDispMode param1, GXBG
break;
}
sub_020067D0((*param0)->unk_34);
SysTask_FinishAndFreeParam((*param0)->unk_34);
*param0 = NULL;
}

2
src/overlay104/ov104_0223DC7C.c
View File

@@ -225,7 +225,7 @@ static void ov104_0223DD30 (UnkStruct_ov104_0223DD30 * param0, SysTask * param1)
SysTask_Done(param0->unk_34);
NARC_dtor(param0->unk_24);
Heap_FreeToHeapExplicit(94, param0->unk_0C);
sub_020067D0(param1);
SysTask_FinishAndFreeParam(param1);
}
static void ov104_0223DD5C (SysTask * param0, void * param1)

2
src/unk_0200679C.c
View File

@@ -29,7 +29,7 @@ SysTask * SysTask_StartAndAllocateParam(SysTaskFunc param0, int paramSize, u32 p
return SysTask_Start(param0, v0, param2);
}
void sub_020067D0 (SysTask * param0)
void SysTask_FinishAndFreeParam (SysTask * param0)
{
void * v0;

2
src/unk_0200DA60.c
View File

@@ -586,7 +586,7 @@ static void sub_0200EC9C (SysTask * param0, void * param1)
sub_0200F12C(v0);
sub_0200D0F4(v0->unk_1C8);
ov5_021D375C(&v0->unk_00);
sub_020067D0(param0);
SysTask_FinishAndFreeParam(param0);
return;
case 2:
v0->unk_1D3 = 3;

4
src/unk_0201567C.c
View File

@@ -91,7 +91,7 @@ void sub_02015738 (void * param0, u8 param1)
void sub_02015760 (void * param0)
{
UnkStruct_020157E4 * v0 = (UnkStruct_020157E4 *)param0;
sub_020067D0(v0->unk_00);
SysTask_FinishAndFreeParam(v0->unk_00);
}
static void sub_0201576C (SysTask * param0, void * param1)
@@ -118,7 +118,7 @@ static void sub_0201576C (SysTask * param0, void * param1)
break;
case 3:
v0->unk_04(v0, v0->unk_0C);
sub_020067D0(param0);
SysTask_FinishAndFreeParam(param0);
}
}

2
src/unk_0205CA94.c
View File

@@ -415,7 +415,7 @@ UnkStruct_0205D274 * sub_0205D050 (SysTaskFunc func, FieldSystem * fieldSystem,
void sub_0205D080 (SysTask * param0, UnkStruct_0205D274 * param1)
{
sub_0205D0AC(&param1->unk_04);
sub_020067D0(param0);
SysTask_FinishAndFreeParam(param0);
}
void sub_0205D094 (UnkStruct_0205D094 * param0, int param1, u32 param2)

4
src/unk_0208694C.c
View File

@@ -1153,7 +1153,7 @@ static int sub_02086F3C (OverlayManager * param0, int * param1)
Strbuf_Free(v0->unk_184);
for (v2 = 0; v2 < 7; v2++) {
sub_020067D0(v0->unk_400[v2]);
SysTask_FinishAndFreeParam(v0->unk_400[v2]);
}
sub_0200A4E4(v0->unk_328[0][0]);
@@ -1741,7 +1741,7 @@ static void sub_02087CDC (SysTask * param0, void * param1)
case 6:
v1.x = v0->unk_08;
sub_02021C50(v0->unk_00, &v1);
sub_020067D0(param0);
SysTask_FinishAndFreeParam(param0);
break;
}