mirror/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship synced 2026-07-07 06:14:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Split headers as much as possible. add unique tags to segment 6 addresses (#167)

Browse Source 
* split up

* format

* torch
This commit is contained in:
petrie911
2024-03-14 16:31:03 -05:00
committed by GitHub
parent 75bbe0ba6a
commit 11c6a8c7dc
62 changed files with 1745 additions and 2186 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/yaml/us/ast_7_ti_1.yaml
+170 -170
View File
@@ -12,313 +12,313 @@
D_AST_7_TI_1_7000000:
{ type: TEXTURE, ctype: u8, format: IA8, width: 96, height: 28, offset: 0x07000000, symbol: D_AST_7_TI_1_7000000, tlut: 0x07001108 }
D_7000A80:
{ type: GFX, offset: 0x7000A80, symbol: D_7000A80 }
D_TI1_7000A80:
{ type: GFX, offset: 0x7000A80, symbol: D_TI1_7000A80 }
D_7000D08:
{ type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x07000D08, symbol: D_7000D08, tlut: 0x07001108 }
D_TI1_7000D08:
{ type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x07000D08, symbol: D_TI1_7000D08, tlut: 0x07001108 }
D_7001108:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 176, offset: 0x07001108, symbol: D_7001108 }
D_TI1_7001108:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 176, offset: 0x07001108, symbol: D_TI1_7001108 }
D_7001268:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x7001268, symbol: D_7001268, pad: 8 }
D_TI1_7001268:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x7001268, symbol: D_TI1_7001268, pad: 8 }
D_7002270:
{ type: GFX, offset: 0x7002270, symbol: D_7002270 }
D_TI1_7002270:
{ type: GFX, offset: 0x7002270, symbol: D_TI1_7002270 }
D_7002490:
{ type: GFX, offset: 0x7002490, symbol: D_7002490 }
D_TI1_7002490:
{ type: GFX, offset: 0x7002490, symbol: D_TI1_7002490 }
D_7002730:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07002730, symbol: D_7002730 }
D_TI1_7002730:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07002730, symbol: D_TI1_7002730 }
D_7002930:
{ type: GFX, offset: 0x7002930, symbol: D_7002930 }
D_TI1_7002930:
{ type: GFX, offset: 0x7002930, symbol: D_TI1_7002930 }
D_7002C88:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x7002C88, symbol: D_7002C88 }
D_TI1_7002C88:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x7002C88, symbol: D_TI1_7002C88 }
D_7003488:
{ type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x07003488, symbol: D_7003488, tlut: 0x07003888 }
D_TI1_7003488:
{ type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x07003488, symbol: D_TI1_7003488, tlut: 0x07003888 }
D_7003888:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 256, offset: 0x07003888, symbol: D_7003888, pad: 8 }
D_TI1_7003888:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 256, offset: 0x07003888, symbol: D_TI1_7003888, pad: 8 }
D_7003A90:
{ type: GFX, offset: 0x7003A90, symbol: D_7003A90 }
D_TI1_7003A90:
{ type: GFX, offset: 0x7003A90, symbol: D_TI1_7003A90 }
D_7003C50:
{ type: GFX, offset: 0x7003C50, symbol: D_7003C50 }
D_TI1_7003C50:
{ type: GFX, offset: 0x7003C50, symbol: D_TI1_7003C50 }
D_7003E30:
{ type: GFX, offset: 0x7003E30, symbol: D_7003E30 }
D_TI1_7003E30:
{ type: GFX, offset: 0x7003E30, symbol: D_TI1_7003E30 }
PAD_7003FB8:
{ type: BLOB, size: 8, offset: 0x7003FB8, symbol: PAD_7003FB8 }
D_7003FC0:
{ type: GFX, offset: 0x7003FC0, symbol: D_7003FC0 }
D_TI1_7003FC0:
{ type: GFX, offset: 0x7003FC0, symbol: D_TI1_7003FC0 }
D_7004170:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07004170, symbol: D_7004170 }
D_TI1_7004170:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07004170, symbol: D_TI1_7004170 }
D_7004370:
{ type: GFX, offset: 0x7004370, symbol: D_7004370 }
D_TI1_7004370:
{ type: GFX, offset: 0x7004370, symbol: D_TI1_7004370 }
D_7004560:
{ type: GFX, offset: 0x7004560, symbol: D_7004560 }
D_TI1_7004560:
{ type: GFX, offset: 0x7004560, symbol: D_TI1_7004560 }
PAD_7004778:
{ type: BLOB, size: 8, offset: 0x7004778, symbol: PAD_7004778 }
D_7004780:
{ type: GFX, offset: 0x7004780, symbol: D_7004780 }
D_TI1_7004780:
{ type: GFX, offset: 0x7004780, symbol: D_TI1_7004780 }
D_70049A0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x070049A0, symbol: D_70049A0 }
D_TI1_70049A0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x070049A0, symbol: D_TI1_70049A0 }
D_7004BA0:
{ type: GFX, offset: 0x7004BA0, symbol: D_7004BA0 }
D_TI1_7004BA0:
{ type: GFX, offset: 0x7004BA0, symbol: D_TI1_7004BA0 }
D_7004E78:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07004E78, symbol: D_7004E78 }
D_TI1_7004E78:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07004E78, symbol: D_TI1_7004E78 }
D_7005078:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07005078, symbol: D_7005078, pad: 8 }
D_TI1_7005078:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07005078, symbol: D_TI1_7005078, pad: 8 }
D_7005280:
{ type: GFX, offset: 0x7005280, symbol: D_7005280 }
D_TI1_7005280:
{ type: GFX, offset: 0x7005280, symbol: D_TI1_7005280 }
PAD_7005418:
{ type: BLOB, size: 8, offset: 0x7005418, symbol: PAD_7005418 }
D_7005420:
{ type: GFX, offset: 0x7005420, symbol: D_7005420 }
D_TI1_7005420:
{ type: GFX, offset: 0x7005420, symbol: D_TI1_7005420 }
PAD_7005648:
{ type: BLOB, size: 8, offset: 0x7005648, symbol: PAD_7005648 }
D_70067C4:
{ type: SF64:ANIM, offset: 0x70067C4, symbol: D_70067C4 }
D_TI1_70067C4:
{ type: SF64:ANIM, offset: 0x70067C4, symbol: D_TI1_70067C4 }
D_7006990:
{ type: SF64:SKELETON, offset: 0x7006990, symbol: D_7006990}
D_TI1_7006990:
{ type: SF64:SKELETON, offset: 0x7006990, symbol: D_TI1_7006990}
PAD_70069CC:
{ type: BLOB, size: 4, offset: 0x70069CC, symbol: PAD_70069CC }
D_7006F74:
{ type: SF64:ANIM, offset: 0x7006F74, symbol: D_7006F74 }
D_TI1_7006F74:
{ type: SF64:ANIM, offset: 0x7006F74, symbol: D_TI1_7006F74 }
D_7007130:
{ type: SF64:ANIM, offset: 0x7007130, symbol: D_7007130 }
D_TI1_7007130:
{ type: SF64:ANIM, offset: 0x7007130, symbol: D_TI1_7007130 }
PAD_700713C:
{ type: BLOB, size: 4, offset: 0x700713C, symbol: PAD_700713C }
D_7007234:
{ type: SF64:ANIM, offset: 0x7007234, symbol: D_7007234 }
D_TI1_7007234:
{ type: SF64:ANIM, offset: 0x7007234, symbol: D_TI1_7007234 }
D_700733C:
{ type: SF64:ANIM, offset: 0x700733C, symbol: D_700733C }
D_TI1_700733C:
{ type: SF64:ANIM, offset: 0x700733C, symbol: D_TI1_700733C }
PAD_7007348:
{ type: BLOB, size: 8, offset: 0x7007348, symbol: PAD_7007348 }
D_7007350:
{ type: GFX, offset: 0x7007350, symbol: D_7007350 }
D_TI1_7007350:
{ type: GFX, offset: 0x7007350, symbol: D_TI1_7007350 }
D_7007AB0:
{ type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x7007AB0, symbol: D_7007AB0, tlut: 0x07007EB0 }
D_TI1_7007AB0:
{ type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x7007AB0, symbol: D_TI1_7007AB0, tlut: 0x07007EB0 }
D_7007EB0:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 240, offset: 0x07007EB0, symbol: D_7007EB0 }
D_TI1_7007EB0:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 240, offset: 0x07007EB0, symbol: D_TI1_7007EB0 }
D_7008090:
{ type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x07008090, symbol: D_7008090, tlut: 0x07008490 }
D_TI1_7008090:
{ type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x07008090, symbol: D_TI1_7008090, tlut: 0x07008490 }
D_7008490:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 248, offset: 0x07008490, symbol: D_7008490 }
D_TI1_7008490:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 248, offset: 0x07008490, symbol: D_TI1_7008490 }
D_7008680:
{ type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x07008680, symbol: D_7008680, tlut: 0x07008490 }
D_TI1_7008680:
{ type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x07008680, symbol: D_TI1_7008680, tlut: 0x07008490 }
D_7008780:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 216, offset: 0x07008780, symbol: D_7008780 }
D_TI1_7008780:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 216, offset: 0x07008780, symbol: D_TI1_7008780 }
D_7008930:
{ type: GFX, offset: 0x7008930, symbol: D_7008930 }
D_TI1_7008930:
{ type: GFX, offset: 0x7008930, symbol: D_TI1_7008930 }
D_7008D10:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x7008D10, symbol: D_7008D10 }
D_TI1_7008D10:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x7008D10, symbol: D_TI1_7008D10 }
D_7008F10:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x7008F10, symbol: D_7008F10 }
D_TI1_7008F10:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x7008F10, symbol: D_TI1_7008F10 }
D_7009110:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07009110, symbol: D_7009110 }
D_TI1_7009110:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07009110, symbol: D_TI1_7009110 }
D_7009310:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07009310, symbol: D_7009310 }
D_TI1_7009310:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07009310, symbol: D_TI1_7009310 }
D_7009510:
{ type: GFX, offset: 0x7009510, symbol: D_7009510 }
D_TI1_7009510:
{ type: GFX, offset: 0x7009510, symbol: D_TI1_7009510 }
D_70096D8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x070096D8, symbol: D_70096D8, pad: 8 }
D_TI1_70096D8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x070096D8, symbol: D_TI1_70096D8, pad: 8 }
D_70098E0:
{ type: GFX, offset: 0x70098E0, symbol: D_70098E0 }
D_TI1_70098E0:
{ type: GFX, offset: 0x70098E0, symbol: D_TI1_70098E0 }
D_7009B58:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07009B58, symbol: D_7009B58, pad: 8 }
D_TI1_7009B58:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07009B58, symbol: D_TI1_7009B58, pad: 8 }
D_7009D60:
{ type: GFX, offset: 0x7009D60, symbol: D_7009D60 }
D_TI1_7009D60:
{ type: GFX, offset: 0x7009D60, symbol: D_TI1_7009D60 }
D_700A190:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0700A190, symbol: D_700A190 }
D_TI1_700A190:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0700A190, symbol: D_TI1_700A190 }
D_700A990:
{ type: GFX, offset: 0x700A990, symbol: D_700A990 }
D_TI1_700A990:
{ type: GFX, offset: 0x700A990, symbol: D_TI1_700A990 }
D_700AAD8:
{ type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x700AAD8, symbol: D_700AAD8, tlut: 0x700AB58 }
D_TI1_700AAD8:
{ type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x700AAD8, symbol: D_TI1_700AAD8, tlut: 0x700AB58 }
D_700AB58:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0x700AB58, symbol: D_700AB58, pad: 8 }
D_TI1_700AB58:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0x700AB58, symbol: D_TI1_700AB58, pad: 8 }
D_700AB70:
{ type: GFX, offset: 0x700AB70, symbol: D_700AB70 }
D_TI1_700AB70:
{ type: GFX, offset: 0x700AB70, symbol: D_TI1_700AB70 }
D_700AEA8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x0700AEA8, symbol: D_700AEA8, pad: 8 }
D_TI1_700AEA8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x0700AEA8, symbol: D_TI1_700AEA8, pad: 8 }
D_700AF30:
{ type: GFX, offset: 0x700AF30, symbol: D_700AF30 }
D_TI1_700AF30:
{ type: GFX, offset: 0x700AF30, symbol: D_TI1_700AF30 }
D_700B5B8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0700B5B8, symbol: D_700B5B8 }
D_TI1_700B5B8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0700B5B8, symbol: D_TI1_700B5B8 }
D_700B7B8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0700B7B8, symbol: D_700B7B8, pad: 8 }
D_TI1_700B7B8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0700B7B8, symbol: D_TI1_700B7B8, pad: 8 }
D_700B9C0:
{ type: GFX, offset: 0x700B9C0, symbol: D_700B9C0 }
D_TI1_700B9C0:
{ type: GFX, offset: 0x700B9C0, symbol: D_TI1_700B9C0 }
D_700BB10:
{ type: GFX, offset: 0x700BB10, symbol: D_700BB10 }
D_TI1_700BB10:
{ type: GFX, offset: 0x700BB10, symbol: D_TI1_700BB10 }
PAD_700BDF8:
{ type: BLOB, size: 8, offset: 0x700BDF8, symbol: PAD_700BDF8 }
D_700BE00:
{ type: GFX, offset: 0x700BE00, symbol: D_700BE00 }
D_TI1_700BE00:
{ type: GFX, offset: 0x700BE00, symbol: D_TI1_700BE00 }
D_700BFB0:
{ type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x0700BFB0, symbol: D_700BFB0, tlut: 0x0700C3B0 }
D_TI1_700BFB0:
{ type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x0700BFB0, symbol: D_TI1_700BFB0, tlut: 0x0700C3B0 }
D_700C3B0:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 128, offset: 0x0700C3B0, symbol: D_700C3B0 }
D_TI1_700C3B0:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 128, offset: 0x0700C3B0, symbol: D_TI1_700C3B0 }
D_700C4B0:
{ type: GFX, offset: 0x700C4B0, symbol: D_700C4B0 }
D_TI1_700C4B0:
{ type: GFX, offset: 0x700C4B0, symbol: D_TI1_700C4B0 }
PAD_700C888:
{ type: BLOB, size: 8, offset: 0x700C888, symbol: PAD_700C888 }
D_700C8D8:
{ type: SF64:ANIM, offset: 0x700C8D8, symbol: D_700C8D8 }
D_TI1_700C8D8:
{ type: SF64:ANIM, offset: 0x700C8D8, symbol: D_TI1_700C8D8 }
D_700C964:
{ type: SF64:SKELETON, offset: 0x700C964, symbol: D_700C964 }
D_TI1_700C964:
{ type: SF64:SKELETON, offset: 0x700C964, symbol: D_TI1_700C964 }
PAD_700C978:
{ type: BLOB, size: 8, offset: 0x700C978, symbol: PAD_700C978 }
D_700C980:
{ type: GFX, offset: 0x700C980, symbol: D_700C980 }
D_TI1_700C980:
{ type: GFX, offset: 0x700C980, symbol: D_TI1_700C980 }
PAD_700CA58:
{ type: BLOB, size: 8, offset: 0x700CA58, symbol: PAD_700CA58 }
D_700CAF4:
{ type: SF64:ANIM, offset: 0x700CAF4, symbol: D_700CAF4}
D_TI1_700CAF4:
{ type: SF64:ANIM, offset: 0x700CAF4, symbol: D_TI1_700CAF4}
D_700CB60:
{type: SF64:SKELETON, offset: 0x700CB60, symbol: D_700CB60}
D_TI1_700CB60:
{type: SF64:SKELETON, offset: 0x700CB60, symbol: D_TI1_700CB60}
D_700D534:
{ type: SF64:ANIM, offset: 0x700D534, symbol: D_700D534 }
D_TI1_700D534:
{ type: SF64:ANIM, offset: 0x700D534, symbol: D_TI1_700D534 }
D_700D700:
{type: SF64:SKELETON, offset: 0x700D700, symbol: D_700D700}
D_TI1_700D700:
{type: SF64:SKELETON, offset: 0x700D700, symbol: D_TI1_700D700}
D_700D740:
{ type: GFX, offset: 0x700D740, symbol: D_700D740 }
D_TI1_700D740:
{ type: GFX, offset: 0x700D740, symbol: D_TI1_700D740 }
PAD_700D878:
{ type: BLOB, size: 0x8, offset: 0x700D878, symbol: PAD_700D878 }
D_700D880:
{ type: GFX, offset: 0x700D880, symbol: D_700D880 }
D_TI1_700D880:
{ type: GFX, offset: 0x700D880, symbol: D_TI1_700D880 }
PAD_700D9A8:
{ type: BLOB, size: 0x8, offset: 0x700D9A8, symbol: PAD_700D9A8 }
D_700D9B0:
{ type: GFX, offset: 0x700D9B0, symbol: D_700D9B0 }
D_TI1_700D9B0:
{ type: GFX, offset: 0x700D9B0, symbol: D_TI1_700D9B0 }
PAD_700DAC8:
{ type: BLOB, size: 0x8, offset: 0x700DAC8, symbol: PAD_700DAC8 }
D_700DAD0:
{ type: GFX, offset: 0x700DAD0, symbol: D_700DAD0 }
D_TI1_700DAD0:
{ type: GFX, offset: 0x700DAD0, symbol: D_TI1_700DAD0 }
PAD_700DBA8:
{ type: BLOB, size: 0x8, offset: 0x700DBA8, symbol: PAD_700DBA8 }
D_700DBB0:
{ type: GFX, offset: 0x700DBB0, symbol: D_700DBB0 }
D_TI1_700DBB0:
{ type: GFX, offset: 0x700DBB0, symbol: D_TI1_700DBB0 }
D_700DC50:
{ type: GFX, offset: 0x700DC50, symbol: D_700DC50 }
D_TI1_700DC50:
{ type: GFX, offset: 0x700DC50, symbol: D_TI1_700DC50 }
D_700DD68:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x0700DD68, symbol: D_700DD68 }
D_TI1_700DD68:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x0700DD68, symbol: D_TI1_700DD68 }
PAD_700DDE8:
{ type: BLOB, size: 0x8, offset: 0x700DDE8, symbol: PAD_700DDE8 }
D_700DDF0:
{ type: GFX, offset: 0x700DDF0, symbol: D_700DDF0 }
D_TI1_700DDF0:
{ type: GFX, offset: 0x700DDF0, symbol: D_TI1_700DDF0 }
PAD_700DEC8:
{ type: BLOB, size: 0x8, offset: 0x700DEC8, symbol: PAD_700DEC8 }
D_700DED0:
{ type: GFX, offset: 0x700DED0, symbol: D_700DED0 }
D_TI1_700DED0:
{ type: GFX, offset: 0x700DED0, symbol: D_TI1_700DED0 }
D_700DF70:
{ type: GFX, offset: 0x700DF70, symbol: D_700DF70 }
D_TI1_700DF70:
{ type: GFX, offset: 0x700DF70, symbol: D_TI1_700DF70 }
PAD_700E028:
{ type: BLOB, size: 0x8, offset: 0x700E028, symbol: PAD_700E028 }
D_700E030:
{ type: GFX, offset: 0x700E030, symbol: D_700E030 }
D_TI1_700E030:
{ type: GFX, offset: 0x700E030, symbol: D_TI1_700E030 }
D_700E1E8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0700E1E8, symbol: D_700E1E8, pad: 8 }
D_TI1_700E1E8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0700E1E8, symbol: D_TI1_700E1E8, pad: 8 }
D_700E3F0:
{ type: GFX, offset: 0x700E3F0, symbol: D_700E3F0 }
D_TI1_700E3F0:
{ type: GFX, offset: 0x700E3F0, symbol: D_TI1_700E3F0 }
D_700E858:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0700E858, symbol: D_700E858, pad: 8 }
D_TI1_700E858:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0700E858, symbol: D_TI1_700E858, pad: 8 }
D_700EA60:
{ type: GFX, offset: 0x700EA60, symbol: D_700EA60 }
D_TI1_700EA60:
{ type: GFX, offset: 0x700EA60, symbol: D_TI1_700EA60 }
# size = 0xEDB0
assets/yaml/us/ast_aquas.yaml
+374 -374
View File
File diff suppressed because it is too large Load Diff
assets/yaml/us/ast_arwing.yaml
+17 -14
View File
@@ -130,10 +130,10 @@ D_3013FE8:
{ type: TEXTURE, format: RGBA16, offset: 0x3013FE8, width: 32, height: 32, ctype: u16, symbol: D_3013FE8 }
D_30147E8:
{ type: TEXTURE, format: RGBA16, offset: 0x30147E8, width: 16, height: 32, ctype: u16, symbol: D_30147E8 }
{ type: TEXTURE, format: RGBA16, offset: 0x30147E8, width: 16, height: 32, ctype: u16, symbol: D_30147E8, pad: 8 }
D_3014BE8:
{ type: GFX, offset: 0x3014BE8, symbol: D_3014BE8 }
D_3014BF0:
{ type: GFX, offset: 0x3014BF0, symbol: D_3014BF0 }
D_3014F20:
{ type: TEXTURE, format: RGBA16, offset: 0x3014F20, width: 16, height: 16, ctype: u16, symbol: D_3014F20 }
@@ -183,32 +183,35 @@ D_3016610:
PAD_301665C:
{ type: BLOB, offset: 0x301665C, size: 0x4, symbol: PAD_301665C }
D_3016B28:
{ type: GFX, offset: 0x3016B28, symbol: D_3016B28 }
PAD_3016B28:
{ type: BLOB, offset: 0x3016B28, size: 0x8, symbol: PAD_3016B28 }
D_3016B30:
{ type: GFX, offset: 0x3016B30, symbol: D_3016B30 }
D_3016BB8:
{ type: TEXTURE, format: IA8, offset: 0x3016BB8, width: 16, height: 16, ctype: u8, symbol: D_3016BB8 }
{ type: TEXTURE, format: IA8, offset: 0x3016BB8, width: 16, height: 16, ctype: u8, symbol: D_3016BB8, pad: 8 }
D_3016CB8:
{ type: GFX, offset: 0x3016CB8, symbol: D_3016CB8 }
D_3016CC0:
{ type: GFX, offset: 0x3016CC0, symbol: D_3016CC0 }
D_30182C8:
{ type: TEXTURE, format: RGBA16, offset: 0x30182C8, width: 8, height: 8, ctype: u16, symbol: D_30182C8 }
D_3018348:
{ type: TEXTURE, format: RGBA16, offset: 0x3018348, width: 8, height: 8, ctype: u16, symbol: D_3018348 }
{ type: TEXTURE, format: RGBA16, offset: 0x3018348, width: 8, height: 8, ctype: u16, symbol: D_3018348, pad: 8 }
D_30183C8:
{ type: GFX, offset: 0x30183C8, symbol: D_30183C8 }
D_30183D0:
{ type: GFX, offset: 0x30183D0, symbol: D_30183D0 }
D_30184D8:
{ type: TEXTURE, format: RGBA16, offset: 0x30184D8, width: 32, height: 32, ctype: u16, symbol: D_30184D8 }
D_3018CD8:
{ type: TEXTURE, format: RGBA16, offset: 0x3018CD8, width: 64, height: 16, ctype: u16, symbol: D_3018CD8 }
{ type: TEXTURE, format: RGBA16, offset: 0x3018CD8, width: 64, height: 16, ctype: u16, symbol: D_3018CD8, pad: 8 }
D_30194D8:
{ type: GFX, offset: 0x30194D8, symbol: D_30194D8 }
D_30194E0:
{ type: GFX, offset: 0x30194E0, symbol: D_30194E0 }
D_30195E8:
{ type: TEXTURE, format: RGBA16, offset: 0x30195E8, width: 32, height: 32, ctype: u16, symbol: D_30195E8 }
assets/yaml/us/ast_font.yaml
+1 -1
View File
@@ -79,7 +79,7 @@ D_50022F0:
# PLISHED
D_5002DC0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 136, height: 23, offset: 0x5002DC0, symbol: D_5002D88, pad: 8 }
{ type: TEXTURE, ctype: u8, format: IA8, width: 136, height: 23, offset: 0x5002DC0, symbol: D_5002DC0, pad: 8 }
# MISSION
D_5003A00:
assets/yaml/us/ast_font_3d.yaml
+2 -2
View File
@@ -120,8 +120,8 @@ D_9005CA0:
PAD_90062C8:
{ type: BLOB, size: 8, offset: 0x90062C8, symbol: PAD_90062C8 }
D_90062C8:
{ type: GFX, offset: 0x90062D0, symbol: D_90062C8 }
D_90062D0:
{ type: GFX, offset: 0x90062D0, symbol: D_90062D0 }
D_9006500:
{ type: GFX, offset: 0x9006500, symbol: D_9006500 }
assets/yaml/us/ast_sector_x.yaml
+184 -184
View File
@@ -10,202 +10,202 @@
- '#include "structs.h"'
- '#include "sf64level.h"'
D_AST_SECTOR_X_6000000:
{ type: TEXTURE, ctype: u8, format: IA8, width: 176, height: 12, offset: 0x6000000, symbol: D_AST_SECTOR_X_6000000 }
D_SX_6000000:
{ type: TEXTURE, ctype: u8, format: IA8, width: 176, height: 12, offset: 0x6000000, symbol: D_SX_6000000 }
D_6000840:
{ type: GFX, offset: 0x6000840, symbol: D_6000840 }
D_SX_6000840:
{ type: GFX, offset: 0x6000840, symbol: D_SX_6000840 }
# Flying mine
D_60008C0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x60008C0, symbol: D_60008C0 }
D_SX_60008C0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x60008C0, symbol: D_SX_60008C0 }
D_60010C0:
{ type: GFX, offset: 0x60010C0, symbol: D_60010C0 }
D_SX_60010C0:
{ type: GFX, offset: 0x60010C0, symbol: D_SX_60010C0 }
# Texture of Planet Titania, seen when Slippy gets thrown by Spyborg
D_6001150:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6001150, symbol: D_6001150 }
D_SX_6001150:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6001150, symbol: D_SX_6001150 }
D_6001950:
{ type: GFX, offset: 0x6001950, symbol: D_6001950 }
D_SX_6001950:
{ type: GFX, offset: 0x6001950, symbol: D_SX_6001950 }
D_6001AD8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6001AD8, symbol: D_6001AD8 }
D_SX_6001AD8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6001AD8, symbol: D_SX_6001AD8 }
PAD_6001CD8:
{ type: BLOB, size: 8, offset: 0x6001CD8, symbol: PAD_6001CD8 }
D_6001CE0:
{ type: GFX, offset: 0x6001CE0, symbol: D_6001CE0 }
D_SX_6001CE0:
{ type: GFX, offset: 0x6001CE0, symbol: D_SX_6001CE0 }
D_60020C0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x60020C0, symbol: D_60020C0 }
D_SX_60020C0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x60020C0, symbol: D_SX_60020C0 }
D_60022C0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x60022C0, symbol: D_60022C0 }
D_SX_60022C0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x60022C0, symbol: D_SX_60022C0 }
D_60024C0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x60024C0, symbol: D_60024C0 }
D_SX_60024C0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x60024C0, symbol: D_SX_60024C0 }
D_60026C0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x60026C0, symbol: D_60026C0 }
D_SX_60026C0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x60026C0, symbol: D_SX_60026C0 }
D_60028C0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x60028C0, symbol: D_60028C0 }
D_SX_60028C0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x60028C0, symbol: D_SX_60028C0 }
D_6002AC0:
{ type: GFX, offset: 0x6002AC0, symbol: D_6002AC0 }
D_SX_6002AC0:
{ type: GFX, offset: 0x6002AC0, symbol: D_SX_6002AC0 }
D_60036E8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x60036E8, symbol: D_60036E8 }
D_SX_60036E8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x60036E8, symbol: D_SX_60036E8 }
D_6003EE8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6003EE8, symbol: D_6003EE8 }
D_SX_6003EE8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6003EE8, symbol: D_SX_6003EE8 }
D_60046E8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x60046E8, symbol: D_60046E8 }
D_SX_60046E8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x60046E8, symbol: D_SX_60046E8 }
D_6004EE8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x6004EE8, symbol: D_6004EE8 }
D_SX_6004EE8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x6004EE8, symbol: D_SX_6004EE8 }
D_6005EE8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6005EE8, symbol: D_6005EE8 }
D_SX_6005EE8:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6005EE8, symbol: D_SX_6005EE8 }
PAD_60066E8:
{ type: BLOB, size: 8, offset: 0x60066E8, symbol: PAD_60066E8 }
D_60066F0:
{ type: GFX, offset: 0x60066F0, symbol: D_60066F0 }
D_SX_60066F0:
{ type: GFX, offset: 0x60066F0, symbol: D_SX_60066F0 }
D_6006810:
{ type: GFX, offset: 0x6006810, symbol: D_6006810 }
D_SX_6006810:
{ type: GFX, offset: 0x6006810, symbol: D_SX_6006810 }
D_6007128:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6007128, symbol: D_6007128 }
D_SX_6007128:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6007128, symbol: D_SX_6007128 }
D_6007928:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6007928, symbol: D_6007928 }
D_SX_6007928:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6007928, symbol: D_SX_6007928 }
D_6008128:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6008128, symbol: D_6008128 }
D_SX_6008128:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6008128, symbol: D_SX_6008128 }
D_6008928:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6008928, symbol: D_6008928 }
D_SX_6008928:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6008928, symbol: D_SX_6008928 }
PAD_6008B28:
{ type: BLOB, size: 8, offset: 0x6008B28, symbol: PAD_6008B28 }
D_6008B30:
{ type: GFX, offset: 0x6008B30, symbol: D_6008B30 }
D_SX_6008B30:
{ type: GFX, offset: 0x6008B30, symbol: D_SX_6008B30 }
D_6009548:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6009548, symbol: D_6009548 }
D_SX_6009548:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6009548, symbol: D_SX_6009548 }
D_6009748:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6009748, symbol: D_6009748 }
D_SX_6009748:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6009748, symbol: D_SX_6009748 }
PAD_6009948:
{ type: BLOB, size: 8, offset: 0x6009948, symbol: PAD_6009948 }
D_6009950:
{ type: GFX, offset: 0x6009950, symbol: D_6009950 }
D_SX_6009950:
{ type: GFX, offset: 0x6009950, symbol: D_SX_6009950 }
PAD_6009C28:
{ type: BLOB, size: 8, offset: 0x6009C28, symbol: PAD_6009C28 }
D_6009C30:
{ type: GFX, offset: 0x6009C30, symbol: D_6009C30 }
D_SX_6009C30:
{ type: GFX, offset: 0x6009C30, symbol: D_SX_6009C30 }
D_6009CC0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x6009CC0, symbol: D_6009CC0 }
D_SX_6009CC0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x6009CC0, symbol: D_SX_6009CC0 }
D_6009FF8:
{ type: SF64:ANIM, offset: 0x6009FF8, symbol: D_6009FF8 }
D_SX_6009FF8:
{ type: SF64:ANIM, offset: 0x6009FF8, symbol: D_SX_6009FF8 }
PAD_600A004:
{ type: BLOB, size: 0xC, offset: 0x600A004, symbol: PAD_600A004 }
D_600A2D4:
{ type: SF64:ANIM, offset: 0x600A2D4, symbol: D_600A2D4 }
D_SX_600A2D4:
{ type: SF64:ANIM, offset: 0x600A2D4, symbol: D_SX_600A2D4 }
D_600A2E0:
{ type: GFX, offset: 0x600A2E0, symbol: D_600A2E0 }
D_SX_600A2E0:
{ type: GFX, offset: 0x600A2E0, symbol: D_SX_600A2E0 }
D_600A570:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x600A570, symbol: D_600A570 }
D_SX_600A570:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x600A570, symbol: D_SX_600A570 }
D_600AD70:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x600AD70, symbol: D_600AD70 }
D_SX_600AD70:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x600AD70, symbol: D_SX_600AD70 }
D_600AF70:
{ type: GFX, offset: 0x600AF70, symbol: D_600AF70 }
D_SX_600AF70:
{ type: GFX, offset: 0x600AF70, symbol: D_SX_600AF70 }
PAD_600B2A8:
{ type: BLOB, size: 8, offset: 0x600B2A8, symbol: PAD_600B2A8 }
D_600B2B0:
{ type: GFX, offset: 0x600B2B0, symbol: D_600B2B0 }
D_SX_600B2B0:
{ type: GFX, offset: 0x600B2B0, symbol: D_SX_600B2B0 }
D_600B540:
{ type: GFX, offset: 0x600B540, symbol: D_600B540 }
D_SX_600B540:
{ type: GFX, offset: 0x600B540, symbol: D_SX_600B540 }
PAD_600B828:
{ type: BLOB, size: 8, offset: 0x600B828, symbol: PAD_600B828 }
D_600B830:
{ type: GFX, offset: 0x600B830, symbol: D_600B830 }
D_SX_600B830:
{ type: GFX, offset: 0x600B830, symbol: D_SX_600B830 }
D_600C000:
{ type: GFX, offset: 0x600C000, symbol: D_600C000 }
D_SX_600C000:
{ type: GFX, offset: 0x600C000, symbol: D_SX_600C000 }
D_600C5A0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x600C5A0, symbol: D_600C5A0 }
D_SX_600C5A0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x600C5A0, symbol: D_SX_600C5A0 }
D_600F890:
{ type: SF64:ANIM, offset: 0x600F890, symbol: D_600F890 }
D_SX_600F890:
{ type: SF64:ANIM, offset: 0x600F890, symbol: D_SX_600F890 }
PAD_600F89C:
{ type: BLOB, size: 4, offset: 0x600F89C, symbol: PAD_600F89C }
D_600F8A0:
{ type: GFX, offset: 0x600F8A0, symbol: D_600F8A0 }
D_SX_600F8A0:
{ type: GFX, offset: 0x600F8A0, symbol: D_SX_600F8A0 }
D_600F938:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0600F938, symbol: D_600F938 }
D_SX_600F938:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0600F938, symbol: D_SX_600F938 }
PAD_6010138:
{ type: BLOB, size: 8, offset: 0x6010138, symbol: PAD_6010138 }
D_6010140:
{ type: GFX, offset: 0x6010140, symbol: D_6010140 }
D_SX_6010140:
{ type: GFX, offset: 0x6010140, symbol: D_SX_6010140 }
D_60105A0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x60105A0, symbol: D_60105A0 }
D_SX_60105A0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x60105A0, symbol: D_SX_60105A0 }
D_60123BC:
{ type: SF64:ANIM, offset: 0x60123BC, symbol: D_60123BC }
D_SX_60123BC:
{ type: SF64:ANIM, offset: 0x60123BC, symbol: D_SX_60123BC }
PAD_60123C8:
{ type: BLOB, size: 0x8, offset: 0x60123C8, symbol: PAD_60123C8 }
D_6013798:
{ type: SF64:ANIM, offset: 0x6013798, symbol: D_6013798, pad: 0xC }
D_SX_6013798:
{ type: SF64:ANIM, offset: 0x6013798, symbol: D_SX_6013798, pad: 0xC }
D_6013820:
{ type: SF64:ANIM, offset: 0x6013820, symbol: D_6013820 }
D_SX_6013820:
{ type: SF64:ANIM, offset: 0x6013820, symbol: D_SX_6013820 }
D_601390C:
{ type: SF64:SKELETON, offset: 0x601390C, symbol: D_601390C }
D_SX_601390C:
{ type: SF64:SKELETON, offset: 0x601390C, symbol: D_SX_601390C }
PAD_601392C:
{ type: BLOB, size: 4, offset: 0x601392C, symbol: PAD_601392C }
D_60158C4:
{ type: SF64:ANIM, offset: 0x60158C4, symbol: D_60158C4 }
D_SX_60158C4:
{ type: SF64:ANIM, offset: 0x60158C4, symbol: D_SX_60158C4 }
D_6016E28:
{ type: SF64:ANIM, offset: 0x6016E28, symbol: D_6016E28 }
D_SX_6016E28:
{ type: SF64:ANIM, offset: 0x6016E28, symbol: D_SX_6016E28 }
PAD_6016E34:
{ type: BLOB, size: 0xC, offset: 0x6016E34, symbol: PAD_6016E34 }
@@ -216,14 +216,14 @@ PAD_6017238:
PAD_60186C8:
{ type: BLOB, size: 0x8, offset: 0x60186C8, symbol: PAD_60186C8 }
D_601AA28:
{ type: SF64:ANIM, offset: 0x601AA28, symbol: D_601AA28 }
D_SX_601AA28:
{ type: SF64:ANIM, offset: 0x601AA28, symbol: D_SX_601AA28 }
PAD_601AA34:
{ type: BLOB, size: 0xC, offset: 0x601AA34, symbol: PAD_601AA34 }
D_601C690:
{ type: SF64:ANIM, offset: 0x601C690, symbol: D_601C690 }
D_SX_601C690:
{ type: SF64:ANIM, offset: 0x601C690, symbol: D_SX_601C690 }
PAD_601C69C:
{ type: BLOB, size: 4, offset: 0x601C69C, symbol: PAD_601C69C }
@@ -234,39 +234,39 @@ PAD_601CA48:
PAD_601CD78:
{ type: BLOB, size: 0x8, offset: 0x601CD78, symbol: PAD_601CD78 }
D_60206DC:
{ type: SF64:ANIM, offset: 0x60206DC, symbol: D_60206DC }
D_SX_60206DC:
{ type: SF64:ANIM, offset: 0x60206DC, symbol: D_SX_60206DC }
D_6020C68:
{ type: SF64:SKELETON, offset: 0x6020C68, symbol: D_6020C68 }
D_SX_6020C68:
{ type: SF64:SKELETON, offset: 0x6020C68, symbol: D_SX_6020C68 }
PAD_6020D1C:
{ type: BLOB, size: 4, offset: 0x6020D1C, symbol: PAD_6020D1C }
D_6020D20:
{ type: GFX, offset: 0x6020D20, symbol: D_6020D20 }
D_SX_6020D20:
{ type: GFX, offset: 0x6020D20, symbol: D_SX_6020D20 }
# Spyborg Radio
D_6020FB0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x06020FB0, symbol: D_6020FB0 }
D_SX_6020FB0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x06020FB0, symbol: D_SX_6020FB0 }
D_6021ED0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x06021ED0, symbol: D_6021ED0 }
D_SX_6021ED0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x06021ED0, symbol: D_SX_6021ED0 }
D_6022DF0:
{ type: GFX, offset: 0x6022DF0, symbol: D_6022DF0 }
D_SX_6022DF0:
{ type: GFX, offset: 0x6022DF0, symbol: D_SX_6022DF0 }
PAD_60234F8:
{ type: BLOB, size: 8, offset: 0x60234F8, symbol: PAD_60234F8 }
D_6023500:
{ type: GFX, offset: 0x6023500, symbol: D_6023500 }
D_SX_6023500:
{ type: GFX, offset: 0x6023500, symbol: D_SX_6023500 }
D_6023C30:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06023C30, symbol: D_6023C30 }
D_SX_6023C30:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06023C30, symbol: D_SX_6023C30 }
D_6023E30:
{ type: GFX, offset: 0x6023E30, symbol: D_6023E30 }
D_SX_6023E30:
{ type: GFX, offset: 0x6023E30, symbol: D_SX_6023E30 }
PAD_60247A8:
{ type: BLOB, size: 8, offset: 0x60247A8, symbol: PAD_60247A8 }
@@ -322,95 +322,95 @@ PAD_60281B8:
PAD_60285E8:
{ type: BLOB, size: 8, offset: 0x60285E8, symbol: PAD_60285E8 }
D_60285F0:
{ type: GFX, offset: 0x60285F0, symbol: D_60285F0 }
D_SX_60285F0:
{ type: GFX, offset: 0x60285F0, symbol: D_SX_60285F0 }
D_6029098:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06029098, symbol: D_6029098 }
D_SX_6029098:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06029098, symbol: D_SX_6029098 }
PAD_6029298:
{ type: BLOB, size: 8, offset: 0x6029298, symbol: PAD_6029298 }
D_60292A0:
{ type: GFX, offset: 0x60292A0, symbol: D_60292A0 }
D_SX_60292A0:
{ type: GFX, offset: 0x60292A0, symbol: D_SX_60292A0 }
D_6029890:
{ type: GFX, offset: 0x6029890, symbol: D_6029890 }
D_SX_6029890:
{ type: GFX, offset: 0x6029890, symbol: D_SX_6029890 }
D_6029918:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x029918, symbol: D_6029918 }
D_SX_6029918:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x029918, symbol: D_SX_6029918 }
PAD_602A118:
{ type: BLOB, size: 8, offset: 0x602A118, symbol: PAD_602A118 }
D_602A120:
{ type: SF64:ENV_SETTINGS, offset: 0x602A120, symbol: D_602A120 }
D_SX_602A120:
{ type: SF64:ENV_SETTINGS, offset: 0x602A120, symbol: D_SX_602A120 }
D_602A164:
{ type: SF64:OBJECT_INIT, count: 1026, offset: 0x602A164, symbol: D_602A164 }
D_SX_602A164:
{ type: SF64:OBJECT_INIT, count: 1026, offset: 0x602A164, symbol: D_SX_602A164 }
D_602F18C:
{ type: SF64:OBJECT_INIT, count: 167, offset: 0x602F18C, symbol: D_602F18C }
D_SX_602F18C:
{ type: SF64:OBJECT_INIT, count: 167, offset: 0x602F18C, symbol: D_SX_602F18C }
D_60320D0:
{ type: SF64:SCRIPT, offset: 0x60320D0, symbol: D_60320D0 }
D_SX_60320D0:
{ type: SF64:SCRIPT, offset: 0x60320D0, symbol: D_SX_60320D0 }
D_6032328:
{ type: SF64:HITBOX, offset: 0x6032328, symbol: D_6032328 }
D_SX_6032328:
{ type: SF64:HITBOX, offset: 0x6032328, symbol: D_SX_6032328 }
D_603238C:
{ type: SF64:HITBOX, offset: 0x603238C, symbol: D_603238C }
D_SX_603238C:
{ type: SF64:HITBOX, offset: 0x603238C, symbol: D_SX_603238C }
D_6032408:
{ type: SF64:HITBOX, offset: 0x6032408, symbol: D_6032408 }
D_SX_6032408:
{ type: SF64:HITBOX, offset: 0x6032408, symbol: D_SX_6032408 }
D_6032488:
{ type: SF64:HITBOX, offset: 0x6032488, symbol: D_6032488 }
D_SX_6032488:
{ type: SF64:HITBOX, offset: 0x6032488, symbol: D_SX_6032488 }
D_60324EC:
{ type: SF64:HITBOX, offset: 0x60324EC, symbol: D_60324EC }
D_SX_60324EC:
{ type: SF64:HITBOX, offset: 0x60324EC, symbol: D_SX_60324EC }
D_6032550:
{ type: SF64:HITBOX, offset: 0x6032550, symbol: D_6032550 }
D_SX_6032550:
{ type: SF64:HITBOX, offset: 0x6032550, symbol: D_SX_6032550 }
D_603285C:
{ type: SF64:HITBOX, offset: 0x603285C, symbol: D_603285C }
D_SX_603285C:
{ type: SF64:HITBOX, offset: 0x603285C, symbol: D_SX_603285C }
D_6032878:
{ type: SF64:HITBOX, offset: 0x6032878, symbol: D_6032878 }
D_SX_6032878:
{ type: SF64:HITBOX, offset: 0x6032878, symbol: D_SX_6032878 }
D_6032894:
{ type: SF64:HITBOX, offset: 0x6032894, symbol: D_6032894 }
D_SX_6032894:
{ type: SF64:HITBOX, offset: 0x6032894, symbol: D_SX_6032894 }
D_60328B0:
{ type: SF64:HITBOX, offset: 0x60328B0, symbol: D_60328B0 }
D_SX_60328B0:
{ type: SF64:HITBOX, offset: 0x60328B0, symbol: D_SX_60328B0 }
D_60328CC:
{ type: SF64:HITBOX, offset: 0x60328CC, symbol: D_60328CC }
D_SX_60328CC:
{ type: SF64:HITBOX, offset: 0x60328CC, symbol: D_SX_60328CC }
D_603265C:
{ type: SF64:HITBOX, offset: 0x603265C, symbol: D_603265C }
D_SX_603265C:
{ type: SF64:HITBOX, offset: 0x603265C, symbol: D_SX_603265C }
D_6032768:
{ type: SF64:HITBOX, offset: 0x6032768, symbol: D_6032768 }
D_SX_6032768:
{ type: SF64:HITBOX, offset: 0x6032768, symbol: D_SX_6032768 }
D_60328E8:
{ type: SF64:HITBOX, offset: 0x60328E8, symbol: D_60328E8 }
D_SX_60328E8:
{ type: SF64:HITBOX, offset: 0x60328E8, symbol: D_SX_60328E8 }
D_6032904:
{ type: SF64:HITBOX, offset: 0x6032904, symbol: D_6032904 }
D_SX_6032904:
{ type: SF64:HITBOX, offset: 0x6032904, symbol: D_SX_6032904 }
D_6032938:
{ type: SF64:HITBOX, offset: 0x6032938, symbol: D_6032938 }
D_SX_6032938:
{ type: SF64:HITBOX, offset: 0x6032938, symbol: D_SX_6032938 }
D_6032954:
{ type: SF64:HITBOX, offset: 0x6032954, symbol: D_6032954 }
D_SX_6032954:
{ type: SF64:HITBOX, offset: 0x6032954, symbol: D_SX_6032954 }
D_6032970:
{ type: SF64:HITBOX, offset: 0x6032970, symbol: D_6032970 }
D_SX_6032970:
{ type: SF64:HITBOX, offset: 0x6032970, symbol: D_SX_6032970 }
D_603298C:
{ type: SF64:HITBOX, offset: 0x603298C, symbol: D_603298C }
D_SX_603298C:
{ type: SF64:HITBOX, offset: 0x603298C, symbol: D_SX_603298C }
PAD_6032AB8:
{ type: BLOB, size: 8, offset: 0x6032AB8, symbol: PAD_6032AB8 }
assets/yaml/us/ast_training.yaml
+46 -46
View File
@@ -10,50 +10,50 @@
- '#include "structs.h"'
- '#include "sf64level.h"'
D_training_6000000:
{ type: TEXTURE, format: IA8, offset: 0x6000000, width: 96, height: 12, ctype: u8, symbol: D_training_6000000 }
D_TR_6000000:
{ type: TEXTURE, format: IA8, offset: 0x6000000, width: 96, height: 12, ctype: u8, symbol: D_TR_6000000 }
D_training_6000480:
{ type: TEXTURE, format: IA8, offset: 0x6000480, width: 96, height: 12, ctype: u8, symbol: D_training_6000480 }
D_TR_6000480:
{ type: TEXTURE, format: IA8, offset: 0x6000480, width: 96, height: 12, ctype: u8, symbol: D_TR_6000480 }
D_training_6000900:
{ type: TEXTURE, format: RGBA16, offset: 0x6000900, width: 44, height: 44, ctype: u16, symbol: D_training_6000900 }
D_TR_6000900:
{ type: TEXTURE, format: RGBA16, offset: 0x6000900, width: 44, height: 44, ctype: u16, symbol: D_TR_6000900 }
D_training_6001820:
{ type: TEXTURE, format: RGBA16, offset: 0x6001820, width: 44, height: 44, ctype: u16, symbol: D_training_6001820 }
D_TR_6001820:
{ type: TEXTURE, format: RGBA16, offset: 0x6001820, width: 44, height: 44, ctype: u16, symbol: D_TR_6001820 }
D_training_6002740:
{ type: GFX, offset: 0x6002740, symbol: D_training_6002740 }
D_TR_6002740:
{ type: GFX, offset: 0x6002740, symbol: D_TR_6002740 }
D_60028F0:
{ type: TEXTURE, format: RGBA16, offset: 0x060028F0, width: 32, height: 32, ctype: u16, symbol: D_60028F0 }
D_TR_60028F0:
{ type: TEXTURE, format: RGBA16, offset: 0x060028F0, width: 32, height: 32, ctype: u16, symbol: D_TR_60028F0 }
D_training_60030F0:
{ type: GFX, offset: 0x60030F0, symbol: D_training_60030F0 }
D_TR_60030F0:
{ type: GFX, offset: 0x60030F0, symbol: D_TR_60030F0 }
D_6003360:
{ type: TEXTURE, format: RGBA16, offset: 0x06003360, width: 16, height: 16, ctype: u16, symbol: D_6003360 }
D_TR_6003360:
{ type: TEXTURE, format: RGBA16, offset: 0x06003360, width: 16, height: 16, ctype: u16, symbol: D_TR_6003360 }
D_6003560:
{ type: TEXTURE, format: RGBA16, offset: 0x06003560, width: 16, height: 16, ctype: u16, symbol: D_6003560 }
D_TR_6003560:
{ type: TEXTURE, format: RGBA16, offset: 0x06003560, width: 16, height: 16, ctype: u16, symbol: D_TR_6003560 }
D_training_6003760:
{ type: GFX, offset: 0x6003760, symbol: D_training_6003760 }
D_TR_6003760:
{ type: GFX, offset: 0x6003760, symbol: D_TR_6003760 }
D_6003878:
{ type: TEXTURE, format: RGBA16, offset: 0x06003878, width: 64, height: 32, ctype: u16, symbol: D_6003878 }
D_TR_6003878:
{ type: TEXTURE, format: RGBA16, offset: 0x06003878, width: 64, height: 32, ctype: u16, symbol: D_TR_6003878 }
D_6004878:
{ type: TEXTURE, format: RGBA16, offset: 0x06004878, width: 64, height: 32, ctype: u16, symbol: D_6004878 }
D_TR_6004878:
{ type: TEXTURE, format: RGBA16, offset: 0x06004878, width: 64, height: 32, ctype: u16, symbol: D_TR_6004878 }
PAD_6005878:
{ type: BLOB, offset: 0x6005878, size: 0x8, symbol: PAD_6005878 }
D_training_6005880:
{ type: GFX, offset: 0x6005880, symbol: D_training_6005880 }
D_TR_6005880:
{ type: GFX, offset: 0x6005880, symbol: D_TR_6005880 }
D_6005938:
{ type: TEXTURE, format: RGBA16, offset: 0x06005938, width: 32, height: 32, ctype: u16, symbol: D_6005938 }
D_TR_6005938:
{ type: TEXTURE, format: RGBA16, offset: 0x06005938, width: 32, height: 32, ctype: u16, symbol: D_TR_6005938 }
PAD_6006138:
{ type: BLOB, offset: 0x6006138, size: 0x8, symbol: PAD_6006138 }
@@ -61,34 +61,34 @@ PAD_6006138:
gItemTrainingRingDL:
{ type: GFX, offset: 0x6006140, symbol: gItemTrainingRingDL }
D_6006958:
{ type: TEXTURE, format: RGBA16, offset: 0x06006958, width: 8, height: 8, ctype: u16, symbol: D_6006958 }
D_TR_6006958:
{ type: TEXTURE, format: RGBA16, offset: 0x06006958, width: 8, height: 8, ctype: u16, symbol: D_TR_6006958 }
D_60069D8:
{ type: TEXTURE, format: RGBA16, offset: 0x060069D8, width: 8, height: 8, ctype: u16, symbol: D_60069D8 }
D_TR_60069D8:
{ type: TEXTURE, format: RGBA16, offset: 0x060069D8, width: 8, height: 8, ctype: u16, symbol: D_TR_60069D8 }
PAD_6006A58:
{ type: BLOB, offset: 0x6006A58, size: 0x8, symbol: PAD_6006A58 }
D_training_6006A60:
{ type: SF64:ENV_SETTINGS, offset: 0x6006A60, symbol: D_training_6006A60 }
D_TR_6006A60:
{ type: SF64:ENV_SETTINGS, offset: 0x6006A60, symbol: D_TR_6006A60 }
D_6006AA4:
{ type: SF64:OBJECT_INIT, offset: 0x6006AA4, symbol: D_6006AA4 }
D_TR_6006AA4:
{ type: SF64:OBJECT_INIT, offset: 0x6006AA4, symbol: D_TR_6006AA4 }
D_6008EF8:
{ type: SF64:OBJECT_INIT, offset: 0x6008EF8, symbol: D_6008EF8 }
D_TR_6008EF8:
{ type: SF64:OBJECT_INIT, offset: 0x6008EF8, symbol: D_TR_6008EF8 }
D_training_6009B34:
{ type: SF64:SCRIPT, offset: 0x6009B34, symbol: D_training_6009B34 }
D_TR_6009B34:
{ type: SF64:SCRIPT, offset: 0x6009B34, symbol: D_TR_6009B34 }
D_training_6009CC4:
{ type: SF64:HITBOX, offset: 0x6009CC4, symbol: D_training_6009CC4 }
D_TR_6009CC4:
{ type: SF64:HITBOX, offset: 0x6009CC4, symbol: D_TR_6009CC4 }
D_training_6009CFC:
{ type: SF64:HITBOX, offset: 0x6009CFC, symbol: D_training_6009CFC }
D_TR_6009CFC:
{ type: SF64:HITBOX, offset: 0x6009CFC, symbol: D_TR_6009CFC }
D_training_6009D18:
{ type: SF64:HITBOX, offset: 0x6009D18, symbol: D_training_6009D18 }
D_TR_6009D18:
{ type: SF64:HITBOX, offset: 0x6009D18, symbol: D_TR_6009D18 }
# size = 0x9D40
assets/yaml/us/ast_warp_zone.yaml
+22 -22
View File
@@ -9,35 +9,35 @@
- '#include "sf64object.h"'
- '#include "structs.h"'
D_7000000:
{ type: GFX, offset: 0x7000000, symbol: D_7000000 }
D_WZ_7000000:
{ type: GFX, offset: 0x7000000, symbol: D_WZ_7000000 }
D_7000280:
{ type: GFX, offset: 0x7000280, symbol: D_7000280 }
D_WZ_7000280:
{ type: GFX, offset: 0x7000280, symbol: D_WZ_7000280 }
D_70008F0:
{ type: GFX, offset: 0x70008F0, symbol: D_70008F0 }
D_WZ_70008F0:
{ type: GFX, offset: 0x70008F0, symbol: D_WZ_70008F0 }
D_7000260:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 4, height: 4, offset: 0x7000260, symbol: D_7000260 }
D_WZ_7000260:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 4, height: 4, offset: 0x7000260, symbol: D_WZ_7000260 }
D_7000A30:
{ type: TEXTURE, ctype: u8, format: CI4, width: 32, height: 32, offset: 0x7000A30, symbol: D_7000A30, tlut: 0x7000C30 }
D_WZ_7000A30:
{ type: TEXTURE, ctype: u8, format: CI4, width: 32, height: 32, offset: 0x7000A30, symbol: D_WZ_7000A30, tlut: 0x7000C30 }
D_7000C30:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0x7000C30, symbol: D_7000C30 }
D_WZ_7000C30:
{ type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0x7000C30, symbol: D_WZ_7000C30 }
D_7000C40:
{ type: GFX, offset: 0x7000C40, symbol: D_7000C40 }
D_WZ_7000C40:
{ type: GFX, offset: 0x7000C40, symbol: D_WZ_7000C40 }
D_7000E80:
{ type: GFX, offset: 0x7000E80, symbol: D_7000E80 }
D_WZ_7000E80:
{ type: GFX, offset: 0x7000E80, symbol: D_WZ_7000E80 }
D_70010E0:
{ type: GFX, offset: 0x70010E0, symbol: D_70010E0 }
D_WZ_70010E0:
{ type: GFX, offset: 0x70010E0, symbol: D_WZ_70010E0 }
D_7001540:
{ type: GFX, offset: 0x7001540, symbol: D_7001540 }
D_WZ_7001540:
{ type: GFX, offset: 0x7001540, symbol: D_WZ_7001540 }
D_70015D0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x70015D0, symbol: D_70015D0 }
D_WZ_70015D0:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x70015D0, symbol: D_WZ_70015D0 }
include/assets.h
+3 -428
View File
@@ -7,205 +7,6 @@
#include "sf64object.h"
#include "sf64player.h"
// ast_common
extern u16 D_1002040[];
extern u16 D_10032A0[];
extern u16 D_10041C0[];
extern u16 D_10050E0[];
extern u16 D_1006000[];
extern u16 D_1006F20[];
extern u16 D_1007E40[];
extern u16 D_1008D60[];
extern u16 D_1009C80[];
extern u16 D_100ABA0[];
extern u16 D_100BAC0[];
extern u16 D_100C9E0[];
extern u16 D_100D900[];
extern u16 D_100E820[];
extern u8 D_1011A40[];
extern u16 D_1011AB0[];
extern u8 D_1011E80[];
extern u16 D_1011EC0[];
extern u8 D_1011ED0[];
extern u16 D_1011F08[];
extern Gfx D_1011F20[];
extern u8 D_10127D0[];
extern u16 D_1012898[];
extern u8 D_10128C0[];
extern u16 D_1012988[];
extern u8 D_10129C0[];
extern u16 D_1013090[];
extern u8 D_1013170[];
extern u16 D_1013570[];
extern Gfx D_1015510[];
extern Gfx D_1015980[];
extern Gfx D_1016580[];
extern Gfx D_1016870[];
extern Gfx D_10177C0[];
extern Gfx D_10182C0[];
extern u16 D_10190C0[]; // A texture of some sort.
extern Gfx D_10194C0[];
extern Gfx D_1019820[];
extern Gfx D_1019CA0[];
extern Gfx D_101A570[];
extern Gfx D_101A8E0[];
extern Gfx D_101ABD0[];
extern Gfx D_101AD20[];
extern Gfx D_101AED0[];
extern Gfx D_101C2E0[];
extern Gfx D_101C2E0[];
extern Gfx D_101CAE0[];
extern Gfx D_101CD70[];
extern u16 D_101D070[];
extern Gfx D_101DC10[];
extern Gfx D_1021E20[];
extern Gfx D_1022120[];
extern Gfx D_1022E80[];
extern Gfx D_10231A0[];
extern Gfx D_1023700[];
extern Gfx D_1023750[];
extern Gfx D_1023C80[];
extern Gfx D_1024230[];
extern Gfx D_1024290[];
extern Gfx D_1024410[];
extern Gfx D_1024570[];
extern Gfx D_10246D0[];
extern Gfx D_1024830[];
extern u8 D_1024A58[];
extern Gfx D_1024AC0[];
extern Gfx D_1024F60[];
extern Gfx D_1025800[];
extern Gfx D_1026090[];
extern Gfx D_1028230[];
extern Gfx D_1029780[];
extern Gfx D_102A010[];
extern Gfx D_102A8A0[];
extern Gfx D_102ED50[];
extern Gfx D_102F5E0[];
extern Gfx D_102FE80[];
extern u16 D_102FF08[];
extern Gfx D_1031630[];
extern Gfx D_1031EC0[];
extern Gfx D_1032780[];
// ast_arwing, ast_landmaster, ast_blue_marine, ast_vs_player
extern u8 D_3000000[];
extern u16 D_3000080[];
extern u8 D_30001E0[];
extern u16 D_3000380[];
extern u8 D_30003A0[];
extern u16 D_30004E0[];
extern u8 D_3000510[];
extern Gfx D_3000660[];
extern u8 D_30006D0[];
extern u16 D_30006A0[];
extern u16 D_3000810[];
extern u8 D_30013E0[];
extern u8 D_3001420[];
extern u16 D_3000BC0[];
extern u8 D_3004010[];
extern u16 D_3003E20[];
extern u16 D_3004D58[];
extern Gfx D_301AD60[];
extern Gfx D_301AEF0[];
extern Gfx D_302D120[];
extern u16 D_3007500[];
extern u8 D_3006C60[];
extern u16 D_300B218[];
extern u8 D_300A470[];
extern Gfx D_3001C90[];
extern Gfx D_3003CE0[];
extern Gfx D_3005980[];
extern Gfx D_3005AB0[];
extern Gfx D_3007650[];
extern u8 D_300D350[];
extern u16 D_300D398[];
extern u8 D_300D3C0[];
extern u16 D_300D408[];
extern u8 D_300D440[];
extern u16 D_300D500[];
extern Gfx D_300D550[];
extern Gfx D_300EE80[];
extern Gfx D_300FB80[];
extern Gfx D_3010A90[];
extern Gfx D_3011470[];
extern Gfx D_3011720[];
extern Gfx D_3011E40[];
extern Gfx D_3012ED0[];
extern Gfx D_30131F0[];
extern Gfx D_3013580[];
extern Gfx D_3013780[];
extern Gfx D_30146B0[];
extern Gfx D_3014BF0[];
extern Gfx D_3015120[];
extern Gfx D_30155E0[];
extern Gfx D_3015740[];
extern Animation D_3015AF4;
extern Animation D_3015C28;
extern Gfx D_3015D80[];
extern Animation D_30163C4;
extern Limb* D_3016610[];
extern Gfx D_3016660[];
extern Gfx D_30160A0[];
extern Gfx D_3016B00[];
extern Gfx D_3016B30[];
extern Gfx D_3016CC0[];
extern Gfx D_30173C0[];
extern Gfx D_30174E0[];
extern Gfx D_3017600[];
extern Gfx D_3017600[];
extern Gfx D_30183D0[];
extern Gfx D_3018800[];
extern Gfx D_30194E0[];
extern Gfx D_301B080[];
extern Gfx D_301B6E0[];
extern Animation D_301C3A8;
extern Limb* D_301C614[];
extern Animation D_301CFEC;
extern Limb* D_301D258[];
extern Animation D_301D888;
extern Limb* D_301DB94[];
extern Animation D_301E19C;
extern Limb* D_301E3E8[];
extern Gfx D_301E570[];
extern Gfx D_301F140[];
extern Gfx D_301FD20[];
extern Gfx D_302D240[];
extern Gfx D_302D4D0[];
extern EnvSettings D_302DD70;
extern EnvSettings D_302DDB4;
extern EnvSettings D_302DDF8;
extern ObjectInit D_302DE3C[];
extern ObjectInit D_302E0E4[];
extern ObjectInit D_302E170[];
extern ObjectInit D_302E378[];
extern Vec3f D_302E56C[];
extern Vec3f D_302E65C[];
extern Vec3f D_302E74C[];
extern Vec3f D_302E830[];
extern Vec3f D_302E95C[];
extern Vec3f D_302EA4C[];
extern Vec3f D_302EB3C[];
extern Vec3f D_302EC20[];
extern f32 D_302ED4C[];
extern f32 D_302ED98[];
extern f32 D_302EDB4[];
extern f32 D_302EE00[];
extern f32 D_302EE64[];
extern f32 D_302EE80[];
extern f32 D_302EE9C[];
extern Triangle D_302EEE8[];
extern Vec3f D_302EF00[];
extern Triangle D_302EF6C[];
extern Vec3f D_302EF84[];
extern Triangle D_302EFF0[];
extern Vec3f D_302F008[];
extern Triangle D_302F044[];
extern Vec3f D_302F098[];
// ast_enmy_planet, ast_enmy_space
extern Animation D_4000080;
extern Limb* D_400014C[];
@@ -222,24 +23,6 @@ extern Animation D_400A30C;
extern Limb* D_400A398[];
extern Gfx D_400B390[];
// ast_font
extern u8 D_50021F0[]; // fox_option
extern u8 D_50022F0[]; // fox_hud
extern u8 D_5002DC0[]; // fox_hud
extern u8 D_5003A00[]; // fox_hud
extern u16 D_50077B0[]; // fox_title
extern u8 D_5007F60[]; // fox_std_lib, fox_versus
extern u8 D_5009F60[]; // fox_std_lib, fox_versus, fox_option
extern u8 D_500A050[]; // fox_std_lib, fox_versus, fox_option, fox_map
extern u8 D_500A140[]; // fox_std_lib, fox_versus, fox_option, fox_map, fox_hud
extern u8 D_500A230[]; // fox_std_lib, fox_versus, fox_option, fox_map, fox_hud
extern u8 D_500A320[]; // fox_std_lib, fox_versus, fox_option, fox_map, fox_hud
extern u8 D_500A410[]; // fox_std_lib, fox_versus, fox_option, fox_map, fox_hud
extern u8 D_500A500[]; // fox_std_lib, fox_versus, fox_option, fox_map, fox_hud
extern u8 D_500A5F0[]; // fox_std_lib, fox_versus, fox_option, fox_hud
extern u8 D_500A6E0[]; // fox_std_lib, fox_versus, fox_option, fox_hud
extern u8 D_500A7D0[]; // fox_std_lib, fox_versus, fox_option, fox_hud
/* ast_corneria, ast_meteo, ast_titania, ast_sector_x, ast_sector_z,
* ast_aquas, ast_area_6, ast_venom_1, ast_venom_2, ast_ve1_boss*,
* ast_bolse, ast_fortuna, ast_sector_y, ast_solar, ast_zoness,
@@ -249,11 +32,9 @@ extern Gfx D_60005B0[]; // fox_bg
extern Gfx D_6000A80[]; // fox_bg, fox_effect
extern u16 D_6000B60[]; // fox_radio
extern Gfx D_6000E00[]; // fox_edata_1C
extern Gfx D_6000E10[]; // fox_enmy2
extern Gfx D_6001360[]; // fox_bg, fox_demo, fox_edata_1C
extern Gfx D_6001530[]; // fox_360, fox_demo, fox_ka
extern Gfx D_6001840[]; // fox_bg
extern Gfx D_6001950[]; // fox_enmy2
extern Gfx D_6001A60[]; // fox_effect
extern u16 D_6001A80[]; // fox_radio
extern u8 D_6001B80[]; // fox_hud
@@ -271,7 +52,6 @@ extern Gfx D_6003000[]; // fox_edata_1C
extern u8 D_60030D0[]; // fox_map
extern Gfx D_60030F0[]; // fox_edata_1C
extern Gfx D_60034D0[]; // fox_edata_1C, fox_enmy2
extern Gfx D_6003610[]; // fox_edata_1C
extern Gfx D_60036A0[]; // fox_edata_1C, fox_enmy2
extern Gfx D_6003760[];
extern u16 D_60038C0[];
@@ -313,7 +93,6 @@ extern f32 D_6006694[];
extern Gfx D_60066D0[];
extern f32 D_60066E0_f32[];
extern Gfx D_60066E0_Gfx[];
extern Gfx D_60066F0[];
extern f32 D_600672C[];
extern u16 D_6006750[];
extern f32 D_6006778[];
@@ -359,7 +138,6 @@ extern EnvSettings D_6007E30;
extern Gfx D_6008370[];
extern Gfx D_6008770[];
extern Gfx D_6008830[];
extern Gfx D_6008970[];
extern u8 D_6008990[];
extern Gfx D_6008AA0[];
extern Vec3s D_6008E08[];
@@ -377,11 +155,8 @@ extern Animation D_6009D30;
extern Gfx D_6009E30[];
extern Vtx D_6009ED0[];
extern Gfx D_6009F90[];
extern Gfx D_600A220[];
extern Gfx D_600A420[];
extern Gfx D_600A810[];
extern Gfx D_600AB10[];
extern u16 D_600AB68[];
extern u8 D_600AD30[];
extern Gfx D_600AF40[];
extern Gfx D_600B0E0[];
@@ -391,7 +166,6 @@ extern Gfx D_600B8B0[];
extern u8 D_600B9B0[];
extern Gfx D_600BAF0[];
extern u16 D_600BEA0[];
extern Gfx D_600BF80[];
extern Gfx D_600C130[];
extern Animation D_600C15C;
extern Animation D_600C200;
@@ -409,7 +183,6 @@ extern Gfx D_600D730[];
extern u16 D_600D990[];
extern Gfx D_600D9F0[];
extern Gfx D_600DA10[];
extern Gfx D_600DB80[];
extern Gfx D_600DBC0[];
extern u8 D_600DDC0[];
extern Gfx D_600DDF0[];
@@ -424,8 +197,6 @@ extern Gfx D_600E820[];
extern u8 D_600E980[];
extern EnvSettings D_600EA90;
extern Gfx D_600EC90[];
extern Gfx D_600EE10[];
extern Gfx D_600EEF0[];
extern Gfx D_600EFF0[];
extern Gfx D_600F160[];
extern Gfx D_600F1D0[];
@@ -444,7 +215,6 @@ extern Gfx D_600F670[];
extern Gfx D_600F6C0[];
extern Gfx D_600F6C0[];
extern Animation D_600F744;
extern Gfx D_600F8A0[];
extern u8 D_600F940[];
extern Gfx D_600F9B0[];
extern Vec3s D_600FD50[];
@@ -477,7 +247,6 @@ extern u8 D_TEX_6011660[];
extern Vec3s D_601170C[];
extern u8 D_6011890[];
extern Gfx D_6011910[];
extern Gfx D_60119A0[];
extern f32 D_6011B24[];
extern u16 D_6011B40[];
extern f32 D_6011BF4[];
@@ -485,8 +254,6 @@ extern f32 D_6011C10[];
extern f32 D_6011C48[];
extern f32 D_6011C80[];
extern u8 D_6011EA0[];
extern Gfx D_6011EE0[];
extern Gfx D_60120F0[];
extern u8 D_6012310[];
extern u8 D_60123F0[];
extern Gfx D_6012C00_Gfx[];
@@ -496,9 +263,7 @@ extern Gfx D_60132B0[];
extern u8 D_6013470[];
extern Gfx D_6013480[];
extern Gfx D_60137B0[];
extern Animation D_6013820;
extern Animation D_601388C;
extern Limb* D_601390C[];
extern Gfx D_6013960[];
extern u8 D_60139E0[];
extern Gfx D_6013B50[];
@@ -511,7 +276,7 @@ extern Animation D_6014658;
extern Gfx D_6014670[];
extern u16 D_60147C0[];
extern u8 D_60147E0[];
extern Gfx D_60148B0[];
extern u8 D_60148B0[];
extern Gfx D_60148D0[];
extern Gfx D_6014A20[];
extern Gfx D_6014B50[];
@@ -520,12 +285,9 @@ extern EnvSettings D_6014D50;
extern CollisionPoly D_6014FEC[];
extern Gfx D_60153B0[];
extern u16 D_6015430[];
extern Gfx D_6015730[];
extern u8 D_6015CE0[];
extern Gfx D_6015DD0[];
extern Gfx D_6015EE0[];
extern Gfx D_6015F00[];
extern Gfx D_6015FF0[];
extern Gfx D_6016270[];
extern Vec3s D_6016374[];
extern Gfx D_60164F0[];
@@ -557,7 +319,6 @@ extern Gfx D_601A7A0[];
extern Gfx D_601A7D0[];
extern Gfx D_601AD70[];
extern Gfx D_601AE40[];
extern Gfx D_601AFF0[];
extern Gfx D_601B0D0[];
extern u16* D_601B1E4[];
extern Gfx D_601B2B0[];
@@ -585,7 +346,6 @@ extern f32 D_601B8A0[];
extern f32 D_601B8D8[];
extern Gfx D_601BB40[];
extern Gfx D_601BEC0[];
extern Gfx D_601C080[];
extern Gfx D_601C0D0[];
extern Gfx D_601C6A0[];
extern Gfx D_601C7C0[];
@@ -598,7 +358,6 @@ extern Gfx D_601D730[];
extern u8 D_601D750[];
extern u16 D_601D800[];
extern u16 D_601DB50[];
extern Gfx D_601DE60[];
extern Gfx D_601DE80[];
extern Gfx D_601E150[];
extern u16 D_601E1E8[];
@@ -622,11 +381,6 @@ extern Gfx D_6020B40[];
extern u16* D_6020DD0[];
extern Gfx D_6020E60[];
extern u16 D_6020F60[];
extern u16 D_6020FB0[];
extern u16 D_6021ED0[];
extern Animation D_602201C;
extern Limb* D_60220E8[];
extern Gfx D_6022110[];
extern u16 D_6022340[];
extern Gfx D_60223C0[];
extern u8 D_60223E0[];
@@ -636,7 +390,6 @@ extern u16 D_6022760[];
extern Gfx D_6022920[];
extern u16 D_60229A4[];
extern f32 D_60231A4[];
extern Gfx D_60231C0[];
extern Gfx D_60238F0[];
extern Gfx D_6023AC0[];
extern EnvSettings D_6023F20;
@@ -673,14 +426,10 @@ extern u8 D_6029220[];
extern Animation D_6029528;
extern Limb* D_6029674[];
extern Gfx D_6029890[];
extern EnvSettings D_602A120;
extern Gfx D_602A720[];
extern u16* D_602AAC0[];
extern Gfx D_602AC40[];
extern u16 D_602AC50[];
extern u16 D_602ACC0[];
extern ObjectInit* D_602B148[];
extern Gfx D_602B4C0[];
extern u16 D_602B620[];
extern u8 D_602B6D0[];
extern f32 D_602B9EC[];
@@ -692,9 +441,7 @@ extern f32 D_602BC58[];
extern f32 D_602BE3C[];
extern f32 D_602BE58[];
extern f32 D_602BFC4[];
extern Gfx D_602C030[];
extern f32 D_602C044[];
extern Gfx D_602C088[];
extern f32 D_602C1D4[];
extern f32 D_602C218[];
extern f32 D_602C234[];
@@ -716,12 +463,9 @@ extern u16 D_602DCB8[];
extern Gfx D_602E080[];
extern Gfx D_602E380[];
extern EnvSettings D_602E4B0;
extern EnvSettings D_602E540;
extern Gfx D_602E570[];
extern EnvSettings D_602E584[];
extern Gfx D_602E7A0[];
extern Gfx D_602E9E0[];
extern ObjectInit* D_602F18C[];
extern u16* D_602F3AC[];
extern f32 D_602F638[];
extern f32 D_602F684[];
@@ -743,24 +487,8 @@ extern Vec3s D_6030550[];
extern CollisionPoly D_60305DC[];
extern Gfx D_6030630[];
extern Gfx D_60306D0[];
extern u16* D_60308B8[];
extern f32 D_6030B10[];
extern ObjectInit D_6030B14[];
extern f32 D_6030B14_f32[];
extern f32 D_6030BE0[];
extern f32 D_6030BFC[];
extern f32 D_6030C18[];
extern f32 D_6030C44[];
extern f32 D_6030C60[];
extern f32 D_6030C7C[];
extern f32 D_6030D20[];
extern f32 D_6030D74[];
extern f32 D_6030DF8[];
extern f32 D_6030E14[];
extern f32 D_6030E30_Hitbox[];
extern EnvSettings D_6030E30_Env;
extern f32 D_6030E4C[];
extern f32 D_6030E68[];
extern Triangle D_6030E74[];
extern Vec3f D_6030E80[];
extern Triangle D_6030EB0[];
@@ -770,37 +498,16 @@ extern Vec3f D_6030EF8[];
extern Triangle D_6030F28[];
extern Vec3f D_6030F34[];
extern Triangle D_6030F64[];
extern f32 D_6030F74[];
extern Vec3f D_6030F7C[];
extern Triangle D_6030FC4[];
extern f32 D_6031400[];
extern f32 D_603144C[];
extern f32 D_6031480[];
extern f32 D_60314C8[];
extern f32 D_6031500[];
extern f32 D_6031538[];
extern f32 D_6031554[];
extern f32 D_6031570[];
extern u16 D_603158C[];
extern Vec3s D_603184C[];
extern Triangle D_6031FB0[];
extern Triangle D_6031FB0[];
extern Vec3f D_6031FE0[];
extern Vec3f D_603204C[];
extern Triangle D_60320B8[];
extern u16* D_60320D0[];
extern Gfx D_60320E0[];
extern Vec3f D_603216C[];
extern f32 D_6032328[];
extern Triangle D_6032388[];
extern u16 D_60323D0[];
extern f32 D_6032408[];
extern Vec3f D_6032430[];
extern u16 D_6032440[];
extern f32 D_6032488[];
extern f32 D_60324EC[];
extern f32 D_6032550[];
extern Gfx D_6032580[];
extern u16 D_6032A60[];
extern Gfx D_6032BC0[];
@@ -876,7 +583,6 @@ extern u16 D_603CC80[];
extern u16* D_603D9E8[];
extern f32 D_603DCA4[];
extern f32 D_603DD40[];
extern EnvSettings D_C035110;
extern f32 D_603DDF0[];
extern f32 D_603DE8C[];
extern f32 D_603DEF4[];
@@ -886,7 +592,6 @@ extern f32 D_603E014[];
extern f32 D_603E030[];
extern f32 D_603E09C[];
extern f32 D_603E0EC[];
extern Gfx D_60084C0[];
extern Gfx D_6008D40[];
extern Gfx D_6007C40[];
@@ -897,11 +602,10 @@ extern Gfx D_6019670[];
extern Gfx D_60185E0[];
extern Gfx D_6017550[];
// ast_7_ti_2, ast_7_ti_1, ast_warp_zone, ast_versus, ast_ending
// ast_versus, ast_ending
extern u8 D_7000F10[]; // fox_option
extern u8 D_7001030[]; // fox_option
extern u8 D_7001270[]; // fox_option
extern Gfx D_7001540[]; // fox_bg
extern u8 D_7001DF0[]; // fox_option
extern u8 D_7002110[]; // fox_option
extern u8 D_7003650[]; // fox_option
@@ -918,63 +622,11 @@ extern u8 D_7004360[]; // fox_versus
extern u16 D_7004460[]; // fox_versus
extern u8 D_70044D0[]; // fox_versus
extern u16 D_7004990[]; // fox_versus
extern Gfx D_7007350[]; // fox_edisplay
extern Gfx D_700AB70[]; // fox_edata_1C
extern Gfx D_700BB10[]; // fox_edisplay
extern Gfx D_700BE00[]; // fox_edata_1C
extern Animation D_700CAF4; // fox_enmy2
extern u16 D_700E9A0[]; // fox_option
extern u8 D_70118E0[]; // fox_versus, fox_option
extern u16 D_70123F8[]; // fox_versus, fox_option
// ast_8_ti, ast_option
extern u8 D_8000000[]; // option
extern u16 D_8000680[]; // option
extern u8 D_80006A0[]; // option
extern u16 D_80017A0[]; // option
extern u8 D_80017C0[]; // option
extern u16 D_80038C0[]; // option
extern u8 D_80038E0[]; // option
extern u8 D_8003930[]; // option
extern u8 D_8003950[]; // option
extern u8 D_80039A8[]; // option
extern u8 D_8003A70[]; // option
extern u8 D_8003AB8[]; // option
extern u8 D_8003AE0[]; // option
extern u8 D_8003B28[]; // option
extern u8 D_8003B50[]; // option
extern u8 D_80046B0[]; // option
extern u8 D_8004C50[]; // option
extern u8 D_8005CD0[]; // option
extern u8 D_8006280[]; // option
extern u8 D_80064F0[]; // option
extern u8 D_80069C0[]; // option
extern u8 D_8006D10[]; // option
extern u8 D_8006E50[]; // option
extern u8 D_8007210[]; // option
extern u8 D_80076E0[]; // option
extern u8 D_80079F0[]; // option
extern u8 D_80080F0[]; // option
extern u8 D_80084B0[]; // option
extern u8 D_8008A30[]; // unused?
extern u8 D_8008DA0[]; // option
extern u8 D_80098E0[]; // unused?
extern u8 D_8009980[]; // option
extern u8 D_8009B00[]; // option
extern u8 D_8009CE0[]; // option
extern u8 D_800B5E0[]; // unused?
extern u8 D_800B680[]; // option
extern u8 D_800C640[]; // unused?
extern u8 D_800CD90[]; // option
extern u8 D_800D070[]; // option
extern u8 D_800D170[]; // option
extern u8 D_800D1F0[];
extern u8 D_800E130[];
extern u16 D_800E170[];
extern Gfx D_8015550[];
extern Gfx D_8015DF0[];
// ast_9_ti, ast_ve1_boss, ast_font_3d
// ast_9_ti, ast_ve1_boss
extern Gfx D_9002CF0[];
extern u16 D_9003330[];
extern u16 D_9003890[];
@@ -992,62 +644,6 @@ extern Gfx D_9023290[];
extern Gfx D_90234D0[];
extern Gfx D_9023AD0[];
// ast_A_ti
extern Gfx D_A000000[];
// segment B is unused
// ast_andross
extern Gfx D_C017440[];
extern ObjectInit* D_C0356A4[];
extern u16* D_C037E3C[];
extern f32 D_C038A48[];
extern f32 D_C038B40[];
extern f32 D_C038B40[];
extern f32 D_C038BA4[];
extern f32 D_C038BD8[];
extern f32 D_C038DC0[];
extern f32 D_C038F24[];
extern Gfx D_C039208[];
// ast_great_fox
extern Gfx D_E000000[];
extern Gfx D_E003AB0[];
extern Gfx D_E00DFB0[];
extern u16 D_E00E100[];
extern u16 D_E00F020[];
extern u16 D_E00FF40[];
extern u16 D_E010E60[];
// ast_logo
extern u16 D_F000000[];
extern u16 D_F000800[];
extern u16 D_F001000[];
extern u16 D_F001800[];
extern u16 D_F002000[];
// ast_star_wolf
extern u16 D_F000000[];
extern u16 D_F000F20[];
extern u16 D_F001E40[];
extern u16 D_F002D60[];
extern u16 D_F003C80[];
extern u16 D_F004BA0[];
extern u16 D_F005AC0[];
extern u16 D_F0069E0[];
extern u16 D_F007900[];
extern u16 D_F008820[];
extern u16 D_F009740[];
extern u16 D_F00A660[];
extern u16 D_F00B580[];
extern u16 D_F00C4A0[];
extern u16 D_F00D3C0[];
extern u16 D_F00E2E0[];
extern Gfx D_F00F200[];
extern Gfx D_F0103D0[];
extern Gfx D_F014180[];
extern Gfx D_F014310[];
// fox_map, to be ordered later
extern f32 D_603E118[];
@@ -1102,25 +698,4 @@ extern Gfx D_6055F20[];
extern Gfx D_605C230[];
extern Gfx D_6060610[];
extern Gfx D_9006AE0[];
extern Gfx D_9000570[];
extern Gfx D_90086F0[];
extern Gfx D_9002EA0[];
extern Gfx D_9005380[];
extern Gfx D_90075A0[];
extern Gfx D_9004230[];
extern Gfx D_C001880[];
extern f32 D_C037FCC[];
extern f32 D_C0380C0[];
extern f32 D_C0381B4[];
extern f32 D_C0382A8[];
extern f32 D_C03839C[];
extern f32 D_C038490[];
extern f32 D_C038584[];
extern f32 D_C038678[];
extern f32 D_C03876C[];
extern f32 D_C038860[];
extern f32 D_C038954[];
#endif // ASSETS_H
include/assets/ast_7_ti_2.h
+14
View File
@@ -5,4 +5,18 @@
#include "sf64object.h"
#include "structs.h"
extern Animation D_7003EE8;
extern Animation D_70084CC;
extern Animation D_70096EC;
extern Animation D_700E244;
extern Gfx D_7003F00[];
extern Gfx D_7004270[];
extern Gfx D_7004400[];
extern Gfx D_70045D0[];
extern Gfx D_70049C0[];
extern Gfx D_7004E80[];
extern Gfx D_7005300[];
extern Gfx D_7009700[];
extern Gfx D_7009890[];
#endif
include/assets/ast_8_ti.h
+22
View File
@@ -5,4 +5,26 @@
#include "sf64object.h"
#include "structs.h"
extern Animation D_8000708;
extern Animation D_8000D80;
extern Animation D_8008FE8;
extern UNK_TYPE D_8000FC0[];
extern Gfx D_8000D90[];
extern Gfx D_80011C0[];
extern Gfx D_80014A0[];
extern Gfx D_8001630[];
extern Gfx D_80018D0[];
extern Gfx D_8001A80[];
extern Gfx D_8001D20[];
extern Gfx D_8001E20[];
extern Gfx D_8001FB0[];
extern Gfx D_80020D0[];
extern Gfx D_8002360[];
extern Gfx D_8003640[];
extern Gfx D_8009000[];
extern UNK_TYPE D_8008A30[]; // unused?
extern UNK_TYPE D_80098E0[]; // unused?
extern UNK_TYPE D_800B5E0[]; // unused?
extern UNK_TYPE D_800C640[]; // unused?
#endif
include/assets/ast_andross.h
+20
View File
@@ -5,24 +5,34 @@
#include "sf64object.h"
#include "structs.h"
extern u8 D_C000A80[];
extern Gfx D_C001880[];
extern Animation D_C00208C;
extern Animation D_C002654;
extern Animation D_C002B08;
extern Gfx D_C002B20[];
extern Gfx D_C002B20[];
extern Gfx D_C002F00[];
extern Gfx D_C002F00[];
extern Gfx D_C0043D0[];
extern Gfx D_C0043D0[];
extern Gfx D_C004860[];
extern Gfx D_C004860[];
extern Animation D_C006F08;
extern Animation D_C00DE48;
extern Animation D_C00E598;
extern Gfx D_C015740[];
extern Gfx D_C015740[];
extern Animation D_C017050;
extern Animation D_C017430;
extern Gfx D_C017440[];
extern Vtx D_C017598[];
extern Vtx D_C017598[];
extern Animation D_C018BC4;
extern Limb* D_C01CC3C[];
extern Limb* D_C01CC3C[];
extern Gfx D_C022520[];
extern Gfx D_C022520[];
extern Animation D_C023B54;
extern Animation D_C0240D0;
@@ -33,9 +43,14 @@ extern Animation D_C02EDA0;
extern Animation D_C030244;
extern Animation D_C033780;
extern Animation D_C033D98;
extern EnvSettings D_C035110;
extern ObjectInit D_C0356A4[];
extern ObjectInit D_C0356CC[];
extern ObjectInit D_C036310[];
extern ObjectInit D_C036310[];
extern ObjectInit D_C036B6C[];
extern ObjectInit D_C036B6C[];
extern ObjectInit D_C03733C[];
extern ObjectInit D_C03733C[];
extern u16* D_C037E3C[];
extern f32 D_C037FCC[];
@@ -51,15 +66,20 @@ extern f32 D_C038860[];
extern f32 D_C038954[];
extern f32 D_C038A48[];
extern Gfx D_C038AC4[];
extern Gfx D_C038AC4[];
extern f32 D_C038B40[];
extern f32 D_C038B40[];
extern f32 D_C038BA4[];
extern f32 D_C038BD8[];
extern f32 D_C038CCC[];
extern f32 D_C038DC0[];
extern f32 D_C038F24[];
extern Vtx D_C038FE8[];
extern Vtx D_C038FE8[];
extern Gfx D_C039208[];
extern u32 D_C039290[];
extern u32 D_C039290[];
extern u32 D_C03A290[];
extern u32 D_C03A290[];
#endif
include/assets/ast_common.h
+73 -9
View File
@@ -5,7 +5,14 @@
#include "sf64object.h"
#include "structs.h"
extern u8 D_1000000[];
extern u8 D_1000280[];
extern u8 D_1000640[];
extern u16 D_1000E80[];
extern u16 D_1002040[];
extern u16 D_1002280[];
extern u16 D_10030D0[];
extern Gfx D_1003130[];
extern u16 D_10032A0[];
extern u16 D_10041C0[];
extern u16 D_10050E0[];
@@ -19,23 +26,48 @@ extern u16 D_100BAC0[];
extern u16 D_100C9E0[];
extern u16 D_100D900[];
extern u16 D_100E820[];
extern u8 D_1011A40[];
extern s32 D_1011280[];
extern s32 D_10116A0[];
extern s32 D_10116B0[];
extern s32 D_1011730[];
extern u8 D_1011A40[];
extern u16 D_1011AB0[];
extern u8 D_1011E80[];
extern s32 D_1011AC0[];
extern s32 D_1011B90[];
extern s32 D_1011BB0[];
extern s32 D_1011C80[];
extern s32 D_1011CA0[];
extern s32 D_1011D70[];
extern s32 D_1011D90[];
extern s32 D_1011E60[];
extern u8 D_1011E80[];
extern u16 D_1011EC0[];
extern u8 D_1011ED0[];
extern u8 D_1011ED0[];
extern u16 D_1011F08[];
extern Gfx D_1011F20[];
extern u8 D_10127D0[];
extern Gfx D_1012110[];
extern u8 D_10127D0[];
extern u16 D_1012898[];
extern u8 D_10128C0[];
extern u8 D_10128C0[];
extern u16 D_1012988[];
extern u8 D_10129C0[];
extern u8 D_10129C0[];
extern u16 D_1013090[];
extern u8 D_1013170[];
extern u8 D_1013170[];
extern u16 D_1013570[];
extern s32 D_1013580[];
extern s32 D_1013700[];
extern Gfx D_1015320[];
extern Gfx D_1015510[];
extern Gfx D_10156A0[];
extern Gfx D_1015810[];
extern Gfx D_1015980[];
extern Gfx D_1015B70[];
extern Gfx D_1015CE0[];
extern Gfx D_1015E50[];
extern Gfx D_1015FC0[];
extern Gfx D_1016130[];
extern Gfx D_10162A0[];
extern Gfx D_1016410[];
extern Gfx D_1016580[];
extern Gfx D_1016870[];
extern Gfx D_10177C0[];
@@ -49,7 +81,18 @@ extern Gfx D_101A8E0[];
extern Gfx D_101ABD0[];
extern Gfx D_101AD20[];
extern Gfx D_101AED0[];
extern Gfx D_101C2E0[];
extern Gfx D_101B1A0[];
extern Gfx D_101B310[];
extern Gfx D_101B480[];
extern Gfx D_101B5F0[];
extern Gfx D_101B760[];
extern Gfx D_101B8D0[];
extern Gfx D_101BA40[];
extern Gfx D_101BBB0[];
extern Gfx D_101BD20[];
extern Gfx D_101BE90[];
extern Gfx D_101C000[];
extern Gfx D_101C170[];
extern Gfx D_101C2E0[];
extern Gfx D_101CAE0[];
extern Gfx D_101CD70[];
@@ -68,7 +111,8 @@ extern Gfx D_1024410[];
extern Gfx D_1024570[];
extern Gfx D_10246D0[];
extern Gfx D_1024830[];
extern u8 D_1024A58[];
extern Gfx D_1024990[];
extern u8 D_1024A58[];
extern Gfx D_1024AC0[];
extern Gfx D_1024F60[];
extern Gfx D_1025800[];
@@ -84,5 +128,25 @@ extern u16 D_102FF08[];
extern Gfx D_1031630[];
extern Gfx D_1031EC0[];
extern Gfx D_1032780[];
extern u8 D_1010660[];
extern u8 D_10106B0[];
extern u8 D_1010700[];
extern u8 D_1010750[];
extern u8 D_10107A0[];
extern u8 D_10107F0[];
extern u8 D_1010840[];
extern u8 D_1010890[];
extern u8 D_10108E0[];
extern u8 D_1010930[];
extern u16 D_10106A0[];
extern u16 D_10106F0[];
extern u16 D_1010740[];
extern u16 D_1010790[];
extern u16 D_10107E0[];
extern u16 D_1010830[];
extern u16 D_1010880[];
extern u16 D_10108D0[];
extern u16 D_1010920[];
extern u16 D_1010970[];
#endif
include/assets/ast_vs_player.h
+111
View File
@@ -3,6 +3,117 @@
#include "gfx.h"
#include "sf64object.h"
#include "sf64level.h"
#include "structs.h"
extern u8 D_3000000[];
extern u16 D_3000080[];
extern u8 D_30001E0[];
extern u16 D_3000380[];
extern u8 D_30003A0[];
extern u16 D_30004E0[];
extern u8 D_3000510[];
extern u16 D_30006A0[];
extern u8 D_30006D0[];
extern u16 D_3000810[];
extern u16 D_3000B20[];
extern u16 D_3000BC0[];
extern u8 D_30013E0[];
extern u8 D_3001420[];
extern u16 D_3003E20[];
extern u8 D_3004010[];
extern u16 D_3004D58[];
extern u8 D_3004F60[];
extern u16 D_3005E38[];
extern u8 D_3006040[];
extern u16 D_3006A68[];
extern u8 D_3006C60[];
extern u16 D_3007500[];
extern u8 D_30076C0[];
extern u16 D_3008598[];
extern u8 D_30087A0[];
extern u16 D_3008DE0[];
extern u8 D_3008EC0[];
extern u16 D_30098C0[];
extern u8 D_3009990[];
extern u16 D_300A390[];
extern u8 D_300A470[];
extern u16 D_300B218[];
extern u8 D_300B3F0[];
extern u16 D_300C458[];
extern u8 D_300D350[];
extern u16 D_300D398[];
extern u8 D_300D3C0[];
extern u16 D_300D408[];
extern u8 D_300D440[];
extern u16 D_300D500[];
extern Gfx D_300D550[];
extern Gfx D_300EE80[];
extern Gfx D_300FB80[];
extern Gfx D_3010A90[];
extern Gfx D_3011470[];
extern Gfx D_3011E40[];
extern Gfx D_3012ED0[];
extern Gfx D_3013580[];
extern Gfx D_3013780[];
extern Gfx D_30146B0[];
extern Gfx D_30155E0[];
extern Gfx D_3015740[];
extern Gfx D_30160A0[];
extern Gfx D_3016660[];
extern Gfx D_3016B00[];
extern Gfx D_30173C0[];
extern Gfx D_30174E0[];
extern Gfx D_3017600[];
extern Gfx D_3017600[];
extern Gfx D_3018800[];
extern Gfx D_301AD60[];
extern Gfx D_301AEF0[];
extern Gfx D_301B080[];
extern Gfx D_301B6E0[];
extern Animation D_301C3A8;
extern Limb* D_301C614[];
extern Animation D_301CFEC;
extern Limb* D_301D258[];
extern Animation D_301D888;
extern Limb* D_301DB94[];
extern Animation D_301E19C;
extern Limb* D_301E3E8[];
extern Gfx D_301E570[];
extern Gfx D_301F140[];
extern Gfx D_301FD20[];
extern Gfx D_302D120[];
extern Gfx D_302D240[];
extern Gfx D_302D4D0[];
extern EnvSettings D_302DD70;
extern EnvSettings D_302DDB4;
extern EnvSettings D_302DDF8;
extern ObjectInit D_302DE3C[];
extern ObjectInit D_302E0E4[];
extern ObjectInit D_302E170[];
extern ObjectInit D_302E378[];
extern Vec3f D_302E56C[];
extern Vec3f D_302E65C[];
extern Vec3f D_302E74C[];
extern Vec3f D_302E830[];
extern Vec3f D_302E95C[];
extern Vec3f D_302EA4C[];
extern Vec3f D_302EB3C[];
extern Vec3f D_302EC20[];
extern f32 D_302ED4C[];
extern f32 D_302ED98[];
extern f32 D_302EDB4[];
extern f32 D_302EE00[];
extern f32 D_302EE64[];
extern f32 D_302EE80[];
extern f32 D_302EE9C[];
extern Triangle D_302EEE8[];
extern Vec3f D_302EF00[];
extern Triangle D_302EF6C[];
extern Vec3f D_302EF84[];
extern Triangle D_302EFF0[];
extern Vec3f D_302F008[];
extern Triangle D_302F044[];
extern Vec3f D_302F098[];
#endif
include/fox_edisplay_assets.h
-1
View File
@@ -126,7 +126,6 @@ extern Gfx D_6029530[];
extern Gfx D_60296A0[];
extern Gfx D_6028A80[];
extern Gfx D_6028910[];
extern Gfx D_6014FD0[];
extern Gfx D_601EDE0[];
extern Gfx D_601F2F0[];
extern Gfx D_601F830[];
include/fox_enmy2_assets.h
-30
View File
@@ -3,8 +3,6 @@
#include "global.h"
extern Limb* D_700CB60[];
// Displaylists
extern Gfx D_40068F0[];
@@ -22,26 +20,13 @@ extern Gfx D_601F2A0[];
extern Gfx D_400AAE0[];
extern Gfx D_4000650[];
extern Gfx D_6016190[];
extern Gfx D_6023500[];
extern Gfx D_6022DF0[];
extern Gfx D_4008FA0[];
extern Gfx D_60285F0[];
extern Gfx D_600AF70[];
extern Gfx D_6023E30[];
extern Gfx D_6001CE0[];
extern Gfx D_6000840[];
extern Gfx D_6012A40[];
extern Gfx D_6009950[];
extern Gfx D_600B2B0[];
extern Gfx D_600A2E0[];
extern Gfx D_600B830[];
extern Gfx D_6020D20[];
extern Gfx D_60102C0[];
extern Gfx D_6017B60[];
extern Gfx D_6004D00[];
extern Gfx D_601A880[];
extern Gfx D_6015D60[];
extern Gfx D_600B540[];
extern Gfx D_4000EC0[];
extern Gfx D_4008D50[];
extern Gfx D_60102C0[];
@@ -55,7 +40,6 @@ extern Gfx D_600C2A0[];
extern Gfx D_600BD40[];
extern Gfx D_60205D0[];
extern Gfx D_60036A0[];
extern Gfx D_3007650[];
extern Gfx D_60034D0[];
extern Gfx D_6005360[];
extern Gfx D_601B610[];
@@ -73,25 +57,13 @@ extern Gfx D_6004310[];
extern Gfx D_6002890[];
extern f32 D_60282A0[];
extern f32 D_603298C[];
extern f32 D_6032904[];
extern f32 D_6032970[];
extern f32 D_603285C[];
extern f32 D_6032938[];
extern f32 D_6032954[];
extern f32 D_6028254[];
extern f32 D_60280E0[];
extern f32 D_6032878[];
extern f32 D_6032894[];
extern f32 D_60328B0[];
extern f32 D_603238C[];
extern f32 D_60328CC[];
extern f32 D_6034478[];
extern f32 D_603450C[];
extern f32 D_6034588[];
extern f32 D_6034124[];
extern f32 D_602C1A0[];
extern f32 D_60328E8[];
extern f32 D_602F604[];
extern f32 D_603445C[];
extern f32 D_6034664[];
@@ -101,9 +73,7 @@ extern f32 D_60347F0[];
extern f32 D_603486C[];
extern f32 D_602C294[];
extern f32 D_601B474[];
extern f32 D_6030B4C[];
extern f32 D_601B43C[];
extern f32 D_6030B30[];
extern f32 D_60368FC[];
extern f32 D_60368E0[];
extern f32 D_60364C0[];
include/fox_enmy_assets.h
+2 -2
View File
@@ -5,7 +5,7 @@
extern ObjectInit D_60371A4[];
extern ObjectInit D_6026CC4[];
extern ObjectInit D_602A164[];
extern ObjectInit D_SX_602A164[];
extern ObjectInit D_6023F64[];
extern ObjectInit D_60287A4[];
extern ObjectInit D_602E4F4[];
@@ -13,7 +13,7 @@ extern ObjectInit D_6007E74[];
extern ObjectInit D_601F234[];
extern ObjectInit D_6026714[];
extern ObjectInit D_0C035154[];
extern ObjectInit D_6006AA4[];
extern ObjectInit D_TR_6006AA4[];
extern ObjectInit D_6031000[];
extern ObjectInit D_6006C60[];
extern ObjectInit D_602E5C8[];
include/fox_option_assets.h
-59
View File
@@ -3,39 +3,18 @@
#include "global.h"
extern u8 D_80039D0[];
extern u16 D_8003A50[];
extern u8 D_8003B50[];
extern u8 D_8003EB0[];
extern u8 D_8004270[];
extern u8 D_80043B0[];
extern u8 D_80046B0[];
extern u8 D_8004930[];
extern u8 D_8005010[];
extern u8 D_80054F0[];
extern u8 D_8005910[];
extern u16 D_8013990[];
extern u16 D_80141B0[];
extern u8 D_80143B0[];
extern u16 D_80147B0[];
extern u8 D_70030B0[];
extern u8 D_7003290[];
extern u8 D_7003470[];
extern u8 D_70049C0[];
extern u8 D_7004BB0[];
extern u8 D_7004DC0[];
extern u8 D_7005020[];
extern u8 D_7000000[];
extern u8 D_70000D0[];
extern u8 D_7000210[];
extern u8 D_7000350[];
extern u16 D_7004B80[];
extern u8 D_8000000[];
extern u16 D_7004D90[];
extern u16 D_7004FF0[];
extern u16 D_70051A0[];
@@ -43,44 +22,6 @@ extern u16 D_7008EE0[];
extern u16 D_700AD20[];
extern u16 D_700CB60[];
extern u16 D_70070A0[];
extern Gfx D_90086F0[];
extern Gfx D_9007FD0[];
extern Gfx D_9007BB0[];
extern Gfx D_9000980[];
extern Gfx D_90075A0[];
extern Gfx D_90070C0[];
extern Gfx D_9006AE0[];
extern Gfx D_9006500[];
extern Gfx D_90062D0[];
extern Gfx D_9001120[];
extern Gfx D_9005CA0[];
extern Gfx D_9005980[];
extern Gfx D_9005380[];
extern Gfx D_9004E10[];
extern Gfx D_9000570[];
extern Gfx D_90014E0[];
extern Gfx D_9004920[];
extern Gfx D_9004230[];
extern Gfx D_9003A30[];
extern Gfx D_9003620[];
extern Gfx D_9003230[];
extern Gfx D_9002EA0[];
extern Gfx D_9002890[];
extern Gfx D_90022A0[];
extern Gfx D_9001E90[];
extern Gfx D_9001A10[];
extern Gfx D_900BB90[];
extern Gfx D_90001F0[];
extern Gfx D_900B580[];
extern Gfx D_900AF60[];
extern Gfx D_900A870[];
extern Gfx D_900A290[];
extern Gfx D_9009CB0[];
extern Gfx D_9009990[];
extern Gfx D_9009280[];
extern Gfx D_9008C60[];
extern Gfx D_9000000[];
extern u8 D_70017B0[];
extern u8 D_70019E0[];
extern u8 D_7005600[];
include/fox_std_lib_assets.h
-28
View File
@@ -1,28 +0,0 @@
#ifndef FOX_STD_LIB_ASSETS_H
#define FOX_STD_LIB_ASSETS_H
#include "global.h"
extern u8 D_1010660[];
extern u8 D_10106B0[];
extern u8 D_1010700[];
extern u8 D_1010750[];
extern u8 D_10107A0[];
extern u8 D_10107F0[];
extern u8 D_1010840[];
extern u8 D_1010890[];
extern u8 D_10108E0[];
extern u8 D_1010930[];
extern u16 D_10106A0[];
extern u16 D_10106F0[];
extern u16 D_1010740[];
extern u16 D_1010790[];
extern u16 D_10107E0[];
extern u16 D_1010830[];
extern u16 D_1010880[];
extern u16 D_10108D0[];
extern u16 D_1010920[];
extern u16 D_1010970[];
#endif
include/fox_versus_assets.h
-22
View File
@@ -1,22 +0,0 @@
#ifndef FOX_VERSUS_ASSETS_H
#define FOX_VERSUS_ASSETS_H
#include "global.h"
extern u8 D_30087A0[];
extern u8 D_3008EC0[];
extern u8 D_3009990[];
extern u8 D_3006040[];
extern u8 D_30076C0[];
extern u8 D_300B3F0[];
extern u8 D_3004F60[];
extern u16 D_3008DE0[];
extern u16 D_30098C0[];
extern u16 D_300A390[];
extern u16 D_3006A68[];
extern u16 D_3008598[];
extern u16 D_300C458[];
extern u16 D_3005E38[];
#endif
include/global.h
+1
View File
@@ -19,6 +19,7 @@
#include "i4.h"
#include "i5.h"
#include "i6.h"
#include "assets/ast_common.h"
#include "assets.h"
#endif // GLOBAL_H
include/i6.h
+2
View File
@@ -24,6 +24,8 @@ extern f32 D_i6_801A7F70;
extern f32 D_i6_801A7F74;
extern f32 D_i6_801A7F78;
extern f32 D_i6_801A7F7C;
extern Vec3f D_i6_801A7F80[100];
extern f32 D_i6_801A8430;
void func_i6_80187530(Actor*);
void func_i6_80193C4C(Player*);
include/sf64mesg.h
+2 -2
View File
@@ -93,8 +93,8 @@ typedef enum {
RCID_ROB64_TITLE_OPEN,
RCID_GEN_PEPPER_TITLE = 310,
RCID_GEN_PEPPER_TITLE_OPEN,
RCID_TRAINING = 350,
RCID_TRAINING_OPEN,
RCID_TR = 350,
RCID_TR_OPEN,
RCID_FOX_EXPERT = 400,
RCID_FOX_EXPERT_OPEN,
} RadioCharacterId;
linker_scripts/us/symbol_addrs_assets.txt
+11
View File
@@ -54,3 +54,14 @@ D_800DD200 = 0x800DD200; // size:0x80 type:s16
gHeadsetPanVolume = 0x800DD280; // size:0x200 type:f32
gStereoPanVolume = 0x800DD480; // size:0x200 type:f32
gDefaultPanVolume = 0x800DD680; // size:0x200 type:f32
D_AQ_6000AE4 = 0x06000AE4;
D_AQ_6002628 = 0x06002628;
D_AQ_60260EC = 0x060260EC;
D_AQ_60314AC = 0x060314AC;
D_TI1_70067C4 = 0x70067C4;
D_TI1_7006990 = 0x7006990;
D_TI1_7006F74 = 0x7006F74;
D_TI1_7007130 = 0x7007130;
D_TI1_7007234 = 0x7007234;
D_TI1_700733C = 0x700733C;
linker_scripts/us/undefined_syms.ld
+227 -222
View File
@@ -137,7 +137,7 @@ D_60023B0 = 0x060023B0;
D_6002990 = 0x06002990;
D_6003000 = 0x06003000;
D_60034D0 = 0x060034D0;
D_6003610 = 0x06003610;
D_AQ_6003610 = 0x06003610;
D_60036A0 = 0x060036A0;
D_6004170 = 0x06004170;
D_6004AC0 = 0x06004AC0;
@@ -187,11 +187,11 @@ D_600A420 = 0x0600A420;
D_600AF40 = 0x0600AF40;
D_600B8B0 = 0x0600B8B0;
D_600BAF0 = 0x0600BAF0;
D_600BF80 = 0x0600BF80;
D_AQ_600BF80 = 0x0600BF80;
D_600E820 = 0x0600E820;
D_600EC90 = 0x0600EC90;
D_600EE10 = 0x0600EE10;
D_600EEF0 = 0x0600EEF0;
D_AQ_600EE10 = 0x0600EE10;
D_AQ_600EEF0 = 0x0600EEF0;
D_600F1DC = 0x0600F1DC;
D_600F394 = 0x0600F394;
D_600F3F4 = 0x0600F3F4;
@@ -223,8 +223,8 @@ D_6011BF4 = 0x06011BF4;
D_6011C10 = 0x06011C10;
D_6011C48 = 0x06011C48;
D_6011C80 = 0x06011C80;
D_6011EE0 = 0x06011EE0;
D_60120F0 = 0x060120F0;
D_AQ_6011EE0 = 0x06011EE0;
D_AQ_60120F0 = 0x060120F0;
D_6012C00_Gfx = 0x06012C00;
D_6012C00_Anim = 0x06012C00;
D_60132B0 = 0x060132B0;
@@ -238,11 +238,11 @@ D_6014A20 = 0x06014A20;
D_6014B50 = 0x06014B50;
D_6014FEC = 0x06014FEC;
D_60153B0 = 0x060153B0;
D_6015730 = 0x06015730;
D_AQ_6015730 = 0x06015730;
D_6015CE0 = 0x06015CE0;
D_6015F00 = 0x06015F00;
D_6015FF0 = 0x06015FF0;
D_6015DD0 = 0x06015DD0;
D_AQ_6015FF0 = 0x06015FF0;
D_AQ_6015DD0 = 0x06015DD0;
D_6016270 = 0x06016270;
D_6016374 = 0x06016374;
D_60164F0 = 0x060164F0;
@@ -278,14 +278,14 @@ D_601BEC0 = 0x0601BEC0;
D_601C6A0 = 0x0601C6A0;
D_601C9B0 = 0x0601C9B0;
D_601D730 = 0x0601D730;
D_601DE60 = 0x0601DE60;
D_AQ_601DE60 = 0x0601DE60;
D_601F1D0 = 0x0601F1D0;
D_601F500 = 0x0601F500;
D_601F5A0 = 0x0601F5A0;
D_601FCB0 = 0x0601FCB0;
D_6022340 = 0x06022340;
D_6022110 = 0x06022110;
D_60231C0 = 0x060231C0;
D_AQ_6022110 = 0x06022110;
D_AQ_60231C0 = 0x060231C0;
D_60238F0 = 0x060238F0;
D_60239E0 = 0x060239E0;
D_6023730 = 0x06023730;
@@ -300,7 +300,7 @@ D_6027900 = 0x06027900;
D_6028454 = 0x06028454;
D_6029170 = 0x06029170;
D_6029220 = 0x06029220;
D_602B4C0 = 0x0602B4C0;
D_AQ_602B4C0 = 0x0602B4C0;
D_602B620 = 0x0602B620;
D_602B9EC = 0x0602B9EC;
D_602BA20 = 0x0602BA20;
@@ -347,21 +347,21 @@ D_6030500 = 0x06030500;
D_6030550 = 0x06030550;
D_60305DC = 0x060305DC;
D_6030630 = 0x06030630;
D_6030B10 = 0x06030B10;
D_6030B14_f32 = 0x6030B14;
D_6030BE0 = 0x06030BE0;
D_6030BFC = 0x06030BFC;
D_6030C18 = 0x06030C18;
D_6030C44 = 0x06030C44;
D_6030C60 = 0x06030C60;
D_6030C7C = 0x06030C7C;
D_6030D20 = 0x06030D20;
D_6030D74 = 0x06030D74;
D_6030DF8 = 0x06030DF8;
D_6030E14 = 0x06030E14;
D_6030E30_Hitbox = 0x06030E30;
D_6030E4C = 0x06030E4C;
D_6030E68 = 0x06030E68;
D_AQ_6030B10 = 0x06030B10;
D_AQ_6030B14_f32 = 0x6030B14;
D_AQ_6030BE0 = 0x06030BE0;
D_AQ_6030BFC = 0x06030BFC;
D_AQ_6030C18 = 0x06030C18;
D_AQ_6030C44 = 0x06030C44;
D_AQ_6030C60 = 0x06030C60;
D_AQ_6030C7C = 0x06030C7C;
D_AQ_6030D20 = 0x06030D20;
D_AQ_6030D74 = 0x06030D74;
D_AQ_6030DF8 = 0x06030DF8;
D_AQ_6030E14 = 0x06030E14;
D_AQ_6030E30_Hitbox = 0x06030E30;
D_AQ_6030E4C = 0x06030E4C;
D_AQ_6030E68 = 0x06030E68;
D_6030E74 = 0x06030E74;
D_6030E80 = 0x06030E80;
D_6030EB0 = 0x06030EB0;
@@ -371,32 +371,32 @@ D_6030EF8 = 0x06030EF8;
D_6030F28 = 0x06030F28;
D_6030F34 = 0x06030F34;
D_6030F64 = 0x06030F64;
D_6030F74 = 0x06030F74;
D_AQ_6030F74 = 0x06030F74;
D_6030F7C = 0x06030F7C;
D_6030FC4 = 0x06030FC4;
D_6030FD0 = 0x06030FD0;
D_6031398 = 0x06031398;
D_60313CC = 0x060313CC;
D_6031400 = 0x06031400;
D_603144C = 0x0603144C;
D_6031480 = 0x06031480;
D_60314C8 = 0x060314C8;
D_6031500 = 0x06031500;
D_6031538 = 0x06031538;
D_6031554 = 0x06031554;
D_6031570 = 0x06031570;
D_AQ_6031398 = 0x06031398;
D_AQ_60313CC = 0x060313CC;
D_AQ_6031400 = 0x06031400;
D_AQ_603144C = 0x0603144C;
D_AQ_6031480 = 0x06031480;
D_AQ_60314C8 = 0x060314C8;
D_AQ_6031500 = 0x06031500;
D_AQ_6031538 = 0x06031538;
D_AQ_6031554 = 0x06031554;
D_AQ_6031570 = 0x06031570;
D_603184C = 0x0603184C;
D_6031FB0 = 0x06031FB0;
D_AQ_6031FB0 = 0x06031FB0;
D_6031FE0 = 0x06031FE0;
D_603204C = 0x0603204C;
D_60320B8 = 0x060320B8;
D_AQ_60320B8 = 0x060320B8;
D_603216C = 0x0603216C;
D_6032388 = 0x06032388;
D_AQ_6032388 = 0x06032388;
D_60323D0 = 0x060323D0;
D_6032430 = 0x06032430;
D_6032488 = 0x06032488;
D_60324EC = 0x060324EC;
D_6032550 = 0x06032550;
D_SX_6032488 = 0x06032488;
D_SX_60324EC = 0x060324EC;
D_SX_6032550 = 0x06032550;
D_6033070 = 0x06033070;
D_6033E08 = 0x06033E08;
D_603405C = 0x0603405C;
@@ -507,7 +507,7 @@ D_6037160 = 0x06037160;
D_601E424 = 0x0601E424;
D_6026C80 = 0x06026C80;
D_6029BE4 = 0x06029BE4;
D_602A120 = 0x0602A120;
D_SX_602A120 = 0x0602A120;
D_602A710 = 0x0602A710;
D_6020058 = 0x06020058;
D_6023F20 = 0x06023F20;
@@ -519,7 +519,7 @@ D_60266D0 = 0x060266D0;
D_C035110 = 0x0C035110;
D_6030E30_Env = 0x06030E30;
D_6005000 = 0x06005000;
D_602E540 = 0x0602E540;
D_AQ_602E540 = 0x0602E540;
D_600EA90 = 0x0600EA90;
D_6011000 = 0x06011000;
D_600FF30_Env = 0x0600FF30;
@@ -535,8 +535,8 @@ D_6019670 = 0x06019670;
D_60185E0 = 0x060185E0;
D_6017550 = 0x06017550;
D_700AB70 = 0x0700AB70;
D_700BE00 = 0x0700BE00;
D_TI1_700AB70 = 0x0700AB70;
D_TI1_700BE00 = 0x0700BE00;
D_70111D0 = 0x070111D0;
D_70143C0 = 0x070143C0;
D_7018708 = 0x07018708;
@@ -881,7 +881,7 @@ D_6029530 = 0x06029530;
D_60296A0 = 0x060296A0;
D_6028A80 = 0x06028A80;
D_6028910 = 0x06028910;
D_6014FD0 = 0x06014FD0;
D_AQ_6014FD0 = 0x06014FD0;
D_601EDE0 = 0x0601EDE0;
D_601F2F0 = 0x0601F2F0;
D_601F830 = 0x0601F830;
@@ -1012,7 +1012,7 @@ D_601F3B8 = 0x0601F3B8;
// fox_enmy
D_60371A4 = 0x0060371A4;
D_6026CC4 = 0x006026CC4;
D_602A164 = 0x00602A164;
D_SX_602A164 = 0x00602A164;
D_6023F64 = 0x006023F64;
D_60287A4 = 0x0060287A4;
D_602E4F4 = 0x00602E4F4;
@@ -1020,7 +1020,7 @@ D_6007E74 = 0x006007E74;
D_601F234 = 0x00601F234;
D_6026714 = 0x006026714;
D_0C035154 = 0x00C035154;
D_6006AA4 = 0x006006AA4;
D_TR_6006AA4 = 0x006006AA4;
D_6031000 = 0x006031000;
D_6006C60 = 0x006006C60;
D_602E5C8 = 0x00602E5C8;
@@ -1039,23 +1039,23 @@ D_4001310 = 0x04001310;
D_601F2A0 = 0x0601F2A0;
D_4000650 = 0x04000650;
D_6016190 = 0x06016190;
D_6023500 = 0x06023500;
D_6022DF0 = 0x06022DF0;
D_SX_6023500 = 0x06023500;
D_SX_6022DF0 = 0x06022DF0;
D_4008FA0 = 0x04008FA0;
D_60285F0 = 0x060285F0;
D_600AF70 = 0x0600AF70;
D_6023E30 = 0x06023E30;
D_6001CE0 = 0x06001CE0;
D_SX_60285F0 = 0x060285F0;
D_SX_600AF70 = 0x0600AF70;
D_SX_6023E30 = 0x06023E30;
D_SX_6001CE0 = 0x06001CE0;
D_6012A40 = 0x06012A40;
D_6009950 = 0x06009950;
D_600B2B0 = 0x0600B2B0;
D_600A2E0 = 0x0600A2E0;
D_600B830 = 0x0600B830;
D_SX_6009950 = 0x06009950;
D_SX_600B2B0 = 0x0600B2B0;
D_SX_600A2E0 = 0x0600A2E0;
D_SX_600B830 = 0x0600B830;
D_6017B60 = 0x06017B60;
D_6004D00 = 0x06004D00;
D_601A880 = 0x0601A880;
D_6015D60 = 0x06015D60;
D_600B540 = 0x0600B540;
D_SX_600B540 = 0x0600B540;
D_4000EC0 = 0x04000EC0;
D_4008D50 = 0x04008D50;
D_6022B10 = 0x06022B10;
@@ -1081,25 +1081,25 @@ D_40084D0 = 0x040084D0;
D_400A630 = 0x0400A630;
D_60282A0 = 0x060282A0;
D_603298C = 0x0603298C;
D_6032904 = 0x06032904;
D_6032970 = 0x06032970;
D_603285C = 0x0603285C;
D_6032938 = 0x06032938;
D_6032954 = 0x06032954;
D_SX_603298C = 0x0603298C;
D_SX_6032904 = 0x06032904;
D_SX_6032970 = 0x06032970;
D_SX_603285C = 0x0603285C;
D_SX_6032938 = 0x06032938;
D_SX_6032954 = 0x06032954;
D_6028254 = 0x06028254;
D_60280E0 = 0x060280E0;
D_6032878 = 0x06032878;
D_6032894 = 0x06032894;
D_60328B0 = 0x060328B0;
D_603238C = 0x0603238C;
D_60328CC = 0x060328CC;
D_SX_6032878 = 0x06032878;
D_SX_6032894 = 0x06032894;
D_SX_60328B0 = 0x060328B0;
D_SX_603238C = 0x0603238C;
D_SX_60328CC = 0x060328CC;
D_6034478 = 0x06034478;
D_603450C = 0x0603450C;
D_6034588 = 0x06034588;
D_6034124 = 0x06034124;
D_602C1A0 = 0x0602C1A0;
D_60328E8 = 0x060328E8;
D_SX_60328E8 = 0x060328E8;
D_602F604 = 0x0602F604;
D_603445C = 0x0603445C;
D_6034664 = 0x06034664;
@@ -1109,9 +1109,9 @@ D_60347F0 = 0x060347F0;
D_603486C = 0x0603486C;
D_602C294 = 0x0602C294;
D_601B474 = 0x0601B474;
D_6030B4C = 0x06030B4C;
D_AQ_6030B4C = 0x06030B4C;
D_601B43C = 0x0601B43C;
D_6030B30 = 0x06030B30;
D_AQ_6030B30 = 0x06030B30;
D_60368FC = 0x060368FC;
D_60368E0 = 0x060368E0;
D_60364C0 = 0x060364C0;
@@ -1204,31 +1204,32 @@ D_7005F10 = 0x07005F10;
D_7006EA0 = 0x07006EA0;
D_7006630 = 0x07006630;
D_70024D0 = 0x070024D0;
D_TI1_7002730 = 0x07002730;
D_7002730 = 0x07002730;
D_7002990 = 0x07002990;
D_7002BF0 = 0x07002BF0;
D_7002E50 = 0x07002E50;
// fox_ti
D_700DDF0 = 0x0700DDF0;
D_700D9B0 = 0x0700D9B0;
D_700DF70 = 0x0700DF70;
D_700DC50 = 0x0700DC50;
D_700DED0 = 0x0700DED0;
D_700DAD0 = 0x0700DAD0;
D_700DBB0 = 0x0700DBB0;
D_700E030 = 0x0700E030;
D_700D880 = 0x0700D880;
D_700D740 = 0x0700D740;
D_7005280 = 0x07005280;
D_7003C50 = 0x07003C50;
D_7003E30 = 0x07003E30;
D_7004370 = 0x07004370;
D_7004560 = 0x07004560;
D_7003A90 = 0x07003A90;
D_7005420 = 0x07005420;
D_7003FC0 = 0x07003FC0;
D_7002930 = 0x07002930;
D_TI1_700DDF0 = 0x0700DDF0;
D_TI1_700D9B0 = 0x0700D9B0;
D_TI1_700DF70 = 0x0700DF70;
D_TI1_700DC50 = 0x0700DC50;
D_TI1_700DED0 = 0x0700DED0;
D_TI1_700DAD0 = 0x0700DAD0;
D_TI1_700DBB0 = 0x0700DBB0;
D_TI1_700E030 = 0x0700E030;
D_TI1_700D880 = 0x0700D880;
D_TI1_700D740 = 0x0700D740;
D_TI1_7005280 = 0x07005280;
D_TI1_7003C50 = 0x07003C50;
D_TI1_7003E30 = 0x07003E30;
D_TI1_7004370 = 0x07004370;
D_TI1_7004560 = 0x07004560;
D_TI1_7003A90 = 0x07003A90;
D_TI1_7005420 = 0x07005420;
D_TI1_7003FC0 = 0x07003FC0;
D_TI1_7002930 = 0x07002930;
D_7009700 = 0x07009700;
D_7004E80 = 0x07004E80;
D_70049C0 = 0x070049C0;
@@ -1508,16 +1509,17 @@ D_500A500 = 0x500A500;
D_500B600 = 0x500B600;
D_6000000 = 0x6000000;
D_60005B0 = 0x60005B0;
D_SX_6000840 = 0x6000840;
D_6000840 = 0x6000840;
D_6000A80 = 0x6000A80;
D_6000AE4 = 0x6000AE4;
D_AQ_6000AE4 = 0x6000AE4;
D_6000B60 = 0x6000B60;
D_6000C80 = 0x6000C80;
D_6000D80 = 0x6000D80;
D_6000DB0 = 0x6000DB0;
D_6000E10 = 0x6000E10;
D_AQ_6000DB0 = 0x6000DB0;
D_AQ_6000E10 = 0x6000E10;
D_6001080 = 0x6001080;
D_60010C0 = 0x60010C0;
D_SX_60010C0 = 0x60010C0;
D_6001180 = 0x6001180;
D_6001260 = 0x6001260;
D_60012A0 = 0x60012A0;
@@ -1528,7 +1530,7 @@ D_60014A0 = 0x60014A0;
D_6001530 = 0x6001530;
D_6001840 = 0x6001840;
D_60018C0 = 0x60018C0;
D_6001950 = 0x6001950;
D_SX_6001950 = 0x6001950;
D_6001A10 = 0x6001A10;
D_6001A60 = 0x6001A60;
D_6001A80 = 0x6001A80;
@@ -1538,11 +1540,11 @@ D_6001C64 = 0x6001C64;
D_6001DA0 = 0x6001DA0;
D_6001FB0 = 0x6001FB0;
D_6002020 = 0x6002020;
D_6002628 = 0x6002628;
D_6002874 = 0x6002874;
D_AQ_6002628 = 0x6002628;
D_AQ_6002874 = 0x6002874;
D_6002890 = 0x6002890;
D_60029A0 = 0x60029A0;
D_6002C10 = 0x6002C10;
D_AQ_6002C10 = 0x6002C10;
D_6002E10 = 0x6002E10;
D_6002E60 = 0x6002E60;
D_6002F80 = 0x6002F80;
@@ -1566,18 +1568,18 @@ D_6004900 = 0x6004900;
D_6004FE0 = 0x6004FE0;
D_6005700 = 0x6005700;
D_6005710 = 0x6005710;
D_6005954 = 0x6005954;
D_AQ_6005954 = 0x6005954;
D_60059F0 = 0x60059F0;
D_6005A80 = 0x6005A80;
D_AQ_6005A80 = 0x6005A80;
D_600631C = 0x600631C;
D_6006360 = 0x6006360;
D_600636C = 0x600636C;
D_6006558 = 0x6006558;
D_60066A0 = 0x60066A0;
D_60066D0 = 0x60066D0;
D_60066F0 = 0x60066F0;
D_SX_60066F0 = 0x60066F0;
D_6006750 = 0x6006750;
D_6006810 = 0x6006810;
D_SX_6006810 = 0x6006810;
D_60068F0 = 0x60068F0;
D_6006910 = 0x6006910;
D_6006924 = 0x6006924;
@@ -1611,35 +1613,35 @@ D_6007D90 = 0x6007D90;
D_6007E20 = 0x6007E20;
D_6008770 = 0x6008770;
D_6008830 = 0x6008830;
D_6008970 = 0x6008970;
D_AQ_6008970 = 0x6008970;
D_6008AA0 = 0x6008AA0;
D_6008BB8 = 0x6008BB8;
D_6008EC8 = 0x6008EC8;
D_6008EF8 = 0x6008EF8;
D_6008FC8 = 0x6008FC8;
D_AQ_6008EC8 = 0x6008EC8;
D_TR_6008EF8 = 0x6008EF8;
D_AQ_6008FC8 = 0x6008FC8;
D_6009230 = 0x6009230;
D_6009250 = 0x6009250;
D_6009300 = 0x6009300;
D_60097E0 = 0x60097E0;
D_6009BB8 = 0x6009BB8;
D_6009BC0 = 0x6009BC0;
D_6009C30 = 0x6009C30;
D_SX_6009C30 = 0x6009C30;
D_6009C50 = 0x6009C50;
D_6009D30 = 0x6009D30;
D_6009E30 = 0x6009E30;
D_6009ED0 = 0x6009ED0;
D_6009F10 = 0x6009F10;
D_6009F90 = 0x6009F90;
D_6009FF8 = 0x6009FF8;
D_SX_6009FF8 = 0x6009FF8;
D_600A1F0 = 0x600A1F0;
D_600A220 = 0x600A220;
D_600A2D4 = 0x600A2D4;
D_AQ_600A220 = 0x600A220;
D_SX_600A2D4 = 0x600A2D4;
D_600A4D0 = 0x600A4D0;
D_600A7D0 = 0x600A7D0;
D_600A810 = 0x600A810;
D_600AA70 = 0x600AA70;
D_600AB10 = 0x600AB10;
D_600AB68 = 0x600AB68;
D_AQ_600AB10 = 0x600AB10;
D_AQ_600AB68 = 0x600AB68;
D_600AD50 = 0x600AD50;
D_600AD80 = 0x600AD80;
D_600B0E0 = 0x600B0E0;
@@ -1685,7 +1687,7 @@ D_600D730 = 0x600D730;
D_600D990 = 0x600D990;
D_600D9F0 = 0x600D9F0;
D_600DA10 = 0x600DA10;
D_600DB80 = 0x600DB80;
D_AQ_600DB80 = 0x600DB80;
D_600DBC0 = 0x600DBC0;
D_600DDC0 = 0x600DDC0;
D_600DDF0 = 0x600DDF0;
@@ -1699,7 +1701,7 @@ D_600E5EC = 0x600E5EC;
D_600E7D8 = 0x600E7D8;
D_600E900 = 0x600E900;
D_600E980 = 0x600E980;
D_600EEF0 = 0x600EEF0;
D_AQ_600EEF0 = 0x600EEF0;
D_600EFF0 = 0x600EFF0;
D_600F160 = 0x600F160;
D_600F1D0 = 0x600F1D0;
@@ -1713,8 +1715,8 @@ D_600F4A4 = 0x600F4A4;
D_600F670 = 0x600F670;
D_600F6C0 = 0x600F6C0;
D_600F744 = 0x600F744;
D_600F890 = 0x600F890;
D_600F8A0 = 0x600F8A0;
D_SX_600F890 = 0x600F890;
D_SX_600F8A0 = 0x600F8A0;
D_600F940 = 0x600F940;
D_600F9B0 = 0x600F9B0;
D_600FEC4 = 0x600FEC4;
@@ -1736,18 +1738,19 @@ D_6010FA0 = 0x6010FA0;
D_60117E0 = 0x60117E0;
D_6011890 = 0x6011890;
D_6011910 = 0x6011910;
D_60119A0 = 0x60119A0;
D_6011A78 = 0x6011A78;
D_AQ_60119A0 = 0x60119A0;
D_AQ_6011A78 = 0x6011A78;
D_6011B40 = 0x6011B40;
D_6011BA4 = 0x6011BA4;
D_6011E28 = 0x6011E28;
D_6012310 = 0x6012310;
D_60123BC = 0x60123BC;
D_SX_60123BC = 0x60123BC;
D_60123F0 = 0x60123F0;
D_6012550 = 0x6012550;
D_6012840 = 0x6012840;
D_6012A60 = 0x6012A60;
D_6012C00 = 0x6012C00;
D_AQ_6012C98 = 0x6012C98;
D_6012C98 = 0x6012C98;
D_6012F50 = 0x6012F50;
D_6013060 = 0x6013060;
@@ -1755,35 +1758,36 @@ D_60132A0 = 0x60132A0;
D_6013330 = 0x6013330;
D_6013470 = 0x6013470;
D_6013480 = 0x6013480;
D_60135E0 = 0x60135E0;
D_AQ_60135E0 = 0x60135E0;
D_6013600 = 0x6013600;
D_60136CC = 0x60136CC;
D_6013798 = 0x6013798;
D_60137CC = 0x60137CC;
D_60137F0 = 0x60137F0;
D_6013820 = 0x6013820;
D_AQ_60136CC = 0x60136CC;
D_SX_6013798 = 0x6013798;
D_AQ_60137CC = 0x60137CC;
D_AQ_60137F0 = 0x60137F0;
D_SX_6013820 = 0x6013820;
D_601388C = 0x601388C;
D_601390C = 0x601390C;
D_6014030 = 0x6014030;
D_SX_601390C = 0x601390C;
D_AQ_6014030 = 0x6014030;
D_6014140 = 0x6014140;
D_6014438 = 0x6014438;
D_6014504 = 0x6014504;
D_AQ_6014438 = 0x6014438;
D_AQ_6014504 = 0x6014504;
D_6014510 = 0x6014510;
D_6014520 = 0x6014520;
D_AQ_6014520 = 0x6014520;
D_6014658 = 0x6014658;
D_60147C0 = 0x60147C0;
D_60147E0 = 0x60147E0;
D_6014844 = 0x6014844;
D_AQ_60148B0 = 0x60148B0;
D_60148B0 = 0x60148B0;
D_60148D0 = 0x60148D0;
D_6014904 = 0x6014904;
D_60149D0 = 0x60149D0;
D_6014A40 = 0x6014A40;
D_6014BD0 = 0x6014BD0;
D_6014FD0 = 0x6014FD0;
D_AQ_6014FD0 = 0x6014FD0;
D_6015430 = 0x6015430;
D_6015510 = 0x6015510;
D_60158C4 = 0x60158C4;
D_SX_60158C4 = 0x60158C4;
D_6015C24 = 0x6015C24;
D_6015EE0 = 0x6015EE0;
D_6016040 = 0x6016040;
@@ -1792,7 +1796,7 @@ D_60163F0 = 0x60163F0;
D_6016880 = 0x6016880;
D_6016B2C = 0x6016B2C;
D_6016CF0 = 0x6016CF0;
D_6016E28 = 0x6016E28;
D_SX_6016E28 = 0x6016E28;
D_6017090 = 0x6017090;
D_6017370 = 0x6017370;
D_6017714 = 0x6017714;
@@ -1803,43 +1807,43 @@ D_60181E0 = 0x60181E0;
D_6018550 = 0x6018550;
D_601863C = 0x601863C;
D_6018660 = 0x6018660;
D_6018878 = 0x6018878;
D_AQ_6018878 = 0x6018878;
D_6018994 = 0x6018994;
D_6018AF0 = 0x6018AF0;
D_6018BA0 = 0x6018BA0;
D_6018BF0 = 0x6018BF0;
D_6018C00 = 0x6018C00;
D_6018C78 = 0x6018C78;
D_AQ_6018C78 = 0x6018C78;
D_6018D40 = 0x6018D40;
D_6018F30 = 0x6018F30;
D_6019030 = 0x6019030;
D_6019078 = 0x6019078;
D_AQ_6019078 = 0x6019078;
D_6019220 = 0x6019220;
D_6019238 = 0x6019238;
D_6019338 = 0x6019338;
D_60194D0 = 0x60194D0;
D_AQ_6019238 = 0x6019238;
D_AQ_6019338 = 0x6019338;
D_AQ_60194D0 = 0x60194D0;
D_60195EC = 0x60195EC;
D_6019730 = 0x6019730;
D_6019738 = 0x6019738;
D_6019880 = 0x6019880;
D_AQ_6019880 = 0x6019880;
D_601996C = 0x601996C;
D_60199D0 = 0x60199D0;
D_6019E18 = 0x6019E18;
D_6019E50 = 0x6019E50;
D_6019E80 = 0x6019E80;
D_AQ_6019E80 = 0x6019E80;
D_6019EB0 = 0x6019EB0;
D_601A120 = 0x601A120;
D_601A2B0 = 0x601A2B0;
D_601A340 = 0x601A340;
D_601A7A0 = 0x601A7A0;
D_601A840 = 0x601A840;
D_601AA28 = 0x601AA28;
D_SX_601AA28 = 0x601AA28;
D_601AA48 = 0x601AA48;
D_601AB14 = 0x601AB14;
D_601AD70 = 0x601AD70;
D_601AE40 = 0x601AE40;
D_601AFB8 = 0x601AFB8;
D_601AFF0 = 0x601AFF0;
D_AQ_601AFF0 = 0x601AFF0;
D_601B184 = 0x601B184;
D_601B1E4 = 0x601B1E4;
D_601B2B0 = 0x601B2B0;
@@ -1852,10 +1856,10 @@ D_601BB40 = 0x601BB40;
D_601BCC0 = 0x601BCC0;
D_601BE90 = 0x601BE90;
D_601C000 = 0x601C000;
D_601C080 = 0x601C080;
D_AQ_601C080 = 0x601C080;
D_601C170 = 0x601C170;
D_601C590 = 0x601C590;
D_601C690 = 0x601C690;
D_SX_601C690 = 0x601C690;
D_601C7C0 = 0x601C7C0;
D_601C820 = 0x601C820;
D_601C8E0 = 0x601C8E0;
@@ -1871,8 +1875,8 @@ D_601DC90 = 0x601DC90;
D_601DCA0 = 0x601DCA0;
D_601DCD8 = 0x601DCD8;
D_601DCF0 = 0x601DCF0;
D_601DE50 = 0x601DE50;
D_601DE60 = 0x601DE60;
D_AQ_601DE50 = 0x601DE50;
D_AQ_601DE60 = 0x601DE60;
D_601E150 = 0x601E150;
D_601E1E8 = 0x601E1E8;
D_601E8C4 = 0x601E8C4;
@@ -1882,8 +1886,8 @@ D_601EA28 = 0x601EA28;
D_601EAA0 = 0x601EAA0;
D_601EAB0 = 0x601EAB0;
D_601EBBC = 0x601EBBC;
D_601EC68 = 0x601EC68;
D_601EDB4 = 0x601EDB4;
D_AQ_601EC68 = 0x601EC68;
D_AQ_601EDB4 = 0x601EDB4;
D_601F270 = 0x601F270;
D_601F3D0 = 0x601F3D0;
D_601F874 = 0x601F874;
@@ -1893,24 +1897,24 @@ D_601FBC4 = 0x601FBC4;
D_601FC90 = 0x601FC90;
D_601FF80 = 0x601FF80;
D_60200E0 = 0x60200E0;
D_60206DC = 0x60206DC;
D_SX_60206DC = 0x60206DC;
D_6020760 = 0x6020760;
D_6020810 = 0x6020810;
D_6020A30 = 0x6020A30;
D_6020A40 = 0x6020A40;
D_AQ_6020A40 = 0x6020A40;
D_6020B40 = 0x6020B40;
D_6020C68 = 0x6020C68;
D_6020C6C = 0x6020C6C;
D_6020D20 = 0x6020D20;
D_SX_6020C68 = 0x6020C68;
D_AQ_6020C6C = 0x6020C6C;
D_SX_6020D20 = 0x6020D20;
D_6020DD0 = 0x6020DD0;
D_6020E60 = 0x6020E60;
D_6020F60 = 0x6020F60;
D_6020FB0 = 0x6020FB0;
D_SX_6020FB0 = 0x6020FB0;
D_6021ABC = 0x6021ABC;
D_6021B88 = 0x6021B88;
D_6021ED0 = 0x6021ED0;
D_602201C = 0x602201C;
D_60220E8 = 0x60220E8;
D_SX_6021ED0 = 0x6021ED0;
D_AQ_602201C = 0x602201C;
D_AQ_60220E8 = 0x60220E8;
D_6022200 = 0x6022200;
D_60223C0 = 0x60223C0;
D_6022450 = 0x6022450;
@@ -1924,9 +1928,9 @@ D_60231A4 = 0x60231A4;
D_6023228 = 0x6023228;
D_6023388 = 0x6023388;
D_60236F0 = 0x60236F0;
D_6023780 = 0x6023780;
D_AQ_6023780 = 0x6023780;
D_6023810 = 0x6023810;
D_602390C = 0x602390C;
D_AQ_602390C = 0x602390C;
D_60239D0 = 0x60239D0;
D_6023AC0 = 0x6023AC0;
D_6023D50 = 0x6023D50;
@@ -1935,11 +1939,11 @@ D_6024220 = 0x6024220;
D_60245E0 = 0x60245E0;
D_6024670 = 0x6024670;
D_60246F8 = 0x60246F8;
D_6024A50 = 0x6024A50;
D_AQ_6024A50 = 0x6024A50;
D_6024AD0 = 0x6024AD0;
D_6024B60 = 0x6024B60;
D_6024F80 = 0x6024F80;
D_602512C = 0x602512C;
D_AQ_6024F80 = 0x6024F80;
D_AQ_602512C = 0x602512C;
D_60251A0 = 0x60251A0;
D_60253E0 = 0x60253E0;
D_6025500 = 0x6025500;
@@ -1950,9 +1954,9 @@ D_6025B50 = 0x6025B50;
D_6025CA0 = 0x6025CA0;
D_6025DAC = 0x6025DAC;
D_6025E60 = 0x6025E60;
D_60260EC = 0x60260EC;
D_AQ_60260EC = 0x60260EC;
D_60263F0 = 0x60263F0;
D_60263F8 = 0x60263F8;
D_AQ_60263F8 = 0x60263F8;
D_6026420 = 0x6026420;
D_602645C = 0x602645C;
D_60265B4 = 0x60265B4;
@@ -1976,6 +1980,7 @@ D_60289FC = 0x60289FC;
D_6028A60 = 0x6028A60;
D_6029528 = 0x6029528;
D_6029674 = 0x6029674;
D_SX_6029890 = 0x6029890;
D_6029890 = 0x6029890;
D_602991C = 0x602991C;
D_6029A48 = 0x6029A48;
@@ -1987,21 +1992,21 @@ D_602AA04 = 0x602AA04;
D_602AA7C = 0x602AA7C;
D_602AAC0 = 0x602AAC0;
D_602AB48 = 0x602AB48;
D_602AC28 = 0x602AC28;
D_602AC40 = 0x602AC40;
D_AQ_602AC28 = 0x602AC28;
D_AQ_602AC40 = 0x602AC40;
D_602AC50 = 0x602AC50;
D_602ACC0 = 0x602ACC0;
D_AQ_602ACC0 = 0x602ACC0;
D_602B148 = 0x602B148;
D_602B4C0 = 0x602B4C0;
D_AQ_602B4C0 = 0x602B4C0;
D_602B778 = 0x602B778;
D_602B8DC = 0x602B8DC;
D_602BC18 = 0x602BC18;
D_602BC58 = 0x602BC58;
D_602BD60 = 0x602BD60;
D_AQ_602BD60 = 0x602BD60;
D_602BE64 = 0x602BE64;
D_602C028 = 0x602C028;
D_602C030 = 0x602C030;
D_602C088 = 0x602C088;
D_AQ_602C030 = 0x602C030;
D_AQ_602C088 = 0x602C088;
D_602C0D0 = 0x602C0D0;
D_602C2CC = 0x602C2CC;
D_602CEB4 = 0x602CEB4;
@@ -2012,11 +2017,11 @@ D_602D5AC = 0x602D5AC;
D_602DA20 = 0x602DA20;
D_602DCB8 = 0x602DCB8;
D_602E380 = 0x602E380;
D_602E584 = 0x602E584;
D_AQ_602E584 = 0x602E584;
D_602EA0C = 0x602EA0C;
D_602EBB8 = 0x602EBB8;
D_602F098 = 0x602F098;
D_602F18C = 0x602F18C;
D_SX_602F18C = 0x602F18C;
D_602F264 = 0x602F264;
D_602F2E0 = 0x602F2E0;
D_602F36C = 0x602F36C;
@@ -2029,25 +2034,25 @@ D_602FFA0 = 0x602FFA0;
D_602FFC0 = 0x602FFC0;
D_60306D0 = 0x60306D0;
D_6030750 = 0x6030750;
D_60308B8 = 0x60308B8;
D_AQ_60308B8 = 0x60308B8;
D_60309D0 = 0x60309D0;
D_6030B14 = 0x6030B14;
D_6030D3C = 0x6030D3C;
D_6030D58 = 0x6030D58;
D_60314AC = 0x60314AC;
D_60314E4 = 0x60314E4;
D_603151C = 0x603151C;
D_603158C = 0x603158C;
D_6031D90 = 0x6031D90;
D_60320D0 = 0x60320D0;
D_AQ_6030D3C = 0x6030D3C;
D_AQ_6030D58 = 0x6030D58;
D_AQ_60314AC = 0x60314AC;
D_AQ_60314E4 = 0x60314E4;
D_AQ_603151C = 0x603151C;
D_AQ_603158C = 0x603158C;
D_AQ_6031D90 = 0x6031D90;
D_SX_60320D0 = 0x60320D0;
D_60320E0 = 0x60320E0;
D_6032328 = 0x6032328;
D_6032408 = 0x6032408;
D_6032550 = 0x6032550;
D_SX_6032328 = 0x6032328;
D_SX_6032408 = 0x6032408;
D_SX_6032550 = 0x6032550;
D_6032580 = 0x6032580;
D_603265C = 0x603265C;
D_6032768 = 0x6032768;
D_60328CC = 0x60328CC;
D_SX_603265C = 0x603265C;
D_SX_6032768 = 0x6032768;
D_SX_60328CC = 0x60328CC;
D_60329C0 = 0x60329C0;
D_6032BC0 = 0x6032BC0;
D_6032E18 = 0x6032E18;
@@ -2110,16 +2115,16 @@ D_604D680 = 0x604D680;
D_605A120 = 0x605A120;
D_605C230 = 0x605C230;
D_07000000 = 0x7000000;
D_7000A80 = 0x7000A80;
D_TI1_7000A80 = 0x7000A80;
D_7000F10 = 0x7000F10;
D_7001030 = 0x7001030;
D_7001270 = 0x7001270;
D_7001540 = 0x7001540;
D_WZ_7001540 = 0x7001540;
D_7001DF0 = 0x7001DF0;
D_7002110 = 0x7002110;
D_7002120 = 0x7002120;
D_7002270 = 0x7002270;
D_7002490 = 0x7002490;
D_TI1_7002270 = 0x7002270;
D_TI1_7002490 = 0x7002490;
D_7003650 = 0x7003650;
D_7003830 = 0x7003830;
D_7003C70 = 0x7003C70;
@@ -2138,35 +2143,35 @@ D_7004460 = 0x7004460;
D_70044D0 = 0x70044D0;
D_7004990 = 0x7004990;
D_7005300 = 0x7005300;
D_70067C4 = 0x70067C4;
D_7006990 = 0x7006990;
D_7006F74 = 0x7006F74;
D_7007130 = 0x7007130;
D_7007234 = 0x7007234;
D_700733C = 0x700733C;
D_7007350 = 0x7007350;
D_TI1_70067C4 = 0x70067C4;
D_TI1_7006990 = 0x7006990;
D_TI1_7006F74 = 0x7006F74;
D_TI1_7007130 = 0x7007130;
D_TI1_7007234 = 0x7007234;
D_TI1_700733C = 0x700733C;
D_TI1_7007350 = 0x7007350;
D_70084CC = 0x70084CC;
D_7008930 = 0x7008930;
D_7009510 = 0x7009510;
D_TI1_7008930 = 0x7008930;
D_TI1_7009510 = 0x7009510;
D_70096EC = 0x70096EC;
D_70098E0 = 0x70098E0;
D_TI1_70098E0 = 0x70098E0;
D_7009A80 = 0x7009A80;
D_7009D60 = 0x7009D60;
D_700A990 = 0x700A990;
D_700B9C0 = 0x700B9C0;
D_700BB10 = 0x700BB10;
D_700C4B0 = 0x700C4B0;
D_TI1_7009D60 = 0x7009D60;
D_TI1_700A990 = 0x700A990;
D_TI1_700B9C0 = 0x700B9C0;
D_TI1_700BB10 = 0x700BB10;
D_TI1_700C4B0 = 0x700C4B0;
D_700C620 = 0x700C620;
D_700C8B0 = 0x700C8B0;
D_700C8D8 = 0x700C8D8;
D_700C964 = 0x700C964;
D_700C980 = 0x700C980;
D_700CAF4 = 0x700CAF4;
D_700CB60 = 0x700CB60;
D_700D534 = 0x700D534;
D_700D700 = 0x700D700;
D_TI1_700C8D8 = 0x700C8D8;
D_TI1_700C964 = 0x700C964;
D_TI1_700C980 = 0x700C980;
D_TI1_700CAF4 = 0x700CAF4;
D_TI1_700CB60 = 0x700CB60;
D_TI1_700D534 = 0x700D534;
D_TI1_700D700 = 0x700D700;
D_700E244 = 0x700E244;
D_700E3F0 = 0x700E3F0;
D_TI1_700E3F0 = 0x700E3F0;
D_700E9A0 = 0x700E9A0;
D_700E9E0 = 0x700E9E0;
D_700EA38 = 0x700EA38;
src/main/fox_360.c
+3 -2
View File
@@ -1,5 +1,8 @@
#include "prevent_bss_reordering.h"
#include "global.h"
#include "assets/ast_star_wolf.h"
#include "assets/ast_allies.h"
#include "assets/ast_vs_player.h"
/* static */ Vec3f D_800C9A90 = { 0.0f, -10.0f, 0.0f };
/* static */ Vec3f D_800C9A9C[4] = {
@@ -45,8 +48,6 @@ s32 D_8015F93C;
s32 D_8015F940;
f32 D_8015F944;
#include "assets/ast_allies.h"
void func_8002E3E0(Actor* actor) {
s32 hits = 0;
src/main/fox_97F80.c
+1 -1
View File
@@ -1,5 +1,5 @@
#include "global.h"
// #include "prevent_bss_reordering.h"
#include "prevent_bss_reordering.h"
f32 __dx1;
f32 __dx2;
src/main/fox_A4290_colheaders.c
+6 -4
View File
@@ -2,6 +2,8 @@
#include "macros.h"
#include "variables.h"
#include "assets.h"
#include "assets/ast_aquas.h"
#include "assets/ast_vs_player.h"
extern Vec3f D_6030FD0[];
@@ -203,21 +205,21 @@ CollisionHeader2 D_800D2CA0[19] = {
{ -74.0f, 0.0f, -84.0f },
{ 74.0f, 125.0f, 84.0f },
30,
D_60320B8,
D_AQ_60320B8,
D_603216C,
},
{
{ -1200.0f, 0.0f, -1315.0f },
{ 1403.0f, 200.0f, 1308.0f },
8,
D_6031FB0,
D_AQ_6031FB0,
D_6031FE0,
},
{
{ -600.0f, 0.0f, -657.0f },
{ 701.0f, 100.0f, 654.0f },
8,
D_6031FB0,
D_AQ_6031FB0,
D_603204C,
},
{
@@ -231,7 +233,7 @@ CollisionHeader2 D_800D2CA0[19] = {
{ -814.0f, 0.0f, -691.0f },
{ 814.0f, 752.0f, 691.0f },
28,
D_6032388,
D_AQ_6032388,
D_6032430,
},
};
src/main/fox_beam.c
+4 -1
View File
@@ -1,5 +1,8 @@
#include "global.h"
#include "assets/ast_landmaster.h"
#include "assets/ast_aquas.h"
#include "assets/ast_great_fox.h"
#include "assets/ast_vs_player.h"
static Vec3f D_8015F950;
@@ -1383,7 +1386,7 @@ void func_80039A50(PlayerShot* shot) {
Matrix_SetGfxMtx(&gMasterDisp);
if (gCurrentLevel == LEVEL_AQUAS) {
RCP_SetupDL(&gMasterDisp, 0x3C);
gSPDisplayList(gMasterDisp++, D_600DB80);
gSPDisplayList(gMasterDisp++, D_AQ_600DB80);
Matrix_Pop(&gGfxMatrix);
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, shot->obj.pos.x, gGroundLevel, shot->obj.pos.z + D_80177D20, 1);
src/main/fox_bg.c
+24 -19
View File
@@ -17,7 +17,12 @@ UNK_TYPE D_8015F988[0x683]; // Unused? Close to being [13][0x80]
f32 D_80161394; // can be static
#include "assets/ast_bg_planet.h"
#include "assets/ast_vs_player.h"
#include "assets/ast_training.h"
#include "assets/ast_sector_x.h"
#include "assets/ast_aquas.h"
#include "assets/ast_andross.h"
#include "assets/ast_warp_zone.h"
f32 D_800C9C30 = 0.0f;
u16 D_800C9C34 = 1;
@@ -403,9 +408,9 @@ void func_8003E1E8(void) {
Matrix_Translate(gGfxMatrix, sp13C, sp134, -7000.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_2) {
gSPDisplayList(gMasterDisp++, D_601AFF0);
gSPDisplayList(gMasterDisp++, D_AQ_601AFF0);
} else {
gSPDisplayList(gMasterDisp++, D_601C080);
gSPDisplayList(gMasterDisp++, D_AQ_601C080);
}
if (sp13C < 0) {
@@ -416,10 +421,10 @@ void func_8003E1E8(void) {
Matrix_Translate(gGfxMatrix, 7280.0f * sp13C, 0.0f, 0.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_2) {
gSPDisplayList(gMasterDisp++, D_601AFF0);
gSPDisplayList(gMasterDisp++, D_AQ_601AFF0);
} else {
gSPDisplayList(gMasterDisp++, D_601C080);
gSPDisplayList(gMasterDisp++, D_AQ_601C080);
}
Matrix_Pop(&gGfxMatrix);
}
@@ -533,7 +538,7 @@ void func_8003E1E8(void) {
Matrix_RotateZ(gGfxMatrix, gGameFrameCount * 10.0f * M_DTOR, 1);
Matrix_Scale(gGfxMatrix, 1.07f, 0.93f, 1.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_7001540);
gSPDisplayList(gMasterDisp++, D_WZ_7001540);
Matrix_Pop(&gGfxMatrix);
}
break;
@@ -557,7 +562,7 @@ void func_8003E1E8(void) {
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL_62();
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 192);
gSPDisplayList(gMasterDisp++, D_6029890);
gSPDisplayList(gMasterDisp++, D_SX_6029890);
}
break;
case LEVEL_TRAINING:
@@ -566,7 +571,7 @@ void func_8003E1E8(void) {
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL_62();
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
gSPDisplayList(gMasterDisp++, D_training_6003760);
gSPDisplayList(gMasterDisp++, D_TR_6003760);
break;
case LEVEL_AREA_6:
case LEVEL_UNK_4:
@@ -976,14 +981,14 @@ void func_80040CE4(void) {
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -3000.0f + D_80177CE8, 1);
Matrix_Scale(gGfxMatrix, 1.0f, 1.0f, 0.5f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_training_6005880);
gSPDisplayList(gMasterDisp++, D_TR_6005880);
Matrix_Pop(&gGfxMatrix);
if (1) {}
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, 3000.0f + D_80177CE8, 1);
Matrix_Scale(gGfxMatrix, 1.0f, 1.0f, 0.5f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_training_6005880);
gSPDisplayList(gMasterDisp++, D_TR_6005880);
Matrix_Pop(&gGfxMatrix);
} else {
for (i = 0; i < 4; i++) {
@@ -991,7 +996,7 @@ void func_80040CE4(void) {
Matrix_Translate(gGfxMatrix, D_800C9E64[i], 0.0f, D_800C9E74[i], 1);
Matrix_Scale(gGfxMatrix, 1.5f, 1.0f, 1.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_training_6005880);
gSPDisplayList(gMasterDisp++, D_TR_6005880);
Matrix_Pop(&gGfxMatrix);
}
}
@@ -1000,14 +1005,14 @@ void func_80040CE4(void) {
RCP_SetupDL(&gMasterDisp, 0x14);
gSPFogPosition(gMasterDisp++, gFogNear, gFogFar);
if ((D_8015F964 == 0) && ((D_80177AC8 == 0) || (D_80177AC8 == 2))) {
gDPSetTextureImage(gMasterDisp++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, SEGMENTED_TO_VIRTUAL(D_600AB68));
gDPSetTextureImage(gMasterDisp++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, SEGMENTED_TO_VIRTUAL(D_AQ_600AB68));
gDPTileSync(gMasterDisp++);
gDPSetTile(gMasterDisp++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD);
gDPLoadSync(gMasterDisp++);
gDPLoadBlock(gMasterDisp++, G_TX_LOADTILE, 0, 0, 1023, 256);
gDPSetTextureImage(gMasterDisp++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, SEGMENTED_TO_VIRTUAL(D_600AB68));
gDPSetTextureImage(gMasterDisp++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, SEGMENTED_TO_VIRTUAL(D_AQ_600AB68));
temp_s0 = fabsf(Math_ModF(2.0f * (D_80177CE8 * 0.2133333f), 128.0f));
temp_fv0 = Math_ModF((10000.0f - gPlayer[gPlayerNum].unk_0AC) * 0.32f, 128.0f);
gDPTileSync(gMasterDisp++);
@@ -1018,7 +1023,7 @@ void func_80040CE4(void) {
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -3000.0f, 1);
Matrix_Scale(gGfxMatrix, 1.0f, 1.0f, 0.5f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
sp1C0 = D_600AB10;
sp1C0 = D_AQ_600AB10;
gSPDisplayList(gMasterDisp++, sp1C0);
Matrix_Pop(&gGfxMatrix);
Matrix_Push(&gGfxMatrix);
@@ -1029,14 +1034,14 @@ void func_80040CE4(void) {
Matrix_Pop(&gGfxMatrix);
}
if ((D_8015F964 != 0) || (D_80177AC8 == 0)) {
gDPSetTextureImage(gMasterDisp++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, SEGMENTED_TO_VIRTUAL(D_602ACC0));
gDPSetTextureImage(gMasterDisp++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, SEGMENTED_TO_VIRTUAL(D_AQ_602ACC0));
gDPTileSync(gMasterDisp++);
gDPSetTile(gMasterDisp++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
G_TX_NOLOD);
gDPLoadSync(gMasterDisp++);
gDPLoadBlock(gMasterDisp++, G_TX_LOADTILE, 0, 0, 1023, 256);
gDPSetTextureImage(gMasterDisp++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, SEGMENTED_TO_VIRTUAL(D_602ACC0));
gDPSetTextureImage(gMasterDisp++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, SEGMENTED_TO_VIRTUAL(D_AQ_602ACC0));
temp_s0 = fabsf(Math_ModF(2.0f * (D_80177CE8 * 0.2133333f), 128.0f));
temp_fv0 = Math_ModF((10000.0f - gPlayer[gPlayerNum].unk_0AC) * 0.32f, 128.0f);
gDPTileSync(gMasterDisp++);
@@ -1059,12 +1064,12 @@ void func_80040CE4(void) {
Matrix_Translate(gGfxMatrix, 0.0f, D_8015F970, -3000.0f, 1);
Matrix_Scale(gGfxMatrix, 2.0f, 1.0f, 0.5f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_602AC40);
gSPDisplayList(gMasterDisp++, D_AQ_602AC40);
Matrix_Pop(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 0.0f, D_8015F970, 3000.0f, 1);
Matrix_Scale(gGfxMatrix, 2.0f, 1.0f, 0.5f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_602AC40);
gSPDisplayList(gMasterDisp++, D_AQ_602AC40);
}
break;
case LEVEL_FORTUNA:
@@ -1153,9 +1158,9 @@ void func_80042D38(void) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 125);
Matrix_SetGfxMtx(&gMasterDisp);
if (gGameFrameCount & 1) {
gSPDisplayList(gMasterDisp++, D_602C030);
gSPDisplayList(gMasterDisp++, D_AQ_602C030);
} else {
gSPDisplayList(gMasterDisp++, D_602C088);
gSPDisplayList(gMasterDisp++, D_AQ_602C088);
}
Matrix_Pop(&gGfxMatrix);
}
src/main/fox_demo.c
+10 -8
View File
@@ -5,8 +5,10 @@
*/
#include "global.h"
#include "assets/ast_sector_x.h"
#include "assets/ast_aquas.h"
#include "assets/ast_great_fox.h"
extern Gfx D_1024AC0[];
extern Gfx D_60320E0[];
extern Gfx D_7010970[];
@@ -34,9 +36,9 @@ extern Gfx D_60132B0[];
extern Gfx D_6014A40[];
extern Gfx D_6020810[];
extern Animation D_6020A40;
extern Animation D_AQ_6020A40;
extern Animation D_601F3B8;
extern Limb* D_6020C6C[];
extern Limb* D_AQ_6020C6C[];
extern Limb* D_602D140[];
#include "assets/ast_allies.h"
@@ -2893,24 +2895,24 @@ void func_8004FEC0(Actor* actor) {
break;
case 44:
Animation_GetFrameData(&D_6020A40, actor->iwork[0], actor->vwork);
Animation_GetFrameData(&D_AQ_6020A40, actor->iwork[0], actor->vwork);
gSPClearGeometryMode(gMasterDisp++, 0x00002000);
Animation_DrawSkeleton(1, D_6020C6C, actor->vwork, 0, 0, &actor->index, &gIdentityMatrix);
Animation_DrawSkeleton(1, D_AQ_6020C6C, actor->vwork, 0, 0, &actor->index, &gIdentityMatrix);
gSPSetGeometryMode(gMasterDisp++, 0x00002000);
break;
case 45:
Matrix_Scale(gGfxMatrix, 0.5f, 0.5f, 0.5f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_600EEF0);
gSPDisplayList(gMasterDisp++, D_AQ_600EEF0);
break;
case 46:
gSPDisplayList(gMasterDisp++, D_601DE60);
gSPDisplayList(gMasterDisp++, D_AQ_601DE60);
break;
case 47:
gSPDisplayList(gMasterDisp++, D_602B4C0);
gSPDisplayList(gMasterDisp++, D_AQ_602B4C0);
break;
}
}
src/main/fox_display.c
+1
View File
@@ -15,6 +15,7 @@ f32 D_801615B8[4];
#include "assets/ast_arwing.h"
#include "assets/ast_allies.h"
#include "assets/ast_landmaster.h"
#include "assets/ast_vs_player.h"
s32 D_800CA220 = 0;
u8 D_800CA224[] = { 0, 0, 0, 0 };
src/main/fox_edata_1C.c
+40 -37
View File
@@ -1,9 +1,12 @@
#include "global.h"
extern f32 D_6031398[];
extern f32 D_60313CC[];
#include "assets/ast_vs_player.h"
#include "assets/ast_arwing.h"
#include "assets/ast_training.h"
#include "assets/ast_sector_x.h"
#include "assets/ast_aquas.h"
#include "assets/ast_7_ti_1.h"
#include "assets/ast_andross.h"
f32 D_800CBE70[] = {
1.0f, 0.0f, 50.0f, 0.0f, 25.0f, 0.0f, 25.0f,
@@ -128,12 +131,12 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_80_50, */ {(void*) D_6007410, 0, (ObjectFunc) NULL, D_601B518, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_51, */ {(void*) D_6006F50, 0, (ObjectFunc) NULL, D_601B584, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_52, */ {(void*) D_6005780, 0, (ObjectFunc) func_i1_80193540, D_601B5F4, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_53, */ {(void*) D_6003610, 0, (ObjectFunc) NULL, D_601B644, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_53, */ {(void*) D_AQ_6003610, 0, (ObjectFunc) NULL, D_601B644, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_54, */ {(void*) D_6000E00, 0, (ObjectFunc) func_8006AA98, D_603E0EC, 1000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_55, */ {(void*) D_6013B50, 0, (ObjectFunc) NULL, D_603E88C, 1000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_56, */ {(void*) func_i1_8018F31C, 2, (ObjectFunc) func_i1_8018F044, D_603E8A8, 1000.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_57, */ {(void*) func_i5_8018F8B8, 1, (ObjectFunc) func_i5_8018F4D8, D_6006BF0, 800.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_58, */ {(void*) D_700BE00, 0, (ObjectFunc) NULL, D_6006C44, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_58, */ {(void*) D_TI1_700BE00, 0, (ObjectFunc) NULL, D_6006C44, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_59, */ {(void*) D_6024010, 0, (ObjectFunc) NULL, D_603626C, 300.0f, 0, 0, 5, 0, 0.0f, 0 },
/* OBJ_80_60, */ {(void*) D_6027180, 0, (ObjectFunc) NULL, D_6036288, 400.0f, 0, 0, 5, 0, 0.0f, 0 },
/* OBJ_80_61, */ {(void*) func_i5_801A2A78, 1, (ObjectFunc) NULL, D_60362A4, 200.0f, 0, 0, 5, 0, 0.0f, 0 },
@@ -192,15 +195,15 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_80_114 */ {(void*) D_601C6A0, 0, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_115 */ {(void*) D_60188D0, 0, (ObjectFunc) NULL, D_603486C, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_116 */ {(void*) D_60034D0, 0, (ObjectFunc) NULL, D_60347D4, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_117 */ {(void*) D_60231C0, 0, (ObjectFunc) NULL, D_6030C60, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_118 */ {(void*) D_6011EE0, 0, (ObjectFunc) NULL, D_6030C7C, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_119 */ {(void*) D_6015730, 0, (ObjectFunc) NULL, D_6030D74, 2000.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_120 */ {(void*) D_601DE60, 0, (ObjectFunc) NULL, D_6030DF8, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_121 */ {(void*) D_602B4C0, 0, (ObjectFunc) NULL, D_6030E14, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_122 */ {(void*) D_600EE10, 0, (ObjectFunc) NULL, D_6030E30_Hitbox, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_123 */ {(void*) D_60120F0, 0, (ObjectFunc) NULL, D_6030E4C, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_124 */ {(void*) D_600EEF0, 0, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_125 */ {(void*) D_600BF80, 0, (ObjectFunc) NULL, D_6030E68, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_117 */ {(void*) D_AQ_60231C0, 0, (ObjectFunc) NULL, D_AQ_6030C60, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_118 */ {(void*) D_AQ_6011EE0, 0, (ObjectFunc) NULL, D_AQ_6030C7C, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_119 */ {(void*) D_AQ_6015730, 0, (ObjectFunc) NULL, D_AQ_6030D74, 2000.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_120 */ {(void*) D_AQ_601DE60, 0, (ObjectFunc) NULL, D_AQ_6030DF8, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_121 */ {(void*) D_AQ_602B4C0, 0, (ObjectFunc) NULL, D_AQ_6030E14, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_122 */ {(void*) D_AQ_600EE10, 0, (ObjectFunc) NULL, D_AQ_6030E30_Hitbox, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_123 */ {(void*) D_AQ_60120F0, 0, (ObjectFunc) NULL, D_AQ_6030E4C, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_124 */ {(void*) D_AQ_600EEF0, 0, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_125 */ {(void*) D_AQ_600BF80, 0, (ObjectFunc) NULL, D_AQ_6030E68, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_126 */ {(void*) func_i3_801BE1FC, 1, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_127 */ {(void*) D_9005C80, 0, (ObjectFunc) func_i1_801924A8, D_601B678, 1000.0f, 0, 0, 42, 0, 0.0f, 0 },
/* OBJ_80_128 */ {(void*) D_9003F50, 0, (ObjectFunc) NULL, D_601B6C4, 3200.0f, 0, 0, 42, 0, 0.0f, 0 },
@@ -208,7 +211,7 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_80_130 */ {(void*) D_900F1D0, 0, (ObjectFunc) NULL, D_601B75C, 3200.0f, 0, 0, 42, 0, 0.0f, 0 },
/* OBJ_80_131 */ {(void*) func_i6_801935D4, 1, (ObjectFunc) func_i6_8019356C, D_C038BD8, 500.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_132 */ {(void*) func_i6_8019350C, 1, (ObjectFunc) func_i6_80193380, D_C038A48, 500.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_133 */ {(void*) D_training_60030F0, 0, (ObjectFunc) NULL, D_training_6009CC4, 1000.0f, 0, 0, 20, 0, 0.0f, 0 },
/* OBJ_80_133 */ {(void*) D_TR_60030F0, 0, (ObjectFunc) NULL, D_TR_6009CC4, 1000.0f, 0, 0, 20, 0, 0.0f, 0 },
/* OBJ_80_134 */ {(void*) D_6003000, 0, (ObjectFunc) NULL, D_C038BA4, 0.0f, 0, 0, 41, 1, 0.0f, 0 },
/* OBJ_80_135 */ {(void*) D_6006890_Gfx, 0, (ObjectFunc) NULL, D_C038B40, 0.0f, 0, 0, 41, 1, 0.0f, 0 },
/* OBJ_80_136 */ {(void*) D_6002990, 0, (ObjectFunc) NULL, D_C038B40, 0.0f, 0, 0, 41, 1, 0.0f, 0 },
@@ -263,7 +266,7 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_ACTOR_185 */ {(void*) func_i2_8018DB6C, 1, (ObjectFunc) func_i2_8018D9EC, D_800CBF34, 100.0f, 0, 1, 39, 0, 0.0f, 1 },
/* OBJ_ACTOR_186 */ {(void*) func_8005B7CC, 1, (ObjectFunc) func_i2_8018795C, D_602F724, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_187 */ {(void*) D_6018450, 0, (ObjectFunc) func_i2_801877C4, D_602F740, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_188 */ {(void*) func_i3_801BEC74, 1, (ObjectFunc) func_i3_801BEC68, D_6030BE0, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_188 */ {(void*) func_i3_801BEC74, 1, (ObjectFunc) func_i3_801BEC68, D_AQ_6030BE0, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_189 */ {(void*) func_8005A094, 1, (ObjectFunc) func_8006C008, D_800CBF34, 0.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_ACTOR_190 */ {(void*) func_8005B848, 1, (ObjectFunc) func_800656D4, D_800CBFE4, 100.0f, 0, 1, 39, 0, 1.0f, 0 },
/* OBJ_ACTOR_191 */ {(void*) func_8005B848, 1, (ObjectFunc) func_800656D4, D_800CBFE4, 100.0f, 0, 1, 39, 0, 1.0f, 0 },
@@ -300,7 +303,7 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_ACTOR_222 */ {(void*) func_i5_801AEEFC, 1, (ObjectFunc) func_i5_801AEC04, D_6036968, 300.0f, 0, 0, 40, 1, 1.0f, 0 },
/* OBJ_ACTOR_223 */ {(void*) func_i5_801A54E8, 1, (ObjectFunc) func_i5_801A4B24, D_60364DC, 300.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_224 */ {(void*) NULL, 1, (ObjectFunc) func_i5_80189194, D_800CBF34, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_ACTOR_225 */ {(void*) D_700AB70, 0, (ObjectFunc) func_i5_8018AB44, D_60064AC, 50.0f, 0, 0, 39, 1, 1.0f, 0 },
/* OBJ_ACTOR_225 */ {(void*) D_TI1_700AB70, 0, (ObjectFunc) func_i5_8018AB44, D_60064AC, 50.0f, 0, 0, 39, 1, 1.0f, 0 },
/* OBJ_ACTOR_226 */ {(void*) func_i5_80189AFC, 1, (ObjectFunc) func_i5_801895B8, D_60064C8, 300.0f, 0, 0, 39, 1, 70.0f, 1 },
/* OBJ_ACTOR_227 */ {(void*) func_i5_8018E5B4, 1, (ObjectFunc) func_i5_8018E54C, D_60067C4, 0.0f, 0, 0, 39, 1, 0.0f, 0 },
/* OBJ_ACTOR_228 */ {(void*) func_i5_8018EF14, 1, (ObjectFunc) func_i5_8018E5F8, D_6006808, 0.0f, 0, 0, 39, 1, 1.0f, 1 },
@@ -330,22 +333,22 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_ACTOR_252 */ {(void*) func_i3_8019C1CC, 1, (ObjectFunc) func_i3_8019BE48, D_602C234, 200.0f, 0, 0, 40, 0, 80.0f, 1 },
/* OBJ_ACTOR_253 */ {(void*) func_i3_8019C83C, 1, (ObjectFunc) func_i3_8019C454, D_602C250, 300.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_254 */ {(void*) func_i3_8019CE58, 1, (ObjectFunc) func_i3_8019CBEC, D_602C2B0, 300.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ACTOR_255 */ {(void*) func_i3_801AE168, 1, (ObjectFunc) func_i3_801AD6C0, D_6030BFC, 500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_256 */ {(void*) func_i3_801AEB44, 1, (ObjectFunc) func_i3_801AE3D8, D_6030C18, 10000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_257 */ {(void*) func_i3_801B099C, 1, (ObjectFunc) func_i3_801AFA5C, D_6030C44, 10000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_255 */ {(void*) func_i3_801AE168, 1, (ObjectFunc) func_i3_801AD6C0, D_AQ_6030BFC, 500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_256 */ {(void*) func_i3_801AEB44, 1, (ObjectFunc) func_i3_801AE3D8, D_AQ_6030C18, 10000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_257 */ {(void*) func_i3_801B099C, 1, (ObjectFunc) func_i3_801AFA5C, D_AQ_6030C44, 10000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_258 */ {(void*) func_i3_801B0EC0, 1, (ObjectFunc) func_i3_801B0B60, D_800CBE8C, 200.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_259 */ {(void*) func_i3_801B619C, 2, (ObjectFunc) func_i3_801B638C, D_6031398, 10000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_260 */ {(void*) func_i3_801B90DC, 2, (ObjectFunc) func_i3_801B7C78, D_60313CC, 300.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_261 */ {(void*) func_i3_801B504C, 2, (ObjectFunc) func_i3_801B50E8, D_6031400, 300.0f, 0, 0, 40, 0, 0.0f, 1 },
/* OBJ_ACTOR_262 */ {(void*) func_i3_801B7A24, 2, (ObjectFunc) func_i3_801B6FF8, D_603144C, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_263 */ {(void*) func_i3_801BA108, 2, (ObjectFunc) func_i3_801B91A4, D_6031480, 200.0f, 0, 0, 40, 0, 0.0f, 1 },
/* OBJ_ACTOR_259 */ {(void*) func_i3_801B619C, 2, (ObjectFunc) func_i3_801B638C, D_AQ_6031398, 10000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_260 */ {(void*) func_i3_801B90DC, 2, (ObjectFunc) func_i3_801B7C78, D_AQ_60313CC, 300.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_261 */ {(void*) func_i3_801B504C, 2, (ObjectFunc) func_i3_801B50E8, D_AQ_6031400, 300.0f, 0, 0, 40, 0, 0.0f, 1 },
/* OBJ_ACTOR_262 */ {(void*) func_i3_801B7A24, 2, (ObjectFunc) func_i3_801B6FF8, D_AQ_603144C, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_263 */ {(void*) func_i3_801BA108, 2, (ObjectFunc) func_i3_801B91A4, D_AQ_6031480, 200.0f, 0, 0, 40, 0, 0.0f, 1 },
/* OBJ_ACTOR_264 */ {(void*) func_i3_801BA4E4, 1, (ObjectFunc) func_i3_801BA26C, D_800CBE8C, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ACTOR_265 */ {(void*) func_i3_801BAD7C, 1, (ObjectFunc) func_i3_801BA6A4, D_6031500, 200.0f, 0, 0, 40, 0, 0.0f, 1 },
/* OBJ_ACTOR_266 */ {(void*) func_i3_801BB204, 2, (ObjectFunc) func_i3_801BADF8, D_6031538, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ACTOR_267 */ {(void*) func_i3_801BC930, 2, (ObjectFunc) func_i3_801BB79C, D_6031554, 800.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_268 */ {(void*) func_i3_801BDE6C, 1, (ObjectFunc) func_i3_801BD54C, D_6031570, 10000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ACTOR_269 */ {(void*) func_i3_801BD264, 1, (ObjectFunc) func_i3_801BC9A0, D_6030D20, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_270 */ {(void*) func_i3_801BEB1C, 1, (ObjectFunc) func_i3_801BE3F8, D_60314C8, 1000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_265 */ {(void*) func_i3_801BAD7C, 1, (ObjectFunc) func_i3_801BA6A4, D_AQ_6031500, 200.0f, 0, 0, 40, 0, 0.0f, 1 },
/* OBJ_ACTOR_266 */ {(void*) func_i3_801BB204, 2, (ObjectFunc) func_i3_801BADF8, D_AQ_6031538, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ACTOR_267 */ {(void*) func_i3_801BC930, 2, (ObjectFunc) func_i3_801BB79C, D_AQ_6031554, 800.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_268 */ {(void*) func_i3_801BDE6C, 1, (ObjectFunc) func_i3_801BD54C, D_AQ_6031570, 10000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ACTOR_269 */ {(void*) func_i3_801BD264, 1, (ObjectFunc) func_i3_801BC9A0, D_AQ_6030D20, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_270 */ {(void*) func_i3_801BEB1C, 1, (ObjectFunc) func_i3_801BE3F8, D_AQ_60314C8, 1000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_271 */ {(void*) func_8002E694, 2, (ObjectFunc) func_8002E670, D_6011B24, 0.0f, 0, 0, 39, 0, 730.0f, 1 },
/* OBJ_ACTOR_272 */ {(void*) func_8002E6DC, 1, (ObjectFunc) func_8002E6B8, D_6011BF4, 0.0f, 0, 0, 39, 0, 150.0f, 1 },
/* OBJ_ACTOR_273 */ {(void*) func_i4_80188FE4, 2, (ObjectFunc) func_i4_80188AD0, D_600FF30_Hitbox, 0.0f, 0, 0, 39, 0, 220.0f, 1 },
@@ -376,11 +379,11 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_BOSS_298 */ {(void*) func_i2_801887D0, 1, (ObjectFunc) func_i2_80188344, D_602FA50, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_299 */ {(void*) func_80042FC4, 2, (ObjectFunc) func_80042FB8, D_800CBF34, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_300 */ {(void*) func_80042FE8, 1, (ObjectFunc) func_80042FDC, D_800CBF34, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_301 */ {(void*) func_i3_801BEC5C, 1, (ObjectFunc) func_i3_801BEC50, D_6030B10, 0.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_301 */ {(void*) func_i3_801BEC5C, 1, (ObjectFunc) func_i3_801BEC50, D_AQ_6030B10, 0.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_A6 */ {(void*) func_i3_8018C54C, 1, (ObjectFunc) func_i3_80187944, D_6028454, 2000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_303 */ {(void*) func_i2_80193434, 2, (ObjectFunc) func_i2_80190078, D_6032550, 20000.0f, 0, 0, 20, 0, 0.0f, 10 },
/* OBJ_BOSS_304 */ {(void*) func_i2_8018FF84, 2, (ObjectFunc) func_i2_8018FE38, D_6032488, 1000.0f, 0, 0, 20, 0, 0.0f, 10 },
/* OBJ_BOSS_305 */ {(void*) func_i2_80190020, 2, (ObjectFunc) func_i2_8018FF20, D_60324EC, 1000.0f, 0, 0, 20, 0, 0.0f, 10 },
/* OBJ_BOSS_303 */ {(void*) func_i2_80193434, 2, (ObjectFunc) func_i2_80190078, D_SX_6032550, 20000.0f, 0, 0, 20, 0, 0.0f, 10 },
/* OBJ_BOSS_304 */ {(void*) func_i2_8018FF84, 2, (ObjectFunc) func_i2_8018FE38, D_SX_6032488, 1000.0f, 0, 0, 20, 0, 0.0f, 10 },
/* OBJ_BOSS_305 */ {(void*) func_i2_80190020, 2, (ObjectFunc) func_i2_8018FF20, D_SX_60324EC, 1000.0f, 0, 0, 20, 0, 0.0f, 10 },
/* OBJ_BOSS_306 */ {(void*) func_i5_801982A8, 1, (ObjectFunc) func_i5_80197A94,D_i5_801B83A8, 1000.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_ZO */ {(void*) func_i3_801949DC, 2, (ObjectFunc) func_i3_80194A84, D_602C044, 1000.0f, 0, 0, 40, 0, 1.0f, 10 },
/* OBJ_BOSS_308 */ {(void*) func_8008FE78, 1, (ObjectFunc) func_800907C4, D_600FFE0, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
@@ -393,7 +396,7 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_BOSS_SO */ {(void*) func_i3_801A71B8, 2, (ObjectFunc) func_i3_801A5B3C, D_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_316 */ {(void*) func_i4_801968F4, 1, (ObjectFunc) func_i4_801946C4, D_6011058, 0.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_317 */ {(void*) func_i4_80193B1C, 1, (ObjectFunc) func_i4_80193718, D_601115C, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_AQ */ {(void*) func_i3_801B4D84, 2, (ObjectFunc) func_i3_801B134C, D_6030F74, 10000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_AQ */ {(void*) func_i3_801B4D84, 2, (ObjectFunc) func_i3_801B134C, D_AQ_6030F74, 10000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_319 */ {(void*) func_i1_801985E4, 1, (ObjectFunc) func_i1_80194398,D_i1_8019A9B8, 3000.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_320 */ {(void*) func_i6_801928C8, 2, (ObjectFunc) func_i6_8018DBF0, D_C038DC0, 10000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_321 */ {(void*) func_i6_8018B8C0, 1, (ObjectFunc) func_i6_80189B70, D_C038F24, 10000.0f, 0, 0, 40, 0, 0.0f, 10 },
@@ -413,7 +416,7 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_ITEM_1UP */ {(void*) D_1022120, 0, (ObjectFunc) func_80067B1C, D_800CBE8C, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_GOLD_RING */ {(void*) func_8005CA80, 1, (ObjectFunc) func_800685F8, D_800CBF54, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_WING_REPAIR */ {(void*) D_3007650, 0, (ObjectFunc) func_80068618, D_800CBFA8, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_TRAINING_RING */ {(void*) gItemTrainingRingDL, 0, (ObjectFunc) func_i1_80198968, D_training_6009CFC, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_TRAINING_RING */ {(void*) gItemTrainingRingDL, 0, (ObjectFunc) func_i1_80198968, D_TR_6009CFC, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_339 */ {(void*) func_8007D55C, 1, (ObjectFunc) func_8007D2F4, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_340 */ {(void*) func_8007D55C, 1, (ObjectFunc) func_8007D748, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_341 */ {(void*) func_8007D55C, 1, (ObjectFunc) func_8007D8A8, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 },
src/main/fox_edisplay.c
+13 -5
View File
@@ -8,6 +8,14 @@ Matrix D_801615F0;
WingInfo D_80161630;
#include "fox_edisplay_assets.h"
#include "assets/ast_sector_x.h"
#include "assets/ast_aquas.h"
#include "assets/ast_7_ti_1.h"
#include "assets/ast_andross.h"
#include "assets/ast_star_wolf.h"
#include "assets/ast_arwing.h"
#include "assets/ast_blue_marine.h"
#include "assets/ast_vs_player.h"
char D_800CF970[] = "$Id: fox_edisplay.c,v 1.196 1997/05/08 08:31:50 morita Exp $";
@@ -85,10 +93,10 @@ void func_80059AEC(Object_80* obj80) {
void func_80059B20(Object_80* obj80) {
if (obj80->obj.id == OBJ_80_29) {
gSPDisplayList(gMasterDisp++, D_7007350);
gSPDisplayList(gMasterDisp++, D_TI1_7007350);
} else {
Graphics_SetScaleMtx(D_800CF9B0[obj80->obj.id + 2]);
gSPDisplayList(gMasterDisp++, D_700BB10);
gSPDisplayList(gMasterDisp++, D_TI1_700BB10);
}
}
@@ -208,7 +216,7 @@ Gfx* D_800CFC0C[] = {
D_60294A0, D_60291B0, D_60287F0, D_6029330, D_6029240, D_6029790, D_6029900,
D_6028F50, D_60290C0, D_6029530, D_60296A0, D_6028A80, D_6028910,
};
Gfx* D_800CFC40[] = { D_6014FD0, D_6014FD0, D_6014FD0, D_6014FD0 };
Gfx* D_800CFC40[] = { D_AQ_6014FD0, D_AQ_6014FD0, D_AQ_6014FD0, D_AQ_6014FD0 };
Gfx* D_800CFC50[] = { D_601EDE0, D_601F2F0, D_601F830, D_601FD70, D_601D110 };
Gfx* D_800CFC64[] = { D_6023940, D_6023D70, D_60249C0, D_6023EB0, D_60249C0, D_6023B80 };
Gfx* D_800CFC7C[] = {
@@ -377,7 +385,7 @@ void func_8005A094(Actor* actor) {
case 58:
Graphics_SetScaleMtx(actor->scale);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_60148B0);
gSPDisplayList(gMasterDisp++, D_AQ_60148B0);
break;
case 59:
Graphics_SetScaleMtx(actor->scale);
@@ -1769,7 +1777,7 @@ void func_80060968(void) {
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -200.0f, 1);
Matrix_RotateZ(gGfxMatrix, gGameFrameCount * 5.0f * M_DTOR, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_60119A0);
gSPDisplayList(gMasterDisp++, D_AQ_60119A0);
} else if (gCurrentLevel == LEVEL_VENOM_ANDROSS) {
Matrix_Scale(gGfxMatrix, 1.0f, 1.0f, 0.0025f, 1);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -200.0f, 1);
src/main/fox_effect.c
+9 -16
View File
@@ -6,18 +6,6 @@ const char D_800D7230[] = "Enm->wrk3=<%d>\n";
const char D_800D7240[] = "a=<%d>\n";
const char D_800D7248[] = "a=<%d>\n";
extern Gfx D_1003130[];
extern Gfx D_1015320[];
extern Gfx D_10156A0[];
extern Gfx D_1015810[];
extern Gfx D_1015B70[];
extern Gfx D_1015CE0[];
extern Gfx D_1015E50[];
extern Gfx D_1015FC0[];
extern Gfx D_1016130[];
extern Gfx D_10162A0[];
extern Gfx D_1016410[];
extern Gfx D_4008CE0[];
extern Gfx D_4008F70[];
@@ -35,9 +23,14 @@ extern Gfx D_601BAD0[];
extern Gfx D_9013C20[];
#include "assets/ast_blue_marine.h"
#include "assets/ast_arwing.h"
#include "assets/ast_bg_space.h"
#include "assets/ast_bg_planet.h"
#include "assets/ast_training.h"
#include "assets/ast_sector_x.h"
#include "assets/ast_aquas.h"
#include "assets/ast_A_ti.h"
void BonusText_Display(f32 xPos, f32 yPos, f32 zPos, s32 hits) {
s32 i;
@@ -493,7 +486,7 @@ void func_80078BE0(Effect* effect) {
var_fv0 *= 1.2f;
}
Graphics_SetScaleMtx(effect->scale2 * var_fv0);
gSPDisplayList(gMasterDisp++, D_600F8A0);
gSPDisplayList(gMasterDisp++, D_SX_600F8A0);
}
void func_80078C84(Effect* effect) {
@@ -841,7 +834,7 @@ void func_800798F0(Effect* effect) {
case LEVEL_AQUAS:
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL(&gMasterDisp, 0x3C);
gSPDisplayList(gMasterDisp++, D_600A220);
gSPDisplayList(gMasterDisp++, D_AQ_600A220);
break;
default:
@@ -1057,7 +1050,7 @@ void func_8007A994(Effect* effect) {
effect->unk_4A++;
}
Gfx* D_800D178C[] = { D_6003440, D_60034E0, D_6003580, D_6003620, D_60036C0, D_training_6003760 };
Gfx* D_800D178C[] = { D_6003440, D_60034E0, D_6003580, D_6003620, D_60036C0, D_TR_6003760 };
void func_8007AA60(Effect* effect) {
RCP_SetupDL(&gMasterDisp, 0x44);
@@ -3914,7 +3907,7 @@ void func_80082F78(Effect* effect) {
Graphics_SetScaleMtx(effect->scale2);
RCP_SetupDL(&gMasterDisp, 0x3C);
if (gCurrentLevel == LEVEL_AQUAS) {
gSPDisplayList(gMasterDisp++, D_600A220);
gSPDisplayList(gMasterDisp++, D_AQ_600A220);
}
if (gCurrentLevel == LEVEL_ZONESS) {
gSPDisplayList(gMasterDisp++, D_6016880);
src/main/fox_enmy.c
+7 -4
View File
@@ -1,5 +1,8 @@
#include "prevent_bss_reordering.h"
#include "global.h"
#include "assets/ast_sector_x.h"
#include "assets/ast_aquas.h"
#include "assets/ast_andross.h"
s32 D_Timer_80161670[4];
s32 D_80161680;
@@ -8,9 +11,9 @@ u8 D_80161684;
#include "fox_enmy_assets.h"
ObjectInit* D_800CFDA0[] = {
D_60371A4, D_6026CC4, D_602A164, D_6023F64, D_60287A4, D_602E4F4, D_6007E74,
D_601F234, D_6026714, D_0C035154, D_6006AA4, D_6031000, D_6006C60, D_602E5C8,
D_600EAD4, NULL, D_6011044, D_600FF74, D_6006EB4, D_6014D94, D_0302DE3C,
D_60371A4, D_6026CC4, D_SX_602A164, D_6023F64, D_60287A4, D_602E4F4, D_6007E74,
D_601F234, D_6026714, D_0C035154, D_TR_6006AA4, D_6031000, D_6006C60, D_602E5C8,
D_600EAD4, NULL, D_6011044, D_600FF74, D_6006EB4, D_6014D94, D_0302DE3C,
};
s32 D_800CFDF4[] = {
OBJ_80_0,
@@ -513,7 +516,7 @@ void func_80062664(void) {
if ((gCurrentLevel == LEVEL_METEO) && (D_8017827C == 1)) {
D_80178310 = SEGMENTED_TO_VIRTUAL(D_602B148);
} else if ((gCurrentLevel == LEVEL_SECTOR_X) && (D_8017827C == 1)) {
D_80178310 = SEGMENTED_TO_VIRTUAL(D_602F18C);
D_80178310 = SEGMENTED_TO_VIRTUAL(D_SX_602F18C);
} else if ((gCurrentLevel == LEVEL_VENOM_ANDROSS) && (D_8017827C == 1)) {
D_80178310 = SEGMENTED_TO_VIRTUAL(D_C0356A4);
} else if ((gCurrentLevel == LEVEL_VENOM_1) && (D_8017827C == 1)) {
src/main/fox_enmy2.c
+44 -39
View File
@@ -5,9 +5,14 @@ s32 D_800CFF90 = 0;
s32 D_80161690;
#include "fox_enmy2_assets.h"
#include "assets/ast_arwing.h"
#include "assets/ast_training.h"
#include "assets/ast_warp_zone.h"
#include "assets/ast_allies.h"
#include "assets/ast_sector_x.h"
#include "assets/ast_aquas.h"
#include "assets/ast_7_ti_1.h"
#include "assets/ast_andross.h"
void func_8006A7B0(u16* msg, s32 character) {
PRINTF("Enm->obj.pos.y + tmp_xyz.y=<%10.3f>\n");
@@ -872,28 +877,28 @@ UnkStruct_D003C D_800D003C[108] = {
{ D_400AAE0, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
{ D_4000650, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 6, 0, 1.0f, 1 },
{ D_6016190, D_60282A0, -2.0f, 2100.0f, 3000.0f, 0, 0, 7, 0, 0.0f, 5 },
{ D_6023500, D_800CBEC4, 2.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
{ D_6022DF0, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
{ D_SX_6023500, D_800CBEC4, 2.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
{ D_SX_6022DF0, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
{ NULL, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 2, 1, 1, 0, 0.0f, 1 },
{ NULL, D_800CBEC4, 2.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 0.0f, 1 },
{ NULL, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 0.0f, 1 },
{ D_4008FA0, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
{ D_60285F0, D_603298C, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
{ D_600AF70, D_6032904, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
{ D_6023E30, D_6032970, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
{ NULL, D_603285C, 2.5f, 100.0f, 3000.0f, 2, 0, 0, 0, 1.0f, 1 },
{ D_6001CE0, D_6032938, 3.0f, 100.0f, 3000.0f, 2, 0, 0, 0, 1.0f, 1 },
{ D_6000840, D_6032954, 1.0f, 100.0f, 3000.0f, 2, 1, 0, 0, 1.0f, 1 },
{ D_SX_60285F0, D_SX_603298C, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
{ D_SX_600AF70, D_SX_6032904, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
{ D_SX_6023E30, D_SX_6032970, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
{ NULL, D_SX_603285C, 2.5f, 100.0f, 3000.0f, 2, 0, 0, 0, 1.0f, 1 },
{ D_SX_6001CE0, D_SX_6032938, 3.0f, 100.0f, 3000.0f, 2, 0, 0, 0, 1.0f, 1 },
{ D_SX_6000840, D_SX_6032954, 1.0f, 100.0f, 3000.0f, 2, 1, 0, 0, 1.0f, 1 },
{ D_6012A40, D_6028254, -2.0f, 2100.0f, 3001.0f, 0, 0, 7, 0, 0.0f, 2 },
{ NULL, D_60280E0, -2.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 3 },
{ D_6009950, D_6032878, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
{ D_SX_6009950, D_SX_6032878, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
{ NULL, D_800CBEC4, 2.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 },
{ D_600B2B0, D_6032894, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
{ D_600A2E0, D_60328B0, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
{ D_SX_600B2B0, D_SX_6032894, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
{ D_SX_600A2E0, D_SX_60328B0, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
{ NULL, D_800CBEFC, 2.0f, 200.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
{ D_600B830, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
{ NULL, D_603238C, 1.0f, 500.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 },
{ D_6020D20, D_60328CC, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
{ D_SX_600B830, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
{ NULL, D_SX_603238C, 1.0f, 500.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 },
{ D_SX_6020D20, D_SX_60328CC, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
{ NULL, D_800CBF34, 1.0f, 100.0f, 3001.0f, 2, 0, 0, 0, 0.0f, 1 },
{ D_60097E0, D_6034478, -1.0f, 10000.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
{ D_601D730, D_603450C, -1.0f, 10000.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
@@ -907,7 +912,7 @@ UnkStruct_D003C D_800D003C[108] = {
{ NULL, D_603405C, 0.3f, 100.0f, 3000.0f, 0, 0, 1, 0, 1.0f, 1 },
{ D_6015D60, D_6034124, 2.0f, 100.0f, 3000.0f, 0, 0, 1, 0, 1.0f, 1 },
{ NULL, D_602C1A0, -1.0f, 1000.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 },
{ D_600B540, D_60328E8, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
{ D_SX_600B540, D_SX_60328E8, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
{ D_4000EC0, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
{ D_4008D50, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
{ NULL, D_800CBF34, -1.0f, 2000.0f, 3000.0f, 0, 0, 3, 0, 0.0f, 1 },
@@ -937,26 +942,26 @@ UnkStruct_D003C D_800D003C[108] = {
{ NULL, D_601B474, -1.0f, 100.0f, 3000.0f, 2, 0, 0, 0, 0.0f, 1 },
{ NULL, D_800CBF34, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 },
{ NULL, D_800CBE8C, 2.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
{ NULL, D_6030B4C, 1.0f, 100.0f, 3000.0f, 2, 0, 0, 0, 60.0f, 1 },
{ NULL, D_AQ_6030B4C, 1.0f, 100.0f, 3000.0f, 2, 0, 0, 0, 60.0f, 1 },
{ D_9012180, D_601B43C, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 },
{ NULL, D_800CBE8C, 1.0f, 20000.0f, 3000.0f, 1, 0, 2, 0, 0.0f, 0 },
{ NULL, D_800CBE8C, 1.0f, 20000.0f, 3000.0f, 1, 0, 2, 0, 0.0f, 0 },
{ D_900EFC0, D_800CBF34, 1.0f, 100.0f, 3000.0f, 1, 1, 0, 0, 0.0f, 1 },
{ NULL, D_6030B30, 1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 },
{ NULL, D_6030B14_f32, 1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 },
{ NULL, D_AQ_6030B30, 1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 },
{ NULL, D_AQ_6030B14_f32, 1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 },
{ D_601C520, D_60368FC, 1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 },
{ D_600AF40, D_60368E0, -1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 },
{ D_7000C40, D_800CC0D4, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
{ D_70010E0, D_800CC0F0, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
{ D_7000E80, D_800CC054, 2.5f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 },
{ D_70008F0, D_800CBE8C, -1.0f, 100.0f, 8000.0f, 1, 0, 0, 0, 0.0f, 0 },
{ D_7000280, D_800CC070, -1.0f, 1000.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 0 },
{ D_WZ_7000C40, D_800CC0D4, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
{ D_WZ_70010E0, D_800CC0F0, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
{ D_WZ_7000E80, D_800CC054, 2.5f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 },
{ D_WZ_70008F0, D_800CBE8C, -1.0f, 100.0f, 8000.0f, 1, 0, 0, 0, 0.0f, 0 },
{ D_WZ_7000280, D_800CC070, -1.0f, 1000.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 0 },
{ D_600AC70, D_800CBE8C, -1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 },
{ D_601A2B0, D_60364C0, 1.0f, 100.0f, 3000.0f, 1, 1, 0, 0, 0.0f, 1 },
{ D_6002500, D_601B944, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 },
{ D_60043F0, D_800CBF34, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 },
{ D_6004310, D_800CBF34, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 },
{ D_training_6002740, D_training_6009D18, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 },
{ D_TR_6002740, D_TR_6009D18, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 },
{ NULL, D_800CBF34, -1.0f, 500.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 0 },
{ NULL, D_800CBF34, -1.0f, 500.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 0 },
{ NULL, D_800CBEC4, 1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 1.0f, 1 },
@@ -988,13 +993,13 @@ void func_8006D36C(Actor* actor) {
var_v1 = SEGMENTED_TO_VIRTUAL(D_602F3AC);
break;
case LEVEL_AQUAS:
var_v1 = SEGMENTED_TO_VIRTUAL(D_60308B8);
var_v1 = SEGMENTED_TO_VIRTUAL(D_AQ_60308B8);
break;
case LEVEL_TITANIA:
var_v1 = SEGMENTED_TO_VIRTUAL(D_600631C);
break;
case LEVEL_SECTOR_X:
var_v1 = SEGMENTED_TO_VIRTUAL(D_60320D0);
var_v1 = SEGMENTED_TO_VIRTUAL(D_SX_60320D0);
break;
case LEVEL_UNK_4:
var_v1 = SEGMENTED_TO_VIRTUAL(D_60289FC);
@@ -1018,7 +1023,7 @@ void func_8006D36C(Actor* actor) {
var_v1 = SEGMENTED_TO_VIRTUAL(D_60381D8);
break;
case LEVEL_TRAINING:
var_v1 = SEGMENTED_TO_VIRTUAL(D_training_6009B34);
var_v1 = SEGMENTED_TO_VIRTUAL(D_TR_6009B34);
break;
default:
var_v1 = SEGMENTED_TO_VIRTUAL(D_603D9E8);
@@ -2819,7 +2824,7 @@ void func_800720E8(Actor* actor) {
if (actor->health <= 0) {
actor->unk_046 = 1;
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6032408);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SX_6032408);
AUDIO_PLAY_SFX(0x1900000D, actor->sfxSource, 0);
} else {
AUDIO_PLAY_SFX(0x2903300E, actor->sfxSource, 0);
@@ -3728,11 +3733,11 @@ bool func_80074C44(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* dat
void func_80074E3C(Actor* actor) {
Vec3f sp30[10];
Animation_GetFrameData(&D_6013820, 0, sp30);
Animation_GetFrameData(&D_SX_6013820, 0, sp30);
sp30[6].y += actor->fwork[15];
sp30[5].z += actor->fwork[16] + ((actor->timer_0BE >> 2) & 1);
sp30[4].z -= actor->fwork[16] + ((actor->timer_0BE >> 2) & 1);
Animation_DrawSkeleton(1, D_601390C, sp30, func_80074C44, NULL, actor, &gIdentityMatrix);
Animation_DrawSkeleton(1, D_SX_601390C, sp30, func_80074C44, NULL, actor, &gIdentityMatrix);
}
bool func_80074F04(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thisx) {
@@ -3925,9 +3930,9 @@ void func_80074FF0(Actor* actor) {
}
RCP_SetupDL(&gMasterDisp, 0x39);
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
gSPDisplayList(gMasterDisp++, D_6001950);
gSPDisplayList(gMasterDisp++, D_SX_6001950);
} else {
gSPDisplayList(gMasterDisp++, D_60066F0);
gSPDisplayList(gMasterDisp++, D_SX_60066F0);
}
break;
@@ -3946,9 +3951,9 @@ void func_80074FF0(Actor* actor) {
break;
case 36:
Animation_GetFrameData(&D_700CAF4, actor->unk_0B6, sp114);
Animation_GetFrameData(&D_TI1_700CAF4, actor->unk_0B6, sp114);
sp114[2].z += actor->fwork[15];
Animation_DrawSkeleton(1, D_700CB60, sp114, NULL, NULL, actor, &gIdentityMatrix);
Animation_DrawSkeleton(1, D_TI1_700CB60, sp114, NULL, NULL, actor, &gIdentityMatrix);
break;
case 38:
@@ -4026,8 +4031,8 @@ void func_80074FF0(Actor* actor) {
case 83:
Matrix_Scale(gGfxMatrix, 3.0f, 3.0f, 3.0f, 1);
Animation_GetFrameData(&D_602201C, actor->unk_0B6, sp114);
Animation_DrawSkeleton(1, D_60220E8, sp114, NULL, NULL, actor, &gIdentityMatrix);
Animation_GetFrameData(&D_AQ_602201C, actor->unk_0B6, sp114);
Animation_DrawSkeleton(1, D_AQ_60220E8, sp114, NULL, NULL, actor, &gIdentityMatrix);
break;
case 85:
@@ -4043,12 +4048,12 @@ void func_80074FF0(Actor* actor) {
case 88:
RCP_SetupDL(&gMasterDisp, 0x16);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, actor->unk_046, actor->unk_046, actor->unk_046, 255);
gSPDisplayList(gMasterDisp++, D_6008970);
gSPDisplayList(gMasterDisp++, D_AQ_6008970);
break;
case 89:
RCP_SetupDL(&gMasterDisp, 0x15);
gSPDisplayList(gMasterDisp++, D_6000E10);
gSPDisplayList(gMasterDisp++, D_AQ_6000E10);
break;
case 103:
@@ -4060,7 +4065,7 @@ void func_80074FF0(Actor* actor) {
RCP_SetupDL(&gMasterDisp, 0x23);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, 0x8F);
gDPSetEnvColor(gMasterDisp++, 0, 0, 0, 0);
gSPDisplayList(gMasterDisp++, D_7000000);
gSPDisplayList(gMasterDisp++, D_WZ_7000000);
break;
case 106:
src/main/fox_game.c
+5 -5
View File
@@ -364,11 +364,11 @@ void Game_Update(void) {
case GSTATE_LOGO_WAIT:
RCP_SetupDL(&gMasterDisp, 0x4C);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
TextureRect_8bIA(&gMasterDisp, D_F000000, 128, 16, 100.0f, 86.0f, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, D_F000800, 128, 16, 100.0f, 102.0f, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, D_F001000, 128, 16, 100.0f, 118.0f, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, D_F001800, 128, 16, 100.0f, 134.0f, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, D_F002000, 128, 10, 100.0f, 150.0f, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, &gNintendoLogo[128 * 16 * 0], 128, 16, 100.0f, 86.0f, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, &gNintendoLogo[128 * 16 * 1], 128, 16, 100.0f, 102.0f, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, &gNintendoLogo[128 * 16 * 2], 128, 16, 100.0f, 118.0f, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, &gNintendoLogo[128 * 16 * 3], 128, 16, 100.0f, 134.0f, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, &gNintendoLogo[128 * 16 * 4], 128, 10, 100.0f, 150.0f, 1.0f, 1.0f);
break;
case GSTATE_START:
gGameState = GSTATE_INIT;
src/main/fox_hud.c
+10 -43
View File
@@ -1,8 +1,15 @@
#include "prevent_bss_reordering.h"
// #include "prevent_bss_reordering.h"
#include "sf64math.h"
#include "assets/ast_blue_marine.h"
#include "assets/ast_landmaster.h"
#include "assets/ast_training.h"
#include "assets/ast_andross.h"
#include "assets/ast_star_wolf.h"
#include "assets/ast_font.h"
#include "assets/ast_vs_player.h"
#include "assets/ast_bg_planet.h"
#include "assets/ast_bg_space.h"
#include "prevent_bss_reordering.h"
// BSS section range:
// D_801616A0 <==> D_80161910
@@ -71,46 +78,6 @@ void func_80087788(void);
// Segmented addresses
extern u8 D_1000000[];
extern u8 D_1000280[];
extern u8 D_1000640[];
extern u16 D_1000E80[];
extern u16 D_1002280[];
extern u16 D_10030D0[];
extern s32 D_1011280[];
extern s32 D_10116A0[];
extern s32 D_10116B0[];
extern s32 D_1011730[];
extern s32 D_1011AC0[];
extern s32 D_1011B90[];
extern s32 D_1011BB0[];
extern s32 D_1011C80[];
extern s32 D_1011CA0[];
extern s32 D_1011D70[];
extern s32 D_1011D90[];
extern s32 D_1011E60[];
extern s32 D_1013580[];
extern s32 D_1013700[];
extern Gfx D_20031B0[];
extern Gfx D_2010A30[];
extern u16 D_3000B20[];
extern u8 D_30013E0[];
extern Gfx D_1012110[];
extern Gfx D_101C2E0[];
extern Gfx D_1024990[];
extern Gfx D_101C170[];
extern Gfx D_101C000[];
extern Gfx D_101BE90[];
extern Gfx D_101BD20[];
extern Gfx D_101BBB0[];
extern Gfx D_101BA40[];
extern Gfx D_101B8D0[];
extern Gfx D_101B760[];
extern Gfx D_101B5F0[];
extern Gfx D_101B480[];
extern Gfx D_101B310[];
extern Gfx D_101B1A0[];
extern u16 D_3000120[];
extern u8 D_6000000[];
extern u16 D_6000840[];
extern u16 D_6000C80[];
@@ -119,8 +86,8 @@ extern u8 D_6001260[];
extern u8 D_60012D0[];
extern u8 D_6002890[];
extern Gfx D_6003090[];
extern u8 D_C000A80[];
#include "assets/ast_blue_marine.h"
#include "assets/ast_arwing.h"
#include "assets/ast_bg_space.h"
#include "assets/ast_bg_planet.h"
@@ -1711,7 +1678,7 @@ void func_80088970(void) {
}
if (gCurrentLevel == LEVEL_TRAINING) {
TextureRect_8bIA(&gMasterDisp, D_training_6000000, 96, 12, x1, y1, 1.0f, 1.0f);
TextureRect_8bIA(&gMasterDisp, D_TR_6000000, 96, 12, x1, y1, 1.0f, 1.0f);
} else {
if (gLifeCount[gPlayerNum]) {
TextureRect_8bIA(&gMasterDisp, D_1000280, 96, 10, x1, y1, 1.0f, 1.0f);
src/main/fox_play.c
+11 -6
View File
@@ -2,6 +2,11 @@
#include "global.h"
#include "fox_map.h"
#include "assets/ast_training.h"
#include "assets/ast_sector_x.h"
#include "assets/ast_aquas.h"
#include "assets/ast_andross.h"
#include "assets/ast_arwing.h"
#include "assets/ast_vs_player.h"
UNK_TYPE D_800D2F50 = 0;
s32 D_800D2F54 = 0;
@@ -454,9 +459,9 @@ void func_800A5844(void) {
}
EnvSettings* D_800D2F98[21] = {
&D_6037160, &D_ENV_6026C80, &D_602A120, &D_6023F20, &D_6028760, &D_602E4B0, &D_6007E30,
&D_601F1F0, &D_60266D0, &D_C035110, &D_training_6006A60, &D_6030E30_Env, &D_6005000, &D_602E540,
&D_600EA90, NULL, &D_6011000, &D_600FF30_Env, &D_6006E70, &D_6014D50, &D_302DD70,
&D_6037160, &D_ENV_6026C80, &D_SX_602A120, &D_6023F20, &D_6028760, &D_602E4B0, &D_6007E30,
&D_601F1F0, &D_60266D0, &D_C035110, &D_TR_6006A60, &D_6030E30_Env, &D_6005000, &D_AQ_602E540,
&D_600EA90, NULL, &D_6011000, &D_600FF30_Env, &D_6006E70, &D_6014D50, &D_302DD70,
};
void func_800A594C(void) {
@@ -482,7 +487,7 @@ void func_800A594C(void) {
Audio_KillSfxBySourceAndId(gPlayer[0].sfxSource, 0x3140807E);
}
} else if (gCurrentLevel == LEVEL_AQUAS) {
sEnvSettings = SEGMENTED_TO_VIRTUAL(D_602E584);
sEnvSettings = SEGMENTED_TO_VIRTUAL(&D_AQ_602E584);
}
D_80177C90 = sEnvSettings->seqId;
gLevelType = sEnvSettings->type;
@@ -1900,7 +1905,7 @@ void func_800A8BA4(Player* player) {
actor->vwork[29].z + actor->unk_0F4.z);
if (temp_v0 != 0) {
if ((temp_v0 < 0) && (actor->unk_0B4 == 38)) {
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6032328);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SX_6032328);
if (D_80177E80 >= 0) {
actor->unk_046 = 2;
D_80177E80++;
@@ -6167,7 +6172,7 @@ void func_800B79B0(void) {
}
break;
case LEVEL_AQUAS:
func_8008C104(D_603158C, D_602ACC0);
func_8008C104(D_AQ_603158C, D_AQ_602ACC0);
break;
case LEVEL_SOLAR:
func_800A3FEC();
src/main/fox_radio.c
+10 -6
View File
@@ -14,6 +14,10 @@ s32 D_80178748;
#include "assets/ast_allies.h"
#include "assets/ast_training.h"
#include "assets/ast_sector_x.h"
#include "assets/ast_aquas.h"
#include "assets/ast_star_wolf.h"
#include "assets/ast_great_fox.h"
s32 gCurrentMsgPri = 0;
@@ -287,10 +291,10 @@ void func_800BAAE8(void) {
sp44 = D_6015430;
break;
case RCID_BOSS_SECTORX:
sp44 = D_6020FB0;
sp44 = D_SX_6020FB0;
break;
case RCID_BOSS_SECTORX_OPEN:
sp44 = D_6021ED0;
sp44 = D_SX_6021ED0;
break;
case RCID_BOSS_SECTORY:
sp44 = D_6018F30;
@@ -370,11 +374,11 @@ void func_800BAAE8(void) {
case RCID_GEN_PEPPER_TITLE_OPEN:
sp44 = D_E010E60;
break;
case RCID_TRAINING:
sp44 = D_training_6000900;
case RCID_TR:
sp44 = D_TR_6000900;
break;
case RCID_TRAINING_OPEN:
sp44 = D_training_6001820;
case RCID_TR_OPEN:
sp44 = D_TR_6001820;
break;
case RCID_STATIC_FLIP:
mirror = true;
src/main/fox_std_lib.c
-1
View File
@@ -2,7 +2,6 @@
char D_801619A0[100];
#include "fox_std_lib_assets.h"
#include "assets/ast_font.h"
char* Graphics_ClearPrintBuffer(char* buf, s32 fill, s32 len) {
src/main/fox_versus.c
+1 -1
View File
@@ -39,8 +39,8 @@ s32 D_80178850[4];
OSTime D_80178860;
OSTime D_80178868;
#include "fox_versus_assets.h"
#include "assets/ast_font.h"
#include "assets/ast_vs_player.h"
s32 D_800D4A90 = 0;
s32 D_800D4A94 = 0;
src/overlays/ovl_ending/fox_end1.c
+2 -2
View File
@@ -1,7 +1,9 @@
#include "prevent_bss_reordering.h"
#include "global.h"
#include "assets/ast_ending_award_front.h"
#include "assets/ast_ending_award_back.h"
#include "assets/ast_allies.h"
#include "assets/ast_great_fox.h"
void func_ending_8018CE20(s32);
void func_ending_801926D4(void);
@@ -37,8 +39,6 @@ extern u8 D_7010FF0[];
extern u16 D_70110C0[];
extern u8 D_70110E0[];
extern u16 D_70111B0[];
extern Gfx D_E000000[];
extern Gfx D_E003AB0[];
bool func_ending_80189C64(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data);
void func_ending_8018ABE8(void);
src/overlays/ovl_ending/fox_end2.c
+2 -1
View File
@@ -1,7 +1,8 @@
#include "global.h"
#include "fox_end2_data.c"
#include "assets/ast_arwing.h"
#include "assets/ast_ending_expert.h"
#include "assets/ast_allies.h"
#include "fox_end2_data.c"
void func_ending_8018CE20(u32 arg0) {
u8 alpha;
src/overlays/ovl_ending/fox_end2_data.c
+2 -6
View File
@@ -2,6 +2,8 @@
#define FOX_END2_DATA
#include "global.h"
#include "assets/ast_arwing.h"
#include "assets/ast_font.h"
typedef struct {
/* 0x00 */ u8* unk_00;
@@ -85,12 +87,6 @@ Vec3f D_ending_801985E0;
Vec3f D_ending_801985F0;
Vec3f D_ending_80198600[300];
extern Gfx D_3003CE0[];
extern Gfx D_3016CC0[];
extern u8 D_50054B0[];
extern u8 D_5007240[];
extern u8 D_5007330[];
extern u8 D_5007420[];
extern Animation D_602F8E0;
extern Limb* D_602FBAC[];
extern Animation D_60305C0;
src/overlays/ovl_i1/fox_co.c
+1 -2
View File
@@ -1,4 +1,5 @@
#include "global.h"
#include "assets/ast_arwing.h"
// bss
u8 D_i1_8019B6D0;
@@ -2550,8 +2551,6 @@ void func_i1_8018F6F8(Actor* actor, s32 arg1) {
AUDIO_PLAY_SFX(0x3100000C, actor->sfxSource, 4);
}
extern Gfx D_30184D8[];
void func_i1_8018F880(Player* player) {
s32 i;
Actor* actor0 = &gActors[0];
src/overlays/ovl_i1/fox_tr360.c
+3 -3
View File
@@ -1,12 +1,12 @@
#include "global.h"
extern ObjectInit D_6008EF8[];
extern ObjectInit D_TR_6008EF8[];
void func_i1_80198C50(void) {
Object_58* obj58;
s32 i;
D_80178310 = SEGMENTED_TO_VIRTUAL(D_6008EF8);
D_80178310 = SEGMENTED_TO_VIRTUAL(D_TR_6008EF8);
Rand_SetSeed(1, 29000, 9876);
obj58 = gObjects58;
@@ -223,7 +223,7 @@ void func_i1_8019949C(void) {
D_80177C8C = 1;
}
if (D_i1_8019AE50[D_80177C8C].unk != 0) {
Radio_PlayMessage(D_i1_8019AE50[D_80177C8C].msg, RCID_TRAINING);
Radio_PlayMessage(D_i1_8019AE50[D_80177C8C].msg, RCID_TR);
D_80177C78 = D_i1_8019AE50[D_80177C8C].unk;
} else {
D_80161690 = 80;
src/overlays/ovl_i2/fox_sx.c
+62 -61
View File
@@ -1,4 +1,5 @@
#include "global.h"
#include "assets/ast_sector_x.h"
s32 D_i2_80195D80;
f32 D_i2_80195D88[3];
@@ -10,24 +11,24 @@ Vec3f D_i2_80195650 = { 90.0f, 0.0f, 0.0f };
Vec3f D_i2_8019565C = { 73.0f, -102.0f, -80.0f };
Vec3f D_i2_80195668 = { 90.0f, 0.0f, 0.0f };
extern Gfx D_60010C0[];
extern Gfx D_6006810[];
extern Gfx D_6009C30[];
extern Animation D_6009FF8;
extern Animation D_600A2D4;
extern Animation D_600F890;
extern Animation D_60123BC;
extern Animation D_6013798;
extern Animation D_60158C4;
extern Animation D_6016E28;
extern Animation D_601AA28;
extern Animation D_601C690;
extern Animation D_60206DC;
extern Limb* D_6020C68[];
extern Gfx D_6020D20[];
extern f32 D_603265C[];
extern f32 D_6032768[];
extern f32 D_60328CC[];
extern Gfx D_SX_60010C0[];
extern Gfx D_SX_6006810[];
extern Gfx D_SX_6009C30[];
extern Animation D_SX_6009FF8;
extern Animation D_SX_600A2D4;
extern Animation D_SX_600F890;
extern Animation D_SX_60123BC;
extern Animation D_SX_6013798;
extern Animation D_SX_60158C4;
extern Animation D_SX_6016E28;
extern Animation D_SX_601AA28;
extern Animation D_SX_601C690;
extern Animation D_SX_60206DC;
extern Limb* D_SX_6020C68[];
extern Gfx D_SX_6020D20[];
extern f32 D_SX_603265C[];
extern f32 D_SX_6032768[];
extern f32 D_SX_60328CC[];
extern s32 D_800C9E90[];
extern void func_i2_8018F030(void);
@@ -174,7 +175,7 @@ void func_i2_8018F330(Actor* actor) {
void func_i2_8018F884(Actor* actor) {
switch (actor->unk_0B6) {
case 0:
gSPDisplayList(gMasterDisp++, D_6020D20);
gSPDisplayList(gMasterDisp++, D_SX_6020D20);
break;
case 1:
@@ -190,7 +191,7 @@ void func_i2_8018F884(Actor* actor) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 220, 70, 30, 255);
Matrix_Scale(gGfxMatrix, 70.0f, 70.0f, 1.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_60010C0);
gSPDisplayList(gMasterDisp++, D_SX_60010C0);
default:
break;
@@ -216,7 +217,7 @@ void func_i2_8018FA04(f32 x, f32 y, f32 z) {
actor->obj.pos.y = y;
actor->obj.pos.z = z;
Object_SetInfo(&actor->info, actor->obj.id);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_60328CC);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SX_60328CC);
xRot = Math_Atan2F(gPlayer[0].pos.x - x, gPlayer[0].unk_138 - z);
pad = sqrtf(SQ(gPlayer[0].pos.x - x) + SQ(gPlayer[0].unk_138 - z));
yRot = -Math_Atan2F(gPlayer[0].pos.y - y, pad);
@@ -275,7 +276,7 @@ void func_i2_8018FE38(Boss* boss) {
Vec3f sp20;
if (boss->state == 0) {
Animation_GetFrameData(&D_60206DC, boss->unk_04C, boss->vwork);
Animation_GetFrameData(&D_SX_60206DC, boss->unk_04C, boss->vwork);
Math_Vec3fFromAngles(&sp20, boss->obj.rot.x, boss->obj.rot.y, 20.0f);
boss->vel.x = sp20.x;
boss->vel.y = sp20.y;
@@ -312,7 +313,7 @@ bool func_i2_8018FF40(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void*
}
void func_i2_8018FF84(Boss* boss) {
Animation_DrawSkeleton(3, D_6020C68, boss->vwork, func_i2_8018FF40, func_i2_80193208, boss, gCalcMatrix);
Animation_DrawSkeleton(3, D_SX_6020C68, boss->vwork, func_i2_8018FF40, func_i2_80193208, boss, gCalcMatrix);
}
bool func_i2_8018FFDC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data) {
@@ -324,7 +325,7 @@ bool func_i2_8018FFDC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void*
}
void func_i2_80190020(Boss* boss) {
Animation_DrawSkeleton(3, D_6020C68, boss->vwork, func_i2_8018FFDC, func_i2_80193208, boss, gCalcMatrix);
Animation_DrawSkeleton(3, D_SX_6020C68, boss->vwork, func_i2_8018FFDC, func_i2_80193208, boss, gCalcMatrix);
}
void func_i2_80190078(Boss* boss) {
@@ -446,7 +447,7 @@ void func_i2_80190078(Boss* boss) {
boss->swork[7] = 1;
Audio_KillSfxBySourceAndId(D_i2_80195D88, 0x31032061);
Audio_KillSfxBySourceAndId(D_i2_80195D98, 0x31032061);
boss->info.hitbox = SEGMENTED_TO_VIRTUAL(D_603265C);
boss->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SX_603265C);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 1);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 1);
boss->timer_052 = 40;
@@ -520,7 +521,7 @@ void func_i2_80190078(Boss* boss) {
boss->swork[7] = 1;
boss->obj.pos.x = gPlayer[0].unk_0AC;
boss->swork[0] = 0;
Animation_GetFrameData(&D_60206DC, boss->unk_04C, boss->vwork);
Animation_GetFrameData(&D_SX_60206DC, boss->unk_04C, boss->vwork);
boss->fwork[1] = -2000.0f;
boss->fwork[14] = 300.0f;
boss->fwork[17] = -300.0f;
@@ -530,7 +531,7 @@ void func_i2_80190078(Boss* boss) {
boss->timer_050 = 450;
boss->swork[3] = 400;
boss->health = 300;
boss->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6032550);
boss->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SX_6032550);
gBossActive = 1;
AUDIO_PLAY_BGM(D_800C9E90[gCurrentLevel]);
boss->swork[6] = 1;
@@ -572,13 +573,13 @@ void func_i2_80190078(Boss* boss) {
case 100:
boss->fwork[1] = -2000.0f;
frameData = Animation_GetFrameData(&D_60206DC, boss->unk_04C, sp80);
frameData = Animation_GetFrameData(&D_SX_60206DC, boss->unk_04C, sp80);
Math_SmoothStepToVec3fArray(sp80, boss->vwork, 1, frameData, boss->fwork[0], 100.0f, 0.0f);
Math_SmoothStepToF(&boss->fwork[0], 1.0f, 1.0f, 0.05f, 0);
boss->unk_04C++;
if (boss->unk_04C >= Animation_GetFrameCount(&D_60206DC)) {
if (boss->unk_04C >= Animation_GetFrameCount(&D_SX_60206DC)) {
boss->unk_04C = 0;
boss->state = 1;
boss->fwork[0] = 0.0f;
@@ -597,13 +598,13 @@ void func_i2_80190078(Boss* boss) {
boss->fwork[44] = 5.0f;
boss->fwork[43] = 5.0f;
frameData = Animation_GetFrameData(&D_6016E28, boss->unk_04C, sp80);
frameData = Animation_GetFrameData(&D_SX_6016E28, boss->unk_04C, sp80);
Math_SmoothStepToVec3fArray(sp80, boss->vwork, 1, frameData, boss->fwork[0], 100.0f, 0.0f);
Math_SmoothStepToF(&boss->fwork[0], 1.0f, 1.0f, 0.05f, 0);
boss->unk_04C++;
if (boss->unk_04C >= Animation_GetFrameCount(&D_6016E28)) {
if (boss->unk_04C >= Animation_GetFrameCount(&D_SX_6016E28)) {
boss->unk_04C = 0;
boss->state = 2;
boss->fwork[0] = 0.0f;
@@ -633,13 +634,13 @@ void func_i2_80190078(Boss* boss) {
boss->fwork[42] = 0.0f;
}
frameData = Animation_GetFrameData(&D_60123BC, boss->unk_04C, sp80);
frameData = Animation_GetFrameData(&D_SX_60123BC, boss->unk_04C, sp80);
Math_SmoothStepToVec3fArray(sp80, boss->vwork, 1, frameData, boss->fwork[0], 100.0f, 0.0f);
Math_SmoothStepToF(&boss->fwork[0], 1.0f, 1.0f, 0.05f, 0);
boss->unk_04C++;
if (boss->unk_04C >= Animation_GetFrameCount(&D_60123BC)) {
if (boss->unk_04C >= Animation_GetFrameCount(&D_SX_60123BC)) {
boss->unk_04C = 0;
boss->state = 3;
boss->fwork[42] = boss->fwork[43] = boss->fwork[44] = boss->fwork[0] = 0.0f;
@@ -669,13 +670,13 @@ void func_i2_80190078(Boss* boss) {
boss->fwork[42] = 0.0f;
}
frameData = Animation_GetFrameData(&D_6013798, boss->unk_04C, sp80);
frameData = Animation_GetFrameData(&D_SX_6013798, boss->unk_04C, sp80);
Math_SmoothStepToVec3fArray(sp80, boss->vwork, 1, frameData, boss->fwork[0], 100.0f, 0.0f);
Math_SmoothStepToF(&boss->fwork[0], 1.0f, 1.0f, 0.05f, 0);
boss->unk_04C++;
if (boss->unk_04C >= Animation_GetFrameCount(&D_6013798)) {
if (boss->unk_04C >= Animation_GetFrameCount(&D_SX_6013798)) {
boss->unk_04C = 0;
boss->fwork[0] = 0.0f;
if (boss->swork[3] <= 250) {
@@ -703,7 +704,7 @@ void func_i2_80190078(Boss* boss) {
Math_SmoothStepToF(&boss->fwork[43], 10.0f, 1.0f, 1.0f, 0);
Math_SmoothStepToF(&boss->fwork[42], 50.0f, 1.0f, 3.0f, 0);
frameData = Animation_GetFrameData(&D_6016E28, 0, sp80);
frameData = Animation_GetFrameData(&D_SX_6016E28, 0, sp80);
Math_SmoothStepToVec3fArray(sp80, boss->vwork, 1, frameData, boss->fwork[0], 100.0f, 0.0f);
Math_SmoothStepToF(&boss->fwork[0], 1.0f, 1.0f, 0.05f, 0);
@@ -830,13 +831,13 @@ void func_i2_80190078(Boss* boss) {
boss->fwork[2] = -400.0f;
boss->fwork[42] = 30.0f;
frameData = Animation_GetFrameData(&D_601C690, boss->unk_04C, sp80);
frameData = Animation_GetFrameData(&D_SX_601C690, boss->unk_04C, sp80);
Math_SmoothStepToVec3fArray(sp80, boss->vwork, 1, frameData, boss->fwork[0], 100.0f, 0.0f);
Math_SmoothStepToF(&boss->fwork[0], 1.0f, 1.0f, 0.05f, 0);
boss->unk_04C++;
if (boss->unk_04C >= Animation_GetFrameCount(&D_601C690)) {
if (boss->unk_04C >= Animation_GetFrameCount(&D_SX_601C690)) {
boss->state = 75;
boss->fwork[0] = 0.0f;
boss->unk_04C = 0;
@@ -848,7 +849,7 @@ void func_i2_80190078(Boss* boss) {
boss->fwork[41] = 20.0f;
boss->fwork[2] = -400.0f;
frameData = Animation_GetFrameData(&D_600A2D4, 0, sp80);
frameData = Animation_GetFrameData(&D_SX_600A2D4, 0, sp80);
Math_SmoothStepToVec3fArray(sp80, boss->vwork, 1, frameData, boss->fwork[0], 2.5f, 0.0f);
Math_SmoothStepToF(&boss->fwork[0], 0.1f, 1.0f, 0.005f, 0);
@@ -876,13 +877,13 @@ void func_i2_80190078(Boss* boss) {
boss->fwork[43] = 5.0f;
boss->fwork[42] = 30.0f;
frameData = Animation_GetFrameData(&D_600F890, boss->unk_04C, sp80);
frameData = Animation_GetFrameData(&D_SX_600F890, boss->unk_04C, sp80);
Math_SmoothStepToVec3fArray(sp80, boss->vwork, 1, frameData, boss->fwork[0], 100.0f, 0.0f);
Math_SmoothStepToF(&boss->fwork[0], 1.0f, 1.0f, 0.02f, 0);
boss->unk_04C++;
if (boss->unk_04C >= Animation_GetFrameCount(&D_600F890)) {
if (boss->unk_04C >= Animation_GetFrameCount(&D_SX_600F890)) {
boss->unk_04C = 0;
boss->fwork[0] = 0.0f;
boss->state = 9;
@@ -896,15 +897,15 @@ void func_i2_80190078(Boss* boss) {
boss->fwork[2] = gPlayer[0].pos.y;
boss->fwork[3] = gPlayer[0].pos.x;
frameData = Animation_GetFrameData(&D_60123BC, boss->unk_04C, sp80);
frameData = Animation_GetFrameData(&D_SX_60123BC, boss->unk_04C, sp80);
Math_SmoothStepToVec3fArray(sp80, boss->vwork, 1, frameData, boss->fwork[0], 50.0f, 0.0f);
Math_SmoothStepToF(&boss->fwork[0], 1.0f, 1.0f, 0.01f, 0);
if (boss->timer_050 == 0) {
boss->unk_04C++;
if (boss->unk_04C >= Animation_GetFrameCount(&D_60123BC)) {
boss->unk_04C = Animation_GetFrameCount(&D_60123BC) - 1;
if (boss->unk_04C >= Animation_GetFrameCount(&D_SX_60123BC)) {
boss->unk_04C = Animation_GetFrameCount(&D_SX_60123BC) - 1;
if (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_0) {
boss->unk_04C = 0;
boss->state = 10;
@@ -928,13 +929,13 @@ void func_i2_80190078(Boss* boss) {
boss->fwork[2] = gPlayer[0].pos.y;
boss->fwork[3] = gPlayer[0].pos.x;
frameData = Animation_GetFrameData(&D_601AA28, boss->unk_04C, sp80);
frameData = Animation_GetFrameData(&D_SX_601AA28, boss->unk_04C, sp80);
Math_SmoothStepToVec3fArray(sp80, boss->vwork, 1, frameData, boss->fwork[0], 50.0f, 0.0f);
Math_SmoothStepToF(&boss->fwork[0], 1.0f, 1.0f, 0.01f, 0);
boss->unk_04C++;
if (boss->unk_04C >= Animation_GetFrameCount(&D_601AA28)) {
if (boss->unk_04C >= Animation_GetFrameCount(&D_SX_601AA28)) {
boss->unk_04C = 0;
boss->state = 10;
boss->fwork[0] = 0.0f;
@@ -957,7 +958,7 @@ void func_i2_80190078(Boss* boss) {
boss->fwork[1] = -1000.0f;
Math_SmoothStepToF(&boss->fwork[42], 50.0f, 1.0f, 3.0f, 0);
frameData = Animation_GetFrameData(&D_60158C4, boss->unk_04C, sp80);
frameData = Animation_GetFrameData(&D_SX_60158C4, boss->unk_04C, sp80);
Math_SmoothStepToVec3fArray(sp80, boss->vwork, 1, frameData, boss->fwork[0], 100.0f, 0.0f);
Math_SmoothStepToF(&boss->fwork[0], 1.0f, 1.0f, 0.05f, 0);
@@ -967,7 +968,7 @@ void func_i2_80190078(Boss* boss) {
AUDIO_PLAY_SFX(0x2902401C, boss->sfxSource, 4);
}
if (boss->unk_04C >= Animation_GetFrameCount(&D_60158C4)) {
if (boss->unk_04C >= Animation_GetFrameCount(&D_SX_60158C4)) {
boss->unk_04C = 0;
boss->fwork[0] = 0.0f;
@@ -1020,7 +1021,7 @@ void func_i2_80190078(Boss* boss) {
Math_SmoothStepToF(&boss->fwork[44], 20.0f, 1.0f, 0.5f, 0);
Math_SmoothStepToF(&boss->fwork[43], 20.0f, 1.0f, 0.5f, 0);
frameData = Animation_GetFrameData(&D_6009FF8, 0, sp80);
frameData = Animation_GetFrameData(&D_SX_6009FF8, 0, sp80);
Math_SmoothStepToVec3fArray(sp80, boss->vwork, 1, frameData, boss->fwork[0], 5.0f, 0.0f);
Math_SmoothStepToF(&boss->fwork[0], 0.1f, 1.0f, 0.001f, 0);
@@ -1048,14 +1049,14 @@ void func_i2_80190078(Boss* boss) {
boss->fwork[41] = 340.0f;
boss->fwork[2] = -400.0f;
frameData = Animation_GetFrameData(&D_601C690, boss->unk_04C, sp80);
frameData = Animation_GetFrameData(&D_SX_601C690, boss->unk_04C, sp80);
Math_SmoothStepToVec3fArray(sp80, boss->vwork, 1, frameData, boss->fwork[0], 100.0f, 0.0f);
Math_SmoothStepToF(&boss->fwork[0], 1.0f, 1.0f, 0.05f, 0);
boss->unk_04C++;
if (boss->unk_04C >= Animation_GetFrameCount(&D_601C690)) {
boss->unk_04C = Animation_GetFrameCount(&D_601C690);
if (boss->unk_04C >= Animation_GetFrameCount(&D_SX_601C690)) {
boss->unk_04C = Animation_GetFrameCount(&D_SX_601C690);
}
if (!(boss->timer_050 & 3)) {
@@ -1106,7 +1107,7 @@ void func_i2_80190078(Boss* boss) {
D_i2_80195640 = 1;
Animation_DrawSkeleton(1, D_6020C68, boss->vwork, func_i2_80192AF0, func_i2_80193208, boss, &gIdentityMatrix);
Animation_DrawSkeleton(1, D_SX_6020C68, boss->vwork, func_i2_80192AF0, func_i2_80193208, boss, &gIdentityMatrix);
if (((boss->swork[1] != 0) && (boss->swork[3] > 0)) && ((boss->fwork[4] < 45.0f) || (boss->fwork[4] > 315.0f))) {
boss->swork[1]++;
@@ -1124,7 +1125,7 @@ void func_i2_80190078(Boss* boss) {
}
if (boss->state != 35) {
boss->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6032550);
boss->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SX_6032550);
boss->info.hitbox[43] = -211.0f + boss->fwork[16];
boss->info.hitbox[45] = -35.0f + boss->fwork[15];
boss->info.hitbox[47] = 442.0f + boss->fwork[14];
@@ -1154,7 +1155,7 @@ void func_i2_80190078(Boss* boss) {
boss->info.hitbox[66] = 70.0f;
}
} else {
boss->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6032768);
boss->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SX_6032768);
}
if (boss->swork[0] == 1) {
@@ -1189,7 +1190,7 @@ s32 func_i2_80192AF0(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* arg4)
gDPSetPrimColor(gMasterDisp++, 0, 0, 64, 64, 255, 255);
}
if (boss->swork[4] == 1) {
*arg1 = D_6006810;
*arg1 = D_SX_6006810;
} else if (boss->swork[4] == 2) {
*arg1 = NULL;
}
@@ -1222,7 +1223,7 @@ s32 func_i2_80192AF0(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* arg4)
Matrix_RotateZ(gGfxMatrix, 2.0f * gGameFrameCount * M_DTOR, 1);
Matrix_Scale(gGfxMatrix, boss->fwork[45], boss->fwork[45], boss->fwork[45], 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_6009C30);
gSPDisplayList(gMasterDisp++, D_SX_6009C30);
Matrix_Pop(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, D_i2_8019565C.x, D_i2_8019565C.y, D_i2_8019565C.z, (u8) 1);
Matrix_RotateZ(gGfxMatrix, D_i2_80195668.z * M_DTOR, 1);
@@ -1231,7 +1232,7 @@ s32 func_i2_80192AF0(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* arg4)
Matrix_RotateZ(gGfxMatrix, 2.0f * -gGameFrameCount * M_DTOR, 1);
Matrix_Scale(gGfxMatrix, boss->fwork[45], boss->fwork[45], boss->fwork[45], 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_6009C30);
gSPDisplayList(gMasterDisp++, D_SX_6009C30);
}
Matrix_Pop(&gGfxMatrix);
Matrix_Pop(&gCalcMatrix);
@@ -1364,7 +1365,7 @@ void func_i2_80193434(Boss* boss) {
if (boss->swork[5] == 0) {
D_i2_80195640 = 0;
Animation_DrawSkeleton(3, D_6020C68, boss->vwork, func_i2_80192AF0, 0, boss, gCalcMatrix);
Animation_DrawSkeleton(3, D_SX_6020C68, boss->vwork, func_i2_80192AF0, 0, boss, gCalcMatrix);
RCP_SetupDL_64();
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 96);
@@ -1416,13 +1417,13 @@ void func_i2_80193434(Boss* boss) {
Matrix_Translate(gGfxMatrix, boss->fwork[20], boss->fwork[21], boss->fwork[22], 1);
Matrix_Scale(gGfxMatrix, fwork, fwork, fwork, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_600F8A0);
gSPDisplayList(gMasterDisp++, D_SX_600F8A0);
Matrix_Pop(&gGfxMatrix);
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, boss->fwork[23], boss->fwork[24], boss->fwork[25], 1);
Matrix_Scale(gGfxMatrix, fwork, fwork, fwork, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_600F8A0);
gSPDisplayList(gMasterDisp++, D_SX_600F8A0);
Matrix_Pop(&gGfxMatrix);
}
}
src/overlays/ovl_i3/fox_aq.c
+76 -124
View File
@@ -1,59 +1,11 @@
// #include "prevent_bss_reordering.h"
#include "prevent_bss_reordering.h"
#include "global.h"
#include "assets/ast_blue_marine.h"
#include "assets/ast_aquas.h"
const char D_i3_801C1A30[] = "プレイヤーのすべてをクリア \n";
const char D_i3_801C1A50[] = "i %d\n";
// /* 0x6 */ ROM_SEGMENT(ast_A58F60),
extern Animation D_6000AE4;
extern Limb* D_6000DB0[];
extern Animation D_6002628;
extern Limb* D_6002874[];
extern Gfx D_6002C10[];
extern Animation D_6005954;
extern Limb* D_6005A80[];
extern u8 D_6008EC8[];
extern u8 D_6008FC8[];
extern Vtx D_6011A78[];
extern Animation D_60135E0;
extern Limb* D_60136CC[];
extern Limb* D_60137CC[];
extern Gfx D_60137F0[];
extern Gfx D_6014030[];
extern Animation D_6014438;
extern Limb* D_6014504[];
extern Gfx D_6014520[];
extern Gfx D_6014FD0[];
extern Vtx D_6018878[];
extern Vtx D_6018C78[];
extern Vtx D_6019078[];
extern u8 D_6019238[];
extern u8 D_6019338[];
extern Gfx D_60194D0[];
extern Gfx D_6019880[];
extern Gfx D_6019E80[];
extern Animation D_601DE50;
extern Animation D_601EC68;
extern Limb* D_601EDB4[];
extern Animation D_6020A40;
extern Limb* D_6020C6C[];
extern Animation D_6023780;
extern Limb* D_602390C[];
extern Gfx D_6024A50[];
extern Animation D_6024F80;
extern Limb* D_602512C[];
extern Animation D_60260EC;
extern Limb* D_60263F8[];
extern Animation D_602AC28;
extern Limb* D_602BD60[];
extern f32 D_6030D3C[];
extern f32 D_6030D58[];
extern f32 D_60314AC[];
extern f32 D_60314E4[];
extern f32 D_603151C[];
extern Vtx D_6031D90[];
typedef enum {
/* 0 */ AQ_LIMB_0,
/* 1 */ AQ_LIMB_1,
@@ -245,7 +197,7 @@ s32 D_i3_801BFB64[11] = {
u8 D_i3_801BFB90[12] = {
0, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
};
Gfx* D_i3_801BFB9C[3] = { D_6015FF0, D_6022110, D_6015DD0 };
Gfx* D_i3_801BFB9C[3] = { D_AQ_6015FF0, D_AQ_6022110, D_AQ_6015DD0 };
f32 D_i3_801BFBA8[2] = { 40.0f, -40.0f };
f32 D_i3_801BFBB0[3] = { 20.0f, 10.0f, 15.0f };
f32 D_i3_801BFBBC[3] = { 8.0f, 27.0f, 42.0f };
@@ -348,8 +300,8 @@ void func_i3_801A8E30(void) {
f32 spA8[17];
f32 sp64[17];
s32 j;
Vtx* sp5C = SEGMENTED_TO_VIRTUAL(D_6031D90);
Vtx* sp58 = SEGMENTED_TO_VIRTUAL(D_6011A78);
Vtx* sp5C = SEGMENTED_TO_VIRTUAL(D_AQ_6031D90);
Vtx* sp58 = SEGMENTED_TO_VIRTUAL(D_AQ_6011A78);
for (i = 0; i < 17; i++) {
if ((i == 0) || (i == 16)) {
@@ -1882,11 +1834,11 @@ void func_i3_801AEB44(Actor* actor) {
actor->iwork[1]++;
actor->iwork[1] %= 8;
}
temp_v1_2 = SEGMENTED_TO_VIRTUAL(D_6019078);
temp_v1_2 = SEGMENTED_TO_VIRTUAL(D_AQ_6019078);
if (actor->iwork[1] < 4) {
var_t5 = SEGMENTED_TO_VIRTUAL(D_6018C78);
var_t5 = SEGMENTED_TO_VIRTUAL(D_AQ_6018C78);
} else {
var_t5 = SEGMENTED_TO_VIRTUAL(D_6018878);
var_t5 = SEGMENTED_TO_VIRTUAL(D_AQ_6018878);
}
var_t1 = actor->iwork[1] % 4;
if (var_t1 >= 3) {
@@ -1930,8 +1882,8 @@ void func_i3_801AEB44(Actor* actor) {
}
Matrix_SetGfxMtx(&gMasterDisp);
gDPSetTextureLUT(gMasterDisp++, G_TT_RGBA16);
gDPLoadTLUT_pal256(gMasterDisp++, D_6008FC8);
gDPLoadTextureBlock(gMasterDisp++, D_6008EC8, G_IM_FMT_CI, G_IM_SIZ_8b, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP,
gDPLoadTLUT_pal256(gMasterDisp++, D_AQ_6008FC8);
gDPLoadTextureBlock(gMasterDisp++, D_AQ_6008EC8, G_IM_FMT_CI, G_IM_SIZ_8b, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, 4, 4, G_TX_NOLOD, G_TX_NOLOD);
gSPVertex(gMasterDisp++, D_i3_801C3A88[actor->iwork[0]][gSysFrameCount & 1], 14, 0);
gSP1Triangle(gMasterDisp++, 0, 1, 2, 0);
@@ -1969,8 +1921,8 @@ void func_i3_801AEB44(Actor* actor) {
gSP1Triangle(gMasterDisp++, 0, 11, 9, 0);
gSP1Triangle(gMasterDisp++, 9, 1, 0, 0);
gSP1Triangle(gMasterDisp++, 9, 12, 8, 0);
gDPLoadTLUT_pal256(gMasterDisp++, D_6019338);
gDPLoadTextureBlock(gMasterDisp++, D_6019238, G_IM_FMT_CI, G_IM_SIZ_8b, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP,
gDPLoadTLUT_pal256(gMasterDisp++, D_AQ_6019338);
gDPLoadTextureBlock(gMasterDisp++, D_AQ_6019238, G_IM_FMT_CI, G_IM_SIZ_8b, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, 4, 4, G_TX_NOLOD, G_TX_NOLOD);
gSPVertex(gMasterDisp++, &D_i3_801C3A88[actor->iwork[0]][gSysFrameCount & 1][20], 8, 0);
gSP1Triangle(gMasterDisp++, 0, 1, 2, 0);
@@ -2231,13 +2183,13 @@ void func_i3_801B099C(Actor* actor) {
}
switch (actor->iwork[0]) {
case 0:
gSPDisplayList(gMasterDisp++, D_6019E80);
gSPDisplayList(gMasterDisp++, D_AQ_6019E80);
break;
case 1:
gSPDisplayList(gMasterDisp++, D_60194D0);
gSPDisplayList(gMasterDisp++, D_AQ_60194D0);
break;
case 2:
gSPDisplayList(gMasterDisp++, D_6019880);
gSPDisplayList(gMasterDisp++, D_AQ_6019880);
break;
}
}
@@ -2318,7 +2270,7 @@ void func_i3_801B0EC0(Actor* actor) {
RCP_SetupDL(&gMasterDisp, 0x3D);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, actor->iwork[1], actor->iwork[2], actor->iwork[3], 255);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_6024A50);
gSPDisplayList(gMasterDisp++, D_AQ_6024A50);
}
}
@@ -3445,7 +3397,7 @@ void func_i3_801B49DC(s32 limbIndex, Vec3f* rot, void* thisx) {
// OBJ_BOSS_AQ draw
void func_i3_801B4D84(Boss* bossAQ) {
Animation_DrawSkeleton(3, D_602BD60, bossAQ->vwork, func_i3_801B42AC, func_i3_801B49DC, bossAQ, gCalcMatrix);
Animation_DrawSkeleton(3, D_AQ_602BD60, bossAQ->vwork, func_i3_801B42AC, func_i3_801B49DC, bossAQ, gCalcMatrix);
}
f32 D_i3_801C01F8[11] = {
@@ -3518,8 +3470,8 @@ void func_i3_801B504C(Actor* actor) {
Vec3f sp30[30];
Matrix_Scale(gCalcMatrix, actor->scale, actor->scale, actor->scale, 1);
Animation_GetFrameData(&D_6005954, actor->unk_0B6, sp30);
Animation_DrawSkeleton(3, D_6005A80, sp30, func_i3_801B4DDC, func_i3_801B4E94, actor, gCalcMatrix);
Animation_GetFrameData(&D_AQ_6005954, actor->unk_0B6, sp30);
Animation_DrawSkeleton(3, D_AQ_6005A80, sp30, func_i3_801B4DDC, func_i3_801B4E94, actor, gCalcMatrix);
}
f32 D_i3_801C025C[2] = { 120.0f, 0.0f };
@@ -3646,7 +3598,7 @@ void func_i3_801B50E8(Actor* actor) {
} else {
actor->unk_0B6 += 3;
}
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_6005954)) {
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_AQ_6005954)) {
actor->unk_0B6 = 0;
}
}
@@ -3795,8 +3747,8 @@ void func_i3_801B619C(Actor* actor) {
Matrix_Push(&gCalcMatrix);
Matrix_Push(&gGfxMatrix);
Matrix_Scale(gCalcMatrix, actor->scale, actor->scale, actor->scale, 1);
Animation_GetFrameData(&D_6002628, actor->unk_0B6, sp40);
Animation_DrawSkeleton(3, D_6002874, sp40, func_i3_801B5C18, func_i3_801B5F68, actor, gCalcMatrix);
Animation_GetFrameData(&D_AQ_6002628, actor->unk_0B6, sp40);
Animation_DrawSkeleton(3, D_AQ_6002874, sp40, func_i3_801B5C18, func_i3_801B5F68, actor, gCalcMatrix);
Matrix_Pop(&gGfxMatrix);
Matrix_Pop(&gCalcMatrix);
Matrix_Push(&gGfxMatrix);
@@ -3875,7 +3827,7 @@ void func_i3_801B638C(Actor* actor) {
actor->fwork[11] = 1200.0f;
}
actor->unk_0B6++;
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_6002628)) {
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_AQ_6002628)) {
actor->unk_0B6 = 0;
}
switch (actor->state) {
@@ -4091,7 +4043,7 @@ void func_i3_801B6FF8(Actor* actor) {
}
}
actor->unk_0B6++;
if (Animation_GetFrameCount(&D_60260EC) < actor->unk_0B6) {
if (Animation_GetFrameCount(&D_AQ_60260EC) < actor->unk_0B6) {
actor->unk_0B6 = 0;
}
if (actor->unk_0D0 != 0) {
@@ -4205,8 +4157,8 @@ void func_i3_801B7A24(Actor* actor) {
RCP_SetupDL(&gMasterDisp, 0x3D);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
}
Animation_GetFrameData(&D_60260EC, actor->unk_0B6, sp30);
Animation_DrawSkeleton(3, D_60263F8, sp30, func_i3_801B76EC, func_i3_801B7754, actor, gCalcMatrix);
Animation_GetFrameData(&D_AQ_60260EC, actor->unk_0B6, sp30);
Animation_DrawSkeleton(3, D_AQ_60263F8, sp30, func_i3_801B76EC, func_i3_801B7754, actor, gCalcMatrix);
}
void func_i3_801B7AF0(Actor* actor) {
@@ -4324,7 +4276,7 @@ void func_i3_801B7C78(Actor* actor) {
break;
case 2:
actor->unk_0B6 += actor->iwork[1];
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_6024F80)) {
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_AQ_6024F80)) {
actor->unk_0B6 = 0;
actor->timer_0BE = 0;
if (actor->iwork[1] >= 2) {
@@ -4354,8 +4306,8 @@ void func_i3_801B7C78(Actor* actor) {
if (actor->timer_0C0 == 0) {
Audio_KillSfxBySource(actor->sfxSource);
actor->unk_0B6++;
if (Animation_GetFrameCount(&D_602AC28) < actor->unk_0B6) {
actor->unk_0B6 = Animation_GetFrameCount(&D_6024F80) - 1;
if (Animation_GetFrameCount(&D_AQ_602AC28) < actor->unk_0B6) {
actor->unk_0B6 = Animation_GetFrameCount(&D_AQ_6024F80) - 1;
actor->state = 7;
}
}
@@ -4418,8 +4370,8 @@ void func_i3_801B7C78(Actor* actor) {
case 5:
Math_SmoothStepToAngle(&actor->obj.rot.x, 40.0f, 0.1f, 10.0f, 0);
actor->unk_0B6++;
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_6024F80)) {
actor->unk_0B6 = Animation_GetFrameCount(&D_6024F80) - 1;
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_AQ_6024F80)) {
actor->unk_0B6 = Animation_GetFrameCount(&D_AQ_6024F80) - 1;
}
if (actor->timer_0C0 == 0) {
temp_dy = gPlayer[0].pos.y - 50.0f - actor->obj.pos.y;
@@ -4438,8 +4390,8 @@ void func_i3_801B7C78(Actor* actor) {
break;
case 6:
actor->unk_0B6++;
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_6024F80)) {
actor->unk_0B6 = Animation_GetFrameCount(&D_6024F80) - 1;
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_AQ_6024F80)) {
actor->unk_0B6 = Animation_GetFrameCount(&D_AQ_6024F80) - 1;
}
Math_SmoothStepToAngle(&actor->obj.rot.x, 30.0f, 0.1f, 10.0f, 0);
if (!(gGameFrameCount & 1)) {
@@ -4591,12 +4543,12 @@ void func_i3_801B90DC(Actor* actor) {
Vec3f sp30[30];
if ((actor->state >= 3) && (actor->state < 5)) {
Animation_GetFrameData(&D_602AC28, actor->unk_0B6, sp30);
Animation_GetFrameData(&D_AQ_602AC28, actor->unk_0B6, sp30);
} else {
Animation_GetFrameData(&D_6024F80, actor->unk_0B6, sp30);
Animation_GetFrameData(&D_AQ_6024F80, actor->unk_0B6, sp30);
}
Matrix_Translate(gCalcMatrix, 0.0f, -150.0f, 100.0f, 1);
Animation_DrawSkeleton(3, D_602512C, sp30, func_i3_801B8C50, func_i3_801B8D7C, actor, gCalcMatrix);
Animation_DrawSkeleton(3, D_AQ_602512C, sp30, func_i3_801B8C50, func_i3_801B8D7C, actor, gCalcMatrix);
}
// OBJ_ACTOR_263 action
@@ -4649,7 +4601,7 @@ void func_i3_801B91A4(Actor* actor) {
actor->unk_0B6 = 19;
actor->fwork[1] = actor->obj.pos.z;
if (actor->obj.rot.z >= 4.0f) {
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_60314AC);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_AQ_60314AC);
actor->health = 200;
actor->info.bonus = 1;
actor->state = 2;
@@ -4672,7 +4624,7 @@ void func_i3_801B91A4(Actor* actor) {
break;
case 1:
actor->unk_0B6++;
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_6000AE4)) {
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_AQ_6000AE4)) {
actor->unk_0B6 = 0;
}
if (actor->unk_0B6 == 36) {
@@ -4711,7 +4663,7 @@ void func_i3_801B91A4(Actor* actor) {
break;
case 2:
actor->unk_0B6++;
if ((actor->unk_0B6 >= Animation_GetFrameCount(&D_6000AE4)) && (actor->fwork[8] < 1.0f)) {
if ((actor->unk_0B6 >= Animation_GetFrameCount(&D_AQ_6000AE4)) && (actor->fwork[8] < 1.0f)) {
actor->unk_0B6 = 0;
}
if (actor->unk_0B6 == 40) {
@@ -4861,8 +4813,8 @@ void func_i3_801BA108(Actor* actor) {
if (actor->state == 1) {
Matrix_RotateX(gCalcMatrix, (actor->obj.rot.x + 90.0f) * M_DTOR, 1);
}
Animation_GetFrameData(&D_6000AE4, actor->unk_0B6, sp40);
Animation_DrawSkeleton(3, D_6000DB0, sp40, NULL, func_i3_801B9DB0, actor, gCalcMatrix);
Animation_GetFrameData(&D_AQ_6000AE4, actor->unk_0B6, sp40);
Animation_DrawSkeleton(3, D_AQ_6000DB0, sp40, NULL, func_i3_801B9DB0, actor, gCalcMatrix);
}
// OBJ_ACTOR_264 action
@@ -4877,10 +4829,10 @@ void func_i3_801BA26C(Actor* actor) {
/* fallthrough */
case 1:
actor->unk_0B6 += 2;
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_6020A40)) {
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_AQ_6020A40)) {
actor->unk_0B6 = 0;
}
sp3E = Animation_GetFrameData(&D_6020A40, actor->unk_0B6, sp40);
sp3E = Animation_GetFrameData(&D_AQ_6020A40, actor->unk_0B6, sp40);
if ((fabsf(actor->obj.pos.x - gPlayer[0].pos.x) < 150.0f) &&
(fabsf(actor->obj.pos.y - gPlayer[0].pos.y) < 500.0f) &&
(fabsf(actor->obj.pos.z - gPlayer[0].unk_138) < 700.0f)) {
@@ -4890,10 +4842,10 @@ void func_i3_801BA26C(Actor* actor) {
break;
case 2:
actor->unk_0B6 += 2;
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_601DE50)) {
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_AQ_601DE50)) {
actor->unk_0B6 = 0;
}
sp3E = Animation_GetFrameData(&D_601DE50, actor->unk_0B6, sp40);
sp3E = Animation_GetFrameData(&D_AQ_601DE50, actor->unk_0B6, sp40);
if ((fabsf(actor->obj.pos.x - gPlayer[0].pos.x) > 150.0f) ||
(fabsf(actor->obj.pos.y - gPlayer[0].pos.y) > 500.0f) ||
(fabsf(actor->obj.pos.z - gPlayer[0].unk_138) > 700.0f)) {
@@ -4909,7 +4861,7 @@ void func_i3_801BA26C(Actor* actor) {
// OBJ_ACTOR_264 draw
void func_i3_801BA4E4(Actor* actor) {
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
Animation_DrawSkeleton(1, D_6020C6C, actor->vwork, NULL, NULL, &actor->index, &gIdentityMatrix);
Animation_DrawSkeleton(1, D_AQ_6020C6C, actor->vwork, NULL, NULL, &actor->index, &gIdentityMatrix);
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
}
@@ -4923,7 +4875,7 @@ void func_i3_801BA57C(Actor* actor) {
actor->info.bonus = 0;
actor->scale = 0.5f;
actor->gravity = 0.1f;
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_603151C);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_AQ_603151C);
actor->fwork[2] = RAND_FLOAT_CENTERED((actor->index & 3) + 1.0f);
}
actor->fwork[1] = RAND_FLOAT(50.0f);
@@ -5027,7 +4979,7 @@ void func_i3_801BA6A4(Actor* actor) {
void func_i3_801BAD7C(Actor* actor) {
Matrix_Scale(gGfxMatrix, actor->scale, actor->scale, actor->scale, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_6014FD0);
gSPDisplayList(gMasterDisp++, D_AQ_6014FD0);
}
// OBJ_ACTOR_266 action
@@ -5101,8 +5053,8 @@ void func_i3_801BB0C4(s32 limbIndex, Vec3f* rot, void* thisx) {
void func_i3_801BB204(Actor* actor) {
Vec3f sp28[30];
Animation_GetFrameData(&D_601EC68, 0, sp28);
Animation_DrawSkeleton(3, D_601EDB4, sp28, NULL, func_i3_801BB0C4, actor, gCalcMatrix);
Animation_GetFrameData(&D_AQ_601EC68, 0, sp28);
Animation_DrawSkeleton(3, D_AQ_601EDB4, sp28, NULL, func_i3_801BB0C4, actor, gCalcMatrix);
}
Vec3f D_i3_801C0344[4] = {
@@ -5155,7 +5107,7 @@ void func_i3_801BB26C(Actor* actor) {
actor->iwork[7] = RAND_INT(120.0f);
actor->iwork[8] = RAND_INT(120.0f);
actor->iwork[9] = RAND_INT(120.0f);
actor->unk_0B6 = RAND_INT(Animation_GetFrameCount(&D_6023780));
actor->unk_0B6 = RAND_INT(Animation_GetFrameCount(&D_AQ_6023780));
if (actor->iwork[2] == 0) {
actor->iwork[18] = fabsf(actor->obj.rot.y / 10.0f);
if ((actor->iwork[18] == 0) || (actor->iwork[18] == 2)) {
@@ -5400,7 +5352,7 @@ void func_i3_801BB79C(Actor* actor) {
actor->iwork[3] &= 1;
}
actor->unk_0B6 += 2;
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_6023780)) {
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_AQ_6023780)) {
actor->unk_0B6 = 0;
}
if (actor->iwork[4] < 30) {
@@ -5558,8 +5510,8 @@ void func_i3_801BC91C(s32 limbIndex, Vec3f* rot, void* thisx) {
void func_i3_801BC930(Actor* actor) {
Vec3f sp28[30];
Animation_GetFrameData(&D_6023780, actor->unk_0B6, sp28);
Animation_DrawSkeleton(3, D_602390C, sp28, func_i3_801BC530, func_i3_801BC91C, actor, gCalcMatrix);
Animation_GetFrameData(&D_AQ_6023780, actor->unk_0B6, sp28);
Animation_DrawSkeleton(3, D_AQ_602390C, sp28, func_i3_801BC530, func_i3_801BC91C, actor, gCalcMatrix);
}
s32 D_i3_801C04C4[9] = {
@@ -5644,10 +5596,10 @@ void func_i3_801BC9A0(Actor* actor) {
var_s0->vel.z = sp98.z;
var_s0->gravity = 0.4f;
var_s0->state = 5;
var_s0->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6030D3C);
var_s0->info.hitbox = SEGMENTED_TO_VIRTUAL(D_AQ_6030D3C);
} else {
var_s0->state = 2;
var_s0->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6030D58);
var_s0->info.hitbox = SEGMENTED_TO_VIRTUAL(D_AQ_6030D58);
}
break;
}
@@ -5735,18 +5687,18 @@ void func_i3_801BD264(Actor* actor) {
case 0:
if (actor->state != 0) {
if ((actor->iwork[3] == 0) && (actor->info.drawType == 2)) {
Animation_GetFrameData(&D_6014438, 0, sp40);
Animation_DrawSkeleton(3, D_6014504, sp40, NULL, func_i3_801BD17C, actor, gCalcMatrix);
Animation_GetFrameData(&D_AQ_6014438, 0, sp40);
Animation_DrawSkeleton(3, D_AQ_6014504, sp40, NULL, func_i3_801BD17C, actor, gCalcMatrix);
} else {
gSPDisplayList(gMasterDisp++, D_6014520);
gSPDisplayList(gMasterDisp++, D_AQ_6014520);
}
}
break;
case 1:
gSPDisplayList(gMasterDisp++, D_60137F0);
gSPDisplayList(gMasterDisp++, D_AQ_60137F0);
break;
case 2:
gSPDisplayList(gMasterDisp++, D_6014030);
gSPDisplayList(gMasterDisp++, D_AQ_6014030);
break;
}
}
@@ -5925,7 +5877,7 @@ void func_i3_801BD54C(Actor* actor) {
break;
}
actor->unk_0B6++;
if (Animation_GetFrameCount(&D_60135E0) < actor->unk_0B6) {
if (Animation_GetFrameCount(&D_AQ_60135E0) < actor->unk_0B6) {
actor->unk_0B6 = 0;
}
}
@@ -5940,11 +5892,11 @@ s32 func_i3_801BDDFC(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* t
// OBJ_ACTOR_268 draw
void func_i3_801BDE6C(Actor* actor) {
Animation_GetFrameData(&D_60135E0, actor->unk_0B6, actor->vwork);
Animation_GetFrameData(&D_AQ_60135E0, actor->unk_0B6, actor->vwork);
if (actor->iwork[3] == 0) {
Animation_DrawSkeleton(1, D_60136CC, actor->vwork, func_i3_801BDDFC, NULL, actor, &gIdentityMatrix);
Animation_DrawSkeleton(1, D_AQ_60136CC, actor->vwork, func_i3_801BDDFC, NULL, actor, &gIdentityMatrix);
} else {
Animation_DrawSkeleton(1, D_60137CC, actor->vwork, func_i3_801BDDFC, NULL, actor, &gIdentityMatrix);
Animation_DrawSkeleton(1, D_AQ_60137CC, actor->vwork, func_i3_801BDDFC, NULL, actor, &gIdentityMatrix);
}
}
@@ -6010,7 +5962,7 @@ void func_i3_801BE034(Actor* actor) {
Math_SmoothStepToAngle(&actor->unk_0F4.y, temp, 1.0f, 100.0f, 0.00001f);
}
actor->iwork[0]++;
if (actor->iwork[0] >= Animation_GetFrameCount(&D_60135E0)) {
if (actor->iwork[0] >= Animation_GetFrameCount(&D_AQ_60135E0)) {
actor->iwork[0] = 0;
}
if (gPlayer[0].unk_1D0 >= 5) {
@@ -6024,8 +5976,8 @@ void func_i3_801BE0F0(Actor* actor) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 255, 255, 255);
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
Matrix_SetGfxMtx(&gMasterDisp);
Animation_GetFrameData(&D_60135E0, actor->iwork[0], actor->vwork);
Animation_DrawSkeleton(1, D_60136CC, actor->vwork, NULL, NULL, actor, &gIdentityMatrix);
Animation_GetFrameData(&D_AQ_60135E0, actor->iwork[0], actor->vwork);
Animation_DrawSkeleton(1, D_AQ_60136CC, actor->vwork, NULL, NULL, actor, &gIdentityMatrix);
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
}
@@ -6033,7 +5985,7 @@ void func_i3_801BE0F0(Actor* actor) {
void func_i3_801BE1FC(Object_80* obj80) {
Matrix_Scale(gGfxMatrix, 0.5f, 0.5f, 0.5f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_600EEF0);
gSPDisplayList(gMasterDisp++, D_AQ_600EEF0);
}
void func_i3_801BE274(Actor* actor, f32 yRot, f32 xRot) {
@@ -6075,7 +6027,7 @@ void func_i3_801BE3F8(Actor* actor) {
break;
case 1:
if (fabsf(gPlayer[0].pos.z - actor->obj.pos.z) <= 3000.0f) {
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_60314E4);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_AQ_60314E4);
actor->info.damage = 0;
actor->info.bonus = 1;
actor->timer_0BC = 40.0f + RAND_FLOAT(30.0f);
@@ -6106,9 +6058,9 @@ void func_i3_801BE3F8(Actor* actor) {
}
}
}
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_602201C)) {
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_AQ_602201C)) {
actor->info.bonus = 0;
actor->unk_0B6 = Animation_GetFrameCount(&D_602201C) - 1;
actor->unk_0B6 = Animation_GetFrameCount(&D_AQ_602201C) - 1;
actor->state++;
}
break;
@@ -6137,7 +6089,7 @@ void func_i3_801BE3F8(Actor* actor) {
}
}
if (actor->state == 1) {
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_60314E4);
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_AQ_60314E4);
actor->info.damage = 0;
actor->info.bonus = 1;
actor->state = 2;
@@ -6151,14 +6103,14 @@ void func_i3_801BEB1C(Actor* actor) {
Graphics_SetScaleMtx(3.0f);
RCP_SetupDL(&gMasterDisp, 0x38);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 143, 143, 255);
Animation_GetFrameData(&D_602201C, actor->unk_0B6, actor->vwork);
Animation_DrawSkeleton(1, D_60220E8, actor->vwork, NULL, NULL, &actor->index, &gIdentityMatrix);
Animation_GetFrameData(&D_AQ_602201C, actor->unk_0B6, actor->vwork);
Animation_DrawSkeleton(1, D_AQ_60220E8, actor->vwork, NULL, NULL, &actor->index, &gIdentityMatrix);
if (actor->health != 0) {
RCP_SetupDL(&gMasterDisp, 0x37);
Matrix_Scale(gGfxMatrix, actor->fwork[0], actor->fwork[1], actor->fwork[2], 1);
Matrix_Translate(gGfxMatrix, 0.0f, -8.0f, 51.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_6002C10);
gSPDisplayList(gMasterDisp++, D_AQ_6002C10);
}
}
src/overlays/ovl_i3/fox_zo.c
+1
View File
@@ -1,3 +1,4 @@
#include "prevent_bss_reordering.h"
#include "global.h"
// f32 temp[] = {
src/overlays/ovl_i4/fox_bo.c
+1 -1
View File
@@ -1,4 +1,4 @@
// #include "prevent_bss_reordering.h"
#include "prevent_bss_reordering.h"
// #include "prevent_bss_reordering2.h"
#include "global.h"
src/overlays/ovl_i4/fox_ka.c
+1
View File
@@ -1,3 +1,4 @@
#include "prevent_bss_reordering.h"
#include "global.h"
Vec3f D_i4_8019F0F0[] = { { 7000.0f, 500.0f, -50 }, { 7700.0f, 550.0f, -50.0f }, { 6000.0f, 300.0f, 1950.0f } };
src/overlays/ovl_i5/fox_ground.c
+1
View File
@@ -1,3 +1,4 @@
// #include "prevent_bss_reordering.h"
#include "global.h"
void func_i5_801B5244(s32 arg0, s32 arg1);
src/overlays/ovl_i5/fox_ma.c
+1
View File
@@ -1,3 +1,4 @@
// #include "prevent_bss_reordering.h"
#include "global.h"
#include "assets/ast_landmaster.h"
src/overlays/ovl_i5/fox_ti.c
+66 -105
View File
@@ -1,36 +1,32 @@
// #include "prevent_bss_reordering.h"
#include "global.h"
#include "assets/ast_bg_planet.h"
#include "assets/ast_7_ti_1.h"
#include "assets/ast_7_ti_2.h"
#include "assets/ast_8_ti.h"
#include "assets/ast_A_ti.h"
#include "assets/ast_landmaster.h"
extern Animation D_7003EE8;
extern Gfx D_7005300[];
extern Limb* D_7006990[];
extern Animation D_70084CC;
extern Animation D_70096EC;
extern Limb* D_700C964[];
extern Limb* D_700D700[];
extern Animation D_700E244;
extern Gfx D_Gfx_800D94D0[];
extern f32 D_6006924[];
extern f32 D_6006C0C[];
extern f32 D_6006C28[];
extern s32 D_8000FC0[];
extern Animation D_8000708;
extern Animation D_8000D80;
extern Animation D_A0002BC;
extern Animation D_A00047C;
extern Animation D_A000858;
extern Animation D_A000934;
extern Animation D_A000D50;
extern Animation D_8008FE8;
extern Animation D_9004288;
extern Animation D_900FC4C;
extern Animation D_A009990;
extern Gfx D_8000D90[];
extern Limb* D_A000568[];
extern Limb* D_A000EDC[];
extern Limb* D_A001A70[];
extern Gfx D_Gfx_800D94D0[];
extern Gfx D_90042A0[];
extern Gfx D_90043D0[];
extern Gfx D_90044E0[];
extern Gfx D_90045F0[];
extern Gfx D_9005040[];
extern Gfx D_90051C0[];
extern Gfx D_9005450[];
extern Gfx D_9005600[];
extern Gfx D_90058A0[];
extern Gfx D_900FC60[];
extern Gfx D_900FD70[];
extern Gfx D_900FE80[];
s32* D_i5_801BBEF0;
f32* D_i5_801BBEF4;
@@ -321,9 +317,9 @@ void func_i5_801895B8(Actor* actor) {
}
void func_i5_80189AFC(Actor* actor) {
Animation_GetFrameData(&D_700C8D8, 0, actor->vwork);
Animation_GetFrameData(&D_TI1_700C8D8, 0, actor->vwork);
actor->vwork[3].z = actor->fwork[5] + 270.0f;
Animation_DrawSkeleton(1, D_700C964, actor->vwork, NULL, func_i5_801891B4, actor, &gIdentityMatrix);
Animation_DrawSkeleton(1, D_TI1_700C964, actor->vwork, NULL, func_i5_801891B4, actor, &gIdentityMatrix);
}
static Vec3f D_i5_801B7544 = { 0.0f, -50.0f, 178.0f };
@@ -425,22 +421,23 @@ void func_i5_80189CC8(Actor* actor) {
}
void func_i5_8018A1C0(Actor* actor) {
gSPDisplayList(gMasterDisp++, D_700C4B0);
gSPDisplayList(gMasterDisp++, D_TI1_700C4B0);
Matrix_Translate(gGfxMatrix, 0.0f, -50.0f, 178.0f, 1);
Matrix_RotateY(gGfxMatrix, actor->fwork[4] * M_DTOR, 1);
Matrix_RotateX(gGfxMatrix, actor->fwork[3] * M_DTOR, 1);
Matrix_SetGfxMtx(&gMasterDisp);
if (actor->health != 0) {
gSPDisplayList(gMasterDisp++, D_700B9C0);
gSPDisplayList(gMasterDisp++, D_TI1_700B9C0);
RCP_SetupDL(&gMasterDisp, 0x21);
gSPDisplayList(gMasterDisp++, D_700C980);
gSPDisplayList(gMasterDisp++, D_TI1_700C980);
}
}
static f32 D_i5_801B7568[7] = { 1.0f, 0.0f, 25.0f, 0.0f, 12.0f, 0.0f, 12.0f };
Gfx* D_i5_801B7584[10] = {
D_700DDF0, D_700D9B0, D_700DF70, D_700DC50, D_700DED0, D_700DAD0, D_700DBB0, D_700E030, D_700D880, D_700D740,
D_TI1_700DDF0, D_TI1_700D9B0, D_TI1_700DF70, D_TI1_700DC50, D_TI1_700DED0,
D_TI1_700DAD0, D_TI1_700DBB0, D_TI1_700E030, D_TI1_700D880, D_TI1_700D740,
};
void func_i5_8018A2E8(Actor* actor, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel) {
@@ -600,7 +597,7 @@ void func_i5_8018AABC(Actor* actor) {
Matrix_Scale(gGfxMatrix, actor->scale, actor->scale, actor->scale, 1);
Matrix_SetGfxMtx(&gMasterDisp);
}
gSPDisplayList(gMasterDisp++, D_700E3F0);
gSPDisplayList(gMasterDisp++, D_TI1_700E3F0);
}
void func_i5_8018AB44(Actor* actor) {
@@ -854,7 +851,7 @@ void func_i5_8018B268(Actor* actor) {
sp38->obj.pos.z = actor->obj.pos.z + dest.z;
}
if (++actor->unk_0B6 >= Animation_GetFrameCount(&D_700D534)) {
if (++actor->unk_0B6 >= Animation_GetFrameCount(&D_TI1_700D534)) {
actor->state++;
}
break;
@@ -865,8 +862,9 @@ void func_i5_8018B268(Actor* actor) {
if (actor->health == 0) {
actor->obj.status = OBJ_DYING;
Animation_GetFrameData(&D_700D534, actor->unk_0B6, actor->vwork);
Animation_DrawSkeleton(0, D_700D700, actor->vwork, func_i5_8018AFD4, func_i5_8018B1B4, actor, &gIdentityMatrix);
Animation_GetFrameData(&D_TI1_700D534, actor->unk_0B6, actor->vwork);
Animation_DrawSkeleton(0, D_TI1_700D700, actor->vwork, func_i5_8018AFD4, func_i5_8018B1B4, actor,
&gIdentityMatrix);
func_8007D2C8(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f);
actor->timer_0CA[0] = 0;
actor->info.unk_1C = 0.0f;
@@ -874,8 +872,8 @@ void func_i5_8018B268(Actor* actor) {
}
void func_i5_8018B6AC(Actor* actor) {
Animation_GetFrameData(&D_700D534, actor->unk_0B6, actor->vwork);
Animation_DrawSkeleton(0, D_700D700, actor->vwork, func_i5_8018AFF0, func_i5_8018B144, actor, &gIdentityMatrix);
Animation_GetFrameData(&D_TI1_700D534, actor->unk_0B6, actor->vwork);
Animation_DrawSkeleton(0, D_TI1_700D700, actor->vwork, func_i5_8018AFF0, func_i5_8018B144, actor, &gIdentityMatrix);
}
void func_i5_8018B720(Actor* actor) {
@@ -1050,7 +1048,8 @@ static s32 D_i5_801B75E4[3][3] = {
};
Gfx* D_i5_801B7608[10] = {
D_7005280, D_7003C50, D_7003E30, D_7004370, D_7004560, D_7003A90, D_7005420, D_7003FC0, D_7002930, D_7002490,
D_TI1_7005280, D_TI1_7003C50, D_TI1_7003E30, D_TI1_7004370, D_TI1_7004560,
D_TI1_7003A90, D_TI1_7005420, D_TI1_7003FC0, D_TI1_7002930, D_TI1_7002490,
};
void func_i5_8018BE84(Actor* actor) {
@@ -1060,12 +1059,12 @@ void func_i5_8018BE84(Actor* actor) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
Matrix_Scale(gGfxMatrix, 1.5f, 1.5f, 1.5f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_7009D60);
gSPDisplayList(gMasterDisp++, D_TI1_7009D60);
RCP_SetupDL(&gMasterDisp, 0x22);
index = actor->iwork[0];
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, D_i5_801B75E4[0][index], D_i5_801B75E4[1][index],
D_i5_801B75E4[2][index], 255);
gSPDisplayList(gMasterDisp++, D_700A990);
gSPDisplayList(gMasterDisp++, D_TI1_700A990);
}
void func_i5_8018BFB0(Actor* actor) {
@@ -1148,7 +1147,7 @@ void func_i5_8018C370(s32 limbIndex, Vec3f* rot, void* data) {
Actor* actor = (Actor*) data;
if ((limbIndex == 13) && !(D_i5_801BD738[actor->iwork[0]][8].unk_18 & 1)) {
gSPDisplayList(gMasterDisp++, D_7002490);
gSPDisplayList(gMasterDisp++, D_TI1_7002490);
}
}
@@ -1263,7 +1262,7 @@ void func_i5_8018C72C(Actor* actor) {
sp30 = actor->vwork[0].y;
actor->vwork[0].y += actor->fwork[26];
Animation_DrawSkeleton(0, D_7006990, actor->vwork, func_i5_8018C118, func_i5_8018C3D8, actor, &gIdentityMatrix);
Animation_DrawSkeleton(0, D_TI1_7006990, actor->vwork, func_i5_8018C118, func_i5_8018C3D8, actor, &gIdentityMatrix);
actor->vwork[0].y = sp30;
actor->iwork[7] = 0;
actor->iwork[8] = 0;
@@ -1352,8 +1351,8 @@ void func_i5_8018C8A8(Actor* actor) {
actor->unk_0C9 = 1;
actor->vel.y = 20.0f;
actor->vel.z = -70.0f;
Animation_GetFrameData(&D_700733C, 0, actor->vwork);
Animation_DrawSkeleton(1, D_7006990, actor->vwork, func_i5_8018C118, func_i5_8018C3D8, actor,
Animation_GetFrameData(&D_TI1_700733C, 0, actor->vwork);
Animation_DrawSkeleton(1, D_TI1_7006990, actor->vwork, func_i5_8018C118, func_i5_8018C3D8, actor,
&gIdentityMatrix);
actor->state = 1;
break;
@@ -1363,9 +1362,9 @@ void func_i5_8018C8A8(Actor* actor) {
actor->fwork[0] = sp9C;
actor->fwork[1] = spA0;
actor->fwork[2] = sp98;
Animation_GetFrameData(&D_700733C, 0, spA4);
Animation_GetFrameData(&D_TI1_700733C, 0, spA4);
Math_SmoothStepToVec3fArray(spA4, actor->vwork, 1, 15, 0.2f, 10.0f, 0.01f);
Animation_DrawSkeleton(1, D_7006990, actor->vwork, func_i5_8018C118, func_i5_8018C3D8, actor,
Animation_DrawSkeleton(1, D_TI1_7006990, actor->vwork, func_i5_8018C118, func_i5_8018C3D8, actor,
&gIdentityMatrix);
if (actor->obj.pos.z <= gPlayer[0].pos.z) {
Math_SmoothStepToAngle(&actor->obj.rot.y, actor->unk_0F4.y, 0.2f, 10.0f, 0.01f);
@@ -1417,11 +1416,11 @@ void func_i5_8018C8A8(Actor* actor) {
actor->obj.pos.y = actor->fwork[0] = actor->fwork[16];
actor->fwork[1] = actor->unk_0F4.x;
actor->fwork[2] = actor->unk_0F4.z;
Animation_GetFrameData(&D_7007234, 0, spA4);
Animation_GetFrameData(&D_TI1_7007234, 0, spA4);
Math_SmoothStepToVec3fArray(spA4, actor->vwork, 1, 15, 0.5f, 7.0, 0.1f);
temp_fs0 = actor->vwork[0].y;
actor->vwork[0].y += actor->fwork[26];
Animation_DrawSkeleton(0, D_7006990, actor->vwork, func_i5_8018C118, func_i5_8018C3D8, actor,
Animation_DrawSkeleton(0, D_TI1_7006990, actor->vwork, func_i5_8018C118, func_i5_8018C3D8, actor,
&gIdentityMatrix);
actor->vwork[0].y = temp_fs0;
actor->fwork[15] = 0.0f;
@@ -1437,11 +1436,11 @@ void func_i5_8018C8A8(Actor* actor) {
if (actor->timer_0BC == 0) {
actor->state = 4;
}
Animation_GetFrameData(&D_70067C4, actor->unk_0B6, spA4);
Animation_GetFrameData(&D_TI1_70067C4, actor->unk_0B6, spA4);
Math_SmoothStepToVec3fArray(spA4, actor->vwork, 1, 0xF, 0.1f, 3.0f, 0.01f);
temp_fs0 = actor->vwork[0].y;
actor->vwork[0].y += actor->fwork[26];
Animation_DrawSkeleton(0, D_7006990, actor->vwork, func_i5_8018C118, func_i5_8018C3D8, actor,
Animation_DrawSkeleton(0, D_TI1_7006990, actor->vwork, func_i5_8018C118, func_i5_8018C3D8, actor,
&gIdentityMatrix);
actor->vwork[0].y = temp_fs0;
actor->fwork[15] = 0.0f;
@@ -1470,7 +1469,7 @@ void func_i5_8018C8A8(Actor* actor) {
}
Math_SmoothStepToF(&actor->fwork[0xF], 1.0f, 0.7f, 0.1f, 0.01f);
actor->unk_0B6++;
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_70067C4)) {
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_TI1_70067C4)) {
actor->unk_0B6 = 0;
}
if ((actor->fwork[4] > 0.0f) || (actor->fwork[7] > 0.0f)) {
@@ -1483,7 +1482,7 @@ void func_i5_8018C8A8(Actor* actor) {
Math_SmoothStepToF(&actor->fwork[15], 0.0f, 1.0f, 0.2f, 0.01f);
Math_SmoothStepToF(&actor->fwork[24], 0.0f, 1.0f, 0.1f, 0.01f);
actor->fwork[23] += actor->fwork[24];
if ((f32) Animation_GetFrameCount(&D_70067C4) <= actor->fwork[23]) {
if ((f32) Animation_GetFrameCount(&D_TI1_70067C4) <= actor->fwork[23]) {
actor->fwork[23] = 0.0f;
}
actor->unk_0B6 = actor->fwork[23];
@@ -1492,11 +1491,11 @@ void func_i5_8018C8A8(Actor* actor) {
}
}
Animation_GetFrameData(&D_70067C4, actor->unk_0B6, spA4);
Animation_GetFrameData(&D_TI1_70067C4, actor->unk_0B6, spA4);
Math_SmoothStepToVec3fArray(spA4, actor->vwork, 1, 15, actor->fwork[15], 360.0f, 0.01f);
temp_fs0 = actor->vwork[0].y;
actor->vwork[0].y += actor->fwork[26];
Animation_DrawSkeleton(0, D_7006990, actor->vwork, func_i5_8018C118, func_i5_8018C3D8, actor,
Animation_DrawSkeleton(0, D_TI1_7006990, actor->vwork, func_i5_8018C118, func_i5_8018C3D8, actor,
&gIdentityMatrix);
actor->vwork[0].y = temp_fs0;
Math_SmoothStepToF(&actor->fwork[26], -60.0f, actor->fwork[15], 500.0f, 0.01f);
@@ -1513,16 +1512,16 @@ void func_i5_8018C8A8(Actor* actor) {
case 5:
Math_SmoothStepToF(&actor->fwork[15], 1.0f, 1.0f, 0.015f, 0.01f);
Animation_GetFrameData(&D_7007130, actor->unk_0B6, spA4);
Animation_GetFrameData(&D_TI1_7007130, actor->unk_0B6, spA4);
Math_SmoothStepToVec3fArray(spA4, actor->vwork, 1, 15, actor->fwork[15], 360.0f, 0.01f);
Math_SmoothStepToF(&actor->fwork[26], -40.0f, actor->fwork[15], 500.0f, 0.01f);
temp_fs0 = actor->vwork[0].y;
actor->vwork[0].y += actor->fwork[26];
Animation_DrawSkeleton(0, D_7006990, actor->vwork, func_i5_8018C118, func_i5_8018C3D8, actor,
Animation_DrawSkeleton(0, D_TI1_7006990, actor->vwork, func_i5_8018C118, func_i5_8018C3D8, actor,
&gIdentityMatrix);
actor->vwork[0].y = temp_fs0;
actor->unk_0B6++;
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_7007130)) {
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_TI1_7007130)) {
actor->unk_0B6 = 0;
}
if (actor->timer_0BC == 0) {
@@ -1538,11 +1537,11 @@ void func_i5_8018C8A8(Actor* actor) {
}
actor->iwork[2] = 1;
Math_SmoothStepToF(&actor->fwork[15], 1.0f, 1.0f, 0.005f, 0.01f);
Animation_GetFrameData(&D_7006F74, actor->unk_0B6, spA4);
Animation_GetFrameData(&D_TI1_7006F74, actor->unk_0B6, spA4);
Math_SmoothStepToVec3fArray(spA4, actor->vwork, 1, 15, actor->fwork[15], 360.0f, 0.01f);
temp_fs0 = actor->vwork[0].y;
actor->vwork[0].y += actor->fwork[26];
Animation_DrawSkeleton(0, D_7006990, actor->vwork, func_i5_8018C118, func_i5_8018C3D8, actor,
Animation_DrawSkeleton(0, D_TI1_7006990, actor->vwork, func_i5_8018C118, func_i5_8018C3D8, actor,
&gIdentityMatrix);
actor->vwork[0].y = temp_fs0;
if (actor->unk_0B6 == 0x15) {
@@ -1578,7 +1577,7 @@ void func_i5_8018C8A8(Actor* actor) {
func_8007D2C8(actor->obj.pos.x + sp158.x, actor->obj.pos.y + sp158.y, actor->obj.pos.z + sp158.z, 1.5f);
}
if (actor->unk_0B6 < (Animation_GetFrameCount(&D_7006F74) - 1)) {
if (actor->unk_0B6 < (Animation_GetFrameCount(&D_TI1_7006F74) - 1)) {
actor->unk_0B6++;
} else {
func_i5_8018C72C(actor);
@@ -1586,7 +1585,7 @@ void func_i5_8018C8A8(Actor* actor) {
break;
case 7:
Animation_GetFrameData(&D_7006F74, actor->unk_0B6, spA4);
Animation_GetFrameData(&D_TI1_7006F74, actor->unk_0B6, spA4);
Math_SmoothStepToVec3fArray(spA4, actor->vwork, 1, 15, actor->fwork[15], 360.0f, 0.01f);
break;
@@ -1701,7 +1700,7 @@ void func_i5_8018E2D8(Actor* actor) {
}
sp34 = actor->vwork[0].y;
actor->vwork[0].y += actor->fwork[26];
Animation_DrawSkeleton(0, D_7006990, actor->vwork, func_i5_8018C134, func_i5_8018C370, actor, &gIdentityMatrix);
Animation_DrawSkeleton(0, D_TI1_7006990, actor->vwork, func_i5_8018C134, func_i5_8018C370, actor, &gIdentityMatrix);
actor->vwork[0].y = sp34;
}
@@ -1757,7 +1756,7 @@ void func_i5_8018E54C(Actor* actor) {
}
void func_i5_8018E5B4(Actor* actor) {
gSPDisplayList(gMasterDisp++, D_70098E0);
gSPDisplayList(gMasterDisp++, D_TI1_70098E0);
}
void func_i5_8018E5E8(Actor* actor) {
@@ -1987,7 +1986,7 @@ void func_i5_8018E5F8(Actor* actor) {
void func_i5_8018EF14(Actor* actor) {
gSPDisplayList(gMasterDisp++, D_7008930);
gSPDisplayList(gMasterDisp++, D_TI1_7008930);
if (!(actor->timer_0C6 & 1)) {
RCP_SetupDL(&gMasterDisp, 0x22);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 220, 220, 220, 255);
@@ -1995,7 +1994,7 @@ void func_i5_8018EF14(Actor* actor) {
RCP_SetupDL(&gMasterDisp, 0x16);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, 255);
}
gSPDisplayList(gMasterDisp++, D_7009510);
gSPDisplayList(gMasterDisp++, D_TI1_7009510);
}
void func_i5_8018EFF0(Object_4C* obj4C) {
@@ -2032,44 +2031,6 @@ void func_i5_8018F0D8(Object_80* obj80) {
static Vec3f D_i5_801B7690 = { 0.0f, 460.0f, 0.0f };
extern Gfx D_7009700[];
extern Gfx D_7004E80[];
extern Gfx D_70049C0[];
extern Gfx D_70045D0[];
extern Gfx D_A001FA0[];
extern Gfx D_900FE80[];
extern Gfx D_80018D0[];
extern Gfx D_9005450[];
extern Gfx D_8009000[];
extern Gfx D_A002170[];
extern Gfx D_8001FB0[];
extern Gfx D_90058A0[];
extern Gfx D_90042A0[];
extern Gfx D_90043D0[];
extern Gfx D_90044E0[];
extern Gfx D_90045F0[];
extern Gfx D_80020D0[];
extern Gfx D_7003F00[];
extern Gfx D_8001D20[];
extern Gfx D_8001E20[];
extern Gfx D_80011C0[];
extern Gfx D_8002360[];
extern Gfx D_90051C0[];
extern Gfx D_8003640[];
extern Gfx D_900FC60[];
extern Gfx D_900FD70[];
extern Gfx D_9005600[];
extern Gfx D_8001630[];
extern Gfx D_80014A0[];
extern Gfx D_9005040[];
extern Gfx D_7004400[];
extern Gfx D_7009890[];
extern Gfx D_8001A80[];
extern Gfx D_A001DB0[];
extern Gfx D_A001EC0[];
extern Gfx D_A001BE0[];
extern Gfx D_7004270[];
Gfx* D_i5_801B769C[39] = {
D_7009700, D_7004E80, D_70049C0, D_70045D0, D_A001FA0, D_900FE80, D_80018D0, D_9005450, NULL, D_8009000,
D_A002170, D_8001FB0, D_90058A0, D_90042A0, D_90043D0, D_90044E0, D_90045F0, D_80020D0, D_7003F00, D_8001D20,
@@ -2200,9 +2161,9 @@ void func_i5_8018F8B8(Object_80* obj80) {
switch (obj80->unk_44) {
case 0:
if (obj80->unk_44 == 0) {
gSPDisplayList(gMasterDisp++, D_7002270);
gSPDisplayList(gMasterDisp++, D_TI1_7002270);
} else {
gSPDisplayList(gMasterDisp++, D_7000A80);
gSPDisplayList(gMasterDisp++, D_TI1_7000A80);
}
break;
case 1:
@@ -2217,9 +2178,9 @@ void func_i5_8018F8B8(Object_80* obj80) {
}
}
if (obj80->unk_44 == 0) {
gSPDisplayList(gMasterDisp++, D_7002270);
gSPDisplayList(gMasterDisp++, D_TI1_7002270);
} else {
gSPDisplayList(gMasterDisp++, D_7000A80);
gSPDisplayList(gMasterDisp++, D_TI1_7000A80);
}
break;
}
src/overlays/ovl_i6/fox_andross.c
+13 -56
View File
@@ -1,5 +1,18 @@
#include "prevent_bss_reordering2.h"
#include "prevent_bss_reordering.h"
#include "global.h"
#include "assets/ast_andross.h"
#include "assets/ast_arwing.h"
#include "assets/ast_vs_player.h"
#include "assets/ast_bg_planet.h"
extern Animation D_600C038;
extern Gfx D_6009300[];
extern Limb* D_600C0A4[];
extern Gfx D_600C2D0[];
extern Gfx D_600C560[];
extern Limb* D_6014844[];
extern Gfx D_6007E20[];
f32 D_i6_801A7F40;
f32 D_i6_801A7F44;
@@ -59,8 +72,6 @@ s32 func_i6_8018767C(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d
return 0;
}
extern Limb* D_6014844[];
void func_i6_8018769C(Actor* actor) {
Vec3f sp28[20];
@@ -68,9 +79,6 @@ void func_i6_8018769C(Actor* actor) {
Animation_DrawSkeleton(1, D_6014844, sp28, func_i6_8018767C, NULL, NULL, &gIdentityMatrix);
}
extern u32 D_C039290[];
extern u32 D_C03A290[];
void func_i6_801876FC(void) {
s32 temp_ft3;
s32* var_s0;
@@ -90,9 +98,6 @@ void func_i6_801876FC(void) {
}
}
extern ObjectInit D_C0356CC[];
extern f32 D_C038CCC[];
void func_i6_801878A8() {
Actor* actor;
Item* item;
@@ -160,10 +165,6 @@ void func_i6_801878A8() {
}
}
extern ObjectInit D_C036310[];
extern ObjectInit D_C036B6C[];
extern ObjectInit D_C03733C[];
void func_i6_80187C5C(void) {
Actor* actor;
Item* item;
@@ -344,8 +345,6 @@ void func_i6_80188528(Actor* actor) {
actor->unk_0F4.z += actor->fwork[0];
}
extern Gfx D_6009300[];
void func_i6_80188660(Actor* actor) {
RCP_SetupDL(&gMasterDisp, 0x3D);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
@@ -469,8 +468,6 @@ void func_i6_80188A4C(Boss* boss) {
}
}
extern Animation D_600C038;
void func_i6_80188CB8(Boss* boss) {
s32 i;
Vec3f sp50;
@@ -1213,10 +1210,6 @@ s32 func_i6_8018B47C(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* d
return false;
}
extern Limb* D_600C0A4[];
extern Gfx D_600C2D0[];
extern Gfx D_600C560[];
void func_i6_8018B8C0(Boss* boss) {
s32 j;
s32 i;
@@ -1273,9 +1266,6 @@ void func_i6_8018B8C0(Boss* boss) {
}
}
extern Vtx D_C017598[];
extern Vtx D_C038FE8[];
void func_i6_8018BDD8(void) {
s32 i;
f32 spC0[17];
@@ -1554,7 +1544,6 @@ void func_i6_8018CAD4(Effect* effect) {
}
}
extern Gfx D_2010A30[];
static Gfx* D_i6_801A6790[10] = {
D_C001880, D_C001880, D_C001880, D_C001880, D_C001880, D_C001880, D_C001880, D_C001880, D_3016660, D_3015D80,
};
@@ -1789,25 +1778,6 @@ void func_i6_8018DA94(Boss* boss, Vec3f* arg1) {
AUDIO_PLAY_SFX(0x2903B009, boss->sfxSource, 4);
}
extern Animation D_C00208C;
extern Animation D_C002654;
extern Animation D_C002B08;
extern Animation D_C006F08;
extern Animation D_C00DE48;
extern Animation D_C00E598;
extern Animation D_C017050;
extern Animation D_C017430;
extern Animation D_C018BC4;
extern Animation D_C023B54;
extern Animation D_C0240D0;
extern Animation D_C025C00;
extern Animation D_C029F74;
extern Animation D_C02E494;
extern Animation D_C02EDA0;
extern Animation D_C030244;
extern Animation D_C033780;
extern Animation D_C033D98;
static f32 D_i6_801A67B8[] = { 0.0f, 0.0f, 0.0f };
void func_i6_8018DBF0(Boss* boss) {
@@ -2841,13 +2811,6 @@ void func_i6_8018DBF0(Boss* boss) {
}
}
extern Gfx D_C002B20[];
extern Gfx D_C002F00[];
extern Gfx D_C0043D0[];
extern Gfx D_C004860[];
extern Gfx D_C015740[];
extern Gfx D_C022520[];
static Vec3f D_i6_801A67C4 = { 40.0f, 0.0f, -10.0f };
static f32 D_i6_801A67D0 = 180.0f;
static f32 D_i6_801A67D4 = 0.0f;
@@ -3172,8 +3135,6 @@ void func_i6_801924B4(s32 limbIndex, Vec3f* rot, void* data) {
}
}
extern Limb* D_C01CC3C[];
void func_i6_801928C8(Boss* boss) {
if (boss->timer_058 == 0) {
@@ -3303,8 +3264,6 @@ void func_i6_80192E94(Actor* actor) {
}
}
extern Gfx D_6007E20[];
void func_i6_80193244(Actor* actor) {
gSPDisplayList(gMasterDisp++, D_6007E20);
@@ -3328,8 +3287,6 @@ void func_i6_80193244(Actor* actor) {
}
}
extern Gfx D_C038AC4[];
void func_i6_80193380(Object_80* obj80) {
switch (obj80->state) {
src/overlays/ovl_menu/fox_map.c
+1 -2
View File
@@ -191,6 +191,7 @@ f32 D_menu_801CF124;
extern u16 D_6000000[];
#include "assets/ast_font.h"
#include "assets/ast_font_3d.h"
s32 D_menu_801AF420[2] = { 10, 20 };
@@ -1108,8 +1109,6 @@ Gfx* D_menu_801B68F8[] = {
D_menu_801B5B10, D_menu_801B5440, D_menu_801B50D8, D_menu_801B57A8, D_604DB10,
};
extern u8 D_5000500[];
extern u8 D_6000840[];
extern u8 D_6001080[];
extern u8 D_60018C0[];
src/overlays/ovl_menu/fox_option.c
+4 -3
View File
@@ -5,10 +5,8 @@
*/
#include "mods.h"
#include "prevent_bss_reordering.h"
#include "global.h"
#include "prevent_bss_reordering.h"
#include "fox_option.h"
extern s32 D_menu_801B81A8[][3];
@@ -24,6 +22,9 @@ extern Gfx D_menu_801B5E78[];
extern Gfx D_menu_801B57A8[];
#include "fox_option_assets.h"
#include "assets/ast_font.h"
#include "assets/ast_font_3d.h"
#include "assets/ast_option.h"
extern f32 D_menu_801CD818[];
src/overlays/ovl_menu/fox_title.c
+3 -5
View File
@@ -3,8 +3,8 @@
* System: Title
* Description: Starfox Title Handler
*/
#include "prevent_bss_reordering.h"
#include "prevent_bss_reordering2.h"
// #include "prevent_bss_reordering.h"
// #include "prevent_bss_reordering2.h"
#include "global.h"
#include "fox_title.h"
@@ -159,8 +159,6 @@ f32 D_menu_801B907C;
f32 D_menu_801B9080;
f32 D_menu_801B9084;
extern u8 D_5000200[];
extern u8 D_5000300[];
extern u16 D_6000000[];
#include "assets/ast_font.h"
@@ -436,7 +434,7 @@ void func_menu_80187CA8(void) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
TextureRect_8bIA(&gMasterDisp, D_50077B0, 16, 2, 36, 32, 15.2f, 1.0f);
TextureRect_8bIA(&gMasterDisp, &D_5007690[48 * 6], 16, 2, 36, 32, 15.2f, 1.0f);
func_menu_80187E28();
}
src/overlays/ovl_unused/fox_unused.c
+1
View File
@@ -1,4 +1,5 @@
#include "global.h"
#include "assets/ast_andross.h"
UNK_TYPE D_unused_801875C0;
tools/Torch
+1 -1
Submodule tools/Torch updated: 70568034c2...a6face7240