Skip to content

Commit

Permalink
scenes: move files to include folder
Browse files Browse the repository at this point in the history
Signed-off-by: Kris Bahnsen <Kris@KBEmbedded.com>
  • Loading branch information
kbembedded committed Aug 6, 2024
1 parent 8a0c348 commit 4fae7bf
Show file tree
Hide file tree
Showing 25 changed files with 28 additions and 28 deletions.
4 changes: 2 additions & 2 deletions src/pokemon_app.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@

#include <src/include/pokemon_app.h>
#include <src/include/pokemon_data.h>
#include <src/scenes/pokemon_menu.h>
#include <src/scenes/include/pokemon_menu.h>
#include <src/views/trade.h>
#include <src/views/select_pokemon.h>
#include <src/include/pokemon_char_encode.h>

#include <src/scenes/pokemon_scene.h>
#include <src/scenes/include/pokemon_scene.h>

PokemonFap* pokemon_alloc() {
PokemonFap* pokemon_fap = (PokemonFap*)malloc(sizeof(PokemonFap));
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/scenes/pokemon_exit_confirm.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <src/include/pokemon_app.h>
#include <src/include/pokemon_data.h>

#include <src/scenes/pokemon_scene.h>
#include <src/scenes/include/pokemon_scene.h>

#include <src/views/select_pokemon.h>
#include <src/views/trade.h>
Expand Down
12 changes: 6 additions & 6 deletions src/scenes/pokemon_gen.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
#include <src/views/trade.h>
#include <src/views/select_pokemon.h>

#include <src/scenes/pokemon_scene.h>
#include <src/scenes/include/pokemon_scene.h>

#include <src/scenes/pokemon_menu.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>
#include <src/scenes/include/pokemon_menu.h>
#include <src/scenes/include/pokemon_shiny.h>
#include <src/scenes/include/pokemon_gender.h>
#include <src/scenes/include/pokemon_pokerus.h>
#include <src/scenes/include/unown_form.h>

static void scene_change_from_main_cb(void* context, uint32_t index) {
PokemonFap* pokemon_fap = (PokemonFap*)context;
Expand Down
2 changes: 1 addition & 1 deletion src/scenes/pokemon_gender.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <src/include/pokemon_app.h>
#include <src/include/pokemon_data.h>

#include <src/scenes/pokemon_scene.h>
#include <src/scenes/include/pokemon_scene.h>

static const char* gender_str[] = {
"Unknown",
Expand Down
2 changes: 1 addition & 1 deletion src/scenes/pokemon_item.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <src/include/pokemon_app.h>
#include <src/include/pokemon_data.h>

#include <src/scenes/pokemon_scene.h>
#include <src/scenes/include/pokemon_scene.h>

static void select_item_selected_callback(void* context, uint32_t index) {
PokemonFap* pokemon_fap = (PokemonFap*)context;
Expand Down
2 changes: 1 addition & 1 deletion src/scenes/pokemon_menu.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include <src/include/pokemon_data.h>
#include <src/include/pokemon_char_encode.h>

#include <src/scenes/pokemon_scene.h>
#include <src/scenes/include/pokemon_scene.h>

static void scene_change_from_main_cb(void* context, uint32_t index) {
PokemonFap* pokemon_fap = (PokemonFap*)context;
Expand Down
2 changes: 1 addition & 1 deletion src/scenes/pokemon_move.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <src/include/pokemon_app.h>
#include <src/include/pokemon_data.h>

#include <src/scenes/pokemon_scene.h>
#include <src/scenes/include/pokemon_scene.h>

static void select_move_selected_callback(void* context, uint32_t index) {
PokemonFap* pokemon_fap = (PokemonFap*)context;
Expand Down
4 changes: 2 additions & 2 deletions src/scenes/pokemon_name_input.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
#include <src/include/pokemon_app.h>
#include <src/include/pokemon_data.h>
#include <src/include/pokemon_char_encode.h>
#include <src/scenes/unown_form.h>
#include <src/scenes/include/unown_form.h>

#include <src/scenes/pokemon_scene.h>
#include <src/scenes/include/pokemon_scene.h>

static char name_buf[LEN_NAME_BUF];

Expand Down
2 changes: 1 addition & 1 deletion src/scenes/pokemon_number_input.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <src/include/pokemon_app.h>
#include <src/include/pokemon_data.h>

#include <src/scenes/pokemon_scene.h>
#include <src/scenes/include/pokemon_scene.h>

static char number_buf[LEN_NUM_BUF];

Expand Down
2 changes: 1 addition & 1 deletion src/scenes/pokemon_pins.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include <src/include/pokemon_app.h>

#include <src/scenes/pokemon_scene.h>
#include <src/scenes/include/pokemon_scene.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
Expand Down
2 changes: 1 addition & 1 deletion src/scenes/pokemon_pokerus.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include <src/include/pokemon_app.h>

#include <src/scenes/pokemon_scene.h>
#include <src/scenes/include/pokemon_scene.h>

static const char* pokerus_states[] = {
"Clean",
Expand Down
8 changes: 4 additions & 4 deletions src/scenes/pokemon_scene.c
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
#include "pokemon_scene.h"
#include "include/pokemon_scene.h"

// Generate scene on_enter handlers array
#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_enter,
void (*const pokemon_on_enter_handlers[])(void*) = {
#include "pokemon_scene_config.h"
#include "include/pokemon_scene_config.h"
};
#undef ADD_SCENE

// Generate scene on_event handlers array
#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_event,
bool (*const pokemon_on_event_handlers[])(void* context, SceneManagerEvent event) = {
#include "pokemon_scene_config.h"
#include "include/pokemon_scene_config.h"
};
#undef ADD_SCENE

// Generate scene on_exit handlers array
#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_exit,
void (*const pokemon_on_exit_handlers[])(void* context) = {
#include "pokemon_scene_config.h"
#include "include/pokemon_scene_config.h"
};
#undef ADD_SCENE

Expand Down
2 changes: 1 addition & 1 deletion src/scenes/pokemon_shiny.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <src/include/pokemon_app.h>

#include <src/scenes/pokemon_scene.h>
#include <src/scenes/include/pokemon_scene.h>

/* This just assumes gen ii for now */
/* For a Gen II pokemon to be shiny, the following must be met:
Expand Down
2 changes: 1 addition & 1 deletion src/scenes/pokemon_stats.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <src/include/pokemon_app.h>
#include <src/include/pokemon_data.h>

#include <src/scenes/pokemon_scene.h>
#include <src/scenes/include/pokemon_scene.h>

static void select_stats_selected_callback(void* context, uint32_t index) {
PokemonFap* pokemon_fap = (PokemonFap*)context;
Expand Down
2 changes: 1 addition & 1 deletion src/scenes/pokemon_trade.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <src/include/pokemon_app.h>

#include <src/scenes/pokemon_scene.h>
#include <src/scenes/include/pokemon_scene.h>

void pokemon_scene_trade_on_enter(void* context) {
PokemonFap* pokemon_fap = (PokemonFap*)context;
Expand Down
2 changes: 1 addition & 1 deletion src/scenes/pokemon_type.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <src/include/pokemon_app.h>
#include <src/include/pokemon_data.h>

#include <src/scenes/pokemon_scene.h>
#include <src/scenes/include/pokemon_scene.h>

struct type_cb {
DataStatSub type;
Expand Down
2 changes: 1 addition & 1 deletion src/scenes/unown_form.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <stdint.h>
#include <src/include/pokemon_data.h>

#include <src/scenes/unown_form.h>
#include <src/scenes/include/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,
Expand Down
2 changes: 1 addition & 1 deletion src/views/select_pokemon.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <gui/elements.h>
#include <pokemon_icons.h>

#include <src/scenes/pokemon_menu.h>
#include <src/scenes/include/pokemon_menu.h>
#include <src/include/pokemon_app.h>
#include <src/include/pokemon_data.h>

Expand Down

0 comments on commit 4fae7bf

Please sign in to comment.