Consolidate and identify party menu source files

This commit is contained in:
Rachel 2025-08-31 20:38:04 -07:00
parent ffee2b6df5
commit bb6765f3e4
40 changed files with 105 additions and 121 deletions

View File

@ -1,28 +1,64 @@
#ifndef POKEPLATINUM_STRUCT_0207F248_H
#define POKEPLATINUM_STRUCT_0207F248_H
#ifndef POKEPLATINUM_PARTY_MENU_DEFS_H
#define POKEPLATINUM_PARTY_MENU_DEFS_H
#include "struct_decls/struct_02098700_decl.h"
#include "struct_defs/funcptr_0207F248_sub1.h"
#include "struct_defs/mail.h"
#include "struct_defs/struct_0202440C.h"
#include "struct_defs/struct_0202610C.h"
#include "struct_defs/struct_020831B4.h"
#include "struct_defs/struct_02083D1C.h"
#include "struct_defs/struct_02098C44.h"
#include "field/field_system_decl.h"
#include "functypes/funcptr_0207F248.h"
#include "overlay118/struct_ov118_021D0FDC_decl.h"
#include "bag.h"
#include "bg_window.h"
#include "field_move_tasks.h"
#include "font_special_chars.h"
#include "g3d_pipeline.h"
#include "game_options.h"
#include "grid_menu_cursor_position.h"
#include "menu.h"
#include "message.h"
#include "party.h"
#include "sprite.h"
#include "sprite_system.h"
#include "strbuf.h"
#include "string_list.h"
#include "string_template.h"
typedef struct {
typedef struct PartyManagementData {
Party *party;
Bag *bag;
Mailbox *mailbox;
Options *options;
TVBroadcast *broadcast;
BattleRegulation *battleRegulation;
FieldMoveContext *fieldMoveContext;
FieldSystem *fieldSystem;
u8 unk_20;
u8 unk_21;
u8 selectedMonSlot;
u8 menuSelectionResult;
u16 usedItemID;
u16 learnedMove;
u8 selectedMoveSlot;
u8 unk_29; // These three fields (unk_29, unk_2A, unk_2B) are used exactly once in the code (sub_0203D578) which is itself only used once.
u8 unk_2A; // sub_0203D578 is used by ScrCmd_194 which is contest related so these fields are likely contest related too.
u8 unk_2B;
u8 unk_2C[6];
u8 unk_32_0 : 4;
u8 unk_32_4 : 4;
u8 unk_33;
int unk_34;
u16 evoTargetSpecies;
u8 padding_3A[2];
int evoType;
} PartyManagementData;
typedef struct GameWindowLayout {
BgConfig *unk_00;
Window unk_04[37];
Window unk_254[1];
@ -64,4 +100,4 @@ typedef struct {
G3DPipelineBuffers *unk_B28;
} GameWindowLayout;
#endif // POKEPLATINUM_STRUCT_0207F248_H
#endif // POKEPLATINUM_PARTY_MENU_DEFS_H

View File

@ -1,7 +1,11 @@
#ifndef POKEPLATINUM_UNK_0207E0B8_H
#define POKEPLATINUM_UNK_0207E0B8_H
#ifndef POKEPLATINUM_PARTY_MENU_MAIN_H
#define POKEPLATINUM_PARTY_MENU_MAIN_H
#include "struct_defs/struct_0207F248.h"
#include "applications/party_menu/defs.h"
#include "overlay_manager.h"
extern const ApplicationManagerTemplate gPokemonPartyAppTemplate;
void sub_0207EA74(GameWindowLayout *windowLayout, int param1);
u8 sub_0207EF04(GameWindowLayout *windowLayout, u8 param1);
@ -22,4 +26,4 @@ void LoadScreenDataFromNARC(u32 param0, u16 *param1, u16 *param2, u16 *param3);
void LoadOverlay118(GameWindowLayout *windowLayout);
void UnloadOverlay118(GameWindowLayout *windowLayout);
#endif // POKEPLATINUM_UNK_0207E0B8_H
#endif // POKEPLATINUM_PARTY_MENU_MAIN_H

View File

@ -1,8 +0,0 @@
#ifndef POKEPLATINUM_CONST_020F1E88_H
#define POKEPLATINUM_CONST_020F1E88_H
#include "overlay_manager.h"
extern const ApplicationManagerTemplate gPokemonPartyAppTemplate;
#endif // POKEPLATINUM_CONST_020F1E88_H

View File

@ -1,7 +1,7 @@
#ifndef POKEPLATINUM_FUNCPTR_0207E634_H
#define POKEPLATINUM_FUNCPTR_0207E634_H
#include "struct_defs/struct_0207F248.h"
#include "applications/party_menu/defs.h"
typedef void (*UnkFuncPtr_0207E634)(GameWindowLayout *, int *);

View File

@ -1,7 +1,7 @@
#ifndef POKEPLATINUM_OV118_021D0D80_H
#define POKEPLATINUM_OV118_021D0D80_H
#include "struct_defs/struct_0207F248.h"
#include "applications/party_menu/defs.h"
void ov118_021D0D80(GameWindowLayout *param0);
int ov118_021D0DBC(GameWindowLayout *param0);

View File

@ -1,44 +0,0 @@
#ifndef POKEPLATINUM_STRUCT_02098C44_H
#define POKEPLATINUM_STRUCT_02098C44_H
#include "struct_defs/mail.h"
#include "struct_defs/struct_0202440C.h"
#include "struct_defs/struct_0202610C.h"
#include "field/field_system_decl.h"
#include "bag.h"
#include "field_move_tasks.h"
#include "game_options.h"
#include "party.h"
typedef struct {
Party *party;
Bag *bag;
Mailbox *mailbox;
Options *options;
TVBroadcast *broadcast;
BattleRegulation *battleRegulation;
FieldMoveContext *fieldMoveContext;
FieldSystem *fieldSystem;
u8 unk_20;
u8 unk_21;
u8 selectedMonSlot;
u8 menuSelectionResult;
u16 usedItemID;
u16 learnedMove;
u8 selectedMoveSlot;
u8 unk_29; // These three fields (unk_29, unk_2A, unk_2B) are used exactly once in the code (sub_0203D578) which is itself only used once.
u8 unk_2A; // sub_0203D578 is used by ScrCmd_194 which is contest related so these fields are likely contest related too.
u8 unk_2B;
u8 unk_2C[6];
u8 unk_32_0 : 4;
u8 unk_32_4 : 4;
u8 unk_33;
int unk_34;
u16 evoTargetSpecies;
u8 padding_3A[2];
int evoType;
} PartyManagementData;
#endif // POKEPLATINUM_STRUCT_02098C44_H

View File

@ -1,8 +1,7 @@
#ifndef POKEPLATINUM_STRUCT_0209BBA4_H
#define POKEPLATINUM_STRUCT_0209BBA4_H
#include "struct_defs/struct_02098C44.h"
#include "applications/party_menu/defs.h"
#include "applications/pokemon_summary_screen/main.h"
#include "field/field_system_decl.h"

View File

@ -9,10 +9,10 @@
#include "struct_defs/struct_0203E274.h"
#include "struct_defs/struct_0203E348.h"
#include "struct_defs/struct_02097728.h"
#include "struct_defs/struct_02098C44.h"
#include "struct_defs/struct_020997B8.h"
#include "applications/naming_screen.h"
#include "applications/party_menu/defs.h"
#include "applications/pc_boxes/pokemon_storage_session.h"
#include "applications/pokemon_summary_screen/main.h"
#include "field/field_system_decl.h"

View File

@ -1,7 +1,7 @@
#ifndef POKEPLATINUM_UNK_020819DC_H
#define POKEPLATINUM_UNK_020819DC_H
#include "struct_defs/struct_0207F248.h"
#include "applications/party_menu/defs.h"
#include "pokemon.h"

View File

@ -1,7 +1,7 @@
#ifndef POKEPLATINUM_UNK_02082C2C_H
#define POKEPLATINUM_UNK_02082C2C_H
#include "struct_defs/struct_0207F248.h"
#include "applications/party_menu/defs.h"
#include "narc.h"

View File

@ -1,7 +1,7 @@
#ifndef POKEPLATINUM_UNK_02083370_H
#define POKEPLATINUM_UNK_02083370_H
#include "struct_defs/struct_0207F248.h"
#include "applications/party_menu/defs.h"
u32 sub_02083370(u8 param0);
void sub_0208337C(GameWindowLayout *param0);

View File

@ -1,7 +1,7 @@
#ifndef POKEPLATINUM_UNK_02084B70_H
#define POKEPLATINUM_UNK_02084B70_H
#include "struct_defs/struct_0207F248.h"
#include "applications/party_menu/defs.h"
#include "pokemon.h"

View File

@ -305,7 +305,7 @@ Static main
Object main.nef.p/src_unk_0207DA28.c.o
Object main.nef.p/src_unk_0207DFAC.c.o
Object main.nef.p/src_unk_0207E060.c.o
Object main.nef.p/src_unk_0207E0B8.c.o
Object main.nef.p/src_applications_party_menu_main.c.o
Object main.nef.p/src_unk_020819DC.c.o
Object main.nef.p/src_unk_02082C2C.c.o
Object main.nef.p/src_unk_02083370.c.o

View File

@ -1,13 +1,14 @@
#include "unk_0207E0B8.h"
#include "applications/party_menu/main.h"
#include <nitro.h>
#include <string.h>
#include "constants/items.h"
#include "struct_defs/struct_0207F248.h"
#include "struct_defs/struct_02099F80.h"
#include "applications/party_menu/defs.h"
#include "applications/party_menu/main.h"
#include "applications/pokemon_summary_screen/main.h"
#include "field/field_system.h"
#include "functypes/funcptr_0207E634.h"
@ -58,8 +59,6 @@
#include "unk_0208C098.h"
#include "vram_transfer.h"
#include "constdata/const_020F1E88.h"
FS_EXTERN_OVERLAY(overlay118);
typedef struct {

View File

@ -10,8 +10,9 @@
#include "struct_defs/struct_0203D9B8.h"
#include "struct_defs/struct_020708E0.h"
#include "struct_defs/struct_02097728.h"
#include "struct_defs/struct_02098C44.h"
#include "applications/party_menu/defs.h"
#include "applications/party_menu/main.h"
#include "field/field_system.h"
#include "overlay005/fieldmap.h"
#include "overlay005/fishing.h"
@ -62,7 +63,6 @@
#include "unk_020989DC.h"
#include "vars_flags.h"
#include "constdata/const_020F1E88.h"
#include "res/text/bank/location_names.h"
typedef struct ItemUseFuncDat {

View File

@ -288,7 +288,7 @@ pokeplatinum_c = files(
'unk_0207DA28.c',
'unk_0207DFAC.c',
'unk_0207E060.c',
'unk_0207E0B8.c',
'applications/party_menu/main.c',
'unk_020819DC.c',
'unk_02082C2C.c',
'unk_02083370.c',

View File

@ -8,6 +8,7 @@
#include "struct_defs/struct_020127E8.h"
#include "struct_defs/struct_02099F80.h"
#include "applications/party_menu/main.h"
#include "applications/pokemon_summary_screen/main.h"
#include "overlay010/struct_ov10_0221F800.h"
@ -54,7 +55,6 @@
#include "unk_020363E8.h"
#include "unk_020366A0.h"
#include "unk_020393C8.h"
#include "unk_0207E0B8.h"
#include "unk_0208C098.h"
#include "vram_transfer.h"

View File

@ -6,6 +6,7 @@
#include "generated/move_classes.h"
#include "generated/pokemon_types.h"
#include "applications/party_menu/main.h"
#include "applications/pokemon_summary_screen/main.h"
#include "battle/ov16_0223DF00.h"
#include "battle/ov16_0226DB7C.h"
@ -22,7 +23,6 @@
#include "pokemon_icon.h"
#include "sprite_system.h"
#include "type_icon.h"
#include "unk_0207E0B8.h"
#include "unk_0208C098.h"
static void ov13_0222453C(BattleParty *param0);

View File

@ -7,6 +7,7 @@
#include "struct_defs/sentence.h"
#include "applications/party_menu/main.h"
#include "overlay063/ov63_0222BE18.h"
#include "overlay063/ov63_0222CCE4.h"
#include "overlay063/ov63_0222D77C.h"
@ -53,7 +54,6 @@
#include "system.h"
#include "text.h"
#include "unk_02014A84.h"
#include "unk_0207E0B8.h"
#include "unk_0209B6F8.h"
typedef struct UnkStruct_ov104_02232B5C_t {

View File

@ -4,9 +4,10 @@
#include <string.h>
#include "struct_decls/struct_0209B75C_decl.h"
#include "struct_defs/struct_02098C44.h"
#include "struct_defs/struct_0209BBA4.h"
#include "applications/party_menu/defs.h"
#include "applications/party_menu/main.h"
#include "applications/pokemon_summary_screen/main.h"
#include "field/field_system.h"
@ -21,7 +22,6 @@
#include "unk_0209B6F8.h"
#include "unk_0209BA80.h"
#include "constdata/const_020F1E88.h"
#include "constdata/const_020F410C.h"
void ov104_02239C7C(UnkStruct_0209BBA4 *param0);

View File

@ -3,6 +3,7 @@
#include <nitro.h>
#include <string.h>
#include "applications/party_menu/main.h"
#include "overlay107/struct_ov107_02249954.h"
#include "char_transfer.h"
@ -18,7 +19,6 @@
#include "sprite_resource.h"
#include "sprite_transfer.h"
#include "sprite_util.h"
#include "unk_0207E0B8.h"
#include "vram_transfer.h"
void ov107_02249604(UnkStruct_ov107_02249954 *param0, Party *param1, u8 param2);

View File

@ -3,6 +3,7 @@
#include <nitro.h>
#include <string.h>
#include "applications/party_menu/main.h"
#include "overlay108/struct_ov108_02243030.h"
#include "char_transfer.h"
@ -17,7 +18,6 @@
#include "sprite_resource.h"
#include "sprite_transfer.h"
#include "sprite_util.h"
#include "unk_0207E0B8.h"
#include "vram_transfer.h"
static const u8 Unk_ov108_02243760[4] = {

View File

@ -5,7 +5,8 @@
#include "generated/species.h"
#include "struct_defs/struct_0207F248.h"
#include "applications/party_menu/defs.h"
#include "applications/party_menu/main.h"
#include "camera.h"
#include "enums.h"
@ -23,7 +24,6 @@
#include "string_template.h"
#include "text.h"
#include "unk_0202419C.h"
#include "unk_0207E0B8.h"
#include "unk_020819DC.h"
#include "unk_02082C2C.h"

View File

@ -45,11 +45,11 @@
#include "struct_defs/struct_0203E608.h"
#include "struct_defs/struct_02041DC8.h"
#include "struct_defs/struct_0204AFC4.h"
#include "struct_defs/struct_02098C44.h"
#include "struct_defs/underground.h"
#include "struct_defs/underground_record.h"
#include "applications/naming_screen.h"
#include "applications/party_menu/defs.h"
#include "applications/pc_boxes/pokemon_storage_session.h"
#include "applications/pokemon_summary_screen/main.h"
#include "boat_cutscene/boat_cutscene.h"

View File

@ -17,8 +17,9 @@
#include "struct_defs/struct_0203D8AC.h"
#include "struct_defs/struct_020708E0.h"
#include "struct_defs/struct_02097728.h"
#include "struct_defs/struct_02098C44.h"
#include "applications/party_menu/defs.h"
#include "applications/party_menu/main.h"
#include "applications/pokedex/pokedex_main.h"
#include "applications/pokemon_summary_screen/main.h"
#include "field/field_system.h"
@ -90,7 +91,6 @@
#include "vars_flags.h"
#include "constdata/const_020EA02C.h"
#include "constdata/const_020F1E88.h"
#include "res/text/bank/start_menu.h"
typedef enum StartMenuPos {

View File

@ -28,12 +28,13 @@
#include "struct_defs/struct_0203E6C0.h"
#include "struct_defs/struct_0206BC70.h"
#include "struct_defs/struct_02097728.h"
#include "struct_defs/struct_02098C44.h"
#include "struct_defs/struct_020997B8.h"
#include "applications/journal_display/journal_controller.h"
#include "applications/naming_screen.h"
#include "applications/options_menu.h"
#include "applications/party_menu/defs.h"
#include "applications/party_menu/main.h"
#include "applications/pc_boxes/box_app_manager.h"
#include "applications/pc_boxes/pokemon_storage_session.h"
#include "applications/pokedex/pokedex_main.h"
@ -135,7 +136,6 @@
#include "constdata/const_020EA02C.h"
#include "constdata/const_020EA328.h"
#include "constdata/const_020EA358.h"
#include "constdata/const_020F1E88.h"
#include "constdata/const_020F2FCC.h"
#include "constdata/const_020F410C.h"
#include "constdata/const_020F6890.h"

View File

@ -11,9 +11,9 @@
#include "struct_decls/struct_0202D764_decl.h"
#include "struct_defs/battle_frontier.h"
#include "struct_defs/struct_0204AFC4.h"
#include "struct_defs/struct_02098C44.h"
#include "struct_defs/underground.h"
#include "applications/party_menu/defs.h"
#include "field/field_system.h"
#include "savedata/save_table.h"

View File

@ -12,8 +12,9 @@
#include "struct_defs/battle_frontier.h"
#include "struct_defs/struct_0204AFC4.h"
#include "struct_defs/struct_0204F3D0.h"
#include "struct_defs/struct_02098C44.h"
#include "applications/party_menu/defs.h"
#include "applications/party_menu/main.h"
#include "applications/pokemon_summary_screen/main.h"
#include "field/field_system.h"
@ -42,7 +43,6 @@
#include "unk_0205DFC4.h"
#include "unk_02099500.h"
#include "constdata/const_020F1E88.h"
#include "constdata/const_020F410C.h"
typedef struct UnkStruct_0204F470_t {

View File

@ -8,8 +8,9 @@
#include "struct_decls/struct_0203041C_decl.h"
#include "struct_defs/struct_0204AFC4.h"
#include "struct_defs/struct_0204FCF8.h"
#include "struct_defs/struct_02098C44.h"
#include "applications/party_menu/defs.h"
#include "applications/party_menu/main.h"
#include "applications/pokemon_summary_screen/main.h"
#include "field/field_system.h"
@ -33,7 +34,6 @@
#include "unk_0205DFC4.h"
#include "unk_02099500.h"
#include "constdata/const_020F1E88.h"
#include "constdata/const_020F410C.h"
typedef struct {

View File

@ -8,8 +8,9 @@
#include "struct_decls/struct_020305B8_decl.h"
#include "struct_defs/struct_0204AFC4.h"
#include "struct_defs/struct_02050224.h"
#include "struct_defs/struct_02098C44.h"
#include "applications/party_menu/defs.h"
#include "applications/party_menu/main.h"
#include "applications/pokemon_summary_screen/main.h"
#include "field/field_system.h"
@ -33,7 +34,6 @@
#include "unk_0205DFC4.h"
#include "unk_02099500.h"
#include "constdata/const_020F1E88.h"
#include "constdata/const_020F410C.h"
typedef struct {

View File

@ -3,8 +3,8 @@
#include <nitro.h>
#include <string.h>
#include "struct_defs/struct_02098C44.h"
#include "applications/party_menu/defs.h"
#include "applications/party_menu/main.h"
#include "applications/pokemon_summary_screen/main.h"
#include "field/field_system.h"
#include "functypes/funcptr_0205AB10.h"
@ -45,7 +45,6 @@
#include "unk_0203D1B8.h"
#include "unk_020655F4.h"
#include "constdata/const_020F1E88.h"
#include "constdata/const_020F410C.h"
typedef struct {

View File

@ -9,9 +9,10 @@
#include "struct_decls/struct_0202D750_decl.h"
#include "struct_defs/battle_frontier.h"
#include "struct_defs/struct_0206BC70.h"
#include "struct_defs/struct_02098C44.h"
#include "struct_defs/underground.h"
#include "applications/party_menu/defs.h"
#include "applications/party_menu/main.h"
#include "applications/pokemon_summary_screen/main.h"
#include "field/field_system.h"
@ -35,7 +36,6 @@
#include "unk_0203D1B8.h"
#include "unk_0204AEE8.h"
#include "constdata/const_020F1E88.h"
#include "constdata/const_020F410C.h"
typedef struct {

View File

@ -3,8 +3,9 @@
#include "struct_defs/mail.h"
#include "struct_defs/struct_02097728.h"
#include "struct_defs/struct_02098C44.h"
#include "applications/party_menu/defs.h"
#include "applications/party_menu/main.h"
#include "field/field_system.h"
#include "overlay005/map_prop_animation.h"
#include "overlay005/ov5_021D431C.h"
@ -41,8 +42,6 @@
#include "unk_0203D1B8.h"
#include "unk_02097624.h"
#include "constdata/const_020F1E88.h"
typedef struct {
u8 unk_00;
u8 unk_01;

View File

@ -3,7 +3,8 @@
#include <nitro.h>
#include <string.h>
#include "struct_defs/struct_0207F248.h"
#include "applications/party_menu/defs.h"
#include "applications/party_menu/main.h"
#include "bg_window.h"
#include "font.h"
@ -20,7 +21,6 @@
#include "string_list.h"
#include "string_template.h"
#include "text.h"
#include "unk_0207E0B8.h"
#include "unk_02083370.h"
#include "unk_02084B70.h"
#include "unk_0208C098.h"

View File

@ -3,9 +3,11 @@
#include <nitro.h>
#include <string.h>
#include "struct_defs/struct_0207F248.h"
#include "struct_defs/struct_020831B4.h"
#include "applications/party_menu/defs.h"
#include "applications/party_menu/main.h"
#include "graphics.h"
#include "grid_menu_cursor_position.h"
#include "gx_layers.h"
@ -18,7 +20,6 @@
#include "sprite.h"
#include "sprite_system.h"
#include "sprite_util.h"
#include "unk_0207E0B8.h"
#include "unk_0208C098.h"
#include "vram_transfer.h"

View File

@ -5,10 +5,11 @@
#include "generated/items.h"
#include "struct_defs/struct_0207F248.h"
#include "struct_defs/struct_020831B4.h"
#include "struct_defs/struct_02083D1C.h"
#include "applications/party_menu/defs.h"
#include "applications/party_menu/main.h"
#include "field/field_system.h"
#include "overlay118/ov118_021D0D80.h"
@ -29,7 +30,6 @@
#include "string_template.h"
#include "system.h"
#include "text.h"
#include "unk_0207E0B8.h"
#include "unk_020819DC.h"
#include "unk_02082C2C.h"
#include "unk_02097624.h"

View File

@ -6,8 +6,8 @@
#include "constants/heap.h"
#include "constants/scrcmd.h"
#include "struct_defs/struct_0207F248.h"
#include "applications/party_menu/defs.h"
#include "applications/party_menu/main.h"
#include "applications/pokemon_summary_screen/main.h"
#include "field/field_system.h"
@ -30,7 +30,6 @@
#include "string_template.h"
#include "system.h"
#include "text.h"
#include "unk_0207E0B8.h"
#include "unk_020819DC.h"
#include "unk_02082C2C.h"

View File

@ -6,8 +6,9 @@
#include "struct_decls/struct_0202440C_decl.h"
#include "struct_defs/seal_case.h"
#include "struct_defs/struct_02097F18.h"
#include "struct_defs/struct_02098C44.h"
#include "applications/party_menu/defs.h"
#include "applications/party_menu/main.h"
#include "field/field_system.h"
#include "overlay076/ov76_0223B140.h"
#include "overlay076/ov76_0223B870.h"
@ -43,7 +44,6 @@
#include "unk_0206CCB0.h"
#include "vram_transfer.h"
#include "constdata/const_020F1E88.h"
#include "constdata/const_020F64C0.h"
FS_EXTERN_OVERLAY(overlay11);

View File

@ -5,9 +5,10 @@
#include "struct_defs/struct_0203D9B8.h"
#include "struct_defs/struct_020989DC.h"
#include "struct_defs/struct_02098C44.h"
#include "struct_defs/struct_02098DE8.h"
#include "applications/party_menu/defs.h"
#include "applications/party_menu/main.h"
#include "applications/pokemon_summary_screen/main.h"
#include "overlay079/ov79_021D0D80.h"
#include "overlay079/ov79_021D2268.h"
@ -24,7 +25,6 @@
#include "savedata.h"
#include "string_template.h"
#include "constdata/const_020F1E88.h"
#include "constdata/const_020F410C.h"
#include "constdata/const_020F6890.h"

View File

@ -3,10 +3,10 @@
#include <nitro.h>
#include <string.h>
#include "struct_defs/struct_02098C44.h"
#include "struct_defs/struct_0209C194.h"
#include "struct_defs/struct_0209C194_1.h"
#include "applications/party_menu/defs.h"
#include "applications/pokemon_summary_screen/main.h"
#include "field/field_system.h"
#include "overlay109/ov109_021D0D80.h"