kobayashi90/marioparty4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #299 from mrshigure/m405

Browse source 
Matched REL/m405 + some code cleanup
This commit is contained in:
Liam Coleman 2024-05-15 21:03:16 -05:00 • committed by GitHub
commit cd71883d86
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
34 changed files with 2683 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

268
config/GMPE01_00/rels/m405Dll/symbols.txt
View file

@ -55,137 +55,137 @@ fn_1_81B4 = .text:0x000081B4; // type:function size:0x93C
fn_1_8AF0 = .text:0x00008AF0; // type:function size:0x798 fn_1_8AF0 = .text:0x00008AF0; // type:function size:0x798
fn_1_9288 = .text:0x00009288; // type:function size:0x1A88 fn_1_9288 = .text:0x00009288; // type:function size:0x1A88
fn_1_AD10 = .text:0x0000AD10; // type:function size:0x3CC fn_1_AD10 = .text:0x0000AD10; // type:function size:0x3CC
fn_1_B0DC = .text:0x0000B0DC; // type:function size:0x4EC ModuleProlog = .text:0x0000B0DC; // type:function size:0x4EC
fn_1_B5C8 = .text:0x0000B5C8; // type:function size:0x16C fn_1_B5C8 = .text:0x0000B5C8; // type:function size:0x16C
_ctors = .ctors:0x00000000; // type:label scope:global data:4byte _ctors = .ctors:0x00000000; // type:label scope:global data:4byte
_dtors = .dtors:0x00000000; // type:label scope:global data:4byte _dtors = .dtors:0x00000000; // type:label scope:global data:4byte
lbl_1_rodata_10 = .rodata:0x00000010; // type:object size:0x4 data:float lbl_1_rodata_10 = .rodata:0x00000010; // type:object size:0x4 scope:local data:float
lbl_1_rodata_14 = .rodata:0x00000014; // type:object size:0x4 data:float lbl_1_rodata_14 = .rodata:0x00000014; // type:object size:0x4 scope:local data:float
lbl_1_rodata_18 = .rodata:0x00000018; // type:object size:0x8 data:double lbl_1_rodata_18 = .rodata:0x00000018; // type:object size:0x8 scope:local data:double
lbl_1_rodata_20 = .rodata:0x00000020; // type:object size:0x4 data:float lbl_1_rodata_20 = .rodata:0x00000020; // type:object size:0x4 scope:local data:float
lbl_1_rodata_24 = .rodata:0x00000024; // type:object size:0x4 data:float lbl_1_rodata_24 = .rodata:0x00000024; // type:object size:0x4 scope:local data:float
lbl_1_rodata_28 = .rodata:0x00000028; // type:object size:0x8 data:double lbl_1_rodata_28 = .rodata:0x00000028; // type:object size:0x8 scope:local data:double
lbl_1_rodata_30 = .rodata:0x00000030; // type:object size:0x8 data:double lbl_1_rodata_30 = .rodata:0x00000030; // type:object size:0x8 scope:local data:double
lbl_1_rodata_38 = .rodata:0x00000038; // type:object size:0x8 data:double lbl_1_rodata_38 = .rodata:0x00000038; // type:object size:0x8 scope:local data:double
lbl_1_rodata_40 = .rodata:0x00000040; // type:object size:0x8 data:double lbl_1_rodata_40 = .rodata:0x00000040; // type:object size:0x8 scope:local data:double
lbl_1_rodata_48 = .rodata:0x00000048; // type:object size:0x4 data:float lbl_1_rodata_48 = .rodata:0x00000048; // type:object size:0x4 scope:local data:float
lbl_1_rodata_4C = .rodata:0x0000004C; // type:object size:0x4 data:float lbl_1_rodata_4C = .rodata:0x0000004C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_50 = .rodata:0x00000050; // type:object size:0x4 data:float lbl_1_rodata_50 = .rodata:0x00000050; // type:object size:0x4 scope:local data:float
lbl_1_rodata_54 = .rodata:0x00000054; // type:object size:0x4 data:float lbl_1_rodata_54 = .rodata:0x00000054; // type:object size:0x4 scope:local data:float
lbl_1_rodata_58 = .rodata:0x00000058; // type:object size:0x4 data:float lbl_1_rodata_58 = .rodata:0x00000058; // type:object size:0x4 scope:local data:float
lbl_1_rodata_5C = .rodata:0x0000005C; // type:object size:0x4 data:float lbl_1_rodata_5C = .rodata:0x0000005C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_60 = .rodata:0x00000060; // type:object size:0x4 data:float lbl_1_rodata_60 = .rodata:0x00000060; // type:object size:0x4 scope:local data:float
lbl_1_rodata_64 = .rodata:0x00000064; // type:object size:0x4 data:float lbl_1_rodata_64 = .rodata:0x00000064; // type:object size:0x4 scope:local data:float
lbl_1_rodata_68 = .rodata:0x00000068; // type:object size:0x8 data:double lbl_1_rodata_68 = .rodata:0x00000068; // type:object size:0x8 scope:local data:double
lbl_1_rodata_70 = .rodata:0x00000070; // type:object size:0x4 data:float lbl_1_rodata_70 = .rodata:0x00000070; // type:object size:0x4 scope:local data:float
lbl_1_rodata_74 = .rodata:0x00000074; // type:object size:0x4 data:float lbl_1_rodata_74 = .rodata:0x00000074; // type:object size:0x4 scope:local data:float
lbl_1_rodata_78 = .rodata:0x00000078; // type:object size:0x4 data:float lbl_1_rodata_78 = .rodata:0x00000078; // type:object size:0x4 scope:local data:float
lbl_1_rodata_80 = .rodata:0x00000080; // type:object size:0x8 data:double lbl_1_rodata_80 = .rodata:0x00000080; // type:object size:0x8 scope:local data:double
lbl_1_rodata_88 = .rodata:0x00000088; // type:object size:0x8 data:double lbl_1_rodata_88 = .rodata:0x00000088; // type:object size:0x8 scope:local data:double
lbl_1_rodata_90 = .rodata:0x00000090; // type:object size:0x4 data:float lbl_1_rodata_90 = .rodata:0x00000090; // type:object size:0x4 scope:local data:float
lbl_1_rodata_94 = .rodata:0x00000094; // type:object size:0x4 data:float lbl_1_rodata_94 = .rodata:0x00000094; // type:object size:0x4 scope:local data:float
lbl_1_rodata_98 = .rodata:0x00000098; // type:object size:0x4 data:float lbl_1_rodata_98 = .rodata:0x00000098; // type:object size:0x4 scope:local data:float
lbl_1_rodata_9C = .rodata:0x0000009C; // type:object size:0x4 data:float lbl_1_rodata_9C = .rodata:0x0000009C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_A0 = .rodata:0x000000A0; // type:object size:0x4 data:float lbl_1_rodata_A0 = .rodata:0x000000A0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_A4 = .rodata:0x000000A4; // type:object size:0x4 data:float lbl_1_rodata_A4 = .rodata:0x000000A4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_A8 = .rodata:0x000000A8; // type:object size:0x4 data:float lbl_1_rodata_A8 = .rodata:0x000000A8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_AC = .rodata:0x000000AC; // type:object size:0x1 data:byte lbl_1_rodata_AC = .rodata:0x000000AC; // type:object size:0x4 scope:local data:byte
lbl_1_rodata_B0 = .rodata:0x000000B0; // type:object size:0x4 data:float lbl_1_rodata_B0 = .rodata:0x000000B0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_B4 = .rodata:0x000000B4; // type:object size:0x4 data:float lbl_1_rodata_B4 = .rodata:0x000000B4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_B8 = .rodata:0x000000B8; // type:object size:0x4 data:float lbl_1_rodata_B8 = .rodata:0x000000B8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_BC = .rodata:0x000000BC; // type:object size:0x4 data:float lbl_1_rodata_BC = .rodata:0x000000BC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_C0 = .rodata:0x000000C0; // type:object size:0x4 data:float lbl_1_rodata_C0 = .rodata:0x000000C0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_C4 = .rodata:0x000000C4; // type:object size:0x4 data:float lbl_1_rodata_C4 = .rodata:0x000000C4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_C8 = .rodata:0x000000C8; // type:object size:0x4 data:float lbl_1_rodata_C8 = .rodata:0x000000C8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_CC = .rodata:0x000000CC; // type:object size:0x4 data:float lbl_1_rodata_CC = .rodata:0x000000CC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_D0 = .rodata:0x000000D0; // type:object size:0x4 data:float lbl_1_rodata_D0 = .rodata:0x000000D0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_D4 = .rodata:0x000000D4; // type:object size:0x4 data:float lbl_1_rodata_D4 = .rodata:0x000000D4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_D8 = .rodata:0x000000D8; // type:object size:0x4 data:float lbl_1_rodata_D8 = .rodata:0x000000D8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_DC = .rodata:0x000000DC; // type:object size:0x4 data:float lbl_1_rodata_DC = .rodata:0x000000DC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_E0 = .rodata:0x000000E0; // type:object size:0x4 data:float lbl_1_rodata_E0 = .rodata:0x000000E0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_E4 = .rodata:0x000000E4; // type:object size:0x4 data:float lbl_1_rodata_E4 = .rodata:0x000000E4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_E8 = .rodata:0x000000E8; // type:object size:0x4 data:float lbl_1_rodata_E8 = .rodata:0x000000E8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_EC = .rodata:0x000000EC; // type:object size:0x4 data:float lbl_1_rodata_EC = .rodata:0x000000EC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_F0 = .rodata:0x000000F0; // type:object size:0x1 data:byte lbl_1_rodata_F0 = .rodata:0x000000F0; // type:object size:0x4 scope:local data:byte
lbl_1_rodata_F4 = .rodata:0x000000F4; // type:object size:0x1 data:byte lbl_1_rodata_F4 = .rodata:0x000000F4; // type:object size:0x4 scope:local data:byte
lbl_1_rodata_F8 = .rodata:0x000000F8; // type:object size:0x4 data:float lbl_1_rodata_F8 = .rodata:0x000000F8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_FC = .rodata:0x000000FC; // type:object size:0x4 data:float lbl_1_rodata_FC = .rodata:0x000000FC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_100 = .rodata:0x00000100; // type:object size:0x4 data:float lbl_1_rodata_100 = .rodata:0x00000100; // type:object size:0x4 scope:local data:float
lbl_1_rodata_104 = .rodata:0x00000104; // type:object size:0x4 data:float lbl_1_rodata_104 = .rodata:0x00000104; // type:object size:0x4 scope:local data:float
lbl_1_rodata_108 = .rodata:0x00000108; // type:object size:0x4 data:float lbl_1_rodata_108 = .rodata:0x00000108; // type:object size:0x4 scope:local data:float
lbl_1_rodata_10C = .rodata:0x0000010C; // type:object size:0x4 data:float lbl_1_rodata_10C = .rodata:0x0000010C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_110 = .rodata:0x00000110; // type:object size:0x4 data:float lbl_1_rodata_110 = .rodata:0x00000110; // type:object size:0x4 scope:local data:float
lbl_1_rodata_118 = .rodata:0x00000118; // type:object size:0x8 data:double lbl_1_rodata_118 = .rodata:0x00000118; // type:object size:0x8 scope:local data:double
lbl_1_rodata_120 = .rodata:0x00000120; // type:object size:0x4 data:float lbl_1_rodata_120 = .rodata:0x00000120; // type:object size:0x4 scope:local data:float
lbl_1_rodata_124 = .rodata:0x00000124; // type:object size:0x4 data:float lbl_1_rodata_124 = .rodata:0x00000124; // type:object size:0x4 scope:local data:float
lbl_1_rodata_128 = .rodata:0x00000128; // type:object size:0x4 data:float lbl_1_rodata_128 = .rodata:0x00000128; // type:object size:0x4 scope:local data:float
lbl_1_rodata_12C = .rodata:0x0000012C; // type:object size:0x4 data:float lbl_1_rodata_12C = .rodata:0x0000012C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_130 = .rodata:0x00000130; // type:object size:0x4 data:float lbl_1_rodata_130 = .rodata:0x00000130; // type:object size:0x4 scope:local data:float
lbl_1_rodata_134 = .rodata:0x00000134; // type:object size:0x4 data:float lbl_1_rodata_134 = .rodata:0x00000134; // type:object size:0x4 scope:local data:float
lbl_1_rodata_138 = .rodata:0x00000138; // type:object size:0x4 data:float lbl_1_rodata_138 = .rodata:0x00000138; // type:object size:0x4 scope:local data:float
lbl_1_rodata_13C = .rodata:0x0000013C; // type:object size:0x4 data:float lbl_1_rodata_13C = .rodata:0x0000013C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_140 = .rodata:0x00000140; // type:object size:0x4 data:float lbl_1_rodata_140 = .rodata:0x00000140; // type:object size:0x4 scope:local data:float
lbl_1_rodata_144 = .rodata:0x00000144; // type:object size:0x4 data:float lbl_1_rodata_144 = .rodata:0x00000144; // type:object size:0x4 scope:local data:float
lbl_1_rodata_148 = .rodata:0x00000148; // type:object size:0x4 data:float lbl_1_rodata_148 = .rodata:0x00000148; // type:object size:0x4 scope:local data:float
lbl_1_rodata_14C = .rodata:0x0000014C; // type:object size:0x4 data:float lbl_1_rodata_14C = .rodata:0x0000014C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_150 = .rodata:0x00000150; // type:object size:0x4 data:float lbl_1_rodata_150 = .rodata:0x00000150; // type:object size:0x4 scope:local data:float
lbl_1_rodata_154 = .rodata:0x00000154; // type:object size:0x4 data:float lbl_1_rodata_154 = .rodata:0x00000154; // type:object size:0x4 scope:local data:float
lbl_1_rodata_158 = .rodata:0x00000158; // type:object size:0x4 data:float lbl_1_rodata_158 = .rodata:0x00000158; // type:object size:0x4 scope:local data:float
lbl_1_rodata_15C = .rodata:0x0000015C; // type:object size:0x4 data:float lbl_1_rodata_15C = .rodata:0x0000015C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_160 = .rodata:0x00000160; // type:object size:0x4 data:float lbl_1_rodata_160 = .rodata:0x00000160; // type:object size:0x4 scope:local data:float
lbl_1_rodata_164 = .rodata:0x00000164; // type:object size:0x4 data:float lbl_1_rodata_164 = .rodata:0x00000164; // type:object size:0x4 scope:local data:float
lbl_1_rodata_168 = .rodata:0x00000168; // type:object size:0x4 data:float lbl_1_rodata_168 = .rodata:0x00000168; // type:object size:0x4 scope:local data:float
lbl_1_rodata_16C = .rodata:0x0000016C; // type:object size:0x4 data:float lbl_1_rodata_16C = .rodata:0x0000016C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_170 = .rodata:0x00000170; // type:object size:0x4 data:float lbl_1_rodata_170 = .rodata:0x00000170; // type:object size:0x4 scope:local data:float
lbl_1_rodata_174 = .rodata:0x00000174; // type:object size:0x4 data:float lbl_1_rodata_174 = .rodata:0x00000174; // type:object size:0x4 scope:local data:float
lbl_1_rodata_178 = .rodata:0x00000178; // type:object size:0x4 data:float lbl_1_rodata_178 = .rodata:0x00000178; // type:object size:0x4 scope:local data:float
lbl_1_rodata_17C = .rodata:0x0000017C; // type:object size:0x4 data:float lbl_1_rodata_17C = .rodata:0x0000017C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_180 = .rodata:0x00000180; // type:object size:0x4 data:float lbl_1_rodata_180 = .rodata:0x00000180; // type:object size:0x4 scope:local data:float
lbl_1_rodata_184 = .rodata:0x00000184; // type:object size:0x4 data:float lbl_1_rodata_184 = .rodata:0x00000184; // type:object size:0x4 scope:local data:float
lbl_1_rodata_188 = .rodata:0x00000188; // type:object size:0x4 data:float lbl_1_rodata_188 = .rodata:0x00000188; // type:object size:0x4 scope:local data:float
lbl_1_rodata_18C = .rodata:0x0000018C; // type:object size:0x4 data:float lbl_1_rodata_18C = .rodata:0x0000018C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_190 = .rodata:0x00000190; // type:object size:0x4 data:float lbl_1_rodata_190 = .rodata:0x00000190; // type:object size:0x4 scope:local data:float
lbl_1_rodata_194 = .rodata:0x00000194; // type:object size:0x4 data:float lbl_1_rodata_194 = .rodata:0x00000194; // type:object size:0x4 scope:local data:float
lbl_1_rodata_198 = .rodata:0x00000198; // type:object size:0x4 data:float lbl_1_rodata_198 = .rodata:0x00000198; // type:object size:0x4 scope:local data:float
lbl_1_rodata_19C = .rodata:0x0000019C; // type:object size:0x4 data:float lbl_1_rodata_19C = .rodata:0x0000019C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1A0 = .rodata:0x000001A0; // type:object size:0x4 data:float lbl_1_rodata_1A0 = .rodata:0x000001A0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1A4 = .rodata:0x000001A4; // type:object size:0x4 data:float lbl_1_rodata_1A4 = .rodata:0x000001A4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1A8 = .rodata:0x000001A8; // type:object size:0x4 data:float lbl_1_rodata_1A8 = .rodata:0x000001A8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1AC = .rodata:0x000001AC; // type:object size:0x4 data:float lbl_1_rodata_1AC = .rodata:0x000001AC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1B0 = .rodata:0x000001B0; // type:object size:0x4 data:float lbl_1_rodata_1B0 = .rodata:0x000001B0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1B4 = .rodata:0x000001B4; // type:object size:0x4 data:float lbl_1_rodata_1B4 = .rodata:0x000001B4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1B8 = .rodata:0x000001B8; // type:object size:0x4 data:float lbl_1_rodata_1B8 = .rodata:0x000001B8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1BC = .rodata:0x000001BC; // type:object size:0x4 data:float lbl_1_rodata_1BC = .rodata:0x000001BC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1C0 = .rodata:0x000001C0; // type:object size:0x4 data:float lbl_1_rodata_1C0 = .rodata:0x000001C0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1C4 = .rodata:0x000001C4; // type:object size:0x4 data:float lbl_1_rodata_1C4 = .rodata:0x000001C4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1C8 = .rodata:0x000001C8; // type:object size:0x4 data:float lbl_1_rodata_1C8 = .rodata:0x000001C8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1CC = .rodata:0x000001CC; // type:object size:0x4 data:float lbl_1_rodata_1CC = .rodata:0x000001CC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1D0 = .rodata:0x000001D0; // type:object size:0x4 data:float lbl_1_rodata_1D0 = .rodata:0x000001D0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1D4 = .rodata:0x000001D4; // type:object size:0x4 data:float lbl_1_rodata_1D4 = .rodata:0x000001D4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1D8 = .rodata:0x000001D8; // type:object size:0x4 data:float lbl_1_rodata_1D8 = .rodata:0x000001D8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1DC = .rodata:0x000001DC; // type:object size:0x4 data:float lbl_1_rodata_1DC = .rodata:0x000001DC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1E0 = .rodata:0x000001E0; // type:object size:0x4 data:float lbl_1_rodata_1E0 = .rodata:0x000001E0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1E4 = .rodata:0x000001E4; // type:object size:0x4 data:float lbl_1_rodata_1E4 = .rodata:0x000001E4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1E8 = .rodata:0x000001E8; // type:object size:0x4 data:float lbl_1_rodata_1E8 = .rodata:0x000001E8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1EC = .rodata:0x000001EC; // type:object size:0x4 data:float lbl_1_rodata_1EC = .rodata:0x000001EC; // type:object size:0x4 scope:local data:float
lbl_1_data_0 = .data:0x00000000; // type:object size:0x10 lbl_1_data_0 = .data:0x00000000; // type:object size:0x10 data:2byte
lbl_1_data_10 = .data:0x00000010; // type:object size:0x30 data:2byte lbl_1_data_10 = .data:0x00000010; // type:object size:0x30 data:2byte
lbl_1_data_40 = .data:0x00000040; // type:object size:0x60 lbl_1_data_40 = .data:0x00000040; // type:object size:0x60 data:float
lbl_1_data_A0 = .data:0x000000A0; // type:object size:0x48 lbl_1_data_A0 = .data:0x000000A0; // type:object size:0x40 data:float
lbl_1_data_E8 = .data:0x000000E8; // type:object size:0x1 data:byte lbl_1_data_E8 = .data:0x000000E8; // type:object size:0x4 data:byte
lbl_1_data_EC = .data:0x000000EC; // type:object size:0x14 lbl_1_data_EC = .data:0x000000EC; // type:object size:0x12 scope:local data:string
lbl_1_data_100 = .data:0x00000100; // type:object size:0xC lbl_1_data_100 = .data:0x00000100; // type:object size:0xC data:float
lbl_1_data_10C = .data:0x0000010C; // type:object size:0xC data:4byte lbl_1_data_10C = .data:0x0000010C; // type:object size:0xC data:float
lbl_1_data_118 = .data:0x00000118; // type:object size:0xC data:4byte lbl_1_data_118 = .data:0x00000118; // type:object size:0xC data:float
lbl_1_data_124 = .data:0x00000124; // type:object size:0xC data:4byte lbl_1_data_124 = .data:0x00000124; // type:object size:0xC data:float
lbl_1_data_130 = .data:0x00000130; // type:object size:0xC data:4byte lbl_1_data_130 = .data:0x00000130; // type:object size:0xC data:float
lbl_1_data_13C = .data:0x0000013C; // type:object size:0xC data:4byte lbl_1_data_13C = .data:0x0000013C; // type:object size:0xC data:float
lbl_1_data_148 = .data:0x00000148; // type:object size:0xC data:4byte lbl_1_data_148 = .data:0x00000148; // type:object size:0xC data:float
lbl_1_data_154 = .data:0x00000154; // type:object size:0xC lbl_1_data_154 = .data:0x00000154; // type:object size:0xC data:float
lbl_1_data_160 = .data:0x00000160; // type:object size:0xC lbl_1_data_160 = .data:0x00000160; // type:object size:0xC data:float
lbl_1_data_16C = .data:0x0000016C; // type:object size:0x4 lbl_1_data_16C = .data:0x0000016C; // type:object size:0x4
lbl_1_data_170 = .data:0x00000170; // type:object size:0xC lbl_1_data_170 = .data:0x00000170; // type:object size:0xC data:float
lbl_1_data_17C = .data:0x0000017C; // type:object size:0xC lbl_1_data_17C = .data:0x0000017C; // type:object size:0xC data:float
lbl_1_data_188 = .data:0x00000188; // type:object size:0x100 lbl_1_data_188 = .data:0x00000188; // type:object size:0x100
lbl_1_data_288 = .data:0x00000288; // type:object size:0x8 lbl_1_data_288 = .data:0x00000288; // type:object size:0x8
lbl_1_data_290 = .data:0x00000290; // type:object size:0x20 lbl_1_data_290 = .data:0x00000290; // type:object size:0x20
@ -193,20 +193,20 @@ lbl_1_data_2B0 = .data:0x000002B0; // type:object size:0x10
lbl_1_data_2C0 = .data:0x000002C0; // type:object size:0x50 lbl_1_data_2C0 = .data:0x000002C0; // type:object size:0x50
lbl_1_data_310 = .data:0x00000310; // type:object size:0x18 data:4byte lbl_1_data_310 = .data:0x00000310; // type:object size:0x18 data:4byte
lbl_1_data_328 = .data:0x00000328; // type:object size:0x14 lbl_1_data_328 = .data:0x00000328; // type:object size:0x14
lbl_1_data_33C = .data:0x0000033C; // type:object size:0xA lbl_1_data_33C = .data:0x0000033C; // type:object size:0xA data:byte
lbl_1_data_346 = .data:0x00000346; // type:object size:0xA lbl_1_data_346 = .data:0x00000346; // type:object size:0xA data:2byte
lbl_1_data_350 = .data:0x00000350; // type:object size:0x8 lbl_1_data_350 = .data:0x00000350; // type:object size:0x8
lbl_1_data_358 = .data:0x00000358; // type:object size:0x8 lbl_1_data_358 = .data:0x00000358; // type:object size:0x8
lbl_1_data_360 = .data:0x00000360; // type:object size:0x8 lbl_1_data_360 = .data:0x00000360; // type:object size:0x8
lbl_1_data_368 = .data:0x00000368; // type:object size:0x8 lbl_1_data_368 = .data:0x00000368; // type:object size:0x8
lbl_1_data_370 = .data:0x00000370; // type:object size:0x50 lbl_1_data_370 = .data:0x00000370; // type:object size:0x50
lbl_1_data_3C0 = .data:0x000003C0; // type:object size:0x50 lbl_1_data_3C0 = .data:0x000003C0; // type:object size:0x50
lbl_1_data_410 = .data:0x00000410; // type:object size:0xC data:string lbl_1_data_410 = .data:0x00000410; // type:object size:0xC scope:local data:string
lbl_1_data_41C = .data:0x0000041C; // type:object size:0x16 data:string lbl_1_data_41C = .data:0x0000041C; // type:object size:0x16 scope:local data:string
lbl_1_data_432 = .data:0x00000432; // type:object size:0x1D data:string lbl_1_data_432 = .data:0x00000432; // type:object size:0x1D scope:local data:string
lbl_1_data_44F = .data:0x0000044F; // type:object size:0x1D lbl_1_data_44F = .data:0x0000044F; // type:object size:0x1B scope:local data:string
jumptable_1_data_46C = .data:0x0000046C; // type:object size:0x24 scope:local jumptable_1_data_46C = .data:0x0000046C; // type:object size:0x24 scope:local
lbl_1_data_490 = .data:0x00000490; // type:object size:0x24 data:string lbl_1_data_490 = .data:0x00000490; // type:object size:0x24 scope:local data:string
lbl_1_bss_0 = .bss:0x00000000; // type:object size:0x18 data:float lbl_1_bss_0 = .bss:0x00000000; // type:object size:0x18 data:float
lbl_1_bss_18 = .bss:0x00000018; // type:object size:0x18 data:4byte lbl_1_bss_18 = .bss:0x00000018; // type:object size:0x18 data:4byte
lbl_1_bss_30 = .bss:0x00000030; // type:object size:0x18 data:float lbl_1_bss_30 = .bss:0x00000030; // type:object size:0x18 data:float
@ -223,7 +223,7 @@ lbl_1_bss_80 = .bss:0x00000080; // type:object size:0x4 data:float
lbl_1_bss_84 = .bss:0x00000084; // type:object size:0x2 data:2byte lbl_1_bss_84 = .bss:0x00000084; // type:object size:0x2 data:2byte
lbl_1_bss_88 = .bss:0x00000088; // type:object size:0x4 data:4byte lbl_1_bss_88 = .bss:0x00000088; // type:object size:0x4 data:4byte
lbl_1_bss_8C = .bss:0x0000008C; // type:object size:0x2 data:2byte lbl_1_bss_8C = .bss:0x0000008C; // type:object size:0x2 data:2byte
lbl_1_bss_90 = .bss:0x00000090; // type:object size:0x8 data:4byte lbl_1_bss_90 = .bss:0x00000090; // type:object size:0x4 data:4byte
lbl_1_bss_98 = .bss:0x00000098; // type:object size:0x4 data:4byte lbl_1_bss_98 = .bss:0x00000098; // type:object size:0x4 data:4byte
lbl_1_bss_9C = .bss:0x0000009C; // type:object size:0x4 data:4byte lbl_1_bss_9C = .bss:0x0000009C; // type:object size:0x4 data:4byte
lbl_1_bss_A0 = .bss:0x000000A0; // type:object size:0x4 data:4byte lbl_1_bss_A0 = .bss:0x000000A0; // type:object size:0x4 data:4byte

