dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #339 from ghoulslash/fixes

Browse Source 
fix PLAYER_AVATAR_FLAG_WATERING
This commit is contained in:
PikalaxALT
2020-05-27 07:51:44 -04:00
committed by GitHub
parent 94b68c54e8 f5c694c5b4
commit 1648d6c66b
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/global.fieldmap.h
+1 -1
View File
@@ -304,7 +304,7 @@ enum {
#define PLAYER_AVATAR_FLAG_UNDERWATER (1 << PLAYER_AVATAR_STATE_UNDERWATER) #define PLAYER_AVATAR_FLAG_UNDERWATER (1 << PLAYER_AVATAR_STATE_UNDERWATER)
#define PLAYER_AVATAR_FLAG_FIELD_MOVE (1 << PLAYER_AVATAR_STATE_FIELD_MOVE) #define PLAYER_AVATAR_FLAG_FIELD_MOVE (1 << PLAYER_AVATAR_STATE_FIELD_MOVE)
#define PLAYER_AVATAR_FLAG_FISHING (1 << PLAYER_AVATAR_STATE_FISHING) #define PLAYER_AVATAR_FLAG_FISHING (1 << PLAYER_AVATAR_STATE_FISHING)
#define PLAYER_AVATAR_FLAG_WATERING (1 << PLAYER_AVATAR_STATE_WATERING) #define PLAYER_AVATAR_FLAG_DASH (1 << PLAYER_AVATAR_STATE_WATERING)
enum enum
{ {
src/bike.c
+1 -1
View File
@@ -374,7 +374,7 @@ s16 GetPlayerSpeed(void)
return exp[gPlayerAvatar.bikeFrameCounter]; return exp[gPlayerAvatar.bikeFrameCounter];
else if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_ACRO_BIKE) else if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_ACRO_BIKE)
return 3; return 3;
else if (gPlayerAvatar.flags & (PLAYER_AVATAR_FLAG_SURFING | PLAYER_AVATAR_FLAG_WATERING)) else if (gPlayerAvatar.flags & (PLAYER_AVATAR_FLAG_SURFING | PLAYER_AVATAR_FLAG_DASH))
return 2; return 2;
else else
return 1; return 1;
src/event_object_movement.c
+1 -1
View File
@@ -3037,7 +3037,7 @@ bool8 ObjectEventIsTrainerAndCloseToPlayer(struct ObjectEvent *objectEvent)
s16 minY; s16 minY;
s16 maxY; s16 maxY;
if (!TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_WATERING)) if (!TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_DASH))
{ {
return FALSE; return FALSE;
} }
src/field_player_avatar.c
+3 -3
View File
@@ -181,7 +181,7 @@ static void npc_clear_strange_bits(struct ObjectEvent *objEvent)
objEvent->inanimate = FALSE; objEvent->inanimate = FALSE;
objEvent->disableAnim = FALSE; objEvent->disableAnim = FALSE;
objEvent->facingDirectionLocked = FALSE; objEvent->facingDirectionLocked = FALSE;
gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_WATERING; gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_DASH;
} }
static void MovePlayerAvatarUsingKeypadInput(u8 direction, u16 newKeys, u16 heldKeys) static void MovePlayerAvatarUsingKeypadInput(u8 direction, u16 newKeys, u16 heldKeys)
@@ -517,7 +517,7 @@ static void PlayerNotOnBikeMoving(u8 direction, u16 heldKeys)
PlayerRunSlow(direction); PlayerRunSlow(direction);
else else
PlayerRun(direction); PlayerRun(direction);
gPlayerAvatar.flags |= PLAYER_AVATAR_FLAG_WATERING; gPlayerAvatar.flags |= PLAYER_AVATAR_FLAG_DASH;
return; return;
} }
else else
@@ -1228,7 +1228,7 @@ void ClearPlayerAvatarInfo(void)
void SetPlayerAvatarStateMask(u8 flags) void SetPlayerAvatarStateMask(u8 flags)
{ {
gPlayerAvatar.flags &= (PLAYER_AVATAR_FLAG_WATERING | PLAYER_AVATAR_FLAG_FISHING | PLAYER_AVATAR_FLAG_FIELD_MOVE); gPlayerAvatar.flags &= (PLAYER_AVATAR_FLAG_DASH | PLAYER_AVATAR_FLAG_FISHING | PLAYER_AVATAR_FLAG_FIELD_MOVE);
gPlayerAvatar.flags |= flags; gPlayerAvatar.flags |= flags;
} }