Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge

Browse Source 
Conflicts:
	include/battle_anim.h
	include/battle_controllers.h
	include/battle_gfx_sfx_util.h
	include/battle_interface.h
	include/battle_main.h
	include/battle_script_commands.h
	include/battle_util.h
	include/easy_chat.h
	include/event_object_movement.h
	include/field_effect.h
	include/field_effect_helpers.h
	include/field_player_avatar.h
	include/intro.h
	include/item_use.h
	include/metatile_behavior.h
	include/move_relearner.h
	include/pokedex.h
	include/pokemon.h
	include/pokemon_icon.h
	include/roamer.h
	include/script_pokemon_util.h
	include/sprite.h
	include/text.h
	include/wild_encounter.h
	src/battle_controllers.c
This commit is contained in:
Hedara 2025-05-24 20:38:21 +02:00
commit 2b92ba315a
93 changed files with 715 additions and 721 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/AgbRfu_LinkManager.h
View File

@ -189,9 +189,9 @@ extern struct linkManagerTag lman;
u32 rfu_LMAN_REQBN_softReset_and_checkID(void); u32 rfu_LMAN_REQBN_softReset_and_checkID(void);
void rfu_LMAN_requestChangeAgbClockMaster(void); void rfu_LMAN_requestChangeAgbClockMaster(void);
void rfu_LMAN_initializeRFU(INIT_PARAM *init_params); void rfu_LMAN_initializeRFU(INIT_PARAM *init_parameters);
u8 rfu_LMAN_establishConnection(u8 parent_child, u16 connect_period, u16 name_accept_period, u16 *acceptable_serialNo_list); u8 rfu_LMAN_establishConnection(u8 parent_child, u16 connect_period, u16 name_accept_period, u16 *acceptable_serialNo_list);
void rfu_LMAN_stopManager(bool8 forced_stop_and_RFU_reset_flag); void rfu_LMAN_stopManager(u8 forced_stop_and_RFU_reset_flag);
void rfu_LMAN_setMSCCallback(void (*MSC_callback_p)(u16)); void rfu_LMAN_setMSCCallback(void (*MSC_callback_p)(u16));
void rfu_LMAN_REQ_sendData(bool8 clockChangeFlag); void rfu_LMAN_REQ_sendData(bool8 clockChangeFlag);
void rfu_LMAN_powerDownRFU(void); void rfu_LMAN_powerDownRFU(void);

49
include/battle_anim.h
View File

@ -76,13 +76,13 @@ s8 BattleAnimAdjustPanning2(s8 pan);
s16 KeepPanInRange(s16 panArg, int oldPan); s16 KeepPanInRange(s16 panArg, int oldPan);
s16 CalculatePanIncrement(s16 sourcePan, s16 targetPan, s16 incrementPan); s16 CalculatePanIncrement(s16 sourcePan, s16 targetPan, s16 incrementPan);
void RelocateBattleBgPal(u16 paletteNum, u16 *dest, u32 offset, bool8 largeScreen); void RelocateBattleBgPal(u16 paletteNum, u16 *dest, u32 offset, bool8 largeScreen);
void ResetBattleAnimBg(bool8); void ResetBattleAnimBg(bool8 toBG2);
void LoadMoveBg(u16 bgId); void LoadMoveBg(u16 bgId);
// battle_intro.c // battle_intro.c
void SetAnimBgAttribute(u8 bgId, u8 attributeId, u8 value); void SetAnimBgAttribute(u8 bgId, u8 attributeId, u8 value);
void DrawBattlerOnBg(int bgId, u8 x, u8 y, u8 battlerPosition, u8 paletteId, u8 *tiles, u16 *tilemap, u16 tilesOffset); void DrawBattlerOnBg(int bgId, u8 x, u8 y, u8 battlerPosition, u8 paletteId, u8 *tiles, u16 *tilemap, u16 tilesOffset);
void HandleIntroSlide(u8 environmentId); void HandleIntroSlide(u8 environment);
int GetAnimBgAttribute(u8 bgId, u8 attributeId); int GetAnimBgAttribute(u8 bgId, u8 attributeId);
// battle_anim_mons.c // battle_anim_mons.c
@ -102,7 +102,7 @@ void StartAnimLinearTranslation(struct Sprite *sprite);
void InitAnimArcTranslation(struct Sprite *sprite); void InitAnimArcTranslation(struct Sprite *sprite);
bool8 AnimTranslateLinear(struct Sprite *sprite); bool8 AnimTranslateLinear(struct Sprite *sprite);
void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite); void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite);
u8 GetBattlerSpriteCoord2(u8 battler, u8 attributeId); u8 GetBattlerSpriteCoord2(u8 battler, u8 coordType);
void InitAnimLinearTranslationWithSpeed(struct Sprite *sprite); void InitAnimLinearTranslationWithSpeed(struct Sprite *sprite);
u16 ArcTan2Neg(s16 x, s16 y); u16 ArcTan2Neg(s16 x, s16 y);
void TrySetSpriteRotScale(struct Sprite *sprite, bool8 recalcCenterVector, s16 xScale, s16 yScale, u16 rotation); void TrySetSpriteRotScale(struct Sprite *sprite, bool8 recalcCenterVector, s16 xScale, s16 yScale, u16 rotation);
@ -118,11 +118,11 @@ void AnimTravelDiagonally(struct Sprite *sprite);
void InitAnimLinearTranslation(struct Sprite *sprite); void InitAnimLinearTranslation(struct Sprite *sprite);
void AnimTranslateLinear_WithFollowup(struct Sprite *sprite); void AnimTranslateLinear_WithFollowup(struct Sprite *sprite);
u8 GetBattlerSpriteBGPriority(u8 battler); u8 GetBattlerSpriteBGPriority(u8 battler);
void *LoadPointerFromVars(s16 bottom, s16 top); void *LoadPointerFromVars(s16 lo, s16 hi);
void StorePointerInVars(s16 *bottom, s16 *top, const void *ptr); void StorePointerInVars(s16 *lo, s16 *hi, const void *ptr);
void InitPrioritiesForVisibleBattlers(void); void InitPrioritiesForVisibleBattlers(void);
void GetBattleAnimBg1Data(struct BattleAnimBgData *); void GetBattleAnimBg1Data(struct BattleAnimBgData *out);
void GetBattleAnimBgData(struct BattleAnimBgData *, u32 bgId); void GetBattleAnimBgData(struct BattleAnimBgData *out, u32 bgId);
u8 GetBattlerSpriteSubpriority(u8 battler); u8 GetBattlerSpriteSubpriority(u8 battler);
bool8 TranslateAnimHorizontalArc(struct Sprite *sprite); bool8 TranslateAnimHorizontalArc(struct Sprite *sprite);
void TranslateSpriteLinearByIdFixedPoint(struct Sprite *sprite); void TranslateSpriteLinearByIdFixedPoint(struct Sprite *sprite);
@ -135,16 +135,16 @@ u32 GetBattlePalettesMask(bool8 battleBackground, bool8 attacker, bool8 target,
u32 GetBattleMonSpritePalettesMask(u8 playerLeft, u8 playerRight, u8 opponentLeft, u8 opponentRight); u32 GetBattleMonSpritePalettesMask(u8 playerLeft, u8 playerRight, u8 opponentLeft, u8 opponentRight);
u8 GetSpritePalIdxByBattler(u8 battler); u8 GetSpritePalIdxByBattler(u8 battler);
s16 CloneBattlerSpriteWithBlend(u8 animBattler); s16 CloneBattlerSpriteWithBlend(u8 animBattler);
void DestroySpriteWithActiveSheet(struct Sprite *); void DestroySpriteWithActiveSheet(struct Sprite *sprite);
u8 CreateInvisibleSpriteCopy(int, u8, int); u8 CreateInvisibleSpriteCopy(int battler, u8 spriteId, int species);
void AnimLoadCompressedBgTilemapHandleContest(struct BattleAnimBgData *, const void *, bool32); void AnimLoadCompressedBgTilemapHandleContest(struct BattleAnimBgData *data, const void *src, bool32 largeScreen);
void AnimLoadCompressedBgGfx(u32, const u32 *, u32); void AnimLoadCompressedBgGfx(u32 bgId, const u32 *src, u32 tilesOffset);
void UpdateAnimBg3ScreenSize(bool8); void UpdateAnimBg3ScreenSize(bool8 largeScreenSize);
void TranslateSpriteInGrowingCircle(struct Sprite *); void TranslateSpriteInGrowingCircle(struct Sprite *sprite);
void SetBattlerSpriteYOffsetFromYScale(u8 spriteId); void SetBattlerSpriteYOffsetFromYScale(u8 spriteId);
void PrepareEruptAnimTaskData(struct Task *task, u8 spriteId, s16 xScaleStart, s16 yScaleStart, s16 xScaleEnd, s16 yScaleEnd, u16 duration); void PrepareEruptAnimTaskData(struct Task *task, u8 spriteId, s16 xScaleStart, s16 yScaleStart, s16 xScaleEnd, s16 yScaleEnd, u16 duration);
u8 UpdateEruptAnimTask(struct Task *task); u8 UpdateEruptAnimTask(struct Task *task);
void DestroyAnimSpriteAndDisableBlend(struct Sprite *); void DestroyAnimSpriteAndDisableBlend(struct Sprite *sprite);
void AnimLoadCompressedBgTilemap(u32 bgId, const void *src); void AnimLoadCompressedBgTilemap(u32 bgId, const void *src);
void InitAnimFastLinearTranslationWithSpeed(struct Sprite *sprite); void InitAnimFastLinearTranslationWithSpeed(struct Sprite *sprite);
bool8 AnimFastTranslateLinear(struct Sprite *sprite); bool8 AnimFastTranslateLinear(struct Sprite *sprite);
@ -154,11 +154,11 @@ void TranslateSpriteLinear(struct Sprite *sprite);
void AnimSpriteOnMonPos(struct Sprite *sprite); void AnimSpriteOnMonPos(struct Sprite *sprite);
void InitAnimLinearTranslationWithSpeedAndPos(struct Sprite *sprite); void InitAnimLinearTranslationWithSpeedAndPos(struct Sprite *sprite);
void TranslateSpriteInCircle(struct Sprite *sprite); void TranslateSpriteInCircle(struct Sprite *sprite);
void SetGrayscaleOrOriginalPalette(u16 palNum, bool8 restoreOriginal); void SetGrayscaleOrOriginalPalette(u16 paletteNum, bool8 restoreOriginalColor);
void PrepareAffineAnimInTaskData(struct Task *task, u8 spriteId, const union AffineAnimCmd *affineAnimCmds); void PrepareAffineAnimInTaskData(struct Task *task, u8 spriteId, const union AffineAnimCmd *affineAnimCmds);
bool8 RunAffineAnimFromTaskData(struct Task *task); bool8 RunAffineAnimFromTaskData(struct Task *task);
void AnimThrowProjectile(struct Sprite *sprite); void AnimThrowProjectile(struct Sprite *sprite);
void GetBgDataForTransform(struct BattleAnimBgData *dest, u8 battler); void GetBgDataForTransform(struct BattleAnimBgData *out, u8 battler);
u8 CreateAdditionalMonSpriteForMoveAnim(u16 species, bool8 isBackpic, u8 id, s16 x, s16 y, u8 subpriority, u32 personality, bool8 isShiny, u32 battler); u8 CreateAdditionalMonSpriteForMoveAnim(u16 species, bool8 isBackpic, u8 id, s16 x, s16 y, u8 subpriority, u32 personality, bool8 isShiny, u32 battler);
void ResetSpriteRotScale_PreserveAffine(struct Sprite *sprite); void ResetSpriteRotScale_PreserveAffine(struct Sprite *sprite);
void Trade_MoveSelectedMonToTarget(struct Sprite *sprite); void Trade_MoveSelectedMonToTarget(struct Sprite *sprite);
@ -188,14 +188,14 @@ enum
BATTLER_COORD_ATTR_RAW_BOTTOM, BATTLER_COORD_ATTR_RAW_BOTTOM,
}; };
u8 GetBattlerSpriteCoord(u8 battler, u8 attributeId); u8 GetBattlerSpriteCoord(u8 battler, u8 coordType);
bool8 IsBattlerSpritePresent(u8 battler); bool8 IsBattlerSpritePresent(u8 battler);
void ClearBattleAnimBg(u32 bgId); void ClearBattleAnimBg(u32 bgId);
u8 GetAnimBattlerSpriteId(u8 wantedBattler); u8 GetAnimBattlerSpriteId(u8 wantedBattler);
u8 GetBattleBgPaletteNum(void); u8 GetBattleBgPaletteNum(void);
u8 GetBattlerSpriteBGPriorityRank(u8 battler); u8 GetBattlerSpriteBGPriorityRank(u8 battler);
void StoreSpriteCallbackInData6(struct Sprite *sprite, void (*spriteCallback)(struct Sprite *)); void StoreSpriteCallbackInData6(struct Sprite *sprite, void (*callback)(struct Sprite *));
void SetSpritePrimaryCoordsFromSecondaryCoords(struct Sprite *sprite); void SetSpritePrimaryCoordsFromSecondaryCoords(struct Sprite *sprite);
u8 GetBattlerSpriteDefault_Y(u8 battler); u8 GetBattlerSpriteDefault_Y(u8 battler);
u8 GetSubstituteSpriteDefault_Y(u8 battler); u8 GetSubstituteSpriteDefault_Y(u8 battler);
@ -235,18 +235,17 @@ extern const union AffineAnimCmd *const gAffineAnims_SpinningBone[];
// battle_anim_throw.c // battle_anim_throw.c
void TryShinyAnimation(u8 battler, struct Pokemon *mon); void TryShinyAnimation(u8 battler, struct Pokemon *mon);
u8 AnimateBallOpenParticles(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballId); u8 AnimateBallOpenParticles(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballId);
u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 spritePalNum, u32 selectedPalettes, u8 ballId); u8 LaunchBallFadeMonTask(bool8 unfadeLater, u8 spritePalNum, u32 selectedPalettes, u8 ballId);
bool32 IsCriticalCapture(void); bool32 IsCriticalCapture(void);
// battle_anim_utility_funcs.c // battle_anim_utility_funcs.c
void InitStatsChangeAnimation(u8); void InitStatsChangeAnimation(u8 taskId);
void StartMonScrollingBgMask(u8 taskId, int unused, u16 scrollSpeed, u8 battler, bool8 includePartner, u8 numFadeSteps, u8 fadeStepDelay, u8 duration, const u32 *gfx, const u32 *tilemap, const u32 *palette); void StartMonScrollingBgMask(u8 taskId, int UNUSED unused, u16 scrollSpeed, u8 battler, bool8 includePartner, u8 numFadeSteps, u8 fadeStepDelay, u8 duration, const u32 *gfx, const u32 *tilemap, const u32 *palette);
// battle_anim_effects_1.c // battle_anim_effects_1.c
void AnimFalseSwipeSlice_Step3(struct Sprite *); void AnimFalseSwipeSlice_Step3(struct Sprite *);
void SetSpriteNextToMonHead(u8 battler, struct Sprite *sprite); void SetSpriteNextToMonHead(u8 battler, struct Sprite *sprite);
void AnimMoveTwisterParticle(struct Sprite *sprite); void AnimMoveTwisterParticle(struct Sprite *sprite);
void AnimParticleBurst(struct Sprite *); void AnimParticleBurst(struct Sprite *sprite);
void AnimPowerAbsorptionOrb(struct Sprite *sprite); void AnimPowerAbsorptionOrb(struct Sprite *sprite);
void AnimNeedleArmSpike(struct Sprite *); void AnimNeedleArmSpike(struct Sprite *);
void AnimTask_CompressTargetHorizontally(u8 taskId); void AnimTask_CompressTargetHorizontally(u8 taskId);
@ -382,9 +381,9 @@ void AnimPsychoBoost(struct Sprite *sprite);
// battle_anim_smokescreen.c // battle_anim_smokescreen.c
u8 SmokescreenImpact(s16 x, s16 y, bool8 persist); u8 SmokescreenImpact(s16 x, s16 y, bool8 persist);
u32 UnpackSelectedBattlePalettes(s16); u32 UnpackSelectedBattlePalettes(s16 selector);
u8 GetBattlerSpriteFinal_Y(u8, u16, u8); u8 GetBattlerSpriteFinal_Y(u8 battler, u16 species, bool8 a3);
extern const struct OamData gOamData_AffineOff_ObjNormal_8x16; extern const struct OamData gOamData_AffineOff_ObjNormal_8x16;
extern const struct OamData gOamData_AffineNormal_ObjBlend_16x16; extern const struct OamData gOamData_AffineNormal_ObjBlend_16x16;

4
include/battle_controllers.h
View File

@ -355,8 +355,8 @@ u32 LinkPlayerGetTrainerPicId(u32 multiplayerId);
void CB2_SetUpReshowBattleScreenAfterMenu(void); void CB2_SetUpReshowBattleScreenAfterMenu(void);
void CB2_SetUpReshowBattleScreenAfterMenu2(void); void CB2_SetUpReshowBattleScreenAfterMenu2(void);
void Task_PlayerController_RestoreBgmAfterCry(u8 taskId); void Task_PlayerController_RestoreBgmAfterCry(u8 taskId);
void ActionSelectionCreateCursorAt(u8 cursorPos, u8 unused); void ActionSelectionCreateCursorAt(u8 cursorPosition, u8 baseTileNum);
void ActionSelectionDestroyCursorAt(u8 cursorPos); void ActionSelectionDestroyCursorAt(u8 cursorPosition);
void InitMoveSelectionsVarsAndStrings(u32 battler); void InitMoveSelectionsVarsAndStrings(u32 battler);
void MoveSelectionCreateCursorAt(u8 cursorPos, u8 arg1); void MoveSelectionCreateCursorAt(u8 cursorPos, u8 arg1);
void MoveSelectionDestroyCursorAt(u8 cursorPosition); void MoveSelectionDestroyCursorAt(u8 cursorPosition);

2
include/battle_gfx_sfx_util.h
View File

@ -22,7 +22,7 @@ bool8 BattleInitAllSprites(u8 *state1, u8 *battler);
void ClearSpritesHealthboxAnimData(void); void ClearSpritesHealthboxAnimData(void);
void CopyAllBattleSpritesInvisibilities(void); void CopyAllBattleSpritesInvisibilities(void);
void CopyBattleSpriteInvisibility(u8 battler); void CopyBattleSpriteInvisibility(u8 battler);
void HandleSpeciesGfxDataChange(u8 attacker, u8 target, bool32 megaEvo, bool8 trackEnemyPersonality); void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, bool32 megaEvo, bool8 trackEnemyPersonality);
void BattleLoadSubstituteOrMonSpriteGfx(u8 battler, bool8 loadMonSprite); void BattleLoadSubstituteOrMonSpriteGfx(u8 battler, bool8 loadMonSprite);
void LoadBattleMonGfxAndAnimate(u8 battler, bool8 loadMonSprite, u8 spriteId); void LoadBattleMonGfxAndAnimate(u8 battler, bool8 loadMonSprite, u8 spriteId);
void TrySetBehindSubstituteSpriteBit(u8 battler, u16 move); void TrySetBehindSubstituteSpriteBit(u8 battler, u16 move);

4
include/battle_interface.h
View File

@ -103,10 +103,10 @@ enum
u32 WhichBattleCoords(u32 battlerId); u32 WhichBattleCoords(u32 battlerId);
u8 CreateBattlerHealthboxSprites(u8 battler); u8 CreateBattlerHealthboxSprites(u8 battler);
u8 CreateSafariPlayerHealthboxSprites(void); u8 CreateSafariPlayerHealthboxSprites(void);
void SetBattleBarStruct(u8 battler, u8 healthboxSpriteId, s32 maxVal, s32 currVal, s32 receivedValue); void SetBattleBarStruct(u8 battler, u8 healthboxSpriteId, s32 maxVal, s32 oldVal, s32 receivedValue);
void SetHealthboxSpriteInvisible(u8 healthboxSpriteId); void SetHealthboxSpriteInvisible(u8 healthboxSpriteId);
void SetHealthboxSpriteVisible(u8 healthboxSpriteId); void SetHealthboxSpriteVisible(u8 healthboxSpriteId);
void DummyBattleInterfaceFunc(u8 healthboxSpriteId, bool8 isDoubleBattleBankOnly); void DummyBattleInterfaceFunc(u8 healthboxSpriteId, bool8 isDoubleBattleBattlerOnly);
void UpdateOamPriorityInAllHealthboxes(u8 priority, bool32 hideHpBoxes); void UpdateOamPriorityInAllHealthboxes(u8 priority, bool32 hideHpBoxes);
void InitBattlerHealthboxCoords(u8 battler); void InitBattlerHealthboxCoords(u8 battler);
void GetBattlerHealthboxCoords(u8 battler, s16 *x, s16 *y); void GetBattlerHealthboxCoords(u8 battler, s16 *x, s16 *y);

2
include/battle_main.h
View File

@ -45,7 +45,7 @@ void SpriteCB_VsLetterDummy(struct Sprite *sprite);
void SpriteCB_VsLetterInit(struct Sprite *sprite); void SpriteCB_VsLetterInit(struct Sprite *sprite);
void CB2_InitEndLinkBattle(void); void CB2_InitEndLinkBattle(void);
u32 GetBattleBgTemplateData(u8 arrayId, u8 caseId); u32 GetBattleBgTemplateData(u8 arrayId, u8 caseId);
u32 GetBattleWindowTemplatePixelWidth(u32 setId, u32 tableId); u32 GetBattleWindowTemplatePixelWidth(u32 windowsType, u32 tableId);
void SpriteCB_WildMon(struct Sprite *sprite); void SpriteCB_WildMon(struct Sprite *sprite);
void SpriteCallbackDummy_2(struct Sprite *sprite); void SpriteCallbackDummy_2(struct Sprite *sprite);
void SpriteCB_FaintOpponentMon(struct Sprite *sprite); void SpriteCB_FaintOpponentMon(struct Sprite *sprite);

2
include/battle_pyramid.h
View File

@ -15,7 +15,7 @@ void CopyPyramidTrainerSpeechBefore(u16 trainerId);
void CopyPyramidTrainerWinSpeech(u16 trainerId); void CopyPyramidTrainerWinSpeech(u16 trainerId);
void CopyPyramidTrainerLoseSpeech(u16 trainerId); void CopyPyramidTrainerLoseSpeech(u16 trainerId);
u8 GetTrainerEncounterMusicIdInBattlePyramid(u16 trainerId); u8 GetTrainerEncounterMusicIdInBattlePyramid(u16 trainerId);
void GenerateBattlePyramidFloorLayout(u16 *mapArg, bool8 setPlayerPosition); void GenerateBattlePyramidFloorLayout(u16 *backupMapData, bool8 setPlayerPosition);
void LoadBattlePyramidObjectEventTemplates(void); void LoadBattlePyramidObjectEventTemplates(void);
void LoadBattlePyramidFloorObjectEventScripts(void); void LoadBattlePyramidFloorObjectEventScripts(void);
u8 GetNumBattlePyramidObjectEvents(void); u8 GetNumBattlePyramidObjectEvents(void);

2
include/battle_util.h
View File

@ -212,7 +212,7 @@ bool32 HandleFaintedMonActions(void);
void TryClearRageAndFuryCutter(void); void TryClearRageAndFuryCutter(void);
u32 AtkCanceller_MoveSuccessOrder(void); u32 AtkCanceller_MoveSuccessOrder(void);
void SetAtkCancellerForCalledMove(void); void SetAtkCancellerForCalledMove(void);
bool32 HasNoMonsToSwitch(u32 battler, u8 r1, u8 r2); bool32 HasNoMonsToSwitch(u32 battler, u8 partyIdBattlerOn1, u8 partyIdBattlerOn2);
bool32 TryChangeBattleWeather(u32 battler, u32 battleWeatherId, bool32 viaAbility); bool32 TryChangeBattleWeather(u32 battler, u32 battleWeatherId, bool32 viaAbility);
bool32 CanAbilityBlockMove(u32 battlerAtk, u32 battlerDef, u32 move, u32 abilityDef, enum AbilityEffectOptions option); bool32 CanAbilityBlockMove(u32 battlerAtk, u32 battlerDef, u32 move, u32 abilityDef, enum AbilityEffectOptions option);
bool32 CanAbilityAbsorbMove(u32 battlerAtk, u32 battlerDef, u32 abilityDef, u32 move, u32 moveType, enum AbilityEffectOptions option); bool32 CanAbilityAbsorbMove(u32 battlerAtk, u32 battlerDef, u32 abilityDef, u32 move, u32 moveType, enum AbilityEffectOptions option);

5
include/berry.h
View File

@ -10,13 +10,12 @@ bool8 IsPlayerFacingEmptyBerryTreePatch(void);
bool8 TryToWaterBerryTree(void); bool8 TryToWaterBerryTree(void);
void ClearBerryTrees(void); void ClearBerryTrees(void);
void BerryTreeTimeUpdate(s32 minutes); void BerryTreeTimeUpdate(s32 minutes);
void PlantBerryTree(u8 id, u8 berry, u8 stage, bool8 sparkle); void PlantBerryTree(u8 id, u8 berry, u8 stage, bool8 allowGrowth);
void RemoveBerryTree(u8 id); void RemoveBerryTree(u8 id);
u8 GetBerryTypeByBerryTreeId(u8 id); u8 GetBerryTypeByBerryTreeId(u8 id);
u8 GetStageByBerryTreeId(u8); u8 GetStageByBerryTreeId(u8 id);
u8 ItemIdToBerryType(u16 item); u8 ItemIdToBerryType(u16 item);
void GetBerryNameByBerryType(u8 berry, u8 *string); void GetBerryNameByBerryType(u8 berry, u8 *string);
void ResetBerryTreeSparkleFlag(u8 id);
void Bag_ChooseBerry(void); void Bag_ChooseBerry(void);
void Bag_ChooseMulch(void); void Bag_ChooseMulch(void);
void ObjectEventInteractionGetBerryTreeData(void); void ObjectEventInteractionGetBerryTreeData(void);

2
include/cable_club.h
View File

@ -4,7 +4,7 @@
#include "task.h" #include "task.h"
#include "constants/cable_club.h" #include "constants/cable_club.h"
void CreateTask_EnterCableClubSeat(TaskFunc taskFunc); void CreateTask_EnterCableClubSeat(TaskFunc followupFunc);
u8 CreateTask_ReestablishCableClubLink(void); u8 CreateTask_ReestablishCableClubLink(void);
void CB2_ReturnFromCableClubBattle(void); void CB2_ReturnFromCableClubBattle(void);
bool32 AreBattleTowerLinkSpeciesSame(u16 *speciesList1, u16 *speciesList2); bool32 AreBattleTowerLinkSpeciesSame(u16 *speciesList1, u16 *speciesList2);

2
include/contest_ai.h
View File

@ -10,7 +10,7 @@ enum
CONTESTAI_DO_NOT_PROCESS CONTESTAI_DO_NOT_PROCESS
}; };
void ContestAI_ResetAI(u8); void ContestAI_ResetAI(u8 contestantAI);
u8 ContestAI_GetActionToUse(void); u8 ContestAI_GetActionToUse(void);
#endif // GUARD_CONTESTAI_H #endif // GUARD_CONTESTAI_H

34
include/contest_link.h
View File

