summaryrefslogtreecommitdiff
path: root/src/pokenav_unk_2.c
diff options
context:
space:
mode:
authorGriffinR <griffin.richards@comcast.net>2019-12-15 11:47:27 -0500
committerGitHub <noreply@github.com>2019-12-15 11:47:27 -0500
commitdb8a5c6c2be2ceedadf836a8e61c71eb0ff6407b (patch)
tree8b0323bd93c5600c8391d73232242b75135f0401 /src/pokenav_unk_2.c
parent82f55f238125ff42845881189eb9237692c48ba4 (diff)
parentfee36224eda1acc4329646caf0e65a891928afc0 (diff)
Merge branch 'master' into fix-eventobj
Diffstat (limited to 'src/pokenav_unk_2.c')
-rw-r--r--src/pokenav_unk_2.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pokenav_unk_2.c b/src/pokenav_unk_2.c
index befe63f0b..de962ccd6 100644
--- a/src/pokenav_unk_2.c
+++ b/src/pokenav_unk_2.c
@@ -323,7 +323,7 @@ static bool32 sub_81C98D4(void)
for (i = 0; i < REMATCH_TABLE_ENTRIES; i++)
{
if (sub_81CB0C8(i) == gMapHeader.regionMapSectionId
- && sub_81CAE08(i)
+ && IsRematchEntryRegistered(i)
&& gSaveBlock1Ptr->trainerRematches[i])
return TRUE;
}
@@ -706,10 +706,10 @@ static u32 sub_81C9F28(s32 state)
switch (state)
{
case 0:
- sub_81C7BA4(sub_81C98C4());
+ PrintHelpBarText(GetHelpBarTextId());
return LT_INC_AND_PAUSE;
case 1:
- if (IsDma3ManagerBusyWithBgCopy_())
+ if (WaitForHelpBar())
return LT_PAUSE;
sub_81C7880();
sub_81CA9C8();