mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-19 13:54:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_npc_wrestler work (#2521)

Browse Source 
* Starting work

* First few functions worked on

* Data work

* So many inlines!!!

* All sumou action functions worked on

* started demo work

* demo functions worked on

* Almost all functions worked on

* Work on some param function stuff

* all functions worked on

* Cleanup and enums

* Hopefully fixed d_a_alink breaks

* PR cleanup
This commit is contained in:
Carco_21
2025-07-10 19:35:38 -04:00
committed by GitHub
parent b67414ef1a
commit a11f8f6375
9 changed files with 5291 additions and 3934 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_npc_gra.cpp
+2 -1
View File
@@ -1855,8 +1855,9 @@ void daNpc_grA_c::getMode() {
}
/* 809C1160-809C116C 002900 000C+00 4/4 0/0 1/1 .text getMode1__11daNpc_grA_cFv */
void daNpc_grA_c::getMode1() {
u8 daNpc_grA_c::getMode1() {
// NONMATCHING
return fopAcM_GetParam(this) & 0xFF00 >> 8;
}
/* 809C116C-809C1238 00290C 00CC+00 2/1 0/0 0/0 .text getTypeFromParam__11daNpc_grA_cFv
src/d/actor/d_a_npc_impal.cpp
+1 -2
View File
@@ -459,8 +459,7 @@ bool daNpcImpal_c::setExpressionAnm(int i_idx, bool i_modify) {
return false;
}
/* 80A08A68-80A08B48 001168 00E0+00 1/0 0/0 0/0 .text setExpressionBtp__12daNpcImpal_cFi
*/
/* 80A08A68-80A08B48 001168 00E0+00 1/0 0/0 0/0 .text setExpressionBtp__12daNpcImpal_cFi */
bool daNpcImpal_c::setExpressionBtp(int i_idx) {
J3DAnmTexPattern* btpAnm = getTexPtrnAnmP(l_arcNames[l_btpGetParamList[i_idx].arcIdx],
l_btpGetParamList[i_idx].fileIdx);
src/d/actor/d_a_npc_wrestler.cpp
+4961 -3855
View File
File diff suppressed because it is too large Load Diff
src/d/d_meter2_info.cpp
+3 -6
View File
@@ -583,8 +583,7 @@ void dMeter2Info_c::onDirectUseItem(int param_0) {
mDirectUseItem |= (u8)(1 << param_0);
}
/* 8021C950-8021C970 217290 0020+00 0/0 4/4 0/0 .text isDirectUseItem__13dMeter2Info_cFi
*/
/* 8021C950-8021C970 217290 0020+00 0/0 4/4 0/0 .text isDirectUseItem__13dMeter2Info_cFi */
BOOL dMeter2Info_c::isDirectUseItem(int param_0) {
return (mDirectUseItem & (u8)(1 << param_0)) ? TRUE : FALSE;
}
@@ -592,8 +591,7 @@ BOOL dMeter2Info_c::isDirectUseItem(int param_0) {
/* 80430188-80430280 05CEA8 00F8+00 4/4 267/267 70/70 .bss g_meter2_info */
dMeter2Info_c g_meter2_info;
/* 8021C970-8021C9DC 2172B0 006C+00 0/0 0/0 5/5 .text setMeterString__13dMeter2Info_cFl
*/
/* 8021C970-8021C9DC 2172B0 006C+00 0/0 0/0 5/5 .text setMeterString__13dMeter2Info_cFl */
int dMeter2Info_c::setMeterString(s32 i_string) {
if (mMeterString != 0) {
return 0;
@@ -615,8 +613,7 @@ int dMeter2Info_c::setMeterString(s32 i_string) {
return 0;
}
/* 8021C9DC-8021CA04 21731C 0028+00 1/1 3/3 0/0 .text resetWarpStatus__13dMeter2Info_cFv
*/
/* 8021C9DC-8021CA04 21731C 0028+00 1/1 3/3 0/0 .text resetWarpStatus__13dMeter2Info_cFv */
void dMeter2Info_c::resetWarpStatus() {
if (mWarpStatus == 2) {
dComIfGs_resetLastWarpAcceptStage();