diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 15 | ||||
| -rw-r--r-- | include/battle_anim.h | 17 | ||||
| -rw-r--r-- | include/contest.h | 2 | ||||
| -rw-r--r-- | include/gba/io_reg.h | 2 | ||||
| -rw-r--r-- | include/graphics.h | 14 | 
5 files changed, 47 insertions, 3 deletions
| diff --git a/include/battle.h b/include/battle.h index 90bef24ac..70b1856a8 100644 --- a/include/battle.h +++ b/include/battle.h @@ -660,7 +660,7 @@ struct MonSpritesGfx      u8 field_F4[0x80];      u8 *barFontGfx;      void *field_178; -    void *field_17C; +    u16 *field_17C;  };  // All battle variables are declared in battle_main.c @@ -769,4 +769,17 @@ extern u8 gMultiUsePlayerCursor;  extern u8 gNumberOfMovesToChoose;  extern u8 gUnknown_03005D7C[MAX_BATTLERS_COUNT]; +extern u16 gBattle_WIN0H; +extern u16 gBattle_WIN0V; +extern u16 gBattle_WIN1H; +extern u16 gBattle_WIN1V; +extern u16 gBattle_BG0_X; +extern u16 gBattle_BG0_Y; +extern u16 gBattle_BG1_X; +extern u16 gBattle_BG1_Y; +extern u16 gBattle_BG2_X; +extern u16 gBattle_BG2_Y; +extern u16 gBattle_BG3_X; +extern u16 gBattle_BG3_Y; +  #endif // GUARD_BATTLE_H diff --git a/include/battle_anim.h b/include/battle_anim.h index 653be10b8..e164cef7a 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -9,7 +9,7 @@ enum      BG_ANIM_SCREEN_SIZE,      BG_ANIM_AREA_OVERFLOW_MODE,      BG_ANIM2, -    BG_ANIM3, +    BG_ANIM_CHAR_BASE_BLOCK,      BG_ANIM_PRIORITY,      BG_ANIM_5,      BG_ANIM_6 @@ -64,6 +64,7 @@ s8 BattleAnimAdjustPanning2(s8 pan);  s16 KeepPanInRange(s16 a);  s16 CalculatePanIncrement(s16 sourcePan, s16 targetPan, s16 incrementPan);  void sub_80A4720(u16 a, u16 *b, u32 c, u8 d); +void sub_80A477C(bool8);  // battle_anim_80FE840.s  void SetAnimBgAttribute(u8 bgId, u8 attributeId, u8 value); @@ -87,6 +88,15 @@ void obj_id_set_rotscale(u8 spriteId, s16 xScale, s16 yScale, u16 rotation);  void sub_80A6E14(struct Sprite *sprite);  void sub_80A7270(u8 spriteId, u8 objMode);  void sub_80A73A0(u8 spriteId); +u32 sub_80A75AC(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u8 a7); +u32 sub_80A76C4(u8 a1, u8 a2, u8 a3, u8 a4); +u8 sub_80A77AC(u8 a1); +s16 duplicate_obj_of_side_rel2move_in_transparent_mode(u8); +void obj_delete_but_dont_free_vram(struct Sprite*); +u8 sub_80A89C8(int, u8, int); +void sub_80A6D60(struct UnknownAnimStruct2*, const void*, u32); +void sub_80A6CC0(u32, const void*, u32); +void sub_80A6DAC(bool8);  enum  { @@ -127,6 +137,11 @@ u8 ItemIdToBallId(u16 itemId);  u8 LaunchBallStarsTask(u8 x, u8 y, u8 kindOfStars, u8 arg3, u8 ballId);  u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 battlerId, u32 arg2, u8 ballId); +// battle_anim_utility_funcs.s +void sub_8116EB4(u8); + +u32 sub_811583C(s16); +  u8 GetBattlerSpriteFinal_Y(u8, u16, u8);  extern const struct OamData gUnknown_08524944; diff --git a/include/contest.h b/include/contest.h index d62d33ab7..502d44b90 100644 --- a/include/contest.h +++ b/include/contest.h @@ -239,7 +239,7 @@ struct Shared18000  struct ContestStruct_field_18  { -    u16 unk0; +    u16 species;      u16 unk2;      u8 unk4_0:1;      u8 unk5; diff --git a/include/gba/io_reg.h b/include/gba/io_reg.h index 03faa1a87..c20b69886 100644 --- a/include/gba/io_reg.h +++ b/include/gba/io_reg.h @@ -565,12 +565,14 @@  #define WINOUT_WIN01_BG1    (1 << 1)  #define WINOUT_WIN01_BG2    (1 << 2)  #define WINOUT_WIN01_BG3    (1 << 3) +#define WINOUT_WIN01_BG_ALL (WINOUT_WIN01_BG0 | WINOUT_WIN01_BG1 | WINOUT_WIN01_BG2 | WINOUT_WIN01_BG3)  #define WINOUT_WIN01_OBJ    (1 << 4)  #define WINOUT_WIN01_CLR    (1 << 5)  #define WINOUT_WINOBJ_BG0   (1 << 8)  #define WINOUT_WINOBJ_BG1   (1 << 9)  #define WINOUT_WINOBJ_BG2   (1 << 10)  #define WINOUT_WINOBJ_BG3   (1 << 11) +#define WINOUT_WINOBJ_BG_ALL (WINOUT_WINOBJ_BG0 | WINOUT_WINOBJ_BG1 | WINOUT_WINOBJ_BG2 | WINOUT_WINOBJ_BG3)  #define WINOUT_WINOBJ_OBJ   (1 << 12)  #define WINOUT_WINOBJ_CLR   (1 << 13) diff --git a/include/graphics.h b/include/graphics.h index a2c86a67d..a3af44ad7 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4697,6 +4697,20 @@ extern const u32 gBattleAnimBackgroundTilemap_17[];  extern const u32 gBattleAnimBackgroundTilemap_20[];  extern const u32 gBattleAnimBackgroundTilemap_21[]; +extern const u32 gUnknown_08C20668[]; +extern const u32 gUnknown_08C20684[]; +extern const u32 gBattleStatMask_Gfx[]; +extern const u32 gBattleStatMask1_Tilemap[]; +extern const u32 gBattleStatMask2_Tilemap[]; +extern const u32 gBattleStatMask1_Pal[]; +extern const u32 gBattleStatMask2_Pal[]; +extern const u32 gBattleStatMask3_Pal[]; +extern const u32 gBattleStatMask4_Pal[]; +extern const u32 gBattleStatMask5_Pal[]; +extern const u32 gBattleStatMask6_Pal[]; +extern const u32 gBattleStatMask7_Pal[]; +extern const u32 gBattleStatMask8_Pal[]; +  extern const u32 gUnknown_08D9A88C[];  extern const u32 gContestMiscGfx[];  extern const u32 gContestAudienceGfx[]; | 