2
configure.py
View file

@ -820,7 +820,7 @@ config.libs = [
), ),
Rel('m405Dll', Rel('m405Dll',
objects = { objects = {
Object(NonMatching, "REL/m405Dll/main.c"), Object(Matching, "REL/m405Dll/main.c"),
} }
), ),
Rel('m406Dll', Rel('m406Dll',

2
include/REL/present.h
View file

@ -133,7 +133,7 @@ typedef struct UnkPresentNestedInnerStruct {
typedef struct UnkPresentNestedOuterStruct { typedef struct UnkPresentNestedOuterStruct {
/* 0x00 */ s32 unk00; /* 0x00 */ s32 unk00;
/* 0x04 */ UnkPresentNestedInnerStruct unk_04[11]; /* 0x04 */ UnkPresentNestedInnerStruct unk_04[11];
} UnkPresentNestedOuterStruct; } UnkPresentNestedOuterStruct;
typedef struct UnkPresentStruct7 { typedef struct UnkPresentStruct7 {

2
include/REL/w03Dll.h
View file

@ -8,7 +8,7 @@
#define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0])) #define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0]))
enum { enum {
MAPOBJ_MAX = 12 MAPOBJ_MAX = 12
}; };
typedef struct w03UnkStruct2{ typedef struct w03UnkStruct2{

4
include/REL/w10Dll.h
View file

@ -5,8 +5,8 @@
#include "game/window.h" #include "game/window.h"
enum { enum {
MAPOBJ_MELON = 0, MAPOBJ_MELON = 0,
MAPOBJ_MAX, MAPOBJ_MAX,
}; };
typedef struct w10_board_work { typedef struct w10_board_work {

4
include/ext_math.h
View file

@ -5,8 +5,8 @@
#include "dolphin/mtx.h" #include "dolphin/mtx.h"
typedef struct vec2f { typedef struct vec2f {
float x; float x;
float y; float y;
} Vec2f; } Vec2f;
#define ABS(x) (((x) < 0) ? -(x) : (x)) #define ABS(x) (((x) < 0) ? -(x) : (x))

2
include/game/chrman.h
View file

@ -42,6 +42,6 @@ void fn_8004F52C(s16 character, s32 arg1);
void CharModelEffectEnableSet(s16 character, s32 arg1); void CharModelEffectEnableSet(s16 character, s32 arg1);
s32 CharModelEffectNpcInit(s16 arg0, s16 arg1, s16 arg2, s16 arg3); s32 CharModelEffectNpcInit(s16 arg0, s16 arg1, s16 arg2, s16 arg3);
s32 CharModelEffectNpcInitSilent(s16 arg0, s16 arg1, s16 arg2); s32 CharModelEffectNpcInitSilent(s16 arg0, s16 arg1, s16 arg2);
s32 CharModelStepTypeSet(s16 character, s32 arg1); void CharModelStepTypeSet(s16 character, s32 arg1);
#endif #endif

2
include/game/hsfformat.h
View file

@ -150,7 +150,7 @@ typedef struct hsf_face {
s16 mat; s16 mat;
union { union {
struct { struct {
s16 indices[3][4]; s16 indices[3][4];
u32 count; u32 count;
s16 *data; s16 *data;
} strip; } strip;

14
include/game/hsfman.h
View file

@ -38,9 +38,9 @@ typedef struct model_data {
u32 motion_attr; u32 motion_attr;
Point3d unk_58; Point3d unk_58;
f32 unk_64; f32 unk_64;
f32 unk_68; f32 unk_68;
f32 unk_6C; f32 unk_6C;
f32 unk_70; f32 unk_70;
f32 unk_74; f32 unk_74;
f32 unk_78; f32 unk_78;
f32 unk_7C; f32 unk_7C;
@ -55,10 +55,10 @@ typedef struct model_data {
f32 unk_A0; f32 unk_A0;
f32 unk_A4[4]; f32 unk_A4[4];
f32 unk_B4[4]; f32 unk_B4[4];
union { union {
HsfData *hsfData; HsfData *hsfData;
ModelHookFunc hook; ModelHookFunc hook;
}; };
HsfData *unk_C8; HsfData *unk_C8;
Vec pos; Vec pos;
Vec rot; Vec rot;

3
src/REL/E3setupDLL/mgselect.c
View file

@ -5,6 +5,7 @@
#include "game/objsub.h" #include "game/objsub.h"
#include "game/sprite.h" #include "game/sprite.h"
#include "game/window.h" #include "game/window.h"
#include "game/wipe.h"
#include "rel_sqrt_consts.h" #include "rel_sqrt_consts.h"
#include "REL/E3SetupDLL.h" #include "REL/E3SetupDLL.h"
@ -69,7 +70,7 @@ void E3MGSelectInit()
mgPicObj = omAddObjEx(var_r31, 31, 0, 0, -1, CreateMGPic); mgPicObj = omAddObjEx(var_r31, 31, 0, 0, -1, CreateMGPic);
mgPicObj->work[0] = mgDefault; mgPicObj->work[0] = mgDefault;
E3LightInit(); E3LightInit();
WipeCreate(1, 0, -1); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, -1);
} }
s16 lbl_2_data_36[] = { 0x0023, 0x0026, 0x0029, 0x002C }; s16 lbl_2_data_36[] = { 0x0023, 0x0026, 0x0029, 0x002C };

10
src/REL/m404Dll/main.c
View file

@ -281,7 +281,7 @@ void fn_1_39C(omObjData *object)
{ {
fn_1_37C(0); fn_1_37C(0);
lbl_1_bss_24 = 60; lbl_1_bss_24 = 60;
WipeCreate(1, 0, 60); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60);
object->func = fn_1_400; object->func = fn_1_400;
} }
@ -326,7 +326,7 @@ void fn_1_400(omObjData *object)
if (!MGSeqStatGet(lbl_1_bss_C)) { if (!MGSeqStatGet(lbl_1_bss_C)) {
fn_1_37C(5); fn_1_37C(5);
WipeColorSet(255, 255, 255); WipeColorSet(255, 255, 255);
WipeCreate(2, 0, 30); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30);
lbl_1_bss_24 = 60; lbl_1_bss_24 = 60;
} }
case 5: case 5:
@ -334,7 +334,7 @@ void fn_1_400(omObjData *object)
break; break;
} }
fn_1_37C(6); fn_1_37C(6);
WipeCreate(1, 0, 60); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60);
break; break;
case 6: case 6:
if (WipeStatGet()) { if (WipeStatGet()) {
@ -362,14 +362,14 @@ void fn_1_400(omObjData *object)
if (--lbl_1_bss_24) { if (--lbl_1_bss_24) {
break; break;
} }
WipeCreate(2, 0, 60); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
object->func = fn_1_784; object->func = fn_1_784;
break; break;
default: default:
break; break;
} }
if (omSysExitReq && !WipeStatGet()) { if (omSysExitReq && !WipeStatGet()) {
WipeCreate(2, 0, 60); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
object->func = fn_1_784; object->func = fn_1_784;
} }
} }

2465
src/REL/m405Dll/main.c Executable file
View file

File diff suppressed because it is too large Load diff

4
src/REL/m407dll/main.c
View file

@ -109,7 +109,7 @@ void fn_1_4980(Process* arg0) {
fn_1_3AC8(lbl_1_bss_3980); fn_1_3AC8(lbl_1_bss_3980);
fn_1_41CC(lbl_1_bss_3980); fn_1_41CC(lbl_1_bss_3980);
fn_1_5C5C(lbl_1_bss_3980, lbl_1_bss_3978); fn_1_5C5C(lbl_1_bss_3980, lbl_1_bss_3978);
WipeCreate(1, 0, 0x3C); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 60);
temp_r31->unk_06 = -1; temp_r31->unk_06 = -1;
temp_r31->unk_08 = -1; temp_r31->unk_08 = -1;
temp_r31->unk_24 = 0; temp_r31->unk_24 = 0;
@ -127,7 +127,7 @@ void fn_1_4B7C(void) {
temp_r31 = lbl_1_bss_397C->data; temp_r31 = lbl_1_bss_397C->data;
if (temp_r31->unk_04 == 0) { if (temp_r31->unk_04 == 0) {
WipeCreate(2, 0, 60); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
temp_r31->unk_04++; temp_r31->unk_04++;
} }
if (WipeStatGet() == 0) { if (WipeStatGet() == 0) {

2
src/REL/messDll/main.c
View file

@ -47,7 +47,7 @@ void ModuleProlog(void) {
} }
static void fn_1_2BC(omObjData *arg0) { static void fn_1_2BC(omObjData *arg0) {
WipeCreate(1, 0, 10); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 10);
arg0->func = fn_1_300; arg0->func = fn_1_300;
} }

2
src/REL/modeltestDll/main.c
View file

@ -59,7 +59,7 @@ void ModuleProlog(void)
lbl_1_bss_9A0 = omAddObjEx(prc, 0x7FDA, 0, 0, -1, omOutView); lbl_1_bss_9A0 = omAddObjEx(prc, 0x7FDA, 0, 0, -1, omOutView);
Hu3DBGColorSet(0x20U, 0x80U, 0x80U); Hu3DBGColorSet(0x20U, 0x80U, 0x80U);
WipeCreate(1, 0, 0x1E); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 30);
} }
// -------------------------------------------------------------------------- // // -------------------------------------------------------------------------- //

2
src/REL/modeltestDll/modeltest00.c
View file

@ -46,7 +46,7 @@ void fn_1_34B0()
lbl_1_bss_9A8 = HuPrcCreate(fn_1_46F0, 0x64U, 0x2000U, 0); lbl_1_bss_9A8 = HuPrcCreate(fn_1_46F0, 0x64U, 0x2000U, 0);
Hu3DBGColorSet(0x20U, 0x80U, 0x80U); Hu3DBGColorSet(0x20U, 0x80U, 0x80U);
WipeCreate(1, 0, 0x1E); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 30);
} }
// -------------------------------------------------------------------------- // // -------------------------------------------------------------------------- //

