diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 5 | ||||
| -rw-r--r-- | include/battle_anim.h | 306 | ||||
| -rw-r--r-- | include/battle_main.h | 4 | ||||
| -rw-r--r-- | include/data.h | 2 | ||||
| -rw-r--r-- | include/gba/defines.h | 2 | ||||
| -rw-r--r-- | include/gba/io_reg.h | 36 | ||||
| -rw-r--r-- | include/global.h | 24 | ||||
| -rw-r--r-- | include/graphics.h | 32 | ||||
| -rw-r--r-- | include/overworld.h | 5 | ||||
| -rw-r--r-- | include/pokemon_icon.h | 1 | ||||
| -rw-r--r-- | include/rom6.h | 17 | ||||
| -rw-r--r-- | include/sprite.h | 2 |
12 files changed, 353 insertions, 83 deletions
diff --git a/include/battle.h b/include/battle.h index 1f7fc5bf6..754e92997 100644 --- a/include/battle.h +++ b/include/battle.h @@ -820,9 +820,6 @@ extern struct BattleSpriteData *gBattleSpritesDataPtr; extern u8 *gLinkBattleSendBuffer; extern u8 *gLinkBattleRecvBuffer; -extern u8 *gUnknown_0202305C; -extern u8 *gUnknown_02023060; - // Move this somewhere else #include "sprite.h" @@ -836,7 +833,7 @@ struct MonSpritesGfx u8 field_F4[0x80]; u8 *barFontGfx; void *field_178; - void *field_17C; + u16 *field_17C; }; extern u16 gBattle_BG0_X; diff --git a/include/battle_anim.h b/include/battle_anim.h index 3536e89f4..feaa8816b 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -1,19 +1,9 @@ #ifndef GUARD_BATTLE_ANIM_H #define GUARD_BATTLE_ANIM_H -#include "global.h" - -#ifndef BATTLE_BANKS_COUNT -#define BATTLE_BANKS_COUNT 4 -#endif // BATTLE_BANKS_COUNT - -enum -{ - ANIM_BANK_ATTACKER, - ANIM_BANK_TARGET, - ANIM_BANK_ATK_PARTNER, - ANIM_BANK_DEF_PARTNER, -}; +#include "battle.h" +#include "constants/battle_anim.h" +#include "task.h" enum { @@ -60,11 +50,39 @@ extern s16 gBattleAnimArgs[ANIM_ARGS_COUNT]; extern u8 gAnimMoveTurn; extern u8 gBattleAnimAttacker; extern u8 gBattleAnimTarget; -extern u16 gAnimSpeciesByBanks[BATTLE_BANKS_COUNT]; -extern u8 gUnknown_02038440; extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT]; extern u16 gAnimMovePower; extern s32 gAnimMoveDmg; +extern u16 gAnimBattlerSpecies[MAX_BATTLERS_COUNT]; +extern u8 gUnknown_2037F24; + +extern struct OamData gOamData_83ACA40; +extern struct OamData gOamData_83AC9C8; +extern struct OamData gOamData_83ACA38; +extern struct OamData gOamData_83AC9D0; +extern struct OamData gOamData_83AC9F8; +extern struct OamData gOamData_83AC9D8; +extern struct OamData gOamData_83ACB58; +extern struct OamData gOamData_83ACAF8; +extern struct OamData gOamData_83ACB60; +extern struct OamData gOamData_83ACA30; +extern struct OamData gOamData_83ACA98; +extern struct OamData gOamData_83ACA90; +extern struct OamData gOamData_83ACAF0; +extern struct OamData gOamData_83ACB10; +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; +extern struct OamData gOamData_83ACAB8; +extern struct OamData gOamData_83ACA00; +extern struct OamData gOamData_83ACBC0; +extern struct OamData gOamData_83ACB00; +extern struct OamData gOamData_83AC9E0; +extern struct OamData gOamData_83ACA20; +extern struct OamData gOamData_83ACA80; +extern struct OamData gOamData_83ACAA0; void ClearBattleAnimationVars(void); void DoMoveAnim(u16 move); @@ -80,25 +98,22 @@ s8 BattleAnimAdjustPanning2(s8 pan); s16 sub_80A52EC(s16 a); 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); -// battle_anim_80FE840.s +// battle_intro.c void SetAnimBgAttribute(u8 bgId, u8 attributeId, u8 value); -void sub_8118FBC(u8 arg0, u8 arg1, u8 arg2, u8 bankIdentity, u8 arg4, void *arg5, u16 *arg6, u16 arg7); -void HandleIntroSlide(u8 terrainId); - -// battle_anim_80A5C6C.s -void sub_80A6EEC(struct Sprite *sprite); -void sub_80A68D4(struct Sprite *sprite); -void sub_80A6F3C(struct Sprite *sprite); -void sub_80A8278(void); -void sub_80A6B30(struct BattleAnimBgData *); -void sub_80A6B90(struct BattleAnimBgData *, u32 arg1); -u8 sub_80A82E4(u8 bank); -bool8 AnimateBallThrow(struct Sprite *sprite); - -// battle_anim_special +s32 GetAnimBgAttribute(u8 bgId, u8 attributeId); +void HandleIntroSlide(u8 terrain); +void sub_80BC41C(u8 taskId); +void sub_80BCEF4(s32 bgId, u8 arg1, u8 arg2, u8 battlerPosition, u8 arg4, u8 *arg5, u16 *arg6, u16 tilesOffset); + +// 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, @@ -119,24 +134,24 @@ enum BATTLER_COORD_ATTR_RAW_BOTTOM, }; -u8 GetBattlerSpriteCoord(u8 bank, u8 attributeId); +u8 GetBattlerSpriteCoord(u8 battlerId, u8 attributeId); -bool8 IsBankSpritePresent(u8 bank); +bool8 IsBankSpritePresent(u8 battlerId); void sub_80A6C68(u8 arg0); -u8 GetAnimBankSpriteId(u8 wantedBank); +u8 GetAnimBattlerSpriteId(u8 wantedBank); bool8 IsDoubleBattle(void); u8 sub_80A6D94(void); u8 sub_80A8364(u8); -void StoreSpriteCallbackInData6(struct Sprite *sprite, void (*spriteCallback)(struct Sprite*)); +void StoreSpriteCallbackInData6(struct Sprite *sprite, void (*spriteCallback)(struct Sprite *)); void SetSpritePrimaryCoordsFromSecondaryCoords(struct Sprite *sprite); -u8 GetBattlerSpriteDefault_Y(u8 bank); -u8 sub_80A82E4(u8 bank); -u8 GetSubstituteSpriteDefault_Y(u8 bank); +u8 GetBattlerSpriteDefault_Y(u8 battlerId); +u8 sub_80A82E4(u8 battlerId); +u8 GetSubstituteSpriteDefault_Y(u8 battlerId); u8 GetGhostSpriteDefault_Y(u8 battlerId); -void sub_8072E48(u8 battlerId, u8); +void MoveBattlerSpriteToBG(u8 battlerId, u8); void sub_8073128(u8); -// battle_anim_80A9C70.s +// battle_anim_status_effects.s #define STAT_ANIM_PLUS1 15 #define STAT_ANIM_PLUS2 39 #define STAT_ANIM_MINUS1 22 @@ -147,25 +162,114 @@ void sub_8073128(u8); #define STAT_ANIM_MULTIPLE_MINUS2 58 void LaunchStatusAnimation(u8 bank, u8 statusAnimId); -// battle_anim_8170478.s +// battle_anim_special.s u8 ItemIdToBallId(u16 itemId); u8 LaunchBallStarsTask(u8 x, u8 y, u8 kindOfStars, u8 arg3, u8 ballId); -u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 bank, u32 arg2, u8 ballId); +u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 battlerId, u32 arg2, u8 ballId); -// battle_anim_mons.s -void TranslateMonSpriteLinear(struct Sprite * sprite); -void TranslateMonSpriteLinearFixedPoint(struct Sprite * sprite); -void InitSpriteDataForLinearTranslation(struct Sprite * sprite); -void PrepareBattlerSpriteForRotScale(u8 spriteId, u8 b); -void ResetSpriteRotScale(u8 spriteId); -void SetSpriteRotScale(u8 spriteId, s16 xScale, s16 yScale, u16 rotation); -bool8 IsContest(void); -void sub_80759DC(u8 spriteId); +// battle_anim_mons.c +u8 GetBattlerSpriteCoord(u8 battlerId, u8 coordType); +u8 GetBattlerSpriteCoord2(u8 battlerId, u8 coordType); +u8 GetBattlerSpriteDefault_Y(u8 battlerId); +u8 GetSubstituteSpriteDefault_Y(u8 battlerId); +u8 GetGhostSpriteDefault_Y(u8 battlerId); +u8 GetBattlerYCoordWithElevation(u8 battlerId); +u8 GetAnimBattlerSpriteId(u8 animBattler); +void StoreSpriteCallbackInData6(struct Sprite *sprite, SpriteCallback callback); +void TranslateSpriteInCircleOverDuration(struct Sprite *sprite); +void TranslateSpriteInGrowingCircleOverDuration(struct Sprite *sprite); +void TranslateSpriteInEllipseOverDuration(struct Sprite *sprite); +void WaitAnimForDuration(struct Sprite *sprite); +void sub_8074C80(struct Sprite *sprite); +void TranslateSpriteLinear(struct Sprite *sprite); +void TranslateSpriteLinearFixedPoint(struct Sprite *sprite); +void TranslateMonSpriteLinear(struct Sprite *sprite); +void TranslateMonSpriteLinearFixedPoint(struct Sprite *sprite); +void TranslateSpriteLinearAndFlicker(struct Sprite *sprite); +void DestroySpriteAndMatrix(struct Sprite *sprite); +void RunStoredCallbackWhenAffineAnimEnds(struct Sprite *sprite); +void RunStoredCallbackWhenAnimEnds(struct Sprite *sprite); +void DestroyAnimSpriteAndDisableBlend(struct Sprite *sprite); +void DestroyAnimVisualTaskAndDisableBlend(u8 taskId); +void SetSpriteCoordsToAnimAttackerCoords(struct Sprite *sprite); +void SetAnimSpriteInitialXOffset(struct Sprite *sprite, s16 xOffset); +void InitAnimArcTranslation(struct Sprite *sprite); +bool8 TranslateAnimHorizontalArc(struct Sprite *sprite); +bool8 TranslateAnimVerticalArc(struct Sprite *sprite); +void SetSpritePrimaryCoordsFromSecondaryCoords(struct Sprite *sprite); +void InitSpritePosToAnimTarget(struct Sprite *sprite, bool8 respectMonPicOffsets); +void InitSpritePosToAnimAttacker(struct Sprite *sprite, bool8 respectMonPicOffsets); +u8 GetBattlerSide(u8 battlerId); +u8 GetBattlerPosition(u8 battlerId); +u8 GetBattlerAtPosition(u8 position); bool8 IsBattlerSpritePresent(u8 battlerId); -u8 GetBattlerSpriteSubpriority(u8 battlerId); +bool8 IsDoubleBattle(void); +void sub_80752A0(struct BattleAnimBgData *animBgData); +void sub_80752C8(struct BattleAnimBgData *animBgData, u32 arg1); +void sub_8075300(struct BattleAnimBgData *animBgData, u8 unused); +void sub_8075358(u32 bgId); +void AnimLoadCompressedBgGfx(u32 bgId, const u32 *src, u32 tilesOffset); +void InitAnimBgTilemapBuffer(u32 bgId, const void *src); +void AnimLoadCompressedBgTilemap(u32 bgId, const u32 *src); +u8 sub_8075454(void); +void sub_8075458(bool8 arg0); +void sub_8075490(struct Sprite *sprite); +void InitSpriteDataForLinearTranslation(struct Sprite *sprite); +void InitAnimLinearTranslation(struct Sprite *sprite); void StartAnimLinearTranslation(struct Sprite *sprite); void sub_80755B8(struct Sprite *sprite); -u8 sub_80768B0(u8 battlerId); +bool8 AnimTranslateLinear(struct Sprite *sprite); +void sub_807563C(struct Sprite *sprite); +void sub_8075678(struct Sprite *sprite); +void sub_80756A4(struct Sprite *sprite); +void InitAndRunAnimFastLinearTranslation(struct Sprite *sprite); +bool8 AnimFastTranslateLinear(struct Sprite *sprite); +void InitAnimFastLinearTranslationWithSpeed(struct Sprite *sprite); +void sub_8075830(struct Sprite *sprite); +void SetSpriteRotScale(u8 spriteId, s16 xScale, s16 yScale, u16 rotation); +void PrepareBattlerSpriteForRotScale(u8 spriteId, u8 objMode); +void ResetSpriteRotScale(u8 spriteId); +void SetBattlerSpriteYOffsetFromRotation(u8 spriteId); +void TrySetSpriteRotScale(struct Sprite *sprite, bool8 recalcCenterVector, s16 xScale, s16 yScale, u16 rotation); +void sub_8075AD8(struct Sprite *sprite); +u16 ArcTan2Neg(s16 a, s16 b); +void SetGreyscaleOrOriginalPalette(u16 paletteNum, bool8 restoreOriginalColor); +u32 sub_8075BE8(u8 battleBackground, u8 attacker, u8 target, u8 attackerPartner, u8 targetPartner, u8 a6, u8 a7); +u32 sub_8075CB8(u8 a1, u8 a2, u8 a3, u8 a4); +u8 sub_8075D80(u8 a1); +void sub_8075D9C(struct Sprite *sprite); +void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite); +void sub_8075E80(struct Sprite *sprite); +void sub_8075F0C(struct Sprite *sprite); +s16 CloneBattlerSpriteWithBlend(u8 animBattler); +void obj_delete_but_dont_free_vram(struct Sprite *sprite); +void sub_8076048(u8 taskId); +void AnimTask_BlendMonInAndOut(u8 task); +void sub_8076288(u8 taskId); +void PrepareAffineAnimInTaskData(struct Task *task, u8 spriteId, const union AffineAnimCmd *affineAnimCmds); +bool8 RunAffineAnimFromTaskData(struct Task *task); +void SetBattlerSpriteYOffsetFromYScale(u8 spriteId); +void SetBattlerSpriteYOffsetFromOtherYScale(u8 spriteId, u8 otherSpriteId); +void StorePointerInVars(s16 *lo, s16 *hi, const void *ptr); +void *LoadPointerFromVars(s16 lo, s16 hi); +void sub_80765D4(struct Task *task, u8 spriteId, s16 a3, s16 a4, s16 a5, s16 a6, u16 a7); +u8 sub_8076640(struct Task *task); +void AnimTask_GetFrustrationPowerLevel(u8 taskId); +void sub_80767F0(void); +u8 GetBattlerSpriteSubpriority(u8 battlerId); +u8 GetBattlerSpriteBGPriority(u8 battlerId); +u8 GetBattlerSpriteBGPriorityRank(u8 battlerId); +u8 sub_80768D0(u16 species, bool8 isBackpic, u8 a3, s16 x, s16 y, u8 subpriority, u32 personality, u32 trainerId, u32 battlerId, u32 a10); +void DestroySpriteAndFreeResources_(struct Sprite *sprite); +s16 GetBattlerSpriteCoordAttr(u8 battlerId, u8 attr); +void SetAverageBattlerPositions(u8 battlerId, bool8 respectMonPicOffsets, s16 *x, s16 *y); +u8 sub_8076E34(s32 battlerId, u8 spriteId, s32 species); +void sub_8076ED8(struct Sprite *sprite); +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); // battle_anim_mon_movement.c void AnimTask_ShakeMon(u8 taskId); @@ -182,4 +286,102 @@ void sub_8099980(u8 taskId); void sub_8099A78(u8 taskId); void sub_8099BD4(u8 taskId); +// normal.c +extern const struct SpriteTemplate gUnknown_83E7C98; + +u32 UnpackSelectedBattleAnimPalettes(s16 selector); +void sub_80B9BDC(u8 taskId); +void sub_80B9CE4(u8 taskId); +void sub_80B9E58(u8 taskId); +void sub_80B9F6C(u8 taskId); +void sub_80BA0E8(u8 taskId); +void sub_80BA47C(u8 taskId); + +// ground.c +void sub_80B8E94(u8 taskId); +void sub_80B90EC(u8 taskId); +void sub_80B94B4(u8 taskId); +void AnimTask_IsPowerOver99(u8 taskId); +void sub_80B9800(u8 taskId); + +// dragon.c +void sub_80B75E0(u8 taskId); + +// ghost.c +void sub_80B54E8(u8 taskId); +void sub_80B58AC(u8 taskId); +void sub_80B5AAC(u8 taskId); +void sub_80B6020(u8 taskId); +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); + +// psychic.c +void sub_80B3418(u8 taskId); +void sub_80B3480(u8 taskId); +void sub_80B3584(u8 taskId); +void sub_80B3834(u8 taskId); +void sub_80B3A58(u8 taskId); +void sub_80B3C78(u8 taskId); + +// dark.c +void sub_80B78E0(u8 taskId); +void sub_80B79DC(u8 taskId); +void sub_80B7A80(u8 taskId); +void sub_80B7DA4(u8 taskId); +void sub_80B8070(u8 taskId); +void sub_80B85B8(u8 taskId); +void sub_80B8664(u8 taskId); +void AnimTask_MetallicShine(u8 taskId); +void AnimTask_SetGreyscaleOrOriginalPal(u8 taskId); +void sub_80B8B38(u8 taskId); + +// flying.c +void sub_80B194C(u8 taskId); +void sub_80B1D3C(struct Sprite *sprite); +void sub_80B2868(u8 taskId); + +// water.s +extern const union AnimCmd *const gUnknown_83E5958[]; + +// fire.s +extern const union AnimCmd *const gUnknown_83E5D48[]; + +// battle_anim_utility_funcs.c +void sub_80BA7F8(u8 taskId); +void sub_80BA83C(u8 taskId); +void AnimTask_SetCamouflageBlend(u8 taskId); +void AnimTask_BlendParticle(u8 taskId); +void sub_80BAB38(u8 taskId); +void sub_80BAB98(u8 taskId); +void sub_80BACEC(u8 taskId); +void sub_80BB088(u8 taskId); +void sub_80BB660(u8 taskId); +void sub_80BB7DC(u8 taskId); +void sub_80BB82C(u8 taskId); +void AnimTask_GetAttackerSide(u8 taskId); +void AnimTask_GetTargetSide(u8 taskId); +void AnimTask_GetTargetIsAttackerPartner(u8 taskId); +void sub_80BB9B0(u8 taskId); +void sub_80BBA20(u8 taskId, s32 unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5, u8 arg6, u8 arg7, const u32 *gfx, const u32 *tilemap, const u32 *palette); +void AnimTask_GetBattleTerrain(u8 taskId); +void sub_80BBE10(u8 taskId); +void sub_80BBE3C(u8 taskId); +void sub_80BBE6C(u8 taskId); +void sub_80BBF08(u8 taskId); +void sub_80BBFA4(u8 taskId); +void AnimTask_IsContest(u8 taskId); +void sub_80BC060(u8 taskId); +void AnimTask_IsTargetSameSide(u8 taskId); +void sub_80BC0DC(u8 taskId); +void sub_80BC0FC(u8 taskId); +void sub_80BC12C(u8 taskId); + #endif // GUARD_BATTLE_ANIM_H diff --git a/include/battle_main.h b/include/battle_main.h index 27aae9970..757ee3468 100644 --- a/include/battle_main.h +++ b/include/battle_main.h @@ -49,7 +49,7 @@ void CB2_QuitRecordedBattle(void); void sub_8038528(struct Sprite* sprite); void sub_8038A04(void); // unused void VBlankCB_Battle(void); -void sub_8038B74(struct Sprite *sprite); +void sub_801182C(struct Sprite *sprite); void sub_8011A1C(void); u32 sub_80391E0(u8 arrayId, u8 caseId); u32 sub_80397C4(u32 setId, u32 tableId); @@ -67,7 +67,7 @@ void EndBounceEffect(u8 bank, bool8 b); void sub_8039E44(struct Sprite *sprite); void sub_8039E60(struct Sprite *sprite); void sub_8039E84(struct Sprite *sprite); -void sub_8039E9C(struct Sprite *sprite); +void sub_801236C(struct Sprite *sprite); void BeginBattleIntro(void); void SwitchInClearSetData(void); void FaintClearSetData(void); diff --git a/include/data.h b/include/data.h index 6479237f2..d3bc77799 100644 --- a/include/data.h +++ b/include/data.h @@ -31,6 +31,8 @@ extern const struct CompressedSpritePalette gMonShinyPaletteTable[]; extern const struct CompressedSpriteSheet gTrainerFrontPicTable[]; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; +extern const struct MonCoords gMonFrontPicCoords[]; +extern const struct MonCoords gMonBackPicCoords[]; extern const struct CompressedSpriteSheet gSpriteSheet_EnemyShadow; extern const struct SpriteTemplate gSpriteTemplate_EnemyShadow; diff --git a/include/gba/defines.h b/include/gba/defines.h index c0eec12b1..65561f10a 100644 --- a/include/gba/defines.h +++ b/include/gba/defines.h @@ -77,8 +77,6 @@ #define RGB_BLACK RGB(0, 0, 0) #define RGB_WHITE RGB(31, 31, 31) -#define WIN_RANGE(a, b) (((a) << 8) | (b)) - #define NAKED __attribute__((naked)) #define UNUSED __attribute__((unused)) diff --git a/include/gba/io_reg.h b/include/gba/io_reg.h index 6dbe5e8ed..6d54bc5fb 100644 --- a/include/gba/io_reg.h +++ b/include/gba/io_reg.h @@ -538,6 +538,40 @@ #define BGCNT_AFF512x512 0x8000 #define BGCNT_AFF1024x1024 0xC000 +// WININ/OUT +#define WININ_WIN0_BG0 (1 << 0) +#define WININ_WIN0_BG1 (1 << 1) +#define WININ_WIN0_BG2 (1 << 2) +#define WININ_WIN0_BG3 (1 << 3) +#define WININ_WIN0_BG_ALL (WININ_WIN0_BG0 | WININ_WIN0_BG1 | WININ_WIN0_BG2 | WININ_WIN0_BG3) +#define WININ_WIN0_OBJ (1 << 4) +#define WININ_WIN0_CLR (1 << 5) +#define WININ_WIN1_BG0 (1 << 8) +#define WININ_WIN1_BG1 (1 << 9) +#define WININ_WIN1_BG2 (1 << 10) +#define WININ_WIN1_BG3 (1 << 11) +#define WININ_WIN1_BG_ALL (WININ_WIN1_BG0 | WININ_WIN1_BG1 | WININ_WIN1_BG2 | WININ_WIN1_BG3) +#define WININ_WIN1_OBJ (1 << 12) +#define WININ_WIN1_CLR (1 << 13) + +#define WINOUT_WIN01_BG0 (1 << 0) +#define WINOUT_WIN01_BG1 (1 << 1) +#define WINOUT_WIN01_BG2 (1 << 2) +#define WINOUT_WIN01_BG3 (1 << 3) +#define WINOUT_WIN01_BG_ALL (WINOUT_WIN01_BG0 | WINOUT_WIN01_BG1 | WINOUT_WIN01_BG2 | WINOUT_WIN01_BG3) +#define WINOUT_WIN01_OBJ (1 << 4) +#define WINOUT_WIN01_CLR (1 << 5) +#define WINOUT_WINOBJ_BG0 (1 << 8) +#define WINOUT_WINOBJ_BG1 (1 << 9) +#define WINOUT_WINOBJ_BG2 (1 << 10) +#define WINOUT_WINOBJ_BG3 (1 << 11) +#define WINOUT_WINOBJ_BG_ALL (WINOUT_WINOBJ_BG0 | WINOUT_WINOBJ_BG1 | WINOUT_WINOBJ_BG2 | WINOUT_WINOBJ_BG3) +#define WINOUT_WINOBJ_OBJ (1 << 12) +#define WINOUT_WINOBJ_CLR (1 << 13) + +#define WIN_RANGE(a, b) (((a) << 8) | (b)) +#define WIN_RANGE2(a, b) ((b) | ((a) << 8)) + // BLDCNT // Bits 0-5 select layers for the 1st target #define BLDCNT_TGT1_BG0 (1 << 0) @@ -558,9 +592,11 @@ #define BLDCNT_TGT2_BG3 (1 << 11) #define BLDCNT_TGT2_OBJ (1 << 12) #define BLDCNT_TGT2_BD (1 << 13) +#define BLDCNT_TGT2_ALL (BLDCNT_TGT2_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD) // 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/global.h b/include/global.h index 35f8de01b..5ddf9a0a8 100644 --- a/include/global.h +++ b/include/global.h @@ -76,6 +76,18 @@ extern u8 gStringVar2[]; extern u8 gStringVar3[]; extern u8 gStringVar4[]; +struct Coords8 +{ + s8 x; + s8 y; +}; + +struct UCoords8 +{ + u8 x; + u8 y; +}; + struct Coords16 { s16 x; @@ -88,6 +100,18 @@ struct UCoords16 u16 y; }; +struct Coords32 +{ + s32 x; + s32 y; +}; + +struct UCoords32 +{ + u32 x; + u32 y; +}; + struct Time { /*0x00*/ s16 days; diff --git a/include/graphics.h b/include/graphics.h index 5e133ee01..1c0612fd1 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -961,6 +961,36 @@ extern const u8 gFile_graphics_items_icon_palettes_sapphire_palette[]; extern const u8 gFile_graphics_items_icons_return_to_field_arrow_sheet[]; extern const u8 gFile_graphics_items_icon_palettes_return_to_field_arrow_palette[]; +// battle_anim_utility_funcs +extern const u32 gFile_graphics_battle_anims_masks_curse_sheet[]; +extern const u32 gFile_graphics_battle_anims_masks_curse_tilemap[]; +extern const u32 gBattleStatMask_Gfx[]; +extern const u32 gBattleStatMask1_Pal[]; +extern const u32 gBattleStatMask2_Pal[]; +extern const u32 gBattleStatMask3_Pal[]; +extern const u32 gBattleStatMask4_Pal[]; +extern const u32 gBattleStatMask5_Pal[]; +extern const u32 gBattleStatMask6_Pal[]; +extern const u32 gBattleStatMask7_Pal[]; +extern const u32 gBattleStatMask8_Pal[]; +extern const u32 gBattleStatMask1_Tilemap[]; +extern const u32 gBattleStatMask2_Tilemap[]; + +// dark +extern const u32 gMetalShineGfx[]; +extern const u32 gMetalShinePalette[]; +extern const u32 gMetalShineTilemap[]; + +// ghost +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[]; @@ -974,6 +1004,7 @@ extern const u8 gGraphics_TitleScreen_CopyrightPressStartMap[]; extern const u16 gGraphics_TitleScreen_FirePals[]; extern const u8 gGraphics_TitleScreen_BlankObjTiles[]; +// battle_gfx_sfx_util extern const u32 gHealthboxSinglesPlayerGfx[]; extern const u32 gHealthboxSinglesOpponentGfx[]; extern const u32 gHealthboxDoublesPlayerGfx[]; @@ -983,7 +1014,6 @@ extern const u32 gBlankGfxCompressed[]; extern const u16 gBattleInterface_BallStatusBarPal[]; extern const u16 gBattleInterface_BallDisplayPal[]; extern const u32 gFile_graphics_interface_hp_numbers[]; - extern const u32 gGhostFrontPic[]; extern const u32 gGhostPalette[]; extern const u32 gSubstituteDollGfx[]; diff --git a/include/overworld.h b/include/overworld.h index 77cacff94..0abbeee4b 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -18,11 +18,6 @@ struct LinkPlayerMapObject u8 mode; }; -struct UCoords32 -{ - u32 x, y; -}; - struct CreditsOverworldCmd { s16 unk_0; diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h index cd8c798f9..60da74bcb 100644 --- a/include/pokemon_icon.h +++ b/include/pokemon_icon.h @@ -16,5 +16,6 @@ u16 sub_8096FD4(u16); u8 sub_8096ECC(u16, void (*)(struct Sprite *), s16, s16, u8, bool32); void sub_8097070(struct Sprite *); u16 GetUnownLetterByPersonality(u32 personality); +u8 UpdateMonIconFrame(struct Sprite *sprite); #endif // GUARD_POKEMON_ICON_H diff --git a/include/rom6.h b/include/rom6.h deleted file mode 100644 index 753c07305..000000000 --- a/include/rom6.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef GUARD_ROM6_H -#define GUARD_ROM6_H - -#include "global.h" - -void sub_81357FC(u8, void(void)); -u8 GetLeadMonIndex(void); -u8 GetSSTidalLocation(u8 *grp, u8 *num, s16 *x, s16 *y); -void sub_813BADC(bool8); -bool8 sub_813B9C0(void); -void UpdateMirageRnd(u16 days); -void UpdateBirchState(u16 days); -void UpdateFrontierManiac(u16 days); -void UpdateFrontierGambler(u16 days); -void SetShoalItemFlag(u16 days); - -#endif //GUARD_ROM6_H diff --git a/include/sprite.h b/include/sprite.h index 27e5dc852..85722311f 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -116,6 +116,7 @@ union AffineAnimCmd struct AffineAnimFrameCmd frame; struct AffineAnimLoopCmd loop; struct AffineAnimJumpCmd jump; + struct AffineAnimEndCmdAlt end; }; #define AFFINEANIMCMDTYPE_LOOP 0x7FFD @@ -251,6 +252,7 @@ extern s16 gSpriteCoordOffsetX; extern s16 gSpriteCoordOffsetY; extern const struct SpriteTemplate gDummySpriteTemplate; extern struct Sprite gSprites[]; +extern struct OamMatrix gOamMatrices[]; void ResetSpriteData(void); void AnimateSprites(void); |