mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-12-25 11:14:15 +01:00
Organized conffig files into their own folder and cleaned up
This commit is contained in:
parent
49b7328d32
commit
011ec16f1e
@ -1,4 +1,5 @@
|
|||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
#include "config/battle.h"
|
||||||
#include "constants/battle.h"
|
#include "constants/battle.h"
|
||||||
#include "constants/battle_anim.h"
|
#include "constants/battle_anim.h"
|
||||||
#include "constants/rgb.h"
|
#include "constants/rgb.h"
|
||||||
@ -7,7 +8,6 @@
|
|||||||
#include "constants/moves.h"
|
#include "constants/moves.h"
|
||||||
#include "constants/pokemon.h"
|
#include "constants/pokemon.h"
|
||||||
#include "constants/items.h"
|
#include "constants/items.h"
|
||||||
#include "constants/battle_config.h"
|
|
||||||
.include "asm/macros.inc"
|
.include "asm/macros.inc"
|
||||||
.include "asm/macros/battle_anim_script.inc"
|
.include "asm/macros/battle_anim_script.inc"
|
||||||
.include "constants/constants.inc"
|
.include "constants/constants.inc"
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
#include "config/battle.h"
|
||||||
#include "constants/global.h"
|
#include "constants/global.h"
|
||||||
#include "constants/battle.h"
|
#include "constants/battle.h"
|
||||||
#include "constants/pokemon.h"
|
#include "constants/pokemon.h"
|
||||||
@ -12,7 +13,6 @@
|
|||||||
#include "constants/songs.h"
|
#include "constants/songs.h"
|
||||||
#include "constants/game_stat.h"
|
#include "constants/game_stat.h"
|
||||||
#include "constants/trainers.h"
|
#include "constants/trainers.h"
|
||||||
#include "constants/battle_config.h"
|
|
||||||
#include "constants/species.h"
|
#include "constants/species.h"
|
||||||
.include "asm/macros.inc"
|
.include "asm/macros.inc"
|
||||||
.include "asm/macros/battle_script.inc"
|
.include "asm/macros/battle_script.inc"
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
|
#include "config/battle.h"
|
||||||
#include "constants/battle.h"
|
#include "constants/battle.h"
|
||||||
#include "constants/battle_script_commands.h"
|
#include "constants/battle_script_commands.h"
|
||||||
#include "constants/battle_anim.h"
|
#include "constants/battle_anim.h"
|
||||||
#include "constants/battle_string_ids.h"
|
#include "constants/battle_string_ids.h"
|
||||||
#include "constants/battle_config.h"
|
|
||||||
#include "constants/items.h"
|
#include "constants/items.h"
|
||||||
#include "constants/songs.h"
|
#include "constants/songs.h"
|
||||||
#include "constants/game_stat.h"
|
#include "constants/game_stat.h"
|
||||||
|
@ -1,8 +1,9 @@
|
|||||||
|
#include "config/battle.h"
|
||||||
|
#include "config/item.h"
|
||||||
#include "constants/global.h"
|
#include "constants/global.h"
|
||||||
#include "constants/apprentice.h"
|
#include "constants/apprentice.h"
|
||||||
#include "constants/battle.h"
|
#include "constants/battle.h"
|
||||||
#include "constants/battle_arena.h"
|
#include "constants/battle_arena.h"
|
||||||
#include "constants/battle_config.h"
|
|
||||||
#include "constants/battle_dome.h"
|
#include "constants/battle_dome.h"
|
||||||
#include "constants/battle_factory.h"
|
#include "constants/battle_factory.h"
|
||||||
#include "constants/battle_frontier.h"
|
#include "constants/battle_frontier.h"
|
||||||
@ -30,7 +31,6 @@
|
|||||||
#include "constants/frontier_util.h"
|
#include "constants/frontier_util.h"
|
||||||
#include "constants/game_stat.h"
|
#include "constants/game_stat.h"
|
||||||
#include "constants/item.h"
|
#include "constants/item.h"
|
||||||
#include "constants/item_config.h"
|
|
||||||
#include "constants/items.h"
|
#include "constants/items.h"
|
||||||
#include "constants/heal_locations.h"
|
#include "constants/heal_locations.h"
|
||||||
#include "constants/layouts.h"
|
#include "constants/layouts.h"
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
.include "asm/macros/m4a.inc"
|
.include "asm/macros/m4a.inc"
|
||||||
.include "asm/macros/music_voice.inc"
|
.include "asm/macros/music_voice.inc"
|
||||||
.include "include/constants/pokemon_config.h"
|
.include "include/config/pokemon.h"
|
||||||
.include "sound/voice_groups.inc"
|
.include "sound/voice_groups.inc"
|
||||||
.include "sound/keysplit_tables.inc"
|
.include "sound/keysplit_tables.inc"
|
||||||
.include "sound/programmable_wave_data.inc"
|
.include "sound/programmable_wave_data.inc"
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
#ifndef GUARD_BATTLE_BG_H
|
#ifndef GUARD_BATTLE_BG_H
|
||||||
#define GUARD_BATTLE_BG_H
|
#define GUARD_BATTLE_BG_H
|
||||||
|
|
||||||
#if P_ENABLE_DEBUG == TRUE
|
|
||||||
struct BattleBackground
|
struct BattleBackground
|
||||||
{
|
{
|
||||||
const void *tileset;
|
const void *tileset;
|
||||||
@ -10,7 +9,6 @@ struct BattleBackground
|
|||||||
const void *entryTilemap;
|
const void *entryTilemap;
|
||||||
const void *palette;
|
const void *palette;
|
||||||
};
|
};
|
||||||
#endif
|
|
||||||
|
|
||||||
void BattleInitBgsAndWindows(void);
|
void BattleInitBgsAndWindows(void);
|
||||||
void InitBattleBgsVideo(void);
|
void InitBattleBgsVideo(void);
|
||||||
|
@ -1,8 +1,6 @@
|
|||||||
#ifndef GUARD_BATTLE_MESSAGE_H
|
#ifndef GUARD_BATTLE_MESSAGE_H
|
||||||
#define GUARD_BATTLE_MESSAGE_H
|
#define GUARD_BATTLE_MESSAGE_H
|
||||||
|
|
||||||
#include "constants/battle_config.h"
|
|
||||||
|
|
||||||
#if B_EXPANDED_ABILITY_NAMES == TRUE
|
#if B_EXPANDED_ABILITY_NAMES == TRUE
|
||||||
#define TEXT_BUFF_ARRAY_COUNT 17
|
#define TEXT_BUFF_ARRAY_COUNT 17
|
||||||
#else
|
#else
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#ifndef GUARD_CONSTANTS_BATTLE_CONFIG_H
|
#ifndef GUARD_CONFIG_BATTLE_H
|
||||||
#define GUARD_CONSTANTS_BATTLE_CONFIG_H
|
#define GUARD_CONFIG_BATTLE_H
|
||||||
|
|
||||||
// Calculation settings
|
// Calculation settings
|
||||||
#define B_CRIT_CHANCE GEN_LATEST // Chances of a critical hit landing. See CalcCritChanceStage. Gen6+ chances guarantee that Farfetch'd and Sirfetch'd always get critical hits while holding a Leek and using high-crit ratio moves.
|
#define B_CRIT_CHANCE GEN_LATEST // Chances of a critical hit landing. See CalcCritChanceStage. Gen6+ chances guarantee that Farfetch'd and Sirfetch'd always get critical hits while holding a Leek and using high-crit ratio moves.
|
||||||
@ -197,6 +197,4 @@
|
|||||||
#define B_NEW_IMPACT_PALETTE FALSE // If set to TRUE, it updates the basic 'hit' palette.
|
#define B_NEW_IMPACT_PALETTE FALSE // If set to TRUE, it updates the basic 'hit' palette.
|
||||||
#define B_NEW_SURF_PARTICLE_PALETTE FALSE // If set to TRUE, it updates Surf's wave palette.
|
#define B_NEW_SURF_PARTICLE_PALETTE FALSE // If set to TRUE, it updates Surf's wave palette.
|
||||||
|
|
||||||
#define B_ENABLE_DEBUG TRUE // If set to TRUE, enables a debug menu to use in battles by pressing the Select button.
|
#endif // GUARD_CONFIG_BATTLE_H
|
||||||
|
|
||||||
#endif // GUARD_CONSTANTS_BATTLE_CONFIG_H
|
|
21
include/config/debug.h
Normal file
21
include/config/debug.h
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
#ifndef GUARD_CONFIG_DEBUG_H
|
||||||
|
#define GUARD_CONFIG_DEBUG_H
|
||||||
|
|
||||||
|
// Overworld Debug
|
||||||
|
#define DEBUG_OVERWORLD_MENU TRUE // Enables a overworld debug menu for changing flags, variables, giving pokemon and more, accessed by holding R and pressing START while in the overworld by default.
|
||||||
|
#define DEBUG_SYSTEM_HELD_KEYS (R_BUTTON) // The keys required to be held to open the debug menu.
|
||||||
|
#define DEBUG_SYSTEM_TRIGGER_EVENT pressedStartButton // The event that opens the menu when holding the key(s) defined in DEBUG_SYSTEM_HELD_KEYS.
|
||||||
|
#define DEBUG_SYSTEM_IN_MENU FALSE // Replaces the overworld debug menu button combination with a start menu entry (above Pokédex).
|
||||||
|
|
||||||
|
// Debug Flags
|
||||||
|
// To use the following debug features, replace the 0s with the flag ID you're assigning it to.
|
||||||
|
// Eg: Replace with FLAG_UNUSED_0x264 so you can use that flag to toggle the feature.
|
||||||
|
#define DEBUG_FLAG_NO_COLLISION 0 // If this flag is set, the debug function in the Utility submenu to disable player collision can be used.
|
||||||
|
|
||||||
|
// Battle Debug Menu
|
||||||
|
#define DEBUG_BATTLE_MENU TRUE // If set to TRUE, enables a debug menu to use in battles by pressing the Select button.
|
||||||
|
|
||||||
|
// Pokémon Debug
|
||||||
|
#define DEBUG_POKEMON_MENU TRUE // Enables a debug menu for pokemon sprites and icons, accessed by pressing SELECT in the summary screen.
|
||||||
|
|
||||||
|
#endif // GUARD_CONFIG_DEBUG_H
|
@ -1,5 +1,5 @@
|
|||||||
#ifndef GUARD_CONSTANTS_ITEM_CONFIG_H
|
#ifndef GUARD_CONFIG_ITEM_H
|
||||||
#define GUARD_CONSTANTS_ITEM_CONFIG_H
|
#define GUARD_CONFIG_ITEM_H
|
||||||
|
|
||||||
// Item config
|
// Item config
|
||||||
#define I_SHINY_CHARM_REROLLS 3 // Amount of re-rolls if the player has the Shiny Charm. Set to 0 to disable Shiny Charm's effects.
|
#define I_SHINY_CHARM_REROLLS 3 // Amount of re-rolls if the player has the Shiny Charm. Set to 0 to disable Shiny Charm's effects.
|
||||||
@ -14,4 +14,4 @@
|
|||||||
#define VAR_LAST_REPEL_LURE_USED 0 // If this var has been assigned, last Repel/Lure used will be saved and the player will get prompted with the vanilla repel YES/NO option, unless I_REPEL_LURE_MENU is set to TRUE.
|
#define VAR_LAST_REPEL_LURE_USED 0 // If this var has been assigned, last Repel/Lure used will be saved and the player will get prompted with the vanilla repel YES/NO option, unless I_REPEL_LURE_MENU is set to TRUE.
|
||||||
#define I_REPEL_LURE_MENU TRUE // If TRUE, the player is able to choose which Repel/Lure to use once the previous one runs out. Cursor position is saved by VAR_LAST_REPEL_LURE_USED if not 0.
|
#define I_REPEL_LURE_MENU TRUE // If TRUE, the player is able to choose which Repel/Lure to use once the previous one runs out. Cursor position is saved by VAR_LAST_REPEL_LURE_USED if not 0.
|
||||||
|
|
||||||
#endif // GUARD_CONSTANTS_ITEM_CONFIG_H
|
#endif // GUARD_CONFIG_ITEM_H
|
13
include/config/overworld.h
Normal file
13
include/config/overworld.h
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
#ifndef GUARD_CONFIG_OVERWORLD_H
|
||||||
|
#define GUARD_CONFIG_OVERWORLD_H
|
||||||
|
|
||||||
|
// Movement config
|
||||||
|
#define OW_RUNNING_INDOORS GEN_LATEST // In Gen4+, players are allowed to run indoors.
|
||||||
|
|
||||||
|
// Overworld flags
|
||||||
|
// To use the following features in scripting, replace the 0s with the flag ID you're assigning it to.
|
||||||
|
// Eg: Replace with FLAG_UNUSED_0x264 so you can use that flag to toggle the feature.
|
||||||
|
#define OW_FLAG_NO_ENCOUNTER 0 // If this flag is set, wild encounters will be disabled.
|
||||||
|
#define OW_FLAG_NO_TRAINER_SEE 0 // If this flag is set, trainers will not battle the player unless they're talked to.
|
||||||
|
|
||||||
|
#endif // GUARD_CONFIG_OVERWORLD_H
|
@ -1,5 +1,5 @@
|
|||||||
#ifndef GUARD_CONSTANTS_POKEMON_CONFIG_H
|
#ifndef GUARD_CONFIG_POKEMON_H
|
||||||
#define GUARD_CONSTANTS_POKEMON_CONFIG_H
|
#define GUARD_CONFIG_POKEMON_H
|
||||||
|
|
||||||
#define P_UPDATED_TYPES GEN_LATEST // Since Gen 6, several Pokémon were changed to be partially or fully Fairy type.
|
#define P_UPDATED_TYPES GEN_LATEST // Since Gen 6, several Pokémon were changed to be partially or fully Fairy type.
|
||||||
#define P_UPDATED_STATS GEN_LATEST // Since Gen 6, Pokémon stats are updated with each passing generation.
|
#define P_UPDATED_STATS GEN_LATEST // Since Gen 6, Pokémon stats are updated with each passing generation.
|
||||||
@ -10,6 +10,12 @@
|
|||||||
#define P_KADABRA_EVERSTONE GEN_LATEST // Since Gen 4, Kadabra can evolve even when holding an Everstone.
|
#define P_KADABRA_EVERSTONE GEN_LATEST // Since Gen 4, Kadabra can evolve even when holding an Everstone.
|
||||||
#define P_NIDORAN_M_DITTO_BREED GEN_LATEST // Since Gen 5, when Nidoran♂ breeds with Ditto it can produce Nidoran♀ offspring. Before, it would only yield male offspring. This change also applies to Volbeat.
|
#define P_NIDORAN_M_DITTO_BREED GEN_LATEST // Since Gen 5, when Nidoran♂ breeds with Ditto it can produce Nidoran♀ offspring. Before, it would only yield male offspring. This change also applies to Volbeat.
|
||||||
|
|
||||||
|
// Flag settings
|
||||||
|
// To use the following features in scripting, replace the 0s with the flag ID you're assigning it to.
|
||||||
|
// Eg: Replace with FLAG_UNUSED_0x264 so you can use that flag to toggle the feature.
|
||||||
|
#define P_FLAG_FORCE_SHINY 0 // If this flag is set, all wild and gift Pokémon will forced into being Shiny.
|
||||||
|
#define P_FLAG_FORCE_NO_SHINY 0 // If this flag is set, all wild and gift Pokémon will forced into NOT being Shiny.
|
||||||
|
|
||||||
// Modifying the latest generation WILL change the saveblock due to Dex flags and will require a new save file.
|
// Modifying the latest generation WILL change the saveblock due to Dex flags and will require a new save file.
|
||||||
// Forms are kept based on the base species, Eg: Meowth and Persian will keep all of their forms, but Perrserker will not be available if P_GEN_8_POKEMON is set to FALSE.
|
// Forms are kept based on the base species, Eg: Meowth and Persian will keep all of their forms, but Perrserker will not be available if P_GEN_8_POKEMON is set to FALSE.
|
||||||
// If you're disabling a generation previous to others (eg: Gen 5 but not Gen 6, 7 and 8),
|
// If you're disabling a generation previous to others (eg: Gen 5 but not Gen 6, 7 and 8),
|
||||||
@ -20,6 +26,4 @@
|
|||||||
#define P_GEN_7_POKEMON TRUE // Generation 7 Pokémon (SM, USUM, LGPE)
|
#define P_GEN_7_POKEMON TRUE // Generation 7 Pokémon (SM, USUM, LGPE)
|
||||||
#define P_GEN_8_POKEMON TRUE // Generation 8 Pokémon (SwSh, BDSP, LA)
|
#define P_GEN_8_POKEMON TRUE // Generation 8 Pokémon (SwSh, BDSP, LA)
|
||||||
|
|
||||||
#define P_ENABLE_DEBUG TRUE // Enables a debug menu for pokemon sprites and icons, accessed by pressing SELECT in the summary screen.
|
#endif // GUARD_CONFIG_POKEMON_H
|
||||||
|
|
||||||
#endif // GUARD_CONSTANTS_POKEMON_CONFIG_H
|
|
@ -1,8 +1,11 @@
|
|||||||
#ifndef GUARD_CONSTANTS_GLOBAL_H
|
#ifndef GUARD_CONSTANTS_GLOBAL_H
|
||||||
#define GUARD_CONSTANTS_GLOBAL_H
|
#define GUARD_CONSTANTS_GLOBAL_H
|
||||||
|
|
||||||
#include "constants/battle_config.h"
|
#include "config/battle.h"
|
||||||
#include "constants/overworld_config.h"
|
#include "config/debug.h"
|
||||||
|
#include "config/item.h"
|
||||||
|
#include "config/pokemon.h"
|
||||||
|
#include "config/overworld.h"
|
||||||
|
|
||||||
// Invalid Versions show as "----------" in Gen 4 and Gen 5's summary screen.
|
// Invalid Versions show as "----------" in Gen 4 and Gen 5's summary screen.
|
||||||
// In Gens 6 and 7, invalid versions instead show "a distant land" in the summary screen.
|
// In Gens 6 and 7, invalid versions instead show "a distant land" in the summary screen.
|
||||||
|
@ -1,20 +0,0 @@
|
|||||||
#ifndef GUARD_CONSTANTS_OVERWORLD_CONFIG_H
|
|
||||||
#define GUARD_CONSTANTS_OVERWORLD_CONFIG_H
|
|
||||||
|
|
||||||
// Movement config
|
|
||||||
#define OW_RUNNING_INDOORS GEN_LATEST // In Gen4+, players are allowed to run indoors.
|
|
||||||
|
|
||||||
// Overworld flags
|
|
||||||
#define OW_FLAG_NO_ENCOUNTER 0 // If this flag is set, wild encounters will be disabled.
|
|
||||||
#define OW_FLAG_NO_TRAINER_SEE 0 // If this flag is set, trainers will not battle the player unless they're talked to.
|
|
||||||
|
|
||||||
// Debug options
|
|
||||||
#define DEBUG_SYSTEM_ENABLE TRUE // Enables a overworld debug menu for changing flags, variables, giving pokemon and more, accessed by holding R and pressing START while in the overworld by default.
|
|
||||||
#define DEBUG_SYSTEM_HELD_KEYS (R_BUTTON) // The keys required to be held to open the debug menu.
|
|
||||||
#define DEBUG_SYSTEM_TRIGGER_EVENT pressedStartButton // The event that opens the menu when holding the key(s) defined in DEBUG_SYSTEM_HELD_KEYS.
|
|
||||||
#define DEBUG_SYSTEM_IN_MENU FALSE // Replaces the overworld debug menu button combination with a start menu entry (above Pokédex).
|
|
||||||
|
|
||||||
// Replace the used flags with others or disable with a 0
|
|
||||||
#define DEBUG_FLAG_NO_COLLISION 0 // If this flag is set, the debug function in the Utility submenu to disable player collision can be used.
|
|
||||||
|
|
||||||
#endif // GUARD_CONSTANTS_OVERWORLD_CONFIG_H
|
|
@ -1,7 +1,6 @@
|
|||||||
#ifndef GUARD_CONSTANTS_POKEDEX_H
|
#ifndef GUARD_CONSTANTS_POKEDEX_H
|
||||||
#define GUARD_CONSTANTS_POKEDEX_H
|
#define GUARD_CONSTANTS_POKEDEX_H
|
||||||
|
|
||||||
#include "constants/pokemon_config.h"
|
|
||||||
// National Pokedex order.
|
// National Pokedex order.
|
||||||
// These constants are NOT disabled by P_GEN_X_POKEMON to keep pokedex_orders.h clean.
|
// These constants are NOT disabled by P_GEN_X_POKEMON to keep pokedex_orders.h clean.
|
||||||
enum {
|
enum {
|
||||||
|
@ -1,8 +1,6 @@
|
|||||||
#ifndef GUARD_CONSTANTS_SPECIES_H
|
#ifndef GUARD_CONSTANTS_SPECIES_H
|
||||||
#define GUARD_CONSTANTS_SPECIES_H
|
#define GUARD_CONSTANTS_SPECIES_H
|
||||||
|
|
||||||
#include "constants/pokemon_config.h"
|
|
||||||
|
|
||||||
#define SPECIES_NONE 0
|
#define SPECIES_NONE 0
|
||||||
#define SPECIES_BULBASAUR 1
|
#define SPECIES_BULBASAUR 1
|
||||||
#define SPECIES_IVYSAUR 2
|
#define SPECIES_IVYSAUR 2
|
||||||
|
@ -1,8 +1,6 @@
|
|||||||
#ifndef GUARD_DEBUG_H
|
#ifndef GUARD_DEBUG_H
|
||||||
#define GUARD_DEBUG_H
|
#define GUARD_DEBUG_H
|
||||||
|
|
||||||
#include "constants/overworld_config.h"
|
|
||||||
|
|
||||||
void Debug_ShowMainMenu(void);
|
void Debug_ShowMainMenu(void);
|
||||||
|
|
||||||
#endif // GUARD_DEBUG_H
|
#endif // GUARD_DEBUG_H
|
||||||
|
@ -2,7 +2,6 @@
|
|||||||
#define GUARD_ITEM_H
|
#define GUARD_ITEM_H
|
||||||
|
|
||||||
#include "constants/item.h"
|
#include "constants/item.h"
|
||||||
#include "constants/item_config.h"
|
|
||||||
|
|
||||||
typedef void (*ItemUseFunc)(u8);
|
typedef void (*ItemUseFunc)(u8);
|
||||||
|
|
||||||
|
@ -3,10 +3,7 @@
|
|||||||
|
|
||||||
extern u8 gUnusedPokedexU8;
|
extern u8 gUnusedPokedexU8;
|
||||||
extern void (*gPokedexVBlankCB)(void);
|
extern void (*gPokedexVBlankCB)(void);
|
||||||
|
|
||||||
#if P_ENABLE_DEBUG == TRUE
|
|
||||||
extern const u8 *const gMonFootprintTable[];
|
extern const u8 *const gMonFootprintTable[];
|
||||||
#endif
|
|
||||||
|
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
|
|
||||||
#include "sprite.h"
|
#include "sprite.h"
|
||||||
#include "constants/region_map_sections.h"
|
#include "constants/region_map_sections.h"
|
||||||
#include "constants/pokemon_config.h"
|
|
||||||
#include "constants/map_groups.h"
|
#include "constants/map_groups.h"
|
||||||
|
|
||||||
#define GET_BASE_SPECIES_ID(speciesId) (GetFormSpeciesId(speciesId, 0))
|
#define GET_BASE_SPECIES_ID(speciesId) (GetFormSpeciesId(speciesId, 0))
|
||||||
@ -327,7 +326,6 @@ struct BaseStats
|
|||||||
u16 flags;
|
u16 flags;
|
||||||
};
|
};
|
||||||
|
|
||||||
#include "constants/battle_config.h"
|
|
||||||
struct BattleMove
|
struct BattleMove
|
||||||
{
|
{
|
||||||
u16 effect;
|
u16 effect;
|
||||||
|
@ -17,7 +17,6 @@
|
|||||||
#include "sprite.h"
|
#include "sprite.h"
|
||||||
#include "task.h"
|
#include "task.h"
|
||||||
#include "constants/battle_anim.h"
|
#include "constants/battle_anim.h"
|
||||||
#include "constants/battle_config.h"
|
|
||||||
#include "constants/moves.h"
|
#include "constants/moves.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -36,11 +36,7 @@ static void CreateBattlerTrace(struct Task *task, u8 taskId);
|
|||||||
|
|
||||||
EWRAM_DATA static union AffineAnimCmd *sAnimTaskAffineAnim = NULL;
|
EWRAM_DATA static union AffineAnimCmd *sAnimTaskAffineAnim = NULL;
|
||||||
|
|
||||||
#if P_ENABLE_DEBUG == TRUE
|
|
||||||
const struct UCoords8 sBattlerCoords[][MAX_BATTLERS_COUNT] =
|
const struct UCoords8 sBattlerCoords[][MAX_BATTLERS_COUNT] =
|
||||||
#else
|
|
||||||
static const struct UCoords8 sBattlerCoords[][MAX_BATTLERS_COUNT] =
|
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
{ // Single battle
|
{ // Single battle
|
||||||
{ 72, 80 },
|
{ 72, 80 },
|
||||||
@ -65,11 +61,7 @@ const struct MonCoords gCastformFrontSpriteCoords[NUM_CASTFORM_FORMS] =
|
|||||||
[CASTFORM_ICE] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 },
|
[CASTFORM_ICE] = { .size = MON_COORDS_SIZE(64, 48), .y_offset = 8 },
|
||||||
};
|
};
|
||||||
|
|
||||||
#if P_ENABLE_DEBUG == TRUE
|
|
||||||
const u8 sCastformElevations[NUM_CASTFORM_FORMS] =
|
const u8 sCastformElevations[NUM_CASTFORM_FORMS] =
|
||||||
#else
|
|
||||||
static const u8 sCastformElevations[NUM_CASTFORM_FORMS] =
|
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
[CASTFORM_NORMAL] = 13,
|
[CASTFORM_NORMAL] = 13,
|
||||||
[CASTFORM_FIRE] = 14,
|
[CASTFORM_FIRE] = 14,
|
||||||
|
@ -26,17 +26,6 @@
|
|||||||
#include "constants/trainers.h"
|
#include "constants/trainers.h"
|
||||||
#include "constants/battle_anim.h"
|
#include "constants/battle_anim.h"
|
||||||
|
|
||||||
#if !P_ENABLE_DEBUG
|
|
||||||
struct BattleBackground
|
|
||||||
{
|
|
||||||
const void *tileset;
|
|
||||||
const void *tilemap;
|
|
||||||
const void *entryTileset;
|
|
||||||
const void *entryTilemap;
|
|
||||||
const void *palette;
|
|
||||||
};
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// .rodata
|
// .rodata
|
||||||
static const u16 sUnrefArray[] = {0x0300, 0x0000}; //OamData?
|
static const u16 sUnrefArray[] = {0x0300, 0x0000}; //OamData?
|
||||||
|
|
||||||
@ -602,11 +591,7 @@ const struct WindowTemplate * const gBattleWindowTemplates[] =
|
|||||||
[B_WIN_TYPE_ARENA] = sBattleArenaWindowTemplates,
|
[B_WIN_TYPE_ARENA] = sBattleArenaWindowTemplates,
|
||||||
};
|
};
|
||||||
|
|
||||||
#if P_ENABLE_DEBUG == TRUE
|
|
||||||
const struct BattleBackground sBattleTerrainTable[] =
|
const struct BattleBackground sBattleTerrainTable[] =
|
||||||
#else
|
|
||||||
static const struct BattleBackground sBattleTerrainTable[] =
|
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
[BATTLE_TERRAIN_GRASS] =
|
[BATTLE_TERRAIN_GRASS] =
|
||||||
{
|
{
|
||||||
|
@ -30,7 +30,6 @@
|
|||||||
#include "util.h"
|
#include "util.h"
|
||||||
#include "window.h"
|
#include "window.h"
|
||||||
#include "constants/battle_anim.h"
|
#include "constants/battle_anim.h"
|
||||||
#include "constants/battle_config.h"
|
|
||||||
#include "constants/items.h"
|
#include "constants/items.h"
|
||||||
#include "constants/moves.h"
|
#include "constants/moves.h"
|
||||||
#include "constants/party_menu.h"
|
#include "constants/party_menu.h"
|
||||||
@ -330,7 +329,7 @@ static void HandleInputChooseAction(void)
|
|||||||
{
|
{
|
||||||
SwapHpBarsWithHpText();
|
SwapHpBarsWithHpText();
|
||||||
}
|
}
|
||||||
#if B_ENABLE_DEBUG == TRUE
|
#if DEBUG_BATTLE_MENU == TRUE
|
||||||
else if (JOY_NEW(SELECT_BUTTON))
|
else if (JOY_NEW(SELECT_BUTTON))
|
||||||
{
|
{
|
||||||
BtlController_EmitTwoReturnValues(BUFFER_B, B_ACTION_DEBUG, 0);
|
BtlController_EmitTwoReturnValues(BUFFER_B, B_ACTION_DEBUG, 0);
|
||||||
|
@ -23,7 +23,6 @@
|
|||||||
#include "palette.h"
|
#include "palette.h"
|
||||||
#include "contest.h"
|
#include "contest.h"
|
||||||
#include "constants/songs.h"
|
#include "constants/songs.h"
|
||||||
#include "constants/battle_config.h"
|
|
||||||
#include "constants/rgb.h"
|
#include "constants/rgb.h"
|
||||||
#include "constants/battle_palace.h"
|
#include "constants/battle_palace.h"
|
||||||
|
|
||||||
@ -78,11 +77,7 @@ static const struct CompressedSpriteSheet sSpriteSheets_HealthBar[MAX_BATTLERS_C
|
|||||||
{gBlankGfxCompressed, 0x0120, TAG_HEALTHBAR_OPPONENT2_TILE}
|
{gBlankGfxCompressed, 0x0120, TAG_HEALTHBAR_OPPONENT2_TILE}
|
||||||
};
|
};
|
||||||
|
|
||||||
#if P_ENABLE_DEBUG == TRUE
|
|
||||||
const struct SpritePalette sSpritePalettes_HealthBoxHealthBar[2] =
|
const struct SpritePalette sSpritePalettes_HealthBoxHealthBar[2] =
|
||||||
#else
|
|
||||||
static const struct SpritePalette sSpritePalettes_HealthBoxHealthBar[2] =
|
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
{gBattleInterface_BallStatusBarPal, TAG_HEALTHBOX_PAL},
|
{gBattleInterface_BallStatusBarPal, TAG_HEALTHBOX_PAL},
|
||||||
{gBattleInterface_BallDisplayPal, TAG_HEALTHBAR_PAL}
|
{gBattleInterface_BallDisplayPal, TAG_HEALTHBAR_PAL}
|
||||||
|
@ -31,7 +31,6 @@
|
|||||||
#include "constants/battle_anim.h"
|
#include "constants/battle_anim.h"
|
||||||
#include "constants/rgb.h"
|
#include "constants/rgb.h"
|
||||||
#include "constants/songs.h"
|
#include "constants/songs.h"
|
||||||
#include "constants/battle_config.h"
|
|
||||||
#include "constants/items.h"
|
#include "constants/items.h"
|
||||||
|
|
||||||
enum
|
enum
|
||||||
|
@ -52,7 +52,6 @@
|
|||||||
#include "wild_encounter.h"
|
#include "wild_encounter.h"
|
||||||
#include "window.h"
|
#include "window.h"
|
||||||
#include "constants/abilities.h"
|
#include "constants/abilities.h"
|
||||||
#include "constants/battle_config.h"
|
|
||||||
#include "constants/battle_move_effects.h"
|
#include "constants/battle_move_effects.h"
|
||||||
#include "constants/battle_string_ids.h"
|
#include "constants/battle_string_ids.h"
|
||||||
#include "constants/hold_effects.h"
|
#include "constants/hold_effects.h"
|
||||||
|
@ -17,7 +17,6 @@
|
|||||||
#include "constants/battle_frontier.h"
|
#include "constants/battle_frontier.h"
|
||||||
#include "constants/frontier_util.h"
|
#include "constants/frontier_util.h"
|
||||||
#include "constants/abilities.h"
|
#include "constants/abilities.h"
|
||||||
#include "constants/battle_config.h"
|
|
||||||
#include "constants/layouts.h"
|
#include "constants/layouts.h"
|
||||||
#include "constants/rgb.h"
|
#include "constants/rgb.h"
|
||||||
#include "constants/trainers.h"
|
#include "constants/trainers.h"
|
||||||
|
@ -37,7 +37,6 @@
|
|||||||
#include "wild_encounter.h"
|
#include "wild_encounter.h"
|
||||||
#include "rtc.h"
|
#include "rtc.h"
|
||||||
#include "party_menu.h"
|
#include "party_menu.h"
|
||||||
#include "constants/battle_config.h"
|
|
||||||
#include "battle_arena.h"
|
#include "battle_arena.h"
|
||||||
#include "battle_pike.h"
|
#include "battle_pike.h"
|
||||||
#include "battle_pyramid.h"
|
#include "battle_pyramid.h"
|
||||||
|
@ -34,7 +34,6 @@
|
|||||||
#include "field_weather.h"
|
#include "field_weather.h"
|
||||||
#include "constants/abilities.h"
|
#include "constants/abilities.h"
|
||||||
#include "constants/battle_anim.h"
|
#include "constants/battle_anim.h"
|
||||||
#include "constants/battle_config.h"
|
|
||||||
#include "constants/battle_move_effects.h"
|
#include "constants/battle_move_effects.h"
|
||||||
#include "constants/battle_script_commands.h"
|
#include "constants/battle_script_commands.h"
|
||||||
#include "constants/battle_string_ids.h"
|
#include "constants/battle_string_ids.h"
|
||||||
@ -7975,7 +7974,7 @@ u32 GetBattlerHoldEffect(u8 battlerId, bool32 checkNegating)
|
|||||||
|
|
||||||
gPotentialItemEffectBattler = battlerId;
|
gPotentialItemEffectBattler = battlerId;
|
||||||
|
|
||||||
#if B_ENABLE_DEBUG == TRUE
|
#if DEBUG_BATTLE_MENU == TRUE
|
||||||
if (gBattleStruct->debugHoldEffects[battlerId] != 0 && gBattleMons[battlerId].item)
|
if (gBattleStruct->debugHoldEffects[battlerId] != 0 && gBattleMons[battlerId].item)
|
||||||
return gBattleStruct->debugHoldEffects[battlerId];
|
return gBattleStruct->debugHoldEffects[battlerId];
|
||||||
else
|
else
|
||||||
@ -9779,8 +9778,8 @@ bool32 CanMegaEvolve(u8 battlerId)
|
|||||||
// Check if there is an entry in the evolution table for regular Mega Evolution.
|
// Check if there is an entry in the evolution table for regular Mega Evolution.
|
||||||
if (GetMegaEvolutionSpecies(species, itemId) != SPECIES_NONE)
|
if (GetMegaEvolutionSpecies(species, itemId) != SPECIES_NONE)
|
||||||
{
|
{
|
||||||
#if B_ENABLE_DEBUG == TRUE
|
#if DEBUG_BATTLE_MENU == TRUE
|
||||||
if (B_ENABLE_DEBUG && gBattleStruct->debugHoldEffects[battlerId])
|
if (gBattleStruct->debugHoldEffects[battlerId])
|
||||||
holdEffect = gBattleStruct->debugHoldEffects[battlerId];
|
holdEffect = gBattleStruct->debugHoldEffects[battlerId];
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
|
@ -31,7 +31,6 @@
|
|||||||
#include "constants/battle_anim.h"
|
#include "constants/battle_anim.h"
|
||||||
#include "constants/rgb.h"
|
#include "constants/rgb.h"
|
||||||
#include "battle_debug.h"
|
#include "battle_debug.h"
|
||||||
#include "constants/battle_config.h"
|
|
||||||
#include "data.h"
|
#include "data.h"
|
||||||
#include "pokemon_summary_screen.h"
|
#include "pokemon_summary_screen.h"
|
||||||
#include "constants/songs.h"
|
#include "constants/songs.h"
|
||||||
@ -187,7 +186,7 @@ bool32 IsViableZMove(u8 battlerId, u16 move)
|
|||||||
return FALSE; // Partner has mega evolved or is about to mega evolve
|
return FALSE; // Partner has mega evolved or is about to mega evolve
|
||||||
}
|
}
|
||||||
|
|
||||||
#if B_ENABLE_DEBUG == TRUE
|
#if DEBUG_BATTLE_MENU == TRUE
|
||||||
if (gBattleStruct->debugHoldEffects[battlerId])
|
if (gBattleStruct->debugHoldEffects[battlerId])
|
||||||
holdEffect = gBattleStruct->debugHoldEffects[battlerId];
|
holdEffect = gBattleStruct->debugHoldEffects[battlerId];
|
||||||
else
|
else
|
||||||
|
@ -58,7 +58,7 @@
|
|||||||
#include "constants/species.h"
|
#include "constants/species.h"
|
||||||
#include "constants/weather.h"
|
#include "constants/weather.h"
|
||||||
|
|
||||||
#if DEBUG_SYSTEM_ENABLE == TRUE
|
#if DEBUG_OVERWORLD_MENU == TRUE
|
||||||
// *******************************
|
// *******************************
|
||||||
// Enums
|
// Enums
|
||||||
enum { // Main
|
enum { // Main
|
||||||
@ -3515,4 +3515,4 @@ SOUND_LIST_SE
|
|||||||
};
|
};
|
||||||
#undef X
|
#undef X
|
||||||
|
|
||||||
#endif //DEBUG_SYSTEM_ENABLE == TRUE
|
#endif //DEBUG_OVERWORLD_MENU == TRUE
|
||||||
|
@ -4643,7 +4643,7 @@ u8 GetCollisionAtCoords(struct ObjectEvent *objectEvent, s16 x, s16 y, u32 dir)
|
|||||||
{
|
{
|
||||||
u8 direction = dir;
|
u8 direction = dir;
|
||||||
|
|
||||||
#if DEBUG_SYSTEM_ENABLE == TRUE
|
#if DEBUG_FLAG_NO_COLLISION != 0
|
||||||
if (FlagGet(DEBUG_FLAG_NO_COLLISION))
|
if (FlagGet(DEBUG_FLAG_NO_COLLISION))
|
||||||
return COLLISION_NONE;
|
return COLLISION_NONE;
|
||||||
#endif
|
#endif
|
||||||
|
@ -131,7 +131,7 @@ void FieldGetPlayerInput(struct FieldInput *input, u16 newKeys, u16 heldKeys)
|
|||||||
else if (heldKeys & DPAD_RIGHT)
|
else if (heldKeys & DPAD_RIGHT)
|
||||||
input->dpadDirection = DIR_EAST;
|
input->dpadDirection = DIR_EAST;
|
||||||
|
|
||||||
#if DEBUG_SYSTEM_ENABLE == TRUE && DEBUG_SYSTEM_IN_MENU == FALSE
|
#if DEBUG_OVERWORLD_MENU == TRUE && DEBUG_SYSTEM_IN_MENU == FALSE
|
||||||
if ((heldKeys & DEBUG_SYSTEM_HELD_KEYS) && input->DEBUG_SYSTEM_TRIGGER_EVENT)
|
if ((heldKeys & DEBUG_SYSTEM_HELD_KEYS) && input->DEBUG_SYSTEM_TRIGGER_EVENT)
|
||||||
{
|
{
|
||||||
input->input_field_1_2 = TRUE;
|
input->input_field_1_2 = TRUE;
|
||||||
@ -197,7 +197,7 @@ int ProcessPlayerFieldInput(struct FieldInput *input)
|
|||||||
if (input->pressedSelectButton && UseRegisteredKeyItemOnField() == TRUE)
|
if (input->pressedSelectButton && UseRegisteredKeyItemOnField() == TRUE)
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
||||||
#if DEBUG_SYSTEM_ENABLE == TRUE && DEBUG_SYSTEM_IN_MENU == FALSE
|
#if DEBUG_OVERWORLD_MENU == TRUE && DEBUG_SYSTEM_IN_MENU == FALSE
|
||||||
if (input->input_field_1_2)
|
if (input->input_field_1_2)
|
||||||
{
|
{
|
||||||
PlaySE(SE_WIN_OPEN);
|
PlaySE(SE_WIN_OPEN);
|
||||||
|
@ -39,7 +39,6 @@
|
|||||||
#include "trainer_hill.h"
|
#include "trainer_hill.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
#include "constants/abilities.h"
|
#include "constants/abilities.h"
|
||||||
#include "constants/battle_config.h"
|
|
||||||
#include "constants/battle_frontier.h"
|
#include "constants/battle_frontier.h"
|
||||||
#include "constants/battle_move_effects.h"
|
#include "constants/battle_move_effects.h"
|
||||||
#include "constants/battle_script_commands.h"
|
#include "constants/battle_script_commands.h"
|
||||||
@ -1962,11 +1961,7 @@ const s8 gNatureStatTable[NUM_NATURES][NUM_NATURE_STATS] =
|
|||||||
#include "data/pokemon/form_change_table_pointers.h"
|
#include "data/pokemon/form_change_table_pointers.h"
|
||||||
|
|
||||||
// SPECIES_NONE are ignored in the following two tables, so decrement before accessing these arrays to get the right result
|
// SPECIES_NONE are ignored in the following two tables, so decrement before accessing these arrays to get the right result
|
||||||
#if P_ENABLE_DEBUG == TRUE
|
|
||||||
const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] =
|
const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] =
|
||||||
#else
|
|
||||||
static const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] =
|
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
[SPECIES_BULBASAUR - 1] = ANIM_V_JUMPS_H_JUMPS,
|
[SPECIES_BULBASAUR - 1] = ANIM_V_JUMPS_H_JUMPS,
|
||||||
[SPECIES_IVYSAUR - 1] = ANIM_V_STRETCH,
|
[SPECIES_IVYSAUR - 1] = ANIM_V_STRETCH,
|
||||||
|
@ -39,7 +39,7 @@
|
|||||||
|
|
||||||
#include "constants/items.h"
|
#include "constants/items.h"
|
||||||
|
|
||||||
#if P_ENABLE_DEBUG == TRUE
|
#if DEBUG_POKEMON_MENU == TRUE
|
||||||
extern const struct BattleBackground sBattleTerrainTable[];
|
extern const struct BattleBackground sBattleTerrainTable[];
|
||||||
extern const struct CompressedSpriteSheet gSpriteSheet_EnemyShadow;
|
extern const struct CompressedSpriteSheet gSpriteSheet_EnemyShadow;
|
||||||
extern const struct SpriteTemplate gSpriteTemplate_EnemyShadow;
|
extern const struct SpriteTemplate gSpriteTemplate_EnemyShadow;
|
||||||
|
@ -41,7 +41,6 @@
|
|||||||
#include "text.h"
|
#include "text.h"
|
||||||
#include "tv.h"
|
#include "tv.h"
|
||||||
#include "window.h"
|
#include "window.h"
|
||||||
#include "constants/battle_config.h"
|
|
||||||
#include "constants/battle_move_effects.h"
|
#include "constants/battle_move_effects.h"
|
||||||
#include "constants/items.h"
|
#include "constants/items.h"
|
||||||
#include "constants/moves.h"
|
#include "constants/moves.h"
|
||||||
@ -1640,7 +1639,7 @@ static void Task_HandleInput(u8 taskId)
|
|||||||
PlaySE(SE_SELECT);
|
PlaySE(SE_SELECT);
|
||||||
BeginCloseSummaryScreen(taskId);
|
BeginCloseSummaryScreen(taskId);
|
||||||
}
|
}
|
||||||
#if P_ENABLE_DEBUG == TRUE
|
#if DEBUG_POKEMON_MENU == TRUE
|
||||||
else if (JOY_NEW(SELECT_BUTTON) && !gMain.inBattle)
|
else if (JOY_NEW(SELECT_BUTTON) && !gMain.inBattle)
|
||||||
{
|
{
|
||||||
sMonSummaryScreen->callback = CB2_Debug_Pokemon;
|
sMonSummaryScreen->callback = CB2_Debug_Pokemon;
|
||||||
@ -1648,7 +1647,7 @@ static void Task_HandleInput(u8 taskId)
|
|||||||
PlaySE(SE_SELECT);
|
PlaySE(SE_SELECT);
|
||||||
CloseSummaryScreen(taskId);
|
CloseSummaryScreen(taskId);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -286,7 +286,7 @@ static void BuildStartMenuActions(void)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
#if DEBUG_SYSTEM_ENABLE == TRUE && DEBUG_SYSTEM_IN_MENU == TRUE
|
#if DEBUG_OVERWORLD_MENU == TRUE && DEBUG_SYSTEM_IN_MENU == TRUE
|
||||||
BuildDebugStartMenu();
|
BuildDebugStartMenu();
|
||||||
#else
|
#else
|
||||||
BuildNormalStartMenu();
|
BuildNormalStartMenu();
|
||||||
@ -760,7 +760,7 @@ static bool8 StartMenuDebugCallback(void)
|
|||||||
RemoveExtraStartMenuWindows();
|
RemoveExtraStartMenuWindows();
|
||||||
HideStartMenuDebug(); // Hide start menu without enabling movement
|
HideStartMenuDebug(); // Hide start menu without enabling movement
|
||||||
|
|
||||||
#if DEBUG_SYSTEM_ENABLE == TRUE
|
#if DEBUG_OVERWORLD_MENU == TRUE
|
||||||
FreezeObjectEvents();
|
FreezeObjectEvents();
|
||||||
Debug_ShowMainMenu();
|
Debug_ShowMainMenu();
|
||||||
#endif
|
#endif
|
||||||
|
@ -18,7 +18,6 @@
|
|||||||
#include "battle_pike.h"
|
#include "battle_pike.h"
|
||||||
#include "battle_pyramid.h"
|
#include "battle_pyramid.h"
|
||||||
#include "constants/abilities.h"
|
#include "constants/abilities.h"
|
||||||
#include "constants/battle_config.h"
|
|
||||||
#include "constants/game_stat.h"
|
#include "constants/game_stat.h"
|
||||||
#include "constants/item.h"
|
#include "constants/item.h"
|
||||||
#include "constants/items.h"
|
#include "constants/items.h"
|
||||||
|
Loading…
Reference in New Issue
Block a user