diff options
| author | petrie911 <69443847+petrie911@users.noreply.github.com> | 2021-01-12 22:59:23 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-12 23:59:23 -0500 |
| commit | d8f146519c67a24262e760396d030acdaa931dce (patch) | |
| tree | 2fb9b1caa9949163b6ed326b99f01c55ce8d540a /src/code/z_moji.c | |
| parent | a22b6a22e8ac0ed8d36eec998a4de1fa00185f8f (diff) | |
Fix LoadTextureBlock/LoadTextureTile combined macros and z_fbdemo OK (#623)
* 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>
Diffstat (limited to 'src/code/z_moji.c')
| -rw-r--r-- | src/code/z_moji.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/code/z_moji.c b/src/code/z_moji.c index 123608bba..b38a587db 100644 --- a/src/code/z_moji.c +++ b/src/code/z_moji.c @@ -67,15 +67,8 @@ void func_8007BBA8(GraphicsContext* gfxCtx, u8* arg1) { gDPPipeSync(POLY_OPA_DISP++); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, sFontColorRed, sFontColorGreen, sFontColorBlue, sFontColorAlpha); - gDPSetTextureImage(POLY_OPA_DISP++, G_IM_FMT_CI, G_IM_SIZ_16b, 1, (s32)gFontFF); - gDPSetTile(POLY_OPA_DISP++, G_IM_FMT_CI, G_IM_SIZ_16b, 0, 0, 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); - gDPLoadSync(POLY_OPA_DISP++); - gDPLoadBlock(POLY_OPA_DISP++, G_TX_LOADTILE, 0, 0, 511, 2048); - gDPPipeSync(POLY_OPA_DISP++); - gDPSetTile(POLY_OPA_DISP++, G_IM_FMT_CI, G_IM_SIZ_4b, 1, 0, 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); - gDPSetTileSize(POLY_OPA_DISP++, G_TX_RENDERTILE, 0, 0, 60, 508); + gDPLoadTextureBlock_4b(POLY_OPA_DISP++, (s32)gFontFF, G_IM_FMT_CI, 16, 128, 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); D_8015FFC0 = -1; |