mirror of
https://github.com/zeldaret/oot.git
synced 2025-07-05 15:34:41 +00:00
Merge branch 'master' into skelanimeupdates
This commit is contained in:
KrimtonZ
commit
25dcb73520
404 changed files with 3577 additions and 5612 deletions
|
|
@ -23,7 +23,7 @@ void func_8002B200(Actor* actor, LightMapper* lightMapper, GlobalContext* global
|
|||
gfxCtx = globalCtx->state.gfxCtx;
|
||||
func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 1553);
|
||||
|
||||
gfxCtx->polyOpa.p = func_80093774(gfxCtx->polyOpa.p, 0x2C);
|
||||
gfxCtx->polyOpa.p = Gfx_CallSetupDL(gfxCtx->polyOpa.p, 0x2C);
|
||||
|
||||
gDPSetCombineLERP(gfxCtx->polyOpa.p++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED, 0, 0,
|
||||
0, COMBINED);
|
||||
|
|
@ -141,7 +141,7 @@ void ActorShadow_DrawFunc_Teardrop(Actor* actor, LightMapper* lightMapper, Globa
|
|||
gfxCtx = globalCtx->state.gfxCtx;
|
||||
func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 1741);
|
||||
|
||||
gfxCtx->polyOpa.p = func_80093774(gfxCtx->polyOpa.p, 0x2C);
|
||||
gfxCtx->polyOpa.p = Gfx_CallSetupDL(gfxCtx->polyOpa.p, 0x2C);
|
||||
actor->shape.unk_15 = 0;
|
||||
|
||||
for (i = 0; i < 2; i++) {
|
||||
|
|
@ -374,7 +374,7 @@ void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) {
|
|||
func_8002BE64(targetCtx, targetCtx->unk_4C, spBC.x, spBC.y, spBC.z);
|
||||
|
||||
if ((!(player->stateFlags1 & 0x40)) || (actor != player->unk_664)) {
|
||||
gfxCtx->overlay.p = func_80093774(gfxCtx->overlay.p, 0x39);
|
||||
gfxCtx->overlay.p = Gfx_CallSetupDL(gfxCtx->overlay.p, 0x39);
|
||||
|
||||
for (spB0 = 0, spAC = targetCtx->unk_4C; spB0 < spB8; spB0++) {
|
||||
entry = &targetCtx->arr_50[spAC];
|
||||
|
|
@ -418,7 +418,7 @@ void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) {
|
|||
if ((actor != NULL) && !(actor->flags & 0x8000000)) {
|
||||
NaviColor* naviColor = &sNaviColorList[actor->type];
|
||||
|
||||
gfxCtx->polyXlu.p = func_80093774(gfxCtx->polyXlu.p, 0x7);
|
||||
gfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 0x7);
|
||||
|
||||
Matrix_Translate(actor->posRot2.pos.x, actor->posRot2.pos.y + (actor->unk_4C * actor->scale.y) + 17.0f,
|
||||
actor->posRot2.pos.z, MTXMODE_NEW);
|
||||
|
|
@ -1926,7 +1926,7 @@ void func_8002FBAC(GlobalContext* globalCtx) {
|
|||
if ((globalCtx->csCtx.state == 0) &&
|
||||
(gSaveContext.respawn[RESPAWN_MODE_TOP].entrance_index == gSaveContext.entrance_index) &&
|
||||
(globalCtx->roomCtx.curRoom.num == gSaveContext.respawn[RESPAWN_MODE_TOP].room_index)) {
|
||||
gfxCtx->polyXlu.p = func_80093774(gfxCtx->polyXlu.p, 0x19);
|
||||
gfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 0x19);
|
||||
|
||||
Matrix_Translate(gSaveContext.respawn[RESPAWN_MODE_TOP].pos.x,
|
||||
gSaveContext.respawn[RESPAWN_MODE_TOP].pos.y + spD8,
|
||||
|
|
@ -3489,7 +3489,7 @@ void func_80033C30(Vec3f* arg0, Vec3f* arg1, u8 alpha, GlobalContext* globalCtx)
|
|||
|
||||
if (0) {} // Necessary to match
|
||||
|
||||
gfxCtx->polyOpa.p = func_80093774(gfxCtx->polyOpa.p, 0x2C);
|
||||
gfxCtx->polyOpa.p = Gfx_CallSetupDL(gfxCtx->polyOpa.p, 0x2C);
|
||||
|
||||
gDPSetPrimColor(gfxCtx->polyOpa.p++, 0, 0, 0x00, 0x00, 0x00, alpha);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#include <ultra64.h>
|
||||
#include <global.h>
|
||||
|
||||
void Draw_DListOpa(GlobalContext* globalCtx, u32 dlist) {
|
||||
void Gfx_DrawDListOpa(GlobalContext* globalCtx, u32 dlist) {
|
||||
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
|
||||
Gfx* gfxArr[4];
|
||||
|
||||
|
|
@ -15,7 +15,7 @@ void Draw_DListOpa(GlobalContext* globalCtx, u32 dlist) {
|
|||
func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_cheap_proc.c", 219);
|
||||
}
|
||||
|
||||
void Draw_DListXlu(GlobalContext* globalCtx, u32 dlist) {
|
||||
void Gfx_DrawDListXlu(GlobalContext* globalCtx, u32 dlist) {
|
||||
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
|
||||
Gfx* gfxArr[4];
|
||||
|
||||
|
|
|
|||
|
|
@ -187,7 +187,7 @@ static void func_800695C0(GlobalContext* globalCtx, s16 drawId) {
|
|||
|
||||
func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 572);
|
||||
|
||||
gfxCtx->polyXlu.p = func_80093774(gfxCtx->polyXlu.p, 5);
|
||||
gfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 5);
|
||||
gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 576),
|
||||
G_MTX_MODELVIEW | G_MTX_LOAD);
|
||||
gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[0]);
|
||||
|
|
@ -208,9 +208,9 @@ static void func_8006969C(GlobalContext* globalCtx, s16 drawId) {
|
|||
|
||||
func_80093D84(globalCtx->state.gfxCtx);
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x08,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 0),
|
||||
0 * (globalCtx->state.frames * 0), 16, 32, 1, 1 * (globalCtx->state.frames * 1),
|
||||
1 * -(globalCtx->state.frames * 8), 16, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 0),
|
||||
0 * (globalCtx->state.frames * 0), 16, 32, 1, 1 * (globalCtx->state.frames * 1),
|
||||
1 * -(globalCtx->state.frames * 8), 16, 32));
|
||||
Matrix_Push();
|
||||
Matrix_Translate(-8.0f, -2.0f, 0.0f, MTXMODE_APPLY);
|
||||
func_800D1FD4(&globalCtx->mf_11DA0);
|
||||
|
|
@ -238,9 +238,9 @@ static void func_80069880(GlobalContext* globalCtx, s16 drawId) {
|
|||
G_MTX_MODELVIEW | G_MTX_LOAD);
|
||||
gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]);
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x08,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 0),
|
||||
0 * (globalCtx->state.frames * 0), 16, 32, 1, 1 * (globalCtx->state.frames * 1),
|
||||
1 * -(globalCtx->state.frames * 6), 16, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 0),
|
||||
0 * (globalCtx->state.frames * 0), 16, 32, 1, 1 * (globalCtx->state.frames * 1),
|
||||
1 * -(globalCtx->state.frames * 6), 16, 32));
|
||||
Matrix_Push();
|
||||
func_800D1FD4(&globalCtx->mf_11DA0);
|
||||
gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 656),
|
||||
|
|
@ -268,9 +268,9 @@ static void func_80069AC8(GlobalContext* globalCtx, s16 drawId) {
|
|||
G_MTX_MODELVIEW | G_MTX_LOAD);
|
||||
gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]);
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x08,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 0),
|
||||
0 * (globalCtx->state.frames * 0), 32, 32, 1, 1 * (globalCtx->state.frames * 1),
|
||||
1 * -(globalCtx->state.frames * 6), 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 0),
|
||||
0 * (globalCtx->state.frames * 0), 32, 32, 1, 1 * (globalCtx->state.frames * 1),
|
||||
1 * -(globalCtx->state.frames * 6), 32, 32));
|
||||
Matrix_Push();
|
||||
func_800D1FD4(&globalCtx->mf_11DA0);
|
||||
gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 698),
|
||||
|
|
@ -289,10 +289,10 @@ static void func_80069CF0(GlobalContext* globalCtx, s16 drawId) {
|
|||
|
||||
func_80093D18(globalCtx->state.gfxCtx);
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x08,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 0) % 256,
|
||||
1 * (globalCtx->state.frames * 2) % 256, 64, 64, 1,
|
||||
0 * (globalCtx->state.frames * 0) % 128, 1 * (globalCtx->state.frames * 1) % 128, 32,
|
||||
32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 0) % 256,
|
||||
1 * (globalCtx->state.frames * 2) % 256, 64, 64, 1,
|
||||
0 * (globalCtx->state.frames * 0) % 128, 1 * (globalCtx->state.frames * 1) % 128, 32,
|
||||
32));
|
||||
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 723),
|
||||
G_MTX_MODELVIEW | G_MTX_LOAD);
|
||||
gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]);
|
||||
|
|
@ -318,9 +318,9 @@ static void func_80069EB0(GlobalContext* globalCtx, s16 drawId) {
|
|||
|
||||
func_80093D84(globalCtx->state.gfxCtx);
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x08,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 0),
|
||||
1 * -(globalCtx->state.frames * 5), 32, 32, 1, 0 * (globalCtx->state.frames * 0),
|
||||
0 * (globalCtx->state.frames * 0), 32, 64));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 0),
|
||||
1 * -(globalCtx->state.frames * 5), 32, 32, 1, 0 * (globalCtx->state.frames * 0),
|
||||
0 * (globalCtx->state.frames * 0), 32, 64));
|
||||
gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 760),
|
||||
G_MTX_MODELVIEW | G_MTX_LOAD);
|
||||
gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]);
|
||||
|
|
@ -354,7 +354,7 @@ static void func_8006A158(GlobalContext* globalCtx, s16 drawId) {
|
|||
G_MTX_MODELVIEW | G_MTX_LOAD);
|
||||
gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]);
|
||||
|
||||
gfxCtx->polyXlu.p = func_80093774(gfxCtx->polyXlu.p, 5);
|
||||
gfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 5);
|
||||
gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 822),
|
||||
G_MTX_MODELVIEW | G_MTX_LOAD);
|
||||
gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]);
|
||||
|
|
@ -370,9 +370,9 @@ static void func_8006A2A0(GlobalContext* globalCtx, s16 drawId) {
|
|||
|
||||
func_80093D18(globalCtx->state.gfxCtx);
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x08,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, -1 * (globalCtx->state.frames * 1),
|
||||
1 * (globalCtx->state.frames * 1), 32, 32, 1, -1 * (globalCtx->state.frames * 1),
|
||||
1 * (globalCtx->state.frames * 1), 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, -1 * (globalCtx->state.frames * 1),
|
||||
1 * (globalCtx->state.frames * 1), 32, 32, 1, -1 * (globalCtx->state.frames * 1),
|
||||
1 * (globalCtx->state.frames * 1), 32, 32));
|
||||
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 845),
|
||||
G_MTX_MODELVIEW | G_MTX_LOAD);
|
||||
gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[1]);
|
||||
|
|
@ -397,9 +397,9 @@ static void func_8006A4B0(GlobalContext* globalCtx, s16 drawId) {
|
|||
|
||||
func_80093D18(globalCtx->state.gfxCtx);
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x08,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 1 * (globalCtx->state.frames * 1),
|
||||
0 * (globalCtx->state.frames * 1), 32, 32, 1, 0 * (globalCtx->state.frames * 1),
|
||||
0 * (globalCtx->state.frames * 1), 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 1 * (globalCtx->state.frames * 1),
|
||||
0 * (globalCtx->state.frames * 1), 32, 32, 1, 0 * (globalCtx->state.frames * 1),
|
||||
0 * (globalCtx->state.frames * 1), 32, 32));
|
||||
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 878),
|
||||
G_MTX_MODELVIEW | G_MTX_LOAD);
|
||||
gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]);
|
||||
|
|
@ -415,9 +415,9 @@ static void func_8006A5F0(GlobalContext* globalCtx, s16 drawId) {
|
|||
|
||||
func_80093D18(globalCtx->state.gfxCtx);
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x08,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 1 * (globalCtx->state.frames * 6),
|
||||
1 * (globalCtx->state.frames * 6), 32, 32, 1, 1 * (globalCtx->state.frames * 6),
|
||||
1 * (globalCtx->state.frames * 6), 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 1 * (globalCtx->state.frames * 6),
|
||||
1 * (globalCtx->state.frames * 6), 32, 32, 1, 1 * (globalCtx->state.frames * 6),
|
||||
1 * (globalCtx->state.frames * 6), 32, 32));
|
||||
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 901),
|
||||
G_MTX_MODELVIEW | G_MTX_LOAD);
|
||||
gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]);
|
||||
|
|
@ -433,9 +433,9 @@ static void func_8006A73C(GlobalContext* globalCtx, s16 drawId) {
|
|||
|
||||
func_80093D84(globalCtx->state.gfxCtx);
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x08,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 1),
|
||||
1 * -(globalCtx->state.frames * 3), 32, 32, 1, 0 * (globalCtx->state.frames * 1),
|
||||
1 * -(globalCtx->state.frames * 2), 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 1),
|
||||
1 * -(globalCtx->state.frames * 3), 32, 32, 1, 0 * (globalCtx->state.frames * 1),
|
||||
1 * -(globalCtx->state.frames * 2), 32, 32));
|
||||
gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 924),
|
||||
G_MTX_MODELVIEW | G_MTX_LOAD);
|
||||
gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[0]);
|
||||
|
|
@ -451,9 +451,9 @@ static void func_8006A88C(GlobalContext* globalCtx, s16 drawId) {
|
|||
|
||||
func_80093D84(globalCtx->state.gfxCtx);
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x08,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 0),
|
||||
1 * (globalCtx->state.frames * 1), 32, 32, 1, 0 * (globalCtx->state.frames * 0),
|
||||
1 * (globalCtx->state.frames * 1), 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 0),
|
||||
1 * (globalCtx->state.frames * 1), 32, 32, 1, 0 * (globalCtx->state.frames * 0),
|
||||
1 * (globalCtx->state.frames * 1), 32, 32));
|
||||
gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 947),
|
||||
G_MTX_MODELVIEW | G_MTX_LOAD);
|
||||
gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[0]);
|
||||
|
|
@ -555,9 +555,9 @@ static void func_8006AF9C(GlobalContext* globalCtx, s16 drawId) {
|
|||
|
||||
func_80093D84(globalCtx->state.gfxCtx);
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x08,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 1 * (globalCtx->state.frames * 2),
|
||||
1 * -(globalCtx->state.frames * 6), 32, 32, 1, 1 * (globalCtx->state.frames * 1),
|
||||
-1 * (globalCtx->state.frames * 2), 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 1 * (globalCtx->state.frames * 2),
|
||||
1 * -(globalCtx->state.frames * 6), 32, 32, 1, 1 * (globalCtx->state.frames * 1),
|
||||
-1 * (globalCtx->state.frames * 2), 32, 32));
|
||||
gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1074),
|
||||
G_MTX_MODELVIEW | G_MTX_LOAD);
|
||||
gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[0]);
|
||||
|
|
@ -636,9 +636,9 @@ static void func_8006B54C(GlobalContext* globalCtx, s16 drawId) {
|
|||
|
||||
func_80093D84(globalCtx->state.gfxCtx);
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x08,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 1 * (globalCtx->state.frames * 2),
|
||||
-1 * (globalCtx->state.frames * 2), 64, 64, 1, 1 * (globalCtx->state.frames * 4),
|
||||
1 * -(globalCtx->state.frames * 4), 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 1 * (globalCtx->state.frames * 2),
|
||||
-1 * (globalCtx->state.frames * 2), 64, 64, 1, 1 * (globalCtx->state.frames * 4),
|
||||
1 * -(globalCtx->state.frames * 4), 32, 32));
|
||||
gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1173),
|
||||
G_MTX_MODELVIEW | G_MTX_LOAD);
|
||||
gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[2]);
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ void func_80020F60(u32 unused, GraphicsContext* gfxCtx) {
|
|||
|
||||
func_800C6AC4(gfxArr, gfxCtx, D_80135180, 809);
|
||||
|
||||
gfxCtx->polyXlu.p = func_80093774(gfxCtx->polyXlu.p, 0x26);
|
||||
gfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 0x26);
|
||||
|
||||
func_800C6B54(gfxArr, gfxCtx, D_80135194, 813);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1109,8 +1109,8 @@ void Interface_SetSceneRestrictions(GlobalContext* globalCtx) {
|
|||
} while (sRestrictionFlags[i].scene != 0xFF);
|
||||
}
|
||||
|
||||
Gfx* Draw_TextureIA8(Gfx* displayListHead, void* texture, s16 textureWidth, s16 textureHeight, s16 rectLeft,
|
||||
s16 rectTop, s16 rectWidth, s16 rectHeight, u16 dsdx, u16 dtdy) {
|
||||
Gfx* Gfx_TextureIA8(Gfx* displayListHead, void* texture, s16 textureWidth, s16 textureHeight, s16 rectLeft, s16 rectTop,
|
||||
s16 rectWidth, s16 rectHeight, u16 dsdx, u16 dtdy) {
|
||||
gDPLoadTextureBlock(displayListHead++, texture, G_IM_FMT_IA, G_IM_SIZ_8b, textureWidth, textureHeight, 0,
|
||||
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
|
||||
G_TX_NOLOD);
|
||||
|
|
@ -1121,8 +1121,8 @@ Gfx* Draw_TextureIA8(Gfx* displayListHead, void* texture, s16 textureWidth, s16
|
|||
return displayListHead;
|
||||
}
|
||||
|
||||
Gfx* Draw_TextureI8(Gfx* displayListHead, void* texture, s16 textureWidth, s16 textureHeight, s16 rectLeft, s16 rectTop,
|
||||
s16 rectWidth, s16 rectHeight, u16 dsdx, u16 dtdy) {
|
||||
Gfx* Gfx_TextureI8(Gfx* displayListHead, void* texture, s16 textureWidth, s16 textureHeight, s16 rectLeft, s16 rectTop,
|
||||
s16 rectWidth, s16 rectHeight, u16 dsdx, u16 dtdy) {
|
||||
gDPLoadTextureBlock(displayListHead++, texture, G_IM_FMT_I, G_IM_SIZ_8b, textureWidth, textureHeight, 0,
|
||||
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
|
||||
G_TX_NOLOD);
|
||||
|
|
@ -2601,10 +2601,10 @@ void Interface_DrawMagicBar(GlobalContext* globalCtx) {
|
|||
gDPSetEnvColor(gfxCtx->overlay.p++, 0x64, 0x32, 0x32, 0xFF);
|
||||
|
||||
gfxCtx->overlay.p =
|
||||
Draw_TextureIA8(gfxCtx->overlay.p, D_020038C0, 8, 16, R_MAGIC_BAR_X, magicBarY, 8, 16, 1024, 1024);
|
||||
Gfx_TextureIA8(gfxCtx->overlay.p, D_020038C0, 8, 16, R_MAGIC_BAR_X, magicBarY, 8, 16, 1024, 1024);
|
||||
|
||||
gfxCtx->overlay.p = Draw_TextureIA8(gfxCtx->overlay.p, D_02003940, 24, 16, R_MAGIC_BAR_X + 8, magicBarY,
|
||||
gSaveContext.unk_13F4, 16, 1024, 1024);
|
||||
gfxCtx->overlay.p = Gfx_TextureIA8(gfxCtx->overlay.p, D_02003940, 24, 16, R_MAGIC_BAR_X + 8, magicBarY,
|
||||
gSaveContext.unk_13F4, 16, 1024, 1024);
|
||||
|
||||
gDPSetTextureImage(gfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, D_020038C0);
|
||||
gDPSetTile(gfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP,
|
||||
|
|
@ -2748,8 +2748,8 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) {
|
|||
interfaceCtx->bAlpha);
|
||||
gDPSetEnvColor(gfxCtx->overlay.p++, 0x00, 0x00, 0x00, 0xFF);
|
||||
gfxCtx->overlay.p =
|
||||
Draw_TextureIA8(gfxCtx->overlay.p, &D_02000A00[0], 32, 32, R_ITEM_BTN_X(0), R_ITEM_BTN_Y(0),
|
||||
R_ITEM_BTN_WIDTH(0), R_ITEM_BTN_WIDTH(0), R_ITEM_BTN_DD(0) * 2, R_ITEM_BTN_DD(0) * 2);
|
||||
Gfx_TextureIA8(gfxCtx->overlay.p, &D_02000A00[0], 32, 32, R_ITEM_BTN_X(0), R_ITEM_BTN_Y(0), R_ITEM_BTN_WIDTH(0),
|
||||
R_ITEM_BTN_WIDTH(0), R_ITEM_BTN_DD(0) * 2, R_ITEM_BTN_DD(0) * 2);
|
||||
|
||||
// C-Left Button Color & Texture
|
||||
gDPPipeSync(gfxCtx->overlay.p++);
|
||||
|
|
@ -2876,8 +2876,8 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) {
|
|||
}
|
||||
|
||||
gfxCtx->overlay.p =
|
||||
Draw_TextureIA8(gfxCtx->overlay.p, &D_02000A00[i + 1], 0x20, 0x20, R_ITEM_BTN_X(i), R_ITEM_BTN_Y(i),
|
||||
R_ITEM_BTN_WIDTH(i), R_ITEM_BTN_WIDTH(i), R_ITEM_BTN_DD(i) * 2, R_ITEM_BTN_DD(i) * 2);
|
||||
Gfx_TextureIA8(gfxCtx->overlay.p, &D_02000A00[i + 1], 0x20, 0x20, R_ITEM_BTN_X(i), R_ITEM_BTN_Y(i),
|
||||
R_ITEM_BTN_WIDTH(i), R_ITEM_BTN_WIDTH(i), R_ITEM_BTN_DD(i) * 2, R_ITEM_BTN_DD(i) * 2);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2956,12 +2956,12 @@ void Interface_DrawAmmoCount(GlobalContext* globalCtx, s16 button, s16 alpha) {
|
|||
}
|
||||
|
||||
if (i != 0) {
|
||||
gfxCtx->overlay.p = Draw_TextureIA8(gfxCtx->overlay.p, &D_020035C0[i], 8, 8, R_ITEM_AMMO_X(button),
|
||||
R_ITEM_AMMO_Y(button), 8, 8, 1024, 1024);
|
||||
gfxCtx->overlay.p = Gfx_TextureIA8(gfxCtx->overlay.p, &D_020035C0[i], 8, 8, R_ITEM_AMMO_X(button),
|
||||
R_ITEM_AMMO_Y(button), 8, 8, 1024, 1024);
|
||||
}
|
||||
|
||||
gfxCtx->overlay.p = Draw_TextureIA8(gfxCtx->overlay.p, &D_020035C0[ammo], 8, 8, R_ITEM_AMMO_X(button) + 6,
|
||||
R_ITEM_AMMO_Y(button), 8, 8, 1024, 1024);
|
||||
gfxCtx->overlay.p = Gfx_TextureIA8(gfxCtx->overlay.p, &D_020035C0[ammo], 8, 8, R_ITEM_AMMO_X(button) + 6,
|
||||
R_ITEM_AMMO_Y(button), 8, 8, 1024, 1024);
|
||||
}
|
||||
|
||||
func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 3158);
|
||||
|
|
@ -3170,7 +3170,7 @@ void Interface_Draw(GlobalContext* globalCtx) {
|
|||
// Rupee Icon
|
||||
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xC8, 0xFF, 0x64, interfaceCtx->magicAlpha);
|
||||
gDPSetEnvColor(gfxCtx->overlay.p++, 0x00, 0x50, 0x00, 0xFF);
|
||||
gfxCtx->overlay.p = Draw_TextureIA8(gfxCtx->overlay.p, D_02001F00, 16, 16, 26, 206, 16, 16, 1024, 1024);
|
||||
gfxCtx->overlay.p = Gfx_TextureIA8(gfxCtx->overlay.p, D_02001F00, 16, 16, 26, 206, 16, 16, 1024, 1024);
|
||||
|
||||
switch (globalCtx->sceneNum) {
|
||||
case SCENE_BMORI1:
|
||||
|
|
@ -3193,7 +3193,7 @@ void Interface_Draw(GlobalContext* globalCtx) {
|
|||
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xC8, 0xE6, 0xFF, interfaceCtx->magicAlpha);
|
||||
gDPSetEnvColor(gfxCtx->overlay.p++, 0x00, 0x00, 0x14, 0xFF);
|
||||
gfxCtx->overlay.p =
|
||||
Draw_TextureIA8(gfxCtx->overlay.p, D_02001E00, 16, 16, 26, 190, 16, 16, 1024, 1024);
|
||||
Gfx_TextureIA8(gfxCtx->overlay.p, D_02001E00, 16, 16, 26, 190, 16, 16, 1024, 1024);
|
||||
|
||||
// Small Key Counter
|
||||
gDPPipeSync(gfxCtx->overlay.p++);
|
||||
|
|
@ -3212,13 +3212,13 @@ void Interface_Draw(GlobalContext* globalCtx) {
|
|||
phi_s2 = 42;
|
||||
if (interfaceCtx->counterDigits[2] != 0) {
|
||||
gfxCtx->overlay.p =
|
||||
Draw_TextureI8(gfxCtx->overlay.p, &D_02003040[interfaceCtx->counterDigits[2]], 8, 16,
|
||||
phi_s2, 190, 8, 16, 1024, 1024);
|
||||
Gfx_TextureI8(gfxCtx->overlay.p, &D_02003040[interfaceCtx->counterDigits[2]], 8, 16, phi_s2,
|
||||
190, 8, 16, 1024, 1024);
|
||||
phi_s2 = 50;
|
||||
}
|
||||
|
||||
gfxCtx->overlay.p = Draw_TextureI8(gfxCtx->overlay.p, &D_02003040[interfaceCtx->counterDigits[3]],
|
||||
8, 16, phi_s2, 190, 8, 16, 1024, 1024);
|
||||
gfxCtx->overlay.p = Gfx_TextureI8(gfxCtx->overlay.p, &D_02003040[interfaceCtx->counterDigits[3]], 8,
|
||||
16, phi_s2, 190, 8, 16, 1024, 1024);
|
||||
}
|
||||
|
||||
phi_s2 = 42;
|
||||
|
|
@ -3265,8 +3265,8 @@ void Interface_Draw(GlobalContext* globalCtx) {
|
|||
phi_s1 = sRupeeDigitsCount[CUR_UPG_VALUE(UPG_WALLET)];
|
||||
|
||||
for (phi_s3 = 0; phi_s3 < phi_s1; phi_s3++, phi_s0++, phi_s2 += 8) {
|
||||
gfxCtx->overlay.p = Draw_TextureI8(gfxCtx->overlay.p, &D_02003040[interfaceCtx->counterDigits[phi_s0]], 8,
|
||||
16, phi_s2, 206, 8, 16, 1024, 1024);
|
||||
gfxCtx->overlay.p = Gfx_TextureI8(gfxCtx->overlay.p, &D_02003040[interfaceCtx->counterDigits[phi_s0]], 8,
|
||||
16, phi_s2, 206, 8, 16, 1024, 1024);
|
||||
}
|
||||
|
||||
Interface_DrawMagicBar(globalCtx);
|
||||
|
|
@ -3532,8 +3532,8 @@ void Interface_Draw(GlobalContext* globalCtx) {
|
|||
for (phi_s3 = 0; phi_s3 < 4; phi_s3++) {
|
||||
if (sHBAScoreDigits[phi_s3] != 0 || (phi_s0 != 0) || (phi_s3 >= 3)) {
|
||||
gfxCtx->overlay.p =
|
||||
Draw_TextureI8(gfxCtx->overlay.p, &D_02003040[sHBAScoreDigits[phi_s3]], 8, 16, phi_s1,
|
||||
ZREG(15) - 2, sDigitWidth[0], VREG(42), VREG(43) * 2, VREG(43) * 2);
|
||||
Gfx_TextureI8(gfxCtx->overlay.p, &D_02003040[sHBAScoreDigits[phi_s3]], 8, 16, phi_s1,
|
||||
ZREG(15) - 2, sDigitWidth[0], VREG(42), VREG(43) * 2, VREG(43) * 2);
|
||||
phi_s1 += 9;
|
||||
phi_s0++;
|
||||
}
|
||||
|
|
@ -3925,8 +3925,8 @@ void Interface_Draw(GlobalContext* globalCtx) {
|
|||
gDPPipeSync(gfxCtx->overlay.p++);
|
||||
gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF);
|
||||
gDPSetEnvColor(gfxCtx->overlay.p++, 0x00, 0x00, 0x00, 0x00);
|
||||
gfxCtx->overlay.p = Draw_TextureIA8(gfxCtx->overlay.p, D_02002000, 16, 16, gSaveContext.timer_x[sp274],
|
||||
gSaveContext.timer_y[sp274] + 2, 16, 16, 1024, 1024);
|
||||
gfxCtx->overlay.p = Gfx_TextureIA8(gfxCtx->overlay.p, D_02002000, 16, 16, gSaveContext.timer_x[sp274],
|
||||
gSaveContext.timer_y[sp274] + 2, 16, 16, 1024, 1024);
|
||||
|
||||
// Timer Counter
|
||||
gDPPipeSync(gfxCtx->overlay.p++);
|
||||
|
|
@ -3948,10 +3948,10 @@ void Interface_Draw(GlobalContext* globalCtx) {
|
|||
}
|
||||
|
||||
for (phi_s3 = 0; phi_s3 < 5; phi_s3++) {
|
||||
gfxCtx->overlay.p = Draw_TextureI8(gfxCtx->overlay.p, &D_02003040[sTimerDigits[phi_s3]], 8, 16,
|
||||
gSaveContext.timer_x[sp274] + sTimerDigitLeftPos[phi_s3],
|
||||
gSaveContext.timer_y[sp274], sDigitWidth[phi_s3], VREG(42),
|
||||
VREG(43) * 2, VREG(43) * 2);
|
||||
gfxCtx->overlay.p = Gfx_TextureI8(gfxCtx->overlay.p, &D_02003040[sTimerDigits[phi_s3]], 8, 16,
|
||||
gSaveContext.timer_x[sp274] + sTimerDigitLeftPos[phi_s3],
|
||||
gSaveContext.timer_y[sp274], sDigitWidth[phi_s3], VREG(42),
|
||||
VREG(43) * 2, VREG(43) * 2);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,8 +26,8 @@ void func_800BC88C(GlobalContext* globalCtx) {
|
|||
}
|
||||
|
||||
Gfx* func_800BC8A0(GlobalContext* globalCtx, Gfx* a1) {
|
||||
func_80093708(a1, globalCtx->lightCtx.unk_07, globalCtx->lightCtx.unk_08, globalCtx->lightCtx.unk_09, 0,
|
||||
globalCtx->lightCtx.unk_0A, 1000);
|
||||
Gfx_SetFog2(a1, globalCtx->lightCtx.unk_07, globalCtx->lightCtx.unk_08, globalCtx->lightCtx.unk_09, 0,
|
||||
globalCtx->lightCtx.unk_0A, 1000);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800BC8EC.s")
|
||||
|
|
|
|||
|
|
@ -35,8 +35,9 @@ void PreNMI_Draw(PreNMIContext* prenmiCtx) {
|
|||
gSPSegment(gfxCtx->polyOpa.p++, 0x00, NULL);
|
||||
func_80095248(gfxCtx, 0, 0, 0);
|
||||
func_800940B0(gfxCtx);
|
||||
gDPSetFillColor(gfxCtx->polyOpa.p++, -1);
|
||||
gDPFillRectangle(gfxCtx->polyOpa.p++, 0, prenmiCtx->timer + 100, 319, prenmiCtx->timer + 100);
|
||||
gDPSetFillColor(gfxCtx->polyOpa.p++,
|
||||
(GPACK_RGBA5551(0xFF, 0xFF, 0xFF, 1) << 16) | GPACK_RGBA5551(0xFF, 0xFF, 0xFF, 1));
|
||||
gDPFillRectangle(gfxCtx->polyOpa.p++, 0, prenmiCtx->timer + 100, SCREEN_WIDTH - 1, prenmiCtx->timer + 100);
|
||||
|
||||
func_800C6B54(gfxArr, gfxCtx, "../z_prenmi.c", 112);
|
||||
}
|
||||
|
|
|
|||
1687
src/code/z_rcp.c
1687
src/code/z_rcp.c
File diff suppressed because it is too large
Load diff
|
|
@ -18,7 +18,7 @@ Gfx D_801270B0[] = {
|
|||
G_TD_CLAMP | G_TP_PERSP | G_CYC_FILL | G_PM_NPRIMITIVE,
|
||||
G_AC_NONE | G_ZS_PIXEL | G_RM_NOOP | G_RM_NOOP2),
|
||||
gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH),
|
||||
gsDPSetScissor(G_SC_NON_INTERLACE, 0, 0, 320, 240),
|
||||
gsDPSetScissor(G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT),
|
||||
gsSPClipRatio(FRUSTRATIO_1),
|
||||
gsSPEndDisplayList(),
|
||||
};
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ void Sample_Draw(SampleContext* this) {
|
|||
func_80103D58(mtx, SREG(37), SREG(38), SREG(39), 1.0f, SREG(40), SREG(41), SREG(42));
|
||||
gSPMatrix(gfxCtx->polyOpa.p++, mtx, G_MTX_LOAD);
|
||||
|
||||
gfxCtx->polyOpa.p = func_80093708(gfxCtx->polyOpa.p, 0xFF, 0xFF, 0xFF, 0, 0, 0);
|
||||
gfxCtx->polyOpa.p = Gfx_SetFog2(gfxCtx->polyOpa.p, 0xFF, 0xFF, 0xFF, 0, 0, 0);
|
||||
func_80093D18(gfxCtx);
|
||||
|
||||
gDPSetCycleType(gfxCtx->polyOpa.p++, G_CYC_1CYCLE);
|
||||
|
|
|
|||
|
|
@ -646,12 +646,12 @@ Scene gSceneTable[] = {
|
|||
};
|
||||
|
||||
Gfx sDefaultDisplayList[] = {
|
||||
gsSPSegment(0x08, D_80127098),
|
||||
gsSPSegment(0x09, D_80127098),
|
||||
gsSPSegment(0x0A, D_80127098),
|
||||
gsSPSegment(0x0B, D_80127098),
|
||||
gsSPSegment(0x0C, D_80127098),
|
||||
gsSPSegment(0x0D, D_80127098),
|
||||
gsSPSegment(0x08, gEmptyDL),
|
||||
gsSPSegment(0x09, gEmptyDL),
|
||||
gsSPSegment(0x0A, gEmptyDL),
|
||||
gsSPSegment(0x0B, gEmptyDL),
|
||||
gsSPSegment(0x0C, gEmptyDL),
|
||||
gsSPSegment(0x0D, gEmptyDL),
|
||||
gsDPPipeSync(),
|
||||
gsDPSetPrimColor(0, 0, 0x80, 0x80, 0x80, 0x80),
|
||||
gsDPSetEnvColor(0x80, 0x80, 0x80, 0x80),
|
||||
|
|
@ -706,8 +706,8 @@ void func_800995DC(GlobalContext* globalCtx) {
|
|||
func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 4763);
|
||||
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x09,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - (gameplayFrames % 128), (gameplayFrames * 1) % 128,
|
||||
32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - (gameplayFrames % 128), (gameplayFrames * 1) % 128,
|
||||
32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
|
||||
|
||||
gDPPipeSync(gfxCtx->polyXlu.p++);
|
||||
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80);
|
||||
|
|
@ -730,8 +730,8 @@ void func_80099760(GlobalContext* globalCtx) {
|
|||
|
||||
gameplayFrames = globalCtx->gameplayFrames;
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x08,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 2) % 256, 0, 64, 32, 1, 0,
|
||||
(gameplayFrames * 2) % 128, 64, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 2) % 256, 0, 64, 32, 1, 0,
|
||||
(gameplayFrames * 2) % 128, 64, 32));
|
||||
|
||||
gDPPipeSync(gfxCtx->polyXlu.p++);
|
||||
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80);
|
||||
|
|
@ -759,11 +759,11 @@ void func_80099878(GlobalContext* globalCtx) {
|
|||
gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A300[gSaveContext.night_flag]));
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(D_8012A308[(s32)(gameplayFrames & 14) >> 1]));
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x09,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 256, 0, 64, 32, 1, 0,
|
||||
(gameplayFrames * 1) % 128, 64, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 256, 0, 64, 32, 1, 0,
|
||||
(gameplayFrames * 1) % 128, 64, 32));
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x0A,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 128, 32, 32, 1, 0,
|
||||
(gameplayFrames * 2) % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 128, 32, 32, 1, 0,
|
||||
(gameplayFrames * 2) % 128, 32, 32));
|
||||
|
||||
{ s32 pad2[2]; } // Necessary to match stack usage
|
||||
|
||||
|
|
@ -863,20 +863,20 @@ void func_8009A45C(GlobalContext* globalCtx) {
|
|||
|
||||
gameplayFrames = globalCtx->gameplayFrames;
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x08,
|
||||
Draw_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 64, 256, 16));
|
||||
Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 64, 256, 16));
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x09,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - (gameplayFrames % 128), (gameplayFrames * 1) % 128,
|
||||
32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - (gameplayFrames % 128), (gameplayFrames * 1) % 128,
|
||||
32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
|
||||
gSPSegment(
|
||||
gfxCtx->polyOpa.p++, 0x0A,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 32, 1, 0, 127 - (gameplayFrames * 1) % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 32, 1, 0, 127 - (gameplayFrames * 1) % 128, 32, 32));
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x0B,
|
||||
Draw_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 128, 32, 32));
|
||||
Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 128, 32, 32));
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x0C,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 50) % 2048, 8, 512, 1, 0,
|
||||
(gameplayFrames * 60) % 2048, 8, 512));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 50) % 2048, 8, 512, 1, 0,
|
||||
(gameplayFrames * 60) % 2048, 8, 512));
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x0D,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 64, 1, 0, (gameplayFrames * 1) % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 64, 1, 0, (gameplayFrames * 1) % 128, 32, 32));
|
||||
|
||||
gDPPipeSync(gfxCtx->polyXlu.p++);
|
||||
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80);
|
||||
|
|
@ -898,17 +898,17 @@ void func_8009A798(GlobalContext* globalCtx) {
|
|||
|
||||
gameplayFrames = globalCtx->gameplayFrames;
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x08,
|
||||
Draw_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 2) % 256, 64, 64));
|
||||
Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 2) % 256, 64, 64));
|
||||
|
||||
gDPPipeSync(gfxCtx->polyOpa.p++);
|
||||
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80);
|
||||
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x0A,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x09,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - (gameplayFrames * 1) % 128,
|
||||
(gameplayFrames * 1) % 256, 32, 64, 1, 0, 0, 32, 128));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - (gameplayFrames * 1) % 128,
|
||||
(gameplayFrames * 1) % 256, 32, 64, 1, 0, 0, 32, 128));
|
||||
|
||||
gDPPipeSync(gfxCtx->polyOpa.p++);
|
||||
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80);
|
||||
|
|
@ -930,11 +930,11 @@ void func_8009A9DC(GlobalContext* globalCtx) {
|
|||
|
||||
gameplayFrames = globalCtx->gameplayFrames;
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x08,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 256, 32,
|
||||
64, 1, gameplayFrames % 128, (gameplayFrames * 3) % 256, 32, 64));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 256, 32,
|
||||
64, 1, gameplayFrames % 128, (gameplayFrames * 3) % 256, 32, 64));
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x09,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32));
|
||||
|
||||
gDPPipeSync(gfxCtx->polyOpa.p++);
|
||||
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80);
|
||||
|
|
@ -955,7 +955,7 @@ void func_8009AB98(GlobalContext* globalCtx) {
|
|||
func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5317);
|
||||
|
||||
gameplayFrames = globalCtx->gameplayFrames;
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x08, Draw_TexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 64, 256, 16));
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 64, 256, 16));
|
||||
|
||||
gDPPipeSync(gfxCtx->polyXlu.p++);
|
||||
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80);
|
||||
|
|
@ -977,9 +977,9 @@ void func_8009ACA8(GlobalContext* globalCtx) {
|
|||
|
||||
gameplayFrames = globalCtx->gameplayFrames;
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x08,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32));
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x09, Draw_TexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 64, 256, 16));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32));
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x09, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 64, 256, 16));
|
||||
|
||||
gDPPipeSync(gfxCtx->polyOpa.p++);
|
||||
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80);
|
||||
|
|
@ -1003,12 +1003,12 @@ void func_8009AE30(GlobalContext* globalCtx) {
|
|||
|
||||
if (globalCtx->sceneNum == SCENE_HAKADAN_BS) {
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x08,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 2) % 128, 0, 32, 32, 1,
|
||||
(gameplayFrames * 2) % 128, 0, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 2) % 128, 0, 32, 32, 1,
|
||||
(gameplayFrames * 2) % 128, 0, 32, 32));
|
||||
} else {
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x08,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 2) % 128, 0, 32, 32, 1,
|
||||
(gameplayFrames * 2) % 128, 0, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 2) % 128, 0, 32, 32, 1,
|
||||
(gameplayFrames * 2) % 128, 0, 32, 32));
|
||||
}
|
||||
|
||||
gDPPipeSync(gfxCtx->polyOpa.p++);
|
||||
|
|
@ -1033,7 +1033,7 @@ void func_8009AFE0(GlobalContext* globalCtx) {
|
|||
|
||||
gameplayFrames = globalCtx->gameplayFrames;
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x09,
|
||||
Draw_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 3) % 128, 32, 32));
|
||||
Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 3) % 128, 32, 32));
|
||||
|
||||
{ s32 pad[2]; } // Necessary to match stack usage
|
||||
|
||||
|
|
@ -1065,54 +1065,54 @@ void func_8009B0FC(GlobalContext* globalCtx) {
|
|||
|
||||
if (spB0 == 1) {
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x08,
|
||||
Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32,
|
||||
0, 0, 0, spAC));
|
||||
Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32,
|
||||
0, 0, 0, spAC));
|
||||
} else if (spB0 < 1) {
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x08,
|
||||
Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32,
|
||||
0, 0, 0, 0xFF));
|
||||
Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32,
|
||||
0, 0, 0, 0xFF));
|
||||
} else {
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x08,
|
||||
Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32,
|
||||
0, 0, 0, 0xA0));
|
||||
Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32,
|
||||
0, 0, 0, 0xA0));
|
||||
}
|
||||
|
||||
if (spB0 == 2) {
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x09,
|
||||
Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32,
|
||||
0, 0, 0, spAC));
|
||||
Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32,
|
||||
0, 0, 0, spAC));
|
||||
} else if (spB0 < 2) {
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x09,
|
||||
Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32,
|
||||
0, 0, 0, 0xFF));
|
||||
Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32,
|
||||
0, 0, 0, 0xFF));
|
||||
} else {
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x09,
|
||||
Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32,
|
||||
0, 0, 0, 0xA0));
|
||||
Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32,
|
||||
0, 0, 0, 0xA0));
|
||||
}
|
||||
|
||||
if (spB0 != 0) {
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x0A,
|
||||
Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32,
|
||||
0, 0, 0, 0xA0));
|
||||
Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32,
|
||||
0, 0, 0, 0xA0));
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x0B,
|
||||
Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 3, 0, 32, 32, 1, 0, 0, 32, 32,
|
||||
0, 0, 0, 0xB4));
|
||||
Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 3, 0, 32, 32, 1, 0, 0, 32, 32,
|
||||
0, 0, 0, 0xB4));
|
||||
} else {
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x0A,
|
||||
Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 128, 0, 32, 32, 1, 0, 0,
|
||||
32, 32, 0, 0, 0, 0xA0 + (s32)((spAC / 200.0f) * 95.0f)));
|
||||
Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 128, 0, 32, 32, 1, 0, 0,
|
||||
32, 32, 0, 0, 0, 0xA0 + (s32)((spAC / 200.0f) * 95.0f)));
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x0B,
|
||||
Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 3, 0, 32, 32, 1, 0, 0, 32, 32,
|
||||
0, 0, 0, 0xB9 + (s32)((spAC / 200.0f) * 70.0f)));
|
||||
Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 3, 0, 32, 32, 1, 0, 0, 32, 32,
|
||||
0, 0, 0, 0xB9 + (s32)((spAC / 200.0f) * 70.0f)));
|
||||
}
|
||||
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x0C,
|
||||
Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, gameplayFrames * 1, 32, 32, 1,
|
||||
0, 127 - (gameplayFrames * 1), 32, 32, 0, 0, 0, 0x80));
|
||||
Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, gameplayFrames * 1, 32, 32, 1,
|
||||
0, 127 - (gameplayFrames * 1), 32, 32, 0, 0, 0, 0x80));
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x0D,
|
||||
Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 4, 0, 32, 32, 1,
|
||||
gameplayFrames * 4, 0, 32, 32, 0, 0, 0, 0x80));
|
||||
Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 4, 0, 32, 32, 1,
|
||||
gameplayFrames * 4, 0, 32, 32, 0, 0, 0, 0x80));
|
||||
|
||||
{ s32 pad[2]; } // Necessary to match stack usage
|
||||
|
||||
|
|
@ -1130,7 +1130,7 @@ void func_8009B86C(GlobalContext* globalCtx) {
|
|||
|
||||
gameplayFrames = globalCtx->gameplayFrames;
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x08,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32));
|
||||
|
||||
gDPPipeSync(gfxCtx->polyOpa.p++);
|
||||
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, globalCtx->unk_11D30[0]);
|
||||
|
|
@ -1151,7 +1151,7 @@ void func_8009B9BC(GlobalContext* globalCtx) {
|
|||
func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5822);
|
||||
|
||||
gameplayFrames = globalCtx->gameplayFrames;
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x08, Draw_TexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 64, 4, 16));
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 64, 4, 16));
|
||||
|
||||
gDPPipeSync(gfxCtx->polyOpa.p++);
|
||||
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80);
|
||||
|
|
@ -1170,12 +1170,12 @@ void func_8009BAA4(GlobalContext* globalCtx) {
|
|||
|
||||
gameplayFrames = globalCtx->gameplayFrames;
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x08,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32));
|
||||
|
||||
if (globalCtx->sceneNum == SCENE_HAIRAL_NIWA) {
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x09,
|
||||
Draw_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 10) % 256, 32, 64));
|
||||
Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 10) % 256, 32, 64));
|
||||
}
|
||||
|
||||
gDPPipeSync(gfxCtx->polyOpa.p++);
|
||||
|
|
@ -1205,16 +1205,16 @@ void func_8009BC44(GlobalContext* globalCtx) {
|
|||
|
||||
if (globalCtx->sceneNum == SCENE_GANON_TOU) {
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x09,
|
||||
Draw_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 256, 64, 64));
|
||||
Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 256, 64, 64));
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x08,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 255 - (gameplayFrames * 1) % 256, 64, 64, 1, 0,
|
||||
(gameplayFrames * 1) % 256, 64, 64));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 255 - (gameplayFrames * 1) % 256, 64, 64, 1, 0,
|
||||
(gameplayFrames * 1) % 256, 64, 64));
|
||||
}
|
||||
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x0B,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 255 - (gameplayFrames * 1) % 128,
|
||||
(gameplayFrames * 1) % 128, 32, 32, 1, (gameplayFrames * 1) % 128,
|
||||
(gameplayFrames * 1) % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 255 - (gameplayFrames * 1) % 128,
|
||||
(gameplayFrames * 1) % 128, 32, 32, 1, (gameplayFrames * 1) % 128,
|
||||
(gameplayFrames * 1) % 128, 32, 32));
|
||||
|
||||
gDPPipeSync(gfxCtx->polyOpa.p++);
|
||||
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80);
|
||||
|
|
@ -1270,14 +1270,14 @@ void func_8009C0AC(GlobalContext* globalCtx) {
|
|||
|
||||
gameplayFrames = globalCtx->gameplayFrames;
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x08,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 512, 64, 128, 1, 0,
|
||||
511 - (gameplayFrames * 1) % 512, 64, 128));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 512, 64, 128, 1, 0,
|
||||
511 - (gameplayFrames * 1) % 512, 64, 128));
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x09,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 256, 32, 64, 1, 0,
|
||||
255 - (gameplayFrames * 1) % 256, 32, 64));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 256, 32, 64, 1, 0,
|
||||
255 - (gameplayFrames * 1) % 256, 32, 64));
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x0A,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 20) % 2048, 16, 512, 1, 0,
|
||||
(gameplayFrames * 30) % 2048, 16, 512));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 20) % 2048, 16, 512, 1, 0,
|
||||
(gameplayFrames * 30) % 2048, 16, 512));
|
||||
|
||||
gDPPipeSync(gfxCtx->polyOpa.p++);
|
||||
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80);
|
||||
|
|
@ -1315,11 +1315,11 @@ void func_8009C3EC(GlobalContext* globalCtx) {
|
|||
gameplayFrames = globalCtx->gameplayFrames;
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A338[gSaveContext.night_flag]));
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x09,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x0A,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
|
||||
|
||||
{ s32 pad[2]; } // Necessary to match stack usage
|
||||
|
||||
|
|
@ -1343,16 +1343,16 @@ void func_8009C608(GlobalContext* globalCtx) {
|
|||
|
||||
gameplayFrames = globalCtx->gameplayFrames;
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x08,
|
||||
Draw_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 64, 256, 16));
|
||||
Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 64, 256, 16));
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x09,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 60) % 2048, 8, 512, 1, 0,
|
||||
(gameplayFrames * 50) % 2048, 8, 512));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 60) % 2048, 8, 512, 1, 0,
|
||||
(gameplayFrames * 50) % 2048, 8, 512));
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x0A,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - (gameplayFrames * 1) % 128, 0, 32, 32, 1,
|
||||
(gameplayFrames * 1) % 128, 0, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - (gameplayFrames * 1) % 128, 0, 32, 32, 1,
|
||||
(gameplayFrames * 1) % 128, 0, 32, 32));
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x0B,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 1023 - (gameplayFrames * 6) % 1024, 16, 256, 1, 0,
|
||||
1023 - (gameplayFrames * 3) % 1024, 16, 256));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 1023 - (gameplayFrames * 6) % 1024, 16, 256, 1, 0,
|
||||
1023 - (gameplayFrames * 3) % 1024, 16, 256));
|
||||
|
||||
gDPPipeSync(gfxCtx->polyOpa.p++);
|
||||
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80);
|
||||
|
|
@ -1374,12 +1374,12 @@ void func_8009C8B8(GlobalContext* globalCtx) {
|
|||
|
||||
gameplayFrames = globalCtx->gameplayFrames;
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x08,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 32, 1, 0, (gameplayFrames * 1) % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 32, 1, 0, (gameplayFrames * 1) % 128, 32, 32));
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x0A,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x09,
|
||||
Draw_TexScroll(globalCtx->state.gfxCtx, 0, 255 - (gameplayFrames * 10) % 256, 32, 64));
|
||||
Gfx_TexScroll(globalCtx->state.gfxCtx, 0, 255 - (gameplayFrames * 10) % 256, 32, 64));
|
||||
|
||||
gDPPipeSync(gfxCtx->polyOpa.p++);
|
||||
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80);
|
||||
|
|
@ -1401,8 +1401,8 @@ void func_8009CAC0(GlobalContext* globalCtx) {
|
|||
|
||||
gameplayFrames = globalCtx->gameplayFrames;
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x08,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
|
||||
|
||||
gDPPipeSync(gfxCtx->polyOpa.p++);
|
||||
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80);
|
||||
|
|
@ -1429,11 +1429,11 @@ void func_8009CC00(GlobalContext* globalCtx) {
|
|||
gameplayFrames = globalCtx->gameplayFrames;
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A340[gSaveContext.night_flag]));
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x09,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x0A,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
|
||||
|
||||
{ s32 pad[2]; } // Necessary to match stack usage
|
||||
|
||||
|
|
@ -1446,8 +1446,8 @@ void func_8009CC00(GlobalContext* globalCtx) {
|
|||
func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6320);
|
||||
}
|
||||
|
||||
Gfx* Draw_TwoTexScrollPrimColor(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 width1, s32 height1, s32 tile2,
|
||||
u32 x2, u32 y2, s32 width2, s32 height2, s32 red, s32 green, s32 blue, s32 alpha) {
|
||||
Gfx* Gfx_TwoTexScrollPrimColor(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 width1, s32 height1, s32 tile2,
|
||||
u32 x2, u32 y2, s32 width2, s32 height2, s32 r, s32 g, s32 b, s32 a) {
|
||||
Gfx* displayList = Graph_Alloc(gfxCtx, 10 * sizeof(Gfx));
|
||||
|
||||
x1 %= 2048;
|
||||
|
|
@ -1459,7 +1459,7 @@ Gfx* Draw_TwoTexScrollPrimColor(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32
|
|||
gDPSetTileSize(displayList + 1, tile1, x1, y1, (x1 + ((width1 - 1) << 2)), (y1 + ((height1 - 1) << 2)));
|
||||
gDPTileSync(displayList + 2);
|
||||
gDPSetTileSize(displayList + 3, tile2, x2, y2, (x2 + ((width2 - 1) << 2)), (y2 + ((height2 - 1) << 2)));
|
||||
gDPSetPrimColor(displayList + 4, 0, 0, red, green, blue, alpha);
|
||||
gDPSetPrimColor(displayList + 4, 0, 0, r, g, b, a);
|
||||
gSPEndDisplayList(displayList + 5);
|
||||
|
||||
return displayList;
|
||||
|
|
@ -1476,10 +1476,10 @@ void func_8009CF84(GlobalContext* globalCtx) {
|
|||
|
||||
gameplayFrames = globalCtx->gameplayFrames;
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x08,
|
||||
Draw_TwoTexScrollPrimColor(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128,
|
||||
(gameplayFrames * 1) % 128, 32, 32, 1, gameplayFrames % 128,
|
||||
(gameplayFrames * 1) % 128, 32, 32, 0xFF, 0xFF, 0xFF,
|
||||
globalCtx->unk_11D30[0] + 127));
|
||||
Gfx_TwoTexScrollPrimColor(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128,
|
||||
(gameplayFrames * 1) % 128, 32, 32, 1, gameplayFrames % 128,
|
||||
(gameplayFrames * 1) % 128, 32, 32, 0xFF, 0xFF, 0xFF,
|
||||
globalCtx->unk_11D30[0] + 127));
|
||||
|
||||
gDPPipeSync(gfxCtx->polyOpa.p++);
|
||||
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80);
|
||||
|
|
@ -1501,14 +1501,13 @@ void func_8009D0E8(GlobalContext* globalCtx) {
|
|||
|
||||
gameplayFrames = globalCtx->gameplayFrames;
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x08,
|
||||
Draw_TexScroll(globalCtx->state.gfxCtx, 127 - (gameplayFrames * 4) % 128, 0, 32, 32));
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x09,
|
||||
Draw_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 5) % 64, 16, 16));
|
||||
Gfx_TexScroll(globalCtx->state.gfxCtx, 127 - (gameplayFrames * 4) % 128, 0, 32, 32));
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x09, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 5) % 64, 16, 16));
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x0A,
|
||||
Draw_TexScroll(globalCtx->state.gfxCtx, 0, 63 - (gameplayFrames * 2) % 64, 16, 16));
|
||||
Gfx_TexScroll(globalCtx->state.gfxCtx, 0, 63 - (gameplayFrames * 2) % 64, 16, 16));
|
||||
gSPSegment(
|
||||
gfxCtx->polyXlu.p++, 0x0B,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 127 - (gameplayFrames * 3) % 128, 32, 32, 1, 0, 0, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 127 - (gameplayFrames * 3) % 128, 32, 32, 1, 0, 0, 32, 32));
|
||||
|
||||
gDPPipeSync(gfxCtx->polyOpa.p++);
|
||||
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80);
|
||||
|
|
@ -1582,10 +1581,10 @@ void func_8009D5B4(GlobalContext* globalCtx) {
|
|||
|
||||
gameplayFrames = globalCtx->gameplayFrames;
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x08,
|
||||
Draw_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 3) % 128, 32, 32));
|
||||
Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 3) % 128, 32, 32));
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x09,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 1023 - (gameplayFrames * 3) % 1024, 16, 256, 1, 0,
|
||||
1023 - (gameplayFrames * 6) % 1024, 16, 256));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 1023 - (gameplayFrames * 3) % 1024, 16, 256, 1, 0,
|
||||
1023 - (gameplayFrames * 6) % 1024, 16, 256));
|
||||
|
||||
gDPPipeSync(gfxCtx->polyOpa.p++);
|
||||
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80);
|
||||
|
|
@ -1612,11 +1611,11 @@ void func_8009D758(GlobalContext* globalCtx) {
|
|||
gameplayFrames = globalCtx->gameplayFrames;
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A360[gSaveContext.night_flag]));
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x09,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x0A,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
|
||||
|
||||
{ s32 pad[2]; } // Necessary to match stack usage
|
||||
|
||||
|
|
@ -1659,11 +1658,11 @@ void func_8009DA30(GlobalContext* globalCtx) {
|
|||
|
||||
gameplayFrames = globalCtx->gameplayFrames;
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x08,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32));
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x09,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 10) % 128,
|
||||
32, 32, 1, gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 10) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, 32));
|
||||
|
||||
gDPPipeSync(gfxCtx->polyOpa.p++);
|
||||
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80);
|
||||
|
|
@ -1727,14 +1726,14 @@ void func_8009DE78(GlobalContext* globalCtx) {
|
|||
|
||||
gameplayFrames = globalCtx->gameplayFrames;
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x08,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 6) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 6) % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 6) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 6) % 128, 32, 32));
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x09,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32));
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x0A,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
|
||||
|
||||
gDPPipeSync(gfxCtx->polyOpa.p++);
|
||||
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80);
|
||||
|
|
@ -1764,11 +1763,11 @@ void func_8009E0B8(GlobalContext* globalCtx) {
|
|||
|
||||
gameplayFrames = globalCtx->gameplayFrames;
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x09,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x08,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 10) % 128,
|
||||
32, 32, 1, gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 10) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, 32));
|
||||
|
||||
gDPPipeSync(gfxCtx->polyOpa.p++);
|
||||
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80);
|
||||
|
|
@ -1796,8 +1795,8 @@ void func_8009E0B8(GlobalContext* globalCtx) {
|
|||
gSPEndDisplayList(displayListHead);
|
||||
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x0C,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (s16)(-globalCtx->unk_11D30[0] * 0.02f), 32, 16, 1, 0,
|
||||
(s16)(-globalCtx->unk_11D30[0] * 0.02f), 32, 16));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (s16)(-globalCtx->unk_11D30[0] * 0.02f), 32, 16, 1, 0,
|
||||
(s16)(-globalCtx->unk_11D30[0] * 0.02f), 32, 16));
|
||||
|
||||
func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7044);
|
||||
}
|
||||
|
|
@ -1817,11 +1816,11 @@ void func_8009E54C(GlobalContext* globalCtx) {
|
|||
|
||||
gameplayFrames = globalCtx->gameplayFrames;
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x08,
|
||||
Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames, gameplayFrames, 32, 32, 1, 0, 0,
|
||||
32, 32, 0, 0, 0, globalCtx->unk_11D30[0] + 0xA8));
|
||||
Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames, gameplayFrames, 32, 32, 1, 0, 0, 32,
|
||||
32, 0, 0, 0, globalCtx->unk_11D30[0] + 0xA8));
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x09,
|
||||
Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, -gameplayFrames, -gameplayFrames, 32, 32, 1, 0, 0,
|
||||
16, 64, 0, 0, 0, globalCtx->unk_11D30[0] + 0xA8));
|
||||
Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, -gameplayFrames, -gameplayFrames, 32, 32, 1, 0, 0,
|
||||
16, 64, 0, 0, 0, globalCtx->unk_11D30[0] + 0xA8));
|
||||
|
||||
gDPPipeSync(gfxCtx->polyOpa.p++);
|
||||
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0xFF, 0xFF, 0xFF, 0x80);
|
||||
|
|
@ -1847,7 +1846,7 @@ void func_8009E730(GlobalContext* globalCtx) {
|
|||
var = 0;
|
||||
}
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x0C,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 64, 32, 1, 0, var, 64, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 64, 32, 1, 0, var, 64, 32));
|
||||
|
||||
gDPPipeSync(gfxCtx->polyOpa.p++);
|
||||
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80);
|
||||
|
|
@ -1870,13 +1869,13 @@ void func_8009E8C0(GlobalContext* globalCtx) {
|
|||
|
||||
gameplayFrames = globalCtx->gameplayFrames;
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x08,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 128, 0, 32, 32, 1, 0, 0, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 128, 0, 32, 32, 1, 0, 0, 32, 32));
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x09,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 255 - (gameplayFrames * 2) % 256, 64, 64, 1, 0,
|
||||
255 - (gameplayFrames * 2) % 256, 64, 64));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 255 - (gameplayFrames * 2) % 256, 64, 64, 1, 0,
|
||||
255 - (gameplayFrames * 2) % 256, 64, 64));
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x0A,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 128, 32, 32, 1, 0,
|
||||
(gameplayFrames * 1) % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 128, 32, 32, 1, 0,
|
||||
(gameplayFrames * 1) % 128, 32, 32));
|
||||
|
||||
gDPPipeSync(gfxCtx->polyOpa.p++);
|
||||
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80);
|
||||
|
|
@ -1898,23 +1897,23 @@ void func_8009EAD8(GlobalContext* globalCtx) {
|
|||
|
||||
gameplayFrames = globalCtx->gameplayFrames;
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x08,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 3) % 1024, 32, 256, 1, 0,
|
||||
(gameplayFrames * 3) % 1024, 32, 256));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 3) % 1024, 32, 256, 1, 0,
|
||||
(gameplayFrames * 3) % 1024, 32, 256));
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x09,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 256, 64, 64, 1, 0,
|
||||
(gameplayFrames * 1) % 256, 64, 64));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 256, 64, 64, 1, 0,
|
||||
(gameplayFrames * 1) % 256, 64, 64));
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x0A,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 2) % 128, 32, 32, 1, 0,
|
||||
(gameplayFrames * 2) % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 2) % 128, 32, 32, 1, 0,
|
||||
(gameplayFrames * 2) % 128, 32, 32));
|
||||
gSPSegment(
|
||||
gfxCtx->polyOpa.p++, 0x0B,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 32, 1, 0, 127 - (gameplayFrames * 3) % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 32, 1, 0, 127 - (gameplayFrames * 3) % 128, 32, 32));
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x0C,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 128, 32, 32, 1, 0,
|
||||
(gameplayFrames * 1) % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 128, 32, 32, 1, 0,
|
||||
(gameplayFrames * 1) % 128, 32, 32));
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x0D,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 64, 16, 16, 1, 0,
|
||||
(gameplayFrames * 1) % 64, 16, 16));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 64, 16, 16, 1, 0,
|
||||
(gameplayFrames * 1) % 64, 16, 16));
|
||||
|
||||
gDPPipeSync(gfxCtx->polyOpa.p++);
|
||||
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80);
|
||||
|
|
@ -1938,11 +1937,11 @@ void func_8009EE44(GlobalContext* globalCtx) {
|
|||
|
||||
gameplayFrames = globalCtx->gameplayFrames;
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x08,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 128, 0, 32, 16, 1, gameplayFrames % 128,
|
||||
0, 32, 16));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 128, 0, 32, 16, 1, gameplayFrames % 128, 0,
|
||||
32, 16));
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x09,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, gameplayFrames % 128, 32, 32,
|
||||
1, gameplayFrames % 128, gameplayFrames % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, gameplayFrames % 128, 32, 32, 1,
|
||||
gameplayFrames % 128, gameplayFrames % 128, 32, 32));
|
||||
|
||||
gDPPipeSync(gfxCtx->polyXlu.p++);
|
||||
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80);
|
||||
|
|
@ -1972,7 +1971,7 @@ void func_8009F074(GlobalContext* globalCtx) {
|
|||
|
||||
gameplayFrames = globalCtx->gameplayFrames;
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x08,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 32, 1, 0, 127 - gameplayFrames % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 32, 1, 0, 127 - gameplayFrames % 128, 32, 32));
|
||||
|
||||
gDPPipeSync(gfxCtx->polyOpa.p++);
|
||||
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80);
|
||||
|
|
@ -2010,11 +2009,11 @@ void func_8009F270(GlobalContext* globalCtx) {
|
|||
|
||||
gameplayFrames = globalCtx->gameplayFrames;
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x08,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, gameplayFrames % 128, 32, 32, 1, 0,
|
||||
gameplayFrames % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, gameplayFrames % 128, 32, 32, 1, 0, gameplayFrames % 128,
|
||||
32, 32));
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x09,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, gameplayFrames % 128, 32, 32, 1, 0,
|
||||
gameplayFrames % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, gameplayFrames % 128, 32, 32, 1, 0, gameplayFrames % 128,
|
||||
32, 32));
|
||||
|
||||
gDPPipeSync(gfxCtx->polyOpa.p++);
|
||||
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80);
|
||||
|
|
@ -2036,11 +2035,11 @@ void func_8009F40C(GlobalContext* globalCtx) {
|
|||
|
||||
gameplayFrames = globalCtx->gameplayFrames;
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x08,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 10) % 128,
|
||||
32, 32, 1, gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 10) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, 32));
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x09,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32));
|
||||
|
||||
gDPPipeSync(gfxCtx->polyOpa.p++);
|
||||
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80);
|
||||
|
|
@ -2110,8 +2109,8 @@ void func_8009F7D4(GlobalContext* globalCtx) {
|
|||
sp6E = (sp6E >> 1) + 192;
|
||||
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x08,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, gameplayFrames % 128, 32, 32, 1, 0,
|
||||
gameplayFrames % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, gameplayFrames % 128, 32, 32, 1, 0, gameplayFrames % 128,
|
||||
32, 32));
|
||||
|
||||
gDPPipeSync(gfxCtx->polyOpa.p++);
|
||||
gDPSetEnvColor(gfxCtx->polyOpa.p++, sp6F, sp6E, 0xFF, 0x80);
|
||||
|
|
@ -2135,8 +2134,8 @@ void func_8009F9D0(GlobalContext* globalCtx) {
|
|||
|
||||
gameplayFrames = globalCtx->gameplayFrames;
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x08,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 127 - gameplayFrames % 128, 32, 32, 1,
|
||||
gameplayFrames % 128, 0, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 127 - gameplayFrames % 128, 32, 32, 1,
|
||||
gameplayFrames % 128, 0, 32, 32));
|
||||
|
||||
gDPPipeSync(gfxCtx->polyOpa.p++);
|
||||
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80);
|
||||
|
|
@ -2184,12 +2183,12 @@ void func_8009FC90(GlobalContext* globalCtx) {
|
|||
|
||||
gameplayFrames = globalCtx->gameplayFrames;
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x08,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 127 - gameplayFrames % 128, 32, 32, 1,
|
||||
127 - gameplayFrames % 128, 0, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 127 - gameplayFrames % 128, 32, 32, 1,
|
||||
127 - gameplayFrames % 128, 0, 32, 32));
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x09,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 3) % 128,
|
||||
127 - (gameplayFrames * 6) % 128, 32, 32, 1, (gameplayFrames * 6) % 128,
|
||||
127 - (gameplayFrames * 3) % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 3) % 128,
|
||||
127 - (gameplayFrames * 6) % 128, 32, 32, 1, (gameplayFrames * 6) % 128,
|
||||
127 - (gameplayFrames * 3) % 128, 32, 32));
|
||||
|
||||
gDPPipeSync(gfxCtx->polyOpa.p++);
|
||||
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x40);
|
||||
|
|
@ -2219,15 +2218,15 @@ void func_8009FE58(GlobalContext* globalCtx) {
|
|||
gameplayFrames = globalCtx->gameplayFrames;
|
||||
if (globalCtx->sceneNum == SCENE_BDAN) {
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x08,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 128, (gameplayFrames * 2) % 128, 32,
|
||||
32, 1, 127 - gameplayFrames % 128, (gameplayFrames * 2) % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 128, (gameplayFrames * 2) % 128, 32,
|
||||
32, 1, 127 - gameplayFrames % 128, (gameplayFrames * 2) % 128, 32, 32));
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x0B,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 255 - (gameplayFrames * 4) % 256, 32, 64, 1, 0,
|
||||
255 - (gameplayFrames * 4) % 256, 32, 64));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 255 - (gameplayFrames * 4) % 256, 32, 64, 1, 0,
|
||||
255 - (gameplayFrames * 4) % 256, 32, 64));
|
||||
} else {
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x08,
|
||||
Draw_TexScroll(globalCtx->state.gfxCtx, (127 - (gameplayFrames * 1)) % 128,
|
||||
(gameplayFrames * 1) % 128, 32, 32));
|
||||
Gfx_TexScroll(globalCtx->state.gfxCtx, (127 - (gameplayFrames * 1)) % 128,
|
||||
(gameplayFrames * 1) % 128, 32, 32));
|
||||
}
|
||||
|
||||
gDPPipeSync(gfxCtx->polyOpa.p++);
|
||||
|
|
@ -2299,14 +2298,14 @@ void func_800A0334(GlobalContext* globalCtx) {
|
|||
|
||||
gameplayFrames = globalCtx->gameplayFrames;
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x08,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 512, 32,
|
||||
128, 1, gameplayFrames % 128, (gameplayFrames * 1) % 512, 32, 128));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 512, 32,
|
||||
128, 1, gameplayFrames % 128, (gameplayFrames * 1) % 512, 32, 128));
|
||||
gSPSegment(gfxCtx->polyXlu.p++, 0x09,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x0A,
|
||||
Draw_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
|
||||
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32,
|
||||
32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
|
||||
|
||||
gDPPipeSync(gfxCtx->polyOpa.p++);
|
||||
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80);
|
||||
|
|
@ -2338,9 +2337,9 @@ void func_800A059C(GlobalContext* globalCtx) {
|
|||
|
||||
gameplayFrames = globalCtx->gameplayFrames;
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x08,
|
||||
Draw_TexScroll(globalCtx->state.gfxCtx, 127 - (gameplayFrames * 2) % 128, 0, 32, 64));
|
||||
Gfx_TexScroll(globalCtx->state.gfxCtx, 127 - (gameplayFrames * 2) % 128, 0, 32, 64));
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x09,
|
||||
Draw_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 2) % 512, 128, 128));
|
||||
Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 2) % 512, 128, 128));
|
||||
|
||||
gDPPipeSync(gfxCtx->polyOpa.p++);
|
||||
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue