From 717f383295c2774b01d8588cbc91f1cfa8ee2852 Mon Sep 17 00:00:00 2001 From: Kris Bahnsen Date: Sat, 6 Jul 2024 23:11:55 -0700 Subject: [PATCH] mass move of files Cleaning up piles of src files. Adjusted include macros to use paths relative to root directory for consistency Signed-off-by: Kris Bahnsen --- item_nl.h | 8 ---- move_nl.h | 8 ---- src/include/item_nl.h | 8 ++++ src/include/move_nl.h | 8 ++++ named_list.h => src/include/named_list.h | 6 +-- pokemon_app.h => src/include/pokemon_app.h | 2 +- .../include/pokemon_char_encode.h | 0 pokemon_data.h => src/include/pokemon_data.h | 8 ++-- .../include/pokemon_table.h | 6 +-- stat_nl.h => src/include/stat_nl.h | 6 +-- stats.h => src/include/stats.h | 6 +-- src/include/type_nl.h | 8 ++++ item_nl.c => src/item_nl.c | 4 +- missingno_i.h => src/missingno_i.h | 0 move_nl.c => src/move_nl.c | 4 +- named_list.c => src/named_list.c | 2 +- pokemon_app.c => src/pokemon_app.c | 12 +++--- .../pokemon_char_encode.c | 2 +- pokemon_data.c => src/pokemon_data.c | 22 +++++------ pokemon_data_i.h => src/pokemon_data_i.h | 6 +-- pokemon_table.c => src/pokemon_table.c | 9 ++--- {scenes => src/scenes}/pokemon_exit_confirm.c | 10 ++--- {scenes => src/scenes}/pokemon_exit_confirm.h | 6 +-- {scenes => src/scenes}/pokemon_gen.c | 24 ++++++------ {scenes => src/scenes}/pokemon_gen.h | 0 {scenes => src/scenes}/pokemon_gender.c | 6 +-- {scenes => src/scenes}/pokemon_gender.h | 0 {scenes => src/scenes}/pokemon_item.c | 8 ++-- {scenes => src/scenes}/pokemon_item.h | 0 {scenes => src/scenes}/pokemon_menu.c | 38 +++++++++---------- {scenes => src/scenes}/pokemon_menu.h | 0 {scenes => src/scenes}/pokemon_move.c | 8 ++-- {scenes => src/scenes}/pokemon_move.h | 0 {scenes => src/scenes}/pokemon_name_input.c | 10 ++--- {scenes => src/scenes}/pokemon_name_input.h | 0 {scenes => src/scenes}/pokemon_number_input.c | 6 +-- {scenes => src/scenes}/pokemon_number_input.h | 0 {scenes => src/scenes}/pokemon_pins.c | 4 +- {scenes => src/scenes}/pokemon_pins.h | 0 {scenes => src/scenes}/pokemon_pokerus.c | 4 +- {scenes => src/scenes}/pokemon_pokerus.h | 8 ++-- {scenes => src/scenes}/pokemon_select.c | 2 +- {scenes => src/scenes}/pokemon_select.h | 0 {scenes => src/scenes}/pokemon_shiny.c | 5 +-- {scenes => src/scenes}/pokemon_shiny.h | 0 {scenes => src/scenes}/pokemon_stats.c | 8 ++-- {scenes => src/scenes}/pokemon_stats.h | 0 {scenes => src/scenes}/pokemon_trade.c | 2 +- {scenes => src/scenes}/pokemon_trade.h | 0 {scenes => src/scenes}/pokemon_type.c | 8 ++-- {scenes => src/scenes}/pokemon_type.h | 0 {scenes => src/scenes}/unown_form.c | 4 +- {scenes => src/scenes}/unown_form.h | 8 ++-- stat_nl.c => src/stat_nl.c | 4 +- type_nl.c => src/type_nl.c | 4 +- {views => src/views}/select_pokemon.c | 6 +-- {views => src/views}/select_pokemon.h | 2 +- {views => src/views}/trade.c | 6 +-- {views => src/views}/trade.h | 2 +- {views => src/views}/trade_patch_list.c | 4 +- {views => src/views}/trade_patch_list.h | 4 +- type_nl.h | 8 ---- 62 files changed, 171 insertions(+), 173 deletions(-) delete mode 100644 item_nl.h delete mode 100644 move_nl.h create mode 100644 src/include/item_nl.h create mode 100644 src/include/move_nl.h rename named_list.h => src/include/named_list.h (95%) rename pokemon_app.h => src/include/pokemon_app.h (97%) rename pokemon_char_encode.h => src/include/pokemon_char_encode.h (100%) rename pokemon_data.h => src/include/pokemon_data.h (95%) rename pokemon_table.h => src/include/pokemon_table.h (88%) rename stat_nl.h => src/include/stat_nl.h (73%) rename stats.h => src/include/stats.h (97%) create mode 100644 src/include/type_nl.h rename item_nl.c => src/item_nl.c (99%) rename missingno_i.h => src/missingno_i.h (100%) rename move_nl.c => src/move_nl.c (99%) rename named_list.c => src/named_list.c (98%) rename pokemon_app.c => src/pokemon_app.c (92%) rename pokemon_char_encode.c => src/pokemon_char_encode.c (99%) rename pokemon_data.c => src/pokemon_data.c (98%) rename pokemon_data_i.h => src/pokemon_data_i.h (97%) rename pokemon_table.c => src/pokemon_table.c (99%) rename {scenes => src/scenes}/pokemon_exit_confirm.c (94%) rename {scenes => src/scenes}/pokemon_exit_confirm.h (73%) rename {scenes => src/scenes}/pokemon_gen.c (94%) rename {scenes => src/scenes}/pokemon_gen.h (100%) rename {scenes => src/scenes}/pokemon_gender.c (96%) rename {scenes => src/scenes}/pokemon_gender.h (100%) rename {scenes => src/scenes}/pokemon_item.c (95%) rename {scenes => src/scenes}/pokemon_item.h (100%) rename {scenes => src/scenes}/pokemon_menu.c (89%) rename {scenes => src/scenes}/pokemon_menu.h (100%) rename {scenes => src/scenes}/pokemon_move.c (97%) rename {scenes => src/scenes}/pokemon_move.h (100%) rename {scenes => src/scenes}/pokemon_name_input.c (95%) rename {scenes => src/scenes}/pokemon_name_input.h (100%) rename {scenes => src/scenes}/pokemon_number_input.c (96%) rename {scenes => src/scenes}/pokemon_number_input.h (100%) rename {scenes => src/scenes}/pokemon_pins.c (98%) rename {scenes => src/scenes}/pokemon_pins.h (100%) rename {scenes => src/scenes}/pokemon_pokerus.c (98%) rename {scenes => src/scenes}/pokemon_pokerus.h (51%) rename {scenes => src/scenes}/pokemon_select.c (91%) rename {scenes => src/scenes}/pokemon_select.h (100%) rename {scenes => src/scenes}/pokemon_shiny.c (96%) rename {scenes => src/scenes}/pokemon_shiny.h (100%) rename {scenes => src/scenes}/pokemon_stats.c (84%) rename {scenes => src/scenes}/pokemon_stats.h (100%) rename {scenes => src/scenes}/pokemon_trade.c (90%) rename {scenes => src/scenes}/pokemon_trade.h (100%) rename {scenes => src/scenes}/pokemon_type.c (94%) rename {scenes => src/scenes}/pokemon_type.h (100%) rename {scenes => src/scenes}/unown_form.c (96%) rename {scenes => src/scenes}/unown_form.h (62%) rename stat_nl.c => src/stat_nl.c (82%) rename type_nl.c => src/type_nl.c (87%) rename {views => src/views}/select_pokemon.c (97%) rename {views => src/views}/select_pokemon.h (90%) rename {views => src/views}/trade.c (99%) rename {views => src/views}/trade.h (89%) rename {views => src/views}/trade_patch_list.c (96%) rename {views => src/views}/trade_patch_list.h (86%) delete mode 100644 type_nl.h diff --git a/item_nl.h b/item_nl.h deleted file mode 100644 index 3c60c4e81af..00000000000 --- a/item_nl.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef __ITEM_NL_H__ -#define __ITEM_NL_H__ - -#pragma once - -extern const NamedList item_list[]; - -#endif // __ITEM_NL_H__ diff --git a/move_nl.h b/move_nl.h deleted file mode 100644 index 2a7e4bbe3dc..00000000000 --- a/move_nl.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef __MOVE_NL_H__ -#define __MOVE_NL_H__ - -#pragma once - -extern const NamedList move_list[]; - -#endif // __MOVE_NL_H__ diff --git a/src/include/item_nl.h b/src/include/item_nl.h new file mode 100644 index 00000000000..6daafd53607 --- /dev/null +++ b/src/include/item_nl.h @@ -0,0 +1,8 @@ +#ifndef ITEM_NL_H +#define ITEM_NL_H + +#pragma once + +extern const NamedList item_list[]; + +#endif // ITEM_NL_H diff --git a/src/include/move_nl.h b/src/include/move_nl.h new file mode 100644 index 00000000000..2704d892777 --- /dev/null +++ b/src/include/move_nl.h @@ -0,0 +1,8 @@ +#ifndef MOVE_NL_H +#define MOVE_NL_H + +#pragma once + +extern const NamedList move_list[]; + +#endif // MOVE_NL_H diff --git a/named_list.h b/src/include/named_list.h similarity index 95% rename from named_list.h rename to src/include/named_list.h index 4b3fad71b18..965a2a7156c 100644 --- a/named_list.h +++ b/src/include/named_list.h @@ -1,5 +1,5 @@ -#ifndef __NAMED_LIST_H__ -#define __NAMED_LIST_H__ +#ifndef NAMED_LIST_H +#define NAMED_LIST_H #pragma once @@ -43,4 +43,4 @@ const char* namedlist_name_get_index(const NamedList* list, uint32_t index); /* Get a pointer to the item's name from a position */ const char* namedlist_name_get_pos(const NamedList* list, uint32_t pos); -#endif //__NAMED_LIST_H__ +#endif //NAMED_LIST_H diff --git a/pokemon_app.h b/src/include/pokemon_app.h similarity index 97% rename from pokemon_app.h rename to src/include/pokemon_app.h index e29d92b5ae0..4557cdccd6d 100644 --- a/pokemon_app.h +++ b/src/include/pokemon_app.h @@ -13,7 +13,7 @@ #include #include -#include "pokemon_data.h" +#include #define TAG "Pokemon" diff --git a/pokemon_char_encode.h b/src/include/pokemon_char_encode.h similarity index 100% rename from pokemon_char_encode.h rename to src/include/pokemon_char_encode.h diff --git a/pokemon_data.h b/src/include/pokemon_data.h similarity index 95% rename from pokemon_data.h rename to src/include/pokemon_data.h index 3609388932b..853a78cdbe0 100644 --- a/pokemon_data.h +++ b/src/include/pokemon_data.h @@ -12,10 +12,10 @@ #include #include -#include -#include -#include -#include "stats.h" +#include +#include +#include +#include /* Generation defines */ #define GEN_I 0x01 diff --git a/pokemon_table.h b/src/include/pokemon_table.h similarity index 88% rename from pokemon_table.h rename to src/include/pokemon_table.h index a02df1daaa6..e0330434ca6 100644 --- a/pokemon_table.h +++ b/src/include/pokemon_table.h @@ -1,5 +1,5 @@ -#ifndef __POKEMON_TABLE_H__ -#define __POKEMON_TABLE_H__ +#ifndef POKEMON_TABLE_H +#define POKEMON_TABLE_H #include @@ -30,4 +30,4 @@ uint8_t const char* table_stat_name_get(const PokemonTable* table, int num); const PokemonTable* table_pointer_get(); -#endif // __POKEMON_TABLE_H__ +#endif // POKEMON_TABLE_H diff --git a/stat_nl.h b/src/include/stat_nl.h similarity index 73% rename from stat_nl.h rename to src/include/stat_nl.h index 753cfa0f5db..b56792b0111 100644 --- a/stat_nl.h +++ b/src/include/stat_nl.h @@ -1,5 +1,5 @@ -#ifndef __STAT_NL_H__ -#define __STAT_NL_H__ +#ifndef STAT_NL_H +#define STAT_NL_H #pragma once @@ -14,4 +14,4 @@ typedef enum { MAXIV_MAXEV, } EvIv; -#endif // __STAT_NL_H__ +#endif // STAT_NL_H diff --git a/stats.h b/src/include/stats.h similarity index 97% rename from stats.h rename to src/include/stats.h index 7c04d905745..05b0fa81ecd 100644 --- a/stats.h +++ b/src/include/stats.h @@ -1,5 +1,5 @@ -#ifndef __STATS_H__ -#define __STATS_H__ +#ifndef STATS_H +#define STATS_H #pragma once @@ -101,4 +101,4 @@ typedef enum { NONE = 0, // Just a filler value } DataStatSub; -#endif // __STATS_H__ +#endif // STATS_H diff --git a/src/include/type_nl.h b/src/include/type_nl.h new file mode 100644 index 00000000000..7da2138d0e0 --- /dev/null +++ b/src/include/type_nl.h @@ -0,0 +1,8 @@ +#ifndef TYPE_NL_H +#define TYPE_NL_H + +#pragma once + +extern const NamedList type_list[]; + +#endif // TYPE_NL_H diff --git a/item_nl.c b/src/item_nl.c similarity index 99% rename from item_nl.c rename to src/item_nl.c index b709f7fe5f1..e8191c9f30b 100644 --- a/item_nl.c +++ b/src/item_nl.c @@ -1,5 +1,5 @@ -#include -#include +#include +#include const NamedList item_list[] = { {"No Item", 0x00, GEN_II}, diff --git a/missingno_i.h b/src/missingno_i.h similarity index 100% rename from missingno_i.h rename to src/missingno_i.h diff --git a/move_nl.c b/src/move_nl.c similarity index 99% rename from move_nl.c rename to src/move_nl.c index 5cb938e6a15..8f2bf292ee5 100644 --- a/move_nl.c +++ b/src/move_nl.c @@ -1,5 +1,5 @@ -#include -#include +#include +#include const NamedList move_list[] = { {"No Move", 0x00, (GEN_I | GEN_II)}, diff --git a/named_list.c b/src/named_list.c similarity index 98% rename from named_list.c rename to src/named_list.c index 746caa59630..27bd3ced50b 100644 --- a/named_list.c +++ b/src/named_list.c @@ -1,7 +1,7 @@ #include #include -#include +#include /* Get number of elements in a list * This is not very efficient as-is since it has to walk the whole list. diff --git a/pokemon_app.c b/src/pokemon_app.c similarity index 92% rename from pokemon_app.c rename to src/pokemon_app.c index 200d892cabd..d1b10767df6 100644 --- a/pokemon_app.c +++ b/src/pokemon_app.c @@ -1,12 +1,12 @@ #include #include -#include "pokemon_app.h" -#include "pokemon_data.h" -#include "scenes/pokemon_menu.h" -#include "views/trade.h" -#include "views/select_pokemon.h" -#include "pokemon_char_encode.h" +#include +#include +#include +#include +#include +#include PokemonFap* pokemon_alloc() { PokemonFap* pokemon_fap = (PokemonFap*)malloc(sizeof(PokemonFap)); diff --git a/pokemon_char_encode.c b/src/pokemon_char_encode.c similarity index 99% rename from pokemon_char_encode.c rename to src/pokemon_char_encode.c index 40b7f8551df..62863d29ff4 100644 --- a/pokemon_char_encode.c +++ b/src/pokemon_char_encode.c @@ -1,7 +1,7 @@ #include #include -#include "pokemon_char_encode.h" +#include char pokemon_char_to_encoded(int byte) { switch(byte) { diff --git a/pokemon_data.c b/src/pokemon_data.c similarity index 98% rename from pokemon_data.c rename to src/pokemon_data.c index 8e71977c43b..014db2a2b17 100644 --- a/pokemon_data.c +++ b/src/pokemon_data.c @@ -1,21 +1,21 @@ #include +#include "pokemon_data_i.h" #include -#include "pokemon_data.h" -#include "pokemon_data_i.h" -#include "pokemon_app.h" -#include "pokemon_char_encode.h" +#include +#include +#include -#include "pokemon_table.h" +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include +#include #define RECALC_NONE 0x00 #define RECALC_EXP 0x01 diff --git a/pokemon_data_i.h b/src/pokemon_data_i.h similarity index 97% rename from pokemon_data_i.h rename to src/pokemon_data_i.h index e94fd46d587..dbaf2c95427 100644 --- a/pokemon_data_i.h +++ b/src/pokemon_data_i.h @@ -1,10 +1,10 @@ #ifndef __POKEMON_DATA_I_H__ #define __POKEMON_DATA_I_H__ -#include "pokemon_data.h" +#include -//#include "pokemon_app.h" -//#include "pokemon_char_encode.h" +//#include +//#include static void pokemon_stat_ev_calc(PokemonData* pdata, EvIv val); static void pokemon_stat_iv_calc(PokemonData* pdata, EvIv val); diff --git a/pokemon_table.c b/src/pokemon_table.c similarity index 99% rename from pokemon_table.c rename to src/pokemon_table.c index e0b4017e98a..b859c4776ff 100644 --- a/pokemon_table.c +++ b/src/pokemon_table.c @@ -1,13 +1,12 @@ #include -#include -#include "stats.h" - #include -#include - #include +#include +#include +#include + /* NOTE: It seems like gen ii index is national pokedex order? */ /* Gen i and Gen ii are _almost_ the same with all stats. The big difference * is that while most gen i pokemon's spc matches the same gen ii spc_atk, diff --git a/scenes/pokemon_exit_confirm.c b/src/scenes/pokemon_exit_confirm.c similarity index 94% rename from scenes/pokemon_exit_confirm.c rename to src/scenes/pokemon_exit_confirm.c index a91e6ee3579..a9bdeaddeca 100644 --- a/scenes/pokemon_exit_confirm.c +++ b/src/scenes/pokemon_exit_confirm.c @@ -1,12 +1,12 @@ #include #include -#include "pokemon_menu.h" -#include "../pokemon_app.h" -#include "../pokemon_data.h" +#include +#include +#include -#include "../views/select_pokemon.h" -#include "../views/trade.h" +#include +#include static bool pokemon_exit_confirm_back_event_callback(void* context) { UNUSED(context); diff --git a/scenes/pokemon_exit_confirm.h b/src/scenes/pokemon_exit_confirm.h similarity index 73% rename from scenes/pokemon_exit_confirm.h rename to src/scenes/pokemon_exit_confirm.h index e0904613756..53fe1cd7540 100644 --- a/scenes/pokemon_exit_confirm.h +++ b/src/scenes/pokemon_exit_confirm.h @@ -1,5 +1,5 @@ -#ifndef __POKEMON_EXIT_CONFIRM_H__ -#define __POKEMON_EXIT_CONFIRM_H__ +#ifndef POKEMON_EXIT_CONFIRM_H +#define POKEMON_EXIT_CONFIRM_H #pragma once @@ -12,4 +12,4 @@ void pokemon_exit_confirm_on_enter(void* context); bool pokemon_exit_confirm_on_event(void* context, SceneManagerEvent event); -#endif // __POKEMON_EXIT_CONFIRM_H__ +#endif // POKEMON_EXIT_CONFIRM_H diff --git a/scenes/pokemon_gen.c b/src/scenes/pokemon_gen.c similarity index 94% rename from scenes/pokemon_gen.c rename to src/scenes/pokemon_gen.c index 65d1ab6491a..1942d2c32dc 100644 --- a/scenes/pokemon_gen.c +++ b/src/scenes/pokemon_gen.c @@ -1,18 +1,18 @@ -#include "../pokemon_app.h" -#include "../pokemon_data.h" -#include "../pokemon_char_encode.h" +#include +#include +#include -#include +#include -#include "../views/trade.h" -#include "../views/select_pokemon.h" +#include +#include -#include "pokemon_menu.h" -#include "pokemon_stats.h" -#include "pokemon_shiny.h" -#include "pokemon_gender.h" -#include "pokemon_pokerus.h" -#include "unown_form.h" +#include +#include +#include +#include +#include +#include static void scene_change_from_main_cb(void* context, uint32_t index) { PokemonFap* pokemon_fap = (PokemonFap*)context; diff --git a/scenes/pokemon_gen.h b/src/scenes/pokemon_gen.h similarity index 100% rename from scenes/pokemon_gen.h rename to src/scenes/pokemon_gen.h diff --git a/scenes/pokemon_gender.c b/src/scenes/pokemon_gender.c similarity index 96% rename from scenes/pokemon_gender.c rename to src/scenes/pokemon_gender.c index 602365746bd..f0dec582fe6 100644 --- a/scenes/pokemon_gender.c +++ b/src/scenes/pokemon_gender.c @@ -1,8 +1,8 @@ #include -#include "../pokemon_app.h" -#include "../pokemon_data.h" -#include "pokemon_menu.h" +#include +#include +#include static const char* gender_str[] = { "Unknown", diff --git a/scenes/pokemon_gender.h b/src/scenes/pokemon_gender.h similarity index 100% rename from scenes/pokemon_gender.h rename to src/scenes/pokemon_gender.h diff --git a/scenes/pokemon_item.c b/src/scenes/pokemon_item.c similarity index 95% rename from scenes/pokemon_item.c rename to src/scenes/pokemon_item.c index 45afbb428c1..8e64ba5e3c6 100644 --- a/scenes/pokemon_item.c +++ b/src/scenes/pokemon_item.c @@ -2,11 +2,11 @@ #include #include -#include +#include -#include "../pokemon_app.h" -#include "../pokemon_data.h" -#include "pokemon_menu.h" +#include +#include +#include static void select_item_selected_callback(void* context, uint32_t index) { PokemonFap* pokemon_fap = (PokemonFap*)context; diff --git a/scenes/pokemon_item.h b/src/scenes/pokemon_item.h similarity index 100% rename from scenes/pokemon_item.h rename to src/scenes/pokemon_item.h diff --git a/scenes/pokemon_menu.c b/src/scenes/pokemon_menu.c similarity index 89% rename from scenes/pokemon_menu.c rename to src/scenes/pokemon_menu.c index 64c7b2b1927..e5d0aed2086 100644 --- a/scenes/pokemon_menu.c +++ b/src/scenes/pokemon_menu.c @@ -1,22 +1,22 @@ -#include "../pokemon_app.h" -#include "../pokemon_data.h" -#include "../pokemon_char_encode.h" - -#include "pokemon_menu.h" -#include "pokemon_gen.h" -#include "pokemon_select.h" -#include "pokemon_name_input.h" -#include "pokemon_number_input.h" -#include "pokemon_move.h" -#include "pokemon_item.h" -#include "pokemon_type.h" -#include "pokemon_stats.h" -#include "pokemon_shiny.h" -#include "pokemon_gender.h" -#include "pokemon_pokerus.h" -#include "pokemon_trade.h" -#include "pokemon_pins.h" -#include "pokemon_exit_confirm.h" +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include static void scene_change_from_main_cb(void* context, uint32_t index) { PokemonFap* pokemon_fap = (PokemonFap*)context; diff --git a/scenes/pokemon_menu.h b/src/scenes/pokemon_menu.h similarity index 100% rename from scenes/pokemon_menu.h rename to src/scenes/pokemon_menu.h diff --git a/scenes/pokemon_move.c b/src/scenes/pokemon_move.c similarity index 97% rename from scenes/pokemon_move.c rename to src/scenes/pokemon_move.c index 272cb0a9982..7f15b693f9d 100644 --- a/scenes/pokemon_move.c +++ b/src/scenes/pokemon_move.c @@ -2,11 +2,11 @@ #include #include -#include +#include -#include "../pokemon_app.h" -#include "../pokemon_data.h" -#include "pokemon_menu.h" +#include +#include +#include static void select_move_selected_callback(void* context, uint32_t index) { PokemonFap* pokemon_fap = (PokemonFap*)context; diff --git a/scenes/pokemon_move.h b/src/scenes/pokemon_move.h similarity index 100% rename from scenes/pokemon_move.h rename to src/scenes/pokemon_move.h diff --git a/scenes/pokemon_name_input.c b/src/scenes/pokemon_name_input.c similarity index 95% rename from scenes/pokemon_name_input.c rename to src/scenes/pokemon_name_input.c index aa38303ed3b..4381137f4fa 100644 --- a/scenes/pokemon_name_input.c +++ b/src/scenes/pokemon_name_input.c @@ -4,11 +4,11 @@ #include #include -#include "../pokemon_app.h" -#include "../pokemon_data.h" -#include "../pokemon_char_encode.h" -#include "pokemon_menu.h" -#include "unown_form.h" +#include +#include +#include +#include +#include static char name_buf[LEN_NAME_BUF]; diff --git a/scenes/pokemon_name_input.h b/src/scenes/pokemon_name_input.h similarity index 100% rename from scenes/pokemon_name_input.h rename to src/scenes/pokemon_name_input.h diff --git a/scenes/pokemon_number_input.c b/src/scenes/pokemon_number_input.c similarity index 96% rename from scenes/pokemon_number_input.c rename to src/scenes/pokemon_number_input.c index 2d5229c2b94..cd757d40972 100644 --- a/scenes/pokemon_number_input.c +++ b/src/scenes/pokemon_number_input.c @@ -3,9 +3,9 @@ #include #include -#include "../pokemon_app.h" -#include "../pokemon_data.h" -#include "pokemon_menu.h" +#include +#include +#include static char number_buf[LEN_NUM_BUF]; diff --git a/scenes/pokemon_number_input.h b/src/scenes/pokemon_number_input.h similarity index 100% rename from scenes/pokemon_number_input.h rename to src/scenes/pokemon_number_input.h diff --git a/scenes/pokemon_pins.c b/src/scenes/pokemon_pins.c similarity index 98% rename from scenes/pokemon_pins.c rename to src/scenes/pokemon_pins.c index 227375b3dcc..66166a63ec1 100644 --- a/scenes/pokemon_pins.c +++ b/src/scenes/pokemon_pins.c @@ -1,8 +1,8 @@ #include #include -#include "../pokemon_app.h" -#include "pokemon_menu.h" +#include +#include /* This is a bit of a hack to save some space and not have to refactor this scene. * We re-use the name and pin from the global gpio pin definition, but need to diff --git a/scenes/pokemon_pins.h b/src/scenes/pokemon_pins.h similarity index 100% rename from scenes/pokemon_pins.h rename to src/scenes/pokemon_pins.h diff --git a/scenes/pokemon_pokerus.c b/src/scenes/pokemon_pokerus.c similarity index 98% rename from scenes/pokemon_pokerus.c rename to src/scenes/pokemon_pokerus.c index 2cc370f4c74..36e278cdee0 100644 --- a/scenes/pokemon_pokerus.c +++ b/src/scenes/pokemon_pokerus.c @@ -1,8 +1,8 @@ #include #include -#include "../pokemon_app.h" -#include "pokemon_menu.h" +#include +#include static const char* pokerus_states[] = { "Clean", diff --git a/scenes/pokemon_pokerus.h b/src/scenes/pokemon_pokerus.h similarity index 51% rename from scenes/pokemon_pokerus.h rename to src/scenes/pokemon_pokerus.h index 24c1eac8262..73490e5855b 100644 --- a/scenes/pokemon_pokerus.h +++ b/src/scenes/pokemon_pokerus.h @@ -1,11 +1,11 @@ -#ifndef __POKEMON_POKERUS_H__ -#define __POKEMON_POKERUS_H__ +#ifndef POKEMON_POKERUS_H +#define POKEMON_POKERUS_H -#include "../pokemon_app.h" +#include #pragma once void select_pokerus_scene_on_enter(void* context); const char* select_pokerus_status(PokemonFap* pokemon_fap); -#endif // __POKEMON_POKERUS_H__ +#endif // POKEMON_POKERUS_H diff --git a/scenes/pokemon_select.c b/src/scenes/pokemon_select.c similarity index 91% rename from scenes/pokemon_select.c rename to src/scenes/pokemon_select.c index 001cdec0a52..112c5ccdef8 100644 --- a/scenes/pokemon_select.c +++ b/src/scenes/pokemon_select.c @@ -1,4 +1,4 @@ -#include "../pokemon_app.h" +#include void select_pokemon_scene_on_enter(void* context) { PokemonFap* pokemon_fap = (PokemonFap*)context; diff --git a/scenes/pokemon_select.h b/src/scenes/pokemon_select.h similarity index 100% rename from scenes/pokemon_select.h rename to src/scenes/pokemon_select.h diff --git a/scenes/pokemon_shiny.c b/src/scenes/pokemon_shiny.c similarity index 96% rename from scenes/pokemon_shiny.c rename to src/scenes/pokemon_shiny.c index cccdac5f4f0..ea3b5858cde 100644 --- a/scenes/pokemon_shiny.c +++ b/src/scenes/pokemon_shiny.c @@ -1,9 +1,8 @@ #include -#include "../pokemon_app.h" -#include "../pokemon_data.h" +#include -#include "pokemon_menu.h" +#include /* This just assumes gen ii for now */ /* For a Gen II pokemon to be shiny, the following must be met: diff --git a/scenes/pokemon_shiny.h b/src/scenes/pokemon_shiny.h similarity index 100% rename from scenes/pokemon_shiny.h rename to src/scenes/pokemon_shiny.h diff --git a/scenes/pokemon_stats.c b/src/scenes/pokemon_stats.c similarity index 84% rename from scenes/pokemon_stats.c rename to src/scenes/pokemon_stats.c index aa8aeed8bd8..6d399a8e07b 100644 --- a/scenes/pokemon_stats.c +++ b/src/scenes/pokemon_stats.c @@ -1,10 +1,10 @@ #include -#include +#include -#include "../pokemon_app.h" -#include "../pokemon_data.h" -#include "pokemon_menu.h" +#include +#include +#include static void select_stats_selected_callback(void* context, uint32_t index) { PokemonFap* pokemon_fap = (PokemonFap*)context; diff --git a/scenes/pokemon_stats.h b/src/scenes/pokemon_stats.h similarity index 100% rename from scenes/pokemon_stats.h rename to src/scenes/pokemon_stats.h diff --git a/scenes/pokemon_trade.c b/src/scenes/pokemon_trade.c similarity index 90% rename from scenes/pokemon_trade.c rename to src/scenes/pokemon_trade.c index f10b1fbb3a3..7cd33df72c1 100644 --- a/scenes/pokemon_trade.c +++ b/src/scenes/pokemon_trade.c @@ -1,4 +1,4 @@ -#include "../pokemon_app.h" +#include void trade_scene_on_enter(void* context) { PokemonFap* pokemon_fap = (PokemonFap*)context; diff --git a/scenes/pokemon_trade.h b/src/scenes/pokemon_trade.h similarity index 100% rename from scenes/pokemon_trade.h rename to src/scenes/pokemon_trade.h diff --git a/scenes/pokemon_type.c b/src/scenes/pokemon_type.c similarity index 94% rename from scenes/pokemon_type.c rename to src/scenes/pokemon_type.c index f91c36f9c2a..6eb465d5611 100644 --- a/scenes/pokemon_type.c +++ b/src/scenes/pokemon_type.c @@ -1,10 +1,10 @@ #include -#include +#include -#include "../pokemon_app.h" -#include "../pokemon_data.h" -#include "pokemon_menu.h" +#include +#include +#include struct type_cb { DataStatSub type; diff --git a/scenes/pokemon_type.h b/src/scenes/pokemon_type.h similarity index 100% rename from scenes/pokemon_type.h rename to src/scenes/pokemon_type.h diff --git a/scenes/unown_form.c b/src/scenes/unown_form.c similarity index 96% rename from scenes/unown_form.c rename to src/scenes/unown_form.c index 2f834d2d182..e044e66f03b 100644 --- a/scenes/unown_form.c +++ b/src/scenes/unown_form.c @@ -1,7 +1,7 @@ #include -#include "../pokemon_data.h" +#include -#include "unown_form.h" +#include /* This is used to get the current IVs from the trade struct. * Unown form is calculated by taking the middle bytes of each nibble of IV, diff --git a/scenes/unown_form.h b/src/scenes/unown_form.h similarity index 62% rename from scenes/unown_form.h rename to src/scenes/unown_form.h index e1b47ebfd0e..438a8e5180e 100644 --- a/scenes/unown_form.h +++ b/src/scenes/unown_form.h @@ -1,13 +1,13 @@ -#ifndef __UNOWN_FORM_H__ -#define __UNOWN_FORM_H__ +#ifndef UNOWN_FORM_H +#define UNOWN_FORM_H #pragma once -#include "../pokemon_data.h" +#include /* Returns ascii char, or 0 if unown is not the current pokemon */ char unown_form_get(PokemonData* pdata); void unown_form_set(PokemonData* pdata, char letter); -#endif // __UNOWN_FORM_H__ +#endif // UNOWN_FORM_H diff --git a/stat_nl.c b/src/stat_nl.c similarity index 82% rename from stat_nl.c rename to src/stat_nl.c index 4446fba6338..910bc4925c5 100644 --- a/stat_nl.c +++ b/src/stat_nl.c @@ -1,5 +1,5 @@ -#include -#include +#include +#include const NamedList stat_list[] = { {"Random IV, Zero EV", RANDIV_ZEROEV, 0}, diff --git a/type_nl.c b/src/type_nl.c similarity index 87% rename from type_nl.c rename to src/type_nl.c index a135326ff5d..10e1a144e2d 100644 --- a/type_nl.c +++ b/src/type_nl.c @@ -1,5 +1,5 @@ -#include -#include +#include +#include const NamedList type_list[] = { {"Bug", 0x07, GEN_I}, diff --git a/views/select_pokemon.c b/src/views/select_pokemon.c similarity index 97% rename from views/select_pokemon.c rename to src/views/select_pokemon.c index fcbb4fbab92..392140003d3 100644 --- a/views/select_pokemon.c +++ b/src/views/select_pokemon.c @@ -1,9 +1,9 @@ #include #include -#include "../scenes/pokemon_menu.h" -#include "../pokemon_app.h" -#include "../pokemon_data.h" +#include +#include +#include struct select_model { uint8_t curr_pokemon; diff --git a/views/select_pokemon.h b/src/views/select_pokemon.h similarity index 90% rename from views/select_pokemon.h rename to src/views/select_pokemon.h index 2564a595989..1dc79901ebe 100644 --- a/views/select_pokemon.h +++ b/src/views/select_pokemon.h @@ -4,7 +4,7 @@ #pragma once #include -#include "../pokemon_app.h" +#include void* select_pokemon_alloc( PokemonData* pdata, diff --git a/views/trade.c b/src/views/trade.c similarity index 99% rename from views/trade.c rename to src/views/trade.c index 9636fea4667..3e9ca8d240f 100644 --- a/views/trade.c +++ b/src/views/trade.c @@ -97,9 +97,9 @@ #include #include -#include "../pokemon_app.h" -#include "../pokemon_data.h" -#include "trade_patch_list.h" +#include +#include +#include /* Uncomment the following line to enable graphics testing for the different * phases of the trade view. Pressing the okay button will step through each diff --git a/views/trade.h b/src/views/trade.h similarity index 89% rename from views/trade.h rename to src/views/trade.h index 1c428420d49..a6ad3dd3ba8 100644 --- a/views/trade.h +++ b/src/views/trade.h @@ -4,7 +4,7 @@ #pragma once #include -#include "../pokemon_data.h" +#include void* trade_alloc( PokemonData* pdata, diff --git a/views/trade_patch_list.c b/src/views/trade_patch_list.c similarity index 96% rename from views/trade_patch_list.c rename to src/views/trade_patch_list.c index 4bde3984106..377d5a5abfe 100644 --- a/views/trade_patch_list.c +++ b/src/views/trade_patch_list.c @@ -1,5 +1,5 @@ -#include "../pokemon_app.h" -#include "trade_patch_list.h" +#include +#include struct patch_list* plist_alloc(void) { struct patch_list* plist = NULL; diff --git a/views/trade_patch_list.h b/src/views/trade_patch_list.h similarity index 86% rename from views/trade_patch_list.h rename to src/views/trade_patch_list.h index d28e2ce2edf..41ff263fac0 100644 --- a/views/trade_patch_list.h +++ b/src/views/trade_patch_list.h @@ -4,8 +4,8 @@ #pragma once #include -#include "../pokemon_app.h" -#include "../pokemon_data.h" +#include +#include struct patch_list { uint8_t index; diff --git a/type_nl.h b/type_nl.h deleted file mode 100644 index 4e454eb1824..00000000000 --- a/type_nl.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef __TYPE_NL_H__ -#define __TYPE_NL_H__ - -#pragma once - -extern const NamedList type_list[]; - -#endif // __TYPE_NL_H__