From 73df15518fe506ebdae9cd53282583045c2cda91 Mon Sep 17 00:00:00 2001 From: VicSevenT Date: Sun, 26 Jul 2026 17:55:14 -0500 Subject: [PATCH] Rename files --- .../{unk_02030494.h => battle_arcade_save.h} | 6 +- .../{ov104_02237DD8.h => battle_arcade.h} | 69 ++++++++++++++++-- ...104_0223BCBC.h => battle_arcade_helpers.h} | 8 +-- include/overlay104/ov104_0222ECE8.h | 2 +- include/overlay104/struct_battle_arcade.h | 71 ------------------- include/struct_defs/battle_frontier.h | 2 +- platinum.us/main.lsf | 6 +- .../frontier/battle_arcade/main.c | 4 +- src/applications/frontier/records/main.c | 2 +- src/{unk_02030494.c => battle_arcade_save.c} | 2 +- src/battle_frontier_save.c | 2 +- src/meson.build | 6 +- .../{ov104_02237DD8.c => battle_arcade.c} | 8 +-- ...104_0223BCBC.c => battle_arcade_helpers.c} | 4 +- src/overlay104/frscrcmd_battle_arcade.c | 7 +- src/overlay104/ov104_0222ECE8.c | 6 +- src/unk_0205003C.c | 2 +- 17 files changed, 98 insertions(+), 109 deletions(-) rename include/{unk_02030494.h => battle_arcade_save.h} (92%) rename include/overlay104/{ov104_02237DD8.h => battle_arcade.h} (55%) rename include/overlay104/{ov104_0223BCBC.h => battle_arcade_helpers.h} (85%) delete mode 100644 include/overlay104/struct_battle_arcade.h rename src/{unk_02030494.c => battle_arcade_save.c} (99%) rename src/overlay104/{ov104_02237DD8.c => battle_arcade.c} (99%) rename src/overlay104/{ov104_0223BCBC.c => battle_arcade_helpers.c} (99%) diff --git a/include/unk_02030494.h b/include/battle_arcade_save.h similarity index 92% rename from include/unk_02030494.h rename to include/battle_arcade_save.h index d003cf4f17..ea7dab081f 100644 --- a/include/unk_02030494.h +++ b/include/battle_arcade_save.h @@ -1,5 +1,5 @@ -#ifndef POKEPLATINUM_UNK_02030494_H -#define POKEPLATINUM_UNK_02030494_H +#ifndef POKEPLATINUM_BATTLE_ARCADE_SAVE_H +#define POKEPLATINUM_BATTLE_ARCADE_SAVE_H #include "savedata.h" @@ -42,4 +42,4 @@ BattleArcadeStreakFlags *BattleArcadeStreakFlags_Get(SaveData *saveData); void BattleArcadeStreakFlags_SetFlag(BattleArcadeStreakFlags *flags, u8 field, u8 challengeType, u8 unused, const void *value); u32 BattleArcadeStreakFlags_GetFlag(BattleArcadeStreakFlags *flags, u8 field, u8 challengeType, u8 unused, void *unused2); -#endif // POKEPLATINUM_UNK_02030494_H +#endif // POKEPLATINUM_BATTLE_ARCADE_SAVE_H diff --git a/include/overlay104/ov104_02237DD8.h b/include/overlay104/battle_arcade.h similarity index 55% rename from include/overlay104/ov104_02237DD8.h rename to include/overlay104/battle_arcade.h index 8a4923a4ac..8a0d38029f 100644 --- a/include/overlay104/ov104_02237DD8.h +++ b/include/overlay104/battle_arcade.h @@ -1,13 +1,74 @@ -#ifndef POKEPLATINUM_OV104_02237DD8_H -#define POKEPLATINUM_OV104_02237DD8_H +#ifndef POKEPLATINUM_BATTLE_ARCADE_H +#define POKEPLATINUM_BATTLE_ARCADE_H + +#include "constants/battle_frontier.h" #include "applications/frontier/battle_arcade/main.h" #include "overlay104/frontier_graphics.h" -#include "overlay104/struct_battle_arcade.h" +#include "overlay104/frontier_opponents.h" +#include "battle_arcade_save.h" +#include "field_battle_data_transfer.h" #include "party.h" #include "savedata.h" +typedef struct BattleArcade { + int unused; + SaveData *saveData; + BattleArcadeSave *arcadeSave; + FieldBattleDTO *dto; + u8 challengeType; + u8 currentBattle; + u8 cursorRandomized; + u8 activeEffect; + int weather; + u16 currentStreak; + u16 currentRound; + u8 rouletteSpeed; + u8 performance; + u8 seenArcadeStarIntro; + u8 immuneToEffect; + u16 randomIndex; + u32 unused2; + int wonBattle; + u8 partySlots[MATH_MAX(ARCADE_PARTY_SIZE_SOLO, ARCADE_PARTY_SIZE_MULTI)]; + u8 saveStreak; + ManagedSprite *playerMonSprites[ARCADE_MAX_PARTY_SIZE]; + ManagedSprite *opponentMonSprites[ARCADE_MAX_PARTY_SIZE]; + ManagedSprite *playerItemSprites[ARCADE_MAX_PARTY_SIZE]; + ManagedSprite *opponentItemSprites[ARCADE_MAX_PARTY_SIZE]; + Party *playersParty; + Party *opponentsParty; + u16 trainerIDs[ARCADE_BATTLES_PER_ROUND * 2]; + u32 monHP[ARCADE_MAX_PARTY_SIZE]; + u32 monAtk[ARCADE_MAX_PARTY_SIZE]; + u32 monDef[ARCADE_MAX_PARTY_SIZE]; + u32 monSpeed[ARCADE_MAX_PARTY_SIZE]; + u32 monSpAtk[ARCADE_MAX_PARTY_SIZE]; + u32 monSpDef[ARCADE_MAX_PARTY_SIZE]; + FrontierOpponent opponents[2]; + u16 monSetIDs[ARCADE_MAX_PARTY_SIZE]; + u8 opponentMonIVs[ARCADE_MAX_PARTY_SIZE]; + u32 opponentMonPersonalities[ARCADE_MAX_PARTY_SIZE]; + FrontierPokemon opponentMons[ARCADE_MAX_PARTY_SIZE]; + u16 unused3; + u16 savedHeldItems[MATH_MAX(ARCADE_PARTY_SIZE_SOLO, ARCADE_PARTY_SIZE_MULTI)]; + u16 appCursorPos[6]; + u16 unk_424[40]; + u8 unk_474[512]; + u8 unk_674[2][512]; + u8 unk_A74; + u8 unk_A75; + u16 unk_A76; + u16 unk_A78; + u8 unk_A7A; + u8 unk_A7B; + u8 msgsReceived; + u8 unk_A7D; + u16 *unk_A80; + u32 unk_A84; +} BattleArcade; + BattleArcade *BattleArcade_Init(SaveData *saveData, u16 resumingFromSave, u8 challengeType, u16 partySlot1, u16 partySlot2, u16 partySlot3, u16 *param6); void BattleArcade_LoadTrainersForRound(BattleArcade *arcade, u16 resumingFromSave); void BattleArcade_Free(BattleArcade *arcade); @@ -37,4 +98,4 @@ void BattleArcade_ApplyEffect(BattleArcade *arcade, u8 effect); u16 BattleArcade_GetEarnedBP(BattleArcade *arcade); void BattleArcade_SaveItemsAfterBattle(Party *battleParty, Party *arcadeParty, int battleSlot, int arcadeSlot); -#endif // POKEPLATINUM_OV104_02237DD8_H +#endif // POKEPLATINUM_BATTLE_ARCADE_H diff --git a/include/overlay104/ov104_0223BCBC.h b/include/overlay104/battle_arcade_helpers.h similarity index 85% rename from include/overlay104/ov104_0223BCBC.h rename to include/overlay104/battle_arcade_helpers.h index 2763e817ac..6228d49231 100644 --- a/include/overlay104/ov104_0223BCBC.h +++ b/include/overlay104/battle_arcade_helpers.h @@ -1,9 +1,9 @@ -#ifndef POKEPLATINUM_OV104_0223BCBC_H -#define POKEPLATINUM_OV104_0223BCBC_H +#ifndef POKEPLATINUM_BATTLE_ARCADE_HELPERS_H +#define POKEPLATINUM_BATTLE_ARCADE_HELPERS_H -#include "overlay104/struct_battle_arcade.h" #include "overlay104/struct_ov104_02230BE4.h" +#include "battle_arcade.h" #include "field_battle_data_transfer.h" #include "party.h" @@ -19,4 +19,4 @@ u16 BattleArcade_GetFreeBPFromEvent(BattleArcade *battleArcade, u8 activeEffect) u16 BattleArcade_GetCurrentRound(BattleArcade *battleArcade); u8 BattleArcade_GetCategoryFromEffect(u8 effect); -#endif // POKEPLATINUM_OV104_0223BCBC_H +#endif // POKEPLATINUM_BATTLE_ARCADE_HELPERS_H diff --git a/include/overlay104/ov104_0222ECE8.h b/include/overlay104/ov104_0222ECE8.h index b3ed099eaf..bb9c3ca24a 100644 --- a/include/overlay104/ov104_0222ECE8.h +++ b/include/overlay104/ov104_0222ECE8.h @@ -1,9 +1,9 @@ #ifndef POKEPLATINUM_OV104_0222ECE8_H #define POKEPLATINUM_OV104_0222ECE8_H +#include "overlay104/battle_arcade.h" #include "overlay104/battle_castle.h" #include "overlay104/battle_hall.h" -#include "overlay104/struct_battle_arcade.h" #include "overlay104/struct_battle_factory.h" void ov104_0222ECE8(int param0, int param1, void *param2, void *param3); diff --git a/include/overlay104/struct_battle_arcade.h b/include/overlay104/struct_battle_arcade.h deleted file mode 100644 index 1ac46f7b2e..0000000000 --- a/include/overlay104/struct_battle_arcade.h +++ /dev/null @@ -1,71 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_BATTLE_ARCADE_H -#define POKEPLATINUM_STRUCT_BATTLE_ARCADE_H - -#include "constants/battle_frontier.h" - -#include "overlay104/frontier_opponents.h" - -#include "field_battle_data_transfer.h" -#include "party.h" -#include "savedata.h" -#include "sprite.h" -#include "unk_02030494.h" - -typedef struct BattleArcade { - int unused; - SaveData *saveData; - BattleArcadeSave *arcadeSave; - FieldBattleDTO *dto; - u8 challengeType; - u8 currentBattle; - u8 cursorRandomized; - u8 activeEffect; - int weather; - u16 currentStreak; - u16 currentRound; - u8 rouletteSpeed; - u8 performance; - u8 seenArcadeStarIntro; - u8 immuneToEffect; - u16 randomIndex; - u32 unused2; - int wonBattle; - u8 partySlots[MATH_MAX(ARCADE_PARTY_SIZE_SOLO, ARCADE_PARTY_SIZE_MULTI)]; - u8 saveStreak; - ManagedSprite *playerMonSprites[ARCADE_MAX_PARTY_SIZE]; - ManagedSprite *opponentMonSprites[ARCADE_MAX_PARTY_SIZE]; - ManagedSprite *playerItemSprites[ARCADE_MAX_PARTY_SIZE]; - ManagedSprite *opponentItemSprites[ARCADE_MAX_PARTY_SIZE]; - Party *playersParty; - Party *opponentsParty; - u16 trainerIDs[ARCADE_BATTLES_PER_ROUND * 2]; - u32 monHP[ARCADE_MAX_PARTY_SIZE]; - u32 monAtk[ARCADE_MAX_PARTY_SIZE]; - u32 monDef[ARCADE_MAX_PARTY_SIZE]; - u32 monSpeed[ARCADE_MAX_PARTY_SIZE]; - u32 monSpAtk[ARCADE_MAX_PARTY_SIZE]; - u32 monSpDef[ARCADE_MAX_PARTY_SIZE]; - FrontierOpponent opponents[2]; - u16 monSetIDs[ARCADE_MAX_PARTY_SIZE]; - u8 opponentMonIVs[ARCADE_MAX_PARTY_SIZE]; - u32 opponentMonPersonalities[ARCADE_MAX_PARTY_SIZE]; - FrontierPokemon opponentMons[ARCADE_MAX_PARTY_SIZE]; - u16 unused3; - u16 savedHeldItems[MATH_MAX(ARCADE_PARTY_SIZE_SOLO, ARCADE_PARTY_SIZE_MULTI)]; - u16 appCursorPos[6]; - u16 unk_424[40]; - u8 unk_474[512]; - u8 unk_674[2][512]; - u8 unk_A74; - u8 unk_A75; - u16 unk_A76; - u16 unk_A78; - u8 unk_A7A; - u8 unk_A7B; - u8 msgsReceived; - u8 unk_A7D; - u16 *unk_A80; - u32 unk_A84; -} BattleArcade; - -#endif // POKEPLATINUM_STRUCT_BATTLE_ARCADE_H diff --git a/include/struct_defs/battle_frontier.h b/include/struct_defs/battle_frontier.h index 4d91c879f7..752e77c274 100644 --- a/include/struct_defs/battle_frontier.h +++ b/include/struct_defs/battle_frontier.h @@ -7,10 +7,10 @@ #include "struct_defs/struct_0202FF58.h" #include "struct_defs/wifi_battle_tower_data.h" +#include "battle_arcade_save.h" #include "battle_castle_save.h" #include "battle_factory_save.h" #include "battle_hall_save.h" -#include "unk_02030494.h" #include "wifi_list.h" typedef struct BattleFrontierStats { diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf index 49cd0ea56f..9b148b4576 100644 --- a/platinum.us/main.lsf +++ b/platinum.us/main.lsf @@ -146,7 +146,7 @@ Static main Object main.nef.p/src_battle_factory_save.c.o Object main.nef.p/src_battle_hall_save.c.o Object main.nef.p/src_battle_castle_save.c.o - Object main.nef.p/src_unk_02030494.c.o + Object main.nef.p/src_battle_arcade_save.c.o Object main.nef.p/src_battle_frontier_save.c.o Object main.nef.p/src_battle_hall_win_records.c.o Object main.nef.p/src_unk_02030A80.c.o @@ -1548,7 +1548,7 @@ Overlay overlay104 Object main.nef.p/src_overlay104_frscrcmd_battle_castle.c.o Object main.nef.p/src_overlay104_battle_castle.c.o Object main.nef.p/src_overlay104_frscrcmd_battle_arcade.c.o - Object main.nef.p/src_overlay104_ov104_02237DD8.c.o + Object main.nef.p/src_overlay104_battle_arcade.c.o Object main.nef.p/src_overlay104_frscrcmd_sound.c.o Object main.nef.p/src_overlay104_frscrcmd_battle_tower.c.o Object main.nef.p/src_overlay104_ov104_022394A4.c.o @@ -1558,7 +1558,7 @@ Overlay overlay104 Object main.nef.p/src_overlay104_ov104_0223A7F4.c.o Object main.nef.p/src_overlay104_battle_hall_helpers.c.o Object main.nef.p/src_overlay104_battle_castle_helpers.c.o - Object main.nef.p/src_overlay104_ov104_0223BCBC.c.o + Object main.nef.p/src_overlay104_battle_arcade_helpers.c.o Object main.nef.p/src_overlay104_ov104_0223C164.c.o Object main.nef.p/src_overlay104_frontier_graphics.c.o Object main.nef.p/src_overlay104_frontier_particle_system.c.o diff --git a/src/applications/frontier/battle_arcade/main.c b/src/applications/frontier/battle_arcade/main.c index d51e48dd7f..643f878383 100644 --- a/src/applications/frontier/battle_arcade/main.c +++ b/src/applications/frontier/battle_arcade/main.c @@ -12,8 +12,9 @@ #include "applications/frontier/battle_arcade/sprite_manager.h" #include "applications/frontier/battle_arcade/sprites.h" #include "applications/frontier/battle_arcade/windows.h" -#include "overlay104/ov104_0223BCBC.h" +#include "overlay104/battle_arcade_helpers.h" +#include "battle_arcade_save.h" #include "battle_frontier_save.h" #include "bg_window.h" #include "communication_system.h" @@ -43,7 +44,6 @@ #include "system.h" #include "touch_screen.h" #include "trainer_info.h" -#include "unk_02030494.h" #include "unk_020363E8.h" #include "unk_0209BA80.h" #include "vram_transfer.h" diff --git a/src/applications/frontier/records/main.c b/src/applications/frontier/records/main.c index fcd41d8fe4..01b656eaab 100644 --- a/src/applications/frontier/records/main.c +++ b/src/applications/frontier/records/main.c @@ -11,6 +11,7 @@ #include "applications/frontier/records/windows.h" +#include "battle_arcade_save.h" #include "battle_castle_save.h" #include "battle_factory_save.h" #include "battle_frontier_save.h" @@ -34,7 +35,6 @@ #include "string_template.h" #include "system.h" #include "text.h" -#include "unk_02030494.h" #include "wifi_battle_tower_save.h" #include "res/graphics/frontier/backgrounds/frontier_backgrounds.naix" diff --git a/src/unk_02030494.c b/src/battle_arcade_save.c similarity index 99% rename from src/unk_02030494.c rename to src/battle_arcade_save.c index 589ee9aac1..2c55e7fe10 100644 --- a/src/unk_02030494.c +++ b/src/battle_arcade_save.c @@ -1,4 +1,4 @@ -#include "unk_02030494.h" +#include "battle_arcade_save.h" #include diff --git a/src/battle_frontier_save.c b/src/battle_frontier_save.c index c0b0059e50..2044763c26 100644 --- a/src/battle_frontier_save.c +++ b/src/battle_frontier_save.c @@ -4,11 +4,11 @@ #include "struct_defs/battle_frontier.h" +#include "battle_arcade_save.h" #include "battle_castle_save.h" #include "battle_factory_save.h" #include "battle_hall_save.h" #include "savedata.h" -#include "unk_02030494.h" #include "wifi_battle_tower_save.h" #include "wifi_list.h" diff --git a/src/meson.build b/src/meson.build index f9c538f7f2..f96a8965d6 100644 --- a/src/meson.build +++ b/src/meson.build @@ -135,7 +135,7 @@ pokeplatinum_c = files( 'battle_factory_save.c', 'battle_hall_save.c', 'battle_castle_save.c', - 'unk_02030494.c', + 'battle_arcade_save.c', 'battle_frontier_save.c', 'battle_hall_win_records.c', 'unk_02030A80.c', @@ -932,7 +932,7 @@ pokeplatinum_c = files( 'overlay104/frscrcmd_battle_castle.c', 'overlay104/battle_castle.c', 'overlay104/frscrcmd_battle_arcade.c', - 'overlay104/ov104_02237DD8.c', + 'overlay104/battle_arcade.c', 'overlay104/frscrcmd_sound.c', 'overlay104/frscrcmd_battle_tower.c', 'overlay104/ov104_022394A4.c', @@ -942,7 +942,7 @@ pokeplatinum_c = files( 'overlay104/ov104_0223A7F4.c', 'overlay104/battle_hall_helpers.c', 'overlay104/battle_castle_helpers.c', - 'overlay104/ov104_0223BCBC.c', + 'overlay104/battle_arcade_helpers.c', 'overlay104/ov104_0223C164.c', 'overlay104/frontier_graphics.c', 'overlay104/frontier_particle_system.c', diff --git a/src/overlay104/ov104_02237DD8.c b/src/overlay104/battle_arcade.c similarity index 99% rename from src/overlay104/ov104_02237DD8.c rename to src/overlay104/battle_arcade.c index f9a4219c44..1b002052ca 100644 --- a/src/overlay104/ov104_02237DD8.c +++ b/src/overlay104/battle_arcade.c @@ -1,4 +1,4 @@ -#include "overlay104/ov104_02237DD8.h" +#include "overlay104/battle_arcade.h" #include #include @@ -8,12 +8,13 @@ #include "generated/items.h" #include "global/utility.h" +#include "overlay104/battle_arcade.h" +#include "overlay104/battle_arcade_helpers.h" #include "overlay104/frontier_opponents.h" #include "overlay104/ov104_0222ECE8.h" #include "overlay104/ov104_02231F74.h" -#include "overlay104/ov104_0223BCBC.h" -#include "overlay104/struct_battle_arcade.h" +#include "battle_arcade_save.h" #include "battle_frontier_save.h" #include "battle_frontier_stats.h" #include "bg_window.h" @@ -29,7 +30,6 @@ #include "savedata.h" #include "sprite.h" #include "system_vars.h" -#include "unk_02030494.h" #include "vars_flags.h" #include "res/graphics/frontier/backgrounds/frontier_backgrounds.naix" diff --git a/src/overlay104/ov104_0223BCBC.c b/src/overlay104/battle_arcade_helpers.c similarity index 99% rename from src/overlay104/ov104_0223BCBC.c rename to src/overlay104/battle_arcade_helpers.c index f07b871c3d..06fceba417 100644 --- a/src/overlay104/ov104_0223BCBC.c +++ b/src/overlay104/battle_arcade_helpers.c @@ -1,4 +1,4 @@ -#include "overlay104/ov104_0223BCBC.h" +#include "overlay104/battle_arcade_helpers.h" #include @@ -8,8 +8,8 @@ #include "struct_defs/frontier_trainer_base.h" +#include "overlay104/battle_arcade.h" #include "overlay104/frontier_opponents.h" -#include "overlay104/struct_battle_arcade.h" #include "overlay104/struct_ov104_02230BE4.h" #include "communication_information.h" diff --git a/src/overlay104/frscrcmd_battle_arcade.c b/src/overlay104/frscrcmd_battle_arcade.c index d6c2d0c16e..3545fe41ab 100644 --- a/src/overlay104/frscrcmd_battle_arcade.c +++ b/src/overlay104/frscrcmd_battle_arcade.c @@ -8,6 +8,8 @@ #include "applications/frontier/battle_arcade/main.h" #include "global/utility.h" #include "overlay063/ov63_0222CCE4.h" +#include "overlay104/battle_arcade.h" +#include "overlay104/battle_arcade_helpers.h" #include "overlay104/battle_castle_helpers.h" #include "overlay104/defs.h" #include "overlay104/frontier_graphics.h" @@ -17,12 +19,10 @@ #include "overlay104/frontier_script_manager.h" #include "overlay104/frscrcmd.h" #include "overlay104/ov104_02231F74.h" -#include "overlay104/ov104_02237DD8.h" -#include "overlay104/ov104_0223BCBC.h" -#include "overlay104/struct_battle_arcade.h" #include "overlay104/struct_ov104_02230BE4.h" #include "overlay104/struct_ov104_0223C634.h" +#include "battle_arcade_save.h" #include "battle_frontier.h" #include "communication_information.h" #include "field_battle_data_transfer.h" @@ -36,7 +36,6 @@ #include "sprite.h" #include "string_template.h" #include "trainer_info.h" -#include "unk_02030494.h" #include "unk_0209BA80.h" #include "constdata/const_020EA358.h" diff --git a/src/overlay104/ov104_0222ECE8.c b/src/overlay104/ov104_0222ECE8.c index 3be0028ea5..96b0946660 100644 --- a/src/overlay104/ov104_0222ECE8.c +++ b/src/overlay104/ov104_0222ECE8.c @@ -3,13 +3,14 @@ #include #include +#include "overlay104/battle_arcade.h" +#include "overlay104/battle_arcade_helpers.h" #include "overlay104/battle_castle_helpers.h" #include "overlay104/battle_hall.h" #include "overlay104/ov104_0223A7F4.h" -#include "overlay104/ov104_0223BCBC.h" -#include "overlay104/struct_battle_arcade.h" #include "overlay104/struct_battle_factory.h" +#include "battle_arcade_save.h" #include "battle_castle_save.h" #include "battle_frontier_save.h" #include "battle_frontier_stats.h" @@ -19,7 +20,6 @@ #include "pokemon.h" #include "save_player.h" #include "trainer_info.h" -#include "unk_02030494.h" BOOL ov104_0222EEF8(BattleFactory *param0); void ov104_0222EF30(int param0, int param1, void *param2, void *param3); diff --git a/src/unk_0205003C.c b/src/unk_0205003C.c index e6329a5c9e..18877f8751 100644 --- a/src/unk_0205003C.c +++ b/src/unk_0205003C.c @@ -13,6 +13,7 @@ #include "field/field_system.h" #include "bag.h" +#include "battle_arcade_save.h" #include "battle_frontier_save.h" #include "battle_frontier_stats.h" #include "communication_system.h" @@ -28,7 +29,6 @@ #include "savedata.h" #include "script_manager.h" #include "unk_0202D778.h" -#include "unk_02030494.h" #include "unk_02049D08.h" #include "unk_02099500.h"