mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-29 07:21:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

some cleanup of f_pc/f_op files (#2254)

Browse Source 
* cleanup f_pc files

* cleanup f_op files

* fix a couple f_op_actor_mng functions

* minor JSystem work
This commit is contained in:
TakaRikka
2024-11-29 08:24:26 -08:00
committed by GitHub
parent 6482fe7535
commit 073992df8d
903 changed files with 6835 additions and 6587 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JSystem/J3DGraphBase/J3DTransform.cpp
+342 -71
View File
@@ -25,40 +25,48 @@ void J3DGQRSetup7(u32 r0, u32 r1, u32 r2, u32 r3) {
/* 80311670-80311760 30BFB0 00F0+00 0/0 2/2 0/0 .text J3DCalcBBoardMtx__FPA4_f */
// this uses a non-standard sqrtf, not sure why or how its supposed to be setup
static inline f32 sqrtf2(f32 x) {
if (x > 0.0f) {
f32 guess = (f32)__frsqrte(x);
return (f32)(x * guess);
}
return x;
inline f32 J3D_sqrtf(register f32 x) {
register f32 recip;
if (x > 0.0f) {
#ifdef __MWERKS__ // clang-format off
asm { frsqrte recip, x }
#endif // clang-format on
return recip * x;
}
return x;
}
void J3DCalcBBoardMtx(Mtx mtx) {
void J3DCalcBBoardMtx(register Mtx mtx) {
f32 x = (mtx[0][0] * mtx[0][0]) + (mtx[1][0] * mtx[1][0]) + (mtx[2][0] * mtx[2][0]);
f32 y = (mtx[0][1] * mtx[0][1]) + (mtx[1][1] * mtx[1][1]) + (mtx[2][1] * mtx[2][1]);
f32 z = (mtx[0][2] * mtx[0][2]) + (mtx[1][2] * mtx[1][2]) + (mtx[2][2] * mtx[2][2]);
if (x > 0.0f) {
x *= sqrtf2(x);
x = J3D_sqrtf(x);
}
if (y > 0.0f) {
y *= sqrtf2(y);
y = J3D_sqrtf(y);
}
if (z > 0.0f) {
z *= sqrtf2(z);
z = J3D_sqrtf(z);
}
register f32 zero = 0.0f;
// zero out gaps of zeroes
#ifdef __MWERKS__ // clang-format off
asm {
psq_st zero, 0x04(mtx), 0, 0
psq_st zero, 0x20(mtx), 0, 0
}
#endif // clang-format on
mtx[0][0] = x;
mtx[0][1] = 0.0f;
mtx[0][2] = 0.0f;
mtx[1][0] = 0.0f;
mtx[1][1] = y;
mtx[1][2] = 0.0f;
mtx[2][0] = 0.0f;
mtx[2][1] = 0.0f;
mtx[2][2] = z;
mtx[1][0] = zero;
mtx[1][1] = y;
mtx[1][2] = zero;
mtx[2][2] = z;
}
/* 803A1E30-803A1E50 02E490 0020+00 0/0 1/1 0/0 .rodata j3dDefaultTransformInfo */
@@ -73,13 +81,85 @@ extern Mtx const j3dDefaultMtx = {
{1.0f, 0.0f, 0.0f, 0.0f}, {0.0f, 1.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 1.0f, 0.0f}};
/* 80311760-8031189C 30C0A0 013C+00 0/0 2/2 0/0 .text J3DCalcYBBoardMtx__FPA4_f */
void J3DCalcYBBoardMtx(f32 (*param_0)[4]) {
// NONMATCHING
void J3DCalcYBBoardMtx(Mtx mtx) {
f32 x = (mtx[0][0] * mtx[0][0]) + (mtx[1][0] * mtx[1][0]) + (mtx[2][0] * mtx[2][0]);
f32 z = (mtx[0][2] * mtx[0][2]) + (mtx[1][2] * mtx[1][2]) + (mtx[2][2] * mtx[2][2]);
if (x > 0.0f) {
x = J3D_sqrtf(x);
}
if (z > 0.0f) {
z = J3D_sqrtf(z);
}
Vec vec = { 0.0f, -mtx[2][1], mtx[1][1] };
VECNormalize(&vec, &vec);
mtx[0][0] = x;
mtx[0][2] = 0.0f;
mtx[1][0] = 0.0f;
mtx[1][2] = vec.y * z;
mtx[2][0] = 0.0f;
mtx[2][2] = vec.z * z;
}
/* 8031189C-80311964 30C1DC 00C8+00 0/0 6/6 0/0 .text J3DPSCalcInverseTranspose__FPA4_fPA3_f */
void J3DPSCalcInverseTranspose(f32 (*param_0)[4], f32 (*param_1)[3]) {
// NONMATCHING
asm void J3DPSCalcInverseTranspose(register Mtx src, register Mtx33 dst) {
#ifdef __MWERKS__ // clang-format off
psq_l f0, 0(src), 1, 0
psq_l f1, 4(src), 0, 0
psq_l f2, 16(src), 1, 0
ps_merge10 f6, f1, f0
psq_l f3, 20(src), 0, 0
psq_l f4, 32(src), 1, 0
ps_merge10 f7, f3, f2
psq_l f5, 36(src), 0, 0
ps_mul f11, f3, f6
ps_merge10 f8, f5, f4
ps_mul f13, f5, f7
ps_msub f11, f1, f7, f11
ps_mul f12, f1, f8
ps_msub f13, f3, f8, f13
ps_msub f12, f5, f6, f12
ps_mul f10, f3, f4
ps_mul f9, f0, f5
ps_mul f8, f1, f2
ps_msub f10, f2, f5, f10
ps_msub f9, f1, f4, f9
ps_msub f8, f0, f3, f8
ps_mul f7, f0, f13
ps_sub f1, f1, f1
ps_madd f7, f2, f12, f7
ps_madd f7, f4, f11, f7
ps_cmpo0 cr0, f7, f1
bne lbl_8005F118
li r3, 0
blr
lbl_8005F118:
fres f0, f7
ps_add f6, f0, f0
ps_mul f5, f0, f0
ps_nmsub f0, f7, f5, f6
ps_add f6, f0, f0
ps_mul f5, f0, f0
ps_nmsub f0, f7, f5, f6
ps_muls0 f13, f13, f0
ps_muls0 f12, f12, f0
psq_st f13, 0(dst), 0, 0
ps_muls0 f11, f11, f0
psq_st f12, 12(dst), 0, 0
ps_muls0 f10, f10, f0
psq_st f11, 24(dst), 0, 0
ps_muls0 f9, f9, f0
psq_st f10, 8(dst), 1, 0
ps_muls0 f8, f8, f0
psq_st f9, 20(r4), 1, 0
li r3, 1
psq_st f8, 32(r4), 1, 0
blr
#endif // clang-format on
}
/* 80311964-80311A24 30C2A4 00C0+00 0/0 2/2 2/2 .text
@@ -239,73 +319,264 @@ void J3DGetTextureMtxMayaOld(const J3DTextureSRTInfo& srt, Mtx dst) {
/* 80311D94-80311DF8 30C6D4 0064+00 0/0 2/2 0/0 .text J3DScaleNrmMtx__FPA4_fRC3Vec */
#ifdef NONMATCHING
void J3DScaleNrmMtx(register Mtx mtx, const register Vec& scl) {
register f32 mtx_xy, mtx_z_, scl_xy, scl_z_;
asm void J3DScaleNrmMtx(register Mtx mtx, const register Vec& scl) {
#ifdef __MWERKS__ // clang-format off
nofralloc;
asm {
/* Row 0 */
psq_l scl_xy, 0(scl), 0, 0
psq_l mtx_xy, 0(mtx), 0, 0
lfs scl_z_, 8(scl)
lfs mtx_z_, 8(mtx)
ps_mul f4, mtx_xy, scl_xy
psq_st f4, 0(mtx), 0, 0
fmuls f4, mtx_z_, scl_z_
stfs f4, 8(mtx)
psq_l fp2, 0(scl), 0, 0
psq_l fp0, 0(mtx), 0, 0
lfs fp3, 8(scl)
lfs fp1, 8(mtx)
ps_mul f4, fp0, fp2
psq_st f4, 0(mtx), 0, 0
fmuls f4, fp1, fp3
stfs f4, 8(mtx)
/* Row 1 */
psq_l scl_xy, 0(scl), 0, 0
psq_l mtx_xy, 16(mtx), 0, 0
lfs scl_z_, 8(scl)
lfs mtx_z_, 24(mtx)
ps_mul f4, mtx_xy, scl_xy
psq_st f4, 16(mtx), 0, 0
fmuls f4, mtx_z_, scl_z_
stfs f4, 24(mtx)
/* Row 1 */
psq_l fp2, 0(scl), 0, 0
psq_l fp0, 16(mtx), 0, 0
lfs fp3, 8(scl)
lfs fp1, 24(mtx)
ps_mul f4, fp0, fp2
psq_st f4, 16(mtx), 0, 0
fmuls f4, fp1, fp3
stfs f4, 24(mtx)
/* Row 2 */
psq_l scl_xy, 0(scl), 0, 0
psq_l mtx_xy, 32(mtx), 0, 0
lfs scl_z_, 8(scl)
lfs mtx_z_, 40(mtx)
ps_mul f4, mtx_xy, scl_xy
psq_st f4, 32(mtx), 0, 0
fmuls f4, mtx_z_, scl_z_
stfs f4, 40(mtx)
}
/* Row 2 */
psq_l fp2, 0(scl), 0, 0
psq_l fp0, 32(mtx), 0, 0
lfs fp3, 8(scl)
lfs fp1, 40(mtx)
ps_mul f4, fp0, fp2
psq_st f4, 32(mtx), 0, 0
fmuls f4, fp1, fp3
stfs f4, 40(mtx)
blr
#endif // clang-format on
}
#else
void J3DScaleNrmMtx(f32 (*param_0)[4], Vec const& param_1) {
// NONMATCHING
}
#endif
/* 80311DF8-80311E4C 30C738 0054+00 0/0 5/5 0/0 .text J3DScaleNrmMtx33__FPA3_fRC3Vec */
void J3DScaleNrmMtx33(f32 (*param_0)[3], Vec const& param_1) {
// NONMATCHING
asm void J3DScaleNrmMtx33(register Mtx33 mtx, const register Vec& scale) {
#ifdef __MWERKS__ // clang-format off
psq_l f0, 0(mtx), 0, 0
psq_l f6, 0(scale), 0, 0
lfs f1, 8(mtx)
lfs f7, 8(scale)
ps_mul f0, f0, f6
psq_l f2, 12(mtx), 0, 0
fmuls f1, f1, f7
lfs f3, 0x14(mtx)
ps_mul f2, f2, f6
psq_l f4, 24(mtx), 0, 0
fmuls f3, f3, f7
lfs f5, 0x20(mtx)
ps_mul f4, f4, f6
psq_st f0, 0(mtx), 0, 0
fmuls f5, f5, f7
stfs f1, 8(mtx)
psq_st f2, 12(mtx), 0, 0
stfs f3, 0x14(mtx)
psq_st f4, 24(mtx), 0, 0
stfs f5, 0x20(mtx)
blr
#endif // clang-format on
}
/* 80311E4C-80311F70 30C78C 0124+00 0/0 3/3 0/0 .text J3DMtxProjConcat__FPA4_fPA4_fPA4_f
*/
void J3DMtxProjConcat(f32 (*param_0)[4], f32 (*param_1)[4], f32 (*param_2)[4]) {
// NONMATCHING
asm void J3DMtxProjConcat(register Mtx mtx1, register Mtx mtx2, register Mtx dst) {
#ifdef __MWERKS__ // clang-format off
psq_l f2, 0(mtx1), 0, 0
psq_l f3, 8(mtx1), 0, 0
ps_merge00 f6, f2, f2
ps_merge11 f7, f2, f2
ps_merge00 f8, f3, f3
ps_merge11 f9, f3, f3
psq_l f10, 0(mtx2), 0, 0
psq_l f11, 16(mtx2), 0, 0
psq_l f12, 32(mtx2), 0, 0
psq_l f13, 48(mtx2), 0, 0
ps_mul f0, f6, f10
ps_madd f0, f7, f11, f0
ps_madd f0, f8, f12, f0
ps_madd f0, f9, f13, f0
psq_st f0, 0(dst), 0, 0
psq_l f10, 8(mtx2), 0, 0
psq_l f11, 24(mtx2), 0, 0
psq_l f12, 40(mtx2), 0, 0
psq_l f13, 56(mtx2), 0, 0
ps_mul f0, f6, f10
ps_madd f0, f7, f11, f0
ps_madd f0, f8, f12, f0
ps_madd f0, f9, f13, f0
psq_st f0, 8(dst), 0, 0
psq_l f2, 16(mtx1), 0, 0
psq_l f3, 24(mtx1), 0, 0
ps_merge00 f6, f2, f2
ps_merge11 f7, f2, f2
ps_merge00 f8, f3, f3
ps_merge11 f9, f3, f3
psq_l f10, 0(mtx2), 0, 0
psq_l f11, 16(mtx2), 0, 0
psq_l f12, 32(mtx2), 0, 0
psq_l f13, 48(mtx2), 0, 0
ps_mul f0, f6, f10
ps_madd f0, f7, f11, f0
ps_madd f0, f8, f12, f0
ps_madd f0, f9, f13, f0
psq_st f0, 16(dst), 0, 0
psq_l f10, 8(mtx2), 0, 0
psq_l f11, 24(mtx2), 0, 0
psq_l f12, 40(mtx2), 0, 0
psq_l f13, 56(mtx2), 0, 0
ps_mul f0, f6, f10
ps_madd f0, f7, f11, f0
ps_madd f0, f8, f12, f0
ps_madd f0, f9, f13, f0
psq_st f0, 24(dst), 0, 0
psq_l f2, 32(mtx1), 0, 0
psq_l f3, 40(mtx1), 0, 0
ps_merge00 f6, f2, f2
ps_merge11 f7, f2, f2
ps_merge00 f8, f3, f3
ps_merge11 f9, f3, f3
psq_l f10, 0(mtx2), 0, 0
psq_l f11, 16(mtx2), 0, 0
psq_l f12, 32(mtx2), 0, 0
psq_l f13, 48(mtx2), 0, 0
ps_mul f0, f6, f10
ps_madd f0, f7, f11, f0
ps_madd f0, f8, f12, f0
ps_madd f0, f9, f13, f0
psq_st f0, 32(dst), 0, 0
psq_l f10, 8(mtx2), 0, 0
psq_l f11, 24(mtx2), 0, 0
psq_l f12, 40(mtx2), 0, 0
psq_l f13, 56(mtx2), 0, 0
ps_mul f0, f6, f10
ps_madd f0, f7, f11, f0
ps_madd f0, f8, f12, f0
ps_madd f0, f9, f13, f0
psq_st f0, 40(dst), 0, 0
blr
#endif // clang-format on
}
/* ############################################################################################## */
/* 80450958-80450960 0003D8 0008+00 1/1 0/0 0/0 .sdata Unit01 */
static f32 Unit01[2] = {
0.0f, 1.0f
};
/* 80311F70-8031204C 30C8B0 00DC+00 0/0 1/1 0/0 .text J3DPSMtxArrayConcat__FPA4_fPA4_fPA4_fUl */
void J3DPSMtxArrayConcat(f32 (*param_0)[4], f32 (*param_1)[4], f32 (*param_2)[4], u32 param_3) {
// NONMATCHING
}
#ifdef __MWERKS__ // clang-format off
asm void J3DPSMtxArrayConcat(register Mtx mA, register Mtx mB, register Mtx mAB, register u32 count) {
#define FP0 fp0
#define FP1 fp1
#define FP2 fp2
#define FP3 fp3
#define FP4 fp4
#define FP5 fp5
#define FP6 fp6
#define FP7 fp7
#define FP8 fp8
#define FP9 fp9
#define FP10 fp10
#define FP11 fp11
#define FP12 fp12
#define FP13 fp13
#define FP14 fp14
#define FP15 fp15
#define FP31 fp31
#define UNIT_R r7
// this is just PSMtxConcat???
nofralloc
stwu sp, -0x40(sp)
stfd FP14, 0x08(sp)
addis UNIT_R, 0, Unit01@ha
stfd FP15, 0x10(sp)
addi UNIT_R, UNIT_R, Unit01@l
stfd FP31, 0x28(sp)
subi mB, mB, 0x08
subi mAB, mAB, 0x08
mtctr count
loop:
psq_l FP0, 0x00(mA), 0, 0
psq_l FP6, 0x08(mB), 0, 0
psq_l FP7, 0x10(mB), 0, 0
psq_l FP8, 0x18(mB), 0, 0
ps_muls0 FP12, FP6, FP0
psq_l FP2, 0x10(mA), 0, 0
ps_muls0 FP13, FP7, FP0
psq_l FP31, 0x00(UNIT_R), 0, 0
ps_muls0 FP14, FP6, FP2
psq_l FP9, 0x20(mB), 0, 0
ps_muls0 FP15, FP7, FP2
psq_l FP1, 0x08(mA), 0, 0
ps_madds1 FP12, FP8, FP0, FP12
psq_l FP3, 0x18(mA), 0, 0
ps_madds1 FP14, FP8, FP2, FP14
psq_l FP10, 0x28(mB), 0, 0
ps_madds1 FP13, FP9, FP0, FP13
psq_lu FP11, 0x30(mB), 0, 0
ps_madds1 FP15, FP9, FP2, FP15
psq_l FP4, 0x20(mA), 0, 0
psq_l FP5, 0x28(mA), 0, 0
ps_madds0 FP12, FP10, FP1, FP12
ps_madds0 FP13, FP11, FP1, FP13
ps_madds0 FP14, FP10, FP3, FP14
ps_madds0 FP15, FP11, FP3, FP15
psq_st FP12, 0x08(mAB), 0, 0
ps_muls0 FP2, FP6, FP4
ps_madds1 FP13, FP31, FP1, FP13
ps_muls0 FP0, FP7, FP4
psq_st FP14, 0x18(mAB), 0, 0
ps_madds1 FP15, FP31, FP3, FP15
psq_st FP13, 0x10(mAB), 0, 0
ps_madds1 FP2, FP8, FP4, FP2
ps_madds1 FP0, FP9, FP4, FP0
ps_madds0 FP2, FP10, FP5, FP2
psq_st FP15, 0x20(mAB), 0, 0
ps_madds0 FP0, FP11, FP5, FP0
psq_st FP2, 0x28(mAB), 0, 0
ps_madds1 FP0, FP31, FP5, FP0
psq_stu FP0, 0x30(mAB), 0, 0
bdnz loop
lfd FP14, 0x08(sp)
lfd FP15, 0x10(sp)
lfd FP31, 0x28(sp)
addi sp, sp, 0x40
blr
#undef FP0
#undef FP1
#undef FP2
#undef FP3
#undef FP4
#undef FP5
#undef FP6
#undef FP7
#undef FP8
#undef FP9
#undef FP10
#undef FP11
#undef FP12
#undef FP13
#undef FP14
#undef FP15
#undef FP31
#undef UNIT_R
}
#endif // clang-format on
/* ############################################################################################## */
/* 803CD8F8-803CD900 02AA18 0008+00 0/0 2/2 0/0 .data PSMulUnit01 */
extern f32 PSMulUnit01[2] = {
extern f32 PSMulUnit01[] = {
0.0f,
-1.0f,
};
src/JSystem/JGadget/std-vector.cpp
-241
View File
@@ -4,222 +4,6 @@
//
#include "JSystem/JGadget/std-vector.h"
#include "dolphin/types.h"
#include "algorithm.h"
//
// Types:
//
namespace JGadget {
struct vector {
/* 802DCCC8 */ static u32 extend_default(u32, u32, u32);
};
template <typename T>
struct TAllocator {
void destroy(T* item) {}
void deallocate(T* mem, u32 size) {
DeallocateRaw(mem);
}
void DeallocateRaw(T* mem) {
delete mem;
}
T* allocate(u32 count, void *param_2) {
return AllocateRaw(count * sizeof(T));
}
T* AllocateRaw(u32 size) {
return (T*)new char[size];
}
u8 field_0x0;
};
/* TAllocator<void*> */
struct TAllocator__template0 {};
typedef u32 (*extendFunc)(u32, u32, u32);
template <typename T, typename Allocator = JGadget::TAllocator<T> >
struct TVector {
struct TDestructed_deallocate_ {
TDestructed_deallocate_(Allocator* allocator, T* addr) {
mAllocator = allocator;
mAddr = addr;
}
void set(T* addr) {
mAddr = addr;
}
inline ~TDestructed_deallocate_() {
mAllocator->deallocate(mAddr, 0);
}
Allocator* mAllocator;
T* mAddr;
};
TVector(Allocator const& param_0) {
field_0x0 = param_0;
pBegin_ = NULL;
pEnd_ = pBegin_;
mCapacity = 0;
pfnExtend_ = JGadget::vector::extend_default;
}
~TVector() {
clear();
field_0x0.deallocate(pBegin_, 0);
}
T* insert(T* pos, const T& val) {
u32 diff = (u32)pos - (u32)begin();
insert(pos, 1, val);
return pBegin_ + diff;
}
void insert(T* pos, u32 count, const T& val) {
if (count != 0) {
T* this_00 = Insert_raw(pos, count);
if (this_00 != end()) {
std::uninitialized_fill_n(this_00, count, val);
}
}
}
T* Insert_raw(T* pos, u32 count) {
if (count == 0) {
return pos;
}
if (mCapacity < count + size()) {
u32 uVar4 = GetSize_extend_(count);
T* ppvVar5 = field_0x0.allocate(uVar4, NULL);
if (ppvVar5 == NULL) {
pos = end();
} else {
TDestructed_deallocate_ aTStack_30(&field_0x0, ppvVar5);
T* ppvVar6 = std::uninitialized_copy(pBegin_, pos, ppvVar5);
std::uninitialized_copy(pos, pEnd_, ppvVar6 + count);
DestroyElement_all_();
aTStack_30.set(pBegin_);
u32 uVar2 = (u32)pEnd_ - (u32)pBegin_;
pEnd_ = ppvVar5 + count + (uVar2 / 4);
pBegin_ = ppvVar5;
mCapacity = uVar4;
pos = ppvVar6;
}
} else {
T* ppvVar5 = pos + count;
if (ppvVar5 < pEnd_) {
T* ppvVar6 = pEnd_ - count;
std::uninitialized_copy(ppvVar6, pEnd_, pEnd_);
std::copy_backward(pos, ppvVar6, pEnd_);
DestroyElement_(pos, ppvVar5);
pEnd_ += count;
} else {
std::uninitialized_copy(pos, pEnd_, ppvVar5);
DestroyElement_(pos, pEnd_);
pEnd_ += count;
}
}
return pos;
}
T* begin() {
return pBegin_;
}
T* end() {
return pEnd_;
}
u32 size() {
if (pBegin_ == 0) {
return 0;
}
return ((u32)pEnd_ - (u32)pBegin_) / 4;
}
u32 capacity() { return mCapacity; }
u32 GetSize_extend_(u32 count) {
u32 iVar2 = size();
u32 uVar3 = capacity();
u32 uVar4 = pfnExtend_(uVar3, iVar2, count);
if (uVar4 < iVar2 + count) {
uVar4 = iVar2 + count;
}
return uVar4;
}
void DestroyElement_(T* start, T* end) {
for (; start != end; start++) {
field_0x0.destroy(start);
}
}
void DestroyElement_all_() {
DestroyElement_(pBegin_, pEnd_);
}
T* erase(T* start, T* end) {
T* vectorEnd = pEnd_;
T* ppvVar3 = std::copy(end, vectorEnd, start);
DestroyElement_(ppvVar3, pEnd_);
pEnd_ = ppvVar3;
return start;
}
void clear() {
erase(begin(), end());
}
Allocator field_0x0;
T* pBegin_;
T* pEnd_;
u32 mCapacity;
extendFunc pfnExtend_;
};
/* TVector<void*, JGadget::TAllocator<void*>> */
struct TVector__template0 {
/* 802DD130 */ void func_802DD130(void* _this, void**, void* const&);
/* 802DCE1C */ void func_802DCE1C(void* _this, void**, u32, void* const&);
/* 802DCE8C */ void func_802DCE8C(void* _this, void**, u32);
};
struct TVector_pointer_void : public TVector<void*> {
/* 802DCCD0 */ TVector_pointer_void(JGadget::TAllocator<void*> const&);
/* 802DCCFC */ ~TVector_pointer_void();
/* 802DCDA4 */ void insert(void**, void* const&);
/* 802DCDC4 */ void** erase(void**, void**);
};
}; // namespace JGadget
//
// Forward References:
//
extern "C" void extend_default__Q27JGadget6vectorFUlUlUl();
extern "C" void func_802DCCD0();
extern "C" void __dt__Q27JGadget20TVector_pointer_voidFv();
extern "C" void insert__Q27JGadget20TVector_pointer_voidFPPvRCPv();
extern "C" void erase__Q27JGadget20TVector_pointer_voidFPPvPPv();
extern "C" void func_802DCE1C(void* _this, void**, u32, void* const&);
extern "C" void func_802DCE8C(void* _this, void**, u32);
extern "C" void func_802DD130(void* _this, void**, void* const&);
//
// External References:
//
extern "C" void* __nw__FUl();
extern "C" void __dl__FPv();
extern "C" void _savegpr_27();
extern "C" void _savegpr_29();
extern "C" void _restgpr_27();
extern "C" void _restgpr_29();
//
// Declarations:
//
/* 802DCCC8-802DCCD0 2D7608 0008+00 1/1 0/0 0/0 .text extend_default__Q27JGadget6vectorFUlUlUl */
u32 JGadget::vector::extend_default(u32 param_0, u32 param_1, u32 param_2) {
@@ -237,37 +21,12 @@ JGadget::TVector_pointer_void::~TVector_pointer_void() {
/* 802DCDA4-802DCDC4 2D76E4 0020+00 0/0 1/1 0/0 .text
* insert__Q27JGadget20TVector_pointer_voidFPPvRCPv */
// the entire function chain needs work
#ifdef NONMATCHING
void JGadget::TVector_pointer_void::insert(void** param_0, void* const& param_1) {
TVector<void*>::insert(param_0, param_1);
}
#else
void JGadget::TVector_pointer_void::insert(void** param_0, void* const& param_1) {
// NONMATCHING
}
#endif
/* 802DCDC4-802DCE1C 2D7704 0058+00 0/0 1/1 0/0 .text
* erase__Q27JGadget20TVector_pointer_voidFPPvPPv */
void** JGadget::TVector_pointer_void::erase(void** param_0, void** param_1) {
return TVector<void*>::erase(param_0, param_1);
}
/* 802DCE1C-802DCE8C 2D775C 0070+00 1/1 0/0 0/0 .text
* insert__Q27JGadget38TVector<Pv,Q27JGadget14TAllocator<Pv>>FPPvUlRCPv */
extern "C" void func_802DCE1C(void* _this, void** param_0, u32 param_1, void* const& param_2) {
// NONMATCHING
}
/* 802DCE8C-802DD130 2D77CC 02A4+00 1/1 0/0 0/0 .text
* Insert_raw__Q27JGadget38TVector<Pv,Q27JGadget14TAllocator<Pv>>FPPvUl */
extern "C" void func_802DCE8C(void* _this, void** param_0, u32 param_1) {
// NONMATCHING
}
/* 802DD130-802DD188 2D7A70 0058+00 1/1 0/0 0/0 .text
* insert__Q27JGadget38TVector<Pv,Q27JGadget14TAllocator<Pv>>FPPvRCPv */
extern "C" void func_802DD130(void* _this, void** param_0, void* const& param_1) {
// NONMATCHING
}
src/JSystem/JMessage/resource.cpp
+88 -17
View File
@@ -4,8 +4,9 @@
//
#include "JSystem/JMessage/resource.h"
#include "string.h"
#include <algorithm.h>
#include "dol2asm.h"
#include "string.h"
//
// Types:
@@ -64,12 +65,81 @@ extern "C" f32 ga4cSignature__Q28JMessage4data[1 + 1 /* padding */];
/* 802A8CDC-802A8EC0 2A361C 01E4+00 0/0 1/1 0/0 .text
* toMessageIndex_messageID__Q28JMessage9TResourceCFUlUlPb */
u16 JMessage::TResource::toMessageIndex_messageID(u32 param_0, u32 param_1,
bool* param_2) const {
// NONMATCHING
// NONMATCHING - instruction order
u16 JMessage::TResource::toMessageIndex_messageID(u32 lowerHalf, u32 upperHalf,
bool* isMsgValid) const {
if (!mMessageID.get()) {
return 0xFFFF;
}
u32 val = -1;
bool check = true;
switch (mMessageID.get_formSupplement()) {
case 0:
if (upperHalf) {
check = false;
}
val = lowerHalf;
break;
case 1:
if (lowerHalf > 0xFFFFFF || upperHalf > 0xFF) {
check = false;
}
val = ((lowerHalf << 8) & 0xFFFFFF00) | (upperHalf & 0xFF);
break;
case 2:
if (lowerHalf > 0xFFFF || upperHalf > 0xFFFF) {
check = false;
}
val = ((lowerHalf << 16) & 0xFFFF0000) | (upperHalf & 0xFFFF);
break;
case 3:
if (lowerHalf > 0xFF || upperHalf > 0xFFFFFF) {
check = false;
}
val = ((lowerHalf << 24) & 0xFF000000) | (upperHalf & 0x00FFFFFF);
break;
case 4:
if (lowerHalf) {
check = false;
}
val = upperHalf;
break;
default:
return 0xFFFF;
}
if (isMsgValid) {
*isMsgValid = check;
}
if (val == 0xFFFFFFFF) {
return 0xFFFF;
}
const u32* first = (u32*)mMessageID.getContent();
const u32* last = (u32*)(first + mMessageID.get_number());
const u32* lower;
if (mMessageID.get_isOrdered()) {
lower = std::lower_bound<const u32*, u32>(first, last, val);
if (lower == last || *lower != val) {
return 0xFFFF;
}
} else {
lower = first;
while (lower != last && *lower != val) {
lower++;
}
if (lower == last) {
return 0xFFFF;
}
}
return (lower - first);
}
/* ############################################################################################## */
/* 803C9C80-803C9C94 -00001 0014+00 1/1 0/0 0/0 .data
* sapfnParseCharacter___Q28JMessage18TResourceContainer */
JMessage::locale::parseCharacter_function JMessage::TResourceContainer::sapfnParseCharacter_[5] = {
@@ -115,15 +185,19 @@ JMessage::TResourceContainer::TCResource::TCResource() {
/* 802A8EF8-802A8F6C 2A3838 0074+00 1/0 2/2 0/0 .text
* __dt__Q38JMessage18TResourceContainer10TCResourceFv */
// need to fix TLinkList_factory vtable stuff
// JMessage::TResourceContainer::TCResource::~TCResource() {
extern "C" void __dt__Q38JMessage18TResourceContainer10TCResourceFv() {
// NONMATCHING
}
JMessage::TResourceContainer::TCResource::~TCResource() {}
/* 802A8F6C-802A8FFC 2A38AC 0090+00 0/0 1/1 0/0 .text
* Get_groupID__Q38JMessage18TResourceContainer10TCResourceFUs */
JMessage::TResource* JMessage::TResourceContainer::TCResource::Get_groupID(u16 param_0) {
// NONMATCHING
// NONMATCHING
JMessage::TResource* JMessage::TResourceContainer::TCResource::Get_groupID(u16 groupID) {
JGadget::TContainerEnumerator<TResource, 0> enumerator(this);
while (enumerator) {
const TResource* res = &(*enumerator);
if (res->field_0xc.get_groupID() == groupID)
return (TResource*)res;
}
return NULL;
}
/* 802A8FFC-802A9048 2A393C 004C+00 1/0 0/0 0/0 .text
@@ -169,10 +243,7 @@ JMessage::TParse::TParse(JMessage::TResourceContainer* pContainer) {
}
/* 802A9158-802A91B8 2A3A98 0060+00 1/0 0/0 0/0 .text __dt__Q28JMessage6TParseFv */
// JMessage::TParse::~TParse() {
extern "C" void __dt__Q28JMessage6TParseFv() {
// NONMATCHING
}
JMessage::TParse::~TParse() {}
/* 802A91B8-802A92F4 2A3AF8 013C+00 1/0 0/0 0/0 .text
* parseHeader_next__Q28JMessage6TParseFPPCvPUlUl */
@@ -253,7 +324,7 @@ int JMessage::locale::parseCharacter_2Byte(char const** string) {
}
/* 802A94D4-802A9528 2A3E14 0054+00 1/1 0/0 0/0 .text lower_bound<PCUl,Ul>__3stdFPCUlPCUlRCUl */
extern "C" void func_802A94D4(void* _this, u32 const* param_0, u32 const* param_1,
/* extern "C" void func_802A94D4(void* _this, u32 const* param_0, u32 const* param_1,
u32 const& param_2) {
// NONMATCHING
}
} */
src/JSystem/JStudio/JStudio/ctb.cpp
+2 -2
View File
@@ -190,7 +190,7 @@ JStudio::ctb::TObject* JStudio::ctb::TControl::getObject_index(u32 param_0) {
return 0;
}
JGadget::TLinkList<TObject, -12>::iterator aiStack_14 = mList.begin();
std::advance(aiStack_14, param_0);
std::advance_fake(aiStack_14, param_0);
return &*aiStack_14;
}
@@ -302,4 +302,4 @@ extern "C" void func_802815B4(void* _this, JGadget::TLinkList<JStudio::ctb::TObj
JGadget::TLinkList<JStudio::ctb::TObject, 12>::iterator param_1,
JStudio::object::TPRObject_ID_equal param_2) {
// NONMATCHING
}
}
src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/algorithm.h
+61 -7
View File
@@ -1,9 +1,30 @@
#ifndef MSL_ALGORITHM_H_
#define MSL_ALGORITHM_H_
#include <string.h>
#include <iterator.h>
namespace std {
template <class ForwardIterator, class T>
ForwardIterator lower_bound(ForwardIterator first, ForwardIterator last, const T& val);
ForwardIterator lower_bound(ForwardIterator first, ForwardIterator last, const T& val) {
typedef typename iterator_traits<ForwardIterator>::difference_type difference_type;
difference_type len = std::distance(first, last);
while (len > 0) {
ForwardIterator i = first;
difference_type step = len / 2;
std::advance(i, step);
if (*i < val) {
first = ++i;
len -= step + 1;
} else {
len = step;
}
}
return first;
}
template <class ForwardIterator, class T>
ForwardIterator upper_bound(ForwardIterator first, ForwardIterator last, const T& val);
@@ -53,12 +74,45 @@ inline OutputIt copy(InputIt first, InputIt last,
return d_first;
}
template<class BidirIt1, class BidirIt2>
inline BidirIt2 copy_backward(BidirIt1 first, BidirIt1 last, BidirIt2 d_last) {
while (first != last) {
*(--d_last) = *(--last);
}
return d_last;
template <class BidirectionalIterator1, class BidirectionalIterator2>
inline BidirectionalIterator2 copy_backward(BidirectionalIterator1 first, BidirectionalIterator1 last, BidirectionalIterator2 result) {
while (last != first)
*--result = *--last;
return result;
}
template <class T, bool A>
struct __copy_backward
{
static T* copy_backward(T* first, T* last, T* result)
{
while (last > first)
*--result = *--last;
return result;
}
};
template <class T>
struct __copy_backward<T, true>
{
static T* copy_backward(T* first, T* last, T* result)
{
#ifdef DEBUG
size_t n = static_cast<size_t>(last - first);
result -= n;
memmove(result, first, n*sizeof(T));
return result;
#else
while (last > first)
*--result = *--last;
return result;
#endif
}
};
template <class T>
inline T* copy_backward(T* first, T* last, T* result) {
return __copy_backward<T, true>::copy_backward(first, last, result);
}
} // namespace std
src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/iterator.h
+78 -6
View File
@@ -2,20 +2,92 @@
#define MSL_ITERATOR_H_
namespace std {
template< class InputIt, class Distance >
inline void advance( InputIt& it, Distance n) {
struct input_iterator_tag {};
struct output_iterator_tag {};
struct forward_iterator_tag : public input_iterator_tag {};
struct bidirectional_iterator_tag : public forward_iterator_tag {};
struct random_access_iterator_tag : public bidirectional_iterator_tag {};
template <class Iterator>
struct iterator_traits {
typedef typename Iterator::difference_type difference_type;
typedef typename Iterator::value_type value_type;
typedef typename Iterator::pointer pointer;
typedef typename Iterator::reference reference;
typedef typename Iterator::iterator_category iterator_category;
};
template <class T>
struct iterator_traits<T*> {
typedef ptrdiff_t difference_type;
typedef T value_type;
typedef T* pointer;
typedef T& reference;
typedef random_access_iterator_tag iterator_category;
};
template <class InputIterator, class Distance>
inline void __advance(InputIterator& i, Distance n, input_iterator_tag) {
for (; n > 0; --n)
++i;
}
template <class BidirectionalIterator, class Distance>
inline void __advance(BidirectionalIterator& i, Distance n, bidirectional_iterator_tag) {
if (n >= 0)
for (; n > 0; --n)
++i;
else
for (; n < 0; ++n)
--i;
}
template <class RandomAccessIterator, class Distance>
inline void __advance(RandomAccessIterator& i, Distance n, random_access_iterator_tag) {
i += n;
}
template <class InputIterator, class Distance>
inline void advance(InputIterator& i, Distance n) {
__advance(i, n, typename iterator_traits<InputIterator>::iterator_category());
}
// TODO: combine this with above later
template <class InputIt, class Distance>
inline void advance_fake(InputIt& it, Distance n) {
while (n > 0) {
--n;
++it;
}
}
template <class InputIterator>
inline typename iterator_traits<InputIterator>::difference_type
__distance(InputIterator first, InputIterator last, input_iterator_tag) {
typename iterator_traits<InputIterator>::difference_type result = 0;
for (; first != last; ++first)
++result;
return result;
}
template <class RandomAccessIterator>
inline typename iterator_traits<RandomAccessIterator>::difference_type
__distance(RandomAccessIterator first, RandomAccessIterator last, random_access_iterator_tag) {
return last - first;
}
template <class InputIterator>
inline typename iterator_traits<InputIterator>::difference_type distance(InputIterator first,
InputIterator last) {
return __distance(first, last, typename iterator_traits<InputIterator>::iterator_category());
}
// This needs to be defined with gcc concepts or something similar. Workaround.
template< class InputIt, class Distance >
inline void advance_pointer( InputIt& it, Distance n) {
template <class InputIt, class Distance>
inline void advance_pointer(InputIt& it, Distance n) {
it += n;
}
}
} // namespace std
#endif
#endif
src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/msl_memory.h
+35 -8
View File
@@ -5,20 +5,47 @@ namespace std {
template<class ForwardIt, class Size, class T>
inline ForwardIt uninitialized_fill_n(ForwardIt first, Size count, const T& value) {
for (; count > 0; ++first, (void) --count) {
*first = value;
for (; count--; ++first) {
if (first != NULL) {
*first = value;
}
}
return first;
}
template<class InputIt, class NoThrowForwardIt>
inline NoThrowForwardIt uninitialized_copy(InputIt first, InputIt last, NoThrowForwardIt d_first) {
for (; first != last; ++first, ++d_first) {
*d_first = *first;
template<class InputIterator, class ForwardIterator>
inline ForwardIterator __uninitialized_copy(InputIterator first, InputIterator last, ForwardIterator result) {
ForwardIterator __save = result;
for (; first != last; ++first, ++result) {
*result = *first;
}
return d_first;
return result;
}
template <class T, bool A, bool B>
struct __uninitialized_copy_helper {
static T* uninitialized_copy(T* first, T* last, T* result) {
return __uninitialized_copy(first, last, result);
}
};
template <class T>
struct __uninitialized_copy_helper<T, true, false>
{
static T* uninitialized_copy(T* first, T* last, T* result)
{
for (; first < last; ++result, ++first)
*result = *first;
return result;
}
};
template <class T>
inline T* uninitialized_copy(T* first, T* last, T* result) {
return __uninitialized_copy_helper<T, true, false>::uninitialized_copy(first, last, result);
}
}
#endif
#endif
src/SSystem/SComponent/c_request.cpp
+9 -9
View File
@@ -7,8 +7,8 @@
/* 802667D4-80266800 261114 002C+00 0/0 3/3 0/0 .text cReq_Is_Done__FP18request_base_class */
int cReq_Is_Done(request_base_class* i_this) {
if (i_this->field_0x0.flag1 == 1) {
i_this->field_0x0.flag1 = 0;
if (i_this->flag1 == 1) {
i_this->flag1 = 0;
return 1;
}
return 0;
@@ -17,9 +17,9 @@ int cReq_Is_Done(request_base_class* i_this) {
/* 80266800-80266830 261140 0030+00 0/0 3/3 0/0 .text cReq_Done__FP18request_base_class
*/
void cReq_Done(request_base_class* i_this) {
i_this->field_0x0.flag0 = 0;
i_this->field_0x0.flag1 = 1;
i_this->field_0x0.flag2 = 0;
i_this->flag0 = 0;
i_this->flag1 = 1;
i_this->flag2 = 0;
}
/* 80266830-80266850 261170 0020+00 0/0 2/2 0/0 .text cReq_Command__FP18request_base_classUc */
@@ -29,7 +29,7 @@ void cReq_Command(request_base_class* i_this, u8 param_1) {
/* 80266850-80266880 261190 0030+00 1/1 2/2 0/0 .text cReq_Create__FP18request_base_classUc */
void cReq_Create(request_base_class* i_this, u8 param_1) {
i_this->field_0x0.flag0 = 1;
i_this->field_0x0.flag1 = 0;
i_this->field_0x0.flag2 = param_1;
}
i_this->flag0 = 1;
i_this->flag1 = 0;
i_this->flag2 = param_1;
}
src/d/actor/d_a_L7demo_dr.cpp
+2 -2
View File
@@ -462,7 +462,7 @@ extern actor_process_profile_definition g_profile_DR = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_DR, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daDr_c), // mSize
0, // mSizeOther
0, // mParameters
@@ -474,4 +474,4 @@ extern actor_process_profile_definition g_profile_DR = {
fopAc_CULLBOX_CUSTOM_e, // cullType
};
/* 805AA4C8-805AA4C8 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 805AA4C8-805AA4C8 000074 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_L7low_dr.cpp
+2 -2
View File
@@ -288,7 +288,7 @@ extern actor_process_profile_definition g_profile_L7lowDr = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_L7lowDr, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daL7lowDr_c), // mSize
0, // mSizeOther
0, // mParameters
@@ -300,4 +300,4 @@ extern actor_process_profile_definition g_profile_L7lowDr = {
fopAc_CULLBOX_CUSTOM_e, // cullType
};
/* 805AAFB0-805AAFB0 00003C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 805AAFB0-805AAFB0 00003C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_L7op_demo_dr.cpp
+2 -2
View File
@@ -887,7 +887,7 @@ extern actor_process_profile_definition g_profile_L7ODR = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_L7ODR, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daL7ODR_c), // mSize
0, // mSizeOther
0, // mParameters
@@ -982,4 +982,4 @@ extern "C" void __as__4cXyzFRC4cXyz() {
// NONMATCHING
}
/* 805AE0AC-805AE0AC 00015C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 805AE0AC-805AE0AC 00015C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_alink.cpp
+1 -1
View File
@@ -5339,7 +5339,7 @@ extern actor_process_profile_definition g_profile_ALINK = {
5,
fpcPi_CURRENT_e,
PROC_ALINK,
&g_fpcLf_Method.mBase,
&g_fpcLf_Method.base,
sizeof(daAlink_c),
0,
0,
src/d/actor/d_a_alink_demo.inc
+4 -4
View File
@@ -1129,10 +1129,10 @@ BOOL daAlink_c::checkEndMessage(u32 param_0) {
msg_class* msg = fopMsgM_SearchByID(mMsgClassID);
if (msg != NULL) {
if (msg->mMode == 14) {
msg->mMode = 16;
} else if (msg->mMode == 0x12) {
msg->mMode = 0x13;
if (msg->mode == 14) {
msg->mode = 16;
} else if (msg->mode == 0x12) {
msg->mode = 0x13;
return 1;
}
}
src/d/actor/d_a_alink_kandelaar.inc
+2 -2
View File
@@ -212,8 +212,8 @@ void daAlink_c::preKandelaarDraw() {
field_0x32c8 = 0;
}
f32 near = dComIfGd_getView()->mNear;
f32 far = dComIfGd_getView()->mFar;
f32 near = dComIfGd_getView()->near;
f32 far = dComIfGd_getView()->far;
mDoLib_pos2camera(&mKandelaarFlamePos, &proj);
proj.z += 30.0f;
src/d/actor/d_a_alldie.cpp
+1 -1
View File
@@ -208,7 +208,7 @@ extern actor_process_profile_definition g_profile_ALLDIE = {
2,
fpcPi_CURRENT_e,
PROC_ALLDIE,
&g_fpcLf_Method.mBase,
&g_fpcLf_Method.base,
sizeof(daAlldie_c),
0,
0,
src/d/actor/d_a_andsw.cpp
+2 -2
View File
@@ -79,7 +79,7 @@ extern actor_process_profile_definition g_profile_ANDSW = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_ANDSW, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daAndsw_c), // mSize
0, // mSizeOther
0, // mParameters
@@ -89,4 +89,4 @@ extern actor_process_profile_definition g_profile_ANDSW = {
0x40000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_CUSTOM_e, // cullType
};
};
src/d/actor/d_a_andsw2.cpp
+2 -2
View File
@@ -368,7 +368,7 @@ extern actor_process_profile_definition g_profile_ANDSW2 = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_ANDSW2, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daAndsw2_c), // mSize
0, // mSizeOther
0, // mParameters
@@ -378,4 +378,4 @@ extern actor_process_profile_definition g_profile_ANDSW2 = {
0x44000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_6_e, // cullType
};
};
src/d/actor/d_a_arrow.cpp
+1 -1
View File
@@ -1292,7 +1292,7 @@ extern actor_process_profile_definition g_profile_ARROW = {
9, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_ARROW, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daArrow_c), // mSize
0, // mSizeOther
0, // mParameters
src/d/actor/d_a_b_bh.cpp
+2 -2
View File
@@ -294,7 +294,7 @@ extern actor_process_profile_definition g_profile_B_BH = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_B_BH, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(b_bh_class), // mSize
0, // mSizeOther
0, // mParameters
@@ -1202,4 +1202,4 @@ static u8 data_805B3478[4];
static u8 data_805B347C[4];
#pragma pop
/* 805B322C-805B322C 0000EC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 805B322C-805B322C 0000EC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_b_bq.cpp
+4 -4
View File
@@ -1434,8 +1434,8 @@ static void demo_camera(b_bq_class* i_this) {
daPy_getPlayerActorClass()->changeOriginalDemo();
i_this->mDemoCamEye = camera0->mLookat.mEye;
i_this->mDemoCamCenter = camera0->mLookat.mCenter;
i_this->mDemoCamEye = camera0->lookat.eye;
i_this->mDemoCamCenter = camera0->lookat.center;
dComIfGp_getEvent().startCheckSkipEdge(i_this);
// fallthrough
@@ -2693,7 +2693,7 @@ extern actor_process_profile_definition g_profile_B_BQ = {
7,
fpcPi_CURRENT_e,
PROC_B_BQ,
&g_fpcLf_Method.mBase,
&g_fpcLf_Method.base,
sizeof(b_bq_class),
0,
0,
@@ -2703,4 +2703,4 @@ extern actor_process_profile_definition g_profile_B_BQ = {
0x44000,
fopAc_ENEMY_e,
fopAc_CULLBOX_CUSTOM_e,
};
};
src/d/actor/d_a_b_dr.cpp
+2 -2
View File
@@ -724,7 +724,7 @@ extern actor_process_profile_definition g_profile_B_DR = {
4, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_B_DR, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daB_DR_c), // mSize
0, // mSizeOther
0, // mParameters
@@ -3088,4 +3088,4 @@ static u8 data_805C7A38[4];
static u8 data_805C7A3C[4];
#pragma pop
/* 805C7240-805C7240 0005CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 805C7240-805C7240 0005CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_b_dre.cpp
+2 -2
View File
@@ -245,7 +245,7 @@ extern actor_process_profile_definition g_profile_B_DRE = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_B_DRE, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daB_DRE_c), // mSize
0, // mSizeOther
0, // mParameters
@@ -1397,4 +1397,4 @@ static u8 data_805CB134[4];
static u8 data_805CB138[4];
#pragma pop
/* 805CAECC-805CAECC 000170 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 805CAECC-805CAECC 000170 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_b_ds.cpp
+7 -7
View File
@@ -1345,10 +1345,10 @@ void daB_DS_c::setYoMessage(int i_msgIdx) {
/* 805CDA44-805CDAC0 002904 007C+00 1/1 0/0 0/0 .text doYoMessage__8daB_DS_cFv */
bool daB_DS_c::doYoMessage() {
if (mpMsg != NULL) {
if (mpMsg->mMode == 0xE) {
mpMsg->mMode = 0x10;
} else if (mpMsg->mMode == 0x12) {
mpMsg->mMode = 0x13;
if (mpMsg->mode == 0xE) {
mpMsg->mode = 0x10;
} else if (mpMsg->mode == 0x12) {
mpMsg->mode = 0x13;
mMsgPcID = 0xFFFFFFFF;
return true;
}
@@ -3182,8 +3182,8 @@ bool daB_DS_c::mChkScreenIn() {
camera_class* camera = dComIfGp_getCamera(0);
cXyz vec1, vec2;
vec2 = camera->mLookat.mEye - camera->mLookat.mCenter;
vec1 = camera->mLookat.mEye - current.pos;
vec2 = camera->lookat.eye - camera->lookat.center;
vec1 = camera->lookat.eye - current.pos;
return abs((s16)(vec1.atan2sX_Z() - vec2.atan2sX_Z())) < 0x3000;
}
@@ -6119,7 +6119,7 @@ extern actor_process_profile_definition g_profile_B_DS = {
4,
fpcPi_CURRENT_e,
PROC_B_DS,
&g_fpcLf_Method.mBase,
&g_fpcLf_Method.base,
sizeof(daB_DS_c),
0,
0,
src/d/actor/d_a_b_gg.cpp
+2 -2
View File
@@ -557,7 +557,7 @@ extern actor_process_profile_definition g_profile_B_GG = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_B_GG, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daB_GG_c), // mSize
0, // mSizeOther
0, // mParameters
@@ -2571,4 +2571,4 @@ static u8 data_805ED83C[4];
static u8 data_805ED840[4];
#pragma pop
/* 805ED3D4-805ED3D4 000374 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 805ED3D4-805ED3D4 000374 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_b_gm.cpp
+2 -2
View File
@@ -522,7 +522,7 @@ extern actor_process_profile_definition g_profile_B_GM = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_B_GM, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(b_gm_class), // mSize
0, // mSizeOther
0, // mParameters
@@ -2047,4 +2047,4 @@ static u8 data_805F4948[4];
static u8 data_805F494C[4];
#pragma pop
/* 805F4388-805F4388 000200 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 805F4388-805F4388 000200 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_b_gnd.cpp
+2 -2
View File
@@ -772,7 +772,7 @@ extern actor_process_profile_definition g_profile_B_GND = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_B_GND, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(b_gnd_class), // mSize
0, // mSizeOther
0, // mParameters
@@ -3101,4 +3101,4 @@ static u8 data_806030B8[4];
static u8 data_806030BC[4];
#pragma pop
/* 806029AC-806029AC 000348 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 806029AC-806029AC 000348 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_b_go.cpp
+2 -2
View File
@@ -312,7 +312,7 @@ extern actor_process_profile_definition g_profile_B_GO = {
7,
fpcPi_CURRENT_e,
PROC_B_GO,
&g_fpcLf_Method.mBase,
&g_fpcLf_Method.base,
sizeof(b_go_class),
0,
0,
@@ -322,4 +322,4 @@ extern actor_process_profile_definition g_profile_B_GO = {
0x40100,
fopAc_ENEMY_e,
fopAc_CULLBOX_CUSTOM_e,
};
};
src/d/actor/d_a_b_gos.cpp
+2 -2
View File
@@ -425,7 +425,7 @@ extern actor_process_profile_definition g_profile_B_GOS = {
8,
fpcPi_CURRENT_e,
PROC_B_GOS,
&g_fpcLf_Method.mBase,
&g_fpcLf_Method.base,
sizeof(b_gos_class),
0,
0,
@@ -435,4 +435,4 @@ extern actor_process_profile_definition g_profile_B_GOS = {
0x40100,
fopAc_ENEMY_e,
fopAc_CULLBOX_CUSTOM_e,
};
};
src/d/actor/d_a_b_mgn.cpp
+2 -2
View File
@@ -619,7 +619,7 @@ extern actor_process_profile_definition g_profile_B_MGN = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_B_MGN, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daB_MGN_c), // mSize
0, // mSizeOther
0, // mParameters
@@ -2024,4 +2024,4 @@ extern "C" void checkNowWolf__9daPy_py_cFv() {
// NONMATCHING
}
/* 80610084-80610084 0002A4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 80610084-80610084 0002A4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_b_ob.cpp
+6 -6
View File
@@ -635,7 +635,7 @@ static int daB_OB_Draw(b_ob_class* i_this) {
for (int i = 0; i < 19; i++) {
if (!i_this->mBodyParts[i].mHide) {
if ((i_this->mBodyParts[i].mPos - camera->mLookat.mEye).abs() >
if ((i_this->mBodyParts[i].mPos - camera->lookat.eye).abs() >
i_this->mBodyParts[i].mSize * (JREG_F(17) + 500.0f))
{
g_env_light.setLightTevColorType_MAJI(i_this->mBodyParts[i].mpMorf->getModel(),
@@ -2315,7 +2315,7 @@ static void fish_move(b_ob_class* i_this) {
a_this->attention_info.position.y += 50.0f;
if (i_this->mDemoAction == 21 || i_this->mDemoAction == 22) {
sp84 = dComIfGp_getCamera(0)->mLookat.mEye - sp90;
sp84 = dComIfGp_getCamera(0)->lookat.eye - sp90;
} else {
sp84 = player->eyePos - sp90;
}
@@ -2399,8 +2399,8 @@ static void demo_camera(b_ob_class* i_this) {
daPy_getPlayerActorClass()->changeOriginalDemo();
daPy_getPlayerActorClass()->changeDemoMode(46, 0, 0, 0);
i_this->mDemoCamEye = camera0->mLookat.mEye;
i_this->mDemoCamCenter = camera0->mLookat.mCenter;
i_this->mDemoCamEye = camera0->lookat.eye;
i_this->mDemoCamCenter = camera0->lookat.center;
sp58 = i_this->mDemoCamEye - tentacle->current.pos;
i_this->field_0x5ce0 = cM_atan2s(sp58.x, sp58.z);
@@ -4201,7 +4201,7 @@ extern actor_process_profile_definition g_profile_B_OB = {
4,
fpcPi_CURRENT_e,
PROC_B_OB,
&g_fpcLf_Method.mBase,
&g_fpcLf_Method.base,
sizeof(b_ob_class),
0,
0,
@@ -4211,4 +4211,4 @@ extern actor_process_profile_definition g_profile_B_OB = {
0xC4000,
fopAc_ENEMY_e,
fopAc_CULLBOX_CUSTOM_e,
};
};
src/d/actor/d_a_b_oh2.cpp
+1 -1
View File
@@ -315,7 +315,7 @@ extern actor_process_profile_definition g_profile_B_OH2 = {
7,
fpcPi_CURRENT_e,
PROC_B_OH2,
&g_fpcLf_Method.mBase,
&g_fpcLf_Method.base,
sizeof(b_oh2_class),
0,
0,
src/d/actor/d_a_b_tn.cpp
+2 -2
View File
@@ -805,7 +805,7 @@ extern actor_process_profile_definition g_profile_B_TN = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_B_TN, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daB_TN_c), // mSize
0, // mSizeOther
0, // mParameters
@@ -2934,4 +2934,4 @@ static u8 data_8062F360[4];
static u8 data_8062F364[4];
#pragma pop
/* 8062E8E8-8062E8E8 0002B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 8062E8E8-8062E8E8 0002B4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_b_yo.cpp
+5 -5
View File
@@ -776,10 +776,10 @@ void daB_YO_c::setYoMessage(int i_msgIdx) {
/* 80630EAC-80630F28 001B2C 007C+00 1/1 0/0 0/0 .text doYoMessage__8daB_YO_cFv */
int daB_YO_c::doYoMessage() {
if (mpMsg != NULL) {
if (mpMsg->mMode == 0xE) {
mpMsg->mMode = 0x10;
} else if (mpMsg->mMode == 0x12) {
mpMsg->mMode = 0x13;
if (mpMsg->mode == 0xE) {
mpMsg->mode = 0x10;
} else if (mpMsg->mode == 0x12) {
mpMsg->mode = 0x13;
mMsgPcID = 0xFFFFFFFF;
return 1;
}
@@ -3686,7 +3686,7 @@ extern actor_process_profile_definition g_profile_B_YO = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_B_YO, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daB_YO_c), // mSize
0, // mSizeOther
0, // mParameters
src/d/actor/d_a_b_yo_ice.cpp
+1 -1
View File
@@ -1145,7 +1145,7 @@ extern actor_process_profile_definition g_profile_B_YOI = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_B_YOI, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daB_YOI_c), // mSize
0, // mSizeOther
0, // mParameters
src/d/actor/d_a_b_zant.cpp
+5 -5
View File
@@ -993,10 +993,10 @@ void daB_ZANT_c::setZantMessage(int i_msgNo) {
/* 80640104-80640180 0020E4 007C+00 1/1 0/0 0/0 .text doZantMessage__10daB_ZANT_cFv */
int daB_ZANT_c::doZantMessage() {
if (mpMsg != NULL) {
if (mpMsg->mMode == 14) {
mpMsg->mMode = 16;
} else if (mpMsg->mMode == 18) {
mpMsg->mMode = 19;
if (mpMsg->mode == 14) {
mpMsg->mode = 16;
} else if (mpMsg->mode == 18) {
mpMsg->mode = 19;
mMsgID = fpcM_ERROR_PROCESS_ID_e;
return 1;
}
@@ -5798,7 +5798,7 @@ extern actor_process_profile_definition g_profile_B_ZANT = {
4, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_B_ZANT, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daB_ZANT_c), // mSize
0, // mSizeOther
0, // mParameters
src/d/actor/d_a_b_zant_magic.cpp
+1 -1
View File
@@ -305,7 +305,7 @@ extern actor_process_profile_definition g_profile_B_ZANTM = {
4, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_B_ZANTM, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daB_ZANTM_c), // mSize
0, // mSizeOther
0, // mParameters
src/d/actor/d_a_b_zant_mobile.cpp
+1 -1
View File
@@ -539,7 +539,7 @@ extern actor_process_profile_definition g_profile_B_ZANTZ = {
4, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_B_ZANTZ, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daB_ZANTZ_c), // mSize
0, // mSizeOther
0, // mParameters
src/d/actor/d_a_b_zant_sima.cpp
+2 -2
View File
@@ -245,7 +245,7 @@ extern actor_process_profile_definition g_profile_B_ZANTS = {
3,
fpcPi_CURRENT_e,
PROC_B_ZANTS,
&g_fpcLf_Method.mBase,
&g_fpcLf_Method.base,
sizeof(daB_ZANTS_c),
0,
0,
@@ -255,4 +255,4 @@ extern actor_process_profile_definition g_profile_B_ZANTS = {
0x40000,
fopAc_ACTOR_e,
fopAc_CULLBOX_CUSTOM_e,
};
};
src/d/actor/d_a_balloon_2D.cpp
+2 -2
View File
@@ -689,7 +689,7 @@ extern actor_process_profile_definition g_profile_BALLOON2D = {
3, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_BALLOON2D, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(JMSMesgEntry_c), // mSize
0, // mSizeOther
0, // mParameters
@@ -810,4 +810,4 @@ void __sinit_d_a_balloon_2D_cpp() {
REGISTER_CTORS(0x80655524, __sinit_d_a_balloon_2D_cpp);
#pragma pop
/* 806555EC-806555EC 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 806555EC-806555EC 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_bd.cpp
+2 -2
View File
@@ -252,7 +252,7 @@ extern actor_process_profile_definition g_profile_BD = {
8, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_BD, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(bd_class), // mSize
0, // mSizeOther
0, // mParameters
@@ -1222,4 +1222,4 @@ static u8 data_804DA44C[4];
static u8 data_804DA450[4];
#pragma pop
/* 804D9F6C-804D9F6C 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 804D9F6C-804D9F6C 000108 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_bg_obj.cpp
+2 -2
View File
@@ -1368,7 +1368,7 @@ extern actor_process_profile_definition g_profile_BG_OBJ = {
7,
fpcPi_CURRENT_e,
PROC_BG_OBJ,
&g_fpcLf_Method.mBase,
&g_fpcLf_Method.base,
sizeof(daBgObj_c),
0,
0,
@@ -1378,4 +1378,4 @@ extern actor_process_profile_definition g_profile_BG_OBJ = {
0x10044100,
fopAc_ACTOR_e,
fopAc_CULLBOX_CUSTOM_e,
};
};
src/d/actor/d_a_boomerang.cpp
+1 -1
View File
@@ -1360,7 +1360,7 @@ extern actor_process_profile_definition g_profile_BOOMERANG = {
6, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_BOOMERANG, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
0x00000DE4, // mSize
0, // mSizeOther
0, // mParameters
src/d/actor/d_a_bullet.cpp
+2 -2
View File
@@ -155,7 +155,7 @@ extern actor_process_profile_definition g_profile_BULLET = {
8, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_BULLET, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daBullet_c), // mSize
0, // mSizeOther
0, // mParameters
@@ -460,4 +460,4 @@ static void func_806566F8() {
// NONMATCHING
}
/* 80656774-80656774 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 80656774-80656774 000060 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_canoe.cpp
+2 -2
View File
@@ -367,7 +367,7 @@ extern actor_process_profile_definition g_profile_CANOE = {
4, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_CANOE, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daCanoe_c), // mSize
0, // mSizeOther
0, // mParameters
@@ -1183,4 +1183,4 @@ static u8 data_804DD8D0[4];
static u8 data_804DD8D4[4];
#pragma pop
/* 804DD6E8-804DD6E8 00010C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 804DD6E8-804DD6E8 00010C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_coach_2D.cpp
+2 -2
View File
@@ -241,7 +241,7 @@ extern actor_process_profile_definition g_profile_COACH2D = {
3, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_COACH2D, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daCoach2D_c), // mSize
0, // mSizeOther
0, // mParameters
@@ -350,4 +350,4 @@ void __sinit_d_a_coach_2D_cpp() {
REGISTER_CTORS(0x8065789C, __sinit_d_a_coach_2D_cpp);
#pragma pop
/* 80657954-80657954 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 80657954-80657954 000030 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_coach_fire.cpp
+2 -2
View File
@@ -197,7 +197,7 @@ extern actor_process_profile_definition g_profile_COACH_FIRE = {
3, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_COACH_FIRE, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daCoachFire_c), // mSize
0, // mSizeOther
0, // mParameters
@@ -279,4 +279,4 @@ extern "C" void __dt__10cCcD_GSttsFv() {
SECTION_DEAD static char const* const stringBase_80658454 = "Coach";
#pragma pop
/* 80658454-80658454 00006C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 80658454-80658454 00006C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_cow.cpp
+2 -2
View File
@@ -1342,7 +1342,7 @@ extern actor_process_profile_definition g_profile_COW = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_COW, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daCow_c), // mSize
0, // mSizeOther
0, // mParameters
@@ -2586,4 +2586,4 @@ static u8 data_806635B4[4];
static u8 data_806635B8[4];
#pragma pop
/* 80662F18-80662F18 000168 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 80662F18-80662F18 000168 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_crod.cpp
+2 -2
View File
@@ -411,7 +411,7 @@ extern actor_process_profile_definition g_profile_CROD = {
8,
fpcPi_CURRENT_e,
PROC_CROD,
&g_fpcLf_Method.mBase,
&g_fpcLf_Method.base,
sizeof(daCrod_c),
0,
0,
@@ -421,4 +421,4 @@ extern actor_process_profile_definition g_profile_CROD = {
0x60000,
5,
fopAc_CULLBOX_0_e,
};
};
src/d/actor/d_a_cstaF.cpp
+2 -2
View File
@@ -378,7 +378,7 @@ extern actor_process_profile_definition g_profile_CSTAF = {
3, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_CSTAF, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
0x00000B38, // mSize
0, // mSizeOther
0, // mParameters
@@ -769,4 +769,4 @@ static void func_804DF89C() {
/* 804DF8A4-804DF8AC 001FC4 0008+00 1/0 0/0 0/0 .text @20@__dt__15dBgS_StatueAcchFv */
static void func_804DF8A4() {
// NONMATCHING
}
}
src/d/actor/d_a_cstatue.cpp
+2 -2
View File
@@ -437,7 +437,7 @@ extern actor_process_profile_definition g_profile_CSTATUE = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_CSTATUE, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
0x00000B2C, // mSize
0, // mSizeOther
0, // mParameters
@@ -1637,4 +1637,4 @@ static u8 data_80667C3C[4];
#pragma push
#pragma force_active on
static u8 data_80667C40[4];
#pragma pop
#pragma pop
src/d/actor/d_a_demo00.cpp
+2 -2
View File
@@ -464,7 +464,7 @@ extern actor_process_profile_definition g_profile_DEMO00 = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_DEMO00, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daDemo00_c), // mSize
0, // mSizeOther
0, // mParameters
@@ -1505,4 +1505,4 @@ static u8 data_804A8E80[4];
static u8 data_804A8E84[4];
#pragma pop
/* 804A8998-804A8998 000138 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 804A8998-804A8998 000138 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_demo_item.cpp
+1 -1
View File
@@ -573,7 +573,7 @@ extern actor_process_profile_definition g_profile_Demo_Item = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_Demo_Item, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daDitem_c), // mSize
0, // mSizeOther
0, // mParameters
src/d/actor/d_a_disappear.cpp
+2 -2
View File
@@ -139,7 +139,7 @@ extern actor_process_profile_definition g_profile_DISAPPEAR = {
7,
fpcPi_CURRENT_e,
PROC_DISAPPEAR,
&g_fpcLf_Method.mBase,
&g_fpcLf_Method.base,
sizeof(disappear_class),
0,
0,
@@ -149,4 +149,4 @@ extern actor_process_profile_definition g_profile_DISAPPEAR = {
0x44000,
fopAc_ACTOR_e,
fopAc_CULLBOX_0_e,
};
};
src/d/actor/d_a_dmidna.cpp
+2 -2
View File
@@ -107,7 +107,7 @@ extern actor_process_profile_definition g_profile_DMIDNA = {
7,
fpcPi_CURRENT_e,
PROC_DMIDNA,
&g_fpcLf_Method.mBase,
&g_fpcLf_Method.base,
sizeof(daDmidna_c),
0,
0,
@@ -117,4 +117,4 @@ extern actor_process_profile_definition g_profile_DMIDNA = {
0x60000,
fopAc_ENV_e,
fopAc_CULLBOX_0_e,
};
};
src/d/actor/d_a_do.cpp
+1 -1
View File
@@ -2814,7 +2814,7 @@ extern actor_process_profile_definition g_profile_DO = {
7,
fpcPi_CURRENT_e,
PROC_DO,
&g_fpcLf_Method.mBase,
&g_fpcLf_Method.base,
sizeof(do_class),
0,
0,
src/d/actor/d_a_door_boss.cpp
+1 -1
View File
@@ -467,7 +467,7 @@ extern actor_process_profile_definition g_profile_BOSS_DOOR = {
7,
fpcPi_CURRENT_e,
PROC_BOSS_DOOR,
&g_fpcLf_Method.mBase,
&g_fpcLf_Method.base,
sizeof(daBdoor_c),
0,
0,
src/d/actor/d_a_door_bossL1.cpp
+1 -1
View File
@@ -1055,7 +1055,7 @@ extern actor_process_profile_definition g_profile_L1BOSS_DOOR = {
7,
fpcPi_CURRENT_e,
PROC_L1BOSS_DOOR,
&g_fpcLf_Method.mBase,
&g_fpcLf_Method.base,
sizeof(daBdoorL1_c),
0,
0,
src/d/actor/d_a_door_bossL5.cpp
+1 -1
View File
@@ -570,7 +570,7 @@ extern actor_process_profile_definition g_profile_L5BOSS_DOOR = {
7,
fpcPi_CURRENT_e,
PROC_L5BOSS_DOOR,
&g_fpcLf_Method.mBase,
&g_fpcLf_Method.base,
sizeof(daBdoorL5_c),
0,
0,
src/d/actor/d_a_door_dbdoor00.cpp
+2 -2
View File
@@ -476,7 +476,7 @@ extern actor_process_profile_definition g_profile_DBDOOR = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_DBDOOR, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daDbDoor00_c), // mSize
0, // mSizeOther
0, // mParameters
@@ -486,4 +486,4 @@ extern actor_process_profile_definition g_profile_DBDOOR = {
0x44000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_6_e, // cullType
};
};
src/d/actor/d_a_door_knob00.cpp
+2 -2
View File
@@ -774,7 +774,7 @@ extern actor_process_profile_definition g_profile_KNOB20 = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_KNOB20, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daKnob20_c), // mSize
0, // mSizeOther
0, // mParameters
@@ -784,4 +784,4 @@ extern actor_process_profile_definition g_profile_KNOB20 = {
0x44100, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_6_e, // cullType
};
};
src/d/actor/d_a_door_mbossL1.cpp
+1 -1
View File
@@ -1842,7 +1842,7 @@ extern actor_process_profile_definition g_profile_L1MBOSS_DOOR = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_L1MBOSS_DOOR, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daMBdoorL1_c), // mSize
0, // mSizeOther
0, // mParameters
src/d/actor/d_a_door_push.cpp
+2 -2
View File
@@ -422,7 +422,7 @@ extern actor_process_profile_definition g_profile_PushDoor = {
3,
fpcPi_CURRENT_e,
PROC_PushDoor,
&g_fpcLf_Method.mBase,
&g_fpcLf_Method.base,
sizeof(daDoorPush_c),
0,
0,
@@ -432,4 +432,4 @@ extern actor_process_profile_definition g_profile_PushDoor = {
0x40100,
fopAc_ACTOR_e,
fopAc_CULLBOX_CUSTOM_e,
};
};
src/d/actor/d_a_door_shutter.cpp
+1 -1
View File
@@ -2270,7 +2270,7 @@ extern actor_process_profile_definition g_profile_DOOR20 = {
3, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_DOOR20, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daDoor20_c), // mSize
0, // mSizeOther
0, // mParameters
src/d/actor/d_a_door_spiral.cpp
+2 -2
View File
@@ -10,7 +10,7 @@ extern actor_process_profile_definition g_profile_SPIRAL_DOOR = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_SPIRAL_DOOR, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
0x6b0, // mSize
0, // mSizeOther
0, // mParameters
@@ -20,4 +20,4 @@ extern actor_process_profile_definition g_profile_SPIRAL_DOOR = {
0x44000, // mStatus
fopAc_ACTOR_e, // mActorType
fopAc_CULLBOX_6_e, // cullType
};
};
src/d/actor/d_a_dshutter.cpp
+1 -1
View File
@@ -300,7 +300,7 @@ extern actor_process_profile_definition2 g_profile_DSHUTTER = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_DSHUTTER, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daDsh_c), // mSize
0, // mSizeOther
0, // mParameters
src/d/actor/d_a_e_ai.cpp
+2 -2
View File
@@ -338,7 +338,7 @@ extern actor_process_profile_definition g_profile_E_AI = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_AI, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(e_ai_class), // mSize
0, // mSizeOther
0, // mParameters
@@ -908,4 +908,4 @@ static void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* param_1,
// NONMATCHING
}
/* 8067C538-8067C538 00013C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 8067C538-8067C538 00013C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_e_arrow.cpp
+1 -1
View File
@@ -889,7 +889,7 @@ extern actor_process_profile_definition g_profile_E_ARROW = {
8,
fpcPi_CURRENT_e,
PROC_E_ARROW,
&g_fpcLf_Method.mBase,
&g_fpcLf_Method.base,
sizeof(e_arrow_class),
0,
0,
src/d/actor/d_a_e_ba.cpp
+1 -1
View File
@@ -1105,7 +1105,7 @@ extern actor_process_profile_definition g_profile_E_BA = {
7,
fpcPi_CURRENT_e,
PROC_E_BA,
&g_fpcLf_Method.mBase,
&g_fpcLf_Method.base,
sizeof(e_ba_class),
0,
0,
src/d/actor/d_a_e_bee.cpp
+3 -3
View File
@@ -629,8 +629,8 @@ static void bee_control(e_bee_class* i_this) {
cXyz vec3;
if (dComIfGp_checkPlayerStatus0(0, 0x200000)) {
vec3.x = bee->mPos.x - camera->mLookat.mEye.x;
vec3.z = bee->mPos.z - camera->mLookat.mEye.z;
vec3.x = bee->mPos.x - camera->lookat.eye.x;
vec3.z = bee->mPos.z - camera->lookat.eye.z;
if (JMAFastSqrt(vec3.x * vec3.x + vec3.z * vec3.z) > 2500.0f) {
bee->mNoDraw = true;
}
@@ -1083,7 +1083,7 @@ extern actor_process_profile_definition g_profile_E_BEE = {
7,
fpcPi_CURRENT_e,
PROC_E_BEE,
&g_fpcLf_Method.mBase,
&g_fpcLf_Method.base,
sizeof(e_bee_class),
0,
0,
src/d/actor/d_a_e_bg.cpp
+2 -2
View File
@@ -287,7 +287,7 @@ extern actor_process_profile_definition g_profile_E_BG = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_BG, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daE_BG_c), // mSize
0, // mSizeOther
0, // mParameters
@@ -856,4 +856,4 @@ static void func_8068A228() {
// NONMATCHING
}
/* 8068A308-8068A308 0000C4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 8068A308-8068A308 0000C4 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_e_bi.cpp
+2 -2
View File
@@ -385,7 +385,7 @@ extern actor_process_profile_definition g_profile_E_BI = {
9, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_BI, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(e_bi_class), // mSize
0, // mSizeOther
0, // mParameters
@@ -1281,4 +1281,4 @@ static u8 data_8068DBC0[4];
static u8 data_8068DBC4[4];
#pragma pop
/* 8068D8D8-8068D8D8 0000EC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 8068D8D8-8068D8D8 0000EC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_e_bi_leaf.cpp
+2 -2
View File
@@ -135,7 +135,7 @@ extern actor_process_profile_definition g_profile_E_BI_LEAF = {
9,
fpcPi_CURRENT_e,
PROC_E_BI_LEAF,
&g_fpcLf_Method.mBase,
&g_fpcLf_Method.base,
sizeof(e_bi_leaf_class),
0,
0,
@@ -145,4 +145,4 @@ extern actor_process_profile_definition g_profile_E_BI_LEAF = {
0x40000,
fopAc_ACTOR_e,
fopAc_CULLBOX_0_e,
};
};
src/d/actor/d_a_e_bs.cpp
+2 -2
View File
@@ -391,7 +391,7 @@ extern actor_process_profile_definition g_profile_E_BS = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_BS, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(e_bs_class), // mSize
0, // mSizeOther
0, // mParameters
@@ -958,4 +958,4 @@ static void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* param_1,
// NONMATCHING
}
/* 80690EB8-80690EB8 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 80690EB8-80690EB8 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_e_bu.cpp
+2 -2
View File
@@ -385,7 +385,7 @@ extern actor_process_profile_definition g_profile_E_BU = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_BU, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(e_bu_class), // mSize
0, // mSizeOther
0, // mParameters
@@ -952,4 +952,4 @@ static void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* param_1,
// NONMATCHING
}
/* 80694770-80694770 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 80694770-80694770 0000E0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_e_bug.cpp
+2 -2
View File
@@ -152,7 +152,7 @@ extern actor_process_profile_definition g_profile_E_BUG = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_BUG, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(e_bug_class), // mSize
0, // mSizeOther
0, // mParameters
@@ -1017,4 +1017,4 @@ static u8 data_80697F0C[4];
static u8 data_80697F10[4];
#pragma pop
/* 80697D98-80697D98 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 80697D98-80697D98 0000F8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_e_cr.cpp
+2 -2
View File
@@ -292,7 +292,7 @@ extern actor_process_profile_definition g_profile_E_CR = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_CR, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(e_cr_class), // mSize
0, // mSizeOther
0, // mParameters
@@ -689,4 +689,4 @@ static void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* param_1,
// NONMATCHING
}
/* 80699D40-80699D40 000090 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 80699D40-80699D40 000090 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_e_cr_egg.cpp
+2 -2
View File
@@ -270,7 +270,7 @@ extern actor_process_profile_definition g_profile_E_CR_EGG = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_CR_EGG, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(e_cr_egg_class), // mSize
0, // mSizeOther
0, // mParameters
@@ -343,4 +343,4 @@ static void func_8069A8BC() {
// NONMATCHING
}
/* 8069A90C-8069A90C 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 8069A90C-8069A90C 000040 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_e_db.cpp
+2 -2
View File
@@ -537,7 +537,7 @@ extern actor_process_profile_definition g_profile_E_DB = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_DB, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(e_db_class), // mSize
0, // mSizeOther
0, // mParameters
@@ -1403,4 +1403,4 @@ extern "C" void __dt__4cXyzFv() {
// NONMATCHING
}
/* 806A1A6C-806A1A6C 000160 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 806A1A6C-806A1A6C 000160 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_e_db_leaf.cpp
+2 -2
View File
@@ -79,7 +79,7 @@ extern actor_process_profile_definition g_profile_E_DB_LEAF = {
7,
fpcPi_CURRENT_e,
PROC_E_DB_LEAF,
&g_fpcLf_Method.mBase,
&g_fpcLf_Method.base,
sizeof(e_db_leaf_class),
0,
0,
@@ -89,4 +89,4 @@ extern actor_process_profile_definition g_profile_E_DB_LEAF = {
0x40000,
fopAc_ACTOR_e,
fopAc_CULLBOX_0_e,
};
};
src/d/actor/d_a_e_dd.cpp
+2 -2
View File
@@ -466,7 +466,7 @@ extern actor_process_profile_definition g_profile_E_DD = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_DD, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(e_dd_class), // mSize
0, // mSizeOther
0, // mParameters
@@ -1105,4 +1105,4 @@ static void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* param_1,
// NONMATCHING
}
/* 806A72B4-806A72B4 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 806A72B4-806A72B4 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_e_df.cpp
+2 -2
View File
@@ -239,7 +239,7 @@ extern actor_process_profile_definition g_profile_E_DF = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_DF, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daE_DF_c), // mSize
0, // mSizeOther
0, // mParameters
@@ -735,4 +735,4 @@ static void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* param_1,
// NONMATCHING
}
/* 806A9FFC-806A9FFC 0000CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 806A9FFC-806A9FFC 0000CC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_e_dk.cpp
+2 -2
View File
@@ -278,7 +278,7 @@ extern actor_process_profile_definition g_profile_E_DK = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_DK, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daE_DK_c), // mSize
0, // mSizeOther
0, // mParameters
@@ -973,4 +973,4 @@ static void func_806AD51C() {
// NONMATCHING
}
/* 806AD628-806AD628 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 806AD628-806AD628 0000F0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_e_dn.cpp
+2 -2
View File
@@ -646,7 +646,7 @@ extern actor_process_profile_definition g_profile_E_DN = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_DN, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(e_dn_class), // mSize
0, // mSizeOther
0, // mParameters
@@ -1975,4 +1975,4 @@ static u8 data_804EEFF4[4];
static u8 data_804EEFF8[4];
#pragma pop
/* 804EEA34-804EEA34 000188 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 804EEA34-804EEA34 000188 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_e_dt.cpp
+2 -2
View File
@@ -602,7 +602,7 @@ extern actor_process_profile_definition g_profile_E_DT = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_DT, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daE_DT_c), // mSize
0, // mSizeOther
0, // mParameters
@@ -2185,4 +2185,4 @@ static u8 data_806B63A8[4];
static u8 data_806B63AC[4];
#pragma pop
/* 806B5ED0-806B5ED0 0001FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 806B5ED0-806B5ED0 0001FC 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_e_fb.cpp
+2 -2
View File
@@ -271,7 +271,7 @@ extern actor_process_profile_definition g_profile_E_FB = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_FB, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daE_FB_c), // mSize
0, // mSizeOther
0, // mParameters
@@ -1055,4 +1055,4 @@ static u8 data_806B9284[4];
static u8 data_806B9288[4];
#pragma pop
/* 806B9028-806B9028 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 806B9028-806B9028 00009C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_e_fk.cpp
+2 -2
View File
@@ -234,7 +234,7 @@ extern actor_process_profile_definition g_profile_E_FK = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_FK, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daE_FK_c), // mSize
0, // mSizeOther
0, // mParameters
@@ -1177,4 +1177,4 @@ static u8 data_806BB9D4[4];
static u8 data_806BB9D8[4];
#pragma pop
/* 806BB81C-806BB81C 00014C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 806BB81C-806BB81C 00014C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_e_fm.cpp
+2 -2
View File
@@ -863,7 +863,7 @@ extern actor_process_profile_definition g_profile_E_FM = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_FM, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(e_fm_class), // mSize
0, // mSizeOther
0, // mParameters
@@ -2589,4 +2589,4 @@ static u8 data_804FAFE0[4];
static u8 data_804FAFE4[4];
#pragma pop
/* 804FA948-804FA948 00028C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 804FA948-804FA948 00028C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_e_fs.cpp
+1 -1
View File
@@ -866,7 +866,7 @@ extern actor_process_profile_definition g_profile_E_FS = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_FS, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(e_fs_class), // mSize
0, // mSizeOther
0, // mParameters
src/d/actor/d_a_e_fz.cpp
+1 -1
View File
@@ -1055,7 +1055,7 @@ extern actor_process_profile_definition g_profile_E_FZ = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_FZ, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daE_FZ_c), // mSize
0, // mSizeOther
0, // mParameters
src/d/actor/d_a_e_ga.cpp
+2 -2
View File
@@ -94,7 +94,7 @@ extern actor_process_profile_definition g_profile_E_GA = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_GA, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(e_ga_class), // mSize
0, // mSizeOther
0, // mParameters
@@ -330,4 +330,4 @@ void __sinit_d_a_e_ga_cpp() {
REGISTER_CTORS(0x804FBB40, __sinit_d_a_e_ga_cpp);
#pragma pop
/* 804FBBD4-804FBBD4 000044 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 804FBBD4-804FBBD4 000044 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_e_gb.cpp
+2 -2
View File
@@ -517,7 +517,7 @@ extern actor_process_profile_definition g_profile_E_GB = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_GB, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(e_gb_class), // mSize
0, // mSizeOther
0, // mParameters
@@ -1609,4 +1609,4 @@ extern "C" void setPos__7daKey_cF4cXyz() {
// NONMATCHING
}
/* 806C76B8-806C76B8 0001D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 806C76B8-806C76B8 0001D0 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_e_ge.cpp
+2 -2
View File
@@ -496,7 +496,7 @@ extern actor_process_profile_definition g_profile_E_GE = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_GE, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daE_GE_c), // mSize
0, // mSizeOther
0, // mParameters
@@ -1199,4 +1199,4 @@ static void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* param_1,
// NONMATCHING
}
/* 806CD10C-806CD10C 00010C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 806CD10C-806CD10C 00010C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_e_gi.cpp
+2 -2
View File
@@ -417,7 +417,7 @@ extern actor_process_profile_definition g_profile_E_GI = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_GI, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daE_GI_c), // mSize
0, // mSizeOther
0, // mParameters
@@ -1107,4 +1107,4 @@ extern "C" void checkNowWolf__9daPy_py_cFv() {
// NONMATCHING
}
/* 806D0F78-806D0F78 000118 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 806D0F78-806D0F78 000118 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_e_gm.cpp
+2 -2
View File
@@ -797,7 +797,7 @@ extern actor_process_profile_definition g_profile_E_GM = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_GM, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daE_GM_c), // mSize
0, // mSizeOther
0, // mParameters
@@ -1892,4 +1892,4 @@ static u8 data_806D7F7C[4];
static u8 data_806D7F80[4];
#pragma pop
/* 806D7AF0-806D7AF0 000150 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 806D7AF0-806D7AF0 000150 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_e_gob.cpp
+2 -2
View File
@@ -348,7 +348,7 @@ extern actor_process_profile_definition g_profile_E_GOB = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_GOB, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(e_gob_class), // mSize
0, // mSizeOther
0, // mParameters
@@ -1792,4 +1792,4 @@ static u8 data_806DF370[4];
static u8 data_806DF374[4];
#pragma pop
/* 806DF054-806DF054 00021C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 806DF054-806DF054 00021C 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_e_gs.cpp
+2 -2
View File
@@ -118,7 +118,7 @@ extern actor_process_profile_definition g_profile_E_GS = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_GS, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(e_gs_class), // mSize
0, // mSizeOther
0, // mParameters
@@ -282,4 +282,4 @@ void __sinit_d_a_e_gs_cpp() {
REGISTER_CTORS(0x806DFDA4, __sinit_d_a_e_gs_cpp);
#pragma pop
/* 806DFE2C-806DFE2C 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 806DFE2C-806DFE2C 000038 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_e_hb.cpp
+2 -2
View File
@@ -438,7 +438,7 @@ extern actor_process_profile_definition g_profile_E_HB = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_HB, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(e_hb_class), // mSize
0, // mSizeOther
0, // mParameters
@@ -1196,4 +1196,4 @@ extern "C" void __dt__4cXyzFv() {
// NONMATCHING
}
/* 80500C34-80500C34 000130 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 80500C34-80500C34 000130 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_e_hb_leaf.cpp
+2 -2
View File
@@ -98,7 +98,7 @@ extern actor_process_profile_definition g_profile_E_HB_LEAF = {
7,
fpcPi_CURRENT_e,
PROC_E_HB_LEAF,
&g_fpcLf_Method.mBase,
&g_fpcLf_Method.base,
sizeof(e_hb_leaf_class),
0,
0,
@@ -108,4 +108,4 @@ extern actor_process_profile_definition g_profile_E_HB_LEAF = {
0x40000,
fopAc_ACTOR_e,
fopAc_CULLBOX_0_e,
};
};
src/d/actor/d_a_e_hm.cpp
+2 -2
View File
@@ -395,7 +395,7 @@ extern actor_process_profile_definition g_profile_E_HM = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_HM, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daE_HM_c), // mSize
0, // mSizeOther
0, // mParameters
@@ -1551,4 +1551,4 @@ static u8 data_806E5CE0[4];
static u8 data_806E5CE4[4];
#pragma pop
/* 806E5A74-806E5A74 000154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 806E5A74-806E5A74 000154 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
src/d/actor/d_a_e_hp.cpp
+2 -2
View File
@@ -389,7 +389,7 @@ extern actor_process_profile_definition g_profile_E_HP = {
7, // mListID
fpcPi_CURRENT_e, // mListPrio
PROC_E_HP, // mProcName
&g_fpcLf_Method.mBase, // sub_method
&g_fpcLf_Method.base, // sub_method
sizeof(daE_HP_c), // mSize
0, // mSizeOther
0, // mParameters
@@ -1018,4 +1018,4 @@ static void setMidnaBindEffect(fopEn_enemy_c* param_0, Z2CreatureEnemy* param_1,
// NONMATCHING
}
/* 806EA2CC-806EA2CC 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */
/* 806EA2CC-806EA2CC 0000D8 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */

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