6
src/REL/option/scene.c
View file

@ -159,7 +159,7 @@ static void fn_1_5EC(omObjData *arg0) {
arg0->unk10 = 2; arg0->unk10 = 2;
/* fallthrough */ /* fallthrough */
case 2: case 2:
WipeCreate(2, 0, 0x3C); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
HuAudFadeOut(1000); HuAudFadeOut(1000);
arg0->unk10 = 3; arg0->unk10 = 3;
/* fallthrough */ /* fallthrough */
@ -191,7 +191,7 @@ static void fn_1_6E8(void) {
espPosSet(temp_r31, 288.0f, 240.0f); espPosSet(temp_r31, 288.0f, 240.0f);
espAttrReset(temp_r31, 4); espAttrReset(temp_r31, 4);
Hu3DBGColorSet(0, 0, 0); Hu3DBGColorSet(0, 0, 0);
WipeCreate(1, 0, 0xA); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 10);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
HuPrcVSleep(); HuPrcVSleep();
} }
@ -199,7 +199,7 @@ static void fn_1_6E8(void) {
if (SLSave() == 0) { if (SLSave() == 0) {
GWSaveModeSet(1); GWSaveModeSet(1);
} }
WipeCreate(2, 0, 0x14); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 20);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
HuPrcVSleep(); HuPrcVSleep();
} }

