From c6da03397c660f6ca01124fb30e12a1fa6f29ef9 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Tue, 28 Feb 2023 16:12:30 -0300 Subject: [PATCH] =?UTF-8?q?`sub=5F02074C60`=20=E2=86=92=20`SetBoxMonData`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/unk_02073C2C.h | 2 +- src/overlay005/ov5_021E622C.c | 2 +- src/overlay019/ov19_021D0D80.c | 4 +- src/overlay097/ov97_02236380.c | 122 ++++++++++++++++----------------- src/unk_02073C2C.c | 100 +++++++++++++-------------- src/unk_020797C8.c | 2 +- src/unk_02092494.c | 50 +++++++------- 7 files changed, 141 insertions(+), 141 deletions(-) diff --git a/include/unk_02073C2C.h b/include/unk_02073C2C.h index 339b602032..b9ac77c110 100644 --- a/include/unk_02073C2C.h +++ b/include/unk_02073C2C.h @@ -40,7 +40,7 @@ void sub_020741B8(Pokemon * param0); u32 GetMonData(Pokemon * param0, int param1, void * param2); u32 sub_02074570(BoxPokemon * param0, int param1, void * param2); void sub_02074B30(Pokemon * param0, int param1, const void * param2); -void sub_02074C60(BoxPokemon * param0, int param1, const void * param2); +void SetBoxMonData(BoxPokemon * param0, int param1, const void * param2); void sub_0207536C(Pokemon * param0, int param1, int param2); UnkStruct_02075874 * sub_02075874(int param0, int param1, int param2); UnkStruct_02075874 * sub_02075894(int param0, int param1); diff --git a/src/overlay005/ov5_021E622C.c b/src/overlay005/ov5_021E622C.c index 3e5d63f99e..93f3e4a441 100644 --- a/src/overlay005/ov5_021E622C.c +++ b/src/overlay005/ov5_021E622C.c @@ -2152,7 +2152,7 @@ int ov5_021E6520 (BoxPokemon * param0, u32 param1) v3 = sub_02074570(v1, MON_DATA_EXP, NULL); v3 += param1; - sub_02074C60(v1, 8, (u8 *)&v3); + SetBoxMonData(v1, 8, (u8 *)&v3); v2 = sub_02075B40(v1); Heap_FreeToHeap(v0); diff --git a/src/overlay019/ov19_021D0D80.c b/src/overlay019/ov19_021D0D80.c index 363a2ac561..61c1fd96bc 100644 --- a/src/overlay019/ov19_021D0D80.c +++ b/src/overlay019/ov19_021D0D80.c @@ -4266,7 +4266,7 @@ static void ov19_021D5BAC (UnkStruct_ov19_021D4DF0 * param0) v1 = param0->unk_74.unk_22; v0->unk_0B = v1; - sub_02074C60(v0->unk_00, 11, &(v1)); + SetBoxMonData(v0->unk_00, 11, &(v1)); if ((ov19_021D5E10(param0) == 0) && (ov19_021D5E38(param0) == 1)) { sub_02024804(); @@ -4291,7 +4291,7 @@ static void ov19_021D5BE8 (UnkStruct_ov19_021D4DF0 * param0, u16 param1, UnkStru sub_02079C50(param2->unk_120, 0xffffffff, v1, 6, ¶m1); } - sub_02074C60(v0->unk_00, 6, ¶m1); + SetBoxMonData(v0->unk_00, 6, ¶m1); { int v2 = sub_02074570(v0->unk_00, MON_DATA_SPECIES, NULL); diff --git a/src/overlay097/ov97_02236380.c b/src/overlay097/ov97_02236380.c index 57468f879c..14dfa0f682 100644 --- a/src/overlay097/ov97_02236380.c +++ b/src/overlay097/ov97_02236380.c @@ -1360,12 +1360,12 @@ void ov97_02236E90 (BoxPokemonGBA * param0, BoxPokemon * param1) v0 = sub_02073D20(param1); v1 = GetGBABoxMonData(param0, 0, NULL); - sub_02074C60(param1, 0, (u8 *)&v1); + SetBoxMonData(param1, 0, (u8 *)&v1); v1 = GetGBABoxMonData(param0, 11, NULL); v1 = ov97_02236DD0(v1); - sub_02074C60(param1, 5, (u8 *)&v1); + SetBoxMonData(param1, 5, (u8 *)&v1); v1 = GetGBABoxMonData(param0, 12, NULL); @@ -1373,61 +1373,61 @@ void ov97_02236E90 (BoxPokemonGBA * param0, BoxPokemon * param1) v1 = sub_0207CF10(v1); } - sub_02074C60(param1, 6, (u8 *)&v1); + SetBoxMonData(param1, 6, (u8 *)&v1); v1 = GetGBABoxMonData(param0, 1, NULL); - sub_02074C60(param1, 7, (u8 *)&v1); + SetBoxMonData(param1, 7, (u8 *)&v1); v1 = GetGBABoxMonData(param0, 25, NULL); - sub_02074C60(param1, 8, (u8 *)&v1); + SetBoxMonData(param1, 8, (u8 *)&v1); v1 = 70; - sub_02074C60(param1, 9, (u8 *)&v1); + SetBoxMonData(param1, 9, (u8 *)&v1); v1 = ov97_02236E28(param0, param1); - sub_02074C60(param1, 10, (u8 *)&v1); + SetBoxMonData(param1, 10, (u8 *)&v1); v1 = GetGBABoxMonData(param0, 8, NULL); - sub_02074C60(param1, 11, (u8 *)&v1); + SetBoxMonData(param1, 11, (u8 *)&v1); v4 = GetGBABoxMonData(param0, 3, NULL); - sub_02074C60(param1, 12, (u8 *)&v4); + SetBoxMonData(param1, 12, (u8 *)&v4); v1 = GetGBABoxMonData(param0, 26, NULL); - sub_02074C60(param1, 13, (u8 *)&v1); + SetBoxMonData(param1, 13, (u8 *)&v1); v1 = GetGBABoxMonData(param0, 27, NULL); - sub_02074C60(param1, 14, (u8 *)&v1); + SetBoxMonData(param1, 14, (u8 *)&v1); v1 = GetGBABoxMonData(param0, 28, NULL); - sub_02074C60(param1, 15, (u8 *)&v1); + SetBoxMonData(param1, 15, (u8 *)&v1); v1 = GetGBABoxMonData(param0, 29, NULL); - sub_02074C60(param1, 16, (u8 *)&v1); + SetBoxMonData(param1, 16, (u8 *)&v1); v1 = GetGBABoxMonData(param0, 30, NULL); - sub_02074C60(param1, 17, (u8 *)&v1); + SetBoxMonData(param1, 17, (u8 *)&v1); v1 = GetGBABoxMonData(param0, 31, NULL); - sub_02074C60(param1, 18, (u8 *)&v1); + SetBoxMonData(param1, 18, (u8 *)&v1); v1 = GetGBABoxMonData(param0, 22, NULL); - sub_02074C60(param1, 19, (u8 *)&v1); + SetBoxMonData(param1, 19, (u8 *)&v1); v1 = GetGBABoxMonData(param0, 23, NULL); - sub_02074C60(param1, 20, (u8 *)&v1); + SetBoxMonData(param1, 20, (u8 *)&v1); v1 = GetGBABoxMonData(param0, 24, NULL); - sub_02074C60(param1, 21, (u8 *)&v1); + SetBoxMonData(param1, 21, (u8 *)&v1); v1 = GetGBABoxMonData(param0, 33, NULL); - sub_02074C60(param1, 22, (u8 *)&v1); + SetBoxMonData(param1, 22, (u8 *)&v1); v1 = GetGBABoxMonData(param0, 47, NULL); - sub_02074C60(param1, 23, (u8 *)&v1); + SetBoxMonData(param1, 23, (u8 *)&v1); v1 = GetGBABoxMonData(param0, 48, NULL); - sub_02074C60(param1, 24, (u8 *)&v1); + SetBoxMonData(param1, 24, (u8 *)&v1); for (v2 = 0; v2 < 4; v2++) { v1 = GetGBABoxMonData(param0, 13 + v2, NULL); @@ -1436,44 +1436,44 @@ void ov97_02236E90 (BoxPokemonGBA * param0, BoxPokemon * param1) (void)0; } - sub_02074C60(param1, 54 + v2, (u8 *)&v1); + SetBoxMonData(param1, 54 + v2, (u8 *)&v1); v1 = GetGBABoxMonData(param0, 21, NULL); v1 = (v1 & (0x3 << (v2 * 2))) >> (v2 * 2); - sub_02074C60(param1, 62 + v2, (u8 *)&v1); + SetBoxMonData(param1, 62 + v2, (u8 *)&v1); v1 = sub_02074570(param1, 66 + v2, NULL); - sub_02074C60(param1, 58 + v2, (u8 *)&v1); + SetBoxMonData(param1, 58 + v2, (u8 *)&v1); } v1 = GetGBABoxMonData(param0, 39, NULL); - sub_02074C60(param1, 70, (u8 *)&v1); + SetBoxMonData(param1, 70, (u8 *)&v1); v1 = GetGBABoxMonData(param0, 40, NULL); - sub_02074C60(param1, 71, (u8 *)&v1); + SetBoxMonData(param1, 71, (u8 *)&v1); v1 = GetGBABoxMonData(param0, 41, NULL); - sub_02074C60(param1, 72, (u8 *)&v1); + SetBoxMonData(param1, 72, (u8 *)&v1); v1 = GetGBABoxMonData(param0, 42, NULL); - sub_02074C60(param1, 73, (u8 *)&v1); + SetBoxMonData(param1, 73, (u8 *)&v1); v1 = GetGBABoxMonData(param0, 43, NULL); - sub_02074C60(param1, 74, (u8 *)&v1); + SetBoxMonData(param1, 74, (u8 *)&v1); v1 = GetGBABoxMonData(param0, 44, NULL); - sub_02074C60(param1, 75, (u8 *)&v1); + SetBoxMonData(param1, 75, (u8 *)&v1); v1 = GetGBABoxMonData(param0, 45, NULL); - sub_02074C60(param1, 76, (u8 *)&v1); + SetBoxMonData(param1, 76, (u8 *)&v1); v3 = GetGBABoxMonData(param0, 50, NULL); if (v3 <= 4) { for (v2 = 0; v2 < v3; v2++) { v1 = 1; - sub_02074C60(param1, 78 + v2, (u8 *)&v1); + SetBoxMonData(param1, 78 + v2, (u8 *)&v1); } } @@ -1482,7 +1482,7 @@ void ov97_02236E90 (BoxPokemonGBA * param0, BoxPokemon * param1) if (v3 <= 4) { for (v2 = 0; v2 < v3; v2++) { v1 = 1; - sub_02074C60(param1, 82 + v2, (u8 *)&v1); + SetBoxMonData(param1, 82 + v2, (u8 *)&v1); } } @@ -1491,7 +1491,7 @@ void ov97_02236E90 (BoxPokemonGBA * param0, BoxPokemon * param1) if (v3 <= 4) { for (v2 = 0; v2 < v3; v2++) { v1 = 1; - sub_02074C60(param1, 86 + v2, (u8 *)&v1); + SetBoxMonData(param1, 86 + v2, (u8 *)&v1); } } @@ -1500,7 +1500,7 @@ void ov97_02236E90 (BoxPokemonGBA * param0, BoxPokemon * param1) if (v3 <= 4) { for (v2 = 0; v2 < v3; v2++) { v1 = 1; - sub_02074C60(param1, 90 + v2, (u8 *)&v1); + SetBoxMonData(param1, 90 + v2, (u8 *)&v1); } } @@ -1509,57 +1509,57 @@ void ov97_02236E90 (BoxPokemonGBA * param0, BoxPokemon * param1) if (v3 <= 4) { for (v2 = 0; v2 < v3; v2++) { v1 = 1; - sub_02074C60(param1, 94 + v2, (u8 *)&v1); + SetBoxMonData(param1, 94 + v2, (u8 *)&v1); } } v1 = GetGBABoxMonData(param0, 67, NULL); - sub_02074C60(param1, 98, (u8 *)&v1); + SetBoxMonData(param1, 98, (u8 *)&v1); v1 = GetGBABoxMonData(param0, 68, NULL); - sub_02074C60(param1, 99, (u8 *)&v1); + SetBoxMonData(param1, 99, (u8 *)&v1); v1 = GetGBABoxMonData(param0, 69, NULL); - sub_02074C60(param1, 100, (u8 *)&v1); + SetBoxMonData(param1, 100, (u8 *)&v1); v1 = GetGBABoxMonData(param0, 70, NULL); - sub_02074C60(param1, 101, (u8 *)&v1); + SetBoxMonData(param1, 101, (u8 *)&v1); v1 = GetGBABoxMonData(param0, 71, NULL); - sub_02074C60(param1, 102, (u8 *)&v1); + SetBoxMonData(param1, 102, (u8 *)&v1); v1 = GetGBABoxMonData(param0, 72, NULL); - sub_02074C60(param1, 103, (u8 *)&v1); + SetBoxMonData(param1, 103, (u8 *)&v1); v1 = GetGBABoxMonData(param0, 73, NULL); - sub_02074C60(param1, 104, (u8 *)&v1); + SetBoxMonData(param1, 104, (u8 *)&v1); v1 = GetGBABoxMonData(param0, 74, NULL); - sub_02074C60(param1, 105, (u8 *)&v1); + SetBoxMonData(param1, 105, (u8 *)&v1); v1 = GetGBABoxMonData(param0, 75, NULL); - sub_02074C60(param1, 106, (u8 *)&v1); + SetBoxMonData(param1, 106, (u8 *)&v1); v1 = GetGBABoxMonData(param0, 76, NULL); - sub_02074C60(param1, 107, (u8 *)&v1); + SetBoxMonData(param1, 107, (u8 *)&v1); v1 = GetGBABoxMonData(param0, 77, NULL); - sub_02074C60(param1, 108, (u8 *)&v1); + SetBoxMonData(param1, 108, (u8 *)&v1); v1 = GetGBABoxMonData(param0, 78, NULL); - sub_02074C60(param1, 109, (u8 *)&v1); + SetBoxMonData(param1, 109, (u8 *)&v1); v1 = GetGBABoxMonData(param0, 80, NULL); - sub_02074C60(param1, 110, (u8 *)&v1); + SetBoxMonData(param1, 110, (u8 *)&v1); v1 = sub_02075D74(param1); - sub_02074C60(param1, 111, (u8 *)&v1); + SetBoxMonData(param1, 111, (u8 *)&v1); if (sub_02074570(param1, MON_DATA_SPECIES, NULL) == 201) { v1 = GetGBABoxMonData(param0, 0, NULL); v1 = (((v1 & 0x3000000) >> 18) | ((v1 & 0x30000) >> 12) | ((v1 & 0x300) >> 6) | (v1 & 0x3)) % 28; - sub_02074C60(param1, 112, (u8 *)&v1); + SetBoxMonData(param1, 112, (u8 *)&v1); } if (sub_02074570(param1, MON_DATA_SPECIES, NULL) == 386) { @@ -1580,40 +1580,40 @@ void ov97_02236E90 (BoxPokemonGBA * param0, BoxPokemon * param1) break; } - sub_02074C60(param1, 112, (u8 *)&v1); + SetBoxMonData(param1, 112, (u8 *)&v1); } GetGBABoxMonData(param0, 2, &v5[0]); ov97_0223936C(&v5[0], &v6[0], 12, v4); - sub_02074C60(param1, 118, &v6[0]); + SetBoxMonData(param1, 118, &v6[0]); if (GetGBABoxMonData(param0, 3, NULL) != Unk_020E4C44) { v1 = 1; - sub_02074C60(param1, 77, &v1); + SetBoxMonData(param1, 77, &v1); } v1 = GetGBABoxMonData(param0, 37, NULL); - sub_02074C60(param1, 122, &v1); + SetBoxMonData(param1, 122, &v1); GetGBABoxMonData(param0, 7, &v5[0]); ov97_0223936C(&v5[0], &v6[0], 8, v4); - sub_02074C60(param1, 144, &v6[0]); + SetBoxMonData(param1, 144, &v6[0]); v1 = GetGBABoxMonData(param0, 35, NULL); - sub_02074C60(param1, 153, &v1); + SetBoxMonData(param1, 153, &v1); v1 = GetGBABoxMonData(param0, 34, NULL); - sub_02074C60(param1, 154, &v1); + SetBoxMonData(param1, 154, &v1); v1 = GetGBABoxMonData(param0, 38, NULL); - sub_02074C60(param1, 155, &v1); + SetBoxMonData(param1, 155, &v1); v1 = GetGBABoxMonData(param0, 36, NULL); - sub_02074C60(param1, 156, &v1); + SetBoxMonData(param1, 156, &v1); v1 = GetGBABoxMonData(param0, 49, NULL); - sub_02074C60(param1, 157, &v1); + SetBoxMonData(param1, 157, &v1); sub_02073D48(param1, v0); } diff --git a/src/unk_02073C2C.c b/src/unk_02073C2C.c index dc006ca31f..4e5dcef87b 100644 --- a/src/unk_02073C2C.c +++ b/src/unk_02073C2C.c @@ -135,7 +135,7 @@ u32 sub_02074570(BoxPokemon * param0, int param1, void * param2); static u32 sub_020745D0(BoxPokemon * param0, int param1, void * param2); void sub_02074B30(Pokemon * param0, int param1, const void * param2); static void sub_02074BC0(Pokemon * param0, int param1, const void * param2); -void sub_02074C60(BoxPokemon * param0, int param1, const void * param2); +void SetBoxMonData(BoxPokemon * param0, int param1, const void * param2); static void sub_02074CD8(BoxPokemon * param0, int param1, const void * param2); void sub_0207536C(Pokemon * param0, int param1, int param2); static void sub_020753F4(Pokemon * param0, int param1, int param2); @@ -387,7 +387,7 @@ void sub_02073E18 (BoxPokemon * param0, int param1, int param2, int param3, int param5 = (sub_0201D2E8() | (sub_0201D2E8() << 16)); } - sub_02074C60(param0, 0, (u8 *)¶m5); + SetBoxMonData(param0, 0, (u8 *)¶m5); if (param6 == 2) { do { @@ -397,50 +397,50 @@ void sub_02073E18 (BoxPokemon * param0, int param1, int param2, int param3, int param7 = 0; } - sub_02074C60(param0, 7, (u8 *)¶m7); - sub_02074C60(param0, 12, (u8 *)&Unk_020E4C44); - sub_02074C60(param0, 5, (u8 *)¶m1); - sub_02074C60(param0, 179, NULL); + SetBoxMonData(param0, 7, (u8 *)¶m7); + SetBoxMonData(param0, 12, (u8 *)&Unk_020E4C44); + SetBoxMonData(param0, 5, (u8 *)¶m1); + SetBoxMonData(param0, 179, NULL); v1 = sub_02075AD0(param1, param2); - sub_02074C60(param0, 8, (u8 *)&v1); + SetBoxMonData(param0, 8, (u8 *)&v1); v1 = sub_020759F0(param1, 20); - sub_02074C60(param0, 9, (u8 *)&v1); + SetBoxMonData(param0, 9, (u8 *)&v1); - sub_02074C60(param0, 156, (u8 *)¶m2); - sub_02074C60(param0, 122, (u8 *)&Unk_020E4C40); + SetBoxMonData(param0, 156, (u8 *)¶m2); + SetBoxMonData(param0, 122, (u8 *)&Unk_020E4C40); v1 = 4; - sub_02074C60(param0, 155, (u8 *)&v1); + SetBoxMonData(param0, 155, (u8 *)&v1); if (param3 < 32) { - sub_02074C60(param0, 70, (u8 *)¶m3); - sub_02074C60(param0, 71, (u8 *)¶m3); - sub_02074C60(param0, 72, (u8 *)¶m3); - sub_02074C60(param0, 73, (u8 *)¶m3); - sub_02074C60(param0, 74, (u8 *)¶m3); - sub_02074C60(param0, 75, (u8 *)¶m3); + SetBoxMonData(param0, 70, (u8 *)¶m3); + SetBoxMonData(param0, 71, (u8 *)¶m3); + SetBoxMonData(param0, 72, (u8 *)¶m3); + SetBoxMonData(param0, 73, (u8 *)¶m3); + SetBoxMonData(param0, 74, (u8 *)¶m3); + SetBoxMonData(param0, 75, (u8 *)¶m3); } else { v1 = sub_0201D2E8(); v2 = (v1 & (0x1f << 0)) >> 0; - sub_02074C60(param0, 70, (u8 *)&v2); + SetBoxMonData(param0, 70, (u8 *)&v2); v2 = (v1 & (0x1f << 5)) >> 5; - sub_02074C60(param0, 71, (u8 *)&v2); + SetBoxMonData(param0, 71, (u8 *)&v2); v2 = (v1 & (0x1f << 10)) >> 10; - sub_02074C60(param0, 72, (u8 *)&v2); + SetBoxMonData(param0, 72, (u8 *)&v2); v1 = sub_0201D2E8(); v2 = (v1 & (0x1f << 0)) >> 0; - sub_02074C60(param0, 73, (u8 *)&v2); + SetBoxMonData(param0, 73, (u8 *)&v2); v2 = (v1 & (0x1f << 5)) >> 5; - sub_02074C60(param0, 74, (u8 *)&v2); + SetBoxMonData(param0, 74, (u8 *)&v2); v2 = (v1 & (0x1f << 10)) >> 10; - sub_02074C60(param0, 75, (u8 *)&v2); + SetBoxMonData(param0, 75, (u8 *)&v2); } v1 = sub_020759F0(param1, 24); @@ -448,17 +448,17 @@ void sub_02073E18 (BoxPokemon * param0, int param1, int param2, int param3, int if (v2 != 0) { if (param5 & 1) { - sub_02074C60(param0, 10, (u8 *)&v2); + SetBoxMonData(param0, 10, (u8 *)&v2); } else { - sub_02074C60(param0, 10, (u8 *)&v1); + SetBoxMonData(param0, 10, (u8 *)&v1); } } else { - sub_02074C60(param0, 10, (u8 *)&v1); + SetBoxMonData(param0, 10, (u8 *)&v1); } v1 = sub_02075D74(param0); - sub_02074C60(param0, 111, (u8 *)&v1); + SetBoxMonData(param0, 111, (u8 *)&v1); sub_02077020(param0); sub_02073D48(param0, v3); } @@ -1208,7 +1208,7 @@ static void sub_02074BC0 (Pokemon * param0, int param1, const void * param2) } } -void sub_02074C60 (BoxPokemon * param0, int param1, const void * param2) +void SetBoxMonData (BoxPokemon * param0, int param1, const void * param2) { u16 v0; @@ -3570,9 +3570,9 @@ void sub_02077144 (BoxPokemon * param0, u16 param1) v3[3] = 0; for (v0 = 0; v0 < 4; v0++) { - sub_02074C60(param0, 54 + v0, (u8 *)&v1[v0]); - sub_02074C60(param0, 58 + v0, (u8 *)&v2[v0]); - sub_02074C60(param0, 62 + v0, (u8 *)&v3[v0]); + SetBoxMonData(param0, 54 + v0, (u8 *)&v1[v0]); + SetBoxMonData(param0, 58 + v0, (u8 *)&v2[v0]); + SetBoxMonData(param0, 62 + v0, (u8 *)&v3[v0]); } sub_02073D48(param0, v4); @@ -3603,12 +3603,12 @@ void sub_02077238 (BoxPokemon * param0, u16 param1, u8 param2) u8 v0; u8 v1; - sub_02074C60(param0, 54 + param2, (u8 *)¶m1); + SetBoxMonData(param0, 54 + param2, (u8 *)¶m1); v1 = sub_02074570(param0, 62 + param2, NULL); v0 = MoveTable_GetMoveMaxPP(param1, v1); - sub_02074C60(param0, 58 + param2, (u8 *)&v0); + SetBoxMonData(param0, 58 + param2, (u8 *)&v0); } u16 sub_0207727C (Pokemon * param0, int * param1, u16 * param2) @@ -3669,12 +3669,12 @@ void sub_0207734C (BoxPokemon * param0, int param1, int param2) v1[1] = sub_02074570(param0, 58 + param2, NULL); v2[1] = sub_02074570(param0, 62 + param2, NULL); - sub_02074C60(param0, 54 + param1, (u8 *)&v0[1]); - sub_02074C60(param0, 58 + param1, (u8 *)&v1[1]); - sub_02074C60(param0, 62 + param1, (u8 *)&v2[1]); - sub_02074C60(param0, 54 + param2, (u8 *)&v0[0]); - sub_02074C60(param0, 58 + param2, (u8 *)&v1[0]); - sub_02074C60(param0, 62 + param2, (u8 *)&v2[0]); + SetBoxMonData(param0, 54 + param1, (u8 *)&v0[1]); + SetBoxMonData(param0, 58 + param1, (u8 *)&v1[1]); + SetBoxMonData(param0, 62 + param1, (u8 *)&v2[1]); + SetBoxMonData(param0, 54 + param2, (u8 *)&v0[0]); + SetBoxMonData(param0, 58 + param2, (u8 *)&v1[0]); + SetBoxMonData(param0, 62 + param2, (u8 *)&v2[0]); } void sub_02077408 (Pokemon * param0, u32 param1) @@ -4032,7 +4032,7 @@ void sub_02077930 (BoxPokemon * param0) if ((v0 == 493) && (v1 == 121)) { v3 = sub_02077988(Item_GetAttribute(v2, 1, 0)); - sub_02074C60(param0, 112, &v3); + SetBoxMonData(param0, 112, &v3); } } @@ -4122,7 +4122,7 @@ int sub_02077A1C (BoxPokemon * param0) if (v0 == 487) { v2 = (v1 == 112) ? 1 : 0; - sub_02074C60(param0, 112, &v2); + SetBoxMonData(param0, 112, &v2); sub_02078044(param0); return v2; @@ -4136,7 +4136,7 @@ void sub_02077A64 (Pokemon * param0) int v0 = 1; if (GetMonData(param0, MON_DATA_SPECIES, NULL) == 487) { - sub_02074C60(¶m0->box, 112, &v0); + SetBoxMonData(¶m0->box, 112, &v0); sub_02078044(¶m0->box); sub_0207418C(param0); } @@ -4175,7 +4175,7 @@ void SetBoxShayminForm (BoxPokemon * param0, int param1) if (v0 == 492) { GF_ASSERT(param1 <= 1); - sub_02074C60(param0, 112, ¶m1); + SetBoxMonData(param0, 112, ¶m1); sub_02078044(param0); } } @@ -4391,9 +4391,9 @@ void sub_02077E64 (Pokemon * param0, UnkStruct_02025E6C * param1, int param2, in void sub_02077EA4 (BoxPokemon * param0, UnkStruct_02025E6C * param1, int param2, int param3, int param4, int param5) { sub_0209305C(param0, param1, 0, param3, param5); - sub_02074C60(param0, 122, &Unk_020E4C40); - sub_02074C60(param0, 155, ¶m2); - sub_02074C60(param0, 158, ¶m4); + SetBoxMonData(param0, 122, &Unk_020E4C40); + SetBoxMonData(param0, 155, ¶m2); + SetBoxMonData(param0, 158, ¶m4); } void sub_02077EE4 (Pokemon * param0, UnkStruct_02025E6C * param1, int param2, int param3, int param4, int param5) @@ -4508,12 +4508,12 @@ void sub_02078044 (BoxPokemon * param0) if (v4 != 0) { if (v5 & 1) { - sub_02074C60(param0, 10, (u8 *)&v4); + SetBoxMonData(param0, 10, (u8 *)&v4); } else { - sub_02074C60(param0, 10, (u8 *)&v3); + SetBoxMonData(param0, 10, (u8 *)&v3); } } else { - sub_02074C60(param0, 10, (u8 *)&v3); + SetBoxMonData(param0, 10, (u8 *)&v3); } sub_02073D48(param0, v0); @@ -5295,7 +5295,7 @@ void sub_0207896C (BoxPokemon * param0) if (sub_02074570(param0, MON_DATA_MOVE1 + v1, NULL)) { u8 v2 = sub_02074570(param0, 66 + v1, NULL); - sub_02074C60(param0, 58 + v1, &v2); + SetBoxMonData(param0, 58 + v1, &v2); } } diff --git a/src/unk_020797C8.c b/src/unk_020797C8.c index b56c7314db..fb2ac1d7ed 100644 --- a/src/unk_020797C8.c +++ b/src/unk_020797C8.c @@ -371,7 +371,7 @@ void sub_02079C50 (UnkStruct_020797DC * param0, u32 param1, u32 param2, int para param1 = param0->unk_00; } - sub_02074C60((BoxPokemon *)(¶m0->unk_04[param1][param2]), param3, param4); + SetBoxMonData((BoxPokemon *)(¶m0->unk_04[param1][param2]), param3, param4); sub_02024804(); } diff --git a/src/unk_02092494.c b/src/unk_02092494.c index 5f97a68e5a..22ba9cd3c6 100644 --- a/src/unk_02092494.c +++ b/src/unk_02092494.c @@ -805,16 +805,16 @@ void sub_0209305C (BoxPokemon * param0, UnkStruct_02025E6C * param1, int param2, int v0; v0 = sub_02074570(param0, MON_DATA_153, NULL); - sub_02074C60(param0, 152, &v0); + SetBoxMonData(param0, 152, &v0); v0 = sub_02074570(param0, MON_DATA_149, NULL); - sub_02074C60(param0, 146, &v0); + SetBoxMonData(param0, 146, &v0); v0 = sub_02074570(param0, MON_DATA_150, NULL); - sub_02074C60(param0, 147, &v0); + SetBoxMonData(param0, 147, &v0); v0 = sub_02074570(param0, MON_DATA_151, NULL); - sub_02074C60(param0, 148, &v0); + SetBoxMonData(param0, 148, &v0); } } @@ -830,9 +830,9 @@ static void sub_020932A4 (BoxPokemon * param0, UnkStruct_02025E6C * param1, int int v1 = sub_02025F30(param1); UnkStruct_02023790 * v2 = sub_02025F04(param1, param2); - sub_02074C60(param0, 7, &v0); - sub_02074C60(param0, 157, &v1); - sub_02074C60(param0, 145, v2); + SetBoxMonData(param0, 7, &v0); + SetBoxMonData(param0, 157, &v1); + SetBoxMonData(param0, 145, v2); sub_020237BC(v2); } @@ -843,15 +843,15 @@ static void sub_020932F0 (BoxPokemon * param0, int param1, int param2) sub_020138A4(&v0); if (param2 == 0) { - sub_02074C60(param0, 152, ¶m1); - sub_02074C60(param0, 146, &v0.year); - sub_02074C60(param0, 147, &v0.month); - sub_02074C60(param0, 148, &v0.day); + SetBoxMonData(param0, 152, ¶m1); + SetBoxMonData(param0, 146, &v0.year); + SetBoxMonData(param0, 147, &v0.month); + SetBoxMonData(param0, 148, &v0.day); } else { - sub_02074C60(param0, 153, ¶m1); - sub_02074C60(param0, 149, &v0.year); - sub_02074C60(param0, 150, &v0.month); - sub_02074C60(param0, 151, &v0.day); + SetBoxMonData(param0, 153, ¶m1); + SetBoxMonData(param0, 149, &v0.year); + SetBoxMonData(param0, 150, &v0.month); + SetBoxMonData(param0, 151, &v0.day); } } @@ -860,26 +860,26 @@ static void sub_02093368 (BoxPokemon * param0, int param1) int v0 = 0; if (param1 == 0) { - sub_02074C60(param0, 152, &v0); - sub_02074C60(param0, 146, &v0); - sub_02074C60(param0, 147, &v0); - sub_02074C60(param0, 148, &v0); + SetBoxMonData(param0, 152, &v0); + SetBoxMonData(param0, 146, &v0); + SetBoxMonData(param0, 147, &v0); + SetBoxMonData(param0, 148, &v0); } else { - sub_02074C60(param0, 153, &v0); - sub_02074C60(param0, 149, &v0); - sub_02074C60(param0, 150, &v0); - sub_02074C60(param0, 151, &v0); + SetBoxMonData(param0, 153, &v0); + SetBoxMonData(param0, 149, &v0); + SetBoxMonData(param0, 150, &v0); + SetBoxMonData(param0, 151, &v0); } } static void sub_020933C8 (BoxPokemon * param0) { int v0 = sub_02074570(param0, MON_DATA_161, NULL); - sub_02074C60(param0, 156, &v0); + SetBoxMonData(param0, 156, &v0); } static void sub_020933E8 (BoxPokemon * param0) { int v0 = 1; - sub_02074C60(param0, 110, &v0); + SetBoxMonData(param0, 110, &v0); }