dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix field player avatar fakmatch

Browse Source
This commit is contained in:
DizzyEggg
2019-02-01 11:50:45 +01:00
parent 5dfaf22fb3
commit 7c8fb66acf
1 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/field_player_avatar.c
+5 -15
View File
@@ -90,7 +90,7 @@ static bool8 sub_808B618(void);
static bool8 PlayerIsAnimActive(void); static bool8 PlayerIsAnimActive(void);
static bool8 PlayerCheckIfAnimFinishedOrInactive(void); static bool8 PlayerCheckIfAnimFinishedOrInactive(void);
static void PlayerRun(u8); static void PlayerRun(u8);
static void PlayerNotOnBikeCollide(u8); static void PlayerNotOnBikeCollide(u8);
static void PlayerNotOnBikeCollideWithFarawayIslandMew(u8); static void PlayerNotOnBikeCollideWithFarawayIslandMew(u8);
@@ -343,7 +343,7 @@ static bool8 TryInterruptEventObjectSpecialAnim(struct EventObject *playerEventO
u8 r5 = direction; u8 r5 = direction;
register u8 r6 asm("r6") = direction; register u8 r6 asm("r6") = direction;
#endif #endif
//a very bad HACK //a very bad HACK
if (EventObjectIsMovementOverridden(playerEventObj) if (EventObjectIsMovementOverridden(playerEventObj)
&& !EventObjectClearHeldMovementIfFinished(playerEventObj)) && !EventObjectClearHeldMovementIfFinished(playerEventObj))
@@ -821,24 +821,14 @@ void SetPlayerAvatarTransitionFlags(u16 transitionFlags)
static void DoPlayerAvatarTransition(void) static void DoPlayerAvatarTransition(void)
{ {
u8 i; u8 i;
u32 flags = gPlayerAvatar.unk1; u8 flags = gPlayerAvatar.unk1;
if (flags != 0) if (flags != 0)
{ {
for (i = 0; i < 8; i++, flags >>= 1) for (i = 0; i < 8; i++, flags >>= 1)
{ {
#ifdef NONMATCHING
if (flags & 1) if (flags & 1)
{
gUnknown_084974B8[i](&gEventObjects[gPlayerAvatar.eventObjectId]); gUnknown_084974B8[i](&gEventObjects[gPlayerAvatar.eventObjectId]);
}
#else
if (flags & 1)
{
register void (*const *funcs)(struct EventObject *) asm("r0") = gUnknown_084974B8;
funcs[i](&gEventObjects[gPlayerAvatar.eventObjectId]);
}
#endif
} }
gPlayerAvatar.unk1 = 0; gPlayerAvatar.unk1 = 0;
} }
@@ -1151,7 +1141,7 @@ void PlayerGetDestCoords(s16 *x, s16 *y)
u8 player_get_pos_including_state_based_drift(s16 *x, s16 *y) u8 player_get_pos_including_state_based_drift(s16 *x, s16 *y)
{ {
struct EventObject *object = &gEventObjects[gPlayerAvatar.eventObjectId]; struct EventObject *object = &gEventObjects[gPlayerAvatar.eventObjectId];
if (object->heldMovementActive && !object->heldMovementFinished && !gSprites[object->spriteId].data[2]) if (object->heldMovementActive && !object->heldMovementFinished && !gSprites[object->spriteId].data[2])
{ {
*x = object->currentCoords.x; *x = object->currentCoords.x;
@@ -1765,7 +1755,7 @@ static bool8 Fishing2(struct Task *task)
static bool8 Fishing3(struct Task *task) static bool8 Fishing3(struct Task *task)
{ {
AlignFishingAnimationFrames(); AlignFishingAnimationFrames();
// Wait one second // Wait one second
task->tFrameCounter++; task->tFrameCounter++;
if (task->tFrameCounter >= 60) if (task->tFrameCounter >= 60)