2
src/REL/option/state.c
View file

@ -73,7 +73,7 @@ static void fn_1_2FB0(omObjData *arg0) {
arg0->unk10 = 1; arg0->unk10 = 1;
/* fallthrough */ /* fallthrough */
case 1: case 1:
WipeCreate(1, -1, 0x3C); WipeCreate(WIPE_MODE_IN, -1, 60);
arg0->unk10 = 2; arg0->unk10 = 2;
break; break;
case 2: case 2:

2
src/REL/present/init.c
View file

@ -160,7 +160,7 @@ void fn_1_5EC(omObjData *object)
} }
object->unk10 = 2; object->unk10 = 2;
case 2: case 2:
WipeCreate(2, 0, 60); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
HuAudFadeOut(1000); HuAudFadeOut(1000);
object->unk10 = 3; object->unk10 = 3;
break; break;

2
src/REL/present/present.c
View file

@ -816,7 +816,7 @@ void fn_1_33AC(omObjData *object)
var_r31->unk_254 = 1.0f / 360.0f; var_r31->unk_254 = 1.0f / 360.0f;
object->unk10 = 1; object->unk10 = 1;
case 1: case 1:
WipeCreate(1, 0, 120); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 120);
object->unk10 = 2; object->unk10 = 2;
case 2: case 2:
var_f31 = sind(90.0f * var_r31->unk_24C); var_f31 = sind(90.0f * var_r31->unk_24C);

