Improved comments and constant dynamism

This commit is contained in:
W1serV1ser committed 2022-07-06 20:28:57 -07:00
1 parent 2873b75645
commit 8137760010
2 files changed
+4 -3

No files matched your search

+1 -1
View File
@@ -268,7 +268,7 @@ void FollowMe(struct ObjectEvent* npc, u8 state, bool8 ignoreScriptActive)
gSaveBlock2Ptr->follower.comeOutDoorStairs = 0;
}
// This makes sure the follower is still invisible after diving or surfacing
// This makes sure the follower is still invisible after diving or surfacing or on a bike
if(!(TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_UNDERWATER) || TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) || TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_BIKE)))
follower->invisible = FALSE;
MoveObjectEventToMapCoords(follower, player->currentCoords.x, player->currentCoords.y);
+3 -2
View File
@@ -3758,12 +3758,13 @@ void UpdateFollowerPokemonGraphic(void)
struct ObjectEvent *follower = &gObjectEvents[gSaveBlock2Ptr->follower.objId];
// If the lead Pokemon is Unown, use the correct sprite
if (leadMonGraphicId == 439)
if (leadMonGraphicId == OBJ_EVENT_GFX_UNOWN_A)
{
u8 unownLetter = GET_UNOWN_LETTER(GetMonData(&gPlayerParty[GetLeadMonNotFaintedIndex()], MON_DATA_PERSONALITY));
// If the Unown is not A, set the graphics id to the proper Unown
if (unownLetter)
leadMonGraphicId = 652 + unownLetter;
leadMonGraphicId = OBJ_EVENT_GFX_DEOXYS_SPEED + unownLetter;
}
if(gSaveBlock2Ptr->follower.inProgress && leadMonGraphicId != gSaveBlock2Ptr->follower.graphicsId)