mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-17 04:31:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Do some work on f_op_actor_mng (#328)

Browse Source 
* decompctx - try without shiftjis and write utf8 as output

* Do some work on f_op_actor_mng

* Remove duplicated includes

* Add fopAcM_setEffectMtx

* Match dShopSystem_searchCameraActor

* fopAcM_setEffectMtx now matches with literals

* Remove unnecessary inline in headers
This commit is contained in:
hatal175
2023-05-09 01:10:22 +03:00
committed by GitHub
parent 85827b28ff
commit 44b0fdbb0d
26 changed files with 225 additions and 569 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_path.cpp
+1 -1
View File
@@ -67,7 +67,7 @@ dPath* dPath_GetNextRoomPath(dPath const* p_path, int room_no) {
/* 8005195C-80051AC0 04C29C 0164+00 0/0 1/1 4/4 .text
* dPath_GetPolyRoomPathVec__FRC13cBgS_PolyInfoP4cXyzPi */
int dPath_GetPolyRoomPathVec(cBgS_PolyInfo const& poly, cXyz* p_pathVec, int* param_2) {
u8 dPath_GetPolyRoomPathVec(cBgS_PolyInfo const& poly, cXyz* p_pathVec, int* param_2) {
int roomId = dComIfG_Bgsp().GetRoomId(poly);
int roomPathId = dComIfG_Bgsp().GetRoomPathId(poly);
src/d/particle/d_particle.cpp
+1 -1
View File
@@ -1970,7 +1970,7 @@ asm void dPa_control_c::setStopContinue(u32 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void dPa_control_c::setSimpleFoot(u32 param_0, u32* param_1, cBgS_PolyInfo& param_2,
asm u32 dPa_control_c::setSimpleFoot(u32 param_0, u32* param_1, cBgS_PolyInfo& param_2,
cXyz const* param_3, dKy_tevstr_c const* param_4, int param_5,
csXyz const* param_6, cXyz const* param_7,
dPa_levelEcallBack* param_8, s8 param_9,
src/d/shop/d_shop_system.cpp
+22 -7
View File
@@ -267,14 +267,29 @@ SECTION_SDATA static fopAc_ac_c* dShopSystem_cameraActor[2] = {NULL, NULL};
static int dShopSystem_camera_count;
/* 80197270-80197338 191BB0 00C8+00 1/1 0/0 0/0 .text dShopSystem_searchCameraActor__FPvPv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
static asm void dShopSystem_searchCameraActor(void* param_0, void* param_1) {
nofralloc
#include "asm/d/shop/d_shop_system/dShopSystem_searchCameraActor__FPvPv.s"
static int dShopSystem_searchCameraActor(void* param_0, void* param_1) {
if (fopAcM_IsActor(param_0) && fopAcM_GetName(param_0) == PROC_TAG_SHOPCAM) {
if ((fopAcM_GetParam(param_1) & 0xf0000000) == (fopAcM_GetParam(param_0) & 0xf0000000) && dShopSystem_camera_count < 2) {
switch (fopAcM_GetParam(param_0) & 0xf) {
case 0:
if (dShopSystem_cameraActor[0] == NULL) {
dShopSystem_cameraActor[0] = (fopAc_ac_c*)param_0;
dShopSystem_camera_count++;
}
break;
case 1:
if (dShopSystem_cameraActor[1] == NULL) {
dShopSystem_cameraActor[1] = (fopAc_ac_c*)param_0;
dShopSystem_camera_count++;
}
break;
default:
break;
}
}
}
return 0;
}
#pragma pop
/* ############################################################################################## */
/* 80453B00-80453B04 002100 0004+00 1/1 0/0 0/0 .sdata2 @4097 */