encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

d_camera work (#2369)

Browse Source 
* bumpCheck matching

* checkGroundInfo matching

* chaseCamera matching

* lockonCamera attempted

* talktoCamera matching

* subjectCamera, magneCamera matching

* colosseumCamera close, plus various fixes

* towerCamera attempted

* hookshotCamera matching
This commit is contained in:
Caroline Madsen
2025-04-01 19:05:30 -07:00
committed by GitHub
parent 9847b2a278
commit e55c504f28
56 changed files with 5623 additions and 2230 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/SSystem/SComponent/c_cc_d.cpp
+10 -10
View File
@@ -294,9 +294,9 @@ void cCcD_ShapeAttr::getShapeAccess(cCcD_ShapeAttr::Shape* pshape) const {
pshape->_0 = 2;
pshape->_14 = 0.0f;
pshape->_10 = 0.0f;
pshape->_C = 0.0f;
pshape->_8 = 0.0f;
pshape->_4 = 0.0f;
pshape->_4.z = 0.0f;
pshape->_4.y = 0.0f;
pshape->_4.x = 0.0f;
}
/* 80263A88-80263B58 25E3C8 00D0+00 1/0 1/0 0/0 .text
@@ -594,9 +594,9 @@ bool cCcD_CylAttr::GetNVec(const cXyz& param_0, cXyz* param_1) const {
* getShapeAccess__12cCcD_CylAttrCFPQ214cCcD_ShapeAttr5Shape */
void cCcD_CylAttr::getShapeAccess(cCcD_ShapeAttr::Shape* pshape) const {
pshape->_0 = 1;
pshape->_4 = mCenter.x;
pshape->_8 = mCenter.y;
pshape->_C = mCenter.z;
pshape->_4.x = mCenter.x;
pshape->_4.y = mCenter.y;
pshape->_4.z = mCenter.z;
pshape->_10 = mRadius;
pshape->_14 = mHeight;
}
@@ -716,9 +716,9 @@ bool cCcD_SphAttr::GetNVec(const cXyz& param_0, cXyz* param_1) const {
* getShapeAccess__12cCcD_SphAttrCFPQ214cCcD_ShapeAttr5Shape */
void cCcD_SphAttr::getShapeAccess(cCcD_ShapeAttr::Shape* pshape) const {
pshape->_0 = 0;
pshape->_4 = mCenter.x;
pshape->_8 = mCenter.y;
pshape->_C = mCenter.z;
pshape->_4.x = mCenter.x;
pshape->_4.y = mCenter.y;
pshape->_4.z = mCenter.z;
pshape->_10 = mRadius;
pshape->_14 = 0.0f;
}
@@ -790,4 +790,4 @@ void cCcD_ObjCo::SetIGrp(u32 grp) {
void cCcD_ObjCo::SetVsGrp(u32 grp) {
mSPrm &= ~0x70;
mSPrm |= grp;
}
}
src/d/actor/d_a_alink_grab.inc
+1 -1
View File
@@ -1703,7 +1703,7 @@ int daAlink_c::endPushPull() {
*/
f32 daAlink_c::getPushPullAnimeSpeed() {
f32 var_f31;
if ((getMoveBGActorName(mPolyInfo1, 0) == PROC_Obj_Movebox && ((daObjMovebox::Act_c*)dComIfG_Bgsp().GetActorPointer(mPolyInfo1.GetBgIndex()))->getType() != 0) ||
if ((getMoveBGActorName(mPolyInfo1, 0) == PROC_Obj_Movebox && ((daObjMovebox::Act_c*)dComIfG_Bgsp().GetActorPointer(mPolyInfo1))->getType() != 0) ||
getMoveBGActorName(mPolyInfo1, 0) == PROC_Obj_Bemos)
{
if (checkWolf()) {
src/d/actor/d_a_e_fz.cpp
+1 -1
View File
@@ -731,7 +731,7 @@ void daE_FZ_c::action() {
}
if (1 < health && mAcchCir.ChkWallHit()) {
if (fopAcM_GetName(dComIfG_Bgsp().GetActorPointer(mAcchCir.GetBgIndex())) != PROC_BG) {
if (fopAcM_GetName(dComIfG_Bgsp().GetActorPointer(mAcchCir)) != PROC_BG) {
dBgS_LinChk lin_chk;
dBgS_LinChk lin_chk2;
src/d/actor/d_a_e_s1.cpp
+1 -2
View File
@@ -536,8 +536,7 @@ static void e_s1_roof(e_s1_class* i_this) {
case 1:
roof_wait = true;
if (i_this->mSwBit != 0xFF) {
s32 room_no = dComIfGp_roomControl_getStayNo();
if (dComIfGs_isSwitch(i_this->mSwBit, room_no)) {
if (dComIfGs_isSwitch(i_this->mSwBit, dComIfGp_roomControl_getStayNo())) {
i_this->mMode = 2;
}
} else if (fopAcM_searchPlayerDistanceXZ(a_this) < i_this->mPrm1 * 100.0f) {
src/d/actor/d_a_kytag00.cpp
+10 -30
View File
@@ -395,24 +395,14 @@ static int daKytag00_Draw(kytag00_class* i_this) {
/* 8046C684-8046C76C 000FE4 00E8+00 1/0 0/0 0/0 .text daKytag00_Execute__FP13kytag00_class */
static int daKytag00_Execute(kytag00_class* i_this) {
BOOL var_r30 = true;
BOOL var_r30 = TRUE;
if (i_this->field_0x571 != 0xFF) {
s32 room_no = dComIfGp_roomControl_getStayNo();
if (dComIfGs_isSwitch(i_this->field_0x571, room_no)) {
var_r30 = 0;
goto label;
}
if (i_this->field_0x571 != 0xFF && dComIfGs_isSwitch(i_this->field_0x571, dComIfGp_roomControl_getStayNo())) {
var_r30 = FALSE;
} else if (i_this->field_0x572 != 0xFF && !dComIfGs_isSwitch(i_this->field_0x572, dComIfGp_roomControl_getStayNo())) {
var_r30 = FALSE;
}
if (i_this->field_0x572 != 0xFF) {
s32 room_no = dComIfGp_roomControl_getStayNo();
if (!dComIfGs_isSwitch(i_this->field_0x572, room_no)) {
var_r30 = 0;
}
}
label:
if (var_r30 == TRUE) {
cLib_addCalc(&i_this->field_0x588, 1.0f, 0.1f, 0.01f, 0.0001f);
} else {
@@ -450,24 +440,14 @@ static int daKytag00_Create(fopAc_ac_c* i_this) {
a_this->field_0x571 = a_this->current.angle.x & 0xFF;
a_this->field_0x572 = (a_this->current.angle.x >> 8) & 0xFF;
BOOL var_r30 = true;
BOOL var_r30 = TRUE;
if (a_this->field_0x571 != 0xFF) {
s32 room_no = dComIfGp_roomControl_getStayNo();
if (dComIfGs_isSwitch(a_this->field_0x571, room_no)) {
var_r30 = 0;
goto label;
}
if (a_this->field_0x571 != 0xFF && dComIfGs_isSwitch(a_this->field_0x571, dComIfGp_roomControl_getStayNo())) {
var_r30 = FALSE;
} else if (a_this->field_0x572 != 0xFF && !dComIfGs_isSwitch(a_this->field_0x572, dComIfGp_roomControl_getStayNo())) {
var_r30 = FALSE;
}
if (a_this->field_0x572 != 0xFF) {
s32 room_no = dComIfGp_roomControl_getStayNo();
if (!dComIfGs_isSwitch(a_this->field_0x572, room_no)) {
var_r30 = 0;
}
}
label:
if (var_r30 == TRUE) {
a_this->field_0x588 = 1.0f;
} else {
src/d/actor/d_a_kytag04.cpp
+5 -10
View File
@@ -34,8 +34,7 @@ static int daKytag04_Draw(kytag04_class* i_this) {
if (i_this->field_0x5b4 == 4 || i_this->field_0x5b4 == 5) {
if (i_this->field_0x5b4 == 4) {
if (i_this->field_0x5b5 != 0xFF && i_this->field_0x5d1 == 1) {
s32 room_no = dComIfGp_roomControl_getStayNo();
if (dComIfGs_isSwitch(i_this->field_0x5b5, room_no)) {
if (dComIfGs_isSwitch(i_this->field_0x5b5, dComIfGp_roomControl_getStayNo())) {
var_r30 = 1;
}
}
@@ -301,8 +300,7 @@ static int daKytag04_Create(fopAc_ac_c* i_this) {
dComIfGp_setNeedLightDropNum(a_this->mNeedDropNum);
if (a_this->field_0x5b5 != 0xFF) {
s32 room_no = dComIfGp_roomControl_getStayNo();
if (dComIfGs_isSwitch(a_this->field_0x5b5, room_no)) {
if (dComIfGs_isSwitch(a_this->field_0x5b5, dComIfGp_roomControl_getStayNo())) {
a_this->field_0x5b7 = 1;
}
}
@@ -317,14 +315,12 @@ static int daKytag04_Create(fopAc_ac_c* i_this) {
OS_WARNING("\n緊急事態！！　雫がそろってるのにまだ闇世界なので強引に進めます]");
a_this->field_0x5b7 = -1;
s32 room_no = dComIfGp_roomControl_getStayNo();
dComIfGs_onSwitch(a_this->field_0x5b5, room_no);
dComIfGs_onSwitch(a_this->field_0x5b5, dComIfGp_roomControl_getStayNo());
}
}
} else if (a_this->field_0x5b4 == 4) {
if (a_this->field_0x5b5 != 0xFF) {
s32 room_no = dComIfGp_roomControl_getStayNo();
if (dComIfGs_isSwitch(a_this->field_0x5b5, room_no)) {
if (dComIfGs_isSwitch(a_this->field_0x5b5, dComIfGp_roomControl_getStayNo())) {
a_this->field_0x5d1 = 1;
a_this->field_0x5c8 = 999.0f;
a_this->field_0x5cc = 20;
@@ -345,8 +341,7 @@ static int daKytag04_Create(fopAc_ac_c* i_this) {
}
if (a_this->field_0x5b4 == 4 && a_this->field_0x5b5 != 0xFF) {
s32 room_no = dComIfGp_roomControl_getStayNo();
if (dComIfGs_isSwitch(a_this->field_0x5b5, room_no)) {
if (dComIfGs_isSwitch(a_this->field_0x5b5, dComIfGp_roomControl_getStayNo())) {
a_this->mBtk.setFrame(a_this->mBtk.getEndFrame());
a_this->mBrk.setFrame(a_this->mBrk.getEndFrame());
}
src/d/actor/d_a_kytag06.cpp
+3 -7
View File
@@ -952,8 +952,7 @@ static void daKytag06_type_03_Execute(kytag06_class* i_this) {
i_this->field_0x578 = 450;
dKy_change_colpat(i_this->field_0x591);
s32 stayNo = dComIfGp_roomControl_getStayNo();
dComIfGs_onSwitch(i_this->mSwNo, stayNo);
dComIfGs_onSwitch(i_this->mSwNo, dComIfGp_roomControl_getStayNo());
}
break;
case 1:
@@ -1046,8 +1045,7 @@ static int daKytag06_Execute(kytag06_class* i_this) {
break;
case 2:
if (i_this->mSwNo != 0xFF) {
s32 stayNo = dComIfGp_roomControl_getStayNo();
if (dComIfGs_isSwitch(i_this->mSwNo, stayNo) && i_this->mMode == 0) {
if (dComIfGs_isSwitch(i_this->mSwNo, dComIfGp_roomControl_getStayNo()) && i_this->mMode == 0) {
i_this->mMode = 1;
dKy_change_colpat(i_this->field_0x591);
}
@@ -1247,9 +1245,7 @@ static void daKytag06_type03_init(fopAc_ac_c* i_this) {
// 0C01: Midna's Desperate Hour started 1E08: Midna's Desperate Hour Completed
if (dComIfGs_isEventBit(0x0C01) && !dComIfGs_isEventBit(0x1E08) && a_this->mSwNo != 0xFF)
{
s32 stayNo = dComIfGp_roomControl_getStayNo();
if (dComIfGs_isSwitch(a_this->mSwNo, stayNo)) {
if (dComIfGs_isSwitch(a_this->mSwNo, dComIfGp_roomControl_getStayNo())) {
a_this->mMode = 9;
g_env_light.raincnt = 250;
g_env_light.mColpatWeather = a_this->field_0x591;
src/d/actor/d_a_kytag11.cpp
+2 -4
View File
@@ -25,8 +25,7 @@ static int daKytag11_Execute(kytag11_class* i_this) {
i_this->mChangeTime = false;
}
} else if (i_this->mOnSwitchNo != 0xFF) {
s32 room_no = dComIfGp_roomControl_getStayNo();
if (!dComIfGs_isSwitch(i_this->mOnSwitchNo, room_no)) {
if (!dComIfGs_isSwitch(i_this->mOnSwitchNo, dComIfGp_roomControl_getStayNo())) {
i_this->mChangeTime = false;
}
}
@@ -36,8 +35,7 @@ static int daKytag11_Execute(kytag11_class* i_this) {
i_this->mChangeTime = false;
}
} else if (i_this->mOffSwitchNo != 0xFF) {
s32 room_no = dComIfGp_roomControl_getStayNo();
if (dComIfGs_isSwitch(i_this->mOffSwitchNo, room_no)) {
if (dComIfGs_isSwitch(i_this->mOffSwitchNo, dComIfGp_roomControl_getStayNo())) {
i_this->mChangeTime = false;
}
}
src/d/actor/d_a_kytag13.cpp
+28 -423
View File
@@ -7,59 +7,6 @@
#include "SSystem/SComponent/c_math.h"
#include "d/d_com_inf_game.h"
#include "d/d_kankyo_rain.h"
#include "dol2asm.h"
//
// Forward References:
//
extern "C" static bool daKytag13_Draw__FP13kytag13_class();
extern "C" static void vectle_calc__FP10DOUBLE_POSP4cXyz();
extern "C" static void daKytag13_Execute_standard__FP13kytag13_class();
extern "C" void __dt__14dBgS_ObjGndChkFv();
extern "C" static void daKytag13_Execute__FP13kytag13_class();
extern "C" static bool daKytag13_IsDelete__FP13kytag13_class();
extern "C" static bool daKytag13_Delete__FP13kytag13_class();
extern "C" static void daKytag13_Create__FP10fopAc_ac_c();
extern "C" static void func_80860450();
extern "C" static void func_80860458();
extern "C" static void func_80860460();
extern "C" extern char const* const d_a_kytag13__stringBase0;
//
// External References:
//
extern "C" void mDoMtx_XrotM__FPA4_fs();
extern "C" void mDoMtx_YrotM__FPA4_fs();
extern "C" void mDoMtx_ZrotM__FPA4_fs();
extern "C" void __ct__10fopAc_ac_cFv();
extern "C" void isSwitch__10dSv_info_cCFii();
extern "C" void dKyw_get_wind_vec__Fv();
extern "C" void dKyw_get_wind_pow__Fv();
extern "C" void dKyw_get_wind_vecpow__Fv();
extern "C" void dKyr_get_vectle_calc__FP4cXyzP4cXyzP4cXyz();
extern "C" void GroundCross__4cBgSFP11cBgS_GndChk();
extern "C" void __ct__11dBgS_GndChkFv();
extern "C" void __dt__11dBgS_GndChkFv();
extern "C" void __dt__18dBgS_ObjGndChk_AllFv();
extern "C" void SetObj__16dBgS_PolyPassChkFv();
extern "C" void cM_rndF__Ff();
extern "C" void cM_rndFX__Ff();
extern "C" void SetPos__11cBgS_GndChkFPC4cXyz();
extern "C" void cM3d_VectorProduct2d__Fffffff();
extern "C" void cLib_addCalc__FPfffff();
extern "C" void __dl__FPv();
extern "C" void _savegpr_21();
extern "C" void _restgpr_21();
extern "C" extern void* __vt__18dBgS_ObjGndChk_All[12];
extern "C" u8 now__14mDoMtx_stack_c[48];
extern "C" u8 sincosTable___5JMath[65536];
//
// Declarations:
//
/* 8085F1F8-8085F200 000078 0008+00 1/0 0/0 0/0 .text daKytag13_Draw__FP13kytag13_class
*/
@@ -67,22 +14,6 @@ static int daKytag13_Draw(kytag13_class* i_this) {
return 1;
}
/* ############################################################################################## */
/* 80860470-80860478 000000 0008+00 2/2 0/0 0/0 .rodata @3783 */
SECTION_RODATA static u8 const lit_3783[8] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x80860470, &lit_3783);
/* 80860478-8086047C 000008 0004+00 1/2 0/0 0/0 .rodata @3784 */
SECTION_RODATA static u8 const lit_3784[4] = {
0x00,
0x00,
0x00,
0x00,
};
COMPILER_STRIP_GATE(0x80860478, &lit_3784);
/* 8085F200-8085F2B0 000080 00B0+00 1/1 0/0 0/0 .text vectle_calc__FP10DOUBLE_POSP4cXyz
*/
static void vectle_calc(DOUBLE_POS* pos, cXyz* out) {
@@ -98,352 +29,6 @@ static void vectle_calc(DOUBLE_POS* pos, cXyz* out) {
}
}
/* ############################################################################################## */
/* 8086047C-80860480 00000C 0004+00 0/1 0/0 0/0 .rodata @4177 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4177 = 100.0f;
COMPILER_STRIP_GATE(0x8086047C, &lit_4177);
#pragma pop
/* 80860480-80860484 000010 0004+00 0/1 0/0 0/0 .rodata @4178 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4178 = 5.0f;
COMPILER_STRIP_GATE(0x80860480, &lit_4178);
#pragma pop
/* 80860484-80860488 000014 0004+00 0/1 0/0 0/0 .rodata @4179 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4179 = 1000.0f;
COMPILER_STRIP_GATE(0x80860484, &lit_4179);
#pragma pop
/* 80860488-8086048C 000018 0004+00 0/1 0/0 0/0 .rodata @4180 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4180 = 3.0f / 10.0f;
COMPILER_STRIP_GATE(0x80860488, &lit_4180);
#pragma pop
/* 8086048C-80860490 00001C 0004+00 0/1 0/0 0/0 .rodata @4181 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4181 = 1.0f;
COMPILER_STRIP_GATE(0x8086048C, &lit_4181);
#pragma pop
/* 80860490-80860494 000020 0004+00 0/1 0/0 0/0 .rodata @4182 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4182 = -0.0f;
COMPILER_STRIP_GATE(0x80860490, &lit_4182);
#pragma pop
/* 80860494-80860498 000024 0004+00 0/1 0/0 0/0 .rodata @4183 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4183 = -3.0f / 10.0f;
COMPILER_STRIP_GATE(0x80860494, &lit_4183);
#pragma pop
/* 80860498-8086049C 000028 0004+00 0/1 0/0 0/0 .rodata @4184 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4184 = -2.0f / 5.0f;
COMPILER_STRIP_GATE(0x80860498, &lit_4184);
#pragma pop
/* 8086049C-808604A0 00002C 0004+00 0/1 0/0 0/0 .rodata @4185 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4185 = 1.0f / 5.0f;
COMPILER_STRIP_GATE(0x8086049C, &lit_4185);
#pragma pop
/* 808604A0-808604A4 000030 0004+00 0/1 0/0 0/0 .rodata @4186 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4186 = 4.0f;
COMPILER_STRIP_GATE(0x808604A0, &lit_4186);
#pragma pop
/* 808604A4-808604A8 000034 0004+00 0/1 0/0 0/0 .rodata @4187 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4187 = 6.0f;
COMPILER_STRIP_GATE(0x808604A4, &lit_4187);
#pragma pop
/* 808604A8-808604AC 000038 0004+00 0/1 0/0 0/0 .rodata @4188 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4188 = 500.0f;
COMPILER_STRIP_GATE(0x808604A8, &lit_4188);
#pragma pop
/* 808604AC-808604B0 00003C 0004+00 0/1 0/0 0/0 .rodata @4189 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4189 = 65536.0f;
COMPILER_STRIP_GATE(0x808604AC, &lit_4189);
#pragma pop
/* 808604B0-808604B4 000040 0004+00 0/1 0/0 0/0 .rodata @4190 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4190 = 1680.0f;
COMPILER_STRIP_GATE(0x808604B0, &lit_4190);
#pragma pop
/* 808604B4-808604B8 000044 0004+00 0/1 0/0 0/0 .rodata @4191 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4191 = 200.0f;
COMPILER_STRIP_GATE(0x808604B4, &lit_4191);
#pragma pop
/* 808604B8-808604BC 000048 0004+00 0/1 0/0 0/0 .rodata @4192 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4192 = 1630.0f;
COMPILER_STRIP_GATE(0x808604B8, &lit_4192);
#pragma pop
/* 808604BC-808604C0 00004C 0004+00 0/1 0/0 0/0 .rodata @4193 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4193 = 4280.0f;
COMPILER_STRIP_GATE(0x808604BC, &lit_4193);
#pragma pop
/* 808604C0-808604C4 000050 0004+00 0/1 0/0 0/0 .rodata @4194 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4194 = -1680.0f;
COMPILER_STRIP_GATE(0x808604C0, &lit_4194);
#pragma pop
/* 808604C4-808604C8 000054 0004+00 0/1 0/0 0/0 .rodata @4195 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4195 = 5000.0f;
COMPILER_STRIP_GATE(0x808604C4, &lit_4195);
#pragma pop
/* 808604C8-808604CC 000058 0004+00 0/1 0/0 0/0 .rodata @4196 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4196 = 750.0f;
COMPILER_STRIP_GATE(0x808604C8, &lit_4196);
#pragma pop
/* 808604CC-808604D0 00005C 0004+00 0/1 0/0 0/0 .rodata @4197 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4197 = 7110.0f;
COMPILER_STRIP_GATE(0x808604CC, &lit_4197);
#pragma pop
/* 808604D0-808604D4 000060 0004+00 0/1 0/0 0/0 .rodata @4198 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4198 = -22.0f;
COMPILER_STRIP_GATE(0x808604D0, &lit_4198);
#pragma pop
/* 808604D4-808604D8 000064 0004+00 0/1 0/0 0/0 .rodata @4199 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4199 = 950.0f;
COMPILER_STRIP_GATE(0x808604D4, &lit_4199);
#pragma pop
/* 808604D8-808604E0 000068 0004+04 0/1 0/0 0/0 .rodata @4200 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4200[1 + 1 /* padding */] = {
-50.0f,
/* padding */
0.0f,
};
COMPILER_STRIP_GATE(0x808604D8, &lit_4200);
#pragma pop
/* 808604E0-808604E8 000070 0008+00 0/1 0/0 0/0 .rodata @4201 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_4201[8] = {
0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x808604E0, &lit_4201);
#pragma pop
/* 808604E8-808604F0 000078 0008+00 0/1 0/0 0/0 .rodata @4202 */
#pragma push
#pragma force_active on
SECTION_RODATA static u8 const lit_4202[8] = {
0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};
COMPILER_STRIP_GATE(0x808604E8, &lit_4202);
#pragma pop
/* 808604F0-808604F4 000080 0004+00 0/1 0/0 0/0 .rodata @4203 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4203 = 2.0f / 25.0f;
COMPILER_STRIP_GATE(0x808604F0, &lit_4203);
#pragma pop
/* 808604F4-808604F8 000084 0004+00 0/1 0/0 0/0 .rodata @4204 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4204 = 0.5f;
COMPILER_STRIP_GATE(0x808604F4, &lit_4204);
#pragma pop
/* 808604F8-808604FC 000088 0004+00 0/1 0/0 0/0 .rodata @4205 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4205 = 1.0f / 10.0f;
COMPILER_STRIP_GATE(0x808604F8, &lit_4205);
#pragma pop
/* 808604FC-80860500 00008C 0004+00 0/1 0/0 0/0 .rodata @4206 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4206 = 1.0f / 100.0f;
COMPILER_STRIP_GATE(0x808604FC, &lit_4206);
#pragma pop
/* 80860500-80860504 000090 0004+00 0/1 0/0 0/0 .rodata @4207 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4207 = 37.0f / 10.0f;
COMPILER_STRIP_GATE(0x80860500, &lit_4207);
#pragma pop
/* 80860504-80860508 000094 0004+00 0/1 0/0 0/0 .rodata @4208 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4208 = 3.0f;
COMPILER_STRIP_GATE(0x80860504, &lit_4208);
#pragma pop
/* 80860508-8086050C 000098 0004+00 0/1 0/0 0/0 .rodata @4209 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4209 = 3000.0f;
COMPILER_STRIP_GATE(0x80860508, &lit_4209);
#pragma pop
/* 8086050C-80860510 00009C 0004+00 0/1 0/0 0/0 .rodata @4210 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4210 = 0.25f;
COMPILER_STRIP_GATE(0x8086050C, &lit_4210);
#pragma pop
/* 80860510-80860514 0000A0 0004+00 0/1 0/0 0/0 .rodata @4211 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4211 = 1500.0f;
COMPILER_STRIP_GATE(0x80860510, &lit_4211);
#pragma pop
/* 80860514-80860518 0000A4 0004+00 0/1 0/0 0/0 .rodata @4212 */
#pragma push
#pragma force_active on
SECTION_RODATA static u32 const lit_4212 = 0x3A83126F;
COMPILER_STRIP_GATE(0x80860514, &lit_4212);
#pragma pop
/* 80860518-8086051C 0000A8 0004+00 0/1 0/0 0/0 .rodata @4213 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4213 = 1.0f / 20.0f;
COMPILER_STRIP_GATE(0x80860518, &lit_4213);
#pragma pop
/* 8086051C-80860520 0000AC 0004+00 0/1 0/0 0/0 .rodata @4214 */
#pragma push
#pragma force_active on
SECTION_RODATA static u32 const lit_4214 = 0x38D1B717;
COMPILER_STRIP_GATE(0x8086051C, &lit_4214);
#pragma pop
/* 80860520-80860524 0000B0 0004+00 0/1 0/0 0/0 .rodata @4215 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4215 = 10.0f;
COMPILER_STRIP_GATE(0x80860520, &lit_4215);
#pragma pop
/* 80860524-80860528 0000B4 0004+00 0/1 0/0 0/0 .rodata @4216 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4216 = -5560.0f;
COMPILER_STRIP_GATE(0x80860524, &lit_4216);
#pragma pop
/* 80860528-8086052C 0000B8 0004+00 0/1 0/0 0/0 .rodata @4217 */
#pragma push
#pragma force_active on
SECTION_RODATA static f32 const lit_4217 = 925.0f;
COMPILER_STRIP_GATE(0x80860528, &lit_4217);
#pragma pop
/* 80860538-80860538 0000C8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
#pragma push
#pragma force_active on
SECTION_DEAD static char const* const stringBase_80860538 = "D_MN11";
#pragma pop
/* 80860540-80860560 -00001 0020+00 1/0 0/0 0/0 .data l_daKytag13_Method */
static actor_method_class l_daKytag13_Method = {
(process_method_func)daKytag13_Create__FP10fopAc_ac_c,
(process_method_func)daKytag13_Delete__FP13kytag13_class,
(process_method_func)daKytag13_Execute__FP13kytag13_class,
(process_method_func)daKytag13_IsDelete__FP13kytag13_class,
(process_method_func)daKytag13_Draw__FP13kytag13_class,
};
/* 80860560-80860590 -00001 0030+00 0/0 0/0 1/0 .data g_profile_KYTAG13 */
extern actor_process_profile_definition g_profile_KYTAG13 = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_KYTAG13, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(kytag13_class), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
107, // mPriority
&l_daKytag13_Method, // sub_method
0x00060000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_0_e, // cullType
};
/* 80860590-808605C0 000050 0030+00 2/2 0/0 0/0 .data __vt__14dBgS_ObjGndChk */
SECTION_DATA extern void* __vt__14dBgS_ObjGndChk[12] = {
(void*)NULL /* RTTI */,
(void*)NULL,
(void*)__dt__14dBgS_ObjGndChkFv,
(void*)NULL,
(void*)NULL,
(void*)func_80860450,
(void*)NULL,
(void*)NULL,
(void*)func_80860460,
(void*)NULL,
(void*)NULL,
(void*)func_80860458,
};
/* 8085F2B0-80860148 000130 0E98+00 1/1 0/0 0/0 .text
* daKytag13_Execute_standard__FP13kytag13_class */
// NONMATCHING - some regalloc
@@ -481,8 +66,7 @@ static int daKytag13_Execute_standard(kytag13_class* i_this) {
f32 temp_f27 = a_this->current.pos.y;
if (i_this->field_0x57a != 0xFF) {
s32 roomNo = dComIfGp_roomControl_getStayNo();
if (!dComIfGs_isSwitch(i_this->field_0x57a, roomNo)) {
if (!dComIfGs_isSwitch(i_this->field_0x57a, dComIfGp_roomControl_getStayNo())) {
g_env_light.field_0xe90 = 0;
}
}
@@ -754,12 +338,6 @@ static int daKytag13_Execute_standard(kytag13_class* i_this) {
return 1;
}
/* 80860148-808601C0 000FC8 0078+00 4/3 0/0 0/0 .text __dt__14dBgS_ObjGndChkFv */
// dBgS_ObjGndChk::~dBgS_ObjGndChk() {
extern "C" void __dt__14dBgS_ObjGndChkFv() {
// NONMATCHING
}
/* 808601C0-80860200 001040 0040+00 1/0 0/0 0/0 .text daKytag13_Execute__FP13kytag13_class */
static int daKytag13_Execute(kytag13_class* i_this) {
if (i_this->home.roomNo == dComIfGp_roomControl_getStayNo()) {
@@ -846,3 +424,30 @@ static int daKytag13_Create(fopAc_ac_c* i_this) {
return cPhs_COMPLEATE_e;
}
/* 80860540-80860560 -00001 0020+00 1/0 0/0 0/0 .data l_daKytag13_Method */
static actor_method_class l_daKytag13_Method = {
(process_method_func)daKytag13_Create,
(process_method_func)daKytag13_Delete,
(process_method_func)daKytag13_Execute,
(process_method_func)daKytag13_IsDelete,
(process_method_func)daKytag13_Draw,
};
/* 80860560-80860590 -00001 0030+00 0/0 0/0 1/0 .data g_profile_KYTAG13 */
extern actor_process_profile_definition g_profile_KYTAG13 = {
fpcLy_CURRENT_e, // mLayerID
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_KYTAG13, // mProcName
&g_fpcLf_Method.base, // sub_method
sizeof(kytag13_class), // mSize
0, // mSizeOther
0, // mParameters
&g_fopAc_Method.base, // sub_method
107, // mPriority
&l_daKytag13_Method, // sub_method
0x00060000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_0_e, // cullType
};
src/d/actor/d_a_kytag14.cpp
+2 -4
View File
@@ -42,8 +42,7 @@ static int daKytag14_Execute(kytag14_class* i_this) {
}
if (i_this->mSwitchNo1 != 0xFF) {
s32 stayNo = dComIfGp_roomControl_getStayNo();
if (dComIfGs_isSwitch(i_this->mSwitchNo1, stayNo)) {
if (dComIfGs_isSwitch(i_this->mSwitchNo1, dComIfGp_roomControl_getStayNo())) {
switch1_set = true;
} else {
switch1_set = false;
@@ -51,8 +50,7 @@ static int daKytag14_Execute(kytag14_class* i_this) {
}
if (i_this->mSwitchNo2 != 0xFF) {
s32 stayNo = dComIfGp_roomControl_getStayNo();
if (!dComIfGs_isSwitch(i_this->mSwitchNo2, stayNo)) {
if (!dComIfGs_isSwitch(i_this->mSwitchNo2, dComIfGp_roomControl_getStayNo())) {
switch2_unset = true;
} else {
switch2_unset = false;
src/d/actor/d_a_kytag16.cpp
+1 -3
View File
@@ -41,9 +41,7 @@ static int daKytag16_Execute(kytag16_class* i_this) {
var_r29 = false;
if (i_this->mSwitch != 0xFF) {
s32 room_no = dComIfGp_roomControl_getStayNo();
if (dComIfGs_isSwitch(i_this->mSwitch, room_no)) {
if (dComIfGs_isSwitch(i_this->mSwitch, dComIfGp_roomControl_getStayNo())) {
var_r29 = true;
}
} else {
src/d/d_a_obj.cpp
+9
View File
@@ -217,4 +217,13 @@ void HitSeStart(cXyz const* i_sePos, int i_roomNo, dCcD_GObjInf const* i_CcObj,
mDoAud_seStart(sfx, i_sePos, param_3 & 0xFF, (s8)reverb);
}
}
static cXyz dummy1(cCcD_CylAttr* cyl) {
return cyl->GetCoCP();
}
static cXyz dummy2(cCcD_SphAttr* sph) {
return sph->GetCoCP();
}
} // namespace daObj
src/d/d_camera.cpp
+4907 -767
View File
File diff suppressed because it is too large Load Diff
src/d/d_com_inf_game.cpp
+4 -6
View File
@@ -841,9 +841,9 @@ int dComIfG_play_c::getLayerNo_common(char const* i_stageName, int i_roomID, int
/* 8002C97C-8002C9D8 0272BC 005C+00 1/1 22/22 68/68 .text getLayerNo__14dComIfG_play_cFi
*/
int dComIfG_play_c::getLayerNo(int) {
s32 roomNo = dComIfGp_roomControl_getStayNo();
int roomNo = dComIfGp_roomControl_getStayNo();
if ((s8)roomNo <= -1) {
if (roomNo <= -1) {
roomNo = dComIfGp_getStartStageRoomNo();
}
@@ -2367,16 +2367,14 @@ void dComIfGs_onVisitedRoom(int i_roomNo) {
/* 8002FC3C-8002FC98 02A57C 005C+00 0/0 0/0 1/1 .text dComIfGs_offVisitedRoom__Fi */
void dComIfGs_offVisitedRoom(int i_roomNo) {
s32 stayNo = dComIfGp_roomControl_getStayNo();
dStage_FileList2_dt_c* list = dStage_roomControl_c::getFileList2(stayNo);
dStage_FileList2_dt_c* list = dStage_roomControl_c::getFileList2(dComIfGp_roomControl_getStayNo());
dComIfGs_offSaveVisitedRoom(list->field_0x13, i_roomNo);
}
/* 8002FC98-8002FCF4 02A5D8 005C+00 0/0 1/1 0/0 .text dComIfGs_isVisitedRoom__Fi */
BOOL dComIfGs_isVisitedRoom(int param_0) {
s32 stayNo = dComIfGp_roomControl_getStayNo();
dStage_FileList2_dt_c* fileList = dStage_roomControl_c::getFileList2(stayNo);
dStage_FileList2_dt_c* fileList = dStage_roomControl_c::getFileList2(dComIfGp_roomControl_getStayNo());
return dComIfGs_isSaveVisitedRoom(fileList->field_0x13, param_0);
}
src/d/d_demo.cpp
+2 -2
View File
@@ -1162,8 +1162,8 @@ void dDemo_c::reset() {
/* 80039F1C-80039F9C 03485C 0080+00 1/0 0/0 0/0 .text emitter_create__16dDemo_particle_cFUl */
JPABaseEmitter* dDemo_particle_c::emitter_create(u32 i_id) {
cXyz pos(0.0f, 0.0f, 0.0f);
int stayNo = dComIfGp_roomControl_getStayNo();
return dComIfGp_particle_set(i_id, &pos, NULL, NULL, 0xFF, NULL, stayNo, NULL, NULL, NULL);
return dComIfGp_particle_set(i_id, &pos, NULL, NULL, 0xFF, NULL,
dComIfGp_roomControl_getStayNo(), NULL, NULL, NULL);
}
/* 80039F9C-80039FFC 0348DC 0060+00 1/0 0/0 0/0 .text __dt__16dDemo_particle_cFv */
src/d/d_envse.cpp
+2 -2
View File
@@ -69,7 +69,7 @@ static void dEnvSe_getNearPathPos(cXyz* param_0, cXyz* param_1, dPath* i_path) {
/* 80182FD8-80183480 17D918 04A8+00 1/1 0/0 0/0 .text
* execute_common__8dEnvSe_cFP18dStage_SoundInfo_cPScUc */
int dEnvSe_c::execute_common(dStage_SoundInfo_c* i_soundInf, s8* param_1, u8 param_2) {
s32 roomNo = dComIfGp_roomControl_getStayNo();
int roomNo = dComIfGp_roomControl_getStayNo();
int path_roomNo = dComIfGp_roomControl_getStayNo();
BOOL var_r25 = false;
@@ -189,7 +189,7 @@ int dEnvSe_c::execute_common(dStage_SoundInfo_c* i_soundInf, s8* param_1, u8 par
/* 80183480-801835A0 17DDC0 0120+00 1/1 0/0 0/0 .text execute__8dEnvSe_cFv */
int dEnvSe_c::execute() {
s32 roomNo = dComIfGp_roomControl_getStayNo();
int roomNo = dComIfGp_roomControl_getStayNo();
dStage_roomDt_c* roomDt_p = dComIfGp_roomControl_getStatusRoomDt(roomNo);
if (roomDt_p == NULL) {
src/d/d_error_msg.cpp
+2 -3
View File
@@ -177,7 +177,6 @@ u8 dDvdErrorMsg_c::execute() {
static u8 l_captureAlpha = 0xFF;
/* 8009D410-8009D790 097D50 0380+00 1/1 0/0 0/0 .text drawCapture__FUc */
// NONMATCHING - stack too small
static void drawCapture(u8 alpha) {
static bool l_texCopied = false;
@@ -188,7 +187,7 @@ static void drawCapture(u8 alpha) {
l_texCopied = true;
}
JFWDisplay::getManager()->setClearColor(g_clearColor);
mDoGph_gInf_c::setClearColor(g_clearColor);
mDoGph_gInf_c::beginRender();
GXSetAlphaUpdate(GX_FALSE);
j3dSys.drawInit();
@@ -218,7 +217,7 @@ static void drawCapture(u8 alpha) {
GXSetCullMode(GX_CULL_NONE);
GXSetDither(GX_ENABLE);
Mtx m;
Mtx44 m;
C_MTXOrtho(m, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 10.0f);
GXLoadPosMtxImm(g_mDoMtx_identity, GX_PNMTX0);
GXSetProjection(m, GX_ORTHOGRAPHIC);
src/d/d_ev_camera.cpp
+84 -135
View File
File diff suppressed because it is too large Load Diff
src/d/d_event_manager.cpp
+1 -1
View File
@@ -38,7 +38,7 @@ const char* dEvent_exception_c::getEventName() {
"PORTALWARP_START", "PORTALWARP_START_B",
};
s32 roomNo = dComIfGp_roomControl_getStayNo();
int roomNo = dComIfGp_roomControl_getStayNo();
dStage_roomDt_c* roomDt = dComIfGp_roomControl_getStatusRoomDt(roomNo);
dStage_MapEventInfo_c* eventInfo = roomDt->getMapEventInfo();
if (mEventInfoIdx == -1) {
src/d/d_item.cpp
+1 -2
View File
@@ -774,8 +774,7 @@ void item_func_WOOD_STICK() {
dComIfGs_setCollectSword(COLLECT_WOODEN_SWORD);
dComIfGs_setSelectEquipSword(fpcNm_ITEM_WOOD_STICK);
s32 roomNo = dComIfGp_roomControl_getStayNo();
dComIfGs_onSwitch(28, roomNo);
dComIfGs_onSwitch(28, dComIfGp_roomControl_getStayNo());
}
void item_func_BOOMERANG() {

Some files were not shown because too many files have changed in this diff Show More