@ -1,23 +1,23 @@
#ifndef GUARD_CONTEST_LINK_H #ifndef GUARD_CONTEST_LINK_H
#define GUARD_CONTEST_LINK_H #define GUARD_CONTEST_LINK_H
void Task_LinkContest_CommunicateAppealsState(u8); void Task_LinkContest_CommunicateAppealsState(u8 taskId);
void Task_LinkContest_CommunicateFinalStandings(u8); void Task_LinkContest_CommunicateFinalStandings(u8 taskId);
void Task_LinkContest_Init(u8); void Task_LinkContest_Init(u8 taskId);
void Task_LinkContest_CommunicateMonsRS(u8); void Task_LinkContest_CommunicateMonsRS(u8 taskId);
void Task_LinkContest_CommunicateRngRS(u8); void Task_LinkContest_CommunicateRngRS(u8 taskId);
void Task_LinkContest_CommunicateLeaderIdsRS(u8); void Task_LinkContest_CommunicateLeaderIdsRS(u8 taskId);
void Task_LinkContest_CommunicateCategoryRS(u8); void Task_LinkContest_CommunicateCategoryRS(u8 taskId);
void Task_LinkContest_CommunicateMonIdxs(u8); void Task_LinkContest_CommunicateMonIdxs(u8 taskId);
void Task_LinkContest_StartCommunicationEm(u8); void Task_LinkContest_StartCommunicationEm(u8 taskId);
void Task_LinkContest_CommunicateRound1Points(u8); void Task_LinkContest_CommunicateRound1Points(u8 taskId);
void Task_LinkContest_CommunicateTurnOrder(u8); void Task_LinkContest_CommunicateTurnOrder(u8 taskId);
void Task_LinkContest_FinalizeConnection(u8); void Task_LinkContest_FinalizeConnection(u8 taskId);
void Task_LinkContest_CommunicateMoveSelections(u8); void Task_LinkContest_CommunicateMoveSelections(u8 taskId);
bool32 LinkContest_TryLinkStandby(s16 *); bool32 LinkContest_TryLinkStandby(s16 *state);
bool32 LinkContest_SendBlock(void *, u16); bool32 LinkContest_SendBlock(void *src, u16 size);
bool8 LinkContest_GetBlockReceivedFromAllPlayers(void); bool8 LinkContest_GetBlockReceivedFromAllPlayers(void);
bool8 LinkContest_GetBlockReceived(u8); bool8 LinkContest_GetBlockReceived(u8 flag);
u8 LinkContest_GetLeaderIndex(u8 *); u8 LinkContest_GetLeaderIndex(u8 *ids);
#endif //GUARD_CONTEST_LINK_H #endif //GUARD_CONTEST_LINK_H

2
include/contest_painting.h
View File

@ -1,7 +1,7 @@
#ifndef GUARD_CONTESTPAINTING_H #ifndef GUARD_CONTESTPAINTING_H
#define GUARD_CONTESTPAINTING_H #define GUARD_CONTESTPAINTING_H
void SetContestWinnerForPainting(int); void SetContestWinnerForPainting(int contestWinnerId);
void CB2_ContestPainting(void); void CB2_ContestPainting(void);
#endif #endif

2
include/contest_util.h
View File

@ -6,7 +6,7 @@ void BufferContestantMonNickname(void);
void StartContest(void); void StartContest(void);
void BufferContestantMonSpecies(void); void BufferContestantMonSpecies(void);
void ShowContestResults(void); void ShowContestResults(void);
void ContestLinkTransfer(u8); void ContestLinkTransfer(u8 category);
void ShowContestPainting(void); void ShowContestPainting(void);
u16 GetContestRand(void); u16 GetContestRand(void);
u8 CountPlayerMuseumPaintings(void); u8 CountPlayerMuseumPaintings(void);

2
include/coord_event_weather.h
View File

@ -1,6 +1,6 @@
#ifndef GUARD_COORD_EVENT_WEATHER_H #ifndef GUARD_COORD_EVENT_WEATHER_H
#define GUARD_COORD_EVENT_WEATHER_H #define GUARD_COORD_EVENT_WEATHER_H
void DoCoordEventWeather(u8); void DoCoordEventWeather(u8 coordEventWeather);
#endif // GUARD_COORD_EVENT_WEATHER_H #endif // GUARD_COORD_EVENT_WEATHER_H

4
include/decoration.h
View File

@ -58,10 +58,10 @@ extern u8 gCurDecorationIndex;
void InitDecorationContextItems(void); void InitDecorationContextItems(void);
void DoSecretBaseDecorationMenu(u8 taskId); void DoSecretBaseDecorationMenu(u8 taskId);
void ShowDecorationOnMap(u16 mapX, u16 mapY, u16 decor); void ShowDecorationOnMap(u16 mapX, u16 mapY, u16 decoration);
void DoPlayerRoomDecorationMenu(u8 taskId); void DoPlayerRoomDecorationMenu(u8 taskId);
void ShowDecorationCategoriesWindow(u8 taskId); void ShowDecorationCategoriesWindow(u8 taskId);
void CopyDecorationCategoryName(u8 *dest, u8 decorCat); void CopyDecorationCategoryName(u8 *dest, u8 category);
bool8 IsSelectedDecorInThePC(void); bool8 IsSelectedDecorInThePC(void);
u8 AddDecorationIconObject(u8 decor, s16 x, s16 y, u8 priority, u16 tilesTag, u16 paletteTag); u8 AddDecorationIconObject(u8 decor, s16 x, s16 y, u8 priority, u16 tilesTag, u16 paletteTag);

6
include/decoration_inventory.h
View File

@ -12,9 +12,9 @@ extern struct DecorationInventory gDecorationInventories[];
void SetDecorationInventoriesPointers(void); void SetDecorationInventoriesPointers(void);
void ClearDecorationInventories(void); void ClearDecorationInventories(void);
s8 GetFirstEmptyDecorSlot(u8 category); s8 GetFirstEmptyDecorSlot(u8 category);
u8 CheckHasDecoration(u8 decor); bool8 CheckHasDecoration(u8 decor);
u8 DecorationAdd(u8 decor); bool8 DecorationAdd(u8 decor);
u8 DecorationCheckSpace(u8 decor); bool8 DecorationCheckSpace(u8 decor);
s8 DecorationRemove(u8 decor); s8 DecorationRemove(u8 decor);
void CondenseDecorationsInCategory(u8 category); void CondenseDecorationsInCategory(u8 category);
u8 GetNumOwnedDecorationsInCategory(u8 category); u8 GetNumOwnedDecorationsInCategory(u8 category);

14
include/easy_chat.h
View File

@ -122,16 +122,16 @@ struct EasyChatWordsByLetter
void InitEasyChatPhrases(void); void InitEasyChatPhrases(void);
void ShowEasyChatScreen(void); void ShowEasyChatScreen(void);
u8 *CopyEasyChatWord(u8 *dest, u16 word); u8 *CopyEasyChatWord(u8 *dest, u16 easyChatWord);
bool32 IsEasyChatAnswerUnlocked(int word); bool32 IsEasyChatAnswerUnlocked(int easyChatWord);
void InitializeEasyChatWordArray(u16 *words, u16 length); void InitializeEasyChatWordArray(u16 *words, u16 length);
u8 *ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 columns, u16 rows); u8 *ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 columns, u16 rows);
bool8 IsBardWordInvalid(u16 word); bool8 IsBardWordInvalid(u16 easyChatWord);
u16 GetRandomEasyChatWordFromGroup(u16 group); u16 GetRandomEasyChatWordFromGroup(u16 groupId);
u16 UnlockRandomTrendySaying(void); u16 UnlockRandomTrendySaying(void);
u16 EasyChat_GetNumWordsInGroup(u8); u16 EasyChat_GetNumWordsInGroup(u8 groupId);
u16 GetRandomEasyChatWordFromUnlockedGroup(u16); u16 GetRandomEasyChatWordFromUnlockedGroup(u16 groupId);
void DoEasyChatScreen(u8 type, u16 *words, MainCallback callback, u8 displayedPersonType); void DoEasyChatScreen(u8 type, u16 *words, MainCallback exitCallback, u8 displayedPersonType);
void InitQuestionnaireWords(void); void InitQuestionnaireWords(void);
void UnlockTrendySaying(u8 wordIndex); void UnlockTrendySaying(u8 wordIndex);

6
include/ereader_helpers.h
View File

@ -49,10 +49,10 @@ struct EReaderTrainerHillSet
u8 unk_ec0[40]; u8 unk_ec0[40];
}; // size = 0xf00 }; // size = 0xf00
bool8 ValidateTrainerHillData(struct EReaderTrainerHillSet *); bool8 ValidateTrainerHillData(struct EReaderTrainerHillSet *hillSet);
bool32 TryWriteTrainerHill(struct EReaderTrainerHillSet *); bool32 TryWriteTrainerHill(struct EReaderTrainerHillSet *hillSet);
bool32 ReadTrainerHillAndValidate(void); bool32 ReadTrainerHillAndValidate(void);
int EReaderHandleTransfer(u8, size_t, const void *, void *); int EReaderHandleTransfer(u8 mode, size_t size, const void *data, void *recvBuffer);
void EReaderHelper_Timer3Callback(void); void EReaderHelper_Timer3Callback(void);
void EReaderHelper_SerialCallback(void); void EReaderHelper_SerialCallback(void);
void EReaderHelper_SaveRegsState(void); void EReaderHelper_SaveRegsState(void);

462
include/event_object_movement.h
View File

