diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_anim.h | 16 | ||||
| -rw-r--r-- | include/graphics.h | 6 | ||||
| -rw-r--r-- | include/random.h | 2 |
3 files changed, 18 insertions, 6 deletions
diff --git a/include/battle_anim.h b/include/battle_anim.h index e987457c7..eacb51f2c 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -218,6 +218,7 @@ void SetSpriteNextToMonHead(u8 battler, struct Sprite* sprite); void sub_80A2F0C(u8 taskId); // battle_anim_effects_2.c +extern const union AffineAnimCmd *const gGrowingRingAffineAnimTable[]; void sub_80A6E48(struct Sprite *); void sub_80A6E98(struct Sprite *); void sub_80A6F8C(struct Sprite *); @@ -345,7 +346,6 @@ void LaunchStatusAnimation(u8 battlerId, u8 statusAnimId); // battle_anim_mons.c extern const struct MonCoords gCastformFrontSpriteCoords[]; - u8 GetBattlerSpriteCoord(u8 battlerId, u8 coordType); u8 GetBattlerSpriteCoord2(u8 battlerId, u8 coordType); u8 GetBattlerSpriteDefault_Y(u8 battlerId); @@ -447,7 +447,7 @@ void sub_8076F58(struct Sprite *sprite); void sub_8076FD0(struct Sprite *sprite); void sub_8077030(u8 taskId); void sub_807729C(struct Sprite *sprite); -void sub_8077350(struct Sprite *sprite); +void AnimWeatherBallDown(struct Sprite *sprite); // battle_anim_mon_movement.c void AnimTask_ShakeMon(u8 taskId); @@ -467,6 +467,7 @@ void sub_8099BD4(u8 taskId); // normal.c extern const struct SpriteTemplate gUnknown_83E7C98; extern const struct SpriteTemplate gBasicHitSplatSpriteTemplate; +extern const struct SpriteTemplate gWaterHitSplatSpriteTemplate; u32 UnpackSelectedBattleAnimPalettes(s16 selector); void AnimTask_CurseBlendEffect(u8 taskId); void sub_80B9CE4(u8 taskId); @@ -478,7 +479,7 @@ void sub_80BA47C(u8 taskId); // ground.c void sub_80B8E94(u8 taskId); void sub_80B90EC(u8 taskId); -void sub_80B94B4(u8 taskId); +void AnimTask_HorizontalShake(u8 taskId); void AnimTask_IsPowerOver99(u8 taskId); void sub_80B9800(u8 taskId); @@ -527,10 +528,14 @@ void sub_80B194C(u8 taskId); void sub_80B1D3C(struct Sprite *sprite); void sub_80B2868(u8 taskId); +// poison.c +extern const union AffineAnimCmd *const gAffineAnims_Droplet[]; + // fighting.c void sub_80B1530(u8 taskId); // ice.c +extern const union AnimCmd *const gAnims_SmallBubblePair[]; void AnimTask_Haze1(u8 taskId); void AnimTask_LoadMistTiles(u8 taskId); void AnimTask_Hail1(u8 taskId); @@ -546,15 +551,14 @@ void sub_80AEFA0(u8 taskId); // fire.c extern const union AnimCmd *const gUnknown_83E5D48[]; - void sub_80ACEA4(u8 taskId); void sub_80ADAD8(u8 taskId); void AnimTask_BlendBackground(u8 taskId); void sub_80AD800(u8 taskId); // water.s -extern const union AnimCmd *const gUnknown_83E5958[]; -extern const union AnimCmd *const gUnknown_83E5A78[]; +extern const union AnimCmd *const gAnims_WaterMudOrb[]; +extern const union AnimCmd *const gAnims_WaterBubble[]; void AnimWaterPulseRing(struct Sprite *sprite); // smokescreen.s diff --git a/include/graphics.h b/include/graphics.h index 40a41b87e..35ef29391 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4241,6 +4241,7 @@ extern const u32 gBattleAnimBgImage_Cosmic[]; extern const u32 gBattleAnimBgImage_InAir[]; extern const u32 gBattleAnimBgImage_Aurora[]; extern const u32 gBattleAnimBgImage_Fissure[]; +extern const u32 gBattleAnimBgImage_Surf[]; extern const u32 gBattleAnimBgPalette_Dark[]; extern const u32 gBattleAnimBgPalette_Ghost[]; extern const u32 gBattleAnimBgPalette_Psychic[]; @@ -4252,11 +4253,13 @@ extern const u32 gBattleAnimBgPalette_Guillotine[]; extern const u32 gBattleAnimBgPalette_Ice[]; extern const u32 gBattleAnimBgPalette_Cosmic[]; extern const u32 gBattleAnimBgPalette_InAir[]; +extern const u32 gBattleAnimBgPalette_MuddyWater[]; extern const u32 gBattleAnimBgPalette_Sky[]; extern const u32 gBattleAnimBgPalette_Aurora[]; extern const u32 gBattleAnimBgPalette_Fissure[]; extern const u32 gBattleAnimBgPalette_Bug[]; extern const u32 gBattleAnimBgPalette_Solarbeam[]; +extern const u32 gBattleAnimBgPalette_Surf[]; extern const u32 gBattleAnimBgTilemap_Dark[]; extern const u32 gBattleAnimBgTilemap_Ghost[]; extern const u32 gBattleAnimBgTilemap_Psychic[]; @@ -4276,6 +4279,9 @@ extern const u32 gBattleAnimBgTilemap_Cosmic[]; extern const u32 gBattleAnimBgTilemap_InAir[]; extern const u32 gBattleAnimBgTilemap_Aurora[]; extern const u32 gBattleAnimBgTilemap_Fissure[]; +extern const u32 gBattleAnimBgTilemap_SurfOpponent[]; +extern const u32 gBattleAnimBgTilemap_SurfPlayer[]; +extern const u32 gBattleAnimBgTilemap_SurfContest[]; // dark extern const u32 gMetalShineGfx[]; diff --git a/include/random.h b/include/random.h index 139316f9d..1eaff3245 100644 --- a/include/random.h +++ b/include/random.h @@ -13,6 +13,8 @@ u16 Random2(void); //Returns a 32-bit pseudorandom number #define Random32() (Random() | (Random() << 16)) +#define ISO_RANDOMIZE2(val)(1103515245 * (val) + 12345) + //Sets the initial seed value of the pseudorandom number generator void SeedRng(u16 seed); void SeedRng2(u16 seed); |