Skip to content

Commit 717f383

Browse files
kbembeddedkbembedded
committed
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>
1 parent 24769ce commit 717f383

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+171
-173
lines changed

‎item_nl.h

-8
This file was deleted.

‎move_nl.h

-8
This file was deleted.

‎src/include/item_nl.h

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#ifndef ITEM_NL_H
2+
#define ITEM_NL_H
3+
4+
#pragma once
5+
6+
extern const NamedList item_list[];
7+
8+
#endif // ITEM_NL_H

‎src/include/move_nl.h

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#ifndef MOVE_NL_H
2+
#define MOVE_NL_H
3+
4+
#pragma once
5+
6+
extern const NamedList move_list[];
7+
8+
#endif // MOVE_NL_H

‎named_list.h ‎src/include/named_list.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef __NAMED_LIST_H__
2-
#define __NAMED_LIST_H__
1+
#ifndef NAMED_LIST_H
2+
#define NAMED_LIST_H
33

44
#pragma once
55

@@ -43,4 +43,4 @@ const char* namedlist_name_get_index(const NamedList* list, uint32_t index);
4343
/* Get a pointer to the item's name from a position */
4444
const char* namedlist_name_get_pos(const NamedList* list, uint32_t pos);
4545

46-
#endif //__NAMED_LIST_H__
46+
#endif //NAMED_LIST_H

‎pokemon_app.h ‎src/include/pokemon_app.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <gui/modules/variable_item_list.h>
1414
#include <gblink.h>
1515

16-
#include "pokemon_data.h"
16+
#include <src/include/pokemon_data.h>
1717

1818
#define TAG "Pokemon"
1919

‎pokemon_char_encode.h ‎src/include/pokemon_char_encode.h

File renamed without changes.

‎pokemon_data.h ‎src/include/pokemon_data.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
#include <math.h>
1313
#include <stdint.h>
1414

15-
#include <named_list.h>
16-
#include <stat_nl.h>
17-
#include <pokemon_table.h>
18-
#include "stats.h"
15+
#include <src/include/named_list.h>
16+
#include <src/include/stat_nl.h>
17+
#include <src/include/pokemon_table.h>
18+
#include <src/include/stats.h>
1919

2020
/* Generation defines */
2121
#define GEN_I 0x01

‎pokemon_table.h ‎src/include/pokemon_table.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef __POKEMON_TABLE_H__
2-
#define __POKEMON_TABLE_H__
1+
#ifndef POKEMON_TABLE_H
2+
#define POKEMON_TABLE_H
33

44
#include <stdint.h>
55

@@ -30,4 +30,4 @@ uint8_t
3030
const char* table_stat_name_get(const PokemonTable* table, int num);
3131
const PokemonTable* table_pointer_get();
3232

33-
#endif // __POKEMON_TABLE_H__
33+
#endif // POKEMON_TABLE_H

‎stat_nl.h ‎src/include/stat_nl.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef __STAT_NL_H__
2-
#define __STAT_NL_H__
1+
#ifndef STAT_NL_H
2+
#define STAT_NL_H
33

44
#pragma once
55

@@ -14,4 +14,4 @@ typedef enum {
1414
MAXIV_MAXEV,
1515
} EvIv;
1616

17-
#endif // __STAT_NL_H__
17+
#endif // STAT_NL_H

‎stats.h ‎src/include/stats.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef __STATS_H__
2-
#define __STATS_H__
1+
#ifndef STATS_H
2+
#define STATS_H
33

44
#pragma once
55

@@ -101,4 +101,4 @@ typedef enum {
101101
NONE = 0, // Just a filler value
102102
} DataStatSub;
103103

104-
#endif // __STATS_H__
104+
#endif // STATS_H

‎src/include/type_nl.h

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#ifndef TYPE_NL_H
2+
#define TYPE_NL_H
3+
4+
#pragma once
5+
6+
extern const NamedList type_list[];
7+
8+
#endif // TYPE_NL_H

