From 30899310a575f59bc244ba585164035e308a041a Mon Sep 17 00:00:00 2001 From: Diamond Lewis Date: Wed, 9 Sep 2026 14:05:02 -0500 Subject: [PATCH] Match fragment4 100% --- src/fragments/4/fragment4.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/fragments/4/fragment4.c b/src/fragments/4/fragment4.c index 553d27a..971c454 100644 --- a/src/fragments/4/fragment4.c +++ b/src/fragments/4/fragment4.c @@ -210,7 +210,6 @@ void func_87A009F0(s32 arg0) { gDisplayListHead = gfx; } -#ifdef NON_MATCHING void func_87A00DB8(s32 arg0) { Gfx* gfx = gDisplayListHead; s32 i; @@ -228,12 +227,11 @@ void func_87A00DB8(s32 arg0) { gDPSetTexturePersp(gfx++, G_TP_NONE); for (i = 0; i < 15; i++) { - s32 sp44 = arg0 + ((i * 0x14) << 9); - - for (j = 0; j < 20; j++, sp44 += 0x200) { + for (j = 0; j < 20; j++) { gDPPipeSync(gfx++); - gDPLoadTextureBlock(gfx++, sp44, G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 16, 0, G_TX_NOMIRROR | G_TX_CLAMP, - G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); + gDPLoadTextureBlock(gfx++, arg0 + (i * 0x14 + j) * 0x200, G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 16, 0, + G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, + G_TX_NOLOD, G_TX_NOLOD); gSPTextureRectangle(gfx++, (j * 0x10) << 2, (i * 0x10) << 2, ((j + 1) * 0x10) << 2, ((i + 1) * 0x10) << 2, G_TX_RENDERTILE, 0, 0, 0x0400, 0x0400); @@ -242,9 +240,6 @@ void func_87A00DB8(s32 arg0) { gDisplayListHead = gfx; } -#else -#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/4/fragment4/func_87A00DB8.s") -#endif typedef void (*ret_func_87A010C8)(void);