Standarized TVBroadcast stuct names for symbols (#568)

This commit is contained in:
Eduardo Quezada
2025-06-23 15:43:10 -04:00
committed by GitHub
parent 79c0f3649b
commit 17619d9ebb
21 changed files with 293 additions and 309 deletions

View File

@@ -15,8 +15,8 @@ UnkStruct_0202E794 *ov59_021D2CB4(SaveData *saveData, int heapID, u32 param2);
UnkStruct_0202E794 *ov59_021D2CF8(SaveData *saveData, int heapID, u32 param2);
UnkStruct_0202E794 *ov59_021D2D3C(SaveData *saveData, int heapID, u32 param2);
UnkStruct_0202E794 *ov59_021D2D80(SaveData *saveData, int heapID, u32 param2);
void ov59_021D2F10(TVBroadcast *param0, int param1, int param2, const void **param3, const void **param4);
void ov59_021D2F38(TVBroadcast *param0, int param1, int param2, const void **param3, const void **param4);
void ov59_021D2F60(TVBroadcast *param0, int param1, int param2, const void **param3, const void **param4);
void ov59_021D2F10(TVBroadcast *broadcast, int param1, int param2, const void **param3, const void **param4);
void ov59_021D2F38(TVBroadcast *broadcast, int param1, int param2, const void **param3, const void **param4);
void ov59_021D2F60(TVBroadcast *broadcast, int param1, int param2, const void **param3, const void **param4);
#endif // POKEPLATINUM_OV59_021D2B44_H

View File

@@ -4,7 +4,7 @@
typedef struct {
u8 unk_00;
u8 padding_01;
u16 unk_02;
u16 unk_02; // Species?
u8 unk_04;
u8 unk_05;
u8 unk_06;

View File

@@ -4,7 +4,7 @@
typedef struct {
u8 unk_00;
u8 padding_01;
u16 unk_02;
u16 unk_02; // Species?
u8 unk_04;
u8 unk_05;
u8 unk_06;

View File

@@ -16,16 +16,16 @@
#include "struct_defs/struct_0202E834.h"
int TVBroadcast_SaveSize(void);
void TVBroadcast_Init(TVBroadcast *param0);
void sub_0202E2EC(TVBroadcast *param0);
void sub_0202E324(TVBroadcast *param0, int param1, int param2);
void sub_0202E35C(TVBroadcast *param0);
void sub_0202E374(TVBroadcast *param0, BOOL param1);
BOOL sub_0202E380(const TVBroadcast *param0);
void sub_0202E384(TVBroadcast *param0, int param1);
BOOL sub_0202E3C4(const TVBroadcast *param0, int param1);
int sub_0202E3DC(const TVBroadcast *param0);
BOOL sub_0202E43C(TVBroadcast *param0, int param1, int param2, const u8 *param3);
void TVBroadcast_Init(TVBroadcast *broadcast);
void sub_0202E2EC(TVBroadcast *broadcast);
void sub_0202E324(TVBroadcast *broadcast, int param1, int param2);
void sub_0202E35C(TVBroadcast *broadcast);
void sub_0202E374(TVBroadcast *broadcast, BOOL param1);
BOOL sub_0202E380(const TVBroadcast *broadcast);
void sub_0202E384(TVBroadcast *broadcast, int param1);
BOOL sub_0202E3C4(const TVBroadcast *broadcast, int param1);
int sub_0202E3DC(const TVBroadcast *broadcast);
BOOL sub_0202E43C(TVBroadcast *broadcast, int param1, int param2, const u8 *param3);
const u16 *sub_0202E4C8(const UnkStruct_0202E794 *param0);
int sub_0202E4CC(const UnkStruct_0202E794 *param0);
int sub_0202E4D0(const UnkStruct_0202E794 *param0);
@@ -34,20 +34,20 @@ UnkStruct_0202E4D4 *sub_0202E4D8(UnkStruct_0202E768 *param0);
int sub_0202E55C(const UnkStruct_0202E4D4 *param0);
void sub_0202E560(UnkStruct_0202E4D4 *param0);
void *sub_0202E574(UnkStruct_0202E4D4 *param0);
int sub_0202E614(const TVBroadcast *param0, int param1, int param2, BOOL param3, BOOL param4, u8 *param5);
BOOL sub_0202E6B0(TVBroadcast *param0, int param1, int param2);
UnkStruct_0202E768 *sub_0202E768(TVBroadcast *param0, int param1, int param2);
UnkStruct_0202E794 *sub_0202E794(TVBroadcast *param0, int param1, int param2);
int sub_0202E614(const TVBroadcast *broadcast, int param1, int param2, BOOL param3, BOOL param4, u8 *param5);
BOOL sub_0202E6B0(TVBroadcast *broadcast, int param1, int param2);
UnkStruct_0202E768 *sub_0202E768(TVBroadcast *broadcast, int param1, int param2);
UnkStruct_0202E794 *sub_0202E794(TVBroadcast *broadcast, int param1, int param2);
BOOL sub_0202E7C0(int param0);
int sub_0202E7D0(int param0);
UnkStruct_0202E7D8 *sub_0202E7D8(TVBroadcast *param0);
UnkStruct_0202E7E4 *sub_0202E7E4(TVBroadcast *param0);
UnkStruct_0202E7F0 *sub_0202E7F0(TVBroadcast *param0);
UnkStruct_0202E7FC *sub_0202E7FC(TVBroadcast *param0);
UnkStruct_0202E808 *sub_0202E808(TVBroadcast *param0);
UnkStruct_0202E810 *sub_0202E810(TVBroadcast *param0);
UnkStruct_0202E81C *sub_0202E81C(TVBroadcast *param0);
UnkStruct_0202E828 *sub_0202E828(TVBroadcast *param0);
UnkStruct_0202E834 *sub_0202E834(TVBroadcast *param0);
UnkStruct_0202E7D8 *sub_0202E7D8(TVBroadcast *broadcast);
UnkStruct_0202E7E4 *sub_0202E7E4(TVBroadcast *broadcast);
UnkStruct_0202E7F0 *sub_0202E7F0(TVBroadcast *broadcast);
UnkStruct_0202E7FC *sub_0202E7FC(TVBroadcast *broadcast);
UnkStruct_0202E808 *sub_0202E808(TVBroadcast *broadcast);
UnkStruct_0202E810 *sub_0202E810(TVBroadcast *broadcast);
UnkStruct_0202E81C *sub_0202E81C(TVBroadcast *broadcast);
UnkStruct_0202E828 *sub_0202E828(TVBroadcast *broadcast);
UnkStruct_0202E834 *sub_0202E834(TVBroadcast *broadcast);
#endif // POKEPLATINUM_UNK_0202E2CC_H

View File

@@ -14,20 +14,20 @@
int sub_0206CD00(int param0, FieldSystem *fieldSystem, StringTemplate *param2, UnkStruct_ov6_022465F4 *param3, u16 *param4);
BOOL sub_0206CD2C(int param0, FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param2);
void sub_0206CF14(TVBroadcast *param0, Pokemon *param1, int param2, int param3, int param4);
void sub_0206CF48(TVBroadcast *param0, Pokemon *param1, int heapID);
void sub_0206CF9C(TVBroadcast *param0, int param1);
void sub_0206CFB4(TVBroadcast *param0, int param1);
void sub_0206CFCC(TVBroadcast *param0, int param1);
void sub_0206CFE4(TVBroadcast *param0, BOOL param1, u16 param2);
void sub_0206D000(TVBroadcast *param0);
void sub_0206D018(TVBroadcast *param0, Pokemon *param1);
void sub_0206D048(TVBroadcast *param0, Pokemon *param1);
void sub_0206D088(TVBroadcast *param0, u8 param1, const TrainerInfo *param2);
void sub_0206D0C8(TVBroadcast *param0, u16 param1);
void sub_0206D0F0(TVBroadcast *param0);
void sub_0206D104(TVBroadcast *param0);
void sub_0206D12C(TVBroadcast *param0);
void sub_0206CF14(TVBroadcast *broadcast, Pokemon *param1, int param2, int param3, int param4);
void sub_0206CF48(TVBroadcast *broadcast, Pokemon *param1, int heapID);
void sub_0206CF9C(TVBroadcast *broadcast, int param1);
void sub_0206CFB4(TVBroadcast *broadcast, int param1);
void sub_0206CFCC(TVBroadcast *broadcast, int param1);
void sub_0206CFE4(TVBroadcast *broadcast, BOOL param1, u16 param2);
void sub_0206D000(TVBroadcast *broadcast);
void sub_0206D018(TVBroadcast *broadcast, Pokemon *param1);
void sub_0206D048(TVBroadcast *broadcast, Pokemon *param1);
void sub_0206D088(TVBroadcast *broadcast, u8 param1, const TrainerInfo *param2);
void sub_0206D0C8(TVBroadcast *broadcast, u16 param1);
void sub_0206D0F0(TVBroadcast *broadcast);
void sub_0206D104(TVBroadcast *broadcast);
void sub_0206D12C(TVBroadcast *broadcast);
UnkStruct_0206D140 *sub_0206D140(int heapID);
void sub_0206D158(UnkStruct_0206D140 *param0);
void sub_0206D160(UnkStruct_0206D140 *param0, Pokemon *param1, int param2, int param3, u32 heapID);
@@ -42,9 +42,9 @@ void sub_0206D60C(FieldSystem *fieldSystem, Pokemon *param1);
void sub_0206D6C8(FieldSystem *fieldSystem, int param1, int param2);
void sub_0206D720(FieldSystem *fieldSystem);
void sub_0206D7C4(FieldSystem *fieldSystem);
void sub_0206D90C(TVBroadcast *param0, Pokemon *param1, u16 param2);
void sub_0206D90C(TVBroadcast *broadcast, Pokemon *param1, u16 param2);
void sub_0206D914(FieldSystem *fieldSystem, u16 param1, u8 param2, u16 param3);
void sub_0206D9B4(TVBroadcast *param0, Pokemon *param1, u8 param2);
void sub_0206D9B4(TVBroadcast *broadcast, Pokemon *param1, u8 param2);
void sub_0206DAB8(FieldSystem *fieldSystem, const TrainerInfo *param1);
void sub_0206DAD4(FieldSystem *fieldSystem, const TrainerInfo *param1);
void sub_0206DB20(FieldSystem *fieldSystem);

View File

@@ -136,17 +136,17 @@ static UnkStruct_ov6_022465F4 *ov6_02246550(FieldSystem *fieldSystem, int param1
UnkStruct_ov6_022465F4 *ov6_022465A0(FieldSystem *fieldSystem, int param1, int param2)
{
TVBroadcast *v0 = SaveData_GetTVBroadcast(fieldSystem->saveData);
TVBroadcast *broadcast = SaveData_GetTVBroadcast(fieldSystem->saveData);
if ((param1 == 4) || (param1 == 5)) {
return ov6_02246550(fieldSystem, param2);
}
if (sub_0202E7C0(param2) == 0) {
UnkStruct_0202E794 *v1 = sub_0202E794(v0, param1, param2);
UnkStruct_0202E794 *v1 = sub_0202E794(broadcast, param1, param2);
return ov6_022464A8(fieldSystem, v1);
} else {
UnkStruct_0202E768 *v2 = sub_0202E768(v0, param1, param2);
UnkStruct_0202E768 *v2 = sub_0202E768(broadcast, param1, param2);
return ov6_022464F8(fieldSystem, v2);
}
}

View File

@@ -41,20 +41,20 @@ static const UnkStruct_ov6_02249470 Unk_ov6_02249470[] = {
void ov6_022465FC(FieldSystem *fieldSystem)
{
TVBroadcast *v0 = SaveData_GetTVBroadcast(fieldSystem->saveData);
sub_0202E374(v0, 1);
TVBroadcast *broadcast = SaveData_GetTVBroadcast(fieldSystem->saveData);
sub_0202E374(broadcast, 1);
}
int ov6_0224660C(FieldSystem *fieldSystem)
{
int v0;
TVBroadcast *v1 = SaveData_GetTVBroadcast(fieldSystem->saveData);
TVBroadcast *broadcast = SaveData_GetTVBroadcast(fieldSystem->saveData);
if (sub_0202E380(v1) == 1) {
if (sub_0202E380(broadcast) == 1) {
return 0;
}
v0 = sub_0202E3DC(v1);
v0 = sub_0202E3DC(broadcast);
if (v0 == 0) {
return 2;
@@ -114,7 +114,7 @@ static void ov6_022466EC(int param0, FieldSystem *fieldSystem, u8 *param2)
{
u8 v0[11];
int v1, v2;
TVBroadcast *v3 = SaveData_GetTVBroadcast(fieldSystem->saveData);
TVBroadcast *broadcast = SaveData_GetTVBroadcast(fieldSystem->saveData);
ov6_022466C8(param0, v0);
MI_CpuClear8(param2, sizeof(u8) * 11);
@@ -154,10 +154,10 @@ static int ov6_0224673C(FieldSystem *fieldSystem, const u8 *param1)
return v0[MTRNG_Next() % v2];
}
static int ov6_0224678C(TVBroadcast *param0, int param1, int param2, BOOL param3, BOOL param4, u8 *param5)
static int ov6_0224678C(TVBroadcast *broadcast, int param1, int param2, BOOL param3, BOOL param4, u8 *param5)
{
if ((param1 != 4) && (param1 != 5)) {
return sub_0202E614(param0, param1, param2, param3, param4, param5);
return sub_0202E614(broadcast, param1, param2, param3, param4, param5);
}
if (param4) {
@@ -168,7 +168,7 @@ static int ov6_0224678C(TVBroadcast *param0, int param1, int param2, BOOL param3
return 0;
}
if (sub_0202E3C4(param0, param2) == 0) {
if (sub_0202E3C4(broadcast, param2) == 0) {
param5[0] = param2;
return 1;
}
@@ -179,14 +179,14 @@ static int ov6_0224678C(TVBroadcast *param0, int param1, int param2, BOOL param3
static int ov6_022467DC(int param0, FieldSystem *fieldSystem, BOOL param2, BOOL param3, const u8 *param4, u8 *param5)
{
u8 v0[16];
TVBroadcast *v1 = SaveData_GetTVBroadcast(fieldSystem->saveData);
TVBroadcast *broadcast = SaveData_GetTVBroadcast(fieldSystem->saveData);
int v2, v3;
int v4 = 0;
while (*param4 != 0) {
MI_CpuClear8(v0, 16);
if (ov6_0224678C(v1, param0, *param4, param2, param3, v0)) {
if (ov6_0224678C(broadcast, param0, *param4, param2, param3, v0)) {
for (v3 = 0; v0[v3] != 0 && v3 < 16; v3++) {
param5[v4] = v0[v3];
v4++;
@@ -217,10 +217,10 @@ static void ov6_02246844(FieldSystem *fieldSystem, int param1, u8 *param2)
static void ov6_02246884(FieldSystem *fieldSystem, u8 *param1)
{
TVBroadcast *v0 = SaveData_GetTVBroadcast(fieldSystem->saveData);
TVBroadcast *broadcast = SaveData_GetTVBroadcast(fieldSystem->saveData);
while (*param1 != 0) {
if (sub_0202E3C4(v0, *param1)) {
if (sub_0202E3C4(broadcast, *param1)) {
*param1 = 0;
}
@@ -292,7 +292,7 @@ static const UnkStruct_ov6_02249470 *ov6_02246958(FieldSystem *fieldSystem)
int ov6_02246978(FieldSystem *fieldSystem, int param1)
{
TVBroadcast *v0 = SaveData_GetTVBroadcast(fieldSystem->saveData);
TVBroadcast *broadcast = SaveData_GetTVBroadcast(fieldSystem->saveData);
const UnkStruct_ov6_02249470 *v1 = ov6_02246958(fieldSystem);
switch (param1) {
@@ -308,7 +308,7 @@ int ov6_02246978(FieldSystem *fieldSystem, int param1)
return v1->unk_02;
}
case 1:
if (sub_0202E3DC(v0) == 0) {
if (sub_0202E3DC(broadcast) == 0) {
return v1->unk_03;
} else {
return v1->unk_04;
@@ -324,10 +324,10 @@ BOOL ov6_022469E0(FieldSystem *fieldSystem, StringTemplate *param1, int param2,
{
int v0 = ov6_0224663C(fieldSystem);
int v1 = ov6_0224669C(v0);
TVBroadcast *v2 = SaveData_GetTVBroadcast(fieldSystem->saveData);
TVBroadcast *broadcast = SaveData_GetTVBroadcast(fieldSystem->saveData);
UnkStruct_ov6_022465F4 *v3;
sub_0202E384(v2, param2);
sub_0202E384(broadcast, param2);
v3 = ov6_022465A0(fieldSystem, v1, param2);

View File

@@ -174,10 +174,10 @@ static void ov59_021D2B90(SaveData *saveData, UnkStruct_0202E794 *param1, UnkStr
UnkStruct_0202E794 *ov59_021D2C28(SaveData *saveData, int heapID, u32 param2)
{
UnkStruct_0202E794 *v0 = Heap_AllocFromHeapAtEnd(heapID, param2);
TVBroadcast *v1 = SaveData_GetTVBroadcast(saveData);
TVBroadcast *broadcast = SaveData_GetTVBroadcast(saveData);
GF_ASSERT(param2 == ov59_021D2B44(saveData));
ov59_021D2B90(saveData, v0, v1->unk_17C, 4, 1, 3);
ov59_021D2B90(saveData, v0, broadcast->unk_17C, 4, 1, 3);
return v0;
}
@@ -185,10 +185,10 @@ UnkStruct_0202E794 *ov59_021D2C28(SaveData *saveData, int heapID, u32 param2)
UnkStruct_0202E794 *ov59_021D2C70(SaveData *saveData, int heapID, u32 param2)
{
UnkStruct_0202E794 *v0 = Heap_AllocFromHeapAtEnd(heapID, param2);
TVBroadcast *v1 = SaveData_GetTVBroadcast(saveData);
TVBroadcast *broadcast = SaveData_GetTVBroadcast(saveData);
GF_ASSERT(param2 == ov59_021D2B4C(saveData));
ov59_021D2B90(saveData, v0, v1->unk_0C, 4, 1, 4);
ov59_021D2B90(saveData, v0, broadcast->unk_0C, 4, 1, 4);
return v0;
}
@@ -196,10 +196,10 @@ UnkStruct_0202E794 *ov59_021D2C70(SaveData *saveData, int heapID, u32 param2)
UnkStruct_0202E794 *ov59_021D2CB4(SaveData *saveData, int heapID, u32 param2)
{
UnkStruct_0202E794 *v0 = Heap_AllocFromHeapAtEnd(heapID, param2);
TVBroadcast *v1 = SaveData_GetTVBroadcast(saveData);
TVBroadcast *broadcast = SaveData_GetTVBroadcast(saveData);
GF_ASSERT(param2 == ov59_021D2B54(saveData));
ov59_021D2B90(saveData, v0, v1->unk_C4, 4, 1, 5);
ov59_021D2B90(saveData, v0, broadcast->unk_C4, 4, 1, 5);
return v0;
}
@@ -207,10 +207,10 @@ UnkStruct_0202E794 *ov59_021D2CB4(SaveData *saveData, int heapID, u32 param2)
UnkStruct_0202E794 *ov59_021D2CF8(SaveData *saveData, int heapID, u32 param2)
{
UnkStruct_0202E794 *v0 = Heap_AllocFromHeapAtEnd(heapID, param2);
TVBroadcast *v1 = SaveData_GetTVBroadcast(saveData);
TVBroadcast *broadcast = SaveData_GetTVBroadcast(saveData);
GF_ASSERT(param2 == ov59_021D2B44(saveData));
ov59_021D2B90(saveData, v0, v1->unk_17C, 4, 0, 0);
ov59_021D2B90(saveData, v0, broadcast->unk_17C, 4, 0, 0);
return v0;
}
@@ -218,10 +218,10 @@ UnkStruct_0202E794 *ov59_021D2CF8(SaveData *saveData, int heapID, u32 param2)
UnkStruct_0202E794 *ov59_021D2D3C(SaveData *saveData, int heapID, u32 param2)
{
UnkStruct_0202E794 *v0 = Heap_AllocFromHeapAtEnd(heapID, param2);
TVBroadcast *v1 = SaveData_GetTVBroadcast(saveData);
TVBroadcast *broadcast = SaveData_GetTVBroadcast(saveData);
GF_ASSERT(param2 == ov59_021D2B4C(saveData));
ov59_021D2B90(saveData, v0, v1->unk_0C, 4, 0, 1);
ov59_021D2B90(saveData, v0, broadcast->unk_0C, 4, 0, 1);
return v0;
}
@@ -229,10 +229,10 @@ UnkStruct_0202E794 *ov59_021D2D3C(SaveData *saveData, int heapID, u32 param2)
UnkStruct_0202E794 *ov59_021D2D80(SaveData *saveData, int heapID, u32 param2)
{
UnkStruct_0202E794 *v0 = Heap_AllocFromHeapAtEnd(heapID, param2);
TVBroadcast *v1 = SaveData_GetTVBroadcast(saveData);
TVBroadcast *broadcast = SaveData_GetTVBroadcast(saveData);
GF_ASSERT(param2 == ov59_021D2B54(saveData));
ov59_021D2B90(saveData, v0, v1->unk_C4, 4, 0, 2);
ov59_021D2B90(saveData, v0, broadcast->unk_C4, 4, 0, 2);
return v0;
}
@@ -321,17 +321,17 @@ static void ov59_021D2E60(UnkStruct_0202E794 *param0, int param1, int param2, in
SaveData_SetChecksum(SAVE_TABLE_ENTRY_TV_BROADCAST);
}
void ov59_021D2F10(TVBroadcast *param0, int param1, int param2, const void **param3, const void **param4)
void ov59_021D2F10(TVBroadcast *broadcast, int param1, int param2, const void **param3, const void **param4)
{
ov59_021D2E60(param0->unk_234, 16, param1, param2, param3, param4, 1);
ov59_021D2E60(broadcast->unk_234, 16, param1, param2, param3, param4, 1);
}
void ov59_021D2F38(TVBroadcast *param0, int param1, int param2, const void **param3, const void **param4)
void ov59_021D2F38(TVBroadcast *broadcast, int param1, int param2, const void **param3, const void **param4)
{
ov59_021D2E60(param0->unk_684, 8, param1, param2, param3, param4, 2);
ov59_021D2E60(broadcast->unk_684, 8, param1, param2, param3, param4, 2);
}
void ov59_021D2F60(TVBroadcast *param0, int param1, int param2, const void **param3, const void **param4)
void ov59_021D2F60(TVBroadcast *broadcast, int param1, int param2, const void **param3, const void **param4)
{
ov59_021D2E60(param0->unk_8AC, 8, param1, param2, param3, param4, 0);
ov59_021D2E60(broadcast->unk_8AC, 8, param1, param2, param3, param4, 0);
}

View File

@@ -92,20 +92,20 @@ static void ov59_021D300C(const UnkStruct_ov59_021D2FBC *param0)
static void ov59_021D3028(const UnkStruct_ov59_021D2FBC *param0)
{
TVBroadcast *v0 = SaveData_GetTVBroadcast(param0->saveData);
ov59_021D2F10(v0, param0->unk_08, param0->unk_0C, param0->unk_10, param0->unk_14);
TVBroadcast *broadcast = SaveData_GetTVBroadcast(param0->saveData);
ov59_021D2F10(broadcast, param0->unk_08, param0->unk_0C, param0->unk_10, param0->unk_14);
}
static void ov59_021D3048(const UnkStruct_ov59_021D2FBC *param0)
{
TVBroadcast *v0 = SaveData_GetTVBroadcast(param0->saveData);
ov59_021D2F38(v0, param0->unk_08, param0->unk_0C, param0->unk_10, param0->unk_14);
TVBroadcast *broadcast = SaveData_GetTVBroadcast(param0->saveData);
ov59_021D2F38(broadcast, param0->unk_08, param0->unk_0C, param0->unk_10, param0->unk_14);
}
static void ov59_021D3068(const UnkStruct_ov59_021D2FBC *param0)
{
TVBroadcast *v0 = SaveData_GetTVBroadcast(param0->saveData);
ov59_021D2F60(v0, param0->unk_08, param0->unk_0C, param0->unk_10, param0->unk_14);
TVBroadcast *broadcast = SaveData_GetTVBroadcast(param0->saveData);
ov59_021D2F60(broadcast, param0->unk_08, param0->unk_0C, param0->unk_10, param0->unk_14);
}
static void *ov59_021D3088(SaveData *saveData, int heapID, u32 param2)
@@ -178,7 +178,7 @@ void ov59_021D313C(SaveData *saveData, const UnkStruct_ov59_021D30E0 *param1)
u32 v1;
u32 v2 = 0;
u32 v3 = 3000;
int v4, v5, v6;
int i, v5, v6;
const void *v7[5];
const void *v8[5];
u32 v9[4 - 2 + 1];
@@ -194,20 +194,20 @@ void ov59_021D313C(SaveData *saveData, const UnkStruct_ov59_021D30E0 *param1)
v9[3 - 2] = 0;
v9[4 - 2] = 0;
for (v4 = 0; v4 < 2; v4++) {
v9[2 - 2] += Unk_ov59_021D33FC[v4].unk_00(saveData);
for (i = 0; i < 2; i++) {
v9[2 - 2] += Unk_ov59_021D33FC[i].unk_00(saveData);
}
for (v4 = 0; v4 < 3; v4++) {
v9[3 - 2] += Unk_ov59_021D33FC[v4].unk_00(saveData);
for (i = 0; i < 3; i++) {
v9[3 - 2] += Unk_ov59_021D33FC[i].unk_00(saveData);
}
for (v4 = 0; v4 < 4; v4++) {
v9[4 - 2] += Unk_ov59_021D33FC[v4].unk_00(saveData);
for (i = 0; i < 4; i++) {
v9[4 - 2] += Unk_ov59_021D33FC[i].unk_00(saveData);
}
for (v4 = 0; v4 < NELEMS(Unk_ov59_021D33FC); v4++) {
v1 = Unk_ov59_021D33FC[v4].unk_00(saveData);
for (i = 0; i < NELEMS(Unk_ov59_021D33FC); i++) {
v1 = Unk_ov59_021D33FC[i].unk_00(saveData);
GF_ASSERT(v3 > v1);
for (v5 = 0; v5 < 5; v5++) {
@@ -218,13 +218,13 @@ void ov59_021D313C(SaveData *saveData, const UnkStruct_ov59_021D30E0 *param1)
}
}
switch (v4) {
switch (i) {
case 7:
case 8:
case 9:
for (v6 = 0; v6 < 5; v6++) {
if (CommInfo_TrainerInfo(v6) != NULL) {
v0.unk_14[v6] = &(param1[v6].unk_00[v9[v4 - 7]]);
v0.unk_14[v6] = &(param1[v6].unk_00[v9[i - 7]]);
} else {
v0.unk_14[v6] = NULL;
}
@@ -232,17 +232,15 @@ void ov59_021D313C(SaveData *saveData, const UnkStruct_ov59_021D30E0 *param1)
break;
}
if (Unk_ov59_021D33FC[v4].unk_08 != NULL) {
Unk_ov59_021D33FC[v4].unk_08(&v0);
if (Unk_ov59_021D33FC[i].unk_08 != NULL) {
Unk_ov59_021D33FC[i].unk_08(&v0);
}
v2 += v1;
v3 -= v1;
}
{
TVBroadcast *v10 = SaveData_GetTVBroadcast(saveData);
sub_0202E2EC(v10);
sub_0202E35C(v10);
}
TVBroadcast *broadcast = SaveData_GetTVBroadcast(saveData);
sub_0202E2EC(broadcast);
sub_0202E35C(broadcast);
}

View File

@@ -1088,7 +1088,7 @@ static BOOL ov83_0223C8B0(UnkStruct_ov83_0223C344 *param0, Poffin *param1, int p
u16 v1;
int v2;
BOOL v3 = 1;
TVBroadcast *v4 = SaveData_GetTVBroadcast(param0->unk_10->saveData);
TVBroadcast *broadcast = SaveData_GetTVBroadcast(param0->unk_10->saveData);
for (v0 = 0; v0 < param2; v0++) {
v1 = PoffinCase_AddPoffin(param0->unk_10->poffinCase, param1);
@@ -1101,7 +1101,7 @@ static BOOL ov83_0223C8B0(UnkStruct_ov83_0223C344 *param0, Poffin *param1, int p
if (param0->unk_26 == 0) {
v2 = Poffin_GetAttribute(param1, 0);
sub_0206CFCC(v4, v2);
sub_0206CFCC(broadcast, v2);
}
return v3;

View File

@@ -657,13 +657,7 @@ static int ov94_022431F0(UnkStruct_ov94_0223FD4C *param0)
GameRecords_IncrementTrainerScore(param0->unk_00->records, TRAINER_SCORE_EVENT_UNK_25);
ov94_02243E48(param0->unk_00->unk_2C, &param0->unk_A4C);
GameRecords_IncrementRecordValue(param0->unk_00->records, RECORD_UNK_024);
{
TVBroadcast *v2;
v2 = SaveData_GetTVBroadcast(param0->unk_00->saveData);
sub_0206D104(v2);
}
sub_0206D104(SaveData_GetTVBroadcast(param0->unk_00->saveData));
break;
case -5:
param0->unk_3C = v1;
@@ -937,12 +931,8 @@ static int ov94_02243658(UnkStruct_ov94_0223FD4C *param0)
ov94_02243E48(param0->unk_00->unk_2C, &param0->unk_12C);
GameRecords_IncrementRecordValue(param0->unk_00->records, RECORD_UNK_024);
{
TVBroadcast *v0;
v0 = SaveData_GetTVBroadcast(param0->unk_00->saveData);
sub_0206D104(v0);
}
TVBroadcast *broadcast = SaveData_GetTVBroadcast(param0->unk_00->saveData);
sub_0206D104(broadcast);
sub_0202DA68(param0->unk_00->unk_00, 0);
param0->unk_2C = 30;

View File

@@ -1869,13 +1869,13 @@ static BOOL ov104_02230EFC(UnkStruct_ov104_0222E930 *param0)
static BOOL ov104_02230F28(UnkStruct_ov104_0222E930 *param0)
{
TVBroadcast *v0;
TVBroadcast *broadcast;
UnkStruct_ov104_02230BE4 *v1 = sub_0209B970(param0->unk_00->unk_00);
u16 v2 = ov104_0222FC00(param0);
v0 = SaveData_GetTVBroadcast(v1->saveData);
broadcast = SaveData_GetTVBroadcast(v1->saveData);
sub_0206D0C8(v0, v2);
sub_0206D0C8(broadcast, v2);
GameRecords_AddToRecordValue(SaveData_GetGameRecords(v1->saveData), RECORD_UNK_068, v2);
sub_0202D230(sub_0202D750(v1->saveData), v2, 5);
@@ -2803,14 +2803,14 @@ static BOOL ov104_02231ED8(UnkStruct_ov104_0222E930 *param0)
static BOOL ov104_02231EFC(UnkStruct_ov104_0222E930 *param0)
{
u16 v0;
TVBroadcast *v1;
TVBroadcast *broadcast;
TrainerInfo *v2;
UnkStruct_ov104_02230BE4 *v3 = sub_0209B970(param0->unk_00->unk_00);
v1 = SaveData_GetTVBroadcast(v3->saveData);
broadcast = SaveData_GetTVBroadcast(v3->saveData);
v0 = ov104_0222FC00(param0);
v2 = CommInfo_TrainerInfo(1 - CommSys_CurNetId());
sub_0206D088(v1, v0, v2);
sub_0206D088(broadcast, v0, v2);
return 0;
}

View File

@@ -398,7 +398,7 @@ BOOL ov104_02234D50(UnkStruct_ov104_0222E930 *param0)
BOOL ov104_02234D6C(UnkStruct_ov104_0222E930 *param0)
{
TVBroadcast *v0;
TVBroadcast *broadcast;
u16 v1;
Party *v2;
Pokemon *v3;
@@ -411,8 +411,8 @@ BOOL ov104_02234D6C(UnkStruct_ov104_0222E930 *param0)
v1 = Pokemon_GetValue(v3, MON_DATA_SPECIES, NULL);
if (v4->unk_04 == 0) {
v0 = SaveData_GetTVBroadcast(v5->saveData);
sub_0206D048(v0, v3);
broadcast = SaveData_GetTVBroadcast(v5->saveData);
sub_0206D048(broadcast, v3);
}
return 0;

View File

@@ -44,7 +44,7 @@ static BOOL ov104_02239464(UnkStruct_ov104_0222E930 *param0, UnkStruct_0204AFC4
BOOL ov104_02239130(UnkStruct_ov104_0222E930 *param0)
{
TVBroadcast *v0;
TVBroadcast *broadcast;
Pokemon *v1;
UnkStruct_0204AFC4 *v2;
int v3, v4;
@@ -63,8 +63,8 @@ BOOL ov104_02239130(UnkStruct_ov104_0222E930 *param0)
break;
case (30 + 16):
*v7 = sub_0204AA04(v2);
v0 = SaveData_GetTVBroadcast(v8->saveData);
sub_0206D0C8(v0, *v7);
broadcast = SaveData_GetTVBroadcast(v8->saveData);
sub_0206D0C8(broadcast, *v7);
GameRecords_AddToRecordValue(SaveData_GetGameRecords(v8->saveData), RECORD_UNK_068, *v7);
break;
case (30 + 25):

View File

@@ -6132,7 +6132,7 @@ static BOOL ScrCmd_202(ScriptContext *ctx)
{
FieldOverworldState *fieldState = SaveData_GetFieldOverworldState(ctx->fieldSystem->saveData);
VarsFlags *v3 = SaveData_GetVarsFlags(ctx->fieldSystem->saveData);
TVBroadcast *v4 = SaveData_GetTVBroadcast(ctx->fieldSystem->saveData);
TVBroadcast *broadcast = SaveData_GetTVBroadcast(ctx->fieldSystem->saveData);
int v5 = ScriptContext_ReadByte(ctx);
u16 *v0 = FieldOverworldState_GetSafariBallCount(fieldState);
@@ -6141,7 +6141,7 @@ static BOOL ScrCmd_202(ScriptContext *ctx)
switch (v5) {
case 0:
SystemFlag_SetSafariGameActive(v3);
sub_0206D000(v4);
sub_0206D000(broadcast);
*v0 = 30;
*v1 = 0;
break;

View File

@@ -21,78 +21,78 @@
#include "rtc.h"
#include "savedata.h"
static void sub_0202E3AC(TVBroadcast *param0);
static UnkStruct_0202E768 *sub_0202E4DC(TVBroadcast *param0, int param1);
static void sub_0202E3AC(TVBroadcast *broadcast);
static UnkStruct_0202E768 *sub_0202E4DC(TVBroadcast *broadcast, int param1);
int TVBroadcast_SaveSize(void)
{
return sizeof(TVBroadcast);
}
void TVBroadcast_Init(TVBroadcast *param0)
void TVBroadcast_Init(TVBroadcast *broadcast)
{
MI_CpuClearFast(param0, sizeof(TVBroadcast));
MI_CpuClearFast(broadcast, sizeof(TVBroadcast));
SaveData_SetChecksum(SAVE_TABLE_ENTRY_TV_BROADCAST);
}
void sub_0202E2EC(TVBroadcast *param0)
void sub_0202E2EC(TVBroadcast *broadcast)
{
MI_CpuClearFast(param0->unk_0C, sizeof(UnkStruct_0202E768) * 4);
MI_CpuClearFast(param0->unk_C4, sizeof(UnkStruct_0202E768) * 4);
MI_CpuClearFast(param0->unk_17C, sizeof(UnkStruct_0202E768) * 4);
MI_CpuClearFast(broadcast->unk_0C, sizeof(UnkStruct_0202E768) * 4);
MI_CpuClearFast(broadcast->unk_C4, sizeof(UnkStruct_0202E768) * 4);
MI_CpuClearFast(broadcast->unk_17C, sizeof(UnkStruct_0202E768) * 4);
sub_0202E35C(param0);
sub_0202E35C(broadcast);
SaveData_SetChecksum(SAVE_TABLE_ENTRY_TV_BROADCAST);
}
void sub_0202E324(TVBroadcast *param0, int param1, int param2)
void sub_0202E324(TVBroadcast *broadcast, int param1, int param2)
{
int v0;
int i;
if (param0->unk_04 > param1) {
param0->unk_04 -= param1;
if (broadcast->unk_04 > param1) {
broadcast->unk_04 -= param1;
} else {
param0->unk_04 = 15 - param2 % 15;
broadcast->unk_04 = 15 - param2 % 15;
if (param0->unk_04 == 0) {
param0->unk_04 = 15;
if (broadcast->unk_04 == 0) {
broadcast->unk_04 = 15;
}
param0->unk_08 = 0;
broadcast->unk_08 = 0;
for (v0 = 0; v0 < 4; v0++) {
param0->unk_00[v0] = 0;
for (i = 0; i < 4; i++) {
broadcast->unk_00[i] = 0;
}
}
SaveData_SetChecksum(SAVE_TABLE_ENTRY_TV_BROADCAST);
}
void sub_0202E35C(TVBroadcast *param0)
void sub_0202E35C(TVBroadcast *broadcast)
{
sub_0202E374(param0, 0);
sub_0202E3AC(param0);
sub_0202E374(broadcast, 0);
sub_0202E3AC(broadcast);
SaveData_SetChecksum(SAVE_TABLE_ENTRY_TV_BROADCAST);
}
void sub_0202E374(TVBroadcast *param0, BOOL param1)
void sub_0202E374(TVBroadcast *broadcast, BOOL param1)
{
param0->unk_08 = param1;
broadcast->unk_08 = param1;
SaveData_SetChecksum(SAVE_TABLE_ENTRY_TV_BROADCAST);
}
BOOL sub_0202E380(const TVBroadcast *param0)
BOOL sub_0202E380(const TVBroadcast *broadcast)
{
return param0->unk_08;
return broadcast->unk_08;
}
void sub_0202E384(TVBroadcast *param0, int param1)
void sub_0202E384(TVBroadcast *broadcast, int param1)
{
int v0;
int i;
for (v0 = 0; v0 < 4; v0++) {
if (param0->unk_00[v0] == 0) {
param0->unk_00[v0] = param1;
for (i = 0; i < 4; i++) {
if (broadcast->unk_00[i] == 0) {
broadcast->unk_00[i] = param1;
SaveData_SetChecksum(SAVE_TABLE_ENTRY_TV_BROADCAST);
return;
}
@@ -103,23 +103,23 @@ void sub_0202E384(TVBroadcast *param0, int param1)
SaveData_SetChecksum(SAVE_TABLE_ENTRY_TV_BROADCAST);
}
static void sub_0202E3AC(TVBroadcast *param0)
static void sub_0202E3AC(TVBroadcast *broadcast)
{
int v0;
int i;
for (v0 = 0; v0 < 4; v0++) {
param0->unk_00[v0] = 0;
for (i = 0; i < 4; i++) {
broadcast->unk_00[i] = 0;
}
SaveData_SetChecksum(SAVE_TABLE_ENTRY_TV_BROADCAST);
}
BOOL sub_0202E3C4(const TVBroadcast *param0, int param1)
BOOL sub_0202E3C4(const TVBroadcast *broadcast, int param1)
{
int v0;
int i;
for (v0 = 0; v0 < 4; v0++) {
if (param0->unk_00[v0] == param1) {
for (i = 0; i < 4; i++) {
if (broadcast->unk_00[i] == param1) {
return 1;
}
}
@@ -127,12 +127,12 @@ BOOL sub_0202E3C4(const TVBroadcast *param0, int param1)
return 0;
}
int sub_0202E3DC(const TVBroadcast *param0)
int sub_0202E3DC(const TVBroadcast *broadcast)
{
int v0, v1;
int i, v1;
for (v0 = 0, v1 = 0; v0 < 4; v0++) {
if (param0->unk_00[v0] != 0) {
for (i = 0, v1 = 0; i < 4; i++) {
if (broadcast->unk_00[i] != 0) {
v1++;
}
}
@@ -154,15 +154,15 @@ static void sub_0202E3F4(UnkStruct_0202E4D4 *param0, int param1, const u8 *param
SaveData_SetChecksum(SAVE_TABLE_ENTRY_TV_BROADCAST);
}
BOOL sub_0202E43C(TVBroadcast *param0, int param1, int param2, const u8 *param3)
BOOL sub_0202E43C(TVBroadcast *broadcast, int param1, int param2, const u8 *param3)
{
int v0;
UnkStruct_0202E768 *v1 = sub_0202E4DC(param0, param1);
int i;
UnkStruct_0202E768 *v1 = sub_0202E4DC(broadcast, param1);
for (v0 = 0; v0 < 4; v0++) {
if (v1[v0].unk_00.unk_00 == param2) {
if (v1[v0].unk_00.unk_01 >= 3) {
sub_0202E3F4(&v1[v0].unk_00, param2, param3);
for (i = 0; i < 4; i++) {
if (v1[i].unk_00.unk_00 == param2) {
if (v1[i].unk_00.unk_01 >= 3) {
sub_0202E3F4(&v1[i].unk_00, param2, param3);
return 1;
}
@@ -170,16 +170,16 @@ BOOL sub_0202E43C(TVBroadcast *param0, int param1, int param2, const u8 *param3)
}
}
for (v0 = 0; v0 < 4; v0++) {
if (v1[v0].unk_00.unk_00 == 0) {
sub_0202E3F4(&v1[v0].unk_00, param2, param3);
for (i = 0; i < 4; i++) {
if (v1[i].unk_00.unk_00 == 0) {
sub_0202E3F4(&v1[i].unk_00, param2, param3);
return 1;
}
}
for (v0 = 0; v0 < 4; v0++) {
if (v1[v0].unk_00.unk_01 >= 3) {
sub_0202E3F4(&v1[v0].unk_00, param2, param3);
for (i = 0; i < 4; i++) {
if (v1[i].unk_00.unk_01 >= 3) {
sub_0202E3F4(&v1[i].unk_00, param2, param3);
return 1;
}
}
@@ -214,19 +214,19 @@ UnkStruct_0202E4D4 *sub_0202E4D8(UnkStruct_0202E768 *param0)
return &param0->unk_00;
}
static UnkStruct_0202E768 *sub_0202E4DC(TVBroadcast *param0, int param1)
static UnkStruct_0202E768 *sub_0202E4DC(TVBroadcast *broadcast, int param1)
{
UnkStruct_0202E768 *v0 = NULL;
switch (param1) {
case 1:
v0 = param0->unk_17C;
v0 = broadcast->unk_17C;
break;
case 2:
v0 = param0->unk_0C;
v0 = broadcast->unk_0C;
break;
case 3:
v0 = param0->unk_C4;
v0 = broadcast->unk_C4;
break;
case 4:
case 5:
@@ -236,19 +236,19 @@ static UnkStruct_0202E768 *sub_0202E4DC(TVBroadcast *param0, int param1)
return v0;
}
static UnkStruct_0202E794 *sub_0202E518(TVBroadcast *param0, int param1)
static UnkStruct_0202E794 *sub_0202E518(TVBroadcast *broadcast, int param1)
{
UnkStruct_0202E794 *v0 = NULL;
switch (param1) {
case 2:
v0 = param0->unk_234;
v0 = broadcast->unk_234;
break;
case 3:
v0 = param0->unk_684;
v0 = broadcast->unk_684;
break;
case 1:
v0 = param0->unk_8AC;
v0 = broadcast->unk_8AC;
break;
case 4:
case 5:
@@ -319,26 +319,26 @@ static int sub_0202E5B8(const UnkStruct_0202E794 *param0, int param1, int param2
return v1;
}
int sub_0202E614(const TVBroadcast *param0, int param1, int param2, BOOL param3, BOOL param4, u8 *param5)
int sub_0202E614(const TVBroadcast *broadcast, int param1, int param2, BOOL param3, BOOL param4, u8 *param5)
{
switch (param1) {
case 2:
if (param3) {
return sub_0202E578(param0->unk_0C, 4, param2, param4, param5);
return sub_0202E578(broadcast->unk_0C, 4, param2, param4, param5);
} else {
return sub_0202E5B8(param0->unk_234, 16, param2, param4, param5);
return sub_0202E5B8(broadcast->unk_234, 16, param2, param4, param5);
}
case 3:
if (param3) {
return sub_0202E578(param0->unk_C4, 4, param2, param4, param5);
return sub_0202E578(broadcast->unk_C4, 4, param2, param4, param5);
} else {
return sub_0202E5B8(param0->unk_684, 8, param2, param4, param5);
return sub_0202E5B8(broadcast->unk_684, 8, param2, param4, param5);
}
case 1:
if (param3) {
return sub_0202E578(param0->unk_17C, 4, param2, param4, param5);
return sub_0202E578(broadcast->unk_17C, 4, param2, param4, param5);
} else {
return sub_0202E5B8(param0->unk_8AC, 8, param2, param4, param5);
return sub_0202E5B8(broadcast->unk_8AC, 8, param2, param4, param5);
}
case 4:
return 0;
@@ -349,26 +349,26 @@ int sub_0202E614(const TVBroadcast *param0, int param1, int param2, BOOL param3,
return 0;
}
BOOL sub_0202E6B0(TVBroadcast *param0, int param1, int param2)
BOOL sub_0202E6B0(TVBroadcast *broadcast, int param1, int param2)
{
int v0;
int v1;
int i;
u8 v2[4];
UnkStruct_0202E768 *v3;
MI_CpuClear8(v2, 4);
v0 = sub_0202E614(param0, param1, param2, 1, 0, v2);
v0 = sub_0202E614(broadcast, param1, param2, 1, 0, v2);
if (v0 != 0) {
return 0;
}
v0 = sub_0202E614(param0, param1, param2, 1, 1, v2);
v0 = sub_0202E614(broadcast, param1, param2, 1, 1, v2);
if (v0 != 0) {
for (v1 = 0; v1 < 4 & v2[v1] != 0; v1++) {
v3 = sub_0202E768(param0, param1, v2[v1]);
for (i = 0; i < 4 & v2[i] != 0; i++) {
v3 = sub_0202E768(broadcast, param1, v2[i]);
if (v3->unk_00.unk_01 >= 3) {
return 1;
@@ -378,8 +378,8 @@ BOOL sub_0202E6B0(TVBroadcast *param0, int param1, int param2)
return 0;
}
for (v1 = 1; v1 <= 4; v1++) {
v3 = sub_0202E768(param0, param1, v1);
for (i = 1; i <= 4; i++) {
v3 = sub_0202E768(broadcast, param1, i);
if ((v3->unk_00.unk_00 == 0) || (v3->unk_00.unk_01 >= 3)) {
return 1;
@@ -389,26 +389,26 @@ BOOL sub_0202E6B0(TVBroadcast *param0, int param1, int param2)
return 0;
}
UnkStruct_0202E768 *sub_0202E768(TVBroadcast *param0, int param1, int param2)
UnkStruct_0202E768 *sub_0202E768(TVBroadcast *broadcast, int param1, int param2)
{
UnkStruct_0202E768 *v0;
GF_ASSERT(sub_0202E7C0(param2) == 1);
param2 &= ~0x80;
v0 = sub_0202E4DC(param0, param1);
v0 = sub_0202E4DC(broadcast, param1);
return &v0[param2 - 1];
}
UnkStruct_0202E794 *sub_0202E794(TVBroadcast *param0, int param1, int param2)
UnkStruct_0202E794 *sub_0202E794(TVBroadcast *broadcast, int param1, int param2)
{
UnkStruct_0202E794 *v0;
GF_ASSERT(sub_0202E7C0(param2) == 0);
param2 &= ~0x80;
v0 = sub_0202E518(param0, param1);
v0 = sub_0202E518(broadcast, param1);
return &v0[param2 - 1];
}
@@ -427,47 +427,47 @@ int sub_0202E7D0(int param0)
return param0 | 0x80;
}
UnkStruct_0202E7D8 *sub_0202E7D8(TVBroadcast *param0)
UnkStruct_0202E7D8 *sub_0202E7D8(TVBroadcast *broadcast)
{
return &param0->unk_AD4;
return &broadcast->unk_AD4;
}
UnkStruct_0202E7E4 *sub_0202E7E4(TVBroadcast *param0)
UnkStruct_0202E7E4 *sub_0202E7E4(TVBroadcast *broadcast)
{
return &param0->unk_ADE;
return &broadcast->unk_ADE;
}
UnkStruct_0202E7F0 *sub_0202E7F0(TVBroadcast *param0)
UnkStruct_0202E7F0 *sub_0202E7F0(TVBroadcast *broadcast)
{
return &param0->unk_B02;
return &broadcast->unk_B02;
}
UnkStruct_0202E7FC *sub_0202E7FC(TVBroadcast *param0)
UnkStruct_0202E7FC *sub_0202E7FC(TVBroadcast *broadcast)
{
return &param0->unk_B04;
return &broadcast->unk_B04;
}
UnkStruct_0202E808 *sub_0202E808(TVBroadcast *param0)
UnkStruct_0202E808 *sub_0202E808(TVBroadcast *broadcast)
{
return &param0->unk_B08;
return &broadcast->unk_B08;
}
UnkStruct_0202E810 *sub_0202E810(TVBroadcast *param0)
UnkStruct_0202E810 *sub_0202E810(TVBroadcast *broadcast)
{
return &param0->unk_B10;
return &broadcast->unk_B10;
}
UnkStruct_0202E81C *sub_0202E81C(TVBroadcast *param0)
UnkStruct_0202E81C *sub_0202E81C(TVBroadcast *broadcast)
{
return &param0->unk_B2E;
return &broadcast->unk_B2E;
}
UnkStruct_0202E828 *sub_0202E828(TVBroadcast *param0)
UnkStruct_0202E828 *sub_0202E828(TVBroadcast *broadcast)
{
return &param0->unk_B44;
return &broadcast->unk_B44;
}
UnkStruct_0202E834 *sub_0202E834(TVBroadcast *param0)
UnkStruct_0202E834 *sub_0202E834(TVBroadcast *broadcast)
{
return &param0->unk_B4C;
return &broadcast->unk_B4C;
}

View File

@@ -190,20 +190,20 @@ BOOL ScrCmd_238(ScriptContext *param0)
BOOL ScrCmd_27C(ScriptContext *param0)
{
TVBroadcast *v0 = SaveData_GetTVBroadcast(param0->fieldSystem->saveData);
TVBroadcast *broadcast = SaveData_GetTVBroadcast(param0->fieldSystem->saveData);
switch (ScriptContext_ReadHalfWord(param0)) {
case 0: {
Party *v1 = SaveData_GetParty(param0->fieldSystem->saveData);
Pokemon *v2 = Party_GetPokemonBySlotIndex(v1, ScriptContext_GetVar(param0));
Party *party = SaveData_GetParty(param0->fieldSystem->saveData);
Pokemon *v2 = Party_GetPokemonBySlotIndex(party, ScriptContext_GetVar(param0));
sub_0206CF48(v0, v2, HEAP_ID_FIELD);
sub_0206CF48(broadcast, v2, HEAP_ID_FIELD);
} break;
case 1:
sub_0206CFB4(v0, ScriptContext_GetVar(param0));
sub_0206CFB4(broadcast, ScriptContext_GetVar(param0));
break;
case 2:
sub_0206CF9C(v0, ScriptContext_GetVar(param0));
sub_0206CF9C(broadcast, ScriptContext_GetVar(param0));
break;
}
@@ -237,9 +237,9 @@ static int sub_020491D0(int param0, FieldSystem *fieldSystem, StringTemplate *pa
static BOOL sub_020491F4(FieldSystem *fieldSystem, int param1)
{
UnkFuncPtr_020EBB48_2 v0;
TVBroadcast *v1 = SaveData_GetTVBroadcast(fieldSystem->saveData);
TVBroadcast *broadcast = SaveData_GetTVBroadcast(fieldSystem->saveData);
if (sub_0202E6B0(v1, 1, param1) == 0) {
if (sub_0202E6B0(broadcast, 1, param1) == 0) {
return 0;
}
@@ -278,8 +278,8 @@ static void sub_02049288(FieldSystem *fieldSystem, StringTemplate *param1)
static void sub_020492A0(FieldSystem *fieldSystem, StringTemplate *param1)
{
u16 v0[10 + 1];
TVBroadcast *v1 = SaveData_GetTVBroadcast(fieldSystem->saveData);
UnkStruct_0202E7E4 *v2 = sub_0202E7E4(v1);
TVBroadcast *broadcast = SaveData_GetTVBroadcast(fieldSystem->saveData);
UnkStruct_0202E7E4 *v2 = sub_0202E7E4(broadcast);
MessageLoader_GetSpeciesName(v2->unk_02, 4, v0);
sub_0204922C(param1, 0, v0, 0, GAME_LANGUAGE, 1);
@@ -288,8 +288,8 @@ static void sub_020492A0(FieldSystem *fieldSystem, StringTemplate *param1)
static void sub_020492D4(FieldSystem *fieldSystem, StringTemplate *param1)
{
u16 v0[10 + 1];
TVBroadcast *v1 = SaveData_GetTVBroadcast(fieldSystem->saveData);
UnkStruct_0202E810 *v2 = sub_0202E810(v1);
TVBroadcast *broadcast = SaveData_GetTVBroadcast(fieldSystem->saveData);
UnkStruct_0202E810 *v2 = sub_0202E810(broadcast);
MessageLoader_GetSpeciesName(v2->unk_02, 4, v0);
sub_0204922C(param1, 0, v0, 0, GAME_LANGUAGE, 1);
@@ -298,8 +298,8 @@ static void sub_020492D4(FieldSystem *fieldSystem, StringTemplate *param1)
static void sub_02049308(FieldSystem *fieldSystem, StringTemplate *param1)
{
Strbuf *v0;
TVBroadcast *v1 = SaveData_GetTVBroadcast(fieldSystem->saveData);
UnkStruct_0202E81C *v2 = sub_0202E81C(v1);
TVBroadcast *broadcast = SaveData_GetTVBroadcast(fieldSystem->saveData);
UnkStruct_0202E81C *v2 = sub_0202E81C(broadcast);
v0 = Strbuf_Init(64, HEAP_ID_FIELD);
@@ -380,12 +380,12 @@ static const UnkStruct_020EBB48 Unk_020EBB48[19] = {
BOOL ScrCmd_31B(ScriptContext *param0)
{
TVBroadcast *v0;
TVBroadcast *broadcast;
UnkStruct_0202E808 *v1;
u16 *v2 = ScriptContext_GetVarPointer(param0);
v0 = SaveData_GetTVBroadcast(param0->fieldSystem->saveData);
v1 = sub_0202E808(v0);
broadcast = SaveData_GetTVBroadcast(param0->fieldSystem->saveData);
v1 = sub_0202E808(broadcast);
*v2 = v1->unk_07;
return 0;
@@ -393,15 +393,15 @@ BOOL ScrCmd_31B(ScriptContext *param0)
BOOL ScrCmd_329(ScriptContext *param0)
{
TVBroadcast *v0;
TVBroadcast *broadcast;
UnkStruct_0202E81C *v1;
u16 *v2 = ScriptContext_GetVarPointer(param0);
u16 *v3 = ScriptContext_GetVarPointer(param0);
u16 *v4 = ScriptContext_GetVarPointer(param0);
u16 *v5 = ScriptContext_GetVarPointer(param0);
v0 = SaveData_GetTVBroadcast(param0->fieldSystem->saveData);
v1 = sub_0202E81C(v0);
broadcast = SaveData_GetTVBroadcast(param0->fieldSystem->saveData);
v1 = sub_0202E81C(broadcast);
switch (v1->unk_01) {
case 5:

View File

@@ -133,15 +133,11 @@ static void sub_02055B64(FieldSystem *fieldSystem, s32 param1, const RTCTime *rt
SpecialEncounter_DecrementHoneyTreeTimers(fieldSystem->saveData, param1);
sub_02028758(fieldSystem->saveData, param1, FieldSystem_HasPenalty(fieldSystem));
{
TVBroadcast *v0 = SaveData_GetTVBroadcast(fieldSystem->saveData);
sub_0202E324(v0, param1, rtcTime->minute);
}
TVBroadcast *broadcast = SaveData_GetTVBroadcast(fieldSystem->saveData);
sub_0202E324(broadcast, param1, rtcTime->minute);
{
Party *party = SaveData_GetParty(fieldSystem->saveData);
Party_SetShayminForm(party, param1, rtcTime);
}
Party *party = SaveData_GetParty(fieldSystem->saveData);
Party_SetShayminForm(party, param1, rtcTime);
}
enum TimeOfDay FieldSystem_GetTimeOfDay(const FieldSystem *fieldSystem)

View File

@@ -428,10 +428,10 @@ BOOL sub_0206CD2C(int param0, FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *
static void sub_0206CD58(SaveData *saveData, int param1, int param2, const void *param3)
{
TVBroadcast *v0 = SaveData_GetTVBroadcast(saveData);
TVBroadcast *broadcast = SaveData_GetTVBroadcast(saveData);
GF_ASSERT(sizeof(UnkUnion_0206D1B8) == 40);
sub_0202E43C(v0, param1, param2, (const u8 *)param3);
sub_0202E43C(broadcast, param1, param2, (const u8 *)param3);
}
static void sub_0206CD70(FieldSystem *fieldSystem, int param1, int param2, const void *param3)
@@ -441,10 +441,10 @@ static void sub_0206CD70(FieldSystem *fieldSystem, int param1, int param2, const
static void sub_0206CD7C(SaveData *saveData, int param1, int param2, const void *param3)
{
TVBroadcast *v0 = SaveData_GetTVBroadcast(saveData);
TVBroadcast *broadcast = SaveData_GetTVBroadcast(saveData);
GF_ASSERT(sizeof(UnkUnion_0206D1B8) == 40);
sub_0202E43C(v0, param1, param2, (const u8 *)param3);
sub_0202E43C(broadcast, param1, param2, (const u8 *)param3);
}
static void sub_0206CD94(StringTemplate *param0, int param1, const u16 *param2, int param3, int param4, int param5)
@@ -507,9 +507,9 @@ static void sub_0206CED0(int heapID, Pokemon *mon, u8 *param2, u16 *param3)
}
}
void sub_0206CF14(TVBroadcast *param0, Pokemon *param1, int param2, int param3, int param4)
void sub_0206CF14(TVBroadcast *broadcast, Pokemon *param1, int param2, int param3, int param4)
{
UnkStruct_0202E7D8 *v0 = sub_0202E7D8(param0);
UnkStruct_0202E7D8 *v0 = sub_0202E7D8(broadcast);
v0->unk_00 = 1;
sub_0206CE38(param1, &v0->unk_02, &v0->unk_04, &v0->unk_05, &v0->unk_06);
@@ -520,9 +520,9 @@ void sub_0206CF14(TVBroadcast *param0, Pokemon *param1, int param2, int param3,
SaveData_SetChecksum(SAVE_TABLE_ENTRY_TV_BROADCAST);
}
void sub_0206CF48(TVBroadcast *param0, Pokemon *param1, int heapID)
void sub_0206CF48(TVBroadcast *broadcast, Pokemon *param1, int heapID)
{
UnkStruct_0202E7E4 *v0 = sub_0202E7E4(param0);
UnkStruct_0202E7E4 *v0 = sub_0202E7E4(broadcast);
v0->unk_00 = 1;
v0->unk_1F = 0;
@@ -535,9 +535,9 @@ void sub_0206CF48(TVBroadcast *param0, Pokemon *param1, int heapID)
SaveData_SetChecksum(SAVE_TABLE_ENTRY_TV_BROADCAST);
}
void sub_0206CF9C(TVBroadcast *param0, int param1)
void sub_0206CF9C(TVBroadcast *broadcast, int param1)
{
UnkStruct_0202E7E4 *v0 = sub_0202E7E4(param0);
UnkStruct_0202E7E4 *v0 = sub_0202E7E4(broadcast);
v0->unk_1F = 2;
v0->unk_20 = param1;
@@ -545,9 +545,9 @@ void sub_0206CF9C(TVBroadcast *param0, int param1)
SaveData_SetChecksum(SAVE_TABLE_ENTRY_TV_BROADCAST);
}
void sub_0206CFB4(TVBroadcast *param0, int param1)
void sub_0206CFB4(TVBroadcast *broadcast, int param1)
{
UnkStruct_0202E7E4 *v0 = sub_0202E7E4(param0);
UnkStruct_0202E7E4 *v0 = sub_0202E7E4(broadcast);
v0->unk_1F = 1;
v0->unk_22 = param1;
@@ -555,9 +555,9 @@ void sub_0206CFB4(TVBroadcast *param0, int param1)
SaveData_SetChecksum(SAVE_TABLE_ENTRY_TV_BROADCAST);
}
void sub_0206CFCC(TVBroadcast *param0, int param1)
void sub_0206CFCC(TVBroadcast *broadcast, int param1)
{
UnkStruct_0202E7F0 *v0 = sub_0202E7F0(param0);
UnkStruct_0202E7F0 *v0 = sub_0202E7F0(broadcast);
v0->unk_00 = 1;
v0->unk_01 = param1;
@@ -565,9 +565,9 @@ void sub_0206CFCC(TVBroadcast *param0, int param1)
SaveData_SetChecksum(SAVE_TABLE_ENTRY_TV_BROADCAST);
}
void sub_0206CFE4(TVBroadcast *param0, BOOL param1, u16 param2)
void sub_0206CFE4(TVBroadcast *broadcast, BOOL param1, u16 param2)
{
UnkStruct_0202E7FC *v0 = sub_0202E7FC(param0);
UnkStruct_0202E7FC *v0 = sub_0202E7FC(broadcast);
v0->unk_00 = 1;
v0->unk_01 = param1;
@@ -576,9 +576,9 @@ void sub_0206CFE4(TVBroadcast *param0, BOOL param1, u16 param2)
SaveData_SetChecksum(SAVE_TABLE_ENTRY_TV_BROADCAST);
}
void sub_0206D000(TVBroadcast *param0)
void sub_0206D000(TVBroadcast *broadcast)
{
UnkStruct_0202E808 *v0 = sub_0202E808(param0);
UnkStruct_0202E808 *v0 = sub_0202E808(broadcast);
v0->unk_00 = 1;
v0->unk_07 = 0;
@@ -586,9 +586,9 @@ void sub_0206D000(TVBroadcast *param0)
SaveData_SetChecksum(SAVE_TABLE_ENTRY_TV_BROADCAST);
}
void sub_0206D018(TVBroadcast *param0, Pokemon *param1)
void sub_0206D018(TVBroadcast *broadcast, Pokemon *param1)
{
UnkStruct_0202E808 *v0 = sub_0202E808(param0);
UnkStruct_0202E808 *v0 = sub_0202E808(broadcast);
if (v0->unk_07 == 0) {
sub_0206CE38(param1, &v0->unk_02, &v0->unk_04, &v0->unk_05, &v0->unk_06);
@@ -598,9 +598,9 @@ void sub_0206D018(TVBroadcast *param0, Pokemon *param1)
SaveData_SetChecksum(SAVE_TABLE_ENTRY_TV_BROADCAST);
}
void sub_0206D048(TVBroadcast *param0, Pokemon *mon)
void sub_0206D048(TVBroadcast *broadcast, Pokemon *mon)
{
UnkStruct_0202E810 *v0 = sub_0202E810(param0);
UnkStruct_0202E810 *v0 = sub_0202E810(broadcast);
v0->unk_00 = 1;
sub_0206CE38(mon, &v0->unk_02, &v0->unk_04, &v0->unk_05, &v0->unk_06);
@@ -610,9 +610,9 @@ void sub_0206D048(TVBroadcast *param0, Pokemon *mon)
SaveData_SetChecksum(SAVE_TABLE_ENTRY_TV_BROADCAST);
}
void sub_0206D088(TVBroadcast *param0, u8 param1, const TrainerInfo *param2)
void sub_0206D088(TVBroadcast *broadcast, u8 param1, const TrainerInfo *param2)
{
UnkStruct_0202E81C *v0 = sub_0202E81C(param0);
UnkStruct_0202E81C *v0 = sub_0202E81C(broadcast);
v0->unk_00 = 1;
v0->unk_01 = param1;
@@ -626,9 +626,9 @@ void sub_0206D088(TVBroadcast *param0, u8 param1, const TrainerInfo *param2)
SaveData_SetChecksum(SAVE_TABLE_ENTRY_TV_BROADCAST);
}
void sub_0206D0C8(TVBroadcast *param0, u16 param1)
void sub_0206D0C8(TVBroadcast *broadcast, u16 param1)
{
UnkStruct_0202E828 *v0 = sub_0202E828(param0);
UnkStruct_0202E828 *v0 = sub_0202E828(broadcast);
v0->unk_00 = 1;
v0->unk_04 += param1;
@@ -640,17 +640,17 @@ void sub_0206D0C8(TVBroadcast *param0, u16 param1)
SaveData_SetChecksum(SAVE_TABLE_ENTRY_TV_BROADCAST);
}
void sub_0206D0F0(TVBroadcast *param0)
void sub_0206D0F0(TVBroadcast *broadcast)
{
UnkStruct_0202E828 *v0 = sub_0202E828(param0);
UnkStruct_0202E828 *v0 = sub_0202E828(broadcast);
v0->unk_04 = 0;
SaveData_SetChecksum(SAVE_TABLE_ENTRY_TV_BROADCAST);
}
void sub_0206D104(TVBroadcast *param0)
void sub_0206D104(TVBroadcast *broadcast)
{
UnkStruct_0202E834 *v0 = sub_0202E834(param0);
UnkStruct_0202E834 *v0 = sub_0202E834(broadcast);
v0->unk_00 = 1;
v0->unk_02++;
@@ -662,9 +662,9 @@ void sub_0206D104(TVBroadcast *param0)
SaveData_SetChecksum(SAVE_TABLE_ENTRY_TV_BROADCAST);
}
void sub_0206D12C(TVBroadcast *param0)
void sub_0206D12C(TVBroadcast *broadcast)
{
UnkStruct_0202E834 *v0 = sub_0202E834(param0);
UnkStruct_0202E834 *v0 = sub_0202E834(broadcast);
v0->unk_02 = 0;
SaveData_SetChecksum(SAVE_TABLE_ENTRY_TV_BROADCAST);
@@ -987,8 +987,8 @@ void sub_0206D720(FieldSystem *fieldSystem)
{
UnkUnion_0206D1B8 v0;
UnkStruct_0206D75C *v1 = &v0.val10;
TVBroadcast *v2 = SaveData_GetTVBroadcast(fieldSystem->saveData);
UnkStruct_0202E808 *v3 = sub_0202E808(v2);
TVBroadcast *broadcast = SaveData_GetTVBroadcast(fieldSystem->saveData);
UnkStruct_0202E808 *v3 = sub_0202E808(broadcast);
if (v3->unk_07 == 0) {
return;
@@ -1089,7 +1089,7 @@ static BOOL sub_0206D8F0(FieldSystem *fieldSystem, UnkStruct_ov6_022465F4 *param
return Pokedex_HasSeenSpecies(SaveData_GetPokedex(fieldSystem->saveData), v0->unk_00);
}
void sub_0206D90C(TVBroadcast *fieldSystem, Pokemon *param1, u16 param2)
void sub_0206D90C(TVBroadcast *broadcast, Pokemon *param1, u16 param2)
{
return;
}
@@ -1138,7 +1138,7 @@ static int sub_0206D98C(FieldSystem *fieldSystem, StringTemplate *param1, UnkStr
return 31;
}
void sub_0206D9B4(TVBroadcast *param0, Pokemon *param1, u8 param2)
void sub_0206D9B4(TVBroadcast *broadcast, Pokemon *param1, u8 param2)
{
UnkUnion_0206D1B8 v0;
UnkStruct_0206D9F4 *v1 = &v0.val14;
@@ -1147,7 +1147,7 @@ void sub_0206D9B4(TVBroadcast *param0, Pokemon *param1, u8 param2)
v1->unk_05 = MTRNG_Next() % 3;
sub_0206CE38(param1, &v1->unk_00, &v1->unk_02, &v1->unk_03, &v1->unk_04);
sub_0202E43C(param0, 2, 21, (const u8 *)v1);
sub_0202E43C(broadcast, 2, 21, (const u8 *)v1);
}
static int sub_0206D9F4(FieldSystem *fieldSystem, StringTemplate *param1, UnkStruct_ov6_022465F4 *param2)
@@ -3008,13 +3008,13 @@ static const UnkStruct_020EFFA4 Unk_020EFD9C[8] = {
void sub_0206F2F0(SaveData *saveData)
{
TVBroadcast *v0 = SaveData_GetTVBroadcast(saveData);
TVBroadcast *broadcast = SaveData_GetTVBroadcast(saveData);
sub_0206DFE0(saveData);
sub_0206E060(saveData);
sub_0206D0F0(v0);
sub_0206D12C(v0);
sub_0206D0F0(broadcast);
sub_0206D12C(broadcast);
return;
}

View File

@@ -1596,8 +1596,8 @@ void sub_02094C44(UnkStruct_02095C48 *param0, SaveData *saveData, u32 param2, Jo
sub_0206DDB8(param0->saveData, param0->unk_1974, v2);
}
TVBroadcast *v4 = SaveData_GetTVBroadcast(param0->saveData);
sub_0206CF14(v4, param0->unk_1974, param0->unk_00.unk_10F, param0->unk_00.unk_110, param0->unk_00.unk_118[param0->unk_00.unk_113].unk_08 + 1);
TVBroadcast *broadcast = SaveData_GetTVBroadcast(param0->saveData);
sub_0206CF14(broadcast, param0->unk_1974, param0->unk_00.unk_10F, param0->unk_00.unk_110, param0->unk_00.unk_118[param0->unk_00.unk_113].unk_08 + 1);
GameRecords *v5 = SaveData_GetGameRecords(param0->saveData);
GameRecords_IncrementRecordValue(v5, RECORD_UNK_090);

View File

@@ -370,7 +370,7 @@ static BOOL sub_02097F38(FieldTask *param0)
Pokemon *v8;
BallCapsule *v9;
BallSeal *v10;
TVBroadcast *v11;
TVBroadcast *broadcast;
int v12;
int v13;
@@ -386,9 +386,9 @@ static BOOL sub_02097F38(FieldTask *param0)
v10 = BallCapsule_GetBallSeals(v9, 0);
v12 = BallSeal_GetSealType(v10);
v12 = sub_02098164(v12);
v11 = SaveData_GetTVBroadcast(fieldSystem->saveData);
broadcast = SaveData_GetTVBroadcast(fieldSystem->saveData);
sub_0206D9B4(v11, v8, v12);
sub_0206D9B4(broadcast, v8, v12);
}
}
v0->unk_14 = 1;