Game-Decompilation/Petari
1
0
Fork 0
mirror of https://github.com/SMGCommunity/Petari.git synced 2024-11-27 15:30:44 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add some members to the Mario header

Browse Source
This commit is contained in:
Headpenguin 2023-06-20 11:35:59 -04:00
parent d393206b27
commit 647d026ba8
4 changed files with 54 additions and 332 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
csv/Player.csv
View File

@ -858,7 +858,7 @@ __dt__11MarioHolderFv,MarioHolder.o,Player.a,false
setMarioActor__11MarioHolderFP10MarioActor,MarioHolder.o,Player.a,false
getMarioActor__11MarioHolderCFv,MarioHolder.o,Player.a,false
getMarioHolder__2MRFv,MarioHolder.o,Player.a,false
initMember__5MarioFv,MarioInit.o,Player.a,false
initMember__5MarioFv,MarioInit.o,Player.a,true
isRising__5MarioCFv,MarioJump.o,Player.a,false
checkWallRiseAndSlipFront__5MarioFv,MarioJump.o,Player.a,false
tryJump__5MarioFv,MarioJump.o,Player.a,false

1 Symbol Name Object File Library Archive Matching
858 setMarioActor__11MarioHolderFP10MarioActor MarioHolder.o Player.a false
859 getMarioActor__11MarioHolderCFv MarioHolder.o Player.a false
860 getMarioHolder__2MRFv MarioHolder.o Player.a false
861 initMember__5MarioFv MarioInit.o Player.a false true
862 isRising__5MarioCFv MarioJump.o Player.a false
863 checkWallRiseAndSlipFront__5MarioFv MarioJump.o Player.a false
864 tryJump__5MarioFv MarioJump.o Player.a false

60
include/Game/Player/Mario.h
View File

@ -1,6 +1,7 @@
#pragma once
#include "Game/Player/MarioModule.h"
#include "Game/Util/TriangleFilter.h"
class MarioActor;
class MarioFlow;
@ -70,6 +71,9 @@ public:
void initTask();
bool isIgnoreTriangle(const Triangle *);
//static const DataWrapper<Mario>::Data<Mario::isIgnoreTriangle> sFilterData;
//= TriangleFilterDelegator<Mario>::Data<Mario::isIgnoreTriangle>(0, -1);
u32 _8;
u32 _C;
u32 _10;
@ -81,6 +85,11 @@ public:
u32 _28;
u32 _2C;
// FAKE
u32 _30;
u32 _34;
//NOT FAKE
f32 _38;
f32 _3C;
TVec3f _40;
@ -90,7 +99,6 @@ public:
TMtx34f _94;
TMtx34f _C4;
TMtx34f _F4;
f32 _124;
f32 _128;
u32 _12C;
@ -111,7 +119,7 @@ public:
TVec3f _1D8;
TVec3f _1E4;
TVec3f _1F0;
TVec3f _1FC;
TVec3f _208;
TVec3f _214;
TVec3f _220;
@ -119,7 +127,6 @@ public:
TVec3f _238;
TVec3f _244;
TVec3f _250;
TVec3f _25C;
TVec3f _268;
u8 _274;
@ -140,7 +147,7 @@ public:
TVec3f _2F8;
TVec3f _304;
TVec3f _310;
TVec3f _31c;
TVec3f _31C;
TVec3f _328;
TVec3f _334;
f32 _340;
@ -161,9 +168,9 @@ public:
u16 _3C4;
u16 _3C6;
u16 _3C8;
u16 _3CE;
u16 _3CC;
u16 _3CA;
u16 _3CC;
u16 _3CE;
u16 _3D0;
u16 _3D2;
u16 _3D4;
@ -197,6 +204,7 @@ public:
u16 _426;
u16 _428;
u16 _42A;
u16 _42C;
u32 _430;
u16 _434;
u16 _436;
@ -234,6 +242,10 @@ public:
TVec3f _4E8;
TVec3f _4F4;
// FAKE
TVec3f _500;
// NOT FAKE
TVec3f _50C;
TVec3f _518;
f32 _524;
@ -249,6 +261,11 @@ public:
TVec3f _54C;
u32 _558;
// FAKE
u32 _55C;
u32 _560;
//NOT FAKE
s32 _564;
u32 _568;
u32 _56C;
@ -256,18 +273,27 @@ public:
u32 _574;
u32 _578;
Triangle* _57C[0x20];
u32 _5FC;
TVec3f _600;
u8 _60C;
u8 _60D;
// FAKE
u32 _610[0xA];
// NOT FAKE
u8 _638;
TVec3f _63C;
TVec3f _648;
TVec3f _654;
TVec3f _660;
// fake
TVec3f _66C;
TVec3f _678;
f32 _684;
//not fake
TVec3f _688;
TVec3f _694;
TVec3f _6A0;
@ -366,8 +392,17 @@ public:
Triangle* _8E8;
u8 _8EC;
//FAKE
u32 _8F0;
//NOT FAKE
f32 _8F4;
//FAKE
TVec3f _8F8;
TVec3f _904;
//NOT FAKE
TVec3f _910;
TVec3f _91C;
TVec3f _928;
@ -380,14 +415,21 @@ public:
u16 _962;
u16 _964[3];
u16 _96A;
// FAKE
u32 _96C[4];
// NOT FAKE
u32 _97C;
u32 _A08[11];
// Fake
u32 _980[0x22];
//NOT FAKE
u32 _A08[11];
u16 _A34;
u32 _A38;
u16 _A3C;
TVec3f _A40;
TVec3f _A4C;
TVec3f _A58;

