mirror
/
tp
mirror of https://github.com/zeldaret/tp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

d_a_npc_wrestler 100% (#2962) 

* Match sumouPunchMiss, improve sumouPunchChaseShock

Removing these consts also matches several functions on debug.

* Match sumouSideStep and sumouPunchChaseShock
This commit is contained in:
LagoLunatic 2025-12-16 15:45:46 -05:00 committed by GitHub
parent 8185d87f85
commit 6a02f5b387
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.py
View File

@ -2325,7 +2325,7 @@ config.libs = [
ActorRel(MatchingFor(ALL_GCN), "d_a_npc_tr"),
ActorRel(MatchingFor(ALL_GCN), "d_a_npc_uri"),
ActorRel(MatchingFor(ALL_GCN), "d_a_npc_worm"),
ActorRel(NonMatching, "d_a_npc_wrestler"), # regalloc; weak func order (sinShort)
ActorRel(Equivalent, "d_a_npc_wrestler"), # weak func order (sinShort)
ActorRel(MatchingFor(ALL_GCN), "d_a_npc_yamid"),
ActorRel(MatchingFor(ALL_GCN), "d_a_npc_yamis"),
ActorRel(MatchingFor(ALL_GCN), "d_a_npc_yamit"),

4
include/d/actor/d_a_npc_wrestler.h
View File

@ -234,8 +234,8 @@ public:
private:
/* 0xB48 */ Z2Creature mSound;
/* 0xBD8 */ const daNpcWrestler_HIOParam* field_0xbd8;
/* 0xBDC */ const daNpcWrestler_HIOParamSub* field_0xbdc;
/* 0xBD8 */ daNpcWrestler_HIOParam* field_0xbd8;
/* 0xBDC */ daNpcWrestler_HIOParamSub* field_0xbdc;
/* 0xBE0 */ daNpcF_MatAnm_c* mpMatAnm;
/* 0xBE4 */ daNpcF_Lookat_c mLookAt;
/* 0xC80 */ daNpcF_ActorMngr_c mActorMngr[2];

7
src/d/actor/d_a_npc_wrestler.cpp
View File

@ -690,7 +690,7 @@ cPhs__Step daNpcWrestler_c::Create() {
return cPhs_ERROR_e;
}
field_0xbd8 = &l_HIO.m;
field_0xbd8 = const_cast<daNpcWrestler_HIOParam*>(&l_HIO.m);
field_0xbdc = &field_0xbd8->mTypeParams[mType];
#if DEBUG
// Sumo wrestler:
@ -2668,7 +2668,6 @@ bool daNpcWrestler_c::checkOutOfArenaW() {
}
bool daNpcWrestler_c::sumouPunchMiss(void* param_1) {
// NONMATCHING - regalloc
daPy_py_c* player = daPy_getPlayerActorClass();
int jointNo = mType == 0 ? 0x12 : 0x11;
cXyz sp2c;
@ -3114,7 +3113,7 @@ void daNpcWrestler_c::setStepAngle() {
}
s16 tgt_ang = cLib_targetAngleY(player->getViewerCurrentPosP(), &current.pos);
tgt_ang += mStepAngle * field_0xbdc->lateral_movement_time;
tgt_ang = tgt_ang + mStepAngle * field_0xbdc->lateral_movement_time;
cXyz sp30(0.0f, 0.0f, field_0xbdc->grapple_distance);
mDoMtx_stack_c::push();
mDoMtx_stack_c::YrotM(tgt_ang);
@ -3135,7 +3134,6 @@ void daNpcWrestler_c::setStepAngle() {
}
bool daNpcWrestler_c::sumouSideStep(void* param_1) {
// NONMATCHING - g_dComIfG_gameInfo weirdness
switch (field_0xe96) {
case 0:
field_0xe80 = field_0xbdc->lateral_movement_time;
@ -3285,7 +3283,6 @@ bool daNpcWrestler_c::sumouPunchShock(void* param_1) {
}
bool daNpcWrestler_c::sumouPunchChaseShock(void* param_1) {
// NONMATCHING - regalloc
daPy_py_c* player = daPy_getPlayerActorClass();
switch (field_0xe96) {