mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 06:10:21 +00:00
Code Issues Projects Releases Wiki Activity

Fix LoadTextureBlock/LoadTextureTile combined macros and z_fbdemo OK (#623)

Browse source 
* first pass

* match z_fbdemo

* .s

* Update src/code/gfxprint.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
petrie911 2021-01-12 22:59:23 -06:00 • committed by GitHub
parent a22b6a22e8
commit d8f146519c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 69 additions and 529 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/overlays/actors/ovl_End_Title/z_end_title.c
View file

@ -92,41 +92,20 @@ void EndTitle_Draw(Actor* thisx, GlobalContext* globalCtx) {
gDPSetCombineLERP(OVERLAY_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0,
COMBINED, 0, 0, 0, COMBINED);
gDPSetPrimColor(OVERLAY_DISP++, 0x00, 0x80, 0, 0, 0, this->endAlpha);
gDPSetTextureImage(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_8b, 80, D_80B670E0);
gDPSetTile(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_8b, 11, 0x0, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_NOMIRROR, 0, 0,
G_TX_NOMIRROR | G_TX_NOMIRROR, 0, 0);
gDPLoadSync(OVERLAY_DISP++);
gDPLoadTile(OVERLAY_DISP++, G_TX_LOADTILE, 0, 0, (80 << 2), (24 << 2));
gDPPipeSync(OVERLAY_DISP++);
gDPSetTile(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_8b, 11, 0x0, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_NOMIRROR, 0,
0, G_TX_NOMIRROR | G_TX_NOMIRROR, 0, 0);
gDPSetTileSize(OVERLAY_DISP++, G_TX_RENDERTILE, 0, 0, (80 << 2), (24 << 2));
gDPLoadTextureTile(OVERLAY_DISP++, D_80B670E0, G_IM_FMT_IA, G_IM_SIZ_8b, 80, 24, 0, 0, 80, 24, 0,
G_TX_NOMIRROR | G_TX_NOMIRROR, G_TX_NOMIRROR | G_TX_NOMIRROR, 0, 0, 0, 0);
gSPTextureRectangle(OVERLAY_DISP++, (120 << 2), (90 << 2), (200 << 2), (113 << 2), G_TX_RENDERTILE, 0, 0, (32 << 5),
(32 << 5));
gDPPipeSync(OVERLAY_DISP++);
gDPSetPrimColor(OVERLAY_DISP++, 0x00, 0x80, 0, 0, 0, this->tlozAlpha);
gDPSetTextureImage(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_8b, 120, D_80B65EA0);
gDPSetTile(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_8b, 16, 0x0, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_NOMIRROR, 0, 0,
G_TX_NOMIRROR | G_TX_NOMIRROR, 0, 0);
gDPLoadSync(OVERLAY_DISP++);
gDPLoadTile(OVERLAY_DISP++, G_TX_LOADTILE, 0, 0, (120 << 2), (24 << 2));
gDPPipeSync(OVERLAY_DISP++);
gDPSetTile(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_8b, 16, 0x0, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_NOMIRROR, 0,
0, G_TX_NOMIRROR | G_TX_NOMIRROR, 0, 0);
gDPSetTileSize(OVERLAY_DISP++, G_TX_RENDERTILE, 0, 0, (120 << 2), (24 << 2));
gDPLoadTextureTile(OVERLAY_DISP++, D_80B65EA0, G_IM_FMT_IA, G_IM_SIZ_8b, 120, 24, 0, 0, 120, 24, 0,
G_TX_NOMIRROR | G_TX_NOMIRROR, G_TX_NOMIRROR | G_TX_NOMIRROR, 0, 0, 0, 0);
gSPTextureRectangle(OVERLAY_DISP++, (100 << 2), (160 << 2), (220 << 2), (183 << 2), G_TX_RENDERTILE, 0, 0,
(32 << 5), (32 << 5));
gDPPipeSync(OVERLAY_DISP++);
gDPSetPrimColor(OVERLAY_DISP++, 0x00, 0x80, 0, 0, 0, this->ootAlpha);
gDPSetTextureImage(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_8b, 112, D_80B669E0);
gDPSetTile(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_8b, 15, 0x0, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_NOMIRROR, 0, 0,
G_TX_NOMIRROR | G_TX_NOMIRROR, 0, 0);
gDPLoadSync(OVERLAY_DISP++);
gDPLoadTile(OVERLAY_DISP++, G_TX_LOADTILE, 0, 0, (112 << 2), (16 << 2));
gDPPipeSync(OVERLAY_DISP++);
gDPSetTile(OVERLAY_DISP++, G_IM_FMT_IA, G_IM_SIZ_8b, 15, 0x0, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_NOMIRROR, 0,
0, G_TX_NOMIRROR | G_TX_NOMIRROR, 0, 0);
gDPSetTileSize(OVERLAY_DISP++, G_TX_RENDERTILE, 0, 0, (112 << 2), (16 << 2));
gDPLoadTextureTile(OVERLAY_DISP++, D_80B669E0, G_IM_FMT_IA, G_IM_SIZ_8b, 112, 16, 0, 0, 112, 16, 0,
G_TX_NOMIRROR | G_TX_NOMIRROR, G_TX_NOMIRROR | G_TX_NOMIRROR, 0, 0, 0, 0);
gSPTextureRectangle(OVERLAY_DISP++, (104 << 2), (177 << 2), (216 << 2), (192 << 2), G_TX_RENDERTILE, 0, 0,
(32 << 5), (32 << 5));

33
src/overlays/actors/ovl_End_Title/z_end_title_gfx.c
View file

@ -446,35 +446,14 @@ static Gfx dList_80B69720[] = {
gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED, 0, 0, 0,
COMBINED),
gsDPSetEnvColor(200, 230, 225, 255),
gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_8b, 64, D_80B67860),
gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_8b, 8, 0x0, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_NOMIRROR, 0, 0,
G_TX_NOMIRROR | G_TX_NOMIRROR, 0, 0),
gsDPLoadSync(),
gsDPLoadTile(G_TX_LOADTILE, 0, 0, (63 << 2), (47 << 2)),
gsDPPipeSync(),
gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_8b, 8, 0x0, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_NOMIRROR, 0, 0,
G_TX_NOMIRROR | G_TX_NOMIRROR, 0, 0),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, (63 << 2), (47 << 2)),
gsDPLoadTextureTile(D_80B67860, G_IM_FMT_IA, G_IM_SIZ_8b, 64, 48, 0, 0, 63, 47, 0, G_TX_NOMIRROR | G_TX_NOMIRROR,
G_TX_NOMIRROR | G_TX_NOMIRROR, 0, 0, 0, 0),
gsSPTextureRectangle((97 << 2), (90 << 2), (160 << 2), (137 << 2), G_TX_RENDERTILE, 0, 0, (32 << 5), (32 << 5)),
gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_8b, 64, D_80B68460),
gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_8b, 8, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadTile(G_TX_LOADTILE, 0, 0, (63 << 2), (47 << 2)),
gsDPPipeSync(),
gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_8b, 8, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, (63 << 2), (47 << 2)),
gsDPLoadTextureTile(D_80B68460, G_IM_FMT_IA, G_IM_SIZ_8b, 64, 48, 0, 0, 63, 47, 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),
gsSPTextureRectangle((160 << 2), (90 << 2), (223 << 2), (137 << 2), G_TX_RENDERTILE, 0, 0, (32 << 5), (32 << 5)),
gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_8b, 96, D_80B69060),
gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_8b, 12, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPLoadSync(),
gsDPLoadTile(G_TX_LOADTILE, 0, 0, (95 << 2), (15 << 2)),
gsDPPipeSync(),
gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_8b, 12, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, (95 << 2), (15 << 2)),
gsDPLoadTextureTile(D_80B69060, G_IM_FMT_IA, G_IM_SIZ_8b, 96, 16, 0, 0, 95, 15, 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),
gsSPTextureRectangle((113 << 2), (80 << 2), (208 << 2), (95 << 2), G_TX_RENDERTILE, 0, 0, (32 << 5), (32 << 5)),
gsSPEndDisplayList(),
};

