Skip to content

d_a_obj_kago OK #2661

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TakaRikka merged 2 commits into from
Sep 15, 2025
Merged

d_a_obj_kago OK #2661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43e594a
d_a_obj_kago OK
YunataSavior Sep 14, 2025
40df0e1
Mark d_a_obj_kago as matching for JP
caseif Sep 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions config/GZ2E01/rels/d_a_obj_kago/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ setGoalPosAndAngle__12daObj_Kago_cFv = .text:0x00001DB0; // type:function size:0
setSmokePrtcl__12daObj_Kago_cFv = .text:0x00001ED0; // type:function size:0x88 scope:global
setWaterPrtcl__12daObj_Kago_cFv = .text:0x00001F58; // type:function size:0x100 scope:global
setHamonPrtcl__12daObj_Kago_cFv = .text:0x00002058; // type:function size:0x5C scope:global
daObj_Kago_Create__FPv = .text:0x000020B4; // type:function size:0x20 scope:global
daObj_Kago_Delete__FPv = .text:0x000020D4; // type:function size:0x20 scope:global
daObj_Kago_Execute__FPv = .text:0x000020F4; // type:function size:0x20 scope:global
daObj_Kago_Draw__FPv = .text:0x00002114; // type:function size:0x20 scope:global
daObj_Kago_IsDelete__FPv = .text:0x00002134; // type:function size:0x8 scope:global
daObj_Kago_Create__FPv = .text:0x000020B4; // type:function size:0x20 scope:local
daObj_Kago_Delete__FPv = .text:0x000020D4; // type:function size:0x20 scope:local
daObj_Kago_Execute__FPv = .text:0x000020F4; // type:function size:0x20 scope:local
daObj_Kago_Draw__FPv = .text:0x00002114; // type:function size:0x20 scope:local
daObj_Kago_IsDelete__FPv = .text:0x00002134; // type:function size:0x8 scope:local
__dt__10cCcD_GSttsFv = .text:0x0000213C; // type:function size:0x48 scope:global
cLib_calcTimer<i>__FPi = .text:0x00002184; // type:function size:0x1C scope:global
__sinit_d_a_obj_kago_cpp = .text:0x000021A0; // type:function size:0x74 scope:local
Expand Down Expand Up @@ -88,14 +88,14 @@ heapSize$3870 = .rodata:0x0000005C; // type:object size:0x14 scope:local
@4708 = .rodata:0x00000110; // type:object size:0x4 scope:local
@stringBase0 = .rodata:0x00000114; // type:object size:0xA scope:local data:string_table
...data.0 = .data:0x00000000; // type:label scope:local
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global
cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local
@1787 = .data:0x0000000C; // type:object size:0x4 scope:local
lbl_491_data_10 = .data:0x00000010; // type:object size:0x10
l_bmdData = .data:0x00000020; // type:object size:0x10 scope:global data:4byte
l_resNameList = .data:0x00000030; // type:object size:0x8 scope:global
l_ccDCyl = .data:0x00000038; // type:object size:0x44 scope:global
l_bmdData = .data:0x00000020; // type:object size:0x10 scope:local data:4byte
l_resNameList = .data:0x00000030; // type:object size:0x8 scope:local
l_ccDCyl = .data:0x00000038; // type:object size:0x44 scope:local
emttrId$4731 = .data:0x0000007C; // type:object size:0x8 scope:local
daObj_Kago_MethodTable = .data:0x00000084; // type:object size:0x20 scope:global
daObj_Kago_MethodTable = .data:0x00000084; // type:object size:0x20 scope:local
g_profile_OBJ_KAGO = .data:0x000000A4; // type:object size:0x30 scope:global
__vt__8cM3dGAab = .data:0x000000D4; // type:object size:0xC scope:global
__vt__8cM3dGCyl = .data:0x000000E0; // type:object size:0xC scope:global
Expand Down Expand Up @@ -125,7 +125,7 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
@1010 = .bss:0x00000040; // type:object size:0x1 scope:local
@1009 = .bss:0x00000044; // type:object size:0x1 scope:local
@3815 = .bss:0x00000048; // type:object size:0xC scope:local
l_HIO = .bss:0x00000054; // type:object size:0x4 scope:global data:4byte
l_HIO = .bss:0x00000054; // type:object size:0x4 scope:local data:4byte
@4686 = .bss:0x00000058; // type:object size:0xC scope:local
pos$4685 = .bss:0x00000068; // type:object size:0xC scope:local
angle$4689 = .bss:0x00000074; // type:object size:0x2 scope:local
Expand Down
2 changes: 1 addition & 1 deletion configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2017,7 +2017,7 @@ def MatchingFor(*versions) -> bool:
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_kabuto"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_kag"),
ActorRel(NonMatching, "d_a_obj_kage"),
ActorRel(NonMatching, "d_a_obj_kago"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_kago"),
ActorRel(NonMatching, "d_a_obj_kaisou"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_kamakiri"),
ActorRel(MatchingFor("GZ2E01", "GZ2J01"), "d_a_obj_kantera"),
Expand Down
4 changes: 0 additions & 4 deletions include/d/actor/d_a_npc_ks.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,10 +198,6 @@ class npc_ks_class {
/* 0xC17 */ s8 field_0xc17;
/* 0xC18 */ dPath* field_0xc18;
/* 0xC1C */ u8 field_0xc1c;

u32 fopAcM_checkHawkCarryNow(fopAc_ac_c* param_1) {
return fopAcM_CheckStatus(param_1, 0x80000000);
}
};

STATIC_ASSERT(sizeof(npc_ks_class) == 0xc20);
Expand Down
4 changes: 0 additions & 4 deletions include/d/actor/d_a_obj_kago.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,6 @@ class daObj_Kago_c : public fopAc_ac_c {
field_0x574->setBaseTRMtx(param_1);
}

u32 fopAcM_checkHawkCarryNow(fopAc_ac_c* actor) {
return fopAcM_CheckStatus(actor, 0x80000000);
}

void popup(f32 param_1, f32 param_2, cXyz* param_3) {
if (param_3 != NULL) {
current.pos = *param_3;
Expand Down
4 changes: 4 additions & 0 deletions include/f_op/f_op_actor_mng.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,10 @@ inline u32 fopAcM_checkCarryNow(fopAc_ac_c* i_actor) {
return i_actor->actor_status & fopAcM_STATUS_CARRY_NOW;
}

inline u32 fopAcM_checkHawkCarryNow(fopAc_ac_c* actor) {
return fopAcM_CheckStatus(actor, 0x80000000);
}

enum fopAcM_CARRY {
/* 0x01 */ fopAcM_CARRY_TYPE_1 = 1,
/* 0x02 */ fopAcM_CARRY_HEAVY = 2,
Expand Down
14 changes: 3 additions & 11 deletions src/d/actor/d_a_npc_ks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,17 @@

#include "d/actor/d_a_npc_ks.h"
#include "d/actor/d_a_obj_kago.h"
#include "d/d_cc_d.h"
#include "d/d_camera.h"
#include "d/d_com_inf_game.h"
#include "d/d_bomb.h"
#include "d/actor/d_a_obj_so.h"
#include "d/actor/d_a_boomerang.h"
#include "d/d_stage.h"
#include "d/actor/d_a_obj_sw.h"
#include "d/actor/d_a_obj_pillar.h"
#include "m_Do/m_Do_controller_pad.h"
#include "c/c_damagereaction.h"
#include "d/actor/d_a_e_fs.h"
#include "d/actor/d_a_obj_brg.h"
#include "d/actor/d_a_midna.h"
#include "JSystem/JUtility/JUTReport.h"
#include "d/d_meter2_info.h"
#include "cmath.h"
#include "d/actor/d_a_e_oc.h"
#include "d/d_stage.h"
#include "Z2AudioLib/Z2Instances.h"
#include "d/d_s_play.h"
#include "f_op/f_op_camera_mng.h"
Expand Down Expand Up @@ -3343,7 +3335,7 @@ static void demo_camera(npc_ks_class* i_this) {
// fallthrough
case 361:
sp44.set(-36540.0f, 335.0f, -20870.0f);
daPy_getPlayerActorClass()->setPlayerPosAndAngle(&sp44, 0xffff8000, 0);
daPy_getPlayerActorClass()->setPlayerPosAndAngle(&sp44, -32768, 0);
if (i_this->field_0xb44 >= 105) {
if (i_this->field_0xb44 == 105) {
i_this->mMsgFlow.init(a_this, 116, 0, NULL);
Expand Down Expand Up @@ -6734,7 +6726,7 @@ static int daNpc_Ks_Execute(npc_ks_class* i_this) {
mDoMtx_stack_c::ZrotM(0);

basket_p->setMtx(mDoMtx_stack_c::get());
if (i_this->fopAcM_checkHawkCarryNow(basket_p) != 0) {
if (fopAcM_checkHawkCarryNow(basket_p) != 0) {
anm_init(i_this, 39, 5.0f, 2, 1.0f);
i_this->mSound.startCreatureVoice(Z2SE_KOSARU_V_JUMP_SURPRISE, -1);
}
Expand Down Expand Up @@ -7262,7 +7254,7 @@ static BOOL start_check(npc_ks_class* i_this) {
fopAcM_setStageLayer(a_this);
if (fopAcM_GetRoomNo(a_this) == 1) {
f32 x_pos = 6836.0f - player->current.pos.x;
f32 y_pos = 2585.0f - player->current.pos.z;
f32 y_pos = 3585.0f - player->current.pos.z;
if (JMAFastSqrt(x_pos * x_pos + y_pos * y_pos) < 500.0f) {
a_this->home.pos.set(7025.0f, 3355.0f, 4500.0f);
a_this->home.angle.y = -0x7343;
Expand Down
Loading