mirror of
https://github.com/encounter/tp.git
synced 2026-07-11 06:18:46 -07:00
d_a_kytag07 OK, d_a_obj_onsenFire OK, d_a_econt OK (#295)
This commit is contained in:
@@ -1467,7 +1467,7 @@ static void do_walk_run(do_class* i_this) {
|
||||
if (i_this->field_0x5e8 >= FLOAT_LABEL(lit_3665)) {
|
||||
i_this->mAction = ACT_RUN;
|
||||
i_this->mStayStatus = 0;
|
||||
i_this->mSound.startSound(JAISoundID(Z2SE_DOG_BARK), 0, -1);
|
||||
i_this->mSound.startSound(Z2SE_DOG_BARK, 0, -1);
|
||||
}
|
||||
}
|
||||
default: {
|
||||
@@ -1790,7 +1790,7 @@ static void do_wait_1(do_class* i_this) {
|
||||
distance = 127.0;
|
||||
}
|
||||
|
||||
i_this->mSound.startLevelSound(JAISoundID(Z2SE_DOG_V_CALL_HELP), distance, -1);
|
||||
i_this->mSound.startLevelSound(Z2SE_DOG_V_CALL_HELP, distance, -1);
|
||||
}
|
||||
}
|
||||
#else
|
||||
@@ -2677,7 +2677,7 @@ static void action(do_class* i_this) {
|
||||
if (i_this->field_0x6ae != 0) {
|
||||
i_this->field_0x6ae--;
|
||||
if (i_this->field_0x6ae == 0) {
|
||||
i_this->mSound.startSound(JAISoundID(Z2SE_M007_DOG_COME_RUNNING), 0, -1);
|
||||
i_this->mSound.startSound(Z2SE_M007_DOG_COME_RUNNING, 0, -1);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2828,7 +2828,7 @@ static void action(do_class* i_this) {
|
||||
(GXColor*)0, (cXyz*)0));
|
||||
}
|
||||
|
||||
i_this->mSound.startSound(JAISoundID(Z2SE_CM_BODYFALL_WATER_S), 0, -1);
|
||||
i_this->mSound.startSound(Z2SE_CM_BODYFALL_WATER_S, 0, -1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+81
-134
@@ -1,167 +1,114 @@
|
||||
//
|
||||
// Generated By: dol2asm
|
||||
// Translation Unit: d_a_econt
|
||||
//
|
||||
/**
|
||||
* d_a_econt.cpp
|
||||
* Encounter
|
||||
*/
|
||||
|
||||
#include "rel/d/a/d_a_econt/d_a_econt.h"
|
||||
#include "dol2asm.h"
|
||||
#include "dolphin/types.h"
|
||||
#include "d/d_procname.h"
|
||||
#include "d/d_timer.h"
|
||||
#include "f_pc/f_pc_executor.h"
|
||||
|
||||
//
|
||||
// Types:
|
||||
//
|
||||
|
||||
struct fopAc_ac_c {
|
||||
/* 80018B64 */ fopAc_ac_c();
|
||||
};
|
||||
|
||||
struct econt_class {};
|
||||
|
||||
struct dSv_info_c {
|
||||
/* 80035360 */ void isSwitch(int, int) const;
|
||||
};
|
||||
|
||||
//
|
||||
// Forward References:
|
||||
//
|
||||
|
||||
extern "C" static bool daEcont_Draw__FP11econt_class();
|
||||
extern "C" static void s_rd_sub__FPvPv();
|
||||
extern "C" static void rider_game__FP11econt_class();
|
||||
extern "C" static void daEcont_Execute__FP11econt_class();
|
||||
extern "C" static bool daEcont_IsDelete__FP11econt_class();
|
||||
extern "C" static void daEcont_Delete__FP11econt_class();
|
||||
extern "C" static void daEcont_Create__FP10fopAc_ac_c();
|
||||
extern "C" extern void* g_profile_ECONT[12];
|
||||
|
||||
//
|
||||
// External References:
|
||||
//
|
||||
|
||||
extern "C" void __ct__10fopAc_ac_cFv();
|
||||
extern "C" void fopAc_IsActor__FPv();
|
||||
extern "C" void fopAcM_delete__FP10fopAc_ac_c();
|
||||
extern "C" void fpcEx_Search__FPFPvPv_PvPv();
|
||||
extern "C" void dComIfG_TimerStart__Fis();
|
||||
extern "C" void dComIfG_TimerDeleteRequest__Fi();
|
||||
extern "C" void isSwitch__10dSv_info_cCFii();
|
||||
extern "C" void dTimer_createTimer__FlUlUcUcffff();
|
||||
extern "C" extern void* g_fopAc_Method[8];
|
||||
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
|
||||
extern "C" extern u8 g_dComIfG_gameInfo[122384];
|
||||
extern "C" extern u8 g_meter2_info[248];
|
||||
extern "C" extern u8 data_805197E0[4];
|
||||
|
||||
//
|
||||
// Declarations:
|
||||
//
|
||||
|
||||
/* 80519518-80519520 000078 0008+00 1/0 0/0 0/0 .text daEcont_Draw__FP11econt_class */
|
||||
static bool daEcont_Draw(econt_class* param_0) {
|
||||
return true;
|
||||
static int daEcont_Draw(econt_class* i_this) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 80519520-80519578 000080 0058+00 1/1 0/0 0/0 .text s_rd_sub__FPvPv */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
static asm void s_rd_sub(void* param_0, void* param_1) {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/d_a_econt/d_a_econt/s_rd_sub__FPvPv.s"
|
||||
static void* s_rd_sub(void* i_this, void* param_1) {
|
||||
if (fopAcM_IsActor(i_this) && fopAcM_GetName(i_this) == PROC_E_RD) {
|
||||
data_805197E0[0]++;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* 80519578-80519664 0000D8 00EC+00 1/1 0/0 0/0 .text rider_game__FP11econt_class */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
static asm void rider_game(econt_class* param_0) {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/d_a_econt/d_a_econt/rider_game__FP11econt_class.s"
|
||||
static void rider_game(econt_class* i_this) {
|
||||
if (dComIfGs_isSwitch(0x2e,fopAcM_GetRoomNo(i_this)) && i_dComIfGp_event_runCheck() == 0) {
|
||||
data_805197E0[0] = 0;
|
||||
i_fpcM_Search(s_rd_sub,i_this);
|
||||
|
||||
if (i_this->field_0x5b4 == 0) {
|
||||
if (i_this->field_0x5b8[0] == 0) {
|
||||
i_this->field_0x5b4 = 1;
|
||||
dMeter2Info_setMaxCount(data_805197E0[0]);
|
||||
dComIfG_TimerStart(8,0);
|
||||
}
|
||||
} else if (data_805197E0[0] == 0) {
|
||||
fopAcM_delete(i_this);
|
||||
return;
|
||||
}
|
||||
|
||||
dMeter2Info_setNowCount(data_805197E0[0]);
|
||||
}
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* 80519664-805196B4 0001C4 0050+00 1/0 0/0 0/0 .text daEcont_Execute__FP11econt_class */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
static asm void daEcont_Execute(econt_class* param_0) {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/d_a_econt/d_a_econt/daEcont_Execute__FP11econt_class.s"
|
||||
static int daEcont_Execute(econt_class* i_this) {
|
||||
for (int i = 0; i < 3; i++) {
|
||||
if (i_this->field_0x5b8[i] != 0) {
|
||||
i_this->field_0x5b8[i] -= 1;
|
||||
}
|
||||
}
|
||||
rider_game(i_this);
|
||||
return 1;
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* 805196B4-805196BC 000214 0008+00 1/0 0/0 0/0 .text daEcont_IsDelete__FP11econt_class
|
||||
*/
|
||||
static bool daEcont_IsDelete(econt_class* param_0) {
|
||||
return true;
|
||||
static int daEcont_IsDelete(econt_class* i_this) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* 805196BC-805196E4 00021C 0028+00 1/0 0/0 0/0 .text daEcont_Delete__FP11econt_class */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
static asm void daEcont_Delete(econt_class* param_0) {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/d_a_econt/d_a_econt/daEcont_Delete__FP11econt_class.s"
|
||||
static int daEcont_Delete(econt_class* i_this) {
|
||||
dComIfG_TimerDeleteRequest(8);
|
||||
return 1;
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 8051977C-80519780 000000 0004+00 1/1 0/0 0/0 .rodata @3870 */
|
||||
SECTION_RODATA static f32 const lit_3870 = 210.0f;
|
||||
COMPILER_STRIP_GATE(0x8051977C, &lit_3870);
|
||||
|
||||
/* 80519780-80519784 000004 0004+00 0/1 0/0 0/0 .rodata @3871 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3871 = 410.0f;
|
||||
COMPILER_STRIP_GATE(0x80519780, &lit_3871);
|
||||
#pragma pop
|
||||
|
||||
/* 80519784-80519788 000008 0004+00 0/1 0/0 0/0 .rodata @3872 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3872 = 32.0f;
|
||||
COMPILER_STRIP_GATE(0x80519784, &lit_3872);
|
||||
#pragma pop
|
||||
|
||||
/* 80519788-8051978C 00000C 0004+00 0/1 0/0 0/0 .rodata @3873 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3873 = 419.0f;
|
||||
COMPILER_STRIP_GATE(0x80519788, &lit_3873);
|
||||
#pragma pop
|
||||
|
||||
/* 805196E4-80519774 000244 0090+00 1/0 0/0 0/0 .text daEcont_Create__FP10fopAc_ac_c */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
static asm void daEcont_Create(fopAc_ac_c* param_0) {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/d_a_econt/d_a_econt/daEcont_Create__FP10fopAc_ac_c.s"
|
||||
static int daEcont_Create(fopAc_ac_c* i_this) {
|
||||
econt_class* encounter = (econt_class*)i_this;
|
||||
if (!fopAcM_CheckCondition(encounter, 8)) {
|
||||
new (encounter) econt_class();
|
||||
fopAcM_OnCondition(encounter, 8);
|
||||
}
|
||||
dTimer_createTimer(8,0x989298,2,0,210.0f,410.0f,32.0f,419.0f);
|
||||
encounter->field_0x5b8[0] = 0x14;
|
||||
return cPhs_COMPLEATE_e;
|
||||
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 8051978C-805197AC -00001 0020+00 1/0 0/0 0/0 .data l_daEcont_Method */
|
||||
SECTION_DATA static void* l_daEcont_Method[8] = {
|
||||
(void*)daEcont_Create__FP10fopAc_ac_c,
|
||||
(void*)daEcont_Delete__FP11econt_class,
|
||||
(void*)daEcont_Execute__FP11econt_class,
|
||||
(void*)daEcont_IsDelete__FP11econt_class,
|
||||
(void*)daEcont_Draw__FP11econt_class,
|
||||
(void*)NULL,
|
||||
(void*)NULL,
|
||||
(void*)NULL,
|
||||
static actor_method_class l_daEcont_Method = {
|
||||
(process_method_func)daEcont_Create,
|
||||
(process_method_func)daEcont_Delete,
|
||||
(process_method_func)daEcont_Execute,
|
||||
(process_method_func)daEcont_IsDelete,
|
||||
(process_method_func)daEcont_Draw
|
||||
};
|
||||
|
||||
/* 805197AC-805197DC -00001 0030+00 0/0 0/0 1/0 .data g_profile_ECONT */
|
||||
SECTION_DATA extern void* g_profile_ECONT[12] = {
|
||||
(void*)0xFFFFFFFD, (void*)0x0008FFFD,
|
||||
(void*)0x02E30000, (void*)&g_fpcLf_Method,
|
||||
(void*)0x000005C0, (void*)NULL,
|
||||
(void*)NULL, (void*)&g_fopAc_Method,
|
||||
(void*)0x009B0000, (void*)&l_daEcont_Method,
|
||||
(void*)0x00044000, (void*)NULL,
|
||||
extern actor_process_profile_definition g_profile_ECONT = {
|
||||
-3, // mLayerID
|
||||
8, // mListID
|
||||
-3, // mListPrio
|
||||
PROC_ECONT, // mProcName
|
||||
0, // padding
|
||||
&g_fpcLf_Method.mBase, // mSubMtd
|
||||
sizeof(econt_class), // mSize
|
||||
0, // mSizeOther
|
||||
0, // mParameters
|
||||
&g_fopAc_Method.base, // mSubMtd
|
||||
0x009B, // mPriority
|
||||
0, // padding
|
||||
0, // padding
|
||||
&l_daEcont_Method, // mSubMtd
|
||||
0x00044000, // mStatus
|
||||
0, // mActorType
|
||||
0, // mCullType
|
||||
0, // padding
|
||||
0 // padding
|
||||
};
|
||||
|
||||
@@ -1,183 +1,106 @@
|
||||
//
|
||||
// Generated By: dol2asm
|
||||
// Translation Unit: d_a_kytag07
|
||||
//
|
||||
/**
|
||||
* d_a_kytag07.cpp
|
||||
* Environment Tag 7
|
||||
*/
|
||||
|
||||
#include "rel/d/a/kytag/d_a_kytag07/d_a_kytag07.h"
|
||||
#include "dol2asm.h"
|
||||
#include "dolphin/types.h"
|
||||
|
||||
//
|
||||
// Types:
|
||||
//
|
||||
|
||||
struct kytag07_class {};
|
||||
|
||||
struct fopAc_ac_c {
|
||||
/* 80018B64 */ fopAc_ac_c();
|
||||
};
|
||||
|
||||
struct LIGHT_INFLUENCE {};
|
||||
|
||||
//
|
||||
// Forward References:
|
||||
//
|
||||
|
||||
extern "C" static bool daKytag07_Draw__FP13kytag07_class();
|
||||
extern "C" static void daKytag07_Execute__FP13kytag07_class();
|
||||
extern "C" static void daKytag07_IsDelete__FP13kytag07_class();
|
||||
extern "C" static void daKytag07_Delete__FP13kytag07_class();
|
||||
extern "C" static void daKytag07_Create__FP10fopAc_ac_c();
|
||||
extern "C" extern void* g_profile_KYTAG07[12];
|
||||
|
||||
//
|
||||
// External References:
|
||||
//
|
||||
|
||||
extern "C" void __ct__10fopAc_ac_cFv();
|
||||
extern "C" void fopAcM_delete__FP10fopAc_ac_c();
|
||||
extern "C" void fopOvlpM_IsDoingReq__Fv();
|
||||
extern "C" void dKy_plight_priority_set__FP15LIGHT_INFLUENCE();
|
||||
extern "C" void dKy_plight_cut__FP15LIGHT_INFLUENCE();
|
||||
extern "C" void cLib_addCalc__FPfffff();
|
||||
extern "C" extern void* g_fopAc_Method[8];
|
||||
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
|
||||
extern "C" extern u8 mStayNo__20dStage_roomControl_c[4];
|
||||
|
||||
//
|
||||
// Declarations:
|
||||
//
|
||||
#include "d/d_stage.h"
|
||||
#include "d/d_procname.h"
|
||||
#include "f_op/f_op_overlap_mng.h"
|
||||
|
||||
/* 8085A278-8085A280 000078 0008+00 1/0 0/0 0/0 .text daKytag07_Draw__FP13kytag07_class
|
||||
*/
|
||||
static bool daKytag07_Draw(kytag07_class* param_0) {
|
||||
return true;
|
||||
static int daKytag07_Draw(kytag07_class* param_0) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 8085A484-8085A488 000000 0004+00 2/2 0/0 0/0 .rodata @3754 */
|
||||
SECTION_RODATA static f32 const lit_3754 = 1.0f / 10.0f;
|
||||
COMPILER_STRIP_GATE(0x8085A484, &lit_3754);
|
||||
|
||||
/* 8085A488-8085A48C 000004 0004+00 0/2 0/0 0/0 .rodata @3755 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3755 = 1000.0f;
|
||||
COMPILER_STRIP_GATE(0x8085A488, &lit_3755);
|
||||
#pragma pop
|
||||
|
||||
/* 8085A48C-8085A490 000008 0004+00 0/1 0/0 0/0 .rodata @3756 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static u32 const lit_3756 = 0x3A83126F;
|
||||
COMPILER_STRIP_GATE(0x8085A48C, &lit_3756);
|
||||
#pragma pop
|
||||
|
||||
/* 8085A490-8085A494 00000C 0004+00 0/1 0/0 0/0 .rodata @3757 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static u8 const lit_3757[4] = {
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x8085A490, &lit_3757);
|
||||
#pragma pop
|
||||
|
||||
/* 8085A494-8085A498 000010 0004+00 0/1 0/0 0/0 .rodata @3758 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3758 = 0.25f;
|
||||
COMPILER_STRIP_GATE(0x8085A494, &lit_3758);
|
||||
#pragma pop
|
||||
|
||||
/* 8085A498-8085A49C 000014 0004+00 0/1 0/0 0/0 .rodata @3759 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3759 = 10000.0f;
|
||||
COMPILER_STRIP_GATE(0x8085A498, &lit_3759);
|
||||
#pragma pop
|
||||
|
||||
/* 8085A49C-8085A4A0 000018 0004+00 0/2 0/0 0/0 .rodata @3760 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3760 = 1.0f;
|
||||
COMPILER_STRIP_GATE(0x8085A49C, &lit_3760);
|
||||
#pragma pop
|
||||
|
||||
/* 8085A4A0-8085A4A4 00001C 0004+00 1/2 0/0 0/0 .rodata @3761 */
|
||||
SECTION_RODATA static f32 const lit_3761 = 1.0f / 100.0f;
|
||||
COMPILER_STRIP_GATE(0x8085A4A0, &lit_3761);
|
||||
|
||||
/* 8085A280-8085A334 000080 00B4+00 1/0 0/0 0/0 .text daKytag07_Execute__FP13kytag07_class */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
static asm void daKytag07_Execute(kytag07_class* param_0) {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/kytag/d_a_kytag07/d_a_kytag07/daKytag07_Execute__FP13kytag07_class.s"
|
||||
static int daKytag07_Execute(kytag07_class* i_this) {
|
||||
if (i_this->field_0x58c != 99) {
|
||||
cLib_addCalc(&i_this->mLightInfluence.mPow,i_this->field_0x588,0.1f,1000.0f,0.001f);
|
||||
} else {
|
||||
if (i_this->orig.roomNo != dStage_roomControl_c::getStayNo()) {
|
||||
cLib_addCalc(&i_this->mLightInfluence.mPow,0.0f,0.25f,10000.0f,1.0f);
|
||||
}
|
||||
|
||||
if (i_this->mLightInfluence.mPow <= 0.01f) {
|
||||
fopAcM_delete(i_this);
|
||||
}
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* 8085A334-8085A388 000134 0054+00 1/0 0/0 0/0 .text daKytag07_IsDelete__FP13kytag07_class */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
static asm void daKytag07_IsDelete(kytag07_class* param_0) {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/kytag/d_a_kytag07/d_a_kytag07/daKytag07_IsDelete__FP13kytag07_class.s"
|
||||
static int daKytag07_IsDelete(kytag07_class* i_this) {
|
||||
i_this->field_0x58c = 99;
|
||||
|
||||
if (i_this->mLightInfluence.mPow <= 0.01f) {
|
||||
return 1;
|
||||
} else {
|
||||
return fopOvlpM_IsDoingReq() == 1 ? 1 : 0;
|
||||
}
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* 8085A388-8085A3B0 000188 0028+00 1/0 0/0 0/0 .text daKytag07_Delete__FP13kytag07_class
|
||||
*/
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
static asm void daKytag07_Delete(kytag07_class* param_0) {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/kytag/d_a_kytag07/d_a_kytag07/daKytag07_Delete__FP13kytag07_class.s"
|
||||
static int daKytag07_Delete(kytag07_class* i_this) {
|
||||
dKy_plight_cut(&i_this->mLightInfluence);
|
||||
return 1;
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 8085A4A4-8085A4A8 000020 0004+00 0/1 0/0 0/0 .rodata @3807 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static u32 const lit_3807 = 0x2EDBE6FF;
|
||||
COMPILER_STRIP_GATE(0x8085A4A4, &lit_3807);
|
||||
#pragma pop
|
||||
|
||||
/* 8085A3B0-8085A47C 0001B0 00CC+00 1/0 0/0 0/0 .text daKytag07_Create__FP10fopAc_ac_c */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
static asm void daKytag07_Create(fopAc_ac_c* param_0) {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/kytag/d_a_kytag07/d_a_kytag07/daKytag07_Create__FP10fopAc_ac_c.s"
|
||||
static int daKytag07_Create(fopAc_ac_c* i_this) {
|
||||
kytag07_class* kytag07 = (kytag07_class*)i_this;
|
||||
|
||||
if (!fopAcM_CheckCondition(kytag07, 8)) {
|
||||
new (kytag07) kytag07_class();
|
||||
fopAcM_OnCondition(kytag07, 8);
|
||||
}
|
||||
|
||||
kytag07->mLightInfluence.mPosition = kytag07->current.pos;
|
||||
kytag07->mLightInfluence.mColor.r = fopAcM_GetParam(i_this) & 0xFF;
|
||||
kytag07->mLightInfluence.mColor.g = fopAcM_GetParam(i_this) >> 8 & 0xFF;
|
||||
kytag07->mLightInfluence.mColor.b = fopAcM_GetParam(i_this) >> 16 & 0xFF;
|
||||
kytag07->mLightInfluence.mPow = 1e-10;
|
||||
kytag07->mLightInfluence.mFluctuation = 1.0f;
|
||||
kytag07->field_0x588 = 1000.0f * kytag07->mScale.x;
|
||||
kytag07->field_0x58c = 0;
|
||||
|
||||
|
||||
dKy_plight_priority_set(&kytag07->mLightInfluence);
|
||||
return cPhs_COMPLEATE_e;
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 8085A4A8-8085A4C8 -00001 0020+00 1/0 0/0 0/0 .data l_daKytag07_Method */
|
||||
SECTION_DATA static void* l_daKytag07_Method[8] = {
|
||||
(void*)daKytag07_Create__FP10fopAc_ac_c,
|
||||
(void*)daKytag07_Delete__FP13kytag07_class,
|
||||
(void*)daKytag07_Execute__FP13kytag07_class,
|
||||
(void*)daKytag07_IsDelete__FP13kytag07_class,
|
||||
(void*)daKytag07_Draw__FP13kytag07_class,
|
||||
(void*)NULL,
|
||||
(void*)NULL,
|
||||
(void*)NULL,
|
||||
static actor_method_class l_daKytag07_Method = {
|
||||
(process_method_func)daKytag07_Create,
|
||||
(process_method_func)daKytag07_Delete,
|
||||
(process_method_func)daKytag07_Execute,
|
||||
(process_method_func)daKytag07_IsDelete,
|
||||
(process_method_func)daKytag07_Draw
|
||||
};
|
||||
|
||||
/* 8085A4C8-8085A4F8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_KYTAG07 */
|
||||
SECTION_DATA extern void* g_profile_KYTAG07[12] = {
|
||||
(void*)0xFFFFFFFD, (void*)0x0007FFFD,
|
||||
(void*)0x02B10000, (void*)&g_fpcLf_Method,
|
||||
(void*)0x00000590, (void*)NULL,
|
||||
(void*)NULL, (void*)&g_fopAc_Method,
|
||||
(void*)0x00650000, (void*)&l_daKytag07_Method,
|
||||
(void*)0x00044000, (void*)NULL,
|
||||
extern actor_process_profile_definition g_profile_KYTAG07 = {
|
||||
-3, // mLayerID
|
||||
7, // mListID
|
||||
-3, // mListPrio
|
||||
PROC_KYTAG07, // mProcName
|
||||
0, // padding
|
||||
&g_fpcLf_Method.mBase, // mSubMtd
|
||||
sizeof(kytag07_class), // mSize
|
||||
0, // mSizeOther
|
||||
0, // mParameters
|
||||
&g_fopAc_Method.base, // mSubMtd
|
||||
0x0065, // mPriority
|
||||
0, // padding
|
||||
0, // padding
|
||||
&l_daKytag07_Method, // mSubMtd
|
||||
0x00044000, // mStatus
|
||||
0, // mActorType
|
||||
0, // mCullType
|
||||
0, // padding
|
||||
0 // padding
|
||||
};
|
||||
|
||||
@@ -1,185 +1,77 @@
|
||||
//
|
||||
// Generated By: dol2asm
|
||||
// Translation Unit: d_a_obj_onsenFire
|
||||
//
|
||||
/**
|
||||
* d_a_obj_onsenFire.cpp
|
||||
* Object - Hotspring Fire
|
||||
*/
|
||||
|
||||
#include "rel/d/a/obj/d_a_obj_onsenFire/d_a_obj_onsenFire.h"
|
||||
#include "dol2asm.h"
|
||||
#include "dolphin/types.h"
|
||||
|
||||
//
|
||||
// Types:
|
||||
//
|
||||
|
||||
struct fopAc_ac_c {
|
||||
/* 80018B64 */ fopAc_ac_c();
|
||||
/* 80018C8C */ ~fopAc_ac_c();
|
||||
};
|
||||
|
||||
struct daObjOnsenFire_c {
|
||||
/* 80CA8278 */ void create();
|
||||
/* 80CA82F4 */ void execute();
|
||||
};
|
||||
|
||||
struct dSv_event_flag_c {
|
||||
static u8 saveBitLabels[1644 + 4 /* padding */];
|
||||
};
|
||||
|
||||
struct dSv_event_c {
|
||||
/* 800349BC */ void isEventBit(u16) const;
|
||||
};
|
||||
|
||||
struct dKy_tevstr_c {};
|
||||
|
||||
struct cXyz {};
|
||||
|
||||
struct _GXColor {};
|
||||
|
||||
struct dPa_control_c {
|
||||
/* 8004D1B8 */ void setSimple(u16, cXyz const*, dKy_tevstr_c const*, u8, _GXColor const&,
|
||||
_GXColor const&, int, f32);
|
||||
};
|
||||
|
||||
struct JAISoundID {};
|
||||
|
||||
struct Vec {};
|
||||
|
||||
struct Z2SeMgr {
|
||||
/* 802AC50C */ void seStartLevel(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
|
||||
};
|
||||
|
||||
struct Z2AudioMgr {
|
||||
static u8 mAudioMgrPtr[4 + 4 /* padding */];
|
||||
};
|
||||
|
||||
//
|
||||
// Forward References:
|
||||
//
|
||||
|
||||
extern "C" void create__16daObjOnsenFire_cFv();
|
||||
extern "C" void execute__16daObjOnsenFire_cFv();
|
||||
extern "C" static void daObjOnsenFire_Create__FP10fopAc_ac_c();
|
||||
extern "C" static void daObjOnsenFire_Execute__FP16daObjOnsenFire_c();
|
||||
extern "C" static void daObjOnsenFire_Delete__FP16daObjOnsenFire_c();
|
||||
extern "C" extern void* g_profile_OBJ_ONSEN_FIRE[12];
|
||||
|
||||
//
|
||||
// External References:
|
||||
//
|
||||
|
||||
extern "C" void __ct__10fopAc_ac_cFv();
|
||||
extern "C" void __dt__10fopAc_ac_cFv();
|
||||
extern "C" void isEventBit__11dSv_event_cCFUs();
|
||||
extern "C" void setSimple__13dPa_control_cFUsPC4cXyzPC12dKy_tevstr_cUcRC8_GXColorRC8_GXColorif();
|
||||
extern "C" void seStartLevel__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
|
||||
extern "C" void _savegpr_29();
|
||||
extern "C" void _restgpr_29();
|
||||
extern "C" extern void* g_fopAc_Method[8];
|
||||
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
|
||||
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
|
||||
extern "C" extern u8 g_dComIfG_gameInfo[122384];
|
||||
extern "C" extern u32 g_whiteColor;
|
||||
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
|
||||
|
||||
//
|
||||
// Declarations:
|
||||
//
|
||||
#include "d/d_procname.h"
|
||||
|
||||
/* 80CA8278-80CA82F4 000078 007C+00 1/1 0/0 0/0 .text create__16daObjOnsenFire_cFv */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void daObjOnsenFire_c::create() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/obj/d_a_obj_onsenFire/d_a_obj_onsenFire/create__16daObjOnsenFire_cFv.s"
|
||||
int daObjOnsenFire_c::create() {
|
||||
if (!fopAcM_CheckCondition(this, 8)) {
|
||||
new (this) daObjOnsenFire_c();
|
||||
fopAcM_OnCondition(this, 8);
|
||||
}
|
||||
if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[377]) == 0) {
|
||||
return cPhs_ERROR_e;
|
||||
}
|
||||
return cPhs_COMPLEATE_e;
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80CA8474-80CA8478 000000 0004+00 1/1 0/0 0/0 .rodata @3659 */
|
||||
SECTION_RODATA static u8 const lit_3659[4] = {
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
0x00,
|
||||
};
|
||||
COMPILER_STRIP_GATE(0x80CA8474, &lit_3659);
|
||||
|
||||
/* 80CA8478-80CA847C 000004 0004+00 0/1 0/0 0/0 .rodata @3660 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3660 = 1.0f;
|
||||
COMPILER_STRIP_GATE(0x80CA8478, &lit_3660);
|
||||
#pragma pop
|
||||
|
||||
/* 80CA847C-80CA8480 000008 0004+00 0/1 0/0 0/0 .rodata @3661 */
|
||||
#pragma push
|
||||
#pragma force_active on
|
||||
SECTION_RODATA static f32 const lit_3661 = -1.0f;
|
||||
COMPILER_STRIP_GATE(0x80CA847C, &lit_3661);
|
||||
#pragma pop
|
||||
|
||||
/* 80CA82F4-80CA83FC 0000F4 0108+00 1/1 0/0 0/0 .text execute__16daObjOnsenFire_cFv */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
asm void daObjOnsenFire_c::execute() {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/obj/d_a_obj_onsenFire/d_a_obj_onsenFire/execute__16daObjOnsenFire_cFv.s"
|
||||
int daObjOnsenFire_c::execute() {
|
||||
dComIfGp_particle_setSimple(0x100,¤t.pos,0xff,g_whiteColor,g_whiteColor,0,0.0f);
|
||||
dComIfGp_particle_setSimple(0x101,¤t.pos,0xff,g_whiteColor,g_whiteColor,0,0.0f);
|
||||
dComIfGp_particle_setSimple(0x103,¤t.pos,0xff,g_whiteColor,g_whiteColor,0,0.0f);
|
||||
Z2AudioMgr::getInterface()->mSeMgr.seStartLevel(Z2SE_OBJ_ONSEN_WARM_FIRE,¤t.pos,0,0,1.0f,1.0f,-1.0f,-1.0f,0);
|
||||
return 1;
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* 80CA83FC-80CA841C 0001FC 0020+00 1/0 0/0 0/0 .text daObjOnsenFire_Create__FP10fopAc_ac_c */
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
static asm void daObjOnsenFire_Create(fopAc_ac_c* param_0) {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/obj/d_a_obj_onsenFire/d_a_obj_onsenFire/daObjOnsenFire_Create__FP10fopAc_ac_c.s"
|
||||
static int daObjOnsenFire_Create(fopAc_ac_c* i_this) {
|
||||
return static_cast<daObjOnsenFire_c*>(i_this)->create();
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* 80CA841C-80CA843C 00021C 0020+00 1/0 0/0 0/0 .text daObjOnsenFire_Execute__FP16daObjOnsenFire_c
|
||||
*/
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
static asm void daObjOnsenFire_Execute(daObjOnsenFire_c* param_0) {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/obj/d_a_obj_onsenFire/d_a_obj_onsenFire/daObjOnsenFire_Execute__FP16daObjOnsenFire_c.s"
|
||||
static int daObjOnsenFire_Execute(daObjOnsenFire_c* i_this) {
|
||||
return i_this->execute();
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* 80CA843C-80CA846C 00023C 0030+00 1/0 0/0 0/0 .text daObjOnsenFire_Delete__FP16daObjOnsenFire_c
|
||||
*/
|
||||
#pragma push
|
||||
#pragma optimization_level 0
|
||||
#pragma optimizewithasm off
|
||||
static asm void daObjOnsenFire_Delete(daObjOnsenFire_c* param_0) {
|
||||
nofralloc
|
||||
#include "asm/rel/d/a/obj/d_a_obj_onsenFire/d_a_obj_onsenFire/daObjOnsenFire_Delete__FP16daObjOnsenFire_c.s"
|
||||
static int daObjOnsenFire_Delete(daObjOnsenFire_c* i_this) {
|
||||
i_this->~daObjOnsenFire_c();
|
||||
return 1;
|
||||
}
|
||||
#pragma pop
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80CA8480-80CA84A0 -00001 0020+00 1/0 0/0 0/0 .data l_daObjOnsenFire_Method */
|
||||
SECTION_DATA static void* l_daObjOnsenFire_Method[8] = {
|
||||
(void*)daObjOnsenFire_Create__FP10fopAc_ac_c,
|
||||
(void*)daObjOnsenFire_Delete__FP16daObjOnsenFire_c,
|
||||
(void*)daObjOnsenFire_Execute__FP16daObjOnsenFire_c,
|
||||
(void*)NULL,
|
||||
(void*)NULL,
|
||||
(void*)NULL,
|
||||
(void*)NULL,
|
||||
(void*)NULL,
|
||||
static actor_method_class l_daObjOnsenFire_Method = {
|
||||
(process_method_func)daObjOnsenFire_Create,
|
||||
(process_method_func)daObjOnsenFire_Delete,
|
||||
(process_method_func)daObjOnsenFire_Execute
|
||||
};
|
||||
|
||||
/* 80CA84A0-80CA84D0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_OBJ_ONSEN_FIRE */
|
||||
SECTION_DATA extern void* g_profile_OBJ_ONSEN_FIRE[12] = {
|
||||
(void*)0xFFFFFFFD, (void*)0x0003FFFD,
|
||||
(void*)0x008C0000, (void*)&g_fpcLf_Method,
|
||||
(void*)0x00000568, (void*)NULL,
|
||||
(void*)NULL, (void*)&g_fopAc_Method,
|
||||
(void*)0x02640000, (void*)&l_daObjOnsenFire_Method,
|
||||
(void*)0x00044000, (void*)0x000E0000,
|
||||
extern actor_process_profile_definition g_profile_OBJ_ONSEN_FIRE = {
|
||||
-3, // mLayerID
|
||||
3, // mListID
|
||||
-3, // mListPrio
|
||||
PROC_OBJ_ONSEN_FIRE, // mProcName
|
||||
0, // padding
|
||||
&g_fpcLf_Method.mBase, // mSubMtd
|
||||
sizeof(daObjOnsenFire_c), // mSize
|
||||
0, // mSizeOther
|
||||
0, // mParameters
|
||||
&g_fopAc_Method.base, // mSubMtd
|
||||
0x0264, // mPriority
|
||||
0, // padding
|
||||
0, // padding
|
||||
&l_daObjOnsenFire_Method, // mSubMtd
|
||||
0x00044000, // mStatus
|
||||
0, // mActorType
|
||||
0x0E, // mCullType
|
||||
0, // padding
|
||||
0, // padding
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user