mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-05-28 00:15:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_tag_etc minor cleanup

Browse Source
This commit is contained in:
Jasper St. Pierre
2023-12-27 22:51:07 -08:00
parent 634470f6ee
commit 15e46fdca0
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_npc_md.h
+2 -2
View File
@@ -273,8 +273,8 @@ public:
void calcFlyingTimer() {}
void checkBitEffectStatus(u8) {}
void checkStatus(u32) {}
u8 checkStatusCamTagIn() { return cLib_checkBit(m30F0, 0x20UL); }
void checkStatusFly() {}
bool checkStatusCamTagIn() { return cLib_checkBit(m30F0, 0x20UL); }
bool checkStatusFly() { return cLib_checkBit(m30F0, 0x10UL); }
void clearJntAng() {}
void clearStatus() {}
void clearStatus(u32) {}
src/d/actor/d_a_tag_etc.cpp
+3 -6
View File
@@ -19,7 +19,7 @@ enum Action {
/* 00000078-00000084 .text getEventNo__11daTag_Etc_cFv */
u8 daTag_Etc_c::getEventNo() {
return fopAcM_GetParam(this) >> 0x18;
return fopAcM_GetParam(this) >> 24;
}
/* 00000084-00000090 .text getType2__11daTag_Etc_cFv */
@@ -27,7 +27,6 @@ u8 daTag_Etc_c::getType2() {
return fopAcM_GetParam(this) >> 8 & 0xF;
}
/* Not Matching */
/* 00000090-000001B4 .text rangeCheck__11daTag_Etc_cFP10fopAc_ac_c */
BOOL daTag_Etc_c::rangeCheck(fopAc_ac_c* pActor) {
float distanceMagnitude;
@@ -47,11 +46,9 @@ BOOL daTag_Etc_c::rangeCheck(fopAc_ac_c* pActor) {
BOOL daTag_Etc_c::otherCheck(fopAc_ac_c* pActor) {
BOOL result;
u8 cVar2 = getType2();
switch (cVar2) {
switch (getType2()) {
case 0:
if (pActor != NULL && (((daNpc_Md_c*)pActor)->m30F0 & 0x10) != 0) {
if (pActor != NULL && ((daNpc_Md_c*)pActor)->checkStatusFly()) {
result = TRUE;
} else {
result = FALSE;