From da9046f7453c3bc411caaa7ef8f3c7f36170ccef Mon Sep 17 00:00:00 2001 From: fgsfds Date: Sat, 5 Aug 2023 01:57:26 +0200 Subject: [PATCH] port: swap RGBA color literals --- src/game/activemenu.c | 4 +-- src/game/bg.c | 2 +- src/game/bondview.c | 4 +-- src/game/credits.c | 14 ++++---- src/game/explosions.c | 4 +-- src/game/gunfx.c | 14 ++++---- src/game/menugfx.c | 72 +++++++++++++++++++++--------------------- src/game/nbomb.c | 10 +++--- src/game/propobj.c | 2 +- src/game/propobjstop.c | 1 - src/game/savebuffer.c | 4 +-- src/game/shards.c | 24 +++++++------- src/game/sight.c | 8 ++--- src/game/sparks.c | 12 +++---- src/game/weather.c | 6 ++-- src/include/types.h | 3 ++ 16 files changed, 93 insertions(+), 91 deletions(-) diff --git a/src/game/activemenu.c b/src/game/activemenu.c index 1c98bb432..f3f496a2a 100644 --- a/src/game/activemenu.c +++ b/src/game/activemenu.c @@ -1368,8 +1368,8 @@ Gfx *amRender(Gfx *gdl) vertices[6].colour = 4; vertices[7].colour = 4; - colours[0].word = 0x22222200; - colours[1].word = 0x0000004f; + colours[0].word = PD_BE32(0x22222200); + colours[1].word = PD_BE32(0x0000004f); gSPColor(gdl++, osVirtualToPhysical(colours), 2); gSPVertex(gdl++, osVirtualToPhysical(vertices), 8, 0); diff --git a/src/game/bg.c b/src/game/bg.c index e51498e63..7b26251dd 100644 --- a/src/game/bg.c +++ b/src/game/bg.c @@ -286,7 +286,7 @@ Gfx *bgRenderXrayData(Gfx *gdl, struct xraydata *xraydata) vertices[i].y = xraydata->vertices[i][1]; vertices[i].z = xraydata->vertices[i][2]; vertices[i].colour = i << 2; - colours[i].word = xraydata->colours[i]; + colours[i].word = PD_BE32(xraydata->colours[i]); } count = xraydata->numvertices; diff --git a/src/game/bondview.c b/src/game/bondview.c index 60a5f4506..b8ead4f64 100644 --- a/src/game/bondview.c +++ b/src/game/bondview.c @@ -770,8 +770,8 @@ Gfx *bviewDrawEyespySideRect(Gfx *gdl, s32 *points, u8 r, u8 g, u8 b, u8 alpha) vertices[3].y = points[7] * 10.0f; vertices[3].z = -10; - colours[0].word = r << 0x18 | g << 0x10 | b << 8 | 0xff; - colours[1].word = r << 0x18 | g << 0x10 | b << 8 | alpha; + colours[0].word = PD_BE32(r << 0x18 | g << 0x10 | b << 8 | 0xff); + colours[1].word = PD_BE32(r << 0x18 | g << 0x10 | b << 8 | alpha); vertices[0].colour = 0; vertices[1].colour = 0; diff --git a/src/game/credits.c b/src/game/credits.c index 6063c6dde..5b09ea062 100644 --- a/src/game/credits.c +++ b/src/game/credits.c @@ -307,17 +307,17 @@ void creditsChooseBgColours(Vtx *vertices, Col *colours, s32 confignum, s32 alph weightfrac = (iVar1 % 60) / 60.0f; weight = 255.0f * weightfrac; - colours[0].word = colourBlend( + colours[0].word = PD_BE32(colourBlend( g_CreditsBgConfigs[confignum].colours[colour2index][0] << 8, - g_CreditsBgConfigs[confignum].colours[colour1index][0] << 8, weight) | alpha; + g_CreditsBgConfigs[confignum].colours[colour1index][0] << 8, weight) | alpha); - colours[1].word = colourBlend( + colours[1].word = PD_BE32(colourBlend( g_CreditsBgConfigs[confignum].colours[colour2index][1] << 8, - g_CreditsBgConfigs[confignum].colours[colour1index][1] << 8, weight) | alpha; + g_CreditsBgConfigs[confignum].colours[colour1index][1] << 8, weight) | alpha); - colours[2].word = colourBlend( + colours[2].word = PD_BE32(colourBlend( g_CreditsBgConfigs[confignum].colours[colour2index][2] << 8, - g_CreditsBgConfigs[confignum].colours[colour1index][2] << 8, weight) | alpha; + g_CreditsBgConfigs[confignum].colours[colour1index][2] << 8, weight) | alpha); } struct creditsbgtype { @@ -883,7 +883,7 @@ Gfx *creditsDrawParticles(Gfx *gdl) } for (j = 0; j < 15; j++) { - colours[i + j * 4].word = (colour & 0xffffff00) | ((colour & 0xff) * (15 - j) / 15); + colours[i + j * 4].word = PD_BE32((colour & 0xffffff00) | ((colour & 0xff) * (15 - j) / 15)); } } diff --git a/src/game/explosions.c b/src/game/explosions.c index 43a8a8e62..1472cda56 100644 --- a/src/game/explosions.c +++ b/src/game/explosions.c @@ -1332,11 +1332,11 @@ Gfx *explosionRender(struct prop *prop, Gfx *gdl, bool xlupass) red = expdist * 127.0f; green = (1.0f - expdist) * 127.0f; - colours[0].word = red << 24 | green << 16 | alpha | 0x80800000; + colours[0].word = PD_BE32(red << 24 | green << 16 | alpha | 0x80800000); } else { static u32 var8007e93c = 0xffffffff; mainOverrideVariable("ecol", &var8007e93c); - colours[0].word = 0xffffffff; + colours[0].word = PD_BE32(0xffffffff); colours[0].word = var8007e93c; } diff --git a/src/game/gunfx.c b/src/game/gunfx.c index 79b8f1f4e..1f8121dc5 100644 --- a/src/game/gunfx.c +++ b/src/game/gunfx.c @@ -225,8 +225,8 @@ Gfx *beamRenderGeneric(Gfx *gdl, struct textureconfig *texconfig, return gdl; } - colours[0].word = headcolour; - colours[1].word = tailcolour; + colours[0].word = PD_BE32(headcolour); + colours[1].word = PD_BE32(tailcolour); spd0.f[0] = (spe4.f[1] * (campos->f[2] - (headpos->f[2] + length * spe4.f[2]))) - (spe4.f[2] * (campos->f[1] - (headpos->f[1] + length * spe4.f[1]))); spd0.f[1] = (spe4.f[2] * (campos->f[0] - (headpos->f[0] + length * spe4.f[0]))) - (spe4.f[0] * (campos->f[2] - (headpos->f[2] + length * spe4.f[2]))); @@ -347,7 +347,7 @@ Gfx *beamRender(Gfx *gdl, struct beam *beam, bool arg2, u8 arg3) } if (beam->weaponnum == -1 || beam->weaponnum == WEAPON_CYCLONE) { - colours[0].word = 0xffffff7f; + colours[0].word = PD_BE32(0xffffff7f); } else { colours[0].word = 0xffffffff; } @@ -1119,8 +1119,8 @@ Gfx *lasersightRenderDot(Gfx *gdl) colours = gfxAllocateColours(2); - colours[0].word = 0xff00005f; - colours[1].word = 0xff00000f; + colours[0].word = PD_BE32(0xff00005f); + colours[1].word = PD_BE32(0xff00000f); gSPColor(gdl++, osVirtualToPhysical(colours), 2); @@ -1336,8 +1336,8 @@ Gfx *lasersightRenderBeam(Gfx *gdl) colours = gfxAllocateColours(2); - colours[0].word = 0xff00005f; - colours[1].word = 0xff00000f; + colours[0].word = PD_BE32(0xff00005f); + colours[1].word = PD_BE32(0xff00000f); gSPColor(gdl++, osVirtualToPhysical(colours), 2); diff --git a/src/game/menugfx.c b/src/game/menugfx.c index 07a261cb8..b07061432 100644 --- a/src/game/menugfx.c +++ b/src/game/menugfx.c @@ -211,7 +211,7 @@ Gfx *menugfxRenderBgBlur(Gfx *gdl, u32 colour, s16 arg2, s16 arg3) vertices[2].colour = 0; vertices[3].colour = 0; - colours[0].word = colour; + colours[0].word = PD_BE32(colour); gSPColor(gdl++, osVirtualToPhysical(colours), 1); gSPVertex(gdl++, osVirtualToPhysical(vertices), 4, 0); @@ -380,10 +380,10 @@ Gfx *menugfxRenderBgGreenHaze(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2) vertices[6].colour = 8; vertices[7].colour = 8; - colours[0].word = 0x00af0000 | alphas[0]; - colours[1].word = 0xffff0000 | alphas[0]; - colours[2].word = 0x00af0000 | alphas[1]; - colours[3].word = 0xffff0000 | alphas[1]; + colours[0].word = PD_BE32(0x00af0000 | alphas[0]); + colours[1].word = PD_BE32(0xffff0000 | alphas[0]); + colours[2].word = PD_BE32(0x00af0000 | alphas[1]); + colours[3].word = PD_BE32(0xffff0000 | alphas[1]); gSPColor(gdl++, osVirtualToPhysical(colours), 4); gSPVertex(gdl++, osVirtualToPhysical(vertices), 8, 0); @@ -449,9 +449,9 @@ Gfx *menugfxDrawDropdownBackground(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2) colour1 = text0f1543ac((x1 + x2) / 2, (y2 + y1) / 2, 0xffffffff) & 0xff; colour2 = (text0f1543ac((x1 + x2) / 2, (y2 + y1) / 2, 0xffffff7f) & 0xff) | 0x00006f00; - colours[0].word = colour1 | 0x00006f00; - colours[1].word = colour2; - colours[2].word = colour1 | 0x00003f00; + colours[0].word = PD_BE32(colour1 | 0x00006f00); + colours[1].word = PD_BE32(colour2); + colours[2].word = PD_BE32(colour1 | 0x00003f00); gSPColor(gdl++, osVirtualToPhysical(colours), 3); gSPVertex(gdl++, osVirtualToPhysical(vertices), 6, 0); @@ -529,17 +529,17 @@ Gfx *menugfxDrawListGroupHeader(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, s32 x3 alpha2 = text0f1543ac((x1 + x2) / 2, (y1 + y2) / 2, 0xffffff7f) & 0xff; #endif - colours[0].word = 0x00006f00 | alpha1; - colours[1].word = 0x00006f00 | alpha2; + colours[0].word = PD_BE32(0x00006f00 | alpha1); + colours[1].word = PD_BE32(0x00006f00 | alpha2); #if VERSION >= VERSION_NTSC_1_0 - colours[2].word = 0x00003f00 | alpha2; + colours[2].word = PD_BE32(0x00003f00 | alpha2); #else - colours[2].word = 0x00003f00 | alpha1; + colours[2].word = PD_BE32(0x00003f00 | alpha1); #endif - colours[3].word = 0xffffff00; - colours[4].word = (0x00006f00 | alpha2) & 0xffffff00; - colours[5].word = (0x00003f00 | alpha1) & 0xffffff00; - colours[6].word = 0x6f6f6f00 | alpha1; + colours[3].word = PD_BE32(0xffffff00); + colours[4].word = PD_BE32((0x00006f00 | alpha2) & 0xffffff00); + colours[5].word = PD_BE32((0x00003f00 | alpha1) & 0xffffff00); + colours[6].word = PD_BE32(0x6f6f6f00 | alpha1); gSPColor(gdl++, osVirtualToPhysical(colours), 7); gSPVertex(gdl++, osVirtualToPhysical(vertices), 9, 0); @@ -799,9 +799,9 @@ Gfx *menugfxRenderGradient(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colours vertices[5].y = ymid * 10; vertices[5].colour = 8; - colours[0].word = colourstart; - colours[2].word = colourmid; - colours[1].word = colourend; + colours[0].word = PD_BE32(colourstart); + colours[2].word = PD_BE32(colourmid); + colours[1].word = PD_BE32(colourend); gSPColor(gdl++, osVirtualToPhysical(colours), 3); gSPVertex(gdl++, osVirtualToPhysical(vertices), 6, 0); @@ -858,9 +858,9 @@ Gfx *menugfxRenderSlider(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, s32 markerx, vertices[4].colour = 8; vertices[5].colour = 8; - colours[0].word = (colour & 0xffffff00) | 0x4f; - colours[1].word = 0xffffffff; - colours[2].word = 0x0000ff4f; + colours[0].word = PD_BE32((colour & 0xffffff00) | 0x4f); + colours[1].word = PD_BE32(0xffffffff); + colours[2].word = PD_BE32(0x0000ff4f); gSPColor(gdl++, osVirtualToPhysical(colours), 3); gSPVertex(gdl++, osVirtualToPhysical(vertices), 6, 0); @@ -956,8 +956,8 @@ Gfx *menugfxDrawTri2(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 vertices[3].colour = 4; } - colours[0].word = colour1; - colours[1].word = colour2; + colours[0].word = PD_BE32(colour1); + colours[1].word = PD_BE32(colour2); gSPColor(gdl++, osVirtualToPhysical(colours), 2); gSPVertex(gdl++, osVirtualToPhysical(vertices), 4, 0); @@ -1264,8 +1264,8 @@ Gfx *menugfxDrawCarouselChevron(Gfx *gdl, s32 x, s32 y, s32 size, s32 direction, vertices[1].colour = 4; vertices[2].colour = 4; - colours[0].word = colour1; - colours[1].word = colour2; + colours[0].word = PD_BE32(colour1); + colours[1].word = PD_BE32(colour2); gSPColor(gdl++, osVirtualToPhysical(colours), 2); gSPVertex(gdl++, osVirtualToPhysical(vertices), 3, 0); @@ -1358,8 +1358,8 @@ Gfx *menugfxDrawDialogChevron(Gfx *gdl, s32 x, s32 y, s32 size, s32 direction, u vertices[2].colour = 4; vertices[3].colour = 4; - colours[0].word = colour1; - colours[1].word = colour2; + colours[0].word = PD_BE32(colour1); + colours[1].word = PD_BE32(colour2); gSPColor(gdl++, osVirtualToPhysical(colours), 2); gSPVertex(gdl++, osVirtualToPhysical(vertices), 4, 0); @@ -1856,50 +1856,50 @@ Gfx *menugfxRenderBgSuccess(Gfx *gdl) if (gray) { for (j = 0, ptr = colours; j < 5;) { - ptr[0].word = 0xffffff00 | ((5 - j) * 127u / 5); + ptr[0].word = PD_BE32(0xffffff00 | ((5 - j) * 127u / 5)); ptr += 4; j++; } for (j = 0, ptr = colours; j < 5;) { - ptr[1].word = 0xaaaaaa00 | ((5 - j) * 16u / 5); + ptr[1].word = PD_BE32(0xaaaaaa00 | ((5 - j) * 16u / 5)); ptr += 4; j++; } for (j = 0, ptr = colours; j < 5;) { - ptr[2].word = 0xffffff00 | ((5 - j) * 127u / 5); + ptr[2].word = PD_BE32(0xffffff00 | ((5 - j) * 127u / 5)); ptr += 4; j++; } for (j = 0, ptr = colours; j < 5;) { - ptr[3].word = 0xaaaaaa00 | ((5 - j) * 16u / 5); + ptr[3].word = PD_BE32(0xaaaaaa00 | ((5 - j) * 16u / 5)); ptr += 4; j++; } } else { for (j = 0, ptr = colours; j < 5;) { - ptr[0].word = 0xffffff00 | ((5 - j) * 127u / 5); + ptr[0].word = PD_BE32(0xffffff00 | ((5 - j) * 127u / 5)); ptr += 4; j++; } for (j = 0, ptr = colours; j < 5;) { - ptr[1].word = 0xaaaaff00 | ((5 - j) * 16u / 5); + ptr[1].word = PD_BE32(0xaaaaff00 | ((5 - j) * 16u / 5)); ptr += 4; j++; } for (j = 0, ptr = colours; j < 5;) { - ptr[2].word = 0xffffff00 | ((5 - j) * 127u / 5); + ptr[2].word = PD_BE32(0xffffff00 | ((5 - j) * 127u / 5)); ptr += 4; j++; } for (j = 0, ptr = colours; j < 5;) { if (colours); - ptr[3].word = 0xffaaff00 | ((5 - j) * 16u / 5); + ptr[3].word = PD_BE32(0xffaaff00 | ((5 - j) * 16u / 5)); ptr += 4; j++; } diff --git a/src/game/nbomb.c b/src/game/nbomb.c index c38e0265d..4815c3e8d 100644 --- a/src/game/nbomb.c +++ b/src/game/nbomb.c @@ -181,7 +181,7 @@ Gfx *func0f0073ac(Gfx *gdl, struct coord *pos, f32 arg2) colours = gfxAllocateColours(1); - colours[0].word = 0xff00007f; + colours[0].word = PD_BE32(0xff00007f); gSPColor(gdl++, osVirtualToPhysical(colours), 1); gSPVertex(gdl++, osVirtualToPhysical(vertices), 6, 0); @@ -377,8 +377,8 @@ Gfx *nbombRender(Gfx *gdl, struct nbomb *nbomb, Gfx *subgdl) colour = nbombCalculateAlpha(nbomb); colours = gfxAllocateColours(2); - colours[0].word = colour; - colours[1].word = 0xffffff00; + colours[0].word = PD_BE32(colour); + colours[1].word = PD_BE32(0xffffff00); gSPColor(gdl++, osVirtualToPhysical(colours), 2); @@ -885,7 +885,7 @@ Gfx *nbombRenderOverlay(Gfx *gdl) vertices[2].colour = 0; vertices[3].colour = 0; - colours[0].word = finalalpha; + colours[0].word = PD_BE32(finalalpha); gSPColor(gdl++, osVirtualToPhysical(colours), 1); gSPVertex(gdl++, osVirtualToPhysical(vertices), 4, 0); @@ -1087,7 +1087,7 @@ Gfx *gasRender(Gfx *gdl) alpha = 127.0f * alphafrac; - colours[0].word = 0x3faf1100 | alpha; + colours[0].word = PD_BE32(0x3faf1100 | alpha); gSPColor(gdl++, osVirtualToPhysical(colours), 1); gSPVertex(gdl++, osVirtualToPhysical(vertices), 8, 0); diff --git a/src/game/propobj.c b/src/game/propobj.c index 9d1e7ed17..884b7b640 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -13483,7 +13483,7 @@ Gfx *gfxRenderRadialShadow(Gfx *gdl, f32 x, f32 y, f32 z, f32 angle, f32 radius, tconfig = &g_TexShadowConfigs[0]; - colours[0].word = colour; + colours[0].word = PD_BE32(colour); pos.x = x; pos.y = y + 2.0f; diff --git a/src/game/propobjstop.c b/src/game/propobjstop.c index d335739f4..b5d4f97d1 100644 --- a/src/game/propobjstop.c +++ b/src/game/propobjstop.c @@ -5,7 +5,6 @@ #include "bss.h" #include "data.h" #include "types.h" -#include "platform.h" void objsStop(void) { diff --git a/src/game/savebuffer.c b/src/game/savebuffer.c index d7ee77cca..b9e8fd94f 100644 --- a/src/game/savebuffer.c +++ b/src/game/savebuffer.c @@ -361,8 +361,8 @@ Gfx *menugfxDrawPlane(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, u32 colour1, u32 vertices[3].colour = 4; } - colours[0].word = colour1; - colours[1].word = colour2; + colours[0].word = PD_BE32(colour1); + colours[1].word = PD_BE32(colour2); gSPColor(gdl++, osVirtualToPhysical(colours), 2); gSPVertex(gdl++, osVirtualToPhysical(vertices), 4, 0); diff --git a/src/game/shards.c b/src/game/shards.c index b3235a352..48a070d97 100644 --- a/src/game/shards.c +++ b/src/game/shards.c @@ -148,21 +148,21 @@ void shardCreate(s16 room, struct coord *pos, f32 rotx, f32 size, s32 type) s32 rand = random() % 100; if (rand < 20) { - g_Shards[g_NextShardNum].colours[0].word = 0xbbbbbbf0; - g_Shards[g_NextShardNum].colours[1].word = 0xaaaaaaf0; - g_Shards[g_NextShardNum].colours[2].word = 0x777777f0; + g_Shards[g_NextShardNum].colours[0].word = PD_BE32(0xbbbbbbf0); + g_Shards[g_NextShardNum].colours[1].word = PD_BE32(0xaaaaaaf0); + g_Shards[g_NextShardNum].colours[2].word = PD_BE32(0x777777f0); } else if (rand < 40) { - g_Shards[g_NextShardNum].colours[0].word = 0x000000f0; - g_Shards[g_NextShardNum].colours[1].word = 0x000000f0; - g_Shards[g_NextShardNum].colours[2].word = 0x000000f0; + g_Shards[g_NextShardNum].colours[0].word = PD_BE32(0x000000f0); + g_Shards[g_NextShardNum].colours[1].word = PD_BE32(0x000000f0); + g_Shards[g_NextShardNum].colours[2].word = PD_BE32(0x000000f0); } else if (rand < 60) { - g_Shards[g_NextShardNum].colours[0].word = 0x553311f0; - g_Shards[g_NextShardNum].colours[1].word = 0x553311f0; - g_Shards[g_NextShardNum].colours[2].word = 0x553311f0; + g_Shards[g_NextShardNum].colours[0].word = PD_BE32(0x553311f0); + g_Shards[g_NextShardNum].colours[1].word = PD_BE32(0x553311f0); + g_Shards[g_NextShardNum].colours[2].word = PD_BE32(0x553311f0); } else { - g_Shards[g_NextShardNum].colours[0].word = 0xddaa88f0; - g_Shards[g_NextShardNum].colours[1].word = 0xddaa88f0; - g_Shards[g_NextShardNum].colours[2].word = 0xddaa88f0; + g_Shards[g_NextShardNum].colours[0].word = PD_BE32(0xddaa88f0); + g_Shards[g_NextShardNum].colours[1].word = PD_BE32(0xddaa88f0); + g_Shards[g_NextShardNum].colours[2].word = PD_BE32(0xddaa88f0); } } else { s32 i; diff --git a/src/game/sight.c b/src/game/sight.c index 2785ab160..485bc7a5b 100644 --- a/src/game/sight.c +++ b/src/game/sight.c @@ -949,8 +949,8 @@ Gfx *sightDrawSkedarTriangle(Gfx *gdl, s32 x, s32 y, s32 dir, u32 colour) #define RGBA(r, g, b, a) (((r) & 0xff) << 24 | ((g) & 0xff) << 16 | ((b) & 0xff) << 8 | ((a) & 0xff)) - colours[0].word = colour; - colours[1].word = RGBA((colour >> 24) & 0xff, (colour >> 16) & 0xff, (colour >> 8) & 0xff, 0x08); + colours[0].word = PD_BE32(colour); + colours[1].word = PD_BE32(RGBA((colour >> 24) & 0xff, (colour >> 16) & 0xff, (colour >> 8) & 0xff, 0x08)); vertices[0].colour = 0; vertices[1].colour = 4; @@ -1351,8 +1351,8 @@ Gfx *sightDrawMaian(Gfx *gdl, bool sighton) vertices[7].y = inner[2] * 10; vertices[7].z = -10; - colours[0].word = 0x00ff000f; - colours[1].word = hasprop ? colour : 0x00ff0044; + colours[0].word = PD_BE32(0x00ff000f); + colours[1].word = PD_BE32(hasprop ? colour : 0x00ff0044); vertices[0].colour = 0; vertices[1].colour = 0; diff --git a/src/game/sparks.c b/src/game/sparks.c index 44456db25..258d82b60 100644 --- a/src/game/sparks.c +++ b/src/game/sparks.c @@ -399,17 +399,17 @@ Gfx *sparksRender(Gfx *gdl) colours = gfxAllocateColours(2); if (USINGDEVICE(DEVICE_NIGHTVISION) || USINGDEVICE(DEVICE_IRSCANNER)) { - colours[0].word = type->unk1c; - colours[1].word = type->unk20; + colours[0].word = PD_BE32(type->unk1c); + colours[1].word = PD_BE32(type->unk20); } else if (g_Vars.currentplayer->visionmode == VISIONMODE_XRAY) { v1 = ((u32) (sp13c * 255.0f) << 24) | ((u32) ((1.0f - sp13c) * 255.0f) << 16); // @bug? Second part also reads from type->unk1c - colours[0].word = v1 | (u32) (sp138 * (f32) (type->unk1c & 0xff)) | 0x3f00; - colours[1].word = v1 | (u32) (sp138 * (f32) (type->unk1c & 0xff)) | 0x3f00; + colours[0].word = PD_BE32(v1 | (u32) (sp138 * (f32) (type->unk1c & 0xff)) | 0x3f00); + colours[1].word = PD_BE32(v1 | (u32) (sp138 * (f32) (type->unk1c & 0xff)) | 0x3f00); } else { - colours[0].word = type->unk1c; - colours[1].word = type->unk20; + colours[0].word = PD_BE32(type->unk1c); + colours[1].word = PD_BE32(type->unk20); } if (type->unk12 < type->maxage && type->unk12 < group->age) { diff --git a/src/game/weather.c b/src/game/weather.c index 236c7cc6a..0ddb66a1d 100644 --- a/src/game/weather.c +++ b/src/game/weather.c @@ -1131,8 +1131,8 @@ Gfx *weatherRenderRain(Gfx *gdl, struct weatherdata *weather, s32 arg2) } colours = gfxAllocateColours(2); - colours[0].word = raincol1; - colours[1].word = raincol2; + colours[0].word = PD_BE32(raincol1); + colours[1].word = PD_BE32(raincol2); gSPColor(gdl++, osVirtualToPhysical(colours), 2); @@ -3096,7 +3096,7 @@ Gfx *weatherRenderSnow(Gfx *gdl, struct weatherdata *weather, s32 arg2) for (j = 0; j < numcolours; j++) { u32 alpha = ((numcolours + 1) * 255 - j * 255) / (numcolours + 1); - colours[j].word = (snowcol1 & 0xffffff00) | alpha; + colours[j].word = PD_BE32((snowcol1 & 0xffffff00) | alpha); } gSPColor(gdl++, osVirtualToPhysical(colours), numcolours); diff --git a/src/include/types.h b/src/include/types.h index a63199dfd..0de5f89f9 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -8,6 +8,9 @@ #include "pads.h" #include "tiles.h" #include "gbi.h" +#ifndef PLATFORM_N64 +#include "platform.h" +#endif #define bool s32 #define ubool u32