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

Merge pull request #228 from mrshigure/w01

Browse source 
Matched REL/w01/main + some data cleanup
This commit is contained in:
Rainchus 2024-03-24 01:33:50 -05:00 • committed by GitHub
commit edc35fa4fd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 2919 additions and 328 deletions
Download patch file Download diff file Expand all files Collapse all files

444
config/GMPE01_00/rels/w01Dll/symbols.txt
View file

@ -3,76 +3,76 @@ _prolog = .text:0x00000030; // type:function size:0x64 scope:global
_epilog = .text:0x00000094; // type:function size:0x4C scope:global
BoardCreate = .text:0x000000E0; // type:function size:0x4BC
BoardDestroy = .text:0x0000059C; // type:function size:0x194
fn_1_730 = .text:0x00000730; // type:function size:0x44
fn_1_774 = .text:0x00000774; // type:function size:0x4
fn_1_778 = .text:0x00000778; // type:function size:0x9C
fn_1_814 = .text:0x00000814; // type:function size:0x1D4
fn_1_9E8 = .text:0x000009E8; // type:function size:0x318
fn_1_D00 = .text:0x00000D00; // type:function size:0x4
fn_1_D04 = .text:0x00000D04; // type:function size:0x550
fn_1_1254 = .text:0x00001254; // type:function size:0x38
fn_1_128C = .text:0x0000128C; // type:function size:0x80
fn_1_130C = .text:0x0000130C; // type:function size:0x270
fn_1_157C = .text:0x0000157C; // type:function size:0xF4
fn_1_1670 = .text:0x00001670; // type:function size:0x90
fn_1_1700 = .text:0x00001700; // type:function size:0x290
fn_1_1990 = .text:0x00001990; // type:function size:0x148
fn_1_1AD8 = .text:0x00001AD8; // type:function size:0x64
fn_1_1B3C = .text:0x00001B3C; // type:function size:0x3A8
fn_1_1EE4 = .text:0x00001EE4; // type:function size:0x48
fn_1_1F2C = .text:0x00001F2C; // type:function size:0x78
fn_1_1FA4 = .text:0x00001FA4; // type:function size:0x580
fn_1_2524 = .text:0x00002524; // type:function size:0x248
fn_1_276C = .text:0x0000276C; // type:function size:0x7AC
fn_1_2F18 = .text:0x00002F18; // type:function size:0x438
fn_1_3350 = .text:0x00003350; // type:function size:0x1C4
fn_1_3514 = .text:0x00003514; // type:function size:0xA0
fn_1_35B4 = .text:0x000035B4; // type:function size:0x70
fn_1_3624 = .text:0x00003624; // type:function size:0xFD0
fn_1_45F4 = .text:0x000045F4; // type:function size:0x180
fn_1_4774 = .text:0x00004774; // type:function size:0xF0
fn_1_4864 = .text:0x00004864; // type:function size:0x50
fn_1_48B4 = .text:0x000048B4; // type:function size:0x560
fn_1_4E14 = .text:0x00004E14; // type:function size:0x194
fn_1_4FA8 = .text:0x00004FA8; // type:function size:0x30
fn_1_4FD8 = .text:0x00004FD8; // type:function size:0xFC
fn_1_50D4 = .text:0x000050D4; // type:function size:0x2E4
fn_1_53B8 = .text:0x000053B8; // type:function size:0x84
fn_1_543C = .text:0x0000543C; // type:function size:0x258
fn_1_5694 = .text:0x00005694; // type:function size:0x1D8
fn_1_586C = .text:0x0000586C; // type:function size:0xC0
fn_1_592C = .text:0x0000592C; // type:function size:0x200
fn_1_5B2C = .text:0x00005B2C; // type:function size:0x14
fn_1_5B40 = .text:0x00005B40; // type:function size:0x190
fn_1_5CD0 = .text:0x00005CD0; // type:function size:0x38
fn_1_5D08 = .text:0x00005D08; // type:function size:0x390
fn_1_6098 = .text:0x00006098; // type:function size:0xFC
fn_1_6194 = .text:0x00006194; // type:function size:0x25C
fn_1_63F0 = .text:0x000063F0; // type:function size:0x624
fn_1_6A14 = .text:0x00006A14; // type:function size:0x1AC
fn_1_6BC0 = .text:0x00006BC0; // type:function size:0x3F4
fn_1_6FB4 = .text:0x00006FB4; // type:function size:0x574
fn_1_7528 = .text:0x00007528; // type:function size:0x2C4
fn_1_77EC = .text:0x000077EC; // type:function size:0xA8
fn_1_7894 = .text:0x00007894; // type:function size:0x1D0
fn_1_7A64 = .text:0x00007A64; // type:function size:0xAC8
fn_1_852C = .text:0x0000852C; // type:function size:0x280
fn_1_87AC = .text:0x000087AC; // type:function size:0x34
fn_1_87E0 = .text:0x000087E0; // type:function size:0x1A8
fn_1_8988 = .text:0x00008988; // type:function size:0xC8
fn_1_8A50 = .text:0x00008A50; // type:function size:0x11C
fn_1_8B6C = .text:0x00008B6C; // type:function size:0x270
fn_1_8DDC = .text:0x00008DDC; // type:function size:0x3B0
fn_1_918C = .text:0x0000918C; // type:function size:0xF0
fn_1_927C = .text:0x0000927C; // type:function size:0xB0
fn_1_932C = .text:0x0000932C; // type:function size:0x17C
fn_1_94A8 = .text:0x000094A8; // type:function size:0x14C
fn_1_95F4 = .text:0x000095F4; // type:function size:0x200
fn_1_97F4 = .text:0x000097F4; // type:function size:0xF8
fn_1_98EC = .text:0x000098EC; // type:function size:0x34
fn_1_9920 = .text:0x00009920; // type:function size:0x104
fn_1_9A24 = .text:0x00009A24; // type:function size:0x198
fn_1_9BBC = .text:0x00009BBC; // type:function size:0x144
fn_1_730 = .text:0x00000730; // type:function size:0x44 scope:local
fn_1_774 = .text:0x00000774; // type:function size:0x4 scope:local
fn_1_778 = .text:0x00000778; // type:function size:0x9C scope:local
fn_1_814 = .text:0x00000814; // type:function size:0x1D4 scope:local
fn_1_9E8 = .text:0x000009E8; // type:function size:0x318 scope:local
fn_1_D00 = .text:0x00000D00; // type:function size:0x4 scope:local
fn_1_D04 = .text:0x00000D04; // type:function size:0x550 scope:local
fn_1_1254 = .text:0x00001254; // type:function size:0x38 scope:local
fn_1_128C = .text:0x0000128C; // type:function size:0x80 scope:local
fn_1_130C = .text:0x0000130C; // type:function size:0x270 scope:local
fn_1_157C = .text:0x0000157C; // type:function size:0xF4 scope:local
fn_1_1670 = .text:0x00001670; // type:function size:0x90 scope:local
fn_1_1700 = .text:0x00001700; // type:function size:0x290 scope:local
fn_1_1990 = .text:0x00001990; // type:function size:0x148 scope:local
fn_1_1AD8 = .text:0x00001AD8; // type:function size:0x64 scope:local
fn_1_1B3C = .text:0x00001B3C; // type:function size:0x3A8 scope:local
fn_1_1EE4 = .text:0x00001EE4; // type:function size:0x48 scope:local
fn_1_1F2C = .text:0x00001F2C; // type:function size:0x78 scope:local
fn_1_1FA4 = .text:0x00001FA4; // type:function size:0x580 scope:local
fn_1_2524 = .text:0x00002524; // type:function size:0x248 scope:local
fn_1_276C = .text:0x0000276C; // type:function size:0x7AC scope:local
fn_1_2F18 = .text:0x00002F18; // type:function size:0x438 scope:local
fn_1_3350 = .text:0x00003350; // type:function size:0x1C4 scope:local
fn_1_3514 = .text:0x00003514; // type:function size:0xA0 scope:local
fn_1_35B4 = .text:0x000035B4; // type:function size:0x70 scope:local
fn_1_3624 = .text:0x00003624; // type:function size:0xFD0 scope:local
fn_1_45F4 = .text:0x000045F4; // type:function size:0x180 scope:local
fn_1_4774 = .text:0x00004774; // type:function size:0xF0 scope:local
fn_1_4864 = .text:0x00004864; // type:function size:0x50 scope:local
fn_1_48B4 = .text:0x000048B4; // type:function size:0x560 scope:local
fn_1_4E14 = .text:0x00004E14; // type:function size:0x194 scope:local
fn_1_4FA8 = .text:0x00004FA8; // type:function size:0x30 scope:local
fn_1_4FD8 = .text:0x00004FD8; // type:function size:0xFC scope:local
fn_1_50D4 = .text:0x000050D4; // type:function size:0x2E4 scope:local
fn_1_53B8 = .text:0x000053B8; // type:function size:0x84 scope:local
fn_1_543C = .text:0x0000543C; // type:function size:0x258 scope:local
fn_1_5694 = .text:0x00005694; // type:function size:0x1D8 scope:local
fn_1_586C = .text:0x0000586C; // type:function size:0xC0 scope:local
fn_1_592C = .text:0x0000592C; // type:function size:0x200 scope:local
fn_1_5B2C = .text:0x00005B2C; // type:function size:0x14 scope:local
fn_1_5B40 = .text:0x00005B40; // type:function size:0x190 scope:local
fn_1_5CD0 = .text:0x00005CD0; // type:function size:0x38 scope:local
fn_1_5D08 = .text:0x00005D08; // type:function size:0x390 scope:local
fn_1_6098 = .text:0x00006098; // type:function size:0xFC scope:local
fn_1_6194 = .text:0x00006194; // type:function size:0x25C scope:local
fn_1_63F0 = .text:0x000063F0; // type:function size:0x624 scope:local
fn_1_6A14 = .text:0x00006A14; // type:function size:0x1AC scope:local
fn_1_6BC0 = .text:0x00006BC0; // type:function size:0x3F4 scope:local
fn_1_6FB4 = .text:0x00006FB4; // type:function size:0x574 scope:local
fn_1_7528 = .text:0x00007528; // type:function size:0x2C4 scope:local
fn_1_77EC = .text:0x000077EC; // type:function size:0xA8 scope:local
fn_1_7894 = .text:0x00007894; // type:function size:0x1D0 scope:local
fn_1_7A64 = .text:0x00007A64; // type:function size:0xAC8 scope:local
fn_1_852C = .text:0x0000852C; // type:function size:0x280 scope:local
fn_1_87AC = .text:0x000087AC; // type:function size:0x34 scope:local
fn_1_87E0 = .text:0x000087E0; // type:function size:0x1A8 scope:local
fn_1_8988 = .text:0x00008988; // type:function size:0xC8 scope:local
fn_1_8A50 = .text:0x00008A50; // type:function size:0x11C scope:local
fn_1_8B6C = .text:0x00008B6C; // type:function size:0x270 scope:local
fn_1_8DDC = .text:0x00008DDC; // type:function size:0x3B0 scope:local
fn_1_918C = .text:0x0000918C; // type:function size:0xF0 scope:local
fn_1_927C = .text:0x0000927C; // type:function size:0xB0 scope:local
fn_1_932C = .text:0x0000932C; // type:function size:0x17C scope:local
fn_1_94A8 = .text:0x000094A8; // type:function size:0x14C scope:local
fn_1_95F4 = .text:0x000095F4; // type:function size:0x200 scope:local
fn_1_97F4 = .text:0x000097F4; // type:function size:0xF8 scope:local
fn_1_98EC = .text:0x000098EC; // type:function size:0x34 scope:local
fn_1_9920 = .text:0x00009920; // type:function size:0x104 scope:local
fn_1_9A24 = .text:0x00009A24; // type:function size:0x198 scope:local
fn_1_9BBC = .text:0x00009BBC; // type:function size:0x144 scope:local
fn_1_9D00 = .text:0x00009D00; // type:function size:0xD8
fn_1_9DD8 = .text:0x00009DD8; // type:function size:0x6E0
fn_1_A4B8 = .text:0x0000A4B8; // type:function size:0x9C
@ -136,90 +136,90 @@ fn_1_11064 = .text:0x00011064; // type:function size:0x420
fn_1_11484 = .text:0x00011484; // type:function size:0x56C
_ctors = .ctors:0x00000000; // type:label scope:global data:4byte
_dtors = .dtors:0x00000000; // type:label scope:global data:4byte
lbl_1_rodata_10 = .rodata:0x00000010; // type:object size:0x4 data:float
lbl_1_rodata_14 = .rodata:0x00000014; // type:object size:0x4 data:float
lbl_1_rodata_18 = .rodata:0x00000018; // type:object size:0x4 data:float
lbl_1_rodata_1C = .rodata:0x0000001C; // type:object size:0x4 data:float
lbl_1_rodata_20 = .rodata:0x00000020; // type:object size:0x4 data:float
lbl_1_rodata_24 = .rodata:0x00000024; // type:object size:0x4 data:float
lbl_1_rodata_28 = .rodata:0x00000028; // type:object size:0x4 data:float
lbl_1_rodata_2C = .rodata:0x0000002C; // type:object size:0x4 data:float
lbl_1_rodata_30 = .rodata:0x00000030; // type:object size:0x4 data:float
lbl_1_rodata_34 = .rodata:0x00000034; // type:object size:0x4 data:float
lbl_1_rodata_38 = .rodata:0x00000038; // type:object size:0x4 data:float
lbl_1_rodata_3C = .rodata:0x0000003C; // type:object size:0x4 data:float
lbl_1_rodata_40 = .rodata:0x00000040; // type:object size:0x8 data:double
lbl_1_rodata_48 = .rodata:0x00000048; // type:object size:0x8 data:double
lbl_1_rodata_50 = .rodata:0x00000050; // type:object size:0x8 data:double
lbl_1_rodata_58 = .rodata:0x00000058; // type:object size:0x8 data:double
lbl_1_rodata_60 = .rodata:0x00000060; // type:object size:0x4 data:float
lbl_1_rodata_64 = .rodata:0x00000064; // type:object size:0x4 data:float
lbl_1_rodata_68 = .rodata:0x00000068; // type:object size:0x4 data:float
lbl_1_rodata_6C = .rodata:0x0000006C; // type:object size:0x4 data:float
lbl_1_rodata_70 = .rodata:0x00000070; // type:object size:0x4 data:float
lbl_1_rodata_74 = .rodata:0x00000074; // type:object size:0x4 data:float
lbl_1_rodata_78 = .rodata:0x00000078; // type:object size:0x8 data:double
lbl_1_rodata_80 = .rodata:0x00000080; // type:object size:0x4 data:float
lbl_1_rodata_84 = .rodata:0x00000084; // type:object size:0x4 data:float
lbl_1_rodata_88 = .rodata:0x00000088; // type:object size: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:0x4 data:float
lbl_1_rodata_AC = .rodata:0x000000AC; // type:object size:0x4 data:float
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:0x8 data:double
lbl_1_rodata_D8 = .rodata:0x000000D8; // type:object size:0x4 data:float
lbl_1_rodata_DC = .rodata:0x000000DC; // type:object size:0x4 data:float
lbl_1_rodata_E0 = .rodata:0x000000E0; // type:object size:0x4 data:float
lbl_1_rodata_E4 = .rodata:0x000000E4; // type:object size:0x4 data:float
lbl_1_rodata_E8 = .rodata:0x000000E8; // type:object size:0x4 data:float
lbl_1_rodata_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:0x10 data:4byte
lbl_1_rodata_104 = .rodata:0x00000104; // type:object size:0x8 data:4byte
lbl_1_rodata_10C = .rodata:0x0000010C; // type:object size:0x8 data:4byte
lbl_1_rodata_114 = .rodata:0x00000114; // type:object size:0x2 data:2byte
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_148 = .rodata:0x00000148; // type:object size:0x8 data:double
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:0x4 data:float
lbl_1_rodata_164 = .rodata:0x00000164; // type:object size:0x4 data:float
lbl_1_rodata_168 = .rodata:0x00000168; // type:object size:0x2 data:2byte
lbl_1_rodata_16C = .rodata:0x0000016C; // type:object size:0x4 data:float
lbl_1_rodata_170 = .rodata:0x00000170; // type:object size:0x4 data:float
lbl_1_rodata_174 = .rodata:0x00000174; // type:object size:0x4 data:float
lbl_1_rodata_178 = .rodata:0x00000178; // type:object size:0x4 data:float
lbl_1_rodata_17C = .rodata:0x0000017C; // type:object size:0x4 data:float
lbl_1_rodata_180 = .rodata:0x00000180; // type:object size:0x4 data:float
lbl_1_rodata_184 = .rodata:0x00000184; // type:object size:0x4 data:float
lbl_1_rodata_188 = .rodata:0x00000188; // type:object size:0x4 data:float
lbl_1_rodata_18C = .rodata:0x0000018C; // type:object size:0x4 data:float
lbl_1_rodata_190 = .rodata:0x00000190; // type:object size:0x4 data:float
lbl_1_rodata_194 = .rodata:0x00000194; // type:object size:0x4 data:float
lbl_1_rodata_10 = .rodata:0x00000010; // type:object size:0x4 scope:local data:float
lbl_1_rodata_14 = .rodata:0x00000014; // type:object size:0x4 scope:local data:float
lbl_1_rodata_18 = .rodata:0x00000018; // type:object size:0x4 scope:local data:float
lbl_1_rodata_1C = .rodata:0x0000001C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_20 = .rodata:0x00000020; // type:object size:0x4 scope:local data:float
lbl_1_rodata_24 = .rodata:0x00000024; // type:object size:0x4 scope:local data:float
lbl_1_rodata_28 = .rodata:0x00000028; // type:object size:0x4 scope:local data:float
lbl_1_rodata_2C = .rodata:0x0000002C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_30 = .rodata:0x00000030; // type:object size:0x4 scope:local data:float
lbl_1_rodata_34 = .rodata:0x00000034; // type:object size:0x4 scope:local data:float
lbl_1_rodata_38 = .rodata:0x00000038; // type:object size:0x4 scope:local data:float
lbl_1_rodata_3C = .rodata:0x0000003C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_40 = .rodata:0x00000040; // type:object size:0x8 scope:local data:double
lbl_1_rodata_48 = .rodata:0x00000048; // type:object size:0x8 scope:local data:double
lbl_1_rodata_50 = .rodata:0x00000050; // type:object size:0x8 scope:local data:double
lbl_1_rodata_58 = .rodata:0x00000058; // type:object size:0x8 scope:local data:double
lbl_1_rodata_60 = .rodata:0x00000060; // type:object size:0x4 scope:local data:float
lbl_1_rodata_64 = .rodata:0x00000064; // type:object size:0x4 scope:local data:float
lbl_1_rodata_68 = .rodata:0x00000068; // type:object size:0x4 scope:local data:float
lbl_1_rodata_6C = .rodata:0x0000006C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_70 = .rodata:0x00000070; // type:object size:0x4 scope:local data:float
lbl_1_rodata_74 = .rodata:0x00000074; // type:object size:0x4 scope:local data:float
lbl_1_rodata_78 = .rodata:0x00000078; // type:object size:0x8 scope:local data:double
lbl_1_rodata_80 = .rodata:0x00000080; // type:object size:0x4 scope:local data:float
lbl_1_rodata_84 = .rodata:0x00000084; // type:object size:0x4 scope:local data:float
lbl_1_rodata_88 = .rodata:0x00000088; // type:object size: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:0x4 scope:local data:float
lbl_1_rodata_AC = .rodata:0x000000AC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_B0 = .rodata:0x000000B0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_B4 = .rodata:0x000000B4; // type:object size:0x4 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:0x8 scope:local data:double
lbl_1_rodata_D8 = .rodata:0x000000D8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_DC = .rodata:0x000000DC; // type:object size:0x4 scope:local data:float
lbl_1_rodata_E0 = .rodata:0x000000E0; // type:object size:0x4 scope:local data:float
lbl_1_rodata_E4 = .rodata:0x000000E4; // type:object size:0x4 scope:local data:float
lbl_1_rodata_E8 = .rodata:0x000000E8; // type:object size:0x4 scope:local data:float
lbl_1_rodata_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:0x10 scope:local data:4byte
lbl_1_rodata_104 = .rodata:0x00000104; // type:object size:0x8 scope:local data:4byte
lbl_1_rodata_10C = .rodata:0x0000010C; // type:object size:0x8 scope:local data:4byte
lbl_1_rodata_114 = .rodata:0x00000114; // type:object size:0x2 scope:local data:2byte
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_148 = .rodata:0x00000148; // type:object size:0x8 scope:local data:double
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:0x4 scope:local data:float
lbl_1_rodata_164 = .rodata:0x00000164; // type:object size:0x4 scope:local data:float
lbl_1_rodata_168 = .rodata:0x00000168; // type:object size:0x2 scope:local data:2byte
lbl_1_rodata_16C = .rodata:0x0000016C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_170 = .rodata:0x00000170; // type:object size:0x4 scope:local data:float
lbl_1_rodata_174 = .rodata:0x00000174; // type:object size:0x4 scope:local data:float
lbl_1_rodata_178 = .rodata:0x00000178; // type:object size:0x4 scope:local data:float
lbl_1_rodata_17C = .rodata:0x0000017C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_180 = .rodata:0x00000180; // type:object size:0x4 scope:local data:float
lbl_1_rodata_184 = .rodata:0x00000184; // type:object size:0x4 scope:local data:float
lbl_1_rodata_188 = .rodata:0x00000188; // type:object size:0x4 scope:local data:float
lbl_1_rodata_18C = .rodata:0x0000018C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_190 = .rodata:0x00000190; // type:object size:0x4 scope:local data:float
lbl_1_rodata_194 = .rodata:0x00000194; // type:object size:0x4 scope:local data:float
lbl_1_rodata_198 = .rodata:0x00000198; // type:object size:0x4 data:float
lbl_1_rodata_19C = .rodata:0x0000019C; // type:object size:0x4 data:float
lbl_1_rodata_1A0 = .rodata:0x000001A0; // type:object size:0x4 data:float
@ -334,34 +334,34 @@ lbl_1_rodata_3B4 = .rodata:0x000003B4; // type:object size:0x4 data:float
lbl_1_rodata_3B8 = .rodata:0x000003B8; // type:object size:0x4 data:float
lbl_1_rodata_3BC = .rodata:0x000003BC; // type:object size:0x4 data:float
lbl_1_rodata_3C0 = .rodata:0x000003C0; // type:object size:0x4 data:float
lbl_1_data_0 = .data:0x00000000; // type:object size:0x528
lbl_1_data_528 = .data:0x00000528; // type:object size:0x2 data:2byte
lbl_1_data_52A = .data:0x0000052A; // type:object size:0x2 data:2byte
lbl_1_data_52C = .data:0x0000052C; // type:object size:0x2 data:2byte
lbl_1_data_52E = .data:0x0000052E; // type:object size:0x2 data:2byte
lbl_1_data_530 = .data:0x00000530; // type:object size:0x2 data:2byte
lbl_1_data_534 = .data:0x00000534; // type:object size:0x8
lbl_1_data_53C = .data:0x0000053C; // type:object size:0x8
lbl_1_data_544 = .data:0x00000544; // type:object size:0x14 data:string
lbl_1_data_558 = .data:0x00000558; // type:object size:0x14 data:string
lbl_1_data_56C = .data:0x0000056C; // type:object size:0x14
lbl_1_data_580 = .data:0x00000580; // type:object size:0x2 data:2byte
lbl_1_data_582 = .data:0x00000582; // type:object size:0x12
lbl_1_data_594 = .data:0x00000594; // type:object size:0x40
lbl_1_data_5D4 = .data:0x000005D4; // type:object size:0x4 data:4byte
lbl_1_data_5D8 = .data:0x000005D8; // type:object size:0x4 data:4byte
lbl_1_data_5DC = .data:0x000005DC; // type:object size:0x10
lbl_1_data_5EC = .data:0x000005EC; // type:object size:0x7 data:string
lbl_1_data_5F3 = .data:0x000005F3; // type:object size:0x7 data:string
lbl_1_data_5FA = .data:0x000005FA; // type:object size:0xA
lbl_1_data_604 = .data:0x00000604; // type:object size:0xC
lbl_1_data_610 = .data:0x00000610; // type:object size:0x10
lbl_1_data_620 = .data:0x00000620; // type:object size:0x5 data:string
lbl_1_data_625 = .data:0x00000625; // type:object size:0x5 data:string
lbl_1_data_62A = .data:0x0000062A; // type:object size:0x5 data:string
lbl_1_data_62F = .data:0x0000062F; // type:object size:0x4 data:string
lbl_1_data_633 = .data:0x00000633; // type:object size:0x1 data:byte
lbl_1_data_634 = .data:0x00000634; // type:object size:0x24
lbl_1_data_0 = .data:0x00000000; // type:object size:0x528 scope:local
lbl_1_data_528 = .data:0x00000528; // type:object size:0x2 scope:local data:2byte
lbl_1_data_52A = .data:0x0000052A; // type:object size:0x2 scope:local data:2byte
lbl_1_data_52C = .data:0x0000052C; // type:object size:0x2 scope:local data:2byte
lbl_1_data_52E = .data:0x0000052E; // type:object size:0x2 scope:local data:2byte
lbl_1_data_530 = .data:0x00000530; // type:object size:0x2 scope:local data:2byte
lbl_1_data_534 = .data:0x00000534; // type:object size:0x8 scope:local
lbl_1_data_53C = .data:0x0000053C; // type:object size:0x8 scope:local
lbl_1_data_544 = .data:0x00000544; // type:object size:0x14 scope:local data:string
lbl_1_data_558 = .data:0x00000558; // type:object size:0x14 scope:local data:string
lbl_1_data_56C = .data:0x0000056C; // type:object size:0x13 scope:local data:string
lbl_1_data_580 = .data:0x00000580; // type:object size:0x2 scope:local data:2byte
lbl_1_data_582 = .data:0x00000582; // type:object size:0x12 scope:local
lbl_1_data_594 = .data:0x00000594; // type:object size:0x40 scope:local
lbl_1_data_5D4 = .data:0x000005D4; // type:object size:0x4 scope:local data:4byte
lbl_1_data_5D8 = .data:0x000005D8; // type:object size:0x4 scope:local data:4byte
lbl_1_data_5DC = .data:0x000005DC; // type:object size:0x10 scope:local data:2byte
lbl_1_data_5EC = .data:0x000005EC; // type:object size:0x7 scope:local data:string
lbl_1_data_5F3 = .data:0x000005F3; // type:object size:0x7 scope:local data:string
lbl_1_data_5FA = .data:0x000005FA; // type:object size:0x7 scope:local data:string
lbl_1_data_604 = .data:0x00000604; // type:object size:0xC scope:local
lbl_1_data_610 = .data:0x00000610; // type:object size:0x10 scope:local
lbl_1_data_620 = .data:0x00000620; // type:object size:0x5 scope:local data:string
lbl_1_data_625 = .data:0x00000625; // type:object size:0x5 scope:local data:string
lbl_1_data_62A = .data:0x0000062A; // type:object size:0x5 scope:local data:string
lbl_1_data_62F = .data:0x0000062F; // type:object size:0x4 scope:local data:string
lbl_1_data_633 = .data:0x00000633; // type:object size:0x1 scope:local data:byte
lbl_1_data_634 = .data:0x00000634; // type:object size:0x24 scope:local
lbl_1_data_658 = .data:0x00000658; // type:object size:0x24
lbl_1_data_67C = .data:0x0000067C; // type:object size:0x14
lbl_1_data_690 = .data:0x00000690; // type:object size:0x2D0
@ -378,46 +378,46 @@ lbl_1_data_F91 = .data:0x00000F91; // type:object size:0x5 data:string
lbl_1_data_F96 = .data:0x00000F96; // type:object size:0x6
lbl_1_data_F9C = .data:0x00000F9C; // type:object size:0x10 data:4byte
lbl_1_bss_0 = .bss:0x00000000; // type:object size:0x4 data:4byte
lbl_1_bss_4 = .bss:0x00000004; // type:object size:0x4 data:4byte
lbl_1_bss_8 = .bss:0x00000008; // type:object size:0x4 data:4byte
lbl_1_bss_C = .bss:0x0000000C; // type:object size:0x4 data:4byte
lbl_1_bss_10 = .bss:0x00000010; // type:object size:0x4 data:4byte
lbl_1_bss_14 = .bss:0x00000014; // type:object size:0x4 data:4byte
lbl_1_bss_18 = .bss:0x00000018; // type:object size:0x4 data:4byte
lbl_1_bss_1C = .bss:0x0000001C; // type:object size:0x1 data:byte
lbl_1_bss_20 = .bss:0x00000020; // type:object size:0x4 data:4byte
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:0x1 data:byte
lbl_1_bss_29 = .bss:0x00000029; // type:object size:0x1 data:byte
lbl_1_bss_2C = .bss:0x0000002C; // type:object size:0x5A0
lbl_1_bss_5CC = .bss:0x000005CC; // type:object size:0x2 data:2byte
lbl_1_bss_5D0 = .bss:0x000005D0; // type:object size:0x30
lbl_1_bss_600 = .bss:0x00000600; // type:object size:0x18
lbl_1_bss_618 = .bss:0x00000618; // type:object size:0xC data:4byte
lbl_1_bss_624 = .bss:0x00000624; // type:object size:0xC data:float
lbl_1_bss_630 = .bss:0x00000630; // type:object size:0xC data:4byte
lbl_1_bss_63C = .bss:0x0000063C; // type:object size:0x4 data:float
lbl_1_bss_640 = .bss:0x00000640; // type:object size:0x4 data:float
lbl_1_bss_644 = .bss:0x00000644; // type:object size:0x4 data:float
lbl_1_bss_648 = .bss:0x00000648; // type:object size:0xC data:4byte
lbl_1_bss_654 = .bss:0x00000654; // type:object size:0xC data:float
lbl_1_bss_660 = .bss:0x00000660; // type:object size:0xC data:float
lbl_1_bss_66C = .bss:0x0000066C; // type:object size:0x4 data:float
lbl_1_bss_670 = .bss:0x00000670; // type:object size:0x4 data:float
lbl_1_bss_674 = .bss:0x00000674; // type:object size:0x4 data:float
lbl_1_bss_678 = .bss:0x00000678; // type:object size:0x30
lbl_1_bss_6A8 = .bss:0x000006A8; // type:object size:0x4 data:float
lbl_1_bss_6AC = .bss:0x000006AC; // type:object size:0x2 data:2byte
lbl_1_bss_6AE = .bss:0x000006AE; // type:object size:0x2 data:2byte
lbl_1_bss_6B0 = .bss:0x000006B0; // type:object size:0x1 data:byte
lbl_1_bss_6B1 = .bss:0x000006B1; // type:object size:0x1 data:byte
lbl_1_bss_6B2 = .bss:0x000006B2; // type:object size:0x1 data:byte
lbl_1_bss_6B3 = .bss:0x000006B3; // type:object size:0x1 data:byte
lbl_1_bss_6B4 = .bss:0x000006B4; // type:object size:0x1 data:byte
lbl_1_bss_6B6 = .bss:0x000006B6; // type:object size:0xA data:2byte
lbl_1_bss_6C0 = .bss:0x000006C0; // type:object size:0x4 data:4byte
lbl_1_bss_6C4 = .bss:0x000006C4; // type:object size:0x44 data:2byte
lbl_1_bss_4 = .bss:0x00000004; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_8 = .bss:0x00000008; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_C = .bss:0x0000000C; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_10 = .bss:0x00000010; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_14 = .bss:0x00000014; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_18 = .bss:0x00000018; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_1C = .bss:0x0000001C; // type:object size:0x1 scope:local data:byte
lbl_1_bss_20 = .bss:0x00000020; // type:object size:0x4 scope:local data:4byte
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:0x1 scope:local data:byte
lbl_1_bss_29 = .bss:0x00000029; // type:object size:0x1 scope:local data:byte
lbl_1_bss_2C = .bss:0x0000002C; // type:object size:0x5A0 scope:local
lbl_1_bss_5CC = .bss:0x000005CC; // type:object size:0x4 scope:local data:2byte
lbl_1_bss_5D0 = .bss:0x000005D0; // type:object size:0x30 scope:local
lbl_1_bss_600 = .bss:0x00000600; // type:object size:0x18 scope:local
lbl_1_bss_618 = .bss:0x00000618; // type:object size:0xC scope:local data:4byte
lbl_1_bss_624 = .bss:0x00000624; // type:object size:0xC scope:local data:float
lbl_1_bss_630 = .bss:0x00000630; // type:object size:0xC scope:local data:4byte
lbl_1_bss_63C = .bss:0x0000063C; // type:object size:0x4 scope:local data:float
lbl_1_bss_640 = .bss:0x00000640; // type:object size:0x4 scope:local data:float
lbl_1_bss_644 = .bss:0x00000644; // type:object size:0x4 scope:local data:float
lbl_1_bss_648 = .bss:0x00000648; // type:object size:0xC scope:local data:4byte
lbl_1_bss_654 = .bss:0x00000654; // type:object size:0xC scope:local data:float
lbl_1_bss_660 = .bss:0x00000660; // type:object size:0xC scope:local data:float
lbl_1_bss_66C = .bss:0x0000066C; // type:object size:0x4 scope:local data:float
lbl_1_bss_670 = .bss:0x00000670; // type:object size:0x4 scope:local data:float
lbl_1_bss_674 = .bss:0x00000674; // type:object size:0x4 scope:local data:float
lbl_1_bss_678 = .bss:0x00000678; // type:object size:0x30 scope:local
lbl_1_bss_6A8 = .bss:0x000006A8; // type:object size:0x4 scope:local data:float
lbl_1_bss_6AC = .bss:0x000006AC; // type:object size:0x2 scope:local data:2byte
lbl_1_bss_6AE = .bss:0x000006AE; // type:object size:0x2 scope:local data:2byte
lbl_1_bss_6B0 = .bss:0x000006B0; // type:object size:0x1 scope:local data:byte
lbl_1_bss_6B1 = .bss:0x000006B1; // type:object size:0x1 scope:local data:byte
lbl_1_bss_6B2 = .bss:0x000006B2; // type:object size:0x1 scope:local data:byte
lbl_1_bss_6B3 = .bss:0x000006B3; // type:object size:0x1 scope:local data:byte
lbl_1_bss_6B4 = .bss:0x000006B4; // type:object size:0x1 scope:local data:byte
lbl_1_bss_6B6 = .bss:0x000006B6; // type:object size:0xA scope:local data:2byte
lbl_1_bss_6C0 = .bss:0x000006C0; // type:object size:0x4 scope:local data:4byte
lbl_1_bss_6C4 = .bss:0x000006C4; // type:object size:0x42 data:2byte
lbl_1_bss_708 = .bss:0x00000708; // type:object size:0x2 data:2byte
lbl_1_bss_70C = .bss:0x0000070C; // type:object size:0x4 data:4byte
lbl_1_bss_710 = .bss:0x00000710; // type:object size:0x4 data:4byte