6
src/REL/subchrselDll/main.c
View file

@ -44,7 +44,7 @@ void ModuleProlog(void)
Process *sp8 = omInitObjMan(0x32, 0x2000); Process *sp8 = omInitObjMan(0x32, 0x2000);
Hu3DBGColorSet(0, 0, 0); Hu3DBGColorSet(0, 0, 0);
HuPrcChildCreate(SubchrMain, 4096, 12288, 0, HuPrcCurrentGet()); HuPrcChildCreate(SubchrMain, 4096, 12288, 0, HuPrcCurrentGet());
WipeCreate(1, 0, -1); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, -1);
} }
static u16 GetBtns(void) static u16 GetBtns(void)
@ -97,7 +97,7 @@ static void SubchrMain()
} }
} }
HuAudFadeOut(30); HuAudFadeOut(30);
WipeCreate(2, 0, -1); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
HuPrcSleep(wipeData.duration+1.0f); HuPrcSleep(wipeData.duration+1.0f);
MGSeqKillAll(); MGSeqKillAll();
omOvlGotoEx(OVL_M433, 1, 0, 0); omOvlGotoEx(OVL_M433, 1, 0, 0);
@ -149,7 +149,7 @@ static void SubchrMain()
} }
if(GetBtns() & PAD_BUTTON_B) { if(GetBtns() & PAD_BUTTON_B) {
HuAudFadeOut(30); HuAudFadeOut(30);
WipeCreate(2, 0, -1); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
HuPrcSleep(wipeData.duration+1.0f); HuPrcSleep(wipeData.duration+1.0f);
MGSeqKillAll(); MGSeqKillAll();
omOvlReturnEx(1, 1); omOvlReturnEx(1, 1);

8
src/REL/w03Dll/condor.c
View file

@ -398,7 +398,7 @@ void fn_1_3968(s32 arg0) {
if (var_r28 == 0) { if (var_r28 == 0) {
if (sp8 == 0x78U) { if (sp8 == 0x78U) {
WipeColorSet(0, 0, 0); WipeColorSet(0, 0, 0);
WipeCreate(2, 0, -1); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
var_r28 = 1; var_r28 = 1;
} }
} else if (WipeStatGet() == 0) { } else if (WipeStatGet() == 0) {
@ -415,7 +415,7 @@ void fn_1_3E88(s32 arg0) {
lbl_1_bss_7D = 1; lbl_1_bss_7D = 1;
BoardStatusShowSetForce(arg0); BoardStatusShowSetForce(arg0);
BoardStatusShowSet(arg0, 1); BoardStatusShowSet(arg0, 1);
WipeCreate(1, 0, 0x15); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 21);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
HuPrcVSleep(); HuPrcVSleep();
@ -495,7 +495,7 @@ void fn_1_3F5C(s32 arg0) {
BoardStatusItemSet(0); BoardStatusItemSet(0);
HuPrcSleep(2); HuPrcSleep(2);
BoardStatusItemSet(1); BoardStatusItemSet(1);
WipeCreate(1, 0, 0x15); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 21);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
HuPrcVSleep(); HuPrcVSleep();
@ -1019,7 +1019,7 @@ void fn_1_5C5C(omObjData* arg0, w03UnkStruct5* arg1) {
if ((BoardModelMotionTimeGet(lbl_1_data_314) >= 410.0f) && (arg1->unk00_bit3) == 0) { if ((BoardModelMotionTimeGet(lbl_1_data_314) >= 410.0f) && (arg1->unk00_bit3) == 0) {
WipeColorSet(0, 0, 0); WipeColorSet(0, 0, 0);
WipeCreate(2, 0, -1); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
arg1->unk00_bit3 = 1; arg1->unk00_bit3 = 1;
BoardAudSeqFadeOut(1, 0x3E8); BoardAudSeqFadeOut(1, 0x3E8);
} }

11
src/REL/w03Dll/statue.c
View file

@ -662,19 +662,20 @@ void fn_1_2B44(void) {
GXSetBlendMode(GX_BM_BLEND, GX_BL_INVDSTCLR, GX_BL_SRCALPHA, GX_LO_NOOP); GXSetBlendMode(GX_BM_BLEND, GX_BL_INVDSTCLR, GX_BL_SRCALPHA, GX_LO_NOOP);
GXSetVtxDesc(GX_VA_POS, GX_DIRECT); GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT); GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_TEX_S, GX_RGBX8, 0); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XY, GX_RGBX8, 0);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_TEX_ST, GX_RGBA6, 0); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_TEX_ST, GX_RGBA6, 0);
GXSetZMode(1, GX_LEQUAL, 0); GXSetZMode(1, GX_LEQUAL, 0);
GXSetAlphaUpdate(1); GXSetAlphaUpdate(1);
GXSetColorUpdate(1); GXSetColorUpdate(1);
GXBegin(GX_QUADS, GX_VTXFMT0, 4); GXBegin(GX_QUADS, GX_VTXFMT0, 4);
GXPosition2u16(temp_f28, temp_f27); GXPosition2u16(temp_f28, temp_f27);
GXPosition2f32(0.0f, 0.0f); GXTexCoord2f32(0.0f, 0.0f);
GXPosition2u16(temp_f30, temp_f27); GXPosition2u16(temp_f30, temp_f27);
GXPosition2f32(1.0f, 0.0f); GXTexCoord2f32(1.0f, 0.0f);
GXPosition2u16(temp_f30, temp_f29); GXPosition2u16(temp_f30, temp_f29);
GXPosition2f32(1.0f, 1.0f); GXTexCoord2f32(1.0f, 1.0f);
GXPosition2u16(temp_f28, temp_f29); GXPosition2u16(temp_f28, temp_f29);
GXPosition2f32(0.0f, 1.0f); GXTexCoord2f32(0.0f, 1.0f);
GXEnd();
GXSetChanMatColor(GX_COLOR0A0, sp1C); GXSetChanMatColor(GX_COLOR0A0, sp1C);
} }

