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

Renamed gWalkAwayFromSignInhibitTimer to gWalkAwayFromSignpostTimer

Browse Source
This commit is contained in:
pkmnsnfrn 2024-07-15 22:33:31 -07:00
parent b54cf221d8
commit 1ae615651d
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/field_message_box.h
View File

@ -19,6 +19,6 @@ u8 GetFieldMessageBoxMode(void);
void StopFieldMessage(void);
void InitFieldMessageBox(void);
extern u8 gWalkAwayFromSignInhibitTimer;
extern u8 gWalkAwayFromSignpostTimer;
#endif // GUARD_FIELD_MESSAGE_BOX_H

4
src/field_control_avatar.c
View File

@ -1177,9 +1177,9 @@ void CancelSignPostMessageBox(struct FieldInput *input)
if (!ScriptContext_IsEnabled())
return;
if (gWalkAwayFromSignInhibitTimer)
if (gWalkAwayFromSignpostTimer)
{
gWalkAwayFromSignInhibitTimer--;
gWalkAwayFromSignpostTimer--;
return;
}

2
src/field_message_box.c
View File

@ -9,7 +9,7 @@
#include "script.h"
static EWRAM_DATA u8 sFieldMessageBoxMode = 0;
EWRAM_DATA u8 gWalkAwayFromSignInhibitTimer = 0;
EWRAM_DATA u8 gWalkAwayFromSignpostTimer = 0;
static void ExpandStringAndStartDrawFieldMessage(const u8 *, bool32);
static void StartDrawFieldMessage(void);

5
src/script.c
View File

@ -505,10 +505,11 @@ void InitRamScript_NoObjectEvent(u8 *script, u16 scriptSize)
#endif //FREE_MYSTERY_EVENT_BUFFERS
}
// auto read signposts
#define WALK_AWAY_SIGNPOST_FRAMES 6
void SetWalkingIntoSignVars(void)
{
gWalkAwayFromSignInhibitTimer = 6;
gWalkAwayFromSignpostTimer = 6;
sMsgBoxIsCancelable = TRUE;
}