mirror of
https://github.com/zeldaret/tp
synced 2026-07-08 14:36:36 -04:00
d_a_npc_jagar - ~94% (#2309)
* Began work on d_a_npc_jagar * Major work on daNpc_Jagar_c::create() * Jagar create() - 11% * Continued work on daNpc_Jagar_c * Jagar create() - 87% * Continues work on Jagar * Work on Jagar.checkChangeEvt() * Working on Jagar.talk() * Work on Jagar.changeBtp() * Jagar.checkChangeJoint() & checkRemoveJoint() * Jagar.chkAction() & setAction() * Jagar.chkChuMotion() * Jagar.chkSitMotion() & chkSitMotion2() * Jagar.chkToMotion() * Jagar.CreateHeap() * Jagar.createHeapCallBack() & ctrlJointCallBack() * Jagar.cuAnger() * Jagar.cutClimbUp() - 92% * Jagar.setAttnPos() - 85% * Jagar.cutConversationWithBou() - 48% * Jagar work and daNpcT_c::getActorDistance - 83% * Jagar setParam work and daNpcT_c::getActorDistance - 85% * Prep Jagar push to main * little cleanup * Fixed return type discrepancy * Fixed *other* return type issues & variable names for Jagar * Jagar talkWithBou work * Work on Jagar talk * Data & function cleanup * I dont remember what i added this time lol * Finished some functions * Reworking Jagar talk() * Finished some functions * Attempting to rework cutNeedYourHelp * Almost(ish) done with Jaggle * Almost done with Jaggle * Took out inline assembly in Jagar.chkToMotion() * Cleanup * Minor variable initialization change * Small cleanup * Hopefully fixed d_a_npc_bou compilation error
This commit is contained in:
+21
-13
@@ -883,17 +883,12 @@ daNpc_Bou_c::~daNpc_Bou_c() {
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80972860-809728FC 000000 009C+00 13/13 0/0 1/1 .rodata m__17daNpc_Bou_Param_c */
|
||||
SECTION_RODATA u8 const daNpc_Bou_Param_c::m[156] = {
|
||||
0x43, 0x52, 0x00, 0x00, 0xC0, 0x40, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x44, 0x16, 0x00, 0x00,
|
||||
0x43, 0x7F, 0x00, 0x00, 0x43, 0x48, 0x00, 0x00, 0x42, 0x0C, 0x00, 0x00, 0x42, 0x20, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0xC1, 0x20, 0x00, 0x00,
|
||||
0x41, 0xF0, 0x00, 0x00, 0xC1, 0x20, 0x00, 0x00, 0x42, 0x34, 0x00, 0x00, 0xC2, 0x34, 0x00, 0x00,
|
||||
0x3F, 0x19, 0x99, 0x9A, 0x41, 0x40, 0x00, 0x00, 0x00, 0x03, 0x00, 0x06, 0x00, 0x05, 0x00, 0x06,
|
||||
0x42, 0xDC, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, 0x43, 0x96, 0x00, 0x00, 0xC3, 0x96, 0x00, 0x00,
|
||||
0x00, 0x3C, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x80, 0x00, 0x00,
|
||||
0x44, 0x7A, 0x00, 0x00, 0x43, 0xFA, 0x00, 0x00, 0xC3, 0xFA, 0x00, 0x00,
|
||||
daNpc_Bou_Param_c::Data const daNpc_Bou_Param_c::m= {
|
||||
255.0f, -3.0f, 1.0f, 600.0f, 255.0f, 200.0f, 35.0f, 40.0f,
|
||||
0.0f, 0.0f, 10.0f, -10.0f, 30.0f, -10.0f, 45.0f, -45.0f,
|
||||
0.6f, 12.0f, 3, 6, 5, 6, 110.0f, 500.0f, 300.0f, -300.0f,
|
||||
60, 8, 0.0f, 0.0f, 4.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
|
||||
0.0f, 0.0f, 16.0f, 1000.0f, 500.0f, -500.0f,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x80972860, &daNpc_Bou_Param_c::m);
|
||||
|
||||
@@ -1088,8 +1083,21 @@ void daNpc_Bou_c::getCowP() {
|
||||
}
|
||||
|
||||
/* 8096DA78-8096DADC 000BD8 0064+00 1/1 0/0 2/2 .text getType__11daNpc_Bou_cFv */
|
||||
void daNpc_Bou_c::getType() {
|
||||
// NONMATCHING
|
||||
u8 daNpc_Bou_c::getType() {
|
||||
switch ((u8)fopAcM_GetParam(this)) {
|
||||
case 0:
|
||||
return TYPE_0;
|
||||
case 1:
|
||||
return TYPE_1;
|
||||
case 2:
|
||||
return TYPE_2;
|
||||
case 3:
|
||||
return TYPE_3;
|
||||
case 4:
|
||||
return TYPE_4;
|
||||
default:
|
||||
return TYPE_5;
|
||||
}
|
||||
}
|
||||
|
||||
/* 8096DADC-8096DBBC 000C3C 00E0+00 1/1 0/0 0/0 .text isDelete__11daNpc_Bou_cFv */
|
||||
|
||||
+1664
-1663
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user