diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_anim.h | 12 | ||||
| -rw-r--r-- | include/graphics.h | 26 |
2 files changed, 24 insertions, 14 deletions
diff --git a/include/battle_anim.h b/include/battle_anim.h index 5f6f2bf75..806a3141f 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -125,7 +125,7 @@ u8 sub_80A77AC(u8 a1); s16 CloneBattlerSpriteWithBlend(u8); void obj_delete_but_dont_free_vram(struct Sprite*); u8 sub_80A89C8(int, u8, int); -void sub_80A6D60(struct BattleAnimBgData*, const void*, u32); +void AnimLoadCompressedBgTilemapHandleContest(struct BattleAnimBgData*, const void*, u32); void AnimLoadCompressedBgGfx(u32, const u32*, u32); void sub_80A6DAC(bool8); void TranslateSpriteInGrowingCircleOverDuration(struct Sprite *); @@ -285,4 +285,14 @@ extern const struct OamData gOamData_AffineOff_ObjBlend_16x32; extern const struct CompressedSpriteSheet gBattleAnimPicTable[]; extern const struct CompressedSpritePalette gBattleAnimPaletteTable[]; +extern const struct SpriteTemplate gWaterHitSplatSpriteTemplate; + +extern const union AnimCmd *const gAnims_WaterMudOrb[]; +extern const union AnimCmd *const gAnims_BasicFire[]; +extern const union AffineAnimCmd *const gGrowingRingAffineAnimTable[]; +extern const union AffineAnimCmd *const gAffineAnims_Droplet[]; +extern const union AnimCmd *const gAnims_SmallBubblePair[]; +extern const union AnimCmd *const gAnims_WaterBubble[]; +extern const union AffineAnimCmd *const gAffineAnims_Bite[]; + #endif // GUARD_BATTLE_ANIM_H diff --git a/include/graphics.h b/include/graphics.h index 4dba50833..161ef4271 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4634,15 +4634,15 @@ extern const u32 gBattleAnimSpritePal_ThoughtBubble[]; extern const u32 gBattleAnimSpritePal_MagentaHeart[]; extern const u32 gBattleAnimSpritePal_ElectricOrbs[]; extern const u32 gBattleAnimSpritePal_MovementWaves[]; -extern const u32 gUnknown_08C249D0[]; -extern const u32 gUnknown_08C249F8[]; +extern const u32 gBattleAnimBgPalette_ScaryFace[]; +extern const u32 gBattleAnimBgImage_ScaryFace[]; extern const u32 gBattleAnimSpritePal_RedHeart[]; extern const u32 gBattleAnimSpritePal_RedOrb[]; extern const u32 gBattleAnimSpritePal_EyeSparkle[]; extern const u32 gBattleAnimSpritePal_PinkHeart[]; -extern const u32 gUnknown_08C232E0; -extern const u32 gUnknown_08C23D50; -extern const u32 gUnknown_08C23D78; +extern const u32 gBattleAnimBgImage_Attract; +extern const u32 gBattleAnimBgPalette_Attract; +extern const u32 gBattleAnimBgTilemap_Attract; extern const u32 gBattleAnimSpritePal_Angel[]; extern const u32 gBattleAnimSpritePal_Devil[]; extern const u32 gBattleAnimSpritePal_Swipe[]; @@ -4747,9 +4747,9 @@ extern const u32 gBattleAnimBgTilemap_Drill[]; extern const u32 gBattleAnimBgTilemap_DrillContests[]; extern const u32 gBattleAnimBgTilemap_HighspeedOpponent[]; extern const u32 gBattleAnimBgTilemap_HighspeedPlayer[]; -extern const u32 gUnknown_08C2A634[]; -extern const u32 gUnknown_08C2A6D4[]; -extern const u32 gUnknown_08C2A6EC[]; +extern const u32 gBattleAnimMaskImage_LightBeam[]; +extern const u32 gBattleAnimMaskPalette_LightBeam[]; +extern const u32 gBattleAnimMaskTilemap_LightBeam[]; extern const u32 gBattleAnimBgTilemap_Thunder[]; extern const u32 gBattleAnimBgTilemap_GuillotineOpponent[]; extern const u32 gBattleAnimBgTilemap_GuillotinePlayer[]; @@ -4796,9 +4796,9 @@ extern const u32 gContestJudgeGfx[]; extern const u32 gContestJudgeSymbolsGfx[]; extern const u32 gContest3Pal[]; -extern const u32 gUnknown_08D95E00[]; -extern const u32 gUnknown_08D960D0[]; -extern const u32 gUnknown_08D963A4[]; +extern const u32 gBattleAnimBgTilemap_SurfOpponent[]; +extern const u32 gBattleAnimBgTilemap_SurfPlayer[]; +extern const u32 gBattleAnimBgTilemap_SurfContest[]; extern const u32 gBattleAnimBgImage_Surf[]; extern const u32 gBattleAnimBgPalette_Surf[]; extern const u32 gBattleAnimBackgroundImageMuddyWater_Pal[]; @@ -4873,8 +4873,8 @@ extern const u16 gUnknown_08DCF210[]; extern const u16 gUnknown_08DCF230[]; extern const u16 gUnknown_08DCF190[]; -extern const u32 gUnknown_08D8D410[]; -extern const u32 gUnknown_08D8D58C[]; +extern const u32 gBattleAnimBgTilemap_Sandstorm[]; +extern const u32 gBattleAnimBgImage_Sandstorm[]; // Pokedex Area Screen extern const u32 gPokedexAreaScreenAreaUnknown_Gfx[]; |