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 <Kris@KBEmbedded.com>

item_nl.h

@@ -1,8 +0,0 @@
-#ifndef __ITEM_NL_H__
-#define __ITEM_NL_H__
-
-#pragma once
-
-extern const NamedList item_list[];
-
-#endif // __ITEM_NL_H__

move_nl.h

@@ -1,8 +0,0 @@
-#ifndef __MOVE_NL_H__
-#define __MOVE_NL_H__
-
-#pragma once
-
-extern const NamedList move_list[];
-
-#endif // __MOVE_NL_H__

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

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

named_list.h → 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

pokemon_app.h → src/include/pokemon_app.h

@@ -13,7 +13,7 @@
 #include <gui/modules/variable_item_list.h>
 #include <gblink.h>
 
-#include "pokemon_data.h"
+#include <src/include/pokemon_data.h>
 
 #define TAG "Pokemon"
 

pokemon_data.h → src/include/pokemon_data.h

@@ -12,10 +12,10 @@
 #include <math.h>
 #include <stdint.h>
 
-#include <named_list.h>
-#include <stat_nl.h>
-#include <pokemon_table.h>
-#include "stats.h"
+#include <src/include/named_list.h>
+#include <src/include/stat_nl.h>
+#include <src/include/pokemon_table.h>
+#include <src/include/stats.h>
 
 /* Generation defines */
 #define GEN_I 0x01

pokemon_table.h → 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 <stdint.h>
 
@@ -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

stat_nl.h → 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

stats.h → 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

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

item_nl.c → src/item_nl.c