8
src/REL/w05Dll/hotel.c
View file

@ -147,21 +147,21 @@ void fn_1_155C(void) {
BoardCameraTargetModelSet(lbl_1_data_164); BoardCameraTargetModelSet(lbl_1_data_164);
BoardCameraOffsetSet(0.0f, 200.0f, 0.0f); BoardCameraOffsetSet(0.0f, 200.0f, 0.0f);
BoardCameraMotionWait(); BoardCameraMotionWait();
HuPrcSleep(0x3C); HuPrcSleep(60);
WipeColorSet(0, 0, 0); WipeColorSet(0, 0, 0);
WipeCreate(2, 0, 0x30); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 48);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
HuPrcVSleep(); HuPrcVSleep();
} }
fn_1_14D0(); fn_1_14D0();
fn_1_13D4(); fn_1_13D4();
WipeCreate(1, 0, 0x30); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 48);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
HuPrcVSleep(); HuPrcVSleep();
} }
HuPrcSleep(0x3C); HuPrcSleep(60);
BoardCameraTargetPlayerSet(lbl_1_bss_28); BoardCameraTargetPlayerSet(lbl_1_bss_28);
BoardCameraMotionWait(); BoardCameraMotionWait();
} }

2
src/game/THPDraw.c
View file

@ -37,7 +37,7 @@ void THPGXYuv2RgbSetup(GXRenderModeObj *obj, GXColor *arg1, Mtx arg2) {
GXClearVtxDesc(); GXClearVtxDesc();
GXSetVtxDesc(GX_VA_POS, GX_DIRECT); GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT); GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT);
GXSetVtxAttrFmt(GX_VTXFMT7, GX_VA_POS, GX_TEX_ST, GX_RGBA4, 0); GXSetVtxAttrFmt(GX_VTXFMT7, GX_VA_POS, GX_POS_XYZ, GX_RGBA4, 0);
GXSetVtxAttrFmt(GX_VTXFMT7, GX_VA_TEX0, GX_TEX_ST, GX_RGBX8, 0); GXSetVtxAttrFmt(GX_VTXFMT7, GX_VA_TEX0, GX_TEX_ST, GX_RGBX8, 0);
GXSetNumTevStages(5); GXSetNumTevStages(5);
GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD1, GX_TEXMAP1, GX_COLOR_NULL); GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD1, GX_TEXMAP1, GX_COLOR_NULL);

4
src/game/board/battle.c
View file

@ -197,7 +197,7 @@ static void ExecBattle(void) {
} }
if (_CheckFlag(0x10004)) { if (_CheckFlag(0x10004)) {
BoardStatusItemSet(1); BoardStatusItemSet(1);
WipeCreate(1, 0, -1); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, -1);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
HuPrcVSleep(); HuPrcVSleep();
} }
@ -296,7 +296,7 @@ static void ExecBattle(void) {
} }
_SetFlag(0x1000E); _SetFlag(0x1000E);
WipeColorSet(0xFF, 0xFF, 0xFF); WipeColorSet(0xFF, 0xFF, 0xFF);
WipeCreate(2, 0, -1); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
HuPrcVSleep(); HuPrcVSleep();
} }