‎item_nl.c ‎src/item_nl.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#include <named_list.h>
2-
#include <pokemon_data.h>
1+
#include <src/include/named_list.h>
2+
#include <src/include/pokemon_data.h>
33

44
const NamedList item_list[] = {
55
{"No Item", 0x00, GEN_II},

‎missingno_i.h ‎src/missingno_i.h

File renamed without changes.

‎move_nl.c ‎src/move_nl.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#include <named_list.h>
2-
#include <pokemon_data.h>
1+
#include <src/include/named_list.h>
2+
#include <src/include/pokemon_data.h>
33

44
const NamedList move_list[] = {
55
{"No Move", 0x00, (GEN_I | GEN_II)},

‎named_list.c ‎src/named_list.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include <stddef.h>
22
#include <stdint.h>
33

4-
#include <named_list.h>
4+
#include <src/include/named_list.h>
55

66
/* Get number of elements in a list
77
* This is not very efficient as-is since it has to walk the whole list.

‎pokemon_app.c ‎src/pokemon_app.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#include <furi_hal_light.h>
22
#include <pokemon_icons.h>
33

4-
#include "pokemon_app.h"
5-
#include "pokemon_data.h"
6-
#include "scenes/pokemon_menu.h"
7-
#include "views/trade.h"
8-
#include "views/select_pokemon.h"
9-
#include "pokemon_char_encode.h"
4+
#include <src/include/pokemon_app.h>
5+
#include <src/include/pokemon_data.h>
6+
#include <src/scenes/pokemon_menu.h>
7+
#include <src/views/trade.h>
8+
#include <src/views/select_pokemon.h>
9+
#include <src/include/pokemon_char_encode.h>
1010

1111
PokemonFap* pokemon_alloc() {
1212
PokemonFap* pokemon_fap = (PokemonFap*)malloc(sizeof(PokemonFap));

‎pokemon_char_encode.c ‎src/pokemon_char_encode.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include <stdint.h>
22
#include <stddef.h>
33

4-
#include "pokemon_char_encode.h"
4+
#include <src/include/pokemon_char_encode.h>
55

66
char pokemon_char_to_encoded(int byte) {
77
switch(byte) {

‎pokemon_data.c ‎src/pokemon_data.c

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
#include <pokemon_icons.h>
2+
#include "pokemon_data_i.h"
23

34
#include <storage/storage.h>
45

5-
#include "pokemon_data.h"
6-
#include "pokemon_data_i.h"
7-
#include "pokemon_app.h"
8-
#include "pokemon_char_encode.h"
6+
#include <src/include/pokemon_data.h>
7+
#include <src/include/pokemon_app.h>
8+
#include <src/include/pokemon_char_encode.h>
99

10-
#include "pokemon_table.h"
10+
#include <src/include/pokemon_table.h>
1111

12-
#include <named_list.h>
13-
#include <item_nl.h>
14-
#include <stat_nl.h>
15-
#include <type_nl.h>
16-
#include <move_nl.h>
12+
#include <src/include/named_list.h>
13+
#include <src/include/item_nl.h>
14+
#include <src/include/stat_nl.h>
15+
#include <src/include/type_nl.h>
16+
#include <src/include/move_nl.h>
1717

18-
#include <missingno_i.h>
18+
#include <src/missingno_i.h>
1919

2020
#define RECALC_NONE 0x00
2121
#define RECALC_EXP 0x01

‎pokemon_data_i.h ‎src/pokemon_data_i.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#ifndef __POKEMON_DATA_I_H__
22
#define __POKEMON_DATA_I_H__
33

4-
#include "pokemon_data.h"
4+
#include <src/include/pokemon_data.h>
55

6-
//#include "pokemon_app.h"
7-
//#include "pokemon_char_encode.h"
6+
//#include <src/pokemon_app.h>
7+
//#include <src/include/pokemon_char_encode.h>
88

99
static void pokemon_stat_ev_calc(PokemonData* pdata, EvIv val);
1010
static void pokemon_stat_iv_calc(PokemonData* pdata, EvIv val);

‎pokemon_table.c ‎src/pokemon_table.c

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
#include <stdint.h>
22

3-
#include <pokemon_table.h>
4-
#include "stats.h"
5-
63
#include <gui/icon.h>
7-
#include <pokemon_icons.h>
8-
94
#include <furi.h>
105

6+
#include <pokemon_icons.h>
7+
#include <src/include/pokemon_table.h>
8+
#include <src/include/stats.h>
9+
1110
/* NOTE: It seems like gen ii index is national pokedex order? */
1211
/* Gen i and Gen ii are _almost_ the same with all stats. The big difference
1312
* 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

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#include <gui/modules/dialog_ex.h>
22

33
#include <pokemon_icons.h>
4-
#include "pokemon_menu.h"
5-
#include "../pokemon_app.h"
6-
#include "../pokemon_data.h"
4+
#include <src/scenes/pokemon_menu.h>
5+
#include <src/include/pokemon_app.h>
6+
#include <src/include/pokemon_data.h>
77

8-
#include "../views/select_pokemon.h"
9-
#include "../views/trade.h"
8+
#include <src/views/select_pokemon.h>
9+
#include <src/views/trade.h>
1010

1111
static bool pokemon_exit_confirm_back_event_callback(void* context) {
1212
UNUSED(context);

‎scenes/pokemon_exit_confirm.h ‎src/scenes/pokemon_exit_confirm.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef __POKEMON_EXIT_CONFIRM_H__
2-
#define __POKEMON_EXIT_CONFIRM_H__
1+
#ifndef POKEMON_EXIT_CONFIRM_H
2+
#define POKEMON_EXIT_CONFIRM_H
33

44
#pragma once
55

@@ -12,4 +12,4 @@ void pokemon_exit_confirm_on_enter(void* context);
1212

1313
bool pokemon_exit_confirm_on_event(void* context, SceneManagerEvent event);
1414

15-
#endif // __POKEMON_EXIT_CONFIRM_H__
15+
#endif // POKEMON_EXIT_CONFIRM_H

‎scenes/pokemon_gen.c ‎src/scenes/pokemon_gen.c

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
#include "../pokemon_app.h"
2-
#include "../pokemon_data.h"
3-
#include "../pokemon_char_encode.h"
1+
#include <src/include/pokemon_app.h>
2+
#include <src/include/pokemon_data.h>
3+
#include <src/include/pokemon_char_encode.h>
44

5-
#include <named_list.h>
5+
#include <src/include/named_list.h>
66

7-
#include "../views/trade.h"
8-
#include "../views/select_pokemon.h"
7+
#include <src/views/trade.h>
8+
#include <src/views/select_pokemon.h>
99

10-
#include "pokemon_menu.h"
11-
#include "pokemon_stats.h"
12-
#include "pokemon_shiny.h"
13-
#include "pokemon_gender.h"
14-
#include "pokemon_pokerus.h"
15-
#include "unown_form.h"
10+
#include <src/scenes/pokemon_menu.h>
11+
#include <src/scenes/pokemon_stats.h>
12+
#include <src/scenes/pokemon_shiny.h>
13+
#include <src/scenes/pokemon_gender.h>
14+
#include <src/scenes/pokemon_pokerus.h>
15+
#include <src/scenes/unown_form.h>
1616

1717
static void scene_change_from_main_cb(void* context, uint32_t index) {
1818
PokemonFap* pokemon_fap = (PokemonFap*)context;

‎scenes/pokemon_gen.h ‎src/scenes/pokemon_gen.h

File renamed without changes.

‎scenes/pokemon_gender.c ‎src/scenes/pokemon_gender.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include <gui/modules/submenu.h>
22

3-
#include "../pokemon_app.h"
4-
#include "../pokemon_data.h"
5-
#include "pokemon_menu.h"
3+
#include <src/include/pokemon_app.h>
4+
#include <src/include/pokemon_data.h>
5+
#include <src/scenes/pokemon_menu.h>
66

77
static const char* gender_str[] = {
88
"Unknown",

‎scenes/pokemon_gender.h ‎src/scenes/pokemon_gender.h

File renamed without changes.

‎scenes/pokemon_item.c ‎src/scenes/pokemon_item.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
#include <gui/scene_manager.h>
33
#include <stdio.h>
44

5-
#include <named_list.h>
5+
#include <src/include/named_list.h>
66

7-
#include "../pokemon_app.h"
8-
#include "../pokemon_data.h"
9-
#include "pokemon_menu.h"
7+
#include <src/include/pokemon_app.h>
8+
#include <src/include/pokemon_data.h>
9+
#include <src/scenes/pokemon_menu.h>
1010

1111
static void select_item_selected_callback(void* context, uint32_t index) {
1212
PokemonFap* pokemon_fap = (PokemonFap*)context;

‎scenes/pokemon_item.h ‎src/scenes/pokemon_item.h

File renamed without changes.

‎scenes/pokemon_menu.c ‎src/scenes/pokemon_menu.c

+19-19
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
#include "../pokemon_app.h"
2-
#include "../pokemon_data.h"
3-
#include "../pokemon_char_encode.h"
4-
5-
#include "pokemon_menu.h"
6-
#include "pokemon_gen.h"
7-
#include "pokemon_select.h"
8-
#include "pokemon_name_input.h"
9-
#include "pokemon_number_input.h"
10-
#include "pokemon_move.h"
11-
#include "pokemon_item.h"
12-
#include "pokemon_type.h"
13-
#include "pokemon_stats.h"
14-
#include "pokemon_shiny.h"
15-
#include "pokemon_gender.h"
16-
#include "pokemon_pokerus.h"
17-
#include "pokemon_trade.h"
18-
#include "pokemon_pins.h"
19-
#include "pokemon_exit_confirm.h"
1+
#include <src/include/pokemon_app.h>
2+
#include <src/include/pokemon_data.h>
3+
#include <src/include/pokemon_char_encode.h>
4+
5+
#include <src/scenes/pokemon_menu.h>
6+
#include <src/scenes/pokemon_gen.h>
7+
#include <src/scenes/pokemon_select.h>
8+
#include <src/scenes/pokemon_name_input.h>
9+
#include <src/scenes/pokemon_number_input.h>
10+
#include <src/scenes/pokemon_move.h>
11+
#include <src/scenes/pokemon_item.h>
12+
#include <src/scenes/pokemon_type.h>
13+
#include <src/scenes/pokemon_stats.h>
14+
#include <src/scenes/pokemon_shiny.h>
15+
#include <src/scenes/pokemon_gender.h>
16+
#include <src/scenes/pokemon_pokerus.h>
17+
#include <src/scenes/pokemon_trade.h>
18+
#include <src/scenes/pokemon_pins.h>
19+
#include <src/scenes/pokemon_exit_confirm.h>
2020

2121
static void scene_change_from_main_cb(void* context, uint32_t index) {
2222
PokemonFap* pokemon_fap = (PokemonFap*)context;

‎scenes/pokemon_menu.h ‎src/scenes/pokemon_menu.h

File renamed without changes.

‎scenes/pokemon_move.c ‎src/scenes/pokemon_move.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
#include <gui/scene_manager.h>
33
#include <stdio.h>
44

5-
#include <named_list.h>
5+
#include <src/include/named_list.h>
66

7-
#include "../pokemon_app.h"
8-
#include "../pokemon_data.h"
9-
#include "pokemon_menu.h"
7+
#include <src/include/pokemon_app.h>
8+
#include <src/include/pokemon_data.h>
9+
#include <src/scenes/pokemon_menu.h>
1010

1111
static void select_move_selected_callback(void* context, uint32_t index) {
1212
PokemonFap* pokemon_fap = (PokemonFap*)context;

‎scenes/pokemon_move.h ‎src/scenes/pokemon_move.h

File renamed without changes.

0 commit comments

Comments
 (0)