Skip to content

Commit 17087cb

Browse files
committed
Matched functions that were ported. Added all zParticleSystemWaterfall
1 parent 5e78bfe commit 17087cb

File tree

12 files changed

+719
-746
lines changed

12 files changed

+719
-746
lines changed

src/SB/Core/gc/iARAMTmp.cpp

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#include "iARAMTmp.h"
2+
3+
bool iARAMTmpEnd(bool)
4+
{
5+
}
6+
7+
void* iARAMTmpInARAMTemp(void*)
8+
{
9+
}
10+
11+
void* iARAMTmpFree(void*)
12+
{
13+
}
14+
15+
U32 iARAMTmpMalloc(unsigned int)
16+
{
17+
return 0;
18+
}
19+
20+
U32 iARAMTmpBegin(unsigned int, unsigned int)
21+
{
22+
}
23+
24+
U64 transferDoneCB(unsigned long)
25+
{
26+
}

src/SB/Core/gc/iARAMTmp.h

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#ifndef IARAMTMP_H
2+
#define IARAMTMP_H
3+
4+
#include <types.h>
5+
6+
bool iARAMTmpEnd(bool);
7+
void* iARAMTmpInARAMTemp(void*);
8+
void* iARAMTmpFree(void*);
9+
U32 iARAMTmpMalloc(unsigned int);
10+
U32 iARAMTmpBegin(unsigned int, unsigned int);
11+
U64 transferDoneCB(unsigned long);
12+
13+
#endif

src/SB/Core/gc/iCutscene.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ U32 iCSFileOpen(xCutscene* csn);
1010
void iCSFileAsyncRead(xCutscene* csn, void* dest, U32 size);
1111
void iCSFileAsyncSkip(xCutscene* csn, U32 amount);
1212
void iCSFileClose(xCutscene* csn);
13+
bool DVDCancelAllAsync();
1314
S32 iCSLoadStep(xCutscene* csn);
1415

1516
#endif

src/SB/Core/gc/iScrFX.cpp

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
#include "iScrFX.h"
2+
3+
extern RwRaster* g_rast_gctapdance;
4+
extern S32 g_alreadyTriedAlloc;
5+
extern _iMotionBlurData sMBD;
6+
extern U32 sMotionBlurEnabled;
7+
8+
void iScrFxLensFlare_Reset()
9+
{
10+
}
11+
12+
S32 iScrFxCameraDestroyed(RwCamera* pCamera)
13+
{
14+
if (sMBD.motionBlurFrontBuffer != NULL)
15+
{
16+
RwRasterDestroy(sMBD.motionBlurFrontBuffer);
17+
sMBD.motionBlurFrontBuffer = NULL;
18+
return 1;
19+
}
20+
return 0;
21+
}
22+
23+
void iScrFxCameraEndScene(RwCamera* pCamera)
24+
{
25+
}
26+
27+
void iScrFxCameraCreated(RwCamera* pCamera)
28+
{
29+
sMBD.motionBlurAlpha = 0x90;
30+
sMBD.motionBlurFrontBuffer = NULL;
31+
sMBD.index[0] = 0;
32+
sMBD.index[1] = 1;
33+
sMBD.index[2] = 2;
34+
sMBD.index[3] = 0;
35+
sMBD.index[4] = 2;
36+
sMBD.index[5] = 3;
37+
}
38+
39+
void iScrFxBegin()
40+
{
41+
}
42+
43+
void iScrFxInit()
44+
{
45+
}

src/SB/Core/gc/iScrFX.h

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,37 @@
55
#include <rwcore.h>
66
#include <types.h>
77

8-
struct _iMotionBlurData {
9-
S32 motionBlurAlpha;
10-
RwRaster *motionBlurFrontBuffer;
11-
// RwSky2DVertex vertex[4]; This doesn't seem right... Due to how the data is
12-
// used, it only makes sense for this to be 96 only.
13-
U8 vertex[96];
14-
U16 index[6];
15-
U32 w;
16-
U32 h;
17-
U8 unk[10]; // There is something here to make this structure 0x88.
8+
// PORTED DIRECTLY FROM BFBB
9+
10+
struct _iMotionBlurData
11+
{
12+
S32 motionBlurAlpha;
13+
RwRaster* motionBlurFrontBuffer;
14+
// RwSky2DVertex vertex[4]; This doesn't seem right... Due to how the data is
15+
// used, it only makes sense for this to be 96 only.
16+
U8 vertex[96];
17+
U16 index[6];
18+
U32 w;
19+
U32 h;
20+
U8 unk[10]; // There is something here to make this structure 0x88.
1821
};
1922

2023
void iScrFxInit();
2124
void iScrFxBegin();
2225
void iScrFxEnd();
23-
void iScrFxDrawBox(F32 x1, F32 y1, F32 x2, F32 y2, U8 red, U8 green, U8 blue,
24-
U8 alpha);
26+
void iScrFxDrawBox(F32 x1, F32 y1, F32 x2, F32 y2, U8 red, U8 green, U8 blue, U8 alpha);
2527
void iCameraMotionBlurActivate(U32 activate);
2628
void iCameraSetBlurriness(F32 amount);
27-
void iScrFxCameraCreated(RwCamera *pCamera);
28-
void iScrFxCameraEndScene(RwCamera *pCamera);
29-
void iScrFxPostCameraEnd(RwCamera *pCamera);
30-
void iCameraOverlayRender(RwCamera *pcamera, RwRaster *ras, RwRGBA col);
31-
RwRaster *FBMBlur_DebugIntervention(RwCamera *camera, RwRaster *ras);
32-
S32 iScrFxMotionBlurOpen(RwCamera *camera);
33-
S32 iScrFxCameraDestroyed(RwCamera *pCamera);
34-
void iScrFxMotionBlurRender(RwCamera *camera, U32 col);
35-
void GCMB_MakeFrameBufferCopy(const RwCamera *camera);
29+
void iScrFxCameraCreated(RwCamera* pCamera);
30+
void iScrFxCameraEndScene(RwCamera* pCamera);
31+
void iScrFxPostCameraEnd(RwCamera* pCamera);
32+
void iCameraOverlayRender(RwCamera* pcamera, RwRaster* ras, RwRGBA col);
33+
RwRaster* FBMBlur_DebugIntervention(RwCamera* camera, RwRaster* ras);
34+
S32 iScrFxMotionBlurOpen(RwCamera* camera);
35+
S32 iScrFxCameraDestroyed(RwCamera* pCamera);
36+
void iScrFxMotionBlurRender(RwCamera* camera, U32 col);
37+
void GCMB_MakeFrameBufferCopy(const RwCamera* camera);
3638
void GCMB_KillFrameBufferCopy();
37-
void GCMB_SiphonFrameBuffer(const RwCamera *camera);
39+
void GCMB_SiphonFrameBuffer(const RwCamera* camera);
3840

3941
#endif

0 commit comments

Comments
 (0)