2
src/game/board/boo.c
View file

@ -683,7 +683,7 @@ static void BallRenderHook(void) {
GXSetScissor(0, 0, 160, 160); GXSetScissor(0, 0, 160, 160);
GXClearVtxDesc(); GXClearVtxDesc();
GXSetVtxDesc(GX_VA_POS, GX_DIRECT); GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_TEX_ST, GX_RGBA6, 0); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_RGBA6, 0);
sp10.r = 0; sp10.r = 0;
sp10.g = 0; sp10.g = 0;
sp10.b = 0; sp10.b = 0;

4
src/game/board/mg_setup.c
View file

@ -177,7 +177,7 @@ static void ExecMGSetup(void) {
sp54.z = 0.0f; sp54.z = 0.0f;
BoardCameraMotionStartEx(-1, NULL, &sp54, 1300.0f, -1.0f, 21); BoardCameraMotionStartEx(-1, NULL, &sp54, 1300.0f, -1.0f, 21);
BoardCameraMotionWait(); BoardCameraMotionWait();
WipeCreate(1, 0, 0x15); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 21);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
HuPrcVSleep(); HuPrcVSleep();
@ -268,7 +268,7 @@ static void ExecMGSetup(void) {
BoardAudSeqFadeOut(0, 0x3E8U); BoardAudSeqFadeOut(0, 0x3E8U);
_SetFlag(0x1000EU); _SetFlag(0x1000EU);
WipeColorSet(0xFFU, 0xFFU, 0xFFU); WipeColorSet(0xFFU, 0xFFU, 0xFFU);
WipeCreate(2, 0, -1); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
HuPrcVSleep(); HuPrcVSleep();
} }

4
src/game/board/view.c
View file

@ -103,7 +103,7 @@ void BoardViewOverheadExec(s32 arg0) {
} }
_SetFlag(0x1001C); _SetFlag(0x1001C);
WipeColorSet(0xFF, 0xFF, 0xFF); WipeColorSet(0xFF, 0xFF, 0xFF);
WipeCreate(2, 1, 1); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_CROSS, 1);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
HuPrcVSleep(); HuPrcVSleep();
} }
@ -314,7 +314,7 @@ static void ExecOverheadView(void) {
HuPrcVSleep(); HuPrcVSleep();
SetTargetView(); SetTargetView();
WipeColorSet(0xFF, 0xFF, 0xFF); WipeColorSet(0xFF, 0xFF, 0xFF);
WipeCreate(1, 1, 0xA); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_CROSS, 10);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
HuPrcVSleep(); HuPrcVSleep();
} }

4
src/game/board/warp.c
View file

@ -148,7 +148,7 @@ static void WarpLaunch(s32 player) {
BoardPlayerPosSetV(player, &warpPos); BoardPlayerPosSetV(player, &warpPos);
if (!(warpPos.y < warpYFloor)) { if (!(warpPos.y < warpYFloor)) {
WipeColorSet(0U, 0U, 0U); WipeColorSet(0U, 0U, 0U);
WipeCreate(2, 0, 21); WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 21);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
HuPrcVSleep(); HuPrcVSleep();
@ -182,7 +182,7 @@ static void WarpStartImpact(s32 player) {
BoardCameraMoveSet(0); BoardCameraMoveSet(0);
BoardCameraTargetSpaceSet(warpSpace); BoardCameraTargetSpaceSet(warpSpace);
HuPrcSleep(1); HuPrcSleep(1);
WipeCreate(1, 0, 0x15); WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 21);
while (WipeStatGet() != 0) { while (WipeStatGet() != 0) {
HuPrcVSleep(); HuPrcVSleep();
} }

2
src/game/chrman.c
View file

@ -2051,7 +2051,7 @@ static void UpdateNpcEffect(void) {
} }
} }
s32 CharModelStepTypeSet(s16 character, s32 arg1) { void CharModelStepTypeSet(s16 character, s32 arg1) {
UnkCharInstanceStruct *temp_r31 = &charInstance[character]; UnkCharInstanceStruct *temp_r31 = &charInstance[character];
temp_r31->unkB0 = arg1; temp_r31->unkB0 = arg1;

4
src/game/hsfanim.c
View file

@ -823,10 +823,10 @@ static void _Hu3DParticleAttrReset(ModelData *arg0, Mtx arg1) {
} }
GXClearVtxDesc(); GXClearVtxDesc();
GXSetVtxDesc(GX_VA_POS, GX_INDEX16); GXSetVtxDesc(GX_VA_POS, GX_INDEX16);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_TEX_ST, GX_RGBA6, 0); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_RGBA6, 0);
GXSetArray(GX_VA_POS, temp_r31->unk_4C, 0xC); GXSetArray(GX_VA_POS, temp_r31->unk_4C, 0xC);
GXSetVtxDesc(GX_VA_CLR0, GX_INDEX16); GXSetVtxDesc(GX_VA_CLR0, GX_INDEX16);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_TEX_ST, GX_RGBA8, 0); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0);
GXSetArray(GX_VA_CLR0, (u8*) temp_r31->unk_48 + 0x40, 0x44); GXSetArray(GX_VA_CLR0, (u8*) temp_r31->unk_48 + 0x40, 0x44);
GXSetVtxDesc(GX_VA_TEX0, GX_INDEX16); GXSetVtxDesc(GX_VA_TEX0, GX_INDEX16);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_TEX_ST, GX_RGBA6, 0); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_TEX_ST, GX_RGBA6, 0);

36
src/game/hsfdraw.c
View file

