diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 2 | ||||
| -rw-r--r-- | include/battle_anim.h | 48 | ||||
| -rw-r--r-- | include/contest.h | 1 | ||||
| -rw-r--r-- | include/graphics.h | 21 | ||||
| -rwxr-xr-x | include/math_util.h | 14 | ||||
| -rw-r--r-- | include/scanline_effect.h | 1 |
6 files changed, 62 insertions, 25 deletions
diff --git a/include/battle.h b/include/battle.h index c06bdaad5..52c4ee8ae 100644 --- a/include/battle.h +++ b/include/battle.h @@ -623,7 +623,7 @@ struct BattleHealthboxInfo u8 battlerBounceSpriteId; u8 animationState; u8 field_5; - u8 field_6; + u8 matrixNum; u8 shadowSpriteId; u8 field_8; u8 field_9; diff --git a/include/battle_anim.h b/include/battle_anim.h index e6540630a..b25822992 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -76,8 +76,8 @@ int GetAnimBgAttribute(u8 bgId, u8 attributeId); // battle_anim_80A5C6C.s void sub_80A6450(struct Sprite *sprite); void SetAverageBattlerPositions(u8 battlerId, bool8 a2, s16 *x, s16 *y); -void move_anim_8074EE0(struct Sprite *sprite); -void sub_80A656C(struct Sprite *sprite); +void DestroySpriteAndMatrix(struct Sprite *sprite); +void TranslateAnimLinearSimple(struct Sprite *sprite); void InitAnimSpritePos(struct Sprite *sprite, u8 a2); void sub_80A6980(struct Sprite *sprite, bool8 a2); void StartAnimLinearTranslation(struct Sprite *sprite); @@ -88,11 +88,11 @@ void sub_80A8EE4(struct Sprite *sprite); u8 GetBattlerSpriteCoord2(u8 battlerId, u8 attributeId); void sub_80A6FD4(struct Sprite *sprite); u16 ArcTan2Neg(s16 a, s16 b); -void sub_80A73E0(struct Sprite *sprite, bool8 a2, s16 xScale, s16 yScale, u16 rotation); -void sub_80A67BC(struct Sprite *sprite); +void TrySetSpriteRotScale(struct Sprite *sprite, bool8 a2, s16 xScale, s16 yScale, u16 rotation); +void RunStoredCallbackWhenAffineAnimEnds(struct Sprite *sprite); void sub_80A66DC(struct Sprite *sprite); -void sub_80A6838(struct Sprite *sprite); -void sub_80A67D8(struct Sprite *sprite); +void SetSpriteCoordsToAnimAttackerCoords(struct Sprite *sprite); +void RunStoredCallbackWhenAnimEnds(struct Sprite *sprite); void sub_80A6864(struct Sprite *sprite, s16 a2); s16 sub_80A861C(u8 battlerId, u8 a2); u8 GetBattlerYCoordWithElevation(u8 battlerId); @@ -101,32 +101,32 @@ void sub_80A7938(struct Sprite *sprite); void InitAnimLinearTranslation(struct Sprite *sprite); void sub_80A6F98(struct Sprite *sprite); u8 sub_80A8328(u8 battlerId); -void *sub_80A8050(s16 bottom, s16 top); -void sub_80A8048(s16 *bottom, s16 *top, const void *ptr); +void *LoadPointerFromVars(s16 bottom, s16 top); +void StorePointerInVars(s16 *bottom, s16 *top, const void *ptr); void sub_80A8278(void); void sub_80A6B30(struct UnknownAnimStruct2*); void sub_80A6B90(struct UnknownAnimStruct2*, u32 arg1); -u8 GetBattlerSubpriority(u8 battlerId); +u8 GetBattlerSpriteSubpriority(u8 battlerId); bool8 TranslateAnimArc(struct Sprite *sprite); void sub_80A6630(struct Sprite *sprite); void sub_80A6680(struct Sprite *sprite); -void sub_80A7344(u8 spriteId); -void obj_id_set_rotscale(u8 spriteId, s16 xScale, s16 yScale, u16 rotation); +void ResetSpriteRotScale(u8 spriteId); +void SetSpriteRotScale(u8 spriteId, s16 xScale, s16 yScale, u16 rotation); void InitSpriteDataForLinearTranslation(struct Sprite *sprite); -void sub_80A7270(u8 spriteId, u8 objMode); -void sub_80A73A0(u8 spriteId); +void PrepareBattlerSpriteForRotScale(u8 spriteId, u8 objMode); +void SetBattlerSpriteYOffsetFromRotation(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); +s16 CloneBattlerSpriteWithBlend(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); -void sub_80A634C(struct Sprite *); +void TranslateSpriteInGrowingCircleOverDuration(struct Sprite *); void sub_80A653C(struct Sprite *); -void sub_80A7E6C(u8 spriteId); +void SetBattlerSpriteYOffsetFromYScale(u8 spriteId); void sub_80A805C(struct Task *task, u8 a2, s16 a3, s16 a4, s16 a5, s16 a6, u16 a7); u8 sub_80A80C8(struct Task *task); void sub_80A8EE4(struct Sprite *); @@ -138,14 +138,25 @@ void sub_80A70C0(struct Sprite *sprite); void TranslateMonBGUntil(struct Sprite *sprite); void TranslateSpriteOverDuration(struct Sprite *sprite); void sub_80A77C8(struct Sprite *sprite); +void sub_80A7000(struct Sprite *sprite); +void TranslateSpriteInCircleOverDuration(struct Sprite *sprite); +void SetGreyscaleOrOriginalPalette(u16 a1, bool8 a2); +void PrepareAffineAnimInTaskData(struct Task *task, u8 spriteId, const union AffineAnimCmd *affineAnimCmds); +bool8 RunAffineAnimFromTaskData(struct Task *task); +void sub_80A78AC(struct Sprite *sprite); +void sub_80A6BFC(struct UnknownAnimStruct2 *unk, u8 unused); +u8 sub_80A8394(u16 species, bool8 isBackpic, u8 a3, s16 x, s16 y, u8 subpriority, u32 personality, u32 trainerId, u32 battlerId, u32 a10); +void sub_80A749C(struct Sprite *sprite); +void sub_80A6814(u8 taskId); +void sub_80A8610(struct Sprite *sprite); enum { BATTLER_COORD_X, BATTLER_COORD_Y, BATTLER_COORD_X_2, - BATTLER_COORD_3, - BATTLER_COORD_4, + BATTLER_COORD_Y_PIC_OFFSET, + BATTLER_COORD_Y_PIC_OFFSET_DEFAULT, }; u8 GetBattlerSpriteCoord(u8 battlerId, u8 attributeId); @@ -179,6 +190,7 @@ u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 battlerId, u32 selectedPalettes, // battle_anim_utility_funcs.s void sub_8116EB4(u8); +void sub_8117854(u8 taskId, int unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5, u8 arg6, u8 arg7, const u8 *arg8, const u8 *arg9, const u16 *palette); u32 UnpackSelectedBattleAnimPalettes(s16); diff --git a/include/contest.h b/include/contest.h index c205737ee..6ce563b46 100644 --- a/include/contest.h +++ b/include/contest.h @@ -416,7 +416,6 @@ extern struct ContestResources *gContestResources; #define eContestAI (gContestResources->field_C) #define shared19328 (*gContestResources->field_10) #define shared19338 (*gContestResources->field_14) -#define shared19348 (*gContestResources->field_18) #define shared15800 (gHeap + 0x18000) #define shared18000 (*(struct Shared18000 *)(gHeap + 0x1a000)) diff --git a/include/graphics.h b/include/graphics.h index 924d2d58e..f92ab05f6 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4154,6 +4154,8 @@ extern const u32 gBattleAnimSpriteSheet_050[]; extern const u32 gBattleAnimSpriteSheet_051[]; extern const u32 gBattleAnimSpriteSheet_052[]; extern const u32 gBattleAnimSpriteSheet_053[]; +extern const u32 gUnknown_08C2EA50[]; +extern const u32 gUnknown_08C2EA9C[]; extern const u32 gBattleAnimSpriteSheet_054[]; extern const u32 gBattleAnimSpriteSheet_055[]; extern const u32 gBattleAnimSpriteSheet_056[]; @@ -4372,6 +4374,9 @@ extern const u32 gBattleAnimSpriteSheet_280[]; extern const u32 gBattleAnimSpriteSheet_281[]; extern const u32 gBattleAnimSpriteSheet_282[]; extern const u32 gBattleAnimSpriteSheet_283[]; +extern const u32 gBattleAnimBackgroundTilemap_ScaryFacePlayer[]; +extern const u32 gBattleAnimBackgroundTilemap_ScaryFaceOpponent[]; +extern const u32 gBattleAnimBackgroundTilemap_ScaryFaceContest[]; extern const u32 gBattleAnimSpriteSheet_284[]; extern const u32 gBattleAnimSpriteSheet_285[]; @@ -4584,10 +4589,15 @@ extern const u32 gBattleAnimSpritePalette_209[]; extern const u32 gBattleAnimSpritePalette_210[]; extern const u32 gBattleAnimSpritePalette_211[]; extern const u32 gBattleAnimSpritePalette_215[]; +extern const u32 gUnknown_08C249D0[]; +extern const u32 gUnknown_08C249F8[]; extern const u32 gBattleAnimSpritePalette_216[]; extern const u32 gBattleAnimSpritePalette_217[]; extern const u32 gBattleAnimSpritePalette_218[]; extern const u32 gBattleAnimSpritePalette_219[]; +extern const u32 gUnknown_08C232E0; +extern const u32 gUnknown_08C23D50; +extern const u32 gUnknown_08C23D78; extern const u32 gBattleAnimSpritePalette_220[]; extern const u32 gBattleAnimSpritePalette_221[]; extern const u32 gBattleAnimSpritePalette_222[]; @@ -4611,6 +4621,9 @@ extern const u32 gBattleAnimSpritePalette_241[]; extern const u32 gBattleAnimSpritePalette_242[]; extern const u32 gBattleAnimSpritePalette_243[]; extern const u32 gBattleAnimSpritePalette_244[]; +extern const u32 gUnknown_08C2DC68[]; +extern const u32 gUnknown_08C2DDA4[]; +extern const u32 gUnknown_08C2DDC4[]; extern const u32 gBattleAnimSpritePalette_245[]; extern const u32 gBattleAnimSpritePalette_248[]; extern const u32 gBattleAnimSpritePalette_249[]; @@ -4689,6 +4702,9 @@ extern const u32 gBattleAnimBackgroundTilemap_07[]; extern const u32 gBattleAnimBackgroundTilemap_08[]; extern const u32 gBattleAnimBackgroundTilemap_09[]; extern const u32 gBattleAnimBackgroundTilemap_10[]; +extern const u32 gUnknown_08C2A634[]; +extern const u32 gUnknown_08C2A6D4[]; +extern const u32 gUnknown_08C2A6EC[]; extern const u32 gBattleAnimBackgroundTilemap_11[]; extern const u32 gBattleAnimBackgroundTilemap_12[]; extern const u32 gBattleAnimBackgroundTilemap_13[]; @@ -4749,11 +4765,6 @@ extern const u32 gCableCarDoor_Gfx[]; extern const u32 gCableCarCord_Gfx[]; extern const u16 gCableCar_Pal[]; -// Battle Anim -extern const u32 gUnknown_08C2DDA4[]; -extern const u32 gUnknown_08C2EA50[]; -extern const u32 gUnknown_08C2EA9C[]; - // Trade extern const u16 gUnknown_08DDB3E4[]; extern const u8 gUnknown_08DDB464[]; diff --git a/include/math_util.h b/include/math_util.h new file mode 100755 index 000000000..6b0d42460 --- /dev/null +++ b/include/math_util.h @@ -0,0 +1,14 @@ +#ifndef GUARD_MATH_UTIL_H +#define GUARD_MATH_UTIL_H + +s16 sub_8151534(s16 x, s16 y); +s16 sub_8151550(u8 s, s16 x, s16 y); +s32 sub_8151574(s32 x, s32 y); +s16 sub_81515B0(s16 x, s16 y); +s16 sub_81515D4(u8 s, s16 x, s16 y); +s32 sub_81515FC(s32 x, s32 y); +s16 sub_8151624(s16 y); +s16 sub_815163C(u8 s, s16 y); +s32 sub_815165C(s32 y); + +#endif // GUARD_MATH_UTIL_H diff --git a/include/scanline_effect.h b/include/scanline_effect.h index eb837e7e2..5bd8b5546 100644 --- a/include/scanline_effect.h +++ b/include/scanline_effect.h @@ -3,6 +3,7 @@ // DMA control value to transfer a single 16-bit value at HBlank #define SCANLINE_EFFECT_DMACNT_16BIT (((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_SRC_INC | DMA_DEST_INC | DMA_16BIT | DMA_DEST_RELOAD) << 16) | 1) +#define SCANLINE_EFFECT_DMACNT_32BIT (((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_SRC_INC | DMA_DEST_INC | DMA_32BIT | DMA_DEST_RELOAD) << 16) | 1) #define SCANLINE_EFFECT_REG_BG0HOFS (REG_ADDR_BG0HOFS - REG_ADDR_BG0HOFS) #define SCANLINE_EFFECT_REG_BG0VOFS (REG_ADDR_BG0VOFS - REG_ADDR_BG0HOFS) |