From f5b84f1a60283ba7cf2a96f014d1a01eaaa87ada Mon Sep 17 00:00:00 2001 From: iriv24 Date: Tue, 31 Dec 2024 09:51:31 -0500 Subject: [PATCH] formatting --- include/catching_show.h | 12 ++++++------ src/encounter.c | 2 +- src/field_menu.c | 2 +- src/overlay005/field_control.c | 2 +- src/unk_0204C500.c | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/catching_show.h b/include/catching_show.h index e39d7091e4..4b299bc693 100644 --- a/include/catching_show.h +++ b/include/catching_show.h @@ -5,13 +5,13 @@ #include "field_battle_data_transfer.h" -#define POINTS_LOST_PER_SECOND 2 -#define CATCHING_SHOW_MONS 6 -#define DISTINCT_TYPE_BONUS 50 -#define DIFFERENT_TYPE_BONUS 200 -#define MAX_TIME_SECONDS 1000 +#define POINTS_LOST_PER_SECOND 2 +#define CATCHING_SHOW_MONS 6 +#define DISTINCT_TYPE_BONUS 50 +#define DIFFERENT_TYPE_BONUS 200 +#define MAX_TIME_SECONDS 1000 -typedef struct CatchingShowPokemon{ +typedef struct CatchingShowPokemon { u16 species; u8 encounterType; u8 encounterRate; diff --git a/src/encounter.c b/src/encounter.c index 7d7a61591a..1a0b746b92 100644 --- a/src/encounter.c +++ b/src/encounter.c @@ -20,6 +20,7 @@ #include "overlay006/ov6_02246034.h" #include "savedata/save_table.h" +#include "catching_show.h" #include "communication_information.h" #include "enc_effects.h" #include "enums.h" @@ -34,7 +35,6 @@ #include "journal.h" #include "location.h" #include "map_object.h" -#include "catching_show.h" #include "party.h" #include "pokemon.h" #include "pokeradar.h" diff --git a/src/field_menu.c b/src/field_menu.c index 109de8787c..05a728aa58 100644 --- a/src/field_menu.c +++ b/src/field_menu.c @@ -35,6 +35,7 @@ #include "bag.h" #include "bg_window.h" +#include "catching_show.h" #include "cell_actor.h" #include "field_overworld_state.h" #include "field_system.h" @@ -50,7 +51,6 @@ #include "menu.h" #include "message.h" #include "narc.h" -#include "catching_show.h" #include "party.h" #include "player_avatar.h" #include "pokemon.h" diff --git a/src/overlay005/field_control.c b/src/overlay005/field_control.c index 2a8fd6c667..b4201a296d 100644 --- a/src/overlay005/field_control.c +++ b/src/overlay005/field_control.c @@ -29,6 +29,7 @@ #include "overlay009/ov9_02249960.h" #include "overlay023/ov23_02241F74.h" +#include "catching_show.h" #include "comm_player_manager.h" #include "communication_information.h" #include "communication_system.h" @@ -45,7 +46,6 @@ #include "map_header_data.h" #include "map_object.h" #include "map_tile_behavior.h" -#include "catching_show.h" #include "party.h" #include "player_avatar.h" #include "pokemon.h" diff --git a/src/unk_0204C500.c b/src/unk_0204C500.c index 0a32be659d..e2d3f535ed 100644 --- a/src/unk_0204C500.c +++ b/src/unk_0204C500.c @@ -9,10 +9,10 @@ #include "savedata/save_table.h" +#include "catching_show.h" #include "field_script_context.h" #include "heap.h" #include "inlines.h" -#include "catching_show.h" #include "pokemon.h" #include "save_player.h" #include "system_flags.h"