@@ -1,5 +1,5 @@
-#include <named_list.h>
-#include <pokemon_data.h>
+#include <src/include/named_list.h>
+#include <src/include/pokemon_data.h>
 
 const NamedList item_list[] = {
     {"No Item", 0x00, GEN_II},

move_nl.c → src/move_nl.c

@@ -1,5 +1,5 @@
-#include <named_list.h>
-#include <pokemon_data.h>
+#include <src/include/named_list.h>
+#include <src/include/pokemon_data.h>
 
 const NamedList move_list[] = {
     {"No Move", 0x00, (GEN_I | GEN_II)},

named_list.c → src/named_list.c

@@ -1,7 +1,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include <named_list.h>
+#include <src/include/named_list.h>
 
 /* Get number of elements in a list
  * This is not very efficient as-is since it has to walk the whole list.

pokemon_app.c → src/pokemon_app.c

@@ -1,12 +1,12 @@
 #include <furi_hal_light.h>
 #include <pokemon_icons.h>
 
-#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 <src/include/pokemon_app.h>
+#include <src/include/pokemon_data.h>
+#include <src/scenes/pokemon_menu.h>
+#include <src/views/trade.h>
+#include <src/views/select_pokemon.h>
+#include <src/include/pokemon_char_encode.h>
 
 PokemonFap* pokemon_alloc() {
     PokemonFap* pokemon_fap = (PokemonFap*)malloc(sizeof(PokemonFap));

pokemon_char_encode.c → src/pokemon_char_encode.c

@@ -1,7 +1,7 @@
 #include <stdint.h>
 #include <stddef.h>
 
-#include "pokemon_char_encode.h"
+#include <src/include/pokemon_char_encode.h>
 
 char pokemon_char_to_encoded(int byte) {
     switch(byte) {

pokemon_data.c → src/pokemon_data.c

@@ -1,21 +1,21 @@
 #include <pokemon_icons.h>
+#include "pokemon_data_i.h"
 
 #include <storage/storage.h>
 
-#include "pokemon_data.h"
-#include "pokemon_data_i.h"
-#include "pokemon_app.h"
-#include "pokemon_char_encode.h"
+#include <src/include/pokemon_data.h>
+#include <src/include/pokemon_app.h>
+#include <src/include/pokemon_char_encode.h>
 
-#include "pokemon_table.h"
+#include <src/include/pokemon_table.h>
 
-#include <named_list.h>
-#include <item_nl.h>
-#include <stat_nl.h>
-#include <type_nl.h>
-#include <move_nl.h>
+#include <src/include/named_list.h>
+#include <src/include/item_nl.h>
+#include <src/include/stat_nl.h>
+#include <src/include/type_nl.h>
+#include <src/include/move_nl.h>
 
-#include <missingno_i.h>
+#include <src/missingno_i.h>
 
 #define RECALC_NONE 0x00
 #define RECALC_EXP 0x01

pokemon_data_i.h → src/pokemon_data_i.h

@@ -1,10 +1,10 @@
 #ifndef __POKEMON_DATA_I_H__
 #define __POKEMON_DATA_I_H__
 
-#include "pokemon_data.h"
+#include <src/include/pokemon_data.h>
 
-//#include "pokemon_app.h"
-//#include "pokemon_char_encode.h"
+//#include <src/pokemon_app.h>
+//#include <src/include/pokemon_char_encode.h>
 
 static void pokemon_stat_ev_calc(PokemonData* pdata, EvIv val);
 static void pokemon_stat_iv_calc(PokemonData* pdata, EvIv val);

pokemon_table.c → src/pokemon_table.c

@@ -1,13 +1,12 @@
 #include <stdint.h>
 
-#include <pokemon_table.h>
-#include "stats.h"
-
 #include <gui/icon.h>
-#include <pokemon_icons.h>
-
 #include <furi.h>
 
+#include <pokemon_icons.h>
+#include <src/include/pokemon_table.h>
+#include <src/include/stats.h>
+
 /* 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,

scenes/pokemon_exit_confirm.c → src/scenes/pokemon_exit_confirm.c

@@ -1,12 +1,12 @@
 #include <gui/modules/dialog_ex.h>
 
 #include <pokemon_icons.h>
-#include "pokemon_menu.h"
-#include "../pokemon_app.h"
-#include "../pokemon_data.h"
+#include <src/scenes/pokemon_menu.h>
+#include <src/include/pokemon_app.h>
+#include <src/include/pokemon_data.h>
 
-#include "../views/select_pokemon.h"
-#include "../views/trade.h"
+#include <src/views/select_pokemon.h>
+#include <src/views/trade.h>
 
 static bool pokemon_exit_confirm_back_event_callback(void* context) {
     UNUSED(context);

scenes/pokemon_exit_confirm.h → 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

scenes/pokemon_gen.c → src/scenes/pokemon_gen.c

@@ -1,18 +1,18 @@
-#include "../pokemon_app.h"
-#include "../pokemon_data.h"
-#include "../pokemon_char_encode.h"
+#include <src/include/pokemon_app.h>
+#include <src/include/pokemon_data.h>
+#include <src/include/pokemon_char_encode.h>
 
-#include <named_list.h>
+#include <src/include/named_list.h>
 
-#include "../views/trade.h"
-#include "../views/select_pokemon.h"
+#include <src/views/trade.h>
+#include <src/views/select_pokemon.h>
 
-#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 <src/scenes/pokemon_menu.h>
+#include <src/scenes/pokemon_stats.h>
+#include <src/scenes/pokemon_shiny.h>
+#include <src/scenes/pokemon_gender.h>
+#include <src/scenes/pokemon_pokerus.h>
+#include <src/scenes/unown_form.h>
 
 static void scene_change_from_main_cb(void* context, uint32_t index) {
     PokemonFap* pokemon_fap = (PokemonFap*)context;

scenes/pokemon_gender.c → src/scenes/pokemon_gender.c

@@ -1,8 +1,8 @@
 #include <gui/modules/submenu.h>
 
-#include "../pokemon_app.h"
-#include "../pokemon_data.h"
-#include "pokemon_menu.h"
+#include <src/include/pokemon_app.h>
+#include <src/include/pokemon_data.h>
+#include <src/scenes/pokemon_menu.h>
 
 static const char* gender_str[] = {
     "Unknown",

scenes/pokemon_item.c → src/scenes/pokemon_item.c

@@ -2,11 +2,11 @@
 #include <gui/scene_manager.h>
 #include <stdio.h>
 
-#include <named_list.h>
+#include <src/include/named_list.h>
 
-#include "../pokemon_app.h"
-#include "../pokemon_data.h"
-#include "pokemon_menu.h"
+#include <src/include/pokemon_app.h>
+#include <src/include/pokemon_data.h>
+#include <src/scenes/pokemon_menu.h>
 
 static void select_item_selected_callback(void* context, uint32_t index) {
     PokemonFap* pokemon_fap = (PokemonFap*)context;

scenes/pokemon_menu.c → 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 <src/include/pokemon_app.h>
+#include <src/include/pokemon_data.h>
+#include <src/include/pokemon_char_encode.h>
+
+#include <src/scenes/pokemon_menu.h>
+#include <src/scenes/pokemon_gen.h>
+#include <src/scenes/pokemon_select.h>
+#include <src/scenes/pokemon_name_input.h>
+#include <src/scenes/pokemon_number_input.h>
+#include <src/scenes/pokemon_move.h>
+#include <src/scenes/pokemon_item.h>
+#include <src/scenes/pokemon_type.h>
+#include <src/scenes/pokemon_stats.h>
+#include <src/scenes/pokemon_shiny.h>
+#include <src/scenes/pokemon_gender.h>
+#include <src/scenes/pokemon_pokerus.h>
+#include <src/scenes/pokemon_trade.h>
+#include <src/scenes/pokemon_pins.h>
+#include <src/scenes/pokemon_exit_confirm.h>
 
 static void scene_change_from_main_cb(void* context, uint32_t index) {
     PokemonFap* pokemon_fap = (PokemonFap*)context;

scenes/pokemon_move.c → src/scenes/pokemon_move.c

@@ -2,11 +2,11 @@
 #include <gui/scene_manager.h>
 #include <stdio.h>
 
-#include <named_list.h>
+#include <src/include/named_list.h>
 
-#include "../pokemon_app.h"
-#include "../pokemon_data.h"
-#include "pokemon_menu.h"
+#include <src/include/pokemon_app.h>
+#include <src/include/pokemon_data.h>
+#include <src/scenes/pokemon_menu.h>
 
 static void select_move_selected_callback(void* context, uint32_t index) {
     PokemonFap* pokemon_fap = (PokemonFap*)context;

scenes/pokemon_name_input.c → src/scenes/pokemon_name_input.c

@@ -4,11 +4,11 @@
 #include <gui/view_dispatcher.h>
 #include <stdlib.h>
 
-#include "../pokemon_app.h"
-#include "../pokemon_data.h"
-#include "../pokemon_char_encode.h"
-#include "pokemon_menu.h"
-#include "unown_form.h"
+#include <src/include/pokemon_app.h>
+#include <src/include/pokemon_data.h>
+#include <src/include/pokemon_char_encode.h>
+#include <src/scenes/pokemon_menu.h>
+#include <src/scenes/unown_form.h>
 
 static char name_buf[LEN_NAME_BUF];
 

scenes/pokemon_number_input.c → src/scenes/pokemon_number_input.c

@@ -3,9 +3,9 @@
 #include <gui/view_dispatcher.h>
 #include <stdlib.h>
 
-#include "../pokemon_app.h"
-#include "../pokemon_data.h"
-#include "pokemon_menu.h"
+#include <src/include/pokemon_app.h>
+#include <src/include/pokemon_data.h>
+#include <src/scenes/pokemon_menu.h>
 
 static char number_buf[LEN_NUM_BUF];
 

scenes/pokemon_pins.c → src/scenes/pokemon_pins.c

@@ -1,8 +1,8 @@
 #include <gui/modules/variable_item_list.h>
 #include <furi.h>
 
-#include "../pokemon_app.h"
-#include "pokemon_menu.h"
+#include <src/include/pokemon_app.h>
+#include <src/scenes/pokemon_menu.h>
 
 /* 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

scenes/pokemon_pokerus.c → src/scenes/pokemon_pokerus.c

@@ -1,8 +1,8 @@
 #include <gui/modules/variable_item_list.h>
 #include <furi.h>
 
-#include "../pokemon_app.h"
-#include "pokemon_menu.h"
+#include <src/include/pokemon_app.h>
+#include <src/scenes/pokemon_menu.h>
 
 static const char* pokerus_states[] = {
     "Clean",

scenes/pokemon_pokerus.h → 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 <src/include/pokemon_app.h>
 
 #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

scenes/pokemon_select.c → src/scenes/pokemon_select.c

@@ -1,4 +1,4 @@
-#include "../pokemon_app.h"
+#include <src/include/pokemon_app.h>
 
 void select_pokemon_scene_on_enter(void* context) {
     PokemonFap* pokemon_fap = (PokemonFap*)context;

scenes/pokemon_shiny.c → src/scenes/pokemon_shiny.c

@@ -1,9 +1,8 @@
 #include <gui/modules/submenu.h>
 
-#include "../pokemon_app.h"
-#include "../pokemon_data.h"
+#include <src/include/pokemon_app.h>
 
-#include "pokemon_menu.h"
+#include <src/scenes/pokemon_menu.h>
 
 /* This just assumes gen ii for now */
 /* For a Gen II pokemon to be shiny, the following must be met:

scenes/pokemon_stats.c → src/scenes/pokemon_stats.c

@@ -1,10 +1,10 @@
 #include <gui/modules/submenu.h>
 
-#include <named_list.h>
+#include <src/include/named_list.h>
 
-#include "../pokemon_app.h"
-#include "../pokemon_data.h"
-#include "pokemon_menu.h"
+#include <src/include/pokemon_app.h>
+#include <src/include/pokemon_data.h>
+#include <src/scenes/pokemon_menu.h>
 
 static void select_stats_selected_callback(void* context, uint32_t index) {
     PokemonFap* pokemon_fap = (PokemonFap*)context;

scenes/pokemon_trade.c → src/scenes/pokemon_trade.c

@@ -1,4 +1,4 @@
-#include "../pokemon_app.h"
+#include <src/include/pokemon_app.h>
 
 void trade_scene_on_enter(void* context) {
     PokemonFap* pokemon_fap = (PokemonFap*)context;

scenes/pokemon_type.c → src/scenes/pokemon_type.c

@@ -1,10 +1,10 @@
 #include <gui/modules/variable_item_list.h>
 
-#include <named_list.h>
+#include <src/include/named_list.h>
 
-#include "../pokemon_app.h"
-#include "../pokemon_data.h"
-#include "pokemon_menu.h"
+#include <src/include/pokemon_app.h>
+#include <src/include/pokemon_data.h>
+#include <src/scenes/pokemon_menu.h>
 
 struct type_cb {
     DataStatSub type;

scenes/unown_form.c → src/scenes/unown_form.c

@@ -1,7 +1,7 @@
 #include <stdint.h>
-#include "../pokemon_data.h"
+#include <src/include/pokemon_data.h>
 
-#include "unown_form.h"
+#include <src/scenes/unown_form.h>
 
 /* 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,

scenes/unown_form.h → 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 <src/include/pokemon_data.h>
 
 /* 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

stat_nl.c → src/stat_nl.c

@@ -1,5 +1,5 @@
-#include <named_list.h>
-#include <stat_nl.h>
+#include <src/include/named_list.h>
+#include <src/include/stat_nl.h>
 
 const NamedList stat_list[] = {
     {"Random IV, Zero EV", RANDIV_ZEROEV, 0},

type_nl.c → src/type_nl.c

@@ -1,5 +1,5 @@
-#include <named_list.h>
-#include <pokemon_data.h>
+#include <src/include/named_list.h>
+#include <src/include/pokemon_data.h>
 
 const NamedList type_list[] = {
     {"Bug", 0x07, GEN_I},

views/select_pokemon.c → src/views/select_pokemon.c

@@ -1,9 +1,9 @@
 #include <gui/elements.h>
 #include <pokemon_icons.h>
 
-#include "../scenes/pokemon_menu.h"
-#include "../pokemon_app.h"
-#include "../pokemon_data.h"
+#include <src/scenes/pokemon_menu.h>
+#include <src/include/pokemon_app.h>
+#include <src/include/pokemon_data.h>
 
 struct select_model {
     uint8_t curr_pokemon;

views/select_pokemon.h → src/views/select_pokemon.h

@@ -4,7 +4,7 @@
 #pragma once
 
 #include <gui/view.h>
-#include "../pokemon_app.h"
+#include <src/include/pokemon_app.h>
 
 void* select_pokemon_alloc(
     PokemonData* pdata,

views/trade.c → src/views/trade.c

@@ -97,9 +97,9 @@
 #include <pokemon_icons.h>
 #include <gblink.h>
 
-#include "../pokemon_app.h"
-#include "../pokemon_data.h"
-#include "trade_patch_list.h"
+#include <src/include/pokemon_app.h>
+#include <src/include/pokemon_data.h>
+#include <src/views/trade_patch_list.h>
 
 /* Uncomment the following line to enable graphics testing for the different
  * phases of the trade view. Pressing the okay button will step through each

views/trade.h → src/views/trade.h

@@ -4,7 +4,7 @@
 #pragma once
 
 #include <gui/view.h>
-#include "../pokemon_data.h"
+#include <src/include/pokemon_data.h>
 
 void* trade_alloc(
     PokemonData* pdata,

views/trade_patch_list.c → src/views/trade_patch_list.c

@@ -1,5 +1,5 @@
-#include "../pokemon_app.h"
-#include "trade_patch_list.h"
+#include <src/include/pokemon_app.h>
+#include <src/views/trade_patch_list.h>
 
 struct patch_list* plist_alloc(void) {
     struct patch_list* plist = NULL;

views/trade_patch_list.h → src/views/trade_patch_list.h

@@ -4,8 +4,8 @@
 #pragma once
 
 #include <gui/view.h>
-#include "../pokemon_app.h"
-#include "../pokemon_data.h"
+#include <src/include/pokemon_app.h>
+#include <src/include/pokemon_data.h>
 
 struct patch_list {
     uint8_t index;

type_nl.h

@@ -1,8 +0,0 @@
-#ifndef __TYPE_NL_H__
-#define __TYPE_NL_H__
-
-#pragma once
-
-extern const NamedList type_list[];
-
-#endif // __TYPE_NL_H__