diff --git a/include/battle/ov16_0226871C.h b/include/battle/ov16_0226871C.h index 7b2a3fbd1d..1de6da8f30 100644 --- a/include/battle/ov16_0226871C.h +++ b/include/battle/ov16_0226871C.h @@ -2,7 +2,6 @@ #define POKEPLATINUM_OV16_0226871C_H #include "struct_decls/battle_system.h" -#include "struct_defs/struct_0209C370.h" #include "battle/struct_ov16_02268A14_decl.h" #include "battle/struct_ov16_0226AC98.h" @@ -12,7 +11,7 @@ void ov16_02268744(BgConfig *param0); void ov16_022687A0(BgConfig *param0); -void *ov16_022687C8(NARC *param0, NARC *param1, BattleSystem *param2, int param3, UnkStruct_0209C370 *param4); +void *ov16_022687C8(NARC *param0, NARC *param1, BattleSystem *param2, int param3, u8 *param4); void ov16_02268A14(UnkStruct_ov16_02268A14 *param0); void ov16_02268A88(UnkStruct_ov16_02268A14 *param0); void ov16_02268B8C(UnkStruct_ov16_02268A14 *param0); diff --git a/include/field/field_system.h b/include/field/field_system.h index 6c1eb8b0bc..66c52da74e 100644 --- a/include/field/field_system.h +++ b/include/field/field_system.h @@ -13,7 +13,6 @@ #include "struct_defs/map_load_mode.h" #include "struct_defs/struct_0202610C.h" #include "struct_defs/struct_0204AFC4.h" -#include "struct_defs/struct_0209C370.h" #include "field/field_system_sub2_decl.h" #include "field/field_system_sub3.h" @@ -101,7 +100,7 @@ typedef struct FieldSystem_t { const BattleRegulation *unk_B0; UnkStruct_0209ACBC *unk_B4; BOOL unk_B8; - UnkStruct_0209C370 *unk_BC; + u8 *battleSubscreenCursorOn; u32 unk_C0; UnkStruct_ov66_0222DCE0_sub1 unk_C4; } FieldSystem; diff --git a/include/field_battle_data_transfer.h b/include/field_battle_data_transfer.h index 01382ca30f..44602ea51d 100644 --- a/include/field_battle_data_transfer.h +++ b/include/field_battle_data_transfer.h @@ -2,6 +2,7 @@ #define POKEPLATINUM_FIELD_BATTLE_DATA_TRANSFER_H #include "constants/battle.h" + #include "struct_decls/pokedexdata_decl.h" #include "struct_decls/struct_02027F8C_decl.h" #include "struct_decls/struct_0202C878_decl.h" @@ -9,7 +10,6 @@ #include "struct_decls/struct_020797DC_decl.h" #include "struct_decls/struct_party_decl.h" #include "struct_defs/chatot_cry.h" -#include "struct_defs/struct_0209C370.h" #include "struct_defs/trainer_data.h" #include "field/field_system_decl.h" @@ -71,8 +71,8 @@ typedef struct FieldBattleDTO { u8 unk_18A; u8 dummy18B; int totalTurnsElapsed; - UnkStruct_0209C370 *unk_190; - u8 unk_194[4]; + u8 *subscreenCursorOn; + u8 unk_194[MAX_BATTLERS]; SaveData *saveData; u32 unk_19C; } FieldBattleDTO; @@ -86,7 +86,7 @@ void sub_0205213C(FieldBattleDTO *param0, Pokemon *param1, int param2); void sub_02052164(FieldBattleDTO *param0, const Party *param1, int param2); void sub_02052184(FieldBattleDTO *param0, const TrainerInfo *param1, int param2); void sub_020521A4(FieldBattleDTO *param0, const ChatotCry *param1, int param2); -void sub_020521B8(FieldBattleDTO *param0, const FieldSystem *fieldSystem, SaveData *param2, int param3, Journal *param4, BagCursor *param5, UnkStruct_0209C370 *param6); +void sub_020521B8(FieldBattleDTO *param0, const FieldSystem *fieldSystem, SaveData *param2, int param3, Journal *param4, BagCursor *param5, u8 *param6); void sub_02052314(FieldBattleDTO *param0, const FieldSystem *fieldSystem); void sub_02052348(FieldBattleDTO *param0, const FieldSystem *fieldSystem, int param2); void sub_020524E4(FieldBattleDTO *param0, const FieldSystem *fieldSystem, const Party *param2, const u8 *param3); diff --git a/include/overlay104/struct_ov104_02230BE4.h b/include/overlay104/struct_ov104_02230BE4.h index faed36b0e0..3c595445b7 100644 --- a/include/overlay104/struct_ov104_02230BE4.h +++ b/include/overlay104/struct_ov104_02230BE4.h @@ -1,8 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_OV104_02230BE4_H #define POKEPLATINUM_STRUCT_OV104_02230BE4_H -#include "struct_defs/struct_0209C370.h" - #include "field/field_system_decl.h" #include "bag.h" @@ -19,7 +17,7 @@ typedef struct { int unk_14; int unk_18; int unk_1C; - UnkStruct_0209C370 *unk_20; + u8 *unk_20; u8 unk_24; FieldSystem *fieldSystem; } UnkStruct_ov104_02230BE4; diff --git a/include/struct_defs/battle_system.h b/include/struct_defs/battle_system.h index b7fe3c058b..f29a0c0424 100644 --- a/include/struct_defs/battle_system.h +++ b/include/struct_defs/battle_system.h @@ -18,7 +18,6 @@ #include "struct_decls/struct_party_decl.h" #include "struct_defs/chatot_cry.h" #include "struct_defs/struct_0207C690.h" -#include "struct_defs/struct_0209C370.h" #include "struct_defs/trainer_data.h" #include "battle/battle_context.h" @@ -31,8 +30,8 @@ #include "overlay012/struct_ov12_0221FCDC_decl.h" #include "bag.h" -#include "field_battle_data_transfer.h" #include "bg_window.h" +#include "field_battle_data_transfer.h" #include "game_options.h" #include "message.h" #include "palette.h" @@ -83,7 +82,7 @@ struct BattleSystem { Options *unk_1B0; UnkStruct_02027F8C *unk_1B4; void *unk_1B8; - UnkStruct_0209C370 *unk_1BC; + u8 *unk_1BC; UnkStruct_ov10_0221F800 *unk_1C0; PokemonAnimationSys *unk_1C4; NNSG2dCellTransferState *cellTransferState; diff --git a/include/struct_defs/struct_0209C370.h b/include/struct_defs/struct_0209C370.h deleted file mode 100644 index 4abccdce22..0000000000 --- a/include/struct_defs/struct_0209C370.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_0209C370_H -#define POKEPLATINUM_STRUCT_0209C370_H - -typedef struct { - u8 unk_00; - u8 padding_01[3]; -} UnkStruct_0209C370; - -#endif // POKEPLATINUM_STRUCT_0209C370_H diff --git a/include/unk_0209C370.h b/include/unk_0209C370.h index b652fe86af..bc583b72c7 100644 --- a/include/unk_0209C370.h +++ b/include/unk_0209C370.h @@ -1,9 +1,7 @@ #ifndef POKEPLATINUM_UNK_0209C370_H #define POKEPLATINUM_UNK_0209C370_H -#include "struct_defs/struct_0209C370.h" - -UnkStruct_0209C370 *sub_0209C370(int param0); -void sub_0209C388(UnkStruct_0209C370 *param0); +u8 *sub_0209C370(int param0); +void sub_0209C388(u8 *param0); #endif // POKEPLATINUM_UNK_0209C370_H diff --git a/src/battle/ov16_0223B140.c b/src/battle/ov16_0223B140.c index 8734399b23..b20f82e921 100644 --- a/src/battle/ov16_0223B140.c +++ b/src/battle/ov16_0223B140.c @@ -736,7 +736,7 @@ static void ov16_0223BCB4(OverlayManager *param0) v1->pcBoxes = v0->pcBoxes; v1->bagCursor = v0->unk_5C; - v1->unk_190 = v0->unk_1BC; + v1->subscreenCursorOn = v0->unk_1BC; v1->poketchData = v0->poketchData; v1->unk_10C = v0->unk_9C; v1->countSafariBalls = v0->safariBalls; @@ -1091,7 +1091,7 @@ static void ov16_0223C2C0(BattleSystem *param0, FieldBattleDTO *param1) param0->unk_1B0 = param1->options; param0->unk_1B4 = param1->unk_124; param0->unk_5C = param1->bagCursor; - param0->unk_1BC = param1->unk_190; + param0->unk_1BC = param1->subscreenCursorOn; param0->poketchData = param1->poketchData; param0->unk_2420 = param1->mapEvolutionMethod; param0->unk_9C = param1->unk_10C; diff --git a/src/battle/ov16_0226871C.c b/src/battle/ov16_0226871C.c index 4442b89ad3..347b596a18 100644 --- a/src/battle/ov16_0226871C.c +++ b/src/battle/ov16_0226871C.c @@ -13,7 +13,6 @@ #include "struct_defs/sprite_template.h" #include "struct_defs/struct_0200D0F4.h" #include "struct_defs/struct_020127E8.h" -#include "struct_defs/struct_0209C370.h" #include "battle/battle_display.h" #include "battle/ov16_0223DF00.h" @@ -197,7 +196,7 @@ typedef struct { typedef struct UnkStruct_ov16_02268A14_t { BattleSystem *unk_00; - UnkStruct_0209C370 *unk_04; + u8 *unk_04; SysTask *unk_08; SysTask *unk_0C; SysTask *unk_10; @@ -1050,7 +1049,7 @@ void ov16_022687A0(BgConfig *param0) } } -void *ov16_022687C8(NARC *param0, NARC *param1, BattleSystem *param2, int param3, UnkStruct_0209C370 *param4) +void *ov16_022687C8(NARC *param0, NARC *param1, BattleSystem *param2, int param3, u8 *param4) { UnkStruct_ov16_02268A14 *v0; PaletteData *v1; @@ -1062,7 +1061,7 @@ void *ov16_022687C8(NARC *param0, NARC *param1, BattleSystem *param2, int param3 v0->unk_04 = param4; if (v0->unk_04 != NULL) { - v0->unk_6C0 = param4->unk_00; + v0->unk_6C0 = *param4; } else { (void)0; } @@ -1177,7 +1176,7 @@ void ov16_02268A14(UnkStruct_ov16_02268A14 *param0) int v0; if (param0->unk_04 != NULL) { - param0->unk_04->unk_00 = param0->unk_6C0; + *param0->unk_04 = param0->unk_6C0; } ov16_0226B1E8(param0); diff --git a/src/field_battle_data_transfer.c b/src/field_battle_data_transfer.c index 7226170d41..97c9e6a602 100644 --- a/src/field_battle_data_transfer.c +++ b/src/field_battle_data_transfer.c @@ -14,7 +14,6 @@ #include "struct_defs/chatot_cry.h" #include "struct_defs/struct_0202610C.h" #include "struct_defs/struct_0205EC34.h" -#include "struct_defs/struct_0209C370.h" #include "struct_defs/trainer_data.h" #include "applications/pokemon_summary_screen/main.h" @@ -105,7 +104,7 @@ FieldBattleDTO *sub_02051D8C(int param0, u32 param1) v1->options = Options_New(param0); v1->unk_10C = sub_0206D140(param0); v1->bagCursor = NULL; - v1->unk_190 = NULL; + v1->subscreenCursorOn = NULL; v1->countSafariBalls = 0; v1->unk_104 = NULL; v1->records = NULL; @@ -185,7 +184,7 @@ FieldBattleDTO *sub_02051F4C(int param0, const FieldSystem *fieldSystem) v4->pcBoxes = SaveData_PCBoxes(fieldSystem->saveData); v4->bagCursor = fieldSystem->unk_98; - v4->unk_190 = NULL; + v4->subscreenCursorOn = NULL; v4->records = SaveData_GetGameRecordsPtr(fieldSystem->saveData); v4->journal = fieldSystem->journal; v4->mapHeaderID = fieldSystem->location->mapId; @@ -247,7 +246,7 @@ void sub_020521A4(FieldBattleDTO *param0, const ChatotCry *param1, int param2) CopyChatotCryData(param0->chatotCries[param2], param1); } -void sub_020521B8(FieldBattleDTO *param0, const FieldSystem *fieldSystem, SaveData *param2, int param3, Journal *param4, BagCursor *param5, UnkStruct_0209C370 *param6) +void sub_020521B8(FieldBattleDTO *param0, const FieldSystem *fieldSystem, SaveData *param2, int param3, Journal *param4, BagCursor *param5, u8 *param6) { TrainerInfo *v0 = SaveData_GetTrainerInfo(param2); Party *v1 = Party_GetFromSavedata(param2); @@ -284,7 +283,7 @@ void sub_020521B8(FieldBattleDTO *param0, const FieldSystem *fieldSystem, SaveDa param0->metBebe = SystemFlag_CheckMetBebe(SaveData_GetVarsFlags(param2)); param0->fieldWeather = FieldOverworldState_GetWeather(v6); param0->bagCursor = param5; - param0->unk_190 = param6; + param0->subscreenCursorOn = param6; param0->poketchData = SaveData_PoketchData(param2); param0->unk_104 = sub_0202C878(param2); param0->records = SaveData_GetGameRecordsPtr(param2); @@ -296,7 +295,7 @@ void sub_020521B8(FieldBattleDTO *param0, const FieldSystem *fieldSystem, SaveDa void sub_02052314(FieldBattleDTO *battleParams, const FieldSystem *fieldSystem) { - sub_020521B8(battleParams, fieldSystem, fieldSystem->saveData, fieldSystem->location->mapId, fieldSystem->journal, fieldSystem->unk_98, fieldSystem->unk_BC); + sub_020521B8(battleParams, fieldSystem, fieldSystem->saveData, fieldSystem->location->mapId, fieldSystem->journal, fieldSystem->unk_98, fieldSystem->battleSubscreenCursorOn); sub_02052894(battleParams); } @@ -341,7 +340,7 @@ void sub_02052348(FieldBattleDTO *param0, const FieldSystem *fieldSystem, int pa param0->pcBoxes = SaveData_PCBoxes(fieldSystem->saveData); param0->timeOfDay = sub_02055BA8(fieldSystem); param0->bagCursor = fieldSystem->unk_98; - param0->unk_190 = fieldSystem->unk_BC; + param0->subscreenCursorOn = fieldSystem->battleSubscreenCursorOn; param0->poketchData = SaveData_PoketchData(fieldSystem->saveData); param0->unk_104 = sub_0202C878(fieldSystem->saveData); param0->records = SaveData_GetGameRecordsPtr(fieldSystem->saveData); @@ -411,7 +410,7 @@ void sub_020524E4(FieldBattleDTO *param0, const FieldSystem *fieldSystem, const param0->pcBoxes = SaveData_PCBoxes(fieldSystem->saveData); param0->timeOfDay = sub_02055BA8(fieldSystem); param0->bagCursor = fieldSystem->unk_98; - param0->unk_190 = fieldSystem->unk_BC; + param0->subscreenCursorOn = fieldSystem->battleSubscreenCursorOn; param0->unk_104 = sub_0202C878(fieldSystem->saveData); param0->records = SaveData_GetGameRecordsPtr(fieldSystem->saveData); param0->journal = fieldSystem->journal; diff --git a/src/field_system.c b/src/field_system.c index 3d38f0d4f6..315a499131 100644 --- a/src/field_system.c +++ b/src/field_system.c @@ -170,7 +170,7 @@ static FieldSystem *InitFieldSystem(OverlayManager *ovyManager) RadarChain_Clear(fieldSystem->chain); fieldSystem->unk_B4 = sub_0209ACBC(HEAP_ID_FIELDMAP); - fieldSystem->unk_BC = sub_0209C370(HEAP_ID_FIELDMAP); + fieldSystem->battleSubscreenCursorOn = sub_0209C370(HEAP_ID_FIELDMAP); return fieldSystem; } @@ -184,7 +184,7 @@ static void TeardownFieldSystem(OverlayManager *ovyManager) Heap_FreeToHeap(fieldSystem->unk_98); RadarChain_Free(fieldSystem->chain); sub_0209ACDC(fieldSystem->unk_B4); - sub_0209C388(fieldSystem->unk_BC); + sub_0209C388(fieldSystem->battleSubscreenCursorOn); Heap_FreeToHeap(fieldSystem->processManager); OverlayManager_FreeData(ovyManager); diff --git a/src/scrcmd.c b/src/scrcmd.c index 04161869e1..7de1c5b365 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -7788,7 +7788,7 @@ static BOOL ScrCmd_2C4(ScriptContext *ctx) v2->unk_1C = ctx->fieldSystem->location->mapId; v2->unk_0C = ctx->fieldSystem->journal; v2->unk_10 = ctx->fieldSystem->unk_98; - v2->unk_20 = ctx->fieldSystem->unk_BC; + v2->unk_20 = ctx->fieldSystem->battleSubscreenCursorOn; FieldTask_RunApplication(ctx->task, &Unk_020F8BE0, v2); ScriptContext_Pause(ctx, sub_02041CC8); diff --git a/src/unk_0209BA18.c b/src/unk_0209BA18.c index 222f5d1cc5..c1591a3d83 100644 --- a/src/unk_0209BA18.c +++ b/src/unk_0209BA18.c @@ -32,7 +32,7 @@ UnkStruct_ov104_02230BE4 *sub_0209BA18(FieldSystem *fieldSystem, void *param1) v0->unk_08 = fieldSystem->saveData; v0->unk_0C = fieldSystem->journal; v0->unk_10 = fieldSystem->unk_98; - v0->unk_20 = fieldSystem->unk_BC; + v0->unk_20 = fieldSystem->battleSubscreenCursorOn; v0->unk_14 = 0; v0->unk_18 = 0; v0->unk_1C = fieldSystem->location->mapId; diff --git a/src/unk_0209C370.c b/src/unk_0209C370.c index c303d72a1f..4dd7f07cce 100644 --- a/src/unk_0209C370.c +++ b/src/unk_0209C370.c @@ -1,22 +1,17 @@ #include "unk_0209C370.h" -#include -#include - -#include "struct_defs/struct_0209C370.h" - #include "heap.h" -UnkStruct_0209C370 *sub_0209C370(int param0) +u8 *sub_0209C370(int param0) { - UnkStruct_0209C370 *v0; + u8 *v0; - v0 = Heap_AllocFromHeap(param0, sizeof(UnkStruct_0209C370)); - MI_CpuClear8(v0, sizeof(UnkStruct_0209C370)); + v0 = Heap_AllocFromHeap(param0, sizeof(void *)); + MI_CpuClear8(v0, sizeof(void *)); return v0; } -void sub_0209C388(UnkStruct_0209C370 *param0) +void sub_0209C388(u8 *param0) { Heap_FreeToHeap(param0); }