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

Matched m462Dll (US); applying some sprite macros (#504)

Browse source
This commit is contained in:
mrshigure 2025-01-03 07:52:10 -08:00 • committed by GitHub
parent 37e9989b96
commit 78ab520813
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
18 changed files with 1975 additions and 313 deletions
Download patch file Download diff file Expand all files Collapse all files

180
config/GMPE01_00/rels/m462Dll/symbols.txt
View file

@ -34,101 +34,101 @@ fn_1_7D40 = .text:0x00007D40; // type:function size:0x60
fn_1_7DA0 = .text:0x00007DA0; // type:function size:0x3BC
_ctors = .ctors: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_14 = .rodata:0x00000014; // type:object size:0x4 data:float
lbl_1_rodata_18 = .rodata:0x00000018; // type:object size:0x4 data:float
lbl_1_rodata_1C = .rodata:0x0000001C; // type:object size:0x4 data:float
lbl_1_rodata_20 = .rodata:0x00000020; // type:object size:0x4 data:float
lbl_1_rodata_24 = .rodata:0x00000024; // type:object size:0x4 data:float
lbl_1_rodata_28 = .rodata:0x00000028; // type:object size:0x4 data:float
lbl_1_rodata_2C = .rodata:0x0000002C; // type:object size:0x4 data:float
lbl_1_rodata_30 = .rodata:0x00000030; // type:object size:0x4 data:float
lbl_1_rodata_34 = .rodata:0x00000034; // type:object size:0x4 data:float
lbl_1_rodata_38 = .rodata:0x00000038; // type:object size:0x4 data:float
lbl_1_rodata_3C = .rodata:0x0000003C; // type:object size:0x4 data:float
lbl_1_rodata_40 = .rodata:0x00000040; // type:object size:0x4 data:float
lbl_1_rodata_44 = .rodata:0x00000044; // type:object size:0x4 data:float
lbl_1_rodata_48 = .rodata:0x00000048; // type:object size:0x4 data:float
lbl_1_rodata_4C = .rodata:0x0000004C; // type:object size:0x4 data:float
lbl_1_rodata_50 = .rodata:0x00000050; // type:object size:0x4 data:float
lbl_1_rodata_54 = .rodata:0x00000054; // type:object size:0x4 data:float
lbl_1_rodata_58 = .rodata:0x00000058; // type:object size:0x4 data:float
lbl_1_rodata_5C = .rodata:0x0000005C; // type:object size:0x4 data:float
lbl_1_rodata_60 = .rodata:0x00000060; // type:object size:0x4 data:float
lbl_1_rodata_64 = .rodata:0x00000064; // type:object size:0x4 data:float
lbl_1_rodata_68 = .rodata:0x00000068; // type:object size:0x4 data:float
lbl_1_rodata_6C = .rodata:0x0000006C; // type:object size:0x4 data:float
lbl_1_rodata_70 = .rodata:0x00000070; // type:object size:0x4 data:float
lbl_1_rodata_74 = .rodata:0x00000074; // type:object size:0x4 data:float
lbl_1_rodata_78 = .rodata:0x00000078; // type:object size:0x4 data:float
lbl_1_rodata_7C = .rodata:0x0000007C; // type:object size:0x4 data:float
lbl_1_rodata_80 = .rodata:0x00000080; // type:object size:0x4 data:float
lbl_1_rodata_84 = .rodata:0x00000084; // type:object size:0x4 data:float
lbl_1_rodata_88 = .rodata:0x00000088; // type:object size:0x4 data:float
lbl_1_rodata_8C = .rodata:0x0000008C; // type:object size:0x4 data:float
lbl_1_rodata_90 = .rodata:0x00000090; // type:object size:0x4 data:float
lbl_1_rodata_94 = .rodata:0x00000094; // type:object size:0x4 data:float
lbl_1_rodata_98 = .rodata:0x00000098; // type:object size:0x8 data:double
lbl_1_rodata_A0 = .rodata:0x000000A0; // type:object size:0x8 data:double
lbl_1_rodata_A8 = .rodata:0x000000A8; // type:object size:0x8 data:double
lbl_1_rodata_B0 = .rodata:0x000000B0; // type:object size:0x8 data:double
lbl_1_rodata_B8 = .rodata:0x000000B8; // type:object size:0x8 data:double
lbl_1_rodata_C0 = .rodata:0x000000C0; // type:object size:0x8 data:double
lbl_1_rodata_C8 = .rodata:0x000000C8; // type:object size:0x8 data:double
lbl_1_rodata_D0 = .rodata:0x000000D0; // type:object size:0x4 data:float
lbl_1_rodata_D4 = .rodata:0x000000D4; // type:object size:0x4 data:float
lbl_1_rodata_D8 = .rodata:0x000000D8; // type:object size:0x4 data:float
lbl_1_rodata_DC = .rodata:0x000000DC; // type:object size:0x4 data:float
lbl_1_rodata_E0 = .rodata:0x000000E0; // type:object size:0x4 data:float
lbl_1_rodata_E4 = .rodata:0x000000E4; // type:object size:0x4 data:float
lbl_1_rodata_E8 = .rodata:0x000000E8; // type:object size:0x4 data:float
lbl_1_rodata_F0 = .rodata:0x000000F0; // type:object size:0x8 data:double
lbl_1_rodata_F8 = .rodata:0x000000F8; // type:object size:0x8 data:double
lbl_1_rodata_100 = .rodata:0x00000100; // type:object size:0x4 data:float
lbl_1_rodata_104 = .rodata:0x00000104; // type:object size:0x4 data:float
lbl_1_rodata_108 = .rodata:0x00000108; // type:object size:0x4 data:float
lbl_1_rodata_10C = .rodata:0x0000010C; // type:object size:0x4 data:float
lbl_1_rodata_110 = .rodata:0x00000110; // type:object size:0x4 data:float
lbl_1_rodata_114 = .rodata:0x00000114; // type:object size:0x4 data:float
lbl_1_rodata_118 = .rodata:0x00000118; // type:object size:0x4 data:float
lbl_1_rodata_11C = .rodata:0x0000011C; // type:object size:0x4 data:float
lbl_1_rodata_120 = .rodata:0x00000120; // type:object size:0x4 data:float
lbl_1_rodata_124 = .rodata:0x00000124; // type:object size:0x4 data:float
lbl_1_rodata_128 = .rodata:0x00000128; // type:object size:0x4 data:float
lbl_1_rodata_12C = .rodata:0x0000012C; // type:object size:0x4 data:float
lbl_1_rodata_130 = .rodata:0x00000130; // type:object size:0x8 data:double
lbl_1_rodata_138 = .rodata:0x00000138; // type:object size:0x4 data:float
lbl_1_rodata_13C = .rodata:0x0000013C; // type:object size:0x4 data:float
lbl_1_rodata_140 = .rodata:0x00000140; // type:object size:0x8 data:double
lbl_1_rodata_148 = .rodata:0x00000148; // type:object size:0x4 data:float
lbl_1_rodata_150 = .rodata:0x00000150; // type:object size:0x8 data:double
lbl_1_rodata_158 = .rodata:0x00000158; // type:object size:0x4 data:float
lbl_1_rodata_15C = .rodata:0x0000015C; // type:object size:0x4 data:float
lbl_1_rodata_160 = .rodata:0x00000160; // type:object size:0x8 data:double
lbl_1_rodata_168 = .rodata:0x00000168; // type:object size:0x4 data:float
lbl_1_rodata_16C = .rodata:0x0000016C; // type:object size:0x4 data:float
lbl_1_rodata_170 = .rodata:0x00000170; // type:object size:0x4 data:float
lbl_1_rodata_174 = .rodata:0x00000174; // type:object size:0x4 data:float
lbl_1_rodata_178 = .rodata:0x00000178; // type:object size:0x4 data:float
lbl_1_rodata_17C = .rodata:0x0000017C; // type:object size:0x4 data:float
lbl_1_rodata_180 = .rodata:0x00000180; // type:object size:0x4 data:float
lbl_1_rodata_184 = .rodata:0x00000184; // type:object size:0x4 data:float
lbl_1_rodata_188 = .rodata:0x00000188; // type:object size:0x4 data:float
lbl_1_rodata_18C = .rodata:0x0000018C; // type:object size:0x4 data:float
lbl_1_rodata_190 = .rodata:0x00000190; // type:object size:0x4 data:float
lbl_1_rodata_194 = .rodata:0x00000194; // type:object size:0x4 data:float
lbl_1_rodata_198 = .rodata:0x00000198; // type:object size:0x4 data:float
lbl_1_rodata_1A0 = .rodata:0x000001A0; // type:object size:0x8 data:double
lbl_1_rodata_1A8 = .rodata:0x000001A8; // type:object size:0x8 data:double
lbl_1_rodata_1B0 = .rodata:0x000001B0; // type:object size:0x4 data:float
lbl_1_rodata_1B4 = .rodata:0x000001B4; // 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 scope:local data:float
lbl_1_rodata_18 = .rodata:0x00000018; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1C = .rodata:0x0000001C; // type:object size:0x4 scope:local 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 scope:local data:float
lbl_1_rodata_28 = .rodata:0x00000028; // type:object size:0x4 scope:local data:float
lbl_1_rodata_2C = .rodata:0x0000002C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_30 = .rodata:0x00000030; // type:object size:0x4 scope:local data:float
lbl_1_rodata_34 = .rodata:0x00000034; // type:object size:0x4 scope:local data:float
lbl_1_rodata_38 = .rodata:0x00000038; // type:object size:0x4 scope:local data:float
lbl_1_rodata_3C = .rodata:0x0000003C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_40 = .rodata:0x00000040; // type:object size:0x4 scope:local data:float
lbl_1_rodata_44 = .rodata:0x00000044; // type:object size:0x4 scope:local 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 scope:local 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 scope:local 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 scope:local 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 scope:local data:float
lbl_1_rodata_68 = .rodata:0x00000068; // type:object size:0x4 scope:local data:float
lbl_1_rodata_6C = .rodata:0x0000006C; // type:object size:0x4 scope:local 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 scope:local data:float
lbl_1_rodata_78 = .rodata:0x00000078; // type:object size:0x4 scope:local data:float
lbl_1_rodata_7C = .rodata:0x0000007C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_80 = .rodata:0x00000080; // type:object size:0x4 scope:local data:float
lbl_1_rodata_84 = .rodata:0x00000084; // type:object size:0x4 scope:local data:float
lbl_1_rodata_88 = .rodata:0x00000088; // type:object size:0x4 scope:local data:float
lbl_1_rodata_8C = .rodata:0x0000008C; // type:object size:0x4 scope:local 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 scope:local data:float
lbl_1_rodata_98 = .rodata:0x00000098; // type:object size:0x8 scope:local data:double
lbl_1_rodata_A0 = .rodata:0x000000A0; // type:object size:0x8 scope:local data:double
lbl_1_rodata_A8 = .rodata:0x000000A8; // type:object size:0x8 scope:local data:double
lbl_1_rodata_B0 = .rodata:0x000000B0; // type:object size:0x8 scope:local data:double
lbl_1_rodata_B8 = .rodata:0x000000B8; // type:object size:0x8 scope:local data:double
lbl_1_rodata_C0 = .rodata:0x000000C0; // type:object size:0x8 scope:local data:double
lbl_1_rodata_C8 = .rodata:0x000000C8; // type:object size:0x8 scope:local data:double
lbl_1_rodata_D0 = .rodata:0x000000D0; // type:object size:0x4 scope:local 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 scope:local 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 scope:local 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 scope:local data:float
lbl_1_rodata_F0 = .rodata:0x000000F0; // type:object size:0x8 scope:local data:double
lbl_1_rodata_F8 = .rodata:0x000000F8; // type:object size:0x8 scope:local data:double
lbl_1_rodata_100 = .rodata:0x00000100; // type:object size:0x4 scope:local 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 scope:local 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 scope:local data:float
lbl_1_rodata_114 = .rodata:0x00000114; // type:object size:0x4 scope:local data:float
lbl_1_rodata_118 = .rodata:0x00000118; // type:object size:0x4 scope:local data:float
lbl_1_rodata_11C = .rodata:0x0000011C; // type:object size:0x4 scope:local 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 scope:local 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 scope:local data:float
lbl_1_rodata_130 = .rodata:0x00000130; // type:object size:0x8 scope:local data:double
lbl_1_rodata_138 = .rodata:0x00000138; // type:object size:0x4 scope:local 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:0x8 scope:local data:double
lbl_1_rodata_148 = .rodata:0x00000148; // type:object size:0x4 scope:local data:float
lbl_1_rodata_150 = .rodata:0x00000150; // type:object size:0x8 scope:local data:double
lbl_1_rodata_158 = .rodata:0x00000158; // type:object size:0x4 scope:local 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:0x8 scope:local data:double
lbl_1_rodata_168 = .rodata:0x00000168; // type:object size:0x4 scope:local 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 scope:local 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 scope:local 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 scope:local 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 scope:local 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 scope:local 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 scope:local data:float
lbl_1_rodata_1A0 = .rodata:0x000001A0; // type:object size:0x8 scope:local data:double
lbl_1_rodata_1A8 = .rodata:0x000001A8; // type:object size:0x8 scope:local data:double
lbl_1_rodata_1B0 = .rodata:0x000001B0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1B4 = .rodata:0x000001B4; // type:object size:0x4 scope:local data:float
lbl_1_data_0 = .data:0x00000000; // type:object size:0x20
lbl_1_data_20 = .data:0x00000020; // type:object size:0x10
lbl_1_data_30 = .data:0x00000030; // type:object size:0x60
lbl_1_data_30 = .data:0x00000030; // type:object size:0x60 data:float
lbl_1_data_90 = .data:0x00000090; // type:object size:0x30 data:float
lbl_1_data_C0 = .data:0x000000C0; // type:object size:0x3C
lbl_1_data_FC = .data:0x000000FC; // type:object size:0x14 data:float
lbl_1_data_110 = .data:0x00000110; // type:object size:0xB data:string
lbl_1_data_110 = .data:0x00000110; // type:object size:0xB scope:local data:string
lbl_1_bss_0 = .bss:0x00000000; // type:object size:0xC data:float
lbl_1_bss_C = .bss:0x0000000C; // type:object size:0xC data:float
lbl_1_bss_18 = .bss:0x00000018; // type:object size:0xC data:float

2
configure.py
View file

@ -1306,7 +1306,7 @@ config.libs = [
Rel(
"m462Dll", # Goomba Stomp
objects={
Object(NonMatching, "REL/m462Dll/main.c"),
Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/m462Dll/main.c"),
},
),
Rel(

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

@ -413,8 +413,8 @@ static void UpdateMGPic(omObjData *object)
if (object->work[1] != object->work[0]) {
temp_r29 = temp_r30->unk_40;
HuSprAttrSet(temp_r29, object->work[1], 4);
HuSprAttrReset(temp_r29, object->work[0], 4);
HuSprAttrSet(temp_r29, object->work[1], HUSPR_ATTR_DISPOFF);
HuSprAttrReset(temp_r29, object->work[0], HUSPR_ATTR_DISPOFF);
object->work[1] = object->work[0];
}
}
@ -453,7 +453,7 @@ static void CreateMGPic(omObjData *object)
HuSprTPLvlSet(temp_r3, index2, 0.7f);
index2++;
object->work[1] = object->work[0];
HuSprAttrReset(temp_r3, object->work[1], 4);
HuSprAttrReset(temp_r3, object->work[1], HUSPR_ATTR_DISPOFF);
object->func = UpdateMGPic;
}

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

@ -2255,7 +2255,7 @@ void fn_1_7738(void)
temp_r28->unk00 = 20.0f + temp_r30->unk00;
temp_r28->unk04 = -20.0f + temp_r30->unk04;
m411InlineFunc(temp_r31, temp_r30);
HuSprAttrReset(temp_r31->unk0C, 0, 4);
HuSprAttrReset(temp_r31->unk0C, 0, HUSPR_ATTR_DISPOFF);
}
temp_r30->unk08 = 50.0f;
temp_r28->unk08 = temp_r30->unk08 - 5.0f;

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