@ -133,28 +133,28 @@ void LoadSpecialObjectReflectionPalette(u16 tag, u8 slot);
void TryMoveObjectEventToMapCoords(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y); void TryMoveObjectEventToMapCoords(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y);
void PatchObjectPalette(u16 paletteTag, u8 paletteSlot); void PatchObjectPalette(u16 paletteTag, u8 paletteSlot);
void SpawnObjectEventsOnReturnToField(s16 x, s16 y); void SpawnObjectEventsOnReturnToField(s16 x, s16 y);
void OverrideSecretBaseDecorationSpriteScript(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat); void OverrideSecretBaseDecorationSpriteScript(u8 localId, u8 mapNum, u8 mapGroup, u8 decorationCategory);
void GetMapCoordsFromSpritePos(s16 x, s16 y, s16 *destX, s16 *destY); void GetMapCoordsFromSpritePos(s16 x, s16 y, s16 *destX, s16 *destY);
u8 GetFaceDirectionAnimNum(u8 direction); u8 GetFaceDirectionAnimNum(u8 direction);
void SetSpritePosToOffsetMapCoords(s16 *x, s16 *y, s16 dx, s16 dy); void SetSpritePosToOffsetMapCoords(s16 *x, s16 *y, s16 dx, s16 dy);
void ClearObjectEventMovement(struct ObjectEvent *objectEvent, struct Sprite *sprite); void ClearObjectEventMovement(struct ObjectEvent *objectEvent, struct Sprite *sprite);
void ObjectEventClearHeldMovement(struct ObjectEvent *); void ObjectEventClearHeldMovement(struct ObjectEvent *objectEvent);
void ObjectEventClearHeldMovementIfActive(struct ObjectEvent *); void ObjectEventClearHeldMovementIfActive(struct ObjectEvent *objectEvent);
struct Pokemon *GetFirstLiveMon(void); struct Pokemon *GetFirstLiveMon(void);
u16 GetOverworldWeatherSpecies(u16 species); u16 GetOverworldWeatherSpecies(u16 species);
void UpdateFollowingPokemon(void); void UpdateFollowingPokemon(void);
void RemoveFollowingPokemon(void); void RemoveFollowingPokemon(void);
struct ObjectEvent *GetFollowerObject(void); struct ObjectEvent *GetFollowerObject(void);
void TrySpawnObjectEvents(s16 cameraX, s16 cameraY); void TrySpawnObjectEvents(s16 cameraX, s16 cameraY);
u8 CreateObjectGraphicsSprite(u16, void (*)(struct Sprite *), s16 x, s16 y, u8 subpriority); u8 CreateObjectGraphicsSprite(u16 graphicsId, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority);
u8 TrySpawnObjectEvent(u8 localId, u8 mapNum, u8 mapGroup); u8 TrySpawnObjectEvent(u8 localId, u8 mapNum, u8 mapGroup);
u8 SpawnSpecialObjectEventParameterized(u16 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 elevation); u8 SpawnSpecialObjectEventParameterized(u16 graphicsId, u8 movementBehavior, u8 localId, s16 x, s16 y, u8 elevation);
u8 SpawnSpecialObjectEvent(struct ObjectEventTemplate *); u8 SpawnSpecialObjectEvent(struct ObjectEventTemplate *objectEventTemplate);
void SetSpritePosToMapCoords(s16 mapX, s16 mapY, s16 *destX, s16 *destY); void SetSpritePosToMapCoords(s16 mapX, s16 mapY, s16 *destX, s16 *destY);
void CameraObjectReset(void); void CameraObjectReset(void);
u8 UpdateSpritePaletteByTemplate(const struct SpriteTemplate *, struct Sprite *); u8 UpdateSpritePaletteByTemplate(const struct SpriteTemplate *spriteTemplate, struct Sprite *sprite);
void ObjectEventSetGraphicsId(struct ObjectEvent *, u16 graphicsId); void ObjectEventSetGraphicsId(struct ObjectEvent *objectEvent, u16 graphicsId);
void ObjectEventTurn(struct ObjectEvent *, u8 direction); void ObjectEventTurn(struct ObjectEvent *objectEvent, u8 direction);
void ObjectEventTurnByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 direction); void ObjectEventTurnByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 direction);
const struct ObjectEventGraphicsInfo *GetObjectEventGraphicsInfo(u16 graphicsId); const struct ObjectEventGraphicsInfo *GetObjectEventGraphicsInfo(u16 graphicsId);
void SetObjectInvisibility(u8 localId, u8 mapNum, u8 mapGroup, bool8 invisible); void SetObjectInvisibility(u8 localId, u8 mapNum, u8 mapGroup, bool8 invisible);
@ -166,12 +166,12 @@ void ResetObjectSubpriority(u8 localId, u8 mapNum, u8 mapGroup);
void SetObjectSubpriority(u8 localId, u8 mapNum, u8 mapGroup, u8 subpriority); void SetObjectSubpriority(u8 localId, u8 mapNum, u8 mapGroup, u8 subpriority);
void AllowObjectAtPosTriggerGroundEffects(s16 x, s16 y); void AllowObjectAtPosTriggerGroundEffects(s16 x, s16 y);
void ObjectEventGetLocalIdAndMap(struct ObjectEvent *objectEvent, void *localId, void *mapNum, void *mapGroup); void ObjectEventGetLocalIdAndMap(struct ObjectEvent *objectEvent, void *localId, void *mapNum, void *mapGroup);
void ShiftObjectEventCoords(struct ObjectEvent *, s16 x, s16 y); void ShiftObjectEventCoords(struct ObjectEvent *objectEvent, s16 x, s16 y);
void MoveObjectEventToMapCoords(struct ObjectEvent *, s16 x, s16 y); void MoveObjectEventToMapCoords(struct ObjectEvent *objectEvent, s16 x, s16 y);
void TryOverrideObjectEventTemplateCoords(u8 localId, u8 mapNum, u8 mapGroup); void TryOverrideObjectEventTemplateCoords(u8 localId, u8 mapNum, u8 mapGroup);
void InitObjectEventPalettes(u8 palSlot); void InitObjectEventPalettes(u8 reflectionType);
void UpdateObjectEventCurrentMovement(struct ObjectEvent *, struct Sprite *, bool8(struct ObjectEvent *, struct Sprite *)); void UpdateObjectEventCurrentMovement(struct ObjectEvent *objectEvent, struct Sprite *sprite, bool8 (*callback)(struct ObjectEvent *, struct Sprite *));
u8 ObjectEventFaceOppositeDirection(struct ObjectEvent *, u8 direction); bool8 ObjectEventFaceOppositeDirection(struct ObjectEvent *objectEvent, u8 direction);
u8 GetOppositeDirection(u8 direction); u8 GetOppositeDirection(u8 direction);
u8 GetWalkInPlaceFasterMovementAction(u32); u8 GetWalkInPlaceFasterMovementAction(u32);
u8 GetWalkInPlaceFastMovementAction(u32); u8 GetWalkInPlaceFastMovementAction(u32);
@ -180,8 +180,8 @@ u8 GetWalkInPlaceSlowMovementAction(u32);
u8 GetCollisionAtCoords(struct ObjectEvent *, s16 x, s16 y, u32 dir); u8 GetCollisionAtCoords(struct ObjectEvent *, s16 x, s16 y, u32 dir);
u32 GetObjectObjectCollidesWith(struct ObjectEvent *objectEvent, s16 x, s16 y, bool32 addCoords); u32 GetObjectObjectCollidesWith(struct ObjectEvent *objectEvent, s16 x, s16 y, bool32 addCoords);
void MoveCoords(u8 direction, s16 *x, s16 *y); void MoveCoords(u8 direction, s16 *x, s16 *y);
bool8 ObjectEventIsHeldMovementActive(struct ObjectEvent *); bool8 ObjectEventIsHeldMovementActive(struct ObjectEvent *objectEvent);
u8 ObjectEventClearHeldMovementIfFinished(struct ObjectEvent *); u8 ObjectEventClearHeldMovementIfFinished(struct ObjectEvent *objectEvent);
u8 GetObjectEventIdByPosition(u16 x, u16 y, u8 elevation); u8 GetObjectEventIdByPosition(u16 x, u16 y, u8 elevation);
void SetTrainerMovementType(struct ObjectEvent *objectEvent, u8 movementType); void SetTrainerMovementType(struct ObjectEvent *objectEvent, u8 movementType);
u8 GetTrainerFacingDirectionMovementType(u8 direction); u8 GetTrainerFacingDirectionMovementType(u8 direction);
@ -225,12 +225,12 @@ u8 GetWalkSlowMovementAction(u32);
u8 GetWalkSlowStairsMovementAction(u32); u8 GetWalkSlowStairsMovementAction(u32);
u8 GetJumpMovementAction(u32); u8 GetJumpMovementAction(u32);
u8 ElevationToPriority(u8 elevation); u8 ElevationToPriority(u8 elevation);
void ObjectEventUpdateElevation(struct ObjectEvent *objEvent, struct Sprite *); void ObjectEventUpdateElevation(struct ObjectEvent *objectEvent, struct Sprite *sprite);
void SetObjectSubpriorityByElevation(u8 elevation, struct Sprite *, u8 subpriority); void SetObjectSubpriorityByElevation(u8 elevation, struct Sprite *sprite, u8 subpriority);
void UnfreezeObjectEvent(struct ObjectEvent *); void UnfreezeObjectEvent(struct ObjectEvent *objectEvent);
u8 FindLockedObjectEventIndex(struct ObjectEvent *); u8 FindLockedObjectEventIndex(struct ObjectEvent *objectEvent);
void SetAndStartSpriteAnim(struct Sprite *, u8 animNum, u8 animCmdIndex); void SetAndStartSpriteAnim(struct Sprite *sprite, u8 animNum, u8 animCmdIndex);
bool8 SpriteAnimEnded(struct Sprite *); bool8 SpriteAnimEnded(struct Sprite *sprite);
void UnfreezeObjectEvents(void); void UnfreezeObjectEvents(void);
void FreezeObjectEventsExceptOne(u8 objectEventId); void FreezeObjectEventsExceptOne(u8 objectEventId);
void FreezeObjectEventsExceptTwo(u8 objectEventId1, u8 objectEventId2); void FreezeObjectEventsExceptTwo(u8 objectEventId1, u8 objectEventId2);
@ -250,62 +250,62 @@ u8 GetObjectEventBerryTreeId(u8 objectEventId);
void SetBerryTreeJustPicked(u8 mapId, u8 mapNumber, u8 mapGroup); void SetBerryTreeJustPicked(u8 mapId, u8 mapNumber, u8 mapGroup);
bool8 IsBerryTreeSparkling(u8 localId, u8 mapNum, u8 mapGroup); bool8 IsBerryTreeSparkling(u8 localId, u8 mapNum, u8 mapGroup);
void MovementType_None(struct Sprite *); void MovementType_None(struct Sprite *sprite);
void MovementType_LookAround(struct Sprite *); void MovementType_LookAround(struct Sprite *sprite);
void MovementType_WanderAround(struct Sprite *); void MovementType_WanderAround(struct Sprite *sprite);
void MovementType_WanderUpAndDown(struct Sprite *); void MovementType_WanderUpAndDown(struct Sprite *sprite);
void MovementType_WanderLeftAndRight(struct Sprite *); void MovementType_WanderLeftAndRight(struct Sprite *sprite);
void MovementType_FaceDirection(struct Sprite *); void MovementType_FaceDirection(struct Sprite *sprite);
void MovementType_Player(struct Sprite *); void MovementType_Player(struct Sprite *sprite);
void MovementType_BerryTreeGrowth(struct Sprite *); void MovementType_BerryTreeGrowth(struct Sprite *sprite);
void MovementType_FaceDownAndUp(struct Sprite *); void MovementType_FaceDownAndUp(struct Sprite *sprite);
void MovementType_FaceLeftAndRight(struct Sprite *); void MovementType_FaceLeftAndRight(struct Sprite *sprite);
void MovementType_FaceUpAndLeft(struct Sprite *); void MovementType_FaceUpAndLeft(struct Sprite *sprite);
void MovementType_FaceUpAndRight(struct Sprite *); void MovementType_FaceUpAndRight(struct Sprite *sprite);
void MovementType_FaceDownAndLeft(struct Sprite *); void MovementType_FaceDownAndLeft(struct Sprite *sprite);
void MovementType_FaceDownAndRight(struct Sprite *); void MovementType_FaceDownAndRight(struct Sprite *sprite);
void MovementType_FaceDownUpAndLeft(struct Sprite *); void MovementType_FaceDownUpAndLeft(struct Sprite *sprite);
void MovementType_FaceDownUpAndRight(struct Sprite *); void MovementType_FaceDownUpAndRight(struct Sprite *sprite);
void MovementType_FaceUpRightAndLeft(struct Sprite *); void MovementType_FaceUpRightAndLeft(struct Sprite *sprite);
void MovementType_FaceDownRightAndLeft(struct Sprite *); void MovementType_FaceDownRightAndLeft(struct Sprite *sprite);
void MovementType_RotateCounterclockwise(struct Sprite *); void MovementType_RotateCounterclockwise(struct Sprite *sprite);
void MovementType_RotateClockwise(struct Sprite *); void MovementType_RotateClockwise(struct Sprite *sprite);
void MovementType_WalkBackAndForth(struct Sprite *); void MovementType_WalkBackAndForth(struct Sprite *sprite);
void MovementType_WalkSequenceUpRightLeftDown(struct Sprite *); void MovementType_WalkSequenceUpRightLeftDown(struct Sprite *sprite);
void MovementType_WalkSequenceRightLeftDownUp(struct Sprite *); void MovementType_WalkSequenceRightLeftDownUp(struct Sprite *sprite);
void MovementType_WalkSequenceDownUpRightLeft(struct Sprite *); void MovementType_WalkSequenceDownUpRightLeft(struct Sprite *sprite);
void MovementType_WalkSequenceLeftDownUpRight(struct Sprite *); void MovementType_WalkSequenceLeftDownUpRight(struct Sprite *sprite);
void MovementType_WalkSequenceUpLeftRightDown(struct Sprite *); void MovementType_WalkSequenceUpLeftRightDown(struct Sprite *sprite);
void MovementType_WalkSequenceLeftRightDownUp(struct Sprite *); void MovementType_WalkSequenceLeftRightDownUp(struct Sprite *sprite);
void MovementType_WalkSequenceDownUpLeftRight(struct Sprite *); void MovementType_WalkSequenceDownUpLeftRight(struct Sprite *sprite);
void MovementType_WalkSequenceRightDownUpLeft(struct Sprite *); void MovementType_WalkSequenceRightDownUpLeft(struct Sprite *sprite);
void MovementType_WalkSequenceLeftUpDownRight(struct Sprite *); void MovementType_WalkSequenceLeftUpDownRight(struct Sprite *sprite);
void MovementType_WalkSequenceUpDownRightLeft(struct Sprite *); void MovementType_WalkSequenceUpDownRightLeft(struct Sprite *sprite);
void MovementType_WalkSequenceRightLeftUpDown(struct Sprite *); void MovementType_WalkSequenceRightLeftUpDown(struct Sprite *sprite);
void MovementType_WalkSequenceDownRightLeftUp(struct Sprite *); void MovementType_WalkSequenceDownRightLeftUp(struct Sprite *sprite);
void MovementType_WalkSequenceRightUpDownLeft(struct Sprite *); void MovementType_WalkSequenceRightUpDownLeft(struct Sprite *sprite);
void MovementType_WalkSequenceUpDownLeftRight(struct Sprite *); void MovementType_WalkSequenceUpDownLeftRight(struct Sprite *sprite);
void MovementType_WalkSequenceLeftRightUpDown(struct Sprite *); void MovementType_WalkSequenceLeftRightUpDown(struct Sprite *sprite);
void MovementType_WalkSequenceDownLeftRightUp(struct Sprite *); void MovementType_WalkSequenceDownLeftRightUp(struct Sprite *sprite);
void MovementType_WalkSequenceUpLeftDownRight(struct Sprite *); void MovementType_WalkSequenceUpLeftDownRight(struct Sprite *sprite);
void MovementType_WalkSequenceDownRightUpLeft(struct Sprite *); void MovementType_WalkSequenceDownRightUpLeft(struct Sprite *sprite);
void MovementType_WalkSequenceLeftDownRightUp(struct Sprite *); void MovementType_WalkSequenceLeftDownRightUp(struct Sprite *sprite);
void MovementType_WalkSequenceRightUpLeftDown(struct Sprite *); void MovementType_WalkSequenceRightUpLeftDown(struct Sprite *sprite);
void MovementType_WalkSequenceUpRightDownLeft(struct Sprite *); void MovementType_WalkSequenceUpRightDownLeft(struct Sprite *sprite);
void MovementType_WalkSequenceDownLeftUpRight(struct Sprite *); void MovementType_WalkSequenceDownLeftUpRight(struct Sprite *sprite);
void MovementType_WalkSequenceLeftUpRightDown(struct Sprite *); void MovementType_WalkSequenceLeftUpRightDown(struct Sprite *sprite);
void MovementType_WalkSequenceRightDownLeftUp(struct Sprite *); void MovementType_WalkSequenceRightDownLeftUp(struct Sprite *sprite);
void MovementType_CopyPlayer(struct Sprite *); void MovementType_CopyPlayer(struct Sprite *sprite);
void MovementType_TreeDisguise(struct Sprite *); void MovementType_TreeDisguise(struct Sprite *sprite);
void MovementType_MountainDisguise(struct Sprite *); void MovementType_MountainDisguise(struct Sprite *sprite);
void MovementType_CopyPlayerInGrass(struct Sprite *); void MovementType_CopyPlayerInGrass(struct Sprite *sprite);
void MovementType_Buried(struct Sprite *); void MovementType_Buried(struct Sprite *sprite);
void MovementType_WalkInPlace(struct Sprite *); void MovementType_WalkInPlace(struct Sprite *sprite);
void MovementType_JogInPlace(struct Sprite *); void MovementType_JogInPlace(struct Sprite *sprite);
void MovementType_RunInPlace(struct Sprite *); void MovementType_RunInPlace(struct Sprite *sprite);
void MovementType_Invisible(struct Sprite *); void MovementType_Invisible(struct Sprite *sprite);
void MovementType_WalkSlowlyInPlace(struct Sprite *); void MovementType_WalkSlowlyInPlace(struct Sprite *sprite);
void MovementType_FollowPlayer(struct Sprite *); void MovementType_FollowPlayer(struct Sprite *sprite);
u8 GetSlideMovementAction(u32); u8 GetSlideMovementAction(u32);
u8 GetJumpMovementAction(u32); u8 GetJumpMovementAction(u32);
u8 GetJump2MovementAction(u32); u8 GetJump2MovementAction(u32);
@ -313,13 +313,13 @@ u8 CopySprite(struct Sprite *sprite, s16 x, s16 y, u8 subpriority);
u8 CreateCopySpriteAt(struct Sprite *sprite, s16 x, s16 y, u8 subpriority); u8 CreateCopySpriteAt(struct Sprite *sprite, s16 x, s16 y, u8 subpriority);
bool8 IsElevationMismatchAt(u8, s16, s16); bool8 IsElevationMismatchAt(u8, s16, s16);
u8 MovementType_WanderAround_Step0(struct ObjectEvent *, struct Sprite *); u8 MovementType_WanderAround_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WanderAround_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_WanderAround_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WanderAround_Step2(struct ObjectEvent *, struct Sprite *); u8 MovementType_WanderAround_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_Wander_Step3(struct ObjectEvent *, struct Sprite *); u8 MovementType_Wander_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WanderAround_Step4(struct ObjectEvent *, struct Sprite *); u8 MovementType_WanderAround_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WanderAround_Step5(struct ObjectEvent *, struct Sprite *); u8 MovementType_WanderAround_Step5(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WanderAround_Step6(struct ObjectEvent *, struct Sprite *); u8 MovementType_WanderAround_Step6(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 GetVectorDirection(s16 dx, s16 dy, s16 absdx, s16 absdy); u8 GetVectorDirection(s16 dx, s16 dy, s16 absdx, s16 absdy);
u8 GetLimitedVectorDirection_SouthNorth(s16 dx, s16 dy, s16 absdx, s16 absdy); u8 GetLimitedVectorDirection_SouthNorth(s16 dx, s16 dy, s16 absdx, s16 absdy);
u8 GetLimitedVectorDirection_WestEast(s16 dx, s16 dy, s16 absdx, s16 absdy); u8 GetLimitedVectorDirection_WestEast(s16 dx, s16 dy, s16 absdx, s16 absdy);
@ -331,156 +331,156 @@ u8 GetLimitedVectorDirection_SouthNorthWest(s16 dx, s16 dy, s16 absdx, s16 absdy
u8 GetLimitedVectorDirection_SouthNorthEast(s16 dx, s16 dy, s16 absdx, s16 absdy); u8 GetLimitedVectorDirection_SouthNorthEast(s16 dx, s16 dy, s16 absdx, s16 absdy);
u8 GetLimitedVectorDirection_NorthWestEast(s16 dx, s16 dy, s16 absdx, s16 absdy); u8 GetLimitedVectorDirection_NorthWestEast(s16 dx, s16 dy, s16 absdx, s16 absdy);
u8 GetLimitedVectorDirection_SouthWestEast(s16 dx, s16 dy, s16 absdx, s16 absdy); u8 GetLimitedVectorDirection_SouthWestEast(s16 dx, s16 dy, s16 absdx, s16 absdy);
u8 MovementType_LookAround_Step0(struct ObjectEvent *, struct Sprite *); u8 MovementType_LookAround_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_LookAround_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_LookAround_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_LookAround_Step2(struct ObjectEvent *, struct Sprite *); u8 MovementType_LookAround_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_LookAround_Step3(struct ObjectEvent *, struct Sprite *); u8 MovementType_LookAround_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_LookAround_Step4(struct ObjectEvent *, struct Sprite *); u8 MovementType_LookAround_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WanderUpAndDown_Step0(struct ObjectEvent *, struct Sprite *); u8 MovementType_WanderUpAndDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WanderUpAndDown_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_WanderUpAndDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WanderUpAndDown_Step2(struct ObjectEvent *, struct Sprite *); u8 MovementType_WanderUpAndDown_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WanderUpAndDown_Step4(struct ObjectEvent *, struct Sprite *); u8 MovementType_WanderUpAndDown_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WanderUpAndDown_Step5(struct ObjectEvent *, struct Sprite *); u8 MovementType_WanderUpAndDown_Step5(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WanderUpAndDown_Step6(struct ObjectEvent *, struct Sprite *); u8 MovementType_WanderUpAndDown_Step6(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WanderLeftAndRight_Step0(struct ObjectEvent *, struct Sprite *); u8 MovementType_WanderLeftAndRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WanderLeftAndRight_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_WanderLeftAndRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WanderLeftAndRight_Step2(struct ObjectEvent *, struct Sprite *); u8 MovementType_WanderLeftAndRight_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WanderLeftAndRight_Step4(struct ObjectEvent *, struct Sprite *); u8 MovementType_WanderLeftAndRight_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WanderLeftAndRight_Step5(struct ObjectEvent *, struct Sprite *); u8 MovementType_WanderLeftAndRight_Step5(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WanderLeftAndRight_Step6(struct ObjectEvent *, struct Sprite *); u8 MovementType_WanderLeftAndRight_Step6(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceDirection_Step0(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceDirection_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceDirection_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceDirection_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceDirection_Step2(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceDirection_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_BerryTreeGrowth_Normal(struct ObjectEvent *, struct Sprite *); u8 MovementType_BerryTreeGrowth_Normal(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_BerryTreeGrowth_Move(struct ObjectEvent *, struct Sprite *); u8 MovementType_BerryTreeGrowth_Move(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_BerryTreeGrowth_SparkleStart(struct ObjectEvent *, struct Sprite *); u8 MovementType_BerryTreeGrowth_SparkleStart(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_BerryTreeGrowth_Sparkle(struct ObjectEvent *, struct Sprite *); u8 MovementType_BerryTreeGrowth_Sparkle(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_BerryTreeGrowth_SparkleEnd(struct ObjectEvent *, struct Sprite *); u8 MovementType_BerryTreeGrowth_SparkleEnd(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceDownAndUp_Step0(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceDownAndUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceDownAndUp_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceDownAndUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceDownAndUp_Step2(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceDownAndUp_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceDownAndUp_Step3(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceDownAndUp_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceDownAndUp_Step4(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceDownAndUp_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceLeftAndRight_Step0(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceLeftAndRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceLeftAndRight_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceLeftAndRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceLeftAndRight_Step2(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceLeftAndRight_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceLeftAndRight_Step3(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceLeftAndRight_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceLeftAndRight_Step4(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceLeftAndRight_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceUpAndLeft_Step0(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceUpAndLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceUpAndLeft_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceUpAndLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceUpAndLeft_Step2(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceUpAndLeft_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceUpAndLeft_Step3(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceUpAndLeft_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceUpAndLeft_Step4(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceUpAndLeft_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceUpAndRight_Step0(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceUpAndRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceUpAndRight_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceUpAndRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceUpAndRight_Step2(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceUpAndRight_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceUpAndRight_Step3(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceUpAndRight_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceUpAndRight_Step4(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceUpAndRight_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceDownAndLeft_Step0(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceDownAndLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceDownAndLeft_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceDownAndLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceDownAndLeft_Step2(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceDownAndLeft_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceDownAndLeft_Step3(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceDownAndLeft_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceDownAndLeft_Step4(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceDownAndLeft_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceDownAndRight_Step0(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceDownAndRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceDownAndRight_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceDownAndRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceDownAndRight_Step2(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceDownAndRight_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceDownAndRight_Step3(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceDownAndRight_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceDownAndRight_Step4(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceDownAndRight_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceDownUpAndLeft_Step0(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceDownUpAndLeft_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceDownUpAndLeft_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceDownUpAndLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceDownUpAndLeft_Step2(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceDownUpAndLeft_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceDownUpAndLeft_Step3(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceDownUpAndLeft_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceDownUpAndLeft_Step4(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceDownUpAndLeft_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceDownUpAndRight_Step0(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceDownUpAndRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceDownUpAndRight_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceDownUpAndRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceDownUpAndRight_Step2(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceDownUpAndRight_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceDownUpAndRight_Step3(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceDownUpAndRight_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceDownUpAndRight_Step4(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceDownUpAndRight_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceUpLeftAndRight_Step0(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceUpLeftAndRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceUpLeftAndRight_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceUpLeftAndRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceUpLeftAndRight_Step2(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceUpLeftAndRight_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceUpLeftAndRight_Step3(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceUpLeftAndRight_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceUpLeftAndRight_Step4(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceUpLeftAndRight_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceDownLeftAndRight_Step0(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceDownLeftAndRight_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceDownLeftAndRight_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceDownLeftAndRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceDownLeftAndRight_Step2(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceDownLeftAndRight_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceDownLeftAndRight_Step3(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceDownLeftAndRight_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FaceDownLeftAndRight_Step4(struct ObjectEvent *, struct Sprite *); u8 MovementType_FaceDownLeftAndRight_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_RotateCounterclockwise_Step0(struct ObjectEvent *, struct Sprite *); u8 MovementType_RotateCounterclockwise_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_RotateCounterclockwise_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_RotateCounterclockwise_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_RotateCounterclockwise_Step2(struct ObjectEvent *, struct Sprite *); u8 MovementType_RotateCounterclockwise_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_RotateCounterclockwise_Step3(struct ObjectEvent *, struct Sprite *); u8 MovementType_RotateCounterclockwise_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_RotateClockwise_Step0(struct ObjectEvent *, struct Sprite *); u8 MovementType_RotateClockwise_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_RotateClockwise_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_RotateClockwise_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_RotateClockwise_Step2(struct ObjectEvent *, struct Sprite *); u8 MovementType_RotateClockwise_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_RotateClockwise_Step3(struct ObjectEvent *, struct Sprite *); u8 MovementType_RotateClockwise_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WalkBackAndForth_Step0(struct ObjectEvent *, struct Sprite *); u8 MovementType_WalkBackAndForth_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WalkBackAndForth_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_WalkBackAndForth_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WalkBackAndForth_Step2(struct ObjectEvent *, struct Sprite *); u8 MovementType_WalkBackAndForth_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WalkBackAndForth_Step3(struct ObjectEvent *, struct Sprite *); u8 MovementType_WalkBackAndForth_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WalkSequence_Step0(struct ObjectEvent *, struct Sprite *); u8 MovementType_WalkSequence_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WalkSequence_Step2(struct ObjectEvent *, struct Sprite *); u8 MovementType_WalkSequence_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WalkSequenceUpRightLeftDown_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_WalkSequenceUpRightLeftDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WalkSequenceRightLeftDownUp_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_WalkSequenceRightLeftDownUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WalkSequenceDownUpRightLeft_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_WalkSequenceDownUpRightLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WalkSequenceLeftDownUpRight_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_WalkSequenceLeftDownUpRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WalkSequenceUpLeftRightDown_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_WalkSequenceUpLeftRightDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WalkSequenceLeftRightDownUp_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_WalkSequenceLeftRightDownUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WalkSequenceDownUpLeftRight_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_WalkSequenceDownUpLeftRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WalkSequenceRightDownUpLeft_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_WalkSequenceRightDownUpLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WalkSequenceLeftUpDownRight_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_WalkSequenceLeftUpDownRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WalkSequenceUpDownRightLeft_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_WalkSequenceUpDownRightLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WalkSequenceRightLeftUpDown_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_WalkSequenceRightLeftUpDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WalkSequenceDownRightLeftUp_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_WalkSequenceDownRightLeftUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WalkSequenceRightUpDownLeft_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_WalkSequenceRightUpDownLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WalkSequenceUpDownLeftRight_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_WalkSequenceUpDownLeftRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WalkSequenceLeftRightUpDown_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_WalkSequenceLeftRightUpDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WalkSequenceDownLeftRightUp_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_WalkSequenceDownLeftRightUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WalkSequenceUpLeftDownRight_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_WalkSequenceUpLeftDownRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WalkSequenceDownRightUpLeft_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_WalkSequenceDownRightUpLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WalkSequenceLeftDownRightUp_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_WalkSequenceLeftDownRightUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WalkSequenceRightUpLeftDown_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_WalkSequenceRightUpLeftDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WalkSequenceUpRightDownLeft_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_WalkSequenceUpRightDownLeft_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WalkSequenceDownLeftUpRight_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_WalkSequenceDownLeftUpRight_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WalkSequenceLeftUpRightDown_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_WalkSequenceLeftUpRightDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WalkSequenceRightDownLeftUp_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_WalkSequenceRightDownLeftUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_CopyPlayer_Step0(struct ObjectEvent *, struct Sprite *); u8 MovementType_CopyPlayer_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_CopyPlayer_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_CopyPlayer_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_CopyPlayer_Step2(struct ObjectEvent *, struct Sprite *); u8 MovementType_CopyPlayer_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite);
bool8 CopyablePlayerMovement_None(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); bool8 CopyablePlayerMovement_None(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8));
bool8 CopyablePlayerMovement_FaceDirection(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); bool8 CopyablePlayerMovement_FaceDirection(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8));
bool8 CopyablePlayerMovement_WalkNormal(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); bool8 CopyablePlayerMovement_WalkNormal(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8));
bool8 CopyablePlayerMovement_WalkFast(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); bool8 CopyablePlayerMovement_WalkFast(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8));
bool8 CopyablePlayerMovement_WalkFaster(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); bool8 CopyablePlayerMovement_WalkFaster(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8));
bool8 CopyablePlayerMovement_Slide(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); bool8 CopyablePlayerMovement_Slide(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8));
bool8 CopyablePlayerMovement_JumpInPlace(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); bool8 CopyablePlayerMovement_JumpInPlace(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8));
bool8 CopyablePlayerMovement_Jump(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); bool8 CopyablePlayerMovement_Jump(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8));
u8 MovementType_FollowPlayer_Shadow(struct ObjectEvent *, struct Sprite *); u8 MovementType_FollowPlayer_Shadow(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FollowPlayer_Active(struct ObjectEvent *, struct Sprite *); u8 MovementType_FollowPlayer_Active(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_FollowPlayer_Moving(struct ObjectEvent *, struct Sprite *); u8 MovementType_FollowPlayer_Moving(struct ObjectEvent *objectEvent, struct Sprite *sprite);
void StartSpriteAnimInDirection(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 animNum); void StartSpriteAnimInDirection(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 direction, u8 animNum);
bool8 FollowablePlayerMovement_Idle(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); bool8 FollowablePlayerMovement_Idle(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8, bool8 tileCallback(u8));
bool8 FollowablePlayerMovement_FaceDirection(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); bool8 FollowablePlayerMovement_FaceDirection(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8, bool8 tileCallback(u8));
bool8 FollowablePlayerMovement_Step(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); bool8 FollowablePlayerMovement_Step(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8, bool8 tileCallback(u8));
bool8 FollowablePlayerMovement_GoSpeed1(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); bool8 FollowablePlayerMovement_GoSpeed1(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8, bool8 tileCallback(u8));
bool8 FollowablePlayerMovement_GoSpeed2(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); bool8 FollowablePlayerMovement_GoSpeed2(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8, bool8 tileCallback(u8));
bool8 FollowablePlayerMovement_Slide(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); bool8 FollowablePlayerMovement_Slide(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8, bool8 tileCallback(u8));
bool8 FollowablePlayerMovement_JumpInPlace(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); bool8 FollowablePlayerMovement_JumpInPlace(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8, bool8 tileCallback(u8));
bool8 FollowablePlayerMovement_GoSpeed4(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); bool8 FollowablePlayerMovement_GoSpeed4(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8, bool8 tileCallback(u8));
bool8 FollowablePlayerMovement_Jump(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); bool8 FollowablePlayerMovement_Jump(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8, bool8 tileCallback(u8));
bool8 CopyablePlayerMovement_Jump2(struct ObjectEvent *, struct Sprite *, u8, bool8(u8)); bool8 CopyablePlayerMovement_Jump2(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8, bool8 tileCallback(u8));
u8 MovementType_CopyPlayerInGrass_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_CopyPlayerInGrass_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_Buried_Step0(struct ObjectEvent *, struct Sprite *); u8 MovementType_Buried_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WalkInPlace_Step0(struct ObjectEvent *, struct Sprite *); u8 MovementType_WalkInPlace_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_MoveInPlace_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_MoveInPlace_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_WalkSlowlyInPlace_Step0(struct ObjectEvent *, struct Sprite *); u8 MovementType_WalkSlowlyInPlace_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_JogInPlace_Step0(struct ObjectEvent *, struct Sprite *); u8 MovementType_JogInPlace_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_RunInPlace_Step0(struct ObjectEvent *, struct Sprite *); u8 MovementType_RunInPlace_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_Invisible_Step0(struct ObjectEvent *, struct Sprite *); u8 MovementType_Invisible_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_Invisible_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_Invisible_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 MovementType_Invisible_Step2(struct ObjectEvent *, struct Sprite *); u8 MovementType_Invisible_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u8 CreateVirtualObject(u16 graphicsId, u8 virtualObjId, s16 x, s16 y, u8 elevation, u8 direction); u8 CreateVirtualObject(u16 graphicsId, u8 virtualObjId, s16 x, s16 y, u8 elevation, u8 direction);
void TurnVirtualObject(u8 virtualObjId, u8 direction); void TurnVirtualObject(u8 virtualObjId, u8 direction);

2
include/evolution_graphics.h
View File

@ -8,6 +8,6 @@ u8 EvolutionSparkles_ArcDown(void);
u8 EvolutionSparkles_CircleInward(void); u8 EvolutionSparkles_CircleInward(void);
u8 EvolutionSparkles_SprayAndFlash(u16 species); u8 EvolutionSparkles_SprayAndFlash(u16 species);
u8 EvolutionSparkles_SprayAndFlash_Trade(u16 species); u8 EvolutionSparkles_SprayAndFlash_Trade(u16 species);
u8 CycleEvolutionMonSprite(u8 preEvoSpriteID, u8 postEvoSpriteID); u8 CycleEvolutionMonSprite(u8 preEvoSpriteId, u8 postEvoSpriteId);
#endif // GUARD_EVOLUTION_GRAPHICS_H #endif // GUARD_EVOLUTION_GRAPHICS_H

6
include/evolution_scene.h
View File

@ -1,9 +1,9 @@
#ifndef GUARD_EVOLUTION_SCENE_H #ifndef GUARD_EVOLUTION_SCENE_H
#define GUARD_EVOLUTION_SCENE_H #define GUARD_EVOLUTION_SCENE_H
void BeginEvolutionScene(struct Pokemon *mon, u16 speciesToEvolve, bool8 canStopEvo, u8 partyID); void BeginEvolutionScene(struct Pokemon *mon, u16 postEvoSpecies, bool8 canStopEvo, u8 partyId);
void EvolutionScene(struct Pokemon *mon, u16 speciesToEvolve, bool8 canStopEvo, u8 partyID); void EvolutionScene(struct Pokemon *mon, u16 postEvoSpecies, bool8 canStopEvo, u8 partyId);
void TradeEvolutionScene(struct Pokemon *mon, u16 speciesToEvolve, u8 preEvoSpriteID, u8 partyID); void TradeEvolutionScene(struct Pokemon *mon, u16 postEvoSpecies, u8 preEvoSpriteId, u8 partyId);
extern void (*gCB2_AfterEvolution)(void); extern void (*gCB2_AfterEvolution)(void);

4
include/faraway_island.h
View File

@ -2,9 +2,9 @@
#define GUARD_FARAWAY_ISLAND_H #define GUARD_FARAWAY_ISLAND_H
u32 GetMewMoveDirection(void); u32 GetMewMoveDirection(void);
bool8 ShouldMewShakeGrass(struct ObjectEvent *); bool8 ShouldMewShakeGrass(struct ObjectEvent *objectEvent);
void UpdateFarawayIslandStepCounter(void); void UpdateFarawayIslandStepCounter(void);
bool8 ObjectEventIsFarawayIslandMew(struct ObjectEvent *); bool8 ObjectEventIsFarawayIslandMew(struct ObjectEvent *objectEvent);
bool8 IsMewPlayingHideAndSeek(void); bool8 IsMewPlayingHideAndSeek(void);
#endif // GUARD_FARAWAY_ISLAND_H #endif // GUARD_FARAWAY_ISLAND_H

2
include/field_camera.h
View File

@ -18,7 +18,7 @@ extern u16 gTotalCameraPixelOffsetY;
void DrawWholeMapView(void); void DrawWholeMapView(void);
void CurrentMapDrawMetatileAt(int x, int y); void CurrentMapDrawMetatileAt(int x, int y);
void GetCameraOffsetWithPan(s16 *x, s16 *y); void GetCameraOffsetWithPan(s16 *x, s16 *y);
void DrawDoorMetatileAt(int x, int y, u16 *arr); void DrawDoorMetatileAt(int x, int y, u16 *tiles);
void ResetFieldCamera(void); void ResetFieldCamera(void);
void ResetCameraUpdateInfo(void); void ResetCameraUpdateInfo(void);
u32 InitCameraUpdateCallback(u8 trackedSpriteId); u32 InitCameraUpdateCallback(u8 trackedSpriteId);

9
include/field_control_avatar.h
View File

@ -22,13 +22,12 @@ struct FieldInput
u8 dpadDirection; u8 dpadDirection;
}; };
void FieldClearPlayerInput(struct FieldInput *pStruct); void FieldClearPlayerInput(struct FieldInput *input);
void FieldGetPlayerInput(struct FieldInput *pStruct, u16 keys, u16 heldKeys); void FieldGetPlayerInput(struct FieldInput *input, u16 newKeys, u16 heldKeys);
int ProcessPlayerFieldInput(struct FieldInput *pStruct); int ProcessPlayerFieldInput(struct FieldInput *input);
void overworld_poison_timer_set(void);
void RestartWildEncounterImmunitySteps(void); void RestartWildEncounterImmunitySteps(void);
const u8 *GetObjectEventScriptPointerPlayerFacing(void); const u8 *GetObjectEventScriptPointerPlayerFacing(void);
bool8 TryDoDiveWarp(struct MapPosition *position, u16 b); bool8 TryDoDiveWarp(struct MapPosition *position, u16 metatileBehavior);
int SetCableClubWarp(void); int SetCableClubWarp(void);
u8 TrySetDiveWarp(void); u8 TrySetDiveWarp(void);
const u8 *GetInteractedLinkPlayerScript(struct MapPosition *position, u8 metatileBehavior, u8 direction); const u8 *GetInteractedLinkPlayerScript(struct MapPosition *position, u8 metatileBehavior, u8 direction);

8
include/field_door.h
View File

@ -1,10 +1,10 @@
#ifndef GUARD_FIELD_DOOR_H #ifndef GUARD_FIELD_DOOR_H
#define GUARD_FIELD_DOOR_H #define GUARD_FIELD_DOOR_H
void FieldSetDoorOpened(u32, u32); void FieldSetDoorOpened(u32 x, u32 y);
void FieldSetDoorClosed(u32, u32); void FieldSetDoorClosed(u32 x, u32 y);
s8 FieldAnimateDoorClose(u32, u32); s8 FieldAnimateDoorClose(u32 x, u32 y);
s8 FieldAnimateDoorOpen(u32, u32); s8 FieldAnimateDoorOpen(u32 x, u32 y);
bool8 FieldIsDoorAnimationRunning(void); bool8 FieldIsDoorAnimationRunning(void);
u32 GetDoorSoundEffect(u32 x, u32 y); u32 GetDoorSoundEffect(u32 x, u32 y);

8
include/field_effect.h
View File

@ -9,12 +9,12 @@ extern s32 gFieldEffectArguments[8];
extern void (*gPostMenuFieldCallback)(void); extern void (*gPostMenuFieldCallback)(void);
extern bool8 (*gFieldCallback2)(void); extern bool8 (*gFieldCallback2)(void);
u32 FieldEffectStart(u8); u32 FieldEffectStart(u8 id);
bool8 FieldEffectActiveListContains(u8 id); bool8 FieldEffectActiveListContains(u8 id);
void FieldEffectActiveListClear(void); void FieldEffectActiveListClear(void);
void ReturnToFieldFromFlyMapSelect(void); void ReturnToFieldFromFlyMapSelect(void);
void FieldCallback_UseFly(void); void FieldCallback_UseFly(void);
u8 AddNewGameBirchObject(s16, s16, u8); u8 AddNewGameBirchObject(s16 x, s16 y, u8 subpriority);
void FieldEffectStop(struct Sprite *sprite, u8 id); void FieldEffectStop(struct Sprite *sprite, u8 id);
u8 CreateTrainerSprite(u8 trainerSpriteID, s16 x, s16 y, u8 subpriority, u8 *buffer); u8 CreateTrainerSprite(u8 trainerSpriteID, s16 x, s16 y, u8 subpriority, u8 *buffer);
void FldEff_TeleportWarpOut(void); void FldEff_TeleportWarpOut(void);
@ -41,8 +41,8 @@ void StartEscalatorWarp(u8 metatileBehavior, u8 priority);
void StartLavaridgeGymB1FWarp(u8 priority); void StartLavaridgeGymB1FWarp(u8 priority);
void StartLavaridgeGym1FWarp(u8 priority); void StartLavaridgeGym1FWarp(u8 priority);
void SpriteCB_AshPuff(struct Sprite *); void SpriteCB_AshPuff(struct Sprite *sprite);
void SpriteCB_AshLaunch(struct Sprite *); void SpriteCB_AshLaunch(struct Sprite *sprite);
void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b); void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b);
void FreeResourcesAndDestroySprite(struct Sprite *sprite, u8 spriteId); void FreeResourcesAndDestroySprite(struct Sprite *sprite, u8 spriteId);

46
include/field_effect_helpers.h
View File

@ -13,33 +13,33 @@ enum {
}; };
u8 CreateWarpArrowSprite(void); u8 CreateWarpArrowSprite(void);
u8 StartUnderwaterSurfBlobBobbing(u8 oldSpriteId); u8 StartUnderwaterSurfBlobBobbing(u8 blobSpriteId);
void SetSurfBlob_BobState(u8 spriteId, u8 state); void SetSurfBlob_BobState(u8 spriteId, u8 state);
void SetSurfBlob_DontSyncAnim(u8 spriteId, bool8 dontSync); void SetSurfBlob_DontSyncAnim(u8 spriteId, bool8 dontSync);
void SetSurfBlob_PlayerOffset(u8 spriteId, bool8 hasOffset, s16 offset); void SetSurfBlob_PlayerOffset(u8 spriteId, bool8 hasOffset, s16 offset);
bool8 UpdateRevealDisguise(struct ObjectEvent *); bool8 UpdateRevealDisguise(struct ObjectEvent *objectEvent);
void StartRevealDisguise(struct ObjectEvent *); void StartRevealDisguise(struct ObjectEvent *objectEvent);
void StartAshFieldEffect(s16, s16, u16, s16); void StartAshFieldEffect(s16 x, s16 y, u16 metatileId, s16 delay);
void SetUpReflection(struct ObjectEvent *, struct Sprite *, u8); void SetUpReflection(struct ObjectEvent *objectEvent, struct Sprite *sprite, bool8 stillReflection);
void SetUpShadow(struct ObjectEvent *, struct Sprite *); void SetUpShadow(struct ObjectEvent *objectEvent, struct Sprite *sprite);
u32 StartFieldEffectForObjectEvent(u8, struct ObjectEvent *); u32 StartFieldEffectForObjectEvent(u8, struct ObjectEvent *objectEvent);
u8 FindTallGrassFieldEffectSpriteId(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y); u8 FindTallGrassFieldEffectSpriteId(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y);
void UpdateRayquazaSpotlightEffect(struct Sprite *); void UpdateRayquazaSpotlightEffect(struct Sprite *sprite);
void UpdateShadowFieldEffect(struct Sprite *); void UpdateShadowFieldEffect(struct Sprite *sprite);
void UpdateTallGrassFieldEffect(struct Sprite *); void UpdateTallGrassFieldEffect(struct Sprite *sprite);
void WaitFieldEffectSpriteAnim(struct Sprite *); void WaitFieldEffectSpriteAnim(struct Sprite *sprite);
void UpdateAshFieldEffect(struct Sprite *); void UpdateAshFieldEffect(struct Sprite *sprite);
void UpdateSurfBlobFieldEffect(struct Sprite *); void UpdateSurfBlobFieldEffect(struct Sprite *sprite);
void UpdateJumpImpactEffect(struct Sprite *); void UpdateJumpImpactEffect(struct Sprite *sprite);
void UpdateFootprintsTireTracksFieldEffect(struct Sprite *); void UpdateFootprintsTireTracksFieldEffect(struct Sprite *sprite);
void UpdateSplashFieldEffect(struct Sprite *); void UpdateSplashFieldEffect(struct Sprite *sprite);
void UpdateLongGrassFieldEffect(struct Sprite *); void UpdateLongGrassFieldEffect(struct Sprite *sprite);
void UpdateSandPileFieldEffect(struct Sprite *); void UpdateSandPileFieldEffect(struct Sprite *sprite);
void UpdateDisguiseFieldEffect(struct Sprite *); void UpdateDisguiseFieldEffect(struct Sprite *sprite);
void UpdateShortGrassFieldEffect(struct Sprite *); void UpdateShortGrassFieldEffect(struct Sprite *sprite);
void UpdateHotSpringsWaterFieldEffect(struct Sprite *); void UpdateHotSpringsWaterFieldEffect(struct Sprite *sprite);
void UpdateBubblesFieldEffect(struct Sprite *); void UpdateBubblesFieldEffect(struct Sprite *sprite);
void UpdateSparkleFieldEffect(struct Sprite *); void UpdateSparkleFieldEffect(struct Sprite *sprite);
void SetSpriteInvisible(u8 spriteId); void SetSpriteInvisible(u8 spriteId);
void ShowWarpArrowSprite(u8 spriteId, u8 direction, s16 x, s16 y); void ShowWarpArrowSprite(u8 spriteId, u8 direction, s16 x, s16 y);

6
include/field_message_box.h
View File

@ -9,10 +9,10 @@ enum
FIELD_MESSAGE_BOX_AUTO_SCROLL, FIELD_MESSAGE_BOX_AUTO_SCROLL,
}; };
bool8 ShowFieldMessage(const u8 *message); bool8 ShowFieldMessage(const u8 *str);
bool8 ShowPokenavFieldMessage(const u8 *message); bool8 ShowPokenavFieldMessage(const u8 *str);
bool8 ShowFieldMessageFromBuffer(void); bool8 ShowFieldMessageFromBuffer(void);
bool8 ShowFieldAutoScrollMessage(const u8 *message); bool8 ShowFieldAutoScrollMessage(const u8 *str);
void HideFieldMessageBox(void); void HideFieldMessageBox(void);
bool8 IsFieldMessageBoxHidden(void); bool8 IsFieldMessageBoxHidden(void);
u8 GetFieldMessageBoxMode(void); u8 GetFieldMessageBoxMode(void);

14
include/field_player_avatar.h
View File

@ -3,11 +3,11 @@
void PlayerStep(u8 direction, u16 newKeys, u16 heldKeys); void PlayerStep(u8 direction, u16 newKeys, u16 heldKeys);
void ClearPlayerAvatarInfo(void); void ClearPlayerAvatarInfo(void);
void SetPlayerAvatarExtraStateTransition(u16, u8); void SetPlayerAvatarExtraStateTransition(u16 graphicsId, u8 transitionFlag);
u8 GetPlayerAvatarGenderByGraphicsId(u16); u8 GetPlayerAvatarGenderByGraphicsId(u16 gfxId);
bool8 TestPlayerAvatarFlags(u8); u8 TestPlayerAvatarFlags(u8 flag);
u8 GetPlayerAvatarSpriteId(void); u8 GetPlayerAvatarSpriteId(void);
void PlayerGetDestCoords(s16 *, s16 *); void PlayerGetDestCoords(s16 *x, s16 *y);
u8 GetPlayerFacingDirection(void); u8 GetPlayerFacingDirection(void);
u8 GetPlayerMovementDirection(void); u8 GetPlayerMovementDirection(void);
u8 PlayerGetCopyableMovement(void); u8 PlayerGetCopyableMovement(void);
@ -36,7 +36,7 @@ void CancelPlayerForcedMovement(void);
void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender); void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender);
void PlayerFreeze(void); void PlayerFreeze(void);
void StopPlayerAvatar(void); void StopPlayerAvatar(void);
void SetSpinStartFacingDir(u8); void SetSpinStartFacingDir(u8 direction);
void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr); void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr);
u16 GetRivalAvatarGraphicsIdByStateIdAndGender(u8 state, u8 gender); u16 GetRivalAvatarGraphicsIdByStateIdAndGender(u8 state, u8 gender);
void SetPlayerAvatarFieldMove(void); void SetPlayerAvatarFieldMove(void);
@ -50,8 +50,8 @@ bool8 IsPlayerSurfingNorth(void);
void SetPlayerAvatarWatering(u8 direction); void SetPlayerAvatarWatering(u8 direction);
u8 GetPlayerAvatarFlags(void); u8 GetPlayerAvatarFlags(void);
void UpdatePlayerAvatarTransitionState(void); void UpdatePlayerAvatarTransitionState(void);
u16 GetFRLGAvatarGraphicsIdByGender(u8); u16 GetFRLGAvatarGraphicsIdByGender(u8 gender);
u16 GetRSAvatarGraphicsIdByGender(u8); u16 GetRSAvatarGraphicsIdByGender(u8 gender);
void PlayerWheelieInPlace(u8 direction); void PlayerWheelieInPlace(u8 direction);
void PlayerWheelieMove(u8 direction); void PlayerWheelieMove(u8 direction);
void PlayerPopWheelieWhileMoving(u8 direction); void PlayerPopWheelieWhileMoving(u8 direction);

2
include/field_specials.h
View File

@ -6,7 +6,7 @@ extern u8 gBikeCollisions;
extern u16 gScrollableMultichoice_ScrollOffset; extern u16 gScrollableMultichoice_ScrollOffset;
u8 GetLeadMonIndex(void); u8 GetLeadMonIndex(void);
u8 IsDestinationBoxFull(void); bool8 IsDestinationBoxFull(void);
u16 GetPCBoxToSendMon(void); u16 GetPCBoxToSendMon(void);
bool8 InMultiPartnerRoom(void); bool8 InMultiPartnerRoom(void);
void UpdateTrainerFansAfterLinkBattle(void); void UpdateTrainerFansAfterLinkBattle(void);

20
include/fieldmap.h
View File

@ -24,19 +24,19 @@
extern struct BackupMapLayout gBackupMapLayout; extern struct BackupMapLayout gBackupMapLayout;
extern u16 ALIGNED(4) sBackupMapData[MAX_MAP_DATA_SIZE]; extern u16 ALIGNED(4) sBackupMapData[MAX_MAP_DATA_SIZE];
u32 MapGridGetMetatileIdAt(int, int); u32 MapGridGetMetatileIdAt(int x, int y);
u32 MapGridGetMetatileBehaviorAt(int, int); u32 MapGridGetMetatileBehaviorAt(int x, int y);
void MapGridSetMetatileIdAt(int, int, u16); void MapGridSetMetatileIdAt(int x, int y, u16 metatile);
void MapGridSetMetatileEntryAt(int, int, u16); void MapGridSetMetatileEntryAt(int x, int y, u16 metatile);
void GetCameraCoords(u16 *, u16 *); void GetCameraCoords(u16 *x, u16 *y);
u8 MapGridGetCollisionAt(int, int); u8 MapGridGetCollisionAt(int x, int y);
int GetMapBorderIdAt(int x, int y); int GetMapBorderIdAt(int x, int y);
bool32 CanCameraMoveInDirection(int direction); bool32 CanCameraMoveInDirection(int direction);
u16 GetMetatileAttributesById(u16 metatileId); u16 GetMetatileAttributesById(u16 metatile);
void GetCameraFocusCoords(u16 *x, u16 *y); void GetCameraFocusCoords(u16 *x, u16 *y);
u8 MapGridGetMetatileLayerTypeAt(int x, int y); u8 MapGridGetMetatileLayerTypeAt(int x, int y);
u8 MapGridGetElevationAt(int x, int y); u8 MapGridGetElevationAt(int x, int y);
bool8 CameraMove(int deltaX, int deltaY); bool8 CameraMove(int x, int y);
void SaveMapView(void); void SaveMapView(void);
void SetCameraFocusCoords(u16 x, u16 y); void SetCameraFocusCoords(u16 x, u16 y);
void InitMap(void); void InitMap(void);
@ -47,8 +47,8 @@ void CopyMapTilesetsToVram(struct MapLayout const *mapLayout);
void LoadMapTilesetPalettes(struct MapLayout const *mapLayout); void LoadMapTilesetPalettes(struct MapLayout const *mapLayout);
void LoadSecondaryTilesetPalette(struct MapLayout const *mapLayout); void LoadSecondaryTilesetPalette(struct MapLayout const *mapLayout);
void CopySecondaryTilesetToVramUsingHeap(struct MapLayout const *mapLayout); void CopySecondaryTilesetToVramUsingHeap(struct MapLayout const *mapLayout);
void CopyPrimaryTilesetToVram(const struct MapLayout *); void CopyPrimaryTilesetToVram(struct MapLayout const *mapLayout);
void CopySecondaryTilesetToVram(const struct MapLayout *); void CopySecondaryTilesetToVram(struct MapLayout const *mapLayout);
const struct MapHeader *const GetMapHeaderFromConnection(const struct MapConnection *connection); const struct MapHeader *const GetMapHeaderFromConnection(const struct MapConnection *connection);
const struct MapConnection *GetMapConnectionAtPos(s16 x, s16 y); const struct MapConnection *GetMapConnectionAtPos(s16 x, s16 y);
void MapGridSetMetatileImpassabilityAt(int x, int y, bool32 impassable); void MapGridSetMetatileImpassabilityAt(int x, int y, bool32 impassable);

2
include/fldeff.h
View File

@ -13,7 +13,7 @@ extern const struct SpritePalette gSpritePalette_CutGrass;
extern struct MapPosition gPlayerFacingPosition; extern struct MapPosition gPlayerFacingPosition;
// escalator // escalator
void StartEscalator(bool8 var); void StartEscalator(bool8 goingUp);
void StopEscalator(void); void StopEscalator(void);
bool8 IsEscalatorMoving(void); bool8 IsEscalatorMoving(void);

6
include/image_processing_effects.h
View File

@ -46,8 +46,8 @@ struct ImageProcessingContext
u8 personality; u8 personality;
}; };
void ApplyImageProcessingEffects(struct ImageProcessingContext *); void ApplyImageProcessingEffects(struct ImageProcessingContext *context);
void ApplyImageProcessingQuantization(struct ImageProcessingContext *); void ApplyImageProcessingQuantization(struct ImageProcessingContext *context);
void ConvertImageProcessingToGBA(struct ImageProcessingContext *); void ConvertImageProcessingToGBA(struct ImageProcessingContext *context);
#endif #endif

8
include/international_string_util.h
View File

@ -4,7 +4,7 @@
#include "menu.h" #include "menu.h"
#include "list_menu.h" #include "list_menu.h"
void ConvertInternationalPlayerName(u8 *src); void ConvertInternationalPlayerName(u8 *str);
void TVShowConvertInternationalString(u8 *dest, const u8 *src, int language); void TVShowConvertInternationalString(u8 *dest, const u8 *src, int language);
int GetStringCenterAlignXOffset(int fontId, const u8 *str, int totalWidth); int GetStringCenterAlignXOffset(int fontId, const u8 *str, int totalWidth);
int GetStringRightAlignXOffset(int fontId, const u8 *str, int totalWidth); int GetStringRightAlignXOffset(int fontId, const u8 *str, int totalWidth);
@ -16,9 +16,9 @@ int Intl_GetListMenuWidth(const struct ListMenuTemplate *listMenu);
void CopyMonCategoryText(u16 species, u8 *dest); void CopyMonCategoryText(u16 species, u8 *dest);
u8 *GetStringClearToWidth(u8 *dest, int fontId, const u8 *str, int totalStringWidth); u8 *GetStringClearToWidth(u8 *dest, int fontId, const u8 *str, int totalStringWidth);
void PadNameString(u8 *dest, u8 padChar); void PadNameString(u8 *dest, u8 padChar);
void ConvertInternationalPlayerNameStripChar(u8 *, u8); void ConvertInternationalPlayerNameStripChar(u8 *str, u8 removeChar);
void ConvertInternationalContestantName(u8 *); void ConvertInternationalContestantName(u8 *str);
int GetNicknameLanguage(u8 *); int GetNicknameLanguage(u8 *str);
void FillWindowTilesByRow(int windowId, int columnStart, int rowStart, int numFillTiles, int numRows); void FillWindowTilesByRow(int windowId, int columnStart, int rowStart, int numFillTiles, int numRows);
#endif // GUARD_INTERNATIONAL_STRING_UTIL_H #endif // GUARD_INTERNATIONAL_STRING_UTIL_H

2
include/intro.h
View File

@ -8,7 +8,7 @@
// Exported ROM declarations // Exported ROM declarations
void CB2_InitCopyrightScreenAfterBootup(void); void CB2_InitCopyrightScreenAfterBootup(void);
void CB2_InitCopyrightScreenAfterTitleScreen(void); void CB2_InitCopyrightScreenAfterTitleScreen(void);
void PanFadeAndZoomScreen(u16, u16, u16, u16); void PanFadeAndZoomScreen(u16 screenX, u16 screenY, u16 zoom, u16 alpha);
void MainCB2_Intro(void); void MainCB2_Intro(void);
void Task_Scene1_Load(u8); void Task_Scene1_Load(u8);

6
include/intro_credits_graphics.h
View File

@ -35,10 +35,10 @@ extern const struct SpritePalette gSpritePalettes_Credits[];
void LoadIntroPart2Graphics(u8 scenery); void LoadIntroPart2Graphics(u8 scenery);
void SetIntroPart2BgCnt(u8 scenery); void SetIntroPart2BgCnt(u8 scenery);
void LoadCreditsSceneGraphics(u8); void LoadCreditsSceneGraphics(u8 scene);
void SetCreditsSceneBgCnt(u8); void SetCreditsSceneBgCnt(u8 scene);
u8 CreateBicycleBgAnimationTask(u8 mode, u16 bg1Speed, u16 bg2Speed, u16 bg3Speed); u8 CreateBicycleBgAnimationTask(u8 mode, u16 bg1Speed, u16 bg2Speed, u16 bg3Speed);
void CycleSceneryPalette(u8); void CycleSceneryPalette(u8 mode);
u8 CreateIntroBrendanSprite(s16 x, s16 y); u8 CreateIntroBrendanSprite(s16 x, s16 y);
u8 CreateIntroMaySprite(s16 x, s16 y); u8 CreateIntroMaySprite(s16 x, s16 y);
u8 CreateIntroFlygonSprite(s16 x, s16 y); u8 CreateIntroFlygonSprite(s16 x, s16 y);

6
include/item_menu.h
View File

@ -97,7 +97,7 @@ void CB2_BagMenuFromStartMenu(void);
u8 GetItemListPosition(u8 pocketId); u8 GetItemListPosition(u8 pocketId);
bool8 UseRegisteredKeyItemOnField(void); bool8 UseRegisteredKeyItemOnField(void);
void CB2_GoToSellMenu(void); void CB2_GoToSellMenu(void);
void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *exitCallback)()); void GoToBagMenu(u8 location, u8 pocket, void ( *exitCallback)());
void DoWallyTutorialBagMenu(void); void DoWallyTutorialBagMenu(void);
void ResetBagScrollPositions(void); void ResetBagScrollPositions(void);
void ChooseBerryForMachine(void (*exitCallback)(void)); void ChooseBerryForMachine(void (*exitCallback)(void));
@ -106,8 +106,8 @@ void CB2_ChooseMulch(void);
void Task_FadeAndCloseBagMenu(u8 taskId); void Task_FadeAndCloseBagMenu(u8 taskId);
void BagMenu_YesNo(u8 taskId, u8 windowType, const struct YesNoFuncTable *funcTable); void BagMenu_YesNo(u8 taskId, u8 windowType, const struct YesNoFuncTable *funcTable);
void UpdatePocketItemList(u8 pocketId); void UpdatePocketItemList(u8 pocketId);
void DisplayItemMessage(u8 taskId, u8 fontId, const u8 *str, void ( *callback)(u8 taskId)); void DisplayItemMessage(u8 taskId, u8 fontId, const u8 *str, void (*callback)(u8 taskId));
void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback); void DisplayItemMessageOnField(u8 taskId, const u8 *string, TaskFunc callback);
void CloseItemMessage(u8 taskId); void CloseItemMessage(u8 taskId);
void ItemMenu_RotomCatalog(u8 taskId); void ItemMenu_RotomCatalog(u8 taskId);

76
include/item_use.h
View File

@ -1,48 +1,48 @@
#ifndef GUARD_ITEM_USE_H #ifndef GUARD_ITEM_USE_H
#define GUARD_ITEM_USE_H #define GUARD_ITEM_USE_H
void ItemUseOutOfBattle_Mail(u8); void ItemUseOutOfBattle_Mail(u8 taskId);
void ItemUseOutOfBattle_Bike(u8); void ItemUseOutOfBattle_Bike(u8 taskId);
void ItemUseOutOfBattle_Rod(u8); void ItemUseOutOfBattle_Rod(u8 taskId);
void ItemUseOutOfBattle_Itemfinder(u8); void ItemUseOutOfBattle_Itemfinder(u8 taskId);
void ItemUseOutOfBattle_PokeblockCase(u8); void ItemUseOutOfBattle_PokeblockCase(u8 taskId);
void ItemUseOutOfBattle_CoinCase(u8); void ItemUseOutOfBattle_CoinCase(u8 taskId);
void ItemUseOutOfBattle_PokemonBoxLink(u8); void ItemUseOutOfBattle_PokemonBoxLink(u8 taskId);
void ItemUseOutOfBattle_PowderJar(u8); void ItemUseOutOfBattle_PowderJar(u8 taskId);
void ItemUseOutOfBattle_SSTicket(u8); void ItemUseOutOfBattle_SSTicket(u8 taskId);
void ItemUseOutOfBattle_WailmerPail(u8); void ItemUseOutOfBattle_WailmerPail(u8 taskId);
void ItemUseOutOfBattle_Medicine(u8); void ItemUseOutOfBattle_Medicine(u8 taskId);
void ItemUseOutOfBattle_AbilityCapsule(u8); void ItemUseOutOfBattle_AbilityCapsule(u8 taskId);
void ItemUseOutOfBattle_AbilityPatch(u8); void ItemUseOutOfBattle_AbilityPatch(u8 taskId);
void ItemUseOutOfBattle_Mint(u8); void ItemUseOutOfBattle_Mint(u8 taskId);
void ItemUseOutOfBattle_ResetEVs(u8); void ItemUseOutOfBattle_ResetEVs(u8 taskId);
void ItemUseOutOfBattle_ReduceEV(u8); void ItemUseOutOfBattle_ReduceEV(u8 taskId);
void ItemUseOutOfBattle_SacredAsh(u8); void ItemUseOutOfBattle_SacredAsh(u8 taskId);
void ItemUseOutOfBattle_PPRecovery(u8); void ItemUseOutOfBattle_PPRecovery(u8 taskId);
void ItemUseOutOfBattle_PPUp(u8); void ItemUseOutOfBattle_PPUp(u8 taskId);
void ItemUseOutOfBattle_RareCandy(u8); void ItemUseOutOfBattle_RareCandy(u8 taskId);
void ItemUseOutOfBattle_DynamaxCandy(u8); void ItemUseOutOfBattle_DynamaxCandy(u8 taskId);
void ItemUseOutOfBattle_TMHM(u8); void ItemUseOutOfBattle_TMHM(u8 taskId);
void ItemUseOutOfBattle_Repel(u8); void ItemUseOutOfBattle_Repel(u8 taskId);
void ItemUseOutOfBattle_Lure(u8); void ItemUseOutOfBattle_Lure(u8 taskId);
void ItemUseOutOfBattle_EscapeRope(u8); void ItemUseOutOfBattle_EscapeRope(u8 taskId);
void ItemUseOutOfBattle_BlackWhiteFlute(u8); void ItemUseOutOfBattle_BlackWhiteFlute(u8 taskId);
void ItemUseOutOfBattle_EvolutionStone(u8); void ItemUseOutOfBattle_EvolutionStone(u8 taskId);
void ItemUseOutOfBattle_Berry(u8); void ItemUseOutOfBattle_Berry(u8 taskId);
void ItemUseOutOfBattle_EnigmaBerry(u8); void ItemUseOutOfBattle_EnigmaBerry(u8 taskId);
void ItemUseOutOfBattle_FormChange(u8); void ItemUseOutOfBattle_FormChange(u8 taskId);
void ItemUseOutOfBattle_FormChange_ConsumedOnUse(u8); void ItemUseOutOfBattle_FormChange_ConsumedOnUse(u8 taskId);
void ItemUseOutOfBattle_RotomCatalog(u8); void ItemUseOutOfBattle_RotomCatalog(u8 taskId);
void ItemUseOutOfBattle_ZygardeCube(u8); void ItemUseOutOfBattle_ZygardeCube(u8 taskId);
void ItemUseOutOfBattle_Fusion(u8); void ItemUseOutOfBattle_Fusion(u8 taskId);
void ItemUseOutOfBattle_Honey(u8); void ItemUseOutOfBattle_Honey(u8 taskId);
void ItemUseOutOfBattle_CannotUse(u8); void ItemUseOutOfBattle_CannotUse(u8 taskId);
void ItemUseOutOfBattle_ExpShare(u8); void ItemUseOutOfBattle_ExpShare(u8 taskId);
void ItemUseInBattle_BagMenu(u8 taskId); void ItemUseInBattle_BagMenu(u8 taskId);
void ItemUseInBattle_PartyMenu(u8 taskId); void ItemUseInBattle_PartyMenu(u8 taskId);
void ItemUseInBattle_PartyMenuChooseMove(u8 taskId); void ItemUseInBattle_PartyMenuChooseMove(u8 taskId);
void Task_UseDigEscapeRopeOnField(u8 taskId); void Task_UseDigEscapeRopeOnField(u8 taskId);
u8 CanUseDigOrEscapeRopeOnCurMap(void); bool8 CanUseDigOrEscapeRopeOnCurMap(void);
u8 CheckIfItemIsTMHMOrEvolutionStone(u16 itemId); u8 CheckIfItemIsTMHMOrEvolutionStone(u16 itemId);
void FieldUseFunc_VsSeeker(u8 taskId); void FieldUseFunc_VsSeeker(u8 taskId);
void Task_ItemUse_CloseMessageBoxAndReturnToField_VsSeeker(u8 taskId); void Task_ItemUse_CloseMessageBoxAndReturnToField_VsSeeker(u8 taskId);

4
include/librfu.h
View File

@ -519,7 +519,7 @@ void rfu_REQ_endSearchParent(void);
void rfu_REQ_startConnectParent(u16 pid); void rfu_REQ_startConnectParent(u16 pid);
void rfu_REQ_pollConnectParent(void); void rfu_REQ_pollConnectParent(void);
void rfu_REQ_endConnectParent(void); void rfu_REQ_endConnectParent(void);
u16 rfu_getConnectParentStatus(u8 *status,u8 *connectSlotNo); u16 rfu_getConnectParentStatus(u8 *status, u8 *connectSlotNo);
// Restore link from child device // Restore link from child device
void rfu_REQ_CHILD_startConnectRecovery(u8 bmRecoverySlot); void rfu_REQ_CHILD_startConnectRecovery(u8 bmRecoverySlot);
void rfu_REQ_CHILD_pollConnectRecovery(void); void rfu_REQ_CHILD_pollConnectRecovery(void);
@ -611,7 +611,7 @@ void STWI_send_DataRxREQ(void);
void STWI_send_MS_ChangeREQ(void); void STWI_send_MS_ChangeREQ(void);
void STWI_send_StopModeREQ(void); void STWI_send_StopModeREQ(void);
void STWI_send_SystemStatusREQ(void); void STWI_send_SystemStatusREQ(void);
void STWI_send_GameConfigREQ(const u8 *serial_uname, const u8 *gname); void STWI_send_GameConfigREQ(const u8 *serial_gname, const u8 *uname);
void STWI_send_ResetREQ(void); void STWI_send_ResetREQ(void);
void STWI_send_LinkStatusREQ(void); void STWI_send_LinkStatusREQ(void);
void STWI_send_VersionStatusREQ(void); void STWI_send_VersionStatusREQ(void);

2
include/lilycove_lady.h
View File

@ -8,7 +8,7 @@ void FieldCallback_FavorLadyEnableScriptContexts(void);
void FieldCallback_QuizLadyEnableScriptContexts(void); void FieldCallback_QuizLadyEnableScriptContexts(void);
void QuizLadyClearQuestionForRecordMix(const LilycoveLady *lilycoveLady); void QuizLadyClearQuestionForRecordMix(const LilycoveLady *lilycoveLady);
bool8 GivePokeblockToContestLady(struct Pokeblock *pokeblock); bool8 GivePokeblockToContestLady(struct Pokeblock *pokeblock);
void BufferContestLadyMonName(u8 *dest1, u8 *dest2); void BufferContestLadyMonName(u8 *category, u8 *nickname);
void BufferContestLadyPlayerName(u8 *dest); void BufferContestLadyPlayerName(u8 *dest);
void BufferContestLadyLanguage(u8 *dest); void BufferContestLadyLanguage(u8 *dest);
void BufferContestName(u8 *dest, u8 category); void BufferContestName(u8 *dest, u8 category);

18
include/link.h
View File

@ -255,21 +255,21 @@ bool8 IsWirelessAdapterConnected(void);
void Task_DestroySelf(u8 taskId); void Task_DestroySelf(u8 taskId);
void OpenLink(void); void OpenLink(void);
void CloseLink(void); void CloseLink(void);
u16 LinkMain2(const u16 *); u16 LinkMain2(const u16 *heldKeys);
void ClearLinkCallback(void); void ClearLinkCallback(void);
void ClearLinkCallback_2(void); void ClearLinkCallback_2(void);
u8 GetLinkPlayerCount(void); u8 GetLinkPlayerCount(void);
void OpenLinkTimed(void); void OpenLinkTimed(void);
u8 GetLinkPlayerDataExchangeStatusTimed(int lower, int upper); u8 GetLinkPlayerDataExchangeStatusTimed(int minPlayers, int maxPlayers);
bool8 IsLinkPlayerDataExchangeComplete(void); bool8 IsLinkPlayerDataExchangeComplete(void);
u32 GetLinkPlayerTrainerId(u8); u32 GetLinkPlayerTrainerId(u8 who);
void ResetLinkPlayers(void); void ResetLinkPlayers(void);
u8 GetMultiplayerId(void); u8 GetMultiplayerId(void);
u8 BitmaskAllOtherLinkPlayers(void); u8 BitmaskAllOtherLinkPlayers(void);
bool8 SendBlock(u8, const void *, u16); bool8 SendBlock(u8 unused, const void *src, u16 size);
u8 GetBlockReceivedStatus(void); u8 GetBlockReceivedStatus(void);
void ResetBlockReceivedFlags(void); void ResetBlockReceivedFlags(void);
void ResetBlockReceivedFlag(u8); void ResetBlockReceivedFlag(u8 who);
u8 GetLinkPlayerCount_2(void); u8 GetLinkPlayerCount_2(void);
bool8 IsLinkMaster(void); bool8 IsLinkMaster(void);
void CB2_LinkError(void); void CB2_LinkError(void);
@ -293,7 +293,7 @@ bool8 HandleLinkConnection(void);
void SetLinkDebugValues(u32 seed, u32 flags); void SetLinkDebugValues(u32 seed, u32 flags);
void SetBerryBlenderLinkCallback(void); void SetBerryBlenderLinkCallback(void);
void SetSuppressLinkErrorMessage(bool8 flag); void SetSuppressLinkErrorMessage(bool8 flag);
void ConvertLinkPlayerName(struct LinkPlayer *linkPlayer); void ConvertLinkPlayerName(struct LinkPlayer *player);
void ClearSavedLinkPlayers(void); void ClearSavedLinkPlayers(void);
void SetLinkErrorBuffer(u32 status, u8 lastSendQueueCount, u8 lastRecvQueueCount, bool8 disconnected); void SetLinkErrorBuffer(u32 status, u8 lastSendQueueCount, u8 lastRecvQueueCount, bool8 disconnected);
void LocalLinkPlayerToBlock(void); void LocalLinkPlayerToBlock(void);
@ -331,10 +331,10 @@ extern u16 gLinkSavedIme;
extern struct LinkPlayer gLocalLinkPlayer; extern struct LinkPlayer gLocalLinkPlayer;
bool32 Link_AnyPartnersPlayingRubyOrSapphire(void); bool32 Link_AnyPartnersPlayingRubyOrSapphire(void);
bool32 LinkDummy_Return2(void); u32 LinkDummy_Return2(void);
void SetLocalLinkPlayerId(u8); void SetLocalLinkPlayerId(u8 playerId);
u8 GetSavedPlayerCount(void); u8 GetSavedPlayerCount(void);
bool8 SendBlockRequest(u8 type); bool8 SendBlockRequest(u8 blockReqType);
u8 GetLinkPlayerCountAsBitFlags(void); u8 GetLinkPlayerCountAsBitFlags(void);
u8 GetSavedLinkPlayerCountAsBitFlags(void); u8 GetSavedLinkPlayerCountAsBitFlags(void);
void SetCloseLinkCallbackHandleJP(void); void SetCloseLinkCallbackHandleJP(void);

6
include/link_rfu.h
View File

@ -268,7 +268,7 @@ void RfuVSync(void);
void RfuSetIgnoreError(bool32 enable); void RfuSetIgnoreError(bool32 enable);
u8 RfuGetStatus(void); u8 RfuGetStatus(void);
struct RfuGameData *GetHostRfuGameData(void); struct RfuGameData *GetHostRfuGameData(void);
void UpdateGameData_GroupLockedIn(u8 startedActivity); void UpdateGameData_GroupLockedIn(bool8 startedActivity);
void RfuSetErrorParams(u32 errorInfo); void RfuSetErrorParams(u32 errorInfo);
void RfuSetStatus(u8 status, u16 errorInfo); void RfuSetStatus(u8 status, u16 errorInfo);
u8 Rfu_SetLinkRecovery(bool32 enable); u8 Rfu_SetLinkRecovery(bool32 enable);
@ -320,8 +320,8 @@ void RfuRecvQueue_Reset(struct RfuRecvQueue *queue);
void RfuSendQueue_Reset(struct RfuSendQueue *queue); void RfuSendQueue_Reset(struct RfuSendQueue *queue);
void RfuRecvQueue_Enqueue(struct RfuRecvQueue *queue, u8 *data); void RfuRecvQueue_Enqueue(struct RfuRecvQueue *queue, u8 *data);
void RfuSendQueue_Enqueue(struct RfuSendQueue *queue, u8 *data); void RfuSendQueue_Enqueue(struct RfuSendQueue *queue, u8 *data);
bool8 RfuRecvQueue_Dequeue(struct RfuRecvQueue *queue, u8 *dest); bool8 RfuRecvQueue_Dequeue(struct RfuRecvQueue *queue, u8 *src);
bool8 RfuSendQueue_Dequeue(struct RfuSendQueue *queue, u8 *dest); bool8 RfuSendQueue_Dequeue(struct RfuSendQueue *queue, u8 *src);
void RfuBackupQueue_Enqueue(struct RfuBackupQueue *queue, const u8 *data); void RfuBackupQueue_Enqueue(struct RfuBackupQueue *queue, const u8 *data);
bool8 RfuBackupQueue_Dequeue(struct RfuBackupQueue *queue, u8 *src); bool8 RfuBackupQueue_Dequeue(struct RfuBackupQueue *queue, u8 *src);
void InitHostRfuGameData(struct RfuGameData *data, u8 activity, bool32 startedActivity, s32 partnerInfo); void InitHostRfuGameData(struct RfuGameData *data, u8 activity, bool32 startedActivity, s32 partnerInfo);

6
include/list_menu.h
View File

@ -107,7 +107,7 @@ struct CursorStruct
extern struct ScrollArrowsTemplate gTempScrollArrowTemplate; extern struct ScrollArrowsTemplate gTempScrollArrowTemplate;
extern struct ListMenuTemplate gMultiuseListMenuTemplate; extern struct ListMenuTemplate gMultiuseListMenuTemplate;
s32 DoMysteryGiftListMenu(const struct WindowTemplate *windowTemplate, const struct ListMenuTemplate *listMenuTemplate, u8 drawMode, u16 tileNum, u16 palNum); s32 DoMysteryGiftListMenu(const struct WindowTemplate *windowTemplate, const struct ListMenuTemplate *listMenuTemplate, u8 drawMode, u16 tileNum, u16 palOffset);
u8 ListMenuInit(struct ListMenuTemplate *listMenuTemplate, u16 scrollOffset, u16 selectedRow); u8 ListMenuInit(struct ListMenuTemplate *listMenuTemplate, u16 scrollOffset, u16 selectedRow);
u8 ListMenuInitInRect(struct ListMenuTemplate *listMenuTemplate, struct ListMenuWindowRect *rect, u16 scrollOffset, u16 selectedRow); u8 ListMenuInitInRect(struct ListMenuTemplate *listMenuTemplate, struct ListMenuWindowRect *rect, u16 scrollOffset, u16 selectedRow);
s32 ListMenu_ProcessInput(u8 listTaskId); s32 ListMenu_ProcessInput(u8 listTaskId);
@ -120,11 +120,11 @@ void ListMenuGetCurrentItemArrayId(u8 listTaskId, u16 *arrayId);
void ListMenuGetScrollAndRow(u8 listTaskId, u16 *scrollOffset, u16 *selectedRow); void ListMenuGetScrollAndRow(u8 listTaskId, u16 *scrollOffset, u16 *selectedRow);
u16 ListMenuGetYCoordForPrintingArrowCursor(u8 listTaskId); u16 ListMenuGetYCoordForPrintingArrowCursor(u8 listTaskId);
void ListMenuOverrideSetColors(u8 cursorPal, u8 fillValue, u8 cursorShadowPal); void ListMenuOverrideSetColors(u8 cursorPal, u8 fillValue, u8 cursorShadowPal);
void ListMenuDefaultCursorMoveFunc(s32 itemIndex, u8 onInit, struct ListMenu *list); void ListMenuDefaultCursorMoveFunc(s32 itemIndex, bool8 onInit, struct ListMenu *list);
s32 ListMenuGetUnkIndicatorsStructFields(u8 taskId, u8 field); s32 ListMenuGetUnkIndicatorsStructFields(u8 taskId, u8 field);
void ListMenuSetUnkIndicatorsStructField(u8 taskId, u8 field, s32 value); void ListMenuSetUnkIndicatorsStructField(u8 taskId, u8 field, s32 value);
u8 AddScrollIndicatorArrowPair(const struct ScrollArrowsTemplate *arrowInfo, u16 *scrollOffset); u8 AddScrollIndicatorArrowPair(const struct ScrollArrowsTemplate *arrowInfo, u16 *scrollOffset);
u8 AddScrollIndicatorArrowPairParameterized(u32 arrowType, s32 commonPos, s32 firstPos, s32 secondPos, s32 fullyDownThreshold, s32 tileTag, s32 palTag, u16 *currItemPtr); u8 AddScrollIndicatorArrowPairParameterized(u32 arrowType, s32 commonPos, s32 firstPos, s32 secondPos, s32 fullyDownThreshold, s32 tileTag, s32 palTag, u16 *scrollOffset);
void RemoveScrollIndicatorArrowPair(u8 taskId); void RemoveScrollIndicatorArrowPair(u8 taskId);
void Task_ScrollIndicatorArrowPairOnMainMenu(u8 taskId); void Task_ScrollIndicatorArrowPairOnMainMenu(u8 taskId);
bool8 ListMenuChangeSelection(struct ListMenu *list, bool8 updateCursorAndCallCallback, u8 count, bool8 movingDown); bool8 ListMenuChangeSelection(struct ListMenu *list, bool8 updateCursorAndCallCallback, u8 count, bool8 movingDown);

2
include/main.h
View File

@ -64,7 +64,7 @@ void SetHBlankCallback(IntrCallback callback);
void SetVCountCallback(IntrCallback callback); void SetVCountCallback(IntrCallback callback);
void SetSerialCallback(IntrCallback callback); void SetSerialCallback(IntrCallback callback);
void InitFlashTimer(void); void InitFlashTimer(void);
void SetTrainerHillVBlankCounter(u32 *var); void SetTrainerHillVBlankCounter(u32 *counter);
void ClearTrainerHillVBlankCounter(void); void ClearTrainerHillVBlankCounter(void);
void DoSoftReset(void); void DoSoftReset(void);
void ClearPokemonCrySongs(void); void ClearPokemonCrySongs(void);

2
include/malloc.h
View File

@ -59,7 +59,7 @@ extern u8 gHeap[HEAP_SIZE];
void *Alloc_(u32 size, const char *location); void *Alloc_(u32 size, const char *location);
void *AllocZeroed_(u32 size, const char *location); void *AllocZeroed_(u32 size, const char *location);
void Free(void *pointer); void Free(void *pointer);
void InitHeap(void *pointer, u32 size); void InitHeap(void *heapStart, u32 heapSize);
const struct MemBlock *HeapHead(void); const struct MemBlock *HeapHead(void);
const char *MemBlockLocation(const struct MemBlock *block); const char *MemBlockLocation(const struct MemBlock *block);

2
include/match_call.h
View File

@ -16,7 +16,7 @@ bool32 TryStartMatchCall(void);
bool32 IsMatchCallTaskActive(void); bool32 IsMatchCallTaskActive(void);
void StartMatchCallFromScript(const u8 *message); void StartMatchCallFromScript(const u8 *message);
void BufferPokedexRatingForMatchCall(u8 *destStr); void BufferPokedexRatingForMatchCall(u8 *destStr);
bool32 SelectMatchCallMessage(int, u8 *); bool32 SelectMatchCallMessage(int trainerId, u8 *str);
void LoadMatchCallWindowGfx(u32 windowId, u32 destOffset, u32 paletteId); void LoadMatchCallWindowGfx(u32 windowId, u32 destOffset, u32 paletteId);
void DrawMatchCallTextBoxBorder(u32 windowId, u32 tileOffset, u32 paletteId); void DrawMatchCallTextBoxBorder(u32 windowId, u32 tileOffset, u32 paletteId);

2
include/mauville_old_man.h
View File

@ -6,7 +6,7 @@ extern struct BardSong gBardSong;
void SetMauvilleOldMan(void); void SetMauvilleOldMan(void);
u8 GetCurrentMauvilleOldMan(void); u8 GetCurrentMauvilleOldMan(void);
void SetMauvilleOldManObjEventGfx(void); void SetMauvilleOldManObjEventGfx(void);
void SanitizeMauvilleOldManForRuby(OldMan *dest); void SanitizeMauvilleOldManForRuby(union OldMan *oldMan);
void SanitizeReceivedRubyOldMan(union OldMan *oldMan, u32 version, u32 language); void SanitizeReceivedRubyOldMan(union OldMan *oldMan, u32 version, u32 language);
void SanitizeReceivedEmeraldOldMan(union OldMan *oldMan, u32 version, u32 language); void SanitizeReceivedEmeraldOldMan(union OldMan *oldMan, u32 version, u32 language);
void ResetMauvilleOldManFlag(void); void ResetMauvilleOldManFlag(void);

28
include/menu.h
View File

@ -57,7 +57,7 @@ void LoadMessageBoxAndBorderGfx(void);
void DrawDialogueFrame(u8 windowId, bool8 copyToVram); void DrawDialogueFrame(u8 windowId, bool8 copyToVram);
void ClearStdWindowAndFrame(u8 windowId, bool8 copyToVram); void ClearStdWindowAndFrame(u8 windowId, bool8 copyToVram);
u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16), u8 fgColor, u8 bgColor, u8 shadowColor); u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16), u8 fgColor, u8 bgColor, u8 shadowColor);
void PrintPlayerNameOnWindow(u8, const u8 *, u16, u16); void PrintPlayerNameOnWindow(u8 windowId, const u8 *src, u16 x, u16 y);
void ClearDialogWindowAndFrame(u8 windowId, bool8 copyToVram); void ClearDialogWindowAndFrame(u8 windowId, bool8 copyToVram);
void SetStandardWindowBorderStyle(u8 windowId, bool8 copyToVram); void SetStandardWindowBorderStyle(u8 windowId, bool8 copyToVram);
void DisplayYesNoMenuDefaultYes(void); void DisplayYesNoMenuDefaultYes(void);
@ -68,11 +68,11 @@ void AddTextPrinterWithCallbackForMessage(bool8 canSpeedUp, void (*callback)(str
void BgDmaFill(u32 bg, u8 value, int offset, int size); void BgDmaFill(u32 bg, u8 value, int offset, int size);
void AddTextPrinterParameterized3(u8 windowId, u8 fontId, u8 left, u8 top, const u8 *color, s8 speed, const u8 *str); void AddTextPrinterParameterized3(u8 windowId, u8 fontId, u8 left, u8 top, const u8 *color, s8 speed, const u8 *str);
void ClearStdWindowAndFrameToTransparent(u8 windowId, bool8 copyToVram); void ClearStdWindowAndFrameToTransparent(u8 windowId, bool8 copyToVram);
void SetWindowTemplateFields(struct WindowTemplate *template, u8 priority, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 palNum, u16 baseBlock); void SetWindowTemplateFields(struct WindowTemplate *template, u8 bg, u8 left, u8 top, u8 width, u8 height, u8 paletteNum, u16 baseBlock);
void DrawStdFrameWithCustomTileAndPalette(u8 windowId, bool8 copyToVram, u16 tileStart, u8 palette); void DrawStdFrameWithCustomTileAndPalette(u8 windowId, bool8 copyToVram, u16 baseTileNum, u8 paletteNum);
void ScheduleBgCopyTilemapToVram(u8 bgNum); void ScheduleBgCopyTilemapToVram(u8 bgId);
void PrintMenuTable(u8 windowId, u8 itemCount, const struct MenuAction *strs); void PrintMenuTable(u8 windowId, u8 itemCount, const struct MenuAction *menuActions);
u8 InitMenuInUpperLeftCornerNormal(u8 windowId, u8 numItems, u8 initialCursorPos); u8 InitMenuInUpperLeftCornerNormal(u8 windowId, u8 itemCount, u8 initialCursorPos);
u8 Menu_GetCursorPos(void); u8 Menu_GetCursorPos(void);
s8 Menu_ProcessInput(void); s8 Menu_ProcessInput(void);
s8 Menu_ProcessInputNoWrap(void); s8 Menu_ProcessInputNoWrap(void);
@ -81,17 +81,17 @@ void ResetTempTileDataBuffers(void);
void *DecompressAndCopyTileDataToVram(u8 bgId, const void *src, u32 size, u16 offset, u8 mode); void *DecompressAndCopyTileDataToVram(u8 bgId, const void *src, u32 size, u16 offset, u8 mode);
bool8 FreeTempTileDataBuffersIfPossible(void); bool8 FreeTempTileDataBuffersIfPossible(void);
struct WindowTemplate CreateWindowTemplate(u8 bg, u8 left, u8 top, u8 width, u8 height, u8 paletteNum, u16 baseBlock); struct WindowTemplate CreateWindowTemplate(u8 bg, u8 left, u8 top, u8 width, u8 height, u8 paletteNum, u16 baseBlock);
void CreateYesNoMenu(const struct WindowTemplate *windowTemplate, u16 borderFirstTileNum, u8 borderPalette, u8 initialCursorPos); void CreateYesNoMenu(const struct WindowTemplate *window, u16 baseTileNum, u8 paletteNum, u8 initialCursorPos);
void DecompressAndLoadBgGfxUsingHeap(u8 bgId, const void *src, u32 size, u16 offset, u8 mode); void DecompressAndLoadBgGfxUsingHeap(u8 bgId, const void *src, u32 size, u16 offset, u8 mode);
s8 Menu_ProcessInputNoWrapClearOnChoose(void); s8 Menu_ProcessInputNoWrapClearOnChoose(void);
s8 ProcessMenuInput_other(void); s8 ProcessMenuInput_other(void);
void DoScheduledBgTilemapCopiesToVram(void); void DoScheduledBgTilemapCopiesToVram(void);
void ClearScheduledBgCopiesToVram(void); void ClearScheduledBgCopiesToVram(void);
void AddTextPrinterParameterized4(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, const u8 *color, s8 speed, const u8 *str); void AddTextPrinterParameterized4(u8 windowId, u8 fontId, u8 left, u8 top, u8 letterSpacing, u8 lineSpacing, const u8 *color, s8 speed, const u8 *str);
void DrawDialogFrameWithCustomTileAndPalette(u8 windowId, bool8 copyToVram, u16 tileNum, u8 paletteNum); void DrawDialogFrameWithCustomTileAndPalette(u8 windowId, bool8 copyToVram, u16 tileNum, u8 paletteNum);
void PrintMenuActionTextsInUpperLeftCorner(u8 windowId, u8 optionsNo, const struct MenuAction *actions, const u8 *actionIds); void PrintMenuActionTextsInUpperLeftCorner(u8 windowId, u8 itemCount, const struct MenuAction *menuActions, const u8 *actionIds);
void ClearDialogWindowAndFrameToTransparent(u8 windowId, bool8 copyToVram); void ClearDialogWindowAndFrameToTransparent(u8 windowId, bool8 copyToVram);
void *malloc_and_decompress(const void *src, u32 *sizeOut); void *malloc_and_decompress(const void *src, u32 *size);
u16 copy_decompressed_tile_data_to_vram(u8 bgId, const void *src, u16 size, u16 offset, u8 mode); u16 copy_decompressed_tile_data_to_vram(u8 bgId, const void *src, u16 size, u16 offset, u8 mode);
void AddTextPrinterForMessage(bool8 allowSkippingDelayWithButtonPress); void AddTextPrinterForMessage(bool8 allowSkippingDelayWithButtonPress);
void PrintMenuActionTexts(u8 windowId, u8 fontId, u8 left, u8 top, u8 letterSpacing, u8 lineHeight, u8 itemCount, const struct MenuAction *menuActions, const u8 *actionIds); void PrintMenuActionTexts(u8 windowId, u8 fontId, u8 left, u8 top, u8 letterSpacing, u8 lineHeight, u8 itemCount, const struct MenuAction *menuActions, const u8 *actionIds);
@ -102,7 +102,7 @@ u8 GetStartMenuWindowId(void);
void ListMenuLoadStdPalAt(u8 palOffset, u8 palId); void ListMenuLoadStdPalAt(u8 palOffset, u8 palId);
u8 Menu_MoveCursor(s8 cursorDelta); u8 Menu_MoveCursor(s8 cursorDelta);
u8 Menu_MoveCursorNoWrapAround(s8 cursorDelta); u8 Menu_MoveCursorNoWrapAround(s8 cursorDelta);
void DrawStdWindowFrame(u8 windowId, bool8 CopyToVram); void DrawStdWindowFrame(u8 windowId, bool8 copyToVram);
u8 AddStartMenuWindow(u8 numActions); u8 AddStartMenuWindow(u8 numActions);
u8 InitMenuNormal(u8 windowId, u8 fontId, u8 left, u8 top, u8 cursorHeight, u8 numChoices, u8 initialCursorPos); u8 InitMenuNormal(u8 windowId, u8 fontId, u8 left, u8 top, u8 cursorHeight, u8 numChoices, u8 initialCursorPos);
void LoadMessageBoxAndFrameGfx(u8 windowId, bool8 copyToVram); void LoadMessageBoxAndFrameGfx(u8 windowId, bool8 copyToVram);
@ -115,9 +115,9 @@ u8 GetMapNamePopUpWindowId(void);
u8 AddMapNamePopUpWindow(void); u8 AddMapNamePopUpWindow(void);
void AddTextPrinterParameterized5(u8 windowId, u8 fontId, const u8 *str, u8 left, u8 top, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16), u8 letterSpacing, u8 lineSpacing); void AddTextPrinterParameterized5(u8 windowId, u8 fontId, const u8 *str, u8 left, u8 top, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16), u8 letterSpacing, u8 lineSpacing);
void SetBgTilemapPalette(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette); void SetBgTilemapPalette(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette);
void AddValToTilemapBuffer(void *ptr, int delta, int width, int height, bool32 is8BPP); void AddValToTilemapBuffer(void *ptr, int delta, int width, int height, bool32 isAffine);
void EraseFieldMessageBox(bool8 copyToVram); void EraseFieldMessageBox(bool8 copyToVram);
void PrintMenuGridTable(u8 windowId, u8 optionWidth, u8 columns, u8 rows, const struct MenuAction *strs); void PrintMenuGridTable(u8 windowId, u8 optionWidth, u8 columns, u8 rows, const struct MenuAction *menuActions);
s8 Menu_ProcessGridInput(void); s8 Menu_ProcessGridInput(void);
u8 InitMenuInUpperLeftCorner(u8 windowId, u8 itemCount, u8 initialCursorPos, bool8 APressMuted); u8 InitMenuInUpperLeftCorner(u8 windowId, u8 itemCount, u8 initialCursorPos, bool8 APressMuted);
s8 Menu_ProcessInputNoWrapAround_other(void); s8 Menu_ProcessInputNoWrapAround_other(void);
@ -129,7 +129,7 @@ void HofPCTopBar_PrintPair(const u8 *string, const u8 *string2, bool8 noBg, u8 l
void ResetBgPositions(void); void ResetBgPositions(void);
void AddTextPrinterWithCustomSpeedForMessage(bool8 allowSkippingDelayWithButtonPress, u8 speed); void AddTextPrinterWithCustomSpeedForMessage(bool8 allowSkippingDelayWithButtonPress, u8 speed);
void EraseYesNoWindow(void); void EraseYesNoWindow(void);
void PrintMenuActionTextsAtPos(u8 windowId, u8 fontId, u8 left, u8 top, u8 lineHeight, u8 itemCount, const struct MenuAction *strs); void PrintMenuActionTextsAtPos(u8 windowId, u8 fontId, u8 left, u8 top, u8 lineHeight, u8 itemCount, const struct MenuAction *menuActions);
void Menu_LoadStdPal(void); void Menu_LoadStdPal(void);
u8 AddSecondaryPopUpWindow(void); u8 AddSecondaryPopUpWindow(void);
u8 GetSecondaryPopUpWindowId(void); u8 GetSecondaryPopUpWindowId(void);

4
include/menu_specialized.h
View File

@ -112,7 +112,7 @@ bool8 ConditionMenu_UpdateMonExit(struct ConditionGraph *graph, s16 *x);
bool8 MoveConditionMonOnscreen(s16 *x); bool8 MoveConditionMonOnscreen(s16 *x);
bool8 MoveConditionMonOffscreen(s16 *x); bool8 MoveConditionMonOffscreen(s16 *x);
void GetConditionMenuMonNameAndLocString(u8 *locationDst, u8 *nameDst, u16 boxId, u16 monId, u16 partyId, u16 numMons, bool8 excludesCancel); void GetConditionMenuMonNameAndLocString(u8 *locationDst, u8 *nameDst, u16 boxId, u16 monId, u16 partyId, u16 numMons, bool8 excludesCancel);
void GetConditionMenuMonConditions(struct ConditionGraph *graph, u8 *sheen, u16 boxId, u16 monId, u16 partyId, u16 id, u16 numMons, bool8 excludesCancel); void GetConditionMenuMonConditions(struct ConditionGraph *graph, u8 *numSparkles, u16 boxId, u16 monId, u16 partyId, u16 id, u16 numMons, bool8 excludesCancel);
void GetConditionMenuMonGfx(void *tilesDst, void *palDst, u16 boxId, u16 monId, u16 partyId, u16 numMons, bool8 excludesCancel); void GetConditionMenuMonGfx(void *tilesDst, void *palDst, u16 boxId, u16 monId, u16 partyId, u16 numMons, bool8 excludesCancel);
void LoadConditionMonPicTemplate(struct SpriteSheet *sheet, struct SpriteTemplate *template, struct SpritePalette *pal); void LoadConditionMonPicTemplate(struct SpriteSheet *sheet, struct SpriteTemplate *template, struct SpritePalette *pal);
void LoadConditionSelectionIcons(struct SpriteSheet *sheets, struct SpriteTemplate *template, struct SpritePalette *pals); void LoadConditionSelectionIcons(struct SpriteSheet *sheets, struct SpriteTemplate *template, struct SpritePalette *pals);
@ -121,7 +121,7 @@ s32 GetBoxOrPartyMonData(u16 boxId, u16 monId, s32 request, u8 *dst);
// Condition sparkles // Condition sparkles
void LoadConditionSparkle(struct SpriteSheet *sheet, struct SpritePalette *pal); void LoadConditionSparkle(struct SpriteSheet *sheet, struct SpritePalette *pal);
void ResetConditionSparkleSprites(struct Sprite **sprites); void ResetConditionSparkleSprites(struct Sprite **sprites);
void CreateConditionSparkleSprites(struct Sprite **sprites, u8 monSpriteId, u8 count); void CreateConditionSparkleSprites(struct Sprite **sprites, u8 monSpriteId, u8 _count);
void DestroyConditionSparkleSprites(struct Sprite **sprites); void DestroyConditionSparkleSprites(struct Sprite **sprites);
void FreeConditionSparkles(struct Sprite **sprites); void FreeConditionSparkles(struct Sprite **sprites);

273
include/metatile_behavior.h
View File

@ -9,145 +9,144 @@ enum {
BRIDGE_TYPE_POND_HIGH, BRIDGE_TYPE_POND_HIGH,
}; };
bool8 MetatileBehavior_IsATile(u8); bool8 MetatileBehavior_IsATile(u8 metatileBehavior);
bool8 MetatileBehavior_IsEncounterTile(u8); bool8 MetatileBehavior_IsEncounterTile(u8 metatileBehavior);
bool8 MetatileBehavior_IsJumpEast(u8); bool8 MetatileBehavior_IsJumpEast(u8 metatileBehavior);
bool8 MetatileBehavior_IsJumpWest(u8); bool8 MetatileBehavior_IsJumpWest(u8 metatileBehavior);
bool8 MetatileBehavior_IsJumpNorth(u8); bool8 MetatileBehavior_IsJumpNorth(u8 metatileBehavior);
bool8 MetatileBehavior_IsJumpSouth(u8); bool8 MetatileBehavior_IsJumpSouth(u8 metatileBehavior);
bool8 MetatileBehavior_IsPokeGrass(u8); bool8 MetatileBehavior_IsPokeGrass(u8 metatileBehavior);
bool8 MetatileBehavior_IsSandOrDeepSand(u8); bool8 MetatileBehavior_IsSandOrDeepSand(u8 metatileBehavior);
bool8 MetatileBehavior_IsDeepSand(u8); bool8 MetatileBehavior_IsDeepSand(u8 metatileBehavior);
bool8 MetatileBehavior_IsReflective(u8); bool8 MetatileBehavior_IsReflective(u8 metatileBehavior);
bool8 MetatileBehavior_IsIce(u8); bool8 MetatileBehavior_IsIce(u8 metatileBehavior);
bool8 MetatileBehavior_IsWarpDoor(u8); bool8 MetatileBehavior_IsWarpDoor(u8 metatileBehavior);
bool8 MetatileBehavior_IsDoor(u8); bool8 MetatileBehavior_IsDoor(u8 metatileBehavior);
bool8 MetatileBehavior_IsEscalator(u8); bool8 MetatileBehavior_IsEscalator(u8 metatileBehavior);
bool8 MetatileBehavior_IsLadder(u8); bool8 MetatileBehavior_IsLadder(u8 metatileBehavior);
bool8 MetatileBehavior_IsNonAnimDoor(u8); bool8 MetatileBehavior_IsNonAnimDoor(u8 metatileBehavior);
bool8 MetatileBehavior_IsDeepSouthWarp(u8); bool8 MetatileBehavior_IsDeepSouthWarp(u8 metatileBehavior);
bool8 MetatileBehavior_IsSurfableWaterOrUnderwater(u8); bool8 MetatileBehavior_IsSurfableWaterOrUnderwater(u8 metatileBehavior);
bool8 MetatileBehavior_IsEastArrowWarp(u8); bool8 MetatileBehavior_IsEastArrowWarp(u8 metatileBehavior);
bool8 MetatileBehavior_IsWestArrowWarp(u8); bool8 MetatileBehavior_IsWestArrowWarp(u8 metatileBehavior);
bool8 MetatileBehavior_IsNorthArrowWarp(u8); bool8 MetatileBehavior_IsNorthArrowWarp(u8 metatileBehavior);
bool8 MetatileBehavior_IsSouthArrowWarp(u8); bool8 MetatileBehavior_IsSouthArrowWarp(u8 metatileBehavior);
bool8 MetatileBehavior_IsArrowWarp(u8); bool8 MetatileBehavior_IsForcedMovementTile(u8 metatileBehavior);
bool8 MetatileBehavior_IsForcedMovementTile(u8); bool8 MetatileBehavior_IsIce_2(u8 metatileBehavior);
bool8 MetatileBehavior_IsIce_2(u8); bool8 MetatileBehavior_IsTrickHouseSlipperyFloor(u8 metatileBehavior);
bool8 MetatileBehavior_IsTrickHouseSlipperyFloor(u8); bool8 MetatileBehavior_IsWalkNorth(u8 metatileBehavior);
bool8 MetatileBehavior_IsWalkNorth(u8); bool8 MetatileBehavior_IsWalkSouth(u8 metatileBehavior);
bool8 MetatileBehavior_IsWalkSouth(u8); bool8 MetatileBehavior_IsWalkWest(u8 metatileBehavior);
bool8 MetatileBehavior_IsWalkWest(u8); bool8 MetatileBehavior_IsWalkEast(u8 metatileBehavior);
bool8 MetatileBehavior_IsWalkEast(u8); bool8 MetatileBehavior_IsNorthwardCurrent(u8 metatileBehavior);
bool8 MetatileBehavior_IsNorthwardCurrent(u8); bool8 MetatileBehavior_IsSouthwardCurrent(u8 metatileBehavior);
bool8 MetatileBehavior_IsSouthwardCurrent(u8); bool8 MetatileBehavior_IsWestwardCurrent(u8 metatileBehavior);
bool8 MetatileBehavior_IsWestwardCurrent(u8); bool8 MetatileBehavior_IsEastwardCurrent(u8 metatileBehavior);
bool8 MetatileBehavior_IsEastwardCurrent(u8); bool8 MetatileBehavior_IsSlideNorth(u8 metatileBehavior);
bool8 MetatileBehavior_IsSlideNorth(u8); bool8 MetatileBehavior_IsSlideSouth(u8 metatileBehavior);
bool8 MetatileBehavior_IsSlideSouth(u8); bool8 MetatileBehavior_IsSlideWest(u8 metatileBehavior);
bool8 MetatileBehavior_IsSlideWest(u8); bool8 MetatileBehavior_IsSlideEast(u8 metatileBehavior);
bool8 MetatileBehavior_IsSlideEast(u8); bool8 MetatileBehavior_IsCounter(u8 metatileBehavior);
bool8 MetatileBehavior_IsCounter(u8); bool8 MetatileBehavior_IsPlayerFacingTVScreen(u8 metatileBehavior, u8 playerDir);
bool8 MetatileBehavior_IsPlayerFacingTVScreen(u8 tile, u8 playerDir); bool8 MetatileBehavior_IsPC(u8 metatileBehavior);
bool8 MetatileBehavior_IsPC(u8); bool8 MetatileBehavior_IsCableBoxResults1(u8 metatileBehavior);
bool8 MetatileBehavior_IsCableBoxResults1(u8); bool8 MetatileBehavior_IsOpenSecretBaseDoor(u8 metatileBehavior);
bool8 MetatileBehavior_IsOpenSecretBaseDoor(u8); bool8 MetatileBehavior_IsSecretBaseCave(u8 metatileBehavior);
bool8 MetatileBehavior_IsSecretBaseCave(u8); bool8 MetatileBehavior_IsSecretBaseTree(u8 metatileBehavior);
bool8 MetatileBehavior_IsSecretBaseTree(u8); bool8 MetatileBehavior_IsSecretBaseShrub(u8 metatileBehavior);
bool8 MetatileBehavior_IsSecretBaseShrub(u8); bool8 MetatileBehavior_IsSecretBasePC(u8 metatileBehavior);
bool8 MetatileBehavior_IsSecretBasePC(u8); bool8 MetatileBehavior_IsRecordMixingSecretBasePC(u8 metatileBehavior);
bool8 MetatileBehavior_IsRecordMixingSecretBasePC(u8); bool8 MetatileBehavior_IsSecretBaseTrainerSpot(u8 metatileBehavior);
bool8 MetatileBehavior_IsSecretBaseTrainerSpot(u8); bool8 MetatileBehavior_IsSecretBaseImpassable(u8 metatileBehavior);
bool8 MetatileBehavior_IsSecretBaseImpassable(u8); bool8 MetatileBehavior_IsSecretBaseDecorationBase(u8 metatileBehavior);
bool8 MetatileBehavior_IsSecretBaseDecorationBase(u8); bool8 MetatileBehavior_IsSecretBasePoster(u8 metatileBehavior);
bool8 MetatileBehavior_IsSecretBasePoster(u8); bool8 MetatileBehavior_IsNormal(u8 metatileBehavior);
bool8 MetatileBehavior_IsNormal(u8); bool8 MetatileBehavior_IsSecretBaseNorthWall(u8 metatileBehavior);
bool8 MetatileBehavior_IsSecretBaseNorthWall(u8); bool8 MetatileBehavior_HoldsSmallDecoration(u8 metatileBehavior);
bool8 MetatileBehavior_HoldsSmallDecoration(u8); bool8 MetatileBehavior_HoldsLargeDecoration(u8 metatileBehavior);
bool8 MetatileBehavior_HoldsLargeDecoration(u8); bool8 MetatileBehavior_IsSecretBaseHole(u8 metatileBehavior);
bool8 MetatileBehavior_IsSecretBaseHole(u8); bool8 MetatileBehavior_IsSecretBaseBalloon(u8 metatileBehavior);
bool8 MetatileBehavior_IsSecretBaseBalloon(u8); bool8 MetatileBehavior_IsSecretBaseBreakableDoor(u8 metatileBehavior);
bool8 MetatileBehavior_IsSecretBaseBreakableDoor(u8); bool8 MetatileBehavior_IsSecretBaseSoundMat(u8 metatileBehavior);
bool8 MetatileBehavior_IsSecretBaseSoundMat(u8); bool8 MetatileBehavior_IsSecretBaseGlitterMat(u8 metatileBehavior);
bool8 MetatileBehavior_IsSecretBaseGlitterMat(u8); bool8 MetatileBehavior_IsSecretBaseSandOrnament(u8 metatileBehavior);
bool8 MetatileBehavior_IsSecretBaseSandOrnament(u8); bool8 MetatileBehavior_IsSecretBaseShieldOrToyTV(u8 metatileBehavior);
bool8 MetatileBehavior_IsSecretBaseShieldOrToyTV(u8); bool8 MetatileBehavior_IsPlayerRoomPCOn(u8 metatileBehavior);
bool8 MetatileBehavior_IsPlayerRoomPCOn(u8); bool8 MetatileBehavior_HasRipples(u8 metatileBehavior);
bool8 MetatileBehavior_HasRipples(u8); bool8 MetatileBehavior_IsPuddle(u8 metatileBehavior);
bool8 MetatileBehavior_IsPuddle(u8); bool8 MetatileBehavior_IsTallGrass(u8 metatileBehavior);
bool8 MetatileBehavior_IsTallGrass(u8); bool8 MetatileBehavior_IsLongGrass(u8 metatileBehavior);
bool8 MetatileBehavior_IsLongGrass(u8); bool8 MetatileBehavior_IsBerryTreeSoil(u8 metatileBehavior);
bool8 MetatileBehavior_IsBerryTreeSoil(u8); bool8 MetatileBehavior_IsAshGrass(u8 metatileBehavior);
bool8 MetatileBehavior_IsAshGrass(u8); bool8 MetatileBehavior_IsFootprints(u8 metatileBehavior);
bool8 MetatileBehavior_IsFootprints(u8); bool8 MetatileBehavior_IsBridgeOverWater(u8 metatileBehavior);
bool8 MetatileBehavior_IsBridgeOverWater(u8); u8 MetatileBehavior_GetBridgeType(u8 metatileBehavior);
u8 MetatileBehavior_GetBridgeType(u8); bool8 MetatileBehavior_IsBridgeOverWaterNoEdge(u8 metatileBehavior);
bool8 MetatileBehavior_IsBridgeOverWaterNoEdge(u8); bool8 MetatileBehavior_IsLandWildEncounter(u8 metatileBehavior);
bool8 MetatileBehavior_IsLandWildEncounter(u8); bool8 MetatileBehavior_IsWaterWildEncounter(u8 metatileBehavior);
bool8 MetatileBehavior_IsWaterWildEncounter(u8); bool8 MetatileBehavior_IsIndoorEncounter(u8 metatileBehavior);
bool8 MetatileBehavior_IsIndoorEncounter(u8); bool8 MetatileBehavior_IsMountain(u8 metatileBehavior);
bool8 MetatileBehavior_IsMountain(u8); bool8 MetatileBehavior_IsDiveable(u8 metatileBehavior);
bool8 MetatileBehavior_IsDiveable(u8); bool8 MetatileBehavior_IsUnableToEmerge(u8 metatileBehavior);
bool8 MetatileBehavior_IsUnableToEmerge(u8); bool8 MetatileBehavior_IsShallowFlowingWater(u8 metatileBehavior);
bool8 MetatileBehavior_IsShallowFlowingWater(u8); bool8 MetatileBehavior_IsThinIce(u8 metatileBehavior);
bool8 MetatileBehavior_IsThinIce(u8); bool8 MetatileBehavior_IsCrackedIce(u8 metatileBehavior);
bool8 MetatileBehavior_IsCrackedIce(u8); bool8 MetatileBehavior_IsDeepOrOceanWater(u8 metatileBehavior);
bool8 MetatileBehavior_IsDeepOrOceanWater(u8); bool8 MetatileBehavior_IsSurfableAndNotWaterfall(u8 metatileBehavior);
bool8 MetatileBehavior_IsSurfableAndNotWaterfall(u8); bool8 MetatileBehavior_IsEastBlocked(u8 metatileBehavior);
bool8 MetatileBehavior_IsEastBlocked(u8); bool8 MetatileBehavior_IsWestBlocked(u8 metatileBehavior);
bool8 MetatileBehavior_IsWestBlocked(u8); bool8 MetatileBehavior_IsNorthBlocked(u8 metatileBehavior);
bool8 MetatileBehavior_IsNorthBlocked(u8); bool8 MetatileBehavior_IsSouthBlocked(u8 metatileBehavior);
bool8 MetatileBehavior_IsSouthBlocked(u8); bool8 MetatileBehavior_IsShortGrass(u8 metatileBehavior);
bool8 MetatileBehavior_IsShortGrass(u8); bool8 MetatileBehavior_IsHotSprings(u8 metatileBehavior);
bool8 MetatileBehavior_IsHotSprings(u8); bool8 MetatileBehavior_IsWaterfall(u8 metatileBehavior);
bool8 MetatileBehavior_IsWaterfall(u8); bool8 MetatileBehavior_IsFortreeBridge(u8 metatileBehavior);
bool8 MetatileBehavior_IsFortreeBridge(u8); bool8 MetatileBehavior_IsPacifidlogVerticalLogTop(u8 metatileBehavior);
bool8 MetatileBehavior_IsPacifidlogVerticalLogTop(u8); bool8 MetatileBehavior_IsPacifidlogVerticalLogBottom(u8 metatileBehavior);
bool8 MetatileBehavior_IsPacifidlogVerticalLogBottom(u8); bool8 MetatileBehavior_IsPacifidlogHorizontalLogLeft(u8 metatileBehavior);
bool8 MetatileBehavior_IsPacifidlogHorizontalLogLeft(u8); bool8 MetatileBehavior_IsPacifidlogHorizontalLogRight(u8 metatileBehavior);
bool8 MetatileBehavior_IsPacifidlogHorizontalLogRight(u8); bool8 MetatileBehavior_IsPacifidlogLog(u8 metatileBehavior);
bool8 MetatileBehavior_IsPacifidlogLog(u8); bool8 MetatileBehavior_IsTrickHousePuzzleDoor(u8 metatileBehavior);
bool8 MetatileBehavior_IsTrickHousePuzzleDoor(u8); bool8 MetatileBehavior_IsRegionMap(u8 metatileBehavior);
bool8 MetatileBehavior_IsRegionMap(u8); bool8 MetatileBehavior_IsClosedSootopolisDoor(u8 metatileBehavior);
bool8 MetatileBehavior_IsClosedSootopolisDoor(u8); bool8 MetatileBehavior_IsSkyPillarClosedDoor(u8 metatileBehavior);
bool8 MetatileBehavior_IsSkyPillarClosedDoor(u8); bool8 MetatileBehavior_IsRoulette(u8 metatileBehavior);
bool8 MetatileBehavior_IsRoulette(u8); bool8 MetatileBehavior_IsPokeblockFeeder(u8 metatileBehavior);
bool8 MetatileBehavior_IsPokeblockFeeder(u8); bool8 MetatileBehavior_IsSecretBaseJumpMat(u8 metatileBehavior);
bool8 MetatileBehavior_IsSecretBaseJumpMat(u8); bool8 MetatileBehavior_IsSecretBaseSpinMat(u8 metatileBehavior);
bool8 MetatileBehavior_IsSecretBaseSpinMat(u8); bool8 MetatileBehavior_IsLavaridgeB1FWarp(u8 metatileBehavior);
bool8 MetatileBehavior_IsLavaridgeB1FWarp(u8); bool8 MetatileBehavior_IsLavaridge1FWarp(u8 metatileBehavior);
bool8 MetatileBehavior_IsLavaridge1FWarp(u8); bool8 MetatileBehavior_IsAquaHideoutWarp(u8 metatileBehavior);
bool8 MetatileBehavior_IsAquaHideoutWarp(u8); bool8 MetatileBehavior_IsUnionRoomWarp(u8 metatileBehavior);
bool8 MetatileBehavior_IsUnionRoomWarp(u8); bool8 MetatileBehavior_IsMossdeepGymWarp(u8 metatileBehavior);
bool8 MetatileBehavior_IsMossdeepGymWarp(u8); bool8 MetatileBehavior_IsSurfableFishableWater(u8 metatileBehavior);
bool8 MetatileBehavior_IsSurfableFishableWater(u8); bool8 MetatileBehavior_IsMtPyreHole(u8 metatileBehavior);
bool8 MetatileBehavior_IsMtPyreHole(u8); bool8 MetatileBehavior_IsCrackedFloorHole(u8 metatileBehavior);
bool8 MetatileBehavior_IsCrackedFloorHole(u8); bool8 MetatileBehavior_IsCrackedFloor(u8 metatileBehavior);
bool8 MetatileBehavior_IsCrackedFloor(u8); bool8 MetatileBehavior_IsMuddySlope(u8 metatileBehavior);
bool8 MetatileBehavior_IsMuddySlope(u8); bool8 MetatileBehavior_IsBumpySlope(u8 metatileBehavior);
bool8 MetatileBehavior_IsBumpySlope(u8); bool8 MetatileBehavior_IsIsolatedVerticalRail(u8 metatileBehavior);
bool8 MetatileBehavior_IsIsolatedVerticalRail(u8); bool8 MetatileBehavior_IsIsolatedHorizontalRail(u8 metatileBehavior);
bool8 MetatileBehavior_IsIsolatedHorizontalRail(u8); bool8 MetatileBehavior_IsVerticalRail(u8 metatileBehavior);
bool8 MetatileBehavior_IsVerticalRail(u8); bool8 MetatileBehavior_IsHorizontalRail(u8 metatileBehavior);
bool8 MetatileBehavior_IsHorizontalRail(u8); bool8 MetatileBehavior_IsSeaweed(u8 metatileBehavior);
bool8 MetatileBehavior_IsSeaweed(u8); bool8 MetatileBehavior_IsRunningDisallowed(u8 metatileBehavior);
bool8 MetatileBehavior_IsRunningDisallowed(u8); bool8 MetatileBehavior_IsCuttableGrass(u8 metatileBehavior);
bool8 MetatileBehavior_IsCuttableGrass(u8); bool8 MetatileBehavior_IsRunningShoesManual(u8 metatileBehavior);
bool8 MetatileBehavior_IsRunningShoesManual(u8); bool8 MetatileBehavior_IsPictureBookShelf(u8 metatileBehavior);
bool8 MetatileBehavior_IsPictureBookShelf(u8); bool8 MetatileBehavior_IsBookShelf(u8 metatileBehavior);
bool8 MetatileBehavior_IsBookShelf(u8); bool8 MetatileBehavior_IsPokeCenterBookShelf(u8 metatileBehavior);
bool8 MetatileBehavior_IsPokeCenterBookShelf(u8); bool8 MetatileBehavior_IsVase(u8 metatileBehavior);
bool8 MetatileBehavior_IsVase(u8); bool8 MetatileBehavior_IsTrashCan(u8 metatileBehavior);
bool8 MetatileBehavior_IsTrashCan(u8); bool8 MetatileBehavior_IsShopShelf(u8 metatileBehavior);
bool8 MetatileBehavior_IsShopShelf(u8); bool8 MetatileBehavior_IsBlueprint(u8 metatileBehavior);
bool8 MetatileBehavior_IsBlueprint(u8); bool8 MetatileBehavior_IsBattlePyramidWarp(u8 metatileBehavior);
bool8 MetatileBehavior_IsBattlePyramidWarp(u8);
bool8 MetatileBehavior_IsPlayerFacingWirelessBoxResults(u8 tile, u8 playerDir); bool8 MetatileBehavior_IsPlayerFacingWirelessBoxResults(u8 tile, u8 playerDir);
bool8 MetatileBehavior_IsCableBoxResults2(u8 tile, u8 playerDir); bool8 MetatileBehavior_IsCableBoxResults2(u8 tile, u8 playerDir);
bool8 MetatileBehavior_IsQuestionnaire(u8); bool8 MetatileBehavior_IsQuestionnaire(u8 metatileBehavior);
bool8 MetatileBehavior_IsLongGrass_Duplicate(u8); bool8 MetatileBehavior_IsLongGrass_Duplicate(u8 metatileBehavior);
bool8 MetatileBehavior_IsLongGrassSouthEdge(u8); bool8 MetatileBehavior_IsLongGrassSouthEdge(u8 metatileBehavior);
bool8 MetatileBehavior_IsTrainerHillTimer(u8); bool8 MetatileBehavior_IsTrainerHillTimer(u8 metatileBehavior);
bool8 MetatileBehavior_IsDirectionalUpRightStairWarp(u8 metatileBehavior); bool8 MetatileBehavior_IsDirectionalUpRightStairWarp(u8 metatileBehavior);
bool8 MetatileBehavior_IsDirectionalUpLeftStairWarp(u8 metatileBehavior); bool8 MetatileBehavior_IsDirectionalUpLeftStairWarp(u8 metatileBehavior);
bool8 MetatileBehavior_IsDirectionalDownRightStairWarp(u8 metatileBehavior); bool8 MetatileBehavior_IsDirectionalDownRightStairWarp(u8 metatileBehavior);

2
include/move_relearner.h
View File

@ -2,7 +2,7 @@
#define GUARD_MOVE_RELEARNER_H #define GUARD_MOVE_RELEARNER_H
void TeachMoveRelearnerMove(void); void TeachMoveRelearnerMove(void);
void MoveRelearnerShowHideHearts(s32); void MoveRelearnerShowHideHearts(s32 move);
void MoveRelearnerShowHideCategoryIcon(s32); void MoveRelearnerShowHideCategoryIcon(s32);
void CB2_InitLearnMove(void); void CB2_InitLearnMove(void);

2
include/mystery_event_script.h
View File

@ -12,7 +12,7 @@ enum {
void InitMysteryEventScriptContext(u8 *script); void InitMysteryEventScriptContext(u8 *script);
bool32 RunMysteryEventScriptContextCommand(u32 *status); bool32 RunMysteryEventScriptContextCommand(u32 *status);
u32 RunMysteryEventScript(u8 *script); u32 RunMysteryEventScript(u8 *script);
void SetMysteryEventScriptStatus(u32 val); void SetMysteryEventScriptStatus(u32 status);
u16 GetRecordMixingGift(void); u16 GetRecordMixingGift(void);
#endif // GUARD_MYSTERY_EVENT_SCRIPT_H #endif // GUARD_MYSTERY_EVENT_SCRIPT_H

2
include/mystery_gift_client.h
View File

@ -88,6 +88,6 @@ void MysteryGiftClient_Create(bool32 isWonderNews);
u32 MysteryGiftClient_Run(u16 *endVal); u32 MysteryGiftClient_Run(u16 *endVal);
void MysteryGiftClient_AdvanceState(void); void MysteryGiftClient_AdvanceState(void);
void * MysteryGiftClient_GetMsg(void); void * MysteryGiftClient_GetMsg(void);
void MysteryGiftClient_SetParam(u32 value); void MysteryGiftClient_SetParam(u32 val);
#endif //GUARD_MYSTERY_GIFT_CLIENT_H #endif //GUARD_MYSTERY_GIFT_CLIENT_H

4
include/mystery_gift_link.h
View File

@ -42,8 +42,8 @@ struct MysteryGiftLink
void MysteryGiftLink_Init(struct MysteryGiftLink *link, u32 sendPlayerId, u32 recvPlayerId); void MysteryGiftLink_Init(struct MysteryGiftLink *link, u32 sendPlayerId, u32 recvPlayerId);
void MysteryGiftLink_InitSend(struct MysteryGiftLink *link, u32 ident, const void *src, u32 size); void MysteryGiftLink_InitSend(struct MysteryGiftLink *link, u32 ident, const void *src, u32 size);
bool32 MysteryGiftLink_Recv(struct MysteryGiftLink *link); u32 MysteryGiftLink_Recv(struct MysteryGiftLink *link);
bool32 MysteryGiftLink_Send(struct MysteryGiftLink *link); u32 MysteryGiftLink_Send(struct MysteryGiftLink *link);
void MysteryGiftLink_InitRecv(struct MysteryGiftLink *link, u32 ident, void *dest); void MysteryGiftLink_InitRecv(struct MysteryGiftLink *link, u32 ident, void *dest);
#endif //GUARD_MYSTERY_GIFT_LINK_H #endif //GUARD_MYSTERY_GIFT_LINK_H

4
include/mystery_gift_menu.h
View File

@ -5,11 +5,11 @@ extern bool8 gGiftIsFromEReader;
u16 GetMysteryGiftBaseBlock(void); u16 GetMysteryGiftBaseBlock(void);
void CB2_MysteryGiftEReader(void); void CB2_MysteryGiftEReader(void);
void PrintMysteryGiftOrEReaderHeader(bool8 isJapanese, bool32 usePickOkCancel); void PrintMysteryGiftOrEReaderHeader(bool8 isEReader, bool32 useCancel);
void MG_DrawCheckerboardPattern(u32 bg); void MG_DrawCheckerboardPattern(u32 bg);
void MainCB_FreeAllBuffersAndReturnToInitTitleScreen(void); void MainCB_FreeAllBuffersAndReturnToInitTitleScreen(void);
bool32 PrintMysteryGiftMenuMessage(u8 *textState, const u8 *str); bool32 PrintMysteryGiftMenuMessage(u8 *textState, const u8 *str);
void MG_AddMessageTextPrinter(const u8 *src); void MG_AddMessageTextPrinter(const u8 *str);
void CB2_InitEReader(void); void CB2_InitEReader(void);
void CB2_InitMysteryGift(void); void CB2_InitMysteryGift(void);
void MG_DrawTextBorder(u8 windowId); void MG_DrawTextBorder(u8 windowId);

4
include/mystery_gift_server.h
View File

@ -93,8 +93,8 @@ struct MysteryGiftServer
struct MysteryGiftLink link; struct MysteryGiftLink link;
}; };
void MysterGiftServer_CreateForCard(); void MysterGiftServer_CreateForCard(void);
void MysterGiftServer_CreateForNews(); void MysterGiftServer_CreateForNews(void);
u32 MysterGiftServer_Run(u16 *endVal); u32 MysterGiftServer_Run(u16 *endVal);
#endif //GUARD_MYSTERY_GIFT_SERVER_H #endif //GUARD_MYSTERY_GIFT_SERVER_H

4
include/mystery_gift_view.h
View File

@ -13,8 +13,8 @@ bool32 WonderCard_Init(struct WonderCard *card, struct WonderCardMetadata *metad
bool32 WonderNews_Init(const struct WonderNews *news); bool32 WonderNews_Init(const struct WonderNews *news);
s32 WonderCard_Enter(void); s32 WonderCard_Enter(void);
s32 WonderNews_Enter(void); s32 WonderNews_Enter(void);
s32 WonderCard_Exit(bool32 flag); s32 WonderCard_Exit(bool32 useCancel);
s32 WonderNews_Exit(bool32 flag); s32 WonderNews_Exit(bool32 useCancel);
void WonderCard_Destroy(void); void WonderCard_Destroy(void);
void WonderNews_Destroy(void); void WonderNews_Destroy(void);
u32 WonderNews_GetInput(u16 input); u32 WonderNews_GetInput(u16 input);

4
include/overworld.h
View File

@ -78,7 +78,7 @@ void SetWarpDestination(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
void SetWarpDestinationToMapWarp(s8 mapGroup, s8 mapNum, s8 warpId); void SetWarpDestinationToMapWarp(s8 mapGroup, s8 mapNum, s8 warpId);
void SetDynamicWarp(s32 unused, s8 mapGroup, s8 mapNum, s8 warpId); void SetDynamicWarp(s32 unused, s8 mapGroup, s8 mapNum, s8 warpId);
void SetDynamicWarpWithCoords(s32 unused, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); void SetDynamicWarpWithCoords(s32 unused, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
void SetWarpDestinationToDynamicWarp(u8 unused); void SetWarpDestinationToDynamicWarp(u8 unusedWarpId);
void SetWarpDestinationToHealLocation(u8 healLocationId); void SetWarpDestinationToHealLocation(u8 healLocationId);
void SetWarpDestinationToLastHealLocation(void); void SetWarpDestinationToLastHealLocation(void);
void SetLastHealLocationWarp(u8 healLocationId); void SetLastHealLocationWarp(u8 healLocationId);
@ -101,7 +101,7 @@ void SetDefaultFlashLevel(void);
void SetFlashLevel(s32 flashLevel); void SetFlashLevel(s32 flashLevel);
u8 GetFlashLevel(void); u8 GetFlashLevel(void);
void SetCurrentMapLayout(u16 mapLayoutId); void SetCurrentMapLayout(u16 mapLayoutId);
void SetObjectEventLoadFlag(u8 var); void SetObjectEventLoadFlag(u8 flag);
u16 GetLocationMusic(struct WarpData *warp); u16 GetLocationMusic(struct WarpData *warp);
u16 GetCurrLocationDefaultMusic(void); u16 GetCurrLocationDefaultMusic(void);
u16 GetWarpDestinationMusic(void); u16 GetWarpDestinationMusic(void);

24
include/palette_util.h
View File

@ -66,18 +66,18 @@ struct RouletteFlashUtil
struct RouletteFlashPalette palettes[16]; struct RouletteFlashPalette palettes[16];
}; };
int InitPulseBlendPaletteSettings(struct PulseBlend *, const struct PulseBlendSettings *); int InitPulseBlendPaletteSettings(struct PulseBlend *pulseBlend, const struct PulseBlendSettings *settings);
void InitPulseBlend(struct PulseBlend *); void InitPulseBlend(struct PulseBlend *pulseBlend);
void MarkUsedPulseBlendPalettes(struct PulseBlend *, u16, u8); void MarkUsedPulseBlendPalettes(struct PulseBlend *pulseBlend, u16 pulseBlendPaletteSelector, u8 multiSelection);
void UnloadUsedPulseBlendPalettes(struct PulseBlend *, u16, u8); void UnloadUsedPulseBlendPalettes(struct PulseBlend *pulseBlend, u16 pulseBlendPaletteSelector, u8 multiSelection);
void UnmarkUsedPulseBlendPalettes(struct PulseBlend *, u16, u8); void UnmarkUsedPulseBlendPalettes(struct PulseBlend *pulseBlend, u16 pulseBlendPaletteSelector, u8 multiSelection);
void UpdatePulseBlend(struct PulseBlend *); void UpdatePulseBlend(struct PulseBlend *pulseBlend);
void FillTilemapRect(u16 *dest, u16 src, u8 left, u8 top, u8 width, u8 height); void FillTilemapRect(u16 *dest, u16 value, u8 left, u8 top, u8 width, u8 height);
void SetTilemapRect(u16 *dest, u16 *src, u8 left, u8 top, u8 width, u8 height); void SetTilemapRect(u16 *dest, u16 *src, u8 left, u8 top, u8 width, u8 height);
void RouletteFlash_Run(struct RouletteFlashUtil *r0); void RouletteFlash_Run(struct RouletteFlashUtil *flash);
void RouletteFlash_Reset(struct RouletteFlashUtil *r0); void RouletteFlash_Reset(struct RouletteFlashUtil *flash);
u8 RouletteFlash_Add(struct RouletteFlashUtil *r0, u8 r1, const struct RouletteFlashSettings *r2); u8 RouletteFlash_Add(struct RouletteFlashUtil *flash, u8 id, const struct RouletteFlashSettings *settings);
void RouletteFlash_Stop(struct RouletteFlashUtil *r0, u16 r1); void RouletteFlash_Stop(struct RouletteFlashUtil *flash, u16 flags);
void RouletteFlash_Enable(struct RouletteFlashUtil *r0, u16 r1); void RouletteFlash_Enable(struct RouletteFlashUtil *flash, u16 flags);
#endif // GUARD_PALETTE_UTIL_H #endif // GUARD_PALETTE_UTIL_H

6
include/party_menu.h
View File

@ -41,7 +41,7 @@ void Task_HandleChooseMonInput(u8 taskId);
u8 *GetMonNickname(struct Pokemon *mon, u8 *dest); u8 *GetMonNickname(struct Pokemon *mon, u8 *dest);
u8 DisplayPartyMenuMessage(const u8 *str, bool8 keepOpen); u8 DisplayPartyMenuMessage(const u8 *str, bool8 keepOpen);
bool8 IsPartyMenuTextPrinterActive(void); bool8 IsPartyMenuTextPrinterActive(void);
void PartyMenuModifyHP(u8 taskId, u8 slot, s8 hpIncrement, s16 HPDifference, TaskFunc task); void PartyMenuModifyHP(u8 taskId, u8 slot, s8 hpIncrement, s16 hpDifference, TaskFunc task);
u8 GetAilmentFromStatus(u32 status); u8 GetAilmentFromStatus(u32 status);
u8 GetMonAilment(struct Pokemon *mon); u8 GetMonAilment(struct Pokemon *mon);
void DisplayPartyMenuStdMessage(u32 stringId); void DisplayPartyMenuStdMessage(u32 stringId);
@ -88,9 +88,9 @@ void OpenPartyMenuInBattle(u8 partyAction);
void ChooseMonForInBattleItem(void); void ChooseMonForInBattleItem(void);
void BufferBattlePartyCurrentOrder(void); void BufferBattlePartyCurrentOrder(void);
void BufferBattlePartyCurrentOrderBySide(u8 battler, u8 flankId); void BufferBattlePartyCurrentOrderBySide(u8 battler, u8 flankId);
void SwitchPartyOrderLinkMulti(u8 battler, u8 slot, u8 arrayIndex); void SwitchPartyOrderLinkMulti(u8 battler, u8 slot, u8 slot2);
void SwitchPartyMonSlots(u8 slot, u8 slot2); void SwitchPartyMonSlots(u8 slot, u8 slot2);
u8 GetPartyIdFromBattlePartyId(u8 slot); u8 GetPartyIdFromBattlePartyId(u8 battlePartyId);
void ShowPartyMenuToShowcaseMultiBattleParty(void); void ShowPartyMenuToShowcaseMultiBattleParty(void);
void ChooseMonForDaycare(void); void ChooseMonForDaycare(void);
bool8 CB2_FadeFromPartyMenu(void); bool8 CB2_FadeFromPartyMenu(void);

2
include/player_pc.h
View File

@ -16,7 +16,7 @@ extern struct PlayerPCItemPageStruct gPlayerPCItemPageInfo;
extern const struct MenuAction gMailboxMailOptions[]; extern const struct MenuAction gMailboxMailOptions[];
void ReshowPlayerPC(u8 taskId); void ReshowPlayerPC(u8 var);
void CB2_PlayerPCExitBagMenu(void); void CB2_PlayerPCExitBagMenu(void);
void Mailbox_ReturnToMailListAfterDeposit(void); void Mailbox_ReturnToMailListAfterDeposit(void);
void NewGameInitPCItems(void); void NewGameInitPCItems(void);

8
include/pokedex.h
View File

@ -5,12 +5,12 @@ extern u8 gUnusedPokedexU8;
extern void (*gPokedexVBlankCB)(void); extern void (*gPokedexVBlankCB)(void);
void ResetPokedex(void); void ResetPokedex(void);
u16 GetNationalPokedexCount(u8); u16 GetNationalPokedexCount(u8 caseID);
u16 GetHoennPokedexCount(u8); u16 GetHoennPokedexCount(u8 caseID);
u8 DisplayCaughtMonDexPage(u16 species, bool32 isShiny, u32 personality); u8 DisplayCaughtMonDexPage(u16 species, bool32 isShiny, u32 personality);
s8 GetSetPokedexFlag(u16 nationalNum, u8 caseId); s8 GetSetPokedexFlag(u16 nationalDexNo, u8 caseID);
void DrawFootprint(u8 windowId, u16 species); void DrawFootprint(u8 windowId, u16 species);
u16 CreateMonSpriteFromNationalDexNumber(u16, s16, s16, u16); u16 CreateMonSpriteFromNationalDexNumber(u16 nationalNum, s16 x, s16 y, u16 paletteSlot);
bool16 HasAllHoennMons(void); bool16 HasAllHoennMons(void);
void ResetPokedexScrollPositions(void); void ResetPokedexScrollPositions(void);
bool16 HasAllMons(void); bool16 HasAllMons(void);

4
include/pokedex_area_region_map.h
View File

@ -9,9 +9,9 @@ struct PokedexAreaMapTemplate
u32 unk:20; // never read u32 unk:20; // never read
}; };
void LoadPokedexAreaMapGfx(const struct PokedexAreaMapTemplate *); void LoadPokedexAreaMapGfx(const struct PokedexAreaMapTemplate *template);
bool32 TryShowPokedexAreaMap(void); bool32 TryShowPokedexAreaMap(void);
void PokedexAreaMapChangeBgY(u32); void PokedexAreaMapChangeBgY(u32 move);
void FreePokedexAreaMapBgNum(void); void FreePokedexAreaMapBgNum(void);
#endif // GUARD_POKEDEX_AREA_REGION_MAP_H #endif // GUARD_POKEDEX_AREA_REGION_MAP_H

2
include/pokedex_area_screen.h
View File

@ -1,6 +1,6 @@
#ifndef GUARD_POKEDEX_AREA_SCREEN_H #ifndef GUARD_POKEDEX_AREA_SCREEN_H
#define GUARD_POKEDEX_AREA_SCREEN_H #define GUARD_POKEDEX_AREA_SCREEN_H
void ShowPokedexAreaScreen(u16, u8 *); void ShowPokedexAreaScreen(u16 species, u8 *screenSwitchState);
#endif // GUARD_POKEDEX_AREA_SCREEN_H #endif // GUARD_POKEDEX_AREA_SCREEN_H

8
include/pokedex_cry_screen.h
View File

@ -12,10 +12,10 @@ struct CryScreenWindow
extern u8 gDexCryScreenState; extern u8 gDexCryScreenState;
bool8 LoadCryWaveformWindow(struct CryScreenWindow *, u8); bool8 LoadCryWaveformWindow(struct CryScreenWindow *window, u8 windowId);
void UpdateCryWaveformWindow(u8); void UpdateCryWaveformWindow(u8 windowId);
void CryScreenPlayButton(u16); void CryScreenPlayButton(u16 species);
bool8 LoadCryMeter(struct CryScreenWindow *, u8); bool8 LoadCryMeter(struct CryScreenWindow *window, u8 windowId);
void FreeCryScreen(void); void FreeCryScreen(void);
#endif #endif

8
include/pokemon.h
View File

@ -667,7 +667,7 @@ u8 GetGenderFromSpeciesAndPersonality(u16 species, u32 personality);
bool32 IsPersonalityFemale(u16 species, u32 personality); bool32 IsPersonalityFemale(u16 species, u32 personality);
u32 GetUnownSpeciesId(u32 personality); u32 GetUnownSpeciesId(u32 personality);
void SetMultiuseSpriteTemplateToPokemon(u16 speciesTag, u8 battlerPosition); void SetMultiuseSpriteTemplateToPokemon(u16 speciesTag, u8 battlerPosition);
void SetMultiuseSpriteTemplateToTrainerBack(u16 trainerSpriteId, u8 battlerPosition); void SetMultiuseSpriteTemplateToTrainerBack(u16 trainerPicId, u8 battlerPosition);
void SetMultiuseSpriteTemplateToTrainerFront(u16 trainerPicId, u8 battlerPosition); void SetMultiuseSpriteTemplateToTrainerFront(u16 trainerPicId, u8 battlerPosition);
/* GameFreak called Get(Box)MonData with either 2 or 3 arguments, for /* GameFreak called Get(Box)MonData with either 2 or 3 arguments, for
@ -716,7 +716,7 @@ void RemoveBattleMonPPBonus(struct BattlePokemon *mon, u8 moveIndex);
void PokemonToBattleMon(struct Pokemon *src, struct BattlePokemon *dst); void PokemonToBattleMon(struct Pokemon *src, struct BattlePokemon *dst);
void CopyPartyMonToBattleData(u32 battler, u32 partyIndex); void CopyPartyMonToBattleData(u32 battler, u32 partyIndex);
bool8 ExecuteTableBasedItemEffect(struct Pokemon *mon, u16 item, u8 partyIndex, u8 moveIndex); bool8 ExecuteTableBasedItemEffect(struct Pokemon *mon, u16 item, u8 partyIndex, u8 moveIndex);
bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 moveIndex, u8 e); bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 moveIndex, u8 usedByAI);
bool8 HealStatusConditions(struct Pokemon *mon, u32 healMask, u8 battler); bool8 HealStatusConditions(struct Pokemon *mon, u32 healMask, u8 battler);
u8 GetItemEffectParamOffset(u32 battler, u16 itemId, u8 effectByte, u8 effectBit); u8 GetItemEffectParamOffset(u32 battler, u16 itemId, u8 effectByte, u8 effectBit);
u8 *UseStatIncreaseItem(u16 itemId); u8 *UseStatIncreaseItem(u16 itemId);
@ -733,10 +733,10 @@ u16 HoennToNationalOrder(u16 hoennNum);
void DrawSpindaSpots(u32 personality, u8 *dest, bool32 isSecondFrame); void DrawSpindaSpots(u32 personality, u8 *dest, bool32 isSecondFrame);
void EvolutionRenameMon(struct Pokemon *mon, u16 oldSpecies, u16 newSpecies); void EvolutionRenameMon(struct Pokemon *mon, u16 oldSpecies, u16 newSpecies);
u8 GetPlayerFlankId(void); u8 GetPlayerFlankId(void);
u16 GetLinkTrainerFlankId(u8 id); u16 GetLinkTrainerFlankId(u8 linkPlayerId);
s32 GetBattlerMultiplayerId(u16 id); s32 GetBattlerMultiplayerId(u16 id);
u8 GetTrainerEncounterMusicId(u16 trainerOpponentId); u8 GetTrainerEncounterMusicId(u16 trainerOpponentId);
u16 ModifyStatByNature(u8 nature, u16 n, u8 statIndex); u16 ModifyStatByNature(u8 nature, u16 stat, u8 statIndex);
void AdjustFriendship(struct Pokemon *mon, u8 event); void AdjustFriendship(struct Pokemon *mon, u8 event);
void MonGainEVs(struct Pokemon *mon, u16 defeatedSpecies); void MonGainEVs(struct Pokemon *mon, u16 defeatedSpecies);
u16 GetMonEVCount(struct Pokemon *mon); u16 GetMonEVCount(struct Pokemon *mon);

6
include/pokemon_icon.h
View File

@ -6,11 +6,11 @@ extern const struct SpritePalette gMonIconPaletteTable[];
const u8 *GetMonIconTiles(u16 species, u32 personality); const u8 *GetMonIconTiles(u16 species, u32 personality);
void TryLoadAllMonIconPalettesAtOffset(u16 offset); void TryLoadAllMonIconPalettesAtOffset(u16 offset);
u8 GetValidMonIconPalIndex(u16 species); u8 GetValidMonIconPalIndex(u16 species);
const u8 *GetMonIconPtr(u16 speciesId, u32 personality); const u8 *GetMonIconPtr(u16 species, u32 personality);
const u16 *GetValidMonIconPalettePtr(u16 speciesId); const u16 *GetValidMonIconPalettePtr(u16 species);
u16 GetIconSpecies(u16 species, u32 personality); u16 GetIconSpecies(u16 species, u32 personality);
u16 GetUnownLetterByPersonality(u32 personality); u16 GetUnownLetterByPersonality(u32 personality);
u16 GetIconSpeciesNoPersonality(u16 speciesId); u16 GetIconSpeciesNoPersonality(u16 species);
void LoadMonIconPalettes(void); void LoadMonIconPalettes(void);
void LoadMonIconPalette(u16 species); void LoadMonIconPalette(u16 species);
void FreeMonIconPalettes(void); void FreeMonIconPalettes(void);

52
include/pokenav.h
View File

@ -309,7 +309,7 @@ enum {
}; };
// pokenav.c // pokenav.c
void SetSelectedConditionSearch(u32); void SetSelectedConditionSearch(u32 cursorPos);
u32 GetSelectedConditionSearch(void); u32 GetSelectedConditionSearch(void);
void CB2_InitPokeNav(void); void CB2_InitPokeNav(void);
@ -336,7 +336,7 @@ int PokenavList_MoveCursorDown(void);
int PokenavList_PageDown(void); int PokenavList_PageDown(void);
int PokenavList_PageUp(void); int PokenavList_PageUp(void);
bool32 PokenavList_IsMoveWindowTaskActive(void); bool32 PokenavList_IsMoveWindowTaskActive(void);
void PokenavList_ToggleVerticalArrows(bool32 shouldHide); void PokenavList_ToggleVerticalArrows(bool32 invisible);
void PokenavList_DrawCurrentItemIcon(void); void PokenavList_DrawCurrentItemIcon(void);
void PokenavList_EraseListForCheckPage(void); void PokenavList_EraseListForCheckPage(void);
bool32 PokenavList_IsTaskActive(void); bool32 PokenavList_IsTaskActive(void);
@ -362,7 +362,7 @@ void CopyPaletteIntoBufferUnfaded(const u16 *palette, u32 bufferOffset, u32 size
void RunMainMenuLoopedTask(u32 state); void RunMainMenuLoopedTask(u32 state);
u32 IsActiveMenuLoopTaskActive(void); u32 IsActiveMenuLoopTaskActive(void);
void LoadLeftHeaderGfxForIndex(u32 menuGfxId); void LoadLeftHeaderGfxForIndex(u32 menuGfxId);
void ShowLeftHeaderGfx(u32 menugfxId, bool32 isMain, bool32 isOnRightSide); void ShowLeftHeaderGfx(u32 menuGfxId, bool32 isMain, bool32 isOnRightSide);
void PokenavFadeScreen(s32 fadeType); void PokenavFadeScreen(s32 fadeType);
bool32 AreLeftHeaderSpritesMoving(void); bool32 AreLeftHeaderSpritesMoving(void);
void InitBgTemplates(const struct BgTemplate *templates, int count); void InitBgTemplates(const struct BgTemplate *templates, int count);
@ -372,7 +372,7 @@ bool32 WaitForHelpBar(void);
void SlideMenuHeaderDown(void); void SlideMenuHeaderDown(void);
bool32 MainMenuLoopedTaskIsBusy(void); bool32 MainMenuLoopedTaskIsBusy(void);
void SetLeftHeaderSpritesInvisibility(void); void SetLeftHeaderSpritesInvisibility(void);
void PokenavCopyPalette(const u16 *a0, const u16 *a1, int a2, int a3, int a4, u16 *palette); void PokenavCopyPalette(const u16 *src, const u16 *dest, int size, int a3, int a4, u16 *palette);
void FadeToBlackExceptPrimary(void); void FadeToBlackExceptPrimary(void);
struct Sprite *GetSpinningPokenavSprite(void); struct Sprite *GetSpinningPokenavSprite(void);
void HideSpinningPokenavSprite(void); void HideSpinningPokenavSprite(void);
@ -382,7 +382,7 @@ void SlideMenuHeaderUp(void);
void PokenavFillPalette(u32 palIndex, u16 fillValue); void PokenavFillPalette(u32 palIndex, u16 fillValue);
u32 PokenavMainMenuLoopedTaskIsActive(void); u32 PokenavMainMenuLoopedTaskIsActive(void);
bool32 WaitForPokenavShutdownFade(void); bool32 WaitForPokenavShutdownFade(void);
void SetActiveMenuLoopTasks(void *func1, void *func2); void SetActiveMenuLoopTasks(void *createLoopTask, void *isLoopTaskActive); // Fix types later.
void ShutdownPokenav(void); void ShutdownPokenav(void);
// pokenav_menu_handler.c // pokenav_menu_handler.c
@ -413,11 +413,11 @@ void FreeMatchCallSubstruct1(void);
int IsMatchCallListInitFinished(void); int IsMatchCallListInitFinished(void);
int GetNumberRegistered(void); int GetNumberRegistered(void);
struct PokenavMatchCallEntry *GetMatchCallList(void); struct PokenavMatchCallEntry *GetMatchCallList(void);
u16 GetMatchCallMapSec(int); u16 GetMatchCallMapSec(int index);
bool32 ShouldDrawRematchPokeballIcon(int index); bool32 ShouldDrawRematchPokeballIcon(int index);
void ClearRematchPokeballIcon(u16 windowId, u32 tileOffset); void ClearRematchPokeballIcon(u16 windowId, u32 tileOffset);
int GetMatchCallTrainerPic(int index); int GetMatchCallTrainerPic(int index);
const u8 *GetMatchCallFlavorText(int index, int textType); const u8 *GetMatchCallFlavorText(int index, int checkPageEntry);
const u8 *GetMatchCallMessageText(int index, bool8 *newRematchRequest); const u8 *GetMatchCallMessageText(int index, bool8 *newRematchRequest);
u16 GetMatchCallOptionCursorPos(void); u16 GetMatchCallOptionCursorPos(void);
u16 GetMatchCallOptionId(int optionId); u16 GetMatchCallOptionId(int optionId);
@ -425,7 +425,7 @@ void BufferMatchCallNameAndDesc(struct PokenavMatchCallEntry *matchCallEntry, u8
u8 GetMatchTableMapSectionId(int rematchIndex); u8 GetMatchTableMapSectionId(int rematchIndex);
int GetIndexDeltaOfNextCheckPageDown(int index); int GetIndexDeltaOfNextCheckPageDown(int index);
int GetIndexDeltaOfNextCheckPageUp(int index); int GetIndexDeltaOfNextCheckPageUp(int index);
bool32 IsRematchEntryRegistered(int index); bool32 IsRematchEntryRegistered(int rematchIndex);
// pokenav_match_call_gfx.c // pokenav_match_call_gfx.c
bool32 OpenMatchCall(void); bool32 OpenMatchCall(void);
@ -437,15 +437,15 @@ void FreeMatchCallSubstruct2(void);
u32 PokenavCallback_Init_RegionMap(void); u32 PokenavCallback_Init_RegionMap(void);
u32 GetRegionMapCallback(void); u32 GetRegionMapCallback(void);
bool32 OpenPokenavRegionMap(void); bool32 OpenPokenavRegionMap(void);
void CreateRegionMapLoopedTask(s32); void CreateRegionMapLoopedTask(s32 index);
bool32 IsRegionMapLoopedTaskActive(void); bool32 IsRegionMapLoopedTaskActive(void);
void FreeRegionMapSubstruct1(void); void FreeRegionMapSubstruct1(void);
void FreeRegionMapSubstruct2(void); void FreeRegionMapSubstruct2(void);
void UpdateRegionMapHelpBarText(void); void UpdateRegionMapHelpBarText(void);
// pokenav_conditions.c // pokenav_conditions.c
u32 PokenavCallback_Init_ConditionGraph_Party(void); bool32 PokenavCallback_Init_ConditionGraph_Party(void);
u32 PokenavCallback_Init_ConditionGraph_Search(void); bool32 PokenavCallback_Init_ConditionGraph_Search(void);
u32 GetConditionGraphMenuCallback(void); u32 GetConditionGraphMenuCallback(void);
void FreeConditionGraphMenuSubstruct1(void); void FreeConditionGraphMenuSubstruct1(void);
bool32 LoadConditionGraphMenuGfx(void); bool32 LoadConditionGraphMenuGfx(void);
@ -456,47 +456,47 @@ u16 GetMonListCount(void);
u8 GetNumConditionMonSparkles(void); u8 GetNumConditionMonSparkles(void);
bool32 LoadNextConditionMenuMonData(u8 mode); bool32 LoadNextConditionMenuMonData(u8 mode);
u8 TryGetMonMarkId(void); u8 TryGetMonMarkId(void);
u8 *GetConditionMonNameText(u8 id); u8 *GetConditionMonNameText(u8 loadId);
u8 *GetConditionMonLocationText(u8 id); u8 *GetConditionMonLocationText(u8 loadId);
u16 GetConditionMonDataBuffer(void); u16 GetConditionMonDataBuffer(void);
void *GetConditionMonPicGfx(u8 id); void *GetConditionMonPicGfx(u8 loadId);
void *GetConditionMonPal(u8 id); void *GetConditionMonPal(u8 loadId);
// pokenav_conditions_gfx.c // pokenav_conditions_gfx.c
bool32 OpenConditionGraphMenu(void); bool32 OpenConditionGraphMenu(void);
void CreateConditionGraphMenuLoopedTask(s32); void CreateConditionGraphMenuLoopedTask(s32 id);
u32 IsConditionGraphMenuLoopedTaskActive(void); u32 IsConditionGraphMenuLoopedTaskActive(void);
void FreeConditionGraphMenuSubstruct2(void); void FreeConditionGraphMenuSubstruct2(void);
u8 GetMonMarkingsData(void); u8 GetMonMarkingsData(void);
// pokenav_conditions_search_results.c // pokenav_conditions_search_results.c
u32 PokenavCallback_Init_ConditionSearch(void); bool32 PokenavCallback_Init_ConditionSearch(void);
u32 PokenavCallback_Init_ReturnToMonSearchList(void); bool32 PokenavCallback_Init_ReturnToMonSearchList(void);
u32 GetConditionSearchResultsCallback(void); u32 GetConditionSearchResultsCallback(void);
void FreeSearchResultSubstruct1(void); void FreeSearchResultSubstruct1(void);
bool32 OpenConditionSearchResults(void); bool32 OpenConditionSearchResults(void);
bool32 OpenConditionSearchListFromGraph(void); bool32 OpenConditionSearchListFromGraph(void);
void CreateSearchResultsLoopedTask(s32); void CreateSearchResultsLoopedTask(s32 idx);
u32 IsSearchResultLoopedTaskActive(void); bool32 IsSearchResultLoopedTaskActive(void);
void FreeSearchResultSubstruct2(void); void FreeSearchResultSubstruct2(void);
// pokenav_ribbons_list.c // pokenav_ribbons_list.c
u32 PokenavCallback_Init_MonRibbonList(void); bool32 PokenavCallback_Init_MonRibbonList(void);
u32 PokenavCallback_Init_RibbonsMonListFromSummary(void); bool32 PokenavCallback_Init_RibbonsMonListFromSummary(void);
u32 GetRibbonsMonListCallback(void); u32 GetRibbonsMonListCallback(void);
void FreeRibbonsMonList(void); void FreeRibbonsMonList(void);
bool32 OpenRibbonsMonList(void); bool32 OpenRibbonsMonList(void);
bool32 OpenRibbonsMonListFromRibbonsSummary(void); bool32 OpenRibbonsMonListFromRibbonsSummary(void);
void CreateRibbonsMonListLoopedTask(s32); void CreateRibbonsMonListLoopedTask(s32 idx);
u32 IsRibbonsMonListLoopedTaskActive(void); bool32 IsRibbonsMonListLoopedTaskActive(void);
void FreeRibbonsMonMenu(void); void FreeRibbonsMonMenu(void);
// pokenav_ribbons_summary.c // pokenav_ribbons_summary.c
u32 PokenavCallback_Init_RibbonsSummaryMenu(void); bool32 PokenavCallback_Init_RibbonsSummaryMenu(void);
u32 GetRibbonsSummaryMenuCallback(void); u32 GetRibbonsSummaryMenuCallback(void);
void FreeRibbonsSummaryScreen1(void); void FreeRibbonsSummaryScreen1(void);
bool32 OpenRibbonsSummaryMenu(void); bool32 OpenRibbonsSummaryMenu(void);
void CreateRibbonsSummaryLoopedTask(s32); void CreateRibbonsSummaryLoopedTask(s32 id);
u32 IsRibbonsSummaryLoopedTaskActive(void); u32 IsRibbonsSummaryLoopedTaskActive(void);
void FreeRibbonsSummaryScreen2(void); void FreeRibbonsSummaryScreen2(void);

2
include/rayquaza_scene.h
View File

@ -1,6 +1,6 @@
#ifndef GUARD_RAYQUAZA_SCENE_H #ifndef GUARD_RAYQUAZA_SCENE_H
#define GUARD_RAYQUAZA_SCENE_H #define GUARD_RAYQUAZA_SCENE_H
void DoRayquazaScene(u8 animId, bool8 endEarly, void (*callback)(void)); void DoRayquazaScene(u8 animId, bool8 endEarly, void (*exitCallback)(void));
#endif // GUARD_RAYQUAZA_SCENE_H #endif // GUARD_RAYQUAZA_SCENE_H

2
include/recorded_battle.h
View File

@ -64,7 +64,7 @@ void RecordedBattle_SetBattlerAction(u8 battler, u8 action);
void RecordedBattle_ClearBattlerAction(u8 battler, u8 bytesToClear); void RecordedBattle_ClearBattlerAction(u8 battler, u8 bytesToClear);
u8 RecordedBattle_GetBattlerAction(u32 actionType, u8 battler); u8 RecordedBattle_GetBattlerAction(u32 actionType, u8 battler);
u8 RecordedBattle_BufferNewBattlerData(u8 *dst); u8 RecordedBattle_BufferNewBattlerData(u8 *dst);
void RecordedBattle_RecordAllBattlerData(u8 *data); void RecordedBattle_RecordAllBattlerData(u8 *src);
bool32 CanCopyRecordedBattleSaveData(void); bool32 CanCopyRecordedBattleSaveData(void);
bool32 MoveRecordedBattleToSaveData(void); bool32 MoveRecordedBattleToSaveData(void);
void SetPartiesFromRecordedSave(struct RecordedBattleSave *src); void SetPartiesFromRecordedSave(struct RecordedBattleSave *src);

4
include/region_map.h
View File

@ -96,7 +96,7 @@ struct RegionMapLocation
void InitRegionMapData(struct RegionMap *regionMap, const struct BgTemplate *template, bool8 zoomed); void InitRegionMapData(struct RegionMap *regionMap, const struct BgTemplate *template, bool8 zoomed);
bool8 LoadRegionMapGfx(void); bool8 LoadRegionMapGfx(void);
void UpdateRegionMapVideoRegs(void); void UpdateRegionMapVideoRegs(void);
void InitRegionMap(struct RegionMap *regionMap, u8 argument); void InitRegionMap(struct RegionMap *regionMap, bool8 zoomed);
u8 DoRegionMapInputCallback(void); u8 DoRegionMapInputCallback(void);
bool8 UpdateRegionMapZoom(void); bool8 UpdateRegionMapZoom(void);
void FreeRegionMapIconResources(void); void FreeRegionMapIconResources(void);
@ -104,7 +104,7 @@ u16 GetRegionMapSecIdAt(u16 x, u16 y);
void CreateRegionMapPlayerIcon(u16 tileTag, u16 paletteTag); void CreateRegionMapPlayerIcon(u16 tileTag, u16 paletteTag);
void CreateRegionMapCursor(u16 tileTag, u16 paletteTag); void CreateRegionMapCursor(u16 tileTag, u16 paletteTag);
bool32 IsEventIslandMapSecId(u8 mapSecId); bool32 IsEventIslandMapSecId(u8 mapSecId);
u8 *GetMapName(u8 *, u16, u16); u8 *GetMapName(u8 *dest, u16 regionMapId, u16 padLength);
u8 *GetMapNameGeneric(u8 *dest, u16 mapSecId); u8 *GetMapNameGeneric(u8 *dest, u16 mapSecId);
u8 *GetMapNameHandleAquaHideout(u8 *dest, u16 mapSecId); u8 *GetMapNameHandleAquaHideout(u8 *dest, u16 mapSecId);
u16 CorrectSpecialMapSecId(u16 mapSecId); u16 CorrectSpecialMapSecId(u16 mapSecId);

2
include/roamer.h
View File

@ -8,7 +8,7 @@ void RoamerMoveToOtherLocationSet(u32 roamerIndex);
void RoamerMove(u32 roamerIndex); void RoamerMove(u32 roamerIndex);
bool8 IsRoamerAt(u32 roamerIndex, u8 mapGroup, u8 mapNum); bool8 IsRoamerAt(u32 roamerIndex, u8 mapGroup, u8 mapNum);
void CreateRoamerMonInstance(u32 roamerIndex); void CreateRoamerMonInstance(u32 roamerIndex);
u8 TryStartRoamerEncounter(void); bool8 TryStartRoamerEncounter(void);
void UpdateRoamerHPStatus(struct Pokemon *mon); void UpdateRoamerHPStatus(struct Pokemon *mon);
void SetRoamerInactive(u32 roamerIndex); void SetRoamerInactive(u32 roamerIndex);
void GetRoamerLocation(u32 roamerIndex, u8 *mapGroup, u8 *mapNum); void GetRoamerLocation(u32 roamerIndex, u8 *mapGroup, u8 *mapNum);

2
include/safari_zone.h
View File

@ -16,6 +16,6 @@ void SafariZoneRetirePrompt(void);
void CB2_EndSafariBattle(void); void CB2_EndSafariBattle(void);
struct Pokeblock *SafariZoneGetActivePokeblock(void); struct Pokeblock *SafariZoneGetActivePokeblock(void);
void SafariZoneActivatePokeblockFeeder(u8 pokeblock_index); void SafariZoneActivatePokeblockFeeder(u8 pkblId);
#endif // GUARD_SAFARI_ZONE_H #endif // GUARD_SAFARI_ZONE_H

2
include/scanline_effect.h
View File

@ -39,7 +39,7 @@ extern u16 ALIGNED(4) gScanlineEffectRegBuffers[2][0x3C0];
void ScanlineEffect_Stop(void); void ScanlineEffect_Stop(void);
void ScanlineEffect_Clear(void); void ScanlineEffect_Clear(void);
void ScanlineEffect_SetParams(struct ScanlineEffectParams); void ScanlineEffect_SetParams(struct ScanlineEffectParams params);
void ScanlineEffect_InitHBlankDmaTransfer(void); void ScanlineEffect_InitHBlankDmaTransfer(void);
u8 ScanlineEffect_InitWave(u8 startLine, u8 endLine, u8 frequency, u8 amplitude, u8 delayInterval, u8 regOffset, bool8 applyBattleBgOffsets); u8 ScanlineEffect_InitWave(u8 startLine, u8 endLine, u8 frequency, u8 amplitude, u8 delayInterval, u8 regOffset, bool8 applyBattleBgOffsets);

2
include/script_menu.h
View File

@ -42,7 +42,7 @@ bool8 (*ScriptMenu_HidePokemonPic(void))(void);
int ConvertPixelWidthToTileWidth(int width); int ConvertPixelWidthToTileWidth(int width);
u8 CreateWindowFromRect(u8 x, u8 y, u8 width, u8 height); u8 CreateWindowFromRect(u8 x, u8 y, u8 width, u8 height);
void ClearToTransparentAndRemoveWindow(u8 windowId); void ClearToTransparentAndRemoveWindow(u8 windowId);
int DisplayTextAndGetWidth(const u8 *str, int width); int DisplayTextAndGetWidth(const u8 *str, int prevWidth);
int ScriptMenu_AdjustLeftCoordFromWidth(int left, int width); int ScriptMenu_AdjustLeftCoordFromWidth(int left, int width);
bool16 ScriptMenu_CreatePCMultichoice(void); bool16 ScriptMenu_CreatePCMultichoice(void);
void ScriptMenu_DisplayPCStartupPrompt(void); void ScriptMenu_DisplayPCStartupPrompt(void);

10
include/script_pokemon_util.h
View File

@ -1,11 +1,11 @@
#ifndef GUARD_SCRIPT_POKEMON_UTIL_H #ifndef GUARD_SCRIPT_POKEMON_UTIL_H
#define GUARD_SCRIPT_POKEMON_UTIL_H #define GUARD_SCRIPT_POKEMON_UTIL_H
u32 ScriptGiveMon(u16, u8, u16); u32 ScriptGiveMon(u16 species, u8 level, u16 item);
u8 ScriptGiveEgg(u16); u8 ScriptGiveEgg(u16 species);
void CreateScriptedWildMon(u16, u8, u16); void CreateScriptedWildMon(u16 species, u8 level, u16 item);
void CreateScriptedDoubleWildMon(u16, u8, u16, u16, u8, u16); void CreateScriptedDoubleWildMon(u16 species, u8 level, u16 item, u16 species2, u8 level2, u16 item2);
void ScriptSetMonMoveSlot(u8, u16, u8); void ScriptSetMonMoveSlot(u8 monIndex, u16 move, u8 slot);
void ReducePlayerPartyToSelectedMons(void); void ReducePlayerPartyToSelectedMons(void);
void HealPlayerParty(void); void HealPlayerParty(void);
void Script_GetChosenMonOffensiveEVs(void); void Script_GetChosenMonOffensiveEVs(void);

4
include/secret_base.h
View File

@ -3,7 +3,7 @@
void HideSecretBaseDecorationSprites(void); void HideSecretBaseDecorationSprites(void);
void CopyCurSecretBaseOwnerName_StrVar1(void); void CopyCurSecretBaseOwnerName_StrVar1(void);
void ClearJapaneseSecretBases(struct SecretBase *dest); void ClearJapaneseSecretBases(struct SecretBase *bases);
void SetPlayerSecretBaseParty(void); void SetPlayerSecretBaseParty(void);
u8 *GetSecretBaseMapName(u8 *dest); u8 *GetSecretBaseMapName(u8 *dest);
const u8 *GetSecretBaseTrainerLoseText(void); const u8 *GetSecretBaseTrainerLoseText(void);
@ -24,6 +24,6 @@ void SetCurSecretBaseIdFromPosition(const struct MapPosition *position, const st
void TrySetCurSecretBaseIndex(void); void TrySetCurSecretBaseIndex(void);
void CheckPlayerHasSecretBase(void); void CheckPlayerHasSecretBase(void);
void ToggleSecretBaseEntranceMetatile(void); void ToggleSecretBaseEntranceMetatile(void);
void ReceiveSecretBasesData(void *records, size_t recordSize, u8 linkIdx); void ReceiveSecretBasesData(void *secretBases, size_t recordSize, u8 linkIdx);
#endif //GUARD_SECRET_BASE_H #endif //GUARD_SECRET_BASE_H

6
include/shop.h
View File

@ -3,9 +3,9 @@
extern struct ItemSlot gMartPurchaseHistory[3]; extern struct ItemSlot gMartPurchaseHistory[3];
void CreatePokemartMenu(const u16 *); void CreatePokemartMenu(const u16 *itemsForSale);
void CreateDecorationShop1Menu(const u16 *); void CreateDecorationShop1Menu(const u16 *itemsForSale);
void CreateDecorationShop2Menu(const u16 *); void CreateDecorationShop2Menu(const u16 *itemsForSale);
void CB2_ExitSellMenu(void); void CB2_ExitSellMenu(void);
#endif // GUARD_SHOP_H #endif // GUARD_SHOP_H

2
include/slot_machine.h
View File

@ -1,6 +1,6 @@
#ifndef GUARD_SLOT_MACHINE_H #ifndef GUARD_SLOT_MACHINE_H
#define GUARD_SLOT_MACHINE_H #define GUARD_SLOT_MACHINE_H
void PlaySlotMachine(u8, void (callback)(void)); void PlaySlotMachine(u8 machineId, MainCallback exitCallback);
#endif // GUARD_SLOT_MACHINE_H #endif // GUARD_SLOT_MACHINE_H

4
include/sprite.h
View File

@ -314,8 +314,6 @@ void FreeSpriteTilesByTag(u16 tag);
void FreeSpriteTileRanges(void); void FreeSpriteTileRanges(void);
u16 GetSpriteTileStartByTag(u16 tag); u16 GetSpriteTileStartByTag(u16 tag);
u16 GetSpriteTileTagByTileStart(u16 start); u16 GetSpriteTileTagByTileStart(u16 start);
void RequestSpriteSheetCopy(const struct SpriteSheet *sheet);
u16 LoadSpriteSheetDeferred(const struct SpriteSheet *sheet);
void FreeAllSpritePalettes(void); void FreeAllSpritePalettes(void);
u32 LoadSpritePalette(const struct SpritePalette *palette); u32 LoadSpritePalette(const struct SpritePalette *palette);
void LoadSpritePalettes(const struct SpritePalette *palettes); void LoadSpritePalettes(const struct SpritePalette *palettes);
@ -324,7 +322,7 @@ u32 IndexOfSpritePaletteTag(u16 tag);
u16 GetSpritePaletteTagByPaletteNum(u8 paletteNum); u16 GetSpritePaletteTagByPaletteNum(u8 paletteNum);
void FreeSpritePaletteByTag(u16 tag); void FreeSpritePaletteByTag(u16 tag);
void SetSubspriteTables(struct Sprite *sprite, const struct SubspriteTable *subspriteTables); void SetSubspriteTables(struct Sprite *sprite, const struct SubspriteTable *subspriteTables);
bool8 AddSpriteToOamBuffer(struct Sprite *object, u8 *oamIndex); bool8 AddSpriteToOamBuffer(struct Sprite *sprite, u8 *oamIndex);
bool8 AddSubspritesToOamBuffer(struct Sprite *sprite, struct OamData *destOam, u8 *oamIndex); bool8 AddSubspritesToOamBuffer(struct Sprite *sprite, struct OamData *destOam, u8 *oamIndex);
void CopyToSprites(u8 *src); void CopyToSprites(u8 *src);
void CopyFromSprites(u8 *dest); void CopyFromSprites(u8 *dest);

4
include/text.h
View File

@ -141,14 +141,14 @@ extern struct TextGlyph gCurGlyph;
void DeactivateAllTextPrinters(void); void DeactivateAllTextPrinters(void);
u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16)); u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16));
bool32 AddTextPrinter(struct TextPrinterTemplate *template, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16)); bool32 AddTextPrinter(struct TextPrinterTemplate *printerTemplate, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16));
void RunTextPrinters(void); void RunTextPrinters(void);
bool32 IsTextPrinterActive(u8 id); bool32 IsTextPrinterActive(u8 id);
void GenerateFontHalfRowLookupTable(u8 fgColor, u8 bgColor, u8 shadowColor); void GenerateFontHalfRowLookupTable(u8 fgColor, u8 bgColor, u8 shadowColor);
void SaveTextColors(u8 *fgColor, u8 *bgColor, u8 *shadowColor); void SaveTextColors(u8 *fgColor, u8 *bgColor, u8 *shadowColor);
void RestoreTextColors(u8 *fgColor, u8 *bgColor, u8 *shadowColor); void RestoreTextColors(u8 *fgColor, u8 *bgColor, u8 *shadowColor);
void DecompressGlyphTile(const void *src_, void *dest_); void DecompressGlyphTile(const void *src_, void *dest_);
void CopyGlyphToWindow(struct TextPrinter *x); void CopyGlyphToWindow(struct TextPrinter *textPrinter);
void ClearTextSpan(struct TextPrinter *textPrinter, u32 width); void ClearTextSpan(struct TextPrinter *textPrinter, u32 width);
void TextPrinterInitDownArrowCounters(struct TextPrinter *textPrinter); void TextPrinterInitDownArrowCounters(struct TextPrinter *textPrinter);

6
include/time_events.h
View File

@ -1,8 +1,8 @@
#ifndef GUARD_TIME_EVENTS_H #ifndef GUARD_TIME_EVENTS_H
#define GUARD_TIME_EVENTS_H #define GUARD_TIME_EVENTS_H
void UpdateMirageRnd(u16); void UpdateMirageRnd(u16 days);
u8 IsMirageIslandPresent(void); bool8 IsMirageIslandPresent(void);
void UpdateBirchState(u16); void UpdateBirchState(u16 days);
#endif // GUARD_TIME_EVENTS_H #endif // GUARD_TIME_EVENTS_H

4
include/trade.h
View File

@ -14,10 +14,10 @@ void CB2_StartCreateTradeMenu(void);
void CB2_LinkTrade(void); void CB2_LinkTrade(void);
int CanRegisterMonForTradingBoard(struct RfuGameCompatibilityData player, u16 species2, u16 species, bool8 isModernFatefulEncounter); int CanRegisterMonForTradingBoard(struct RfuGameCompatibilityData player, u16 species2, u16 species, bool8 isModernFatefulEncounter);
int GetUnionRoomTradeMessageId(struct RfuGameCompatibilityData player, struct RfuGameCompatibilityData partner, u16 playerSpecies2, u16 partnerSpecies, u8 requestedType, u16 playerSpecies, bool8 isModernFatefulEncounter); int GetUnionRoomTradeMessageId(struct RfuGameCompatibilityData player, struct RfuGameCompatibilityData partner, u16 playerSpecies2, u16 partnerSpecies, u8 requestedType, u16 playerSpecies, bool8 isModernFatefulEncounter);
int CanSpinTradeMon(struct Pokemon *, u16); int CanSpinTradeMon(struct Pokemon *mon, u16 monIdx);
void InitTradeSequenceBgGpuRegs(void); void InitTradeSequenceBgGpuRegs(void);
void LinkTradeDrawWindow(void); void LinkTradeDrawWindow(void);
void LoadTradeAnimGfx(void); void LoadTradeAnimGfx(void);
void DrawTextOnTradeWindow(u8, const u8 *, u8); void DrawTextOnTradeWindow(u8 windowId, const u8 *str, u8 speed);
#endif //GUARD_TRADE_H #endif //GUARD_TRADE_H

2
include/trainer_card.h
View File

@ -69,6 +69,6 @@ u8 GetTrainerCardStars(u8 cardId);
void CopyTrainerCardData(struct TrainerCard *dst, struct TrainerCard *src, u8 gameVersion); void CopyTrainerCardData(struct TrainerCard *dst, struct TrainerCard *src, u8 gameVersion);
void ShowPlayerTrainerCard(void (*callback)(void)); void ShowPlayerTrainerCard(void (*callback)(void));
void ShowTrainerCardInLink(u8 cardId, void (*callback)(void)); void ShowTrainerCardInLink(u8 cardId, void (*callback)(void));
void TrainerCard_GenerateCardForLinkPlayer(struct TrainerCard *); void TrainerCard_GenerateCardForLinkPlayer(struct TrainerCard *trainerCard);
#endif // GUARD_TRAINER_CARD_H #endif // GUARD_TRAINER_CARD_H

2
include/trainer_see.h
View File

@ -17,7 +17,7 @@ extern bool8 gTrainerApproachedPlayer;
extern u8 gApproachingTrainerId; extern u8 gApproachingTrainerId;
bool8 CheckForTrainersWantingBattle(void); bool8 CheckForTrainersWantingBattle(void);
void SetBuriedTrainerMovement(struct ObjectEvent *var); void SetBuriedTrainerMovement(struct ObjectEvent *objEvent);
void DoTrainerApproach(void); void DoTrainerApproach(void);
void TryPrepareSecondApproachingTrainer(void); void TryPrepareSecondApproachingTrainer(void);
u8 FldEff_ExclamationMarkIcon(void); u8 FldEff_ExclamationMarkIcon(void);

12
include/tv.h
View File

@ -6,7 +6,7 @@ extern u8 *const gTVStringVarPtrs[3];
void ClearTVShowData(void); void ClearTVShowData(void);
void TryPutBreakingNewsOnAir(void); void TryPutBreakingNewsOnAir(void);
void TryPutBattleSeminarOnAir(u16 foeSpecies, u16 species, u8 moveIndex, const u16 *movePtr, u16 betterMove); void TryPutBattleSeminarOnAir(u16 foeSpecies, u16 species, u8 moveIndex, const u16 *movePtr, u16 betterMove);
void TryPutFrontierTVShowOnAir(u16 winStreak, u8 facility); void TryPutFrontierTVShowOnAir(u16 winStreak, u8 facilityAndMode);
void DoTVShow(void); void DoTVShow(void);
void DoTVShowInSearchOfTrainers(void); void DoTVShowInSearchOfTrainers(void);
void TryPutTreasureInvestigatorsOnAir(void); void TryPutTreasureInvestigatorsOnAir(void);
@ -16,7 +16,7 @@ void IncrementDailyPlantedBerries(void);
void IncrementDailyPickedBerries(void); void IncrementDailyPickedBerries(void);
void IncrementDailyBattlePoints(u16 delta); void IncrementDailyBattlePoints(u16 delta);
void HideBattleTowerReporter(void); void HideBattleTowerReporter(void);
void ReceiveTvShowsData(void *src, u32 size, u8 masterIdx); void ReceiveTvShowsData(void *src, u32 size, u8 playersLinkId);
void TryPutSpotTheCutiesOnAir(struct Pokemon *pokemon, u8 ribbonMonDataIdx); void TryPutSpotTheCutiesOnAir(struct Pokemon *pokemon, u8 ribbonMonDataIdx);
u32 GetPlayerIDAsU32(void); u32 GetPlayerIDAsU32(void);
bool8 IsPokeNewsActive(u8 newsKind); bool8 IsPokeNewsActive(u8 newsKind);
@ -29,7 +29,7 @@ void TryPutFindThatGamerOnAir(u16 nCoinsPaidOut);
void TryPutSecretBaseSecretsOnAir(void); void TryPutSecretBaseSecretsOnAir(void);
void TryPutTodaysRivalTrainerOnAir(void); void TryPutTodaysRivalTrainerOnAir(void);
void TryPutTrendWatcherOnAir(const u16 *words); void TryPutTrendWatcherOnAir(const u16 *words);
void ReceivePokeNewsData(void *src, u32 size, u8 masterIdx); void ReceivePokeNewsData(void *src, u32 size, u8 playersLinkId);
void DeactivateAllNormalTVShows(void); void DeactivateAllNormalTVShows(void);
void RecordFishingAttemptForTV(bool8 caughtFish); void RecordFishingAttemptForTV(bool8 caughtFish);
void IncrementDailySlotsUses(void); void IncrementDailySlotsUses(void);
@ -37,8 +37,8 @@ void IncrementDailyRouletteUses(void);
void IncrementDailyWildBattles(void); void IncrementDailyWildBattles(void);
void IncrementDailyBerryBlender(void); void IncrementDailyBerryBlender(void);
void SanitizeTVShowsForRuby(TVShow *shows); void SanitizeTVShowsForRuby(TVShow *shows);
void TryPutSafariFanClubOnAir(u8 nMonsCaught, u8 nPkblkUsed); void TryPutSafariFanClubOnAir(u8 monsCaught, u8 pokeblocksUsed);
bool8 Put3CheersForPokeblocksOnTheAir(const u8 *partnersName, u8 flavor, u8 unused, u8 sheen, u8 language); bool8 Put3CheersForPokeblocksOnTheAir(const u8 *partnersName, u8 flavor, u8 color, u8 sheen, u8 language);
void SetPokemonAnglerSpecies(u16 species); void SetPokemonAnglerSpecies(u16 species);
void UpdateTVShowsPerDay(u16 days); void UpdateTVShowsPerDay(u16 days);
void TryPutPokemonTodayOnAir(void); void TryPutPokemonTodayOnAir(void);
@ -47,7 +47,7 @@ void PutBattleUpdateOnTheAir(u8 opponentLinkPlayerId, u16 move, u16 speciesPlaye
void BravoTrainerPokemonProfile_BeforeInterview1(u16 move); void BravoTrainerPokemonProfile_BeforeInterview1(u16 move);
void InterviewBefore(void); void InterviewBefore(void);
void InterviewAfter(void); void InterviewAfter(void);
void UpdateTVScreensOnMap(int, int); void UpdateTVScreensOnMap(int width, int height);
void ConvertIntToDecimalString(u8 varIdx, int value); void ConvertIntToDecimalString(u8 varIdx, int value);
void TryPutSmartShopperOnAir(void); void TryPutSmartShopperOnAir(void);
bool8 ShouldAirFrontierTVShow(void); bool8 ShouldAirFrontierTVShow(void);

6
include/util.h
View File

@ -5,9 +5,9 @@
extern const u8 gMiscBlank_Gfx[]; // unused in Emerald extern const u8 gMiscBlank_Gfx[]; // unused in Emerald
u8 CreateInvisibleSpriteWithCallback(void (*)(struct Sprite *)); u8 CreateInvisibleSpriteWithCallback(void (*callback)(struct Sprite *));
void StoreWordInTwoHalfwords(u16 *, u32); void StoreWordInTwoHalfwords(u16 *h, u32 w);
void LoadWordFromTwoHalfwords(u16 *, u32 *); void LoadWordFromTwoHalfwords(u16 *h, u32 *w);
int CountTrailingZeroBits(u32 value); int CountTrailingZeroBits(u32 value);
u16 CalcCRC16(const u8 *data, s32 length); u16 CalcCRC16(const u8 *data, s32 length);
u16 CalcCRC16WithTable(const u8 *data, u32 length); u16 CalcCRC16WithTable(const u8 *data, u32 length);

2
include/wild_encounter.h
View File

@ -34,7 +34,7 @@ extern u8 gChainFishingDexNavStreak;
void DisableWildEncounters(bool8 disabled); void DisableWildEncounters(bool8 disabled);
u8 PickWildMonNature(void); u8 PickWildMonNature(void);
bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavior); bool8 StandardWildEncounter(u16 curMetatileBehavior, u16 prevMetatileBehavior);
bool8 SweetScentWildEncounter(void); bool8 SweetScentWildEncounter(void);
bool8 DoesCurrentMapHaveFishingMons(void); bool8 DoesCurrentMapHaveFishingMons(void);
void FishingWildEncounter(u8 rod); void FishingWildEncounter(u8 rod);

12
src/battle_controllers.c
View File

@ -1156,15 +1156,15 @@ void BtlController_EmitMoveAnimation(u32 battler, u32 bufferId, u16 move, u8 tur
PrepareBufferDataTransfer(battler, bufferId, gBattleResources->transferBuffer, 16 + sizeof(struct DisableStruct)); PrepareBufferDataTransfer(battler, bufferId, gBattleResources->transferBuffer, 16 + sizeof(struct DisableStruct));
} }
void BtlController_EmitPrintString(u32 battler, u32 bufferId, u16 stringID) void BtlController_EmitPrintString(u32 battler, u32 bufferId, u16 stringId)
{ {
s32 i; s32 i;
struct BattleMsgData *stringInfo; struct BattleMsgData *stringInfo;
gBattleResources->transferBuffer[0] = CONTROLLER_PRINTSTRING; gBattleResources->transferBuffer[0] = CONTROLLER_PRINTSTRING;
gBattleResources->transferBuffer[1] = gBattleOutcome; gBattleResources->transferBuffer[1] = gBattleOutcome;
gBattleResources->transferBuffer[2] = stringID; gBattleResources->transferBuffer[2] = stringId;
gBattleResources->transferBuffer[3] = (stringID & 0xFF00) >> 8; gBattleResources->transferBuffer[3] = (stringId & 0xFF00) >> 8;
stringInfo = (struct BattleMsgData *)(&gBattleResources->transferBuffer[4]); stringInfo = (struct BattleMsgData *)(&gBattleResources->transferBuffer[4]);
stringInfo->currentMove = gCurrentMove; stringInfo->currentMove = gCurrentMove;
@ -1188,15 +1188,15 @@ void BtlController_EmitPrintString(u32 battler, u32 bufferId, u16 stringID)
PrepareBufferDataTransfer(battler, bufferId, gBattleResources->transferBuffer, sizeof(struct BattleMsgData) + 4); PrepareBufferDataTransfer(battler, bufferId, gBattleResources->transferBuffer, sizeof(struct BattleMsgData) + 4);
} }
void BtlController_EmitPrintSelectionString(u32 battler, u32 bufferId, u16 stringID) void BtlController_EmitPrintSelectionString(u32 battler, u32 bufferId, u16 stringId)
{ {
s32 i; s32 i;
struct BattleMsgData *stringInfo; struct BattleMsgData *stringInfo;
gBattleResources->transferBuffer[0] = CONTROLLER_PRINTSTRINGPLAYERONLY; gBattleResources->transferBuffer[0] = CONTROLLER_PRINTSTRINGPLAYERONLY;
gBattleResources->transferBuffer[1] = CONTROLLER_PRINTSTRINGPLAYERONLY; gBattleResources->transferBuffer[1] = CONTROLLER_PRINTSTRINGPLAYERONLY;
gBattleResources->transferBuffer[2] = stringID; gBattleResources->transferBuffer[2] = stringId;
gBattleResources->transferBuffer[3] = (stringID & 0xFF00) >> 8; gBattleResources->transferBuffer[3] = (stringId & 0xFF00) >> 8;
stringInfo = (struct BattleMsgData *)(&gBattleResources->transferBuffer[4]); stringInfo = (struct BattleMsgData *)(&gBattleResources->transferBuffer[4]);
stringInfo->currentMove = gCurrentMove; stringInfo->currentMove = gCurrentMove;

2
src/main.c
View File

@ -89,7 +89,7 @@ void EnableVCountIntrAtLine150(void);
#define B_START_SELECT (B_BUTTON | START_BUTTON | SELECT_BUTTON) #define B_START_SELECT (B_BUTTON | START_BUTTON | SELECT_BUTTON)
void AgbMain() void AgbMain(void)
{ {
*(vu16 *)BG_PLTT = RGB_WHITE; // Set the backdrop to white on startup *(vu16 *)BG_PLTT = RGB_WHITE; // Set the backdrop to white on startup
InitGpuRegManager(); InitGpuRegManager();

2
src/metatile_behavior.c
View File

@ -328,7 +328,7 @@ bool8 MetatileBehavior_IsSouthArrowWarp(u8 metatileBehavior)
return FALSE; return FALSE;
} }
bool8 Unref_MetatileBehavior_IsArrowWarp(u8 metatileBehavior) bool8 UNUSED Unref_MetatileBehavior_IsArrowWarp(u8 metatileBehavior)
{ {
u8 isArrowWarp = FALSE; u8 isArrowWarp = FALSE;

2
src/save.c
View File

@ -836,7 +836,7 @@ bool8 LinkFullSave_SetLastSectorSignature(void)
return FALSE; return FALSE;
} }
u8 WriteSaveBlock2(void) bool8 WriteSaveBlock2(void)
{ {
if (gFlashMemoryPresent != TRUE) if (gFlashMemoryPresent != TRUE)
return TRUE; return TRUE;