match MarioActor::init

This commit is contained in:
Headpenguin 2023-06-28 12:55:53 -04:00
parent a1f4f245e4
commit 6584b3be30
2 changed files with 22 additions and 1 deletions

View File

@ -169,7 +169,7 @@ __as__8TriangleFRC8Triangle,MarioActor.o,Player.a,true
getEuler__Q29JGeometry64TRotation3<Q29JGeometry38TMatrix34<Q29JGeometry13SMatrix34C<f>>>CFRQ29JGeometry8TVec3<f>,MarioActor.o,Player.a,false
__ct__10MarioActorFPCc,MarioActor.o,Player.a,false
__dt__10MarioActorFv,MarioActor.o,Player.a,false
init__10MarioActorFRC12JMapInfoIter,MarioActor.o,Player.a,false
init__10MarioActorFRC12JMapInfoIter,MarioActor.o,Player.a,true
init2__10MarioActorFRCQ29JGeometry8TVec3<f>RCQ29JGeometry8TVec3<f>l,MarioActor.o,Player.a,false
initAfterPlacement__10MarioActorFv,MarioActor.o,Player.a,false
initAfterOpeningDemo__10MarioActorFv,MarioActor.o,Player.a,false

1 Symbol Name Object File Library Archive Matching
169 getEuler__Q29JGeometry64TRotation3<Q29JGeometry38TMatrix34<Q29JGeometry13SMatrix34C<f>>>CFRQ29JGeometry8TVec3<f> MarioActor.o Player.a false
170 __ct__10MarioActorFPCc MarioActor.o Player.a false
171 __dt__10MarioActorFv MarioActor.o Player.a false
172 init__10MarioActorFRC12JMapInfoIter MarioActor.o Player.a false true
173 init2__10MarioActorFRCQ29JGeometry8TVec3<f>RCQ29JGeometry8TVec3<f>l MarioActor.o Player.a false
174 initAfterPlacement__10MarioActorFv MarioActor.o Player.a false
175 initAfterOpeningDemo__10MarioActorFv MarioActor.o Player.a false

View File

@ -14,3 +14,24 @@ Triangle &Triangle::operator=(const Triangle &rOther) {
return *this;
}
static float ZERO = 0f;
void MarioActor::init(const JMapInfoIter &rInfo) {
long stack_8 = -1;
if(!MR::isValidInfo(rInfo)) return;
TVec3f stack_24, stack_18, stack_c;
MR::getJMapInfoTrans(rInfo, &stack_24);
MR::getJMapInfoRotate(rInfo, &stack_18);
MR::getJMapInfoScale(rInfo, &stack_c);
stack_18.x = ZERO + (f32)fmod(stack_18.x - ZERO + 360f, (double)360.0);
stack_18.y = ZERO + (f32)fmod(stack_18.y - ZERO + 360f, (double)360.0);
stack_18.z = ZERO + (f32)fmod(stack_18.z - ZERO + 360f, (double)360.0);
if(MR::isExistJMapArg(rInfo)) {
MR::getJMapInfoArg0NoInit(rInfo, &stack_8);
}
init2(stack_24, stack_18, stack_8);
}