321
source/Game/Player/Mario.cpp
View File

@ -1,321 +0,0 @@
#include "Game/Player/Mario.h"
#include "Game/Player/MarioFlow.h"
#include "Game/Player/MarioWall.h"
#include "Game/Player/MarioDamage.h"
#include "Game/Player/MarioFaint.h"
#include "Game/Player/MarioBlown.h"
#include "Game/Player/MarioHang.h"
#include "Game/Player/MarioSwim.h"
#include "Game/Player/MarioSlider.h"
#include "Game/Player/MarioFireDamage.h"
#include "Game/Player/MarioFireRun.h"
#include "Game/Player/MarioFireDance.h"
#include "Game/Player/MarioAbyssDamage.h"
#include "Game/Player/MarioDarkDamage.h"
#include "Game/Player/MarioStep.h"
#include "Game/Player/MarioBump.h"
#include "Game/Player/MarioParalyze.h"
#include "Game/Player/MarioStun.h"
#include "Game/Player/MarioCrush.h"
#include "Game/Player/MarioFreeze.h"
#include "Game/Player/MarioMagic.h"
#include "Game/Player/MarioFpView.h"
#include "Game/Player/MarioRecovery.h"
#include "Game/Player/MarioFlip.h"
#include "Game/Player/MarioSideStep.h"
#include "Game/Player/MarioFrontStep.h"
#include "Game/Player/MarioStick.h"
#include "Game/Player/MarioRabbit.h"
#include "Game/Player/MarioSukekiyo.h"
#include "Game/Player/MarioBury.h"
#include "Game/Player/MarioWait.h"
#include "Game/Player/MarioClimb.h"
#include "Game/Player/MarioSkate.h"
#include "Game/Player/MarioFoo.h"
#include "Game/Player/MarioWarp.h"
#include "Game/Player/MarioTeresa.h"
#include "Game/Player/MarioTalk.h"
#include "Game/Player/MarioMove.h"
#include "Game/Player/MarioMapCode.h"
#include "Game/Map/HitInfo.h"
Mario::Mario(MarioActor *parent) {
initMember();
_160.zero();
_13C.zero();
_148.zero();
_154.zero();
_43C = _220 = _208 = TVec3f(1f, 0f, 0f);
_214 = TVec3f(1f, 0f, 0f);
_22C = TVec3f(1f, 0f, 0f);
_3E4 = TVec3f(1f, 0f, 0f);
_2B4 = 0f;
_290 = _310 = TVec3f(0f, 0f, 1f);
_1D8 = TVec3f(0f, -1f, 0f);
_1E4.zero();
bool nearZero = MR::isNearZero(_1D8, 0.0010000000475f);
_938 = _1F0 = -_1D8;
_944 = _208;
_950 = _310;
_60D = 0;
_71C = 0;
_278 = 0f;
_2D0 = 0f;
_2D4.zero();
_2E0.zero();
_2EC.zero();
_2F8.zero();
_328.zero();
_334.zero();
_488=0f;
_430=0;
_3BC=0;
_3BE=0;
_3C0=0;
_3CE=0;
_3CC=0;
_3CA=0;
_3D0=0;
_3D4=0;
_424=0;
_434=0;
_436=0;
_428=0;
_3D2=0;
_404=0;
_406=0;
_408=0;
_40A=0;
_426=0;
_418=0;
_41A=0;
_774=0;
_3C2=0;
_3C4=0;
_3C6=0;
_3C8=0;
_7D0=0x78;
_524=0f;
_528=0f;
_52C=0f;
_530=0f;
_534=0;
_538=0f;
_53C=0f;
_544=0;
_540=0f;
_3F8=0;
_3FA=0;
_3FC=0;
_3FE=0;
_400=0;
_402=0;
_27C=0f;
_734=0;
_735=0;
_748=0;
_71E=0;
_414=0;
_416=0;
_41C=0;
_41E=0;
_410=0;
_420=0;
_43A=0;
_3F4=0f;
_3F0=1f;
_58.zero();
_12C = 0;
_76C = 0;
_770 = _738 = _73C = 0f;
_740 = 1f;
_744 = 0f;
_368 = TVec3f(0f, 1f, 0f);
_374 = -_368;
_380 = _368;
_38C = -_368;
_398 = TVec3f(0f, 1f, 0f);
_344 = TVec3f(1f, 0f, 0f);
_74C = 0f;
_750 = 0;
_754 = 0;
_40C = 0;
_40E = 0;
_412 = 0;
_558 = 0;
_2A8 = -_368;
_29C = _368;
_124 = _128 = _548 = 0f;
_54C = _1F0;
_C4.identity();
_64.identity();
_94.identity();
clearSlope();
_910.zero();
_91C.zero();
_928.zero();
_934 = 0.8f;
_3C = 0.001f;
_8 = _C = _10 = _14 = _18 = _1C = _20 = _24 = _28 = 0;
_458 = new TriangleFilterDelegator<Mario>(this, 0, -1, &Mario::isIgnoreTriangle);
_45C = new Triangle();
_460 = new Triangle();
_464 = new Triangle();
_468 = new Triangle();
_46C = new Triangle();
_4C8 = new Triangle();
_4CC = new Triangle();
_4D0 = new Triangle();
_4D4 = new Triangle();
_4D8 = new Triangle();
_4DC = new Triangle();
_470 = new Triangle();
_474 = new Triangle();
_478 = new Triangle();
_7E0 = new Triangle();
_820 = new Triangle();
_47C = new Triangle();
_480 = new Triangle();
_484 = new Triangle();
for(int i = 0; i < 0x20; i++) {
_57C[i] = new Triangle();
}
_578 = 0;
_4E8.zero();
_4F4.zero();
_7D4.zero();
_8A4.zero();
_8C8 = new Triangle();
_8E8 = new Triangle();
_8CC = new Triangle();
_8D0 = new Triangle();
_564 = -1;
_568 = 0;
_564 = 0;
_56C = 0;
for(int i = 0; i < 9; i++) {
_A8C[i].zero();
}
_4A4.zero();
_4B0.zero();
_25C.zero();
_268.zero();
_350.zero();
_35C.zero();
_184.zero();
_1A8.zero();
_190.zero();
_19C.zero();
_4E4 = 0f;
_4E0 = 0f;
_72C = 200f;
_730 = 0;
_8D8 = 0;
_8D4 = 0;
_A38 = 0;
_A68 = 0;
_5FC = 0;
_1CC.zero();
_38 = 0f;
_1C0 = TVec3f(0f, 0f, 0f);
_3D8.zero();
_244.zero();
_238.zero();
_250.zero();
clear2DStick();
_6AC = 0;
_6AD = 0;
_6B0.zero();
_6BC.zero();
_63C = TVec3f(1f, 0f, 0f);
_648 = TVec3f(0f, 1f, 0f);
_6A0 = _654 = TVec3f(0f, 0f, 1f);
initSound();
_97C = 0;
_854 = new MarioFlow(mActor);
_758 = new MarioWall(mActor);
_7C0 = new MarioDamage(mActor);
_87C = new MarioFaint(mActor);
_880 = new MarioBlown(mActor);
_79C = new MarioHang(mActor);
_884 = new MarioSwim(mActor);
_888 = new MarioSlider(mActor);
_858 = new MarioFireDamage(mActor);
_860 = new MarioFireRun(mActor);
_85C = new MarioFireDance(mActor);
_874 = new MarioAbyssDamage(mActor);
_878 = new MarioDarkDamage(mActor);
_88C = new MarioStep(mActor);
_890 = new MarioBump(mActor);
_864 = new MarioParalyze(mActor);
_868 = new MarioStun(mActor);
_86C = new MarioCrush(mActor);
_870 = new MarioFreeze(mActor);
_894 = new MarioMagic(mActor);
_89C = new MarioFpView(mActor);
_7A0 = new MarioRecovery(mActor);
_7A8 = new MarioFlip(mActor);
_7AC = new MarioSideStep(mActor);
_7B0 = new MarioFrontStep(mActor);
_768 = new MarioStick(mActor);
_778 = new MarioRabbit(mActor);
_780 = new MarioSukekiyo(mActor);
_784 = new MarioBury(mActor);
_788 = new MarioWait(mActor);
_78C = new MarioClimb(mActor);
_7B4 = new MarioSkate(mActor);
_77C = new MarioFoo(mActor);
_7A4 = new MarioWarp(mActor);
_7BC = new MarioTeresa(mActor);
_7B8 = new MarioTalk(mActor);
_8A0 = new MarioMove(mActor);
initTask();
_95C = new FloorCode();
_960 = 0;
_962 = 0;
for(int i = 0; i < 3; i++) {
_964[i] = _962;
}
_96A = 0;
_574 = 0;
_898 = 0;
}

3
source/Game/Player/MarioInit.cpp
View File

@ -14,7 +14,7 @@ void Mario::initMember() {
_2B8.zero();
_2C4.zero();
_304.zero();
_31c.zero();
_31C.zero();
_340 = 0f;
_3A4.zero();
@ -78,6 +78,7 @@ void Mario::initMember() {
_A40.zero();
_A4C.zero();
_A58.zero();
_A64 = 0f;
for(int i = 0; i < 0x20; i++) {