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

Port some RELs to PAL (#465)

Browse source
This commit is contained in:
Liam Coleman 2024-11-16 15:01:59 -06:00 • committed by GitHub
parent d0a5c85d3e
commit ae81b60c47
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 349 additions and 197 deletions
Download patch file Download diff file Expand all files Collapse all files

15
config/GMPP01_00/rels/E3setupDLL/splits.txt
View file

@ -5,3 +5,18 @@ Sections:
.rodata type:rodata align:8 .rodata type:rodata align:8
.data type:data align:8 .data type:data align:8
.bss type:bss align:8 .bss type:bss align:8
REL/E3setupDLL/mgselect.c:
.text start:0x00000000 end:0x0000133C
.rodata start:0x00000000 end:0x00000088
.data start:0x00000000 end:0x00000250
.bss start:0x00000000 end:0x00000028
REL/executor.c:
.text start:0x0000133C end:0x000013DC
REL/E3setupDLL/main.c:
.text start:0x000013DC end:0x00005850
.rodata start:0x00000088 end:0x00000130
.data start:0x00000250 end:0x000004D0
.bss start:0x00000028 end:0x000000F8

359
config/GMPP01_00/rels/E3setupDLL/symbols.txt
View file

@ -1,168 +1,179 @@
fn_2_0 = .text:0x00000000; // type:function size:0x324 E3MGSelectInit = .text:0x00000000; // type:function size:0x324
fn_2_324 = .text:0x00000324; // type:function size:0x9C StartMGSelect = .text:0x00000324; // type:function size:0x9C scope:local
fn_2_3C0 = .text:0x000003C0; // type:function size:0xA0 UpdatePad = .text:0x000003C0; // type:function size:0xA0 scope:local
fn_2_460 = .text:0x00000460; // type:function size:0x584 UpdateMGSelect = .text:0x00000460; // type:function size:0x584 scope:local
fn_2_9E4 = .text:0x000009E4; // type:function size:0x528 CreateMGSelect = .text:0x000009E4; // type:function size:0x528 scope:local
fn_2_F0C = .text:0x00000F0C; // type:function size:0x80 UpdateMGPic = .text:0x00000F0C; // type:function size:0x80 scope:local
fn_2_F8C = .text:0x00000F8C; // type:function size:0x1AC CreateMGPic = .text:0x00000F8C; // type:function size:0x1AC scope:local
fn_2_1138 = .text:0x00001138; // type:function size:0x14 UpdateMGInterface = .text:0x00001138; // type:function size:0x14 scope:local
fn_2_114C = .text:0x0000114C; // type:function size:0x1F0 CreateMGInterface = .text:0x0000114C; // type:function size:0x1F0 scope:local
_prolog = .text:0x0000133C; // type:function size:0x54 scope:global _prolog = .text:0x0000133C; // type:function size:0x54 scope:global
_epilog = .text:0x00001390; // type:function size:0x4C scope:global _epilog = .text:0x00001390; // type:function size:0x4C scope:global
fn_2_13DC = .text:0x000013DC; // type:function size:0x108 ObjectSetup = .text:0x000013DC; // type:function size:0x108
fn_2_14E4 = .text:0x000014E4; // type:function size:0x514 E3MainInit = .text:0x000014E4; // type:function size:0x514
fn_2_19F8 = .text:0x000019F8; // type:function size:0x1AC E3LightInit = .text:0x000019F8; // type:function size:0x1AC
fn_2_1BA4 = .text:0x00001BA4; // type:function size:0x7C GetStickX = .text:0x00001BA4; // type:function size:0x7C scope:local
fn_2_1C20 = .text:0x00001C20; // type:function size:0x84 GetStickY = .text:0x00001C20; // type:function size:0x84 scope:local
fn_2_1CA4 = .text:0x00001CA4; // type:function size:0x90 GetBtn = .text:0x00001CA4; // type:function size:0x90 scope:local
fn_2_1D34 = .text:0x00001D34; // type:function size:0x24 GetBtnDown = .text:0x00001D34; // type:function size:0x24 scope:local
fn_2_1D58 = .text:0x00001D58; // type:function size:0xFC E3PadUpdate = .text:0x00001D58; // type:function size:0xFC
fn_2_1E54 = .text:0x00001E54; // type:function size:0x1C0 E3PadRead = .text:0x00001E54; // type:function size:0x1C0
fn_2_2014 = .text:0x00002014; // type:function size:0x78 MotionMaxTimeGet = .text:0x00002014; // type:function size:0x78
fn_2_208C = .text:0x0000208C; // type:function size:0x2C MotionShiftTimeGet = .text:0x0000208C; // type:function size:0x2C
fn_2_20B8 = .text:0x000020B8; // type:function size:0xA4 InitMenuControl = .text:0x000020B8; // type:function size:0xA4 scope:local
fn_2_215C = .text:0x0000215C; // type:function size:0x400 UpdateMenuControl = .text:0x0000215C; // type:function size:0x400 scope:local
fn_2_255C = .text:0x0000255C; // type:function size:0x124 UpdateOvlWatch = .text:0x0000255C; // type:function size:0x124 scope:local
fn_2_2680 = .text:0x00002680; // type:function size:0x74 E3OvlWatchInit = .text:0x00002680; // type:function size:0x74
fn_2_26F4 = .text:0x000026F4; // type:function size:0x344 UpdatePlayerCnt = .text:0x000026F4; // type:function size:0x344 scope:local
fn_2_2A38 = .text:0x00002A38; // type:function size:0x59C InitPlayerCnt = .text:0x00002A38; // type:function size:0x59C scope:local
fn_2_2FD4 = .text:0x00002FD4; // type:function size:0x208 UpdateCharSelCursor = .text:0x00002FD4; // type:function size:0x208 scope:local
fn_2_31DC = .text:0x000031DC; // type:function size:0x37C UpdateCharSelPlayerCursor = .text:0x000031DC; // type:function size:0x37C scope:local
fn_2_3558 = .text:0x00003558; // type:function size:0x3B4 UpdateCharSelComCursor = .text:0x00003558; // type:function size:0x3B4 scope:local
fn_2_390C = .text:0x0000390C; // type:function size:0xAC CheckCharSel = .text:0x0000390C; // type:function size:0xAC scope:local
fn_2_39B8 = .text:0x000039B8; // type:function size:0x2B8 UpdateCharSel = .text:0x000039B8; // type:function size:0x2B8 scope:local
fn_2_3C70 = .text:0x00003C70; // type:function size:0x534 InitCharSel = .text:0x00003C70; // type:function size:0x534 scope:local
fn_2_41A4 = .text:0x000041A4; // type:function size:0x2DC UpdateRumbleCfg = .text:0x000041A4; // type:function size:0x2DC scope:local
fn_2_4480 = .text:0x00004480; // type:function size:0x520 InitRumbleCfg = .text:0x00004480; // type:function size:0x520 scope:local
fn_2_49A0 = .text:0x000049A0; // type:function size:0x59C UpdateModeSel = .text:0x000049A0; // type:function size:0x59C scope:local
fn_2_4F3C = .text:0x00004F3C; // type:function size:0x4E8 InitModeSel = .text:0x00004F3C; // type:function size:0x4E8 scope:local
fn_2_5424 = .text:0x00005424; // type:function size:0x100 E3BGUpdate = .text:0x00005424; // type:function size:0x100 scope:local
fn_2_5524 = .text:0x00005524; // type:function size:0x184 E3BGCreate = .text:0x00005524; // type:function size:0x184
fn_2_56A8 = .text:0x000056A8; // type:function size:0x7C InitCamera = .text:0x000056A8; // type:function size:0x7C scope:local
fn_2_5724 = .text:0x00005724; // type:function size:0x12C UpdateCamera = .text:0x00005724; // type:function size:0x12C scope:local
_ctors = .ctors:0x00000000; // type:label scope:global data:4byte _ctors = .ctors:0x00000000; // type:label scope:global data:4byte
_dtors = .dtors:0x00000000; // type:label scope:global data:4byte _dtors = .dtors:0x00000000; // type:label scope:global data:4byte
lbl_2_rodata_10 = .rodata:0x00000010; // type:object size:0x4 data:float lbl_2_rodata_0 = .rodata:0x00000000; // type:object size:0x10
lbl_2_rodata_14 = .rodata:0x00000014; // type:object size:0x4 data:float lbl_2_rodata_10 = .rodata:0x00000010; // type:object size:0x4 scope:local data:float
lbl_2_rodata_18 = .rodata:0x00000018; // type:object size:0x4 data:float lbl_2_rodata_14 = .rodata:0x00000014; // type:object size:0x4 scope:local data:float
lbl_2_rodata_1C = .rodata:0x0000001C; // type:object size:0x4 data:float lbl_2_rodata_18 = .rodata:0x00000018; // type:object size:0x4 scope:local data:float
lbl_2_rodata_20 = .rodata:0x00000020; // type:object size:0x4 data:float lbl_2_rodata_1C = .rodata:0x0000001C; // type:object size:0x4 scope:local data:float
lbl_2_rodata_24 = .rodata:0x00000024; // type:object size:0x4 data:float lbl_2_rodata_20 = .rodata:0x00000020; // type:object size:0x4 scope:local data:float
lbl_2_rodata_28 = .rodata:0x00000028; // type:object size:0x4 data:float lbl_2_rodata_24 = .rodata:0x00000024; // type:object size:0x4 scope:local data:float
lbl_2_rodata_2C = .rodata:0x0000002C; // type:object size:0x4 data:float lbl_2_rodata_28 = .rodata:0x00000028; // type:object size:0x4 scope:local data:float
lbl_2_rodata_30 = .rodata:0x00000030; // type:object size:0x4 data:float lbl_2_rodata_2C = .rodata:0x0000002C; // type:object size:0x4 scope:local data:float
lbl_2_rodata_34 = .rodata:0x00000034; // type:object size:0x4 data:float lbl_2_rodata_30 = .rodata:0x00000030; // type:object size:0x4 scope:local data:float
lbl_2_rodata_38 = .rodata:0x00000038; // type:object size:0x4 data:float lbl_2_rodata_34 = .rodata:0x00000034; // type:object size:0x4 scope:local data:float
lbl_2_rodata_3C = .rodata:0x0000003C; // type:object size:0x4 data:float lbl_2_rodata_38 = .rodata:0x00000038; // type:object size:0x4 scope:local data:float
lbl_2_rodata_40 = .rodata:0x00000040; // type:object size:0x4 data:float lbl_2_rodata_3C = .rodata:0x0000003C; // type:object size:0x4 scope:local data:float
lbl_2_rodata_44 = .rodata:0x00000044; // type:object size:0x4 data:float lbl_2_rodata_40 = .rodata:0x00000040; // type:object size:0x4 scope:local data:float
lbl_2_rodata_48 = .rodata:0x00000048; // type:object size:0x4 data:float lbl_2_rodata_44 = .rodata:0x00000044; // type:object size:0x4 scope:local data:float
lbl_2_rodata_4C = .rodata:0x0000004C; // type:object size:0x4 data:float lbl_2_rodata_48 = .rodata:0x00000048; // type:object size:0x4 scope:local data:float
lbl_2_rodata_50 = .rodata:0x00000050; // type:object size:0x4 data:float lbl_2_rodata_4C = .rodata:0x0000004C; // type:object size:0x4 scope:local data:float
lbl_2_rodata_54 = .rodata:0x00000054; // type:object size:0x4 data:float lbl_2_rodata_50 = .rodata:0x00000050; // type:object size:0x4 scope:local data:float
lbl_2_rodata_58 = .rodata:0x00000058; // type:object size:0x4 data:float lbl_2_rodata_54 = .rodata:0x00000054; // type:object size:0x4 scope:local data:float
lbl_2_rodata_5C = .rodata:0x0000005C; // type:object size:0x4 data:float lbl_2_rodata_58 = .rodata:0x00000058; // type:object size:0x4 scope:local data:float
lbl_2_rodata_60 = .rodata:0x00000060; // type:object size:0x4 data:float lbl_2_rodata_5C = .rodata:0x0000005C; // type:object size:0x4 scope:local data:float
lbl_2_rodata_64 = .rodata:0x00000064; // type:object size:0x4 data:float lbl_2_rodata_60 = .rodata:0x00000060; // type:object size:0x4 scope:local data:float
lbl_2_rodata_68 = .rodata:0x00000068; // type:object size:0x4 data:float lbl_2_rodata_64 = .rodata:0x00000064; // type:object size:0x4 scope:local data:float
lbl_2_rodata_6C = .rodata:0x0000006C; // type:object size:0x4 data:float lbl_2_rodata_68 = .rodata:0x00000068; // type:object size:0x4 scope:local data:float
lbl_2_rodata_70 = .rodata:0x00000070; // type:object size:0x4 data:float lbl_2_rodata_6C = .rodata:0x0000006C; // type:object size:0x4 scope:local data:float
lbl_2_rodata_74 = .rodata:0x00000074; // type:object size:0x4 data:float lbl_2_rodata_70 = .rodata:0x00000070; // type:object size:0x4 scope:local data:float
lbl_2_rodata_78 = .rodata:0x00000078; // type:object size:0x4 data:float lbl_2_rodata_74 = .rodata:0x00000074; // type:object size:0x4 scope:local data:float
lbl_2_rodata_7C = .rodata:0x0000007C; // type:object size:0x4 data:float lbl_2_rodata_78 = .rodata:0x00000078; // type:object size:0x4 scope:local data:float
lbl_2_rodata_80 = .rodata:0x00000080; // type:object size:0x8 data:float lbl_2_rodata_7C = .rodata:0x0000007C; // type:object size:0x4 scope:local data:float
lbl_2_rodata_88 = .rodata:0x00000088; // type:object size:0x4 data:float lbl_2_rodata_80 = .rodata:0x00000080; // type:object size:0x8 scope:local data:float
lbl_2_rodata_8C = .rodata:0x0000008C; // type:object size:0x4 data:float lbl_2_rodata_88 = .rodata:0x00000088; // type:object size:0x4 scope:local data:float
lbl_2_rodata_90 = .rodata:0x00000090; // type:object size:0x4 data:float lbl_2_rodata_8C = .rodata:0x0000008C; // type:object size:0x4 scope:local data:float
lbl_2_rodata_94 = .rodata:0x00000094; // type:object size:0x4 data:float lbl_2_rodata_90 = .rodata:0x00000090; // type:object size:0x4 scope:local data:float
lbl_2_rodata_98 = .rodata:0x00000098; // type:object size:0x4 data:float lbl_2_rodata_94 = .rodata:0x00000094; // type:object size:0x4 scope:local data:float
lbl_2_rodata_9C = .rodata:0x0000009C; // type:object size:0x4 data:float lbl_2_rodata_98 = .rodata:0x00000098; // type:object size:0x4 scope:local data:float
lbl_2_rodata_A0 = .rodata:0x000000A0; // type:object size:0x4 data:float lbl_2_rodata_9C = .rodata:0x0000009C; // type:object size:0x4 scope:local data:float
lbl_2_rodata_A4 = .rodata:0x000000A4; // type:object size:0x4 data:float lbl_2_rodata_A0 = .rodata:0x000000A0; // type:object size:0x4 scope:local data:float
lbl_2_rodata_A8 = .rodata:0x000000A8; // type:object size:0x4 data:float lbl_2_rodata_A4 = .rodata:0x000000A4; // type:object size:0x4 scope:local data:float
lbl_2_rodata_AC = .rodata:0x000000AC; // type:object size:0x4 data:float lbl_2_rodata_A8 = .rodata:0x000000A8; // type:object size:0x4 scope:local data:float
lbl_2_rodata_B0 = .rodata:0x000000B0; // type:object size:0x4 data:float lbl_2_rodata_AC = .rodata:0x000000AC; // type:object size:0x4 scope:local data:float
lbl_2_rodata_B4 = .rodata:0x000000B4; // type:object size:0x4 data:float lbl_2_rodata_B0 = .rodata:0x000000B0; // type:object size:0x4 scope:local data:float
lbl_2_rodata_B8 = .rodata:0x000000B8; // type:object size:0x4 data:float lbl_2_rodata_B4 = .rodata:0x000000B4; // type:object size:0x4 scope:local data:float
lbl_2_rodata_BC = .rodata:0x000000BC; // type:object size:0x4 data:float lbl_2_rodata_B8 = .rodata:0x000000B8; // type:object size:0x4 scope:local data:float
lbl_2_rodata_C0 = .rodata:0x000000C0; // type:object size:0x8 data:double lbl_2_rodata_BC = .rodata:0x000000BC; // type:object size:0x4 scope:local data:float
lbl_2_rodata_C8 = .rodata:0x000000C8; // type:object size:0x4 data:float lbl_2_rodata_C0 = .rodata:0x000000C0; // type:object size:0x8 scope:local data:double
lbl_2_rodata_CC = .rodata:0x000000CC; // type:object size:0x4 data:float lbl_2_rodata_C8 = .rodata:0x000000C8; // type:object size:0x4 scope:local data:float
lbl_2_rodata_D0 = .rodata:0x000000D0; // type:object size:0x4 data:float lbl_2_rodata_CC = .rodata:0x000000CC; // type:object size:0x4 scope:local data:float
lbl_2_rodata_D4 = .rodata:0x000000D4; // type:object size:0x4 data:float lbl_2_rodata_D0 = .rodata:0x000000D0; // type:object size:0x4 scope:local data:float
lbl_2_rodata_D8 = .rodata:0x000000D8; // type:object size:0x4 data:float lbl_2_rodata_D4 = .rodata:0x000000D4; // type:object size:0x4 scope:local data:float
lbl_2_rodata_DC = .rodata:0x000000DC; // type:object size:0x4 data:float lbl_2_rodata_D8 = .rodata:0x000000D8; // type:object size:0x4 scope:local data:float
lbl_2_rodata_E0 = .rodata:0x000000E0; // type:object size:0x4 data:float lbl_2_rodata_DC = .rodata:0x000000DC; // type:object size:0x4 scope:local data:float
lbl_2_rodata_E4 = .rodata:0x000000E4; // type:object size:0x4 data:float lbl_2_rodata_E0 = .rodata:0x000000E0; // type:object size:0x4 scope:local data:float
lbl_2_rodata_E8 = .rodata:0x000000E8; // type:object size:0x4 data:float lbl_2_rodata_E4 = .rodata:0x000000E4; // type:object size:0x4 scope:local data:float
lbl_2_rodata_EC = .rodata:0x000000EC; // type:object size:0x4 data:float lbl_2_rodata_E8 = .rodata:0x000000E8; // type:object size:0x4 scope:local data:float
lbl_2_rodata_F0 = .rodata:0x000000F0; // type:object size:0x4 data:float lbl_2_rodata_EC = .rodata:0x000000EC; // type:object size:0x4 scope:local data:float
lbl_2_rodata_F4 = .rodata:0x000000F4; // type:object size:0x4 data:float lbl_2_rodata_F0 = .rodata:0x000000F0; // type:object size:0x4 scope:local data:float
lbl_2_rodata_F8 = .rodata:0x000000F8; // type:object size:0x4 data:float lbl_2_rodata_F4 = .rodata:0x000000F4; // type:object size:0x4 scope:local data:float
lbl_2_rodata_FC = .rodata:0x000000FC; // type:object size:0x4 data:float lbl_2_rodata_F8 = .rodata:0x000000F8; // type:object size:0x4 scope:local data:float
lbl_2_rodata_100 = .rodata:0x00000100; // type:object size:0x4 data:float lbl_2_rodata_FC = .rodata:0x000000FC; // type:object size:0x4 scope:local data:float
lbl_2_rodata_104 = .rodata:0x00000104; // type:object size:0x4 data:float lbl_2_rodata_100 = .rodata:0x00000100; // type:object size:0x4 scope:local data:float
lbl_2_rodata_108 = .rodata:0x00000108; // type:object size:0x4 data:float lbl_2_rodata_104 = .rodata:0x00000104; // type:object size:0x4 scope:local data:float
lbl_2_rodata_10C = .rodata:0x0000010C; // type:object size:0x4 data:float lbl_2_rodata_108 = .rodata:0x00000108; // type:object size:0x4 scope:local data:float
lbl_2_rodata_110 = .rodata:0x00000110; // type:object size:0x4 data:float lbl_2_rodata_10C = .rodata:0x0000010C; // type:object size:0x4 scope:local data:float
lbl_2_rodata_114 = .rodata:0x00000114; // type:object size:0x4 data:float lbl_2_rodata_110 = .rodata:0x00000110; // type:object size:0x4 scope:local data:float
lbl_2_rodata_118 = .rodata:0x00000118; // type:object size:0x4 data:float lbl_2_rodata_114 = .rodata:0x00000114; // type:object size:0x4 scope:local data:float
lbl_2_rodata_11C = .rodata:0x0000011C; // type:object size:0x4 data:float lbl_2_rodata_118 = .rodata:0x00000118; // type:object size:0x4 scope:local data:float
lbl_2_rodata_120 = .rodata:0x00000120; // type:object size:0x4 data:float lbl_2_rodata_11C = .rodata:0x0000011C; // type:object size:0x4 scope:local data:float
lbl_2_rodata_124 = .rodata:0x00000124; // type:object size:0x4 data:float lbl_2_rodata_120 = .rodata:0x00000120; // type:object size:0x4 scope:local data:float
lbl_2_rodata_128 = .rodata:0x00000128; // type:object size:0x4 data:float lbl_2_rodata_124 = .rodata:0x00000124; // type:object size:0x4 scope:local data:float
lbl_2_rodata_12C = .rodata:0x0000012C; // type:object size:0x4 data:float lbl_2_rodata_128 = .rodata:0x00000128; // type:object size:0x4 scope:local data:float
lbl_2_data_24 = .data:0x00000024; // type:object size:0x1A lbl_2_rodata_12C = .rodata:0x0000012C; // type:object size:0x4 scope:local data:float
lbl_2_data_3E = .data:0x0000003E; // type:object size:0x1A lbl_2_data_0 = .data:0x00000000; // type:object size:0x24 data:float
lbl_2_data_58 = .data:0x00000058; // type:object size:0x1C lbl_2_data_24 = .data:0x00000024; // type:object size:0x11 scope:local data:string
lbl_2_data_74 = .data:0x00000074; // type:object size:0x34 lbl_2_data_36 = .data:0x00000036; // type:object size:0x8
lbl_2_data_A8 = .data:0x000000A8; // type:object size:0x21 mgOvlTbl = .data:0x0000003E; // type:object size:0x1A scope:local
lbl_2_data_C9 = .data:0x000000C9; // type:object size:0x16 mgIdTbl = .data:0x00000058; // type:object size:0x1C scope:local
lbl_2_data_DF = .data:0x000000DF; // type:object size:0x16 mgNameTbl = .data:0x00000074; // type:object size:0x34 scope:local
lbl_2_data_F5 = .data:0x000000F5; // type:object size:0x16 lbl_2_data_A8 = .data:0x000000A8; // type:object size:0x21 data:string
lbl_2_data_10B = .data:0x0000010B; // type:object size:0xD lbl_2_data_C9 = .data:0x000000C9; // type:object size:0x16 data:string
lbl_2_data_118 = .data:0x00000118; // type:object size:0x16 lbl_2_data_DF = .data:0x000000DF; // type:object size:0x16 data:string
lbl_2_data_12E = .data:0x0000012E; // type:object size:0xD lbl_2_data_F5 = .data:0x000000F5; // type:object size:0x16 data:string
lbl_2_data_13B = .data:0x0000013B; // type:object size:0x16 lbl_2_data_10B = .data:0x0000010B; // type:object size:0xD data:string
lbl_2_data_151 = .data:0x00000151; // type:object size:0x16 lbl_2_data_118 = .data:0x00000118; // type:object size:0x16 data:string
lbl_2_data_167 = .data:0x00000167; // type:object size:0x16 lbl_2_data_12E = .data:0x0000012E; // type:object size:0xD data:string
lbl_2_data_17D = .data:0x0000017D; // type:object size:0x16 lbl_2_data_13B = .data:0x0000013B; // type:object size:0x16 data:string
lbl_2_data_193 = .data:0x00000193; // type:object size:0x16 lbl_2_data_151 = .data:0x00000151; // type:object size:0x16 data:string
lbl_2_data_1A9 = .data:0x000001A9; // type:object size:0x4B lbl_2_data_167 = .data:0x00000167; // type:object size:0x16 data:string
lbl_2_data_1F4 = .data:0x000001F4; // type:object size:0x14 lbl_2_data_17D = .data:0x0000017D; // type:object size:0x16 data:string
lbl_2_data_208 = .data:0x00000208; // type:object size:0x34 lbl_2_data_193 = .data:0x00000193; // type:object size:0x16 data:string
lbl_2_data_23C = .data:0x0000023C; // type:object size:0x14 lbl_2_data_1A9 = .data:0x000001A9; // type:object size:0x16 data:string
lbl_2_data_250 = .data:0x00000250; // type:object size:0xC mgNameTestTbl = .data:0x000001C0; // type:object size:0x34 scope:local
lbl_2_data_25C = .data:0x0000025C; // type:object size:0xC cursorYOfsTbl = .data:0x000001F4; // type:object size:0x14 scope:local data:float
lbl_2_data_268 = .data:0x00000268; // type:object size:0x6C mgPicTbl = .data:0x00000208; // type:object size:0x34 scope:local
lbl_2_data_2D4 = .data:0x000002D4; // type:object size:0x8 startText = .data:0x0000023C; // type:object size:0x10 scope:local data:string
lbl_2_data_2DC = .data:0x000002DC; // type:object size:0x10 shadowPos = .data:0x00000250; // type:object size:0xC scope:local
lbl_2_data_2EC = .data:0x000002EC; // type:object size:0x20 shadowTarget = .data:0x0000025C; // type:object size:0xC scope:local
lbl_2_data_30C = .data:0x0000030C; // type:object size:0x1C shadowUp = .data:0x00000268; // type:object size:0xC scope:local
lbl_2_data_328 = .data:0x00000328; // type:object size:0x10 lbl_2_data_274 = .data:0x00000274; // type:object size:0x60 data:float
lbl_2_data_338 = .data:0x00000338; // type:object size:0x40 playerCntTbl = .data:0x000002D4; // type:object size:0x8 scope:local
lbl_2_data_378 = .data:0x00000378; // type:object size:0x20 charTbl = .data:0x000002DC; // type:object size:0x10 scope:local
lbl_2_data_398 = .data:0x00000398; // type:object size:0x10 charSfxTbl = .data:0x000002EC; // type:object size:0x20 scope:local
lbl_2_data_3A8 = .data:0x000003A8; // type:object size:0x20 lbl_2_data_30C = .data:0x0000030C; // type:object size:0x12 scope:local
lbl_2_data_3C8 = .data:0x000003C8; // type:object size:0x14 lbl_2_data_31E = .data:0x0000031E; // type:object size:0x8
lbl_2_data_3DC = .data:0x000003DC; // type:object size:0x14 playerCntMessTbl = .data:0x00000328; // type:object size:0x10 scope:local
lbl_2_data_3F0 = .data:0x000003F0; // type:object size:0x8 charPosTbl = .data:0x00000338; // type:object size:0x40 scope:local data:float
lbl_2_data_3F8 = .data:0x000003F8; // type:object size:0x10 charComSfxTbl = .data:0x00000378; // type:object size:0x20 scope:local
lbl_2_data_408 = .data:0x00000408; // type:object size:0x10 lbl_2_data_398 = .data:0x00000398; // type:object size:0xF scope:local data:string
lbl_2_data_418 = .data:0x00000418; // type:object size:0x60 charSpriteTbl = .data:0x000003A8; // type:object size:0x20 scope:local
lbl_2_data_478 = .data:0x00000478; // type:object size:0x24 cursorSpriteTbl = .data:0x000003C8; // type:object size:0x14 scope:local
lbl_2_data_49C = .data:0x0000049C; // type:object size:0x34 hiliteSprTbl = .data:0x000003DC; // type:object size:0x14 scope:local
rumbleMess = .data:0x000003F0; // type:object size:0x8 scope:local
modeSelCursorPosTbl = .data:0x000003F8; // type:object size:0x10 scope:local
boardSelCursorPosTbl = .data:0x00000408; // type:object size:0x10 scope:local
camViewTbl = .data:0x00000418; // type:object size:0x60 scope:local data:float
lbl_2_data_478 = .data:0x00000478; // type:object size:0x24 data:float
lbl_2_data_49C = .data:0x0000049C; // type:object size:0x24 data:float
lbl_2_data_4C0 = .data:0x000004C0; // type:object size:0x10
lbl_2_bss_0 = .bss:0x00000000; // type:object size:0xA data:2byte
lbl_2_bss_A = .bss:0x0000000A; // type:object size:0x2 data:2byte lbl_2_bss_A = .bss:0x0000000A; // type:object size:0x2 data:2byte
lbl_2_bss_C = .bss:0x0000000C; // type:object size:0x2 data:2byte lbl_2_bss_C = .bss:0x0000000C; // type:object size:0x2 data:2byte
lbl_2_bss_E = .bss:0x0000000E; // type:object size:0x2 data:2byte
lbl_2_bss_10 = .bss:0x00000010; // type:object size:0x2 data:2byte lbl_2_bss_10 = .bss:0x00000010; // type:object size:0x2 data:2byte
lbl_2_bss_14 = .bss:0x00000014; // type:object size:0x4 data:4byte lbl_2_bss_14 = .bss:0x00000014; // type:object size:0x4 data:4byte
lbl_2_bss_18 = .bss:0x00000018; // type:object size:0x4 data:4byte mgPicObj = .bss:0x00000018; // type:object size:0x4 scope:local data:4byte
lbl_2_bss_1C = .bss:0x0000001C; // type:object size:0x4 data:4byte mgSelectObj = .bss:0x0000001C; // type:object size:0x4 scope:local data:4byte
lbl_2_bss_20 = .bss:0x00000020; // type:object size:0x4 data:4byte mgInterfaceObj = .bss:0x00000020; // type:object size:0x4 scope:local data:4byte
lbl_2_bss_24 = .bss:0x00000024; // type:object size:0x2 data:2byte mgDefault = .bss:0x00000024; // type:object size:0x2 scope:local data:2byte
lbl_2_bss_28 = .bss:0x00000028; // type:object size:0xC data:2byte repBtn = .bss:0x00000028; // type:object size:0x2 scope:local data:2byte
lbl_2_bss_2A = .bss:0x0000002A; // type:object size:0xA data:2byte
lbl_2_bss_34 = .bss:0x00000034; // type:object size:0x2 data:2byte lbl_2_bss_34 = .bss:0x00000034; // type:object size:0x2 data:2byte
lbl_2_bss_36 = .bss:0x00000036; // type:object size:0x2 data:2byte lbl_2_bss_36 = .bss:0x00000036; // type:object size:0x2 data:2byte
lbl_2_bss_38 = .bss:0x00000038; // type:object size:0x2 data:2byte
lbl_2_bss_3A = .bss:0x0000003A; // type:object size:0x2 data:2byte lbl_2_bss_3A = .bss:0x0000003A; // type:object size:0x2 data:2byte
lbl_2_bss_3C = .bss:0x0000003C; // type:object size:0x4 data:4byte lbl_2_bss_3C = .bss:0x0000003C; // type:object size:0x4 data:4byte
lbl_2_bss_40 = .bss:0x00000040; // type:object size:0x2 data:2byte lbl_2_bss_40 = .bss:0x00000040; // type:object size:0x2 data:2byte
@ -171,22 +182,24 @@ lbl_2_bss_48 = .bss:0x00000048; // type:object size:0xC data:float
lbl_2_bss_54 = .bss:0x00000054; // type:object size:0xC data:float lbl_2_bss_54 = .bss:0x00000054; // type:object size:0xC data:float
lbl_2_bss_60 = .bss:0x00000060; // type:object size:0x2 data:2byte lbl_2_bss_60 = .bss:0x00000060; // type:object size:0x2 data:2byte
lbl_2_bss_62 = .bss:0x00000062; // type:object size:0x8 lbl_2_bss_62 = .bss:0x00000062; // type:object size:0x8
lbl_2_bss_6A = .bss:0x0000006A; // type:object size:0x6 data:2byte lightE3 = .bss:0x0000006A; // type:object size:0x2 scope:local data:2byte
lbl_2_bss_70 = .bss:0x00000070; // type:object size:0x4 data:4byte lbl_2_bss_6C = .bss:0x0000006C; // type:object size:0x4 data:2byte
lbl_2_bss_74 = .bss:0x00000074; // type:object size:0x18 data:4byte e3BGObj = .bss:0x00000070; // type:object size:0x4 data:4byte
lbl_2_bss_8C = .bss:0x0000008C; // type:object size:0x4 data:4byte configModeObj = .bss:0x00000074; // type:object size:0x10 scope:local data:4byte
lbl_2_bss_90 = .bss:0x00000090; // type:object size:0x4 data:4byte lbl_2_bss_84 = .bss:0x00000084; // type:object size:0x8 data:4byte
lbl_2_bss_94 = .bss:0x00000094; // type:object size:0x4 data:4byte cameraObj = .bss:0x0000008C; // type:object size:0x4 scope:local data:4byte
lbl_2_bss_98 = .bss:0x00000098; // type:object size:0x4 data:4byte e3OvlWatchObj = .bss:0x00000090; // type:object size:0x4 data:4byte
lbl_2_bss_9C = .bss:0x0000009C; // type:object size:0x4 data:float e3ViewObj = .bss:0x00000094; // type:object size:0x4 data:4byte
lbl_2_bss_A0 = .bss:0x000000A0; // type:object size:0x4 data:4byte e3MenuMainObj = .bss:0x00000098; // type:object size:0x4 data:4byte
lbl_2_bss_A4 = .bss:0x000000A4; // type:object size:0x4 data:4byte e3CameraFov = .bss:0x0000009C; // type:object size:0x4 data:float
lbl_2_bss_A8 = .bss:0x000000A8; // type:object size:0x4 data:4byte needCharKill = .bss:0x000000A0; // type:object size:0x4 scope:local data:4byte
lbl_2_bss_AC = .bss:0x000000AC; // type:object size:0x4 data:4byte e3ExitMode = .bss:0x000000A4; // type:object size:0x4 data:4byte
e3NextEvent = .bss:0x000000A8; // type:object size:0x4 data:4byte
e3NextOvl = .bss:0x000000AC; // type:object size:0x4 data:4byte
lbl_2_bss_B0 = .bss:0x000000B0; // type:object size:0x4 data:4byte lbl_2_bss_B0 = .bss:0x000000B0; // type:object size:0x4 data:4byte
lbl_2_bss_B4 = .bss:0x000000B4; // type:object size:0x4 data:4byte e3ExitEnableF = .bss:0x000000B4; // type:object size:0x4 data:4byte
lbl_2_bss_B8 = .bss:0x000000B8; // type:object size:0x4 data:4byte e3EvtNo = .bss:0x000000B8; // type:object size:0x4 scope:local data:4byte
lbl_2_bss_BC = .bss:0x000000BC; // type:object size:0x2 data:2byte e3ConfigPlayerCnt = .bss:0x000000BC; // type:object size:0x2 data:2byte
lbl_2_bss_BE = .bss:0x000000BE; // type:object size:0x2 data:2byte e3PadCtrl = .bss:0x000000BE; // type:object size:0x2 data:2byte
lbl_2_bss_C0 = .bss:0x000000C0; // type:object size:0x20 e3PadData = .bss:0x000000C0; // type:object size:0x20
lbl_2_bss_E0 = .bss:0x000000E0; // type:object size:0x18 data:2byte configE3 = .bss:0x000000E0; // type:object size:0x18 scope:local data:2byte

8
config/GMPP01_00/rels/_minigameDll/splits.txt
View file

@ -4,3 +4,11 @@ Sections:
.dtors type:rodata align:4 .dtors type:rodata align:4
.rodata type:rodata align:8 .rodata type:rodata align:8
.data type:data align:8 .data type:data align:8
REL/executor.c:
.text start:0x00000000 end:0x000000A0
REL/_minigameDLL/_minigameDLL.c:
.text start:0x000000A0 end:0x000000F0
.rodata start:0x00000000 end:0x00000010
.data start:0x00000000 end:0x00000014

2
config/GMPP01_00/rels/_minigameDll/symbols.txt
View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global _prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global _epilog = .text:0x00000054; // type:function size:0x4C scope:global
fn_1_A0 = .text:0x000000A0; // type:function size:0x2C ObjectSetup = .text:0x000000A0; // type:function size:0x2C
fn_1_CC = .text:0x000000CC; // type:function size:0x24 fn_1_CC = .text:0x000000CC; // type:function size:0x24
_ctors = .ctors:0x00000000; // type:label scope:global data:4byte _ctors = .ctors:0x00000000; // type:label scope:global data:4byte
_dtors = .dtors:0x00000000; // type:label scope:global data:4byte _dtors = .dtors:0x00000000; // type:label scope:global data:4byte

14
config/GMPP01_00/rels/instDll/splits.txt
View file

@ -5,3 +5,17 @@ Sections:
.rodata type:rodata align:8 .rodata type:rodata align:8
.data type:data align:8 .data type:data align:8
.bss type:bss align:8 .bss type:bss align:8
REL/executor.c:
.text start:0x00000000 end:0x000000A0
REL/instDll/main.c:
.text start:0x000000A0 end:0x00005EA4
.rodata start:0x00000000 end:0x00000208
.data start:0x00000000 end:0x00000150
.bss start:0x00000000 end:0x00000064
REL/instDll/font.c:
.text start:0x00005EA4 end:0x0000629C
.rodata start:0x00000208 end:0x00000210
.data start:0x00000150 end:0x00000610

2
config/GMPP01_00/rels/instDll/symbols.txt
View file

@ -1,6 +1,6 @@
_prolog = .text:0x00000000; // type:function size:0x54 scope:global _prolog = .text:0x00000000; // type:function size:0x54 scope:global
_epilog = .text:0x00000054; // type:function size:0x4C scope:global _epilog = .text:0x00000054; // type:function size:0x4C scope:global
fn_1_A0 = .text:0x000000A0; // type:function size:0x8F4 ObjectSetup = .text:0x000000A0; // type:function size:0x8F4
fn_1_994 = .text:0x00000994; // type:function size:0xE50 fn_1_994 = .text:0x00000994; // type:function size:0xE50
fn_1_17E4 = .text:0x000017E4; // type:function size:0xA28 fn_1_17E4 = .text:0x000017E4; // type:function size:0xA28
fn_1_220C = .text:0x0000220C; // type:function size:0x5F8 fn_1_220C = .text:0x0000220C; // type:function size:0x5F8

12
config/GMPP01_00/rels/mentDll/splits.txt
View file

@ -5,3 +5,15 @@ Sections:
.rodata type:rodata align:8 .rodata type:rodata align:8
.data type:data align:8 .data type:data align:8
.bss type:bss align:8 .bss type:bss align:8
REL/mentDll/common.c:
.text start:0x00000000 end:0x0000658C
.rodata start:0x00000000 end:0x000000E8
.data start:0x00000000 end:0x000000D8
.bss start:0x00000000 end:0x00000008
REL/mentDll/main.c:
.text start:0x0000658C end:0x000238C4
.rodata start:0x000000E8 end:0x00000520
.data start:0x000000D8 end:0x000006D0
.bss start:0x00000008 end:0x000036C4

3
config/GMPP01_00/rels/mentDll/symbols.txt
View file

@ -417,7 +417,8 @@ lbl_1_data_5BC = .data:0x000005BC; // type:object size:0x20
lbl_1_data_5DC = .data:0x000005DC; // type:object size:0x64 data:float lbl_1_data_5DC = .data:0x000005DC; // type:object size:0x64 data:float
lbl_1_data_640 = .data:0x00000640; // type:object size:0x50 data:4byte lbl_1_data_640 = .data:0x00000640; // type:object size:0x50 data:4byte
lbl_1_data_690 = .data:0x00000690; // type:object size:0x40 data:4byte lbl_1_data_690 = .data:0x00000690; // type:object size:0x40 data:4byte
lbl_1_bss_0 = .bss:0x00000000; // type:object size:0x14 data:4byte lbl_1_bss_0 = .bss:0x00000000; // type:object size:0x4 data:4byte
lbl_1_bss_8 = .bss:0x00000008; // type:object size:0xC data:4byte
lbl_1_bss_14 = .bss:0x00000014; // type:object size:0x10 data:4byte lbl_1_bss_14 = .bss:0x00000014; // type:object size:0x10 data:4byte
lbl_1_bss_24 = .bss:0x00000024; // type:object size:0x40 data:4byte lbl_1_bss_24 = .bss:0x00000024; // type:object size:0x40 data:4byte
lbl_1_bss_64 = .bss:0x00000064; // type:object size:0x44 data:float lbl_1_bss_64 = .bss:0x00000064; // type:object size:0x44 data:float

12
configure.py
View file

@ -829,7 +829,7 @@ config.libs = [
Rel( Rel(
"_minigameDLL", "_minigameDLL",
objects={ objects={
Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/_minigameDLL/_minigameDLL.c"), Object(Matching, "REL/_minigameDLL/_minigameDLL.c"),
}, },
), ),
Rel( Rel(
@ -842,14 +842,14 @@ config.libs = [
Rel( Rel(
"E3setupDLL", "E3setupDLL",
objects={ objects={
Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/E3setupDLL/mgselect.c"), Object(Matching, "REL/E3setupDLL/mgselect.c"),
Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/E3setupDLL/main.c"), Object(Matching, "REL/E3setupDLL/main.c"),
}, },
), ),
Rel( Rel(
"instDll", "instDll",
objects={ objects={
Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/instDll/main.c"), Object(Matching, "REL/instDll/main.c"),
Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/instDll/font.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/instDll/font.c"),
}, },
), ),
@ -1300,8 +1300,8 @@ config.libs = [
Rel( Rel(
"mentDll", "mentDll",
objects={ objects={
Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/mentDll/common.c"), Object(Matching, "REL/mentDll/common.c"),
Object(MatchingFor("GMPE01_00", "GMPE01_01"), "REL/mentDll/main.c"), Object(Matching, "REL/mentDll/main.c"),
}, },
), ),
Rel( Rel(

64
src/REL/instDll/main.c
View file

@ -689,7 +689,11 @@ static void fn_1_2804(void)
HuWinMesPalSet(window, 7, 0, 0, 192); HuWinMesPalSet(window, 7, 0, 0, 192);
HuWinPosSet(window_other, 142.0f, 320.0f); HuWinPosSet(window_other, 142.0f, 320.0f);
for (i = 0; i <= 10; i++) { for (i = 0; i <= 10; i++) {
#if VERSION_NTSC
HuWinPosSet(window_other, 30.0 * sind(i * 9.0f) + 142.0, 160.0 * (1.0 - cosd(i * 9.0f)) + 320.0); HuWinPosSet(window_other, 30.0 * sind(i * 9.0f) + 142.0, 160.0 * (1.0 - cosd(i * 9.0f)) + 320.0);
#else
HuWinPosSet(window_other, 30.0 * sind(i * 9.0f) + 142.0, 180.0 * (1.0 - cosd(i * 9.0f)) + 320.0);
#endif
HuPrcVSleep(); HuPrcVSleep();
} }
HuPrcSleep(5); HuPrcSleep(5);
@ -711,6 +715,12 @@ static void fn_1_2804(void)
static float lbl_1_data_124[] = { 420, 70, 488, 186, 476, 242, 400, 292 }; static float lbl_1_data_124[] = { 420, 70, 488, 186, 476, 242, 400, 292 };
#if VERSION_NTSC
#define WIN_ANIM_OFS 201
#else
#define WIN_ANIM_OFS 219
#endif
static void fn_1_2FA0(void) static void fn_1_2FA0(void)
{ {
float temp_f31; float temp_f31;
@ -763,20 +773,39 @@ static void fn_1_2FA0(void)
temp_r29++; temp_r29++;
} }
#if VERSION_NTSC
if (temp_r26 == 1) { if (temp_r26 == 1) {
temp_r22 = spC[0]; temp_r22 = spC[0];
temp_r28 = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_INST, 18)); temp_r28 = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_INST, 18));
temp_f29 = ((576.0f - temp_r22) - 24.0f) - 16.0f + 227.0f; temp_f29 = ((576.0f - temp_r22) - 24.0f) - 16.0f + 227;
temp_f28 = 78; temp_f28 = 78;
temp_f27 = 0.5f; temp_f27 = 0.5f;
} }
else { else {
temp_r22 = (spC[0] > spC[1]) ? spC[0] : spC[1]; temp_r22 = (spC[0] > spC[1]) ? spC[0] : spC[1];
temp_r28 = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_INST, 15)); temp_r28 = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_INST, 15));
temp_f29 = ((576.0f - temp_r22) - 24.0f) - 16.0f + 172.0f; temp_f29 = ((576.0f - temp_r22) - 24.0f) - 16.0f + 172.0f;
temp_f28 = 84; temp_f28 = 84;
temp_f27 = 1.0f; temp_f27 = 1.0f;
} }
#else
if (temp_r26 == 1) {
temp_r22 = spC[0];
temp_r28 = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_INST, 18));
temp_f29 = ((576.0f - temp_r22) - 24.0f) - 16.0f + 235;
temp_f28 = 78;
temp_f27 = 0.5f;
}
else {
temp_r22 = (spC[0] > spC[1]) ? spC[0] : spC[1];
temp_r28 = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_INST, 15));
temp_f29 = ((576.0f - temp_r22) - 24.0f) - 16.0f + 235;
temp_f28 = 84;
temp_f27 = 1.0f;
}
#endif
temp_r25 = HuSprGrpCreate(1); temp_r25 = HuSprGrpCreate(1);
temp_r17 = HuSprCreate(temp_r28, 0, 0); temp_r17 = HuSprCreate(temp_r28, 0, 0);
HuSprGrpMemberSet(temp_r25, 0, temp_r17); HuSprGrpMemberSet(temp_r25, 0, temp_r17);
@ -809,13 +838,13 @@ static void fn_1_2FA0(void)
HuWinMesSet(sp10[2], lbl_1_bss_10 + MAKE_MESSID(0x24, 0x02)); HuWinMesSet(sp10[2], lbl_1_bss_10 + MAKE_MESSID(0x24, 0x02));
HuWinBGTPLvlSet(sp10[2], 0.0f); HuWinBGTPLvlSet(sp10[2], 0.0f);
HuWinMesSpeedSet(sp10[2], 0); HuWinMesSpeedSet(sp10[2], 0);
temp_r31 = HuWinAnimSet(sp10[2], temp_r28, 0, 201, 18); temp_r31 = HuWinAnimSet(sp10[2], temp_r28, 0, WIN_ANIM_OFS, 18);
HuWinSprPriSet(sp10[2], temp_r31, 1000); HuWinSprPriSet(sp10[2], temp_r31, 1000);
temp_r27 = HuWinCreate(1000, 292, 456, 42, 0); temp_r27 = HuWinCreate(1000, 292, 456, 42, 0);
HuWinBGTPLvlSet(temp_r27, 0.0f); HuWinBGTPLvlSet(temp_r27, 0.0f);
HuWinMesSpeedSet(temp_r27, 0); HuWinMesSpeedSet(temp_r27, 0);
HuWinMesSet(temp_r27, lbl_1_bss_10 + MAKE_MESSID(0x24, 0x02)); HuWinMesSet(temp_r27, lbl_1_bss_10 + MAKE_MESSID(0x24, 0x02));
temp_r31 = HuWinAnimSet(temp_r27, temp_r28, 0, 201, 18); temp_r31 = HuWinAnimSet(temp_r27, temp_r28, 0, WIN_ANIM_OFS, 18);
HuWinPriSet(temp_r27, 10); HuWinPriSet(temp_r27, 10);
HuWinSprPriSet(temp_r27, temp_r31, 11); HuWinSprPriSet(temp_r27, temp_r31, 11);
while (lbl_1_data_0 != 0) { while (lbl_1_data_0 != 0) {
@ -824,12 +853,21 @@ static void fn_1_2FA0(void)
for (temp_r31 = 0; temp_r31 < 36; temp_r31++) { for (temp_r31 = 0; temp_r31 < 36; temp_r31++) {
temp_f30 = temp_r31; temp_f30 = temp_r31;
if (temp_f30 <= 20.0f) { if (temp_f30 <= 20.0f) {
#if VERSION_NTSC
temp_f31 = 300.0 * cosd(4.5f * temp_f30) + temp_f29; temp_f31 = 300.0 * cosd(4.5f * temp_f30) + temp_f29;
HuSprGrpPosSet(temp_r25, temp_f31, temp_f28); HuSprGrpPosSet(temp_r25, temp_f31, temp_f28);
temp_f31 = 300.0 * cosd(4.5f * temp_f30) + (576.0f - (temp_r22 / 2) - 24.0f); temp_f31 = 300.0 * cosd(4.5f * temp_f30) + (576.0f - (temp_r22 / 2) - 24.0f);
for (temp_r30 = 0; temp_r30 < temp_r26; temp_r30++) { for (temp_r30 = 0; temp_r30 < temp_r26; temp_r30++) {
HuSprGrpPosSet(work.spr_grp[temp_r30], temp_f31, (temp_r30 * 28) + 70); HuSprGrpPosSet(work.spr_grp[temp_r30], temp_f31, (temp_r30 * 28) + 70);
} }
#else
temp_f31 = 500.0 * cosd(4.5f * temp_f30) + temp_f29;
HuSprGrpPosSet(temp_r25, temp_f31, temp_f28);
temp_f31 = 500.0 * cosd(4.5f * temp_f30) + (576.0f - (temp_r22 / 2) - 24.0f);
for (temp_r30 = 0; temp_r30 < temp_r26; temp_r30++) {
HuSprGrpPosSet(work.spr_grp[temp_r30], temp_f31, (temp_r30 * 28) + 70);
}
#endif
} }
temp_f30 = temp_r31 - 3; temp_f30 = temp_r31 - 3;
if (temp_f30 > 0.0f) { if (temp_f30 > 0.0f) {
@ -837,7 +875,11 @@ static void fn_1_2FA0(void)
temp_f31 = 300.0 * cosd(4.5f * temp_f30) + lbl_1_data_124[2]; temp_f31 = 300.0 * cosd(4.5f * temp_f30) + lbl_1_data_124[2];
HuSprGrpPosSet(temp_r24, temp_f31, 186.0f); HuSprGrpPosSet(temp_r24, temp_f31, 186.0f);
temp_f31 = 300.0 * cosd(4.5f * temp_f30) + (lbl_1_data_124[2] - 88.0f); temp_f31 = 300.0 * cosd(4.5f * temp_f30) + (lbl_1_data_124[2] - 88.0f);
#if VERSION_NTSC
HuWinPosSet(sp10[0], 16.0f + temp_f31, 168.0f); HuWinPosSet(sp10[0], 16.0f + temp_f31, 168.0f);
#else
HuWinPosSet(sp10[0], 8.0f + temp_f31, 168.0f);
#endif
} }
} }
temp_f30 = temp_r31 - 6; temp_f30 = temp_r31 - 6;
@ -846,13 +888,17 @@ static void fn_1_2FA0(void)
temp_f31 = 300.0 * cosd(4.5f * temp_f30) + lbl_1_data_124[4]; temp_f31 = 300.0 * cosd(4.5f * temp_f30) + lbl_1_data_124[4];
HuSprGrpPosSet(temp_r23, temp_f31, 242.0f); HuSprGrpPosSet(temp_r23, temp_f31, 242.0f);
temp_f31 = 300.0 * cosd(4.5f * temp_f30) + (lbl_1_data_124[4] - 100.0f); temp_f31 = 300.0 * cosd(4.5f * temp_f30) + (lbl_1_data_124[4] - 100.0f);
#if VERSION_NTSC
HuWinPosSet(sp10[1], 16.0f + temp_f31, 224.0f); HuWinPosSet(sp10[1], 16.0f + temp_f31, 224.0f);
#else
HuWinPosSet(sp10[1], 8.0f + temp_f31, 224.0f);
#endif
} }
} }
temp_f30 = temp_r31 - 9; temp_f30 = temp_r31 - 9;
if (temp_f30 > 0.0f) { if (temp_f30 > 0.0f) {
if (temp_f30 <= 20.0f) { if (temp_f30 <= 20.0f) {
temp_f31 = 300.0 * cosd(4.5f * temp_f30) + (lbl_1_data_124[6] - 217.0f); temp_f31 = 300.0 * cosd(4.5f * temp_f30) + (lbl_1_data_124[6] - (WIN_ANIM_OFS+16));
HuWinPosSet(sp10[2], 16.0f + temp_f31, 274.0f); HuWinPosSet(sp10[2], 16.0f + temp_f31, 274.0f);
} }
} }
@ -860,7 +906,7 @@ static void fn_1_2FA0(void)
} }
while (lbl_1_data_0 != 3) { while (lbl_1_data_0 != 3) {
if (temp_r21 != lbl_1_bss_6) { if (temp_r21 != lbl_1_bss_6) {
temp_f31 = 16.0f + (lbl_1_data_124[6] - 217.0f); temp_f31 = 16.0f + (lbl_1_data_124[6] - (WIN_ANIM_OFS+16));
HuWinMesSet(temp_r27, MAKE_MESSID(0x24, 0x02) + lbl_1_bss_10 + temp_r21); HuWinMesSet(temp_r27, MAKE_MESSID(0x24, 0x02) + lbl_1_bss_10 + temp_r21);
temp_r21 = lbl_1_bss_6; temp_r21 = lbl_1_bss_6;
if (lbl_1_bss_6 == 1) { if (lbl_1_bss_6 == 1) {
@ -875,7 +921,11 @@ static void fn_1_2FA0(void)
HuWinMesSet(sp10[2], MAKE_MESSID(0x24, 0x02) + lbl_1_bss_10 + lbl_1_bss_6); HuWinMesSet(sp10[2], MAKE_MESSID(0x24, 0x02) + lbl_1_bss_10 + lbl_1_bss_6);
} }
for (temp_r31 = 0; temp_r31 <= 10; temp_r31++) { for (temp_r31 = 0; temp_r31 <= 10; temp_r31++) {
#if VERSION_NTSC
HuWinPosSet(temp_r27, 30.0 * sind(temp_r31 * 9.0f) + temp_f31, 200.0 * (1.0 - cosd(temp_r31 * 9.0f)) + 274.0); HuWinPosSet(temp_r27, 30.0 * sind(temp_r31 * 9.0f) + temp_f31, 200.0 * (1.0 - cosd(temp_r31 * 9.0f)) + 274.0);
#else
HuWinPosSet(temp_r27, 30.0 * sind(temp_r31 * 9.0f) + temp_f31, 220.0 * (1.0 - cosd(temp_r31 * 9.0f)) + 274.0);
#endif
HuPrcVSleep(); HuPrcVSleep();
} }
} }
@ -897,7 +947,11 @@ static void fn_1_2FA0(void)
HuSprGrpPosSet(temp_r23, temp_f31, 242.0f); HuSprGrpPosSet(temp_r23, temp_f31, 242.0f);
temp_f31 = (lbl_1_data_124[4] - 100.0f) + (300.0f * temp_f30); temp_f31 = (lbl_1_data_124[4] - 100.0f) + (300.0f * temp_f30);
HuWinPosSet(sp10[1], 16.0f + temp_f31, 224); HuWinPosSet(sp10[1], 16.0f + temp_f31, 224);
#if VERSION_NTSC
temp_f31 = (lbl_1_data_124[6] - 184.0f) + (400.0f * temp_f30); temp_f31 = (lbl_1_data_124[6] - 184.0f) + (400.0f * temp_f30);
#else
temp_f31 = (lbl_1_data_124[6] - 235.0f) + (400.0f * temp_f30);
#endif
HuWinPosSet(sp10[2], 16.0f + temp_f31, 274); HuWinPosSet(sp10[2], 16.0f + temp_f31, 274);
HuPrcVSleep(); HuPrcVSleep();
} }

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