@ -1005,12 +1005,12 @@ void fn_1_3D48(s32 arg0, s32 arg1)
var_r29->user_data = var_r31;
var_r31->unk_5C = var_r30;
}
HuSprAttrSet(var_r31->unk_2E, (var_r30 * 2) + 2, 4);
HuSprAttrReset(var_r31->unk_2E, (var_r30 * 2) + 3, 4);
HuSprAttrSet(var_r31->unk_2E, (var_r30 * 2) + 2, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(var_r31->unk_2E, (var_r30 * 2) + 3, HUSPR_ATTR_DISPOFF);
}
else {
HuSprAttrReset(var_r31->unk_2E, (var_r30 * 2) + 2, 4);
HuSprAttrSet(var_r31->unk_2E, (var_r30 * 2) + 3, 4);
HuSprAttrReset(var_r31->unk_2E, (var_r30 * 2) + 2, HUSPR_ATTR_DISPOFF);
HuSprAttrSet(var_r31->unk_2E, (var_r30 * 2) + 3, HUSPR_ATTR_DISPOFF);
}
}
}
@ -2047,7 +2047,7 @@ void fn_1_79A8(void)
var_r28 = &lbl_1_bss_F0[var_r30];
var_r27 = HuPrcChildCreate(fn_1_76F4, 8192, 8192, 0, HuPrcCurrentGet());
var_r27->user_data = var_r28;
HuSprAttrReset(var_r28->unk_2C, 0, 4);
HuSprAttrReset(var_r28->unk_2C, 0, HUSPR_ATTR_DISPOFF);
}
for (var_r29 = 0, var_f27 = 0.0f; var_r29 < 15; var_r29++) {
var_f27 += 0.06666667f;

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

@ -1408,7 +1408,7 @@ void fn_1_557C(void)
for (i = 0; i < 2; i++) {
for (j = 0; j < 5; j++) {
HuSprAttrReset(lbl_1_bss_588[i].unk04, j, 4);
HuSprAttrReset(lbl_1_bss_588[i].unk04, j, HUSPR_ATTR_DISPOFF);
}
}
}
@ -1420,7 +1420,7 @@ void fn_1_55F0(void)
for (i = 0; i < 2; i++) {
for (j = 0; j < 5; j++) {
HuSprAttrSet(lbl_1_bss_588[i].unk04, j, 4);
HuSprAttrSet(lbl_1_bss_588[i].unk04, j, HUSPR_ATTR_DISPOFF);
}
}
}
@ -1429,7 +1429,7 @@ void fn_1_5664(UnkM445Struct_02 *arg0, s32 arg1)
{
HuSprBankSet(arg0->unk04, 3, arg1 % 10);
HuSprBankSet(arg0->unk04, 4, arg1 / 10);
HuSprAttrReset(arg0->unk04, 4, 4);
HuSprAttrReset(arg0->unk04, 4, HUSPR_ATTR_DISPOFF);
}
void fn_1_5700(UnkM445Struct_02 *arg0)

4
src/REL/m451Dll/m451.c
View file

@ -872,11 +872,11 @@ void fn_1_2A34(Bss348Data *arg0, s32 arg1, s32 arg2)
temp_r30->scale.y = temp_r31->scale.y;
temp_r30->scale.z = 0.8f * temp_r31->scale.z;
if (arg2 == 0) {
HuSprAttrReset(arg0->unkA, 0, 1);
HuSprAttrReset(arg0->unkA, 0, HUSPR_ATTR_NOANIM);
HuSprGrpScaleSet(arg0->unkA, 1, 1);
}
else {
HuSprAttrReset(arg0->unkA, 0, 64);
HuSprAttrReset(arg0->unkA, 0, HUSPR_ATTR_REVERSE);
}
}

1662
src/REL/m462Dll/main.c Executable file
View file

File diff suppressed because it is too large Load diff

292
src/REL/mentDll/main.c
View file