2
configure.py
View file

@ -1084,7 +1084,7 @@ config.libs = [
Rel('w01Dll',
objects = {
Object(Matching, "REL/board_executor.c"),
Object(NonMatching, "REL/w01Dll/main.c"),
Object(Matching, "REL/w01Dll/main.c"),
Object(NonMatching, "REL/w01Dll/mg_coin.c"),
Object(NonMatching, "REL/w01Dll/mg_item.c"),
}

5
include/REL/option.h
View file

@ -1,3 +1,6 @@
#ifndef REL_OPTION_H
#define REL_OPTION_H
#include "game/object.h"
#include "dolphin/types.h"
@ -78,3 +81,5 @@ extern omObjData *lbl_1_bss_28;
extern omObjData *lbl_1_bss_30;
extern omObjData *lbl_1_bss_38;
extern omObjData *lbl_1_bss_40;
#endif

22
include/REL/w01Dll.h Executable file
View file

@ -0,0 +1,22 @@
#ifndef REL_W01_H
#define REL_W01_H
#include "dolphin/types.h"
typedef struct {
/* 0x00 */ struct {
u8 unk00_field0 : 1;
};
/* 0x01 */ s8 unk01[2];
} UnkBoardDataStruct; // Size unknown
extern void fn_1_9D00(s32 arg0);
extern void fn_1_9DD8(void);
extern void fn_1_D740(s16 *arg0);
extern void fn_1_DD84(void);
extern void fn_1_DE94(void);
extern s16 lbl_1_bss_6C4[33];
extern UnkBoardDataStruct *lbl_1_bss_0;
#endif

1
include/game/board/main.h
View file

@ -106,7 +106,6 @@ void BoardCameraOffsetSet(float x, float y, float z);
void BoardCameraTargetPlayerSet(s32 player);
void BoardCameraTargetModelSet(s16 model);
void BoardCameraTargetSpaceSet(s32 space);
void BoardCameraPosCalcFuncSet(BoardCameraPosCalcFunc func);
void BoardCameraQuakeSet(s32 duration, float strength);
void BoardCameraQuakeReset();
void BoardCameraTargetSet(float x, float y, float z);

1
include/game/board/player.h
View file

@ -146,7 +146,6 @@ void BoardBowserSuitMotionSetWait(void);
void BoardBowserSuitPlayerModelKill(void);
void BoardDiceDigit2DShowSet(s32);
s32 BoardPlayerMotBlendCheck(s32);
void BoardPlayerMoveAwayStartCurr(s32, s32);
void BoardBowserSuitMotionSetWalk(void);
s16 BoardBowserSuitModelGet(void);

1
include/game/board/space.h
View file

@ -49,6 +49,7 @@ s32 BoardSpaceStarGetCurr(void);
s32 BoardSpaceStarCheck(s32 index);
void BoardSpaceLandExec(s32 player, s32 space);
void BoardSpaceBlockPosSet(void);
void BoardSpaceInit(s32 data_num);
extern s16 boardSpaceStarTbl[8];

2564
src/REL/w01Dll/main.c Executable file
View file

File diff suppressed because it is too large Load diff

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

@ -2,6 +2,7 @@
#include "game/audio.h"
#include "game/chrman.h"
#include "game/data.h"
#include "game/flag.h"
#include "game/gamework.h"
#include "game/object.h"
#include "game/objsub.h"
@ -84,7 +85,7 @@ static omObjData *battleObj;
static Process *battleProc;
static const s8 battleCoinTbl[] = {
0x05, 0x0A, 0x14, 0x1E, 0x32
5, 10, 20, 30, 50
};
static float battleCursorPosTbl[] = {
@ -133,7 +134,7 @@ void BoardBattleExec(s32 player, s32 space) {
}
static void DestroyBattle(void) {
HuDataDirClose(0x10000);
HuDataDirClose(DATADIR_BBATTLE);
battleProc = NULL;
}
@ -201,13 +202,13 @@ static void ExecBattle(void) {
HuPrcVSleep();
}
_ClearFlag(0x1001C);
HuPrcSleep(0x3C);
HuPrcSleep(60);
HuPrcEnd();
}
HuAudFXPlay(0x34A);
omVibrate(GWSystem.player_curr, 0xC, 6, 6);
BoardAudSeqPause(0, 1, 0x1F4);
temp_r22 = BoardDataDirReadAsync(0x10000);
omVibrate(GWSystem.player_curr, 12, 6, 6);
BoardAudSeqPause(0, 1, 500);
temp_r22 = BoardDataDirReadAsync(DATADIR_BBATTLE);
BoardCameraViewSet(3);
BoardCameraMotionWait();
BoardPlayerMotBlendSet(currPlayer, 0, 0xF);
@ -217,7 +218,7 @@ static void ExecBattle(void) {
BoardDataAsyncWait(temp_r22);
SetBattleCoinValue();
BoardMusStart(1, 4, 0x7F, 0);
omVibrate(GWSystem.player_curr, 0xC, 6, 6);
omVibrate(GWSystem.player_curr, 12, 6, 6);
InitExplode();
while (CheckExplode() == 0) {
HuPrcVSleep();
@ -235,13 +236,13 @@ static void ExecBattle(void) {
}
}
if (var_r26 == 0) {
BoardWinCreate(2, 0x20001, 1);
BoardWinCreate(2, MAKE_MESSID(2, 1), 1);
BoardWinWait();
BoardWinKill();
var_r27 = 1;
} else {
HuAudFXPlay(0x4F);
BoardWinCreate(2, 0x20000, 1);
BoardWinCreate(2, MAKE_MESSID(2, 0), 1);
BoardWinWait();
BoardWinKill();
SetBattleBombState(3);
@ -260,7 +261,7 @@ static void ExecBattle(void) {
var_r23 = 1;
}
var_r25 = var_r23;
HuPrcSleep(0x3C);
HuPrcSleep(60);
} else {
var_r25 = -1;
}
@ -279,15 +280,15 @@ static void ExecBattle(void) {
BoardMusVolPanSet(0, 0, 1);
BoardAudSeqPause(0, 0, 1);
if (var_r27 == 0) {
HuDataDirClose(0x70000);
HuDataDirClose(0x20000);
HuDataDirClose(DATADIR_BOARD);
HuDataDirClose(DATADIR_BGUEST);
HuDataDirClose(sp8[GWBoardGet()]);
HuPrcSleep(2);
temp_r28 = battleMGList[battleMGIdx[mgChoice]];
GWMGAvailSet(temp_r28);
GWSystem.mg_next = temp_r28 - 401;
if (_CheckFlag(0xB)) {
var_r24 = 0x140000;
var_r24 = DATADIR_INST;
} else {
var_r24 = mgInfoTbl[temp_r28 - 401].data_dir;
}
@ -375,12 +376,12 @@ static void TakeCoins(void) {
HuAudFXPlay(0xF);
sprintf(totalCoinStr, "%d", var_r30);
if (var_r30 != coinTakeMax * 4) {
var_r24 = 0x20003;
var_r24 = MAKE_MESSID(2, 3);
} else {
var_r24 = 0x20002;
var_r24 = MAKE_MESSID(2, 2);
}
BoardWinCreate(2, var_r24, 1);
BoardWinInsertMesSet((u32) totalCoinStr, 0);
BoardWinInsertMesSet(MAKE_MESSID_PTR(totalCoinStr), 0);
BoardWinWait();
BoardWinKill();
}
@ -403,7 +404,7 @@ static void InitExplode(void) {
temp_r31->unk00_field0 = 0;
temp_r31->unk00_field1 = 0;
temp_r31->unk01 = 0x10;
temp_r31->unk02 = BoardModelCreate(0x20026, NULL, 0);
temp_r31->unk02 = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BGUEST, 38), NULL, 0);
BoardModelLayerSet(temp_r31->unk02, 2);
explodeObj->trans.x = sp14.x;
explodeObj->trans.y = sp14.y - 100.0f;
@ -411,7 +412,7 @@ static void InitExplode(void) {
BoardModelPosSet(temp_r31->unk02, explodeObj->trans.x, explodeObj->trans.y, explodeObj->trans.z);
BoardModelMotionStart(temp_r31->unk02, 0, 0x40000001);
for (i = 0; i < 4; i++) {
temp_r31->unk04[i] = BoardModelCreate(0x70066, NULL, 0);
temp_r31->unk04[i] = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BOARD, 102), NULL, 0);
sp8.x = sp14.x + sp20[i][0];
sp8.y = sp14.y;
sp8.z = sp14.z + sp20[i][1];
@ -534,7 +535,7 @@ static void CreateBattleMain(void) {
}
HuSprGrpPosSet(temp_r31->unk08, 288.0f, 240.0f);
battleObj->trans.x = -308.0f;
BoardFilterFadeInit(0x1E, 0xA0);
BoardFilterFadeInit(30, 0xA0);
}
static void UpdateBattleMain(omObjData *arg0) {
@ -614,7 +615,7 @@ static void ShowBattleGame(BattleWork *arg0, omObjData *arg1) {
float var_r29;
if (arg0->unk01 == 0) {
if (BoardFilterFadePauseCheck() != 0) {
if (BoardFilterFadePauseCheck()) {
arg0->unk01 = 1;
arg1->trans.z = 0.01f;
arg1->trans.y = 0.0f;
@ -711,7 +712,7 @@ static void ShowBattleCoin(BattleWork *arg0, omObjData *arg1) {
while (var_f30 > 180.0f) {
var_f30 -= 180.0f;
}
temp_f29 = 0.8999999761581421 + sin(var_f30 * M_PI / 180.0);
temp_f29 = 0.9f + sin(var_f30 * M_PI / 180.0);
HuSprScaleSet(arg0->unk08, 1, temp_f29, temp_f29);
}
@ -750,7 +751,7 @@ static void VibratePad(BattleWork *arg0, omObjData *arg1) {
s32 i;
for (i = 0; i < 4; i++) {
omVibrate(i, 0xC, 0xC, 0);
omVibrate(i, 12, 0xC, 0);
}
arg0->unk00_field1 = 8;
}

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

@ -114,15 +114,15 @@ static float padConfigPosTbl[4][2] = {
};
static s32 boardLogoTbl[] = {
0x00070057,
0x00070058,
0x00070059,
0x0007005A,
0x0007005B,
0x0007005C,
0x00070057,
0x0007005D,
0x0007005E
DATA_MAKE_NUM(DATADIR_BOARD, 87),
DATA_MAKE_NUM(DATADIR_BOARD, 88),
DATA_MAKE_NUM(DATADIR_BOARD, 89),
DATA_MAKE_NUM(DATADIR_BOARD, 90),
DATA_MAKE_NUM(DATADIR_BOARD, 91),
DATA_MAKE_NUM(DATADIR_BOARD, 92),
DATA_MAKE_NUM(DATADIR_BOARD, 87),
DATA_MAKE_NUM(DATADIR_BOARD, 93),
DATA_MAKE_NUM(DATADIR_BOARD, 94)
};
static float turnDigitPosTbl[] = {
@ -130,14 +130,14 @@ static float turnDigitPosTbl[] = {
};
static s32 boxMdlTbl[] = {
0x00080008,
0x00080009,
0x0008000A,
0x0008000B,
0x0008000C,
0x0008000D,
0x0008000E,
0x0008000F
DATA_MAKE_NUM(DATADIR_BPAUSE, 8),
DATA_MAKE_NUM(DATADIR_BPAUSE, 9),
DATA_MAKE_NUM(DATADIR_BPAUSE, 10),
DATA_MAKE_NUM(DATADIR_BPAUSE, 11),
DATA_MAKE_NUM(DATADIR_BPAUSE, 12),
DATA_MAKE_NUM(DATADIR_BPAUSE, 13),
DATA_MAKE_NUM(DATADIR_BPAUSE, 14),
DATA_MAKE_NUM(DATADIR_BPAUSE, 15)
};
void BoardPauseStart(void) {
@ -168,7 +168,7 @@ static void PauseExit(void) {
DeletePauseScreen();
DeletePauseControlWin();
BoardEventFlagReset();
HuDataDirClose(0x80000);
HuDataDirClose(DATADIR_BPAUSE);
pausePad = -1;
omSysPauseCtrl(0);
if (GWMGExplainGet()) {
@ -197,8 +197,8 @@ static void PauseProcess(void) {
pauseQuitF = 0;
mainScreenF = 1;
BoardFilterFadeInit(0x1E, 0xA0);
temp_r31 = BoardDataDirReadAsync(0x80000);
BoardFilterFadeInit(30, 0xA0);
temp_r31 = BoardDataDirReadAsync(DATADIR_BPAUSE);
BoardRollWinDispSet(0);
BoardDiceDigit2DShowSet(0);
BoardStatusItemSet(0);
@ -219,12 +219,12 @@ static void PauseProcess(void) {
DeletePauseScreen();
DeletePauseControlWin();
if (pauseQuitF != 0) {
HuPrcSleep(0x14);
HuPrcSleep(20);
WipeColorSet(0, 0, 0);
BoardKill();
} else {
BoardFilterFadeOut(0x1E);
HuPrcSleep(0x1E);
BoardFilterFadeOut(30);
HuPrcSleep(30);
}
HuPrcEnd();
}
@ -262,28 +262,28 @@ void CreatePauseScreen(void) {
temp_r27->trans.y = -32.0f + boxPosTbl[cursorPos][1];
pauseCursorPos = HuSprGrpCreate(2);
HuSprGrpPosSet(pauseCursorPos, 0.0f, 0.0f);
BoardSpriteCreate(0x70055, 0x2BC, 0, &sp8);
BoardSpriteCreate(DATA_MAKE_NUM(DATADIR_BOARD, 85), 700, 0, &sp8);
HuSprGrpMemberSet(pauseCursorPos, 0, sp8);
HuSprZRotSet(pauseCursorPos, 0, 45.0f);
HuSprAttrSet(pauseCursorPos, 0, 4);
HuSprAttrSet(pauseCursorPos, 0, 8);
HuSprPosSet(pauseCursorPos, 0, temp_r27->trans.x, temp_r27->trans.y);
BoardSpriteCreate(0x80007, 0x2EE, 0, &sp8);
BoardSpriteCreate(DATA_MAKE_NUM(DATADIR_BPAUSE, 7), 750, 0, &sp8);
HuSprGrpMemberSet(pauseCursorPos, 1, sp8);
HuSprAttrSet(pauseCursorPos, 1, 4);
HuSprAttrSet(pauseCursorPos, 1, 8);
pauseSprGrp = HuSprGrpCreate(7);
HuSprGrpPosSet(pauseSprGrp, 0.0f, 0.0f);
BoardSpriteCreate(boardLogoTbl[GWBoardGet()], 0x384, 0, &sp8);
BoardSpriteCreate(boardLogoTbl[GWBoardGet()], 900, 0, &sp8);
HuSprGrpMemberSet(pauseSprGrp, 0, sp8);
HuSprPosSet(pauseSprGrp, 0, 288.0f, 120.0f);
HuSprAttrSet(pauseSprGrp, 0, 4);
HuSprAttrSet(pauseSprGrp, 0, 8);
BoardSpriteCreate(0x80005, 0x384, 0, &sp8);
BoardSpriteCreate(DATA_MAKE_NUM(DATADIR_BPAUSE, 5), 900, 0, &sp8);
HuSprGrpMemberSet(pauseSprGrp, 1, sp8);
HuSprPosSet(pauseSprGrp, 1, 288.0f, 302.0f);
HuSprAttrSet(pauseSprGrp, 1, 8);
BoardSpriteCreate(0x80004, 0x320, 0, &sp8);
BoardSpriteCreate(DATA_MAKE_NUM(DATADIR_BPAUSE, 4), 800, 0, &sp8);
HuSprGrpMemberSet(pauseSprGrp, 2, sp8);
HuSprZRotSet(pauseSprGrp, 2, -30.0f);
HuSprPosSet(pauseSprGrp, 2, 87.0f, 245.0f);
@ -301,32 +301,32 @@ void CreatePauseScreen(void) {
HuSprBankSet(pauseSprGrp, 2, 1);
}
for (i = 0; i < 4; i++) {
BoardSpriteCreate(0x80006, 0x320, 0, &sp8);
BoardSpriteCreate(DATA_MAKE_NUM(DATADIR_BPAUSE, 6), 800, 0, &sp8);
HuSprGrpMemberSet(pauseSprGrp, i + 3, sp8);
HuSprPosSet(pauseSprGrp, i + 3, turnDigitPosTbl[i], 301.0f);
HuSprAttrSet(pauseSprGrp, i + 3, 8);
HuSprAttrSet(pauseSprGrp, i + 3, 1);
}
padConfigSprGrp = HuSprGrpCreate(0xD);
padConfigSprGrp = HuSprGrpCreate(13);
HuSprGrpPosSet(padConfigSprGrp, 0.0f, 0.0f);
for (i = 0; i < 4; i++) {
BoardSpriteCreate(0x80000, 0x38E, 0, &sp8);
BoardSpriteCreate(DATA_MAKE_NUM(DATADIR_BPAUSE, 0), 910, 0, &sp8);
HuSprGrpMemberSet(padConfigSprGrp, i, sp8);
HuSprAttrSet(padConfigSprGrp, i, 8);
HuSprAttrSet(padConfigSprGrp, i, 1);
BoardSpriteCreate(0x80001, 0x2BC, 0, &sp8);
BoardSpriteCreate(DATA_MAKE_NUM(DATADIR_BPAUSE, 1), 700, 0, &sp8);
HuSprGrpMemberSet(padConfigSprGrp, i + 4, sp8);
HuSprAttrSet(padConfigSprGrp, i + 4, 8);
HuSprAttrSet(padConfigSprGrp, i + 4, 1);
BoardSpriteCreate(0x80002, 0x320, 0, &sp8);
BoardSpriteCreate(DATA_MAKE_NUM(DATADIR_BPAUSE, 2), 800, 0, &sp8);
HuSprGrpMemberSet(padConfigSprGrp, i + 8, sp8);
HuSprAttrSet(padConfigSprGrp, i + 8, 8);
HuSprAttrSet(padConfigSprGrp, i + 8, 1);
}
BoardSpriteCreate(0x80003, 0x3E8, 0, &sp8);
HuSprGrpMemberSet(padConfigSprGrp, 0xC, sp8);
HuSprAttrSet(padConfigSprGrp, 0xC, 4);
HuSprDrawNoSet(padConfigSprGrp, 0xC, 0x40);
BoardSpriteCreate(DATA_MAKE_NUM(DATADIR_BPAUSE, 3), 1000, 0, &sp8);
HuSprGrpMemberSet(padConfigSprGrp, 12, sp8);
HuSprAttrSet(padConfigSprGrp, 12, 4);
HuSprDrawNoSet(padConfigSprGrp, 12, 0x40);
CreatePadConfigSprite();
ShowPadConfigSprite(0);
hostOldLayer = BoardModelLayerGet(hostMdl);
@ -551,15 +551,15 @@ static void PauseConfigObjFunc(omObjData *arg0) {
switch (boxState[5]) {
case 0:
GWSystem.mess_speed = 2;
GWSystem.mess_delay = 0x30;
GWSystem.mess_delay = 48;
break;
case 1:
GWSystem.mess_speed = 1;
GWSystem.mess_delay = 0x20;
GWSystem.mess_delay = 32;
break;
case 2:
GWSystem.mess_speed = 0;
GWSystem.mess_delay = 0x10;
GWSystem.mess_delay = 16;
break;
}
}
@ -608,14 +608,14 @@ static void UpdatePauseText(s32 arg0) {
switch (arg0) {
case 0:
HuWinMesSet(settingsWin, 0x10001C);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 28));
for (i = 0; i < 4; i++) {
for (j = 0; j < 4; j++) {
if (i == GWPlayer[j].port) {
if (GWPlayer[j].com) {
var_r28 = 0x10001E;
var_r28 = MAKE_MESSID(16, 30);
} else {
var_r28 = 0x10001D;
var_r28 = MAKE_MESSID(16, 29);
}
HuWinInsertMesSet(settingsWin, var_r28, i);
break;
@ -625,66 +625,66 @@ static void UpdatePauseText(s32 arg0) {
break;
case 1:
if (boxState[arg0] != 0) {
HuWinMesSet(settingsWin, 0x100021);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 33));
} else {
HuWinMesSet(settingsWin, 0x100022);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 34));
}
break;
case 2:
if (boxState[arg0] != 0) {
HuWinMesSet(settingsWin, 0x100023);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 35));
} else {
HuWinMesSet(settingsWin, 0x100024);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 36));
}
break;
case 3:
switch (boxState[arg0]) {
case 0:
HuWinMesSet(settingsWin, 0x100026);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 38));
break;
case 1:
HuWinMesSet(settingsWin, 0x100025);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 37));
break;
case 2:
HuWinMesSet(settingsWin, 0x100027);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 39));
break;
}
break;
case 4:
if (boxState[arg0] != 0) {
HuWinMesSet(settingsWin, 0x100028);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 40));
} else {
HuWinMesSet(settingsWin, 0x100029);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 41));
}
break;
case 5:
switch (boxState[arg0]) {
case 0:
HuWinMesSet(settingsWin, 0x10002C);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 44));
break;
case 1:
HuWinMesSet(settingsWin, 0x10002B);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 43));
break;
case 2:
HuWinMesSet(settingsWin, 0x10002A);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 42));
break;
}
break;
case 6:
switch (boxState[arg0]) {
case 0:
HuWinMesSet(settingsWin, 0x10002F);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 47));
break;
case 1:
HuWinMesSet(settingsWin, 0x10002D);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 45));
break;
case 2:
HuWinMesSet(settingsWin, 0x10002E);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 46));
break;
}
break;
case 7:
HuWinMesSet(settingsWin, 0x100030);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 48));
break;
}
}
@ -699,16 +699,16 @@ static void InitPauseQuit(omObjData *arg0, ConfigWork *arg1) {
HuPrcSetStat(quitProcess, 0xC);
HuPrcDestructorSet2(quitProcess, DeletePauseQuit);
arg1->unk01 = 1;
arg1->unk06 = 0xA;
arg1->unk06 = 10;
HuSprAttrSet(pauseCursorPos, 0, 4);
HuSprAttrSet(pauseCursorPos, 1, 4);
break;
case 1:
if (quitWin != -1 && HuWinStatGet(quitWin) == 3) {
if (HuWinChoiceNowGet(quitWin) != 0) {
HuWinMesSet(settingsWin, 0x100033);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 51));
} else {
HuWinMesSet(settingsWin, 0x100032);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 50));
}
}
if (!quitProcess) {
@ -741,7 +741,7 @@ static void PauseQuitProcess(void) {
float sp10[2];
float sp8[2];
HuWinMesMaxSizeGet(1, sp8, 0x100031);
HuWinMesMaxSizeGet(1, sp8, MAKE_MESSID(16, 49));
sp10[0] = -10000.0f;
sp10[1] = 140.0f;
quitWin = HuWinExCreate(sp10[0], sp10[1], sp8[0], sp8[1], -1);
@ -749,10 +749,10 @@ static void PauseQuitProcess(void) {
temp_r31->active_pad = (1 << pausePad);
HuWinExAnimIn(quitWin);
HuWinMesSpeedSet(quitWin, 0);
HuWinMesSet(quitWin, 0x100031);
HuWinMesSet(quitWin, MAKE_MESSID(16, 49));
HuWinMesWait(quitWin);
if (HuWinChoiceGet(quitWin, 0) == 1) {
HuPrcSleep(0x3C);
HuPrcSleep(60);
pauseQuitF = 1;
_SetFlag(0x1001B);
}
@ -764,7 +764,7 @@ static void DeletePauseQuit(void) {
HuWinExCleanup(quitWin);
quitWin = -1;
}
HuDataDirClose(0x80000);
HuDataDirClose(DATADIR_BPAUSE);
quitProcess = NULL;
}
@ -807,7 +807,7 @@ static void CreatePadConfig(omObjData *arg0, ConfigWork *arg1) {
arg0->rot.x = 576.0f;
arg0->rot.y = 112.0f;
arg0->rot.z = (32.0f - arg0->rot.x) / 20.0f;
arg1->unk07 = 0x14;
arg1->unk07 = 20;
ShowPadConfigSprite(1);
HuSprGrpPosSet(padConfigSprGrp, arg0->rot.x, arg0->rot.y);
arg1->unk04 = 0;
@ -864,7 +864,7 @@ static void CursorMovePadConfig(omObjData *arg0, ConfigWork *arg1) {
s32 temp_r29;
u32 temp_r30;
HuWinMesSet(settingsWin, 0x10001F);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 31));
temp_r30 = HuPadDStkRep[pausePad] | HuPadBtnDown[pausePad];
temp_r29 = CheckPort(arg1->unk04);
if (temp_r30 == 0x100) {
@ -910,9 +910,9 @@ static void ChangeDiffPadConfig(omObjData *arg0, ConfigWork *arg1) {
u32 var_r30;
var_r30 = 0;
if (HuPadStkX[pausePad] < -0x14) {
if (HuPadStkX[pausePad] < -20) {
var_r30 |= 1;
} else if (HuPadStkX[pausePad] > 0x14) {
} else if (HuPadStkX[pausePad] > 20) {
var_r30 |= 2;
}
temp_r29 = CheckPort(arg1->unk04);
@ -921,10 +921,10 @@ static void ChangeDiffPadConfig(omObjData *arg0, ConfigWork *arg1) {
} else {
var_r27 = 3;
}
HuWinMesSet(settingsWin, 0x100020);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 32));
if (var_r30 != 0) {
if (arg1->unk0C != 0 && arg1->unk0C == var_r30) {
if (arg1->unk09++ < 0xA) {
if (arg1->unk09++ < 10) {
return;
}
} else {
@ -1061,7 +1061,7 @@ static s32 UpdatePauseBox(omObjData *arg0, ConfigWork *arg1, s32 arg2) {
}
var_f29 = arg0->rot.x;
arg0->rot.y = (var_f30 - var_f29) / 30.0f;
arg1->unk07 = 0x1E;
arg1->unk07 = 30;
arg1->unk01 = 2;
}
break;
@ -1161,7 +1161,7 @@ static s32 UpdatePauseBoxExt(omObjData *arg0, ConfigWork *arg1, s32 arg2) {
}
var_f29 = arg0->rot.x;
arg0->rot.y = (var_f30 - var_f29) / 30.0f;
arg1->unk07 = 0x1E;
arg1->unk07 = 30;
arg1->unk01 = 2;
}
break;
@ -1280,7 +1280,7 @@ static void CreatePauseControlWin(void) {
float var_f30;
u32 var_r31;
var_r31 = 0x100035;
var_r31 = MAKE_MESSID(16, 53);
HuWinMesMaxSizeGet(1, sp8, var_r31);
var_f31 = 152.0f;
var_f30 = 280.0f;
@ -1290,9 +1290,9 @@ static void CreatePauseControlWin(void) {
HuWinMesSet(settingsControlWin, var_r31);
HuWinDispOff(settingsControlWin);
if (GWBoardGet() == 7 || GWBoardGet() == 8) {
var_r31 = 0x100049;
var_r31 = MAKE_MESSID(16, 73);
} else {
var_r31 = 0x100034;
var_r31 = MAKE_MESSID(16, 52);
}
HuWinMesMaxSizeGet(1, sp8, var_r31);
var_f31 = -10000.0f;
@ -1418,7 +1418,7 @@ static void CreatePadConfigSprite(void) {
break;
}
}
temp_f31 = i * 0x60 + 0xB2;
temp_f31 = i * 96 + 178;
temp_f30 = 64.0f;
temp_r28 = GWPlayer[j].character;
temp_r27 = GWPlayer[j].diff;
@ -1434,7 +1434,7 @@ static void CreatePadConfigSprite(void) {
HuSprPosSet(padConfigSprGrp, i + 4, temp_f31, temp_f30);
HuSprPosSet(padConfigSprGrp, i + 8, temp_f31, temp_f30);
}
HuSprPosSet(padConfigSprGrp, 0xC, 260.0f, 64.0f);
HuSprPosSet(padConfigSprGrp, 12, 260.0f, 64.0f);
HuSprGrpPosSet(padConfigSprGrp, 0.0f, 0.0f);
}
@ -1455,9 +1455,9 @@ static void ShowPadConfigSprite(s32 arg0) {
}
}
if (arg0 != 0) {
HuSprAttrReset(padConfigSprGrp, 0xC, 4);
HuSprAttrReset(padConfigSprGrp, 12, 4);
} else {
HuSprAttrSet(padConfigSprGrp, 0xC, 4);
HuSprAttrSet(padConfigSprGrp, 12, 4);
}
}