PublicMirrors/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship.git synced 2025-02-02 16:23:57 +03:00
Code Issues Actions 2 Packages Projects Releases 1 Wiki Activity

Fixed cloud planet

Browse Source
This commit is contained in:
KiritoDv 2024-11-17 23:21:50 -06:00
parent b01825576c
commit 26d7812f41
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/yaml/jp/rev0/ast_map.yaml
View File

@ -366,8 +366,8 @@ D_MAP_6047A68:
aMapVenomCloudDL: aMapVenomCloudDL:
{ type: GFX, offset: 0x6047E70, symbol: aMapVenomCloudDL } { type: GFX, offset: 0x6047E70, symbol: aMapVenomCloudDL }
aMapVenomCloud1Tex: aMapVenomCloudEffectTex:
{ type: TEXTURE, format: IA8, offset: 0x06047F80, width: 64, height: 32, ctype: u8, symbol: aMapVenomCloud1Tex } { type: TEXTURE, format: IA8, offset: 0x06047F80, width: 64, height: 32, ctype: u8, symbol: aMapVenomCloudEffectTex }
aMapVenomCloud2Tex: aMapVenomCloud2Tex:
{ type: TEXTURE, format: IA8, offset: 0x06048780, width: 64, height: 32, ctype: u8, symbol: aMapVenomCloud2Tex } { type: TEXTURE, format: IA8, offset: 0x06048780, width: 64, height: 32, ctype: u8, symbol: aMapVenomCloud2Tex }

7
assets/yaml/us/rev1/ast_map.yaml
View File

@ -366,11 +366,8 @@ D_MAP_6047A68:
aMapVenomCloudDL: aMapVenomCloudDL:
{ type: GFX, offset: 0x6047E70, symbol: aMapVenomCloudDL } { type: GFX, offset: 0x6047E70, symbol: aMapVenomCloudDL }
aMapVenomCloud1Tex: aMapVenomCloudEffectTex:
{ type: TEXTURE, format: IA8, offset: 0x06047F80, width: 64, height: 32, ctype: u8, symbol: aMapVenomCloud1Tex } { type: TEXTURE, format: IA8, offset: 0x06047F80, width: 64, height: 64, ctype: u8, symbol: aMapVenomCloudEffectTex }
aMapVenomCloud2Tex:
{ type: TEXTURE, format: IA8, offset: 0x06048780, width: 64, height: 32, ctype: u8, symbol: aMapVenomCloud2Tex }
D_MAP_6048F80: D_MAP_6048F80:
{ type: TEXTURE, format: IA8, offset: 0x06048F80, width: 64, height: 64, ctype: u8, symbol: D_MAP_6048F80 } { type: TEXTURE, format: IA8, offset: 0x06048F80, width: 64, height: 64, ctype: u8, symbol: D_MAP_6048F80 }

5
src/engine/fox_std_lib.c
View File

@ -83,11 +83,6 @@ void Lib_Texture_Mottle(u16* dst, u16* src, u8 mode) {
u8* src8; u8* src8;
s32 offset; s32 offset;
// LTODO: Causes corruption in the map, there's probably a badly extracted texture
if ((gGameState == GSTATE_MAP)) {
return;
}
dst = LOAD_ASSET(dst); dst = LOAD_ASSET(dst);
src = LOAD_ASSET(src); src = LOAD_ASSET(src);

10
src/overlays/ovl_menu/fox_map.c
View File

@ -1989,7 +1989,7 @@ void Map_Draw(void) {
D_menu_801CEEC4 = 0; D_menu_801CEEC4 = 0;
} }
Lib_Texture_Mottle((u16*) aMapVenomCloud1Tex, (u16*) D_MAP_6048F80, 5); Lib_Texture_Mottle(aMapVenomCloudEffectTex, D_MAP_6048F80, 5);
} }
s32 Map_801A05B4(void) { s32 Map_801A05B4(void) {
@ -4783,7 +4783,13 @@ void Map_VenomCloud_Draw(f32* zAngle, f32 next, f32 scale) {
Matrix_SetGfxMtx(&gMasterDisp); Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, aMapVenomCloudDL); // @port This should be aMapVenomCloudDL but torch is stupid sometimes
u8* buffer = SEGMENTED_TO_VIRTUAL(aMapVenomCloudEffectTex);
gSPVertex(gMasterDisp++, ast_map_seg6_vtx_47F00, 8, 0);
gDPLoadTextureBlock(gMasterDisp++, buffer, G_IM_FMT_IA, G_IM_SIZ_8b, 64, 33, 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);
gSP2Triangles(gMasterDisp++, 1, 2, 3, 0, 1, 3, 0, 0);
gDPLoadTextureBlock(gMasterDisp++, buffer + 64 * 32, G_IM_FMT_IA, G_IM_SIZ_8b, 64, 32, 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);
gSP2Triangles(gMasterDisp++, 5, 6, 7, 0, 5, 7, 4, 0);
Matrix_Pop(&gGfxMatrix); Matrix_Pop(&gGfxMatrix);