@ -3768,6 +3768,8 @@ s32 lbl_1_data_5BC[4][2] = {
{ 0x77, 0x18 }, { 0x77, 0x18 },
{ 0xA5, 0x18 }, { 0xA5, 0x18 },
}; };
#if VERSION_NTSC
float lbl_1_data_5DC[5][5] = { float lbl_1_data_5DC[5][5] = {
{ 262.0f, 119.0f, 1.3f, 227.0f, 455.0f }, { 262.0f, 119.0f, 1.3f, 227.0f, 455.0f },
{ 314.0f, 168.0f, 0.75f, 265.0f, 416.0f }, { 314.0f, 168.0f, 0.75f, 265.0f, 416.0f },
@ -3775,6 +3777,16 @@ float lbl_1_data_5DC[5][5] = {
{ 418.0f, 240.0f, 0.75f, 300.0f, 381.0f }, { 418.0f, 240.0f, 0.75f, 300.0f, 381.0f },
{ -1.0f, 289.0f, 1.3f, 220.0f, 460.0f }, { -1.0f, 289.0f, 1.3f, 220.0f, 460.0f },
}; };
#else
float lbl_1_data_5DC[5][5] = {
{ 262.0f, 119.0f, 1.3f, 227.0f, 455.0f },
{ 314.0f, 168.0f, 0.75f, 300.0f, 381.0f },
{ 366.0f, 204.0f, 0.75f, 240.0f, 440.0f },
{ 418.0f, 240.0f, 0.75f, 300.0f, 381.0f },
{ -1.0f, 289.0f, 1.3f, 220.0f, 460.0f },
};
#endif
s32 lbl_1_data_640[4][5] = { s32 lbl_1_data_640[4][5] = {
{ 0xB4, 0x60, 0x87, 0, 0 }, { 0xB4, 0x60, 0x87, 0, 0 },
{ 0xFC, 0xB8, 0xF6, 0xD4, 0x1D4 }, { 0xFC, 0xB8, 0xF6, 0xD4, 0x1D4 },
@ -4633,6 +4645,18 @@ void fn_1_18F74(omObjData *arg0, MentDllUnkBss35BCStruct *arg1)
} }
} }
#if VERSION_PAL
#define POSX1 353
#define POSX2 325
#else
#define POSX1 321
#define POSX2 295
#endif
void fn_1_190E8(void) void fn_1_190E8(void)
{ {
s32 var_r31; s32 var_r31;
@ -4690,16 +4714,18 @@ void fn_1_190E8(void)
HuSprPosSet(var_r30, 0x47, 340.0f, lbl_1_data_5DC[0][1]); HuSprPosSet(var_r30, 0x47, 340.0f, lbl_1_data_5DC[0][1]);
HuSprScaleSet(var_r30, 0x47, 0.0f, 0.0f); HuSprScaleSet(var_r30, 0x47, 0.0f, 0.0f);
HuSprAttrReset(var_r30, 0x47, 4); HuSprAttrReset(var_r30, 0x47, 4);
#if VERSION_NTSC
HuSprAttrReset(var_r30, 0x48, 4); HuSprAttrReset(var_r30, 0x48, 4);
HuSprPosSet(var_r30, 0x48, 366.0f, lbl_1_data_5DC[1][1]); HuSprPosSet(var_r30, 0x48, 366.0f, lbl_1_data_5DC[1][1]);
HuSprAttrReset(var_r30, 0x49, 4); HuSprAttrReset(var_r30, 0x49, 4);
HuSprPosSet(var_r30, 0x49, 367.0f, 2.0f + lbl_1_data_5DC[1][1]); HuSprPosSet(var_r30, 0x49, 367.0f, 2.0f + lbl_1_data_5DC[1][1]);
#endif
for (var_r31 = 0; var_r31 < 2; var_r31++) { for (var_r31 = 0; var_r31 < 2; var_r31++) {
HuSprAttrReset(var_r30, var_r31 + 0x4A, 4); HuSprAttrReset(var_r30, var_r31 + 0x4A, 4);
HuSprPosSet(var_r30, var_r31 + 0x4A, 0x141 - (var_r31 * 0x1A), lbl_1_data_5DC[1][1]); 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); HuSprBankSet(var_r30, var_r31 + 0x4A, var_r31);
HuSprAttrReset(var_r30, var_r31 + 0x4C, 4); HuSprAttrReset(var_r30, var_r31 + 0x4C, 4);
HuSprPosSet(var_r30, var_r31 + 0x4C, 0x142 - (var_r31 * 0x1A), 2.0f + lbl_1_data_5DC[1][1]); 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); HuSprBankSet(var_r30, var_r31 + 0x4C, var_r31);
} }
HuSprAttrReset(var_r30, 0x4E, 4); HuSprAttrReset(var_r30, 0x4E, 4);
@ -4964,23 +4990,29 @@ void fn_1_19C98(omObjData *arg0, MentDllUnkBss35BCStruct *arg1)
break; break;
case 1: case 1:
if (var_r26 == 1) { if (var_r26 == 1) {
#if VERSION_NTSC
HuSprPosSet(var_r30, 0x48, 366.0f + var_f31, lbl_1_data_5DC[1][1]); HuSprPosSet(var_r30, 0x48, 366.0f + var_f31, lbl_1_data_5DC[1][1]);
HuSprPosSet(var_r30, 0x49, 367.0f + var_f31, 2.0f + lbl_1_data_5DC[1][1]); HuSprPosSet(var_r30, 0x49, 367.0f + var_f31, 2.0f + lbl_1_data_5DC[1][1]);
HuSprPosSet(var_r30, 0x4A, 321.0f + var_f31, lbl_1_data_5DC[1][1]); #endif
HuSprPosSet(var_r30, 0x4C, 322.0f + var_f31, 2.0f + lbl_1_data_5DC[1][1]); HuSprPosSet(var_r30, 0x4A, POSX1 + var_f31, lbl_1_data_5DC[1][1]);
HuSprPosSet(var_r30, 0x4B, 295.0f + var_f31, lbl_1_data_5DC[1][1]); HuSprPosSet(var_r30, 0x4C, POSX1+1 + var_f31, 2.0f + lbl_1_data_5DC[1][1]);
HuSprPosSet(var_r30, 0x4D, 296.0f + var_f31, 2.0f + lbl_1_data_5DC[1][1]); HuSprPosSet(var_r30, 0x4B, POSX2 + var_f31, lbl_1_data_5DC[1][1]);
HuSprPosSet(var_r30, 0x4D, POSX2+1 + var_f31, 2.0f + lbl_1_data_5DC[1][1]);
} }
else { else {
#if VERSION_NTSC
HuSprPosSet(var_r30, 0x48, 366.0f - var_f31, lbl_1_data_5DC[1][1]); HuSprPosSet(var_r30, 0x48, 366.0f - var_f31, lbl_1_data_5DC[1][1]);
HuSprPosSet(var_r30, 0x49, 367.0f - var_f31, 2.0f + lbl_1_data_5DC[1][1]); HuSprPosSet(var_r30, 0x49, 367.0f - var_f31, 2.0f + lbl_1_data_5DC[1][1]);
HuSprPosSet(var_r30, 0x4A, 321.0f - var_f31, lbl_1_data_5DC[1][1]); #endif
HuSprPosSet(var_r30, 0x4C, 322.0f - var_f31, 2.0f + lbl_1_data_5DC[1][1]); HuSprPosSet(var_r30, 0x4A, POSX1 - var_f31, lbl_1_data_5DC[1][1]);
HuSprPosSet(var_r30, 0x4B, 295.0f - var_f31, lbl_1_data_5DC[1][1]); HuSprPosSet(var_r30, 0x4C, POSX1+1 - var_f31, 2.0f + lbl_1_data_5DC[1][1]);
HuSprPosSet(var_r30, 0x4D, 296.0f - var_f31, 2.0f + lbl_1_data_5DC[1][1]); HuSprPosSet(var_r30, 0x4B, POSX2 - var_f31, lbl_1_data_5DC[1][1]);
HuSprPosSet(var_r30, 0x4D, POSX2+1 - var_f31, 2.0f + lbl_1_data_5DC[1][1]);
} }
#if VERSION_NTSC
HuSprScaleSet(var_r30, 0x48, 1.0f, var_f30); HuSprScaleSet(var_r30, 0x48, 1.0f, var_f30);
HuSprScaleSet(var_r30, 0x49, 1.0f, var_f30); HuSprScaleSet(var_r30, 0x49, 1.0f, var_f30);
#endif
HuSprScaleSet(var_r30, 0x4A, 1.0f, var_f30); HuSprScaleSet(var_r30, 0x4A, 1.0f, var_f30);
HuSprScaleSet(var_r30, 0x4C, 1.0f, var_f30); HuSprScaleSet(var_r30, 0x4C, 1.0f, var_f30);
HuSprScaleSet(var_r30, 0x4B, 1.0f, var_f30); HuSprScaleSet(var_r30, 0x4B, 1.0f, var_f30);
@ -5103,6 +5135,9 @@ void fn_1_19C98(omObjData *arg0, MentDllUnkBss35BCStruct *arg1)
} }
} }
#undef POSX2
#undef POSX1
void fn_1_1BB2C(MentDllUnkBss35BCStruct *arg0, s32 arg1, s32 arg2, s32 arg3) void fn_1_1BB2C(MentDllUnkBss35BCStruct *arg0, s32 arg1, s32 arg2, s32 arg3)
{ {
s32 var_r31; s32 var_r31;