Game-Decompilation/kirby64
1
0
Fork 0
mirror of https://github.com/farisawan-2000/kirby64.git synced 2024-11-27 07:00:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed most compiler warnings in geo blocks

Browse Source
This commit is contained in:
Mr-Wiseguy 2021-01-16 22:25:14 -05:00
parent 24c7ef061a
commit 9a565c5894
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/geo_block_header.h
View File

@ -30,7 +30,7 @@ struct Layout {
};
struct GeoBlockHeader {
struct Layout *layouts;
void *entriesOrLayoutsOrDL;
struct TextureScroll ***texScrollHeader;
u32 renderMode;
Gfx **imgRefs;

4
tools/scut/GeoFromBin.py
View File

@ -655,7 +655,7 @@ def WriteLayout(file,L,env,GH):
file.write(" /*0x%02X*/ NULL,\n"%h[1])
else:
if h[0][1][0] in symbols:
file.write(" /*0x%02X*/ %s,\n"%(h[1],symbols[h[0][1][0]]))
file.write(" /*0x%02X*/ (struct EntryPoint *) %s,\n"%(h[1],symbols[h[0][1][0]]))
else:
file.write(" /*0x%02X*/ (struct EntryPoint *) 0x%08X,\n"%(h[1],h[0][1][0]))
elif h[1]<8:
@ -857,6 +857,8 @@ def WriteTS(file,GH,TS,THS,H2,tPad,tUnk):
else:
file.write(" /*0x%02X*/ %s,\n" % (k, symbols[v[0]]))
# file.write(" /*0x%02X*/ "%k+"(u32 *) 0x%08X"%v + ",\n")
elif j == 15:
file.write(" /*0x%02X*/ "%k+"(u32 *)0x%X"%v + ",\n")
elif type[0]==">4B":
file.write(" /*0x%02X*/ {"%k+str(v)[1:-1] + "},\n")
elif j+1==len(t[0]):