22
src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2_gfx.c
View file

@ -138,24 +138,10 @@ static Gfx sTextureDL[] = {
gsDPPipeSync(),
gsDPSetTextureLUT(G_TT_NONE),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPSetTextureImage(G_IM_FMT_I, G_IM_SIZ_16b, 1, tex0),
gsDPSetTile(G_IM_FMT_I, G_IM_SIZ_16b, 0, 0x0, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_NOMIRROR, 6, 14,
G_TX_NOMIRROR | G_TX_NOMIRROR, 6, 14),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 512),
gsDPPipeSync(),
gsDPSetTile(G_IM_FMT_I, G_IM_SIZ_4b, 4, 0x0, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_NOMIRROR, 6, 14,
G_TX_NOMIRROR | G_TX_NOMIRROR, 6, 14),
gsDPSetTileSize(G_TX_RENDERTILE, 0, 0, (63 << 2), (63 << 2)),
gsDPSetTextureImage(G_IM_FMT_I, G_IM_SIZ_16b, 1, tex1),
gsDPSetTile(G_IM_FMT_I, G_IM_SIZ_16b, 0, 0x100, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_NOMIRROR, 6, 14,
G_TX_NOMIRROR | G_TX_NOMIRROR, 6, 1),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 1023, 512),
gsDPPipeSync(),
gsDPSetTile(G_IM_FMT_I, G_IM_SIZ_4b, 4, 0x100, 1, 0, G_TX_NOMIRROR | G_TX_NOMIRROR, 6, 14,
G_TX_NOMIRROR | G_TX_NOMIRROR, 6, 1),
gsDPSetTileSize(1, 0, 0, (63 << 2), (63 << 2)),
gsDPLoadTextureBlock_4b(tex0, G_IM_FMT_I, 64, 64, 0, G_TX_NOMIRROR | G_TX_NOMIRROR, G_TX_NOMIRROR | G_TX_NOMIRROR,
6, 6, 14, 14),
gsDPLoadMultiBlock_4b(tex1, 0x100, 1, G_IM_FMT_I, 64, 64, 0, G_TX_NOMIRROR | G_TX_NOMIRROR,
G_TX_NOMIRROR | G_TX_NOMIRROR, 6, 6, 1, 14),
gsDPSetCombineLERP(TEXEL1, PRIMITIVE, ENV_ALPHA, TEXEL0, TEXEL1, 0, ENVIRONMENT, TEXEL0, PRIMITIVE, ENVIRONMENT,
COMBINED, ENVIRONMENT, COMBINED, 0, SHADE, 0),
gsDPSetRenderMode(AA_EN | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL |