Even more matches for code_800431B0.c (#261)

* More matches for code_800431B0

* Also added a header for the common_textures file since some other
 files use the Gfx/Vtx variables defined there

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
This commit is contained in:
Tyler McGavran
2022-09-25 13:26:58 -04:00
committed by GitHub
parent 5cd2115c2e
commit 754e31da04
34 changed files with 3027 additions and 6167 deletions
+2496 -3924
View File
File diff suppressed because it is too large Load Diff
+117 -146
View File
@@ -6,7 +6,7 @@
void func_800431B0(Vec3f, Vec3s, f32, Vtx*);
void func_80043220(Vec3f, Vec3s, f32, Gfx*);
void func_80043328(Vec3f, Vec3s, f32, Gfx*);
void func_800433288(Vec3f, Vec3s, f32, Gfx*);
void func_80043288(Vec3f, Vec3s, f32, Gfx*);
void func_80043390(Vec3f, Vec3s, f32, Gfx*);
void func_800433F8(Vec3f, Vec3s, f32, Gfx*);
void func_80043460(Vec3f, Vec3s, f32, Gfx*);
@@ -40,8 +40,12 @@ void func_80045B2C(Vtx*);
void func_80045B74(Vtx*);
void func_80045BBC(Vec3f, Vec3s, f32, Vtx*);
void func_80045C48(Vec3f, Vec3s, f32, Vtx*);
void func_80045E10(s32, s32, s32, s32, s32);
void func_80045D0C(s8*, Vtx*, s32, s32, s32);
void func_80045E10(s8*, Vtx*, s32, s32, s32);
void func_80045F18(s8*, Vtx*, s32, s32, s32, s32);
void func_800461A4(s8*, Vtx*, s32, s32, s32);
void func_800462A8(s8*, Vtx*, s32, s32, s32);
void func_800463B0(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32);
void func_80046424(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32);
void func_800464D0(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32);
@@ -70,99 +74,111 @@ void func_80046DF4(s32, s32, u16, f32, s32, s32);
void func_80046E60(s32, s32, s32, s32);
void func_80046F60(s32, s32, s32, s32, s32);
void func_80047068(s32, s32, s32, s32, s32, s32, s32);
void func_8004788C(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32, s32);
void func_80047910(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32, s32);
void func_80047994(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32, s32);
void func_80047A18(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32, s32);
void func_80047A9C(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32, s32);
void func_80047B20(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32);
void func_80047B9C(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_80047C28(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_80047CB4(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_80047D40(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_80047DCC(s32, s32, f32, s32, s32, s32, s32, s32, s32, s32);
void func_80047E48(s32, s32, f32, s32, s32, s32, s32, s32, s32, s32);
void func_80047EC4(s32, s32, f32, s32, s32, s32, s32, s32, s32, s32);
void func_80047F40(s32, s32, f32, s32, s32, s32, s32, s32, s32, s32);
void func_80047FBC(s32, s32, f32, s32, s32, s32, s32, s32, s32, s32);
void func_80047068(s8*, s8*, Vtx*, s32, s32, s32, s32);
void func_80047270(s8*, s8*, Vtx*, s32, s32, s32, s32);
void func_8004747C(s8*, s8*, Vtx*, s32, s32, s32, s32, s32);
void func_8004768C(s8*, s8*, Vtx*, s32, s32, s32);
void func_8004788C(s32, s32, u16, f32, s32, s32, Vtx*, s32, s32, s32, s32);
void func_80047910(s32, s32, u16, f32, s32, s32, Vtx*, s32, s32, s32, s32);
void func_80047994(s32, s32, u16, f32, s32, s32, Vtx*, s32, s32, s32, s32);
void func_80047A18(s32, s32, u16, f32, s32, s32, Vtx*, s32, s32, s32, s32);
void func_80047A9C(s32, s32, u16, f32, s32, s32, Vtx*, s32, s32, s32, s32);
void func_80047B20(s32, s32, u16, f32, s32, s32, Vtx*, s32, s32, s32);
void func_80047B9C(s32, s32, u16, f32, s32, s32, s32, Vtx*, s32, s32, s32, s32);
void func_80047C28(s32, s32, u16, f32, s32, s32, s32, Vtx*, s32, s32, s32, s32);
void func_80047CB4(s32, s32, u16, f32, s32, s32, s32, Vtx*, s32, s32, s32, s32);
void func_80047D40(s32, s32, u16, f32, s32, s32, s32, Vtx*, s32, s32, s32, s32);
void func_80047DCC(Vec3f, Vec3su, f32, s32, s32, Vtx*, s32, s32, s32, s32);
void func_80047E48(Vec3f, Vec3su, f32, s32, s32, Vtx*, s32, s32, s32, s32);
void func_80047EC4(Vec3f, Vec3su, f32, s32, s32, Vtx*, s32, s32, s32, s32);
void func_80047F40(Vec3f, Vec3su, f32, s32, s32, Vtx*, s32, s32, s32, s32);
void func_80047FBC(Vec3f, Vec3su, f32, s32, s32, Vtx*, s32, s32, s32, s32);
void func_80048038(s32, s32, f32, s32, s32, s32, s32, s32, s32, s32);
void func_800480B4(s32, s32, f32, s32, s32, s32, s32, s32, s32, s32);
void func_80048130(s32, s32, f32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_800481B4(s32, s32, f32, s32, s32, s32, s32, s32, s32);
void func_80048228(s32, s32, f32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_800482AC(s32, s32, f32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_80048330(s32, s32, f32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_800483B4(s32, s32, f32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_80048438(s32, s32, f32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_800484BC(s32, s32, f32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_80048540(s32, s32, f32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_800485C4(s32, s32, f32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_800486B0(s32, s32, u16, f32, s32, s32, s32);
void func_80048718(s32, s32, u16, f32, s32, s32, s32);
void func_80048780(s32, s32, f32, s32, s32, s32, s32);
void func_800487DC(s32, s32, u16, f32, s32, s32, s32);
void func_80048844(s32, s32, u16, f32, s32, s32, s32);
void func_800488AC(s32, s32, u16, f32, s32, s32, s32);
void func_80048914(s32, s32, u16, f32, s32, s32, s32);
void func_8004897C(s32, s32, u16, f32, s32, s32, s32);
void func_800489E4(s32, s32, u16, f32, s32, s32, s32);
void func_80048A4C(s32, s32, u16, f32, s32, s32, s32);
void func_80048AB4(s32, s32, u16, f32, s32, s32, s32, s32);
void func_80048B24(s32, s32, u16, f32, s32, s32, s32, s32);
void func_80048B94(s32, s32, f32, s32, s32, s32);
void func_80048BE8(s32, s32, f32, s32, s32, s32);
void func_80048C3C(s32, s32, f32, s32, s32, s32);
void func_80048C90(s32, s32, f32, s32, s32, s32, s32);
void func_80048CEC(s32, s32, f32, s32, s32, s32, s32);
void func_80048D48(s32, s32, f32, s32, s32, s32, s32);
void func_80048DA4(s32, s32, f32, s32, s32, s32, s32);
void func_80048E00(s32, s32, u16, f32, s32, s32, s32);
void func_80048E68(s32, s32, u16, f32, s32, s32, s32);
void func_80048ED0(s32, s32, u16, f32, s32, s32, s32);
void func_80048F38(s32, s32, f32, s32, s32, s32);
void func_80048038(Vec3f, Vec3su, f32, s32, s32, Vtx*, s32, s32, s32, s32);
void func_800480B4(Vec3f, Vec3su, f32, s32, s32, Vtx*, s32, s32, s32, s32);
void func_80048130(Vec3f, Vec3su, f32, s32, s32, Vtx*, s32, s32, s32, s32, s32);
void func_800481B4(Vec3f, Vec3su, f32, s32, s32, Vtx*, s32, s32, s32);
void func_80048228(Vec3f, Vec3su, f32, s32, s32, s32, Vtx*, s32, s32, s32, s32);
void func_800482AC(Vec3f, Vec3su, f32, s32, s32, s32, Vtx*, s32, s32, s32, s32);
void func_80048330(Vec3f, Vec3su, f32, s32, s32, s32, Vtx*, s32, s32, s32, s32);
void func_800483B4(Vec3f, Vec3su, f32, s32, s32, s32, Vtx*, s32, s32, s32, s32);
void func_80048438(Vec3f, Vec3su, f32, s32, s32, s32, Vtx*, s32, s32, s32, s32);
void func_800484BC(Vec3f, Vec3su, f32, s32, s32, s32, Vtx*, s32, s32, s32, s32);
void func_80048540(Vec3f, Vec3su, f32, s32, s32, s32, Vtx*, s32, s32, s32, s32);
void func_800485C4(Vec3f, Vec3su, f32, s32, s32, s32, Vtx*, s32, s32, s32, s32);
void func_800486B0(s32, s32, u16, f32, s32, s32, Vtx*);
void func_80048718(s32, s32, u16, f32, s32, s32, Vtx*);
void func_80048780(s32, s32, f32, s32, s32, s32, Vtx*);
void func_800487DC(s32, s32, u16, f32, s32, s32, Vtx*);
void func_80048844(s32, s32, u16, f32, s32, s32, Vtx*);
void func_800488AC(s32, s32, u16, f32, s32, s32, Vtx*);
void func_80048914(s32, s32, u16, f32, s32, s32, Vtx*);
void func_8004897C(s32, s32, u16, f32, s32, s32, Vtx*);
void func_800489E4(s32, s32, u16, f32, s32, s32, Vtx*);
void func_80048A4C(s32, s32, u16, f32, s32, s32, Vtx*);
void func_80048AB4(s32, s32, u16, f32, s32, s32, s32, Vtx*);
void func_80048B24(s32, s32, u16, f32, s32, s32, s32, Vtx*);
void func_80048B94(Vec3f, Vec3su, f32, s32, s32, Vtx*);
void func_80048BE8(Vec3f, Vec3su, f32, s32, s32, Vtx*);
void func_80048C3C(Vec3f, Vec3su, f32, s32, s32, Vtx*);
void func_80048C90(Vec3f, Vec3su, f32, s32, s32, s32, Vtx*);
void func_80048CEC(Vec3f, Vec3su, f32, s32, s32, s32, Vtx*);
void func_80048D48(Vec3f, Vec3su, f32, s32, s32, s32, Vtx*);
void func_80048DA4(Vec3f, Vec3su, f32, s32, s32, s32, Vtx*);
void func_80048E00(s32, s32, u16, f32, s32, s32, Vtx*);
void func_80048E68(s32, s32, u16, f32, s32, s32, Vtx*);
void func_80048ED0(s32, s32, u16, f32, s32, s32, Vtx*);
void func_80048F38(s32, s32, f32, s32, s32, Vtx*);
void func_80048F8C(s8*, Vtx*, s32, s32, s32, s32);
void func_80049B20(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32);
void func_80049B9C(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32);
void func_80049C18(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32);
void func_80049C94(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32);
void func_80049D10(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32);
void func_80049D8C(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32);
void func_80049E08(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_80049E98(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_80049F28(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_80049FB8(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32);
void func_80049130(s8*, Vtx*, s32, s32, s32, s32);
void func_800492D4(s8*, Vtx*, s32, s32, s32, s32);
void func_80049478(s8*, Vtx*, s32, s32, s32, s32);
void func_800497CC(s8*, Vtx*, s32, s32, s32, s32);
void func_80049B20(s32, s32, u16, f32, s32, Vtx*, s32, s32, s32, s32);
void func_80049B9C(s32, s32, u16, f32, s32, Vtx*, s32, s32, s32, s32);
void func_80049C18(s32, s32, u16, f32, s32, Vtx*, s32, s32, s32, s32);
void func_80049C94(s32, s32, u16, f32, s32, Vtx*, s32, s32, s32, s32);
void func_80049D10(s32, s32, u16, f32, s32, Vtx*, s32, s32, s32, s32);
void func_80049D8C(s32, s32, u16, f32, s32, Vtx*, s32, s32, s32, s32);
void func_80049E08(s32, s32, u16, f32, s32, s32, s32, s32, s32, Vtx*, s32, s32, s32, s32);
void func_80049E98(s32, s32, u16, f32, s32, s32, s32, s32, s32, Vtx*, s32, s32, s32, s32);
void func_80049F28(s32, s32, u16, f32, s32, s32, s32, s32, s32, Vtx*, s32, s32, s32, s32);
void func_80049FB8(s32, s32, u16, f32, s32, Vtx*, s32, s32, s32, s32);
void func_8004A034(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32);
void func_8004A0B0(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32);
void func_8004A12C(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_8004A1BC(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32);
void func_8004A258(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32);
void func_8004A2F4(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_8004A384(s32, s32, u16, f32, s32, s32, s32, s32, s32, s32, s32, s32, s32, s32);
void func_8004A414(s32, s32, f32, s32, s32, s32, s32, s32, s32);
void func_8004A488(s32, s32, f32, s32, s32, s32, s32, s32, s32);
void func_8004A4FC(s32, s32, f32, s32, s32, s32, s32, s32, s32);
void func_8004A570(s32, s32, f32, s32, s32, s32, s32, s32, s32);
void func_8004A5E4(s32, s32, f32, s32, s32);
void func_8004A034(s32, s32, u16, f32, s32, Vtx*, s32, s32, s32, s32);
void func_8004A0B0(s32, s32, u16, f32, s32, Vtx*, s32, s32, s32, s32);
void func_8004A12C(s32, s32, u16, f32, s32, s32, s32, s32, s32, Vtx*, s32, s32, s32, s32);
void func_8004A1BC(s32, s32, u16, f32, s32, Vtx*, s32, s32, s32, s32);
void func_8004A258(s32, s32, u16, f32, s32, Vtx*, s32, s32, s32, s32);
void func_8004A2F4(s32, s32, u16, f32, s32, s32, s32, s32, s32, Vtx*, s32, s32, s32, s32);
void func_8004A384(s32, s32, u16, f32, s32, s32, s32, s32, s32, Vtx*, s32, s32, s32, s32);
void func_8004A414(Vec3f, Vec3su, f32, s32, Vtx*, s32, s32, s32, s32);
void func_8004A488(Vec3f, Vec3su, f32, s32, Vtx*, s32, s32, s32, s32);
void func_8004A4FC(Vec3f, Vec3su, f32, s32, Vtx*, s32, s32, s32, s32);
void func_8004A570(Vec3f, Vec3su, f32, s32, Vtx*, s32, s32, s32, s32);
void func_8004A5E4(Vec3f, Vec3su, f32, s32, Vtx*);
void func_8004A630(UnkActorInner*, Vec3f, f32);
void func_8004A6EC(s32, f32);
void func_8004A7AC(s32, f32);
void func_8004A870(s32, f32);
void func_8004A9B8(f32);
void func_8004AA10(s32, s32, f32, s32, s32, s32, s32, s32, s32);
void func_8004AAA0(s32, s32, u16, f32, s32, s32);
void func_8004AB00(s32, s32, u16, f32, s32, s32);
void func_8004AB60(s32, s32, u16, f32, s32, s32);
void func_8004ABC0(s32, s32, u16, f32, s32, s32);
void func_8004AC20(s32, s32, u16, f32, s32, s32);
void func_8004AC80(s32, s32, u16, f32, s32, s32);
void func_8004ACE0(s32, s32, f32, s32, s32);
void func_8004AD2C(s32, s32, u16, f32, s32, s32);
void func_8004AD8C(s32, s32, u16, f32, s32, s32);
void func_8004ADEC(s32, s32, u16, f32, s32, s32);
void func_8004AE4C(s32, s32, u16, f32, s32, s32);
void func_8004AEAC(s32, s32, u16, f32, s32, s32);
void func_8004AF0C(s32, s32, u16, f32, s32, s32);
void func_8004AF6C(s32, s32, u16, f32, s32, s32);
void func_8004AFCC(s32, s32, u16, f32, s32, s32);
void func_8004AA10(Vec3f, Vec3su, f32, s32, Vtx*, s32, s32, s32, s32);
void func_8004AAA0(s32, s32, u16, f32, s32, Vtx*);
void func_8004AB00(s32, s32, u16, f32, s32, Vtx*);
void func_8004AB60(s32, s32, u16, f32, s32, Vtx*);
void func_8004ABC0(s32, s32, u16, f32, s32, Vtx*);
void func_8004AC20(s32, s32, u16, f32, s32, Vtx*);
void func_8004AC80(s32, s32, u16, f32, s32, Vtx*);
void func_8004ACE0(s32, s32, f32, s32, Vtx*);
void func_8004AD2C(s32, s32, u16, f32, s32, Vtx*);
void func_8004AD8C(s32, s32, u16, f32, s32, Vtx*);
void func_8004ADEC(s32, s32, u16, f32, s32, Vtx*);
void func_8004AE4C(s32, s32, u16, f32, s32, Vtx*);
void func_8004AEAC(s32, s32, u16, f32, s32, Vtx*);
void func_8004AF0C(s32, s32, u16, f32, s32, Vtx*);
void func_8004AF6C(s32, s32, u16, f32, s32, Vtx*);
void func_8004AFCC(s32, s32, u16, f32, s32, Vtx*);
void func_8004B02C();
void func_8004B05C(u8*);
@@ -185,6 +201,7 @@ void func_8004B72C(s32, s32, s32, s32, s32, s32, s32);
void func_8004B950(s32, s32, s32, s32, s32);
void func_8004BB34();
void func_8004BB3C(s32, s32, s32, s32, f32);
void func_8004BD14(s32, s32, u32, u32, s32, s8*, s8*);
void func_8004C024(s16, s16, s16, u16, u16, u16, u16);
void func_8004C148(s16, s16, s16, u16, u16, u16, u16);
@@ -252,6 +269,7 @@ void func_8004E59C(s32, s32, s32, s32, s32);
void func_8004E5D8(s32, s32, u8*, s32);
void func_8004E604(s32, s32, u8*, s32);
void func_8004E638(s32);
void func_8004E6C4(s32);
void func_8004E78C(s32);
void func_8004E800(s32);
void func_8004E998(s32);
@@ -262,6 +280,7 @@ void func_8004EE54(s32);
void func_8004F020(s32);
void func_8004F3E4(s32);
s32 func_8004F674(s32*, s32);
void print_timer(s32, s32, s32);
void func_8004F950(s32, s32, s32, s32);
void func_8004F9CC(s32, s32, s32);
@@ -273,6 +292,8 @@ void func_80050320();
void func_800514BC();
void func_80051638(s32);
void func_800517C8();
void func_80051ABC(s16, s32);
void func_80051C60(s16, s32);
void func_80051EBC();
void func_80051EF8();
void func_80051F9C();
@@ -301,7 +322,9 @@ void func_80054BE8(s32);
void func_800550A4(s32);
void func_80055228(s32);
void func_80055380(s32);
void func_80055458(s32, s32);
void func_80055528(s32);
void func_800555BC(s32, s32);
void func_8005568C(s32);
void func_800557AC();
void func_8005592C(s32);
@@ -313,6 +336,7 @@ void func_80055FA0(s32, s32);
void func_80056160(s32);
void func_80056188(s32);
void func_800568A0(s32, s32);
void func_800569F4(s32);
void func_80056A40(s32, s32);
void func_80056A94(s32);
@@ -357,6 +381,8 @@ extern u16 D_801656E0;
extern s32 D_80183DD8[];
extern Vec3f D_80183E50;
extern Vec3f D_80183E70;
extern s32 D_80183E88[];
extern Vec3s D_80183E98;
extern s32 D_80183EAC;
extern s32 D_8018D1E0;
@@ -369,61 +395,6 @@ extern Lights1 D_800E4698;
extern s8 D_800E5670[];
extern s8 D_800E566A[];
extern Gfx D_0D005470[];
extern Gfx D_0D005770[];
extern Gfx D_0D005AE0[];
extern Gfx D_0D005FB0[];
extern Gfx D_0D0060B0[];
extern Gfx D_0D006930[];
extern Gfx D_0D006940[];
extern Gfx D_0D0077A0[];
extern Gfx D_0D0077D0[];
extern Gfx D_0D0077F8[];
extern Gfx D_0D007828[];
extern Gfx D_0D007850[];
extern Gfx D_0D007878[];
extern Gfx D_0D0078A0[];
extern Gfx D_0D0078D0[];
extern Gfx D_0D007928[];
extern Gfx D_0D007948[];
extern Gfx D_0D007968[];
extern Gfx D_0D0079A8[];
extern Gfx D_0D0079C8[];
extern Gfx D_0D0079E8[];
extern Gfx D_0D007A40[];
extern Gfx D_0D007A60[];
extern Gfx D_0D007A80[];
extern Gfx D_0D007AA0[];
extern Gfx D_0D007AC0[];
extern Gfx D_0D007AE0[];
extern Gfx D_0D007B00[];
extern Gfx D_0D007C10[];
extern Gfx D_0D007CB8[];
extern Gfx D_0D007CD8[];
extern Gfx D_0D007CF8[];
extern Gfx D_0D007D18[];
extern Gfx D_0D007D38[];
extern Gfx D_0D007D58[];
extern Gfx D_0D007D78[];
extern Gfx D_0D007D98[];
extern Gfx D_0D007DB8[];
extern Gfx D_0D007DD8[];
extern Gfx D_0D007DF8[];
extern Gfx D_0D007E18[];
extern Gfx D_0D007E38[];
extern Gfx D_0D007E58[];
extern Gfx D_0D007E98[];
extern Gfx D_0D007EB8[];
extern Gfx D_0D007EF8[];
extern Gfx D_0D007F38[];
extern Gfx D_0D007F78[];
extern Gfx D_0D007FE0[];
extern Gfx D_0D008000[];
extern Gfx D_0D008080[];
extern Gfx D_0D008108[];
extern Gfx D_0D00AB58[];
extern Gfx D_0D00C558[];
extern Gfx *gDisplayListHead;
#endif
+63 -63
View File
@@ -1530,9 +1530,9 @@ void func_80074FD8(s32 objectIndex) {
}
sp28 = temp_v1;
func_8008BF18(objectIndex);
temp_v1->unk_0B2 = (u16) temp_v1->unk_0B2 + D_8016582C.unk0;
temp_v1->unk_0B4 = (u16) temp_v1->unk_0B4 + D_8016582C.unk2;
temp_v1->unk_0B6 = (u16) temp_v1->unk_0B6 + D_8016582C.unk4;
temp_v1->unk_0B2[0] = (u16) temp_v1->unk_0B2[0] + D_8016582C.unk0;
temp_v1->unk_0B2[1] = (u16) temp_v1->unk_0B2[1] + D_8016582C.unk2;
temp_v1->unk_0B2[2] = (u16) temp_v1->unk_0B2[2] + D_8016582C.unk4;
return;
case 2:
func_80086F60(objectIndex);
@@ -1577,9 +1577,9 @@ void func_800750D8(s32 objectIndex, s32 arg1, f32 *arg2, s32 arg3, s32 arg4) {
}
temp_a0 = temp_v0 * 0x50;
temp_v1->unk_010[1] = (f32) (var_f18 + ((f64) arg2->unk4 - 10.0));
temp_v1->unk_0B2 = sp24 << 7;
temp_v1->unk_0B4 = temp_a0;
temp_v1->unk_0B6 = temp_a0;
temp_v1->unk_0B2[0] = sp24 << 7;
temp_v1->unk_0B2[1] = temp_a0;
temp_v1->unk_0B2[2] = temp_a0;
temp_v1->unk_010[2] = (arg2->unk8 + (f32) ((s32) temp_v0 / 2)) - 12.0f;
}
#else
@@ -1750,8 +1750,8 @@ void func_80075698(s32 arg0) {
D_80165C18[arg0].unk_06C = D_8018D490;
D_80165C18[arg0].unk_0A0 = 0xFF;
D_80165C18[arg0].unk_0BE[1] = 0;
D_80165C18[arg0].unk_0B2 = 0;
D_80165C18[arg0].unk_0B6 = 0;
D_80165C18[arg0].unk_0B2[0] = 0;
D_80165C18[arg0].unk_0B2[2] = 0;
D_80165C18[arg0].unk_028[0] = 0.0f;
D_80165C18[arg0].unk_028[1] = 0.0f;
D_80165C18[arg0].unk_028[2] = 0.0f;
@@ -1897,8 +1897,8 @@ void func_80075B08(s32 arg0) {
D_80165C18[arg0].unk_06C = D_8018D490;
D_80165C18[arg0].unk_0A0 = 0xFF;
D_80165C18[arg0].unk_0BE[1] = 0;
D_80165C18[arg0].unk_0B2 = 0;
D_80165C18[arg0].unk_0B6 = 0;
D_80165C18[arg0].unk_0B2[0] = 0;
D_80165C18[arg0].unk_0B2[2] = 0;
D_80165C18[arg0].unk_028[0] = 0.0f;
D_80165C18[arg0].unk_028[1] = 0.0f;
D_80165C18[arg0].unk_028[2] = 0.0f;
@@ -2838,7 +2838,7 @@ void func_80077584(s32 objectIndex) {
temp_v0->unk_038[0] = 0.0f;
}
}
temp_v0->unk_0B6 = (u16) temp_v0->unk_0B6 + temp_v0->unk_084[3];
temp_v0->unk_0B2[2] = (u16) temp_v0->unk_0B2[2] + temp_v0->unk_084[3];
func_80087710(objectIndex);
func_8008BF18(objectIndex);
}
@@ -3020,8 +3020,8 @@ void func_80077BCC(s32 objectIndex) {
break;
}
func_8008BF18(objectIndex);
D_80165C18[objectIndex].unk_0B2 += 0x1000;
D_80165C18[objectIndex].unk_0B4 += 0x1000;
D_80165C18[objectIndex].unk_0B2[0] += 0x1000;
D_80165C18[objectIndex].unk_0B2[1] += 0x1000;
}
#ifdef MIPS_TO_C
@@ -3374,7 +3374,7 @@ void func_80078288(s32 objectIndex) {
if ((f64) temp_s0->unk_004[1] <= 0.0) {
func_80086FD4(objectIndex);
}
temp_s0->unk_0B4 = func_800872D8(objectIndex, camera1);
temp_s0->unk_0B2[1] = func_800872D8(objectIndex, camera1);
return;
case 3:
func_80086F60(objectIndex);
@@ -5705,8 +5705,8 @@ void func_8007C5B4(s32 objectIndex) {
func_80073FD4(objectIndex);
func_80086EF0(objectIndex);
func_800721C0(objectIndex, 0x00000800);
temp_s0->unk_0B2 = 0;
temp_s0->unk_0B6 = 0x8000;
temp_s0->unk_0B2[0] = 0;
temp_s0->unk_0B2[2] = 0x8000;
}
#else
GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007C5B4.s")
@@ -6467,7 +6467,7 @@ void func_8007DB44(void) {
func_80073514(temp_s0);
temp_s1 = &D_80165C18[temp_s0];
func_80073CB0(temp_s0, &temp_s1->unk_0A0, -0x00001000, 0x00001000, 0x00000400, 0, -1);
temp_s1->unk_0B6 = temp_s1->unk_0A0 + 0x8000;
temp_s1->unk_0B2[2] = temp_s1->unk_0A0 + 0x8000;
if ((D_8018CFB0 != 0) || (D_8018CFC8 != 0)) {
D_8018CFD8 = 0;
var_s2 = &D_8018C3F0;
@@ -6596,7 +6596,7 @@ void func_8007DF20(s32 objectIndex) {
temp_v0->unk_000 = 1.0f;
func_8008B8BC(objectIndex, 0U, 0U, 0U);
if (gIsMirrorMode != 0) {
temp_v0->unk_0B4 = 0x8000;
temp_v0->unk_0B2[1] = 0x8000;
temp_v0->unk_004[0] = 1765.0f;
temp_v0->unk_004[2] = 195.0f;
} else {
@@ -6651,7 +6651,7 @@ void func_8007E00C(s32 objectIndex) {
}
func_80073CB0(objectIndex, &temp_s0->unk_0A0, -0x00002000, 0, 0x00000400, 0, -1);
temp_v1 = temp_s0->unk_084[7];
temp_s0->unk_0B6 = temp_s0->unk_0A0;
temp_s0->unk_0B2[2] = temp_s0->unk_0A0;
if (temp_v1 == 0) {
func_800C98B8(temp_s0->unk_004, temp_s0->unk_038, 0x1901904EU);
temp_s0->unk_084[7] = 0x0014;
@@ -6660,8 +6660,8 @@ void func_8007E00C(s32 objectIndex) {
temp_s0->unk_084[7] = temp_v1 - 1;
return;
case 5:
temp_v0 = func_800417B4((u16) temp_s0->unk_0B6, 0U);
temp_s0->unk_0B6 = temp_v0;
temp_v0 = func_800417B4((u16) temp_s0->unk_0B2[2], 0U);
temp_s0->unk_0B2[2] = temp_v0;
if (!(temp_v0 & 0xFFFF)) {
func_80072488(objectIndex);
return;
@@ -6669,7 +6669,7 @@ void func_8007E00C(s32 objectIndex) {
default:
return;
case 6:
temp_s0->unk_0B6 = 0;
temp_s0->unk_0B2[2] = 0;
temp_s0->unk_084[7] = 0;
func_80072488(objectIndex);
D_8018CFB0 = 0;
@@ -7058,7 +7058,7 @@ void func_8007E63C(s32 objectIndex) {
}
break;
case 0x12C:
if (func_80073E18(objectIndex, (u16 *) &temp_v1->unk_0B4, 0x0400U, 0x00008000) != 0) {
if (func_80073E18(objectIndex, (u16 *) &temp_v1->unk_0B2[1], 0x0400U, 0x00008000) != 0) {
func_800722CC(objectIndex, 4);
func_8007266C(objectIndex);
}
@@ -7141,7 +7141,7 @@ void func_8007ED6C(s32 objectIndex) {
}
func_8007E63C(objectIndex);
func_8008BF18(objectIndex);
sp24->unk_0BE[1] = (u16) sp24->unk_0B4;
sp24->unk_0BE[1] = (u16) sp24->unk_0B2[1];
func_80073514(objectIndex);
}
#else
@@ -7203,7 +7203,7 @@ void func_8007EFBC(s32 objectIndex) {
switch (temp_t8) {
case 1:
sp24 = temp_v1;
if (func_80073E18(objectIndex, (u16 *) &temp_v1->unk_0B4, 0x0800U, 0x00008000) != 0) {
if (func_80073E18(objectIndex, (u16 *) &temp_v1->unk_0B2[1], 0x0800U, 0x00008000) != 0) {
temp_v1->unk1C = (f32) ((f64) D_8018D01C * 200.0);
func_80086FD4(objectIndex);
return;
@@ -7217,14 +7217,14 @@ void func_8007EFBC(s32 objectIndex) {
}
break;
case 3:
if (func_80073E18(objectIndex, (u16 *) &temp_v1->unk_0B4, 0x0400U, 0x00008000) != 0) {
if (func_80073E18(objectIndex, (u16 *) &temp_v1->unk_0B2[1], 0x0400U, 0x00008000) != 0) {
func_800726CC(objectIndex, 3);
func_80086FD4(objectIndex);
return;
}
break;
case 5:
if (func_80073E18(objectIndex, (u16 *) &temp_v1->unk_0B4, 0x0400U, 0x0000C000) != 0) {
if (func_80073E18(objectIndex, (u16 *) &temp_v1->unk_0B2[1], 0x0400U, 0x0000C000) != 0) {
func_80086FD4(objectIndex);
return;
}
@@ -7236,14 +7236,14 @@ void func_8007EFBC(s32 objectIndex) {
}
break;
case 7:
if (func_80073E18(objectIndex, (u16 *) &temp_v1->unk_0B4, 0x0400U, 0x00004000) != 0) {
if (func_80073E18(objectIndex, (u16 *) &temp_v1->unk_0B2[1], 0x0400U, 0x00004000) != 0) {
func_80086FD4(objectIndex);
func_800726CC(objectIndex, 3);
return;
}
break;
case 9:
if (func_80073E18(objectIndex, (u16 *) &temp_v1->unk_0B4, 0x0400U, 0x00010000) != 0) {
if (func_80073E18(objectIndex, (u16 *) &temp_v1->unk_0B2[1], 0x0400U, 0x00010000) != 0) {
func_80086FD4(objectIndex);
return;
}
@@ -7255,14 +7255,14 @@ void func_8007EFBC(s32 objectIndex) {
}
break;
case 11:
if (func_80073E18(objectIndex, (u16 *) &temp_v1->unk_0B4, 0x0400U, 0x00010000) != 0) {
if (func_80073E18(objectIndex, (u16 *) &temp_v1->unk_0B2[1], 0x0400U, 0x00010000) != 0) {
func_80086FD4(objectIndex);
func_800726CC(objectIndex, 3);
return;
}
break;
case 13:
if (func_80073E18(objectIndex, (u16 *) &temp_v1->unk_0B4, 0x0400U, 0x00014000) != 0) {
if (func_80073E18(objectIndex, (u16 *) &temp_v1->unk_0B2[1], 0x0400U, 0x00014000) != 0) {
func_80086FD4(objectIndex);
return;
}
@@ -7274,7 +7274,7 @@ void func_8007EFBC(s32 objectIndex) {
}
break;
case 15:
if (func_80073E18(objectIndex, (u16 *) &temp_v1->unk_0B4, 0x0400U, 0x0000C000) != 0) {
if (func_80073E18(objectIndex, (u16 *) &temp_v1->unk_0B2[1], 0x0400U, 0x0000C000) != 0) {
func_80086FD4(objectIndex);
func_800726CC(objectIndex, 3);
return;
@@ -7303,7 +7303,7 @@ void func_8007F280(s32 objectIndex) {
switch (temp_t8) {
case 1:
sp24 = temp_v1;
if (func_80073E18(objectIndex, (u16 *) &temp_v1->unk_0B4, 0x0400U, 0x00010000) != 0) {
if (func_80073E18(objectIndex, (u16 *) &temp_v1->unk_0B2[1], 0x0400U, 0x00010000) != 0) {
temp_v1->unk1C = (f32) ((f64) D_8018D01C * -200.0);
func_80086FD4(objectIndex);
return;
@@ -7317,14 +7317,14 @@ void func_8007F280(s32 objectIndex) {
}
break;
case 3:
if (func_80073E18(objectIndex, (u16 *) &temp_v1->unk_0B4, 0x0400U, 0x00010000) != 0) {
if (func_80073E18(objectIndex, (u16 *) &temp_v1->unk_0B2[1], 0x0400U, 0x00010000) != 0) {
func_800726CC(objectIndex, 3);
func_80086FD4(objectIndex);
return;
}
break;
case 5:
if (func_80073E18(objectIndex, (u16 *) &temp_v1->unk_0B4, 0x0400U, 0x00004000) != 0) {
if (func_80073E18(objectIndex, (u16 *) &temp_v1->unk_0B2[1], 0x0400U, 0x00004000) != 0) {
func_80086FD4(objectIndex);
return;
}
@@ -7336,14 +7336,14 @@ void func_8007F280(s32 objectIndex) {
}
break;
case 7:
if (func_80073E18(objectIndex, (u16 *) &temp_v1->unk_0B4, 0x0400U, 0x0000C000) != 0) {
if (func_80073E18(objectIndex, (u16 *) &temp_v1->unk_0B2[1], 0x0400U, 0x0000C000) != 0) {
func_80086FD4(objectIndex);
func_800726CC(objectIndex, 3);
return;
}
break;
case 9:
if (func_80073E18(objectIndex, (u16 *) &temp_v1->unk_0B4, 0x0400U, 0x00008000) != 0) {
if (func_80073E18(objectIndex, (u16 *) &temp_v1->unk_0B2[1], 0x0400U, 0x00008000) != 0) {
func_80086FD4(objectIndex);
return;
}
@@ -7355,14 +7355,14 @@ void func_8007F280(s32 objectIndex) {
}
break;
case 11:
if (func_80073E18(objectIndex, (u16 *) &temp_v1->unk_0B4, 0x0400U, 0x00008000) != 0) {
if (func_80073E18(objectIndex, (u16 *) &temp_v1->unk_0B2[1], 0x0400U, 0x00008000) != 0) {
func_80086FD4(objectIndex);
func_800726CC(objectIndex, 3);
return;
}
break;
case 13:
if (func_80073E18(objectIndex, (u16 *) &temp_v1->unk_0B4, 0x0400U, 0x0000C000) != 0) {
if (func_80073E18(objectIndex, (u16 *) &temp_v1->unk_0B2[1], 0x0400U, 0x0000C000) != 0) {
func_80086FD4(objectIndex);
return;
}
@@ -7374,7 +7374,7 @@ void func_8007F280(s32 objectIndex) {
}
break;
case 15:
if (func_80073E18(objectIndex, (u16 *) &temp_v1->unk_0B4, 0x0400U, 0x00014000) != 0) {
if (func_80073E18(objectIndex, (u16 *) &temp_v1->unk_0B2[1], 0x0400U, 0x00014000) != 0) {
func_80086FD4(objectIndex);
func_800726CC(objectIndex, 3);
return;
@@ -7601,7 +7601,7 @@ void func_8007FA08(s32 objectIndex) {
temp_s0->unk_038 = (bitwise f32) 0;
temp_s0->unk_0DD = 1;
temp_s0->unk_0DF = 8;
temp_s0->unk_0BE[1] = (u16) temp_s0->unk_0B4;
temp_s0->unk_0BE[1] = (u16) temp_s0->unk_0B2[1];
temp_s0->unk_028[1] = 15.0f;
temp_s0->unk20 = 15.0f;
func_80072488(objectIndex);
@@ -7661,7 +7661,7 @@ void func_8007FB48(s32 objectIndex) {
if (var_a0 < 0x65) {
sp18 = temp_v1;
var_a0 = temp_v1->unk_0B0;
temp_v1->unk_0B4 = func_800417B4(temp_v1->unk_0B4, (temp_v1->unk_0BE[1] + 0x8000) & 0xFFFF);
temp_v1->unk_0B2[1] = func_800417B4(temp_v1->unk_0B2[1], (temp_v1->unk_0BE[1] + 0x8000) & 0xFFFF);
if (var_a0 == 0x0064) {
temp_v1->unk_0D2 = 1;
var_a0 = temp_v1->unk_0B0;
@@ -7696,8 +7696,8 @@ block_20:
break;
case 5:
sp18 = temp_v1;
temp_v0_2 = func_800417B4(temp_v1->unk_0B4, temp_v1->unk_0BE[1]);
temp_v1->unk_0B4 = temp_v0_2;
temp_v0_2 = func_800417B4(temp_v1->unk_0B2[1], temp_v1->unk_0BE[1]);
temp_v1->unk_0B2[1] = temp_v0_2;
if ((temp_v0_2 & 0xFFFF) == temp_v1->unk_0BE[1]) {
sp18 = temp_v1;
func_800722CC(objectIndex, 8);
@@ -8320,8 +8320,8 @@ void func_80081080(s32 objectIndex) {
temp_v0 = &D_80165C18[objectIndex];
temp_v0->unk_0A0 = 0x00FF;
temp_v0->unk_0BE[1] = 0;
temp_v0->unk_0B2 = 0;
temp_v0->unk_0B6 = 0;
temp_v0->unk_0B2[0] = 0;
temp_v0->unk_0B2[2] = 0;
temp_v0->unk_064 = temp_v1;
temp_v0->unk_06C = (s32) temp_v1;
temp_v0->unk_028[0] = 0.0f;
@@ -8564,7 +8564,7 @@ loop_6:
}
temp_s0->unk_03C = (f32) (((f64) var_f6 * 0.1) + 4.8);
temp_f4 = ((f64) (f32) random_int(5U) * 0.01) + 0.8;
temp_s0->unk_0B4 = (0x10000 / sp70) * var_s1;
temp_s0->unk_0B2[1] = (0x10000 / sp70) * var_s1;
temp_s0->unk_034 = (f32) temp_f4;
temp_s0->unk_010[0] = temp_s5->unk_010[0];
temp_s0->unk_010[1] = (f32) ((f64) temp_s5->unk_010[1] - 13.0);
@@ -8589,7 +8589,7 @@ void func_80081790(s32 objectIndex) {
case 0:
break; /* irregular */
case 1:
if (func_80087E08(objectIndex, D_80165C18[objectIndex].unk_038[1], 0.3f, D_80165C18[objectIndex].unk_034, D_80165C18[objectIndex].unk_0B4, 0x00000032) != 0) {
if (func_80087E08(objectIndex, D_80165C18[objectIndex].unk_038[1], 0.3f, D_80165C18[objectIndex].unk_034, D_80165C18[objectIndex].unk_0B2[1], 0x00000032) != 0) {
func_80072488(objectIndex);
}
func_8008BF18(objectIndex);
@@ -8652,7 +8652,7 @@ void func_80081924(s32 objectIndex) {
func_80086F60(objectIndex);
break;
case 10:
D_80165C18[objectIndex].unk_0B6 += 0x1000;
D_80165C18[objectIndex].unk_0B2[2] += 0x1000;
D_80165C18[objectIndex].unk_038[1] -= 0.184;
func_8008751C(objectIndex);
func_80087710(objectIndex);
@@ -9646,7 +9646,7 @@ void func_8008379C(s32 objectIndex) {
break;
}
func_8008BF18(objectIndex);
D_80165C18[objectIndex].unk_0B6 += D_80165C18[objectIndex].unk_0A0;
D_80165C18[objectIndex].unk_0B2[2] += D_80165C18[objectIndex].unk_0A0;
}
#ifdef MIPS_TO_C
@@ -9665,9 +9665,9 @@ void func_80083868(s32 objectIndex) {
temp_s0->unk_000 = 0.1f;
func_80072488(objectIndex);
func_8008B80C(objectIndex, 0.0f, 0.0f, 0.0f);
temp_s0->unk_0B2 = 0;
temp_s0->unk_0B4 = 0;
temp_s0->unk_0B6 = 0x8000;
temp_s0->unk_0B2[0] = 0;
temp_s0->unk_0B2[1] = 0;
temp_s0->unk_0B2[2] = 0x8000;
temp_s0->unk_0A0 = random_int(0x2000U) - 0x1000;
func_80086E70(objectIndex);
temp_s0->unk_034 = 1.5f;
@@ -9707,7 +9707,7 @@ void func_80083948(s32 objectIndex) {
}
func_8008BF18(objectIndex);
func_80073D0C(objectIndex, &D_80165C18[objectIndex].unk_0A0, -0x00001000, 0x00001000, 0x00000400, 1, -1);
D_80165C18[objectIndex].unk_0B6 = D_80165C18[objectIndex].unk_0A0 + 0x8000;
D_80165C18[objectIndex].unk_0B2[2] = D_80165C18[objectIndex].unk_0A0 + 0x8000;
}
#else
GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80083948.s")
@@ -9757,9 +9757,9 @@ void func_80083B0C(s32 objectIndex) {
temp_v0->unk_000 = 0.1f;
func_80072488(objectIndex);
func_8008B80C(objectIndex, 0.0f, 0.0f, 0.0f);
temp_v0->unk_0B2 = 0;
temp_v0->unk_0B4 = 0;
temp_v0->unk_0B6 = 0x8000;
temp_v0->unk_0B2[0] = 0;
temp_v0->unk_0B2[1] = 0;
temp_v0->unk_0B2[2] = 0x8000;
temp_v0->unkC8 = 2;
temp_v0->unk_034 = 1.5f;
func_800721C0(objectIndex, 0x04000210);
@@ -10439,14 +10439,14 @@ void func_800850B0(s32 objectIndex) {
return;
}
temp_s0->unk_084[7] = temp_v0 - 1;
temp_s0->unk_0B4 = (u16) temp_s0->unk_0B4 + 0x2000;
temp_s0->unk_0B2 = (s16) temp_s0->unk_0BE[0];
temp_s0->unk_0B6 = (s16) temp_s0->unk_0BE[2];
temp_s0->unk_0B2[1] = (u16) temp_s0->unk_0B2[1] + 0x2000;
temp_s0->unk_0B2[0] = (s16) temp_s0->unk_0BE[0];
temp_s0->unk_0B2[2] = (s16) temp_s0->unk_0BE[2];
return;
}
temp_s0->unk_0B2 = (s16) temp_s0->unk_0BE[0];
temp_s0->unk_0B4 = (s16) temp_s0->unk_0BE[1];
temp_s0->unk_0B6 = (s16) temp_s0->unk_0BE[2];
temp_s0->unk_0B2[0] = (s16) temp_s0->unk_0BE[0];
temp_s0->unk_0B2[1] = (s16) temp_s0->unk_0BE[1];
temp_s0->unk_0B2[2] = (s16) temp_s0->unk_0BE[2];
}
#else
GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800850B0.s")
+3 -3
View File
@@ -2022,9 +2022,9 @@ void func_8008B888(s32 arg0, u16 arg1, u16 arg2, u16 arg3) {
}
void func_8008B8BC(s32 arg0, u16 arg1, u16 arg2, u16 arg3) {
D_80165C18[arg0].unk_0B2 = arg1;
D_80165C18[arg0].unk_0B4 = arg2;
D_80165C18[arg0].unk_0B6 = arg3;
D_80165C18[arg0].unk_0B2[0] = arg1;
D_80165C18[arg0].unk_0B2[1] = arg2;
D_80165C18[arg0].unk_0B2[2] = arg3;
}
void func_8008B8F0(s32 arg0, f32 arg1, f32 arg2, f32 arg3) {
+335
View File
@@ -0,0 +1,335 @@
#ifndef COMMON_TEXTURES_H
#define COMMON_TEXTURES_H
#include <types.h>
#include <PR/gbi.h>
extern s8 D_0D000000[];
extern s8 D_0D000200[];
extern Vtx D_0D001200[];
extern Vtx D_0D001210[];
extern Vtx D_0D001240[];
extern Vtx D_0D001270[];
extern Vtx D_0D0012A0[];
extern Vtx D_0D0012D0[];
extern Vtx D_0D001300[];
extern Vtx D_0D001330[];
extern Vtx D_0D001360[];
extern Vtx D_0D001390[];
extern Vtx D_0D001590[];
extern Vtx D_0D001710[];
extern Gfx D_0D001750[];
extern Gfx D_0D001780[];
extern Gfx D_0D001798[];
extern Gfx D_0D0017B0[];
extern Gfx D_0D0017C8[];
extern Gfx D_0D0017E0[];
extern Gfx D_0D0017F8[];
extern Gfx D_0D001810[];
extern Gfx D_0D001828[];
extern Gfx D_0D001840[];
extern Gfx D_0D001AB8[];
extern Gfx D_0D001B68[];
extern Gfx D_0D001B90[];
extern Gfx D_0D001BD8[];
extern Gfx D_0D001C20[];
extern Gfx D_0D001C88[];
extern Vtx D_0D001CE8[];
extern Vtx D_0D001D28[];
extern Vtx D_0D001D68[];
extern Vtx D_0D001D98[];
extern Vtx D_0D001DC8[];
extern Vtx D_0D001DF8[];
extern Vtx D_0D001E28[];
extern Vtx D_0D001E58[];
extern Vtx D_0D001E88[];
extern Vtx D_0D001EB8[];
extern s8 gItemBoxQuestionMark_Texture[];
extern Gfx D_0D002EE8[];
extern Vtx D_0D002F40[];
extern Gfx D_0D002F80[];
extern Gfx D_0D003008[];
extern Gfx D_0D003090[];
extern Gfx D_0D0030F8[];
extern Gfx D_0D003128[];
extern Gfx D_0D003158[];
extern Gfx D_0D003188[];
extern Gfx D_0D0031B8[];
extern Gfx D_0D0031E8[];
extern Gfx D_0D003218[];
extern Gfx D_0D003248[];
extern Gfx D_0D003278[];
extern Gfx D_0D003288[];
extern Vtx D_0D003298[];
extern Vtx D_0D0032E8[];
extern s8 gBananaTexture[];
extern s8 D_0D003B48[];
extern Gfx D_0D004B48[];
extern Gfx D_0D004BD8[];
extern s8 D_0D004C68[];
extern s8 D_0D004E38[];
extern s8 D_0D004E68[];
extern s8 D_0D005068[];
extern Vtx D_0D005238[];
extern Vtx D_0D005278[];
extern Gfx D_0D0052B8[];
extern Gfx D_0D005308[];
extern Gfx D_0D005338[];
extern Gfx D_0D005368[];
extern Gfx D_0D005398[];
extern Gfx D_0D0053B0[];
extern Gfx D_0D0053C8[];
extern Gfx D_0D0053F0[];
extern Gfx D_0D005418[];
extern Vtx D_0D005430[];
extern Vtx D_0D005470[];
extern Vtx D_0D0054B0[];
extern Vtx D_0D005770[];
extern Vtx D_0D0057B0[];
extern Vtx D_0D0057F0[];
extern Vtx D_0D0058E0[];
extern Vtx D_0D005920[];
extern Vtx D_0D005AA0[];
extern Vtx D_0D005AE0[];
extern Vtx D_0D005B20[];
extern Vtx D_0D005B60[];
extern Vtx D_0D005BD0[];
extern Vtx D_0D005C00[];
extern Vtx D_0D005C30[];
extern Vtx D_0D005EB0[];
extern Vtx D_0D005F30[];
extern Vtx D_0D005FB0[];
extern Vtx D_0D005FF0[];
extern Vtx D_0D006030[];
extern Vtx D_0D0060B0[];
extern Vtx D_0D006130[];
extern Vtx D_0D0061B0[];
extern Vtx D_0D0062B0[];
extern Vtx D_0D0064B0[];
extern Vtx D_0D006730[];
extern Vtx D_0D0068F0[];
extern Gfx D_0D006930[];
extern Gfx D_0D006940[];
extern Gfx D_0D006950[];
extern Gfx D_0D006968[];
extern Gfx D_0D006980[];
extern Gfx D_0D006998[];
extern Gfx D_0D0069B0[];
extern Gfx D_0D0069C8[];
extern Gfx D_0D0069E0[];
extern Gfx D_0D0069F8[];
extern Gfx D_0D006A10[];
extern Gfx D_0D006A28[];
extern Gfx D_0D006A40[];
extern s8 D_0D006A58[];
extern s8 D_0D006AD8[];
extern s8 D_0D006ED8[];
extern s8 D_0D006EF8[];
extern Gfx D_0D0076F8[];
extern Gfx D_0D007780[];
extern Gfx D_0D0077A0[];
extern Gfx D_0D0077D0[];
extern Gfx D_0D0077F8[];
extern Gfx D_0D007828[];
extern Gfx D_0D007850[];
extern Gfx D_0D007878[];
extern Gfx D_0D0078A0[];
extern Gfx D_0D0078D0[];
extern Gfx D_0D0078F8[];
extern Gfx D_0D007928[];
extern Gfx D_0D007948[];
extern Gfx D_0D007968[];
extern Gfx D_0D007988[];
extern Gfx D_0D0079A8[];
extern Gfx D_0D0079C8[];
extern Gfx D_0D0079E8[];
extern Gfx D_0D007A08[];
extern Gfx D_0D007A40[];
extern Gfx D_0D007A60[];
extern Gfx D_0D007A80[];
extern Gfx D_0D007AA0[];
extern Gfx D_0D007AC0[];
extern Gfx D_0D007AE0[];
extern Gfx D_0D007B00[];
extern Gfx D_0D007B20[];
extern Gfx D_0D007B98[];
extern Gfx D_0D007C10[];
extern Gfx D_0D007C88[];
extern Gfx D_0D007CB8[];
extern Gfx D_0D007CD8[];
extern Gfx D_0D007CF8[];
extern Gfx D_0D007D18[];
extern Gfx D_0D007D38[];
extern Gfx D_0D007D58[];
extern Gfx D_0D007D78[];
extern Gfx D_0D007D98[];
extern Gfx D_0D007DB8[];
extern Gfx D_0D007DD8[];
extern Gfx D_0D007DF8[];
extern Gfx D_0D007E18[];
extern Gfx D_0D007E38[];
extern Gfx D_0D007E58[];
extern Gfx D_0D007E78[];
extern Gfx D_0D007E98[];
extern Gfx D_0D007EB8[];
extern Gfx D_0D007ED8[];
extern Gfx D_0D007EF8[];
extern Gfx D_0D007F18[];
extern Gfx D_0D007F38[];
extern Gfx D_0D007F58[];
extern Gfx D_0D007F78[];
extern Gfx D_0D007F98[];
extern Gfx D_0D007FB8[];
extern Gfx D_0D007FE0[];
extern Gfx D_0D008000[];
extern Gfx D_0D008020[];
extern Gfx D_0D008040[];
extern Gfx D_0D008060[];
extern Gfx D_0D008080[];
extern Gfx D_0D008108[];
extern Gfx D_0D008120[];
extern Gfx D_0D008138[];
extern s8 D_0D008150[];
extern s8 D_0D008470[];
extern s8 D_0D008790[];
extern Vtx D_0D008B78[];
extern Vtx D_0D008BB8[];
extern Vtx D_0D008BF8[];
extern Vtx D_0D008C38[];
extern Gfx D_0D008C78[];
extern Gfx D_0D008C90[];
extern Gfx D_0D008CD8[];
extern Gfx D_0D008D10[];
extern Gfx D_0D008D58[];
extern Gfx D_0D008DA0[];
extern Gfx D_0D008DB8[];
extern Gfx D_0D008DF8[];
extern Gfx D_0D008E20[];
extern Gfx D_0D008E48[];
extern Gfx D_0D008E70[];
extern Vtx D_0D008E98[];
extern f32 D_0D009418[];
extern f32 D_0D009568[];
extern f32 D_0D0096B8[];
extern f32 D_0D009808[];
extern s32 unkPad;
extern s8 D_0D009958[];
extern s8 D_0D00A558[];
extern s8 D_0D00A958[];
extern s8 D_0D00AB58[];
extern s8 D_0D00AD58[];
extern s8 D_0D00B158[];
extern s8 D_0D00B558[];
extern s8 D_0D00B958[];
extern s8 D_0D00BD58[];
extern s8 D_0D00C158[];
extern s8 D_0D00C558[];
extern s8 D_0D00D258[];
extern s8 D_0D00E258[];
extern s8 D_0D00F258[];
extern s8 D_0D010258[];
extern s8 D_0D011258[];
extern s8 D_0D012258[];
extern s8 D_0D013258[];
extern s8 D_0D014258[];
extern s8 D_0D015258[];
extern s8 D_0D015A58[];
extern s8 D_0D016258[];
extern s8 D_0D016A58[];
extern s8 D_0D017258[];
extern s16 tlutPad[];
extern s8 D_0D017458[];
extern s8 D_0D01A2D8[];
extern s8 D_0D01A4D8[];
extern s8 D_0D01A6D8[];
extern s8 D_0D01A8D8[];
extern s8 D_0D01AAD8[];
extern s8 D_0D01ACD8[];
extern s8 D_0D01AED8[];
extern s8 D_0D01B0D8[];
extern s8 D_0D01B2D8[];
extern s8 D_0D01B4D8[];
extern s8 D_0D01B6D8[];
extern s8 D_0D01BAD8[];
extern s8 D_0D01BED8[];
extern s8 D_0D01C2D8[];
extern s8 D_0D01C6D8[];
extern s8 D_0D01CAD8[];
extern s8 D_0D01CED8[];
extern s8 D_0D01D2D8[];
extern s8 D_0D01D6D8[];
extern s8 D_0D01DAD8[];
extern s8 D_0D01DED8[];
extern s8 D_0D01E0D8[];
extern s8 D_0D01E2D8[];
extern s8 D_0D01E4D8[];
extern s8 D_0D01E6D8[];
extern s8 D_0D01E8D8[];
extern s8 D_0D01EAD8[];
extern s8 D_0D01ECD8[];
extern s8 D_0D01EED8[];
extern s8 D_0D01F0D8[];
extern s8 D_0D01F2D8[];
extern s8 D_0D01F4D8[];
extern s8 D_0D01F6D8[];
extern s8 D_0D01F8D8[];
extern s8 D_0D01FAD8[];
extern s8 D_0D01FCD8[];
extern s8 D_0D01FED8[];
extern s8 D_0D0203D8[];
extern s8 D_0D0208D8[];
extern s8 D_0D020DD8[];
extern s8 D_0D0212D8[];
extern s8 D_0D0217D8[];
extern s8 D_0D021CD8[];
extern s8 D_0D0221D8[];
extern s8 D_0D0226D8[];
extern s8 D_0D022BD8[];
extern s8 D_0D0230D8[];
extern s8 D_0D0235D8[];
extern s8 D_0D023AD8[];
extern s8 D_0D023FD8[];
extern s8 D_0D0244D8[];
extern s8 D_0D0249D8[];
extern s8 D_0D024ED8[];
extern s8 D_0D025ED8[];
extern s8 D_0D0260D8[];
extern s8 D_0D026558[];
extern s8 D_0D0269D8[];
extern s8 D_0D026E58[];
extern s8 D_0D0272D8[];
extern s8 D_0D027758[];
extern s8 D_0D027BD8[];
extern s8 D_0D028058[];
extern s8 D_0D0284D8[];
extern s8 D_0D028958[];
extern s8 D_0D028DD8[];
extern s8 D_0D0291D8[];
extern s8 D_0D0293D8[];
extern s8 D_0D029458[];
extern s8 D_0D029858[];
extern s8 D_0D029C58[];
extern s8 D_0D02A058[];
extern s8 D_0D02A458[];
extern s8 D_0D02A858[];
extern s8 D_0D02AA58[];
extern s8 D_0D02AC58[];
extern s8 D_0D02B058[];
extern s8 D_0D02B458[];
extern s8 D_0D02B858[];
extern s8 D_0D02BC58[];
extern s8 D_0D02C058[];
extern s8 D_0D02C458[];
extern s8 D_0D02C858[];
extern s8 D_0D02CC58[];
extern s8 D_0D02CCD8[];
extern s8 D_0D02CD58[];
extern s8 D_0D02CDD8[];
extern s8 D_0D02CE58[];
extern s8 D_0D02CED8[];
extern s8 D_0D02CF58[];
extern s8 D_0D02CFD8[];
extern s8 D_0D02D058[];
extern s8 D_0D02D0D8[];
#endif
+1 -1
View File
@@ -2216,7 +2216,7 @@ s8 D_0D00A558[] = {
};
// Lap UI Texture
s8 D_D00A958[] = {
s8 D_0D00A958[] = {
#include "textures/132B50_0A958.rgba16.inc.c"
};
+8 -8
View File
@@ -746,7 +746,7 @@ UNUSED void func_8004252C(Mat4 arg0, u16 arg1, u16 arg2) {
arg0[2][2] = sp28 * temp_f0;
}
void func_800425D0(Mat4 arg0, Vec3f arg1, Vec3s arg2, f32 arg3) {
void func_800425D0(Mat4 arg0, Vec3f arg1, Vec3su arg2, f32 arg3) {
f32 sp44 = sins(arg2[0]);
f32 temp_f22 = coss(arg2[0]);
f32 sp3C = sins(arg2[1]);
@@ -808,12 +808,12 @@ void func_800427DC(s32 arg0, Mat4 arg1) {
f32 temp_f0;
f32 temp_f20;
sp3C = sins(temp_s0->unk_0B2);
temp_f20 = coss(temp_s0->unk_0B2);
sp34 = sins(temp_s0->unk_0B4);
sp30 = coss(temp_s0->unk_0B4);
sp2C = sins(temp_s0->unk_0B6);
temp_f0 = coss(temp_s0->unk_0B6);
sp3C = sins(temp_s0->unk_0B2[0]);
temp_f20 = coss(temp_s0->unk_0B2[0]);
sp34 = sins(temp_s0->unk_0B2[1]);
sp30 = coss(temp_s0->unk_0B2[1]);
sp2C = sins(temp_s0->unk_0B2[2]);
temp_f0 = coss(temp_s0->unk_0B2[2]);
arg1[0][0] = temp_s0->unk_000 * ((sp30 * temp_f0) + (sp3C * sp34 * sp2C));
arg1[1][0] = temp_s0->unk_000 * ((-sp30 * sp2C) + sp3C * sp34 * temp_f0);
@@ -938,7 +938,7 @@ void func_80042D14(Vec3f arg0, Vec3f arg1, Vec3s arg2) {
arg0[2] = ((sp2C * cosine1 * sine2) - (sp28 * sine1)) + (sp24 * cosine1 * cosine2);
}
void func_80042E00(Vec3f arg0, Vec3s arg1, f32 arg2) {
void func_80042E00(Vec3f arg0, Vec3su arg1, f32 arg2) {
Mat4 matrix;
func_800425D0(matrix, arg0, arg1, arg2);
+2 -2
View File
@@ -70,12 +70,12 @@ void func_80041D24();
void func_80041D34();
void func_80041EF4();
void func_80042330(s32, s32, u16, f32);
void func_800425D0(Mat4, Vec3f, Vec3s, f32);
void func_800425D0(Mat4, Vec3f, Vec3su, f32);
void func_80042760(Mat4, Vec3f, Vec3f, f32);
void func_800427DC(s32, Mat4);
void func_80042A20(Mat4, Vec3f, Vec3f, u16, f32);
void func_80042D14(Vec3f, Vec3f, Vec3s);
void func_80042E00(Vec3f, Vec3s, f32);
void func_80042E00(Vec3f, Vec3su, f32);
void func_80042F70(Vec3f, Vec3su, f32);
void func_80043050(Vec3f, Vec3f, f32);
void func_80043104(s32);