From fa983cf03be1897568bae7ceb7f6d2f22c8ec751 Mon Sep 17 00:00:00 2001 From: RavePossum Date: Mon, 17 Feb 2025 14:35:35 -0500 Subject: [PATCH] Move PokemonSpriteTemplate to pokemon sprite struct def header --- include/battle/struct_ov16_0225EA80.h | 1 - include/overlay006/ov6_022426AC.h | 2 +- include/overlay022/ov22_022578F4.h | 2 -- include/overlay022/ov22_02259098.h | 1 - include/overlay079/struct_ov79_021D3820.h | 1 - include/pokemon.h | 1 - include/struct_defs/archived_sprite.h | 15 --------------- include/struct_defs/pokemon_sprite.h | 12 +++++++++++- include/struct_defs/struct_02095E80_t.h | 1 - include/unk_0200762C.h | 1 - src/applications/pokemon_summary_screen/3d_anim.c | 2 -- src/battle/battle_display.c | 1 - src/battle/battle_io_command.c | 1 - src/battle/battle_script.c | 1 - src/battle/ov16_0223B140.c | 1 - src/choose_starter/choose_starter_app.c | 1 - src/overlay006/ov6_022426AC.c | 2 -- src/overlay006/ov6_02243258.c | 1 - src/overlay012/ov12_022380BC.c | 2 -- src/overlay017/ov17_022476F8.c | 2 -- src/overlay019/ov19_021DA92C.c | 2 -- src/overlay021/ov21_021D1FA4.c | 1 - src/overlay021/ov21_021E8D48.c | 1 - src/overlay022/ov22_02255D44.c | 1 - src/overlay022/ov22_022578F4.c | 1 - src/overlay022/ov22_02259098.c | 1 - src/overlay022/ov22_0225AF8C.c | 1 - src/overlay062/ov62_02239D60.c | 1 - src/overlay073/ov73_021D0D80.c | 1 - src/overlay076/ov76_0223D338.c | 1 - src/overlay077/ov77_021D6C70.c | 1 - src/overlay079/ov79_021D3768.c | 1 - src/overlay086/ov86_0223B140.c | 1 - src/overlay087/ov87_021D106C.c | 1 - src/overlay088/ov88_0223B140.c | 1 - src/overlay094/ov94_0223D0C4.c | 2 -- src/overlay095/ov95_02246C20.c | 1 - src/overlay095/ov95_02247B6C.c | 1 - src/overlay095/ov95_0224B3D8.c | 1 - src/overlay097/ov97_02237694.c | 1 - src/overlay104/ov104_02231F74.c | 1 - src/overlay105/ov105_02245CD0.c | 1 - src/overlay119/ov119_021D0D80.c | 1 - src/pokemon.c | 1 - src/render_window.c | 1 - src/unk_0200762C.c | 1 - src/unk_0207AE68.c | 1 - src/unk_02094EDC.c | 1 - 48 files changed, 12 insertions(+), 69 deletions(-) delete mode 100644 include/struct_defs/archived_sprite.h diff --git a/include/battle/struct_ov16_0225EA80.h b/include/battle/struct_ov16_0225EA80.h index 238ee3719f..6f1f5f378e 100644 --- a/include/battle/struct_ov16_0225EA80.h +++ b/include/battle/struct_ov16_0225EA80.h @@ -2,7 +2,6 @@ #define POKEPLATINUM_STRUCT_OV16_0225EA80_H #include "struct_decls/battle_system.h" -#include "struct_defs/archived_sprite.h" #include "battle/struct_ov16_0225BFFC_decl.h" #include "battle/struct_ov16_02265BBC.h" diff --git a/include/overlay006/ov6_022426AC.h b/include/overlay006/ov6_022426AC.h index 7f0bb29941..34e0074d28 100644 --- a/include/overlay006/ov6_022426AC.h +++ b/include/overlay006/ov6_022426AC.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_OV6_022426AC_H #define POKEPLATINUM_OV6_022426AC_H -#include "struct_defs/archived_sprite.h" +#include "struct_defs/pokemon_sprite.h" #include "sprite.h" #include "sprite_resource.h" diff --git a/include/overlay022/ov22_022578F4.h b/include/overlay022/ov22_022578F4.h index d193f93335..1e5d496d5f 100644 --- a/include/overlay022/ov22_022578F4.h +++ b/include/overlay022/ov22_022578F4.h @@ -4,8 +4,6 @@ #include #include -#include "struct_defs/archived_sprite.h" - #include "overlay022/struct_ov22_02257964.h" #include "overlay022/struct_ov22_02259560.h" #include "overlay022/struct_ov22_0225B388.h" diff --git a/include/overlay022/ov22_02259098.h b/include/overlay022/ov22_02259098.h index 1cec573748..6fd543e1b0 100644 --- a/include/overlay022/ov22_02259098.h +++ b/include/overlay022/ov22_02259098.h @@ -3,7 +3,6 @@ #include -#include "struct_defs/archived_sprite.h" #include "struct_defs/struct_020298D8.h" #include "overlay022/struct_ov22_022596B0.h" diff --git a/include/overlay079/struct_ov79_021D3820.h b/include/overlay079/struct_ov79_021D3820.h index 0d9729989c..6cbf2072f7 100644 --- a/include/overlay079/struct_ov79_021D3820.h +++ b/include/overlay079/struct_ov79_021D3820.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_STRUCT_OV79_021D3820_H #define POKEPLATINUM_STRUCT_OV79_021D3820_H -#include "struct_defs/archived_sprite.h" #include "struct_defs/pokemon_sprite.h" #include "camera.h" diff --git a/include/pokemon.h b/include/pokemon.h index 3f61c687a1..394bd4ec2f 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -8,7 +8,6 @@ #include "struct_decls/pokemon_animation_sys_decl.h" #include "struct_decls/struct_02078B40_decl.h" -#include "struct_defs/archived_sprite.h" #include "struct_defs/chatot_cry.h" #include "struct_defs/pokemon.h" #include "struct_defs/pokemon_sprite.h" diff --git a/include/struct_defs/archived_sprite.h b/include/struct_defs/archived_sprite.h deleted file mode 100644 index 56c41dc8d1..0000000000 --- a/include/struct_defs/archived_sprite.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef POKEPLATINUM_STRUCT_POKEMON_SPRITE_TEMPLATE_H -#define POKEPLATINUM_STRUCT_POKEMON_SPRITE_TEMPLATE_H - -typedef struct PokemonSpriteTemplate { - u16 archive; //< ID of the sprite archive - u16 character; //< File index to pull from the archive for the character data (tiles) - u16 palette; //< File index to pull from the archive for the palette data - u16 spindaSpots; //< Simple flag denoting whether the rendered sprite should be pseudo-randomized with splotches (only for Spinda's front-sprite). - - u8 dummy; //< Dummy value; never used or set to anything other than 0. - - u32 personality; //< Cached personality value for Pokemon front-sprites. Specifically used for Spinda spots. -} PokemonSpriteTemplate; - -#endif // POKEPLATINUM_STRUCT_POKEMON_SPRITE_TEMPLATE_H diff --git a/include/struct_defs/pokemon_sprite.h b/include/struct_defs/pokemon_sprite.h index 144fa7f52b..7fbcad5386 100644 --- a/include/struct_defs/pokemon_sprite.h +++ b/include/struct_defs/pokemon_sprite.h @@ -5,7 +5,6 @@ #include "constants/heap.h" -#include "struct_defs/archived_sprite.h" #include "struct_defs/sprite_animation_frame.h" #include "struct_defs/struct_02007C7C_sub1.h" #include "struct_defs/struct_02007C7C_sub2.h" @@ -14,6 +13,17 @@ typedef struct PokemonSprite PokemonSprite; typedef void(UnkFuncPtr_02007C34)(PokemonSprite *, UnkStruct_02007C7C_sub1 *); +typedef struct PokemonSpriteTemplate { + u16 archive; //< ID of the sprite archive + u16 character; //< File index to pull from the archive for the character data (tiles) + u16 palette; //< File index to pull from the archive for the palette data + u16 spindaSpots; //< Simple flag denoting whether the rendered sprite should be pseudo-randomized with splotches (only for Spinda's front-sprite). + + u8 dummy; //< Dummy value; never used or set to anything other than 0. + + u32 personality; //< Cached personality value for Pokemon front-sprites. Specifically used for Spinda spots. +} PokemonSpriteTemplate; + struct PokemonSprite { u32 unk_00_0 : 1; u32 unk_00_1 : 6; diff --git a/include/struct_defs/struct_02095E80_t.h b/include/struct_defs/struct_02095E80_t.h index 5c41ed5ff7..c8523a53ad 100644 --- a/include/struct_defs/struct_02095E80_t.h +++ b/include/struct_defs/struct_02095E80_t.h @@ -7,7 +7,6 @@ #include "struct_decls/struct_02027F8C_decl.h" #include "struct_decls/struct_0202B370_decl.h" #include "struct_decls/struct_02095E80_decl.h" -#include "struct_defs/archived_sprite.h" #include "struct_defs/chatot_cry.h" #include "struct_defs/struct_02027F8C.h" #include "struct_defs/struct_02095E80_sub1.h" diff --git a/include/unk_0200762C.h b/include/unk_0200762C.h index d2e0e83fc3..a3ef673d77 100644 --- a/include/unk_0200762C.h +++ b/include/unk_0200762C.h @@ -1,7 +1,6 @@ #ifndef POKEPLATINUM_UNK_0200762C_H #define POKEPLATINUM_UNK_0200762C_H -#include "struct_defs/archived_sprite.h" #include "struct_defs/pokemon_sprite.h" #include "struct_defs/sprite_animation_frame.h" #include "struct_defs/struct_02008900.h" diff --git a/src/applications/pokemon_summary_screen/3d_anim.c b/src/applications/pokemon_summary_screen/3d_anim.c index a397deb649..358088484c 100644 --- a/src/applications/pokemon_summary_screen/3d_anim.c +++ b/src/applications/pokemon_summary_screen/3d_anim.c @@ -5,8 +5,6 @@ #include "constants/pokemon.h" -#include "struct_defs/archived_sprite.h" - #include "applications/pokemon_summary_screen/main.h" #include "applications/pokemon_summary_screen/sprites.h" #include "overlay115/camera_angle.h" diff --git a/src/battle/battle_display.c b/src/battle/battle_display.c index f1751fcf57..99eff0ad44 100644 --- a/src/battle/battle_display.c +++ b/src/battle/battle_display.c @@ -7,7 +7,6 @@ #include "constants/species.h" #include "struct_decls/battle_system.h" -#include "struct_defs/archived_sprite.h" #include "struct_defs/battle_io.h" #include "struct_defs/pokemon_sprite.h" #include "struct_defs/sprite_animation_frame.h" diff --git a/src/battle/battle_io_command.c b/src/battle/battle_io_command.c index e1abd1a37c..96c320f41a 100644 --- a/src/battle/battle_io_command.c +++ b/src/battle/battle_io_command.c @@ -6,7 +6,6 @@ #include "constants/battle/battle_io.h" #include "struct_decls/battle_system.h" -#include "struct_defs/archived_sprite.h" #include "struct_defs/battle_io.h" #include "battle/battle_display.h" diff --git a/src/battle/battle_script.c b/src/battle/battle_script.c index 138796f53a..2089ecf665 100644 --- a/src/battle/battle_script.c +++ b/src/battle/battle_script.c @@ -14,7 +14,6 @@ #include "struct_decls/battle_system.h" #include "struct_decls/pc_boxes_decl.h" -#include "struct_defs/archived_sprite.h" #include "struct_defs/battle_system.h" #include "struct_defs/fraction.h" #include "struct_defs/pokemon_sprite.h" diff --git a/src/battle/ov16_0223B140.c b/src/battle/ov16_0223B140.c index 4b7ed28c24..4a45b13563 100644 --- a/src/battle/ov16_0223B140.c +++ b/src/battle/ov16_0223B140.c @@ -11,7 +11,6 @@ #include "struct_decls/battle_system.h" #include "struct_decls/struct_0207AE68_decl.h" -#include "struct_defs/archived_sprite.h" #include "struct_defs/battle_system.h" #include "struct_defs/struct_0207A778.h" #include "struct_defs/struct_0207C690.h" diff --git a/src/choose_starter/choose_starter_app.c b/src/choose_starter/choose_starter_app.c index cc308c603b..d91fc000bc 100644 --- a/src/choose_starter/choose_starter_app.c +++ b/src/choose_starter/choose_starter_app.c @@ -13,7 +13,6 @@ #include "struct_decls/struct_02015128_decl.h" #include "struct_decls/struct_020151A4_decl.h" #include "struct_decls/struct_02015214_decl.h" -#include "struct_defs/archived_sprite.h" #include "struct_defs/choose_starter_data.h" #include "struct_defs/pokemon_sprite.h" #include "struct_defs/struct_02099F80.h" diff --git a/src/overlay006/ov6_022426AC.c b/src/overlay006/ov6_022426AC.c index a38adbfa99..c2eed534ab 100644 --- a/src/overlay006/ov6_022426AC.c +++ b/src/overlay006/ov6_022426AC.c @@ -6,8 +6,6 @@ #include "generated/gender_ratios.h" #include "generated/genders.h" -#include "struct_defs/archived_sprite.h" - #include "heap.h" #include "math.h" #include "narc.h" diff --git a/src/overlay006/ov6_02243258.c b/src/overlay006/ov6_02243258.c index 5c9f1735d9..3aed14680a 100644 --- a/src/overlay006/ov6_02243258.c +++ b/src/overlay006/ov6_02243258.c @@ -5,7 +5,6 @@ #include "struct_decls/struct_02061AB4_decl.h" #include "struct_decls/struct_020711EC_decl.h" -#include "struct_defs/archived_sprite.h" #include "field/field_system.h" #include "overlay005/ov5_021F0EB0.h" diff --git a/src/overlay012/ov12_022380BC.c b/src/overlay012/ov12_022380BC.c index 8a38e79a52..f5bc79d0d9 100644 --- a/src/overlay012/ov12_022380BC.c +++ b/src/overlay012/ov12_022380BC.c @@ -3,8 +3,6 @@ #include #include -#include "struct_defs/archived_sprite.h" - #include "overlay012/const_ov12_0223B0A0.h" #include "overlay012/const_ov12_0223B0B8.h" #include "overlay012/const_ov12_0223B0DC.h" diff --git a/src/overlay017/ov17_022476F8.c b/src/overlay017/ov17_022476F8.c index fd2cf6bc6f..d0275204d1 100644 --- a/src/overlay017/ov17_022476F8.c +++ b/src/overlay017/ov17_022476F8.c @@ -3,8 +3,6 @@ #include #include -#include "struct_defs/archived_sprite.h" - #include "overlay017/struct_ov17_022476F8.h" #include "overlay017/struct_ov17_0224792C.h" #include "overlay017/struct_ov17_02247A48.h" diff --git a/src/overlay019/ov19_021DA92C.c b/src/overlay019/ov19_021DA92C.c index db4f36b1ab..1770a71c78 100644 --- a/src/overlay019/ov19_021DA92C.c +++ b/src/overlay019/ov19_021DA92C.c @@ -3,8 +3,6 @@ #include #include -#include "struct_defs/archived_sprite.h" - #include "overlay019/ov19_021D0D80.h" #include "overlay019/ov19_021D61B0.h" #include "overlay019/pc_mon_preview.h" diff --git a/src/overlay021/ov21_021D1FA4.c b/src/overlay021/ov21_021D1FA4.c index 896d7745bd..b2887618bc 100644 --- a/src/overlay021/ov21_021D1FA4.c +++ b/src/overlay021/ov21_021D1FA4.c @@ -3,7 +3,6 @@ #include #include -#include "struct_defs/archived_sprite.h" #include "struct_defs/pokemon_sprite.h" #include "overlay021/ov21_021D4C0C.h" diff --git a/src/overlay021/ov21_021E8D48.c b/src/overlay021/ov21_021E8D48.c index 258a7bd30b..0042eb4e8f 100644 --- a/src/overlay021/ov21_021E8D48.c +++ b/src/overlay021/ov21_021E8D48.c @@ -5,7 +5,6 @@ #include "generated/text_banks.h" -#include "struct_defs/archived_sprite.h" #include "struct_defs/pokemon_sprite.h" #include "overlay021/ov21_021D1F90.h" diff --git a/src/overlay022/ov22_02255D44.c b/src/overlay022/ov22_02255D44.c index 2bd73936c5..9cf4ae2dfb 100644 --- a/src/overlay022/ov22_02255D44.c +++ b/src/overlay022/ov22_02255D44.c @@ -8,7 +8,6 @@ #include "struct_decls/struct_02015920_decl.h" #include "struct_decls/struct_02029C68_decl.h" #include "struct_decls/struct_02029C88_decl.h" -#include "struct_defs/archived_sprite.h" #include "struct_defs/struct_02015958.h" #include "struct_defs/struct_0203DA00.h" #include "struct_defs/struct_02093BBC.h" diff --git a/src/overlay022/ov22_022578F4.c b/src/overlay022/ov22_022578F4.c index 1ffd02ff0d..441b15f031 100644 --- a/src/overlay022/ov22_022578F4.c +++ b/src/overlay022/ov22_022578F4.c @@ -3,7 +3,6 @@ #include #include -#include "struct_defs/archived_sprite.h" #include "struct_defs/struct_020298D8.h" #include "overlay022/ov22_02254DE0.h" diff --git a/src/overlay022/ov22_02259098.c b/src/overlay022/ov22_02259098.c index 7ecc757ef9..5ad46c64c1 100644 --- a/src/overlay022/ov22_02259098.c +++ b/src/overlay022/ov22_02259098.c @@ -3,7 +3,6 @@ #include #include -#include "struct_defs/archived_sprite.h" #include "struct_defs/struct_020298D8.h" #include "overlay022/ov22_02255094.h" diff --git a/src/overlay022/ov22_0225AF8C.c b/src/overlay022/ov22_0225AF8C.c index cf9711770f..c812db8b15 100644 --- a/src/overlay022/ov22_0225AF8C.c +++ b/src/overlay022/ov22_0225AF8C.c @@ -7,7 +7,6 @@ #include "struct_decls/struct_02029C88_decl.h" #include "struct_decls/struct_0202A138_decl.h" #include "struct_decls/struct_0202A150_decl.h" -#include "struct_defs/archived_sprite.h" #include "overlay022/ov22_02254DE0.h" #include "overlay022/ov22_02255094.h" diff --git a/src/overlay062/ov62_02239D60.c b/src/overlay062/ov62_02239D60.c index fb8e76a9c6..10468f4d46 100644 --- a/src/overlay062/ov62_02239D60.c +++ b/src/overlay062/ov62_02239D60.c @@ -8,7 +8,6 @@ #include "struct_decls/pc_boxes_decl.h" #include "struct_decls/struct_02023FCC_decl.h" -#include "struct_defs/archived_sprite.h" #include "struct_defs/pokemon_sprite.h" #include "struct_defs/struct_02030A80.h" #include "struct_defs/struct_0208C06C.h" diff --git a/src/overlay073/ov73_021D0D80.c b/src/overlay073/ov73_021D0D80.c index f0e7603e1f..502ffca19b 100644 --- a/src/overlay073/ov73_021D0D80.c +++ b/src/overlay073/ov73_021D0D80.c @@ -4,7 +4,6 @@ #include "constants/species.h" #include "struct_decls/struct_02015920_decl.h" -#include "struct_defs/archived_sprite.h" #include "struct_defs/struct_02015958.h" #include "struct_defs/struct_0208737C.h" #include "struct_defs/struct_02099F80.h" diff --git a/src/overlay076/ov76_0223D338.c b/src/overlay076/ov76_0223D338.c index 737662d014..4844dc9be3 100644 --- a/src/overlay076/ov76_0223D338.c +++ b/src/overlay076/ov76_0223D338.c @@ -6,7 +6,6 @@ #include "generated/trainer_score_events.h" #include "struct_decls/font_oam.h" -#include "struct_defs/archived_sprite.h" #include "struct_defs/sprite_animation_frame.h" #include "struct_defs/struct_02015958.h" #include "struct_defs/struct_0202CA28.h" diff --git a/src/overlay077/ov77_021D6C70.c b/src/overlay077/ov77_021D6C70.c index 0ec2c63588..4b51192e48 100644 --- a/src/overlay077/ov77_021D6C70.c +++ b/src/overlay077/ov77_021D6C70.c @@ -4,7 +4,6 @@ #include #include "struct_decls/struct_02014014_decl.h" -#include "struct_defs/archived_sprite.h" #include "struct_defs/pokemon_sprite.h" #include "camera.h" diff --git a/src/overlay079/ov79_021D3768.c b/src/overlay079/ov79_021D3768.c index 16c278ea91..676ce7e565 100644 --- a/src/overlay079/ov79_021D3768.c +++ b/src/overlay079/ov79_021D3768.c @@ -3,7 +3,6 @@ #include #include -#include "struct_defs/archived_sprite.h" #include "struct_defs/pokemon_sprite.h" #include "overlay079/struct_ov79_021D3820.h" diff --git a/src/overlay086/ov86_0223B140.c b/src/overlay086/ov86_0223B140.c index 7491d1b23f..a3f5ab4ca8 100644 --- a/src/overlay086/ov86_0223B140.c +++ b/src/overlay086/ov86_0223B140.c @@ -3,7 +3,6 @@ #include #include -#include "struct_defs/archived_sprite.h" #include "struct_defs/sprite_animation_frame.h" #include "struct_defs/struct_02008900.h" #include "struct_defs/struct_02013610.h" diff --git a/src/overlay087/ov87_021D106C.c b/src/overlay087/ov87_021D106C.c index d4723162a2..0a30f97f0a 100644 --- a/src/overlay087/ov87_021D106C.c +++ b/src/overlay087/ov87_021D106C.c @@ -3,7 +3,6 @@ #include #include -#include "struct_defs/archived_sprite.h" #include "struct_defs/struct_02013610.h" #include "struct_defs/struct_02099F80.h" diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c index b492d9a15e..66486d7503 100644 --- a/src/overlay088/ov88_0223B140.c +++ b/src/overlay088/ov88_0223B140.c @@ -8,7 +8,6 @@ #include "struct_decls/struct_0202B370_decl.h" #include "struct_decls/struct_02095E80_decl.h" -#include "struct_defs/archived_sprite.h" #include "struct_defs/chatot_cry.h" #include "struct_defs/struct_02027F8C.h" #include "struct_defs/struct_02095E80_t.h" diff --git a/src/overlay094/ov94_0223D0C4.c b/src/overlay094/ov94_0223D0C4.c index 3e2b7d9ac0..1a501a902b 100644 --- a/src/overlay094/ov94_0223D0C4.c +++ b/src/overlay094/ov94_0223D0C4.c @@ -4,8 +4,6 @@ #include #include -#include "struct_defs/archived_sprite.h" - #include "overlay094/const_ov94_02245FD8.h" #include "overlay094/ov94_0223BCB0.h" #include "overlay094/ov94_0223FB48.h" diff --git a/src/overlay095/ov95_02246C20.c b/src/overlay095/ov95_02246C20.c index a45338c54e..e19028cf3a 100644 --- a/src/overlay095/ov95_02246C20.c +++ b/src/overlay095/ov95_02246C20.c @@ -3,7 +3,6 @@ #include #include -#include "struct_defs/archived_sprite.h" #include "struct_defs/struct_02013610.h" #include "overlay006/struct_ov6_02246254.h" diff --git a/src/overlay095/ov95_02247B6C.c b/src/overlay095/ov95_02247B6C.c index a62a54f82a..3100018398 100644 --- a/src/overlay095/ov95_02247B6C.c +++ b/src/overlay095/ov95_02247B6C.c @@ -3,7 +3,6 @@ #include #include -#include "struct_defs/archived_sprite.h" #include "struct_defs/pokemon_sprite.h" #include "struct_defs/sprite_animation_frame.h" #include "struct_defs/struct_02099F80.h" diff --git a/src/overlay095/ov95_0224B3D8.c b/src/overlay095/ov95_0224B3D8.c index dbb2840270..c3e0fbe381 100644 --- a/src/overlay095/ov95_0224B3D8.c +++ b/src/overlay095/ov95_0224B3D8.c @@ -3,7 +3,6 @@ #include #include -#include "struct_defs/archived_sprite.h" #include "struct_defs/pokemon_sprite.h" #include "struct_defs/sprite_animation_frame.h" #include "struct_defs/struct_02099F80.h" diff --git a/src/overlay097/ov97_02237694.c b/src/overlay097/ov97_02237694.c index 3f66a81add..0feb5a63eb 100644 --- a/src/overlay097/ov97_02237694.c +++ b/src/overlay097/ov97_02237694.c @@ -5,7 +5,6 @@ #include "constants/species.h" -#include "struct_defs/archived_sprite.h" #include "struct_defs/struct_0202DF40.h" #include "overlay097/struct_ov97_0222D250.h" diff --git a/src/overlay104/ov104_02231F74.c b/src/overlay104/ov104_02231F74.c index d01b237927..46bff17443 100644 --- a/src/overlay104/ov104_02231F74.c +++ b/src/overlay104/ov104_02231F74.c @@ -5,7 +5,6 @@ #include "constants/narc.h" -#include "struct_defs/archived_sprite.h" #include "struct_defs/sentence.h" #include "overlay063/ov63_0222BE18.h" diff --git a/src/overlay105/ov105_02245CD0.c b/src/overlay105/ov105_02245CD0.c index 7a147d7202..e4a4de3fbd 100644 --- a/src/overlay105/ov105_02245CD0.c +++ b/src/overlay105/ov105_02245CD0.c @@ -1,7 +1,6 @@ #include #include -#include "struct_defs/archived_sprite.h" #include "struct_defs/pokemon_sprite.h" #include "gx_layers.h" diff --git a/src/overlay119/ov119_021D0D80.c b/src/overlay119/ov119_021D0D80.c index 9c26dd23d4..62cbcc1fb7 100644 --- a/src/overlay119/ov119_021D0D80.c +++ b/src/overlay119/ov119_021D0D80.c @@ -4,7 +4,6 @@ #include #include "struct_decls/struct_02014014_decl.h" -#include "struct_defs/archived_sprite.h" #include "struct_defs/sprite_animation_frame.h" #include "struct_defs/struct_0207C690.h" #include "struct_defs/struct_02099F80.h" diff --git a/src/pokemon.c b/src/pokemon.c index 77286bd403..ae9828a714 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -20,7 +20,6 @@ #include "struct_decls/pokemon_animation_sys_decl.h" #include "struct_decls/struct_02023790_decl.h" #include "struct_defs/archived_poke_sprite_data.h" -#include "struct_defs/archived_sprite.h" #include "struct_defs/chatot_cry.h" #include "struct_defs/poke_animation_settings.h" #include "struct_defs/pokemon_sprite.h" diff --git a/src/render_window.c b/src/render_window.c index ea6971f1ee..47ef0d8085 100644 --- a/src/render_window.c +++ b/src/render_window.c @@ -6,7 +6,6 @@ #include "constants/narc.h" #include "generated/signpost_types.h" -#include "struct_defs/archived_sprite.h" #include "struct_defs/struct_02013610.h" #include "graphics/signposts/field_board.naix" diff --git a/src/unk_0200762C.c b/src/unk_0200762C.c index 82591d4c2c..35a5d9f582 100644 --- a/src/unk_0200762C.c +++ b/src/unk_0200762C.c @@ -3,7 +3,6 @@ #include #include -#include "struct_defs/archived_sprite.h" #include "struct_defs/pokemon_sprite.h" #include "struct_defs/sprite_animation_frame.h" #include "struct_defs/struct_02008900.h" diff --git a/src/unk_0207AE68.c b/src/unk_0207AE68.c index c22163cd4b..fc546aafc7 100644 --- a/src/unk_0207AE68.c +++ b/src/unk_0207AE68.c @@ -11,7 +11,6 @@ #include "struct_decls/pokedexdata_decl.h" #include "struct_decls/struct_0207AE68_decl.h" -#include "struct_defs/archived_sprite.h" #include "struct_defs/sprite_animation_frame.h" #include "struct_defs/struct_0202818C.h" #include "struct_defs/struct_0202CA28.h" diff --git a/src/unk_02094EDC.c b/src/unk_02094EDC.c index 5413c2e1ef..647ced8771 100644 --- a/src/unk_02094EDC.c +++ b/src/unk_02094EDC.c @@ -3,7 +3,6 @@ #include #include -#include "struct_defs/archived_sprite.h" #include "struct_defs/pokemon_sprite.h" #include "struct_defs/struct_020951B0.h" #include "struct_defs/struct_020954F0.h"