diff --git a/include/overlay094/struct_ov94_0223FD4C.h b/include/overlay094/struct_ov94_0223FD4C.h index 2e7fefc9bc..2863af6f34 100644 --- a/include/overlay094/struct_ov94_0223FD4C.h +++ b/include/overlay094/struct_ov94_0223FD4C.h @@ -28,7 +28,7 @@ #include "message.h" #include "overlay_manager.h" #include "pokemon.h" -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" #include "sprite_resource.h" #include "strbuf.h" #include "string_list.h" diff --git a/include/pokemon_summary_app.h b/include/pokemon_summary_screen.h similarity index 97% rename from include/pokemon_summary_app.h rename to include/pokemon_summary_screen.h index d55df79993..6f2cd9c10a 100644 --- a/include/pokemon_summary_app.h +++ b/include/pokemon_summary_screen.h @@ -1,5 +1,5 @@ -#ifndef POKEPLATINUM_UNK_0208C324_H -#define POKEPLATINUM_UNK_0208C324_H +#ifndef POKEPLATINUM_POKEMON_SUMMARY_SCREEN_H +#define POKEPLATINUM_POKEMON_SUMMARY_SCREEN_H #include "constants/moves.h" @@ -21,7 +21,7 @@ #include "message.h" #include "narc.h" #include "pokemon.h" -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" #include "savedata.h" #include "strbuf.h" #include "string_template.h" @@ -241,4 +241,4 @@ u32 PokemonSummary_StatusIconCell(void); u32 PokemonSummary_StatusIconAnim(void); u32 PokemonSummary_StatusIconAnimIdx(Pokemon *mon); -#endif // POKEPLATINUM_UNK_0208C324_H +#endif // POKEPLATINUM_POKEMON_SUMMARY_SCREEN_H diff --git a/include/struct_defs/struct_0207AE68_t.h b/include/struct_defs/struct_0207AE68_t.h index c14aacd28e..9c2e214b85 100644 --- a/include/struct_defs/struct_0207AE68_t.h +++ b/include/struct_defs/struct_0207AE68_t.h @@ -18,7 +18,7 @@ #include "overlay_manager.h" #include "palette.h" #include "pokemon.h" -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" #include "poketch_data.h" #include "strbuf.h" #include "string_template.h" diff --git a/include/struct_defs/struct_02095E80_t.h b/include/struct_defs/struct_02095E80_t.h index 7715708738..e6ce6a10e1 100644 --- a/include/struct_defs/struct_02095E80_t.h +++ b/include/struct_defs/struct_02095E80_t.h @@ -24,7 +24,7 @@ #include "menu.h" #include "message.h" #include "overlay_manager.h" -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" #include "savedata.h" #include "sprite_resource.h" #include "strbuf.h" diff --git a/include/struct_defs/struct_0209BBA4.h b/include/struct_defs/struct_0209BBA4.h index c77d59e028..d2e5912322 100644 --- a/include/struct_defs/struct_0209BBA4.h +++ b/include/struct_defs/struct_0209BBA4.h @@ -5,7 +5,7 @@ #include "field/field_system_decl.h" -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" #include "savedata.h" typedef struct { diff --git a/include/unk_0203D1B8.h b/include/unk_0203D1B8.h index d131250230..026bc65035 100644 --- a/include/unk_0203D1B8.h +++ b/include/unk_0203D1B8.h @@ -22,7 +22,7 @@ #include "field_task.h" #include "pokemon.h" -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" #include "savedata.h" void sub_0203D1D4(FieldSystem *fieldSystem, BattleParams *param1); diff --git a/include/unk_0208EA44.h b/include/unk_0208EA44.h index 02b8c9e5dc..d2c86c90b4 100644 --- a/include/unk_0208EA44.h +++ b/include/unk_0208EA44.h @@ -2,7 +2,7 @@ #define POKEPLATINUM_UNK_0208EA44_H #include "bg_window.h" -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" void sub_0208EA44(PokemonSummaryScreen *param0); void sub_0208EAF4(PokemonSummaryScreen *param0); diff --git a/include/unk_0208FCF8.h b/include/unk_0208FCF8.h index f737ef1430..75abe39683 100644 --- a/include/unk_0208FCF8.h +++ b/include/unk_0208FCF8.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_0208FCF8_H #define POKEPLATINUM_UNK_0208FCF8_H -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" void sub_0208FCF8(PokemonSummaryScreen *param0); void sub_0208FD40(PokemonSummaryScreen *param0); diff --git a/include/unk_020916B4.h b/include/unk_020916B4.h index 9d87340dc9..81a9fe75ef 100644 --- a/include/unk_020916B4.h +++ b/include/unk_020916B4.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_020916B4_H #define POKEPLATINUM_UNK_020916B4_H -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" void sub_020916B4(PokemonSummaryScreen *param0); void sub_02091750(PokemonSummaryScreen *param0); diff --git a/include/unk_020920C0.h b/include/unk_020920C0.h index 1dd4d6040a..f34318084c 100644 --- a/include/unk_020920C0.h +++ b/include/unk_020920C0.h @@ -1,7 +1,7 @@ #ifndef POKEPLATINUM_UNK_020920C0_H #define POKEPLATINUM_UNK_020920C0_H -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" void sub_020920C0(PokemonSummaryScreen *param0); void sub_0209219C(PokemonSummaryScreen *param0); diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf index 26867600e6..c053bfd35c 100644 --- a/platinum.us/main.lsf +++ b/platinum.us/main.lsf @@ -319,7 +319,7 @@ Static main Object main.nef.p/src_unk_0208BEBC.c.o Object main.nef.p/src_unk_0208C010.c.o Object main.nef.p/src_unk_0208C098.c.o - Object main.nef.p/src_pokemon_summary_app.c.o + Object main.nef.p/src_pokemon_summary_screen.c.o Object main.nef.p/src_unk_0208EA44.c.o Object main.nef.p/src_unk_0208FCF8.c.o Object main.nef.p/src_unk_020916B4.c.o diff --git a/src/field_menu.c b/src/field_menu.c index f85cb65014..42184f1088 100644 --- a/src/field_menu.c +++ b/src/field_menu.c @@ -51,7 +51,7 @@ #include "party.h" #include "player_avatar.h" #include "pokemon.h" -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" #include "poketch_data.h" #include "render_window.h" #include "save_player.h" diff --git a/src/meson.build b/src/meson.build index c23aab4675..df3d9217f9 100644 --- a/src/meson.build +++ b/src/meson.build @@ -303,7 +303,7 @@ pokeplatinum_c = files( 'unk_0208BEBC.c', 'unk_0208C010.c', 'unk_0208C098.c', - 'pokemon_summary_app.c', + 'pokemon_summary_screen.c', 'unk_0208EA44.c', 'unk_0208FCF8.c', 'unk_020916B4.c', diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c index 4956851ddc..cf125051bb 100644 --- a/src/overlay010/ov10_0221F800.c +++ b/src/overlay010/ov10_0221F800.c @@ -43,7 +43,7 @@ #include "party.h" #include "pokemon.h" #include "pokemon_icon.h" -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" #include "render_window.h" #include "strbuf.h" #include "string_template.h" diff --git a/src/overlay013/ov13_0221FC20.c b/src/overlay013/ov13_0221FC20.c index bd13021506..bf78cd083d 100644 --- a/src/overlay013/ov13_0221FC20.c +++ b/src/overlay013/ov13_0221FC20.c @@ -29,7 +29,7 @@ #include "palette.h" #include "party.h" #include "pokemon.h" -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" #include "render_window.h" #include "strbuf.h" #include "string_template.h" diff --git a/src/overlay013/ov13_02221A88.c b/src/overlay013/ov13_02221A88.c index ee17cba18e..c25f4ab129 100644 --- a/src/overlay013/ov13_02221A88.c +++ b/src/overlay013/ov13_02221A88.c @@ -17,7 +17,7 @@ #include "move_table.h" #include "party.h" #include "pokemon.h" -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" #include "render_text.h" #include "render_window.h" #include "strbuf.h" diff --git a/src/overlay013/ov13_02224500.c b/src/overlay013/ov13_02224500.c index 8bf73f9afe..3ab3e56ac0 100644 --- a/src/overlay013/ov13_02224500.c +++ b/src/overlay013/ov13_02224500.c @@ -22,7 +22,7 @@ #include "narc.h" #include "party.h" #include "pokemon_icon.h" -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" #include "unk_0200C6E4.h" #include "unk_0207C908.h" #include "unk_0207E0B8.h" diff --git a/src/overlay019/ov19_021D0D80.c b/src/overlay019/ov19_021D0D80.c index 453a418449..42d3e96525 100644 --- a/src/overlay019/ov19_021D0D80.c +++ b/src/overlay019/ov19_021D0D80.c @@ -44,7 +44,7 @@ #include "overlay_manager.h" #include "party.h" #include "pokemon.h" -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" #include "save_player.h" #include "savedata.h" #include "strbuf.h" diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c index 22f915b947..f0c9a0d67b 100644 --- a/src/overlay088/ov88_0223B140.c +++ b/src/overlay088/ov88_0223B140.c @@ -45,7 +45,7 @@ #include "party.h" #include "pokemon.h" #include "pokemon_icon.h" -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" #include "render_window.h" #include "rtc.h" #include "savedata.h" diff --git a/src/overlay091/ov91_021D0D80.c b/src/overlay091/ov91_021D0D80.c index 0f9adede74..83970cf7e7 100644 --- a/src/overlay091/ov91_021D0D80.c +++ b/src/overlay091/ov91_021D0D80.c @@ -29,7 +29,7 @@ #include "narc.h" #include "overlay_manager.h" #include "pokemon.h" -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" #include "render_text.h" #include "render_window.h" #include "strbuf.h" diff --git a/src/overlay094/ov94_022443E0.c b/src/overlay094/ov94_022443E0.c index 0da13f0065..efb0037215 100644 --- a/src/overlay094/ov94_022443E0.c +++ b/src/overlay094/ov94_022443E0.c @@ -9,7 +9,7 @@ #include "overlay094/struct_ov94_0223FD4C.h" #include "overlay_manager.h" -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" #include "unk_0202D778.h" #include "constdata/const_020F410C.h" diff --git a/src/overlay104/ov104_02239C58.c b/src/overlay104/ov104_02239C58.c index c2b8abbf17..471cfb269a 100644 --- a/src/overlay104/ov104_02239C58.c +++ b/src/overlay104/ov104_02239C58.c @@ -12,7 +12,7 @@ #include "bag.h" #include "heap.h" #include "party.h" -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" #include "save_player.h" #include "savedata.h" #include "unk_02028124.h" diff --git a/src/overlay105/ov105_02241AE0.c b/src/overlay105/ov105_02241AE0.c index 0432616e5a..2368f6e911 100644 --- a/src/overlay105/ov105_02241AE0.c +++ b/src/overlay105/ov105_02241AE0.c @@ -42,7 +42,7 @@ #include "palette.h" #include "party.h" #include "pokemon.h" -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" #include "render_window.h" #include "save_player.h" #include "savedata.h" diff --git a/src/overlay106/ov106_02241AE0.c b/src/overlay106/ov106_02241AE0.c index 8b71ff0b2e..1d9c269527 100644 --- a/src/overlay106/ov106_02241AE0.c +++ b/src/overlay106/ov106_02241AE0.c @@ -34,7 +34,7 @@ #include "palette.h" #include "party.h" #include "pokemon.h" -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" #include "render_window.h" #include "save_player.h" #include "savedata.h" diff --git a/src/pokemon_summary_app.c b/src/pokemon_summary_screen.c similarity index 99% rename from src/pokemon_summary_app.c rename to src/pokemon_summary_screen.c index d503dd44e4..afe72cf615 100644 --- a/src/pokemon_summary_app.c +++ b/src/pokemon_summary_screen.c @@ -1,4 +1,4 @@ -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" #include #include @@ -28,7 +28,7 @@ #include "overlay_manager.h" #include "party.h" #include "pokemon.h" -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" #include "render_window.h" #include "ribbon.h" #include "savedata.h" diff --git a/src/scrcmd.c b/src/scrcmd.c index 9e6928b44f..712542c207 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -116,7 +116,7 @@ #include "player_avatar.h" #include "poffin.h" #include "pokemon.h" -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" #include "pokeradar.h" #include "poketch_data.h" #include "render_window.h" diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c index d456b97edf..880916bc97 100644 --- a/src/unk_0203D1B8.c +++ b/src/unk_0203D1B8.c @@ -97,7 +97,7 @@ #include "party.h" #include "player_avatar.h" #include "pokemon.h" -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" #include "poketch_data.h" #include "record_mixed_rng.h" #include "rtc.h" diff --git a/src/unk_0204F13C.c b/src/unk_0204F13C.c index 1d9da65790..c6e97a4541 100644 --- a/src/unk_0204F13C.c +++ b/src/unk_0204F13C.c @@ -27,7 +27,7 @@ #include "inlines.h" #include "party.h" #include "pokemon.h" -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" #include "save_player.h" #include "savedata.h" #include "script_manager.h" diff --git a/src/unk_0204FAB4.c b/src/unk_0204FAB4.c index 0b88189f45..1a5cd812b2 100644 --- a/src/unk_0204FAB4.c +++ b/src/unk_0204FAB4.c @@ -20,7 +20,7 @@ #include "heap.h" #include "inlines.h" #include "party.h" -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" #include "save_player.h" #include "savedata.h" #include "script_manager.h" diff --git a/src/unk_0205003C.c b/src/unk_0205003C.c index 2f5178a6fb..53eb6ccba8 100644 --- a/src/unk_0205003C.c +++ b/src/unk_0205003C.c @@ -20,7 +20,7 @@ #include "heap.h" #include "inlines.h" #include "party.h" -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" #include "save_player.h" #include "savedata.h" #include "script_manager.h" diff --git a/src/unk_02051D8C.c b/src/unk_02051D8C.c index 226b4e12d6..f250855d5e 100644 --- a/src/unk_02051D8C.c +++ b/src/unk_02051D8C.c @@ -34,7 +34,7 @@ #include "message.h" #include "party.h" #include "pokemon.h" -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" #include "poketch_data.h" #include "rtc.h" #include "save_player.h" diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c index 5578cdbe45..5bbdfe274b 100644 --- a/src/unk_0205A0D8.c +++ b/src/unk_0205A0D8.c @@ -27,7 +27,7 @@ #include "party.h" #include "player_avatar.h" #include "pokemon.h" -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" #include "render_window.h" #include "save_player.h" #include "savedata.h" diff --git a/src/unk_0206B9D8.c b/src/unk_0206B9D8.c index 99379c90be..8f4b9cc591 100644 --- a/src/unk_0206B9D8.c +++ b/src/unk_0206B9D8.c @@ -20,7 +20,7 @@ #include "field_task.h" #include "heap.h" #include "party.h" -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" #include "record_mixed_rng.h" #include "save_player.h" #include "savedata.h" diff --git a/src/unk_0207AE68.c b/src/unk_0207AE68.c index f6598b1bee..2d4feac55b 100644 --- a/src/unk_0207AE68.c +++ b/src/unk_0207AE68.c @@ -34,7 +34,7 @@ #include "palette.h" #include "party.h" #include "pokemon.h" -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" #include "poketch_data.h" #include "render_text.h" #include "render_window.h" diff --git a/src/unk_0207E0B8.c b/src/unk_0207E0B8.c index 9cf735adbf..b1f3260a83 100644 --- a/src/unk_0207E0B8.c +++ b/src/unk_0207E0B8.c @@ -32,7 +32,7 @@ #include "overlay_manager.h" #include "party.h" #include "pokemon.h" -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" #include "render_window.h" #include "strbuf.h" #include "string_list.h" diff --git a/src/unk_02084B70.c b/src/unk_02084B70.c index 88a2a5a398..1f0f0cca02 100644 --- a/src/unk_02084B70.c +++ b/src/unk_02084B70.c @@ -19,7 +19,7 @@ #include "move_table.h" #include "party.h" #include "pokemon.h" -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" #include "render_window.h" #include "strbuf.h" #include "string_list.h" diff --git a/src/unk_0208EA44.c b/src/unk_0208EA44.c index 7121a34689..4360e5fea6 100644 --- a/src/unk_0208EA44.c +++ b/src/unk_0208EA44.c @@ -16,7 +16,7 @@ #include "move_table.h" #include "pokemon.h" #include "pokemon_icon.h" -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" #include "ribbon.h" #include "unk_0200C6E4.h" #include "unk_0201DBEC.h" diff --git a/src/unk_0208FCF8.c b/src/unk_0208FCF8.c index 068a016baa..692bd53ad0 100644 --- a/src/unk_0208FCF8.c +++ b/src/unk_0208FCF8.c @@ -11,7 +11,7 @@ #include "message.h" #include "move_table.h" #include "pokemon.h" -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" #include "render_window.h" #include "ribbon.h" #include "strbuf.h" diff --git a/src/unk_020916B4.c b/src/unk_020916B4.c index f3ef1dc797..db01e1a97e 100644 --- a/src/unk_020916B4.c +++ b/src/unk_020916B4.c @@ -13,7 +13,7 @@ #include "camera.h" #include "gx_layers.h" #include "pokemon.h" -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" #include "unk_0200762C.h" #include "unk_02015F84.h" #include "unk_0202419C.h" diff --git a/src/unk_020920C0.c b/src/unk_020920C0.c index d924cd6f54..04407496f3 100644 --- a/src/unk_020920C0.c +++ b/src/unk_020920C0.c @@ -5,7 +5,7 @@ #include "bg_window.h" #include "core_sys.h" -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" #include "touch_screen.h" #include "unk_02005474.h" #include "unk_0208EA44.h" diff --git a/src/unk_020989DC.c b/src/unk_020989DC.c index ac124c5453..957ba4026e 100644 --- a/src/unk_020989DC.c +++ b/src/unk_020989DC.c @@ -20,7 +20,7 @@ #include "party.h" #include "poffin.h" #include "pokemon.h" -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" #include "save_player.h" #include "savedata.h" #include "string_template.h" diff --git a/src/unk_0209C194.c b/src/unk_0209C194.c index 6c2db59442..ca7e1a912a 100644 --- a/src/unk_0209C194.c +++ b/src/unk_0209C194.c @@ -17,7 +17,7 @@ #include "game_records.h" #include "heap.h" #include "journal.h" -#include "pokemon_summary_app.h" +#include "pokemon_summary_screen.h" #include "save_player.h" #include "unk_020366A0.h" #include "unk_0203D1B8.h"