mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-09-03 02:03:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_obj_cboard / finish f_op_actor / rels cleanup (#268)

Browse Source 
* d_a_obj_cboard / finish f_op_actor / clean up some rel files

* rename some actor vars / remove asm

* progress
This commit is contained in:
TakaRikka
2023-02-03 20:24:26 -08:00
committed by GitHub
parent f030d04b14
commit 0f1c727725
85 changed files with 1038 additions and 2328 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rel/d/a/b/d_a_b_go/d_a_b_go.cpp
+10 -11
View File
@@ -168,7 +168,6 @@ extern "C" void _savegpr_29();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern void* g_fopAc_Method[8];
extern "C" extern void* __vt__8dCcD_Sph[36];
extern "C" extern void* __vt__8dCcD_Cyl[36];
extern "C" extern void* __vt__9dCcD_Stts[11];
@@ -371,7 +370,7 @@ COMPILER_STRIP_GATE(0x80604064, &lit_3705);
// matches with literals
#ifdef NONMATCHING
static void h_wait(b_go_class* b_go) {
b_go->mSpeedF = 0.0f;
b_go->speedF = 0.0f;
switch (b_go->field_0x66c) {
case 0:
@@ -431,7 +430,7 @@ static void h_walk(b_go_class* b_go) {
break;
}
cLib_addCalc2(&b_go->mSpeedF, speed, 1.0f, 1.0f);
cLib_addCalc2(&b_go->speedF, speed, 1.0f, 1.0f);
cLib_addCalcAngleS2(&b_go->current.angle.y, b_go->mAngleToPlayer, 1, 0x200);
}
#else
@@ -449,7 +448,7 @@ static asm void h_walk(b_go_class* param_0) {
#ifdef NONMATCHING
static void h_attack(b_go_class* b_go) {
int frame = b_go->mpMorf->getFrame();
cLib_addCalc0(&b_go->mSpeedF, 1.0f, 1.0f);
cLib_addCalc0(&b_go->speedF, 1.0f, 1.0f);
switch (b_go->field_0x66c) {
case 0:
@@ -536,15 +535,15 @@ static void action(b_go_class* b_go) {
cXyz speed;
speed.x = 0.0f;
speed.y = 0.0f;
speed.z = b_go->mSpeedF;
speed.z = b_go->speedF;
cXyz newSpeed;
MtxPosition(&speed, &newSpeed);
b_go->mSpeed.x = newSpeed.x;
b_go->mSpeed.z = newSpeed.z;
b_go->speed.x = newSpeed.x;
b_go->speed.z = newSpeed.z;
PSVECAdd(&b_go->current.pos, &b_go->mSpeed, &b_go->current.pos);
b_go->mSpeed.y += b_go->mGravity;
PSVECAdd(&b_go->current.pos, &b_go->speed, &b_go->current.pos);
b_go->speed.y += b_go->mGravity;
b_go->mAcch.CrrPos(dComIfG_Bgsp());
}
@@ -581,7 +580,7 @@ static int daB_GO_Execute(b_go_class* b_go) {
mDoMtx_stack_c::YrotM(b_go->shape_angle.y);
mDoMtx_stack_c::scaleM((*(daB_GO_HIO_c*)l_HIO).mSmallSize, (*(daB_GO_HIO_c*)l_HIO).mSmallSize, (*(daB_GO_HIO_c*)l_HIO).mSmallSize);
mDoMtx_stack_c::copy(b_go->mpMorf->getModel()->getBaseTRMtx());
b_go->mpMorf->play(0, dComIfGp_getReverb(b_go->current.mRoomNo));
b_go->mpMorf->play(0, dComIfGp_getReverb(b_go->current.roomNo));
b_go->mpMorf->modelCalc();
return 1;
@@ -718,7 +717,7 @@ static int daB_GO_Create(fopAc_ac_c* i_actor) {
b_go->field_0x560 = 1000;
b_go->mAcch.Set(&b_go->current.pos, &b_go->next.pos, b_go, 1, &b_go->mAcchCir,
&b_go->mSpeed, NULL, NULL);
&b_go->speed, NULL, NULL);
b_go->mAcchCir.SetWall(100.0f, 300.0f);
b_go->mZ2Enemy.init(&b_go->current.pos, &b_go->mEyePos, 3, 1);
rel/d/a/b/d_a_b_oh2/d_a_b_oh2.cpp
+4 -6
View File
@@ -9,8 +9,6 @@
#include "c/c_damagereaction.h"
#include "d/d_procname.h"
extern "C" extern leafdraw_method_class g_fopAc_Method;
/* 8061DCB8-8061DDB0 000078 00F8+00 1/1 0/0 0/0 .text nodeCallBack__FP8J3DJointi */
static int nodeCallBack(J3DJoint* i_joint, int param_1) {
if (param_1 == 0) {
@@ -83,7 +81,7 @@ static void dmcalc(b_oh2_class* i_this) {
f32 var_f30 = 0.0f;
f32 var_f29 = -50000.0f;
if (boss->mSpeedF < var_f31) {
if (boss->speedF < var_f31) {
var_f29 = boss->field_0x47a0 + 100.0f;
var_f30 = -20.0f;
}
@@ -122,7 +120,7 @@ static void dmcalc(b_oh2_class* i_this) {
int temp_r6 = 0;
for (int i = 0; i < 30; i++, temp_r6 += -10000) {
if (boss->mSpeedF > 1.0f) {
if (boss->speedF > 1.0f) {
i_this->field_0x5e8[i] = i_this->field_0x5e0 + 1.0f +
(i_this->field_0x5e0 * cM_ssin(i_this->field_0x5dc + temp_r6));
} else {
@@ -164,7 +162,7 @@ static void action(b_oh2_class* i_this) {
int roomNo = fopAcM_GetRoomNo(i_this);
i_this->mpMorf->play(0, dComIfGp_getReverb(roomNo));
if (boss->mSpeedF <= 1.0f) {
if (boss->speedF <= 1.0f) {
i_this->mpBrk->setFrame(0.0f);
i_this->mpBtk->setFrame(0.0f);
} else {
@@ -324,7 +322,7 @@ extern actor_process_profile_definition g_profile_B_OH2 = {
sizeof(b_oh2_class),
0,
0,
&g_fopAc_Method,
&g_fopAc_Method.base,
0x00DB,
0,
0,
rel/d/a/d_a_alldie/d_a_alldie.cpp
+30 -32
View File
@@ -1,23 +1,11 @@
//
// Generated By: dol2asm
// Translation Unit: d_a_alldie
//
/**
* d_a_alldie.cpp
* Activates a switch when all enemies are defeated
*/
#include "rel/d/a/d_a_alldie/d_a_alldie.h"
#include "dol2asm.h"
#include "dolphin/types.h"
#include "d/com/d_com_inf_game.h"
//
// External References:
//
extern "C" extern void* g_fopAc_Method[8];
//
// Declarations:
//
/* 804D5818-804D5824 000078 000C+00 2/2 0/0 0/0 .text getEventNo__10daAlldie_cFv */
u8 daAlldie_c::getEventNo() {
return fopAcM_GetParam(this) >> 0x18;
@@ -212,23 +200,33 @@ static int daAlldie_Create(fopAc_ac_c* i_this) {
/* ############################################################################################## */
/* 804D5D24-804D5D44 -00001 0020+00 1/0 0/0 0/0 .data l_daAlldie_Method */
SECTION_DATA static void* l_daAlldie_Method[8] = {
(void*)daAlldie_Create,
(void*)daAlldie_Delete,
(void*)daAlldie_Execute,
(void*)daAlldie_IsDelete,
(void*)daAlldie_Draw,
(void*)NULL,
(void*)NULL,
(void*)NULL,
static actor_method_class l_daAlldie_Method = {
(process_method_func)daAlldie_Create,
(process_method_func)daAlldie_Delete,
(process_method_func)daAlldie_Execute,
(process_method_func)daAlldie_IsDelete,
(process_method_func)daAlldie_Draw,
};
/* 804D5D44-804D5D74 -00001 0030+00 0/0 0/0 1/0 .data g_profile_ALLDIE */
SECTION_DATA extern void* g_profile_ALLDIE[12] = {
(void*)0xFFFFFFFD, (void*)0x0002FFFD,
(void*)0x00140000, (void*)&g_fpcLf_Method,
(void*)0x00000574, (void*)NULL,
(void*)NULL, (void*)&g_fopAc_Method,
(void*)0x01160000, (void*)&l_daAlldie_Method,
(void*)0x00044000, (void*)0x00060000,
extern actor_process_profile_definition g_profile_ALLDIE = {
-3,
2,
0xFFFD,
PROC_ALLDIE,
0,
&g_fpcLf_Method.mBase,
sizeof(daAlldie_c),
0,
0,
&g_fopAc_Method.base,
0x0116,
0,
0,
&l_daAlldie_Method,
0x00044000,
0,
6,
0,
0,
};
rel/d/a/d_a_arrow/d_a_arrow.cpp
-1
View File
@@ -193,7 +193,6 @@ extern "C" void _restgpr_26();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern void* g_fopAc_Method[8];
extern "C" extern void* __vt__22dPa_hermiteEcallBack_c[9];
extern "C" extern void* __vt__8dCcD_Sph[36];
extern "C" extern void* __vt__8dCcD_Cps[36];
rel/d/a/d_a_bg/d_a_bg.cpp
+2 -3
View File
@@ -171,7 +171,6 @@ extern "C" void _restgpr_20();
extern "C" void _restgpr_26();
extern "C" void _restgpr_27();
extern "C" void _restgpr_29();
extern "C" extern void* g_fopAc_Method[8];
extern "C" extern void* __vt__14J3DMaterialAnm[4];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" u8 mClipper__14mDoLib_clipper[92];
@@ -995,8 +994,8 @@ int daBg_c::create() {
fopAcM_OnCondition(this, 8);
}
orig.mRoomNo = roomNo;
current.mRoomNo = roomNo;
orig.roomNo = roomNo;
current.roomNo = roomNo;
JKRExpHeap* heap = dStage_roomControl_c::getMemoryBlock(roomNo);
if (heap != NULL) {
rel/d/a/d_a_boomerang/d_a_boomerang.cpp
-1
View File
@@ -229,7 +229,6 @@ extern "C" void _restgpr_26();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern void* g_fopAc_Method[8];
extern "C" extern void* __vt__8dCcD_Cyl[36];
extern "C" extern void* __vt__8dCcD_Cps[36];
extern "C" extern void* __vt__9dCcD_Stts[11];
rel/d/a/d_a_canoe/d_a_canoe.cpp
-1
View File
@@ -169,7 +169,6 @@ extern "C" void _restgpr_26();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern void* g_fopAc_Method[8];
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern void* __vt__8dCcD_Cyl[36];
extern "C" extern void* __vt__9dCcD_Stts[11];
rel/d/a/d_a_crod/d_a_crod.cpp
-1
View File
@@ -112,7 +112,6 @@ extern "C" void _savegpr_27();
extern "C" void _savegpr_29();
extern "C" void _restgpr_27();
extern "C" void _restgpr_29();
extern "C" extern void* g_fopAc_Method[8];
extern "C" extern void* __vt__8dCcD_Cps[36];
extern "C" extern void* __vt__9dCcD_Stts[11];
extern "C" extern void* __vt__12cCcD_CpsAttr[25];
rel/d/a/d_a_cstatue/d_a_cstatue.cpp
-1
View File
@@ -181,7 +181,6 @@ extern "C" void _restgpr_23();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern void* g_fopAc_Method[8];
extern "C" extern void* __vt__8dCcD_Sph[36];
extern "C" extern void* __vt__8dCcD_Cyl[36];
extern "C" extern void* __vt__8dCcD_Cps[36];
rel/d/a/d_a_horse/d_a_horse.cpp
-1
View File
@@ -474,7 +474,6 @@ extern "C" u8 const m_handRightInSidePos__9daAlink_c[12];
extern "C" extern void* __vt__19mDoExt_3DlineMat1_c[5];
extern "C" extern void* __vt__28mDoExt_MtxCalcAnmBlendTblOld[11];
extern "C" extern void* __vt__25mDoExt_MtxCalcAnmBlendTbl[11];
extern "C" extern void* g_fopAc_Method[8];
extern "C" u8 m_typeFourData__8dPaPoF_c[60];
extern "C" u8 m_emitterFourData__8dPaPoF_c[60 + 28 /* padding */];
extern "C" extern void* __vt__8dCcD_Sph[36];
rel/d/a/d_a_movie_player/d_a_movie_player.cpp
-1
View File
@@ -250,7 +250,6 @@ extern "C" void _restgpr_27();
extern "C" void __div2i();
extern "C" void sprintf();
extern "C" void strcmp();
extern "C" extern void* g_fopAc_Method[8];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_clearColor[4];
extern "C" extern u8 mBlureFlag__13mDoGph_gInf_c[4];
rel/d/a/d_a_scene_exit/d_a_scene_exit.cpp
-1
View File
@@ -31,7 +31,6 @@ extern "C" void isSwitch__10dSv_info_cCFii();
extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc();
extern "C" void _savegpr_29();
extern "C" void _restgpr_29();
extern "C" extern void* g_fopAc_Method[8];
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
rel/d/a/d_a_set_bgobj/d_a_set_bgobj.cpp
+1 -3
View File
@@ -6,8 +6,6 @@
#include "rel/d/a/d_a_set_bgobj/d_a_set_bgobj.h"
#include "d/d_procname.h"
extern "C" extern leafdraw_method_class g_fopAc_Method;
/* 80485F00-80485F0C 000000 0009+03 1/1 0/0 0/0 .rodata l_specName */
static const char l_specName[] = "spec.dat";
@@ -78,7 +76,7 @@ extern actor_process_profile_definition g_profile_SET_BG_OBJ = {
sizeof(daSetBgObj_c),
0,
0,
&g_fopAc_Method,
&g_fopAc_Method.base,
0x02F2,
0,
0,
rel/d/a/d_a_skip_2D/d_a_skip_2D.cpp
+24 -27
View File
@@ -4,17 +4,6 @@
*/
#include "rel/d/a/d_a_skip_2D/d_a_skip_2D.h"
#include "dol2asm.h"
//
// External References:
//
extern "C" extern void* g_fopAc_Method[8];
//
// Declarations:
//
/* 80D4D478-80D4D498 000078 0020+00 1/1 0/0 0/0 .text daSkip2D_createHeap__FP10fopAc_ac_c
*/
@@ -97,23 +86,31 @@ static int daSkip2D_IsDelete(void*) {
/* ############################################################################################## */
/* 80D4D6DC-80D4D6FC -00001 0020+00 1/0 0/0 0/0 .data daSkip2D_MethodTable */
SECTION_DATA static void* daSkip2D_MethodTable[8] = {
(void*)daSkip2D_Create,
(void*)daSkip2D_Delete,
(void*)daSkip2D_Execute,
(void*)daSkip2D_IsDelete,
(void*)daSkip2D_Draw,
(void*)NULL,
(void*)NULL,
(void*)NULL,
static actor_method_class daSkip2D_MethodTable = {
(process_method_func)daSkip2D_Create, (process_method_func)daSkip2D_Delete,
(process_method_func)daSkip2D_Execute, (process_method_func)daSkip2D_IsDelete,
(process_method_func)daSkip2D_Draw,
};
/* 80D4D6FC-80D4D72C -00001 0030+00 0/0 0/0 1/0 .data g_profile_SKIP2D */
SECTION_DATA extern void* g_profile_SKIP2D[12] = {
(void*)0xFFFFFFFD, (void*)0x0003FFFD,
(void*)0x005B0000, (void*)&g_fpcLf_Method,
(void*)0x00000578, (void*)NULL,
(void*)NULL, (void*)&g_fopAc_Method,
(void*)0x03040000, (void*)&daSkip2D_MethodTable,
(void*)0x00040000, (void*)NULL,
extern actor_process_profile_definition g_profile_SKIP2D = {
-3,
3,
0xFFFD,
PROC_SKIP2D,
0000,
&g_fpcLf_Method.mBase,
sizeof(daSkip2D_c),
0,
0,
&g_fopAc_Method.base,
0x0304,
0,
0,
&daSkip2D_MethodTable,
0x00040000,
0,
0,
0,
0,
};
rel/d/a/d_a_swc00/d_a_swc00.cpp
-1
View File
@@ -62,7 +62,6 @@ extern "C" void getEventIdx__16dEvent_manager_cFP10fopAc_ac_cUc();
extern "C" void endCheck__16dEvent_manager_cFs();
extern "C" void __mi__4cXyzCFRC3Vec();
extern "C" void __ptmf_scall();
extern "C" extern void* g_fopAc_Method[8];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 data_805A1F28[4];
rel/d/a/d_a_tboxSw/d_a_tboxSw.cpp
+28 -32
View File
@@ -1,23 +1,11 @@
//
// Generated By: dol2asm
// Translation Unit: d_a_tboxSw
//
/**
* d_a_tboxSw.cpp
* Turns on a switch when a treasure chest is opened
*/
#include "rel/d/a/d_a_tboxSw/d_a_tboxSw.h"
#include "dol2asm.h"
#include "dolphin/types.h"
#include "d/com/d_com_inf_game.h"
//
// External References:
//
extern "C" extern void* g_fopAc_Method[8];
//
// Declarations:
//
/* 80D66858-80D66860 000078 0008+00 1/1 0/0 0/0 .text Create__10daTboxSw_cFv */
int daTboxSw_c::Create() {
return 1;
@@ -79,23 +67,31 @@ static int daTboxSw_Create(fopAc_ac_c* i_this) {
/* ############################################################################################## */
/* 80D669D0-80D669F0 -00001 0020+00 1/0 0/0 0/0 .data l_daTboxSw_Method */
SECTION_DATA static void* l_daTboxSw_Method[8] = {
(void*)daTboxSw_Create,
(void*)daTboxSw_Delete,
(void*)daTboxSw_Execute,
(void*)NULL,
(void*)daTboxSw_Draw,
(void*)NULL,
(void*)NULL,
(void*)NULL,
static actor_method_class l_daTboxSw_Method = {
(process_method_func)daTboxSw_Create, (process_method_func)daTboxSw_Delete,
(process_method_func)daTboxSw_Execute, (process_method_func)NULL,
(process_method_func)daTboxSw_Draw,
};
/* 80D669F0-80D66A20 -00001 0030+00 0/0 0/0 1/0 .data g_profile_TBOX_SW */
SECTION_DATA extern void* g_profile_TBOX_SW[12] = {
(void*)0xFFFFFFFD, (void*)0x0007FFFD,
(void*)0x016E0000, (void*)&g_fpcLf_Method,
(void*)0x00000568, (void*)NULL,
(void*)NULL, (void*)&g_fopAc_Method,
(void*)0x020E0000, (void*)&l_daTboxSw_Method,
(void*)0x00040100, (void*)0x000E0000,
extern actor_process_profile_definition g_profile_TBOX_SW = {
-3,
7,
0xFFFD,
PROC_TBOX_SW,
0000,
&g_fpcLf_Method.mBase,
sizeof(daTboxSw_c),
0,
0,
&g_fopAc_Method.base,
0x020E,
0,
0,
&l_daTboxSw_Method,
0x00040100,
0,
14,
0,
0,
};
rel/d/a/e/d_a_e_wb/d_a_e_wb.cpp
-1
View File
@@ -351,7 +351,6 @@ extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern void* __vt__19mDoExt_3DlineMat1_c[5];
extern "C" extern void* g_fopAc_Method[8];
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern void* __vt__8dCcD_Sph[36];
extern "C" extern void* __vt__9dCcD_Stts[11];
rel/d/a/kytag/d_a_kytag05/d_a_kytag05.cpp
+38 -53
View File
@@ -1,64 +1,41 @@
//
// Generated By: dol2asm
// Translation Unit: d_a_kytag05
//
/**
* d_a_kytag05.cpp
*
*/
#include "rel/d/a/kytag/d_a_kytag05/d_a_kytag05.h"
#include "dol2asm.h"
#include "dolphin/types.h"
#include "d/d_procname.h"
#include "f_op/f_op_actor_mng.h"
//
// Forward References:
//
extern "C" static bool daKytag05_Draw__FP13kytag05_class();
extern "C" static bool daKytag05_Execute__FP13kytag05_class();
extern "C" static bool daKytag05_IsDelete__FP13kytag05_class();
extern "C" static bool daKytag05_Delete__FP13kytag05_class();
extern "C" static void daKytag05_Create__FP10fopAc_ac_c();
extern "C" extern void* g_profile_KYTAG05[12];
//
// External References:
//
extern "C" void __ct__10fopAc_ac_cFv();
extern "C" extern void* g_fopAc_Method[8];
//
// Declarations:
//
/* 80528A58-80528A60 000078 0008+00 1/0 0/0 0/0 .text daKytag05_Draw__FP13kytag05_class
*/
static int daKytag05_Draw(kytag05_class* ac) {
static int daKytag05_Draw(kytag05_class* i_this) {
return 1;
}
/* 80528A60-80528A68 000080 0008+00 1/0 0/0 0/0 .text daKytag05_Execute__FP13kytag05_class */
static int daKytag05_Execute(kytag05_class* ac) {
static int daKytag05_Execute(kytag05_class* i_this) {
return 1;
}
/* 80528A68-80528A70 000088 0008+00 1/0 0/0 0/0 .text daKytag05_IsDelete__FP13kytag05_class */
static int daKytag05_IsDelete(kytag05_class* ac) {
static int daKytag05_IsDelete(kytag05_class* i_this) {
return 1;
}
/* 80528A70-80528A78 000090 0008+00 1/0 0/0 0/0 .text daKytag05_Delete__FP13kytag05_class
*/
static int daKytag05_Delete(kytag05_class* ac) {
static int daKytag05_Delete(kytag05_class* i_this) {
return 1;
}
/* 80528A78-80528B10 000098 0098+00 1/0 0/0 0/0 .text daKytag05_Create__FP10fopAc_ac_c */
static int daKytag05_Create(fopAc_ac_c* ac) {
if (!fopAcM_CheckCondition(ac, 8)) {
new (ac) kytag05_class();
fopAcM_OnCondition(ac, 8);
static int daKytag05_Create(fopAc_ac_c* i_this) {
if (!fopAcM_CheckCondition(i_this, 8)) {
new (i_this) kytag05_class();
fopAcM_OnCondition(i_this, 8);
}
kytag05_class* tag = static_cast<kytag05_class*>(ac);
kytag05_class* tag = static_cast<kytag05_class*>(i_this);
tag->field_0x56c = fopAcM_GetParam(tag) >> 8;
tag->mSceneListID = fopAcM_GetParam(tag);
@@ -73,23 +50,31 @@ static int daKytag05_Create(fopAc_ac_c* ac) {
/* ############################################################################################## */
/* 80528B1C-80528B3C -00001 0020+00 1/0 0/0 0/0 .data l_daKytag05_Method */
SECTION_DATA static void* l_daKytag05_Method[8] = {
(void*)daKytag05_Create__FP10fopAc_ac_c,
(void*)daKytag05_Delete__FP13kytag05_class,
(void*)daKytag05_Execute__FP13kytag05_class,
(void*)daKytag05_IsDelete__FP13kytag05_class,
(void*)daKytag05_Draw__FP13kytag05_class,
(void*)NULL,
(void*)NULL,
(void*)NULL,
static actor_method_class l_daKytag05_Method = {
(process_method_func)daKytag05_Create, (process_method_func)daKytag05_Delete,
(process_method_func)daKytag05_Execute, (process_method_func)daKytag05_IsDelete,
(process_method_func)daKytag05_Draw,
};
/* 80528B3C-80528B6C -00001 0030+00 0/0 0/0 1/0 .data g_profile_KYTAG05 */
SECTION_DATA extern void* g_profile_KYTAG05[12] = {
(void*)0xFFFFFFFD, (void*)0x0007FFFD,
(void*)0x02AF0000, (void*)&g_fpcLf_Method,
(void*)0x00000570, (void*)NULL,
(void*)NULL, (void*)&g_fopAc_Method,
(void*)0x00630000, (void*)&l_daKytag05_Method,
(void*)0x00044000, (void*)NULL,
extern actor_process_profile_definition g_profile_KYTAG05 = {
-3,
7,
0xFFFD,
PROC_KYTAG05,
0000,
&g_fpcLf_Method.mBase,
sizeof(kytag05_class),
0,
0,
&g_fopAc_Method.base,
0x0063,
0,
0,
&l_daKytag05_Method,
0x00044000,
0,
0,
0,
0,
};
rel/d/a/kytag/d_a_kytag14/d_a_kytag14.cpp
+28 -30
View File
@@ -6,17 +6,6 @@
#include "rel/d/a/kytag/d_a_kytag14/d_a_kytag14.h"
#include "d/com/d_com_inf_game.h"
#include "dol2asm.h"
//
// External References:
//
extern "C" extern void* g_fopAc_Method[8];
//
// Declarations:
//
/* 80529998-805299A0 000078 0008+00 1/0 0/0 0/0 .text daKytag14_Draw__FP13kytag14_class
*/
@@ -69,7 +58,8 @@ static int daKytag14_Execute(kytag14_class* i_this) {
}
}
if (event1_set == true && event2_unset == true && switch1_set == true && switch2_unset == true) {
if (event1_set == true && event2_unset == true && switch1_set == true && switch2_unset == true)
{
g_dComIfG_gameInfo.info.getPlayer().getPlayerReturnPlace().set(
dComIfGp_getStartStageName(), i_this->mSaveRoomNo, i_this->mSavePoint);
}
@@ -103,8 +93,8 @@ static int daKytag14_Create(fopAc_ac_c* i_this) {
kytag->mSwitchNo1 = kytag->current.angle.z;
kytag->mSwitchNo2 = (kytag->current.angle.z >> 8) & 0xFF;
if (kytag->orig.mRoomNo != -1) {
kytag->mSaveRoomNo = kytag->orig.mRoomNo;
if (kytag->orig.roomNo != -1) {
kytag->mSaveRoomNo = kytag->orig.roomNo;
}
return cPhs_COMPLEATE_e;
@@ -112,23 +102,31 @@ static int daKytag14_Create(fopAc_ac_c* i_this) {
/* ############################################################################################## */
/* 80529BE8-80529C08 -00001 0020+00 1/0 0/0 0/0 .data l_daKytag14_Method */
SECTION_DATA static void* l_daKytag14_Method[8] = {
(void*)daKytag14_Create,
(void*)daKytag14_Delete,
(void*)daKytag14_Execute,
(void*)daKytag14_IsDelete,
(void*)daKytag14_Draw,
(void*)NULL,
(void*)NULL,
(void*)NULL,
static actor_method_class l_daKytag14_Method = {
(process_method_func)daKytag14_Create, (process_method_func)daKytag14_Delete,
(process_method_func)daKytag14_Execute, (process_method_func)daKytag14_IsDelete,
(process_method_func)daKytag14_Draw,
};
/* 80529C08-80529C38 -00001 0030+00 0/0 0/0 1/0 .data g_profile_KYTAG14 */
SECTION_DATA extern void* g_profile_KYTAG14[12] = {
(void*)0xFFFFFFFD, (void*)0x0007FFFD,
(void*)0x02B80000, (void*)&g_fpcLf_Method,
(void*)0x00000570, (void*)NULL,
(void*)NULL, (void*)&g_fopAc_Method,
(void*)0x006C0000, (void*)&l_daKytag14_Method,
(void*)0x00044000, (void*)NULL,
extern actor_process_profile_definition g_profile_KYTAG14 = {
-3,
7,
0xFFFD,
PROC_KYTAG14,
0,
&g_fpcLf_Method.mBase,
sizeof(kytag14_class),
0,
0,
&g_fopAc_Method.base,
0x006C,
0,
0,
&l_daKytag14_Method,
0x00044000,
0,
0,
0,
0,
};
rel/d/a/npc/d_a_npc_tr/d_a_npc_tr.cpp
+1 -2
View File
@@ -98,7 +98,6 @@ extern "C" void MtxPosition__FP4cXyzP4cXyz();
extern "C" void __dl__FPv();
extern "C" void _savegpr_28();
extern "C" void _restgpr_28();
extern "C" extern void* g_fopAc_Method[8];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" u8 mCurrentMtx__6J3DSys[48];
extern "C" u8 sincosTable___5JMath[65536];
@@ -446,7 +445,7 @@ static void npc_tr_move(npc_tr_class* npc_tr) {
}
cLib_addCalc2(&npc_tr->field_0x5f8, var_f1_2, 0.5f, 1000.0f);
cLib_addCalc2(&npc_tr->mSpeedF, npc_tr->field_0x5e4 * l_HIO.field_0xc, 1.0f, var_f31);
cLib_addCalc2(&npc_tr->speedF, npc_tr->field_0x5e4 * l_HIO.field_0xc, 1.0f, var_f31);
}
#else
#pragma push
rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.cpp
-1
View File
@@ -413,7 +413,6 @@ extern "C" void _restgpr_26();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern void* g_fopAc_Method[8];
extern "C" extern u8 ZeroQuat[16];
extern "C" extern void* __vt__8dCcD_Sph[36];
extern "C" extern void* __vt__8dCcD_Cyl[36];
rel/d/a/obj/d_a_obj_catdoor/d_a_obj_catdoor.cpp
-1
View File
@@ -184,7 +184,6 @@ extern "C" void _savegpr_25();
extern "C" void _savegpr_29();
extern "C" void _restgpr_25();
extern "C" void _restgpr_29();
extern "C" extern void* g_fopAc_Method[8];
extern "C" extern void* __vt__4dBgW[65];
extern "C" u8 now__14mDoMtx_stack_c[48];
rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.cpp
+149 -286
View File
@@ -1,335 +1,198 @@
//
// Generated By: dol2asm
// Translation Unit: d_a_obj_cboard
//
/**
* d_a_obj_cboard.cpp
* Clear (Invisible) Wall
*/
#include "rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.h"
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct request_of_phase_process_class {};
struct csXyz {};
struct cXyz {};
struct mDoMtx_stack_c {
/* 8000CD64 */ void transS(cXyz const&);
/* 8000CE70 */ void scaleM(cXyz const&);
/* 8000CF44 */ void ZXYrotM(csXyz const&);
static u8 now[48];
};
struct fopAc_ac_c {};
struct daObjBoard_c {
/* 8057B958 */ void initBaseMtx();
/* 8057B978 */ void setBaseMtx();
/* 8057B9C8 */ void Create();
/* 8057BA70 */ bool CreateHeap();
/* 8057BA78 */ void create1st();
/* 8057BB74 */ void Execute(f32 (**)[3][4]);
/* 8057BCC0 */ bool Draw();
/* 8057BCC8 */ void Delete();
};
struct dSv_info_c {
/* 80035360 */ void isSwitch(int, int) const;
};
struct dRes_control_c {
/* 8003C6B8 */ void getObjectResName2Index(char const*, char const*);
};
struct dBgW_Base {};
struct dBgW {};
struct cBgS_PolyInfo {};
struct dBgS_MoveBgActor {
/* 80078624 */ dBgS_MoveBgActor();
/* 800786B0 */ bool IsDelete();
/* 800786B8 */ bool ToFore();
/* 800786C0 */ bool ToBack();
/* 800787BC */ void MoveBGCreate(char const*, int,
void (*)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*,
csXyz*, csXyz*),
u32, f32 (*)[3][4]);
/* 800788DC */ void MoveBGDelete();
/* 80078950 */ void MoveBGExecute();
};
struct dBgS {
/* 80074A08 */ void Regist(dBgW_Base*, fopAc_ac_c*);
};
struct cBgW_BgId {
/* 802681D4 */ void ChkUsed() const;
};
struct cBgS {
/* 80074250 */ void Release(dBgW_Base*);
};
//
// Forward References:
//
extern "C" void initBaseMtx__12daObjBoard_cFv();
extern "C" void setBaseMtx__12daObjBoard_cFv();
extern "C" void Create__12daObjBoard_cFv();
extern "C" bool CreateHeap__12daObjBoard_cFv();
extern "C" void create1st__12daObjBoard_cFv();
extern "C" void Execute__12daObjBoard_cFPPA3_A4_f();
extern "C" bool Draw__12daObjBoard_cFv();
extern "C" void Delete__12daObjBoard_cFv();
extern "C" static void daObjBoard_create1st__FP12daObjBoard_c();
extern "C" static void daObjBoard_MoveBGDelete__FP12daObjBoard_c();
extern "C" static void daObjBoard_MoveBGExecute__FP12daObjBoard_c();
extern "C" static void daObjBoard_MoveBGDraw__FP12daObjBoard_c();
extern "C" extern char const* const d_a_obj_cboard__stringBase0;
//
// External References:
//
extern "C" void transS__14mDoMtx_stack_cFRC4cXyz();
extern "C" void scaleM__14mDoMtx_stack_cFRC4cXyz();
extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz();
extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff();
extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc();
extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc();
extern "C" void isSwitch__10dSv_info_cCFii();
extern "C" void getObjectResName2Index__14dRes_control_cFPCcPCc();
extern "C" void Release__4cBgSFP9dBgW_Base();
extern "C" void Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c();
extern "C" void __ct__16dBgS_MoveBgActorFv();
extern "C" bool IsDelete__16dBgS_MoveBgActorFv();
extern "C" bool ToFore__16dBgS_MoveBgActorFv();
extern "C" bool ToBack__16dBgS_MoveBgActorFv();
extern "C" void
MoveBGCreate__16dBgS_MoveBgActorFPCciPFP4dBgWPvRC13cBgS_PolyInfobP4cXyzP5csXyzP5csXyz_vUlPA3_A4_f();
extern "C" void MoveBGDelete__16dBgS_MoveBgActorFv();
extern "C" void MoveBGExecute__16dBgS_MoveBgActorFv();
extern "C" void ChkUsed__9cBgW_BgIdCFv();
extern "C" void PSMTXCopy();
extern "C" extern void* g_fopAc_Method[8];
extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
//
// Declarations:
//
/* 8057B958-8057B978 000078 0020+00 1/1 0/0 0/0 .text initBaseMtx__12daObjBoard_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daObjBoard_c::initBaseMtx() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard/initBaseMtx__12daObjBoard_cFv.s"
void daObjBoard_c::initBaseMtx() {
setBaseMtx();
}
#pragma pop
/* 8057B978-8057B9C8 000098 0050+00 1/1 0/0 0/0 .text setBaseMtx__12daObjBoard_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daObjBoard_c::setBaseMtx() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard/setBaseMtx__12daObjBoard_cFv.s"
void daObjBoard_c::setBaseMtx() {
mDoMtx_stack_c::transS(current.pos);
mDoMtx_stack_c::ZXYrotM(shape_angle);
mDoMtx_stack_c::scaleM(mScale);
PSMTXCopy(mDoMtx_stack_c::get(), field_0x56c);
}
#pragma pop
/* ############################################################################################## */
/* 8057BDD0-8057BDD4 000000 0004+00 1/1 0/0 0/0 .rodata @3636 */
SECTION_RODATA static f32 const lit_3636 = 10.0f;
COMPILER_STRIP_GATE(0x8057BDD0, &lit_3636);
/* 8057BDD4-8057BDD4 000004 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_8057BDD4 = "Obj_Board";
SECTION_DEAD static char const* const stringBase_8057BDDE = "ClearB00.dzb";
SECTION_DEAD static char const* const stringBase_8057BDEB = "ClearB01.dzb";
SECTION_DEAD static char const* const stringBase_8057BDF8 = "ClearB02.dzb";
SECTION_DEAD static char const* const stringBase_8057BE05 = "ClearB03.dzb";
SECTION_DEAD static char const* const stringBase_8057BE12 = "ClearB04.dzb";
#pragma pop
/* 8057BE20-8057BE24 -00001 0004+00 2/2 0/0 0/0 .data l_arcName */
SECTION_DATA static void* l_arcName = (void*)&d_a_obj_cboard__stringBase0;
static char* l_arcName = "Obj_Board";
/* 8057BE24-8057BE38 -00001 0014+00 1/1 0/0 0/0 .data l_dzbName */
SECTION_DATA static void* l_dzbName[5] = {
(void*)(((char*)&d_a_obj_cboard__stringBase0) + 0xA),
(void*)(((char*)&d_a_obj_cboard__stringBase0) + 0x17),
(void*)(((char*)&d_a_obj_cboard__stringBase0) + 0x24),
(void*)(((char*)&d_a_obj_cboard__stringBase0) + 0x31),
(void*)(((char*)&d_a_obj_cboard__stringBase0) + 0x3E),
static char* l_dzbName[5] = {
"ClearB00.dzb", "ClearB01.dzb", "ClearB02.dzb", "ClearB03.dzb", "ClearB04.dzb",
};
/* 8057BE38-8057BE50 000018 0018+00 1/1 0/0 0/0 .data l_cull_box */
SECTION_DATA static u8 l_cull_box[24] = {
0xC2, 0xC8, 0x00, 0x00, 0xC1, 0x20, 0x00, 0x00, 0xC2, 0xC8, 0x00, 0x00,
0x42, 0xC8, 0x00, 0x00, 0x41, 0x20, 0x00, 0x00, 0x42, 0xC8, 0x00, 0x00,
static Vec l_cull_box[2] = {
{-100.0f, -10.0f, -100.0f},
{100.0f, 10.0f, 100.0f},
};
/* 8057B9C8-8057BA70 0000E8 00A8+00 1/0 0/0 0/0 .text Create__12daObjBoard_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daObjBoard_c::Create() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard/Create__12daObjBoard_cFv.s"
int daObjBoard_c::Create() {
if (getNameArg() == 1) {
mScale.x *= 10.0f;
mScale.z *= 10.0f;
}
initBaseMtx();
fopAcM_SetMtx(this, field_0x5a8);
fopAcM_setCullSizeBox(this, l_cull_box[0].x * mScale.x, l_cull_box[0].y,
l_cull_box[0].z * mScale.z, l_cull_box[1].x * mScale.x, l_cull_box[1].y,
l_cull_box[1].z * mScale.z);
return 1;
}
#pragma pop
/* 8057BA70-8057BA78 000190 0008+00 1/0 0/0 0/0 .text CreateHeap__12daObjBoard_cFv */
bool daObjBoard_c::CreateHeap() {
return true;
int daObjBoard_c::CreateHeap() {
return 1;
}
/* 8057BA78-8057BB74 000198 00FC+00 1/1 0/0 0/0 .text create1st__12daObjBoard_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daObjBoard_c::create1st() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard/create1st__12daObjBoard_cFv.s"
}
#pragma pop
int daObjBoard_c::create1st() {
int ret = dComIfG_resLoad(&mPhase, l_arcName);
if (ret == cPhs_COMPLEATE_e) {
int dzb_no;
/* ############################################################################################## */
/* 8057BE50-8057BE90 -00001 0040+00 1/1 0/0 0/0 .data @3712 */
SECTION_DATA static void* lit_3712[16] = {
(void*)(((char*)Execute__12daObjBoard_cFPPA3_A4_f) + 0xB8),
(void*)(((char*)Execute__12daObjBoard_cFPPA3_A4_f) + 0x44),
(void*)(((char*)Execute__12daObjBoard_cFPPA3_A4_f) + 0xB8),
(void*)(((char*)Execute__12daObjBoard_cFPPA3_A4_f) + 0x44),
(void*)(((char*)Execute__12daObjBoard_cFPPA3_A4_f) + 0xB8),
(void*)(((char*)Execute__12daObjBoard_cFPPA3_A4_f) + 0x44),
(void*)(((char*)Execute__12daObjBoard_cFPPA3_A4_f) + 0xB8),
(void*)(((char*)Execute__12daObjBoard_cFPPA3_A4_f) + 0x44),
(void*)(((char*)Execute__12daObjBoard_cFPPA3_A4_f) + 0xB8),
(void*)(((char*)Execute__12daObjBoard_cFPPA3_A4_f) + 0x128),
(void*)(((char*)Execute__12daObjBoard_cFPPA3_A4_f) + 0x128),
(void*)(((char*)Execute__12daObjBoard_cFPPA3_A4_f) + 0x128),
(void*)(((char*)Execute__12daObjBoard_cFPPA3_A4_f) + 0x128),
(void*)(((char*)Execute__12daObjBoard_cFPPA3_A4_f) + 0x128),
(void*)(((char*)Execute__12daObjBoard_cFPPA3_A4_f) + 0x128),
(void*)(((char*)Execute__12daObjBoard_cFPPA3_A4_f) + 0x44),
};
switch (getArg0()) {
case 1:
case 2:
dzb_no = 1;
break;
case 3:
case 4:
dzb_no = 2;
break;
case 5:
case 6:
case 7:
case 8:
dzb_no = 4;
break;
default:
dzb_no = 0;
break;
}
int dzb_id = dComIfG_getObjctResName2Index(l_arcName, l_dzbName[dzb_no]);
ret = MoveBGCreate(l_arcName, dzb_id, NULL, 0x200, NULL);
if (ret == cPhs_ERROR_e) {
return ret;
}
}
return ret;
}
/* 8057BB74-8057BCC0 000294 014C+00 2/0 0/0 0/0 .text Execute__12daObjBoard_cFPPA3_A4_f
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daObjBoard_c::Execute(f32 (**param_0)[3][4]) {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard/Execute__12daObjBoard_cFPPA3_A4_f.s"
int daObjBoard_c::Execute(Mtx** param_0) {
switch (getArg0()) {
case 1:
case 3:
case 5:
case 7:
case 15:
if (i_fopAcM_isSwitch(this, getSwNo())) {
if (!field_0x568->ChkUsed()) {
dComIfG_Bgsp().Regist(field_0x568, this);
}
} else {
if (field_0x568->ChkUsed()) {
dComIfG_Bgsp().Release(field_0x568);
}
}
break;
case 0:
case 2:
case 4:
case 6:
case 8:
if (i_fopAcM_isSwitch(this, getSwNo())) {
if (field_0x568->ChkUsed()) {
dComIfG_Bgsp().Release(field_0x568);
}
} else {
if (!field_0x568->ChkUsed()) {
dComIfG_Bgsp().Regist(field_0x568, this);
}
}
break;
}
*param_0 = &field_0x56c;
return 1;
}
#pragma pop
/* 8057BCC0-8057BCC8 0003E0 0008+00 1/0 0/0 0/0 .text Draw__12daObjBoard_cFv */
bool daObjBoard_c::Draw() {
return true;
int daObjBoard_c::Draw() {
return 1;
}
/* 8057BCC8-8057BCFC 0003E8 0034+00 1/0 0/0 0/0 .text Delete__12daObjBoard_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daObjBoard_c::Delete() {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard/Delete__12daObjBoard_cFv.s"
int daObjBoard_c::Delete() {
dComIfG_resDelete(&mPhase, l_arcName);
return 1;
}
#pragma pop
/* ############################################################################################## */
/* 8057BE90-8057BEB0 -00001 0020+00 1/0 0/0 0/0 .data daObjBoard_METHODS */
SECTION_DATA static void* daObjBoard_METHODS[8] = {
(void*)daObjBoard_create1st__FP12daObjBoard_c,
(void*)daObjBoard_MoveBGDelete__FP12daObjBoard_c,
(void*)daObjBoard_MoveBGExecute__FP12daObjBoard_c,
(void*)NULL,
(void*)daObjBoard_MoveBGDraw__FP12daObjBoard_c,
(void*)NULL,
(void*)NULL,
(void*)NULL,
};
/* 8057BEB0-8057BEE0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Cboard */
SECTION_DATA extern void* g_profile_Obj_Cboard[12] = {
(void*)0xFFFFFFFD, (void*)0x0003FFFD,
(void*)0x00630000, (void*)&g_fpcLf_Method,
(void*)0x000005D8, (void*)NULL,
(void*)NULL, (void*)&g_fopAc_Method,
(void*)0x01C50000, (void*)&daObjBoard_METHODS,
(void*)0x00040000, (void*)0x000E0000,
};
/* 8057BEE0-8057BF08 0000C0 0028+00 1/1 0/0 0/0 .data __vt__12daObjBoard_c */
SECTION_DATA extern void* __vt__12daObjBoard_c[10] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)CreateHeap__12daObjBoard_cFv,
(void*)Create__12daObjBoard_cFv,
(void*)Execute__12daObjBoard_cFPPA3_A4_f,
(void*)Draw__12daObjBoard_cFv,
(void*)Delete__12daObjBoard_cFv,
(void*)IsDelete__16dBgS_MoveBgActorFv,
(void*)ToFore__16dBgS_MoveBgActorFv,
(void*)ToBack__16dBgS_MoveBgActorFv,
};
/* 8057BCFC-8057BD5C 00041C 0060+00 1/0 0/0 0/0 .text daObjBoard_create1st__FP12daObjBoard_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daObjBoard_create1st(daObjBoard_c* param_0) {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard/daObjBoard_create1st__FP12daObjBoard_c.s"
static int daObjBoard_create1st(daObjBoard_c* i_this) {
if (!fopAcM_CheckCondition(i_this, 8)) {
new (i_this) daObjBoard_c();
fopAcM_OnCondition(i_this, 8);
}
return i_this->create1st();
}
#pragma pop
/* 8057BD5C-8057BD7C 00047C 0020+00 1/0 0/0 0/0 .text daObjBoard_MoveBGDelete__FP12daObjBoard_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daObjBoard_MoveBGDelete(daObjBoard_c* param_0) {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard/daObjBoard_MoveBGDelete__FP12daObjBoard_c.s"
static int daObjBoard_MoveBGDelete(daObjBoard_c* i_this) {
return i_this->MoveBGDelete();
}
#pragma pop
/* 8057BD7C-8057BD9C 00049C 0020+00 1/0 0/0 0/0 .text daObjBoard_MoveBGExecute__FP12daObjBoard_c
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daObjBoard_MoveBGExecute(daObjBoard_c* param_0) {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard/daObjBoard_MoveBGExecute__FP12daObjBoard_c.s"
static int daObjBoard_MoveBGExecute(daObjBoard_c* i_this) {
return i_this->MoveBGExecute();
}
#pragma pop
/* 8057BD9C-8057BDC8 0004BC 002C+00 1/0 0/0 0/0 .text daObjBoard_MoveBGDraw__FP12daObjBoard_c */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void daObjBoard_MoveBGDraw(daObjBoard_c* param_0) {
nofralloc
#include "asm/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard/daObjBoard_MoveBGDraw__FP12daObjBoard_c.s"
static int daObjBoard_MoveBGDraw(daObjBoard_c* i_this) {
return i_this->Draw();
}
#pragma pop
/* 8057BDD4-8057BDD4 000004 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* ############################################################################################## */
/* 8057BE90-8057BEB0 -00001 0020+00 1/0 0/0 0/0 .data daObjBoard_METHODS */
static actor_method_class daObjBoard_METHODS = {
(process_method_func)daObjBoard_create1st, (process_method_func)daObjBoard_MoveBGDelete,
(process_method_func)daObjBoard_MoveBGExecute, (process_method_func)NULL,
(process_method_func)daObjBoard_MoveBGDraw,
};
/* 8057BEB0-8057BEE0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Obj_Cboard */
extern actor_process_profile_definition g_profile_Obj_Cboard = {
-3,
3,
-3,
PROC_Obj_Cboard,
0,
&g_fpcLf_Method.mBase,
sizeof(daObjBoard_c),
0,
0,
&g_fopAc_Method.base,
0x01C5,
0,
0,
&daObjBoard_METHODS,
0x00040000,
0,
14,
0,
0,
};
rel/d/a/obj/d_a_obj_enemy_create/d_a_obj_enemy_create.cpp
+1 -3
View File
@@ -6,8 +6,6 @@
#include "rel/d/a/obj/d_a_obj_enemy_create/d_a_obj_enemy_create.h"
#include "d/d_procname.h"
extern "C" extern leafdraw_method_class g_fopAc_Method;
/* 80BE3178-80BE3198 000078 0020+00 1/0 0/0 0/0 .text daObjE_CREATE_Create__FP10fopAc_ac_c */
static int daObjE_CREATE_Create(fopAc_ac_c* i_this) {
return static_cast<daObjE_CREATE_c*>(i_this)->create();
@@ -284,7 +282,7 @@ extern actor_process_profile_definition g_profile_Obj_E_CREATE = {
sizeof(daObjE_CREATE_c),
0,
0,
&g_fopAc_Method,
&g_fopAc_Method.base,
0x01CA,
0,
0,
rel/d/a/obj/d_a_obj_web0/d_a_obj_web0.cpp
+1 -2
View File
@@ -66,7 +66,6 @@ extern "C" void _savegpr_28();
extern "C" void _savegpr_29();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern leafdraw_method_class g_fopAc_Method;
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" u8 sincosTable___5JMath[65536];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
@@ -450,7 +449,7 @@ extern actor_process_profile_definition g_profile_OBJ_WEB0 = {
sizeof(obj_web0_class),
0,
0,
&g_fopAc_Method,
&g_fopAc_Method.base,
0x002F,
0,
0,
rel/d/a/obj/d_a_obj_web1/d_a_obj_web1.cpp
+1 -3
View File
@@ -8,8 +8,6 @@
#include "SSystem/SComponent/c_math.h"
#include "d/d_procname.h"
extern "C" extern leafdraw_method_class g_fopAc_Method;
/* 80D353AC-80D353C4 0000EC 0018+00 1/1 0/0 0/0 .text __ct__16daObj_Web1_HIO_cFv */
daObj_Web1_HIO_c::daObj_Web1_HIO_c() {
field_0x4 = -1;
@@ -341,7 +339,7 @@ extern actor_process_profile_definition g_profile_OBJ_WEB1 = {
sizeof(obj_web1_class),
0,
0,
&g_fopAc_Method,
&g_fopAc_Method.base,
0x0030,
0,
0,
rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.cpp
-1
View File
@@ -109,7 +109,6 @@ extern "C" void _savegpr_29();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern void* g_fopAc_Method[8];
extern "C" extern void* __vt__8dCcD_Cyl[36];
extern "C" extern void* __vt__9dCcD_Stts[11];
extern "C" extern void* __vt__12cCcD_CylAttr[25];
rel/d/a/tag/d_a_tag_TWgate/d_a_tag_TWgate.cpp
-1
View File
@@ -255,7 +255,6 @@ extern "C" void _restgpr_26();
extern "C" void _restgpr_27();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern void* g_fopAc_Method[8];
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
rel/d/a/tag/d_a_tag_ajnot/d_a_tag_ajnot.cpp
+60 -91
View File
@@ -1,39 +1,9 @@
//
// Generated By: dol2asm
// Translation Unit: d_a_tag_ajnot
//
/**
* d_a_tag_ajnot.cpp
*
*/
#include "rel/d/a/tag/d_a_tag_ajnot/d_a_tag_ajnot.h"
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Forward References:
//
extern "C" void create__12daTagAJnot_cFv();
extern "C" static void daTagAJnot_Create__FP10fopAc_ac_c();
extern "C" void __dt__12daTagAJnot_cFv();
extern "C" static void daTagAJnot_Delete__FP12daTagAJnot_c();
extern "C" void execute__12daTagAJnot_cFv();
extern "C" static void daTagAJnot_Execute__FP12daTagAJnot_c();
extern "C" static bool daTagAJnot_Draw__FP12daTagAJnot_c();
extern "C" extern void* g_profile_Tag_AJnot[12];
//
// External References:
//
extern "C" void __ct__10fopAc_ac_cFv();
extern "C" void __dt__10fopAc_ac_cFv();
extern "C" void __dl__FPv();
extern "C" void _savegpr_29();
extern "C" void _restgpr_29();
extern "C" extern void* g_fopAc_Method[8];
//
// Declarations:
//
/* 805A2658-805A26A8 000078 0050+00 1/1 0/0 0/0 .text create__12daTagAJnot_cFv */
int daTagAJnot_c::create() {
@@ -41,14 +11,14 @@ int daTagAJnot_c::create() {
new (this) daTagAJnot_c();
fopAcM_OnCondition(this, 8);
}
return 4;
return cPhs_COMPLEATE_e;
}
/* 805A26A8-805A26C8 0000C8 0020+00 1/0 0/0 0/0 .text daTagAJnot_Create__FP10fopAc_ac_c
*/
static int daTagAJnot_Create(fopAc_ac_c* ajnot) {
return static_cast<daTagAJnot_c*>(ajnot)->create();
static int daTagAJnot_Create(fopAc_ac_c* i_this) {
return static_cast<daTagAJnot_c*>(i_this)->create();
}
/* 805A26C8-805A271C 0000E8 0054+00 1/1 0/0 0/0 .text __dt__12daTagAJnot_cFv */
@@ -56,74 +26,73 @@ daTagAJnot_c::~daTagAJnot_c() {}
/* 805A271C-805A2744 00013C 0028+00 1/0 0/0 0/0 .text daTagAJnot_Delete__FP12daTagAJnot_c
*/
static int daTagAJnot_Delete(daTagAJnot_c* ajnot) {
ajnot->~daTagAJnot_c();
static int daTagAJnot_Delete(daTagAJnot_c* i_this) {
i_this->~daTagAJnot_c();
return 1;
}
/* ############################################################################################## */
/* 805A2880-805A2884 000000 0004+00 1/1 0/0 0/0 .rodata @3713 */
SECTION_RODATA static u8 const lit_3713[4] = {
0x00,
0x00,
0x00,
0x00,
};
COMPILER_STRIP_GATE(0x805A2880, &lit_3713);
/* 805A2884-805A2888 000004 0004+00 0/1 0/0 0/0 .rodata @3714 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3714 = 100.0f;
COMPILER_STRIP_GATE(0x805A2884, &lit_3714);
#pragma pop
/* 805A2888-805A288C 000008 0004+00 0/1 0/0 0/0 .rodata @3715 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_3715 = 10000.0f;
COMPILER_STRIP_GATE(0x805A2888, &lit_3715);
#pragma pop
/* 805A2744-805A2850 000164 010C+00 1/1 0/0 0/0 .text execute__12daTagAJnot_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm int daTagAJnot_c::execute() {
nofralloc
#include "asm/rel/d/a/tag/d_a_tag_ajnot/d_a_tag_ajnot/execute__12daTagAJnot_cFv.s"
int daTagAJnot_c::execute() {
daPy_py_c* player = daPy_getPlayerActorClass();
f32 y_dist_to_player = player->current.pos.y - current.pos.y;
if (y_dist_to_player >= 0.0f && y_dist_to_player <= mScale.y * 100.0f &&
player->current.pos.abs2XZ(current.pos) <= mScale.x * (10000.0f * mScale.x))
{
int prm = (fopAcM_GetParam(this) & 0xF);
if (prm == 1) {
player->onForceAutoJump();
} else {
player->onNotAutoJump();
if (prm == 15) {
player->onNotHang();
}
}
}
return 1;
}
#pragma pop
/* 805A2850-805A2870 000270 0020+00 1/0 0/0 0/0 .text daTagAJnot_Execute__FP12daTagAJnot_c */
static int daTagAJnot_Execute(daTagAJnot_c* ajnot) {
return ajnot->execute();
static int daTagAJnot_Execute(daTagAJnot_c* i_this) {
return i_this->execute();
}
/* 805A2870-805A2878 000290 0008+00 1/0 0/0 0/0 .text daTagAJnot_Draw__FP12daTagAJnot_c
*/
static bool daTagAJnot_Draw(daTagAJnot_c* ajnot) {
return true;
static int daTagAJnot_Draw(daTagAJnot_c* i_this) {
return 1;
}
/* ############################################################################################## */
/* 805A288C-805A28AC -00001 0020+00 1/0 0/0 0/0 .data l_daTagAJnot_Method */
SECTION_DATA static void* l_daTagAJnot_Method[8] = {
(void*)daTagAJnot_Create__FP10fopAc_ac_c,
(void*)daTagAJnot_Delete__FP12daTagAJnot_c,
(void*)daTagAJnot_Execute__FP12daTagAJnot_c,
(void*)NULL,
(void*)daTagAJnot_Draw__FP12daTagAJnot_c,
(void*)NULL,
(void*)NULL,
(void*)NULL,
static actor_method_class l_daTagAJnot_Method = {
(process_method_func)daTagAJnot_Create, (process_method_func)daTagAJnot_Delete,
(process_method_func)daTagAJnot_Execute, (process_method_func)NULL,
(process_method_func)daTagAJnot_Draw,
};
/* 805A28AC-805A28DC -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_AJnot */
SECTION_DATA extern void* g_profile_Tag_AJnot[12] = {
(void*)0xFFFFFFFD, (void*)0x0003FFFD,
(void*)0x00EB0000, (void*)&g_fpcLf_Method,
(void*)0x00000568, (void*)NULL,
(void*)NULL, (void*)&g_fopAc_Method,
(void*)0x01B40000, (void*)&l_daTagAJnot_Method,
(void*)0x00044000, (void*)0x030E0000,
extern actor_process_profile_definition g_profile_Tag_AJnot = {
-3,
3,
0xFFFD,
PROC_Tag_AJnot,
0,
&g_fpcLf_Method.mBase,
sizeof(daTagAJnot_c),
0,
0,
&g_fopAc_Method.base,
0x01B4,
0,
0,
&l_daTagAJnot_Method,
0x00044000,
3,
14,
0,
0,
};
rel/d/a/tag/d_a_tag_escape/d_a_tag_escape.cpp
+37 -46
View File
@@ -1,66 +1,57 @@
//
// Generated By: dol2asm
// Translation Unit: d_a_tag_escape
//
/**
* d_a_tag_escape.cpp
*
*/
#include "rel/d/a/tag/d_a_tag_escape/d_a_tag_escape.h"
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Forward References:
//
extern "C" static void daTagEscape_Create__FP10fopAc_ac_c();
extern "C" static void daTagEscape_Delete__FP13daTagEscape_c();
extern "C" extern void* g_profile_Tag_Escape[12];
//
// External References:
//
extern "C" extern void* g_fopAc_Method[8];
//
// Declarations:
//
#include "d/d_procname.h"
/* 80D587D8-80D58828 000078 0050+00 1/0 0/0 0/0 .text daTagEscape_Create__FP10fopAc_ac_c
*/
static int daTagEscape_Create(fopAc_ac_c* tag) {
if (!fopAcM_CheckCondition(tag, 8)) {
new (tag) daTagEscape_c();
fopAcM_OnCondition(tag, 8);
static int daTagEscape_Create(fopAc_ac_c* i_this) {
if (!fopAcM_CheckCondition(i_this, 8)) {
new (i_this) daTagEscape_c();
fopAcM_OnCondition(i_this, 8);
}
return cPhs_COMPLEATE_e;
}
/* 80D58828-80D58858 0000C8 0030+00 1/0 0/0 0/0 .text daTagEscape_Delete__FP13daTagEscape_c */
static int daTagEscape_Delete(daTagEscape_c* tag) {
tag->~daTagEscape_c();
static int daTagEscape_Delete(daTagEscape_c* i_this) {
i_this->~daTagEscape_c();
return 1;
}
/* ############################################################################################## */
/* 80D58860-80D58880 -00001 0020+00 1/0 0/0 0/0 .data l_daTagEscape_Method */
SECTION_DATA static void* l_daTagEscape_Method[8] = {
(void*)daTagEscape_Create__FP10fopAc_ac_c,
(void*)daTagEscape_Delete__FP13daTagEscape_c,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
static actor_method_class l_daTagEscape_Method = {
(process_method_func)daTagEscape_Create,
(process_method_func)daTagEscape_Delete,
(process_method_func)NULL,
(process_method_func)NULL,
(process_method_func)NULL,
};
/* 80D58880-80D588B0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_Escape */
SECTION_DATA extern void* g_profile_Tag_Escape[12] = {
(void*)0xFFFFFFFD, (void*)0x0007FFFD,
(void*)0x028A0000, (void*)&g_fpcLf_Method,
(void*)0x00000568, (void*)NULL,
(void*)NULL, (void*)&g_fopAc_Method,
(void*)0x018D0000, (void*)&l_daTagEscape_Method,
(void*)0x00040000, (void*)0x000E0000,
extern actor_process_profile_definition g_profile_Tag_Escape = {
-3,
07,
0xFFFD,
PROC_Tag_Escape,
0,
&g_fpcLf_Method.mBase,
sizeof(daTagEscape_c),
0,
0,
&g_fopAc_Method.base,
0x018D,
0,
0,
&l_daTagEscape_Method,
0x00040000,
0,
14,
0,
0,
};
rel/d/a/tag/d_a_tag_gstart/d_a_tag_gstart.cpp
+30 -33
View File
@@ -1,22 +1,10 @@
//
// Generated By: dol2asm
// Translation Unit: d_a_tag_gstart
//
/**
* d_a_tag_gstart.cpp
*
*/
#include "rel/d/a/tag/d_a_tag_gstart/d_a_tag_gstart.h"
#include "d/com/d_com_inf_game.h"
#include "dol2asm.h"
#include "dolphin/types.h"
//
// External References:
//
extern "C" extern void* g_fopAc_Method[8];
//
// Declarations:
//
/* 805A3478-805A34F4 000078 007C+00 1/1 0/0 0/0 .text create__13daTagGstart_cFv */
int daTagGstart_c::create() {
@@ -51,7 +39,8 @@ static int daTagGstart_Delete(daTagGstart_c* i_this) {
/* 805A3590-805A3658 000190 00C8+00 1/1 0/0 0/0 .text execute__13daTagGstart_cFv */
int daTagGstart_c::execute() {
if ((mSwNo == 0xFF || dComIfGs_isSwitch(mSwNo, fopAcM_GetHomeRoomNo(this))) &&
(mSwNo2 == 0xFF || !dComIfGs_isSwitch(mSwNo2, fopAcM_GetHomeRoomNo(this)))) {
(mSwNo2 == 0xFF || !dComIfGs_isSwitch(mSwNo2, fopAcM_GetHomeRoomNo(this))))
{
if (mType != 0 || dComIfGp_getLinkPlayer()->i_checkWolf()) {
dComIfGp_getLinkPlayer()->onSceneChangeDead(field_0x56a, fopAcM_GetRoomNo(this));
}
@@ -73,23 +62,31 @@ static int daTagGstart_Draw(daTagGstart_c*) {
/* ############################################################################################## */
/* 805A3688-805A36A8 -00001 0020+00 1/0 0/0 0/0 .data l_daTagGstart_Method */
SECTION_DATA static void* l_daTagGstart_Method[8] = {
(void*)daTagGstart_Create,
(void*)daTagGstart_Delete,
(void*)daTagGstart_Execute,
(void*)NULL,
(void*)daTagGstart_Draw,
(void*)NULL,
(void*)NULL,
(void*)NULL,
static actor_method_class l_daTagGstart_Method = {
(process_method_func)daTagGstart_Create, (process_method_func)daTagGstart_Delete,
(process_method_func)daTagGstart_Execute, (process_method_func)NULL,
(process_method_func)daTagGstart_Draw,
};
/* 805A36A8-805A36D8 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_Gstart */
SECTION_DATA extern void* g_profile_Tag_Gstart[12] = {
(void*)0xFFFFFFFD, (void*)0x0002FFFD,
(void*)0x00190000, (void*)&g_fpcLf_Method,
(void*)0x0000056C, (void*)NULL,
(void*)NULL, (void*)&g_fopAc_Method,
(void*)0x01B50000, (void*)&l_daTagGstart_Method,
(void*)0x00060000, (void*)0x030E0000,
extern actor_process_profile_definition g_profile_Tag_Gstart = {
-3,
2,
0xFFFD,
PROC_Tag_Gstart,
0,
&g_fpcLf_Method.mBase,
sizeof(daTagGstart_c),
0,
0,
&g_fopAc_Method.base,
0x01B5,
0,
0,
&l_daTagGstart_Method,
0x00060000,
3,
14,
0,
0,
};
rel/d/a/tag/d_a_tag_guard/d_a_tag_guard.cpp
+1 -3
View File
@@ -6,8 +6,6 @@
#include "rel/d/a/tag/d_a_tag_guard/d_a_tag_guard.h"
#include "d/d_procname.h"
extern "C" extern leafdraw_method_class g_fopAc_Method;
/* 80D597F8-80D5985C 000078 0064+00 0/0 0/0 1/1 .text getAppearPoint__12daTagGuard_cFP3Vec */
int daTagGuard_c::getAppearPoint(Vec* i_appearPnt) {
if (mPath == NULL) {
@@ -84,7 +82,7 @@ extern actor_process_profile_definition g_profile_TAG_GUARD = {
sizeof(daTagGuard_c),
0,
0,
&g_fopAc_Method,
&g_fopAc_Method.base,
0x0198,
0,
0,
rel/d/a/tag/d_a_tag_hinit/d_a_tag_hinit.cpp
-6
View File
@@ -14,12 +14,6 @@
extern "C" extern void* g_profile_Tag_Hinit[12];
//
// External References:
//
extern "C" extern void* g_fopAc_Method[8];
//
// Declarations:
//
rel/d/a/tag/d_a_tag_hstop/d_a_tag_hstop.cpp
+34 -36
View File
@@ -1,24 +1,12 @@
//
// Generated By: dol2asm
// Translation Unit: d_a_tag_hstop
//
/**
* d_a_tag_hstop.cpp
*
*/
#include "rel/d/a/tag/d_a_tag_hstop/d_a_tag_hstop.h"
#include "d/com/d_com_inf_game.h"
#include "dol2asm.h"
#include "dolphin/types.h"
#include "rel/d/a/d_a_horse/d_a_horse.h"
//
// External References:
//
extern "C" extern void* g_fopAc_Method[8];
//
// Declarations:
//
/* 805A43EC-805A45D8 0000EC 01EC+00 1/1 0/0 0/0 .text create__12daTagHstop_cFv */
int daTagHstop_c::create() {
if (!fopAcM_CheckCondition(this, 8)) {
@@ -107,7 +95,8 @@ static int daTagHstop_Delete(daTagHstop_c* i_this) {
void daTagHstop_c::setActive() {
if (mPrm0 == 0xFF || mPrm1 == 2 ||
(mPrm1 == 0 && dComIfGs_isSwitch(mPrm0, fopAcM_GetHomeRoomNo(this))) ||
(mPrm1 == 1 && !dComIfGs_isSwitch(mPrm0, fopAcM_GetHomeRoomNo(this)))) {
(mPrm1 == 1 && !dComIfGs_isSwitch(mPrm0, fopAcM_GetHomeRoomNo(this))))
{
mActive = true;
} else {
mActive = false;
@@ -152,7 +141,8 @@ int daTagHstop_c::execute() {
field_0x573 = 0;
} else if (field_0x573 == 1) {
if (i_dComIfGp_getHorseActor()->checkTurnStand() &&
!i_dComIfGp_getHorseActor()->checkTurnStandCamera()) {
!i_dComIfGp_getHorseActor()->checkTurnStandCamera())
{
field_0x573 = 2;
}
} else if (field_0x573 == 2 && !i_dComIfGp_getHorseActor()->checkTurnStand()) {
@@ -160,8 +150,8 @@ int daTagHstop_c::execute() {
mEvtInfo.i_onCondition(1);
}
} else if (mPrm1 == 2 && !i_dComIfGp_event_runCheck()) {
if (dComIfGs_getArrowNum() == 0 &&
!dComIfGs_isSwitch(0x8D, fopAcM_GetHomeRoomNo(this))) {
if (dComIfGs_getArrowNum() == 0 && !dComIfGs_isSwitch(0x8D, fopAcM_GetHomeRoomNo(this)))
{
dComIfGs_onSwitch(0x8D, fopAcM_GetHomeRoomNo(this));
dMeter2Info_setFloatingFlow(43, 90, true);
@@ -194,23 +184,31 @@ static int daTagHstop_Draw(daTagHstop_c*) {
/* ############################################################################################## */
/* 805A4B24-805A4B44 -00001 0020+00 1/0 0/0 0/0 .data l_daTagHstop_Method */
SECTION_DATA static void* l_daTagHstop_Method[8] = {
(void*)daTagHstop_Create,
(void*)daTagHstop_Delete,
(void*)daTagHstop_Execute,
(void*)NULL,
(void*)daTagHstop_Draw,
(void*)NULL,
(void*)NULL,
(void*)NULL,
static actor_method_class l_daTagHstop_Method = {
(process_method_func)daTagHstop_Create, (process_method_func)daTagHstop_Delete,
(process_method_func)daTagHstop_Execute, (process_method_func)NULL,
(process_method_func)daTagHstop_Draw,
};
/* 805A4B44-805A4B74 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_Hstop */
SECTION_DATA extern void* g_profile_Tag_Hstop[12] = {
(void*)0xFFFFFFFD, (void*)0x0003FFFD,
(void*)0x00EC0000, (void*)&g_fpcLf_Method,
(void*)0x00000578, (void*)NULL,
(void*)NULL, (void*)&g_fopAc_Method,
(void*)0x01B30000, (void*)&l_daTagHstop_Method,
(void*)0x00040000, (void*)0x030E0000,
extern actor_process_profile_definition g_profile_Tag_Hstop = {
-3,
3,
0xFFFD,
PROC_Tag_Hstop,
0,
&g_fpcLf_Method.mBase,
sizeof(daTagHstop_c),
0,
0,
&g_fopAc_Method.base,
0x01B3,
0,
0,
&l_daTagHstop_Method,
0x00040000,
3,
14,
0,
0,
};
rel/d/a/tag/d_a_tag_instruction/d_a_tag_instruction.cpp
+31 -32
View File
@@ -1,21 +1,10 @@
//
// Generated By: dol2asm
// Translation Unit: d_a_tag_instruction
//
/**
* d_a_tag_instruction.cpp
*
*/
#include "rel/d/a/tag/d_a_tag_instruction/d_a_tag_instruction.h"
#include "dol2asm.h"
#include "dolphin/types.h"
//
// External References:
//
extern "C" extern void* g_fopAc_Method[8];
//
// Declarations:
//
#include "d/d_procname.h"
/* 80D59AF8-80D59B48 000078 0050+00 1/0 0/0 0/0 .text daTagInst_Create__FP10fopAc_ac_c */
static int daTagInst_Create(fopAc_ac_c* i_this) {
@@ -36,23 +25,33 @@ static int daTagInst_Delete(daTagInst_c* i_this) {
/* ############################################################################################## */
/* 80D59B80-80D59BA0 -00001 0020+00 1/0 0/0 0/0 .data l_daTagInst_Method */
SECTION_DATA static void* l_daTagInst_Method[8] = {
(void*)daTagInst_Create,
(void*)daTagInst_Delete,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
static actor_method_class l_daTagInst_Method = {
(process_method_func)daTagInst_Create,
(process_method_func)daTagInst_Delete,
(process_method_func)NULL,
(process_method_func)NULL,
(process_method_func)NULL,
};
/* 80D59BA0-80D59BD0 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_Instruction */
SECTION_DATA extern void* g_profile_Tag_Instruction[12] = {
(void*)0xFFFFFFFD, (void*)0x0007FFFD,
(void*)0x024D0000, (void*)&g_fpcLf_Method,
(void*)0x00000568, (void*)NULL,
(void*)NULL, (void*)&g_fopAc_Method,
(void*)0x014E0000, (void*)&l_daTagInst_Method,
(void*)0x00040000, (void*)0x000E0000,
extern actor_process_profile_definition g_profile_Tag_Instruction = {
-3,
7,
0xFFFD,
PROC_Tag_Instruction,
0,
&g_fpcLf_Method.mBase,
sizeof(daTagInst_c),
0,
0,
&g_fopAc_Method.base,
0x014E,
0,
0,
&l_daTagInst_Method,
0x00040000,
0,
14,
0,
0,
};
rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.cpp
+45 -83
View File
@@ -1,78 +1,10 @@
//
// Generated By: dol2asm
// Translation Unit: d_a_tag_lv5soup
//
/**
* d_a_tag_lv5soup.cpp
*
*/
#include "rel/d/a/tag/d_a_tag_lv5soup/d_a_tag_lv5soup.h"
#include "d/com/d_com_inf_game.h"
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Forward References:
//
extern "C" void create__15daTag_Lv5Soup_cFv();
extern "C" bool Delete__15daTag_Lv5Soup_cFv();
extern "C" void Execute__15daTag_Lv5Soup_cFv();
extern "C" bool Draw__15daTag_Lv5Soup_cFv();
extern "C" void isAreaCheck__15daTag_Lv5Soup_cFv();
extern "C" static void daTag_Lv5Soup_Create__FPv();
extern "C" static void daTag_Lv5Soup_Delete__FPv();
extern "C" static void daTag_Lv5Soup_Execute__FPv();
extern "C" static void daTag_Lv5Soup_Draw__FPv();
extern "C" static bool daTag_Lv5Soup_IsDelete__FPv();
extern "C" void __dt__15daTag_Lv5Soup_cFv();
//
// External References:
//
extern "C" void __ct__10fopAc_ac_cFv();
extern "C" void __dt__10fopAc_ac_cFv();
extern "C" void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff();
extern "C" void onEventBit__11dSv_event_cFUs();
extern "C" void isEventBit__11dSv_event_cCFUs();
extern "C" void __mi__4cXyzCFRC3Vec();
extern "C" void __dl__FPv();
extern "C" extern void* g_fopAc_Method[8];
//
// Declarations:
//
inline int dComIfGs_isEventBit(u16 event) {
return g_dComIfG_gameInfo.info.getSavedata().getEvent().isEventBit(event);
}
/* 80D5B18C-80D5B1AC -00001 0020+00 1/0 0/0 0/0 .data daTag_Lv5Soup_MethodTable */
SECTION_DATA static void* daTag_Lv5Soup_MethodTable[8] = {
(void*)daTag_Lv5Soup_Create__FPv,
(void*)daTag_Lv5Soup_Delete__FPv,
(void*)daTag_Lv5Soup_Execute__FPv,
(void*)daTag_Lv5Soup_IsDelete__FPv,
(void*)daTag_Lv5Soup_Draw__FPv,
(void*)NULL,
(void*)NULL,
(void*)NULL,
};
/* 80D5B1AC-80D5B1DC -00001 0030+00 0/0 0/0 1/0 .data g_profile_TAG_LV5SOUP */
SECTION_DATA extern void* g_profile_TAG_LV5SOUP[12] = {
(void*)0xFFFFFFFD, (void*)0x0007FFFD,
(void*)0x01220000, (void*)&g_fpcLf_Method,
(void*)0x0000056C, (void*)NULL,
(void*)NULL, (void*)&g_fopAc_Method,
(void*)0x00460000, (void*)&daTag_Lv5Soup_MethodTable,
(void*)0x00064100, (void*)0x050E0000,
};
/* 80D5B1DC-80D5B1E8 000050 000C+00 2/2 0/0 0/0 .data __vt__15daTag_Lv5Soup_c */
SECTION_DATA extern void* __vt__15daTag_Lv5Soup_c[3] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__15daTag_Lv5Soup_cFv,
};
/* 80D5AD58-80D5ADEC 000078 0094+00 1/1 0/0 0/0 .text create__15daTag_Lv5Soup_cFv */
int daTag_Lv5Soup_c::create() {
@@ -95,13 +27,13 @@ int daTag_Lv5Soup_c::Delete() {
int daTag_Lv5Soup_c::Execute() {
if (isAreaCheck()) {
// Yeto took pumpkin and pumpkin not in soup
if (dComIfGs_isEventBit(0x0020) && !dComIfGs_isEventBit(0x0002)) {
if (i_dComIfGs_isEventBit(0x0020) && !i_dComIfGs_isEventBit(0x0002)) {
// Pumpkin in soup
dComIfGs_onEventBit(0x0002);
}
// Yeto took cheese and cheese not in soup
if (dComIfGs_isEventBit(0x0010) && !dComIfGs_isEventBit(0x0001)) {
if (i_dComIfGs_isEventBit(0x0010) && !i_dComIfGs_isEventBit(0x0001)) {
// Cheese in soup
dComIfGs_onEventBit(0x0001);
}
@@ -128,29 +60,59 @@ bool daTag_Lv5Soup_c::isAreaCheck() {
}
/* 80D5B06C-80D5B08C 00038C 0020+00 1/0 0/0 0/0 .text daTag_Lv5Soup_Create__FPv */
static int daTag_Lv5Soup_Create(void* tag) {
return static_cast<daTag_Lv5Soup_c*>(tag)->create();
static int daTag_Lv5Soup_Create(void* i_this) {
return static_cast<daTag_Lv5Soup_c*>(i_this)->create();
}
/* 80D5B08C-80D5B0AC 0003AC 0020+00 1/0 0/0 0/0 .text daTag_Lv5Soup_Delete__FPv */
static int daTag_Lv5Soup_Delete(void* tag) {
return static_cast<daTag_Lv5Soup_c*>(tag)->Delete();
static int daTag_Lv5Soup_Delete(void* i_this) {
return static_cast<daTag_Lv5Soup_c*>(i_this)->Delete();
}
/* 80D5B0AC-80D5B0CC 0003CC 0020+00 1/0 0/0 0/0 .text daTag_Lv5Soup_Execute__FPv */
static int daTag_Lv5Soup_Execute(void* tag) {
return static_cast<daTag_Lv5Soup_c*>(tag)->Execute();
static int daTag_Lv5Soup_Execute(void* i_this) {
return static_cast<daTag_Lv5Soup_c*>(i_this)->Execute();
}
/* 80D5B0CC-80D5B0EC 0003EC 0020+00 1/0 0/0 0/0 .text daTag_Lv5Soup_Draw__FPv */
static int daTag_Lv5Soup_Draw(void* tag) {
return static_cast<daTag_Lv5Soup_c*>(tag)->Draw();
static int daTag_Lv5Soup_Draw(void* i_this) {
return static_cast<daTag_Lv5Soup_c*>(i_this)->Draw();
}
/* 80D5B0EC-80D5B0F4 00040C 0008+00 1/0 0/0 0/0 .text daTag_Lv5Soup_IsDelete__FPv */
static int daTag_Lv5Soup_IsDelete(void* tag) {
static int daTag_Lv5Soup_IsDelete(void* i_this) {
return 1;
}
/* 80D5B0F4-80D5B154 000414 0060+00 1/0 0/0 0/0 .text __dt__15daTag_Lv5Soup_cFv */
daTag_Lv5Soup_c::~daTag_Lv5Soup_c() {}
/* 80D5B18C-80D5B1AC -00001 0020+00 1/0 0/0 0/0 .data daTag_Lv5Soup_MethodTable */
static actor_method_class daTag_Lv5Soup_MethodTable = {
(process_method_func)daTag_Lv5Soup_Create, (process_method_func)daTag_Lv5Soup_Delete,
(process_method_func)daTag_Lv5Soup_Execute, (process_method_func)daTag_Lv5Soup_IsDelete,
(process_method_func)daTag_Lv5Soup_Draw,
};
/* 80D5B1AC-80D5B1DC -00001 0030+00 0/0 0/0 1/0 .data g_profile_TAG_LV5SOUP */
extern actor_process_profile_definition g_profile_TAG_LV5SOUP = {
-3,
7,
0xFFFD,
0x122,
0,
&g_fpcLf_Method.mBase,
sizeof(daTag_Lv5Soup_c),
0,
0,
&g_fopAc_Method.base,
0x0046,
0,
0,
&daTag_Lv5Soup_MethodTable,
0x00064100,
5,
14,
0,
0,
};
rel/d/a/tag/d_a_tag_magne/d_a_tag_magne.cpp
+35 -36
View File
@@ -1,21 +1,10 @@
//
// Generated By: dol2asm
// Translation Unit: d_a_tag_magne
//
/**
* d_a_tag_magne.cpp
*
*/
#include "rel/d/a/tag/d_a_tag_magne/d_a_tag_magne.h"
#include "dol2asm.h"
#include "dolphin/types.h"
//
// External References:
//
extern "C" extern void* g_fopAc_Method[8];
//
// Declarations:
//
#include "d/d_procname.h"
/* 805A5498-805A54DC 000078 0044+00 1/1 0/0 0/0 .text Create__12daTagMagne_cFv */
int daTagMagne_c::Create() {
@@ -37,8 +26,8 @@ int daTagMagne_c::create() {
new (this) daTagMagne_c();
fopAcM_OnCondition(this, 8);
}
if (mTagMagne != NULL && mTagMagne->current.mRoomNo != current.mRoomNo) {
if (mTagMagne != NULL && mTagMagne->current.roomNo != current.roomNo) {
return cPhs_ZERO_e;
}
@@ -57,35 +46,45 @@ int daTagMagne_c::_delete() {
/* 805A558C-805A55AC 00016C 0020+00 1/0 0/0 0/0 .text daTagMagne_Delete__FP12daTagMagne_c
*/
static void daTagMagne_Delete(daTagMagne_c* p_tag) {
p_tag->_delete();
static void daTagMagne_Delete(daTagMagne_c* i_this) {
i_this->_delete();
}
/* 805A55AC-805A55CC 00018C 0020+00 1/0 0/0 0/0 .text daTagMagne_Create__FP10fopAc_ac_c
*/
static void daTagMagne_Create(fopAc_ac_c* p_tag) {
((daTagMagne_c*)p_tag)->create();
static void daTagMagne_Create(fopAc_ac_c* i_this) {
((daTagMagne_c*)i_this)->create();
}
/* ############################################################################################## */
/* 805A55D4-805A55F4 -00001 0020+00 1/0 0/0 0/0 .data l_daTagMagne_Method */
SECTION_DATA static process_method_func l_daTagMagne_Method[8] = {
static actor_method_class l_daTagMagne_Method = {
(process_method_func)daTagMagne_Create,
(process_method_func)daTagMagne_Delete,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
(process_method_func)NULL,
(process_method_func)NULL,
(process_method_func)NULL,
};
/* 805A55F4-805A5624 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_Magne */
SECTION_DATA extern void* g_profile_Tag_Magne[12] = {
(void*)0xFFFFFFFD, (void*)0x0007FFFD,
(void*)0x01620000, (void*)&g_fpcLf_Method,
(void*)0x0000056C, (void*)NULL,
(void*)NULL, (void*)&g_fopAc_Method,
(void*)0x024E0000, (void*)&l_daTagMagne_Method,
(void*)0x00040000, (void*)0x000E0000,
extern actor_process_profile_definition g_profile_Tag_Magne = {
-3,
7,
0xFFFD,
PROC_Tag_Magne,
0,
&g_fpcLf_Method.mBase,
sizeof(daTagMagne_c),
0,
0,
&g_fopAc_Method.base,
0x024E,
0,
0,
&l_daTagMagne_Method,
0x00040000,
0,
14,
0,
0,
};
rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.cpp
-1
View File
@@ -86,7 +86,6 @@ extern "C" void __dl__FPv();
extern "C" void _savegpr_29();
extern "C" void _restgpr_29();
extern "C" void strcmp();
extern "C" extern void* g_fopAc_Method[8];
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 g_meter2_info[248];
rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.cpp
+14 -21
View File
@@ -9,12 +9,6 @@
#include "dol2asm.h"
#include "dolphin/types.h"
//
// External References:
//
extern "C" extern leafdraw_method_class g_fopAc_Method;
/* ############################################################################################## */
/* 80D5B918-80D5BA94 000078 017C+00 1/1 0/0 0/0 .text create__11daTagMmsg_cFv */
int daTagMmsg_c::create() {
@@ -53,8 +47,8 @@ int daTagMmsg_c::create() {
}
/* 80D5BA94-80D5BAB4 0001F4 0020+00 1/0 0/0 0/0 .text daTagMmsg_Create__FP10fopAc_ac_c */
static int daTagMmsg_Create(fopAc_ac_c* tag) {
return static_cast<daTagMmsg_c*>(tag)->create();
static int daTagMmsg_Create(fopAc_ac_c* i_this) {
return static_cast<daTagMmsg_c*>(i_this)->create();
}
/* 80D5BAB4-80D5BB08 000214 0054+00 1/1 0/0 0/0 .text __dt__11daTagMmsg_cFv */
@@ -62,8 +56,8 @@ daTagMmsg_c::~daTagMmsg_c() {}
/* 80D5BB08-80D5BB30 000268 0028+00 1/0 0/0 0/0 .text daTagMmsg_Delete__FP11daTagMmsg_c
*/
static int daTagMmsg_Delete(daTagMmsg_c* tag) {
tag->~daTagMmsg_c();
static int daTagMmsg_Delete(daTagMmsg_c* i_this) {
i_this->~daTagMmsg_c();
return 1;
}
@@ -73,8 +67,8 @@ int daTagMmsg_c::execute() {
return 1;
}
if (field_0x572 != 0x3FF &&
i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x572])) {
if (field_0x572 != 0x3FF && i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x572]))
{
return 1;
}
@@ -94,7 +88,8 @@ int daTagMmsg_c::execute() {
(fopAcM_searchPlayerDistanceXZ2(this) < field_0x574) &&
(field_0x570 == 0x3FF ||
i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x570])) &&
(field_0x568 == 0xFF || dComIfGs_isSwitch(field_0x568, fopAcM_GetHomeRoomNo(this)))) {
(field_0x568 == 0xFF || dComIfGs_isSwitch(field_0x568, fopAcM_GetHomeRoomNo(this))))
{
player->setMidnaMsgNum(this, shape_angle.z);
}
@@ -103,22 +98,20 @@ int daTagMmsg_c::execute() {
/* 80D5BD08-80D5BD28 000468 0020+00 1/0 0/0 0/0 .text daTagMmsg_Execute__FP11daTagMmsg_c
*/
static int daTagMmsg_Execute(daTagMmsg_c* tag) {
return tag->execute();
static int daTagMmsg_Execute(daTagMmsg_c* i_this) {
return i_this->execute();
}
/* 80D5BD28-80D5BD30 000488 0008+00 1/0 0/0 0/0 .text daTagMmsg_Draw__FP11daTagMmsg_c */
static int daTagMmsg_Draw(daTagMmsg_c* tag) {
static int daTagMmsg_Draw(daTagMmsg_c* i_this) {
return 1;
}
/* ############################################################################################## */
/* 80D5BD44-80D5BD64 -00001 0020+00 1/0 0/0 0/0 .data l_daTagMmsg_Method */
static actor_method_class l_daTagMmsg_Method = {
(process_method_func)daTagMmsg_Create,
(process_method_func)daTagMmsg_Delete,
(process_method_func)daTagMmsg_Execute,
(process_method_func)NULL,
(process_method_func)daTagMmsg_Create, (process_method_func)daTagMmsg_Delete,
(process_method_func)daTagMmsg_Execute, (process_method_func)NULL,
(process_method_func)daTagMmsg_Draw,
};
@@ -133,7 +126,7 @@ extern actor_process_profile_definition g_profile_Tag_Mmsg = {
sizeof(daTagMmsg_c), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method, // mSubMtd
&g_fopAc_Method.base, // mSubMtd
0x00FF, // mPriority
0, // unk22[0]
0, // unk22[1]
rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.cpp
-1
View File
@@ -76,7 +76,6 @@ extern "C" void _savegpr_28();
extern "C" void _savegpr_29();
extern "C" void _restgpr_28();
extern "C" void _restgpr_29();
extern "C" extern void* g_fopAc_Method[8];
extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" u8 m_midnaActor__9daPy_py_c[4];
rel/d/a/tag/d_a_tag_setBall/d_a_tag_setBall.cpp
+37 -44
View File
@@ -1,27 +1,10 @@
//
// Generated By: dol2asm
// Translation Unit: d_a_tag_setBall
//
/**
* d_a_tag_setBall.cpp
*
*/
#include "rel/d/a/tag/d_a_tag_setBall/d_a_tag_setBall.h"
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Forward References:
//
extern "C" extern void* g_profile_Tag_SetBall[12];
//
// External References:
//
extern "C" extern void* g_fopAc_Method[8];
//
// Declarations:
//
#include "d/d_procname.h"
/* 80D601F8-80D60218 000078 0020+00 1/1 0/0 0/0 .text initBaseMtx__14daTagSetBall_cFv */
void daTagSetBall_c::initBaseMtx() {
@@ -63,39 +46,49 @@ int daTagSetBall_c::_delete() {
}
/* 80D602C4-80D602E4 000144 0020+00 1/0 0/0 0/0 .text daTagSetBall_Execute__FP14daTagSetBall_c */
static int daTagSetBall_Execute(daTagSetBall_c* tag) {
return tag->execute();
static int daTagSetBall_Execute(daTagSetBall_c* i_this) {
return i_this->execute();
}
/* 80D602E4-80D60304 000164 0020+00 1/0 0/0 0/0 .text daTagSetBall_Delete__FP14daTagSetBall_c */
static int daTagSetBall_Delete(daTagSetBall_c* tag) {
return tag->_delete();
static int daTagSetBall_Delete(daTagSetBall_c* i_this) {
return i_this->_delete();
}
/* 80D60304-80D60324 000184 0020+00 1/0 0/0 0/0 .text daTagSetBall_Create__FP14daTagSetBall_c */
static int daTagSetBall_Create(daTagSetBall_c* tag) {
return tag->create();
static int daTagSetBall_Create(daTagSetBall_c* i_this) {
return i_this->create();
}
/* ############################################################################################## */
/* 80D6032C-80D6034C -00001 0020+00 1/0 0/0 0/0 .data l_daTagSetBall_Method */
SECTION_DATA static void* l_daTagSetBall_Method[8] = {
(void*)daTagSetBall_Create,
(void*)daTagSetBall_Delete,
(void*)daTagSetBall_Execute,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
static actor_method_class l_daTagSetBall_Method = {
(process_method_func)daTagSetBall_Create,
(process_method_func)daTagSetBall_Delete,
(process_method_func)daTagSetBall_Execute,
(process_method_func)NULL,
(process_method_func)NULL,
};
/* 80D6034C-80D6037C -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_SetBall */
SECTION_DATA extern void* g_profile_Tag_SetBall[12] = {
(void*)0xFFFFFFFD, (void*)0x0007FFFD,
(void*)0x019F0000, (void*)&g_fpcLf_Method,
(void*)0x0000056C, (void*)NULL,
(void*)NULL, (void*)&g_fopAc_Method,
(void*)0x023F0000, (void*)&l_daTagSetBall_Method,
(void*)0x00040100, (void*)0x000E0000,
extern actor_process_profile_definition g_profile_Tag_SetBall = {
-3,
7,
0xFFFD,
PROC_Tag_SetBall,
0,
&g_fpcLf_Method.mBase,
sizeof(daTagSetBall_c),
0,
0,
&g_fopAc_Method.base,
0x023F,
0,
0,
&l_daTagSetBall_Method,
0x00040100,
0,
14,
0,
0,
};
rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart.cpp
+28 -50
View File
@@ -6,24 +6,6 @@
#include "rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart.h"
#include "d/com/d_com_inf_game.h"
#include "dol2asm.h"
//
// Forward References:
//
extern "C" extern void* g_profile_Tag_Restart[12];
//
// External References:
//
extern "C" void __dl__FPv();
extern "C" extern void* g_fopAc_Method[8];
//
// Declarations:
//
/* 80D603F8-80D6048C 000078 0094+00 1/1 0/0 0/0 .text Create__14daTagRestart_cFv */
int daTagRestart_c::Create() {
@@ -62,21 +44,6 @@ int daTagRestart_c::create() {
return cPhs_COMPLEATE_e;
}
/* 80D60520-80D6055C 0001A0 003C+00 1/1 0/0 0/0 .text __dt__4cXyzFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
// asm cXyz::~cXyz() {
extern "C" asm void __dt__4cXyzFv() {
nofralloc
#include "asm/rel/d/a/tag/d_a_tag_setrestart/d_a_tag_setrestart/__dt__4cXyzFv.s"
}
#pragma pop
/* 80D6055C-80D60560 0001DC 0004+00 1/1 0/0 0/0 .text __ct__4cXyzFv */
// cXyz::cXyz() {
extern "C" void __ct__4cXyzFv() {}
/* 80D60560-80D60744 0001E0 01E4+00 1/1 0/0 0/0 .text execute__14daTagRestart_cFv */
int daTagRestart_c::execute() {
fopAc_ac_c* player = dComIfGp_getPlayer(0);
@@ -87,7 +54,8 @@ int daTagRestart_c::execute() {
mDoMtx_stack_c::multVec(&player_pos, &player_pos);
if (field_0x56c[0].x < player_pos.x && field_0x56c[0].z < player_pos.z &&
field_0x56c[2].x > player_pos.x && field_0x56c[2].z > player_pos.z) {
field_0x56c[2].x > player_pos.x && field_0x56c[2].z > player_pos.z)
{
int roomNo = dComIfGp_roomControl_getStayNo();
if (roomNo != mPlayerRoomNo) {
cXyz pos_offset;
@@ -141,23 +109,33 @@ static int daTagRestart_Create(fopAc_ac_c* i_this) {
/* ############################################################################################## */
/* 80D607C0-80D607E0 -00001 0020+00 1/0 0/0 0/0 .data l_daTagRestart_Method */
SECTION_DATA static void* l_daTagRestart_Method[8] = {
(void*)daTagRestart_Create,
(void*)daTagRestart_Delete,
(void*)daTagRestart_Execute,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
(void*)NULL,
static actor_method_class l_daTagRestart_Method = {
(process_method_func)daTagRestart_Create,
(process_method_func)daTagRestart_Delete,
(process_method_func)daTagRestart_Execute,
(process_method_func)NULL,
(process_method_func)NULL,
};
/* 80D607E0-80D60810 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_Restart */
SECTION_DATA extern void* g_profile_Tag_Restart[12] = {
(void*)0xFFFFFFFD, (void*)0x0007FFFD,
(void*)0x022F0000, (void*)&g_fpcLf_Method,
(void*)0x0000059C, (void*)NULL,
(void*)NULL, (void*)&g_fopAc_Method,
(void*)0x02500000, (void*)&l_daTagRestart_Method,
(void*)0x00040000, (void*)0x000E0000,
extern actor_process_profile_definition g_profile_Tag_Restart = {
-3,
7,
0xFFFD,
PROC_Tag_Restart,
0,
&g_fpcLf_Method.mBase,
sizeof(daTagRestart_c),
0,
0,
&g_fopAc_Method.base,
0x0250,
0,
0,
&l_daTagRestart_Method,
0x00040000,
0,
14,
0,
0,
};
rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.cpp
+36 -57
View File
@@ -1,40 +1,11 @@
//
// Generated By: dol2asm
// Translation Unit: d_a_tag_telop
//
/**
* d_a_tag_telop.cpp
*
*/
#include "rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.h"
#include "dol2asm.h"
#include "dolphin/types.h"
#include "f_op/f_op_msg_mng.h"
//
// Forward References:
//
extern "C" void create__13daTag_Telop_cFv();
extern "C" void execute__13daTag_Telop_cFv();
extern "C" static bool daTag_Telop_Draw__FP13daTag_Telop_c();
extern "C" static void daTag_Telop_Execute__FP13daTag_Telop_c();
extern "C" static bool daTag_Telop_IsDelete__FP13daTag_Telop_c();
extern "C" static void daTag_Telop_Delete__FP13daTag_Telop_c();
extern "C" static void daTag_Telop_Create__FP10fopAc_ac_c();
extern "C" extern void* g_profile_TAG_TELOP[12];
//
// External References:
//
extern "C" extern void* g_fopAc_Method[8];
//
// Declarations:
//
inline int dComIfGs_isEventBit(u16 event) {
return g_dComIfG_gameInfo.info.getSavedata().getEvent().isEventBit(event);
}
/* 80490A58-80490AF8 000078 00A0+00 1/1 0/0 0/0 .text create__13daTag_Telop_cFv */
int daTag_Telop_c::create() {
if (!fopAcM_CheckCondition(this, 8)) {
@@ -71,52 +42,60 @@ void daTag_Telop_c::execute() {
/* 80490B5C-80490B64 00017C 0008+00 1/0 0/0 0/0 .text daTag_Telop_Draw__FP13daTag_Telop_c
*/
static int daTag_Telop_Draw(daTag_Telop_c* tag) {
static int daTag_Telop_Draw(daTag_Telop_c* i_this) {
return 1;
}
/* 80490B64-80490B88 000184 0024+00 1/0 0/0 0/0 .text daTag_Telop_Execute__FP13daTag_Telop_c */
static int daTag_Telop_Execute(daTag_Telop_c* tag) {
tag->execute();
static int daTag_Telop_Execute(daTag_Telop_c* i_this) {
i_this->execute();
return 1;
}
/* 80490B88-80490B90 0001A8 0008+00 1/0 0/0 0/0 .text daTag_Telop_IsDelete__FP13daTag_Telop_c */
static int daTag_Telop_IsDelete(daTag_Telop_c* tag) {
static int daTag_Telop_IsDelete(daTag_Telop_c* i_this) {
return 1;
}
/* 80490B90-80490BC0 0001B0 0030+00 1/0 0/0 0/0 .text daTag_Telop_Delete__FP13daTag_Telop_c */
static int daTag_Telop_Delete(daTag_Telop_c* tag) {
tag->~daTag_Telop_c();
static int daTag_Telop_Delete(daTag_Telop_c* i_this) {
i_this->~daTag_Telop_c();
return 1;
}
/* 80490BC0-80490BE0 0001E0 0020+00 1/0 0/0 0/0 .text daTag_Telop_Create__FP10fopAc_ac_c
*/
static int daTag_Telop_Create(fopAc_ac_c* tag) {
return static_cast<daTag_Telop_c*>(tag)->create();
static int daTag_Telop_Create(fopAc_ac_c* i_this) {
return static_cast<daTag_Telop_c*>(i_this)->create();
}
/* ############################################################################################## */
/* 80490BE8-80490C08 -00001 0020+00 1/0 0/0 0/0 .data l_daTag_Telop_Method */
SECTION_DATA static void* l_daTag_Telop_Method[8] = {
(void*)daTag_Telop_Create__FP10fopAc_ac_c,
(void*)daTag_Telop_Delete__FP13daTag_Telop_c,
(void*)daTag_Telop_Execute__FP13daTag_Telop_c,
(void*)daTag_Telop_IsDelete__FP13daTag_Telop_c,
(void*)daTag_Telop_Draw__FP13daTag_Telop_c,
(void*)NULL,
(void*)NULL,
(void*)NULL,
static actor_method_class l_daTag_Telop_Method = {
(process_method_func)daTag_Telop_Create, (process_method_func)daTag_Telop_Delete,
(process_method_func)daTag_Telop_Execute, (process_method_func)daTag_Telop_IsDelete,
(process_method_func)daTag_Telop_Draw,
};
/* 80490C08-80490C38 -00001 0030+00 0/0 0/0 1/0 .data g_profile_TAG_TELOP */
SECTION_DATA extern void* g_profile_TAG_TELOP[12] = {
(void*)0xFFFFFFFD, (void*)0x0007FFFD,
(void*)0x02D30000, (void*)&g_fpcLf_Method,
(void*)0x00000570, (void*)NULL,
(void*)NULL, (void*)&g_fopAc_Method,
(void*)0x011A0000, (void*)&l_daTag_Telop_Method,
(void*)0x00044000, (void*)0x00060000,
extern actor_process_profile_definition g_profile_TAG_TELOP = {
-3,
7,
0xFFFD,
PROC_TAG_TELOP,
0,
&g_fpcLf_Method.mBase,
sizeof(daTag_Telop_c),
0,
0,
&g_fopAc_Method.base,
0x011A,
0,
0,
&l_daTag_Telop_Method,
0x00044000,
0,
6,
0,
0,
};
rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl.cpp
+28 -31
View File
@@ -1,21 +1,10 @@
//
// Generated By: dol2asm
// Translation Unit: d_a_tag_wara_howl
//
/**
* d_a_tag_wara_howl.cpp
*
*/
#include "rel/d/a/tag/d_a_tag_wara_howl/d_a_tag_wara_howl.h"
#include "d/com/d_com_inf_game.h"
#include "dol2asm.h"
//
// External References:
//
extern "C" extern void* g_fopAc_Method[8];
//
// Declarations:
//
/* 80D63F38-80D63F74 000078 003C+00 2/2 0/0 0/0 .text __ct__13daTagWrHowl_cFv */
daTagWrHowl_c::daTagWrHowl_c() {}
@@ -106,23 +95,31 @@ static int daTagWrHowl_draw(daTagWrHowl_c* i_this) {
/* ############################################################################################## */
/* 80D64204-80D64224 -00001 0020+00 1/0 0/0 0/0 .data daTagWrHowl_METHODS */
SECTION_DATA static void* daTagWrHowl_METHODS[8] = {
(void*)daTagWrHowl_create,
(void*)daTagWrHowl_Delete,
(void*)daTagWrHowl_execute,
(void*)NULL,
(void*)daTagWrHowl_draw,
(void*)NULL,
(void*)NULL,
(void*)NULL,
static actor_method_class daTagWrHowl_METHODS = {
(process_method_func)daTagWrHowl_create, (process_method_func)daTagWrHowl_Delete,
(process_method_func)daTagWrHowl_execute, (process_method_func)NULL,
(process_method_func)daTagWrHowl_draw,
};
/* 80D64224-80D64254 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_WaraHowl */
SECTION_DATA extern void* g_profile_Tag_WaraHowl[12] = {
(void*)0xFFFFFFFD, (void*)0x0007FFFD,
(void*)0x018B0000, (void*)&g_fpcLf_Method,
(void*)0x00000574, (void*)NULL,
(void*)NULL, (void*)&g_fopAc_Method,
(void*)0x02DD0000, (void*)&daTagWrHowl_METHODS,
(void*)0x00040000, (void*)0x000E0000,
extern actor_process_profile_definition g_profile_Tag_WaraHowl = {
-3,
7,
0xFFFD,
PROC_Tag_WaraHowl,
0,
&g_fpcLf_Method.mBase,
sizeof(daTagWrHowl_c),
0,
0,
&g_fopAc_Method.base,
0x02DD,
0,
0,
&daTagWrHowl_METHODS,
0x00040000,
0,
14,
0,
0,
};