diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_anim.h | 10 | ||||
| -rw-r--r-- | include/gba/io_reg.h | 1 | ||||
| -rw-r--r-- | include/graphics.h | 5 |
3 files changed, 16 insertions, 0 deletions
diff --git a/include/battle_anim.h b/include/battle_anim.h index 09eeefb44..b5bdd05ce 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -74,6 +74,7 @@ extern struct OamData gOamData_83ACB18; extern struct OamData gOamData_83ACB38; extern struct OamData gOamData_83ACA18; extern struct OamData gOamData_83ACB20; +extern struct OamData gOamData_83ACB50; void ClearBattleAnimationVars(void); void DoMoveAnim(u16 move); @@ -102,6 +103,9 @@ void sub_80BCEF4(s32 bgId, u8 arg1, u8 arg2, u8 battlerPosition, u8 arg4, u8 *ar // battle_anim_special.s void sub_80F1720(u8 battler, struct Pokemon *mon); +// battle_anim_effects_1.s +void AnimMoveTwisterParticle(struct Sprite *sprite); + enum { BATTLER_COORD_X, @@ -302,6 +306,12 @@ void sub_80B63B4(u8 taskId); void sub_80B68C8(u8 taskId); void sub_80B6BBC(u8 taskId); +// rock.c +void AnimTask_LoadSandstormBackground(u8 taskId); +void sub_80B4BD0(u8 taskId); +void AnimTask_GetSeismicTossDamageLevel(u8 taskId); +void sub_80B5188(u8 taskId); +void sub_80B51EC(u8 taskId); // flying.s void sub_80B1D3C(struct Sprite *sprite); diff --git a/include/gba/io_reg.h b/include/gba/io_reg.h index 2eefb2482..6d54bc5fb 100644 --- a/include/gba/io_reg.h +++ b/include/gba/io_reg.h @@ -596,6 +596,7 @@ // BLDALPHA #define BLDALPHA_BLEND(target1, target2) (((target2) << 8) | (target1)) +#define BLDALPHA_BLEND2(target1, target2) ((target1) | ((target2) << 8)) // SOUNDCNT_H #define SOUND_CGB_MIX_QUARTER 0x0000 diff --git a/include/graphics.h b/include/graphics.h index 492b21893..1c0612fd1 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -986,6 +986,11 @@ extern const u32 gFile_graphics_battle_anims_backgrounds_scary_face_sheet[]; extern const u32 gFile_graphics_battle_anims_backgrounds_scary_face_palette[]; extern const u32 gFile_graphics_battle_anims_backgrounds_scary_face_player_tilemap[]; +// rock +extern const u32 gFile_graphics_battle_anims_backgrounds_sandstorm_brew_tilemap[]; +extern const u32 gFile_graphics_battle_anims_backgrounds_sandstorm_brew_sheet[]; +extern const u32 gBattleAnimSpritePal_FlyingDirt[]; + // title_screen extern const u16 gGraphics_TitleScreen_PokemonFireRedLogoPals[]; extern const u8 gGraphics_TitleScreen_PokemonFireRedLogoTiles[]; |