diff --git a/config/SOUE01/rels/d_a_knight_leader_birdNP/symbols.txt b/config/SOUE01/rels/d_a_knight_leader_birdNP/symbols.txt index 5927225d..2eb95430 100644 --- a/config/SOUE01/rels/d_a_knight_leader_birdNP/symbols.txt +++ b/config/SOUE01/rels/d_a_knight_leader_birdNP/symbols.txt @@ -4,27 +4,27 @@ _unresolved = .text:0x00000060; // type:function size:0x4 scope:global __register_global_object = .text:0x00000070; // type:function size:0x1C scope:global __destroy_global_chain = .text:0x00000090; // type:function size:0x54 scope:global dAcKnightLeaderBird_c_classInit__Fv = .text:0x000000F0; // type:function size:0x12C -fn_4_220 = .text:0x00000220; // type:function size:0x58 +__dt__15dShadowCircle_cFv = .text:0x00000220; // type:function size:0x58 __dt__34sFState_c<21dAcKnightLeaderBird_c>Fv = .text:0x00000280; // type:function size:0x58 __dt__37sFStateFct_c<21dAcKnightLeaderBird_c>Fv = .text:0x000002E0; // type:function size:0x6C __dt__90sStateMgr_c<21dAcKnightLeaderBird_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x00000350; // type:function size:0xA0 __dt__60sFStateMgr_c<21dAcKnightLeaderBird_c,20sStateMethodUsr_FI_c>Fv = .text:0x000003F0; // type:function size:0xA4 -fn_4_4A0 = .text:0x000004A0; // type:function size:0x9C -fn_4_540 = .text:0x00000540; // type:function size:0xCC +createHeap__21dAcKnightLeaderBird_cFv = .text:0x000004A0; // type:function size:0x9C +create__21dAcKnightLeaderBird_cFv = .text:0x00000540; // type:function size:0xCC changeState__90sStateMgr_c<21dAcKnightLeaderBird_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x00000610; // type:function size:0x10 -fn_4_620 = .text:0x00000620; // type:function size:0x8 -fn_4_630 = .text:0x00000630; // type:function size:0x94 +doDelete__21dAcKnightLeaderBird_cFv = .text:0x00000620; // type:function size:0x8 +actorExecute__21dAcKnightLeaderBird_cFv = .text:0x00000630; // type:function size:0x94 executeState__90sStateMgr_c<21dAcKnightLeaderBird_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x000006D0; // type:function size:0x10 -fn_4_6E0 = .text:0x000006E0; // type:function size:0x2C -fn_4_710 = .text:0x00000710; // type:function size:0x24 -fn_4_740 = .text:0x00000740; // type:function size:0xC8 +preDraw__21dAcKnightLeaderBird_cFv = .text:0x000006E0; // type:function size:0x2C +draw__21dAcKnightLeaderBird_cFv = .text:0x00000710; // type:function size:0x24 +updateSpineMtx__21dAcKnightLeaderBird_cFv = .text:0x00000740; // type:function size:0xC8 initializeState_Wait__21dAcKnightLeaderBird_cFv = .text:0x00000810; // type:function size:0x38 executeState_Wait__21dAcKnightLeaderBird_cFv = .text:0x00000850; // type:function size:0x4 finalizeState_Wait__21dAcKnightLeaderBird_cFv = .text:0x00000860; // type:function size:0x4 -fn_4_870 = .text:0x00000870; // type:function size:0xC -fn_4_880 = .text:0x00000880; // type:function size:0xC -fn_4_890 = .text:0x00000890; // type:function size:0xC -fn_4_8A0 = .text:0x000008A0; // type:function size:0x20 +getAnmArcNameSpecial__13dAcBirdBase_cCFv = .text:0x00000870; // type:function size:0xC +getAnmArcNameLink__13dAcBirdBase_cCFv = .text:0x00000880; // type:function size:0xC +getAnmArcNameBase__13dAcBirdBase_cCFv = .text:0x00000890; // type:function size:0xC +hasPath__13dAcBirdBase_cCFv = .text:0x000008A0; // type:function size:0x20 __dt__21dAcKnightLeaderBird_cFv = .text:0x000008C0; // type:function size:0x158 getStateID__90sStateMgr_c<21dAcKnightLeaderBird_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000A20; // type:function size:0x10 getOldStateID__90sStateMgr_c<21dAcKnightLeaderBird_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x00000A30; // type:function size:0x10 @@ -47,29 +47,29 @@ isSameName__36sFStateID_c<21dAcKnightLeaderBird_c>CFPCc = .text:0x00000D60; // t _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 scope:global -lbl_4_rodata_0 = .rodata:0x00000000; // type:object size:0xC data:float -lbl_4_rodata_C = .rodata:0x0000000C; // type:object size:0xC align:4 data:float -lbl_4_rodata_18 = .rodata:0x00000018; // type:object size:0x4 align:4 data:float +lbl_4_rodata_0 = .rodata:0x00000000; // type:object size:0xC scope:local data:float +lbl_4_rodata_C = .rodata:0x0000000C; // type:object size:0xC scope:local align:4 data:float +lbl_4_rodata_18 = .rodata:0x00000018; // type:object size:0x4 scope:local align:4 data:float g_profile_KNIGHT_LEADER_BIRD = .data:0x00000000; // type:object size:0x10 data:4byte -lbl_4_data_10 = .data:0x00000010; // type:object size:0x10 -lbl_4_data_20 = .data:0x00000020; // type:object size:0x10 -lbl_4_data_30 = .data:0x00000030; // type:object size:0x8 -lbl_4_data_38 = .data:0x00000038; // type:object size:0x4 data:4byte -lbl_4_data_3C = .data:0x0000003C; // type:object size:0xC -lbl_4_data_48 = .data:0x00000048; // type:object size:0xC -lbl_4_data_54 = .data:0x00000054; // type:object size:0x24 -lbl_4_data_78 = .data:0x00000078; // type:object size:0x8 -lbl_4_data_80 = .data:0x00000080; // type:object size:0x4 data:4byte -lbl_4_data_84 = .data:0x00000084; // type:object size:0x94 -lbl_4_data_118 = .data:0x00000118; // type:object size:0x30 -lbl_4_data_148 = .data:0x00000148; // type:object size:0x30 -lbl_4_data_178 = .data:0x00000178; // type:object size:0x18 -lbl_4_data_190 = .data:0x00000190; // type:object size:0x18 -lbl_4_data_1A8 = .data:0x000001A8; // type:object size:0x54 -lbl_4_data_1FC = .data:0x000001FC; // type:object size:0x34 -lbl_4_data_230 = .data:0x00000230; // type:object size:0x8 data:string -lbl_4_data_238 = .data:0x00000238; // type:object size:0xC data:string -lbl_4_data_244 = .data:0x00000244; // type:object size:0xC data:string +lbl_4_data_10 = .data:0x00000010; // type:object size:0x10 scope:local +lbl_4_data_20 = .data:0x00000020; // type:object size:0x10 scope:local +lbl_4_data_30 = .data:0x00000030; // type:object size:0x8 scope:local +lbl_4_data_38 = .data:0x00000038; // type:object size:0x4 scope:local data:4byte +lbl_4_data_3C = .data:0x0000003C; // type:object size:0xC scope:local +lbl_4_data_48 = .data:0x00000048; // type:object size:0xC scope:local +lbl_4_data_54 = .data:0x00000054; // type:object size:0x23 scope:local data:string +lbl_4_data_78 = .data:0x00000078; // type:object size:0x8 scope:local +lbl_4_data_80 = .data:0x00000080; // type:object size:0x4 scope:local data:4byte +__vt__21dAcKnightLeaderBird_c = .data:0x00000084; // type:object size:0x94 +__vt__60sFStateMgr_c<21dAcKnightLeaderBird_c,20sStateMethodUsr_FI_c> = .data:0x00000118; // type:object size:0x30 +__vt__90sStateMgr_c<21dAcKnightLeaderBird_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x00000148; // type:object size:0x30 +__vt__37sFStateFct_c<21dAcKnightLeaderBird_c> = .data:0x00000178; // type:object size:0x18 +__vt__34sFState_c<21dAcKnightLeaderBird_c> = .data:0x00000190; // type:object size:0x18 +__vt__15dShadowCircle_c = .data:0x000001A8; // type:object size:0x54 +__vt__36sFStateID_c<21dAcKnightLeaderBird_c> = .data:0x000001FC; // type:object size:0x34 +lbl_4_data_230 = .data:0x00000230; // type:object size:0x8 scope:local data:string +lbl_4_data_238 = .data:0x00000238; // type:object size:0xC scope:local data:string +lbl_4_data_244 = .data:0x00000244; // type:object size:0xC scope:local data:string __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global -lbl_4_bss_8 = .bss:0x00000008; // type:object size:0x10 -lbl_4_bss_18 = .bss:0x00000018; // type:object size:0x30 data:4byte +lbl_4_bss_8 = .bss:0x00000008; // type:object size:0x10 scope:local +lbl_4_bss_18 = .bss:0x00000018; // type:object size:0x30 scope:local data:4byte diff --git a/config/SOUE01/splits.txt b/config/SOUE01/splits.txt index f26f2490..0c5e668c 100644 --- a/config/SOUE01/splits.txt +++ b/config/SOUE01/splits.txt @@ -1205,6 +1205,8 @@ d/lyt/d_screen_fader.cpp: d/a/d_a_bird_base.cpp: .text start:0x80175FD0 end:0x80179128 align:16 .data start:0x80528D90 end:0x80528F20 + .sdata start:0x80572AB0 end:0x80572BB0 + .sdata2 start:0x8057AC08 end:0x8057AC78 d/a/d_a_door_base.cpp: .text start:0x80179130 end:0x801792C4 align:16 diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index e9a9bb1c..a90d06f7 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -9839,31 +9839,31 @@ draw__14dScreenFader_cFv = .text:0x80175E60; // type:function size:0x148 fadeIn__14dScreenFader_cFv = .text:0x80175FB0; // type:function size:0x4 fadeOut__14dScreenFader_cFv = .text:0x80175FC0; // type:function size:0x4 fn_80175FD0 = .text:0x80175FD0; // type:function size:0xC8 -fn_801760A0 = .text:0x801760A0; // type:function size:0x778 -fn_80176820 = .text:0x80176820; // type:function size:0x310 -fn_80176B30 = .text:0x80176B30; // type:function size:0x19C -fn_80176CD0 = .text:0x80176CD0; // type:function size:0x20 -fn_80176CF0 = .text:0x80176CF0; // type:function size:0x8 -fn_80176D00 = .text:0x80176D00; // type:function size:0x28 -fn_80176D30 = .text:0x80176D30; // type:function size:0x58 +timingB__Q213dAcBirdBase_c10callback_cFUlPQ34nw4r3g3d13WorldMtxManipQ34nw4r3g3d6ResMdl = .text:0x801760A0; // type:function size:0x778 +loadMdlNodeIds__13dAcBirdBase_cFv = .text:0x80176820; // type:function size:0x310 +resetBird__13dAcBirdBase_cFv = .text:0x80176B30; // type:function size:0x19C +hasPath__13dAcBirdBase_cCFv = .text:0x80176CD0; // type:function size:0x20 +doDelete__13dAcBirdBase_cFv = .text:0x80176CF0; // type:function size:0x8 +draw__13dAcBirdBase_cFv = .text:0x80176D00; // type:function size:0x28 +fn_80176D30__13dAcBirdBase_cFv = .text:0x80176D30; // type:function size:0x58 fn_80176D90 = .text:0x80176D90; // type:function size:0x1E8 -fn_80176F80 = .text:0x80176F80; // type:function size:0x1C0 +fn_80176F80__13dAcBirdBase_cFv = .text:0x80176F80; // type:function size:0x1C0 fn_80177140 = .text:0x80177140; // type:function size:0x64 -fn_801771B0 = .text:0x801771B0; // type:function size:0x94 -fn_80177250 = .text:0x80177250; // type:function size:0xEC -fn_80177340 = .text:0x80177340; // type:function size:0x8 -fn_80177350 = .text:0x80177350; // type:function size:0xC -fn_80177360 = .text:0x80177360; // type:function size:0xC -fn_80177370 = .text:0x80177370; // type:function size:0x1E4 +updateMatrixBird__13dAcBirdBase_cFv = .text:0x801771B0; // type:function size:0x94 +changeBirdAction__13dAcBirdBase_cFPCclQ23m3d10playMode_ef = .text:0x80177250; // type:function size:0xEC +getAnmArcNameBase__13dAcBirdBase_cCFv = .text:0x80177340; // type:function size:0x8 +getAnmArcNameLink__13dAcBirdBase_cCFv = .text:0x80177350; // type:function size:0xC +getAnmArcNameSpecial__13dAcBirdBase_cCFv = .text:0x80177360; // type:function size:0xC +executeBirdAction__13dAcBirdBase_cFv = .text:0x80177370; // type:function size:0x1E4 fn_80177560 = .text:0x80177560; // type:function size:0x108 fn_80177670 = .text:0x80177670; // type:function size:0xF0 -fn_80177760 = .text:0x80177760; // type:function size:0xB4 -fn_80177820 = .text:0x80177820; // type:function size:0x590 +chkWallGndRoofHit__13dAcBirdBase_cFv = .text:0x80177760; // type:function size:0xB4 +handleWallGndRoofHit__13dAcBirdBase_cFv = .text:0x80177820; // type:function size:0x590 fn_80177DB0 = .text:0x80177DB0; // type:function size:0xE4 -fn_80177EA0 = .text:0x80177EA0; // type:function size:0x90 -fn_80177F30 = .text:0x80177F30; // type:function size:0xC8 -fn_80178000 = .text:0x80178000; // type:function size:0xBC -fn_801780C0 = .text:0x801780C0; // type:function size:0xA8 +fn_80177EA0__13dAcBirdBase_cFv = .text:0x80177EA0; // type:function size:0x90 +fn_80177F30__13dAcBirdBase_cFv = .text:0x80177F30; // type:function size:0xC8 +fn_80178000__13dAcBirdBase_cFv = .text:0x80178000; // type:function size:0xBC +fn_801780C0__13dAcBirdBase_cFv = .text:0x801780C0; // type:function size:0xA8 fn_80178170 = .text:0x80178170; // type:function size:0x48 fn_801781C0 = .text:0x801781C0; // type:function size:0x88 fn_80178250 = .text:0x80178250; // type:function size:0x8 @@ -9884,8 +9884,8 @@ fn_80178D80 = .text:0x80178D80; // type:function size:0xB8 fn_80178E40 = .text:0x80178E40; // type:function size:0x4C fn_80178E90 = .text:0x80178E90; // type:function size:0x40 fn_80178ED0 = .text:0x80178ED0; // type:function size:0x114 -fn_80178FF0 = .text:0x80178FF0; // type:function size:0xDC -fn_801790D0 = .text:0x801790D0; // type:function size:0x58 +__dt__13dAcBirdBase_cFv = .text:0x80178FF0; // type:function size:0xDC +__dt__Q213dAcBirdBase_c10callback_cFv = .text:0x801790D0; // type:function size:0x58 __ct__16dAcObjDoor_cFv = .text:0x80179130; // type:function size:0x58 fn_80179190 = .text:0x80179190; // type:function size:0x74 ActorDoorBase__hasVisitedRoomIdMaybe = .text:0x80179210; // type:function size:0x14 @@ -35052,8 +35052,11 @@ lbl_80528C40 = .data:0x80528C40; // type:object size:0x88 @7061 = .data:0x80528D30; // type:object size:0xE scope:local data:string __vt__11dLytFader_c = .data:0x80528D40; // type:object size:0x24 __vt__14dScreenFader_c = .data:0x80528D68; // type:object size:0x24 -lbl_80528D90 = .data:0x80528D90; // type:object size:0x10 -lbl_80528DA0 = .data:0x80528DA0; // type:object size:0x168 +lbl_80528D90 = .data:0x80528D90; // type:object size:0xD data:string +lbl_80528DA0 = .data:0x80528DA0; // type:object size:0xA data:string +lbl_80528DAC = .data:0x80528DAC; // type:object size:0xAC +__vt__13dAcBirdBase_c = .data:0x80528E58; // type:object size:0x98 +__vt__Q213dAcBirdBase_c10callback_c = .data:0x80528EF0; // type:object size:0x18 lbl_80528F08 = .data:0x80528F08; // type:object size:0xC data:string lbl_80528F14 = .data:0x80528F14; // type:object size:0xC data:string lbl_80528F20 = .data:0x80528F20; // type:object size:0x90 @@ -40121,8 +40124,8 @@ lbl_80572B38 = .sdata:0x80572B38; // type:object size:0x8 lbl_80572B40 = .sdata:0x80572B40; // type:object size:0x8 lbl_80572B48 = .sdata:0x80572B48; // type:object size:0x8 lbl_80572B50 = .sdata:0x80572B50; // type:object size:0x4 data:4byte -lbl_80572B54 = .sdata:0x80572B54; // type:object size:0x8 -lbl_80572B5C = .sdata:0x80572B5C; // type:object size:0x8 +lbl_80572B54 = .sdata:0x80572B54; // type:object size:0x5 data:string +lbl_80572B5C = .sdata:0x80572B5C; // type:object size:0x6 data:string lbl_80572B64 = .sdata:0x80572B64; // type:object size:0x4 data:4byte lbl_80572B68 = .sdata:0x80572B68; // type:object size:0x4 data:4byte lbl_80572B6C = .sdata:0x80572B6C; // type:object size:0x4 data:4byte diff --git a/configure.py b/configure.py index 23612952..637ee579 100644 --- a/configure.py +++ b/configure.py @@ -2138,7 +2138,7 @@ config.libs = [ Rel(NonMatching, "d_a_insect_scarab", "REL/d/a/d_a_insect_scarab.cpp"), Rel(Matching, "d_a_invisible", "REL/d/a/d_a_invisible.cpp"), Rel(NonMatching, "d_a_kanban", "REL/d/a/d_a_kanban.cpp"), - Rel(NonMatching, "d_a_knight_leader_bird", "REL/d/a/d_a_knight_leader_bird.cpp"), + Rel(Matching, "d_a_knight_leader_bird", "REL/d/a/d_a_knight_leader_bird.cpp"), Rel(NonMatching, "d_a_little_bird", "REL/d/a/d_a_little_bird.cpp"), Rel(NonMatching, "d_a_little_bird_mgr", "REL/d/a/d_a_little_bird_mgr.cpp"), Rel(NonMatching, "d_a_message", "REL/d/a/d_a_message.cpp"), diff --git a/include/d/a/d_a_bird_base.h b/include/d/a/d_a_bird_base.h new file mode 100644 index 00000000..bfb904df --- /dev/null +++ b/include/d/a/d_a_bird_base.h @@ -0,0 +1,112 @@ +#ifndef D_A_BIRD_BASE_H +#define D_A_BIRD_BASE_H + +#include "d/a/obj/d_a_obj_base.h" +#include "d/col/bg/d_bg_s_acch.h" +#include "d/col/cc/d_cc_d.h" +#include "d/d_shadow.h" +#include "m/m3d/m_fanm.h" +#include "m/m3d/m_mdl.h" +#include "m/m_mtx.h" +#include "m/m_quat.h" +#include "m/m_vec.h" +#include "toBeSorted/d_d3d.h" +#include "toBeSorted/d_path.h" + +class dAcBirdBase_c : public dAcObjBase_c { + class callback_c : public m3d::callback_c { + public: + virtual ~callback_c() {} + virtual void timingB(u32, nw4r::g3d::WorldMtxManip *, nw4r::g3d::ResMdl) override; + + /* 0x04 */ u8 _0x04[0x94 - 0x04]; + }; + +public: + enum Action_e { + BIRD_ACTION_FLAP, + BIRD_ACTION_GLIDE, + BIRD_ACTION_KEEP, + BIRD_ACTION_DAMAGE, + BIRD_ACTION_4, + BIRD_ACTION_DOWN, + BIRD_ACTION_HOVER, + BIRD_ACTION_GLIDE_DIVE, + BIRD_ACTION_SWITCH_DIVE, + + // Certain birds use special actions starting from 9 + + BIRD_ACTION_BASE_MAX = 9, + }; + + dAcBirdBase_c() : field_0xF30(0) {} + virtual ~dAcBirdBase_c() {} + + virtual int doDelete() override; + virtual int draw() override; + + /* 0x80 */ virtual bool resetBird(); + /* 0x84 */ virtual bool hasPath() const { + return getPath() >= 0 && getPath() < 0xFF; + } + /* 0x88 */ virtual const char* getAnmArcNameBase() const { + return "BirdAnm"; + } + /* 0x8C */ virtual const char* getAnmArcNameLink() const { + return "BirdLinkAnm"; + } + /* 0x90 */ virtual const char* getAnmArcNameSpecial() const { + return "BirdLinkAnm"; + } + +protected: + s32 getPath() const { + return params & 0xFF; + } + + void updateMatrixBird(); + void loadMdlNodeIds(); + bool chkWallGndRoofHit(); + void handleWallGndRoofHit(); + bool changeBirdAction(const char *animName, s32 action, m3d::playMode_e playMode, f32 blend); + void executeBirdAction(); + + void fn_80176D30(); + void fn_80176F80(); + void fn_80177EA0(); + void fn_80178000(); + void fn_801780C0(); + void fn_80177F30(); + + /* 0x330 */ d3d::AnmMdlWrapper mMdl; + /* 0x3A0 */ s16 mBirdAction; + /* 0x3A4 */ dShadowCircle_c mShadow; + /* 0x3AC */ dCcD_Cps mCcCps; + /* 0x51C */ dCcD_Sph mCcSph; + /* 0x66C */ dBgS_AcchCir mAcchCir1; + /* 0x6C8 */ dBgS_ObjAcch mObjAcch1; + /* 0xA78 */ callback_c mMdlCallback; + /* 0xB0C */ dBgS_ObjAcch mObjAcch2; + /* 0xEBC */ dBgS_AcchCir mAcchCir2; + /* 0xF18 */ mVec3_c field_0xF18; + /* 0xF24 */ mVec3_c field_0xF24; + /* 0xF30 */ u16 field_0xF30; + /* 0xF32 */ s16 mBirdActionTimer; + /* 0xF34 */ s16 mChkWallGndRoofTimer; + /* 0xF36 */ u8 _0xF36[0xF40 - 0xF36]; + /* 0xF40 */ f32 field_0xF40; + /* 0xF44 */ u8 _0xF44[0xF50 - 0xF44]; + /* 0xF50 */ mVec3_c field_0xF50; + /* 0xF5C */ mVec3_c field_0xF5C; + /* 0xF68 */ mVec3_c field_0xF68; + /* 0xF74 */ mVec3_c field_0xF74; + /* 0xF80 */ mMtx_c field_0xF80; + /* 0xFB0 */ mQuat_c field_0xFB0; + /* 0xFC0 */ mVec3_c field_0xFC0; + /* 0xFCC */ u8 field_0xFCC; + /* 0xFCE */ s16 field_0xFCE; + /* 0xFD0 */ u8 _0xFD0[0xFE4 - 0xFD0]; + /* 0xFE4 */ ActorOnRail_Ext mPath; +}; + +#endif diff --git a/include/d/a/d_a_knight_leader_bird.h b/include/d/a/d_a_knight_leader_bird.h index 4a473cc4..461f2001 100644 --- a/include/d/a/d_a_knight_leader_bird.h +++ b/include/d/a/d_a_knight_leader_bird.h @@ -1,19 +1,34 @@ #ifndef D_A_KNIGHT_LEADER_BIRD_H #define D_A_KNIGHT_LEADER_BIRD_H +#include "d/a/d_a_base.h" +#include "d/a/d_a_bird_base.h" #include "d/a/obj/d_a_obj_base.h" +#include "m/m_mtx.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" -class dAcKnightLeaderBird_c : public dAcObjBase_c { +class dAcKnightLeaderBird_c : public dAcBirdBase_c { public: dAcKnightLeaderBird_c() : mStateMgr(*this, sStateID::null) {} virtual ~dAcKnightLeaderBird_c() {} + virtual bool createHeap() override; + virtual int create() override; + virtual int doDelete() override; + virtual int actorExecute() override; + virtual int preDraw() override; + virtual int draw() override; + STATE_FUNC_DECLARE(dAcKnightLeaderBird_c, Wait); + STATE_MGR_DEFINE_UTIL_GETOLDSTATEID(dAcKnightLeaderBird_c); private: - /* 0x??? */ STATE_MGR_DECLARE(dAcKnightLeaderBird_c); + void updateSpineMtx(); + + /* 0x1030 */ u8 _0x1030[0x1040 - 0x1030]; + /* 0x1040 */ STATE_MGR_DECLARE(dAcKnightLeaderBird_c); + /* 0x1064 */ dAcRef_c mUnkRef; + /* 0x1070 */ mMtx_c mSpineWorldMtx; }; #endif diff --git a/include/m/m3d/m_anmmdl.h b/include/m/m3d/m_anmmdl.h index 09180be0..cb8ec945 100644 --- a/include/m/m3d/m_anmmdl.h +++ b/include/m/m3d/m_anmmdl.h @@ -57,6 +57,10 @@ public: return mAnm; } + void setAnmFile(void *data) { + mAnmFile = nw4r::g3d::ResFile(data); + } + protected: nw4r::g3d::ResFile mMdlFile; nw4r::g3d::ResFile mAnmFile; diff --git a/include/m/m3d/m_fanm.h b/include/m/m3d/m_fanm.h index 49c89c0d..fd02f880 100644 --- a/include/m/m3d/m_fanm.h +++ b/include/m/m3d/m_fanm.h @@ -33,6 +33,10 @@ public: mPlayState = state; } + playMode_e getPlayMode() const { + return (playMode_e)mPlayState; + } + inline f32 getEndFrame() { return mEndFrame; } diff --git a/include/m/m_mtx.h b/include/m/m_mtx.h index 95830252..effe67e6 100644 --- a/include/m/m_mtx.h +++ b/include/m/m_mtx.h @@ -110,6 +110,30 @@ public: *this += m; } + void concat(const mMtx_c &rhs) { + MTXConcat(*this, rhs, *this); + } + + void scaleS(const mVec3_c &v) { + MTXScale(*this, v.x, v.y, v.z); + } + + void scaleS(f32 x, f32 y, f32 z) { + MTXScale(*this, x, y, z); + } + + void scaleM(const mVec3_c &v) { + mMtx_c m; + MTXScale(m, v.x, v.y, v.z); + *this += m; + } + + void scaleM(f32 x, f32 y, f32 z) { + mMtx_c m; + MTXScale(m, x, y, z); + *this += m; + } + void multVec(const mVec3_c &in, mVec3_c &out) const { MTXMultVec(*this, in, out); } diff --git a/include/s/s_State.hpp b/include/s/s_State.hpp index 262885af..03c90acd 100644 --- a/include/s/s_State.hpp +++ b/include/s/s_State.hpp @@ -44,6 +44,11 @@ return *mStateMgr.getStateID() == value; \ } +#define STATE_MGR_DEFINE_UTIL_GETOLDSTATEID(class_name) \ + const sFStateID_c &getOldStateID() const { \ + return (sFStateID_c &)*mStateMgr.getOldStateID(); \ + } + // TODO this is probably not the whole solution. // The problems with this approach are: // * You can't define the same state name for multiple files in the same TU due to baseID_ symbol clash. diff --git a/src/REL/d/a/d_a_knight_leader_bird.cpp b/src/REL/d/a/d_a_knight_leader_bird.cpp index 62f14bf2..94d9a4a8 100644 --- a/src/REL/d/a/d_a_knight_leader_bird.cpp +++ b/src/REL/d/a/d_a_knight_leader_bird.cpp @@ -1,9 +1,94 @@ #include "d/a/d_a_knight_leader_bird.h" +#include "d/a/d_a_bird_base.h" +#include "d/a/obj/d_a_obj_base.h" +#include "m/m3d/m_fanm.h" +#include "m/m_vec.h" + SPECIAL_ACTOR_PROFILE(KNIGHT_LEADER_BIRD, dAcKnightLeaderBird_c, fProfile::KNIGHT_LEADER_BIRD, 0x8E, 0, 2); STATE_DEFINE(dAcKnightLeaderBird_c, Wait); -void dAcKnightLeaderBird_c::initializeState_Wait() {} +const char *sBirdLordMdlResName = "BirdLord"; +const char *sBirdLordAnmResName = "BirdAnm"; + +const char *sBirdLordMdlName = "BirdLord"; +const char *sBirdLordAnmName = "Glide"; +// unused, can't be static +const char *sBirdLordAnmName2 = "Flap"; +const char *sBirdLordAnmName3 = "Keep"; + +bool dAcKnightLeaderBird_c::createHeap() { + void *mdl = getOarcResFile(sBirdLordMdlResName); + void *anm = getOarcResFile(sBirdLordAnmResName); + if (!mMdl.create3(*this, mdl, anm, sBirdLordMdlName, sBirdLordAnmName, 0x120)) { + return false; + } + loadMdlNodeIds(); + return true; +} + +int dAcKnightLeaderBird_c::create() { + 1.0f; // float order + + CREATE_ALLOCATOR(dAcKnightLeaderBird_c); + dAcBirdBase_c::resetBird(); + field_0xF40 = 0.15f; + mStateMgr.changeState(StateID_Wait); + boundingBox.Set(mVec3_c(-300.0f, 0.0f, -300.0f), mVec3_c(300.0f, 200.0f, 300.0f)); + + return SUCCEEDED; +} + +int dAcKnightLeaderBird_c::doDelete() { + return SUCCEEDED; +} + +int dAcKnightLeaderBird_c::actorExecute() { + mStateMgr.executeState(); + mMdl.play(); + + fn_80176D30(); + fn_80176F80(); + updateMatrixBird(); + + updateSpineMtx(); + + fn_80177EA0(); + fn_80178000(); + fn_801780C0(); + fn_80177F30(); + + return SUCCEEDED; +} + +int dAcKnightLeaderBird_c::preDraw() { + // @bug boolean conversion... + return dAcObjBase_c::preDraw() != false; +} + +int dAcKnightLeaderBird_c::draw() { + dAcBirdBase_c::draw(); + return SUCCEEDED; +} + + +void dAcKnightLeaderBird_c::updateSpineMtx() { + static const char *sBirdLordSpineName = "Spine"; + u32 id = mMdl.getModel().getNodeID(sBirdLordSpineName); + if (!mMdl.getModel().getNodeWorldMtx(id, mSpineWorldMtx)) { + mSpineWorldMtx = mWorldMtx; + return; + } + + mSpineWorldMtx.YrotM(0x4000); +} + +void dAcKnightLeaderBird_c::initializeState_Wait() { + forwardSpeed = 0.0f; + velocity.set(0.0f, 0.0f, 0.0f); + forwardAccel = 0.0f; + changeBirdAction(sBirdLordAnmName, BIRD_ACTION_GLIDE, m3d::PLAY_MODE_4, 8.0f); +} void dAcKnightLeaderBird_c::executeState_Wait() {} void dAcKnightLeaderBird_c::finalizeState_Wait() {} diff --git a/src/d/a/d_a_bird_base.cpp b/src/d/a/d_a_bird_base.cpp new file mode 100644 index 00000000..e3ca30de --- /dev/null +++ b/src/d/a/d_a_bird_base.cpp @@ -0,0 +1,184 @@ +#include "d/a/d_a_bird_base.h" + +#include "c/c_math.h" +#include "common.h" +#include "d/col/bg/d_bg_s.h" +#include "d/col/bg/d_bg_s_lin_chk.h" +#include "m/m3d/m_fanm.h" +#include "m/m_mtx.h" +#include "m/m_vec.h" + +void dAcBirdBase_c::callback_c::timingB(u32, nw4r::g3d::WorldMtxManip *, nw4r::g3d::ResMdl) { + // TODO +} + +int dAcBirdBase_c::doDelete() { + return SUCCEEDED; +} + +int dAcBirdBase_c::draw() { + drawModelType1(&mMdl.getModel()); + return SUCCEEDED; +} + +void dAcBirdBase_c::updateMatrixBird() { + mWorldMtx.transS(position); + mWorldMtx.concat(field_0xF80); + mWorldMtx.ZrotM(rotation.z); + mWorldMtx.scaleM(field_0xF50.x, field_0xF50.y, field_0xF50.z); + mMdl.getModel().setLocalMtx(mWorldMtx); + mMdl.getModel().calc(false); +} + +bool dAcBirdBase_c::changeBirdAction(const char *animName, s32 action, m3d::playMode_e playMode, f32 blend) { + void *data; + if (action < BIRD_ACTION_HOVER) { + data = getOarcResFile(getAnmArcNameBase()); + } else if (action < BIRD_ACTION_BASE_MAX) { + data = getOarcResFile(getAnmArcNameLink()); + } else { + data = getOarcResFile(getAnmArcNameSpecial()); + } + mMdl.setAnmFile(data); + bool ret = false; + if (mBirdAction != action) { + mMdl.setAnm(animName, playMode, blend); + mBirdAction = action; + ret = true; + } + return ret; +} + +void dAcBirdBase_c::executeBirdAction() { + if (mBirdAction == BIRD_ACTION_GLIDE) { + if (--mBirdActionTimer <= 0) { + changeBirdAction("Flap", BIRD_ACTION_FLAP, m3d::PLAY_MODE_4, 5.0f); + mBirdActionTimer = cM::rndInt(100) + 100; + } else if (field_0xF5C.y < -0.3f) { + changeBirdAction("SwitchToDive", BIRD_ACTION_SWITCH_DIVE, m3d::PLAY_MODE_4, 5.0f); + } + } else if (mBirdAction == BIRD_ACTION_GLIDE_DIVE) { + if (field_0xF5C.y >= -0.2f) { + changeBirdAction("SwitchToDive", BIRD_ACTION_SWITCH_DIVE, m3d::PLAY_MODE_3, 5.0f); + } + } else if (mBirdAction == BIRD_ACTION_SWITCH_DIVE) { + if (mMdl.getAnm().isStop()) { + if (mMdl.getAnm().getPlayMode() == m3d::PLAY_MODE_3) { + changeBirdAction("Glide", BIRD_ACTION_GLIDE, m3d::PLAY_MODE_4, 5.0f); + } else { + changeBirdAction("GlideDive", BIRD_ACTION_GLIDE_DIVE, m3d::PLAY_MODE_4, 5.0f); + } + } else if (field_0xF5C.y >= -0.15f) { + changeBirdAction("SwitchToDive", BIRD_ACTION_SWITCH_DIVE, m3d::PLAY_MODE_3, 5.0f); + } + } else { + if ((mMdl.getAnm().isStop() && mBirdAction == BIRD_ACTION_FLAP) || + (mMdl.getAnm().isStop() && mBirdAction == BIRD_ACTION_DAMAGE) || + (mMdl.getAnm().isStop() && mBirdAction == BIRD_ACTION_HOVER)) { + changeBirdAction("Glide", BIRD_ACTION_GLIDE, m3d::PLAY_MODE_4, 5.0f); + mBirdActionTimer = cM::rndInt(100) + 100; + } + } +} + +bool dAcBirdBase_c::chkWallGndRoofHit() { + mVec3_c tmp; + tmp.set(position); // unused + + if (--mChkWallGndRoofTimer <= 0) { + mChkWallGndRoofTimer = cM::rndInt(10) + 20; + if (mObjAcch2.ChkWallHit(nullptr) || mObjAcch2.ChkGndHit() || mObjAcch2.ChkRoofHit()) { + mChkWallGndRoofTimer = 60; + handleWallGndRoofHit(); + return true; + } + } + return false; +} + +void dAcBirdBase_c::handleWallGndRoofHit() { + dBgS_ObjLinChk linChk; + mVec3_c start, end; + start.set(position); + end.set(position); + + mVec3_c v1; + mMtx_c m1; + mMtx_c m2; + + mAng rot1 = field_0xF5C.atan2sX_Z(); + if (mObjAcch2.ChkGndHit()) { + end.set(position); + v1.set(0.0f, 0.0f, 10000.0f); + m1.YrotS(rot1); + m1.XrotM(-0x4000); + MTXMultVec(m1, v1, v1); + end += v1; + linChk.Set(&start, &end, nullptr); + if (!dBgS::GetInstance()->LineCross(&linChk)) { + field_0xF68.set(v1); + field_0xF68.normalizeRS(); + return; + } + + end.set(position); + v1.set(0.0f, 0.0f, 10000.0f); + m1.YrotS(rot1); + m1.XrotM(0x4000); + MTXMultVec(m1, v1, v1); + end += v1; + linChk.Set(&start, &end, nullptr); + if (!dBgS::GetInstance()->LineCross(&linChk)) { + field_0xF68.set(v1); + field_0xF68.normalizeRS(); + return; + } + } + + v1.set(0.0f, 0.0f, 10000.0f); + v1.rotY(rot1 + mAng(0x4000)); + end += v1; + linChk.Set(&start, &end, nullptr); + if (!dBgS::GetInstance()->LineCross(&linChk)) { + field_0xF68.set(v1); + field_0xF68.normalizeRS(); + return; + } + + end.set(position); + v1.set(0.0f, 0.0f, 10000.0f); + v1.rotY(rot1 - mAng(0x4000)); + end += v1; + linChk.Set(&start, &end, nullptr); + if (!dBgS::GetInstance()->LineCross(&linChk)) { + field_0xF68.set(v1); + field_0xF68.normalizeRS(); + return; + } + + end.set(position); + v1.set(0.0f, 0.0f, 10000.0f); + m2.YrotS(rot1); + m2.XrotM(0xC000); + MTXMultVec(m2, v1, v1); + end += v1; + linChk.Set(&start, &end, nullptr); + if (!dBgS::GetInstance()->LineCross(&linChk)) { + field_0xF68.set(v1); + field_0xF68.normalizeRS(); + return; + } + + end.set(position); + v1.set(0.0f, 0.0f, 10000.0f); + m2.YrotS(rot1); + m2.XrotM(0x4000); + MTXMultVec(m2, v1, v1); + end += v1; + linChk.Set(&start, &end, nullptr); + if (!dBgS::GetInstance()->LineCross(&linChk)) { + field_0xF68.set(v1); + field_0xF68.normalizeRS(); + return; + } +}