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

d_s_open match

Browse Source
This commit is contained in:
Jasper St. Pierre
2023-10-13 17:45:23 -07:00
parent 299a86c850
commit 09365b4c00
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -480,7 +480,7 @@ config.libs = [
Object(NonMatching, "d/d_s_logo.cpp"),
Object(NonMatching, "d/d_s_menu.cpp"),
Object(NonMatching, "d/d_s_name.cpp"),
Object(NonMatching, "d/d_s_open.cpp"),
Object(Matching, "d/d_s_open.cpp"),
Object(NonMatching, "d/d_s_open_sub.cpp"),
Object(NonMatching, "d/d_s_play.cpp"),
Object(NonMatching, "d/d_s_room.cpp"),
src/d/d_s_open.cpp
+7 -5
View File
@@ -12,6 +12,7 @@
#include "d/d_procname.h"
#include "m_Do/m_Do_audio.h"
#include "m_Do/m_Do_controller_pad.h"
#include "m_Do/m_Do_graphic.h"
class dScnOpen_message_c;
class J2DScreen;
@@ -57,11 +58,12 @@ s32 dScnOpen_c::create() {
field_0x1d4 = NULL;
mDoExt_restoreCurrentHeap();
mDoExt_adjustSolidHeap(solid_heap);
// mDoGph_gInf_c::setTickRate();
mDoGph_gInf_c::setTickRate((OS_BUS_CLOCK / 4) / 30);
return cPhs_COMPLEATE_e;
} else if (rt == cPhs_ERROR_e) {
JUT_ASSERT(0x48, rt == cPhs_COMPLEATE_e);
return rt;
}
return rt;
}
/* 80232BC4-80232CAC .text execute__10dScnOpen_cFv */
@@ -145,7 +147,7 @@ s32 dScnOpen_Create(scene_class* i_scn) {
return i_this->create();
}
static scene_method_class l_dScnOpen_Method = {
scene_method_class l_dScnOpen_Method = {
(process_method_func)dScnOpen_Create,
(process_method_func)dScnOpen_Delete,
(process_method_func)dScnOpen_Execute,
@@ -158,7 +160,7 @@ extern scene_process_profile_definition g_profile_OPEN_SCENE = {
1,
fpcPi_CURRENT_e,
PROC_OPEN_SCENE,
&g_fpcLf_Method.mBase,
&g_fpcNd_Method.mBase,
sizeof(dScnOpen_c),
0,
0,
@@ -172,7 +174,7 @@ extern scene_process_profile_definition g_profile_OPEN2_SCENE = {
1,
fpcPi_CURRENT_e,
PROC_OPEN2_SCENE,
&g_fpcLf_Method.mBase,
&g_fpcNd_Method.mBase,
sizeof(dScnOpen_c),
0,
0,
src/d/d_throwstone.cpp
+3 -3
View File
@@ -87,7 +87,7 @@ BOOL daThrowstone_c::_execute() {
mpModel->setBaseScale(mScale);
mDoMtx_stack_c::transS(getPosition());
mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
mDoMtx_stack_c::ZXYrotM(shape_angle);
mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
mDoMtx_copy(mDoMtx_stack_c::get(), mMtx);
@@ -121,7 +121,7 @@ BOOL daThrowstoneIsDelete(void*) {
return TRUE;
}
static actor_method_class l_daThrowstone_Method = {
actor_method_class daThrowstoneMethodTable = {
(process_method_func)daThrowstoneCreate,
(process_method_func)daThrowstoneDelete,
(process_method_func)daThrowstoneExecute,
@@ -140,7 +140,7 @@ actor_process_profile_definition g_profile_THROWSTONE = {
0,
&g_fopAc_Method.base,
0x01CE,
&l_daThrowstone_Method,
&daThrowstoneMethodTable,
fopAcStts_CULL_e | fopAcStts_UNK40000_e,
fopAc_ACTOR_e,
fopAc_CULLBOX_0_e,