mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-01 11:28:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Match iceeff, lighteff

Browse Source
This commit is contained in:
SuperDude88
2023-12-06 21:16:03 -05:00
parent 36ca3efcb2
commit 410b625350
4 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+2 -2
View File
@@ -1329,8 +1329,8 @@ config.libs = [
ActorRel(Matching, "d_a_am", extra_cflags=['-pragma "nosyminline on"']),
ActorRel(Matching, "d_a_am2", extra_cflags=["-sym off"]),
ActorRel(NonMatching, "d_a_amiprop"),
ActorRel(NonMatching, "d_a_arrow_iceeff", extra_cflags=['-pragma "nosyminline on"']),
ActorRel(NonMatching, "d_a_arrow_lighteff", extra_cflags=['-pragma "nosyminline on"']),
ActorRel(Matching, "d_a_arrow_iceeff", extra_cflags=['-pragma "nosyminline on"']),
ActorRel(Matching, "d_a_arrow_lighteff", extra_cflags=['-pragma "nosyminline on"']),
ActorRel(NonMatching, "d_a_beam"),
ActorRel(NonMatching, "d_a_boko"),
ActorRel(NonMatching, "d_a_canon"),
include/d/actor/d_a_arrow_lighteff.h
+1 -1
View File
@@ -14,7 +14,7 @@ public:
inline bool _delete();
inline bool _draw();
inline bool _execute();
void brk_play() {} // based on position in the debug map this would play the btk so not sure what this is really doing
inline void brk_play();
void setTopPos();
void setPointLight();
src/d/actor/d_a_arrow_iceeff.cpp
+1 -1
View File
@@ -297,7 +297,7 @@ static BOOL daArrow_Iceeff_IsDelete(void*) {
static actor_method_class daArrow_IceeffMethodTable = {
(process_method_func)daArrow_Iceeff_Create,
(process_method_func)daArrow_Iceeff_Delete,
(process_method_func)daArrow_Iceeff_Draw,
(process_method_func)daArrow_Iceeff_Execute,
(process_method_func)daArrow_Iceeff_IsDelete,
(process_method_func)daArrow_Iceeff_Draw,
};
src/d/actor/d_a_arrow_lighteff.cpp
+11 -7
View File
@@ -267,13 +267,10 @@ static BOOL daArrow_Lighteff_Execute(void* i_this) {
return static_cast<daArrow_Lighteff_c*>(i_this)->_execute();
}
/* 00000D44-000011A4 .text _execute__18daArrow_Lighteff_cFv */
bool daArrow_Lighteff_c::_execute() {
field_0x2F0 = field_0x2EC;
void daArrow_Lighteff_c::brk_play() {
mBtk.play();
s32 cam = dComIfGp_getPlayerCameraID(0);
int cam = dComIfGp_getPlayerCameraID(0);
if(!dComIfGp_checkCameraAttentionStatus(cam, 0x20)) {
if(field_0x2E0 < mBrk.getEndFrame()) {
field_0x2E0 += 1.0f;
@@ -300,6 +297,13 @@ bool daArrow_Lighteff_c::_execute() {
}
mBrk.setFrame(field_0x2E0);
}
/* 00000D44-000011A4 .text _execute__18daArrow_Lighteff_cFv */
bool daArrow_Lighteff_c::_execute() {
field_0x2F0 = field_0x2EC;
brk_play();
daPy_py_c* link = daPy_getPlayerActorClass();
daArrow_c* arrow = static_cast<daArrow_c*>(fopAcM_SearchByID(mParentPcId));
@@ -356,7 +360,7 @@ bool daArrow_Lighteff_c::_execute() {
fopAcM_delete(this);
}
cam = dComIfGp_getPlayerCameraID(0);
int cam = dComIfGp_getPlayerCameraID(0);
if(field_0x2E8 == 1) {
fopAcM_seStartCurrent(this, JA_SE_OBJ_FIRE_ARROW_AMB, 0);
if(!dComIfGp_checkCameraAttentionStatus(cam, 0x20)) {
@@ -399,7 +403,7 @@ static BOOL daArrow_Lighteff_IsDelete(void*) {
static actor_method_class daArrow_LighteffMethodTable = {
(process_method_func)daArrow_Lighteff_Create,
(process_method_func)daArrow_Lighteff_Delete,
(process_method_func)daArrow_Lighteff_Draw,
(process_method_func)daArrow_Lighteff_Execute,
(process_method_func)daArrow_Lighteff_IsDelete,
(process_method_func)daArrow_Lighteff_Draw,
};