From 952789578727c5cecbc61d0ad490b57819618783 Mon Sep 17 00:00:00 2001 From: Fexty12573 Date: Thu, 6 Jun 2024 13:40:43 +0200 Subject: [PATCH 1/7] struct/unk 02025E5C -> Playtime --- include/journal.h | 6 +++--- include/playtime.h | 12 ++++++++++++ include/struct_decls/playtime_decl.h | 6 ++++++ include/struct_decls/struct_02025E5C_decl.h | 6 ------ include/struct_defs/playtime.h | 10 ++++++++++ include/struct_defs/struct_02025E5C.h | 10 ---------- include/struct_defs/struct_0203E234.h | 4 ++-- include/struct_defs/struct_02072014.h | 4 ++-- include/unk_02017428.h | 4 ++-- include/unk_02025E08.h | 4 ++-- include/unk_0202CBE4.h | 12 ------------ platinum.us/main.lsf | 2 +- src/journal.c | 8 ++++---- src/meson.build | 2 +- src/overlay005/ov5_021E1D20.c | 6 +++--- src/overlay061/ov61_0222B008.c | 4 ++-- src/overlay062/ov62_0223CAEC.c | 2 +- src/overlay071/ov71_0223C69C.c | 2 +- src/overlay086/ov86_0223B140.c | 2 +- src/overlay097/ov97_0222AE60.c | 6 +++--- src/{unk_0202CBE4.c => playtime.c} | 15 +++++++-------- src/unk_02017428.c | 8 ++++---- src/unk_02025E08.c | 8 ++++---- src/unk_02071D40.c | 10 +++++----- 24 files changed, 76 insertions(+), 77 deletions(-) create mode 100644 include/playtime.h create mode 100644 include/struct_decls/playtime_decl.h delete mode 100644 include/struct_decls/struct_02025E5C_decl.h create mode 100644 include/struct_defs/playtime.h delete mode 100644 include/struct_defs/struct_02025E5C.h delete mode 100644 include/unk_0202CBE4.h rename src/{unk_0202CBE4.c => playtime.c} (69%) diff --git a/include/journal.h b/include/journal.h index 32df201109..1ba96b27db 100644 --- a/include/journal.h +++ b/include/journal.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_JOURNAL_H #define POKEPLATINUM_JOURNAL_H -#include "struct_decls/struct_02025E5C_decl.h" +#include "struct_decls/playtime_decl.h" #include "trainer_info.h" #include "savedata.h" @@ -36,8 +36,8 @@ void * sub_0202BE00(u8 param0, u16 param1, u32 param2); void * sub_0202BE14(u32 param0); void * sub_0202BE20(u32 param0); void * sub_0202BE2C(u32 param0, u32 param1); -void * sub_0202BE4C(const UnkStruct_02025E5C * param0, u16 param1, u8 param2, u8 param3, u32 param4); -void * sub_0202BECC(const UnkStruct_02025E5C * param0, u16 param1, u8 param2, u8 param3, u32 param4); +void * sub_0202BE4C(const Playtime * param0, u16 param1, u8 param2, u8 param3, u32 param4); +void * sub_0202BECC(const Playtime * param0, u16 param1, u8 param2, u8 param3, u32 param4); void * sub_0202BF4C(u16 param0, u16 param1, u32 param2); void * sub_0202BFCC(u16 * param0, u8 param1, u8 param2, u32 param3); void * sub_0202C00C(u16 * param0, u8 param1, u8 param2, u32 param3); diff --git a/include/playtime.h b/include/playtime.h new file mode 100644 index 0000000000..501712ebc9 --- /dev/null +++ b/include/playtime.h @@ -0,0 +1,12 @@ +#ifndef POKEPLATINUM_PLAYTIME_H +#define POKEPLATINUM_PLAYTIME_H + +#include "struct_decls/playtime_decl.h" + +void sub_0202CBE4(Playtime * param0); +void sub_0202CBF0(Playtime * param0, u32 param1); +u16 sub_0202CC58(const Playtime * param0); +u8 sub_0202CC5C(const Playtime * param0); +u8 sub_0202CC60(const Playtime * param0); + +#endif // POKEPLATINUM_PLAYTIME_H diff --git a/include/struct_decls/playtime_decl.h b/include/struct_decls/playtime_decl.h new file mode 100644 index 0000000000..9e3e2bf958 --- /dev/null +++ b/include/struct_decls/playtime_decl.h @@ -0,0 +1,6 @@ +#ifndef POKEPLATINUM_STRUCT_PLAYTIME_DECL_H +#define POKEPLATINUM_STRUCT_PLAYTIME_DECL_H + +typedef struct Playtime Playtime; + +#endif // POKEPLATINUM_STRUCT_PLAYTIME_DECL_H diff --git a/include/struct_decls/struct_02025E5C_decl.h b/include/struct_decls/struct_02025E5C_decl.h deleted file mode 100644 index f3fb598274..0000000000 --- a/include/struct_decls/struct_02025E5C_decl.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_02025E5C_DECL_H -#define POKEPLATINUM_STRUCT_02025E5C_DECL_H - -typedef struct UnkStruct_02025E5C_t UnkStruct_02025E5C; - -#endif // POKEPLATINUM_STRUCT_02025E5C_DECL_H diff --git a/include/struct_defs/playtime.h b/include/struct_defs/playtime.h new file mode 100644 index 0000000000..f627a5de5f --- /dev/null +++ b/include/struct_defs/playtime.h @@ -0,0 +1,10 @@ +#ifndef POKEPLATINUM_STRUCT_PLAYTIME_H +#define POKEPLATINUM_STRUCT_PLAYTIME_H + +typedef struct Playtime { + u16 unk_00; + u8 unk_02; + u8 unk_03; +} Playtime; + +#endif // POKEPLATINUM_STRUCT_PLAYTIME_H diff --git a/include/struct_defs/struct_02025E5C.h b/include/struct_defs/struct_02025E5C.h deleted file mode 100644 index 648834fd3a..0000000000 --- a/include/struct_defs/struct_02025E5C.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_02025E5C_H -#define POKEPLATINUM_STRUCT_02025E5C_H - -typedef struct UnkStruct_02025E5C_t { - u16 unk_00; - u8 unk_02; - u8 unk_03; -} UnkStruct_02025E5C; - -#endif // POKEPLATINUM_STRUCT_02025E5C_H diff --git a/include/struct_defs/struct_0203E234.h b/include/struct_defs/struct_0203E234.h index cbb53d3e02..f441ad6626 100644 --- a/include/struct_defs/struct_0203E234.h +++ b/include/struct_defs/struct_0203E234.h @@ -1,14 +1,14 @@ #ifndef POKEPLATINUM_STRUCT_0203E234_H #define POKEPLATINUM_STRUCT_0203E234_H -#include "struct_decls/struct_02025E5C_decl.h" +#include "struct_decls/playtime_decl.h" #include "trainer_info.h" #include "struct_decls/struct_party_decl.h" typedef struct { const TrainerInfo * unk_00; const Party * unk_04; - const UnkStruct_02025E5C * unk_08; + const Playtime * unk_08; } UnkStruct_0203E234; #endif // POKEPLATINUM_STRUCT_0203E234_H diff --git a/include/struct_defs/struct_02072014.h b/include/struct_defs/struct_02072014.h index 3e7f344ec3..3ff4919289 100644 --- a/include/struct_defs/struct_02072014.h +++ b/include/struct_defs/struct_02072014.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_02072014_H #define POKEPLATINUM_STRUCT_02072014_H -#include "struct_decls/struct_02025E5C_decl.h" +#include "struct_decls/playtime_decl.h" #include "struct_defs/struct_02072014_sub1.h" typedef struct { @@ -17,7 +17,7 @@ typedef struct { u8 unk_05; u8 padding_06[2]; u16 unk_08[8]; - const UnkStruct_02025E5C * unk_18; + const Playtime * unk_18; u32 unk_1C; u32 unk_20; u32 unk_24; diff --git a/include/unk_02017428.h b/include/unk_02017428.h index c35c147886..483b50c0c4 100644 --- a/include/unk_02017428.h +++ b/include/unk_02017428.h @@ -1,10 +1,10 @@ #ifndef POKEPLATINUM_UNK_02017428_H #define POKEPLATINUM_UNK_02017428_H -#include "struct_decls/struct_02025E5C_decl.h" +#include "struct_decls/playtime_decl.h" void sub_02017428(void); -void sub_02017434(UnkStruct_02025E5C * param0); +void sub_02017434(Playtime * param0); void sub_02017458(void); #endif // POKEPLATINUM_UNK_02017428_H diff --git a/include/unk_02025E08.h b/include/unk_02025E08.h index 47080cf6e3..19e153cce3 100644 --- a/include/unk_02025E08.h +++ b/include/unk_02025E08.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_UNK_02025E08_H #include "struct_decls/struct_02025E0C_decl.h" -#include "struct_decls/struct_02025E5C_decl.h" +#include "struct_decls/playtime_decl.h" #include "trainer_info.h" #include "game_options.h" #include "savedata.h" @@ -12,6 +12,6 @@ void Player_Init(UnkStruct_02025E0C * param0); TrainerInfo * SaveData_GetTrainerInfo(SaveData * param0); Options * SaveData_Options(SaveData * param0); u16 * sub_02025E50(SaveData * param0); -UnkStruct_02025E5C * sub_02025E5C(SaveData * param0); +Playtime * sub_02025E5C(SaveData * param0); #endif // POKEPLATINUM_UNK_02025E08_H diff --git a/include/unk_0202CBE4.h b/include/unk_0202CBE4.h deleted file mode 100644 index 50bdc6686f..0000000000 --- a/include/unk_0202CBE4.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef POKEPLATINUM_UNK_0202CBE4_H -#define POKEPLATINUM_UNK_0202CBE4_H - -#include "struct_decls/struct_02025E5C_decl.h" - -void sub_0202CBE4(UnkStruct_02025E5C * param0); -void sub_0202CBF0(UnkStruct_02025E5C * param0, u32 param1); -u16 sub_0202CC58(const UnkStruct_02025E5C * param0); -u8 sub_0202CC5C(const UnkStruct_02025E5C * param0); -u8 sub_0202CC60(const UnkStruct_02025E5C * param0); - -#endif // POKEPLATINUM_UNK_0202CBE4_H diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf index df3507e8bc..0ccd6b1df8 100644 --- a/platinum.us/main.lsf +++ b/platinum.us/main.lsf @@ -126,7 +126,7 @@ Static main Object main.nef.p/src_unk_0202C7FC.c.o Object main.nef.p/src_unk_0202C858.c.o Object main.nef.p/src_unk_0202C9F4.c.o - Object main.nef.p/src_unk_0202CBE4.c.o + Object main.nef.p/src_playtime.c.o Object main.nef.p/src_unk_0202CC64.c.o Object main.nef.p/src_unk_0202CD50.c.o Object main.nef.p/src_unk_0202D05C.c.o diff --git a/src/journal.c b/src/journal.c index def2b7c26b..67979d4634 100644 --- a/src/journal.c +++ b/src/journal.c @@ -1,7 +1,7 @@ #include #include -#include "struct_decls/struct_02025E5C_decl.h" +#include "struct_decls/playtime_decl.h" #include "trainer_info.h" #include "savedata.h" @@ -16,7 +16,7 @@ #include "savedata.h" #include "trainer_info.h" #include "journal.h" -#include "unk_0202CBE4.h" +#include "playtime.h" #include "map_header.h" typedef struct Journal_t { @@ -802,7 +802,7 @@ static UnkStruct_0202BE38 * sub_0202BE38 (u32 param0) return v0; } -void * sub_0202BE4C (const UnkStruct_02025E5C * param0, u16 param1, u8 param2, u8 param3, u32 param4) +void * sub_0202BE4C (const Playtime * param0, u16 param1, u8 param2, u8 param3, u32 param4) { UnkStruct_0202BE38 * v0; u8 v1; @@ -827,7 +827,7 @@ void * sub_0202BE4C (const UnkStruct_02025E5C * param0, u16 param1, u8 param2, u return v0; } -void * sub_0202BECC (const UnkStruct_02025E5C * param0, u16 param1, u8 param2, u8 param3, u32 param4) +void * sub_0202BECC (const Playtime * param0, u16 param1, u8 param2, u8 param3, u32 param4) { UnkStruct_0202BE38 * v0; u8 v1; diff --git a/src/meson.build b/src/meson.build index 1163d0578f..a60b448079 100644 --- a/src/meson.build +++ b/src/meson.build @@ -116,7 +116,7 @@ pokeplatinum_c = files( 'unk_0202C7FC.c', 'unk_0202C858.c', 'unk_0202C9F4.c', - 'unk_0202CBE4.c', + 'playtime.c', 'unk_0202CC64.c', 'unk_0202CD50.c', 'unk_0202D05C.c', diff --git a/src/overlay005/ov5_021E1D20.c b/src/overlay005/ov5_021E1D20.c index 191f0f95b4..6ca7d82d6a 100644 --- a/src/overlay005/ov5_021E1D20.c +++ b/src/overlay005/ov5_021E1D20.c @@ -4,7 +4,7 @@ #include "message.h" #include "struct_decls/struct_02018340_decl.h" #include "strbuf.h" -#include "struct_decls/struct_02025E5C_decl.h" +#include "struct_decls/playtime_decl.h" #include "trainer_info.h" #include "struct_decls/pokedexdata_decl.h" #include "savedata.h" @@ -27,7 +27,7 @@ #include "unk_02025E08.h" #include "trainer_info.h" #include "unk_0202631C.h" -#include "unk_0202CBE4.h" +#include "playtime.h" #include "unk_020366A0.h" #include "map_header.h" #include "field_overworld_state.h" @@ -39,7 +39,7 @@ typedef struct { int unk_00; int unk_04; TrainerInfo * unk_08; - UnkStruct_02025E5C * unk_0C; + Playtime * unk_0C; } UnkStruct_ov5_021E1D20; struct UnkStruct_ov5_021E1FF4_t { diff --git a/src/overlay061/ov61_0222B008.c b/src/overlay061/ov61_0222B008.c index ba1d57679d..a3b79da0f9 100644 --- a/src/overlay061/ov61_0222B008.c +++ b/src/overlay061/ov61_0222B008.c @@ -5,7 +5,7 @@ #include "core_sys.h" #include "strbuf.h" -#include "struct_decls/struct_02025E5C_decl.h" +#include "struct_decls/playtime_decl.h" #include "struct_decls/struct_02029C68_decl.h" #include "struct_decls/struct_020797DC_decl.h" @@ -234,7 +234,7 @@ int ov61_0222B2B8 (UnkStruct_ov62_022349A8 * param0) int ov61_0222B2D8 (UnkStruct_ov62_022349A8 * param0, UnkStruct_02030A80 * param1, UnkStruct_ov61_0222B2D8 param2[]) { - UnkStruct_02025E5C * v0; + Playtime * v0; int v1; if (ov61_0222BBBC(param0) == 0) { diff --git a/src/overlay062/ov62_0223CAEC.c b/src/overlay062/ov62_0223CAEC.c index 26f48f5d13..486cb0aefa 100644 --- a/src/overlay062/ov62_0223CAEC.c +++ b/src/overlay062/ov62_0223CAEC.c @@ -33,7 +33,7 @@ #include "strbuf.h" #include "unk_02023FCC.h" #include "unk_02025E08.h" -#include "unk_0202CBE4.h" +#include "playtime.h" #include "unk_0202CD50.h" #include "unk_02030A80.h" #include "unk_0208B284.h" diff --git a/src/overlay071/ov71_0223C69C.c b/src/overlay071/ov71_0223C69C.c index 4f438bde6a..7ebe5e1fb1 100644 --- a/src/overlay071/ov71_0223C69C.c +++ b/src/overlay071/ov71_0223C69C.c @@ -15,7 +15,7 @@ #include "unk_02018340.h" #include "unk_0201D670.h" #include "strbuf.h" -#include "unk_0202CBE4.h" +#include "playtime.h" #include "overlay071/ov71_0223C69C.h" static void ov71_0223CD64(Window * param0, const u32 param1, const u32 param2, const u32 param3, Strbuf *param4, const u32 param5, const u8 param6, const int param7); diff --git a/src/overlay086/ov86_0223B140.c b/src/overlay086/ov86_0223B140.c index 80ee7e2703..dc90a419cd 100644 --- a/src/overlay086/ov86_0223B140.c +++ b/src/overlay086/ov86_0223B140.c @@ -53,7 +53,7 @@ #include "unk_020218BC.h" #include "strbuf.h" #include "trainer_info.h" -#include "unk_0202CBE4.h" +#include "playtime.h" #include "pokemon.h" #include "party.h" #include "overlay086/ov86_0223B140.h" diff --git a/src/overlay097/ov97_0222AE60.c b/src/overlay097/ov97_0222AE60.c index fb42ce0c3f..25d3ba856d 100644 --- a/src/overlay097/ov97_0222AE60.c +++ b/src/overlay097/ov97_0222AE60.c @@ -8,7 +8,7 @@ #include "struct_decls/struct_02022550_decl.h" #include "strbuf.h" #include "struct_decls/struct_0202442C_decl.h" -#include "struct_decls/struct_02025E5C_decl.h" +#include "struct_decls/playtime_decl.h" #include "trainer_info.h" #include "struct_decls/pokedexdata_decl.h" #include "savedata.h" @@ -52,7 +52,7 @@ #include "unk_02025E08.h" #include "trainer_info.h" #include "unk_0202631C.h" -#include "unk_0202CBE4.h" +#include "playtime.h" #include "unk_0202DAB4.h" #include "unk_020366A0.h" #include "unk_0209A74C.h" @@ -95,7 +95,7 @@ typedef struct { SaveData * unk_04; PokedexData * unk_08; TrainerInfo * unk_0C; - UnkStruct_02025E5C * unk_10; + Playtime * unk_10; MysteryGift * unk_14; int unk_18; int unk_1C; diff --git a/src/unk_0202CBE4.c b/src/playtime.c similarity index 69% rename from src/unk_0202CBE4.c rename to src/playtime.c index 8edec59b8b..922f3a2c85 100644 --- a/src/unk_0202CBE4.c +++ b/src/playtime.c @@ -1,18 +1,17 @@ #include -#include -#include "struct_defs/struct_02025E5C.h" +#include "struct_defs/playtime.h" -#include "unk_0202CBE4.h" +#include "playtime.h" -void sub_0202CBE4 (UnkStruct_02025E5C * param0) +void sub_0202CBE4 (Playtime * param0) { param0->unk_00 = 0; param0->unk_02 = 0; param0->unk_03 = 0; } -void sub_0202CBF0 (UnkStruct_02025E5C * param0, u32 param1) +void sub_0202CBF0 (Playtime * param0, u32 param1) { u32 v0, v1, v2; @@ -45,17 +44,17 @@ void sub_0202CBF0 (UnkStruct_02025E5C * param0, u32 param1) param0->unk_03 = v2; } -u16 sub_0202CC58 (const UnkStruct_02025E5C * param0) +u16 sub_0202CC58 (const Playtime * param0) { return param0->unk_00; } -u8 sub_0202CC5C (const UnkStruct_02025E5C * param0) +u8 sub_0202CC5C (const Playtime * param0) { return param0->unk_02; } -u8 sub_0202CC60 (const UnkStruct_02025E5C * param0) +u8 sub_0202CC60 (const Playtime * param0) { return param0->unk_03; } diff --git a/src/unk_02017428.c b/src/unk_02017428.c index 0799acb5bd..c679184ab7 100644 --- a/src/unk_02017428.c +++ b/src/unk_02017428.c @@ -1,24 +1,24 @@ #include #include -#include "struct_decls/struct_02025E5C_decl.h" +#include "struct_decls/playtime_decl.h" #include "unk_02017428.h" #include "unk_02022844.h" -#include "unk_0202CBE4.h" +#include "playtime.h" static BOOL Unk_021BF658 = 0; static u64 Unk_021BF668 = 0; static u64 Unk_021BF660 = 0; static u64 Unk_021BF670 = 0; -static UnkStruct_02025E5C * Unk_021BF65C = NULL; +static Playtime * Unk_021BF65C = NULL; void sub_02017428 (void) { Unk_021BF658 = 0; } -void sub_02017434 (UnkStruct_02025E5C * param0) +void sub_02017434 (Playtime * param0) { Unk_021BF658 = 1; Unk_021BF668 = 0; diff --git a/src/unk_02025E08.c b/src/unk_02025E08.c index 0e64b9571c..efe2fd677b 100644 --- a/src/unk_02025E08.c +++ b/src/unk_02025E08.c @@ -4,20 +4,20 @@ #include "struct_decls/struct_02025E0C_decl.h" #include "savedata.h" -#include "struct_defs/struct_02025E5C.h" +#include "struct_defs/playtime.h" #include "savedata.h" #include "unk_02025E08.h" #include "trainer_info.h" #include "game_options.h" #include "coins.h" -#include "unk_0202CBE4.h" +#include "playtime.h" struct UnkStruct_02025E0C_t { Options unk_00; TrainerInfo unk_04; u16 unk_24; - UnkStruct_02025E5C unk_26; + Playtime unk_26; }; int Player_SaveSize (void) @@ -59,7 +59,7 @@ u16 * sub_02025E50 (SaveData * param0) return &v0->unk_24; } -UnkStruct_02025E5C * sub_02025E5C (SaveData * param0) +Playtime * sub_02025E5C (SaveData * param0) { UnkStruct_02025E0C * v0; diff --git a/src/unk_02071D40.c b/src/unk_02071D40.c index 887fd71e72..19daaab238 100644 --- a/src/unk_02071D40.c +++ b/src/unk_02071D40.c @@ -1,7 +1,7 @@ #include #include -#include "struct_decls/struct_02025E5C_decl.h" +#include "struct_decls/playtime_decl.h" #include "trainer_info.h" #include "struct_decls/struct_0202855C_decl.h" #include "struct_decls/struct_0202C834_decl.h" @@ -21,7 +21,7 @@ #include "unk_0202631C.h" #include "unk_0202854C.h" #include "unk_0202C7FC.h" -#include "unk_0202CBE4.h" +#include "playtime.h" #include "unk_0202CD50.h" #include "unk_0203061C.h" #include "field_system.h" @@ -40,7 +40,7 @@ typedef struct { static void sub_02072014(const u8 param0, const u8 param1, const u8 param2, const u8 param3, const u8 param4, TrainerCard * param5); static void sub_02072038(const u16 param0, const u8 param1, const u16 * param2, const u32 param3, const u32 param4, const BOOL param5, const u32 param6, TrainerCard * param7); -static void sub_0207207C(const u8 param0, const UnkStruct_02025E5C * param1, const RTCDate * param2, const RTCDate * param3, const RTCTime * param4, const u8 param5, TrainerCard * param6); +static void sub_0207207C(const u8 param0, const Playtime * param1, const RTCDate * param2, const RTCDate * param3, const RTCTime * param4, const u8 param5, TrainerCard * param6); static void sub_02072120(const u32 param0, const u32 param1, const u32 param2, const u32 param3, const u8 * param4, TrainerCard * param5); static void sub_0207216C(TrainerInfo * param0, FieldSystem * fieldSystem, TrainerCard * param2); static BOOL sub_02072230(TaskManager * param0); @@ -70,7 +70,7 @@ void sub_02071D40 (const u8 param0, const u8 param1, const u8 param2, const u8 p RTCDate v4; RTCDate v5; RTCTime v6; - UnkStruct_02025E5C * v7; + Playtime * v7; v7 = sub_02025E5C(v2); @@ -182,7 +182,7 @@ static void sub_02072038 (const u16 param0, const u8 param1, const u16 * param2, param7->unk_24 = param6; } -static void sub_0207207C (const u8 param0, const UnkStruct_02025E5C * param1, const RTCDate * param2, const RTCDate * param3, const RTCTime * param4, const u8 param5, TrainerCard * param6) +static void sub_0207207C (const u8 param0, const Playtime * param1, const RTCDate * param2, const RTCDate * param3, const RTCTime * param4, const u8 param5, TrainerCard * param6) { param6->unk_2A = sub_0202CC58(param1); param6->unk_2E = sub_0202CC5C(param1); From 5dab46cd624c328b6e0dfa54e97953aa3293d3a3 Mon Sep 17 00:00:00 2001 From: Fexty12573 Date: Thu, 6 Jun 2024 14:00:09 +0200 Subject: [PATCH 2/7] document playtime.c --- include/playtime.h | 10 +++--- include/struct_defs/playtime.h | 6 ++-- src/journal.c | 4 +-- src/overlay005/ov5_021E1D20.c | 4 +-- src/overlay062/ov62_0223CAEC.c | 6 ++-- src/overlay071/ov71_0223C69C.c | 10 +++--- src/overlay086/ov86_0223B140.c | 4 +-- src/overlay097/ov97_0222AE60.c | 4 +-- src/playtime.c | 64 +++++++++++++++++++--------------- src/unk_02017428.c | 2 +- src/unk_02025E08.c | 2 +- src/unk_02071D40.c | 4 +-- 12 files changed, 63 insertions(+), 57 deletions(-) diff --git a/include/playtime.h b/include/playtime.h index 501712ebc9..ce99a46cf6 100644 --- a/include/playtime.h +++ b/include/playtime.h @@ -3,10 +3,10 @@ #include "struct_decls/playtime_decl.h" -void sub_0202CBE4(Playtime * param0); -void sub_0202CBF0(Playtime * param0, u32 param1); -u16 sub_0202CC58(const Playtime * param0); -u8 sub_0202CC5C(const Playtime * param0); -u8 sub_0202CC60(const Playtime * param0); +void Playtime_Initialize(Playtime *playtime); +void Playtime_Increase(Playtime *playtime, u32 seconds); +u16 Playtime_GetHours(const Playtime *playtime); +u8 Playtime_GetMinutes(const Playtime *playtime); +u8 Playtime_GetSeconds(const Playtime *playtime); #endif // POKEPLATINUM_PLAYTIME_H diff --git a/include/struct_defs/playtime.h b/include/struct_defs/playtime.h index f627a5de5f..5f823fc3e6 100644 --- a/include/struct_defs/playtime.h +++ b/include/struct_defs/playtime.h @@ -2,9 +2,9 @@ #define POKEPLATINUM_STRUCT_PLAYTIME_H typedef struct Playtime { - u16 unk_00; - u8 unk_02; - u8 unk_03; + u16 hours; + u8 minutes; + u8 seconds; } Playtime; #endif // POKEPLATINUM_STRUCT_PLAYTIME_H diff --git a/src/journal.c b/src/journal.c index 67979d4634..b222dbd24f 100644 --- a/src/journal.c +++ b/src/journal.c @@ -814,7 +814,7 @@ void * sub_0202BE4C (const Playtime * param0, u16 param1, u8 param2, u8 param3, v0->unk_01_6 = param2; v0->unk_01_2 = param3; - v1 = sub_0202CC5C(param0) / 10; + v1 = Playtime_GetMinutes(param0) / 10; if ((v1 == 0) || (v1 == 2) || (v1 == 4)) { v0->unk_01_0 = 0; @@ -839,7 +839,7 @@ void * sub_0202BECC (const Playtime * param0, u16 param1, u8 param2, u8 param3, v0->unk_01_6 = param2; v0->unk_01_2 = param3; - v1 = sub_0202CC5C(param0) / 10; + v1 = Playtime_GetMinutes(param0) / 10; if ((v1 == 1) || (v1 == 3) || (v1 == 5)) { v0->unk_01_0 = 0; diff --git a/src/overlay005/ov5_021E1D20.c b/src/overlay005/ov5_021E1D20.c index 6ca7d82d6a..449b05d5f2 100644 --- a/src/overlay005/ov5_021E1D20.c +++ b/src/overlay005/ov5_021E1D20.c @@ -110,7 +110,7 @@ static void ov5_021E1D6C (StringTemplate * strTemplate, const UnkStruct_ov5_021E } StringTemplate_SetNumber(strTemplate, 3, param1->unk_00, v0, v1, 1); - v2 = sub_0202CC58(param1->unk_0C); + v2 = Playtime_GetHours(param1->unk_0C); if (v2 >= 100) { v0 = 3; @@ -124,7 +124,7 @@ static void ov5_021E1D6C (StringTemplate * strTemplate, const UnkStruct_ov5_021E } StringTemplate_SetNumber(strTemplate, 4, v2, v0, v1, 1); - StringTemplate_SetNumber(strTemplate, 5, sub_0202CC5C(param1->unk_0C), 2, 2, 1); + StringTemplate_SetNumber(strTemplate, 5, Playtime_GetMinutes(param1->unk_0C), 2, 2, 1); } static int ov5_021E1E10 (const UnkStruct_ov5_021E1D20 * param0) diff --git a/src/overlay062/ov62_0223CAEC.c b/src/overlay062/ov62_0223CAEC.c index 486cb0aefa..996f192c77 100644 --- a/src/overlay062/ov62_0223CAEC.c +++ b/src/overlay062/ov62_0223CAEC.c @@ -994,9 +994,9 @@ static BOOL ov62_0223D744 (UnkStruct_0208C06C * param0) } else { { v0->unk_71C = &v0->unk_710; - v0->unk_720.unk_08.unk_00 = sub_0202CC58(sub_02025E5C(param0->unk_830)); - v0->unk_720.unk_08.unk_02 = sub_0202CC5C(sub_02025E5C(param0->unk_830)); - v0->unk_720.unk_08.unk_03 = sub_0202CC60(sub_02025E5C(param0->unk_830)); + v0->unk_720.unk_08.unk_00 = Playtime_GetHours(sub_02025E5C(param0->unk_830)); + v0->unk_720.unk_08.unk_02 = Playtime_GetMinutes(sub_02025E5C(param0->unk_830)); + v0->unk_720.unk_08.unk_03 = Playtime_GetSeconds(sub_02025E5C(param0->unk_830)); v0->unk_720.unk_0C[0].unk_00 = v0->unk_71C->unk_00[0]; v0->unk_720.unk_0C[1].unk_00 = v0->unk_71C->unk_00[1]; v0->unk_720.unk_0C[2].unk_00 = v0->unk_71C->unk_00[2]; diff --git a/src/overlay071/ov71_0223C69C.c b/src/overlay071/ov71_0223C69C.c index 7ebe5e1fb1..152f74e5ea 100644 --- a/src/overlay071/ov71_0223C69C.c +++ b/src/overlay071/ov71_0223C69C.c @@ -132,8 +132,8 @@ void ov71_0223C6F0 (Window * param0, const TrainerCard * param1) u32 v7; if (param1->unk_04_1) { - StringTemplate_SetNumber(v4, 0, sub_0202CC58(param1->unk_18), 3, 1, 1); - StringTemplate_SetNumber(v4, 1, sub_0202CC5C(param1->unk_18), 2, 2, 1); + StringTemplate_SetNumber(v4, 0, Playtime_GetHours(param1->unk_18), 3, 1, 1); + StringTemplate_SetNumber(v4, 1, Playtime_GetMinutes(param1->unk_18), 2, 2, 1); MessageLoader_GetStrbuf(v1, 16, v3); } else { StringTemplate_SetNumber(v4, 0, param1->unk_2A, 3, 1, 1); @@ -554,7 +554,7 @@ void ov71_0223CDE8 (Window * param0, const TrainerCard * param1, Strbuf *param2) GF_ASSERT(param1->unk_18 != NULL); - v0 = sub_0202CC58(param1->unk_18); + v0 = Playtime_GetHours(param1->unk_18); if (v0 > 999) { v0 = 999; @@ -569,8 +569,8 @@ void ov71_0223CDE8 (Window * param0, const TrainerCard * param1, Strbuf *param2) Strbuf* v4 = Strbuf_Init(32, 25); StringTemplate * v5 = StringTemplate_New((1 + 1), 32, 25); - StringTemplate_SetNumber(v5, 0, sub_0202CC58(param1->unk_18), 3, 1, 1); - StringTemplate_SetNumber(v5, 1, sub_0202CC5C(param1->unk_18), 2, 2, 1); + StringTemplate_SetNumber(v5, 0, Playtime_GetHours(param1->unk_18), 3, 1, 1); + StringTemplate_SetNumber(v5, 1, Playtime_GetMinutes(param1->unk_18), 2, 2, 1); MessageLoader_GetStrbuf(v2, 16, v4); StringTemplate_Format(v5, v3, v4); v1 = (8 * 28) - sub_02002D7C(0, v3, 0); diff --git a/src/overlay086/ov86_0223B140.c b/src/overlay086/ov86_0223B140.c index dc90a419cd..4fa7c022c9 100644 --- a/src/overlay086/ov86_0223B140.c +++ b/src/overlay086/ov86_0223B140.c @@ -1433,8 +1433,8 @@ static void ov86_0223C72C (UnkStruct_ov86_0223B3C8 * param0) StringTemplate_SetPlayerName(param0->unk_1C44, 0, param0->unk_0C->unk_00); StringTemplate_SetNumber(param0->unk_1C44, 1, TrainerInfo_ID_LowHalf(param0->unk_0C->unk_00), 5, 2, 1); - StringTemplate_SetNumber(param0->unk_1C44, 2, sub_0202CC58(param0->unk_0C->unk_08), 3, 0, 1); - StringTemplate_SetNumber(param0->unk_1C44, 3, sub_0202CC5C(param0->unk_0C->unk_08), 2, 2, 1); + StringTemplate_SetNumber(param0->unk_1C44, 2, Playtime_GetHours(param0->unk_0C->unk_08), 3, 0, 1); + StringTemplate_SetNumber(param0->unk_1C44, 3, Playtime_GetMinutes(param0->unk_0C->unk_08), 2, 2, 1); MessageLoader_GetStrbuf(param0->unk_1C50, 13, param0->unk_1C4C); StringTemplate_Format(param0->unk_1C44, param0->unk_1C48, param0->unk_1C4C); diff --git a/src/overlay097/ov97_0222AE60.c b/src/overlay097/ov97_0222AE60.c index 25d3ba856d..5b3c4eeff0 100644 --- a/src/overlay097/ov97_0222AE60.c +++ b/src/overlay097/ov97_0222AE60.c @@ -597,9 +597,9 @@ static BOOL ov97_0222B5C0 (void * param0, int param1, UnkStruct_ov97_02237808 * StringTemplate_SetPlayerName(v4, 0, v6->unk_0C); ov97_0222B53C(param2->unk_10, v5, v4, v7, 16, 16 * 1); - ov97_0222B590(v4, sub_0202CC58(v6->unk_10)); + ov97_0222B590(v4, Playtime_GetHours(v6->unk_10)); - StringTemplate_SetNumber(v4, 1, sub_0202CC5C(v6->unk_10), 2, 2, 1); + StringTemplate_SetNumber(v4, 1, Playtime_GetMinutes(v6->unk_10), 2, 2, 1); ov97_0222B53C(param2->unk_10, v5, v4, v7, 17, 16 * 2); StringTemplate_SetNumber(v4, 0, v6->unk_50, 1, 0, 1); diff --git a/src/playtime.c b/src/playtime.c index 922f3a2c85..3c81428cf6 100644 --- a/src/playtime.c +++ b/src/playtime.c @@ -4,57 +4,63 @@ #include "playtime.h" -void sub_0202CBE4 (Playtime * param0) +#define PLAYTIME_MAX_HOURS 999 +#define PLAYTIME_MAX_MINUTES 59 +#define PLAYTIME_MAX_SECONDS 59 + +void Playtime_Initialize(Playtime *param0) { - param0->unk_00 = 0; - param0->unk_02 = 0; - param0->unk_03 = 0; + param0->hours = 0; + param0->minutes = 0; + param0->seconds = 0; } -void sub_0202CBF0 (Playtime * param0, u32 param1) +void Playtime_Increase(Playtime *playtime, u32 seconds) { - u32 v0, v1, v2; + // u32 hours, minutes, newSeconds; - if ((param0->unk_00 == 999) && (param0->unk_02 == 59) && (param0->unk_03 == 59)) { + if (playtime->hours == PLAYTIME_MAX_HOURS + && playtime->minutes == PLAYTIME_MAX_MINUTES + && playtime->seconds == PLAYTIME_MAX_SECONDS) { return; } - v0 = param0->unk_00; - v1 = param0->unk_02; - v2 = param0->unk_03 + param1; + u32 hours = playtime->hours; + u32 minutes = playtime->minutes; + u32 newSeconds = playtime->seconds + seconds; - if (v2 > 59) { - v1 = param0->unk_02 + (v2 / (59 + 1)); - v2 %= (59 + 1); + if (newSeconds > PLAYTIME_MAX_SECONDS) { + minutes = playtime->minutes + newSeconds / (PLAYTIME_MAX_SECONDS + 1); + newSeconds %= PLAYTIME_MAX_SECONDS + 1; - if (v1 > 59) { - v0 = param0->unk_00 + (v1 / (59 + 1)); - v1 %= (59 + 1); + if (minutes > PLAYTIME_MAX_MINUTES) { + hours = playtime->hours + minutes / (PLAYTIME_MAX_MINUTES + 1); + minutes %= PLAYTIME_MAX_MINUTES + 1; - if (v0 >= 999) { - v0 = 999; - v1 = 59; - v2 = 59; + if (hours >= PLAYTIME_MAX_HOURS) { + hours = PLAYTIME_MAX_HOURS; + minutes = PLAYTIME_MAX_MINUTES; + newSeconds = PLAYTIME_MAX_SECONDS; } } } - param0->unk_00 = v0; - param0->unk_02 = v1; - param0->unk_03 = v2; + playtime->hours = hours; + playtime->minutes = minutes; + playtime->seconds = newSeconds; } -u16 sub_0202CC58 (const Playtime * param0) +u16 Playtime_GetHours(const Playtime *playtime) { - return param0->unk_00; + return playtime->hours; } -u8 sub_0202CC5C (const Playtime * param0) +u8 Playtime_GetMinutes(const Playtime *playtime) { - return param0->unk_02; + return playtime->minutes; } -u8 sub_0202CC60 (const Playtime * param0) +u8 Playtime_GetSeconds(const Playtime *playtime) { - return param0->unk_03; + return playtime->seconds; } diff --git a/src/unk_02017428.c b/src/unk_02017428.c index c679184ab7..6b50dff6ba 100644 --- a/src/unk_02017428.c +++ b/src/unk_02017428.c @@ -33,7 +33,7 @@ void sub_02017458 (void) u64 v0 = sub_0202295C(sub_0202293C() - Unk_021BF670); if (v0 > Unk_021BF660) { - sub_0202CBF0(Unk_021BF65C, (v0 - Unk_021BF660)); + Playtime_Increase(Unk_021BF65C, (v0 - Unk_021BF660)); Unk_021BF660 = v0; } } diff --git a/src/unk_02025E08.c b/src/unk_02025E08.c index efe2fd677b..4924b65be6 100644 --- a/src/unk_02025E08.c +++ b/src/unk_02025E08.c @@ -32,7 +32,7 @@ void Player_Init (UnkStruct_02025E0C * param0) Options_Init(¶m0->unk_00); TrainerInfo_Init(¶m0->unk_04); Coins_Init(¶m0->unk_24); - sub_0202CBE4(¶m0->unk_26); + Playtime_Initialize(¶m0->unk_26); } TrainerInfo * SaveData_GetTrainerInfo (SaveData * param0) diff --git a/src/unk_02071D40.c b/src/unk_02071D40.c index 19daaab238..f87a7c51d1 100644 --- a/src/unk_02071D40.c +++ b/src/unk_02071D40.c @@ -184,8 +184,8 @@ static void sub_02072038 (const u16 param0, const u8 param1, const u16 * param2, static void sub_0207207C (const u8 param0, const Playtime * param1, const RTCDate * param2, const RTCDate * param3, const RTCTime * param4, const u8 param5, TrainerCard * param6) { - param6->unk_2A = sub_0202CC58(param1); - param6->unk_2E = sub_0202CC5C(param1); + param6->unk_2A = Playtime_GetHours(param1); + param6->unk_2E = Playtime_GetMinutes(param1); param6->unk_2F = param2->year; param6->unk_30 = param2->month; param6->unk_31 = param2->day; From 2aaeed7a92062e3064dcc417a7b7f4c9f89910a1 Mon Sep 17 00:00:00 2001 From: Fexty12573 Date: Thu, 6 Jun 2024 14:23:23 +0200 Subject: [PATCH 3/7] Document some savedata stuff related to playtime --- include/unk_02025E08.h | 2 +- src/overlay005/ov5_021E1D20.c | 2 +- src/overlay057/ov57_021D0D80.c | 4 ++-- src/overlay061/ov61_0222B008.c | 2 +- src/overlay062/ov62_0223CAEC.c | 6 +++--- src/overlay097/ov97_0222AE60.c | 2 +- src/playtime.c | 10 ++++------ src/unk_02025E08.c | 12 +++++------- src/unk_02050A74.c | 4 ++-- src/unk_02052C6C.c | 2 +- src/unk_02071D40.c | 2 +- 11 files changed, 22 insertions(+), 26 deletions(-) diff --git a/include/unk_02025E08.h b/include/unk_02025E08.h index 19e153cce3..ecb677f397 100644 --- a/include/unk_02025E08.h +++ b/include/unk_02025E08.h @@ -12,6 +12,6 @@ void Player_Init(UnkStruct_02025E0C * param0); TrainerInfo * SaveData_GetTrainerInfo(SaveData * param0); Options * SaveData_Options(SaveData * param0); u16 * sub_02025E50(SaveData * param0); -Playtime * sub_02025E5C(SaveData * param0); +Playtime * SaveData_GetPlaytime(SaveData * param0); #endif // POKEPLATINUM_UNK_02025E08_H diff --git a/src/overlay005/ov5_021E1D20.c b/src/overlay005/ov5_021E1D20.c index 449b05d5f2..86961d3394 100644 --- a/src/overlay005/ov5_021E1D20.c +++ b/src/overlay005/ov5_021E1D20.c @@ -87,7 +87,7 @@ static void ov5_021E1D20 (UnkStruct_ov5_021E1D20 * param0, const FieldSystem * f } param0->unk_08 = SaveData_GetTrainerInfo(v0); - param0->unk_0C = sub_02025E5C(v0); + param0->unk_0C = SaveData_GetPlaytime(v0); } static void ov5_021E1D6C (StringTemplate * strTemplate, const UnkStruct_ov5_021E1D20 * param1) diff --git a/src/overlay057/ov57_021D0D80.c b/src/overlay057/ov57_021D0D80.c index cfdeccaa76..79502fcd15 100644 --- a/src/overlay057/ov57_021D0D80.c +++ b/src/overlay057/ov57_021D0D80.c @@ -105,7 +105,7 @@ static int ov57_021D0DE0 (OverlayManager * param0, int * param1) SaveData * v0 = ((UnkStruct_0203CC84 *)OverlayManager_Args(param0))->unk_08; ov57_021D0EAC(77, v0, 1); - sub_02017434(sub_02025E5C(v0)); + sub_02017434(SaveData_GetPlaytime(v0)); return 1; } @@ -139,7 +139,7 @@ static int ov57_021D0E34 (OverlayManager * param0, int * param1) Party_SetShayminLandForm(Party_GetFromSavedata(v0)); } - sub_02017434(sub_02025E5C(v0)); + sub_02017434(SaveData_GetPlaytime(v0)); return 1; } diff --git a/src/overlay061/ov61_0222B008.c b/src/overlay061/ov61_0222B008.c index a3b79da0f9..4c1321286d 100644 --- a/src/overlay061/ov61_0222B008.c +++ b/src/overlay061/ov61_0222B008.c @@ -241,7 +241,7 @@ int ov61_0222B2D8 (UnkStruct_ov62_022349A8 * param0, UnkStruct_02030A80 * param1 return 0; } - v0 = sub_02025E5C(param0->unk_00); + v0 = SaveData_GetPlaytime(param0->unk_00); MI_CpuCopy8(v0, ¶m0->unk_190.unk_00_val3.unk_08, sizeof(UnkStruct_ov62_0223D518_sub1_sub1)); ov61_0222AFCC(param0->unk_00, param1, ¶m0->unk_190.unk_00_val3.unk_00); diff --git a/src/overlay062/ov62_0223CAEC.c b/src/overlay062/ov62_0223CAEC.c index 996f192c77..c4295dac4d 100644 --- a/src/overlay062/ov62_0223CAEC.c +++ b/src/overlay062/ov62_0223CAEC.c @@ -994,9 +994,9 @@ static BOOL ov62_0223D744 (UnkStruct_0208C06C * param0) } else { { v0->unk_71C = &v0->unk_710; - v0->unk_720.unk_08.unk_00 = Playtime_GetHours(sub_02025E5C(param0->unk_830)); - v0->unk_720.unk_08.unk_02 = Playtime_GetMinutes(sub_02025E5C(param0->unk_830)); - v0->unk_720.unk_08.unk_03 = Playtime_GetSeconds(sub_02025E5C(param0->unk_830)); + v0->unk_720.unk_08.unk_00 = Playtime_GetHours(SaveData_GetPlaytime(param0->unk_830)); + v0->unk_720.unk_08.unk_02 = Playtime_GetMinutes(SaveData_GetPlaytime(param0->unk_830)); + v0->unk_720.unk_08.unk_03 = Playtime_GetSeconds(SaveData_GetPlaytime(param0->unk_830)); v0->unk_720.unk_0C[0].unk_00 = v0->unk_71C->unk_00[0]; v0->unk_720.unk_0C[1].unk_00 = v0->unk_71C->unk_00[1]; v0->unk_720.unk_0C[2].unk_00 = v0->unk_71C->unk_00[2]; diff --git a/src/overlay097/ov97_0222AE60.c b/src/overlay097/ov97_0222AE60.c index 5b3c4eeff0..f9b1d1a2a7 100644 --- a/src/overlay097/ov97_0222AE60.c +++ b/src/overlay097/ov97_0222AE60.c @@ -996,7 +996,7 @@ static int ov97_0222BD70 (OverlayManager * param0, int * param1) v0->unk_120 = FX32_ONE * 0; v0->unk_0C = SaveData_GetTrainerInfo(v0->unk_04); v0->unk_08 = SaveData_Pokedex(v0->unk_04); - v0->unk_10 = sub_02025E5C(v0->unk_04); + v0->unk_10 = SaveData_GetPlaytime(v0->unk_04); v0->unk_4C = sub_02027520(v0->unk_08); v0->unk_50 = TrainerInfo_BadgeCount(v0->unk_0C); v0->unk_12C = 15; diff --git a/src/playtime.c b/src/playtime.c index 3c81428cf6..3fd94d95a9 100644 --- a/src/playtime.c +++ b/src/playtime.c @@ -8,17 +8,15 @@ #define PLAYTIME_MAX_MINUTES 59 #define PLAYTIME_MAX_SECONDS 59 -void Playtime_Initialize(Playtime *param0) +void Playtime_Initialize(Playtime *playtime) { - param0->hours = 0; - param0->minutes = 0; - param0->seconds = 0; + playtime->hours = 0; + playtime->minutes = 0; + playtime->seconds = 0; } void Playtime_Increase(Playtime *playtime, u32 seconds) { - // u32 hours, minutes, newSeconds; - if (playtime->hours == PLAYTIME_MAX_HOURS && playtime->minutes == PLAYTIME_MAX_MINUTES && playtime->seconds == PLAYTIME_MAX_SECONDS) { diff --git a/src/unk_02025E08.c b/src/unk_02025E08.c index 4924b65be6..2a49dc16a3 100644 --- a/src/unk_02025E08.c +++ b/src/unk_02025E08.c @@ -17,7 +17,7 @@ struct UnkStruct_02025E0C_t { Options unk_00; TrainerInfo unk_04; u16 unk_24; - Playtime unk_26; + Playtime playtime; }; int Player_SaveSize (void) @@ -32,7 +32,7 @@ void Player_Init (UnkStruct_02025E0C * param0) Options_Init(¶m0->unk_00); TrainerInfo_Init(¶m0->unk_04); Coins_Init(¶m0->unk_24); - Playtime_Initialize(¶m0->unk_26); + Playtime_Initialize(¶m0->playtime); } TrainerInfo * SaveData_GetTrainerInfo (SaveData * param0) @@ -59,10 +59,8 @@ u16 * sub_02025E50 (SaveData * param0) return &v0->unk_24; } -Playtime * sub_02025E5C (SaveData * param0) +Playtime *SaveData_GetPlaytime(SaveData *savedata) { - UnkStruct_02025E0C * v0; - - v0 = SaveData_SaveTable(param0, 1); - return &v0->unk_26; + UnkStruct_02025E0C *player = SaveData_SaveTable(savedata, 1); + return &player->playtime; } diff --git a/src/unk_02050A74.c b/src/unk_02050A74.c index ee2156f6c8..0bc0777371 100644 --- a/src/unk_02050A74.c +++ b/src/unk_02050A74.c @@ -985,7 +985,7 @@ static void sub_02051988 (FieldSystem * fieldSystem, BattleParams * param1) if (fieldSystem->unk_78.unk_02 >= 5) { v0 = Party_GetPokemonBySlotIndex(param1->parties[1], 0); - v3 = sub_0202BECC(sub_02025E5C(fieldSystem->saveData), Pokemon_GetValue(v0, MON_DATA_SPECIES, 0), Pokemon_GetValue(v0, MON_DATA_GENDER, 0), param1->unk_138, 11); + v3 = sub_0202BECC(SaveData_GetPlaytime(fieldSystem->saveData), Pokemon_GetValue(v0, MON_DATA_SPECIES, 0), Pokemon_GetValue(v0, MON_DATA_GENDER, 0), param1->unk_138, 11); sub_0202B758(fieldSystem->unk_9C, v3, 2); } } else if (v2 == 0x4) { @@ -993,7 +993,7 @@ static void sub_02051988 (FieldSystem * fieldSystem, BattleParams * param1) v4 = param1->unk_148; v0 = Party_GetPokemonBySlotIndex(param1->parties[v4], 0); - v3 = sub_0202BE4C(sub_02025E5C(fieldSystem->saveData), Pokemon_GetValue(v0, MON_DATA_SPECIES, 0), Pokemon_GetValue(v0, MON_DATA_GENDER, 0), param1->unk_138, 11); + v3 = sub_0202BE4C(SaveData_GetPlaytime(fieldSystem->saveData), Pokemon_GetValue(v0, MON_DATA_SPECIES, 0), Pokemon_GetValue(v0, MON_DATA_GENDER, 0), param1->unk_138, 11); sub_0202B758(fieldSystem->unk_9C, v3, 2); } diff --git a/src/unk_02052C6C.c b/src/unk_02052C6C.c index f582b0f11f..4c2cd4c596 100644 --- a/src/unk_02052C6C.c +++ b/src/unk_02052C6C.c @@ -197,7 +197,7 @@ void sub_02052E58 (TaskManager * param0) v5->unk_00 = sub_0206A954(v3); v5->unk_04.unk_00 = SaveData_GetTrainerInfo(fieldSystem->saveData); v5->unk_04.unk_04 = Party_GetFromSavedata(fieldSystem->saveData); - v5->unk_04.unk_08 = sub_02025E5C(fieldSystem->saveData); + v5->unk_04.unk_08 = SaveData_GetPlaytime(fieldSystem->saveData); v5->unk_10.unk_00 = TrainerInfo_Gender(SaveData_GetTrainerInfo(fieldSystem->saveData)); v5->unk_10.unk_04 = sub_0206A954(v3); v5->unk_10.unk_08 = SaveData_Pokedex(fieldSystem->saveData); diff --git a/src/unk_02071D40.c b/src/unk_02071D40.c index f87a7c51d1..805daedf38 100644 --- a/src/unk_02071D40.c +++ b/src/unk_02071D40.c @@ -72,7 +72,7 @@ void sub_02071D40 (const u8 param0, const u8 param1, const u8 param2, const u8 p RTCTime v6; Playtime * v7; - v7 = sub_02025E5C(v2); + v7 = SaveData_GetPlaytime(v2); sub_02055BF4(fieldSystem, &v4, &v6); sub_02055C10(fieldSystem, &v5, &v6); From ec541cb79e6e8c404bec8f0a70fa8a4f6095ee91 Mon Sep 17 00:00:00 2001 From: Fexty12573 Date: Thu, 6 Jun 2024 15:03:41 +0200 Subject: [PATCH 4/7] Some playtime related stuff --- include/struct_defs/struct_02072014.h | 4 +-- src/overlay071/ov71_0223C69C.c | 4 +-- src/unk_02071D40.c | 38 +++++++++++++-------------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/include/struct_defs/struct_02072014.h b/include/struct_defs/struct_02072014.h index 3ff4919289..71839a9be2 100644 --- a/include/struct_defs/struct_02072014.h +++ b/include/struct_defs/struct_02072014.h @@ -22,9 +22,9 @@ typedef struct { u32 unk_20; u32 unk_24; u16 unk_28; - u16 unk_2A; + u16 playtimeHours; u16 unk_2C; - u8 unk_2E; + u8 playtimeMinutes; u8 unk_2F; u8 unk_30; u8 unk_31; diff --git a/src/overlay071/ov71_0223C69C.c b/src/overlay071/ov71_0223C69C.c index 152f74e5ea..1c57fd03a5 100644 --- a/src/overlay071/ov71_0223C69C.c +++ b/src/overlay071/ov71_0223C69C.c @@ -136,8 +136,8 @@ void ov71_0223C6F0 (Window * param0, const TrainerCard * param1) StringTemplate_SetNumber(v4, 1, Playtime_GetMinutes(param1->unk_18), 2, 2, 1); MessageLoader_GetStrbuf(v1, 16, v3); } else { - StringTemplate_SetNumber(v4, 0, param1->unk_2A, 3, 1, 1); - StringTemplate_SetNumber(v4, 1, param1->unk_2E, 2, 2, 1); + StringTemplate_SetNumber(v4, 0, param1->playtimeHours, 3, 1, 1); + StringTemplate_SetNumber(v4, 1, param1->playtimeMinutes, 2, 2, 1); MessageLoader_GetStrbuf(v1, 15, v3); } diff --git a/src/unk_02071D40.c b/src/unk_02071D40.c index 805daedf38..4bb265a06b 100644 --- a/src/unk_02071D40.c +++ b/src/unk_02071D40.c @@ -182,34 +182,34 @@ static void sub_02072038 (const u16 param0, const u8 param1, const u16 * param2, param7->unk_24 = param6; } -static void sub_0207207C (const u8 param0, const Playtime * param1, const RTCDate * param2, const RTCDate * param3, const RTCTime * param4, const u8 param5, TrainerCard * param6) +static void sub_0207207C (const u8 param0, const Playtime *playtime, const RTCDate * param2, const RTCDate * param3, const RTCTime * param4, const u8 param5, TrainerCard * trainerCard) { - param6->unk_2A = Playtime_GetHours(param1); - param6->unk_2E = Playtime_GetMinutes(param1); - param6->unk_2F = param2->year; - param6->unk_30 = param2->month; - param6->unk_31 = param2->day; + trainerCard->playtimeHours = Playtime_GetHours(playtime); + trainerCard->playtimeMinutes = Playtime_GetMinutes(playtime); + trainerCard->unk_2F = param2->year; + trainerCard->unk_30 = param2->month; + trainerCard->unk_31 = param2->day; if (param0) { - param6->unk_32 = param3->year; - param6->unk_33 = param3->month; - param6->unk_34 = param3->day; - param6->unk_2C = param4->hour; - param6->unk_35 = param4->minute; + trainerCard->unk_32 = param3->year; + trainerCard->unk_33 = param3->month; + trainerCard->unk_34 = param3->day; + trainerCard->unk_2C = param4->hour; + trainerCard->unk_35 = param4->minute; } else { - param6->unk_32 = 0; - param6->unk_33 = 0; - param6->unk_34 = 0; - param6->unk_2C = 0; - param6->unk_35 = 0; + trainerCard->unk_32 = 0; + trainerCard->unk_33 = 0; + trainerCard->unk_34 = 0; + trainerCard->unk_2C = 0; + trainerCard->unk_35 = 0; } - param6->unk_04_1 = param5; + trainerCard->unk_04_1 = param5; if (param5) { - param6->unk_18 = param1; + trainerCard->unk_18 = playtime; } else { - param6->unk_18 = NULL; + trainerCard->unk_18 = NULL; } } From 0d45c0cb6f99edaa9391efeebdfa7a773b7821cf Mon Sep 17 00:00:00 2001 From: Fexty12573 Date: Fri, 7 Jun 2024 09:20:39 +0200 Subject: [PATCH 5/7] PR feedback (Playtime -> PlayTime, label fields/params, remove struct_def/decl file) --- include/journal.h | 6 ++-- include/playtime.h | 16 ++++++---- include/struct_decls/playtime_decl.h | 6 ---- include/struct_defs/playtime.h | 10 ------ include/struct_defs/struct_0203E234.h | 4 +-- include/struct_defs/struct_02072014.h | 4 +-- include/unk_02017428.h | 4 +-- include/unk_02025E08.h | 4 +-- src/journal.c | 9 +++--- src/overlay005/ov5_021E1D20.c | 10 +++--- src/overlay057/ov57_021D0D80.c | 4 +-- src/overlay061/ov61_0222B008.c | 6 ++-- src/overlay062/ov62_0223CAEC.c | 6 ++-- src/overlay071/ov71_0223C69C.c | 12 +++---- src/overlay086/ov86_0223B140.c | 4 +-- src/overlay097/ov97_0222AE60.c | 10 +++--- src/playtime.c | 46 +++++++++++++-------------- src/unk_02017428.c | 10 +++--- src/unk_02025E08.c | 8 ++--- src/unk_02050A74.c | 4 +-- src/unk_02052C6C.c | 2 +- src/unk_02071D40.c | 18 +++++------ 22 files changed, 92 insertions(+), 111 deletions(-) delete mode 100644 include/struct_decls/playtime_decl.h delete mode 100644 include/struct_defs/playtime.h diff --git a/include/journal.h b/include/journal.h index 1ba96b27db..afa356549d 100644 --- a/include/journal.h +++ b/include/journal.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_JOURNAL_H #define POKEPLATINUM_JOURNAL_H -#include "struct_decls/playtime_decl.h" +#include "playtime.h" #include "trainer_info.h" #include "savedata.h" @@ -36,8 +36,8 @@ void * sub_0202BE00(u8 param0, u16 param1, u32 param2); void * sub_0202BE14(u32 param0); void * sub_0202BE20(u32 param0); void * sub_0202BE2C(u32 param0, u32 param1); -void * sub_0202BE4C(const Playtime * param0, u16 param1, u8 param2, u8 param3, u32 param4); -void * sub_0202BECC(const Playtime * param0, u16 param1, u8 param2, u8 param3, u32 param4); +void * sub_0202BE4C(const PlayTime * playTime, u16 param1, u8 param2, u8 param3, u32 param4); +void * sub_0202BECC(const PlayTime * playTime, u16 param1, u8 param2, u8 param3, u32 param4); void * sub_0202BF4C(u16 param0, u16 param1, u32 param2); void * sub_0202BFCC(u16 * param0, u8 param1, u8 param2, u32 param3); void * sub_0202C00C(u16 * param0, u8 param1, u8 param2, u32 param3); diff --git a/include/playtime.h b/include/playtime.h index ce99a46cf6..defbe1d706 100644 --- a/include/playtime.h +++ b/include/playtime.h @@ -1,12 +1,16 @@ #ifndef POKEPLATINUM_PLAYTIME_H #define POKEPLATINUM_PLAYTIME_H -#include "struct_decls/playtime_decl.h" +typedef struct PlayTime { + u16 hours; + u8 minutes; + u8 seconds; +} PlayTime; -void Playtime_Initialize(Playtime *playtime); -void Playtime_Increase(Playtime *playtime, u32 seconds); -u16 Playtime_GetHours(const Playtime *playtime); -u8 Playtime_GetMinutes(const Playtime *playtime); -u8 Playtime_GetSeconds(const Playtime *playtime); +void PlayTime_Init(PlayTime *playtime); +void PlayTime_Increment(PlayTime *playtime, u32 seconds); +u16 PlayTime_GetHours(const PlayTime *playtime); +u8 PlayTime_GetMinutes(const PlayTime *playtime); +u8 PlayTime_GetSeconds(const PlayTime *playtime); #endif // POKEPLATINUM_PLAYTIME_H diff --git a/include/struct_decls/playtime_decl.h b/include/struct_decls/playtime_decl.h deleted file mode 100644 index 9e3e2bf958..0000000000 --- a/include/struct_decls/playtime_decl.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_PLAYTIME_DECL_H -#define POKEPLATINUM_STRUCT_PLAYTIME_DECL_H - -typedef struct Playtime Playtime; - -#endif // POKEPLATINUM_STRUCT_PLAYTIME_DECL_H diff --git a/include/struct_defs/playtime.h b/include/struct_defs/playtime.h deleted file mode 100644 index 5f823fc3e6..0000000000 --- a/include/struct_defs/playtime.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_PLAYTIME_H -#define POKEPLATINUM_STRUCT_PLAYTIME_H - -typedef struct Playtime { - u16 hours; - u8 minutes; - u8 seconds; -} Playtime; - -#endif // POKEPLATINUM_STRUCT_PLAYTIME_H diff --git a/include/struct_defs/struct_0203E234.h b/include/struct_defs/struct_0203E234.h index f441ad6626..bbe3deb206 100644 --- a/include/struct_defs/struct_0203E234.h +++ b/include/struct_defs/struct_0203E234.h @@ -1,14 +1,14 @@ #ifndef POKEPLATINUM_STRUCT_0203E234_H #define POKEPLATINUM_STRUCT_0203E234_H -#include "struct_decls/playtime_decl.h" +#include "playtime.h" #include "trainer_info.h" #include "struct_decls/struct_party_decl.h" typedef struct { const TrainerInfo * unk_00; const Party * unk_04; - const Playtime * unk_08; + const PlayTime * playTime; } UnkStruct_0203E234; #endif // POKEPLATINUM_STRUCT_0203E234_H diff --git a/include/struct_defs/struct_02072014.h b/include/struct_defs/struct_02072014.h index 71839a9be2..cab710222f 100644 --- a/include/struct_defs/struct_02072014.h +++ b/include/struct_defs/struct_02072014.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_02072014_H #define POKEPLATINUM_STRUCT_02072014_H -#include "struct_decls/playtime_decl.h" +#include "playtime.h" #include "struct_defs/struct_02072014_sub1.h" typedef struct { @@ -17,7 +17,7 @@ typedef struct { u8 unk_05; u8 padding_06[2]; u16 unk_08[8]; - const Playtime * unk_18; + const PlayTime *playTime; u32 unk_1C; u32 unk_20; u32 unk_24; diff --git a/include/unk_02017428.h b/include/unk_02017428.h index 483b50c0c4..c654fad49a 100644 --- a/include/unk_02017428.h +++ b/include/unk_02017428.h @@ -1,10 +1,10 @@ #ifndef POKEPLATINUM_UNK_02017428_H #define POKEPLATINUM_UNK_02017428_H -#include "struct_decls/playtime_decl.h" +#include "playtime.h" void sub_02017428(void); -void sub_02017434(Playtime * param0); +void sub_02017434(PlayTime *playTime); void sub_02017458(void); #endif // POKEPLATINUM_UNK_02017428_H diff --git a/include/unk_02025E08.h b/include/unk_02025E08.h index ecb677f397..5e8471acd8 100644 --- a/include/unk_02025E08.h +++ b/include/unk_02025E08.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_UNK_02025E08_H #include "struct_decls/struct_02025E0C_decl.h" -#include "struct_decls/playtime_decl.h" +#include "playtime.h" #include "trainer_info.h" #include "game_options.h" #include "savedata.h" @@ -12,6 +12,6 @@ void Player_Init(UnkStruct_02025E0C * param0); TrainerInfo * SaveData_GetTrainerInfo(SaveData * param0); Options * SaveData_Options(SaveData * param0); u16 * sub_02025E50(SaveData * param0); -Playtime * SaveData_GetPlaytime(SaveData * param0); +PlayTime * SaveData_GetPlayTime(SaveData * param0); #endif // POKEPLATINUM_UNK_02025E08_H diff --git a/src/journal.c b/src/journal.c index b222dbd24f..913fd76b53 100644 --- a/src/journal.c +++ b/src/journal.c @@ -1,7 +1,6 @@ #include #include -#include "struct_decls/playtime_decl.h" #include "trainer_info.h" #include "savedata.h" @@ -802,7 +801,7 @@ static UnkStruct_0202BE38 * sub_0202BE38 (u32 param0) return v0; } -void * sub_0202BE4C (const Playtime * param0, u16 param1, u8 param2, u8 param3, u32 param4) +void * sub_0202BE4C (const PlayTime *playTime, u16 param1, u8 param2, u8 param3, u32 param4) { UnkStruct_0202BE38 * v0; u8 v1; @@ -814,7 +813,7 @@ void * sub_0202BE4C (const Playtime * param0, u16 param1, u8 param2, u8 param3, v0->unk_01_6 = param2; v0->unk_01_2 = param3; - v1 = Playtime_GetMinutes(param0) / 10; + v1 = PlayTime_GetMinutes(playTime) / 10; if ((v1 == 0) || (v1 == 2) || (v1 == 4)) { v0->unk_01_0 = 0; @@ -827,7 +826,7 @@ void * sub_0202BE4C (const Playtime * param0, u16 param1, u8 param2, u8 param3, return v0; } -void * sub_0202BECC (const Playtime * param0, u16 param1, u8 param2, u8 param3, u32 param4) +void * sub_0202BECC (const PlayTime *playTime, u16 param1, u8 param2, u8 param3, u32 param4) { UnkStruct_0202BE38 * v0; u8 v1; @@ -839,7 +838,7 @@ void * sub_0202BECC (const Playtime * param0, u16 param1, u8 param2, u8 param3, v0->unk_01_6 = param2; v0->unk_01_2 = param3; - v1 = Playtime_GetMinutes(param0) / 10; + v1 = PlayTime_GetMinutes(playTime) / 10; if ((v1 == 1) || (v1 == 3) || (v1 == 5)) { v0->unk_01_0 = 0; diff --git a/src/overlay005/ov5_021E1D20.c b/src/overlay005/ov5_021E1D20.c index 86961d3394..e4f6e3f195 100644 --- a/src/overlay005/ov5_021E1D20.c +++ b/src/overlay005/ov5_021E1D20.c @@ -4,7 +4,7 @@ #include "message.h" #include "struct_decls/struct_02018340_decl.h" #include "strbuf.h" -#include "struct_decls/playtime_decl.h" +#include "playtime.h" #include "trainer_info.h" #include "struct_decls/pokedexdata_decl.h" #include "savedata.h" @@ -39,7 +39,7 @@ typedef struct { int unk_00; int unk_04; TrainerInfo * unk_08; - Playtime * unk_0C; + PlayTime *playTime; } UnkStruct_ov5_021E1D20; struct UnkStruct_ov5_021E1FF4_t { @@ -87,7 +87,7 @@ static void ov5_021E1D20 (UnkStruct_ov5_021E1D20 * param0, const FieldSystem * f } param0->unk_08 = SaveData_GetTrainerInfo(v0); - param0->unk_0C = SaveData_GetPlaytime(v0); + param0->playTime = SaveData_GetPlayTime(v0); } static void ov5_021E1D6C (StringTemplate * strTemplate, const UnkStruct_ov5_021E1D20 * param1) @@ -110,7 +110,7 @@ static void ov5_021E1D6C (StringTemplate * strTemplate, const UnkStruct_ov5_021E } StringTemplate_SetNumber(strTemplate, 3, param1->unk_00, v0, v1, 1); - v2 = Playtime_GetHours(param1->unk_0C); + v2 = PlayTime_GetHours(param1->playTime); if (v2 >= 100) { v0 = 3; @@ -124,7 +124,7 @@ static void ov5_021E1D6C (StringTemplate * strTemplate, const UnkStruct_ov5_021E } StringTemplate_SetNumber(strTemplate, 4, v2, v0, v1, 1); - StringTemplate_SetNumber(strTemplate, 5, Playtime_GetMinutes(param1->unk_0C), 2, 2, 1); + StringTemplate_SetNumber(strTemplate, 5, PlayTime_GetMinutes(param1->playTime), 2, 2, 1); } static int ov5_021E1E10 (const UnkStruct_ov5_021E1D20 * param0) diff --git a/src/overlay057/ov57_021D0D80.c b/src/overlay057/ov57_021D0D80.c index 79502fcd15..474248b908 100644 --- a/src/overlay057/ov57_021D0D80.c +++ b/src/overlay057/ov57_021D0D80.c @@ -105,7 +105,7 @@ static int ov57_021D0DE0 (OverlayManager * param0, int * param1) SaveData * v0 = ((UnkStruct_0203CC84 *)OverlayManager_Args(param0))->unk_08; ov57_021D0EAC(77, v0, 1); - sub_02017434(SaveData_GetPlaytime(v0)); + sub_02017434(SaveData_GetPlayTime(v0)); return 1; } @@ -139,7 +139,7 @@ static int ov57_021D0E34 (OverlayManager * param0, int * param1) Party_SetShayminLandForm(Party_GetFromSavedata(v0)); } - sub_02017434(SaveData_GetPlaytime(v0)); + sub_02017434(SaveData_GetPlayTime(v0)); return 1; } diff --git a/src/overlay061/ov61_0222B008.c b/src/overlay061/ov61_0222B008.c index 4c1321286d..118aa63c50 100644 --- a/src/overlay061/ov61_0222B008.c +++ b/src/overlay061/ov61_0222B008.c @@ -5,7 +5,7 @@ #include "core_sys.h" #include "strbuf.h" -#include "struct_decls/playtime_decl.h" +#include "playtime.h" #include "struct_decls/struct_02029C68_decl.h" #include "struct_decls/struct_020797DC_decl.h" @@ -234,14 +234,14 @@ int ov61_0222B2B8 (UnkStruct_ov62_022349A8 * param0) int ov61_0222B2D8 (UnkStruct_ov62_022349A8 * param0, UnkStruct_02030A80 * param1, UnkStruct_ov61_0222B2D8 param2[]) { - Playtime * v0; + PlayTime * v0; int v1; if (ov61_0222BBBC(param0) == 0) { return 0; } - v0 = SaveData_GetPlaytime(param0->unk_00); + v0 = SaveData_GetPlayTime(param0->unk_00); MI_CpuCopy8(v0, ¶m0->unk_190.unk_00_val3.unk_08, sizeof(UnkStruct_ov62_0223D518_sub1_sub1)); ov61_0222AFCC(param0->unk_00, param1, ¶m0->unk_190.unk_00_val3.unk_00); diff --git a/src/overlay062/ov62_0223CAEC.c b/src/overlay062/ov62_0223CAEC.c index c4295dac4d..0bb411ce9e 100644 --- a/src/overlay062/ov62_0223CAEC.c +++ b/src/overlay062/ov62_0223CAEC.c @@ -994,9 +994,9 @@ static BOOL ov62_0223D744 (UnkStruct_0208C06C * param0) } else { { v0->unk_71C = &v0->unk_710; - v0->unk_720.unk_08.unk_00 = Playtime_GetHours(SaveData_GetPlaytime(param0->unk_830)); - v0->unk_720.unk_08.unk_02 = Playtime_GetMinutes(SaveData_GetPlaytime(param0->unk_830)); - v0->unk_720.unk_08.unk_03 = Playtime_GetSeconds(SaveData_GetPlaytime(param0->unk_830)); + v0->unk_720.unk_08.unk_00 = PlayTime_GetHours(SaveData_GetPlayTime(param0->unk_830)); + v0->unk_720.unk_08.unk_02 = PlayTime_GetMinutes(SaveData_GetPlayTime(param0->unk_830)); + v0->unk_720.unk_08.unk_03 = PlayTime_GetSeconds(SaveData_GetPlayTime(param0->unk_830)); v0->unk_720.unk_0C[0].unk_00 = v0->unk_71C->unk_00[0]; v0->unk_720.unk_0C[1].unk_00 = v0->unk_71C->unk_00[1]; v0->unk_720.unk_0C[2].unk_00 = v0->unk_71C->unk_00[2]; diff --git a/src/overlay071/ov71_0223C69C.c b/src/overlay071/ov71_0223C69C.c index 1c57fd03a5..0f7093c48c 100644 --- a/src/overlay071/ov71_0223C69C.c +++ b/src/overlay071/ov71_0223C69C.c @@ -132,8 +132,8 @@ void ov71_0223C6F0 (Window * param0, const TrainerCard * param1) u32 v7; if (param1->unk_04_1) { - StringTemplate_SetNumber(v4, 0, Playtime_GetHours(param1->unk_18), 3, 1, 1); - StringTemplate_SetNumber(v4, 1, Playtime_GetMinutes(param1->unk_18), 2, 2, 1); + StringTemplate_SetNumber(v4, 0, PlayTime_GetHours(param1->playTime), 3, 1, 1); + StringTemplate_SetNumber(v4, 1, PlayTime_GetMinutes(param1->playTime), 2, 2, 1); MessageLoader_GetStrbuf(v1, 16, v3); } else { StringTemplate_SetNumber(v4, 0, param1->playtimeHours, 3, 1, 1); @@ -552,9 +552,9 @@ void ov71_0223CDE8 (Window * param0, const TrainerCard * param1, Strbuf *param2) { int v0; - GF_ASSERT(param1->unk_18 != NULL); + GF_ASSERT(param1->playTime != NULL); - v0 = Playtime_GetHours(param1->unk_18); + v0 = PlayTime_GetHours(param1->playTime); if (v0 > 999) { v0 = 999; @@ -569,8 +569,8 @@ void ov71_0223CDE8 (Window * param0, const TrainerCard * param1, Strbuf *param2) Strbuf* v4 = Strbuf_Init(32, 25); StringTemplate * v5 = StringTemplate_New((1 + 1), 32, 25); - StringTemplate_SetNumber(v5, 0, Playtime_GetHours(param1->unk_18), 3, 1, 1); - StringTemplate_SetNumber(v5, 1, Playtime_GetMinutes(param1->unk_18), 2, 2, 1); + StringTemplate_SetNumber(v5, 0, PlayTime_GetHours(param1->playTime), 3, 1, 1); + StringTemplate_SetNumber(v5, 1, PlayTime_GetMinutes(param1->playTime), 2, 2, 1); MessageLoader_GetStrbuf(v2, 16, v4); StringTemplate_Format(v5, v3, v4); v1 = (8 * 28) - sub_02002D7C(0, v3, 0); diff --git a/src/overlay086/ov86_0223B140.c b/src/overlay086/ov86_0223B140.c index 4fa7c022c9..a263a2579b 100644 --- a/src/overlay086/ov86_0223B140.c +++ b/src/overlay086/ov86_0223B140.c @@ -1433,8 +1433,8 @@ static void ov86_0223C72C (UnkStruct_ov86_0223B3C8 * param0) StringTemplate_SetPlayerName(param0->unk_1C44, 0, param0->unk_0C->unk_00); StringTemplate_SetNumber(param0->unk_1C44, 1, TrainerInfo_ID_LowHalf(param0->unk_0C->unk_00), 5, 2, 1); - StringTemplate_SetNumber(param0->unk_1C44, 2, Playtime_GetHours(param0->unk_0C->unk_08), 3, 0, 1); - StringTemplate_SetNumber(param0->unk_1C44, 3, Playtime_GetMinutes(param0->unk_0C->unk_08), 2, 2, 1); + StringTemplate_SetNumber(param0->unk_1C44, 2, PlayTime_GetHours(param0->unk_0C->playTime), 3, 0, 1); + StringTemplate_SetNumber(param0->unk_1C44, 3, PlayTime_GetMinutes(param0->unk_0C->playTime), 2, 2, 1); MessageLoader_GetStrbuf(param0->unk_1C50, 13, param0->unk_1C4C); StringTemplate_Format(param0->unk_1C44, param0->unk_1C48, param0->unk_1C4C); diff --git a/src/overlay097/ov97_0222AE60.c b/src/overlay097/ov97_0222AE60.c index f9b1d1a2a7..02b8251af7 100644 --- a/src/overlay097/ov97_0222AE60.c +++ b/src/overlay097/ov97_0222AE60.c @@ -8,7 +8,7 @@ #include "struct_decls/struct_02022550_decl.h" #include "strbuf.h" #include "struct_decls/struct_0202442C_decl.h" -#include "struct_decls/playtime_decl.h" +#include "playtime.h" #include "trainer_info.h" #include "struct_decls/pokedexdata_decl.h" #include "savedata.h" @@ -95,7 +95,7 @@ typedef struct { SaveData * unk_04; PokedexData * unk_08; TrainerInfo * unk_0C; - Playtime * unk_10; + PlayTime *playTime; MysteryGift * unk_14; int unk_18; int unk_1C; @@ -597,9 +597,9 @@ static BOOL ov97_0222B5C0 (void * param0, int param1, UnkStruct_ov97_02237808 * StringTemplate_SetPlayerName(v4, 0, v6->unk_0C); ov97_0222B53C(param2->unk_10, v5, v4, v7, 16, 16 * 1); - ov97_0222B590(v4, Playtime_GetHours(v6->unk_10)); + ov97_0222B590(v4, PlayTime_GetHours(v6->playTime)); - StringTemplate_SetNumber(v4, 1, Playtime_GetMinutes(v6->unk_10), 2, 2, 1); + StringTemplate_SetNumber(v4, 1, PlayTime_GetMinutes(v6->playTime), 2, 2, 1); ov97_0222B53C(param2->unk_10, v5, v4, v7, 17, 16 * 2); StringTemplate_SetNumber(v4, 0, v6->unk_50, 1, 0, 1); @@ -996,7 +996,7 @@ static int ov97_0222BD70 (OverlayManager * param0, int * param1) v0->unk_120 = FX32_ONE * 0; v0->unk_0C = SaveData_GetTrainerInfo(v0->unk_04); v0->unk_08 = SaveData_Pokedex(v0->unk_04); - v0->unk_10 = SaveData_GetPlaytime(v0->unk_04); + v0->playTime = SaveData_GetPlayTime(v0->unk_04); v0->unk_4C = sub_02027520(v0->unk_08); v0->unk_50 = TrainerInfo_BadgeCount(v0->unk_0C); v0->unk_12C = 15; diff --git a/src/playtime.c b/src/playtime.c index 3fd94d95a9..5a08f9f3fb 100644 --- a/src/playtime.c +++ b/src/playtime.c @@ -1,38 +1,36 @@ #include -#include "struct_defs/playtime.h" - #include "playtime.h" #define PLAYTIME_MAX_HOURS 999 #define PLAYTIME_MAX_MINUTES 59 #define PLAYTIME_MAX_SECONDS 59 -void Playtime_Initialize(Playtime *playtime) +void PlayTime_Init(PlayTime *playTime) { - playtime->hours = 0; - playtime->minutes = 0; - playtime->seconds = 0; + playTime->hours = 0; + playTime->minutes = 0; + playTime->seconds = 0; } -void Playtime_Increase(Playtime *playtime, u32 seconds) +void PlayTime_Increment(PlayTime *playTime, u32 seconds) { - if (playtime->hours == PLAYTIME_MAX_HOURS - && playtime->minutes == PLAYTIME_MAX_MINUTES - && playtime->seconds == PLAYTIME_MAX_SECONDS) { + if (playTime->hours == PLAYTIME_MAX_HOURS + && playTime->minutes == PLAYTIME_MAX_MINUTES + && playTime->seconds == PLAYTIME_MAX_SECONDS) { return; } - u32 hours = playtime->hours; - u32 minutes = playtime->minutes; - u32 newSeconds = playtime->seconds + seconds; + u32 hours = playTime->hours; + u32 minutes = playTime->minutes; + u32 newSeconds = playTime->seconds + seconds; if (newSeconds > PLAYTIME_MAX_SECONDS) { - minutes = playtime->minutes + newSeconds / (PLAYTIME_MAX_SECONDS + 1); + minutes = playTime->minutes + newSeconds / (PLAYTIME_MAX_SECONDS + 1); newSeconds %= PLAYTIME_MAX_SECONDS + 1; if (minutes > PLAYTIME_MAX_MINUTES) { - hours = playtime->hours + minutes / (PLAYTIME_MAX_MINUTES + 1); + hours = playTime->hours + minutes / (PLAYTIME_MAX_MINUTES + 1); minutes %= PLAYTIME_MAX_MINUTES + 1; if (hours >= PLAYTIME_MAX_HOURS) { @@ -43,22 +41,22 @@ void Playtime_Increase(Playtime *playtime, u32 seconds) } } - playtime->hours = hours; - playtime->minutes = minutes; - playtime->seconds = newSeconds; + playTime->hours = hours; + playTime->minutes = minutes; + playTime->seconds = newSeconds; } -u16 Playtime_GetHours(const Playtime *playtime) +u16 PlayTime_GetHours(const PlayTime *playTime) { - return playtime->hours; + return playTime->hours; } -u8 Playtime_GetMinutes(const Playtime *playtime) +u8 PlayTime_GetMinutes(const PlayTime *playTime) { - return playtime->minutes; + return playTime->minutes; } -u8 Playtime_GetSeconds(const Playtime *playtime) +u8 PlayTime_GetSeconds(const PlayTime *playTime) { - return playtime->seconds; + return playTime->seconds; } diff --git a/src/unk_02017428.c b/src/unk_02017428.c index 6b50dff6ba..3e60c56f16 100644 --- a/src/unk_02017428.c +++ b/src/unk_02017428.c @@ -1,8 +1,6 @@ #include #include -#include "struct_decls/playtime_decl.h" - #include "unk_02017428.h" #include "unk_02022844.h" #include "playtime.h" @@ -11,19 +9,19 @@ static BOOL Unk_021BF658 = 0; static u64 Unk_021BF668 = 0; static u64 Unk_021BF660 = 0; static u64 Unk_021BF670 = 0; -static Playtime * Unk_021BF65C = NULL; +static PlayTime * sPlayTime = NULL; void sub_02017428 (void) { Unk_021BF658 = 0; } -void sub_02017434 (Playtime * param0) +void sub_02017434 (PlayTime *playTime) { Unk_021BF658 = 1; Unk_021BF668 = 0; Unk_021BF660 = 0; - Unk_021BF65C = param0; + sPlayTime = playTime; Unk_021BF670 = sub_0202293C(); } @@ -33,7 +31,7 @@ void sub_02017458 (void) u64 v0 = sub_0202295C(sub_0202293C() - Unk_021BF670); if (v0 > Unk_021BF660) { - Playtime_Increase(Unk_021BF65C, (v0 - Unk_021BF660)); + PlayTime_Increment(sPlayTime, (v0 - Unk_021BF660)); Unk_021BF660 = v0; } } diff --git a/src/unk_02025E08.c b/src/unk_02025E08.c index 2a49dc16a3..b148a3e9b7 100644 --- a/src/unk_02025E08.c +++ b/src/unk_02025E08.c @@ -4,8 +4,6 @@ #include "struct_decls/struct_02025E0C_decl.h" #include "savedata.h" -#include "struct_defs/playtime.h" - #include "savedata.h" #include "unk_02025E08.h" #include "trainer_info.h" @@ -17,7 +15,7 @@ struct UnkStruct_02025E0C_t { Options unk_00; TrainerInfo unk_04; u16 unk_24; - Playtime playtime; + PlayTime playtime; }; int Player_SaveSize (void) @@ -32,7 +30,7 @@ void Player_Init (UnkStruct_02025E0C * param0) Options_Init(¶m0->unk_00); TrainerInfo_Init(¶m0->unk_04); Coins_Init(¶m0->unk_24); - Playtime_Initialize(¶m0->playtime); + PlayTime_Init(¶m0->playtime); } TrainerInfo * SaveData_GetTrainerInfo (SaveData * param0) @@ -59,7 +57,7 @@ u16 * sub_02025E50 (SaveData * param0) return &v0->unk_24; } -Playtime *SaveData_GetPlaytime(SaveData *savedata) +PlayTime *SaveData_GetPlayTime(SaveData *savedata) { UnkStruct_02025E0C *player = SaveData_SaveTable(savedata, 1); return &player->playtime; diff --git a/src/unk_02050A74.c b/src/unk_02050A74.c index 0bc0777371..9e4053aa21 100644 --- a/src/unk_02050A74.c +++ b/src/unk_02050A74.c @@ -985,7 +985,7 @@ static void sub_02051988 (FieldSystem * fieldSystem, BattleParams * param1) if (fieldSystem->unk_78.unk_02 >= 5) { v0 = Party_GetPokemonBySlotIndex(param1->parties[1], 0); - v3 = sub_0202BECC(SaveData_GetPlaytime(fieldSystem->saveData), Pokemon_GetValue(v0, MON_DATA_SPECIES, 0), Pokemon_GetValue(v0, MON_DATA_GENDER, 0), param1->unk_138, 11); + v3 = sub_0202BECC(SaveData_GetPlayTime(fieldSystem->saveData), Pokemon_GetValue(v0, MON_DATA_SPECIES, 0), Pokemon_GetValue(v0, MON_DATA_GENDER, 0), param1->unk_138, 11); sub_0202B758(fieldSystem->unk_9C, v3, 2); } } else if (v2 == 0x4) { @@ -993,7 +993,7 @@ static void sub_02051988 (FieldSystem * fieldSystem, BattleParams * param1) v4 = param1->unk_148; v0 = Party_GetPokemonBySlotIndex(param1->parties[v4], 0); - v3 = sub_0202BE4C(SaveData_GetPlaytime(fieldSystem->saveData), Pokemon_GetValue(v0, MON_DATA_SPECIES, 0), Pokemon_GetValue(v0, MON_DATA_GENDER, 0), param1->unk_138, 11); + v3 = sub_0202BE4C(SaveData_GetPlayTime(fieldSystem->saveData), Pokemon_GetValue(v0, MON_DATA_SPECIES, 0), Pokemon_GetValue(v0, MON_DATA_GENDER, 0), param1->unk_138, 11); sub_0202B758(fieldSystem->unk_9C, v3, 2); } diff --git a/src/unk_02052C6C.c b/src/unk_02052C6C.c index 4c2cd4c596..173b597c81 100644 --- a/src/unk_02052C6C.c +++ b/src/unk_02052C6C.c @@ -197,7 +197,7 @@ void sub_02052E58 (TaskManager * param0) v5->unk_00 = sub_0206A954(v3); v5->unk_04.unk_00 = SaveData_GetTrainerInfo(fieldSystem->saveData); v5->unk_04.unk_04 = Party_GetFromSavedata(fieldSystem->saveData); - v5->unk_04.unk_08 = SaveData_GetPlaytime(fieldSystem->saveData); + v5->unk_04.playTime = SaveData_GetPlayTime(fieldSystem->saveData); v5->unk_10.unk_00 = TrainerInfo_Gender(SaveData_GetTrainerInfo(fieldSystem->saveData)); v5->unk_10.unk_04 = sub_0206A954(v3); v5->unk_10.unk_08 = SaveData_Pokedex(fieldSystem->saveData); diff --git a/src/unk_02071D40.c b/src/unk_02071D40.c index 4bb265a06b..9faf377335 100644 --- a/src/unk_02071D40.c +++ b/src/unk_02071D40.c @@ -1,7 +1,7 @@ #include #include -#include "struct_decls/playtime_decl.h" +#include "playtime.h" #include "trainer_info.h" #include "struct_decls/struct_0202855C_decl.h" #include "struct_decls/struct_0202C834_decl.h" @@ -40,7 +40,7 @@ typedef struct { static void sub_02072014(const u8 param0, const u8 param1, const u8 param2, const u8 param3, const u8 param4, TrainerCard * param5); static void sub_02072038(const u16 param0, const u8 param1, const u16 * param2, const u32 param3, const u32 param4, const BOOL param5, const u32 param6, TrainerCard * param7); -static void sub_0207207C(const u8 param0, const Playtime * param1, const RTCDate * param2, const RTCDate * param3, const RTCTime * param4, const u8 param5, TrainerCard * param6); +static void sub_0207207C(const u8 param0, const PlayTime *playTime, const RTCDate * param2, const RTCDate * param3, const RTCTime * param4, const u8 param5, TrainerCard * param6); static void sub_02072120(const u32 param0, const u32 param1, const u32 param2, const u32 param3, const u8 * param4, TrainerCard * param5); static void sub_0207216C(TrainerInfo * param0, FieldSystem * fieldSystem, TrainerCard * param2); static BOOL sub_02072230(TaskManager * param0); @@ -70,9 +70,9 @@ void sub_02071D40 (const u8 param0, const u8 param1, const u8 param2, const u8 p RTCDate v4; RTCDate v5; RTCTime v6; - Playtime * v7; + PlayTime * v7; - v7 = SaveData_GetPlaytime(v2); + v7 = SaveData_GetPlayTime(v2); sub_02055BF4(fieldSystem, &v4, &v6); sub_02055C10(fieldSystem, &v5, &v6); @@ -182,10 +182,10 @@ static void sub_02072038 (const u16 param0, const u8 param1, const u16 * param2, param7->unk_24 = param6; } -static void sub_0207207C (const u8 param0, const Playtime *playtime, const RTCDate * param2, const RTCDate * param3, const RTCTime * param4, const u8 param5, TrainerCard * trainerCard) +static void sub_0207207C (const u8 param0, const PlayTime *playtime, const RTCDate * param2, const RTCDate * param3, const RTCTime * param4, const u8 param5, TrainerCard * trainerCard) { - trainerCard->playtimeHours = Playtime_GetHours(playtime); - trainerCard->playtimeMinutes = Playtime_GetMinutes(playtime); + trainerCard->playtimeHours = PlayTime_GetHours(playtime); + trainerCard->playtimeMinutes = PlayTime_GetMinutes(playtime); trainerCard->unk_2F = param2->year; trainerCard->unk_30 = param2->month; trainerCard->unk_31 = param2->day; @@ -207,9 +207,9 @@ static void sub_0207207C (const u8 param0, const Playtime *playtime, const RTCDa trainerCard->unk_04_1 = param5; if (param5) { - trainerCard->unk_18 = playtime; + trainerCard->playTime = playtime; } else { - trainerCard->unk_18 = NULL; + trainerCard->playTime = NULL; } } From a6b217c0926f306430543f87c25d3fb9a8798c38 Mon Sep 17 00:00:00 2001 From: Fexty12573 Date: Mon, 10 Jun 2024 10:05:31 +0200 Subject: [PATCH 6/7] PR feedback (playtime -> playTime, playtime.* -> play_time.*) --- include/journal.h | 2 +- include/play_time.h | 16 ++++++++++++++++ include/playtime.h | 16 ---------------- include/struct_defs/struct_0203E234.h | 2 +- include/struct_defs/struct_02072014.h | 6 +++--- include/unk_02017428.h | 2 +- include/unk_02025E08.h | 2 +- platinum.us/main.lsf | 2 +- src/journal.c | 2 +- src/meson.build | 2 +- src/overlay005/ov5_021E1D20.c | 4 ++-- src/overlay061/ov61_0222B008.c | 8 ++++---- src/overlay062/ov62_0223CAEC.c | 2 +- src/overlay071/ov71_0223C69C.c | 6 +++--- src/overlay086/ov86_0223B140.c | 2 +- src/overlay097/ov97_0222AE60.c | 4 ++-- src/{playtime.c => play_time.c} | 2 +- src/unk_02017428.c | 2 +- src/unk_02025E08.c | 10 +++++----- src/unk_02071D40.c | 18 +++++++++--------- 20 files changed, 55 insertions(+), 55 deletions(-) create mode 100644 include/play_time.h delete mode 100644 include/playtime.h rename src/{playtime.c => play_time.c} (98%) diff --git a/include/journal.h b/include/journal.h index afa356549d..2209e6c92a 100644 --- a/include/journal.h +++ b/include/journal.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_JOURNAL_H #define POKEPLATINUM_JOURNAL_H -#include "playtime.h" +#include "play_time.h" #include "trainer_info.h" #include "savedata.h" diff --git a/include/play_time.h b/include/play_time.h new file mode 100644 index 0000000000..3dcf93c438 --- /dev/null +++ b/include/play_time.h @@ -0,0 +1,16 @@ +#ifndef POKEPLATINUM_PLAYTIME_H +#define POKEPLATINUM_PLAYTIME_H + +typedef struct PlayTime { + u16 hours; + u8 minutes; + u8 seconds; +} PlayTime; + +void PlayTime_Init(PlayTime *playTime); +void PlayTime_Increment(PlayTime *playTime, u32 seconds); +u16 PlayTime_GetHours(const PlayTime *playTime); +u8 PlayTime_GetMinutes(const PlayTime *playTime); +u8 PlayTime_GetSeconds(const PlayTime *playTime); + +#endif // POKEPLATINUM_PLAYTIME_H diff --git a/include/playtime.h b/include/playtime.h deleted file mode 100644 index defbe1d706..0000000000 --- a/include/playtime.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef POKEPLATINUM_PLAYTIME_H -#define POKEPLATINUM_PLAYTIME_H - -typedef struct PlayTime { - u16 hours; - u8 minutes; - u8 seconds; -} PlayTime; - -void PlayTime_Init(PlayTime *playtime); -void PlayTime_Increment(PlayTime *playtime, u32 seconds); -u16 PlayTime_GetHours(const PlayTime *playtime); -u8 PlayTime_GetMinutes(const PlayTime *playtime); -u8 PlayTime_GetSeconds(const PlayTime *playtime); - -#endif // POKEPLATINUM_PLAYTIME_H diff --git a/include/struct_defs/struct_0203E234.h b/include/struct_defs/struct_0203E234.h index bbe3deb206..4553b991b0 100644 --- a/include/struct_defs/struct_0203E234.h +++ b/include/struct_defs/struct_0203E234.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_0203E234_H #define POKEPLATINUM_STRUCT_0203E234_H -#include "playtime.h" +#include "play_time.h" #include "trainer_info.h" #include "struct_decls/struct_party_decl.h" diff --git a/include/struct_defs/struct_02072014.h b/include/struct_defs/struct_02072014.h index cab710222f..ee6858e96e 100644 --- a/include/struct_defs/struct_02072014.h +++ b/include/struct_defs/struct_02072014.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_STRUCT_02072014_H #define POKEPLATINUM_STRUCT_02072014_H -#include "playtime.h" +#include "play_time.h" #include "struct_defs/struct_02072014_sub1.h" typedef struct { @@ -22,9 +22,9 @@ typedef struct { u32 unk_20; u32 unk_24; u16 unk_28; - u16 playtimeHours; + u16 playTimeHours; u16 unk_2C; - u8 playtimeMinutes; + u8 playTimeMinutes; u8 unk_2F; u8 unk_30; u8 unk_31; diff --git a/include/unk_02017428.h b/include/unk_02017428.h index c654fad49a..ac92092911 100644 --- a/include/unk_02017428.h +++ b/include/unk_02017428.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_02017428_H #define POKEPLATINUM_UNK_02017428_H -#include "playtime.h" +#include "play_time.h" void sub_02017428(void); void sub_02017434(PlayTime *playTime); diff --git a/include/unk_02025E08.h b/include/unk_02025E08.h index 5e8471acd8..644139be56 100644 --- a/include/unk_02025E08.h +++ b/include/unk_02025E08.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_UNK_02025E08_H #include "struct_decls/struct_02025E0C_decl.h" -#include "playtime.h" +#include "play_time.h" #include "trainer_info.h" #include "game_options.h" #include "savedata.h" diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf index 0ccd6b1df8..bdb2847e95 100644 --- a/platinum.us/main.lsf +++ b/platinum.us/main.lsf @@ -126,7 +126,7 @@ Static main Object main.nef.p/src_unk_0202C7FC.c.o Object main.nef.p/src_unk_0202C858.c.o Object main.nef.p/src_unk_0202C9F4.c.o - Object main.nef.p/src_playtime.c.o + Object main.nef.p/src_play_time.c.o Object main.nef.p/src_unk_0202CC64.c.o Object main.nef.p/src_unk_0202CD50.c.o Object main.nef.p/src_unk_0202D05C.c.o diff --git a/src/journal.c b/src/journal.c index 913fd76b53..16a4ea8428 100644 --- a/src/journal.c +++ b/src/journal.c @@ -15,7 +15,7 @@ #include "savedata.h" #include "trainer_info.h" #include "journal.h" -#include "playtime.h" +#include "play_time.h" #include "map_header.h" typedef struct Journal_t { diff --git a/src/meson.build b/src/meson.build index a60b448079..2757322b5d 100644 --- a/src/meson.build +++ b/src/meson.build @@ -116,7 +116,7 @@ pokeplatinum_c = files( 'unk_0202C7FC.c', 'unk_0202C858.c', 'unk_0202C9F4.c', - 'playtime.c', + 'play_time.c', 'unk_0202CC64.c', 'unk_0202CD50.c', 'unk_0202D05C.c', diff --git a/src/overlay005/ov5_021E1D20.c b/src/overlay005/ov5_021E1D20.c index e4f6e3f195..196519747b 100644 --- a/src/overlay005/ov5_021E1D20.c +++ b/src/overlay005/ov5_021E1D20.c @@ -4,7 +4,7 @@ #include "message.h" #include "struct_decls/struct_02018340_decl.h" #include "strbuf.h" -#include "playtime.h" +#include "play_time.h" #include "trainer_info.h" #include "struct_decls/pokedexdata_decl.h" #include "savedata.h" @@ -27,7 +27,7 @@ #include "unk_02025E08.h" #include "trainer_info.h" #include "unk_0202631C.h" -#include "playtime.h" +#include "play_time.h" #include "unk_020366A0.h" #include "map_header.h" #include "field_overworld_state.h" diff --git a/src/overlay061/ov61_0222B008.c b/src/overlay061/ov61_0222B008.c index 118aa63c50..cb0e8673c5 100644 --- a/src/overlay061/ov61_0222B008.c +++ b/src/overlay061/ov61_0222B008.c @@ -5,7 +5,7 @@ #include "core_sys.h" #include "strbuf.h" -#include "playtime.h" +#include "play_time.h" #include "struct_decls/struct_02029C68_decl.h" #include "struct_decls/struct_020797DC_decl.h" @@ -234,15 +234,15 @@ int ov61_0222B2B8 (UnkStruct_ov62_022349A8 * param0) int ov61_0222B2D8 (UnkStruct_ov62_022349A8 * param0, UnkStruct_02030A80 * param1, UnkStruct_ov61_0222B2D8 param2[]) { - PlayTime * v0; + PlayTime * playTime; int v1; if (ov61_0222BBBC(param0) == 0) { return 0; } - v0 = SaveData_GetPlayTime(param0->unk_00); - MI_CpuCopy8(v0, ¶m0->unk_190.unk_00_val3.unk_08, sizeof(UnkStruct_ov62_0223D518_sub1_sub1)); + playTime = SaveData_GetPlayTime(param0->unk_00); + MI_CpuCopy8(playTime, ¶m0->unk_190.unk_00_val3.unk_08, sizeof(UnkStruct_ov62_0223D518_sub1_sub1)); ov61_0222AFCC(param0->unk_00, param1, ¶m0->unk_190.unk_00_val3.unk_00); for (v1 = 0; v1 < 3; v1++) { diff --git a/src/overlay062/ov62_0223CAEC.c b/src/overlay062/ov62_0223CAEC.c index 0bb411ce9e..0407cdce7a 100644 --- a/src/overlay062/ov62_0223CAEC.c +++ b/src/overlay062/ov62_0223CAEC.c @@ -33,7 +33,7 @@ #include "strbuf.h" #include "unk_02023FCC.h" #include "unk_02025E08.h" -#include "playtime.h" +#include "play_time.h" #include "unk_0202CD50.h" #include "unk_02030A80.h" #include "unk_0208B284.h" diff --git a/src/overlay071/ov71_0223C69C.c b/src/overlay071/ov71_0223C69C.c index 0f7093c48c..7189d547fc 100644 --- a/src/overlay071/ov71_0223C69C.c +++ b/src/overlay071/ov71_0223C69C.c @@ -15,7 +15,7 @@ #include "unk_02018340.h" #include "unk_0201D670.h" #include "strbuf.h" -#include "playtime.h" +#include "play_time.h" #include "overlay071/ov71_0223C69C.h" static void ov71_0223CD64(Window * param0, const u32 param1, const u32 param2, const u32 param3, Strbuf *param4, const u32 param5, const u8 param6, const int param7); @@ -136,8 +136,8 @@ void ov71_0223C6F0 (Window * param0, const TrainerCard * param1) StringTemplate_SetNumber(v4, 1, PlayTime_GetMinutes(param1->playTime), 2, 2, 1); MessageLoader_GetStrbuf(v1, 16, v3); } else { - StringTemplate_SetNumber(v4, 0, param1->playtimeHours, 3, 1, 1); - StringTemplate_SetNumber(v4, 1, param1->playtimeMinutes, 2, 2, 1); + StringTemplate_SetNumber(v4, 0, param1->playTimeHours, 3, 1, 1); + StringTemplate_SetNumber(v4, 1, param1->playTimeMinutes, 2, 2, 1); MessageLoader_GetStrbuf(v1, 15, v3); } diff --git a/src/overlay086/ov86_0223B140.c b/src/overlay086/ov86_0223B140.c index a263a2579b..4cb87f50fa 100644 --- a/src/overlay086/ov86_0223B140.c +++ b/src/overlay086/ov86_0223B140.c @@ -53,7 +53,7 @@ #include "unk_020218BC.h" #include "strbuf.h" #include "trainer_info.h" -#include "playtime.h" +#include "play_time.h" #include "pokemon.h" #include "party.h" #include "overlay086/ov86_0223B140.h" diff --git a/src/overlay097/ov97_0222AE60.c b/src/overlay097/ov97_0222AE60.c index 02b8251af7..50c55573ac 100644 --- a/src/overlay097/ov97_0222AE60.c +++ b/src/overlay097/ov97_0222AE60.c @@ -8,7 +8,7 @@ #include "struct_decls/struct_02022550_decl.h" #include "strbuf.h" #include "struct_decls/struct_0202442C_decl.h" -#include "playtime.h" +#include "play_time.h" #include "trainer_info.h" #include "struct_decls/pokedexdata_decl.h" #include "savedata.h" @@ -52,7 +52,7 @@ #include "unk_02025E08.h" #include "trainer_info.h" #include "unk_0202631C.h" -#include "playtime.h" +#include "play_time.h" #include "unk_0202DAB4.h" #include "unk_020366A0.h" #include "unk_0209A74C.h" diff --git a/src/playtime.c b/src/play_time.c similarity index 98% rename from src/playtime.c rename to src/play_time.c index 5a08f9f3fb..033e692a44 100644 --- a/src/playtime.c +++ b/src/play_time.c @@ -1,6 +1,6 @@ #include -#include "playtime.h" +#include "play_time.h" #define PLAYTIME_MAX_HOURS 999 #define PLAYTIME_MAX_MINUTES 59 diff --git a/src/unk_02017428.c b/src/unk_02017428.c index 3e60c56f16..767afee815 100644 --- a/src/unk_02017428.c +++ b/src/unk_02017428.c @@ -3,7 +3,7 @@ #include "unk_02017428.h" #include "unk_02022844.h" -#include "playtime.h" +#include "play_time.h" static BOOL Unk_021BF658 = 0; static u64 Unk_021BF668 = 0; diff --git a/src/unk_02025E08.c b/src/unk_02025E08.c index b148a3e9b7..5cbfa36278 100644 --- a/src/unk_02025E08.c +++ b/src/unk_02025E08.c @@ -9,13 +9,13 @@ #include "trainer_info.h" #include "game_options.h" #include "coins.h" -#include "playtime.h" +#include "play_time.h" struct UnkStruct_02025E0C_t { Options unk_00; TrainerInfo unk_04; u16 unk_24; - PlayTime playtime; + PlayTime playTime; }; int Player_SaveSize (void) @@ -30,7 +30,7 @@ void Player_Init (UnkStruct_02025E0C * param0) Options_Init(¶m0->unk_00); TrainerInfo_Init(¶m0->unk_04); Coins_Init(¶m0->unk_24); - PlayTime_Init(¶m0->playtime); + PlayTime_Init(¶m0->playTime); } TrainerInfo * SaveData_GetTrainerInfo (SaveData * param0) @@ -59,6 +59,6 @@ u16 * sub_02025E50 (SaveData * param0) PlayTime *SaveData_GetPlayTime(SaveData *savedata) { - UnkStruct_02025E0C *player = SaveData_SaveTable(savedata, 1); - return &player->playtime; + UnkStruct_02025E0C *v0 = SaveData_SaveTable(savedata, 1); + return &v0->playTime; } diff --git a/src/unk_02071D40.c b/src/unk_02071D40.c index 9faf377335..dae8ac51d9 100644 --- a/src/unk_02071D40.c +++ b/src/unk_02071D40.c @@ -1,7 +1,7 @@ #include #include -#include "playtime.h" +#include "play_time.h" #include "trainer_info.h" #include "struct_decls/struct_0202855C_decl.h" #include "struct_decls/struct_0202C834_decl.h" @@ -21,7 +21,7 @@ #include "unk_0202631C.h" #include "unk_0202854C.h" #include "unk_0202C7FC.h" -#include "playtime.h" +#include "play_time.h" #include "unk_0202CD50.h" #include "unk_0203061C.h" #include "field_system.h" @@ -70,13 +70,13 @@ void sub_02071D40 (const u8 param0, const u8 param1, const u8 param2, const u8 p RTCDate v4; RTCDate v5; RTCTime v6; - PlayTime * v7; + PlayTime * playTime; - v7 = SaveData_GetPlayTime(v2); + playTime = SaveData_GetPlayTime(v2); sub_02055BF4(fieldSystem, &v4, &v6); sub_02055C10(fieldSystem, &v5, &v6); - sub_0207207C(sub_0206A954(SaveData_GetVarsFlags(fieldSystem->saveData)), v7, &v4, &v5, &v6, param1, param5); + sub_0207207C(sub_0206A954(SaveData_GetVarsFlags(fieldSystem->saveData)), playTime, &v4, &v5, &v6, param1, param5); } { @@ -182,10 +182,10 @@ static void sub_02072038 (const u16 param0, const u8 param1, const u16 * param2, param7->unk_24 = param6; } -static void sub_0207207C (const u8 param0, const PlayTime *playtime, const RTCDate * param2, const RTCDate * param3, const RTCTime * param4, const u8 param5, TrainerCard * trainerCard) +static void sub_0207207C (const u8 param0, const PlayTime *playTime, const RTCDate * param2, const RTCDate * param3, const RTCTime * param4, const u8 param5, TrainerCard * trainerCard) { - trainerCard->playtimeHours = PlayTime_GetHours(playtime); - trainerCard->playtimeMinutes = PlayTime_GetMinutes(playtime); + trainerCard->playTimeHours = PlayTime_GetHours(playTime); + trainerCard->playTimeMinutes = PlayTime_GetMinutes(playTime); trainerCard->unk_2F = param2->year; trainerCard->unk_30 = param2->month; trainerCard->unk_31 = param2->day; @@ -207,7 +207,7 @@ static void sub_0207207C (const u8 param0, const PlayTime *playtime, const RTCDa trainerCard->unk_04_1 = param5; if (param5) { - trainerCard->playTime = playtime; + trainerCard->playTime = playTime; } else { trainerCard->playTime = NULL; } From 9c21b43be78840fd0c3b734965cb2f0420a5c89e Mon Sep 17 00:00:00 2001 From: Fexty12573 Date: Wed, 12 Jun 2024 08:06:20 +0200 Subject: [PATCH 7/7] Constants for clarity + remove unnecessary includes --- src/overlay005/ov5_021E1D20.c | 1 - src/overlay097/ov97_0222AE60.c | 1 - src/play_time.c | 14 ++++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/overlay005/ov5_021E1D20.c b/src/overlay005/ov5_021E1D20.c index 196519747b..dee2fc2837 100644 --- a/src/overlay005/ov5_021E1D20.c +++ b/src/overlay005/ov5_021E1D20.c @@ -4,7 +4,6 @@ #include "message.h" #include "struct_decls/struct_02018340_decl.h" #include "strbuf.h" -#include "play_time.h" #include "trainer_info.h" #include "struct_decls/pokedexdata_decl.h" #include "savedata.h" diff --git a/src/overlay097/ov97_0222AE60.c b/src/overlay097/ov97_0222AE60.c index 50c55573ac..c5cf27a80d 100644 --- a/src/overlay097/ov97_0222AE60.c +++ b/src/overlay097/ov97_0222AE60.c @@ -52,7 +52,6 @@ #include "unk_02025E08.h" #include "trainer_info.h" #include "unk_0202631C.h" -#include "play_time.h" #include "unk_0202DAB4.h" #include "unk_020366A0.h" #include "unk_0209A74C.h" diff --git a/src/play_time.c b/src/play_time.c index 033e692a44..dd5e181ffb 100644 --- a/src/play_time.c +++ b/src/play_time.c @@ -2,9 +2,11 @@ #include "play_time.h" +#define SECONDS_PER_MINUTE 60 +#define MINUTES_PER_HOUR 60 #define PLAYTIME_MAX_HOURS 999 -#define PLAYTIME_MAX_MINUTES 59 -#define PLAYTIME_MAX_SECONDS 59 +#define PLAYTIME_MAX_MINUTES (MINUTES_PER_HOUR - 1) +#define PLAYTIME_MAX_SECONDS (SECONDS_PER_MINUTE - 1) void PlayTime_Init(PlayTime *playTime) { @@ -26,12 +28,12 @@ void PlayTime_Increment(PlayTime *playTime, u32 seconds) u32 newSeconds = playTime->seconds + seconds; if (newSeconds > PLAYTIME_MAX_SECONDS) { - minutes = playTime->minutes + newSeconds / (PLAYTIME_MAX_SECONDS + 1); - newSeconds %= PLAYTIME_MAX_SECONDS + 1; + minutes = playTime->minutes + newSeconds / SECONDS_PER_MINUTE; + newSeconds %= SECONDS_PER_MINUTE; if (minutes > PLAYTIME_MAX_MINUTES) { - hours = playTime->hours + minutes / (PLAYTIME_MAX_MINUTES + 1); - minutes %= PLAYTIME_MAX_MINUTES + 1; + hours = playTime->hours + minutes / MINUTES_PER_HOUR; + minutes %= MINUTES_PER_HOUR; if (hours >= PLAYTIME_MAX_HOURS) { hours = PLAYTIME_MAX_HOURS;