atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tidy up header files

Browse source
This commit is contained in:
Slawter666 2018-11-13 22:28:46 +00:00
parent 1d46507110
commit 6fcf878e2f
9 changed files with 126 additions and 132 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/event_scripts.s
View file

@ -1,6 +1,6 @@
#include "constants/battle_frontier.h" #include "constants/battle_frontier.h"
#include "constants/flags.h"
#include "constants/field_effects.h" #include "constants/field_effects.h"
#include "constants/flags.h"
#include "constants/items.h" #include "constants/items.h"
#include "constants/heal_locations.h" #include "constants/heal_locations.h"
#include "constants/maps.h" #include "constants/maps.h"

2
include/battle_controllers.h
View file

@ -1,8 +1,6 @@
#ifndef GUARD_BATTLE_CONTROLLERS_H #ifndef GUARD_BATTLE_CONTROLLERS_H
#define GUARD_BATTLE_CONTROLLERS_H #define GUARD_BATTLE_CONTROLLERS_H
#include "battle.h"
enum enum
{ {
REQUEST_ALL_BATTLE, REQUEST_ALL_BATTLE,

2
include/battle_interface.h
View file

@ -1,8 +1,6 @@
#ifndef GUARD_BATTLE_INTERFACE_H #ifndef GUARD_BATTLE_INTERFACE_H
#define GUARD_BATTLE_INTERFACE_H #define GUARD_BATTLE_INTERFACE_H
#include "battle_controllers.h"
enum enum
{ {
HP_CURRENT, HP_CURRENT,

50
include/event_scripts.h
View file

@ -528,4 +528,54 @@ extern const u8 MauvilleCity_PokemonCenter_1F_Text_290097[];
extern const u8 MauvilleCity_PokemonCenter_1F_Text_2900B5[]; extern const u8 MauvilleCity_PokemonCenter_1F_Text_2900B5[];
extern const u8 MauvilleCity_PokemonCenter_1F_Text_2900CB[]; extern const u8 MauvilleCity_PokemonCenter_1F_Text_2900CB[];
extern const u8 EventScript_PlayerPCMale[];
extern const u8 EventScript_PlayerPCFemale[];
extern const u8 EventScript_SecretBasePC[];
extern const u8 EventScript_RecordMixingSecretBasePC[];
extern const u8 EventScript_SecretPower1[];
extern const u8 EventScript_SecretPower2[];
extern const u8 EventScript_PC[];
extern const u8 EventScript_TestSignpostMsg[];
extern const u8 EventScript_HiddenItemScript[];
extern const u8 EventScript_2759F1[];
extern const u8 EventScript_TV[];
extern const u8 EventScript_ClosedSootopolisDoor[];
extern const u8 SkyPillar_Outside_EventScript_2393F9[];
extern const u8 EventScript_CableBoxResults[];
extern const u8 EventScript_2A4BAC[];
extern const u8 Route110_TrickHouseEntrance_EventScript_26A22A[];
extern const u8 EventScript_RegionMap[];
extern const u8 EventScript_RunningShoesManual[];
extern const u8 EventScript_PictureBookShelf[];
extern const u8 EventScript_BookShelf[];
extern const u8 EventScript_PokemonCenterBookshelf[];
extern const u8 EventScript_Vase[];
extern const u8 EventScript_TrashCan[];
extern const u8 EventScript_ShopShelf[];
extern const u8 EventScript_Blueprint[];
extern const u8 EventScript_WirelessBoxResults[];
extern const u8 EventScript_CableBoxResults[];
extern const u8 EventScript_Questionnaire[];
extern const u8 EventScript_TrainerHillTimer[];
extern const u8 EventScript_SecretBaseSandOrnament[];
extern const u8 EventScript_SecretBaseShieldOrToyTV[];
extern const u8 EventScript_UseSurf[];
extern const u8 EventScript_UseWaterfall[];
extern const u8 EventScript_CannotUseWaterfall[];
extern const u8 EventScript_UseDive[];
extern const u8 EventScript_UseDiveUnderwater[];
extern const u8 EventScript_FallDownHole[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8[];
extern const u8 EventScript_Poison[];
extern const u8 EventScript_EggHatch[];
extern const u8 gUnknown_08273D1F[];
extern const u8 IslandCave_EventScript_238EAF[];
extern const u8 MauvilleCity_EventScript_1DF7BA[];
extern const u8 Route119_EventScript_1F49EC[];
extern const u8 LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6[];
extern const u8 RustboroCity_Gym_EventScript_21307B[];
extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_224175[];
extern const u8 SSTidalCorridor_EventScript_23C050[];
extern const u8 gUnknown_082A8350[];
#endif //GUARD_EVENT_SCRIPTS_H #endif //GUARD_EVENT_SCRIPTS_H

2
include/main.h
View file

@ -1,8 +1,6 @@
#ifndef GUARD_MAIN_H #ifndef GUARD_MAIN_H
#define GUARD_MAIN_H #define GUARD_MAIN_H
#include "global.h"
typedef void (*MainCallback)(void); typedef void (*MainCallback)(void);
typedef void (*IntrCallback)(void); typedef void (*IntrCallback)(void);
typedef void (*IntrFunc)(void); typedef void (*IntrFunc)(void);

23
src/battle_anim.c
View file

@ -1,21 +1,22 @@
#include "global.h" #include "global.h"
#include "battle.h" #include "battle.h"
#include "battle_anim.h" #include "battle_anim.h"
#include "constants/battle_anim.h" #include "battle_controllers.h"
#include "sprite.h"
#include "contest.h"
#include "m4a.h"
#include "pokemon.h"
#include "battle_interface.h" #include "battle_interface.h"
#include "task.h"
#include "decompress.h"
#include "sound.h"
#include "graphics.h"
#include "dma3.h"
#include "bg.h" #include "bg.h"
#include "contest.h"
#include "decompress.h"
#include "dma3.h"
#include "gpu_regs.h" #include "gpu_regs.h"
#include "palette.h" #include "graphics.h"
#include "main.h" #include "main.h"
#include "m4a.h"
#include "palette.h"
#include "pokemon.h"
#include "sound.h"
#include "sprite.h"
#include "task.h"
#include "constants/battle_anim.h"
#define ANIM_SPRITE_INDEX_COUNT 8 #define ANIM_SPRITE_INDEX_COUNT 8

91
src/battle_main.c
View file

@ -1,59 +1,58 @@
#include "global.h" #include "global.h"
#include "battle.h" #include "battle.h"
#include "recorded_battle.h" #include "battle_ai_script_commands.h"
#include "main.h" #include "battle_arena.h"
#include "load_save.h" #include "battle_controllers.h"
#include "gpu_regs.h"
#include "scanline_effect.h"
#include "battle_setup.h"
#include "battle_scripts.h"
#include "battle_interface.h" #include "battle_interface.h"
#include "pokemon.h" #include "battle_message.h"
#include "palette.h" #include "battle_scripts.h"
#include "task.h" #include "battle_setup.h"
#include "event_data.h" #include "battle_tower.h"
#include "constants/species.h"
#include "berry.h" #include "berry.h"
#include "text.h"
#include "item.h"
#include "constants/items.h"
#include "constants/hold_effects.h"
#include "constants/trainers.h"
#include "link.h"
#include "link_rfu.h"
#include "bg.h" #include "bg.h"
#include "dma3.h" #include "dma3.h"
#include "string_util.h"
#include "malloc.h"
#include "event_data.h"
#include "m4a.h"
#include "window.h"
#include "random.h"
#include "constants/songs.h"
#include "sound.h"
#include "battle_message.h"
#include "sprite.h"
#include "util.h"
#include "trig.h"
#include "battle_ai_script_commands.h"
#include "constants/battle_move_effects.h"
#include "battle_controllers.h"
#include "pokedex.h"
#include "constants/abilities.h"
#include "constants/moves.h"
#include "constants/rgb.h"
#include "evolution_scene.h"
#include "roamer.h"
#include "tv.h"
#include "safari_zone.h"
#include "constants/battle_string_ids.h"
#include "data2.h" #include "data2.h"
#include "decompress.h" #include "decompress.h"
#include "event_data.h"
#include "evolution_scene.h"
#include "gpu_regs.h"
#include "international_string_util.h" #include "international_string_util.h"
#include "pokeball.h" #include "item.h"
#include "link.h"
#include "link_rfu.h"
#include "load_save.h"
#include "main.h"
#include "malloc.h"
#include "m4a.h"
#include "palette.h"
#include "party_menu.h" #include "party_menu.h"
#include "battle_tower.h" #include "pokeball.h"
#include "battle_arena.h" #include "pokedex.h"
#include "pokemon.h"
#include "random.h"
#include "recorded_battle.h"
#include "roamer.h"
#include "safari_zone.h"
#include "scanline_effect.h"
#include "sound.h"
#include "sprite.h"
#include "string_util.h"
#include "task.h"
#include "text.h"
#include "trig.h"
#include "tv.h"
#include "util.h"
#include "window.h"
#include "constants/abilities.h"
#include "constants/battle_move_effects.h"
#include "constants/battle_string_ids.h"
#include "constants/hold_effects.h"
#include "constants/items.h"
#include "constants/moves.h"
#include "constants/rgb.h"
#include "constants/trainers.h"
#include "constants/songs.h"
#include "constants/species.h"
struct UnknownPokemonStruct4 struct UnknownPokemonStruct4
{ {

34
src/battle_pyramid_bag.c
View file

@ -1,35 +1,35 @@
#include "global.h" #include "global.h"
#include "battle_pyramid_bag.h" #include "battle.h"
#include "main.h"
#include "battle_controllers.h" #include "battle_controllers.h"
#include "battle_pyramid_bag.h"
#include "bg.h" #include "bg.h"
#include "decompress.h"
#include "event_data.h"
#include "field_effect.h" #include "field_effect.h"
#include "field_weather.h" #include "field_weather.h"
#include "graphics.h"
#include "gpu_regs.h" #include "gpu_regs.h"
#include "international_string_util.h"
#include "item.h"
#include "item_icon.h"
#include "item_menu.h"
#include "item_use.h"
#include "list_menu.h"
#include "mail.h"
#include "main.h"
#include "malloc.h" #include "malloc.h"
#include "menu.h" #include "menu.h"
#include "overworld.h"
#include "menu_helpers.h" #include "menu_helpers.h"
#include "overworld.h" #include "overworld.h"
#include "palette.h" #include "palette.h"
#include "party_menu.h" #include "party_menu.h"
#include "task.h"
#include "text_window.h"
#include "scanline_effect.h" #include "scanline_effect.h"
#include "script.h" #include "script.h"
#include "task.h"
#include "decompress.h"
#include "graphics.h"
#include "string_util.h"
#include "list_menu.h"
#include "strings.h"
#include "item.h"
#include "sound.h" #include "sound.h"
#include "item_menu.h" #include "string_util.h"
#include "mail.h" #include "strings.h"
#include "item_use.h"
#include "event_data.h"
#include "text_window.h"
#include "international_string_util.h"
#include "item_icon.h"
#include "constants/items.h" #include "constants/items.h"
#include "constants/rgb.h" #include "constants/rgb.h"
#include "constants/songs.h" #include "constants/songs.h"

52
src/field_control_avatar.c
View file

@ -5,6 +5,7 @@
#include "daycare.h" #include "daycare.h"
#include "event_data.h" #include "event_data.h"
#include "event_object_movement.h" #include "event_object_movement.h"
#include "event_scripts.h"
#include "fieldmap.h" #include "fieldmap.h"
#include "field_control_avatar.h" #include "field_control_avatar.h"
#include "field_fadetransition.h" #include "field_fadetransition.h"
@ -37,57 +38,6 @@ static EWRAM_DATA u16 sPreviousPlayerMetatileBehavior = 0;
u8 gSelectedEventObject; u8 gSelectedEventObject;
//scripts
extern const u8 EventScript_PlayerPCMale[];
extern const u8 EventScript_PlayerPCFemale[];
extern const u8 EventScript_SecretBasePC[];
extern const u8 EventScript_RecordMixingSecretBasePC[];
extern const u8 EventScript_SecretPower1[];
extern const u8 EventScript_SecretPower2[];
extern const u8 EventScript_PC[];
extern const u8 EventScript_TestSignpostMsg[];
extern const u8 EventScript_HiddenItemScript[];
extern const u8 EventScript_2759F1[];
extern const u8 EventScript_TV[];
extern const u8 EventScript_ClosedSootopolisDoor[];
extern const u8 SkyPillar_Outside_EventScript_2393F9[];
extern const u8 EventScript_CableBoxResults[];
extern const u8 EventScript_2A4BAC[];
extern const u8 Route110_TrickHouseEntrance_EventScript_26A22A[];
extern const u8 EventScript_RegionMap[];
extern const u8 EventScript_RunningShoesManual[];
extern const u8 EventScript_PictureBookShelf[];
extern const u8 EventScript_BookShelf[];
extern const u8 EventScript_PokemonCenterBookshelf[];
extern const u8 EventScript_Vase[];
extern const u8 EventScript_TrashCan[];
extern const u8 EventScript_ShopShelf[];
extern const u8 EventScript_Blueprint[];
extern const u8 EventScript_WirelessBoxResults[];
extern const u8 EventScript_CableBoxResults[];
extern const u8 EventScript_Questionnaire[];
extern const u8 EventScript_TrainerHillTimer[];
extern const u8 EventScript_SecretBaseSandOrnament[];
extern const u8 EventScript_SecretBaseShieldOrToyTV[];
extern const u8 EventScript_UseSurf[];
extern const u8 EventScript_UseWaterfall[];
extern const u8 EventScript_CannotUseWaterfall[];
extern const u8 EventScript_UseDive[];
extern const u8 EventScript_UseDiveUnderwater[];
extern const u8 EventScript_FallDownHole[];
extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8[];
extern const u8 EventScript_Poison[];
extern const u8 EventScript_EggHatch[];
extern const u8 gUnknown_08273D1F[];
extern const u8 IslandCave_EventScript_238EAF[];
extern const u8 MauvilleCity_EventScript_1DF7BA[];
extern const u8 Route119_EventScript_1F49EC[];
extern const u8 LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6[];
extern const u8 RustboroCity_Gym_EventScript_21307B[];
extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_224175[];
extern const u8 SSTidalCorridor_EventScript_23C050[];
extern const u8 gUnknown_082A8350[];
static void GetPlayerPosition(struct MapPosition *); static void GetPlayerPosition(struct MapPosition *);
static void GetInFrontOfPlayerPosition(struct MapPosition *); static void GetInFrontOfPlayerPosition(struct MapPosition *);
static u16 GetPlayerCurMetatileBehavior(int); static u16 GetPlayerCurMetatileBehavior(int);