From 2df0c5aac6980add0aa80be924d5e5ddb2a67762 Mon Sep 17 00:00:00 2001 From: Rachel Date: Fri, 21 Jun 2024 13:27:07 -0700 Subject: [PATCH] Document Trainer Score incrementing functions --- consts/game_records.json | 59 ++++++++++++- include/game_records.h | 15 ++-- src/battle/ov16_0223DF00.c | 2 +- src/comm_player_manager.c | 2 +- src/game_records.c | 142 ++++++++++++++++---------------- src/overlay005/field_control.c | 2 +- src/overlay022/ov22_02255D44.c | 2 +- src/overlay023/ov23_0223E140.c | 2 +- src/overlay023/ov23_0224340C.c | 2 +- src/overlay023/ov23_022499E4.c | 2 +- src/overlay023/ov23_0224A1D0.c | 2 +- src/overlay023/ov23_0224B05C.c | 4 +- src/overlay023/ov23_0224DC40.c | 6 +- src/overlay023/ov23_02253598.c | 4 +- src/overlay059/ov59_021D0D80.c | 2 +- src/overlay062/ov62_02231690.c | 2 +- src/overlay067/ov67_0225C700.c | 2 +- src/overlay072/ov72_0223D7A0.c | 2 +- src/overlay076/ov76_0223D338.c | 2 +- src/overlay083/ov83_0223B5A0.c | 4 +- src/overlay094/ov94_02242AD0.c | 4 +- src/overlay104/ov104_0222FBE4.c | 2 +- src/overlay109/ov109_021D0D80.c | 2 +- src/overlay109/ov109_021D3D50.c | 2 +- src/scrcmd.c | 4 +- src/unk_0202F180.c | 2 +- src/unk_0203D1B8.c | 4 +- src/unk_02048DD8.c | 2 +- src/unk_02049D08.c | 2 +- src/unk_0204B64C.c | 2 +- src/unk_02050A74.c | 16 ++-- src/unk_020562F8.c | 2 +- src/unk_02071D40.c | 2 +- src/unk_0207AE68.c | 4 +- src/unk_0207DA28.c | 2 +- src/unk_020933F8.c | 4 +- src/unk_02097624.c | 2 +- 37 files changed, 187 insertions(+), 131 deletions(-) diff --git a/consts/game_records.json b/consts/game_records.json index 0efb2fc6f0..c0f5675040 100644 --- a/consts/game_records.json +++ b/consts/game_records.json @@ -4,7 +4,7 @@ "type": "enum", "values": [ "RECORD_UNK_000", - "RECORD_UNK_001", + "RECORD_TRAINER_SCORE", "RECORD_UNK_002", "RECORD_UNK_003", "RECORD_UNK_004", @@ -153,6 +153,63 @@ "RECORD_UNK_147", "MAX_RECORDS" ] + }, + "@TrainerScoreEvent": { + "type": "enum", + "values": [ + "TRAINER_SCORE_EVENT_UNK_00", + "TRAINER_SCORE_EVENT_UNK_01", + "TRAINER_SCORE_EVENT_UNK_02", + "TRAINER_SCORE_EVENT_UNK_03", + "TRAINER_SCORE_EVENT_UNK_04", + "TRAINER_SCORE_EVENT_UNK_05", + "TRAINER_SCORE_EVENT_UNK_06", + "TRAINER_SCORE_EVENT_UNK_07", + "TRAINER_SCORE_EVENT_UNK_08", + "TRAINER_SCORE_EVENT_UNK_09", + "TRAINER_SCORE_EVENT_UNK_10", + "TRAINER_SCORE_EVENT_UNK_11", + "TRAINER_SCORE_EVENT_UNK_12", + "TRAINER_SCORE_EVENT_UNK_13", + "TRAINER_SCORE_EVENT_UNK_14", + "TRAINER_SCORE_EVENT_UNK_15", + "TRAINER_SCORE_EVENT_UNK_16", + "TRAINER_SCORE_EVENT_UNK_17", + "TRAINER_SCORE_EVENT_UNK_18", + "TRAINER_SCORE_EVENT_UNK_19", + "TRAINER_SCORE_EVENT_UNK_20", + "TRAINER_SCORE_EVENT_UNK_21", + "TRAINER_SCORE_EVENT_CAUGHT_SPECIES", + "TRAINER_SCORE_EVENT_UNK_23", + "TRAINER_SCORE_EVENT_UNK_24", + "TRAINER_SCORE_EVENT_UNK_25", + "TRAINER_SCORE_EVENT_UNK_26", + "TRAINER_SCORE_EVENT_UNK_27", + "TRAINER_SCORE_EVENT_UNK_28", + "TRAINER_SCORE_EVENT_UNK_29", + "TRAINER_SCORE_EVENT_UNK_30", + "TRAINER_SCORE_EVENT_UNK_31", + "TRAINER_SCORE_EVENT_UNK_32", + "TRAINER_SCORE_EVENT_UNK_33", + "TRAINER_SCORE_EVENT_UNK_34", + "TRAINER_SCORE_EVENT_UNK_35", + "TRAINER_SCORE_EVENT_UNK_36", + "TRAINER_SCORE_EVENT_UNK_37", + "TRAINER_SCORE_EVENT_UNK_38", + "TRAINER_SCORE_EVENT_UNK_39", + "TRAINER_SCORE_EVENT_UNK_40", + "TRAINER_SCORE_EVENT_UNK_41", + "TRAINER_SCORE_EVENT_UNK_42", + "TRAINER_SCORE_EVENT_UNK_43", + "TRAINER_SCORE_EVENT_UNK_44", + "TRAINER_SCORE_EVENT_UNK_45", + "TRAINER_SCORE_EVENT_UNK_46", + "TRAINER_SCORE_EVENT_UNK_47", + "TRAINER_SCORE_EVENT_UNK_48", + "TRAINER_SCORE_EVENT_UNK_49", + "TRAINER_SCORE_EVENT_UNK_50", + "MAX_TRAINER_SCORE_EVENTS" + ] } } } diff --git a/include/game_records.h b/include/game_records.h index 000bcf1312..ad7f5671dd 100644 --- a/include/game_records.h +++ b/include/game_records.h @@ -7,10 +7,11 @@ #define NUM_U32_RECORDS 71 #define NUM_U16_RECORDS 77 -#define HIGH_LIMIT_U32 999999999 -#define LOW_LIMIT_U32 999999 -#define HIGH_LIMIT_U16 0xFFFF -#define LOW_LIMIT_U16 9999 +#define TRAINER_SCORE_LIMIT 99999999 +#define HIGH_LIMIT_U32 999999999 +#define LOW_LIMIT_U32 999999 +#define HIGH_LIMIT_U16 0xFFFF +#define LOW_LIMIT_U16 9999 typedef struct EncodingSeed { u16 byteSum; @@ -33,8 +34,8 @@ u32 GameRecords_SetAndLimitRecordValue(GameRecords * records, int param1, u32 pa u32 GameRecords_IncrementRecordValue(GameRecords * records, int param1); u32 GameRecords_AddToRecordValue(GameRecords * records, int param1, u32 param2); u32 GameRecords_GetRecordValue(GameRecords * records, int param1); -void sub_0202CFEC(GameRecords * records, int param1); -u32 sub_0202D034(GameRecords * records); -void sub_0202D040(GameRecords * records, const PokedexData * param1, u16 const param2); +void GameRecords_IncrementTrainerScore(GameRecords * records, int param1); +u32 GameRecords_GetTrainerScore(GameRecords * records); +void GameRecords_IncrementTrainerScoreOnCatch(GameRecords * records, const PokedexData * param1, u16 const param2); #endif // POKEPLATINUM_UNK_0202CD50_H diff --git a/src/battle/ov16_0223DF00.c b/src/battle/ov16_0223DF00.c index 1f44011096..dfb5f119f9 100644 --- a/src/battle/ov16_0223DF00.c +++ b/src/battle/ov16_0223DF00.c @@ -1275,7 +1275,7 @@ void ov16_0223F268 (BattleSystem * param0) return; } - sub_0202CFEC(param0->unk_218, 22); + GameRecords_IncrementTrainerScore(param0->unk_218, 22); } void BattleSystem_SetCommandSelectionFlags (BattleSystem *battleSys, int flags) diff --git a/src/comm_player_manager.c b/src/comm_player_manager.c index f3dd3a8664..9b5932e639 100644 --- a/src/comm_player_manager.c +++ b/src/comm_player_manager.c @@ -930,7 +930,7 @@ static void sub_02058644 (int netId) sub_0202929C(underground); if (sub_020292B4(underground) == 50) { - sub_0202CFEC(SaveData_GetGameRecordsPtr(sCommPlayerManager->fieldSystem->saveData), 37); + GameRecords_IncrementTrainerScore(SaveData_GetGameRecordsPtr(sCommPlayerManager->fieldSystem->saveData), 37); } } } diff --git a/src/game_records.c b/src/game_records.c index da5703a35d..54cb0fde24 100644 --- a/src/game_records.c +++ b/src/game_records.c @@ -10,7 +10,7 @@ #include "unk_0202631C.h" #include "game_records.h" -#define START_ENCODED_RECORDS RECORD_UNK_001 +#define START_ENCODED_RECORDS RECORD_TRAINER_SCORE #define SIZE_ENCODED_RECORDS (sizeof(GameRecords) - sizeof(EncodingSeed) - (START_ENCODED_RECORDS * sizeof(u32))) static void EncodeGameRecords(GameRecords *records, int id); @@ -18,6 +18,7 @@ static void DecodeGameRecords(GameRecords *records, int id); static u32 GetRecordValue(const GameRecords *records, int id); static u32 SetRecordValue(GameRecords *records, int id, u32 val); static u32 GetRecordLimit(int id); +static int GetTrainerScoreIncrement(int records); int GameRecords_SaveSize(void) { @@ -89,7 +90,7 @@ static u32 SetRecordValue(GameRecords *records, int id, u32 val) static u8 sUsesHighLimit[MAX_RECORDS] = { [RECORD_UNK_000] = TRUE, - [RECORD_UNK_001] = TRUE, + [RECORD_TRAINER_SCORE] = TRUE, [RECORD_UNK_002] = TRUE, [RECORD_UNK_003] = FALSE, [RECORD_UNK_004] = TRUE, @@ -258,63 +259,63 @@ static u32 GetRecordLimit(int id) return 0; } -static int sub_0202CE84 (int records) -{ - static const u16 v0[51] = { - 0x1, - 0x1, - 0x1, - 0x1, - 0x1, - 0x1, - 0x2, - 0x2, - 0x2, - 0x2, - 0x3, - 0x3, - 0x3, - 0x7, - 0x7, - 0x7, - 0xA, - 0xA, - 0xB, - 0xB, - 0xB, - 0xB, - 0x14, - 0x1E, - 0x23, - 0x28, - 0x1F4, - 0x2710, - 0x1E, - 0x1E, - 0x2, - 0x5, - 0x1, - 0x1, - 0x5, - 0x3, - 0x1, - 0x1, - 0x7, - 0x7, - 0x7, - 0x7, - 0x3E8, - 0xB, - 0x14, - 0xA, - 0xF, - 0xB, - 0xB, - 0xA, - 0xA - }; +static const u16 sTrainerScoreIncrements[MAX_TRAINER_SCORE_EVENTS] = { + [TRAINER_SCORE_EVENT_UNK_00] = 1, + [TRAINER_SCORE_EVENT_UNK_01] = 1, + [TRAINER_SCORE_EVENT_UNK_02] = 1, + [TRAINER_SCORE_EVENT_UNK_03] = 1, + [TRAINER_SCORE_EVENT_UNK_04] = 1, + [TRAINER_SCORE_EVENT_UNK_05] = 1, + [TRAINER_SCORE_EVENT_UNK_06] = 2, + [TRAINER_SCORE_EVENT_UNK_07] = 2, + [TRAINER_SCORE_EVENT_UNK_08] = 2, + [TRAINER_SCORE_EVENT_UNK_09] = 2, + [TRAINER_SCORE_EVENT_UNK_10] = 3, + [TRAINER_SCORE_EVENT_UNK_11] = 3, + [TRAINER_SCORE_EVENT_UNK_12] = 3, + [TRAINER_SCORE_EVENT_UNK_13] = 7, + [TRAINER_SCORE_EVENT_UNK_14] = 7, + [TRAINER_SCORE_EVENT_UNK_15] = 7, + [TRAINER_SCORE_EVENT_UNK_16] = 10, + [TRAINER_SCORE_EVENT_UNK_17] = 10, + [TRAINER_SCORE_EVENT_UNK_18] = 11, + [TRAINER_SCORE_EVENT_UNK_19] = 11, + [TRAINER_SCORE_EVENT_UNK_20] = 11, + [TRAINER_SCORE_EVENT_UNK_21] = 11, + [TRAINER_SCORE_EVENT_CAUGHT_SPECIES] = 20, + [TRAINER_SCORE_EVENT_UNK_23] = 30, + [TRAINER_SCORE_EVENT_UNK_24] = 35, + [TRAINER_SCORE_EVENT_UNK_25] = 40, + [TRAINER_SCORE_EVENT_UNK_26] = 500, + [TRAINER_SCORE_EVENT_UNK_27] = 10000, + [TRAINER_SCORE_EVENT_UNK_28] = 30, + [TRAINER_SCORE_EVENT_UNK_29] = 30, + [TRAINER_SCORE_EVENT_UNK_30] = 2, + [TRAINER_SCORE_EVENT_UNK_31] = 5, + [TRAINER_SCORE_EVENT_UNK_32] = 1, + [TRAINER_SCORE_EVENT_UNK_33] = 1, + [TRAINER_SCORE_EVENT_UNK_34] = 5, + [TRAINER_SCORE_EVENT_UNK_35] = 3, + [TRAINER_SCORE_EVENT_UNK_36] = 1, + [TRAINER_SCORE_EVENT_UNK_37] = 1, + [TRAINER_SCORE_EVENT_UNK_38] = 7, + [TRAINER_SCORE_EVENT_UNK_39] = 7, + [TRAINER_SCORE_EVENT_UNK_40] = 7, + [TRAINER_SCORE_EVENT_UNK_41] = 7, + [TRAINER_SCORE_EVENT_UNK_42] = 1000, + [TRAINER_SCORE_EVENT_UNK_43] = 11, + [TRAINER_SCORE_EVENT_UNK_44] = 20, + [TRAINER_SCORE_EVENT_UNK_45] = 10, + [TRAINER_SCORE_EVENT_UNK_46] = 15, + [TRAINER_SCORE_EVENT_UNK_47] = 11, + [TRAINER_SCORE_EVENT_UNK_48] = 11, + [TRAINER_SCORE_EVENT_UNK_49] = 10, + [TRAINER_SCORE_EVENT_UNK_50] = 10, +}; - return v0[records]; +static int GetTrainerScoreIncrement(int records) +{ + return sTrainerScoreIncrements[records]; } static inline u32 SetRecordValueWithLimit(GameRecords *records, int id, u32 val, u32 limit) @@ -393,29 +394,26 @@ u32 GameRecords_GetRecordValue(GameRecords *records, int id) return cur > limit ? limit : cur; } -void sub_0202CFEC (GameRecords * records, int param1) +void GameRecords_IncrementTrainerScore(GameRecords *records, int id) { - u32 v0; + GF_ASSERT(id < MAX_TRAINER_SCORE_EVENTS); - GF_ASSERT(param1 < 51); - - v0 = GameRecords_GetRecordValue(records, (0 + 1)); - - if (v0 + sub_0202CE84(param1) > 99999999) { - GameRecords_SetRecordValue(records, (0 + 1), 99999999); + u32 cur = GameRecords_GetRecordValue(records, RECORD_TRAINER_SCORE); + if (cur + GetTrainerScoreIncrement(id) > TRAINER_SCORE_LIMIT) { + GameRecords_SetRecordValue(records, RECORD_TRAINER_SCORE, TRAINER_SCORE_LIMIT); } else { - GameRecords_AddToRecordValue(records, (0 + 1), sub_0202CE84(param1)); + GameRecords_AddToRecordValue(records, RECORD_TRAINER_SCORE, GetTrainerScoreIncrement(id)); } } -u32 sub_0202D034 (GameRecords * records) +u32 GameRecords_GetTrainerScore (GameRecords *records) { - return GameRecords_GetRecordValue(records, (0 + 1)); + return GameRecords_GetRecordValue(records, RECORD_TRAINER_SCORE); } -void sub_0202D040 (GameRecords * records, const PokedexData * param1, u16 const param2) +void GameRecords_IncrementTrainerScoreOnCatch(GameRecords *records, const PokedexData *pokedex, const u16 species) { - if (!Pokedex_CaughtSpecies(param1, param2)) { - sub_0202CFEC(records, 22); + if (!Pokedex_CaughtSpecies(pokedex, species)) { + GameRecords_IncrementTrainerScore(records, TRAINER_SCORE_EVENT_CAUGHT_SPECIES); } } diff --git a/src/overlay005/field_control.c b/src/overlay005/field_control.c index ce3313dfc6..06fd3edb88 100644 --- a/src/overlay005/field_control.c +++ b/src/overlay005/field_control.c @@ -833,7 +833,7 @@ static BOOL Field_UpdateDaycare (FieldSystem *fieldSystem) GameRecords *v2 = SaveData_GetGameRecordsPtr(fieldSystem->saveData); GameRecords_IncrementRecordValue(v2, (1 + 10)); - sub_0202CFEC(v2, 15); + GameRecords_IncrementTrainerScore(v2, 15); sub_0203E880(fieldSystem, 2031, NULL); return TRUE; diff --git a/src/overlay022/ov22_02255D44.c b/src/overlay022/ov22_02255D44.c index 3e757f971b..35c4b4a462 100644 --- a/src/overlay022/ov22_02255D44.c +++ b/src/overlay022/ov22_02255D44.c @@ -368,7 +368,7 @@ int ov22_02256098 (OverlayManager * param0, int * param1) UnkStruct_0203DA00 * v2 = OverlayManager_Args(param0); if (v0->unk_71C == 1) { - sub_0202CFEC(v2->unk_10, 7); + GameRecords_IncrementTrainerScore(v2->unk_10, 7); ov22_02256F38(v2->unk_04, &v0->unk_458, v2->unk_14); } diff --git a/src/overlay023/ov23_0223E140.c b/src/overlay023/ov23_0223E140.c index d4e5312a8e..6a01f4d9a1 100644 --- a/src/overlay023/ov23_0223E140.c +++ b/src/overlay023/ov23_0223E140.c @@ -2748,7 +2748,7 @@ static BOOL ov23_02240CFC (UnkStruct_ov23_0223EE80 * param0) if (ov23_02240934(param0)) { sub_02029220(v2); - sub_0202CFEC(SaveData_GetGameRecordsPtr(Unk_ov23_02257740->fieldSystem->saveData), 30); + GameRecords_IncrementTrainerScore(SaveData_GetGameRecordsPtr(Unk_ov23_02257740->fieldSystem->saveData), 30); param0->unk_00 = 14; param0->unk_08 = 25; param0->unk_50 = 1; diff --git a/src/overlay023/ov23_0224340C.c b/src/overlay023/ov23_0224340C.c index 295f7ae862..09f1799a04 100644 --- a/src/overlay023/ov23_0224340C.c +++ b/src/overlay023/ov23_0224340C.c @@ -2559,7 +2559,7 @@ void ov23_022455B4 (int param0, int param1, void * param2, void * param3) if (v0->unk_00 == CommSys_CurNetId()) { sub_02029744(v1); - sub_0202CFEC(SaveData_GetGameRecordsPtr(Unk_ov23_02257764->fieldSystem->saveData), 34); + GameRecords_IncrementTrainerScore(SaveData_GetGameRecordsPtr(Unk_ov23_02257764->fieldSystem->saveData), 34); sub_020594FC(); ov23_02254068(ov23_0224219C(), CommInfo_TrainerInfo(v0->unk_01)); diff --git a/src/overlay023/ov23_022499E4.c b/src/overlay023/ov23_022499E4.c index 4001720367..1840334a5c 100644 --- a/src/overlay023/ov23_022499E4.c +++ b/src/overlay023/ov23_022499E4.c @@ -88,7 +88,7 @@ void ov23_02249A2C (void) FieldCommunicationManager * v0 = FieldCommMan_Get(); v0->unk_41 = 1; - sub_0202CFEC(SaveData_GetGameRecordsPtr(v0->fieldSystem->saveData), 36); + GameRecords_IncrementTrainerScore(SaveData_GetGameRecordsPtr(v0->fieldSystem->saveData), 36); ov23_02242BC0(v0->fieldSystem); ov23_02249C24(ov23_02249C34, 0); diff --git a/src/overlay023/ov23_0224A1D0.c b/src/overlay023/ov23_0224A1D0.c index 7d06907bad..9d21a5d662 100644 --- a/src/overlay023/ov23_0224A1D0.c +++ b/src/overlay023/ov23_0224A1D0.c @@ -81,7 +81,7 @@ static void ov23_0224A204 (int param0) if (param0 == CommSys_CurNetId()) { if (commPlayerMan->unk_290[param0] != NULL) { - sub_0202CFEC(SaveData_GetGameRecordsPtr(commPlayerMan->fieldSystem->saveData), 28); + GameRecords_IncrementTrainerScore(SaveData_GetGameRecordsPtr(commPlayerMan->fieldSystem->saveData), 28); if (commPlayerMan->unk_27C[5 - 1]) { Heap_FreeToHeap(commPlayerMan->unk_27C[5 - 1]); diff --git a/src/overlay023/ov23_0224B05C.c b/src/overlay023/ov23_0224B05C.c index 7ba4adac80..2090bef9cb 100644 --- a/src/overlay023/ov23_0224B05C.c +++ b/src/overlay023/ov23_0224B05C.c @@ -384,7 +384,7 @@ void ov23_0224B2C8 (FieldSystem * fieldSystem) v0 = sub_02029894(FieldSystem_SaveData(fieldSystem)); v1 = sub_020298AC(v0); - sub_020294D4(v1, sub_0202D034(SaveData_GetGameRecordsPtr(fieldSystem->saveData))); + sub_020294D4(v1, GameRecords_GetTrainerScore(SaveData_GetGameRecordsPtr(fieldSystem->saveData))); MI_CpuCopy8(v0, Unk_ov23_022577AC->unk_08[16].unk_02, 148); ov23_0224B39C(v0, Unk_ov23_022577AC->unk_A04[16]); @@ -2026,7 +2026,7 @@ void ov23_0224CF18 (int param0, int param1, void * param2, void * param3) void * v6 = sub_0202BE20(11); sub_0202B758(Unk_ov23_022577AC->fieldSystem->unk_9C, v6, 1); - sub_0202CFEC(SaveData_GetGameRecordsPtr(Unk_ov23_022577AC->fieldSystem->saveData), 35); + GameRecords_IncrementTrainerScore(SaveData_GetGameRecordsPtr(Unk_ov23_022577AC->fieldSystem->saveData), 35); } } } diff --git a/src/overlay023/ov23_0224DC40.c b/src/overlay023/ov23_0224DC40.c index 0318c7bc12..77777398de 100644 --- a/src/overlay023/ov23_0224DC40.c +++ b/src/overlay023/ov23_0224DC40.c @@ -643,7 +643,7 @@ static void ov23_0224E2D8 (SysTask * param0, void * param1) case 10: break; case 11: - sub_0202CFEC(SaveData_GetGameRecordsPtr(v0->fieldSystem->saveData), 32); + GameRecords_IncrementTrainerScore(SaveData_GetGameRecordsPtr(v0->fieldSystem->saveData), 32); ov23_022539E8(); ov23_0224DC68(v0, 9); v0->unk_37 = 12; @@ -739,7 +739,7 @@ static void ov23_0224E2D8 (SysTask * param0, void * param1) sub_0206B3FC(v2, sub_0206B3EC(v2) + 1); } - sub_0202CFEC(SaveData_GetGameRecordsPtr(v0->fieldSystem->saveData), 31); + GameRecords_IncrementTrainerScore(SaveData_GetGameRecordsPtr(v0->fieldSystem->saveData), 31); v0->unk_37 = 25; break; case 25: @@ -807,7 +807,7 @@ static void ov23_0224E2D8 (SysTask * param0, void * param1) break; case 36: if (ov23_02254238(ov23_0224219C()) == 0) { - sub_0202CFEC(SaveData_GetGameRecordsPtr(v0->fieldSystem->saveData), 33); + GameRecords_IncrementTrainerScore(SaveData_GetGameRecordsPtr(v0->fieldSystem->saveData), 33); ov23_0224DC68(v0, 142); v0->unk_37 = 37; } diff --git a/src/overlay023/ov23_02253598.c b/src/overlay023/ov23_02253598.c index 7a54a724b3..0304bc7994 100644 --- a/src/overlay023/ov23_02253598.c +++ b/src/overlay023/ov23_02253598.c @@ -392,7 +392,7 @@ void ov23_02253834 (BGL * param0, TrainerInfo * param1, UnkFuncPtr_ov23_02253834 void ov23_022538FC (int param0) { int v0 = sub_02028558(); - int v1 = sub_0202D034(SaveData_GetGameRecordsPtr(Unk_ov23_022577BC->unk_08)); + int v1 = GameRecords_GetTrainerScore(SaveData_GetGameRecordsPtr(Unk_ov23_022577BC->unk_08)); u8 * v2 = Heap_AllocFromHeap(4, v0 + 1); MI_CpuClear8(v2, v0 + 1); @@ -412,7 +412,7 @@ void ov23_022538FC (int param0) void ov23_02253968 (void) { - int v0 = sub_0202D034(SaveData_GetGameRecordsPtr(Unk_ov23_022577BC->unk_08)); + int v0 = GameRecords_GetTrainerScore(SaveData_GetGameRecordsPtr(Unk_ov23_022577BC->unk_08)); if (v0 >= 999999) { v0 = 999999; diff --git a/src/overlay059/ov59_021D0D80.c b/src/overlay059/ov59_021D0D80.c index 8902454e56..99860d71d4 100644 --- a/src/overlay059/ov59_021D0D80.c +++ b/src/overlay059/ov59_021D0D80.c @@ -1093,7 +1093,7 @@ static int ov59_021D1DC8 (UnkStruct_020961E8 * param0, int param1) v0 = sub_0202C1B4(51); sub_0202B758(param0->unk_08->unk_10, v0, 4); - sub_0202CFEC(param0->unk_08->unk_0C, 20); + GameRecords_IncrementTrainerScore(param0->unk_08->unk_0C, 20); sub_02038ED4(¶m0->unk_404); param0->unk_3A8 = 28; diff --git a/src/overlay062/ov62_02231690.c b/src/overlay062/ov62_02231690.c index 4f4182def4..b1071a2397 100644 --- a/src/overlay062/ov62_02231690.c +++ b/src/overlay062/ov62_02231690.c @@ -2507,7 +2507,7 @@ void ov62_02233704 (UnkStruct_0208C06C * param0, u32 param1) GameRecords * v0; v0 = SaveData_GetGameRecordsPtr(param0->unk_830); - sub_0202CFEC(v0, param1); + GameRecords_IncrementTrainerScore(v0, param1); } void ov62_0223371C (UnkStruct_0208C06C * param0) diff --git a/src/overlay067/ov67_0225C700.c b/src/overlay067/ov67_0225C700.c index 2b8db08487..a80b6a33b6 100644 --- a/src/overlay067/ov67_0225C700.c +++ b/src/overlay067/ov67_0225C700.c @@ -278,7 +278,7 @@ int ov67_0225C820 (OverlayManager * param0, int * param1) GameRecords * v4; v4 = SaveData_GetGameRecordsPtr(v0->unk_00); - sub_0202CFEC(v4, 44); + GameRecords_IncrementTrainerScore(v4, 44); } { diff --git a/src/overlay072/ov72_0223D7A0.c b/src/overlay072/ov72_0223D7A0.c index ec6082f5bf..68c505b401 100644 --- a/src/overlay072/ov72_0223D7A0.c +++ b/src/overlay072/ov72_0223D7A0.c @@ -769,7 +769,7 @@ static int ov72_0223E488 (UnkStruct_ov72_0223DB98 * param0, int param1) switch (v0) { case 1: - sub_0202CFEC(param0->unk_08, 4); + GameRecords_IncrementTrainerScore(param0->unk_08, 4); GameRecords_IncrementRecordValue(param0->unk_08, (((70 + 1)) + 43)); sub_0200E084(¶m0->unk_338, 1); sub_02015A54(param0->unk_5D00); diff --git a/src/overlay076/ov76_0223D338.c b/src/overlay076/ov76_0223D338.c index 43fd4b2321..b57cdeea44 100644 --- a/src/overlay076/ov76_0223D338.c +++ b/src/overlay076/ov76_0223D338.c @@ -1004,7 +1004,7 @@ static BOOL ov76_0223DF94 (UnkStruct_ov76_0223DE00 * param0) GameRecords * v7; v7 = SaveData_GetGameRecordsPtr(param0->unk_00->unk_28); - sub_0202CFEC(v7, 6); + GameRecords_IncrementTrainerScore(v7, 6); } { diff --git a/src/overlay083/ov83_0223B5A0.c b/src/overlay083/ov83_0223B5A0.c index 95f6c14384..8a2d42763d 100644 --- a/src/overlay083/ov83_0223B5A0.c +++ b/src/overlay083/ov83_0223B5A0.c @@ -562,10 +562,10 @@ static int ov83_0223BCEC (UnkStruct_ov83_0223C344 * param0, UnkStruct_ov83_0223B GameRecords * v2 = SaveData_GetGameRecordsPtr(param0->unk_10->unk_0C); if (param1->unk_1490 == 0) { - sub_0202CFEC(v2, 12); + GameRecords_IncrementTrainerScore(v2, 12); GameRecords_IncrementRecordValue(v2, (1 + 51)); } else { - sub_0202CFEC(v2, 18); + GameRecords_IncrementTrainerScore(v2, 18); GameRecords_IncrementRecordValue(v2, (1 + 52)); } } diff --git a/src/overlay094/ov94_02242AD0.c b/src/overlay094/ov94_02242AD0.c index d9c8857711..8d862d9343 100644 --- a/src/overlay094/ov94_02242AD0.c +++ b/src/overlay094/ov94_02242AD0.c @@ -656,7 +656,7 @@ static int ov94_022431F0 (UnkStruct_ov94_0223FD4C * param0) ov94_02243B08(param0, 0); ov94_02243CE4(param0, (Pokemon *)param0->unk_A4C.unk_00.unk_00, param0->unk_110); ov94_02243E2C(param0->unk_00->unk_18, ¶m0->unk_A4C); - sub_0202CFEC(param0->unk_00->unk_28, 25); + GameRecords_IncrementTrainerScore(param0->unk_00->unk_28, 25); ov94_02243E48(param0->unk_00->unk_2C, ¶m0->unk_A4C); GameRecords_IncrementRecordValue(param0->unk_00->unk_28, (1 + 23)); @@ -935,7 +935,7 @@ static int ov94_02243658 (UnkStruct_ov94_0223FD4C * param0) ov94_02243BC4(param0, (Pokemon *)param0->unk_12C.unk_00.unk_00, sub_0202DAAC(param0->unk_00->unk_00), param0->unk_12C.unk_121); ov94_02243E2C(param0->unk_00->unk_18, ¶m0->unk_12C); - sub_0202CFEC(param0->unk_00->unk_28, 25); + GameRecords_IncrementTrainerScore(param0->unk_00->unk_28, 25); ov94_02243E48(param0->unk_00->unk_2C, ¶m0->unk_12C); GameRecords_IncrementRecordValue(param0->unk_00->unk_28, (1 + 23)); diff --git a/src/overlay104/ov104_0222FBE4.c b/src/overlay104/ov104_0222FBE4.c index bbd205bef5..76af7da705 100644 --- a/src/overlay104/ov104_0222FBE4.c +++ b/src/overlay104/ov104_0222FBE4.c @@ -2827,7 +2827,7 @@ static BOOL ov104_02231E80 (UnkStruct_ov104_0222E930 * param0) u16 v1 = ov104_0222EA48(param0); v0 = sub_0209B970(param0->unk_00->unk_00); - sub_0202CFEC(SaveData_GetGameRecordsPtr(v0->unk_08), v1); + GameRecords_IncrementTrainerScore(SaveData_GetGameRecordsPtr(v0->unk_08), v1); return 0; } diff --git a/src/overlay109/ov109_021D0D80.c b/src/overlay109/ov109_021D0D80.c index 330518de8e..0cbd03c9d7 100644 --- a/src/overlay109/ov109_021D0D80.c +++ b/src/overlay109/ov109_021D0D80.c @@ -1362,7 +1362,7 @@ static int ov109_021D1A14 (UnkStruct_ov109_021D0F70 * param0) sub_0202B758(param0->unk_CC->unk_14.unk_18, v0, 4); GameRecords_IncrementRecordValue(param0->unk_CC->unk_14.unk_14, (((70 + 1)) + 48)); - sub_0202CFEC(param0->unk_CC->unk_14.unk_14, 45); + GameRecords_IncrementTrainerScore(param0->unk_CC->unk_14.unk_14, 45); ov109_021D2634(param0, 11); CommTiming_StartSync(202); diff --git a/src/overlay109/ov109_021D3D50.c b/src/overlay109/ov109_021D3D50.c index 5dc498b101..ad577b2f38 100644 --- a/src/overlay109/ov109_021D3D50.c +++ b/src/overlay109/ov109_021D3D50.c @@ -1067,7 +1067,7 @@ static int ov109_021D4CC8 (UnkStruct_ov109_021D5140 * param0, int param1) v0 = sub_0202C244(95, 17); sub_0202B758(param0->unk_0C->unk_14.unk_18, v0, 4); - sub_0202CFEC(param0->unk_0C->unk_14.unk_14, 20); + GameRecords_IncrementTrainerScore(param0->unk_0C->unk_14.unk_14, 20); sub_02038ED4(¶m0->unk_414); param0->unk_3B8 = 28; diff --git a/src/scrcmd.c b/src/scrcmd.c index b749b3a299..e63aeed3db 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -6903,7 +6903,7 @@ static BOOL ScrCmd_260 (ScriptContext * ctx) { u16 v0 = ScriptContext_ReadHalfWord(ctx); - sub_0202CFEC(SaveData_GetGameRecordsPtr(ctx->fieldSystem->saveData), v0); + GameRecords_IncrementTrainerScore(SaveData_GetGameRecordsPtr(ctx->fieldSystem->saveData), v0); return 0; } @@ -8249,7 +8249,7 @@ static BOOL ScrCmd_30A (ScriptContext * ctx) { u16 v0 = ScriptContext_ReadHalfWord(ctx); - sub_0202CFEC(SaveData_GetGameRecordsPtr(ctx->fieldSystem->saveData), v0); + GameRecords_IncrementTrainerScore(SaveData_GetGameRecordsPtr(ctx->fieldSystem->saveData), v0); return 0; } diff --git a/src/unk_0202F180.c b/src/unk_0202F180.c index 9b8aa1ce08..b72efdfc14 100644 --- a/src/unk_0202F180.c +++ b/src/unk_0202F180.c @@ -16,7 +16,7 @@ void sub_0202F180 (SaveData * param0, const Pokemon * param1) if (Pokemon_GetValue((Pokemon *)param1, MON_DATA_IS_EGG, NULL) == 0) { PokedexData * v0 = SaveData_Pokedex(param0); - sub_0202D040(SaveData_GetGameRecordsPtr(param0), v0, Pokemon_GetValue((Pokemon *)param1, MON_DATA_SPECIES, NULL)); + GameRecords_IncrementTrainerScoreOnCatch(SaveData_GetGameRecordsPtr(param0), v0, Pokemon_GetValue((Pokemon *)param1, MON_DATA_SPECIES, NULL)); sub_0202736C(v0, (Pokemon *)param1); PoketchData_PokemonHistoryEnqueue(SaveData_PoketchData(param0), (const BoxPokemon *)param1); } diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c index 7cc20556d4..a20001d833 100644 --- a/src/unk_0203D1B8.c +++ b/src/unk_0203D1B8.c @@ -1109,7 +1109,7 @@ BOOL sub_0203DBF0 (TaskManager * param0) { GameRecords * v6 = SaveData_GetGameRecordsPtr(fieldSystem->saveData); - sub_0202CFEC(v6, 16); + GameRecords_IncrementTrainerScore(v6, 16); if (sub_020389B8()) { GameRecords_IncrementRecordValue(v6, (((70 + 1)) + 42)); @@ -1621,7 +1621,7 @@ void sub_0203E414 (TaskManager * param0, int param1) v2->unk_0C.unk_10 = Options_Frame(v1); v2->unk_0C.unk_04 = sub_0203E484(fieldSystem->saveData, param1); - sub_0202CFEC(SaveData_GetGameRecordsPtr(fieldSystem->saveData), 5); + GameRecords_IncrementTrainerScore(SaveData_GetGameRecordsPtr(fieldSystem->saveData), 5); FieldTask_Start(param0, sub_0203E35C, v2); } diff --git a/src/unk_02048DD8.c b/src/unk_02048DD8.c index 7c867eabaa..d535744fcb 100644 --- a/src/unk_02048DD8.c +++ b/src/unk_02048DD8.c @@ -185,7 +185,7 @@ BOOL ScrCmd_237 (ScriptContext * param0) v6 = ScriptContext_GetVar(param0); sub_020491B8(param0->fieldSystem, v4, v5, v6); - sub_0202CFEC(v7, 3); + GameRecords_IncrementTrainerScore(v7, 3); } break; } diff --git a/src/unk_02049D08.c b/src/unk_02049D08.c index 1707d8bd11..c239700113 100644 --- a/src/unk_02049D08.c +++ b/src/unk_02049D08.c @@ -699,7 +699,7 @@ void sub_0204A7A4 (UnkStruct_0204AFC4 * param0, SaveData * param1, Journal * par GameRecords_AddToRecordValue(v6, (1 + 14), 1); } - sub_0202CFEC(v6, 14); + GameRecords_IncrementTrainerScore(v6, 14); sub_0204ACC8(param0); sub_0204A5EC(param0, param1, 1, v0); diff --git a/src/unk_0204B64C.c b/src/unk_0204B64C.c index 40818f5a75..63b2ec8d75 100644 --- a/src/unk_0204B64C.c +++ b/src/unk_0204B64C.c @@ -102,7 +102,7 @@ BOOL ScrCmd_185 (ScriptContext * param0) MapObject ** v2 = sub_0203F098(param0->fieldSystem, 10); sub_02055E00(param0->fieldSystem, *v2); - sub_0202CFEC(v1, 0); + GameRecords_IncrementTrainerScore(v1, 0); return 0; } diff --git a/src/unk_02050A74.c b/src/unk_02050A74.c index 61a7c31d0c..507e98506f 100644 --- a/src/unk_02050A74.c +++ b/src/unk_02050A74.c @@ -260,7 +260,7 @@ static BOOL sub_02050CA8 (TaskManager * taskMan) { GameRecords * v3 = SaveData_GetGameRecordsPtr(fieldSystem->saveData); - sub_0202CFEC(v3, 21); + GameRecords_IncrementTrainerScore(v3, 21); } sub_02055868(taskMan); @@ -300,7 +300,7 @@ static BOOL sub_02050D4C (TaskManager * taskMan) } { GameRecords * v3 = SaveData_GetGameRecordsPtr(fieldSystem->saveData); - sub_0202CFEC(v3, 21); + GameRecords_IncrementTrainerScore(v3, 21); } (*v2)++; break; @@ -928,28 +928,28 @@ static void sub_020518B0 (FieldSystem * fieldSystem, BattleParams * param1) || (v1 == BATTLE_TYPE_ROAMER) || (v1 == BATTLE_TYPE_AI_PARTNER)) { if (v2 == 0x1) { - sub_0202CFEC(SaveData_GetGameRecordsPtr(fieldSystem->saveData), 8); + GameRecords_IncrementTrainerScore(SaveData_GetGameRecordsPtr(fieldSystem->saveData), 8); } else if (v2 == 0x4) { v0 = Party_GetPokemonBySlotIndex(param1->parties[1], 0); if (sub_0207A294(0, Pokemon_GetValue(v0, MON_DATA_SPECIES, 0))) { - sub_0202CFEC(SaveData_GetGameRecordsPtr(fieldSystem->saveData), 9); + GameRecords_IncrementTrainerScore(SaveData_GetGameRecordsPtr(fieldSystem->saveData), 9); } else { - sub_0202CFEC(SaveData_GetGameRecordsPtr(fieldSystem->saveData), 10); + GameRecords_IncrementTrainerScore(SaveData_GetGameRecordsPtr(fieldSystem->saveData), 10); } } } else if ((v1 & BATTLE_TYPE_TRAINER) || (v1 & BATTLE_TYPE_TAG)) { if (v2 == 0x1) { - sub_0202CFEC(SaveData_GetGameRecordsPtr(fieldSystem->saveData), 11); + GameRecords_IncrementTrainerScore(SaveData_GetGameRecordsPtr(fieldSystem->saveData), 11); } } else if ((v1 & BATTLE_TYPE_SAFARI) || (v1 & BATTLE_TYPE_PAL_PARK)) { if (v2 == 0x4) { v0 = Party_GetPokemonBySlotIndex(param1->parties[1], 0); if (sub_0207A294(0, Pokemon_GetValue(v0, MON_DATA_SPECIES, 0))) { - sub_0202CFEC(SaveData_GetGameRecordsPtr(fieldSystem->saveData), 9); + GameRecords_IncrementTrainerScore(SaveData_GetGameRecordsPtr(fieldSystem->saveData), 9); } else { - sub_0202CFEC(SaveData_GetGameRecordsPtr(fieldSystem->saveData), 10); + GameRecords_IncrementTrainerScore(SaveData_GetGameRecordsPtr(fieldSystem->saveData), 10); } } } diff --git a/src/unk_020562F8.c b/src/unk_020562F8.c index e169ebbcbf..b5f12acb99 100644 --- a/src/unk_020562F8.c +++ b/src/unk_020562F8.c @@ -80,7 +80,7 @@ void sub_02056328 (FieldSystem * fieldSystem) v0->unk_48 = 0; } - sub_0202CFEC(v1, 17); + GameRecords_IncrementTrainerScore(v1, 17); } BOOL sub_02056374 (FieldSystem * fieldSystem, int param1, int param2) diff --git a/src/unk_02071D40.c b/src/unk_02071D40.c index 6d52dc4314..70f6666908 100644 --- a/src/unk_02071D40.c +++ b/src/unk_02071D40.c @@ -63,7 +63,7 @@ void sub_02071D40 (const u8 param0, const u8 param1, const u8 param2, const u8 p sub_02072014(param0, GAME_VERSION, v3, param2, TrainerInfo_RegionCode(v0), param5); } - sub_02072038(TrainerInfo_ID_LowHalf(v0), TrainerInfo_Gender(v0), TrainerInfo_Name(v0), TrainerInfo_Money(v0), sub_02026E48(SaveData_Pokedex(fieldSystem->saveData)), sub_02027520(SaveData_Pokedex(fieldSystem->saveData)), sub_0202D034(v1), param5); + sub_02072038(TrainerInfo_ID_LowHalf(v0), TrainerInfo_Gender(v0), TrainerInfo_Name(v0), TrainerInfo_Money(v0), sub_02026E48(SaveData_Pokedex(fieldSystem->saveData)), sub_02027520(SaveData_Pokedex(fieldSystem->saveData)), GameRecords_GetTrainerScore(v1), param5); { RTCDate v4; diff --git a/src/unk_0207AE68.c b/src/unk_0207AE68.c index 5fccc6db46..f692c69de9 100644 --- a/src/unk_0207AE68.c +++ b/src/unk_0207AE68.c @@ -415,7 +415,7 @@ static void sub_0207B180 (UnkStruct_0207AE68 * param0) if (--param0->unk_66 == 0) { sub_0202736C(param0->unk_48, param0->unk_28); GameRecords_IncrementRecordValue(param0->unk_50, (1 + 11)); - sub_0202CFEC(param0->unk_50, 22); + GameRecords_IncrementTrainerScore(param0->unk_50, 22); PoketchData_PokemonHistoryEnqueue(param0->poketchData, Pokemon_GetBoxPokemon(param0->unk_28)); if (Pokemon_GetValue(param0->unk_28, MON_DATA_HAS_NICKNAME, NULL) == 0) { @@ -747,7 +747,7 @@ static void sub_0207C028 (UnkStruct_0207AE68 * param0) Party_AddPokemon(param0->unk_24, v1); sub_0202736C(param0->unk_48, v1); GameRecords_IncrementRecordValue(param0->unk_50, (1 + 11)); - sub_0202CFEC(param0->unk_50, 22); + GameRecords_IncrementTrainerScore(param0->unk_50, 22); PoketchData_PokemonHistoryEnqueue(param0->poketchData, Pokemon_GetBoxPokemon(v1)); Heap_FreeToHeap(v1); Bag_TryRemoveItem(param0->unk_4C, 4, 1, param0->unk_5C); diff --git a/src/unk_0207DA28.c b/src/unk_0207DA28.c index 1205c94106..620b461788 100644 --- a/src/unk_0207DA28.c +++ b/src/unk_0207DA28.c @@ -473,5 +473,5 @@ static void sub_0207DF9C (FieldSystem * fieldSystem) GameRecords * v0; v0 = SaveData_GetGameRecordsPtr(fieldSystem->saveData); - sub_0202CFEC(v0, 50); + GameRecords_IncrementTrainerScore(v0, 50); } diff --git a/src/unk_020933F8.c b/src/unk_020933F8.c index 5a4bde8b96..17946c1fed 100644 --- a/src/unk_020933F8.c +++ b/src/unk_020933F8.c @@ -1636,7 +1636,7 @@ void sub_02094C44 (UnkStruct_02095C48 * param0, SaveData * param1, u32 param2, J if (sub_02094790(param0) == 0) { GameRecords_IncrementRecordValue(v5, (((70 + 1)) + 21)); - sub_0202CFEC(v5, 13); + GameRecords_IncrementTrainerScore(v5, 13); } if (v0 == 1) { @@ -1665,7 +1665,7 @@ void sub_02094C44 (UnkStruct_02095C48 * param0, SaveData * param1, u32 param2, J if (sub_02094790(param0) == 0) { GameRecords_IncrementRecordValue(v8, (((70 + 1)) + 22)); - sub_0202CFEC(v8, 19); + GameRecords_IncrementTrainerScore(v8, 19); } } diff --git a/src/unk_02097624.c b/src/unk_02097624.c index f6a0a93f07..07436fe7ae 100644 --- a/src/unk_02097624.c +++ b/src/unk_02097624.c @@ -347,7 +347,7 @@ static int sub_020979A8 (OverlayManager * param0, int * param1) if (v0->unk_10->unk_00 == 3) { sub_020978F0(v1->unk_14, v0->unk_10); - sub_0202CFEC(SaveData_GetGameRecordsPtr(v1->unk_10), 2); + GameRecords_IncrementTrainerScore(SaveData_GetGameRecordsPtr(v1->unk_10), 2); GameRecords_IncrementRecordValue(SaveData_GetGameRecordsPtr(v1->unk_10), (1 + 44)); v1->unk_04 = 1; } else {