mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-06 11:51:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

scannon / scannon_crs / scannon_ten done (#2632)

Browse Source 
* scannon done

* scannon_crs done

* scannon_ten done

* pr

* attention debug stuff

* attn flags

* fix build
This commit is contained in:
TakaRikka
2025-09-08 02:01:20 -07:00
committed by GitHub
parent b35204b0c8
commit 5fce8ea1e1
244 changed files with 3067 additions and 3159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/f_op/f_op_actor.cpp
+7 -7
View File
@@ -39,9 +39,9 @@ static int fopAc_Draw(void* i_this) {
int ret = 1;
if (!dComIfGp_isPauseFlag()) {
if ((dComIfGp_event_moveApproval(a_this) == 2 ||
(!fopAcM_checkStatus(a_this, fopAc_ac_c::stopStatus) &&
(!fopAcM_checkStatus(a_this, fopAcStts_CULL_e) || !fopAcM_cullingCheck(a_this)))) &&
!fopAcM_checkStatus(a_this, 0x21000000))
(!fopAcM_CheckStatus(a_this, fopAc_ac_c::stopStatus) &&
(!fopAcM_CheckStatus(a_this, fopAcStts_CULL_e) || !fopAcM_cullingCheck(a_this)))) &&
!fopAcM_CheckStatus(a_this, 0x21000000))
{
fopAcM_OffCondition(a_this, fopAcCnd_NODRAW_e);
ret = fpcLf_DrawMethod((leafdraw_method_class*)a_this->sub_method, a_this);
@@ -67,10 +67,10 @@ static int fopAc_Execute(void* i_this) {
s32 move = dComIfGp_event_moveApproval(i_this);
fopAcM_OffStatus(a_this, 0x40000000);
if (!fopAcM_checkStatus(a_this, 0x20000000) &&
if (!fopAcM_CheckStatus(a_this, 0x20000000) &&
(move == 2 ||
(move != 0 && !fopAcM_checkStatus(a_this, fopAc_ac_c::stopStatus) &&
(!fopAcM_checkStatus(a_this, fopAcStts_NOEXEC_e) || !fopAcM_CheckCondition(a_this, fopAcCnd_NODRAW_e)))))
(move != 0 && !fopAcM_CheckStatus(a_this, fopAc_ac_c::stopStatus) &&
(!fopAcM_CheckStatus(a_this, fopAcStts_NOEXEC_e) || !fopAcM_CheckCondition(a_this, fopAcCnd_NODRAW_e)))))
{
fopAcM_OffCondition(a_this, fopAcCnd_NOEXEC_e);
a_this->old = a_this->current;
@@ -80,7 +80,7 @@ static int fopAc_Execute(void* i_this) {
fopAcM_OnCondition(a_this, fopAcCnd_NOEXEC_e);
}
if (fopAcM_checkStatus(a_this, 0x20) &&
if (fopAcM_CheckStatus(a_this, 0x20) &&
a_this->home.pos.y - a_this->current.pos.y > 5000.0f)
{
fopAcM_delete(a_this);