Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-03-21 17:55:13 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Delete some unnecessary struct_decl files (#997)

Browse Source
This commit is contained in:
VicSevenT 2026-03-08 00:30:39 -06:00 committed by GitHub
parent 3374d13a36
commit 4657454cbd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
78 changed files with 72 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/applications/naming_screen.h
View File

@ -1,10 +1,9 @@
#ifndef POKEPLATINUM_KEYBOARD_H
#define POKEPLATINUM_KEYBOARD_H
#include "struct_decls/pc_boxes_decl.h"
#include "game_options.h"
#include "overlay_manager.h"
#include "pc_boxes.h"
#include "string_gf.h"
enum NamingScreenType {

3
include/applications/pc_boxes/box_app_manager.h
View File

@ -1,8 +1,6 @@
#ifndef POKEPLATINUM_BOX_APP_MANAGER_H
#define POKEPLATINUM_BOX_APP_MANAGER_H
#include "struct_decls/pc_boxes_decl.h"
#include "applications/naming_screen.h"
#include "applications/pc_boxes/box_application.h"
#include "applications/pc_boxes/box_customization.h"
@ -15,6 +13,7 @@
#include "message.h"
#include "overlay_manager.h"
#include "pc_boxes.h"
#include "pokemon.h"
#include "string_template.h"
#include "touch_screen_actions.h"

3
include/applications/pc_boxes/box_application.h
View File

@ -1,8 +1,6 @@
#ifndef POKEPLATINUM_STRUCT_BOX_APPLICATION_H
#define POKEPLATINUM_STRUCT_BOX_APPLICATION_H
#include "struct_decls/pc_boxes_decl.h"
#include "applications/pc_boxes/box_cursor.h"
#include "applications/pc_boxes/box_customization.h"
#include "applications/pc_boxes/box_mon_selection.h"
@ -13,6 +11,7 @@
#include "applications/pc_boxes/struct_box_menu.h"
#include "party.h"
#include "pc_boxes.h"
typedef struct BoxApplication {
const PCBoxes *pcBoxes;

3
include/applications/pokedex/pokedex_main.h
View File

@ -3,8 +3,6 @@
#include <nnsys.h>
#include "struct_decls/pokedexdata_decl.h"
#include "applications/pokedex/pokedex_app.h"
#include "applications/pokedex/pokedex_graphics.h"
#include "applications/pokedex/pokedex_sort_data.h"
@ -16,6 +14,7 @@
#include "bg_window.h"
#include "heap.h"
#include "overlay_manager.h"
#include "pokedex.h"
#include "pokedex_memory.h"
#include "sprite.h"
#include "string_gf.h"

3
include/applications/pokedex/pokedex_sort.h
View File

@ -3,11 +3,10 @@
#include "constants/heap.h"
#include "struct_decls/pokedexdata_decl.h"
#include "applications/pokedex/pokedex_sort_data.h"
#include "applications/pokedex/species_caught_status.h"
#include "pokedex.h"
#include "string_gf.h"
#include "trainer_info.h"

3
include/applications/pokedex/pokedex_sort_data.h
View File

@ -1,10 +1,9 @@
#ifndef POKEPLATINUM_POKEDEX_SORT_DATA_H
#define POKEPLATINUM_POKEDEX_SORT_DATA_H
#include "struct_decls/pokedexdata_decl.h"
#include "applications/pokedex/sorted_pokedex.h"
#include "pokedex.h"
#include "pokedex_heightweight.h"
#include "string_gf.h"

4
include/battle/battle_system.h
View File

@ -5,8 +5,6 @@
#include "generated/trainer_message_types.h"
#include "struct_decls/battle_system.h"
#include "struct_decls/pc_boxes_decl.h"
#include "struct_decls/pokedexdata_decl.h"
#include "struct_defs/battler_data.h"
#include "struct_defs/chatot_cry.h"
#include "struct_defs/trainer.h"
@ -28,6 +26,8 @@
#include "message.h"
#include "palette.h"
#include "party.h"
#include "pc_boxes.h"
#include "pokedex.h"
#include "pokemon.h"
#include "pokemon_anim.h"
#include "pokemon_sprite.h"

11
include/berry_patch_manager.h
View File

@ -3,11 +3,12 @@
#include "constants/heap.h"
#include "struct_decls/berry_patch_manager_decl.h"
#include "struct_decls/struct_02061AB4_decl.h"
#include "field/field_system_decl.h"
#include "berry_patches.h"
enum BerryWateringState {
BERRY_WATERING_STATE_INIT = 0, // Initial state - setting up watering mode
BERRY_WATERING_STATE_WATERING, // Watering the current patch
@ -23,6 +24,14 @@ enum BerryPatchFlags {
BERRY_PATCH_FLAG_HAS_BERRY = 0x4, // Patch has berry growing
};
typedef struct BerryPatchManager {
enum HeapID heapID;
BerryGrowthData *growthData;
NNSG3dRenderObj renderObj;
NNSG3dResMdl *model;
NNSG3dResFileHeader *resource;
} BerryPatchManager;
BerryPatchManager *BerryPatchManager_New(FieldSystem *fieldSystem, enum HeapID heapID);
void BerryPatchManager_Free(BerryPatchManager *manager);
void BerryPatches_ElapseTime(FieldSystem *fieldSystem, int minutes);

3
include/dexmode_checker.h
View File

@ -1,8 +1,7 @@
#ifndef POKEPLATINUM_DEXMODE_CHECKER_H
#define POKEPLATINUM_DEXMODE_CHECKER_H
#include "struct_decls/pokedexdata_decl.h"
#include "pokedex.h"
#include "savedata.h"
u32 SaveData_GetDexMode(SaveData *saveData);

2
include/evolution.h
View File

@ -1,7 +1,6 @@
#ifndef POKEPLATINUM_EVOLUTION_H
#define POKEPLATINUM_EVOLUTION_H
#include "struct_decls/pokedexdata_decl.h"
#include "struct_defs/struct_0207C8C4.h"
#include "applications/pokemon_summary_screen/main.h"
@ -13,6 +12,7 @@
#include "game_records.h"
#include "overlay_manager.h"
#include "party.h"
#include "pokedex.h"
#include "pokemon.h"
#include "pokemon_anim.h"
#include "poketch.h"

4
include/field/field_system_sub2_t.h
View File

@ -1,8 +1,6 @@
#ifndef POKEPLATINUM_FIELD_SYSTEM_SUB2_T_H
#define POKEPLATINUM_FIELD_SYSTEM_SUB2_T_H
#include "struct_decls/berry_patch_manager_decl.h"
#include "applications/poketch/poketch_system.h"
#include "overlay005/hblank_system.h"
#include "overlay005/map_name_popup.h"
@ -11,6 +9,8 @@
#include "overlay005/struct_ov5_021EF4F8_decl.h"
#include "overlay005/texture_resource_manager.h"
#include "berry_patch_manager.h"
struct FieldSystem_sub2_t {
BOOL unk_00;
UnkStruct_ov5_021D1A94 *unk_04;

4
include/field_battle_data_transfer.h
View File

@ -5,8 +5,6 @@
#include "generated/evolution_methods.h"
#include "generated/map_headers.h"
#include "struct_decls/pc_boxes_decl.h"
#include "struct_decls/pokedexdata_decl.h"
#include "struct_defs/chatot_cry.h"
#include "struct_defs/trainer.h"
#include "struct_defs/wi_fi_history.h"
@ -19,6 +17,8 @@
#include "journal.h"
#include "pal_pad.h"
#include "party.h"
#include "pc_boxes.h"
#include "pokedex.h"
#include "poketch.h"
#include "rtc.h"
#include "savedata.h"

3
include/game_records.h
View File

@ -1,8 +1,7 @@
#ifndef POKEPLATINUM_GAME_RECORDS_H
#define POKEPLATINUM_GAME_RECORDS_H
#include "struct_decls/pokedexdata_decl.h"
#include "pokedex.h"
#include "savedata.h"
#define NUM_U32_RECORDS 71

2
include/overlay061/ov61_0222AE60.h
View File

@ -1,7 +1,6 @@
#ifndef POKEPLATINUM_OV61_0222AE60_H
#define POKEPLATINUM_OV61_0222AE60_H
#include "struct_decls/pc_boxes_decl.h"
#include "struct_decls/struct_02030A80_decl.h"
#include "struct_defs/dress_up_photo.h"
@ -10,6 +9,7 @@
#include "overlay061/struct_ov61_0222AFCC.h"
#include "overlay062/struct_ov62_02239DA4.h"
#include "pc_boxes.h"
#include "savedata.h"
void ov61_0222AE60(SaveData *saveData, const DressUpPhoto *photo, UnkStruct_ov61_0222AE80 *param2);

2
include/overlay061/ov61_0222B008.h
View File

@ -1,7 +1,6 @@
#ifndef POKEPLATINUM_OV61_0222B008_H
#define POKEPLATINUM_OV61_0222B008_H
#include "struct_decls/pc_boxes_decl.h"
#include "struct_decls/struct_02030A80_decl.h"
#include "struct_defs/dress_up_photo.h"
@ -16,6 +15,7 @@
#include "gds.h"
#include "message.h"
#include "pc_boxes.h"
#include "savedata.h"
#include "string_gf.h"
#include "string_template.h"

2
include/overlay088/struct_ov88_0223C370.h
View File

@ -1,7 +1,6 @@
#ifndef POKEPLATINUM_STRUCT_OV88_0223C370_H
#define POKEPLATINUM_STRUCT_OV88_0223C370_H
#include "struct_decls/pokedexdata_decl.h"
#include "struct_defs/wi_fi_history.h"
#include "field/field_system_decl.h"
@ -11,6 +10,7 @@
#include "journal.h"
#include "pal_pad.h"
#include "party.h"
#include "pokedex.h"
#include "pokemon.h"
#include "savedata.h"
#include "trainer_info.h"

3
include/overlay094/screens/deposit.h
View File

@ -1,14 +1,13 @@
#ifndef POKEPLATINUM_GTS_SCREENS_DEPOSIT_H
#define POKEPLATINUM_GTS_SCREENS_DEPOSIT_H
#include "struct_decls/pokedexdata_decl.h"
#include "overlay094/gts_application_state.h"
#include "overlay094/struct_ov94_02242AAC.h"
#include "bg_window.h"
#include "list_menu.h"
#include "message.h"
#include "pokedex.h"
#include "string_list.h"
#include "string_template.h"
#include "text.h"

3
include/overlay094/screens/select_pokemon.h
View File

@ -1,11 +1,10 @@
#ifndef POKEPLATINUM_GTS_SCREENS_SELECT_POKEMON_H
#define POKEPLATINUM_GTS_SCREENS_SELECT_POKEMON_H
#include "struct_decls/pc_boxes_decl.h"
#include "overlay094/gts_application_state.h"
#include "party.h"
#include "pc_boxes.h"
#include "pokemon.h"
int GTSApplication_SelectPokemon_Init(GTSApplicationState *param0, int param1);

10
include/pc_boxes.h
View File

@ -1,8 +1,6 @@
#ifndef POKEPLATINUM_PC_BOXES_H
#define POKEPLATINUM_PC_BOXES_H
#include "struct_decls/pc_boxes_decl.h"
#include "pokemon.h"
#include "string_gf.h"
@ -17,6 +15,14 @@
#define USE_CURRENT_BOX -1
typedef struct PCBoxes {
u32 currentBoxID;
BoxPokemon boxMons[MAX_PC_BOXES][MAX_MONS_PER_BOX];
u16 names[MAX_PC_BOXES][PC_BOX_NAME_BUFFER_LEN];
u8 wallpapers[MAX_PC_BOXES];
u8 unlockedWallpapers;
} PCBoxes;
void PCBoxes_Init(PCBoxes *pcBoxes);
u32 PCBoxes_SaveSize(void);
BOOL PCBoxes_TryStoreBoxMon(PCBoxes *pcBoxes, BoxPokemon *boxMon);

26
include/pokedex.h
View File

@ -1,12 +1,34 @@
#ifndef POKEPLATINUM_POKEDEX_H
#define POKEPLATINUM_POKEDEX_H
#include "struct_decls/pokedexdata_decl.h"
#include "heap.h"
#include "pokemon.h"
#include "savedata.h"
#define DEX_SIZE_U32 ((int)((NATIONAL_DEX_COUNT - 1) / 32) + 1) // default 16
typedef struct Pokedex {
u32 magic;
u32 caughtPokemon[DEX_SIZE_U32];
u32 seenPokemon[DEX_SIZE_U32];
u32 recordedGenders[2][DEX_SIZE_U32];
u32 spindaForm;
u8 shellosFormsSeen;
u8 gastrodonFormsSeen;
u8 burmyFormsSeen;
u8 wormadamFormsSeen;
u8 unownFormsSeen[UNOWN_FORM_COUNT];
u8 recordedLanguages[MAX_SPECIES + 1];
u8 canDetectForms;
u8 canDetectLanguages;
u8 pokedexObtained;
u8 nationalDexObtained;
u32 rotomFormsSeen;
u8 shayminFormsSeen;
u8 giratinaFormsSeen;
// u8 padding[2]; // implicit padding in vanilla
} Pokedex;
int Pokedex_SaveSize(void);
Pokedex *Pokedex_New(enum HeapID heapID);
void Pokedex_Copy(const Pokedex *src, Pokedex *dest);

2
include/savedata/save_table.h
View File

@ -3,7 +3,6 @@
#include "constants/savedata/save_table.h"
#include "struct_decls/pc_boxes_decl.h"
#include "struct_decls/struct_02024440_decl.h"
#include "struct_decls/struct_020308A0_decl.h"
#include "struct_defs/struct_0202440C.h"
@ -11,6 +10,7 @@
#include "hall_of_fame_entries.h"
#include "mystery_gift.h"
#include "pc_boxes.h"
#include "savedata.h"
typedef int (*SaveEntrySizeFunc)(void);

2
include/string_template.h
View File

@ -4,11 +4,11 @@
#include "generated/abilities.h"
#include "generated/genders.h"
#include "struct_decls/pc_boxes_decl.h"
#include "struct_defs/pokemon.h"
#include "struct_defs/trainer.h"
#include "enums.h"
#include "pc_boxes.h"
#include "savedata.h"
#include "string_gf.h"
#include "trainer_info.h"

6
include/struct_decls/berry_patch_manager_decl.h
View File

@ -1,6 +0,0 @@
#ifndef POKEPLATINUM_BERRY_PATCH_MANAGER_DECL_H
#define POKEPLATINUM_BERRY_PATCH_MANAGER_DECL_H
typedef struct BerryPatchManager BerryPatchManager;
#endif // POKEPLATINUM_BERRY_PATCH_MANAGER_DECL_H

6
include/struct_decls/pc_boxes_decl.h
View File

@ -1,6 +0,0 @@
#ifndef POKEPLATINUM_PC_BOXES_DECL_H
#define POKEPLATINUM_PC_BOXES_DECL_H
typedef struct PCBoxes PCBoxes;
#endif // POKEPLATINUM_PC_BOXES_DECL_H

6
include/struct_decls/pokedexdata_decl.h
View File

@ -1,6 +0,0 @@
#ifndef POKEPLATINUM_POKEDEXDATA_DECL_H
#define POKEPLATINUM_POKEDEXDATA_DECL_H
typedef struct Pokedex Pokedex;
#endif // POKEPLATINUM_POKEDEXDATA_DECL_H

6
include/struct_decls/struct_0200AC5C_decl.h
View File

@ -1,6 +0,0 @@
#ifndef POKEPLATINUM_STRUCT_0200AC5C_DECL_H
#define POKEPLATINUM_STRUCT_0200AC5C_DECL_H
typedef struct MessageBank_t MessageBank;
#endif // POKEPLATINUM_STRUCT_0200AC5C_DECL_H

6
include/struct_decls/struct_0200B144_decl.h
View File

@ -1,6 +0,0 @@
#ifndef POKEPLATINUM_STRUCT_0200B144_DECL_H
#define POKEPLATINUM_STRUCT_0200B144_DECL_H
typedef struct MessageLoader_t MessageLoader;
#endif // POKEPLATINUM_STRUCT_0200B144_DECL_H

6
include/struct_decls/struct_02023790_decl.h
View File

@ -1,6 +0,0 @@
#ifndef POKEPLATINUM_STRUCT_02023790_DECL_H
#define POKEPLATINUM_STRUCT_02023790_DECL_H
typedef struct String String;
#endif // POKEPLATINUM_STRUCT_02023790_DECL_H

6
include/struct_decls/struct_02027F8C_decl.h
View File

@ -1,6 +0,0 @@
#ifndef POKEPLATINUM_STRUCT_02027F8C_DECL_H
#define POKEPLATINUM_STRUCT_02027F8C_DECL_H
typedef struct PalPad_t PalPad;
#endif // POKEPLATINUM_STRUCT_02027F8C_DECL_H

6
include/struct_decls/struct_020789BC_sub1_decl.h
View File

@ -1,6 +0,0 @@
#ifndef POKEPLATINUM_STRUCT_020789BC_SUB1_DECL_H
#define POKEPLATINUM_STRUCT_020789BC_SUB1_DECL_H
typedef struct ArchivedAnimation_sub1_t ArchivedAnimation_sub1;
#endif // POKEPLATINUM_STRUCT_020789BC_SUB1_DECL_H

4
include/struct_defs/battle_system.h
View File

@ -6,8 +6,6 @@
#include "constants/battle.h"
#include "constants/rtc.h"
#include "struct_decls/pc_boxes_decl.h"
#include "struct_decls/pokedexdata_decl.h"
#include "struct_defs/battler_data.h"
#include "struct_defs/trainer.h"
@ -29,6 +27,8 @@
#include "pal_pad.h"
#include "palette.h"
#include "party.h"
#include "pc_boxes.h"
#include "pokedex.h"
#include "pokemon_anim.h"
#include "poketch.h"
#include "render_window.h"

2
include/struct_defs/clear_game_player_info.h
View File

@ -1,7 +1,7 @@
#ifndef POKEPLATINUM_CLEAR_GAME_PLAYER_INFO_H
#define POKEPLATINUM_CLEAR_GAME_PLAYER_INFO_H
#include "struct_decls/pokedexdata_decl.h"
#include "pokedex.h"
typedef struct ClearGamePlayerInfo {
int gender;

4
include/struct_defs/gts_player_data.h
View File

@ -1,8 +1,6 @@
#ifndef POKEPLATINUM_STRUCT_GTS_PLAYER_DATA_H
#define POKEPLATINUM_STRUCT_GTS_PLAYER_DATA_H
#include "struct_decls/pc_boxes_decl.h"
#include "struct_decls/pokedexdata_decl.h"
#include "struct_decls/struct_0202B370_decl.h"
#include "struct_defs/wi_fi_history.h"
@ -12,6 +10,8 @@
#include "global_trade.h"
#include "journal.h"
#include "party.h"
#include "pc_boxes.h"
#include "pokedex.h"
#include "savedata.h"
#include "system_data.h"
#include "trainer_info.h"

2
include/unk_0209747C.h
View File

@ -1,11 +1,11 @@
#ifndef POKEPLATINUM_UNK_0209747C_H
#define POKEPLATINUM_UNK_0209747C_H
#include "struct_decls/pokedexdata_decl.h"
#include "struct_decls/struct_02014EC4_decl.h"
#include "struct_decls/struct_0209747C_decl.h"
#include "struct_defs/sentence.h"
#include "pokedex.h"
#include "savedata.h"
UnkStruct_0209747C *sub_0209747C(u32 param0, u32 param1, SaveData *saveData, enum HeapID heapID);

1
src/applications/pc_boxes/box_app_manager.c
View File

@ -7,7 +7,6 @@
#include "constants/species.h"
#include "constants/string.h"
#include "struct_decls/pc_boxes_decl.h"
#include "struct_defs/chatot_cry.h"
#include "applications/bag/application.h"

4
src/applications/pc_boxes/box_menu.c
View File

@ -1,18 +1,14 @@
#include "applications/pc_boxes/box_menu.h"
#include <nitro.h>
#include <string.h>
#include "constants/items.h"
#include "struct_decls/pc_boxes_decl.h"
#include "applications/pc_boxes/box_app_manager.h"
#include "applications/pc_boxes/box_application.h"
#include "applications/pc_boxes/pc_mon_preview.h"
#include "applications/pc_boxes/struct_box_menu.h"
#include "enums.h"
#include "pc_boxes.h"
#include "sound_playback.h"
#include "system.h"

3
src/applications/pc_boxes/ov19_021D79F8.c
View File

@ -1,12 +1,9 @@
#include "applications/pc_boxes/ov19_021D79F8.h"
#include <nitro.h>
#include <string.h>
#include "generated/species.h"
#include "struct_decls/pc_boxes_decl.h"
#include "applications/pc_boxes/box_app_manager.h"
#include "applications/pc_boxes/box_application.h"
#include "applications/pc_boxes/box_customization.h"

3
src/applications/pc_boxes/ov19_021DB8E4.c
View File

@ -1,13 +1,10 @@
#include "applications/pc_boxes/ov19_021DB8E4.h"
#include <nitro.h>
#include <string.h>
#include "generated/pokemon_colors.h"
#include "generated/species.h"
#include "struct_decls/pc_boxes_decl.h"
#include "applications/pc_boxes/box_app_manager.h"
#include "applications/pc_boxes/box_application.h"
#include "applications/pc_boxes/ov19_021D61B0.h"

2
src/applications/pokedex/pokedex_sort.c
View File

@ -4,8 +4,6 @@
#include "constants/heap.h"
#include "struct_decls/pokedexdata_decl.h"
#include "applications/pokedex/pokedex_sort_data.h"
#include "applications/pokedex/sorted_pokedex.h"
#include "applications/pokedex/species_caught_status.h"

2
src/applications/poketch/calculator/main.c
View File

@ -1,8 +1,6 @@
#include <nitro.h>
#include <nitro/sinit.h>
#include "struct_decls/pokedexdata_decl.h"
#include "applications/poketch/calculator/graphics.h"
#include "applications/poketch/calculator/value.h"
#include "applications/poketch/poketch_button.h"

1
src/battle/battle_script.c
View File

@ -17,7 +17,6 @@
#include "generated/genders.h"
#include "struct_decls/battle_system.h"
#include "struct_decls/pc_boxes_decl.h"
#include "struct_defs/battle_system.h"
#include "struct_defs/battler_data.h"
#include "struct_defs/fraction.h"

3
src/battle/battle_system.c
View File

@ -16,8 +16,6 @@
#include "generated/trainer_score_events.h"
#include "struct_decls/battle_system.h"
#include "struct_decls/pc_boxes_decl.h"
#include "struct_decls/pokedexdata_decl.h"
#include "struct_defs/battle_system.h"
#include "struct_defs/battler_data.h"
#include "struct_defs/chatot_cry.h"
@ -53,6 +51,7 @@
#include "message.h"
#include "palette.h"
#include "party.h"
#include "pc_boxes.h"
#include "pokedex.h"
#include "pokemon.h"
#include "pokemon_anim.h"

1
src/battle_sub_menus/battle_bag.c
View File

@ -3,7 +3,6 @@
#include "generated/text_banks.h"
#include "struct_decls/battle_system.h"
#include "struct_decls/pc_boxes_decl.h"
#include "battle/battle_lib.h"
#include "battle/battle_system.h"

10
src/berry_patch_manager.c
View File

@ -1,11 +1,9 @@
#include "berry_patch_manager.h"
#include <nitro.h>
#include <string.h>
#include "constants/items.h"
#include "struct_decls/berry_patch_manager_decl.h"
#include "struct_decls/struct_02061AB4_decl.h"
#include "field/field_system.h"
@ -31,14 +29,6 @@
#include "tv_episode_segment.h"
#include "unk_020655F4.h"
struct BerryPatchManager {
enum HeapID heapID;
BerryGrowthData *growthData;
NNSG3dRenderObj renderObj;
NNSG3dResMdl *model;
NNSG3dResFileHeader *resource;
};
typedef struct BerryWateringTask {
enum BerryWateringState state;
enum FaceDirection direction;

2
src/dexmode_checker.c
View File

@ -3,8 +3,6 @@
#include <nitro.h>
#include <string.h>
#include "struct_decls/pokedexdata_decl.h"
#include "pokedex.h"
#include "pokemon.h"
#include "savedata.h"

2
src/encounter.c
View File

@ -1,7 +1,6 @@
#include "encounter.h"
#include <nitro.h>
#include <string.h>
#include "constants/battle.h"
#include "constants/heap.h"
@ -10,7 +9,6 @@
#include "generated/map_headers.h"
#include "generated/trainer_score_events.h"
#include "struct_decls/pc_boxes_decl.h"
#include "struct_decls/struct_0202440C_decl.h"
#include "field/field_system.h"

1
src/evolution.c
View File

@ -10,7 +10,6 @@
#include "generated/species.h"
#include "generated/trainer_score_events.h"
#include "struct_decls/pokedexdata_decl.h"
#include "struct_defs/mail.h"
#include "struct_defs/seal_case.h"
#include "struct_defs/sprite_animation_frame.h"

1
src/field_battle_data_transfer.c
View File

@ -12,7 +12,6 @@
#include "generated/items.h"
#include "generated/species.h"
#include "struct_decls/pokedexdata_decl.h"
#include "struct_decls/struct_0203A790_decl.h"
#include "struct_defs/chatot_cry.h"
#include "struct_defs/struct_0205EC34.h"

2
src/main_menu/main_menu.c
View File

@ -7,8 +7,6 @@
#include "generated/string_padding_mode.h"
#include "generated/text_banks.h"
#include "struct_decls/pokedexdata_decl.h"
#include "game_opening/const_ov77_021D742C.h"
#include "main_menu/application_template.h"
#include "main_menu/distribution_cartridge.h"

2
src/main_menu/ov97_0222C174.c
View File

@ -1,8 +1,6 @@
#include <nitro.h>
#include <string.h>
#include "struct_decls/pokedexdata_decl.h"
#include "game_opening/const_ov77_021D742C.h"
#include "main_menu/main_menu_util.h"
#include "main_menu/ov97_02232DC8.h"

2
src/overlay005/save_info_window.c
View File

@ -7,8 +7,6 @@
#include "constants/narc.h"
#include "generated/map_headers.h"
#include "struct_decls/pokedexdata_decl.h"
#include "applications/poketch/poketch_system.h"
#include "overlay005/ov5_021EA714.h"
#include "overlay005/save_info_window.h"

2
src/overlay006/ov6_02246A30.c
View File

@ -5,8 +5,6 @@
#include "generated/first_arrival_to_zones.h"
#include "struct_decls/pokedexdata_decl.h"
#include "field/field_system.h"
#include "inlines.h"

2
src/overlay061/ov61_0222AE60.c
View File

@ -1,11 +1,9 @@
#include "overlay061/ov61_0222AE60.h"
#include <nitro.h>
#include <string.h>
#include "constants/species.h"
#include "struct_decls/pc_boxes_decl.h"
#include "struct_defs/dress_up_photo.h"
#include "struct_defs/struct_02030A80.h"

2
src/overlay061/ov61_0222B008.c
View File

@ -4,7 +4,6 @@
#include <nitro.h>
#include <string.h>
#include "struct_decls/pc_boxes_decl.h"
#include "struct_defs/dress_up_photo.h"
#include "struct_defs/struct_02030A80.h"
@ -28,6 +27,7 @@
#include "gds.h"
#include "heap.h"
#include "message.h"
#include "pc_boxes.h"
#include "play_time.h"
#include "save_player.h"
#include "string_gf.h"

1
src/overlay062/ov62_02237D24.c
View File

@ -3,7 +3,6 @@
#include <nitro.h>
#include <string.h>
#include "struct_decls/pokedexdata_decl.h"
#include "struct_defs/dress_up_photo.h"
#include "struct_defs/struct_02030A80.h"
#include "struct_defs/struct_0208C06C.h"

1
src/overlay062/ov62_02239D60.c
View File

@ -6,7 +6,6 @@
#include "constants/narc.h"
#include "constants/species.h"
#include "struct_decls/pc_boxes_decl.h"
#include "struct_defs/struct_02030A80.h"
#include "struct_defs/struct_0208C06C.h"

1
src/overlay062/ov62_02241204.c
View File

@ -3,7 +3,6 @@
#include <nitro.h>
#include <string.h>
#include "struct_decls/pokedexdata_decl.h"
#include "struct_decls/struct_0202F41C_decl.h"
#include "struct_defs/struct_02030A80.h"
#include "struct_defs/struct_0208C06C.h"

1
src/overlay065/ov65_0222DCE0.c
View File

@ -6,7 +6,6 @@
#include "generated/journal_online_events.h"
#include "struct_decls/pokedexdata_decl.h"
#include "struct_decls/struct_02012B20_decl.h"
#include "struct_decls/struct_0202B370_decl.h"
#include "struct_defs/battle_frontier.h"

1
src/overlay066/ov66_0222DDF0.c
View File

@ -9,7 +9,6 @@
#include "generated/journal_online_events.h"
#include "generated/species.h"
#include "struct_decls/pokedexdata_decl.h"
#include "struct_decls/struct_02014FB0_decl.h"
#include "struct_decls/struct_02030EC4_decl.h"
#include "struct_decls/struct_0207E060_decl.h"

2
src/overlay094/screens/deposit.c
View File

@ -8,8 +8,6 @@
#include "generated/gender_ratios.h"
#include "generated/species_data_params.h"
#include "struct_decls/pokedexdata_decl.h"
#include "overlay094/application.h"
#include "overlay094/const_ov94_02245FD4.h"
#include "overlay094/const_ov94_02245FD8.h"

3
src/overlay094/screens/select_pokemon.c
View File

@ -2,13 +2,10 @@
#include <dwc.h>
#include <nitro.h>
#include <string.h>
#include "generated/items.h"
#include "generated/species.h"
#include "struct_decls/pc_boxes_decl.h"
#include "global/utility.h"
#include "overlay094/application.h"
#include "overlay094/gts_application_state.h"

8
src/pc_boxes.c
View File

@ -12,14 +12,6 @@
#include "res/text/bank/pokemon_storage_system.h"
typedef struct PCBoxes {
u32 currentBoxID;
BoxPokemon boxMons[MAX_PC_BOXES][MAX_MONS_PER_BOX];
u16 names[MAX_PC_BOXES][PC_BOX_NAME_BUFFER_LEN];
u8 wallpapers[MAX_PC_BOXES];
u8 unlockedWallpapers;
} PCBoxes;
static void PCBoxes_InitInternal(PCBoxes *pcBoxes);
void PCBoxes_Init(PCBoxes *pcBoxes)

23
src/pokedex.c
View File

@ -27,35 +27,12 @@ static const u16 sExcludedMonsNational[] = {
};
static const u16 sExcludedMonsLocal[] = {};
#define DEX_SIZE_U32 ((int)((NATIONAL_DEX_COUNT - 1) / 32) + 1) // default 16
#define MAGIC_NUMBER 0xBEEFCAFE
#define NUM_EXCLUDED_NATIONAL ((int)(sizeof(sExcludedMonsNational) / sizeof(u16)))
#define NUM_EXCLUDED_LOCAL 0 //((int)(sizeof(sExcludedMonsLocal) / sizeof(u16)))
#define NATIONAL_DEX_GOAL (NATIONAL_DEX_COUNT - NUM_EXCLUDED_NATIONAL)
#define LOCAL_DEX_GOAL (SINNOH_DEX_COUNT - NUM_EXCLUDED_LOCAL)
typedef struct Pokedex {
u32 magic;
u32 caughtPokemon[DEX_SIZE_U32];
u32 seenPokemon[DEX_SIZE_U32];
u32 recordedGenders[2][DEX_SIZE_U32];
u32 spindaForm;
u8 shellosFormsSeen;
u8 gastrodonFormsSeen;
u8 burmyFormsSeen;
u8 wormadamFormsSeen;
u8 unownFormsSeen[UNOWN_FORM_COUNT];
u8 recordedLanguages[MAX_SPECIES + 1];
u8 canDetectForms;
u8 canDetectLanguages;
u8 pokedexObtained;
u8 nationalDexObtained;
u32 rotomFormsSeen;
u8 shayminFormsSeen;
u8 giratinaFormsSeen;
// u8 padding[2]; // implicit padding in vanilla
} Pokedex;
int Pokedex_SaveSize(void)
{
return sizeof(Pokedex);

1
src/pokemon.c
View File

@ -20,7 +20,6 @@
#include "generated/natures.h"
#include "generated/species_data_params.h"
#include "struct_decls/struct_02023790_decl.h"
#include "struct_defs/chatot_cry.h"
#include "struct_defs/mail.h"
#include "struct_defs/seal_case.h"

2
src/scrcmd.c
View File

@ -23,8 +23,6 @@
#include "generated/save_types.h"
#include "generated/signpost_commands.h"
#include "struct_decls/pc_boxes_decl.h"
#include "struct_decls/pokedexdata_decl.h"
#include "struct_decls/struct_02014EC4_decl.h"
#include "struct_decls/struct_0202440C_decl.h"
#include "struct_decls/struct_0203A790_decl.h"

3
src/scrcmd_catching_show.c
View File

@ -1,12 +1,9 @@
#include "scrcmd_catching_show.h"
#include <nitro.h>
#include <string.h>
#include "generated/catching_show_points_category.h"
#include "struct_decls/pc_boxes_decl.h"
#include "struct_decls/pokedexdata_decl.h"
#include "struct_decls/struct_02024440_decl.h"
#include "savedata/save_table.h"

3
src/scrcmd_jubilife_lottery.c
View File

@ -1,9 +1,6 @@
#include "scrcmd_jubilife_lottery.h"
#include <nitro.h>
#include <string.h>
#include "struct_decls/pc_boxes_decl.h"
#include "field/field_system.h"
#include "savedata/save_table.h"

3
src/scrcmd_party.c
View File

@ -1,14 +1,11 @@
#include "scrcmd_party.h"
#include <nitro.h>
#include <string.h>
#include "constants/heap.h"
#include "generated/natures.h"
#include "generated/species.h"
#include "struct_decls/pc_boxes_decl.h"
#include "field/field_system.h"
#include "overlay005/daycare.h"
#include "savedata/save_table.h"

3
src/scrcmd_strings.c
View File

@ -2,12 +2,9 @@
#include <nitro.h>
#include <nitro/code16.h>
#include <string.h>
#include "constants/narc.h"
#include "struct_decls/pc_boxes_decl.h"
#include "field/field_system.h"
#include "savedata/save_table.h"

1
src/scrcmd_system_flags.c
View File

@ -2,7 +2,6 @@
#include "generated/badges.h"
#include "struct_decls/pokedexdata_decl.h"
#include "struct_decls/struct_0203A790_decl.h"
#include "struct_defs/struct_0205EC34.h"

1
src/start_menu.c
View File

@ -11,7 +11,6 @@
#include "generated/species.h"
#include "generated/text_banks.h"
#include "struct_decls/pokedexdata_decl.h"
#include "struct_decls/struct_0209747C_decl.h"
#include "struct_defs/sentence.h"
#include "struct_defs/struct_020708E0.h"

1
src/string_template.c
View File

@ -11,7 +11,6 @@
#include "generated/genders.h"
#include "generated/moves.h"
#include "struct_decls/pc_boxes_decl.h"
#include "struct_defs/trainer.h"
#include "global/utility.h"

1
src/tv_episode_segment.c
View File

@ -12,7 +12,6 @@
#include "generated/natures.h"
#include "generated/pokemon_stats.h"
#include "struct_decls/pokedexdata_decl.h"
#include "struct_decls/struct_0202440C_decl.h"
#include "struct_defs/dress_up_photo.h"
#include "struct_defs/image_clips.h"

2
src/unk_0202F180.c
View File

@ -3,8 +3,6 @@
#include <nitro.h>
#include <string.h>
#include "struct_decls/pokedexdata_decl.h"
#include "game_records.h"
#include "pokedex.h"
#include "pokemon.h"

1
src/unk_0204AEE8.c
View File

@ -10,7 +10,6 @@
#include "generated/species_data_params.h"
#include "generated/trainer_classes.h"
#include "struct_decls/pokedexdata_decl.h"
#include "struct_defs/battle_frontier_pokemon_data.h"
#include "struct_defs/battle_frontier_trainer_data.h"
#include "struct_defs/battle_tower.h"

1
src/unk_020933F8.c
View File

@ -9,7 +9,6 @@
#include "generated/pokemon_contest_ranks.h"
#include "generated/trainer_score_events.h"
#include "struct_decls/pokedexdata_decl.h"
#include "struct_decls/struct_0202440C_decl.h"
#include "struct_defs/image_clips.h"
#include "struct_defs/struct_02029C88.h"

1
src/unk_0209747C.c
View File

@ -3,7 +3,6 @@
#include <nitro.h>
#include <string.h>
#include "struct_decls/pokedexdata_decl.h"
#include "struct_decls/struct_02014EC4_decl.h"
#include "struct_decls/struct_0209747C_decl.h"
#include "struct_defs/sentence.h"

1
src/unk_020998EC.c
View File

@ -3,7 +3,6 @@
#include <nitro.h>
#include <string.h>
#include "struct_decls/pokedexdata_decl.h"
#include "struct_decls/struct_02014D38_decl.h"
#include "struct_decls/struct_02014EC4_decl.h"
#include "struct_decls/struct_0209747C_decl.h"