diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_anim.h | 7 | ||||
| -rw-r--r-- | include/berry_blender.h | 1 | ||||
| -rw-r--r-- | include/data2.h | 1 | ||||
| -rw-r--r-- | include/decoration.h | 2 | ||||
| -rw-r--r-- | include/gba/defines.h | 1 | ||||
| -rw-r--r-- | include/global.h | 1 | ||||
| -rw-r--r-- | include/graphics.h | 7 | ||||
| -rw-r--r-- | include/overworld.h | 1 | ||||
| -rw-r--r-- | include/pokemon_menu.h | 1 | ||||
| -rw-r--r-- | include/shop.h | 1 |
10 files changed, 16 insertions, 7 deletions
diff --git a/include/battle_anim.h b/include/battle_anim.h index 4f79dfc93..71a61f175 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -31,13 +31,6 @@ enum BATTLER_COORD_ATTR_RAW_BOTTOM, }; -struct BattleAnimBackground -{ - void *image; - void *palette; - void *tilemap; -}; - struct UnknownStruct1 { u8 unk0; diff --git a/include/berry_blender.h b/include/berry_blender.h index 8aaf934e5..d03dff728 100644 --- a/include/berry_blender.h +++ b/include/berry_blender.h @@ -2,5 +2,6 @@ #define GUARD_BERRY_BLENDER_H void debug_sub_80524BC(void); +void sub_804E990(void); #endif //GUARD_BERRY_BLENDER_H diff --git a/include/data2.h b/include/data2.h index 593d04480..ed23a10ce 100644 --- a/include/data2.h +++ b/include/data2.h @@ -2,6 +2,7 @@ #define GUARD_DATA2_H #include "sprite.h" +#include "battle.h" struct ScanlineEffectParams; diff --git a/include/decoration.h b/include/decoration.h index 7676c0add..62a8aafa0 100644 --- a/include/decoration.h +++ b/include/decoration.h @@ -2,6 +2,8 @@ #define GUARD_DECORATION_H #include "task.h" +#include "menu.h" +#include "menu_helpers.h" enum DecorPerm { /* diff --git a/include/gba/defines.h b/include/gba/defines.h index e53ccfccf..71de1275c 100644 --- a/include/gba/defines.h +++ b/include/gba/defines.h @@ -6,6 +6,7 @@ #define TRUE 1 #define FALSE 0 +#define BSS_DATA __attribute__((section(".bss"))) #define IWRAM_DATA __attribute__((section("iwram_data"))) #define EWRAM_DATA __attribute__((section("ewram_data"))) #define UNUSED __attribute__((unused)) diff --git a/include/global.h b/include/global.h index 7fd7e902a..1ccc92bb1 100644 --- a/include/global.h +++ b/include/global.h @@ -3,6 +3,7 @@ #include <string.h> #include <stdlib.h> +#include <limits.h> #include "config.h" // we need to define config before gba headers as print stuff needs the functions nulled before defines. #include "gba/gba.h" diff --git a/include/graphics.h b/include/graphics.h index 1912a2399..e14aa72d5 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -1,6 +1,13 @@ #ifndef GUARD_GRAPHICS_H #define GUARD_GRAPHICS_H +struct BattleAnimBackground +{ + void *image; + void *palette; + void *tilemap; +}; + // data/graphics.s extern const u8 gInterfaceGfx_PokeBall[]; extern const u8 gInterfacePal_PokeBall[]; diff --git a/include/overworld.h b/include/overworld.h index 9d00194be..5d9d474ea 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -211,5 +211,6 @@ void sub_805465C(void); void CB2_InitTestMenu(void); void debug_sub_8058C00(void); +void sub_80546B8(void); #endif // GUARD_ROM4_H diff --git a/include/pokemon_menu.h b/include/pokemon_menu.h index 099c3a3bc..e5c0b2110 100644 --- a/include/pokemon_menu.h +++ b/include/pokemon_menu.h @@ -48,5 +48,6 @@ void sub_808B0C0(u8 taskID); void sub_808B508(u8); void sub_808B564(void); void debug_sub_80986AC(void); +void sub_808A3F8(void); #endif // GUARD_POKEMON_MENU_H diff --git a/include/shop.h b/include/shop.h index 4de58eaf2..4483ebfe1 100644 --- a/include/shop.h +++ b/include/shop.h @@ -41,5 +41,6 @@ void Shop_CreatePokemartMenu(u16 *); void Shop_CreateDecorationShop1Menu(u16 *); void Shop_CreateDecorationShop2Menu(u16 *); void Shop_RunExitSellMenuTask(u8 taskId); +void Shop_FadeReturnToMartMenu(void); #endif // GUARD_SHOP_H |