@ -3739,19 +3739,19 @@ void fn_1_14BA8(void)
s32 var_r30;
var_r30 = lbl_1_bss_35BC[0].unk_30;
for (var_r31 = 0; var_r31 < 0x35; var_r31++) {
HuSprAttrSet(var_r30, var_r31, 4);
HuSprAttrSet(var_r30, var_r31, HUSPR_ATTR_DISPOFF);
}
for (var_r31 = 0; var_r31 < 8; var_r31++) {
HuSprBankSet(var_r30, var_r31, 0);
HuSprAttrReset(var_r30, var_r31, 4);
HuSprAttrReset(var_r30, var_r31 + 8, 4);
HuSprAttrReset(var_r30, var_r31, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(var_r30, var_r31 + 8, HUSPR_ATTR_DISPOFF);
}
HuSprAttrReset(var_r30, 0x28, 4);
HuSprAttrReset(var_r30, 0x28, HUSPR_ATTR_DISPOFF);
for (var_r31 = 0; var_r31 < 4; var_r31++) {
HuSprBankSet(var_r30, var_r31 + 0x10, 0);
HuSprBankSet(var_r30, var_r31 + 0x14, 0);
HuSprAttrReset(var_r30, var_r31 + 0x29, 4);
HuSprAttrReset(var_r30, var_r31 + 0x2D, 4);
HuSprAttrReset(var_r30, var_r31 + 0x29, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(var_r30, var_r31 + 0x2D, HUSPR_ATTR_DISPOFF);
}
HuSprGrpPosSet(var_r30, 0.0f, -500.0f);
}
@ -3809,19 +3809,19 @@ void fn_1_14CE0(void)
var_r30 = lbl_1_bss_35BC[0].unk_30;
for (var_r31 = 0; var_r31 < 4; var_r31++) {
if (lbl_1_bss_3114[var_r31].unk_60 != 0) {
HuSprAttrSet(var_r30, lbl_1_bss_3114[var_r31].unk_58 + 0x10, 4);
HuSprAttrSet(var_r30, lbl_1_bss_3114[var_r31].unk_58 + 0x14, 4);
HuSprAttrSet(var_r30, lbl_1_bss_3114[var_r31].unk_58 + 0x10, HUSPR_ATTR_DISPOFF);
HuSprAttrSet(var_r30, lbl_1_bss_3114[var_r31].unk_58 + 0x14, HUSPR_ATTR_DISPOFF);
}
else {
HuSprAttrReset(var_r30, lbl_1_bss_3114[var_r31].unk_58 + 0x10, 4);
HuSprAttrReset(var_r30, lbl_1_bss_3114[var_r31].unk_58 + 0x14, 4);
HuSprAttrReset(var_r30, lbl_1_bss_3114[var_r31].unk_58 + 0x10, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(var_r30, lbl_1_bss_3114[var_r31].unk_58 + 0x14, HUSPR_ATTR_DISPOFF);
}
HuSprPosSet(var_r30, lbl_1_bss_3114[var_r31].unk_58 + 0x10, lbl_1_data_57C[lbl_1_bss_3114[var_r31].unk_68 % 4][0],
lbl_1_data_57C[lbl_1_bss_3114[var_r31].unk_68 / 4][1]);
HuSprPosSet(var_r30, lbl_1_bss_3114[var_r31].unk_58 + 0x14, lbl_1_data_57C[lbl_1_bss_3114[var_r31].unk_68 % 4][0],
lbl_1_data_57C[lbl_1_bss_3114[var_r31].unk_68 / 4][1]);
}
for (var_r31 = 0; var_r31 <= 0x3C; var_r31++) {
for (var_r31 = 0; var_r31 <= 60; var_r31++) {
fn_1_4D8();
if (var_r31 <= 0x32) {
var_f31 = fn_1_32C(-500.0f, 10.0f, var_r31, 50.0f);
@ -3918,19 +3918,19 @@ void fn_1_151B8(MentDllUnkBss35BCStruct *arg0, s32 arg1, s32 arg2, s32 arg3)
}
var_r27 = lbl_1_bss_35BC[0].unk_30;
for (var_r28 = 0; var_r28 < 0x35; var_r28++) {
HuSprAttrSet(var_r27, var_r28, 4);
HuSprAttrSet(var_r27, var_r28, HUSPR_ATTR_DISPOFF);
}
for (var_r28 = 0; var_r28 < 8; var_r28++) {
HuSprBankSet(var_r27, var_r28, 0);
HuSprAttrReset(var_r27, var_r28, 4);
HuSprAttrReset(var_r27, var_r28 + 8, 4);
HuSprAttrReset(var_r27, var_r28, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(var_r27, var_r28 + 8, HUSPR_ATTR_DISPOFF);
}
HuSprAttrReset(var_r27, 0x28, 4);
HuSprAttrReset(var_r27, 0x28, HUSPR_ATTR_DISPOFF);
for (var_r28 = 0; var_r28 < 4; var_r28++) {
HuSprBankSet(var_r27, var_r28 + 0x10, 0);
HuSprBankSet(var_r27, var_r28 + 0x14, 0);
HuSprAttrReset(var_r27, var_r28 + 0x29, 4);
HuSprAttrReset(var_r27, var_r28 + 0x2D, 4);
HuSprAttrReset(var_r27, var_r28 + 0x29, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(var_r27, var_r28 + 0x2D, HUSPR_ATTR_DISPOFF);
}
HuSprGrpPosSet(var_r27, 0.0f, -500.0f);
}
@ -4093,8 +4093,8 @@ void fn_1_162A0(MentDllUnkBss3114Struct *arg0)
HuSprBankSet(var_r30, arg0->unk_58 + 0x20, arg0->unk_64);
HuSprPosSet(var_r30, arg0->unk_58 + 0x20, lbl_1_data_57C[arg0->unk_68 % 4][0], lbl_1_data_57C[arg0->unk_68 / 4][1] + 0x23);
HuSprPosSet(var_r30, arg0->unk_58 + 0x24, lbl_1_data_57C[arg0->unk_68 % 4][0] + 1, lbl_1_data_57C[arg0->unk_68 / 4][1] + 0x25);
HuSprAttrReset(var_r30, arg0->unk_58 + 0x20, 4);
HuSprAttrReset(var_r30, arg0->unk_58 + 0x24, 4);
HuSprAttrReset(var_r30, arg0->unk_58 + 0x20, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(var_r30, arg0->unk_58 + 0x24, HUSPR_ATTR_DISPOFF);
}
s32 fn_1_1648C(MentDllUnkBss3114Struct *arg0)
@ -4174,8 +4174,8 @@ s32 fn_1_1648C(MentDllUnkBss3114Struct *arg0)
if (var_r27 == 1) {
HuSprPosSet(var_r29, arg0->unk_58 + 49, lbl_1_data_57C[arg0->unk_68 % 4][0], lbl_1_data_57C[arg0->unk_68 / 4][1] + 35);
HuSprBankSet(var_r29, arg0->unk_58 + 49, arg0->unk_64);
HuSprAttrReset(var_r29, arg0->unk_58 + 49, 4);
HuSprAttrSet(var_r29, arg0->unk_58 + 32, 4);
HuSprAttrReset(var_r29, arg0->unk_58 + 49, HUSPR_ATTR_DISPOFF);
HuSprAttrSet(var_r29, arg0->unk_58 + 32, HUSPR_ATTR_DISPOFF);
}
return var_r27;
@ -4327,11 +4327,11 @@ void fn_1_173FC(MentDllUnkBss3114Struct *arg0)
HuSprPosSet(var_r30, arg0->unk_58 + 0x24, lbl_1_data_57C[arg0->unk_68 % 4][0] + 1, lbl_1_data_57C[arg0->unk_68 / 4][1] + 0x25);
HuSprPosSet(var_r30, arg0->unk_58 + 0x31, lbl_1_data_57C[arg0->unk_68 % 4][0] + 1, lbl_1_data_57C[arg0->unk_68 / 4][1] + 0x25);
arg0->unk_70[2] = 0;
HuSprAttrReset(var_r30, arg0->unk_58 + 0x18, 4);
HuSprAttrReset(var_r30, arg0->unk_58 + 0x1C, 4);
HuSprAttrSet(var_r30, arg0->unk_58 + 0x20, 4);
HuSprAttrSet(var_r30, arg0->unk_58 + 0x24, 4);
HuSprAttrSet(var_r30, arg0->unk_58 + 0x31, 4);
HuSprAttrReset(var_r30, arg0->unk_58 + 0x18, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(var_r30, arg0->unk_58 + 0x1C, HUSPR_ATTR_DISPOFF);
HuSprAttrSet(var_r30, arg0->unk_58 + 0x20, HUSPR_ATTR_DISPOFF);
HuSprAttrSet(var_r30, arg0->unk_58 + 0x24, HUSPR_ATTR_DISPOFF);
HuSprAttrSet(var_r30, arg0->unk_58 + 0x31, HUSPR_ATTR_DISPOFF);
}
void fn_1_17914(MentDllUnkBss3114Struct *arg0)
@ -4355,24 +4355,24 @@ void fn_1_179DC(void)
var_r30 = lbl_1_bss_35BC[0].unk_34;
for (var_r29 = 0; var_r29 < 0x11; var_r29++) {
HuSprAttrSet(var_r30, var_r29, 4);
HuSprAttrSet(var_r30, var_r29, HUSPR_ATTR_DISPOFF);
}
for (var_r29 = 0; var_r29 < 4; var_r29++) {
var_r31 = &lbl_1_bss_3114[var_r29];
HuSprPosSet(var_r30, var_r31->unk_68, lbl_1_data_5BC[var_r31->unk_58][0], lbl_1_data_5BC[var_r31->unk_58][1]);
HuSprAttrReset(var_r30, var_r31->unk_68, 4);
HuSprAttrReset(var_r30, var_r31->unk_68, HUSPR_ATTR_DISPOFF);
if (var_r31->unk_60 == 0) {
HuSprBankSet(var_r30, var_r31->unk_58 + 8, var_r31->unk_58);
HuSprPosSet(var_r30, var_r31->unk_58 + 8, lbl_1_data_5BC[var_r31->unk_58][0], lbl_1_data_5BC[var_r31->unk_58][1] + 0x19);
HuSprAttrReset(var_r30, var_r31->unk_58 + 8, 4);
HuSprAttrReset(var_r30, var_r31->unk_58 + 8, HUSPR_ATTR_DISPOFF);
}
else {
HuSprBankSet(var_r30, var_r31->unk_58 + 0xC, var_r31->unk_64);
HuSprPosSet(var_r30, var_r31->unk_58 + 0xC, lbl_1_data_5BC[var_r31->unk_58][0], lbl_1_data_5BC[var_r31->unk_58][1] + 0x19);
HuSprAttrReset(var_r30, var_r31->unk_58 + 0xC, 4);
HuSprAttrReset(var_r30, var_r31->unk_58 + 0xC, HUSPR_ATTR_DISPOFF);
}
}
HuSprAttrReset(var_r30, 0x10, 4);
HuSprAttrReset(var_r30, 0x10, HUSPR_ATTR_DISPOFF);
HuSprGrpPosSet(var_r30, 16.0f, -500.0f);
}
@ -4407,24 +4407,24 @@ void fn_1_17CC8(MentDllUnkBss35BCStruct *arg0, s32 arg1, s32 arg2, s32 arg3)
HuSprPosSet(var_r26, 0x10, 96.0f, 32.0f);
var_r29 = lbl_1_bss_35BC[0].unk_34;
for (var_r28 = 0; var_r28 < 0x11; var_r28++) {
HuSprAttrSet(var_r29, var_r28, 4);
HuSprAttrSet(var_r29, var_r28, HUSPR_ATTR_DISPOFF);
}
for (var_r28 = 0; var_r28 < 4; var_r28++) {
var_r31 = &lbl_1_bss_3114[var_r28];
HuSprPosSet(var_r29, var_r31->unk_68, lbl_1_data_5BC[var_r31->unk_58][0], lbl_1_data_5BC[var_r31->unk_58][1]);
HuSprAttrReset(var_r29, var_r31->unk_68, 4);
HuSprAttrReset(var_r29, var_r31->unk_68, HUSPR_ATTR_DISPOFF);
if (var_r31->unk_60 == 0) {
HuSprBankSet(var_r29, var_r31->unk_58 + 8, var_r31->unk_58);
HuSprPosSet(var_r29, var_r31->unk_58 + 8, lbl_1_data_5BC[var_r31->unk_58][0], lbl_1_data_5BC[var_r31->unk_58][1] + 0x19);
HuSprAttrReset(var_r29, var_r31->unk_58 + 8, 4);
HuSprAttrReset(var_r29, var_r31->unk_58 + 8, HUSPR_ATTR_DISPOFF);
}
else {
HuSprBankSet(var_r29, var_r31->unk_58 + 0xC, var_r31->unk_64);
HuSprPosSet(var_r29, var_r31->unk_58 + 0xC, lbl_1_data_5BC[var_r31->unk_58][0], lbl_1_data_5BC[var_r31->unk_58][1] + 0x19);
HuSprAttrReset(var_r29, var_r31->unk_58 + 0xC, 4);
HuSprAttrReset(var_r29, var_r31->unk_58 + 0xC, HUSPR_ATTR_DISPOFF);
}
}
HuSprAttrReset(var_r29, 0x10, 4);
HuSprAttrReset(var_r29, 0x10, HUSPR_ATTR_DISPOFF);
HuSprGrpPosSet(var_r29, 16.0f, -500.0f);
}
@ -4438,24 +4438,24 @@ void fn_1_1811C(void)
var_r30 = lbl_1_bss_35BC[0].unk_34;
for (var_r29 = 0; var_r29 < 0x11; var_r29++) {
HuSprAttrSet(var_r30, var_r29, 4);
HuSprAttrSet(var_r30, var_r29, HUSPR_ATTR_DISPOFF);
}
for (var_r29 = 0; var_r29 < 4; var_r29++) {
var_r31 = &lbl_1_bss_3114[var_r29];
HuSprPosSet(var_r30, var_r31->unk_68, lbl_1_data_5BC[var_r31->unk_58][0], lbl_1_data_5BC[var_r31->unk_58][1]);
HuSprAttrReset(var_r30, var_r31->unk_68, 4);
HuSprAttrReset(var_r30, var_r31->unk_68, HUSPR_ATTR_DISPOFF);
if (var_r31->unk_60 == 0) {
HuSprBankSet(var_r30, var_r31->unk_58 + 8, var_r31->unk_58);
HuSprPosSet(var_r30, var_r31->unk_58 + 8, lbl_1_data_5BC[var_r31->unk_58][0], lbl_1_data_5BC[var_r31->unk_58][1] + 0x19);
HuSprAttrReset(var_r30, var_r31->unk_58 + 8, 4);
HuSprAttrReset(var_r30, var_r31->unk_58 + 8, HUSPR_ATTR_DISPOFF);
}
else {
HuSprBankSet(var_r30, var_r31->unk_58 + 0xC, var_r31->unk_64);
HuSprPosSet(var_r30, var_r31->unk_58 + 0xC, lbl_1_data_5BC[var_r31->unk_58][0], lbl_1_data_5BC[var_r31->unk_58][1] + 0x19);
HuSprAttrReset(var_r30, var_r31->unk_58 + 0xC, 4);
HuSprAttrReset(var_r30, var_r31->unk_58 + 0xC, HUSPR_ATTR_DISPOFF);
}
}
HuSprAttrReset(var_r30, 0x10, 4);
HuSprAttrReset(var_r30, 0x10, HUSPR_ATTR_DISPOFF);
HuSprGrpPosSet(var_r30, 16.0f, -500.0f);
for (var_r28 = 0; var_r28 <= 0x3C; var_r28++) {
fn_1_4D8();
@ -4551,18 +4551,18 @@ void fn_1_18A54(s32 arg0)
if (arg0 != 5) {
HuSprBankSet(var_r31, 0, arg0);
HuSprBankSet(var_r31, 1, arg0);
HuSprAttrSet(var_r31, 2, 4);
HuSprAttrSet(var_r31, 3, 4);
HuSprAttrReset(var_r31, 0, 4);
HuSprAttrReset(var_r31, 1, 4);
HuSprAttrSet(var_r31, 2, HUSPR_ATTR_DISPOFF);
HuSprAttrSet(var_r31, 3, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(var_r31, 0, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(var_r31, 1, HUSPR_ATTR_DISPOFF);
if (lbl_1_bss_A8[0] != 0) {
if ((arg0 == 0 && _CheckFlag(FLAG_ID_MAKE(0, 2)) != 0) || (arg0 == 1 && _CheckFlag(FLAG_ID_MAKE(0, 3)) != 0)
|| (arg0 == 2 && _CheckFlag(FLAG_ID_MAKE(0, 4)) != 0) || (arg0 == 3 && (_CheckFlag(FLAG_ID_MAKE(0, 5)) != 0))
|| (arg0 == 4 && (_CheckFlag(FLAG_ID_MAKE(0, 6)) != 0))) {
HuSprAttrReset(var_r31, 4, 4);
HuSprAttrReset(var_r31, 5, 4);
HuSprAttrReset(var_r31, 4, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(var_r31, 5, HUSPR_ATTR_DISPOFF);
HuSprTPLvlSet(var_r31, 5, 0.8f);
HuSprAttrReset(var_r31, 6, 4);
HuSprAttrReset(var_r31, 6, HUSPR_ATTR_DISPOFF);
HuSprTPLvlSet(var_r31, 6, 0.5f);
}
else {
@ -4573,10 +4573,10 @@ void fn_1_18A54(s32 arg0)
}
}
else {
HuSprAttrSet(var_r31, 0, 4);
HuSprAttrSet(var_r31, 1, 4);
HuSprAttrReset(var_r31, 2, 4);
HuSprAttrReset(var_r31, 3, 4);
HuSprAttrSet(var_r31, 0, HUSPR_ATTR_DISPOFF);
HuSprAttrSet(var_r31, 1, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(var_r31, 2, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(var_r31, 3, HUSPR_ATTR_DISPOFF);
}
lbl_1_bss_35BC[0].unk_08[0] = arg0;
lbl_1_bss_35BC[0].unk_1C[1] = (rand8() % 10) * 0x24;
@ -4664,47 +4664,47 @@ void fn_1_190E8(void)
var_r30 = lbl_1_bss_35BC[0].unk_3C;
for (var_r31 = 0; var_r31 < 0x5B; var_r31++) {
HuSprAttrSet(var_r30, var_r31, 4);
HuSprAttrSet(var_r30, var_r31, HUSPR_ATTR_DISPOFF);
}
if (lbl_1_bss_A8[2] != 5) {
HuSprBankSet(var_r30, 0, lbl_1_bss_A8[2]);
HuSprAttrReset(var_r30, 0, 4);
HuSprAttrReset(var_r30, 0, HUSPR_ATTR_DISPOFF);
}
else {
HuSprAttrReset(var_r30, 1, 4);
HuSprAttrReset(var_r30, 1, HUSPR_ATTR_DISPOFF);
}
HuSprAttrReset(var_r30, 2, 4);
HuSprAttrReset(var_r30, 2, HUSPR_ATTR_DISPOFF);
HuSprPosSet(var_r30, 2, 288.0f, lbl_1_data_5DC[0][1]);
HuSprScaleSet(var_r30, 2, 1.0f, lbl_1_data_5DC[0][2]);
for (var_r31 = 0; var_r31 < 2; var_r31++) {
HuSprAttrReset(var_r30, var_r31 + 3, 4);
HuSprAttrReset(var_r30, var_r31 + 3, HUSPR_ATTR_DISPOFF);
HuSprPosSet(var_r30, var_r31 + 3, lbl_1_data_5DC[0][var_r31 + 3], lbl_1_data_5DC[0][1]);
}
for (var_r31 = 0; var_r31 < 4; var_r31++) {
HuSprAttrReset(var_r30, lbl_1_bss_3114[var_r31].unk_68 + 7, 4);
HuSprAttrReset(var_r30, lbl_1_bss_3114[var_r31].unk_68 + 7, HUSPR_ATTR_DISPOFF);
HuSprPosSet(var_r30, lbl_1_bss_3114[var_r31].unk_68 + 7, lbl_1_data_5DC[lbl_1_bss_3114[var_r31].unk_58][0], lbl_1_data_5DC[0][1]);
HuSprAttrReset(var_r30, lbl_1_bss_3114[var_r31].unk_58 + 0xF, 4);
HuSprAttrReset(var_r30, lbl_1_bss_3114[var_r31].unk_58 + 0xF, HUSPR_ATTR_DISPOFF);
HuSprPosSet(
var_r30, lbl_1_bss_3114[var_r31].unk_58 + 0xF, 1.0f + lbl_1_data_5DC[lbl_1_bss_3114[var_r31].unk_58][0], 2.0f + lbl_1_data_5DC[0][1]);
HuSprAttrReset(var_r30, lbl_1_bss_3114[var_r31].unk_68 + 0x1F, 4);
HuSprAttrReset(var_r30, lbl_1_bss_3114[var_r31].unk_68 + 0x1F, HUSPR_ATTR_DISPOFF);
HuSprPosSet(var_r30, lbl_1_bss_3114[var_r31].unk_68 + 0x1F, lbl_1_data_5DC[lbl_1_bss_3114[var_r31].unk_58][0], lbl_1_data_5DC[4][1] - 9.0f);
HuSprAttrReset(var_r30, lbl_1_bss_3114[var_r31].unk_58 + 0x27, 4);
HuSprAttrReset(var_r30, lbl_1_bss_3114[var_r31].unk_58 + 0x27, HUSPR_ATTR_DISPOFF);
HuSprPosSet(
var_r30, lbl_1_bss_3114[var_r31].unk_58 + 0x27, 1.0f + lbl_1_data_5DC[lbl_1_bss_3114[var_r31].unk_58][0], lbl_1_data_5DC[4][1] - 7.0f);
if (lbl_1_bss_3114[var_r31].unk_60 != 0) {
HuSprAttrReset(var_r30, var_r31 + 0x1B, 4);
HuSprAttrReset(var_r30, var_r31 + 0x1B, HUSPR_ATTR_DISPOFF);
HuSprBankSet(var_r30, var_r31 + 0x1B, lbl_1_bss_3114[var_r31].unk_64);
HuSprPosSet(var_r30, var_r31 + 0x1B, lbl_1_data_5DC[lbl_1_bss_3114[var_r31].unk_58][0], 21.0f + lbl_1_data_5DC[0][1]);
}
else {
HuSprAttrReset(var_r30, var_r31 + 0x17, 4);
HuSprAttrReset(var_r30, var_r31 + 0x17, HUSPR_ATTR_DISPOFF);
HuSprBankSet(var_r30, var_r31 + 0x17, lbl_1_bss_3114[var_r31].unk_58);
HuSprPosSet(var_r30, var_r31 + 0x17, lbl_1_data_5DC[lbl_1_bss_3114[var_r31].unk_58][0] - 8.0f, lbl_1_data_5DC[0][1] - 21.0f);
}
HuSprPosSet(var_r30, var_r31 + 0x2F, lbl_1_data_5DC[lbl_1_bss_3114[var_r31].unk_58][0], 20.0f + lbl_1_data_5DC[4][1]);
HuSprAttrReset(var_r30, var_r31 + 0x2F, 4);
HuSprAttrReset(var_r30, var_r31 + 0x2F, HUSPR_ATTR_DISPOFF);
HuSprPosSet(var_r30, var_r31 + 0x33, 10.0f + lbl_1_data_5DC[lbl_1_bss_3114[var_r31].unk_58][0], 21.0f + lbl_1_data_5DC[4][1]);
HuSprAttrReset(var_r30, var_r31 + 0x33, 4);
HuSprAttrReset(var_r30, var_r31 + 0x33, HUSPR_ATTR_DISPOFF);
HuSprBankSet(var_r30, var_r31 + 0x33, 0);
HuSprPosSet(var_r30, lbl_1_bss_3114[var_r31].unk_68 + 0x37, lbl_1_data_5DC[lbl_1_bss_3114[var_r31].unk_58][0], lbl_1_data_5DC[4][1] - 7.0f);
HuSprPosSet(var_r30, var_r31 + 0x3F, lbl_1_data_5DC[lbl_1_bss_3114[var_r31].unk_58][0], 23.0f + lbl_1_data_5DC[4][1]);
@ -4713,37 +4713,37 @@ void fn_1_190E8(void)
}
HuSprPosSet(var_r30, 0x47, 340.0f, lbl_1_data_5DC[0][1]);
HuSprScaleSet(var_r30, 0x47, 0.0f, 0.0f);
HuSprAttrReset(var_r30, 0x47, 4);
HuSprAttrReset(var_r30, 0x47, HUSPR_ATTR_DISPOFF);
#if VERSION_NTSC
HuSprAttrReset(var_r30, 0x48, 4);
HuSprAttrReset(var_r30, 0x48, HUSPR_ATTR_DISPOFF);
HuSprPosSet(var_r30, 0x48, 366.0f, lbl_1_data_5DC[1][1]);
HuSprAttrReset(var_r30, 0x49, 4);
HuSprAttrReset(var_r30, 0x49, HUSPR_ATTR_DISPOFF);
HuSprPosSet(var_r30, 0x49, 367.0f, 2.0f + lbl_1_data_5DC[1][1]);
#endif
for (var_r31 = 0; var_r31 < 2; var_r31++) {
HuSprAttrReset(var_r30, var_r31 + 0x4A, 4);
HuSprAttrReset(var_r30, var_r31 + 0x4A, HUSPR_ATTR_DISPOFF);
HuSprPosSet(var_r30, var_r31 + 0x4A, POSX1 - (var_r31 * (POSX1-POSX2)), lbl_1_data_5DC[1][1]);
HuSprBankSet(var_r30, var_r31 + 0x4A, var_r31);
HuSprAttrReset(var_r30, var_r31 + 0x4C, 4);
HuSprAttrReset(var_r30, var_r31 + 0x4C, HUSPR_ATTR_DISPOFF);
HuSprPosSet(var_r30, var_r31 + 0x4C, POSX1+1 - (var_r31 * (POSX1-POSX2)), 2.0f + lbl_1_data_5DC[1][1]);
HuSprBankSet(var_r30, var_r31 + 0x4C, var_r31);
}
HuSprAttrReset(var_r30, 0x4E, 4);
HuSprAttrReset(var_r30, 0x4E, HUSPR_ATTR_DISPOFF);
HuSprPosSet(var_r30, 0x4E, 340.0f, lbl_1_data_5DC[2][1]);
HuSprBankSet(var_r30, 0x4E, 0);
HuSprAttrReset(var_r30, 0x4F, 4);
HuSprAttrReset(var_r30, 0x4F, HUSPR_ATTR_DISPOFF);
HuSprPosSet(var_r30, 0x4F, 341.0f, 2.0f + lbl_1_data_5DC[2][1]);
HuSprBankSet(var_r30, 0x4F, 0);
HuSprAttrReset(var_r30, 0x50, 4);
HuSprAttrReset(var_r30, 0x50, HUSPR_ATTR_DISPOFF);
HuSprPosSet(var_r30, 0x50, 340.0f, lbl_1_data_5DC[3][1]);
HuSprBankSet(var_r30, 0x50, 0);
HuSprAttrReset(var_r30, 0x51, 4);
HuSprAttrReset(var_r30, 0x51, HUSPR_ATTR_DISPOFF);
HuSprPosSet(var_r30, 0x51, 341.0f, 2.0f + lbl_1_data_5DC[3][1]);
HuSprBankSet(var_r30, 0x51, 0);
HuSprAttrReset(var_r30, 0x52, 4);
HuSprAttrReset(var_r30, 0x52, HUSPR_ATTR_DISPOFF);
for (var_r31 = 0; var_r31 < 4; var_r31++) {
HuSprAttrReset(var_r30, var_r31 + 0x53, 4);
HuSprAttrReset(var_r30, var_r31 + 0x57, 4);
HuSprAttrReset(var_r30, var_r31 + 0x53, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(var_r30, var_r31 + 0x57, HUSPR_ATTR_DISPOFF);
}
for (var_r31 = 0; var_r31 < 5; var_r31++) {
HuWinPosSet(lbl_1_bss_35BC[0].unk_44[var_r31], 100.0f, -500.0f + (lbl_1_data_5DC[var_r31][1] - 21.0f));
@ -5052,13 +5052,13 @@ void fn_1_19C98(omObjData *arg0, MentDllUnkBss35BCStruct *arg1)
HuSprPosSet(var_r30, 6, var_f31, 49.0f + lbl_1_data_5DC[4][1]);
if (var_r29 == 3) {
for (var_r28 = 0; var_r28 < 4; var_r28++) {
HuSprAttrSet(var_r30, lbl_1_bss_3114[var_r28].unk_68 + 0x37, 4);
HuSprAttrSet(var_r30, var_r28 + 0x3F, 4);
HuSprAttrSet(var_r30, var_r28 + 0x43, 4);
HuSprAttrSet(var_r30, lbl_1_bss_3114[var_r28].unk_68 + 0x37, HUSPR_ATTR_DISPOFF);
HuSprAttrSet(var_r30, var_r28 + 0x3F, HUSPR_ATTR_DISPOFF);
HuSprAttrSet(var_r30, var_r28 + 0x43, HUSPR_ATTR_DISPOFF);
}
HuSprAttrReset(var_r30, lbl_1_bss_3114[arg1->unk_1C[4]].unk_68 + 0x37, 4);
HuSprAttrReset(var_r30, arg1->unk_1C[4] + 0x3F, 4);
HuSprAttrReset(var_r30, arg1->unk_1C[4] + 0x43, 4);
HuSprAttrReset(var_r30, lbl_1_bss_3114[arg1->unk_1C[4]].unk_68 + 0x37, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(var_r30, arg1->unk_1C[4] + 0x3F, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(var_r30, arg1->unk_1C[4] + 0x43, HUSPR_ATTR_DISPOFF);
}
break;
}
@ -5101,9 +5101,9 @@ void fn_1_19C98(omObjData *arg0, MentDllUnkBss35BCStruct *arg1)
HuSprPosSet(var_r30, 5, lbl_1_data_5DC[arg1->unk_1C[4]][0], (lbl_1_data_5DC[4][1] - var_f29) - 48.0f);
HuSprPosSet(var_r30, 6, lbl_1_data_5DC[arg1->unk_1C[4]][0], 49.0f + (lbl_1_data_5DC[4][1] + var_f29));
for (var_r28 = 0; var_r28 < 4; var_r28++) {
HuSprAttrSet(var_r30, lbl_1_bss_3114[var_r28].unk_68 + 0x37, 4);
HuSprAttrSet(var_r30, var_r28 + 0x3F, 4);
HuSprAttrSet(var_r30, var_r28 + 0x43, 4);
HuSprAttrSet(var_r30, lbl_1_bss_3114[var_r28].unk_68 + 0x37, HUSPR_ATTR_DISPOFF);
HuSprAttrSet(var_r30, var_r28 + 0x3F, HUSPR_ATTR_DISPOFF);
HuSprAttrSet(var_r30, var_r28 + 0x43, HUSPR_ATTR_DISPOFF);
}
}
else {
@ -5111,8 +5111,8 @@ void fn_1_19C98(omObjData *arg0, MentDllUnkBss35BCStruct *arg1)
HuSprPosSet(var_r30, 3, var_f31, var_f29);
var_f31 = fn_1_32C(sp8[1], 33.0f + lbl_1_data_5DC[arg1->unk_1C[4]][0], var_r29, 10.0f);
HuSprPosSet(var_r30, 4, var_f31, var_f29);
HuSprAttrReset(var_r30, 5, 4);
HuSprAttrReset(var_r30, 6, 4);
HuSprAttrReset(var_r30, 5, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(var_r30, 6, HUSPR_ATTR_DISPOFF);
var_f30 = fn_1_32C(0.0f, 1.0f, var_r29, 10.0f);
HuSprTPLvlSet(var_r30, 5, var_f30);
HuSprTPLvlSet(var_r30, 6, var_f30);
@ -5120,15 +5120,15 @@ void fn_1_19C98(omObjData *arg0, MentDllUnkBss35BCStruct *arg1)
HuSprPosSet(var_r30, 5, lbl_1_data_5DC[arg1->unk_1C[4]][0], (lbl_1_data_5DC[4][1] - var_f29) - 48.0f);
HuSprPosSet(var_r30, 6, lbl_1_data_5DC[arg1->unk_1C[4]][0], 49.0f + (lbl_1_data_5DC[4][1] + var_f29));
if (var_r29 == 3) {
HuSprAttrReset(var_r30, lbl_1_bss_3114[arg1->unk_1C[4]].unk_68 + 0x37, 4);
HuSprAttrReset(var_r30, arg1->unk_1C[4] + 0x3F, 4);
HuSprAttrReset(var_r30, arg1->unk_1C[4] + 0x43, 4);
HuSprAttrReset(var_r30, lbl_1_bss_3114[arg1->unk_1C[4]].unk_68 + 0x37, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(var_r30, arg1->unk_1C[4] + 0x3F, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(var_r30, arg1->unk_1C[4] + 0x43, HUSPR_ATTR_DISPOFF);
}
}
}
if (arg1->unk_08[0] != 4) {
HuSprAttrSet(var_r30, 5, 4);
HuSprAttrSet(var_r30, 6, 4);
HuSprAttrSet(var_r30, 5, HUSPR_ATTR_DISPOFF);
HuSprAttrSet(var_r30, 6, HUSPR_ATTR_DISPOFF);
}
}
lbl_1_bss_35BC[0].unk_08[3] = 0;
@ -5266,18 +5266,18 @@ void fn_1_1C554(void)
var_r30 = lbl_1_bss_35BC[0].unk_3C;
var_r29 = &lbl_1_bss_35BC[1];
HuSprAttrReset(var_r30, 2, 4);
HuSprAttrReset(var_r30, 2, HUSPR_ATTR_DISPOFF);
if (lbl_1_bss_35BC[1].unk_08[0] == 4) {
for (var_r31 = 0; var_r31 < 4; var_r31++) {
HuSprAttrReset(var_r30, var_r31 + 3, 4);
HuSprAttrReset(var_r30, var_r31 + 3, HUSPR_ATTR_DISPOFF);
}
HuSprAttrReset(var_r30, lbl_1_bss_3114[var_r29->unk_1C[4]].unk_68 + 0x37, 4);
HuSprAttrReset(var_r30, var_r29->unk_1C[4] + 0x3F, 4);
HuSprAttrReset(var_r30, var_r29->unk_1C[4] + 0x43, 4);
HuSprAttrReset(var_r30, lbl_1_bss_3114[var_r29->unk_1C[4]].unk_68 + 0x37, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(var_r30, var_r29->unk_1C[4] + 0x3F, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(var_r30, var_r29->unk_1C[4] + 0x43, HUSPR_ATTR_DISPOFF);
return;
}
for (var_r31 = 0; var_r31 < 2; var_r31++) {
HuSprAttrReset(var_r30, var_r31 + 3, 4);
HuSprAttrReset(var_r30, var_r31 + 3, HUSPR_ATTR_DISPOFF);
}
}
@ -5289,13 +5289,13 @@ void fn_1_1C674(void)
var_r30 = lbl_1_bss_35BC[0].unk_3C;
var_r31 = &lbl_1_bss_35BC[1];
HuSprAttrSet(var_r30, 2, 4);
HuSprAttrSet(var_r30, 2, HUSPR_ATTR_DISPOFF);
for (var_r29 = 0; var_r29 < 4; var_r29++) {
HuSprAttrSet(var_r30, var_r29 + 3, 4);
HuSprAttrSet(var_r30, var_r29 + 3, HUSPR_ATTR_DISPOFF);
}
HuSprAttrSet(var_r30, lbl_1_bss_3114[var_r31->unk_1C[4]].unk_68 + 0x37, 4);
HuSprAttrSet(var_r30, var_r31->unk_1C[4] + 0x3F, 4);
HuSprAttrSet(var_r30, var_r31->unk_1C[4] + 0x43, 4);
HuSprAttrSet(var_r30, lbl_1_bss_3114[var_r31->unk_1C[4]].unk_68 + 0x37, HUSPR_ATTR_DISPOFF);
HuSprAttrSet(var_r30, var_r31->unk_1C[4] + 0x3F, HUSPR_ATTR_DISPOFF);
HuSprAttrSet(var_r30, var_r31->unk_1C[4] + 0x43, HUSPR_ATTR_DISPOFF);
}
void fn_1_1C754(void)
@ -5317,7 +5317,7 @@ void fn_1_1C754(void)
HuSprAttrSet(var_r28, lbl_1_bss_3114[var_r30->unk_1C[4]].unk_68 + 0x37, 4);
HuSprAttrSet(var_r28, var_r30->unk_1C[4] + 0x3F, 4);
HuSprAttrSet(var_r28, var_r30->unk_1C[4] + 0x43, 4);
for (var_r31 = 0; var_r31 <= 0x3C; var_r31++) {
for (var_r31 = 0; var_r31 <= 60; var_r31++) {
fn_1_4D8();
if (var_r31 <= 0x32) {
var_f31 = fn_1_32C(-500.0f, 10.0f, var_r31, 50.0f);
@ -5372,12 +5372,12 @@ void fn_1_1CBC8(void)
var_r30 = lbl_1_bss_35BC[0].unk_30;
for (var_r31 = 0; var_r31 < 0x22; var_r31++) {
HuSprAttrSet(var_r30, var_r31, 4);
HuSprAttrSet(var_r30, var_r31, HUSPR_ATTR_DISPOFF);
}
HuSprAttrReset(var_r30, 0, 4);
HuSprAttrReset(var_r30, 0, HUSPR_ATTR_DISPOFF);
for (var_r31 = 0; var_r31 < 4; var_r31++) {
HuSprAttrReset(var_r30, var_r31 + 1, 4);
HuSprAttrReset(var_r30, var_r31 + 5, 4);
HuSprAttrReset(var_r30, var_r31 + 1, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(var_r30, var_r31 + 5, HUSPR_ATTR_DISPOFF);
}
HuSprPosSet(var_r30, 0x1B, 288.0f, lbl_1_data_640[1][2]);
HuSprScaleSet(var_r30, 0x1B, 1.0f, 0.75f);
@ -5385,19 +5385,19 @@ void fn_1_1CBC8(void)
HuSprPosSet(var_r30, 0x1D, lbl_1_data_640[1][4], lbl_1_data_640[1][2]);
for (var_r31 = 0; var_r31 < 8; var_r31++) {
HuSprBankSet(var_r30, var_r31 + 9, 0);
HuSprAttrReset(var_r30, var_r31 + 9, 4);
HuSprAttrReset(var_r30, var_r31 + 0x11, 4);
HuSprAttrReset(var_r30, var_r31 + 9, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(var_r30, var_r31 + 0x11, HUSPR_ATTR_DISPOFF);
}
HuSprAttrReset(var_r30, 0x19, 4);
HuSprAttrReset(var_r30, 0x1A, 4);
HuSprAttrReset(var_r30, 0x19, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(var_r30, 0x1A, HUSPR_ATTR_DISPOFF);
HuSprBankSet(var_r30, 0x1E, 0);
HuSprAttrReset(var_r30, 0x1E, 4);
HuSprAttrReset(var_r30, 0x1E, HUSPR_ATTR_DISPOFF);
HuSprBankSet(var_r30, 0x1F, 0);
HuSprAttrReset(var_r30, 0x1F, 4);
HuSprAttrReset(var_r30, 0x1F, HUSPR_ATTR_DISPOFF);
HuSprBankSet(var_r30, 0x20, 0);
HuSprAttrReset(var_r30, 0x20, 4);
HuSprAttrReset(var_r30, 0x20, HUSPR_ATTR_DISPOFF);
HuSprBankSet(var_r30, 0x21, 0);
HuSprAttrReset(var_r30, 0x21, 4);
HuSprAttrReset(var_r30, 0x21, HUSPR_ATTR_DISPOFF);
for (var_r31 = 0; var_r31 < 3; var_r31++) {
HuWinPosSet(lbl_1_bss_35BC->unk_44[var_r31], 100.0f, lbl_1_data_640[var_r31][2] - 0x209);
}
@ -5548,9 +5548,9 @@ void fn_1_1DED8()
s32 var_r31;
var_r30 = lbl_1_bss_35BC[0].unk_30;
HuSprAttrReset(var_r30, 0x1B, 4);
HuSprAttrReset(var_r30, 0x1B, HUSPR_ATTR_DISPOFF);
for (var_r31 = 0; var_r31 < 2; var_r31++) {
HuSprAttrReset(var_r30, var_r31 + 0x1C, 4);
HuSprAttrReset(var_r30, var_r31 + 0x1C, HUSPR_ATTR_DISPOFF);
}
}
@ -5907,11 +5907,11 @@ void fn_1_1F5F0(void)
var_r31 = lbl_1_bss_35BC[0].unk_34;
for (var_r30 = 0; var_r30 < 9; var_r30++) {
HuSprAttrSet(var_r31, var_r30, 4);
HuSprAttrSet(var_r31, var_r30, HUSPR_ATTR_DISPOFF);
}
HuSprAttrReset(var_r31, 0, 4);
HuSprAttrReset(var_r31, 0, HUSPR_ATTR_DISPOFF);
HuSprBankSet(var_r31, 0, lbl_1_bss_35BC[0].unk_1C[0]);
HuSprAttrReset(var_r31, lbl_1_bss_3114->unk_68 + 1, 4);
HuSprAttrReset(var_r31, lbl_1_bss_3114->unk_68 + 1, HUSPR_ATTR_DISPOFF);
HuSprGrpPosSet(var_r31, 16.0f, -500.0f);
}
@ -5937,9 +5937,9 @@ void fn_1_1F6B8(MentDllUnkBss35BCStruct *arg0, s32 arg1, s32 arg2, s32 arg3)
for (var_r28 = 0; var_r28 < 9; var_r28++) {
HuSprAttrSet(var_r30, var_r28, 4);
}
HuSprAttrReset(var_r30, 0, 4);
HuSprAttrReset(var_r30, 0, HUSPR_ATTR_DISPOFF);
HuSprBankSet(var_r30, 0, lbl_1_bss_35BC[0].unk_1C[0]);
HuSprAttrReset(var_r30, lbl_1_bss_3114->unk_68 + 1, 4);
HuSprAttrReset(var_r30, lbl_1_bss_3114->unk_68 + 1, HUSPR_ATTR_DISPOFF);
HuSprGrpPosSet(var_r30, 16.0f, -500.0f);
}
@ -5952,11 +5952,11 @@ void fn_1_1F868(void)
var_r30 = lbl_1_bss_35BC[0].unk_34;
for (var_r29 = 0; var_r29 < 9; var_r29++) {
HuSprAttrSet(var_r30, var_r29, 4);
HuSprAttrSet(var_r30, var_r29, HUSPR_ATTR_DISPOFF);
}
HuSprAttrReset(var_r30, 0, 4);
HuSprAttrReset(var_r30, 0, HUSPR_ATTR_DISPOFF);
HuSprBankSet(var_r30, 0, lbl_1_bss_35BC[0].unk_1C[0]);
HuSprAttrReset(var_r30, lbl_1_bss_3114->unk_68 + 1, 4);
HuSprAttrReset(var_r30, lbl_1_bss_3114->unk_68 + 1, HUSPR_ATTR_DISPOFF);
HuSprGrpPosSet(var_r30, 16.0f, -500.0f);
for (var_r31 = 0; var_r31 <= 0x3C; var_r31++) {
fn_1_4D8();
@ -6023,13 +6023,13 @@ void fn_1_1FE08(void)
for (var_r31 = 0; var_r31 < 4; var_r31++) {
HuSprBankSet(var_r30, var_r31, 0);
lbl_1_bss_3114[var_r31].unk_70[3] = lbl_1_bss_3114[var_r31].unk_60 = 0;
HuSprAttrReset(var_r30, var_r31, 4);
HuSprAttrReset(var_r30, var_r31 + 4, 4);
HuSprAttrReset(var_r30, var_r31, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(var_r30, var_r31 + 4, HUSPR_ATTR_DISPOFF);
}
HuSprAttrReset(var_r30, 0xA, 4);
HuSprAttrReset(var_r30, 0xA, HUSPR_ATTR_DISPOFF);
for (var_r31 = 0; var_r31 < 4; var_r31++) {
HuSprAttrReset(var_r30, var_r31 + 0xB, 4);
HuSprAttrReset(var_r30, var_r31 + 0xF, 4);
HuSprAttrReset(var_r30, var_r31 + 0xB, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(var_r30, var_r31 + 0xF, HUSPR_ATTR_DISPOFF);
}
HuSprGrpPosSet(var_r30, 0.0f, -500.0f);
}
@ -6153,18 +6153,18 @@ void fn_1_2055C(s32 arg0)
spC = 0;
var_r30 = lbl_1_bss_35BC[0].unk_40;
for (var_r31 = 0; var_r31 < 0x13; var_r31++) {
HuSprAttrSet(var_r30, var_r31, 4);
HuSprAttrSet(var_r30, var_r31, HUSPR_ATTR_DISPOFF);
}
for (var_r31 = 0; var_r31 < 4; var_r31++) {
HuSprBankSet(var_r30, var_r31, 0);
lbl_1_bss_3114[var_r31].unk_70[3] = lbl_1_bss_3114[var_r31].unk_60 = 0;
HuSprAttrReset(var_r30, var_r31, 4);
HuSprAttrReset(var_r30, var_r31 + 4, 4);
HuSprAttrReset(var_r30, var_r31, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(var_r30, var_r31 + 4, HUSPR_ATTR_DISPOFF);
}
HuSprAttrReset(var_r30, 0xA, 4);
HuSprAttrReset(var_r30, 0xA, HUSPR_ATTR_DISPOFF);
for (var_r31 = 0; var_r31 < 4; var_r31++) {
HuSprAttrReset(var_r30, var_r31 + 0xB, 4);
HuSprAttrReset(var_r30, var_r31 + 0xF, 4);
HuSprAttrReset(var_r30, var_r31 + 0xB, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(var_r30, var_r31 + 0xF, HUSPR_ATTR_DISPOFF);
}
HuSprGrpPosSet(var_r30, 0.0f, -500.0f);
}
@ -6208,9 +6208,9 @@ void fn_1_208F4(void)
s32 var_r31;
var_r31 = lbl_1_bss_35BC[0].unk_40;
HuSprAttrReset(var_r31, 8, 4);
HuSprAttrReset(var_r31, 8, HUSPR_ATTR_DISPOFF);
HuSprPosSet(var_r31, 8, lbl_1_data_690[0][0] - 0x32, lbl_1_data_690[0][1]);
HuSprAttrReset(var_r31, 9, 4);
HuSprAttrReset(var_r31, 9, HUSPR_ATTR_DISPOFF);
HuSprPosSet(var_r31, 9, lbl_1_data_690[3][0] + 0x32, lbl_1_data_690[0][1]);
}
@ -6274,18 +6274,18 @@ void fn_1_20B54(MentDllUnkBss35BCStruct *arg0, s32 arg1, s32 arg2, s32 arg3)
sp8 = 0;
var_r27 = lbl_1_bss_35BC[0].unk_40;
for (var_r30 = 0; var_r30 < 0x13; var_r30++) {
HuSprAttrSet(var_r27, var_r30, 4);
HuSprAttrSet(var_r27, var_r30, HUSPR_ATTR_DISPOFF);
}
for (var_r30 = 0; var_r30 < 4; var_r30++) {
HuSprBankSet(var_r27, var_r30, 0);
lbl_1_bss_3114[var_r30].unk_70[3] = lbl_1_bss_3114[var_r30].unk_60 = 0;
HuSprAttrReset(var_r27, var_r30, 4);
HuSprAttrReset(var_r27, var_r30 + 4, 4);
HuSprAttrReset(var_r27, var_r30, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(var_r27, var_r30 + 4, HUSPR_ATTR_DISPOFF);
}
HuSprAttrReset(var_r27, 0xA, 4);
HuSprAttrReset(var_r27, 0xA, HUSPR_ATTR_DISPOFF);
for (var_r30 = 0; var_r30 < 4; var_r30++) {
HuSprAttrReset(var_r27, var_r30 + 0xB, 4);
HuSprAttrReset(var_r27, var_r30 + 0xF, 4);
HuSprAttrReset(var_r27, var_r30 + 0xB, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(var_r27, var_r30 + 0xF, HUSPR_ATTR_DISPOFF);
}
HuSprGrpPosSet(var_r27, 0.0f, -500.0f);
}

8
src/REL/modeseldll/filesel.c
View file

@ -1977,15 +1977,15 @@ void fn_1_AAB8(void)
HuSprGrpScaleSet(lbl_1_bss_116[temp_r30], temp_f31, temp_f31);
if (lbl_1_bss_EE[temp_r30] > 9999) {
for (temp_r28 = 0; temp_r28 < 4; temp_r28++) {
HuSprAttrSet(lbl_1_bss_116[temp_r30], temp_r28 + 1, 4);
HuSprAttrSet(lbl_1_bss_116[temp_r30], temp_r28 + 1, HUSPR_ATTR_DISPOFF);
}
HuSprAttrReset(lbl_1_bss_116[temp_r30], 5, 4);
HuSprAttrReset(lbl_1_bss_116[temp_r30], 5, HUSPR_ATTR_DISPOFF);
}
else {
for (temp_r28 = 0; temp_r28 < 4; temp_r28++) {
HuSprAttrReset(lbl_1_bss_116[temp_r30], temp_r28 + 1, 4);
HuSprAttrReset(lbl_1_bss_116[temp_r30], temp_r28 + 1, HUSPR_ATTR_DISPOFF);
}
HuSprAttrSet(lbl_1_bss_116[temp_r30], 5, 4);
HuSprAttrSet(lbl_1_bss_116[temp_r30], 5, HUSPR_ATTR_DISPOFF);
temp_r29 = lbl_1_bss_EE[temp_r30];
HuSprBankSet(lbl_1_bss_116[temp_r30], 1, temp_r29 / 1000);
temp_r29 -= (temp_r29 / 1000) * 1000;

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

@ -619,7 +619,7 @@ static void ShowBattleGame(BattleWork *arg0, omObjData *arg1) {
arg0->unk01 = 1;
arg1->trans.z = 0.01f;
arg1->trans.y = 0.0f;
HuSprAttrReset(arg0->unk08, 0, 4);
HuSprAttrReset(arg0->unk08, 0, HUSPR_ATTR_DISPOFF);
HuSprPosSet(arg0->unk08, 0, 0.0f, 0.0f);
} else {
return;
@ -682,8 +682,8 @@ static void UpdateBattleCoin(BattleWork *arg0, omObjData *arg1) {
HuSprBankSet(arg0->unk08, 1, temp_r28);
return;
}
HuSprAttrReset(arg0->unk08, 2, 4);
HuSprAttrReset(arg0->unk08, 1, 5);
HuSprAttrReset(arg0->unk08, 2, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(arg0->unk08, 1, HUSPR_ATTR_NOANIM | HUSPR_ATTR_DISPOFF);
HuSprPosSet(arg0->unk08, 2, 0.0f, 40.0f);
HuSprPosSet(arg0->unk08, 1, 34.0f, 40.0f);
HuSprScaleSet(arg0->unk08, 1, 0.9f, 0.9f);
@ -726,10 +726,10 @@ static void InitBattleGameSpr(BattleWork *arg0, omObjData *arg1) {
temp_r30 = battleMGIdx[0];
temp_r29 = battleMGIdx[1];
HuSprAttrReset(arg0->unk08, 3, 4);
HuSprAttrReset(arg0->unk08, 4, 4);
HuSprAttrReset(arg0->unk08, temp_r30 + 5, 4);
HuSprAttrReset(arg0->unk08, temp_r29 + 5, 4);
HuSprAttrReset(arg0->unk08, 3, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(arg0->unk08, 4, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(arg0->unk08, temp_r30 + 5, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(arg0->unk08, temp_r29 + 5, HUSPR_ATTR_DISPOFF);
HuSprPosSet(arg0->unk08, 3, sp8[0][0], sp8[0][1]);
HuSprPosSet(arg0->unk08, 4, sp8[1][0], sp8[1][1]);
HuSprPosSet(arg0->unk08, temp_r30 + 5, sp8[0][0], sp8[0][1]);

6
src/game/board/char_wheel.c
View file

@ -368,14 +368,14 @@ static void StopCharWheel(CharWheelWork *arg0) {
}
var_r30 = arg0->unk03 % 6;
if (var_r30 < 3) {
HuSprAttrSet(wheelSprGrp, wheelPos + 10, 4);
HuSprAttrSet(wheelSprGrp, wheelPos + 10, HUSPR_ATTR_DISPOFF);
} else {
HuSprAttrReset(wheelSprGrp, wheelPos + 10, 4);
HuSprAttrReset(wheelSprGrp, wheelPos + 10, HUSPR_ATTR_DISPOFF);
}
if (arg0->unk03 < 90) {
arg0->unk03++;
} else {
HuSprAttrReset(wheelSprGrp, wheelPos + 10, 4);
HuSprAttrReset(wheelSprGrp, wheelPos + 10, HUSPR_ATTR_DISPOFF);
arg0->unk00_field3 = 4;
}
}

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

@ -787,7 +787,7 @@ static void PopupVS(bitcopy* arg0, omObjData* arg1) {
temp_r29 = arg0->unk_0C;
if (arg0->unk_02 == 0) {
HuSprAttrReset(temp_r29->unk_00[0], 0, 4);
HuSprAttrReset(temp_r29->unk_00[0], 0, HUSPR_ATTR_DISPOFF);
HuSprAttrSet(temp_r29->unk_00[0], 0, 8);
HuSprScaleSet(temp_r29->unk_00[0], 0, 0.001f, 0.001f);
HuSprPosSet(temp_r29->unk_00[0], 0, 0.0f, 64.0f);
@ -832,7 +832,7 @@ static void FallMGType(bitcopy* arg0, omObjData* arg1) {
temp_r31 = arg0->unk_0C;
temp_r30 = sp8[mgType];
if (arg0->unk_02 == 0) {
HuSprAttrReset(temp_r31->unk_00[0], temp_r30, 4);
HuSprAttrReset(temp_r31->unk_00[0], temp_r30, HUSPR_ATTR_DISPOFF);
temp_r31->unk_1C[0][temp_r30].y = -284.0f;
temp_r31->unk_1C[1][temp_r30].y = -128.0f;
arg0->unk_02 = 1;
@ -872,7 +872,7 @@ static void LuckyMGFall(bitcopy* arg0, omObjData* arg1) {
temp_r27 = &temp_r29->unk_1C[0][temp_r24];
switch (arg0->unk_02) {
case 0:
HuSprAttrReset(temp_r29->unk_00[0], 4, 4);
HuSprAttrReset(temp_r29->unk_00[0], 4, HUSPR_ATTR_DISPOFF);
temp_r28->y = -284.0f;
temp_r25->y = -128.0f;
arg0->unk_02 = 1;
@ -889,7 +889,7 @@ static void LuckyMGFall(bitcopy* arg0, omObjData* arg1) {
case 2:
temp_r27->y += 10.0f;
if (328.0f < temp_r27->y) {
HuSprAttrReset(temp_r29->unk_00[0], temp_r24, 4);
HuSprAttrReset(temp_r29->unk_00[0], temp_r24, HUSPR_ATTR_DISPOFF);
temp_r26 = (bitcopy*) mgSetupObj->work;
temp_r26->field00_bit1 = 7;
temp_r26->unk_02 = 0;
@ -935,8 +935,8 @@ static void UpdateLuckyValue(bitcopy* arg0, omObjData* arg1) {
temp_r27 = arg0->unk_0C;
switch (arg0->unk_02) {
case 0:
HuSprAttrReset(temp_r27->unk_00[0], 8, 4);
HuSprAttrReset(temp_r27->unk_00[0], 9, 4);
HuSprAttrReset(temp_r27->unk_00[0], 8, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(temp_r27->unk_00[0], 9, HUSPR_ATTR_DISPOFF);
HuSprAttrSet(temp_r27->unk_00[0], 8, 8);
HuSprAttrSet(temp_r27->unk_00[0], 9, 8);
HuSprPosSet(temp_r27->unk_00[0], 8, 0.0f, 0.0f);
@ -1042,10 +1042,10 @@ static void UpdateMGList(bitcopy* arg0, omObjData* arg1) {
temp_r24 = arg0->unk_0C;
temp_r22 = mgType + 5;
switch (arg0->unk_02) { /* irregular */
switch (arg0->unk_02) {
case 0:
HuSprAttrSet(temp_r24->unk_00[0], temp_r22, 8);
HuSprAttrReset(temp_r24->unk_00[0], temp_r22, 4);
HuSprAttrReset(temp_r24->unk_00[0], temp_r22, HUSPR_ATTR_DISPOFF);
HuSprPosSet(temp_r24->unk_00[0], temp_r22, 0.0f, 32.0f);
HuSprScaleSet(temp_r24->unk_00[0], temp_r22, 0.001f, 0.001f);
arg0->unk_04 = 0;
@ -1084,11 +1084,11 @@ static void UpdateMGList(bitcopy* arg0, omObjData* arg1) {
for (var_r23 = 0; var_r23 < arg0->field01_bit0; var_r23++) {
HuWinDispOn(activeMG[var_r23].unk_00);
}
HuSprAttrReset(temp_r24->unk_00[0], 0xA, 4);
HuSprAttrReset(temp_r24->unk_00[0], 0xA, HUSPR_ATTR_DISPOFF);
HuSprAttrSet(temp_r24->unk_00[0], 0xA, 8);
HuSprPosSet(temp_r24->unk_00[0], 0xA, -148.0f, cursorYTbl[0]);
temp_r18 = &hiliteColTbl[mgType];
HuSprAttrReset(temp_r24->unk_00[0], 0xC, 4);
HuSprAttrReset(temp_r24->unk_00[0], 0xC, HUSPR_ATTR_DISPOFF);
HuSprPosSet(temp_r24->unk_00[0], 0xC, 0.0f, hiliteYTbl[0]);
HuSprTPLvlSet(temp_r24->unk_00[0], 0xC, 0.7f);
HuSprScaleSet(temp_r24->unk_00[0], 0xC, 32.0f, 3.5f);
@ -1158,10 +1158,10 @@ static void UpdateMGList(bitcopy* arg0, omObjData* arg1) {
hiliteTimer = 0;
}
if (hiliteShowF != 0) {
HuSprAttrReset(temp_r24->unk_00[0], 0xC, 4);
HuSprAttrReset(temp_r24->unk_00[0], 0xC, HUSPR_ATTR_DISPOFF);
return;
}
HuSprAttrSet(temp_r24->unk_00[0], 0xC, 4);
HuSprAttrSet(temp_r24->unk_00[0], 0xC, HUSPR_ATTR_DISPOFF);
return;
case 5:
if (arg0->unk_03 < 0x5A) {

32
src/game/board/pause.c
View file

@ -717,9 +717,9 @@ static void InitPauseQuit(omObjData *arg0, ConfigWork *arg1) {
SetBoxVisible(1);
var_f31 = 0.5f;
BoardModelScaleSet(boxModelID[7], var_f31, var_f31, var_f31);
HuSprAttrReset(pauseCursorPos, 0, 4);
HuSprAttrReset(pauseCursorPos, 0, HUSPR_ATTR_DISPOFF);
if (GWPartyGet() == 0) {
HuSprAttrReset(pauseCursorPos, 1, 4);
HuSprAttrReset(pauseCursorPos, 1, HUSPR_ATTR_DISPOFF);
}
break;
}
@ -822,7 +822,7 @@ static void ScrollInPadConfig(omObjData *arg0, ConfigWork *arg1) {
s32 i;
if (arg1->unk07 == 0) {
HuSprAttrReset(pauseCursorPos, 0, 4);
HuSprAttrReset(pauseCursorPos, 0, HUSPR_ATTR_DISPOFF);
if (arg1->unk00_field2 != 0) {
for (i = 0; i < 8; i++) {
if (i != 0) {
@ -1332,8 +1332,8 @@ static s32 WaitPauseInput(void) {
}
HuWinDispOn(controlWin);
SetBoxVisible(0);
HuSprAttrReset(pauseSprGrp, 0, 4);
HuSprAttrSet(pauseCursorPos, 0, 4);
HuSprAttrReset(pauseSprGrp, 0, HUSPR_ATTR_DISPOFF);
HuSprAttrSet(pauseCursorPos, 0, HUSPR_ATTR_DISPOFF);
PauseCreateNumber(0, GWSystem.turn);
PauseCreateNumber(1, GWSystem.max_turn);
HuPrcSleep(4);
@ -1376,15 +1376,15 @@ static void ShowPauseConfig(void) {
HuWinDispOn(settingsControlWin);
HuWinDispOn(settingsWin);
SetBoxVisible(1);
HuSprAttrReset(pauseCursorPos, 0, 4);
HuSprAttrReset(pauseCursorPos, 0, HUSPR_ATTR_DISPOFF);
BoardModelVisibilitySet(hostMdl, 1);
if (GWPartyGet() == 0) {
var_f31 = boxPosTbl[0][0];
var_f30 = boxPosTbl[0][1];
HuSprPosSet(pauseCursorPos, 1, var_f31, var_f30);
HuSprAttrReset(pauseCursorPos, 1, 4);
HuSprAttrReset(pauseCursorPos, 1, HUSPR_ATTR_DISPOFF);
} else {
HuSprAttrSet(pauseCursorPos, 1, 4);
HuSprAttrSet(pauseCursorPos, 1, HUSPR_ATTR_DISPOFF);
}
while (configObj) {
HuPrcVSleep();
@ -1434,19 +1434,19 @@ static void ShowPadConfigSprite(s32 arg0) {
for (i = 0; i < 4; i++) {
temp_r31 = GWPlayer[i].port;
if (arg0 != 0) {
HuSprAttrReset(padConfigSprGrp, temp_r31, 4);
HuSprAttrReset(padConfigSprGrp, temp_r31 + 4, 4);
HuSprAttrReset(padConfigSprGrp, temp_r31 + 8, 4);
HuSprAttrReset(padConfigSprGrp, temp_r31, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(padConfigSprGrp, temp_r31 + 4, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(padConfigSprGrp, temp_r31 + 8, HUSPR_ATTR_DISPOFF);
} else {
HuSprAttrSet(padConfigSprGrp, temp_r31, 4);
HuSprAttrSet(padConfigSprGrp, temp_r31 + 4, 4);
HuSprAttrSet(padConfigSprGrp, temp_r31 + 8, 4);
HuSprAttrSet(padConfigSprGrp, temp_r31, HUSPR_ATTR_DISPOFF);
HuSprAttrSet(padConfigSprGrp, temp_r31 + 4, HUSPR_ATTR_DISPOFF);
HuSprAttrSet(padConfigSprGrp, temp_r31 + 8, HUSPR_ATTR_DISPOFF);
}
}
if (arg0 != 0) {
HuSprAttrReset(padConfigSprGrp, 12, 4);
HuSprAttrReset(padConfigSprGrp, 12, HUSPR_ATTR_DISPOFF);
} else {
HuSprAttrSet(padConfigSprGrp, 12, 4);
HuSprAttrSet(padConfigSprGrp, 12, HUSPR_ATTR_DISPOFF);
}
}

10
src/game/board/player.c
View file

@ -2127,15 +2127,15 @@ void BoardRollDispSet(s32 arg0)
if (arg0 != 0) {
temp_r31->field00_bit1 = 1;
if ((var_r30 == 1) && (GWPlayer[temp_r31->unk_02].roll / 10 == 0)) {
HuSprAttrSet(temp_r31->unk_04, var_r30, 4);
HuSprAttrSet(temp_r31->unk_04, var_r30, HUSPR_ATTR_DISPOFF);
}
else {
HuSprAttrReset(temp_r31->unk_04, var_r30, 4);
HuSprAttrReset(temp_r31->unk_04, var_r30, HUSPR_ATTR_DISPOFF);
}
}
else {
temp_r31->field00_bit1 = 0;
HuSprAttrSet(temp_r31->unk_04, var_r30, 4);
HuSprAttrSet(temp_r31->unk_04, var_r30, HUSPR_ATTR_DISPOFF);
}
}
UpdateRollSprite(rollObj);
@ -2163,7 +2163,7 @@ static void UpdateRollSprite(omObjData *arg0)
for (var_r30 = 0; var_r30 < 2; var_r30++) {
if (((var_r30 == 1) && (sp14[1] == 0)) || (temp_r31->field00_bit1 == 0)) {
HuSprAttrSet(temp_r31->unk_04, var_r30, 4);
HuSprAttrSet(temp_r31->unk_04, var_r30, HUSPR_ATTR_DISPOFF);
}
else {
if ((sp14[1] == 0) && (var_r30 == 0)) {
@ -2173,7 +2173,7 @@ static void UpdateRollSprite(omObjData *arg0)
sp1C.x = spC[var_r30];
}
sp1C.y = (HU_DISP_HEIGHTF * 176) / 480;
HuSprAttrReset(temp_r31->unk_04, var_r30, 4);
HuSprAttrReset(temp_r31->unk_04, var_r30, HUSPR_ATTR_DISPOFF);
HuSprBankSet(temp_r31->unk_04, var_r30, sp14[var_r30]);
HuSprPosSet(temp_r31->unk_04, var_r30, sp1C.x, sp1C.y);
}

20
src/game/board/ui.c
View file

@ -453,10 +453,10 @@ void BoardStatusHammerShowSet(s32 arg0, s32 arg1) {
if (temp_r31->unk00_bit6) {
if (arg1 != 0) {
HuSprAttrSet(temp_r31->unk02, 0x10, 2);
HuSprAttrSet(temp_r31->unk02, 0x10, HUSPR_ATTR_LOOP);
} else {
HuSprAttrReset(temp_r31->unk02, 0x10, 2);
HuSprAttrSet(temp_r31->unk02, 0x10, 1);
HuSprAttrReset(temp_r31->unk02, 0x10, HUSPR_ATTR_LOOP);
HuSprAttrSet(temp_r31->unk02, 0x10, HUSPR_ATTR_NOANIM);
}
}
}
@ -618,15 +618,15 @@ static s32 UpdateBoardStatus(void) {
temp_r27 = GWPlayer[i].items[j];
if (temp_r27 != -1 && temp_r31->unk00_bit5) {
UpdateStatusItem(temp_r31, j, temp_r27);
HuSprAttrReset(temp_r31->unk02, j + 0xD, 4);
HuSprAttrReset(temp_r31->unk02, j + 0xD, HUSPR_ATTR_DISPOFF);
} else {
HuSprAttrSet(temp_r31->unk02, j + 0xD, 4);
HuSprAttrSet(temp_r31->unk02, j + 0xD, HUSPR_ATTR_DISPOFF);
}
}
if (GWPlayer[i].com) {
HuSprAttrReset(temp_r31->unk02, 0xC, 4);
HuSprAttrReset(temp_r31->unk02, 0xC, HUSPR_ATTR_DISPOFF);
} else {
HuSprAttrSet(temp_r31->unk02, 0xC, 4);
HuSprAttrSet(temp_r31->unk02, 0xC, HUSPR_ATTR_DISPOFF);
}
temp_r28 = statusColTbl[GWPlayer[i].color];
HuSprColorSet(temp_r31->unk02, 0, temp_r28[0], temp_r28[1], temp_r28[2]);
@ -685,7 +685,7 @@ void BoardSpriteDigitUpdate(s16 arg0, s16 arg1, s32 arg2) {
} else {
HuSprBankSet(arg0, arg1 + 1, temp_r28);
HuSprBankSet(arg0, arg1, temp_r27);
HuSprAttrReset(arg0, arg1, 4);
HuSprAttrReset(arg0, arg1, HUSPR_ATTR_DISPOFF);
}
}
@ -1616,8 +1616,8 @@ static void UpdateItemPickGfx(omObjData *arg0) {
if (!temp_r30->unk00_bit7) {
temp_r30->unk00_bit3 = 1;
HuSprBankSet(temp_r30->unk04, 0, 1);
HuSprAttrSet(temp_r30->unk04, 0, 2);
HuSprAttrReset(temp_r30->unk04, 0, 1);
HuSprAttrSet(temp_r30->unk04, 0, HUSPR_ATTR_LOOP);
HuSprAttrReset(temp_r30->unk04, 0, HUSPR_ATTR_NOANIM);
arg0->func = UpdateItemPickup;
HuWinDispOff(temp_r30->unk06);
} else {

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

@ -577,15 +577,15 @@ static void UpdateOverheadView(omObjData *arg0) {
BoardModelVisibilitySet(temp_r31->unk04, 0);
} else if (temp_r31->unk01 != 0) {
if (i != 4) {
HuSprAttrReset(temp_r31->unk02, i, 4);
HuSprAttrReset(temp_r31->unk02, i, HUSPR_ATTR_DISPOFF);
}
HuSprAttrReset(temp_r31->unk02, var_r28, 4);
HuSprAttrReset(temp_r31->unk02, var_r28, HUSPR_ATTR_DISPOFF);
BoardModelVisibilitySet(temp_r31->unk04, 1);
} else {
if (i != 4) {
HuSprAttrSet(temp_r31->unk02, i, 4);
HuSprAttrSet(temp_r31->unk02, i, HUSPR_ATTR_DISPOFF);
}
HuSprAttrSet(temp_r31->unk02, var_r28, 4);
HuSprAttrSet(temp_r31->unk02, var_r28, HUSPR_ATTR_DISPOFF);
BoardModelVisibilitySet(temp_r31->unk04, 0);
}
}

2
src/game/thpmain.c
View file

@ -161,7 +161,7 @@ static void THPTestProc(void)
Hu3DModelAttrReset(SimpleControl.unk19E, HU3D_ATTR_DISPOFF);
}
else {
HuSprAttrReset(SimpleControl.unk19E, 0, 4);
HuSprAttrReset(SimpleControl.unk19E, 0, HUSPR_ATTR_DISPOFF);
}
while (1) {
if (THPStat == 2) {