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

Merge pull request #290 from mrshigure/m402

Browse source 
Matched most of REL/m402 + applying ext_math macros
This commit is contained in:
Liam Coleman 2024-05-05 06:40:14 -05:00 • committed by GitHub
commit f1a4621adc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
13 changed files with 2277 additions and 305 deletions
Download patch file Download diff file Expand all files Collapse all files

398
config/GMPE01_00/rels/m402Dll/symbols.txt
View file

@ -1,204 +1,204 @@
fn_1_0 = .text:0x00000000; // type:function size:0x24
fn_1_24 = .text:0x00000024; // type:function size:0x88
fn_1_AC = .text:0x000000AC; // type:function size:0xA4
fn_1_150 = .text:0x00000150; // type:function size:0x24
fn_1_174 = .text:0x00000174; // type:function size:0x164
fn_1_2D8 = .text:0x000002D8; // type:function size:0x13C
fn_1_414 = .text:0x00000414; // type:function size:0x58
fn_1_46C = .text:0x0000046C; // type:function size:0x114
fn_1_580 = .text:0x00000580; // type:function size:0x218
fn_1_798 = .text:0x00000798; // type:function size:0x254
fn_1_9EC = .text:0x000009EC; // type:function size:0x54
fn_1_A40 = .text:0x00000A40; // type:function size:0x10C
fn_1_B4C = .text:0x00000B4C; // type:function size:0x6A8
fn_1_11F4 = .text:0x000011F4; // type:function size:0x15C
fn_1_1350 = .text:0x00001350; // type:function size:0x8C
fn_1_13DC = .text:0x000013DC; // type:function size:0x334
fn_1_1710 = .text:0x00001710; // type:function size:0x350
fn_1_1A60 = .text:0x00001A60; // type:function size:0x2B8
fn_1_1D18 = .text:0x00001D18; // type:function size:0x58
fn_1_1D70 = .text:0x00001D70; // type:function size:0xB0
fn_1_1E20 = .text:0x00001E20; // type:function size:0x104
fn_1_1F24 = .text:0x00001F24; // type:function size:0x34
fn_1_1F58 = .text:0x00001F58; // type:function size:0x6C
fn_1_1FC4 = .text:0x00001FC4; // type:function size:0x3F0
fn_1_0 = .text:0x00000000; // type:function size:0x24 scope:local
fn_1_24 = .text:0x00000024; // type:function size:0x88 scope:local
fn_1_AC = .text:0x000000AC; // type:function size:0xA4 scope:local
fn_1_150 = .text:0x00000150; // type:function size:0x24 scope:local
fn_1_174 = .text:0x00000174; // type:function size:0x164 scope:local
fn_1_2D8 = .text:0x000002D8; // type:function size:0x13C scope:local
fn_1_414 = .text:0x00000414; // type:function size:0x58 scope:local
fn_1_46C = .text:0x0000046C; // type:function size:0x114 scope:local
fn_1_580 = .text:0x00000580; // type:function size:0x218 scope:local
fn_1_798 = .text:0x00000798; // type:function size:0x254 scope:local
fn_1_9EC = .text:0x000009EC; // type:function size:0x54 scope:local
fn_1_A40 = .text:0x00000A40; // type:function size:0x10C scope:local
fn_1_B4C = .text:0x00000B4C; // type:function size:0x6A8 scope:local
fn_1_11F4 = .text:0x000011F4; // type:function size:0x15C scope:local
fn_1_1350 = .text:0x00001350; // type:function size:0x8C scope:local
fn_1_13DC = .text:0x000013DC; // type:function size:0x334 scope:local
fn_1_1710 = .text:0x00001710; // type:function size:0x350 scope:local
fn_1_1A60 = .text:0x00001A60; // type:function size:0x2B8 scope:local
fn_1_1D18 = .text:0x00001D18; // type:function size:0x58 scope:local
fn_1_1D70 = .text:0x00001D70; // type:function size:0xB0 scope:local
fn_1_1E20 = .text:0x00001E20; // type:function size:0x104 scope:local
fn_1_1F24 = .text:0x00001F24; // type:function size:0x34 scope:local
fn_1_1F58 = .text:0x00001F58; // type:function size:0x6C scope:local
fn_1_1FC4 = .text:0x00001FC4; // type:function size:0x3F0 scope:local
_prolog = .text:0x000023B4; // type:function size:0x54 scope:global
_epilog = .text:0x00002408; // type:function size:0x4C scope:global
fn_1_2454 = .text:0x00002454; // type:function size:0x2F0
fn_1_2744 = .text:0x00002744; // type:function size:0x64
fn_1_27A8 = .text:0x000027A8; // type:function size:0xD8
fn_1_2880 = .text:0x00002880; // type:function size:0xF0
fn_1_2970 = .text:0x00002970; // type:function size:0x1C0
fn_1_2B30 = .text:0x00002B30; // type:function size:0x28C
fn_1_2DBC = .text:0x00002DBC; // type:function size:0x380
fn_1_313C = .text:0x0000313C; // type:function size:0xC8
fn_1_3204 = .text:0x00003204; // type:function size:0xF8C
fn_1_4190 = .text:0x00004190; // type:function size:0xF4
fn_1_4284 = .text:0x00004284; // type:function size:0x154
fn_1_43D8 = .text:0x000043D8; // type:function size:0x1FF0
fn_1_63C8 = .text:0x000063C8; // type:function size:0x490
fn_1_6858 = .text:0x00006858; // type:function size:0x4
fn_1_685C = .text:0x0000685C; // type:function size:0x258
fn_1_6AB4 = .text:0x00006AB4; // type:function size:0x3B0
fn_1_6E64 = .text:0x00006E64; // type:function size:0x1BC
fn_1_7020 = .text:0x00007020; // type:function size:0xC4
fn_1_70E4 = .text:0x000070E4; // type:function size:0x86C
fn_1_7950 = .text:0x00007950; // type:function size:0x19C
fn_1_7AEC = .text:0x00007AEC; // type:function size:0x25C
fn_1_7D48 = .text:0x00007D48; // type:function size:0x4
fn_1_7D4C = .text:0x00007D4C; // type:function size:0x134
fn_1_7E80 = .text:0x00007E80; // type:function size:0x4
fn_1_7E84 = .text:0x00007E84; // type:function size:0x1C4
fn_1_8048 = .text:0x00008048; // type:function size:0x1D0
fn_1_8218 = .text:0x00008218; // type:function size:0xE40
fn_1_9058 = .text:0x00009058; // type:function size:0x1EC
fn_1_9244 = .text:0x00009244; // type:function size:0x8B0
fn_1_9AF4 = .text:0x00009AF4; // type:function size:0xD0
fn_1_2454 = .text:0x00002454; // type:function size:0x2F0 scope:local
fn_1_2744 = .text:0x00002744; // type:function size:0x64 scope:local
fn_1_27A8 = .text:0x000027A8; // type:function size:0xD8 scope:local
fn_1_2880 = .text:0x00002880; // type:function size:0xF0 scope:local
fn_1_2970 = .text:0x00002970; // type:function size:0x1C0 scope:local
fn_1_2B30 = .text:0x00002B30; // type:function size:0x28C scope:local
fn_1_2DBC = .text:0x00002DBC; // type:function size:0x380 scope:local
fn_1_313C = .text:0x0000313C; // type:function size:0xC8 scope:local
fn_1_3204 = .text:0x00003204; // type:function size:0xF8C scope:local
fn_1_4190 = .text:0x00004190; // type:function size:0xF4 scope:local
fn_1_4284 = .text:0x00004284; // type:function size:0x154 scope:local
fn_1_43D8 = .text:0x000043D8; // type:function size:0x1FF0 scope:local
fn_1_63C8 = .text:0x000063C8; // type:function size:0x490 scope:local
fn_1_6858 = .text:0x00006858; // type:function size:0x4 scope:local
fn_1_685C = .text:0x0000685C; // type:function size:0x258 scope:local
fn_1_6AB4 = .text:0x00006AB4; // type:function size:0x3B0 scope:local
fn_1_6E64 = .text:0x00006E64; // type:function size:0x1BC scope:local
fn_1_7020 = .text:0x00007020; // type:function size:0xC4 scope:local
fn_1_70E4 = .text:0x000070E4; // type:function size:0x86C scope:local
fn_1_7950 = .text:0x00007950; // type:function size:0x19C scope:local
fn_1_7AEC = .text:0x00007AEC; // type:function size:0x25C scope:local
fn_1_7D48 = .text:0x00007D48; // type:function size:0x4 scope:local
fn_1_7D4C = .text:0x00007D4C; // type:function size:0x134 scope:local
fn_1_7E80 = .text:0x00007E80; // type:function size:0x4 scope:local
fn_1_7E84 = .text:0x00007E84; // type:function size:0x1C4 scope:local
fn_1_8048 = .text:0x00008048; // type:function size:0x1D0 scope:local
fn_1_8218 = .text:0x00008218; // type:function size:0xE40 scope:local
fn_1_9058 = .text:0x00009058; // type:function size:0x1EC scope:local
ModuleProlog = .text:0x00009244; // type:function size:0x8B0
fn_1_9AF4 = .text:0x00009AF4; // type:function size:0xD0 scope:local
_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:0x8 data:double
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:0x8 data:double
lbl_1_rodata_30 = .rodata:0x00000030; // type:object size:0x8 data:double
lbl_1_rodata_38 = .rodata:0x00000038; // type:object size:0x8 data:double
lbl_1_rodata_40 = .rodata:0x00000040; // type:object size:0x8 data:double
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:0x8 data:double
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_80 = .rodata:0x00000080; // type:object size:0x8 data:double
lbl_1_rodata_88 = .rodata:0x00000088; // type:object size:0x8 data:double
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:0x4 data:float
lbl_1_rodata_9C = .rodata:0x0000009C; // type:object size:0x4 data:float
lbl_1_rodata_A0 = .rodata:0x000000A0; // type:object size:0x4 data:float
lbl_1_rodata_A4 = .rodata:0x000000A4; // type:object size:0x4 data:float
lbl_1_rodata_A8 = .rodata:0x000000A8; // type:object size:0x8 data:double
lbl_1_rodata_B0 = .rodata:0x000000B0; // type:object size:0x4 data:float
lbl_1_rodata_B4 = .rodata:0x000000B4; // type:object size:0x4 data:float
lbl_1_rodata_B8 = .rodata:0x000000B8; // type:object size:0x4 data:float
lbl_1_rodata_BC = .rodata:0x000000BC; // type:object size:0x4 data:float
lbl_1_rodata_C0 = .rodata:0x000000C0; // type:object size:0x4 data:float
lbl_1_rodata_C4 = .rodata:0x000000C4; // type:object size:0x4 data:float
lbl_1_rodata_C8 = .rodata:0x000000C8; // type:object size:0x4 data:float
lbl_1_rodata_CC = .rodata:0x000000CC; // type:object size:0x4 data:float
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_E0 = .rodata:0x000000E0; // type:object size:0x8 data:double
lbl_1_rodata_E8 = .rodata:0x000000E8; // type:object size:0x4 data:float
lbl_1_rodata_EC = .rodata:0x000000EC; // type:object size:0x4 data:float
lbl_1_rodata_F0 = .rodata:0x000000F0; // type:object size:0x4 data:float
lbl_1_rodata_F4 = .rodata:0x000000F4; // type:object size:0x4 data:float
lbl_1_rodata_F8 = .rodata:0x000000F8; // type:object size:0x4 data:float
lbl_1_rodata_FC = .rodata:0x000000FC; // type:object size:0x4 data:float
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:0x4 data:float
lbl_1_rodata_134 = .rodata:0x00000134; // type:object size:0x4 data:float
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:0x4 data:float
lbl_1_rodata_144 = .rodata:0x00000144; // type:object size:0x4 data:float
lbl_1_rodata_148 = .rodata:0x00000148; // type:object size:0x4 data:float
lbl_1_rodata_14C = .rodata:0x0000014C; // type:object size:0x4 data:float
lbl_1_rodata_150 = .rodata:0x00000150; // type:object size:0x4 data:float
lbl_1_rodata_154 = .rodata:0x00000154; // type:object size:0x4 data:float
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_data_0 = .data:0x00000000; // type:object size:0x10
lbl_1_data_10 = .data:0x00000010; // type:object size:0xC data:4byte
lbl_1_data_1C = .data:0x0000001C; // type:object size:0xC
lbl_1_data_28 = .data:0x00000028; // type:object size:0xC data:4byte
lbl_1_data_34 = .data:0x00000034; // type:object size:0xC
lbl_1_data_40 = .data:0x00000040; // type:object size:0xC
lbl_1_data_4C = .data:0x0000004C; // type:object size:0x14
lbl_1_data_60 = .data:0x00000060; // type:object size:0xC
lbl_1_data_6C = .data:0x0000006C; // type:object size:0xC
lbl_1_data_78 = .data:0x00000078; // type:object size:0x160
lbl_1_data_1D8 = .data:0x000001D8; // type:object size:0x10
lbl_1_data_1E8 = .data:0x000001E8; // type:object size:0xC
lbl_1_data_1F4 = .data:0x000001F4; // type:object size:0x4 data:4byte
lbl_1_data_1F8 = .data:0x000001F8; // type:object size:0x8
lbl_1_data_200 = .data:0x00000200; // type:object size:0x18
lbl_1_data_218 = .data:0x00000218; // type:object size:0x1C
lbl_1_data_234 = .data:0x00000234; // type:object size:0x190
lbl_1_data_3C4 = .data:0x000003C4; // type:object size:0x14
lbl_1_data_3D8 = .data:0x000003D8; // type:object size:0x1A data:string
lbl_1_data_3F2 = .data:0x000003F2; // type:object size:0x9 data:string
lbl_1_data_3FB = .data:0x000003FB; // type:object size:0x6 data:string
lbl_1_data_401 = .data:0x00000401; // type:object size:0x10 data:string
lbl_1_data_411 = .data:0x00000411; // type:object size:0x1F
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:0x8 scope:local data:double
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:0x8 scope:local 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 scope:local 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 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:0x8 scope:local data:double
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_80 = .rodata:0x00000080; // type:object size:0x8 scope:local 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 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:0x4 scope:local 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 scope:local 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:0x8 scope:local data:double
lbl_1_rodata_B0 = .rodata:0x000000B0; // type:object size:0x4 scope:local 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 scope:local 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 scope:local 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 scope:local 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 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_E0 = .rodata:0x000000E0; // type:object size:0x8 scope:local data:double
lbl_1_rodata_E8 = .rodata:0x000000E8; // type:object size:0x4 scope:local 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:0x4 scope:local data:float
lbl_1_rodata_F4 = .rodata:0x000000F4; // type:object size:0x4 scope:local 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 scope:local 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 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:0x4 scope:local 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 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:0x4 scope:local 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 scope:local 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 scope:local 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 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_data_0 = .data:0x00000000; // type:object size:0x10 scope:local data:2byte
lbl_1_data_10 = .data:0x00000010; // type:object size:0xC scope:local data:float
lbl_1_data_1C = .data:0x0000001C; // type:object size:0xC scope:local data:float
lbl_1_data_28 = .data:0x00000028; // type:object size:0xC scope:local data:float
lbl_1_data_34 = .data:0x00000034; // type:object size:0xC scope:local data:float
lbl_1_data_40 = .data:0x00000040; // type:object size:0xC scope:local data:float
lbl_1_data_4C = .data:0x0000004C; // type:object size:0x4 scope:local
lbl_1_data_60 = .data:0x00000060; // type:object size:0xC scope:local data:float
lbl_1_data_6C = .data:0x0000006C; // type:object size:0xC scope:local data:float
lbl_1_data_78 = .data:0x00000078; // type:object size:0x160 scope:local
lbl_1_data_1D8 = .data:0x000001D8; // type:object size:0x10 scope:local
lbl_1_data_1E8 = .data:0x000001E8; // type:object size:0xC scope:local
lbl_1_data_1F4 = .data:0x000001F4; // type:object size:0x4 scope:local data:4byte
lbl_1_data_1F8 = .data:0x000001F8; // type:object size:0x8 scope:local
lbl_1_data_200 = .data:0x00000200; // type:object size:0x18 scope:local data:float
lbl_1_data_218 = .data:0x00000218; // type:object size:0x1C scope:local
lbl_1_data_234 = .data:0x00000234; // type:object size:0x190 scope:local
lbl_1_data_3C4 = .data:0x000003C4; // type:object size:0x14 scope:local
lbl_1_data_3D8 = .data:0x000003D8; // type:object size:0x1A scope:local data:string
lbl_1_data_3F2 = .data:0x000003F2; // type:object size:0x9 scope:local data:string
lbl_1_data_3FB = .data:0x000003FB; // type:object size:0x6 scope:local data:string
lbl_1_data_401 = .data:0x00000401; // type:object size:0x10 scope:local data:string
lbl_1_data_411 = .data:0x00000411; // type:object size:0x1D scope:local data:string
jumptable_1_data_430 = .data:0x00000430; // type:object size:0x40 scope:local
lbl_1_data_470 = .data:0x00000470; // type:object size:0x17 data:string
lbl_1_data_487 = .data:0x00000487; // type:object size:0x1B data:string
lbl_1_data_4A2 = .data:0x000004A2; // type:object size:0x24 data:string
lbl_1_bss_4 = .bss:0x00000004; // type:object size:0x4 data:float
lbl_1_bss_8 = .bss:0x00000008; // type:object size:0x4 data:float
lbl_1_bss_C = .bss:0x0000000C; // type:object size:0x4 data:float
lbl_1_bss_10 = .bss:0x00000010; // type:object size:0x4 data:4byte
lbl_1_bss_14 = .bss:0x00000014; // type:object size:0x2 data:2byte
lbl_1_bss_16 = .bss:0x00000016; // type:object size:0xE
lbl_1_bss_24 = .bss:0x00000024; // type:object size:0x2 data:2byte
lbl_1_bss_26 = .bss:0x00000026; // type:object size:0x2 data:2byte
lbl_1_bss_28 = .bss:0x00000028; // type:object size:0x4 data:float
lbl_1_bss_2C = .bss:0x0000002C; // type:object size:0x4 data:float
lbl_1_bss_30 = .bss:0x00000030; // type:object size:0x4 data:float
lbl_1_bss_34 = .bss:0x00000034; // type:object size:0x4 data:float
lbl_1_bss_38 = .bss:0x00000038; // type:object size:0x8 data:float
lbl_1_bss_40 = .bss:0x00000040; // type:object size:0x4 data:4byte
lbl_1_bss_44 = .bss:0x00000044; // type:object size:0x4 data:4byte
lbl_1_bss_48 = .bss:0x00000048; // type:object size:0x4 data:4byte
lbl_1_bss_4C = .bss:0x0000004C; // type:object size:0x4 data:4byte
lbl_1_bss_50 = .bss:0x00000050; // type:object size:0x4 data:4byte
lbl_1_bss_54 = .bss:0x00000054; // type:object size:0x4 data:4byte
lbl_1_bss_58 = .bss:0x00000058; // type:object size:0x4 data:4byte
lbl_1_bss_5C = .bss:0x0000005C; // type:object size:0x100
lbl_1_bss_15C = .bss:0x0000015C; // type:object size:0x40 data:4byte
lbl_1_bss_19C = .bss:0x0000019C; // type:object size:0x4 data:float
lbl_1_bss_1A0 = .bss:0x000001A0; // type:object size:0x4 data:4byte
lbl_1_bss_1A4 = .bss:0x000001A4; // type:object size:0x4 data:4byte
lbl_1_bss_1A8 = .bss:0x000001A8; // type:object size:0x2 data:2byte
lbl_1_bss_1AA = .bss:0x000001AA; // type:object size:0x2 data:2byte
lbl_1_bss_1AC = .bss:0x000001AC; // type:object size:0x4 data:4byte
lbl_1_bss_1B0 = .bss:0x000001B0; // type:object size:0x4 data:4byte
lbl_1_bss_1B4 = .bss:0x000001B4; // type:object size:0x4 data:4byte
lbl_1_bss_1B8 = .bss:0x000001B8; // type:object size:0xC data:4byte
lbl_1_bss_1C4 = .bss:0x000001C4; // type:object size:0xC data:4byte
lbl_1_bss_1D0 = .bss:0x000001D0; // type:object size:0xC data:4byte
lbl_1_bss_1DC = .bss:0x000001DC; // type:object size:0xC data:4byte
lbl_1_bss_1E8 = .bss:0x000001E8; // type:object size:0x4 data:4byte
lbl_1_bss_1EC = .bss:0x000001EC; // type:object size:0x18 data:4byte
lbl_1_bss_204 = .bss:0x00000204; // type:object size:0xC data:4byte
lbl_1_data_470 = .data:0x00000470; // type:object size:0x17 scope:local data:string
lbl_1_data_487 = .data:0x00000487; // type:object size:0x1B scope:local data:string
lbl_1_data_4A2 = .data:0x000004A2; // type:object size:0x24 scope:local data:string
lbl_1_bss_4 = .bss:0x00000004; // type:object size:0x4 scope:local data:float
lbl_1_bss_8 = .bss:0x00000008; // type:object size:0x4 scope:local data:float
lbl_1_bss_C = .bss:0x0000000C; // type:object size:0x4 scope:local data:float
lbl_1_bss_10 = .bss:0x00000010; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_14 = .bss:0x00000014; // type:object size:0x2 scope:local data:2byte
lbl_1_bss_16 = .bss:0x00000016; // type:object size:0xE scope:local
lbl_1_bss_24 = .bss:0x00000024; // type:object size:0x2 scope:local data:2byte
lbl_1_bss_26 = .bss:0x00000026; // type:object size:0x2 scope:local data:2byte
lbl_1_bss_28 = .bss:0x00000028; // type:object size:0x4 scope:local data:float
lbl_1_bss_2C = .bss:0x0000002C; // type:object size:0x4 scope:local data:float
lbl_1_bss_30 = .bss:0x00000030; // type:object size:0x4 scope:local data:float
lbl_1_bss_34 = .bss:0x00000034; // type:object size:0x4 scope:local data:float
lbl_1_bss_38 = .bss:0x00000038; // type:object size:0x4 scope:local data:float
lbl_1_bss_40 = .bss:0x00000040; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_44 = .bss:0x00000044; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_48 = .bss:0x00000048; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_4C = .bss:0x0000004C; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_50 = .bss:0x00000050; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_54 = .bss:0x00000054; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_58 = .bss:0x00000058; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_5C = .bss:0x0000005C; // type:object size:0x100 scope:local
lbl_1_bss_15C = .bss:0x0000015C; // type:object size:0x40 scope:local data:4byte
lbl_1_bss_19C = .bss:0x0000019C; // type:object size:0x4 scope:local data:float
lbl_1_bss_1A0 = .bss:0x000001A0; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_1A4 = .bss:0x000001A4; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_1A8 = .bss:0x000001A8; // type:object size:0x2 scope:local data:2byte
lbl_1_bss_1AA = .bss:0x000001AA; // type:object size:0x2 scope:local data:2byte
lbl_1_bss_1AC = .bss:0x000001AC; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_1B0 = .bss:0x000001B0; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_1B4 = .bss:0x000001B4; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_1B8 = .bss:0x000001B8; // type:object size:0xC scope:local data:4byte
lbl_1_bss_1C4 = .bss:0x000001C4; // type:object size:0xC scope:local data:4byte
lbl_1_bss_1D0 = .bss:0x000001D0; // type:object size:0xC scope:local data:4byte
lbl_1_bss_1DC = .bss:0x000001DC; // type:object size:0xC scope:local data:4byte
lbl_1_bss_1E8 = .bss:0x000001E8; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_1EC = .bss:0x000001EC; // type:object size:0x18 scope:local data:4byte
lbl_1_bss_204 = .bss:0x00000204; // type:object size:0xC scope:local data:4byte

