diff options
| author | Random <28494085+Random06457@users.noreply.github.com> | 2020-05-25 23:18:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-25 23:18:14 +0200 |
| commit | 3d050f286114de1332781ed951b90d42ac36c8ee (patch) | |
| tree | 0faeff040458535d810d4f7d4ba84643e3bcd134 /src/code | |
| parent | 13b1dc03bb2f26291c68e7d19e4e42625d3a2ec2 (diff) | |
Decompile a bunch of small files (#160)
* Decompile a bunch of small files
* Rename dacrate to dacRate
* Run format.sh
* Minor fixes in PR #160
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/mtxuty-cvt.c | 23 | ||||
| -rw-r--r-- | src/code/padmgr.c | 4 | ||||
| -rw-r--r-- | src/code/padutils.c | 93 | ||||
| -rw-r--r-- | src/code/sys_matrix.c | 2 | ||||
| -rw-r--r-- | src/code/z_room.c | 2 |
5 files changed, 120 insertions, 4 deletions
diff --git a/src/code/mtxuty-cvt.c b/src/code/mtxuty-cvt.c new file mode 100644 index 000000000..0f1f6a7ff --- /dev/null +++ b/src/code/mtxuty-cvt.c @@ -0,0 +1,23 @@ +#include <global.h> + +void MtxConv_F2L(MatrixInternal* m1, MtxF* m2) { + s32 i; + s32 j; + + LogUtils_CheckNullPointer("m1", m1, "../mtxuty-cvt.c", 31); + LogUtils_CheckNullPointer("m2", m2, "../mtxuty-cvt.c", 32); + + for (i = 0; i < 4; i++) { + for (j = 0; j < 4; j++) { + s32 value = (m2->mf[i][j] * 0x10000); + m1->intPart[i][j] = value >> 16; + m1->fracPart[i][j] = value; + } + } +} + +void MtxConv_L2F(MtxF* m1, Mtx* m2) { + LogUtils_CheckNullPointer("m1", m1, "../mtxuty-cvt.c", 55); + LogUtils_CheckNullPointer("m2", m2, "../mtxuty-cvt.c", 56); + func_80102FA0(m1, m2); // guMtxL2F ? +} diff --git a/src/code/padmgr.c b/src/code/padmgr.c index 745c058e4..b81116e6a 100644 --- a/src/code/padmgr.c +++ b/src/code/padmgr.c @@ -272,7 +272,7 @@ void PadMgr_ProcessInputs(PadMgr* padmgr) { } input->press.in.button = input->cur.in.button & (input->prev.in.button ^ input->cur.in.button); input->rel.in.button = input->prev.in.button & (input->prev.in.button ^ input->cur.in.button); - func_800FCC6C(input); + PadUtils_UpdateRelXY(input); input->press.in.x = (input->cur.in.x - input->prev.in.x) + input->press.in.x; input->press.in.y = (input->cur.in.y - input->prev.in.y) + input->press.in.y; } @@ -360,7 +360,7 @@ void PadMgr_RequestPadData(PadMgr* padmgr, Input* inputs, s32 mode) { newin->cur = pmInputs->cur; newin->press.in.button = newin->cur.in.button & (newin->prev.in.button ^ newin->cur.in.button); newin->rel.in.button = newin->prev.in.button & (newin->prev.in.button ^ newin->cur.in.button); - func_800FCC6C(newin); + PadUtils_UpdateRelXY(newin); newin->press.in.x = (newin->cur.in.x - newin->prev.in.x) + newin->press.in.x; newin->press.in.y = (newin->cur.in.y - newin->prev.in.y) + newin->press.in.y; } diff --git a/src/code/padutils.c b/src/code/padutils.c new file mode 100644 index 000000000..b19fdbf12 --- /dev/null +++ b/src/code/padutils.c @@ -0,0 +1,93 @@ +#include <global.h> + +void PadUtils_Init(Input* input) { + bzero(input, sizeof(Input)); +} + +void func_800FCB70() { +} + +void PadUtils_ResetPressRel(Input* input) { + input->press.in.button = 0; + input->rel.in.button = 0; +} + +u32 PadUtils_CheckCurExact(Input* input, u16 value) { + return value == input->cur.in.button; +} + +u32 PadUtils_CheckCur(Input* input, u16 key) { + return key == (input->cur.in.button & key); +} + +u32 PadUtils_CheckPressed(Input* input, u16 key) { + return key == (input->press.in.button & key); +} + +u32 PadUtils_CheckReleased(Input* input, u16 key) { + return key == (input->rel.in.button & key); +} + +u16 PadUtils_GetCurButton(Input* input) { + return input->cur.in.button; +} + +u16 PadUtils_GetPressButton(Input* input) { + return input->press.in.button; +} + +s8 PadUtils_GetCurX(Input* input) { + return input->cur.in.x; +} + +s8 PadUtils_GetCurY(Input* input) { + return input->cur.in.y; +} + +void PadUtils_SetRelXY(Input* input, s32 x, s32 y) { + input->rel.in.x = x; + input->rel.in.y = y; +} + +s8 PadUtils_GetRelXImpl(Input* input) { + return input->rel.in.x; +} + +s8 PadUtils_GetRelYImpl(Input* input) { + return input->rel.in.y; +} + +s8 PadUtils_GetRelX(Input* input) { + return PadUtils_GetRelXImpl(input); +} + +s8 PadUtils_GetRelY(Input* input) { + return PadUtils_GetRelYImpl(input); +} + +void PadUtils_UpdateRelXY(Input* input) { + s32 curX, curY; + s32 relX, relY; + + curX = PadUtils_GetCurX(input); + curY = PadUtils_GetCurY(input); + + if (curX > 7) { + relX = (curX < 0x43) ? curX - 7 : 0x43 - 7; + } else if (curX < -7) { + relX = (curX > -0x43) ? curX + 7 : -0x43 + 7; + } else { + relX = 0; + } + + if (curY > 7) { + relY = (curY < 0x43) ? curY - 7 : 0x43 - 7; + + } else if (curY < -7) { + relY = (curY > -0x43) ? curY + 7 : -0x43 + 7; + } else { + relY = 0; + } + + PadUtils_SetRelXY(input, relX, relY); +} diff --git a/src/code/sys_matrix.c b/src/code/sys_matrix.c index f0b3e4005..487e1a841 100644 --- a/src/code/sys_matrix.c +++ b/src/code/sys_matrix.c @@ -935,7 +935,7 @@ void func_800D2A98(Mtx* mtx, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { MtxF mf; func_800D2A34(&mf, arg1, arg2, arg3, arg4); - func_801064E0(&mf, mtx); + guMtxF2L(&mf, mtx); } void func_800D2AE4(Mtx* mtx, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { diff --git a/src/code/z_room.c b/src/code/z_room.c index 233cbdc39..90ca8ce64 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -299,7 +299,7 @@ void func_8009638C(Gfx** displayList, u32 source, u32 tlut, u16 width, u16 heigh if ((fmt == G_IM_FMT_RGBA) && (SREG(26) == 0)) { bg->b.frameW = width * 4; bg->b.frameH = height * 4; - func_80104B00(bg); + guS2DInitBg(bg); gDPSetOtherMode(displayListHead++, mode0 | G_TL_TILE | G_TD_CLAMP | G_TP_NONE | G_CYC_COPY | G_PM_NPRIMITIVE, G_AC_THRESHOLD | G_ZS_PIXEL | G_RM_NOOP | G_RM_NOOP2); gSPBgRectCopy(displayListHead++, bg); |
