diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-15 11:47:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-15 11:47:27 -0500 |
| commit | db8a5c6c2be2ceedadf836a8e61c71eb0ff6407b (patch) | |
| tree | 8b0323bd93c5600c8391d73232242b75135f0401 /src/pokenav_unk_5.c | |
| parent | 82f55f238125ff42845881189eb9237692c48ba4 (diff) | |
| parent | fee36224eda1acc4329646caf0e65a891928afc0 (diff) | |
Merge branch 'master' into fix-eventobj
Diffstat (limited to 'src/pokenav_unk_5.c')
| -rwxr-xr-x | src/pokenav_unk_5.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pokenav_unk_5.c b/src/pokenav_unk_5.c index a42d08e15..be30ca94d 100755 --- a/src/pokenav_unk_5.c +++ b/src/pokenav_unk_5.c @@ -401,10 +401,10 @@ u32 sub_81CC878(s32 taskState) if (sub_8123514() || sub_81CCC88()) return 2; - sub_81C7BA4(1); + PrintHelpBarText(HELPBAR_MAP_ZOOMED_OUT); return 0; case 2: - if (IsDma3ManagerBusyWithBgCopy_()) + if (WaitForHelpBar()) return 2; sub_81C7E14(4); @@ -434,10 +434,10 @@ u32 sub_81CC8D8(s32 taskState) if (sub_8123514() || sub_81CCC88()) return 2; - sub_81C7BA4(2); + PrintHelpBarText(HELPBAR_MAP_ZOOMED_IN); return 0; case 3: - if (IsDma3ManagerBusyWithBgCopy_()) + if (WaitForHelpBar()) return 2; sub_81C7E14(5); |