2
include/game/chrman.h
View file

@ -10,7 +10,7 @@ void CharARAMClose(s16 character);
void CharKill(s16 arg0);
void CharKillAll(void);
s16 CharModelCreate(s16 character, s16 lod);
s16 CharModelMotionCreate(s16 character, s32 arg1);
s16 CharModelMotionCreate(s16 character, s32 data_num);
void CharModelMotionIndexSet(s16 character, s16 arg1, s32 arg2);
void CharModelMotionKill(s16 character, u32 motion);
void CharModelMotionDataClose(s16 character);

1966
src/REL/m402Dll/main.c Executable file
View file

File diff suppressed because it is too large Load diff

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

@ -8,7 +8,7 @@
#include "game/wipe.h"
#include "dolphin.h"
#include "math.h"
#include "ext_math.h"
#include "rel_sqrt_consts.h"
extern s32 sprintf(char*, const char*, s32);
@ -68,25 +68,25 @@ static void fn_1_300(omObjData *arg0) {
CRot.y += HuPadSubStkX[0] / 20;
CZoom += HuPadTrigL[0] / 2;
CZoom -= HuPadTrigR[0] / 2;
sp2C.x = Center.x + CZoom * (sin(CRot.y * M_PI / 180.0) * cos(CRot.x * M_PI / 180.0));
sp2C.y = Center.y + CZoom * -sin(CRot.x * M_PI / 180.0);
sp2C.z = Center.z + CZoom * (cos(CRot.y * M_PI / 180.0) * cos(CRot.x * M_PI / 180.0));
sp2C.x = Center.x + CZoom * (sind(CRot.y) * cosd(CRot.x));
sp2C.y = Center.y + CZoom * -sind(CRot.x);
sp2C.z = Center.z + CZoom * (cosd(CRot.y) * cosd(CRot.x));
sp20.x = Center.x - sp2C.x;
sp20.y = Center.y - sp2C.y;
sp20.z = Center.z - sp2C.z;
sp14.x = sin(CRot.y * M_PI / 180.0) * sin(CRot.x * M_PI / 180.0);
sp14.y = cos(CRot.x * M_PI / 180.0);
sp14.z = cos(CRot.y * M_PI / 180.0) * sin(CRot.x * M_PI / 180.0);
sp14.x = sind(CRot.y) * sind(CRot.x);
sp14.y = cosd(CRot.x);
sp14.z = cosd(CRot.y) * sind(CRot.x);
temp_f31 = CRot.z;
sp8.x = sp14.x * (sp20.x * sp20.x + (1.0f - sp20.x * sp20.x) * cos(temp_f31 * M_PI / 180.0))
+ sp14.y * (sp20.x * sp20.y * (1.0 - cos(temp_f31 * M_PI / 180.0)) - sp20.z * sin(temp_f31 * M_PI / 180.0))
+ sp14.z * (sp20.x * sp20.z * (1.0 - cos(temp_f31 * M_PI / 180.0)) + sp20.y * sin(temp_f31 * M_PI / 180.0));
sp8.y = sp14.x * (sp20.x * sp20.y * (1.0 - cos(temp_f31 * M_PI / 180.0)) + sp20.z * sin(temp_f31 * M_PI / 180.0))
+ sp14.y * (sp20.y * sp20.y + (1.0f - sp20.y * sp20.y) * cos(temp_f31 * M_PI / 180.0))
+ sp14.z * (sp20.y * sp20.z * (1.0 - cos(temp_f31 * M_PI / 180.0)) - sp20.x * sin(temp_f31 * M_PI / 180.0));
sp8.z = sp14.x * (sp20.x * sp20.z * (1.0 - cos(temp_f31 * M_PI / 180.0)) - sp20.y * sin(temp_f31 * M_PI / 180.0))
+ sp14.y * (sp20.y * sp20.z * (1.0 - cos(temp_f31 * M_PI / 180.0)) + sp20.x * sin(temp_f31 * M_PI / 180.0))
+ sp14.z * (sp20.z * sp20.z + (1.0f - sp20.z * sp20.z) * cos(temp_f31 * M_PI / 180.0));
sp8.x = sp14.x * (sp20.x * sp20.x + (1.0f - sp20.x * sp20.x) * cosd(temp_f31))
+ sp14.y * (sp20.x * sp20.y * (1.0 - cosd(temp_f31)) - sp20.z * sind(temp_f31))
+ sp14.z * (sp20.x * sp20.z * (1.0 - cosd(temp_f31)) + sp20.y * sind(temp_f31));
sp8.y = sp14.x * (sp20.x * sp20.y * (1.0 - cosd(temp_f31)) + sp20.z * sind(temp_f31))
+ sp14.y * (sp20.y * sp20.y + (1.0f - sp20.y * sp20.y) * cosd(temp_f31))
+ sp14.z * (sp20.y * sp20.z * (1.0 - cosd(temp_f31)) - sp20.x * sind(temp_f31));
sp8.z = sp14.x * (sp20.x * sp20.z * (1.0 - cosd(temp_f31)) - sp20.y * sind(temp_f31))
+ sp14.y * (sp20.y * sp20.z * (1.0 - cosd(temp_f31)) + sp20.x * sind(temp_f31))
+ sp14.z * (sp20.z * sp20.z + (1.0f - sp20.z * sp20.z) * cosd(temp_f31));
PSVECCrossProduct(&sp14, &sp20, &sp20);
PSVECNormalize(&sp20, &sp20);
temp_r31 = HuPadSubStkX[0] & 0xF8;

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

@ -17,7 +17,7 @@
#include "game/board/space.h"
#include "game/board/window.h"
#include "math.h"
#include "ext_math.h"
typedef struct {
struct {
@ -635,12 +635,12 @@ static void BallMain(omObjData *arg0) {
temp_f30 = 240.0f;
BoardCameraRotGet(&sp20);
BoardCameraTargetGet(&sp2C);
sp8.x = sp2C.x + sin(sp20.y * M_PI / 180.0) * cos(sp20.x * M_PI / 180.0) * temp_f30;
sp8.y = sp2C.y + -sin(sp20.x * M_PI / 180.0) * temp_f30;
sp8.z = sp2C.z + cos(sp20.y * M_PI / 180.0) * cos(sp20.x * M_PI / 180.0) * temp_f30;
sp14.x = sin(sp20.y * M_PI / 180.0) * sin(sp20.x * M_PI / 180.0);
sp14.y = cos(sp20.x * M_PI / 180.0);
sp14.z = cos(sp20.y * M_PI / 180.0) * sin(sp20.x * M_PI / 180.0);
sp8.x = sp2C.x + sind(sp20.y) * cosd(sp20.x) * temp_f30;
sp8.y = sp2C.y + -sind(sp20.x) * temp_f30;
sp8.z = sp2C.z + cosd(sp20.y) * cosd(sp20.x) * temp_f30;
sp14.x = sind(sp20.y) * sind(sp20.x);
sp14.y = cosd(sp20.x);
sp14.z = cosd(sp20.y) * sind(sp20.x);
if (temp_r30->unk01 != 0) {
temp_r30->unk02 += temp_r30->unk01;
if (temp_r30->unk02 > 255) {
@ -711,8 +711,8 @@ static void BallRenderHook(void) {
sp20.z = 0.0f;
C_MTXLookAt(sp38, &sp2C, &sp20, &sp14);
GXLoadPosMtxImm(sp38, GX_PNMTX0);
sp2C.x = sin(5 * M_PI / 72) * 20000.0 * 1.2f;
sp2C.y = sin(5 * M_PI / 72) * 20000.0 * 0.8333333f;
sp2C.x = sind(12.5) * 20000.0 * 1.2f;
sp2C.y = sind(12.5) * 20000.0 * 0.8333333f;
sp2C.z = -9000.0f;
GXBegin(GX_QUADS, GX_VTXFMT0, 4);
GXPosition3f32(-sp2C.x, -sp2C.y, sp2C.z);
@ -754,12 +754,12 @@ static void UpdateBallCamera(omObjData *arg0) {
sp20.x = arg0->trans.x;
sp20.y = arg0->trans.y + arg0->rot.y;
sp20.z = arg0->trans.z;
sp14.x = sp20.x + sin(0.0) * cos(arg0->rot.x * M_PI / 180.0) * arg0->rot.z;
sp14.y = sp20.y + -sin(arg0->rot.x * M_PI / 180.0) * arg0->rot.z;
sp14.z = sp20.z + cos(0.0) * cos(arg0->rot.x * M_PI / 180.0) * arg0->rot.z;
sp8.x = sin(0.0) * sin(arg0->rot.x * M_PI / 180.0);
sp8.y = cos(arg0->rot.x * M_PI / 180.0);
sp8.z = cos(0.0) * sin(arg0->rot.x * M_PI / 180.0);
sp14.x = sp20.x + sin(0.0) * cosd(arg0->rot.x) * arg0->rot.z;
sp14.y = sp20.y + -sind(arg0->rot.x) * arg0->rot.z;
sp14.z = sp20.z + cos(0.0) * cosd(arg0->rot.x) * arg0->rot.z;
sp8.x = sin(0.0) * sind(arg0->rot.x);
sp8.y = cosd(arg0->rot.x);
sp8.z = cos(0.0) * sind(arg0->rot.x);
Hu3DCameraPosSetV(var_r30->unk02, &sp14, &sp8, &sp20);
}
@ -909,9 +909,9 @@ static void BallPlayerZoomOut(omObjData *arg0, BallPlayerWork *arg1) {
sp14.x = arg0->trans.x;
sp14.y = arg0->trans.y;
sp14.z = arg0->trans.z;
sp8.x = sp14.x + 120.0 * sin(-M_PI / 2);
sp8.x = sp14.x + 120.0 * sind(-90);
sp8.y = sp14.y;
sp8.z = sp14.z + 120.0 * cos(-M_PI / 2);
sp8.z = sp14.z + 120.0 * cosd(-90);
BoardPlayerPosLerpStart(stealTarget, &sp14, &sp8, 20);
var_r29 = GWPlayer[stealTarget].character;
HuAudFXPlay(booSfxTbl[0][var_r29]);
@ -1082,9 +1082,9 @@ static void BallBooCreate(void) {
BoardModelCameraSet(temp_r31->unk04, 1);
temp_f31 = BoardPlayerRotYGet(stealTarget);
BoardPlayerPosGet(stealTarget, &sp14);
ballBooObj->trans.x = sp14.x + 240.0 * sin(-temp_f31 * M_PI / 180.0);
ballBooObj->trans.x = sp14.x + 240.0 * sind(-temp_f31);
ballBooObj->trans.y = sp14.y + 160.0f;
ballBooObj->trans.z = sp14.z + 240.0 * cos(-temp_f31 * M_PI / 180.0);
ballBooObj->trans.z = sp14.z + 240.0 * cosd(-temp_f31);
BoardModelPosSet(temp_r31->unk04, ballBooObj->trans.x, ballBooObj->trans.y, ballBooObj->trans.z);
if (stealType == 2) {
var_f30 = 126.0f;
@ -1093,9 +1093,9 @@ static void BallBooCreate(void) {
var_f30 = 90.0f;
var_f29 = 100.0f;
}
sp8.x = sp14.x + var_f30 * sin(-temp_f31 * M_PI / 180.0);
sp8.x = sp14.x + var_f30 * sind(-temp_f31);
sp8.y = sp14.y + var_f29;
sp8.z = sp14.z + var_f30 * cos(-temp_f31 * M_PI / 180.0);
sp8.z = sp14.z + var_f30 * cosd(-temp_f31);
ballBooObj->rot.x = (sp8.x - ballBooObj->trans.x) / 60.0f;
ballBooObj->rot.y = (sp8.y - ballBooObj->trans.y) / 60.0f;
ballBooObj->rot.z = (sp8.z - ballBooObj->trans.z) / 60.0f;
@ -1104,7 +1104,7 @@ static void BallBooCreate(void) {
ballBooObj->scale.z = 1.0f;
sp8.x = sp14.x - ballBooObj->trans.x;
sp8.z = sp14.z - ballBooObj->trans.z;
ballBooObj->scale.y = 180.0 * (atan2(sp8.x, sp8.z) / M_PI);
ballBooObj->scale.y = atan2d(sp8.x, sp8.z);
BoardModelRotYSet(temp_r31->unk04, ballBooObj->scale.y);
BoardModelMotionStart(temp_r31->unk04, 1, 0x40000001);
}
@ -1246,7 +1246,7 @@ static void BallBooAttack(omObjData *arg0, BallBooWork *arg1) {
}
}
OSu8tof32(&arg1->unk02, &var_f29);
arg0->scale.z = 1.0 + sin(var_f29 * M_PI / 180.0);
arg0->scale.z = 1.0 + sind(var_f29);
}
static void BallBooFlash(omObjData *arg0, BallBooWork *arg1) {
@ -1258,9 +1258,9 @@ static void BallBooFlash(omObjData *arg0, BallBooWork *arg1) {
BoardModelMotionShiftSet(arg1->unk04, 3, 0.0f, 10.0f, 0x40000001);
temp_f31 = BoardPlayerRotYGet(stealTarget);
BoardPlayerPosGet(stealTarget, &sp8);
sp8.x += 500.0 * sin(-temp_f31 * M_PI / 180.0);
sp8.x += 500.0 * sind(-temp_f31);
sp8.y = sp8.y + 160.0f;
sp8.z += 500.0 * cos(-temp_f31 * M_PI / 180.0);
sp8.z += 500.0 * cosd(-temp_f31);
arg0->rot.x = (sp8.x - arg0->trans.x) / 72.0f;
arg0->rot.y = (sp8.y - arg0->trans.y) / 72.0f;
arg0->rot.z = (sp8.z - arg0->trans.z) / 72.0f;
@ -1365,8 +1365,8 @@ void TakeBallStar(void) {
ballTakeCoinObj->trans.y = sp8.y + 150.0f;
ballTakeCoinObj->trans.z = sp8.z;
temp_r31->unk04 = sp8.y;
ballTakeCoinObj->rot.x = 3.0 * sin(4 * M_PI / 9);
ballTakeCoinObj->rot.z = 3.0 * cos(4 * M_PI / 9);
ballTakeCoinObj->rot.x = 3.0 * sind(80);
ballTakeCoinObj->rot.z = 3.0 * cosd(80);
ballTakeCoinObj->rot.y = 0.0f;
BoardModelPosSet(temp_r31->unk02, ballTakeCoinObj->trans.x, ballTakeCoinObj->trans.y, ballTakeCoinObj->trans.z);
BoardModelVisibilitySet(temp_r31->unk02, 1);

12
src/game/board/boo_house.c
View file

@ -15,6 +15,8 @@
#include "game/board/player.h"
#include "game/board/window.h"
#include "ext_math.h"
// bss
static s16 houseMdl[6];
@ -134,7 +136,7 @@ static void ExecBooHouse(void) {
Vec sp20;
Vec sp14;
Vec sp8;
f32 temp_f31;
float temp_f31;
s16 temp_r29;
s32 var_r31;
s16 var_r30;
@ -187,7 +189,7 @@ static void ExecBooHouse(void) {
BoardSpacePosGet(0, temp_r29, &sp2C);
PSVECSubtract(&sp2C, &sp38, &sp20);
PSVECNormalize(&sp20, &sp20);
temp_f31 = (180.0 * (atan2(-sp20.x, -sp20.z) / M_PI));
temp_f31 = atan2d(-sp20.x, -sp20.z);
sp14.x = -15.0f;
sp14.y = temp_f31;
sp14.z = 0.0f;
@ -577,7 +579,7 @@ void ApplySteal(void) {
s32 temp_r30;
s32 temp_r6;
s32 var_r31;
f32 var_f31;
float var_f31;
BoardModelHookSet(houseMdl[0], "yoko8", booMdl);
BoardModelVisibilitySet(booMdl, 1);
@ -749,7 +751,7 @@ void BoardBooHouseTutorialExec(void) {
Vec sp20;
Vec sp14;
Vec sp8;
f32 temp_f31;
float temp_f31;
s16 temp_r28;
s16 temp_r29;
s32 temp_r27;
@ -765,7 +767,7 @@ void BoardBooHouseTutorialExec(void) {
BoardSpacePosGet(0, temp_r28, &sp2C);
PSVECSubtract(&sp2C, &sp38, &sp20);
PSVECNormalize(&sp20, &sp20);
temp_f31 = (180.0 * (atan2(-sp20.x, -sp20.z) / M_PI));
temp_f31 = atan2d(-sp20.x, -sp20.z);
sp14.x = -15.0f;
sp14.y = temp_f31;
sp14.z = 0.0f;

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

@ -10,7 +10,7 @@
#include "game/board/tutorial.h"
#include "game/board/ui.h"
#include "math.h"
#include "ext_math.h"
typedef struct {
struct {
@ -374,7 +374,7 @@ static void GrowCharWheel(CharWheelWork *arg0) {
if (arg0->unk02 < 90) {
arg0->unk02 += 3;
} else {
if (_CheckFlag(0x1000B)) {
if (_CheckFlag(FLAG_ID_MAKE(1, 11))) {
BoardTutorialHookExec(0x14, 0);
}
arg0->unk02 = 90;
@ -382,7 +382,7 @@ static void GrowCharWheel(CharWheelWork *arg0) {
wheelFXStat = HuAudFXPlay(0x30A);
}
OSs8tof32(&arg0->unk02, &temp_f30);
HuSprGrpScaleSet(wheelSprGrp, sin(temp_f30 * M_PI / 180.0), sin(temp_f30 * M_PI / 180.0));
HuSprGrpScaleSet(wheelSprGrp, sind(temp_f30), sind(temp_f30));
}
static void ShrinkCharWheel(CharWheelWork *arg0) {
@ -397,7 +397,7 @@ static void ShrinkCharWheel(CharWheelWork *arg0) {
targetF = 0;
}
OSs8tof32(&arg0->unk02, &temp_f30);
HuSprGrpScaleSet(wheelSprGrp, sin(temp_f30 * M_PI / 180.0), sin(temp_f30 * M_PI / 180.0));
HuSprGrpScaleSet(wheelSprGrp, sind(temp_f30), sind(temp_f30));
}
static void KillCharWheelSpr(void) {

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

@ -9,7 +9,7 @@
#include "game/board/window.h"
#include "game/board/boo.h"
#include "math.h"
#include "ext_math.h"
typedef BOOL (*UseCheckFunc)(s32 player, s32 item);
@ -625,7 +625,7 @@ s32 BoardComJunctionInputGet(s32 item, Vec *input, s32 num_dirs, float *dirs) {
BoardSpacePosGet(0, space, &pos_junction);
BoardSpacePosGet(0, space_next, &pos_next);
PSVECSubtract(&pos_next, &pos_junction, &dir);
angle = BoardDAngleCalc(90.0 - 180.0 * (atan2(dir.z, dir.x) / M_PI));
angle = BoardDAngleCalc(90.0 - atan2d(dir.z, dir.x));
if (angle < 0.0f) {
angle += 360.0f;
}

58
src/game/board/item.c
View file

@ -26,6 +26,8 @@
#include "game/board/view.h"
#include "game/frand.h"
#include "ext_math.h"
typedef struct {
/* 0x00 */ s16 unk00;
/* 0x02 */ s16 unk02;
@ -285,7 +287,7 @@ static void ItemSizeShowAnim(void) {
BoardModelRotSetV(suitMdl, &spC);
BoardModelPosSetV(suitMdl, &sp24);
for (i = 0; i < 120; i++) {
sp24.y += 3.0 * sin(var_f31 * M_PI / 180.0);
sp24.y += 3.0 * sind(var_f31);
BoardModelPosSetV(suitMdl, &sp24);
var_f31 += 9.0f;
if (var_f31 >= 360.0f) {
@ -318,7 +320,7 @@ static void ItemRotProc(void) {
while (1) {
if (temp_r31->unk00 == 0) {
sp14 = sp20;
sp14.y += temp_r31->unk04 * sin(temp_r31->unk0C * M_PI / 180.0);
sp14.y += temp_r31->unk04 * sind(temp_r31->unk0C);
BoardModelPosSetV(temp_r31->unk02, &sp14);
temp_r31->unk0C += temp_r31->unk08;
if (temp_r31->unk0C >= 360.0f) {
@ -489,8 +491,8 @@ static Process *ItemShowProc(UnkItemShowProcStruct *arg0, Vec *arg1) {
if (arg0 == NULL || arg0->unk1C != 0) {
CharModelLayerSetAll(3);
sp20.y += 35.0f;
sp20.z += 50.0 * cos(sp14.y * M_PI / 180.0);
sp20.x += 50.0 * sin(sp14.y * M_PI / 180.0);
sp20.z += 50.0 * cosd(sp14.y);
sp20.x += 50.0 * sind(sp14.y);
CharModelEffectCreate(1, &sp20);
HuPrcSleep(10);
}
@ -1124,12 +1126,12 @@ static void ExecItemSwap(void) {
for (var_r31 = 0; var_r31 < 60; var_r31++) {
for (var_r30 = 0; var_r30 < var_r28 / 2; var_r30++) {
sp6C = sp1A4[var_r30];
sp6C.x += 3.0 * sin((frandmods(360)) * M_PI / 180.0);
sp6C.y += 3.0 * sin((frandmods(360)) * M_PI / 180.0);
sp6C.x += 3.0 * sind(frandmods(360));
sp6C.y += 3.0 * sind(frandmods(360));
BoardModelPosSetV(sp54[var_r30], &sp6C);
sp6C = sp180[var_r30];
sp6C.x += 3.0 * sin((frandmods(360)) * M_PI / 180.0);
sp6C.y += 3.0 * sin((frandmods(360)) * M_PI / 180.0);
sp6C.x += 3.0 * sind(frandmods(360));
sp6C.y += 3.0 * sind(frandmods(360));
BoardModelPosSetV(sp54[var_r30 + 3], &sp6C);
}
HuPrcSleep(2);
@ -1263,8 +1265,8 @@ static void ExecItemSpark(void) {
BoardSpaceRotGet(0, GWPlayer[currItemRestore].space_curr, &sp20);
BoardModelRotSetV(suitMdl, &sp20);
BoardModelPosGet(suitMdl, &sp2C);
sp2C.z += 106.0 * sin(sp20.x * M_PI / 180.0);
sp2C.x -= 106.0 * sin(sp20.z * M_PI / 180.0);
sp2C.z += 106.0 * sind(sp20.x);
sp2C.x -= 106.0 * sind(sp20.z);
BoardModelPosSetV(suitMdl, &sp2C);
HuAudFXPlay(0x31B);
BoardModelMotionStart(suitMdl, 1, 0);
@ -1369,9 +1371,9 @@ static void ExecItemWhistle(void) {
temp_r17 = BoardModelMotionCreate(sp20[var_r31], DATA_MAKE_NUM(DATADIR_BGUEST, 40));
BoardModelMotionStart(sp20[var_r31], temp_r17, 0x40000001);
sp28[var_r31] = 120.0f;
spF0[var_r31].x = spB4.x + 120.0 * sin(var_f31 * M_PI / 180.0);
spF0[var_r31].x = spB4.x + 120.0 * sind(var_f31);
spF0[var_r31].y = 1000.0f + spB4.y + 100.0f * var_r31;
spF0[var_r31].z = spB4.z + 120.0 * cos(var_f31 * M_PI / 180.0);
spF0[var_r31].z = spB4.z + 120.0 * cosd(var_f31);
spC0[var_r31].x = spC0[var_r31].z = 0.0f;
spC0[var_r31].y = var_f31 + 90.0f;
if (spC0[var_r31].y >= 360.0f) {
@ -1490,8 +1492,8 @@ static void ExecItemWhistle(void) {
if (spC0[var_r31].y >= 360.0f) {
spC0[var_r31].y -= 360.0f;
}
spF0[var_r31].x = spB4.x + 120.0 * sin(sp38[var_r31] * M_PI / 180.0);
spF0[var_r31].z = spB4.z + 120.0 * cos(sp38[var_r31] * M_PI / 180.0);
spF0[var_r31].x = spB4.x + 120.0 * sind(sp38[var_r31]);
spF0[var_r31].z = spB4.z + 120.0 * cosd(sp38[var_r31]);
BoardModelPosSetV(sp20[var_r31], &spF0[var_r31]);
BoardModelRotSetV(sp20[var_r31], &spC0[var_r31]);
}
@ -1523,8 +1525,8 @@ static void ExecItemWhistle(void) {
spF0[var_r31].y = spB4.y;
sp48[var_r31] = -1.0f;
}
spF0[var_r31].x = spB4.x + sp28[var_r31] * sin(sp38[var_r31] * M_PI / 180.0);
spF0[var_r31].z = spB4.z + sp28[var_r31] * cos(sp38[var_r31] * M_PI / 180.0);
spF0[var_r31].x = spB4.x + sp28[var_r31] * sind(sp38[var_r31]);
spF0[var_r31].z = spB4.z + sp28[var_r31] * cosd(sp38[var_r31]);
BoardModelPosSetV(sp20[var_r31], &spF0[var_r31]);
}
}
@ -1955,12 +1957,12 @@ static void LampParticleUpdate(ModelData *model, ParticleData *particle, Mtx mat
}
}
if (j != particle->unk_30) {
var_r31->unk34.x = 60.0 * sin((spC.y - 90.0f) * M_PI / 180.0);
var_r31->unk34.x = 60.0 * sind(spC.y - 90.0f);
var_r31->unk34.y = 30.0f;
var_r31->unk34.z = 60.0 * cos((spC.y - 90.0f) * M_PI / 180.0);
var_r31->unk34.z = 60.0 * cosd(spC.y - 90.0f);
sp8 = 12.0f;
var_r31->unk08.x = 12.0 * cos((i * 110.0f + 35.0f) * M_PI / 180.0);
var_r31->unk08.y = 12.0 * sin((i * 110.0f + 35.0f) * M_PI / 180.0);
var_r31->unk08.x = 12.0 * cosd(i * 110.0f + 35.0f);
var_r31->unk08.y = 12.0 * sind(i * 110.0f + 35.0f);
var_r31->unk08.z = 3.0f + frand8() * 5.0f * 0.003921569f;
var_r31->unk14.y = 255.0f;
var_r31->unk2C = 25.0f;
@ -1983,9 +1985,9 @@ static void LampParticleUpdate(ModelData *model, ParticleData *particle, Mtx mat
if (var_r31->unk14.y <= 120.0f) {
var_r31->unk14.y = 200.0f;
temp_f31 = frand8() * 180.0f * 0.003921569f;
var_r31->unk08.x = 6.0 * cos(temp_f31 * M_PI / 180.0);
var_r31->unk08.x = 6.0 * cosd(temp_f31);
var_r31->unk08.y = -4.0f;
var_r31->unk08.z = 6.0 * sin(temp_f31 * M_PI / 180.0);
var_r31->unk08.z = 6.0 * sind(temp_f31);
var_r31->unk00_s16 = 1;
}
var_r31->unk40.a = var_r31->unk14.y;
@ -2017,11 +2019,11 @@ static void GenieParticleUpdate(ModelData *model, ParticleData *particle, Mtx ma
var_r31->unk34.y = -50.0f + frand8() * 100.0f * 0.003921569f;
var_r31->unk34.z = -10.0f + frand8() * 20.0f * 0.003921569f;
temp_f31 = 0.5f + frand8() * 3.0f * 0.003921569f;
var_r31->unk08.x = temp_f31 * cos((i * 110.0f + 35.0f) * M_PI / 180.0);
var_r31->unk08.y = temp_f31 * sin((i * 110.0f + 35.0f) * M_PI / 180.0);
var_r31->unk08.x = temp_f31 * cosd(i * 110.0f + 35.0f);
var_r31->unk08.y = temp_f31 * sind(i * 110.0f + 35.0f);
var_r31->unk08.z = 0.0f;
var_r31->unk14.y = 255.0f;
temp_f30 = 125.0f + frand8() * 0x64 * 0.003921569f;
temp_f30 = 125.0f + frand8() * 100 * 0.003921569f;
var_r31->unk40.r = var_r31->unk40.g = var_r31->unk40.b = temp_f30;
var_r31->unk00 = 0;
var_r31->unk2C = 80.0f + frand8() * 60.0f * 0.003921569f;
@ -2288,9 +2290,9 @@ static void GenieSceneExec(void) {
booCamUp.x = sp38.x + (sp50.x - sp38.x) * 0.7f;
booCamUp.y = sp38.y + 400.0f;
booCamUp.z = sp38.z + (sp50.z - sp38.z) * 0.7f;
booCamPos.x = booCamUp.x + sin(-5 * M_PI / 9) * 1100.0;
booCamPos.x = booCamUp.x + sind(-100) * 1100.0;
booCamPos.y = booCamUp.y + 950.0f;
booCamPos.z = booCamUp.z + cos(-5 * M_PI / 9) * 1100.0;
booCamPos.z = booCamUp.z + cosd(-100) * 1100.0;
HuAudFXPlay(0x356);
BoardWinCreate(2, MAKE_MESSID(18, 27), -1);
BoardWinWait();
@ -2565,7 +2567,7 @@ static void ExecItemBagShow(void) {
break;
}
sp8 = sp14;
sp8.y += 15.0 * sin(var_f31 * M_PI / 180.0);
sp8.y += 15.0 * sind(var_f31);
BoardModelPosSetV(suitMdl, &sp8);
var_f31 += 36.0f;
HuPrcVSleep();

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

@ -12,6 +12,8 @@
#include "game/board/player.h"
#include "game/board/tutorial.h"
#include "ext_math.h"
typedef struct {
struct {
u8 unk00_field0 : 1;
@ -481,7 +483,7 @@ static void DiceMain(omObjData *arg0) {
var_f27 = 1.0f;
var_f28 = 0.5f;
}
arg0->scale.x = var_f27 + var_f28 * sin((float) (temp_r29->unk04 % 180) * M_PI / 180.0);
arg0->scale.x = var_f27 + var_f28 * sind((float) (temp_r29->unk04 % 180));
arg0->scale.y = arg0->scale.x;
arg0->scale.z = arg0->scale.x;
if (temp_r29->unk04 <= 360) {
@ -502,7 +504,7 @@ static void DiceMain(omObjData *arg0) {
temp_r29->unk04 -= 360;
}
OSs16tof32(&temp_r29->unk04, &temp_f29);
arg0->trans.y += 0.20000000298023224 * sin(temp_f29 * M_PI / 180.0);
arg0->trans.y += 0.2f * sind(temp_f29);
break;
case 2:
temp_r29->unk04++;
@ -523,7 +525,7 @@ static void DiceMain(omObjData *arg0) {
OSs16tof32(&temp_r29->unk04, &temp_f29);
if (temp_r29->unk04 < 4) {
arg0->trans.y += 10.0f + (0.5f * temp_f29);
arg0->scale.x = (arg0->scale.x + (0.10000000149011612 * sin((M_PI * (4.0f * temp_f29)) / 180.0)));
arg0->scale.x += 0.1f * sind(4.0f * temp_f29);
arg0->scale.y = arg0->scale.x;
arg0->scale.z = arg0->scale.x;
} else {

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

@ -21,7 +21,7 @@
#include "game/board/window.h"
#include "dolphin.h"
#include "math.h"
#include "ext_math.h"
typedef struct {
struct {
@ -262,7 +262,7 @@ static void ExecShop(void) {
BoardSpacePosGet(0, temp_r25, &sp2C);
PSVECSubtract(&sp2C, &sp38, &sp20);
PSVECNormalize(&sp20, &sp20);
temp_f31 = 180.0 * (atan2(-sp20.x, -sp20.z) / M_PI);
temp_f31 = atan2d(-sp20.x, -sp20.z);
sp14.x = -10.0f;
sp14.y = temp_f31;
sp14.z = 0.0f;
@ -535,7 +535,7 @@ static void UpdateShopWin(omObjData *arg0) {
temp_r28->unk04 = 90;
}
OSs8tof32(&temp_r28->unk04, &var_f28);
arg0->scale.x = arg0->scale.y = arg0->scale.z = 0.25 * sin(var_f28 * M_PI / 180.0);
arg0->scale.x = arg0->scale.y = arg0->scale.z = 0.25 * sind(var_f28);
}
if (temp_r28->unk00_field1 == 5) {
var_f29 = -12.5f;
@ -575,7 +575,7 @@ static void SetShopWinItem(ShopWinWork *arg0, omObjData *arg1) {
BoardModelMotionSpeedSet(itemMdl, 0.033333335f);
}
BoardCameraDirGet(&spC);
arg1->rot.y = BoardDAngleCalc(180.0 * (atan2(-spC.x, -spC.z) / M_PI));
arg1->rot.y = BoardDAngleCalc(atan2d(-spC.x, -spC.z));
OSf32tos16(&arg1->rot.y, &angleVal);
}
}
@ -689,7 +689,7 @@ static void MoveItemGive(omObjData *arg0, ItemGiveWork *arg1) {
temp_f27 = -0.08166667f * temp_f27 * temp_f27;
arg0->trans.y += temp_f27;
BoardCameraDirGet(&sp10);
var_f26 = BoardDAngleCalc(180.0 * (atan2(-sp10.x, -sp10.z) / M_PI));
var_f26 = BoardDAngleCalc(atan2d(-sp10.x, -sp10.z));
OSf32tos16(&var_f26, &angleVal);
} else {
arg0->scale.x += arg0->scale.y;
@ -723,7 +723,7 @@ static void ShrinkItemGive(omObjData *arg0, ItemGiveWork *arg1) {
if (var_f30 > 90.0f) {
var_f30 = 90.0f;
}
arg0->scale.x = cos(var_f30 * M_PI / 180.0);
arg0->scale.x = cosd(var_f30);
arg0->trans.y += arg0->rot.x;
angleVal += 8;
if (angleVal > 360) {
@ -1137,7 +1137,7 @@ void BoardShopTutorialExec(s32 arg0) {
BoardSpacePosGet(0, temp_r27, &sp3C);
PSVECSubtract(&sp3C, &sp48, &sp30);
PSVECNormalize(&sp30, &sp30);
temp_f31 = 180.0 * (atan2(-sp30.x, -sp30.z) / M_PI);
temp_f31 = atan2d(-sp30.x, -sp30.z);
sp24.x = -10.0f;
sp24.y = temp_f31;
sp24.z = 0.0f;

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

@ -20,7 +20,7 @@
#include "game/board/ui.h"
#include "game/board/window.h"
#include "math.h"
#include "ext_math.h"
typedef struct {
struct {
@ -207,7 +207,7 @@ static void ExecStar(void) {
var_r22 = BoardSpaceLinkFlagSearch(0, temp_r24, 0x04000000);
BoardSpacePosGet(0, var_r22, &sp18);
PSVECSubtract(&sp18, &sp24, &spC);
temp_f30 = 90.0 - 180.0 * (atan2(spC.z, spC.x) / M_PI);
temp_f30 = 90.0 - atan2d(spC.z, spC.x);
temp_f30 = 90.0f * ((temp_f30 + 3.0f) / 90.0f);
temp_f29 = BoardPlayerRotYGet(temp_r31);
BoardPlayerIdleSet(temp_r31);
@ -511,7 +511,7 @@ static void ShrinkGiveStar(GiveStarWork *arg0, omObjData *arg1) {
}
}
OSs16tof32(&arg0->unk08, &var_f30);
arg1->scale.x = sin((var_f30 + 90.0f) * M_PI / 180.0);
arg1->scale.x = sind(var_f30 + 90.0f);
if (arg1->scale.x <= 0.0f) {
arg1->scale.x = 0.001f;
}

20
src/game/window.c
View file

@ -10,7 +10,7 @@
#include "game/armem.h"
#include "game/audio.h"
#include "math.h"
#include "ext_math.h"
#include "stdarg.h"
#include "string.h"
@ -1784,7 +1784,7 @@ static s32 winPortraitTbl[] = {
WIN_BOWSER_TALK_ANM,
WIN_KKID_TALK_ANM,
WIN_KOOPA_TALK_ANM,
WIN_CONDOR_TALK_ANM,
WIN_CONDOR_TALK_ANM,
WIN_BOO_BLUE_TALK_ANM,
WIN_DOLPHIN_TALK_ANM,
WIN_BOO_RED_TALK_ANM,
@ -1842,7 +1842,7 @@ void HuWinExAnimIn(s16 window) {
HuSprScaleSet(window_ptr->group, 0, 1.0f, 0.0f);
HuWinDispOn(window);
for (i=0; i<=10; i++) {
HuSprScaleSet(window_ptr->group, 0, 1.0f, 1.0 - 1.1 * cos(M_PI * (9.0f * i) / 180.0));
HuSprScaleSet(window_ptr->group, 0, 1.0f, 1.0 - 1.1 * cosd(9.0f * i));
HuPrcVSleep();
}
HuSprScaleSet(window_ptr->group, 0, 1.0f, 1.0f);
@ -1852,13 +1852,13 @@ void HuWinExAnimIn(s16 window) {
HuWinDispOn(window);
for (i=0; i<=20; i++) {
if (i <= 10) {
HuSprScaleSet(window_ptr->group, 0, 1.0f, 1.1 * (1.0 - cos(M_PI * (9.0f * i) / 180.0)));
HuSprScaleSet(window_ptr->group, 0, 1.0f, 1.1 * (1.0 - cosd(9.0f * i)));
} else {
HuSprScaleSet(window_ptr->group, 0, 1.0f, 1.0f);
}
if (i > 10) {
s16 time = i - 10;
HuSprScaleSet(window_ptr->group, 2, 1.0f, 1.0 - 1.1 * cos(M_PI * (9.0f * time) / 180.0));
HuSprScaleSet(window_ptr->group, 2, 1.0f, 1.0 - 1.1 * cosd(9.0f * time));
}
HuPrcVSleep();
}
@ -1873,18 +1873,18 @@ void HuWinExAnimOut(s16 window) {
_HuWinHomeClear(window_ptr);
if (window_ptr->sprite_id[2] == -1) {
for (i=0; i<=10; i++) {
HuSprScaleSet(window_ptr->group, 0, 1.0f, cos(M_PI * (9.0f * i) / 180.0));
HuSprScaleSet(window_ptr->group, 0, 1.0f, cosd(9.0f * i));
HuPrcVSleep();
}
HuWinDispOff(window);
} else {
for (i=0; i<=15; i++) {
if (i <= 10) {
HuSprScaleSet(window_ptr->group, 2, 1.0f, cos(M_PI * (9.0f * i) / 180.0));
HuSprScaleSet(window_ptr->group, 2, 1.0f, cosd(9.0f * i));
}
if (i > 5) {
s16 time = i - 5;
HuSprScaleSet(window_ptr->group, 0, 1.0f, cos(M_PI * (9.0f * time) / 180.0));
HuSprScaleSet(window_ptr->group, 0, 1.0f, cosd(9.0f * time));
}
HuPrcVSleep();
}
@ -1901,13 +1901,13 @@ void HuWinExAnimPopIn(s16 window, s16 portrait) {
s16 i;
for (i=0; i<=10; i++) {
HuSprScaleSet(window_ptr->group, 2, 1.0f, cos(M_PI * (9.0f * i) / 180.0));
HuSprScaleSet(window_ptr->group, 2, 1.0f, cosd(9.0f * i));
HuPrcVSleep();
}
HuWinSprKill(window, 2);
HuWinExCreatePortrait(window, portrait, 48.0f, 48.0f);
for (i=0; i<=10; i++) {
HuSprScaleSet(window_ptr->group, 2, 1.0f, sin(M_PI * (9.0f * i) / 180.0));
HuSprScaleSet(window_ptr->group, 2, 1.0f, sind(9.0f * i));
HuPrcVSleep();
}
HuSprScaleSet(window_ptr->group, 2, 1.0f, 1.0f);