diff options
| author | SuperDude88 <82904174+SuperDude88@users.noreply.github.com> | 2024-06-16 01:55:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-15 22:55:31 -0700 |
| commit | 3f0845880920b2d72fc2cc99d189af83ca33cd55 (patch) | |
| tree | 4a747042a141dae53b34fe6270456246323a3cd3 /src/d/d_kankyo.cpp | |
| parent | e855019ab4a87e853a9993d7689d0750302bf50c (diff) | |
d_a_npc_people Almost OK (#658)
* daNpcPeople Work
* Oops
Somehow I break this file every time I touch it
Diffstat (limited to 'src/d/d_kankyo.cpp')
| -rw-r--r-- | src/d/d_kankyo.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index 4d71c31a..b16a3a58 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -3450,9 +3450,9 @@ s32 dKy_moon_type_chk() { } /* 80197404-80197504 .text dKy_telescope_lookin_chk__FP4cXyzff */ -bool dKy_telescope_lookin_chk(cXyz* pPos, f32 maxDist, f32 minFov) { - bool ret = false; - if (dComIfGp_getScopeType() != 0 && dComIfGd_getView()->mFovy > minFov) { +BOOL dKy_telescope_lookin_chk(cXyz* pPos, f32 maxDist, f32 minFov) { + BOOL ret = false; + if (dComIfGp_getScopeMesgStatus() != 0 && dComIfGd_getView()->mFovy > minFov) { cXyz proj; cXyz center; mDoLib_project((Vec*)pPos, &proj); @@ -3464,8 +3464,8 @@ bool dKy_telescope_lookin_chk(cXyz* pPos, f32 maxDist, f32 minFov) { } /* 80197504-80197558 .text dKy_moon_look_chk__Fv */ -bool dKy_moon_look_chk() { - bool rt = false; +BOOL dKy_moon_look_chk() { + BOOL rt = false; if (dKyr_moon_arrival_check()) { rt = dKy_telescope_lookin_chk(&g_env_light.mMoonPos, 100.0f, 20.0f); } @@ -3474,13 +3474,13 @@ bool dKy_moon_look_chk() { } /* 80197558-801975A4 .text dKy_orion_look_chk__Fv */ -bool dKy_orion_look_chk() { +BOOL dKy_orion_look_chk() { cXyz pos = dKy_get_orion_pos(); return dKy_telescope_lookin_chk(&pos, 100.0f, 20.0f); } /* 801975A4-801975F0 .text dKy_hokuto_look_chk__Fv */ -bool dKy_hokuto_look_chk() { +BOOL dKy_hokuto_look_chk() { cXyz pos = dKy_get_hokuto_pos(); return dKy_telescope_lookin_chk(&pos, 100.0f, 20.0f); } |
