falso
/
mk64
mirror of https://github.com/n64decomp/mk64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor rename test

This commit is contained in:
coco875 2025-01-20 14:07:53 +01:00
parent 4d3a8d358c
commit ddbd535af7
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
assets.json
View File

@ -191,8 +191,8 @@
"bin/gTextureMenuData.rgba16.tkmk00": {"meta":{"size":"0x200"}, "offsets": {"us":["0x8090C0", "0x0"]}},
"bin/gTextureMenuOK.rgba16.tkmk00": {"meta":{"size":"0x200"}, "offsets": {"us":["0x8092C0", "0x0"]}},
"bin/gTextureBackgroundBlueSky.rgba16.tkmk00": {"meta":{"size":"0xCE00"}, "offsets": {"us":["0x8094C0", "0x0"]}},
"bin/gTextureBackgroundSunset.rgba16.tkmk00": {"meta":{"size":"0x9400"}, "offsets": {"us":["0x8162C0", "0x0"]}},
"bin/background_blue_sky.rgba16.tkmk00": {"meta":{"size":"0xCE00"}, "offsets": {"us":["0x8094C0", "0x0"]}},
"bin/background_sunset.rgba16.tkmk00": {"meta":{"size":"0x9400"}, "offsets": {"us":["0x8162C0", "0x0"]}},
"bin/gTextureGreenGoldStripe.rgba16.tkmk00": {"meta":{"size":"0xC00"}, "offsets": {"us":["0x81F6C0", "0x0"]}},
"bin/gTextureGoldStripe.rgba16.tkmk00": {"meta":{"size":"0x700"}, "offsets": {"us":["0x8202C0", "0x0"]}},
@ -1057,8 +1057,8 @@
"textures/gTextureMenuData.rgba16.png": {"meta":{"dims":[64,18], "alpha":"0xBE"}, "offsets": {"us":["0x8090C0", "0x0"]}},
"textures/gTextureMenuOK.rgba16.png": {"meta":{"dims":[31,19], "alpha":"0xBE"}, "offsets": {"us":["0x8092C0", "0x0"]}},
"textures/gTextureBackgroundBlueSky.rgba16.png": {"meta":{"dims":[320,240], "alpha":"0x01"}, "offsets": {"us":["0x8094C0", "0x0"]}},
"textures/gTextureBackgroundSunset.rgba16.png": {"meta":{"dims":[320,240], "alpha":"0x01"}, "offsets": {"us":["0x8162C0", "0x0"]}},
"textures/background_blue_sky.rgba16.png": {"meta":{"dims":[320,240], "alpha":"0x01"}, "offsets": {"us":["0x8094C0", "0x0"]}},
"textures/background_sunset.rgba16.png": {"meta":{"dims":[320,240], "alpha":"0x01"}, "offsets": {"us":["0x8162C0", "0x0"]}},
"textures/gTextureGreenGoldStripe.rgba16.png": {"meta":{"dims":[256,29], "alpha":"0x01"}, "offsets": {"us":["0x81F6C0", "0x0"]}},
"textures/gTextureGoldStripe.rgba16.png": {"meta":{"dims":[256,15], "alpha":"0x01"}, "offsets": {"us":["0x8202C0", "0x0"]}},

12
data/texture_tkmk00.s
View File

@ -229,13 +229,13 @@ glabel gTextureMenuOK
.incbin "bin/gTextureMenuOK.rgba16.tkmk00"
glabel gTextureMenuOK_end
glabel gTextureBackgroundBlueSky
.incbin "bin/gTextureBackgroundBlueSky.rgba16.tkmk00"
glabel gTextureBackgroundBlueSky_end
glabel background_blue_sky
.incbin "bin/background_blue_sky.rgba16.tkmk00"
glabel background_blue_sky_end
glabel gTextureBackgroundSunset
.incbin "bin/gTextureBackgroundSunset.rgba16.tkmk00"
glabel gTextureBackgroundSunset_end
glabel background_sunset
.incbin "bin/background_sunset.rgba16.tkmk00"
glabel background_sunset_end
glabel gTextureGreenGoldStripe
.incbin "bin/gTextureGreenGoldStripe.rgba16.tkmk00"

4
src/code_80057C60.c
View File

@ -2835,14 +2835,14 @@ s32 set_particle_color(UnkPlayerStruct258* arg0, s32 color, s16 alpha) {
arg0->alpha = alpha;
}
s32 func_8005D82C(UnkPlayerStruct258* arg0, s32 arg1, s16 arg2) {
s32 func_8005D82C(UnkPlayerStruct258* arg0, s32 arg1, s16 alpha) {
s32 temp_v0;
temp_v0 = random_int(48);
arg0->red = (u8) ((u8) (arg1 >> 16) - temp_v0);
arg0->green = (u8) ((u8) (arg1 >> 8) - temp_v0);
arg0->blue = (u8) ((u8) arg1 - temp_v0);
arg0->alpha = arg2;
arg0->alpha = alpha;
}
void func_8005D898(Player* player, s16 arg1, UNUSED s32 arg2, UNUSED s8 arg3, UNUSED s8 arg4) {

4
src/data/textures.c
View File

@ -4151,7 +4151,7 @@ MenuTexture D_02004584[1] = {
*
*/
MenuTexture seg2_blue_sky_background_texture[2] = {
{ 0, gTextureBackgroundBlueSky, 320, 240, 0, 0, 0xcd60, 0 },
{ 0, background_blue_sky, 320, 240, 0, 0, 0xcd60, 0 },
{ 0, NULL, 0, 0, 0, 0, 0, 0 },
};
@ -4160,7 +4160,7 @@ MenuTexture seg2_blue_sky_background_texture[2] = {
*
*/
MenuTexture seg2_sunset_background_texture[2] = {
{ 0, gTextureBackgroundSunset, 320, 240, 0, 0, 0x93c4, 0 },
{ 0, background_sunset, 320, 240, 0, 0, 0x93c4, 0 },
{ 0, NULL, 0, 0, 0, 0, 0, 0 },
};

4
src/textures.h
View File

@ -1089,8 +1089,8 @@ extern u64 gTexture7FA0C4[];
extern u64 gTexture7FA194[];
extern u64 gTexture7FA264[];
extern u64 gTexture7FA334[];
extern u64 gTextureBackgroundBlueSky[];
extern u64 gTextureBackgroundSunset[];
extern u64 background_blue_sky[];
extern u64 background_sunset[];
extern u64 gTextureBowserFace00[];
extern u64 gTextureBowserFace01[];
extern u64 gTextureBowserFace02[];