diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_anim.h | 80 | ||||
| -rw-r--r-- | include/battle_bg.h | 1 |
2 files changed, 80 insertions, 1 deletions
diff --git a/include/battle_anim.h b/include/battle_anim.h index dc2db9cbf..6002cd5ee 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -57,6 +57,7 @@ extern s32 gAnimMoveDmg; extern u16 gAnimBattlerSpecies[MAX_BATTLERS_COUNT]; extern u8 gUnknown_2037F24; +/* extern const struct OamData gOamData_83AC9C8; extern const struct OamData gOamData_83AC9D0; extern const struct OamData gOamData_83AC9D8; @@ -90,6 +91,83 @@ extern const struct OamData gOamData_83ACB60; extern const struct OamData gOamData_83ACB88; extern const struct OamData gOamData_83ACBC0; extern const struct OamData gOamData_83ACBE8; +*/ + +extern const struct OamData gOamData_AffineOff_ObjNormal_8x8; +extern const struct OamData gOamData_AffineOff_ObjNormal_16x16; +extern const struct OamData gOamData_AffineOff_ObjNormal_32x32; +extern const struct OamData gOamData_AffineOff_ObjNormal_64x64; +extern const struct OamData gOamData_AffineOff_ObjNormal_16x8; +extern const struct OamData gOamData_AffineOff_ObjNormal_32x8; +extern const struct OamData gOamData_AffineOff_ObjNormal_32x16; +extern const struct OamData gOamData_AffineOff_ObjNormal_64x32; +extern const struct OamData gOamData_AffineOff_ObjNormal_8x16; +extern const struct OamData gOamData_AffineOff_ObjNormal_8x32; +extern const struct OamData gOamData_AffineOff_ObjNormal_16x32; +extern const struct OamData gOamData_AffineOff_ObjNormal_32x64; +extern const struct OamData gOamData_AffineNormal_ObjNormal_8x8; +extern const struct OamData gOamData_AffineNormal_ObjNormal_16x16; +extern const struct OamData gOamData_AffineNormal_ObjNormal_32x32; +extern const struct OamData gOamData_AffineNormal_ObjNormal_64x64; +extern const struct OamData gOamData_AffineNormal_ObjNormal_16x8; +extern const struct OamData gOamData_AffineNormal_ObjNormal_32x8; +extern const struct OamData gOamData_AffineNormal_ObjNormal_32x16; +extern const struct OamData gOamData_AffineNormal_ObjNormal_64x32; +extern const struct OamData gOamData_AffineNormal_ObjNormal_8x16; +extern const struct OamData gOamData_AffineNormal_ObjNormal_8x32; +extern const struct OamData gOamData_AffineNormal_ObjNormal_16x32; +extern const struct OamData gOamData_AffineNormal_ObjNormal_32x64; +extern const struct OamData gOamData_AffineDouble_ObjNormal_8x8; +extern const struct OamData gOamData_AffineDouble_ObjNormal_16x16; +extern const struct OamData gOamData_AffineDouble_ObjNormal_32x32; +extern const struct OamData gOamData_AffineDouble_ObjNormal_64x64; +extern const struct OamData gOamData_AffineDouble_ObjNormal_16x8; +extern const struct OamData gOamData_AffineDouble_ObjNormal_32x8; +extern const struct OamData gOamData_AffineDouble_ObjNormal_32x16; +extern const struct OamData gOamData_AffineDouble_ObjNormal_64x32; +extern const struct OamData gOamData_AffineDouble_ObjNormal_8x16; +extern const struct OamData gOamData_AffineDouble_ObjNormal_8x32; +extern const struct OamData gOamData_AffineDouble_ObjNormal_16x32; +extern const struct OamData gOamData_AffineDouble_ObjNormal_32x64; +extern const struct OamData gOamData_AffineOff_ObjBlend_8x8; +extern const struct OamData gOamData_AffineOff_ObjBlend_16x16; +extern const struct OamData gOamData_AffineOff_ObjBlend_32x32; +extern const struct OamData gOamData_AffineOff_ObjBlend_64x64; +extern const struct OamData gOamData_AffineOff_ObjBlend_16x8; +extern const struct OamData gOamData_AffineOff_ObjBlend_32x8; +extern const struct OamData gOamData_AffineOff_ObjBlend_32x16; +extern const struct OamData gOamData_AffineOff_ObjBlend_64x32; +extern const struct OamData gOamData_AffineOff_ObjBlend_8x16; +extern const struct OamData gOamData_AffineOff_ObjBlend_8x32; +extern const struct OamData gOamData_AffineOff_ObjBlend_16x32; +extern const struct OamData gOamData_AffineOff_ObjBlend_32x64; +extern const struct OamData gOamData_AffineNormal_ObjBlend_8x8; +extern const struct OamData gOamData_AffineNormal_ObjBlend_16x16; +extern const struct OamData gOamData_AffineNormal_ObjBlend_32x32; +extern const struct OamData gOamData_AffineNormal_ObjBlend_64x64; +extern const struct OamData gOamData_AffineNormal_ObjBlend_16x8; +extern const struct OamData gOamData_AffineNormal_ObjBlend_32x8; +extern const struct OamData gOamData_AffineNormal_ObjBlend_32x16; +extern const struct OamData gOamData_AffineNormal_ObjBlend_64x32; +extern const struct OamData gOamData_AffineNormal_ObjBlend_8x16; +extern const struct OamData gOamData_AffineNormal_ObjBlend_8x32; +extern const struct OamData gOamData_AffineNormal_ObjBlend_16x32; +extern const struct OamData gOamData_AffineNormal_ObjBlend_32x64; +extern const struct OamData gOamData_AffineDouble_ObjBlend_8x8; +extern const struct OamData gOamData_AffineDouble_ObjBlend_16x16; +extern const struct OamData gOamData_AffineDouble_ObjBlend_32x32; +extern const struct OamData gOamData_AffineDouble_ObjBlend_64x64; +extern const struct OamData gOamData_AffineDouble_ObjBlend_16x8; +extern const struct OamData gOamData_AffineDouble_ObjBlend_32x8; +extern const struct OamData gOamData_AffineDouble_ObjBlend_32x16; +extern const struct OamData gOamData_AffineDouble_ObjBlend_64x32; +extern const struct OamData gOamData_AffineDouble_ObjBlend_8x16; +extern const struct OamData gOamData_AffineDouble_ObjBlend_8x32; +extern const struct OamData gOamData_AffineDouble_ObjBlend_16x32; +extern const struct OamData gOamData_AffineDouble_ObjBlend_32x64; + +extern const struct CompressedSpriteSheet gBattleAnimPicTable[]; +extern const struct CompressedSpritePalette gBattleAnimPaletteTable[]; // battle_anim.c void MoveBattlerSpriteToBG(u8 battlerId, u8); @@ -107,7 +185,7 @@ s8 BattleAnimAdjustPanning2(s8 pan); s16 CalculatePanIncrement(s16 sourcePan, s16 targetPan, s16 incrementPan); bool8 IsBattlerSpriteVisible(u8 battlerId); s16 KeepPanInRange(s16 a, s32 oldPan); -void sub_80730C0(u16, const u16 *, s32, u8); +void sub_80730C0(u16, u16 *, s32, u8); // battle_intro.c void SetAnimBgAttribute(u8 bgId, u8 attributeId, u8 value); diff --git a/include/battle_bg.h b/include/battle_bg.h index 61c106b64..60a6de8f5 100644 --- a/include/battle_bg.h +++ b/include/battle_bg.h @@ -11,5 +11,6 @@ void sub_800F6FC(u8 taskId); void LoadBattleMenuWindowGfx(void); void LoadBattleTextboxAndBackground(void); void sub_800F324(void); +void DrawMainBattleBackground(void); #endif // GUARD_BATTLE_BG_H |