@ -503,19 +503,19 @@ static void FaceDraw(HsfdrawStruct00 *arg0, HsfFace *arg1) {
vtxModeBak = var_r22; vtxModeBak = var_r22;
GXClearVtxDesc(); GXClearVtxDesc();
GXSetVtxDesc(GX_VA_POS, GX_INDEX16); GXSetVtxDesc(GX_VA_POS, GX_INDEX16);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_TEX_ST, GX_RGBA6, 0); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_RGBA6, 0);
GXSetArray(GX_VA_POS, temp_r28->data.vertex->data, 0xC); GXSetArray(GX_VA_POS, temp_r28->data.vertex->data, 0xC);
GXSetVtxDesc(GX_VA_NRM, GX_INDEX16); GXSetVtxDesc(GX_VA_NRM, GX_INDEX16);
if (temp_r29->hsfData->cenvCnt == 0) { if (temp_r29->hsfData->cenvCnt == 0) {
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_NRM, GX_TEX_S, GX_RGB8, 0); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_NRM, GX_NRM_XYZ, GX_RGB8, 0);
GXSetArray(GX_VA_NRM, temp_r28->data.normal->data, 3); GXSetArray(GX_VA_NRM, temp_r28->data.normal->data, 3);
} else { } else {
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_NRM, GX_TEX_S, GX_RGBA6, 0); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_NRM, GX_NRM_XYZ, GX_RGBA6, 0);
GXSetArray(GX_VA_NRM, temp_r28->data.normal->data, 0xC); GXSetArray(GX_VA_NRM, temp_r28->data.normal->data, 0xC);
} }
if (var_r22 & 4) { if (var_r22 & 4) {
GXSetVtxDesc(GX_VA_CLR0, GX_INDEX16); GXSetVtxDesc(GX_VA_CLR0, GX_INDEX16);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_TEX_ST, GX_RGBA8, 0); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0);
GXSetArray(GX_VA_CLR0, temp_r28->data.color->data, 4); GXSetArray(GX_VA_CLR0, temp_r28->data.color->data, 4);
} }
GXSetZCompLoc(1); GXSetZCompLoc(1);
@ -576,18 +576,18 @@ static void FaceDraw(HsfdrawStruct00 *arg0, HsfFace *arg1) {
vtxModeBak = var_r22; vtxModeBak = var_r22;
GXClearVtxDesc(); GXClearVtxDesc();
GXSetVtxDesc(GX_VA_POS, GX_INDEX16); GXSetVtxDesc(GX_VA_POS, GX_INDEX16);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_TEX_ST, GX_RGBA6, 0); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_RGBA6, 0);
GXSetArray(GX_VA_POS, temp_r28->data.vertex->data, 0xC); GXSetArray(GX_VA_POS, temp_r28->data.vertex->data, 0xC);
if (var_r22 & 2) { if (var_r22 & 2) {
GXSetVtxDesc(GX_VA_NBT, GX_DIRECT); GXSetVtxDesc(GX_VA_NBT, GX_DIRECT);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_NBT, GX_TEX_ST, GX_RGBA4, 8); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_NBT, GX_NRM_NBT, GX_RGBA4, 8);
} else { } else {
GXSetVtxDesc(GX_VA_NRM, GX_INDEX16); GXSetVtxDesc(GX_VA_NRM, GX_INDEX16);
if (temp_r29->hsfData->cenvCnt == 0) { if (temp_r29->hsfData->cenvCnt == 0) {
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_NRM, GX_TEX_S, GX_RGB8, 0); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_NRM, GX_NRM_XYZ, GX_RGB8, 0);
GXSetArray(GX_VA_NRM, temp_r28->data.normal->data, 3); GXSetArray(GX_VA_NRM, temp_r28->data.normal->data, 3);
} else { } else {
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_NRM, GX_TEX_S, GX_RGBA6, 0); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_NRM, GX_NRM_XYZ, GX_RGBA6, 0);
GXSetArray(GX_VA_NRM, temp_r28->data.normal->data, 0xC); GXSetArray(GX_VA_NRM, temp_r28->data.normal->data, 0xC);
} }
} }
@ -596,7 +596,7 @@ static void FaceDraw(HsfdrawStruct00 *arg0, HsfFace *arg1) {
GXSetArray(GX_VA_TEX0, temp_r28->data.st->data, 8); GXSetArray(GX_VA_TEX0, temp_r28->data.st->data, 8);
if (var_r22 & 4) { if (var_r22 & 4) {
GXSetVtxDesc(GX_VA_CLR0, GX_INDEX16); GXSetVtxDesc(GX_VA_CLR0, GX_INDEX16);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_TEX_ST, GX_RGBA8, 0); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0);
GXSetArray(GX_VA_CLR0, temp_r28->data.color->data, 4); GXSetArray(GX_VA_CLR0, temp_r28->data.color->data, 4);
} }
GXSetZCompLoc(0); GXSetZCompLoc(0);
@ -1668,19 +1668,19 @@ static void FaceDrawShadow(HsfdrawStruct00 *arg0, HsfFace *arg1) {
vtxModeBak = var_r30; vtxModeBak = var_r30;
GXClearVtxDesc(); GXClearVtxDesc();
GXSetVtxDesc(GX_VA_POS, GX_INDEX16); GXSetVtxDesc(GX_VA_POS, GX_INDEX16);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_TEX_ST, GX_RGBA6, 0); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_RGBA6, 0);
GXSetArray(GX_VA_POS, temp_r31->data.vertex->data, 0xC); GXSetArray(GX_VA_POS, temp_r31->data.vertex->data, 0xC);
GXSetVtxDesc(GX_VA_NRM, GX_INDEX16); GXSetVtxDesc(GX_VA_NRM, GX_INDEX16);
if (temp_r28->hsfData->cenvCnt == 0) { if (temp_r28->hsfData->cenvCnt == 0) {
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_NRM, GX_TEX_S, GX_RGB8, 0); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_NRM, GX_NRM_XYZ, GX_RGB8, 0);
GXSetArray(GX_VA_NRM, temp_r31->data.normal->data, 3); GXSetArray(GX_VA_NRM, temp_r31->data.normal->data, 3);
} else { } else {
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_NRM, GX_TEX_S, GX_RGBA6, 0); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_NRM, GX_NRM_XYZ, GX_RGBA6, 0);
GXSetArray(GX_VA_NRM, temp_r31->data.normal->data, 0xC); GXSetArray(GX_VA_NRM, temp_r31->data.normal->data, 0xC);
} }
if (var_r30 & 4) { if (var_r30 & 4) {
GXSetVtxDesc(GX_VA_CLR0, GX_INDEX16); GXSetVtxDesc(GX_VA_CLR0, GX_INDEX16);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_TEX_ST, GX_RGBA8, 0); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0);
GXSetArray(GX_VA_CLR0, temp_r31->data.color->data, 4); GXSetArray(GX_VA_CLR0, temp_r31->data.color->data, 4);
} }
GXSetZCompLoc(1); GXSetZCompLoc(1);
@ -1701,18 +1701,18 @@ static void FaceDrawShadow(HsfdrawStruct00 *arg0, HsfFace *arg1) {
vtxModeBak = var_r30; vtxModeBak = var_r30;
GXClearVtxDesc(); GXClearVtxDesc();
GXSetVtxDesc(GX_VA_POS, GX_INDEX16); GXSetVtxDesc(GX_VA_POS, GX_INDEX16);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_TEX_ST, GX_RGBA6, 0); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_RGBA6, 0);
GXSetArray(GX_VA_POS, temp_r31->data.vertex->data, 0xC); GXSetArray(GX_VA_POS, temp_r31->data.vertex->data, 0xC);
if (var_r30 & 2) { if (var_r30 & 2) {
GXSetVtxDesc(GX_VA_NBT, GX_DIRECT); GXSetVtxDesc(GX_VA_NBT, GX_DIRECT);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_NBT, GX_TEX_ST, GX_RGBA4, 8); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_NBT, GX_NRM_NBT, GX_RGBA4, 8);
} else { } else {
GXSetVtxDesc(GX_VA_NRM, GX_INDEX16); GXSetVtxDesc(GX_VA_NRM, GX_INDEX16);
if (temp_r28->hsfData->cenvCnt == 0) { if (temp_r28->hsfData->cenvCnt == 0) {
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_NRM, GX_TEX_S, GX_RGB8, 0); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_NRM, GX_NRM_XYZ, GX_RGB8, 0);
GXSetArray(GX_VA_NRM, temp_r31->data.normal->data, 3); GXSetArray(GX_VA_NRM, temp_r31->data.normal->data, 3);
} else { } else {
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_NRM, GX_TEX_S, GX_RGBA6, 0); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_NRM, GX_NRM_XYZ, GX_RGBA6, 0);
GXSetArray(GX_VA_NRM, temp_r31->data.normal->data, 0xC); GXSetArray(GX_VA_NRM, temp_r31->data.normal->data, 0xC);
} }
} }
@ -1721,7 +1721,7 @@ static void FaceDrawShadow(HsfdrawStruct00 *arg0, HsfFace *arg1) {
GXSetArray(GX_VA_TEX0, temp_r31->data.st->data, 8); GXSetArray(GX_VA_TEX0, temp_r31->data.st->data, 8);
if (var_r30 & 4) { if (var_r30 & 4) {
GXSetVtxDesc(GX_VA_CLR0, GX_INDEX16); GXSetVtxDesc(GX_VA_CLR0, GX_INDEX16);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_TEX_ST, GX_RGBA8, 0); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGBA, GX_RGBA8, 0);
GXSetArray(GX_VA_CLR0, temp_r31->data.color->data, 4); GXSetArray(GX_VA_CLR0, temp_r31->data.color->data, 4);
} }
GXSetZCompLoc(0); GXSetZCompLoc(0);

4
src/game/window.c
View file

@ -433,9 +433,9 @@ static void MesDispFunc(HuSprite *sprite) {
GXSetVtxDesc(GX_VA_POS, GX_DIRECT); GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT); GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT);
GXSetVtxDesc(GX_VA_CLR0, GX_DIRECT); GXSetVtxDesc(GX_VA_CLR0, GX_DIRECT);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_TEX_ST, GX_RGBA6, 0); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_RGBA6, 0);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_TEX_ST, GX_RGBA6, 0); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_TEX_ST, GX_RGBA6, 0);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_TEX_S, GX_RGBA8, 0); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_CLR0, GX_CLR_RGB, GX_RGBA8, 0);
GXSetCullMode(GX_CULL_NONE); GXSetCullMode(GX_CULL_NONE);
GXSetNumTexGens(1); GXSetNumTexGens(1);
GXSetTexCoordGen(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, GX_IDENTITY); GXSetTexCoordGen(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, GX_IDENTITY);