Merge branch 'master' into trade
This commit is contained in:
PikalaxALT
+1
-4
@@ -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;
|
||||
|
||||
+253
-51
@@ -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);
|
||||
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_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
|
||||
// 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
|
||||
|
||||
@@ -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);
|
||||
|
||||
+7
-7
@@ -59,13 +59,13 @@ enum BgTileAllocMode
|
||||
|
||||
struct BgTemplate
|
||||
{
|
||||
u32 bg:2; // 0x1, 0x2 -> 0x3
|
||||
u32 charBaseIndex:2; // 0x4, 0x8 -> 0xC
|
||||
u32 mapBaseIndex:5; // 0x10, 0x20, 0x40, 0x80, 0x100 -> 0x1F0
|
||||
u32 screenSize:2; // 0x200, 0x400 -> 0x600
|
||||
u32 paletteMode:1; // 0x800
|
||||
u32 priority:2; // 0x1000, 0x2000 > 0x3000
|
||||
u32 baseTile:10;
|
||||
u16 bg:2; // 0x1, 0x2 -> 0x3
|
||||
u16 charBaseIndex:2; // 0x4, 0x8 -> 0xC
|
||||
u16 mapBaseIndex:5; // 0x10, 0x20, 0x40, 0x80, 0x100 -> 0x1F0
|
||||
u16 screenSize:2; // 0x200, 0x400 -> 0x600
|
||||
u16 paletteMode:1; // 0x800
|
||||
u16 priority:2; // 0x1000, 0x2000 > 0x3000
|
||||
u16 baseTile:10;
|
||||
};
|
||||
|
||||
void ResetBgs(void);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -1158,4 +1158,14 @@ extern const u8 EventScript_ItemfinderDigUpUnderfootItem[];
|
||||
// new_game
|
||||
extern const u8 EventScript_ResetAllMapFlags[];
|
||||
|
||||
// player_pc
|
||||
extern const u8 EventScript_PalletTown_PlayersHouse_2F_ShutDownPC[];
|
||||
|
||||
// start_menu
|
||||
extern const u8 gText_WouldYouLikeToSaveTheGame[];
|
||||
extern const u8 gText_AlreadySaveFile_WouldLikeToOverwrite[];
|
||||
extern const u8 gText_SavingDontTurnOffThePower[];
|
||||
extern const u8 gText_PlayerSavedTheGame[];
|
||||
extern const u8 gText_DifferentGameFile[];
|
||||
|
||||
#endif //GUARD_EVENT_SCRIPTS_H
|
||||
|
||||
@@ -15,6 +15,7 @@ void sub_807DF64(void);
|
||||
void sub_807DC18(void);
|
||||
void FieldCallback_ReturnToEventScript2(void);
|
||||
void sub_807DC00(void);
|
||||
void FadeTransition_FadeInOnReturnToStartMenu(void);
|
||||
|
||||
bool32 sub_807E418(void);
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ void DoCurrentWeather(void);
|
||||
void SetSav1WeatherFromCurrMapHeader(void);
|
||||
void sub_807B0C4(u16 *, u16 *, u32);
|
||||
void PlayRainStoppingSoundEffect(void);
|
||||
bool8 sub_807AA70(void);
|
||||
bool8 field_weather_is_fade_finished(void);
|
||||
void SetWeatherScreenFadeOut(void);
|
||||
void sub_807B070(void);
|
||||
u8 GetCurrentWeather(void);
|
||||
|
||||
@@ -26,4 +26,6 @@ u32 GetBehaviorByMetatileIdAndMapData(struct MapData *mapData, u16 metatile, u8
|
||||
const struct MapHeader * mapconnection_get_mapheader(struct MapConnection * connection);
|
||||
struct MapConnection * GetMapConnectionAtPos(s16 x, s16 y);
|
||||
|
||||
void save_serialize_map(void);
|
||||
|
||||
#endif //GUARD_FIELDMAP_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))
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -121,10 +121,31 @@
|
||||
} \
|
||||
}
|
||||
|
||||
#define DmaFillLarge(dmaNum, value, dest, size, block, bit) \
|
||||
{ \
|
||||
void *_dest = (void *)dest; \
|
||||
u32 _size = size; \
|
||||
while (1) \
|
||||
{ \
|
||||
DmaFill##bit(dmaNum, value, _dest, (block)); \
|
||||
_dest += (block); \
|
||||
_size -= (block); \
|
||||
if (_size <= (block)) \
|
||||
{ \
|
||||
DmaFill##bit(dmaNum, value, _dest, _size); \
|
||||
break; \
|
||||
} \
|
||||
} \
|
||||
}
|
||||
|
||||
#define DmaCopyLarge16(dmaNum, src, dest, size, block) DmaCopyLarge(dmaNum, src, dest, size, block, 16)
|
||||
|
||||
#define DmaCopyLarge32(dmaNum, src, dest, size, block) DmaCopyLarge(dmaNum, src, dest, size, block, 32)
|
||||
|
||||
#define DmaFillLarge16(dmaNum, value, dest, size, block) DmaFillLarge(dmaNum, value, dest, size, block, 16)
|
||||
|
||||
#define DmaFillLarge32(dmaNum, value, dest, size, block) DmaFillLarge(dmaNum, value, dest, size, block, 32)
|
||||
|
||||
#define DmaClearLarge16(dmaNum, dest, size, block) DmaClearLarge(dmaNum, dest, size, block, 16)
|
||||
#define DmaClearLarge32(dmaNum, dest, size, block) DmaClearLarge(dmaNum, dest, size, block, 32)
|
||||
|
||||
@@ -139,4 +160,14 @@
|
||||
#define DmaCopy16Defvars(dmaNum, src, dest, size) DmaCopyDefvars(dmaNum, src, dest, size, 16)
|
||||
#define DmaCopy32Defvars(dmaNum, src, dest, size) DmaCopyDefvars(dmaNum, src, dest, size, 32)
|
||||
|
||||
#define DmaFillDefvars(dmaNum, value, dest, size, bit) \
|
||||
{ \
|
||||
void *_dest = (void *)dest; \
|
||||
u32 _size = size; \
|
||||
DmaFill##bit(dmaNum, value, _dest, _size); \
|
||||
}
|
||||
|
||||
#define DmaFill16Defvars(dmaNum, value, dest, size) DmaFillDefvars(dmaNum, value, dest, size, 16)
|
||||
#define DmaFill32Defvars(dmaNum, value, dest, size) DmaFillDefvars(dmaNum, value, dest, size, 32)
|
||||
|
||||
#endif // GUARD_GBA_MACRO_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;
|
||||
|
||||
+31
-1
@@ -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[];
|
||||
|
||||
@@ -29,7 +29,7 @@ extern bool8 gHelpSystemEnabled;
|
||||
extern u8 gUnknown_203F175;
|
||||
|
||||
// help_system_812B1E0
|
||||
void sub_812B1E0(u8);
|
||||
void HelpSystem_SetSomeVariable(u8);
|
||||
void HelpSystem_SetSomeVariable2(u8);
|
||||
bool8 sub_812B40C(void);
|
||||
bool8 sub_812B45C(void);
|
||||
@@ -89,5 +89,7 @@ void HelpSystem_FillPanel3(void);
|
||||
void PrintListMenuItems(void);
|
||||
void PlaceListMenuCursor(void);
|
||||
bool8 MoveCursor(u8 by, u8 dirn);
|
||||
void HelpSystem_BackupSomeVariable(void);
|
||||
void HelpSystem_RestoreSomeVariable(void);
|
||||
|
||||
#endif //GUARD_HELP_SYSTEM_H
|
||||
|
||||
@@ -77,5 +77,6 @@ u16 GetPcItemQuantity(u16 *);
|
||||
void ItemPcCompaction(void);
|
||||
void RemoveItemFromPC(u16 itemId, u16 quantity);
|
||||
void SortAndCompactBagPocket(struct BagPocket * pocket);
|
||||
u8 CountItemsInPC(void);
|
||||
|
||||
#endif // GUARD_ITEM_H
|
||||
|
||||
+2
-1
@@ -28,7 +28,7 @@ void sub_81AAC70(void);
|
||||
void sub_8108CF0(void);
|
||||
void sub_81089BC(void);
|
||||
void sub_810B108(u8);
|
||||
void ReturnToBagFromKeyItem(void);
|
||||
void CB2_BagMenuFromStartMenu(void);
|
||||
void ItemMenu_MoveItemSlotToNewPositionInArray(struct ItemSlot * slots, int pos1, int pos2);
|
||||
void ItemMenu_StartFadeToExitCallback(u8 taskId);
|
||||
void sub_8108CB4(void);
|
||||
@@ -38,5 +38,6 @@ void sub_810A1F8(u8 taskId);
|
||||
void sub_8107ECC(void);
|
||||
void sub_8108DC8(u8 pocketId);
|
||||
void sub_81089F4(u8 pocketId);
|
||||
void sub_8107DB4(u8 menuType, u8 pocket, MainCallback callback);
|
||||
|
||||
#endif //GUARD_ITEM_MENU_H
|
||||
|
||||
@@ -41,5 +41,6 @@ u32 GetRfuRecvQueueLength(void);
|
||||
void sub_80F8DC0(void);
|
||||
void sub_80FBB20(void);
|
||||
bool8 sub_80FA484(bool32 a0);
|
||||
void var_800D_set_xB(void);
|
||||
|
||||
#endif //GUARD_LINK_RFU_H
|
||||
|
||||
@@ -26,5 +26,7 @@ void ApplyNewEncryptionKeyToAllEncryptedData(u32 encryptionKey);
|
||||
void ApplyNewEncryptionKeyToBagItems(u32 encryptionKey);
|
||||
void ApplyNewEncryptionKeyToWord(u32 * word, u32 encryptionKey);
|
||||
void ApplyNewEncryptionKeyToHword(u16 * hword, u32 encryptionKey);
|
||||
void sav2_gender2_inplace_and_xFE(void);
|
||||
void sub_804C1C0(void);
|
||||
|
||||
#endif // GUARD_LOAD_SAVE_H
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
#ifndef GUARD_MAILBOX_PC_H
|
||||
#define GUARD_MAILBOX_PC_H
|
||||
|
||||
#include "player_pc.h"
|
||||
|
||||
bool8 MailboxPC_InitBuffers(u8 num);
|
||||
u8 MailboxPC_GetAddWindow(u8 winIdx);
|
||||
void MailboxPC_RemoveWindow(u8 winIdx);
|
||||
u8 MailboxPC_GetWindowId(u8 winIdx);
|
||||
u8 MailboxPC_InitListMenu(struct PlayerPC_Unk_203AAC4 * playerPcStruct);
|
||||
void MailboxPC_AddScrollIndicatorArrows(struct PlayerPC_Unk_203AAC4 * playerPcStruct);
|
||||
u8 MailboxPC_InitListMenu(struct PlayerPCItemPageStruct * playerPcStruct);
|
||||
void MailboxPC_AddScrollIndicatorArrows(struct PlayerPCItemPageStruct * playerPcStruct);
|
||||
void MailboxPC_DestroyListMenuBuffer(void);
|
||||
|
||||
#endif //GUARD_MAILBOX_PC_H
|
||||
|
||||
+1
-1
@@ -21,7 +21,7 @@ struct MenuAction
|
||||
void AddTextPrinterParameterized3(u8 windowId, u8 fontId, u8 x, u8 y, const u8 * color, s8 speed, const u8 * str);
|
||||
void AddTextPrinterParameterized4(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, const u8 *color, s8 speed, const u8 *str);
|
||||
void AddTextPrinterParameterized5(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16), u8 letterSpacing, u8 lineSpacing);
|
||||
void sub_812E6DC(u8 windowId, const u8 * src, u16 x, u16 y);
|
||||
void Menu_PrintFormatIntlPlayerName(u8 windowId, const u8 * src, u16 x, u16 y);
|
||||
void StartBlendTask(u8 eva_start, u8 evb_start, u8 eva_end, u8 evb_end, u8 ev_step, u8 priority);
|
||||
bool8 IsBlendTaskActive(void);
|
||||
u8 sub_812EA78(u16 species, u32 personality, u8 a2);
|
||||
|
||||
@@ -3,6 +3,8 @@
|
||||
|
||||
#include "global.h"
|
||||
|
||||
extern bool8 gDifferentSaveFile;
|
||||
|
||||
void SetTrainerId(u32 trainerId, u8 *dst);
|
||||
void CopyTrainerId(u8 *dst, u8 *src);
|
||||
void NewGameInitData(void);
|
||||
|
||||
@@ -26,7 +26,7 @@ u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed
|
||||
void AddTextPrinterDiffStyle(bool8 allowSkippingDelayWithButtonPress);
|
||||
void AddTextPrinterForMessage(bool8 allowSkippingDelayWithButtonPress);
|
||||
void AddTextPrinterWithCustomSpeedForMessage(bool8 allowSkippingDelayWithButtonPress, u8 speed);
|
||||
void sub_80F6E9C(void);
|
||||
void LoadStdWindowFrameGfx(void);
|
||||
void DrawDialogueFrame(u8 windowId, bool8 transfer);
|
||||
void DrawStdWindowFrame(u8 windowId, bool8 copyNow);
|
||||
void ClearDialogWindowAndFrame(u8 windowId, bool8 copyToVram);
|
||||
@@ -41,12 +41,12 @@ void DisplayItemMessageOnField(u8 taskId, u8 bgId, const u8 *src, TaskFunc callb
|
||||
void DisplayYesNoMenuDefaultYes(void);
|
||||
void DisplayYesNoMenuDefaultNo(void);
|
||||
u8 GetTextSpeedSetting(void);
|
||||
u8 sub_80F78E0(u8 height);
|
||||
u8 CreateStartMenuWindow(u8 height);
|
||||
u8 GetStartMenuWindowId(void);
|
||||
void RemoveStartMenuWindow(void);
|
||||
u16 GetStdWindowBaseTileNum(void);
|
||||
void sub_80F7974(const u8 * text);
|
||||
void sub_80F7998(void);
|
||||
void DrawHelpMessageWindowWithText(const u8 * text);
|
||||
void DestroyHelpMessageWindow_(void);
|
||||
void sub_80F79A4(void);
|
||||
void SetDefaultFontsPointer(void);
|
||||
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
#ifndef GUARD_OPTION_MENU_H
|
||||
#define GUARD_OPTION_MENU_H
|
||||
|
||||
void CB2_OptionsMenuFromStartMenu(void);
|
||||
|
||||
#endif //GUARD_OPTION_MENU_H
|
||||
+3
-6
@@ -18,11 +18,6 @@ struct LinkPlayerMapObject
|
||||
u8 mode;
|
||||
};
|
||||
|
||||
struct UCoords32
|
||||
{
|
||||
u32 x, y;
|
||||
};
|
||||
|
||||
struct CreditsOverworldCmd
|
||||
{
|
||||
s16 unk_0;
|
||||
@@ -43,6 +38,7 @@ extern MainCallback gFieldCallback;
|
||||
extern struct WarpData gUnknown_2031DBC;
|
||||
|
||||
extern u8 gUnknown_2031DE0;
|
||||
extern u8 gUnknown_300502C;
|
||||
|
||||
void IncrementGameStat(u8 index);
|
||||
|
||||
@@ -113,7 +109,6 @@ u32 sub_8054C04(void);
|
||||
extern u8 gDisableMapMusicChangeOnMapLoad;
|
||||
extern u8 gUnknown_2036E28;
|
||||
|
||||
extern void (*gFieldCallback)(void);
|
||||
extern bool8 (* gFieldCallback2)(void);
|
||||
|
||||
void SetLastHealLocationWarp(u8 healLocaionId);
|
||||
@@ -144,4 +139,6 @@ bool32 Overworld_DoScrollSceneForCredits(u8 *, const struct CreditsOverworldCmd
|
||||
|
||||
bool32 sub_8058318(void);
|
||||
|
||||
void CB2_ReturnToStartMenu(void);
|
||||
|
||||
#endif //GUARD_OVERWORLD_H
|
||||
|
||||
@@ -83,5 +83,7 @@ void sub_8127EC4(u8 battlerId, u8 unk, u8 arrayIndex);
|
||||
bool8 IsMultiBattle(void);
|
||||
void sub_8126EDC(void);
|
||||
void sub_812256C(u8 *partyCount, u8 *icons, u8 side);
|
||||
void PartyMenuInit_FromPlayerPc(void);
|
||||
void CB2_PartyMenuFromStartMenu(void);
|
||||
|
||||
#endif // GUARD_PARTY_MENU_H
|
||||
|
||||
+7
-5
@@ -6,14 +6,16 @@
|
||||
|
||||
// Exported type declarations
|
||||
|
||||
struct PlayerPC_Unk_203AAC4
|
||||
struct PlayerPCItemPageStruct
|
||||
{
|
||||
u16 selectedRow;
|
||||
u16 scrollOffset;
|
||||
u8 unk_4;
|
||||
u8 unk_5;
|
||||
u8 filler_6[4];
|
||||
u8 unk_A;
|
||||
u8 pageItems;
|
||||
u8 count;
|
||||
u8 filler_6[3];
|
||||
u8 unk_9;
|
||||
u8 scrollIndicatorId;
|
||||
u8 filler_B[5];
|
||||
};
|
||||
|
||||
// Exported RAM declarations
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
#ifndef GUARD_POKEDEX_SCREEN_H
|
||||
#define GUARD_POKEDEX_SCREEN_H
|
||||
|
||||
void CB2_OpenPokedexFromStartMenu(void);
|
||||
|
||||
#endif //GUARD_POKEDEX_SCREEN_H
|
||||
@@ -18,5 +18,6 @@ void sub_8097070(struct Sprite *);
|
||||
u16 GetUnownLetterByPersonality(u32 personality);
|
||||
void sub_809718C(void);
|
||||
u8 CreateMonIcon(u16 species, void (*callback)(void), s16 x, s16 y, u8 subpriority, u32 personality, bool32 extra);
|
||||
u8 UpdateMonIconFrame(struct Sprite *sprite);
|
||||
|
||||
#endif // GUARD_POKEMON_ICON_H
|
||||
|
||||
+7
-3
@@ -28,14 +28,18 @@ u8 sub_8112CAC(void);
|
||||
bool8 sub_81119D4(void (*func)(void));
|
||||
void sub_8111F38(u16, u16);
|
||||
void sub_8111134(void);
|
||||
void sub_8112EDC(u8 a0);
|
||||
u8 sub_8112EB4(void);
|
||||
void sub_8113018(const u8 * text, u8 mode);
|
||||
void DestroyHelpMessageWindow(u8 a0);
|
||||
u8 CreateHelpMessageWindow(void);
|
||||
void PrintTextOnHelpMessageWindow(const u8 * text, u8 mode);
|
||||
void MapNamePopupWindowIdSetDummy(void);
|
||||
void sub_8111CF0(void);
|
||||
void sub_811089C(void);
|
||||
void sub_8113044(void);
|
||||
void TrySetUpQuestLogScenes_ElseContinueFromSave(u8 taskId);
|
||||
void sub_8112450(void);
|
||||
void sub_8112364(void);
|
||||
u8 sub_8112CAC(void);
|
||||
void sub_81138F8(void);
|
||||
|
||||
extern u8 gUnknown_203ADFA;
|
||||
|
||||
|
||||
@@ -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
|
||||
+1
-1
@@ -84,7 +84,7 @@ extern u16 gSaveUnusedVar;
|
||||
extern u16 gSaveFileStatus;
|
||||
extern void (*gGameContinueCallback)(void);
|
||||
extern struct SaveBlockChunk gRamSaveSectionLocations[0xE];
|
||||
extern u16 gUnknown_3005420;
|
||||
extern u16 gSaveSucceeded;
|
||||
|
||||
extern struct SaveSection gSaveDataBuffer;
|
||||
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
#ifndef GUARD_SAVE_MENU_UTIL_H
|
||||
#define GUARD_SAVE_MENU_UTIL_H
|
||||
|
||||
enum SaveStat
|
||||
{
|
||||
SAVE_STAT_NAME = 0,
|
||||
SAVE_STAT_POKEDEX,
|
||||
SAVE_STAT_TIME,
|
||||
SAVE_STAT_LOCATION,
|
||||
SAVE_STAT_BADGES
|
||||
};
|
||||
|
||||
void SaveStatToString(u8 a0, u8 *a1, u8 a2);
|
||||
|
||||
#endif //GUARD_SAVE_MENU_UTIL_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);
|
||||
|
||||
@@ -4,7 +4,10 @@
|
||||
#include "global.h"
|
||||
|
||||
void AppendToList(u8* list, u8* pos, u8 newEntry);
|
||||
void sub_806F1F0(u8 taskId);
|
||||
void sub_806F1D4(void);
|
||||
void Task_StartMenuHandleInput(u8 taskId);
|
||||
void SetUpReturnToStartMenu(void);
|
||||
void ShowStartMenu(void);
|
||||
void Field_AskSaveTheGame(void);
|
||||
void CB2_SetUpSaveAfterLinkBattle(void);
|
||||
|
||||
#endif // GUARD_START_MENU_H
|
||||
|
||||
+49
-3
@@ -77,8 +77,8 @@ extern const u8 gText_Ferry[];
|
||||
extern const u8 gText_SecretBase[];
|
||||
extern const u8 gText_Hideout[];
|
||||
extern const u8 gText_FlyToWhere[];
|
||||
extern const u8 gText_PokemonLeague[];
|
||||
extern const u8 gText_PokemonCenter[];
|
||||
extern const u8 gStartMenuText_PokemonLeague[];
|
||||
extern const u8 gStartMenuText_PokemonCenter[];
|
||||
extern const u8 gText_ApostropheSBase[];
|
||||
extern const u8 gText_NoRegistry[];
|
||||
extern const u8 gText_OkayToDeleteFromRegistry[];
|
||||
@@ -90,7 +90,7 @@ extern const u8 gText_IsThisTheCorrectTime[];
|
||||
extern const u8 gText_PkmnFainted3[];
|
||||
extern const u8 gText_Coins[];
|
||||
extern const u8 gText_EggNickname[];
|
||||
extern const u8 gText_Pokemon[];
|
||||
extern const u8 gStartMenuText_Pokemon[];
|
||||
extern const u8 gText_PkmnFainted3[];
|
||||
|
||||
extern const u8 gOtherText_Use[];
|
||||
@@ -426,4 +426,50 @@ extern const u8 gText_HaventReceivedGiftOkayToDiscard[];
|
||||
extern const u8 gText_SendingWonderCard[];
|
||||
extern const u8 gText_SendingWonderNews[];
|
||||
|
||||
// player_pc
|
||||
extern const u8 gText_WhatWouldYouLikeToDo[];
|
||||
extern const u8 gText_TakeOutItemsFromThePC[];
|
||||
extern const u8 gText_StoreItemsInThePC[];
|
||||
extern const u8 gText_GoBackToThePreviousMenu[];
|
||||
extern const u8 gText_ItemStorage[];
|
||||
extern const u8 gText_Mailbox[];
|
||||
extern const u8 gText_TurnOff[];
|
||||
extern const u8 gText_WithdrawItem2[];
|
||||
extern const u8 gText_DepositItem2[];
|
||||
extern const u8 gOtherText_Read[];
|
||||
extern const u8 gOtherText_MoveToBag[];
|
||||
extern const u8 gOtherText_Give2[];
|
||||
extern const u8 gText_TheresNoMailHere[];
|
||||
extern const u8 gText_ThereAreNoItems[];
|
||||
extern const u8 gText_WhatWouldYouLikeToDoWithPlayersMail[];
|
||||
extern const u8 gText_MessageWillBeLost[];
|
||||
extern const u8 gText_BagIsFull[];
|
||||
extern const u8 gText_MailReturnedToBagMessageErased[];
|
||||
|
||||
// start_menu
|
||||
extern const u8 gStartMenuText_Pokedex[];
|
||||
extern const u8 gStartMenuText_Pokemon[];
|
||||
extern const u8 gStartMenuText_Bag[];
|
||||
extern const u8 gStartMenuText_Player[];
|
||||
extern const u8 gStartMenuText_Save[];
|
||||
extern const u8 gStartMenuText_Option[];
|
||||
extern const u8 gStartMenuText_Exit[];
|
||||
extern const u8 gStartMenuText_Retire[];
|
||||
extern const u8 gUnknown_84162A9[];
|
||||
extern const u8 gStartMenuDesc_Pokedex[];
|
||||
extern const u8 gStartMenuDesc_Pokemon[];
|
||||
extern const u8 gStartMenuDesc_Bag[];
|
||||
extern const u8 gStartMenuDesc_Player[];
|
||||
extern const u8 gStartMenuDesc_Save[];
|
||||
extern const u8 gStartMenuDesc_Option[];
|
||||
extern const u8 gStartMenuDesc_Exit[];
|
||||
extern const u8 gStartMenuDesc_Retire[];
|
||||
extern const u8 gStartMenuDesc_Player[];
|
||||
extern const u8 gText_SaveError_PleaseExchangeBackupMemory[];
|
||||
extern const u8 gText_SavingDontTurnOffThePower2[];
|
||||
extern const u8 gSaveStatName_Player[];
|
||||
extern const u8 gSaveStatName_Badges[];
|
||||
extern const u8 gSaveStatName_Pokedex[];
|
||||
extern const u8 gSaveStatName_Time[];
|
||||
|
||||
#endif //GUARD_STRINGS_H
|
||||
|
||||
@@ -40,4 +40,7 @@ struct TrainerCard
|
||||
|
||||
extern struct TrainerCard gTrainerCards[4];
|
||||
|
||||
void InitTrainerCard(MainCallback callback);
|
||||
void InitLinkPartnerTrainerCard(u8 whoseCard, MainCallback callback);
|
||||
|
||||
#endif //GUARD_TRAINER_CARD_H
|
||||
|
||||
Reference in New Issue
Block a user