diff --git a/config/GMPE01_00/symbols.txt b/config/GMPE01_00/symbols.txt index 63e036f3..cfa1a176 100644 --- a/config/GMPE01_00/symbols.txt +++ b/config/GMPE01_00/symbols.txt @@ -1841,10 +1841,10 @@ BallBooFlash = .text:0x800A1024; // type:function size:0x178 scope:local TakeBallCoin = .text:0x800A119C; // type:function size:0x1B0 scope:local ExecTakeBallCoin = .text:0x800A134C; // type:function size:0xDC scope:local TakeBallCoinPosSet = .text:0x800A1428; // type:function size:0x9C scope:local -CheckBallCoinDone = .text:0x800A14C4; // type:function size:0x68 -TakeBallStar = .text:0x800A152C; // type:function size:0x168 -ExecTakeBallStar = .text:0x800A1694; // type:function size:0x184 -CheckTakeBallStarDone = .text:0x800A1818; // type:function size:0x1C +CheckBallCoinDone = .text:0x800A14C4; // type:function size:0x68 scope:local +TakeBallStar = .text:0x800A152C; // type:function size:0x168 scope:local +ExecTakeBallStar = .text:0x800A1694; // type:function size:0x184 scope:local +CheckTakeBallStarDone = .text:0x800A1818; // type:function size:0x1C scope:local BoardBooStealValueGet = .text:0x800A1834; // type:function size:0x30 BoardBooStealLightCheck = .text:0x800A1864; // type:function size:0x20 UpdatePlayerCoins = .text:0x800A1884; // type:function size:0x1B0 scope:local @@ -4291,7 +4291,9 @@ statusLayout1Vs3 = .data:0x8013AD64; // type:object size:0x30 scope:local data:f statusLayout2Vs2 = .data:0x8013AD94; // type:object size:0x30 scope:local data:float luckyMessTbl = .data:0x8013ADC4; // type:object size:0x24 scope:local jumptable_8013ADE8 = .data:0x8013ADE8; // type:object size:0x20 scope:local -hiliteYTbl = .data:0x8013AE08; // type:object size:0x10 scope:local +cursorYTbl = .data:0x8013AE08; // type:object size:0x10 scope:local +hiliteYTbl = .data:0x8013AE18; // type:object size:0x10 scope:local + hiliteColTbl = .data:0x8013AE28; // type:object size:0xC scope:local hostMesTbl = .data:0x8013AE38; // type:object size:0x90 scope:local houseMdlTbl = .data:0x8013AEC8; // type:object size:0x30 scope:local @@ -4701,7 +4703,7 @@ spacePos = .bss:0x801A4CF0; // type:object size:0xC scope:local data:float focusPos = .bss:0x801A4CFC; // type:object size:0xC scope:local data:float hostPos = .bss:0x801A4D08; // type:object size:0xC scope:local hostMot = .bss:0x801A4D14; // type:object size:0x10 scope:local data:2byte -lotteryTicketObj = .bss:0x801A4D24; // type:object size:0x14 scope:local data:4byte +lotteryTicketObj = .bss:0x801A4D24; // type:object size:0x10 scope:local data:4byte boxRot = .bss:0x801A4D38; // type:object size:0x20 scope:local padBoxPos = .bss:0x801A4D58; // type:object size:0xC scope:local data:float pathNodeData = .bss:0x801A4D68; // type:object size:0x500 scope:local data:byte @@ -5023,9 +5025,9 @@ houseShowMot = .sdata:0x801D37F0; // type:object size:0x2 scope:local data:2byte houseHideMot = .sdata:0x801D37F2; // type:object size:0x2 scope:local data:2byte ballMdl = .sdata:0x801D37F4; // type:object size:0x2 scope:local data:2byte booMdl = .sdata:0x801D37F6; // type:object size:0x2 scope:local data:2byte -lbl_801D37F8 = .sdata:0x801D37F8; // type:object size:0x2 scope:local data:2byte +smokeMdl = .sdata:0x801D37F8; // type:object size:0x2 scope:local data:2byte hostMdl = .sdata:0x801D37FA; // type:object size:0x2 scope:local data:2byte -houseMot = .sdata:0x801D37FC; // type:object size:0x6 scope:local data:2byte +hostMot = .sdata:0x801D37FC; // type:object size:0x6 scope:local data:2byte lbl_801D3802 = .sdata:0x801D3802; // type:object size:0x7 data:string lbl_801D3809 = .sdata:0x801D3809; // type:object size:0x7 data:string lbl_801D3810 = .sdata:0x801D3810; // type:object size:0x7 data:string diff --git a/config/GMPP01_00/splits.txt b/config/GMPP01_00/splits.txt index dad1284d..3706997a 100644 --- a/config/GMPP01_00/splits.txt +++ b/config/GMPP01_00/splits.txt @@ -492,3 +492,76 @@ game/board/fortune.c: .sdata start:0x801F0B78 end:0x801F0B80 .sbss start:0x801F1558 end:0x801F1568 .sdata2 start:0x801F3258 end:0x801F3268 + +game/board/boo.c: + .text start:0x8009DEF0 end:0x800A1954 + .data start:0x80157EB0 end:0x80158088 + .sdata start:0x801F0B80 end:0x801F0B90 + .sbss start:0x801F1568 end:0x801F15A0 + .sdata2 start:0x801F3268 end:0x801F3378 + +game/board/mg_setup.c: + .text start:0x800A1954 end:0x800A4E8C + .rodata start:0x8011E1C8 end:0x8011E1F0 + .data start:0x80158088 end:0x801581C0 + .bss start:0x801C1FF8 end:0x801C2068 + .sdata start:0x801F0B90 end:0x801F0B98 + .sbss start:0x801F15A0 end:0x801F15D0 + .sdata2 start:0x801F3378 end:0x801F3450 + +game/board/boo_house.c: + .text start:0x800A4E8C end:0x800A6E04 + .data start:0x801581C0 end:0x801582F8 + .bss start:0x801C2068 end:0x801C2078 + .sdata start:0x801F0B98 end:0x801F0BE8 + .sbss start:0x801F15D0 end:0x801F15E8 + .sdata2 start:0x801F3450 end:0x801F3498 + +game/board/start.c: + .text start:0x800A6E04 end:0x800A9628 + .rodata start:0x8011E1F0 end:0x8011E210 + .data start:0x801582F8 end:0x80158460 + .bss start:0x801C2078 end:0x801C2090 + .sdata start:0x801F0BE8 end:0x801F0BF8 + .sbss start:0x801F15E8 end:0x801F15F8 + .sdata2 start:0x801F3498 end:0x801F3568 + +game/board/last5.c: + .text start:0x800A9628 end:0x800ADAA4 + .rodata start:0x8011E210 end:0x8011E250 + .data start:0x80158460 end:0x80158778 + .bss start:0x801C2090 end:0x801C20D8 + .sdata start:0x801F0BF8 end:0x801F0C50 + .sbss start:0x801F15F8 end:0x801F1618 + .sdata2 start:0x801F3568 end:0x801F3668 + +game/board/pause.c: + .text start:0x800ADAA4 end:0x800B1894 + .data start:0x80158778 end:0x801588A0 + .bss start:0x801C20D8 end:0x801C2108 + .sdata start:0x801F0C50 end:0x801F0C60 + .sbss start:0x801F1618 end:0x801F1638 + .sdata2 start:0x801F3668 end:0x801F3720 + +game/board/com_path.c: + .text start:0x800B1894 end:0x800B3DF8 + .bss start:0x801C2108 end:0x801C2688 + .sbss start:0x801F1638 end:0x801F1640 + +game/board/tutorial.c: + .text start:0x800B3DF8 end:0x800B4214 + .data start:0x801588A0 end:0x801588E8 + .bss start:0x801C2688 end:0x801C26A0 + .sbss start:0x801F1640 end:0x801F1668 + +dolphin/os/__start.c: + .init start:0x80003100 end:0x80003354 + +dolphin/PPCArch.c: + .text start:0x800B4214 end:0x800B42BC + +dolphin/os/OS.c: + .text start:0x800B42BC end:0x800B4C18 + .data start:0x801588E8 end:0x80158AA8 + .bss start:0x801C26A0 end:0x801C26F0 + .sbss start:0x801F1668 end:0x801F1698 diff --git a/config/GMPP01_00/symbols.txt b/config/GMPP01_00/symbols.txt index faf05c99..36e40d58 100644 --- a/config/GMPP01_00/symbols.txt +++ b/config/GMPP01_00/symbols.txt @@ -1805,68 +1805,68 @@ ComFortuneSwapStar = .text:0x8009DE88; // type:function size:0x68 scope:local BoardBooCreate = .text:0x8009DEF0; // type:function size:0x11C BoardBooKill = .text:0x8009E00C; // type:function size:0x2C BoardBooStealTypeSet = .text:0x8009E038; // type:function size:0x2A8 -fn_8009E2E0 = .text:0x8009E2E0; // type:function size:0x1D4 -fn_8009E4B4 = .text:0x8009E4B4; // type:function size:0xE8 +ComSetupStealPlayer = .text:0x8009E2E0; // type:function size:0x1D4 scope:local +ComSetStealPlayerInput = .text:0x8009E4B4; // type:function size:0xE8 scope:local BoardBooStealMain = .text:0x8009E59C; // type:function size:0x280 -fn_8009E81C = .text:0x8009E81C; // type:function size:0xC0 -fn_8009E8DC = .text:0x8009E8DC; // type:function size:0xA8 -fn_8009E984 = .text:0x8009E984; // type:function size:0x94 -fn_8009EA18 = .text:0x8009EA18; // type:function size:0x10 -fn_8009EA28 = .text:0x8009EA28; // type:function size:0xBC -fn_8009EAE4 = .text:0x8009EAE4; // type:function size:0x1D4 -fn_8009ECB8 = .text:0x8009ECB8; // type:function size:0xAC -fn_8009ED64 = .text:0x8009ED64; // type:function size:0x28 -fn_8009ED8C = .text:0x8009ED8C; // type:function size:0x4C -fn_8009EDD8 = .text:0x8009EDD8; // type:function size:0x300 -fn_8009F0D8 = .text:0x8009F0D8; // type:function size:0x4A0 -fn_8009F578 = .text:0x8009F578; // type:function size:0x9C -fn_8009F614 = .text:0x8009F614; // type:function size:0x1DC -fn_8009F7F0 = .text:0x8009F7F0; // type:function size:0x358 -fn_8009FB48 = .text:0x8009FB48; // type:function size:0x24 -fn_8009FB6C = .text:0x8009FB6C; // type:function size:0x2C -fn_8009FB98 = .text:0x8009FB98; // type:function size:0x214 -fn_8009FDAC = .text:0x8009FDAC; // type:function size:0x15C -fn_8009FF08 = .text:0x8009FF08; // type:function size:0x110 -fn_800A0018 = .text:0x800A0018; // type:function size:0x68 -fn_800A0080 = .text:0x800A0080; // type:function size:0x1E0 -fn_800A0260 = .text:0x800A0260; // type:function size:0x10C -fn_800A036C = .text:0x800A036C; // type:function size:0x190 -fn_800A04FC = .text:0x800A04FC; // type:function size:0x328 -fn_800A0824 = .text:0x800A0824; // type:function size:0x170 -fn_800A0994 = .text:0x800A0994; // type:function size:0x24 -fn_800A09B8 = .text:0x800A09B8; // type:function size:0x128 -fn_800A0AE0 = .text:0x800A0AE0; // type:function size:0x54 -fn_800A0B34 = .text:0x800A0B34; // type:function size:0x104 -fn_800A0C38 = .text:0x800A0C38; // type:function size:0x218 -fn_800A0E50 = .text:0x800A0E50; // type:function size:0xF4 -fn_800A0F44 = .text:0x800A0F44; // type:function size:0x178 -fn_800A10BC = .text:0x800A10BC; // type:function size:0x1B0 -fn_800A126C = .text:0x800A126C; // type:function size:0xDC -fn_800A1348 = .text:0x800A1348; // type:function size:0x9C -fn_800A13E4 = .text:0x800A13E4; // type:function size:0x68 -fn_800A144C = .text:0x800A144C; // type:function size:0x168 -fn_800A15B4 = .text:0x800A15B4; // type:function size:0x184 -fn_800A1738 = .text:0x800A1738; // type:function size:0x1C +ExecCoinSteal = .text:0x8009E81C; // type:function size:0xC0 scope:local +ExecStarSteal = .text:0x8009E8DC; // type:function size:0xA8 scope:local +ExecLightSteal = .text:0x8009E984; // type:function size:0x94 scope:local +SetBooMode = .text:0x8009EA18; // type:function size:0x10 scope:local +CreateBallMdl = .text:0x8009EA28; // type:function size:0xBC scope:local +CreateBallView = .text:0x8009EAE4; // type:function size:0x1D4 scope:local +SetBallView = .text:0x8009ECB8; // type:function size:0xAC scope:local +SetBallActive = .text:0x8009ED64; // type:function size:0x28 scope:local +CheckBallKill = .text:0x8009ED8C; // type:function size:0x4C scope:local +BallMain = .text:0x8009EDD8; // type:function size:0x300 scope:local +BallRenderHook = .text:0x8009F0D8; // type:function size:0x4A0 scope:local +ExecBoo = .text:0x8009F578; // type:function size:0x9C scope:local +UpdateBallCamera = .text:0x8009F614; // type:function size:0x1DC scope:local +CreateBallPlayer = .text:0x8009F7F0; // type:function size:0x358 scope:local +GetBallPlayerState = .text:0x8009FB48; // type:function size:0x24 scope:local +SetBallPlayerState = .text:0x8009FB6C; // type:function size:0x2C scope:local +ExecBallPlayer = .text:0x8009FB98; // type:function size:0x214 scope:local +BallPlayerZoomOut = .text:0x8009FDAC; // type:function size:0x15C scope:local +BallPlayerScare = .text:0x8009FF08; // type:function size:0x110 scope:local +BallPlayerTurn = .text:0x800A0018; // type:function size:0x68 scope:local +BallPlayerPunch = .text:0x800A0080; // type:function size:0x1E0 scope:local +BallPlayerUseLight = .text:0x800A0260; // type:function size:0x10C scope:local +BallPlayerCatch = .text:0x800A036C; // type:function size:0x190 scope:local +BallBooCreate = .text:0x800A04FC; // type:function size:0x328 scope:local +SetBallBooState = .text:0x800A0824; // type:function size:0x170 scope:local +GetBallBooState = .text:0x800A0994; // type:function size:0x24 scope:local +ExecBallBoo = .text:0x800A09B8; // type:function size:0x128 scope:local +BallBooSpawn = .text:0x800A0AE0; // type:function size:0x54 scope:local +BallBooChase = .text:0x800A0B34; // type:function size:0x104 scope:local +BallBooBattle = .text:0x800A0C38; // type:function size:0x218 scope:local +BallBooAttack = .text:0x800A0E50; // type:function size:0xF4 scope:local +BallBooFlash = .text:0x800A0F44; // type:function size:0x178 scope:local +TakeBallCoin = .text:0x800A10BC; // type:function size:0x1B0 scope:local +ExecTakeBallCoin = .text:0x800A126C; // type:function size:0xDC scope:local +TakeBallCoinPosSet = .text:0x800A1348; // type:function size:0x9C scope:local +CheckBallCoinDone = .text:0x800A13E4; // type:function size:0x68 scope:local +TakeBallStar = .text:0x800A144C; // type:function size:0x168 scope:local +ExecTakeBallStar = .text:0x800A15B4; // type:function size:0x184 scope:local +CheckTakeBallStarDone = .text:0x800A1738; // type:function size:0x1C scope:local BoardBooStealValueGet = .text:0x800A1754; // type:function size:0x30 BoardBooStealLightCheck = .text:0x800A1784; // type:function size:0x20 -fn_800A17A4 = .text:0x800A17A4; // type:function size:0x1B0 +UpdatePlayerCoins = .text:0x800A17A4; // type:function size:0x1B0 scope:local BoardMGSetupExec = .text:0x800A1954; // type:function size:0x60 -fn_800A19B4 = .text:0x800A19B4; // type:function size:0x1C -fn_800A19D0 = .text:0x800A19D0; // type:function size:0x6FC -fn_800A20CC = .text:0x800A20CC; // type:function size:0x3B0 -fn_800A247C = .text:0x800A247C; // type:function size:0x3A8 -fn_800A2824 = .text:0x800A2824; // type:function size:0x388 -fn_800A2BAC = .text:0x800A2BAC; // type:function size:0x3A4 -fn_800A2F50 = .text:0x800A2F50; // type:function size:0x194 -fn_800A30E4 = .text:0x800A30E4; // type:function size:0x198 -fn_800A327C = .text:0x800A327C; // type:function size:0x174 -fn_800A33F0 = .text:0x800A33F0; // type:function size:0x200 -fn_800A35F0 = .text:0x800A35F0; // type:function size:0x20C -fn_800A37FC = .text:0x800A37FC; // type:function size:0x1C8 -fn_800A39C4 = .text:0x800A39C4; // type:function size:0x204 -fn_800A3BC8 = .text:0x800A3BC8; // type:function size:0xA8 -fn_800A3C70 = .text:0x800A3C70; // type:function size:0x430 -fn_800A40A0 = .text:0x800A40A0; // type:function size:0x8FC +DestroyMGSetup = .text:0x800A19B4; // type:function size:0x1C scope:local +ExecMGSetup = .text:0x800A19D0; // type:function size:0x6FC scope:local +DetermineMGList = .text:0x800A20CC; // type:function size:0x3B0 scope:local +SetupStatusLayout = .text:0x800A247C; // type:function size:0x3A8 scope:local +GetMGType = .text:0x800A2824; // type:function size:0x388 scope:local +GetMGTypeTeam = .text:0x800A2BAC; // type:function size:0x3A4 scope:local +CreateMGSetup = .text:0x800A2F50; // type:function size:0x194 scope:local +UpdateMGSetup = .text:0x800A30E4; // type:function size:0x198 scope:local +CenterStatus = .text:0x800A327C; // type:function size:0x174 scope:local +SeparateStatus = .text:0x800A33F0; // type:function size:0x200 scope:local +PopupVS = .text:0x800A35F0; // type:function size:0x20C scope:local +FallMGType = .text:0x800A37FC; // type:function size:0x1C8 scope:local +LuckyMGFall = .text:0x800A39C4; // type:function size:0x204 scope:local +HideLuckyValue = .text:0x800A3BC8; // type:function size:0xA8 scope:local +UpdateLuckyValue = .text:0x800A3C70; // type:function size:0x430 scope:local +UpdateMGList = .text:0x800A40A0; // type:function size:0x8FC scope:local BoardMGSetupPlayClear = .text:0x800A499C; // type:function size:0x74 BoardMGSetupPlaySearch = .text:0x800A4A10; // type:function size:0xC8 BoardMGSetupPlayPush = .text:0x800A4AD8; // type:function size:0xD0 @@ -1876,130 +1876,130 @@ BoardBooHouseHostGet = .text:0x800A4E94; // type:function size:0x8 BoardBooHouseCreate = .text:0x800A4E9C; // type:function size:0xB4 BoardBooHouseKill = .text:0x800A4F50; // type:function size:0x50 BoardBooHouseExec = .text:0x800A4FA0; // type:function size:0x94 -fn_800A5034 = .text:0x800A5034; // type:function size:0x538 -fn_800A556C = .text:0x800A556C; // type:function size:0xF0 -fn_800A565C = .text:0x800A565C; // type:function size:0xFC -fn_800A5758 = .text:0x800A5758; // type:function size:0x3A0 -fn_800A5AF8 = .text:0x800A5AF8; // type:function size:0x124 -fn_800A5C1C = .text:0x800A5C1C; // type:function size:0xB0 -fn_800A5CCC = .text:0x800A5CCC; // type:function size:0xD4 -fn_800A5DA0 = .text:0x800A5DA0; // type:function size:0x68 -fn_800A5E08 = .text:0x800A5E08; // type:function size:0x2AC -fn_800A60B4 = .text:0x800A60B4; // type:function size:0x2AC -fn_800A6360 = .text:0x800A6360; // type:function size:0x188 -fn_800A64E8 = .text:0x800A64E8; // type:function size:0x16C -fn_800A6654 = .text:0x800A6654; // type:function size:0x164 -fn_800A67B8 = .text:0x800A67B8; // type:function size:0x70 -fn_800A6828 = .text:0x800A6828; // type:function size:0x60 +ExecBooHouse = .text:0x800A5034; // type:function size:0x538 scope:local +DestroyBooHouse = .text:0x800A556C; // type:function size:0xF0 scope:local +PickComStealType = .text:0x800A565C; // type:function size:0xFC scope:local +OpenBooHouse = .text:0x800A5758; // type:function size:0x3A0 scope:local +CloseBooHouse = .text:0x800A5AF8; // type:function size:0x124 scope:local +CreateBooHouseModel = .text:0x800A5C1C; // type:function size:0xB0 scope:local +KillBooHouseModel = .text:0x800A5CCC; // type:function size:0xD4 scope:local +ExecNullSteal = .text:0x800A5DA0; // type:function size:0x68 scope:local +ExecStarSteal = .text:0x800A5E08; // type:function size:0x2AC scope:local +ExecCoinSteal = .text:0x800A60B4; // type:function size:0x2AC scope:local +ApplySteal = .text:0x800A6360; // type:function size:0x188 scope:local +ApplyCoinSteal = .text:0x800A64E8; // type:function size:0x16C scope:local +ApplyStarSteal = .text:0x800A6654; // type:function size:0x164 scope:local +ApplyBooLight = .text:0x800A67B8; // type:function size:0x70 scope:local +SetBooBallPos = .text:0x800A6828; // type:function size:0x60 scope:local BoardBooComUseCheck = .text:0x800A6888; // type:function size:0x1A8 BoardBooHouseTutorialExec = .text:0x800A6A30; // type:function size:0x3D4 BoardStartExec = .text:0x800A6E04; // type:function size:0x64 -fn_800A6E68 = .text:0x800A6E68; // type:function size:0x84 -fn_800A6EEC = .text:0x800A6EEC; // type:function size:0x400 -fn_800A72EC = .text:0x800A72EC; // type:function size:0x2FC -fn_800A75E8 = .text:0x800A75E8; // type:function size:0x17C -fn_800A7764 = .text:0x800A7764; // type:function size:0x2D8 -fn_800A7A3C = .text:0x800A7A3C; // type:function size:0x188 -fn_800A7BC4 = .text:0x800A7BC4; // type:function size:0x1C8 -fn_800A7D8C = .text:0x800A7D8C; // type:function size:0xEC -fn_800A7E78 = .text:0x800A7E78; // type:function size:0x1A8 -fn_800A8020 = .text:0x800A8020; // type:function size:0x454 -fn_800A8474 = .text:0x800A8474; // type:function size:0xD8 -fn_800A854C = .text:0x800A854C; // type:function size:0x250 -fn_800A879C = .text:0x800A879C; // type:function size:0xC8 -fn_800A8864 = .text:0x800A8864; // type:function size:0x3C -fn_800A88A0 = .text:0x800A88A0; // type:function size:0x6D4 -fn_800A8F74 = .text:0x800A8F74; // type:function size:0x318 -fn_800A928C = .text:0x800A928C; // type:function size:0xA4 -fn_800A9330 = .text:0x800A9330; // type:function size:0xDC -fn_800A940C = .text:0x800A940C; // type:function size:0x21C +DestroyStart = .text:0x800A6E68; // type:function size:0x84 scope:local +ExecStart = .text:0x800A6EEC; // type:function size:0x400 scope:local +ShowLogo = .text:0x800A72EC; // type:function size:0x2FC scope:local +FocusStart = .text:0x800A75E8; // type:function size:0x17C scope:local +CreatePlayerStart = .text:0x800A7764; // type:function size:0x2D8 scope:local +ExecPlayerStart = .text:0x800A7A3C; // type:function size:0x188 scope:local +PlayerFall = .text:0x800A7BC4; // type:function size:0x1C8 scope:local +PlayerWaitSpeak = .text:0x800A7D8C; // type:function size:0xEC scope:local +PlayerDiceFall = .text:0x800A7E78; // type:function size:0x1A8 scope:local +PlayerDiceRoll = .text:0x800A8020; // type:function size:0x454 scope:local +PlayerDiceNumShow = .text:0x800A8474; // type:function size:0xD8 scope:local +PlayerDiceNumHide = .text:0x800A854C; // type:function size:0x250 scope:local +SetPlayerStartState = .text:0x800A879C; // type:function size:0xC8 scope:local +GetPlayerStartState = .text:0x800A8864; // type:function size:0x3C scope:local +ExecStartRoll = .text:0x800A88A0; // type:function size:0x6D4 scope:local +InitCamera = .text:0x800A8F74; // type:function size:0x318 scope:local +InitHost = .text:0x800A928C; // type:function size:0xA4 scope:local +CreateTapWin = .text:0x800A9330; // type:function size:0xDC scope:local +OrderPlayers = .text:0x800A940C; // type:function size:0x21C scope:local BoardLast5Exec = .text:0x800A9628; // type:function size:0x84 -fn_800A96AC = .text:0x800A96AC; // type:function size:0x30 -fn_800A96DC = .text:0x800A96DC; // type:function size:0x1D4 -fn_800A98B0 = .text:0x800A98B0; // type:function size:0x184 -fn_800A9A34 = .text:0x800A9A34; // type:function size:0x48 -fn_800A9A7C = .text:0x800A9A7C; // type:function size:0x10C -fn_800A9B88 = .text:0x800A9B88; // type:function size:0xA4 -fn_800A9C2C = .text:0x800A9C2C; // type:function size:0xCC0 -fn_800AA8EC = .text:0x800AA8EC; // type:function size:0xA4 -fn_800AA990 = .text:0x800AA990; // type:function size:0x1FC -fn_800AAB8C = .text:0x800AAB8C; // type:function size:0xD4 -fn_800AAC60 = .text:0x800AAC60; // type:function size:0x170 -fn_800AADD0 = .text:0x800AADD0; // type:function size:0x88 -fn_800AAE58 = .text:0x800AAE58; // type:function size:0x20 -fn_800AAE78 = .text:0x800AAE78; // type:function size:0x24 -fn_800AAE9C = .text:0x800AAE9C; // type:function size:0x2D0 -fn_800AB16C = .text:0x800AB16C; // type:function size:0x1D8 -fn_800AB344 = .text:0x800AB344; // type:function size:0x950 -fn_800ABC94 = .text:0x800ABC94; // type:function size:0x4C -fn_800ABCE0 = .text:0x800ABCE0; // type:function size:0x488 -fn_800AC168 = .text:0x800AC168; // type:function size:0x2A4 -fn_800AC40C = .text:0x800AC40C; // type:function size:0x1C0 -fn_800AC5CC = .text:0x800AC5CC; // type:function size:0x7C -fn_800AC648 = .text:0x800AC648; // type:function size:0x78 -fn_800AC6C0 = .text:0x800AC6C0; // type:function size:0xB0 -fn_800AC770 = .text:0x800AC770; // type:function size:0x1CC -fn_800AC93C = .text:0x800AC93C; // type:function size:0x228 -fn_800ACB64 = .text:0x800ACB64; // type:function size:0x1C -fn_800ACB80 = .text:0x800ACB80; // type:function size:0xC0 -fn_800ACC40 = .text:0x800ACC40; // type:function size:0x180 -fn_800ACDC0 = .text:0x800ACDC0; // type:function size:0x2B0 -fn_800AD070 = .text:0x800AD070; // type:function size:0x44 -fn_800AD0B4 = .text:0x800AD0B4; // type:function size:0x38 -fn_800AD0EC = .text:0x800AD0EC; // type:function size:0x38 -fn_800AD124 = .text:0x800AD124; // type:function size:0x44 -fn_800AD168 = .text:0x800AD168; // type:function size:0x2B4 -fn_800AD41C = .text:0x800AD41C; // type:function size:0x340 -fn_800AD75C = .text:0x800AD75C; // type:function size:0x58 -fn_800AD7B4 = .text:0x800AD7B4; // type:function size:0x58 -fn_800AD80C = .text:0x800AD80C; // type:function size:0x38 -fn_800AD844 = .text:0x800AD844; // type:function size:0x260 +DestroyLast5 = .text:0x800A96AC; // type:function size:0x30 scope:local +ExecLast5 = .text:0x800A96DC; // type:function size:0x1D4 scope:local +CreateLast5 = .text:0x800A98B0; // type:function size:0x184 scope:local +KillLast5 = .text:0x800A9A34; // type:function size:0x48 scope:local +InitHost = .text:0x800A9A7C; // type:function size:0x10C scope:local +KillHost = .text:0x800A9B88; // type:function size:0xA4 scope:local +Last5Main = .text:0x800A9C2C; // type:function size:0xCC0 scope:local +CheckJump = .text:0x800AA8EC; // type:function size:0xA4 scope:local +CreateLotteryDrawWheel = .text:0x800AA990; // type:function size:0x1FC scope:local +CreateLotteryDraw = .text:0x800AAB8C; // type:function size:0xD4 scope:local +UpdateLotteryDraw = .text:0x800AAC60; // type:function size:0x170 scope:local +SetLotteryDrawState = .text:0x800AADD0; // type:function size:0x88 scope:local +GetLotteryDrawState = .text:0x800AAE58; // type:function size:0x20 scope:local +KillLotteryDrawWheel = .text:0x800AAE78; // type:function size:0x24 scope:local +UpdateLotteryDrawWheel = .text:0x800AAE9C; // type:function size:0x2D0 scope:local +SetLotteryDrawWheelState = .text:0x800AB16C; // type:function size:0x1D8 scope:local +ExecLotteryDraw = .text:0x800AB344; // type:function size:0x950 scope:local +KillLotteryTicket = .text:0x800ABC94; // type:function size:0x4C scope:local +InitLotteryTicket = .text:0x800ABCE0; // type:function size:0x488 scope:local +UpdateLotteryTicket = .text:0x800AC168; // type:function size:0x2A4 scope:local +SetLotteryTicketState = .text:0x800AC40C; // type:function size:0x1C0 scope:local +GetLotteryTicketPlayer = .text:0x800AC5CC; // type:function size:0x7C scope:local +CheckLotteryTicket = .text:0x800AC648; // type:function size:0x78 scope:local +UpdateLotteryTicketMatch = .text:0x800AC6C0; // type:function size:0xB0 scope:local +StartHostMove = .text:0x800AC770; // type:function size:0x1CC scope:local +ExecHostMove = .text:0x800AC93C; // type:function size:0x228 scope:local +CheckHostMove = .text:0x800ACB64; // type:function size:0x1C scope:local +CreateStopWin = .text:0x800ACB80; // type:function size:0xC0 scope:local +CreateLast5Roulette = .text:0x800ACC40; // type:function size:0x180 scope:local +UpdateLast5Roulette = .text:0x800ACDC0; // type:function size:0x2B0 scope:local +SetLast5RouletteFade = .text:0x800AD070; // type:function size:0x44 scope:local +SetLast5RouletteState = .text:0x800AD0B4; // type:function size:0x38 scope:local +GetLast5RouletteState = .text:0x800AD0EC; // type:function size:0x38 scope:local +GetLast5RouletteResult = .text:0x800AD124; // type:function size:0x44 scope:local +CreateTeamResult = .text:0x800AD168; // type:function size:0x2B4 scope:local +CreateTeamResultWork = .text:0x800AD41C; // type:function size:0x340 scope:local +SetTeamResultTarget = .text:0x800AD75C; // type:function size:0x58 scope:local +GetTeamResultTarget = .text:0x800AD7B4; // type:function size:0x58 scope:local +KillTeamResult = .text:0x800AD80C; // type:function size:0x38 scope:local +UpdateTeamResult = .text:0x800AD844; // type:function size:0x260 scope:local BoardPauseStart = .text:0x800ADAA4; // type:function size:0x88 -fn_800ADB2C = .text:0x800ADB2C; // type:function size:0x3C0 -fn_800ADEEC = .text:0x800ADEEC; // type:function size:0x108 -fn_800ADFF4 = .text:0x800ADFF4; // type:function size:0xABC -fn_800AEAB0 = .text:0x800AEAB0; // type:function size:0x168 -fn_800AEC18 = .text:0x800AEC18; // type:function size:0x58 -fn_800AEC70 = .text:0x800AEC70; // type:function size:0x4F4 -fn_800AF164 = .text:0x800AF164; // type:function size:0x310 -fn_800AF474 = .text:0x800AF474; // type:function size:0x264 -fn_800AF6D8 = .text:0x800AF6D8; // type:function size:0x110 -fn_800AF7E8 = .text:0x800AF7E8; // type:function size:0x48 -fn_800AF830 = .text:0x800AF830; // type:function size:0xD4 -fn_800AF904 = .text:0x800AF904; // type:function size:0x1CC -fn_800AFAD0 = .text:0x800AFAD0; // type:function size:0x178 -fn_800AFC48 = .text:0x800AFC48; // type:function size:0x238 -fn_800AFE80 = .text:0x800AFE80; // type:function size:0x3B0 -fn_800B0230 = .text:0x800B0230; // type:function size:0x154 -fn_800B0384 = .text:0x800B0384; // type:function size:0x390 -fn_800B0714 = .text:0x800B0714; // type:function size:0x3E4 -fn_800B0AF8 = .text:0x800B0AF8; // type:function size:0x240 -fn_800B0D38 = .text:0x800B0D38; // type:function size:0x210 -fn_800B0F48 = .text:0x800B0F48; // type:function size:0x70 -fn_800B0FB8 = .text:0x800B0FB8; // type:function size:0x1B8 -fn_800B1170 = .text:0x800B1170; // type:function size:0x12C -fn_800B129C = .text:0x800B129C; // type:function size:0x1A4 -fn_800B1440 = .text:0x800B1440; // type:function size:0x10C -fn_800B154C = .text:0x800B154C; // type:function size:0xDC +PauseExit = .text:0x800ADB2C; // type:function size:0x3C0 scope:local +PauseProcess = .text:0x800ADEEC; // type:function size:0x108 scope:local +CreatePauseScreen = .text:0x800ADFF4; // type:function size:0xABC scope:local +DeletePauseScreen = .text:0x800AEAB0; // type:function size:0x168 scope:local +SetBoxVisible = .text:0x800AEC18; // type:function size:0x58 scope:local +PauseConfigObjFunc = .text:0x800AEC70; // type:function size:0x4F4 scope:local +UpdatePauseText = .text:0x800AF164; // type:function size:0x310 scope:local +InitPauseQuit = .text:0x800AF474; // type:function size:0x264 scope:local +PauseQuitProcess = .text:0x800AF6D8; // type:function size:0x110 scope:local +DeletePauseQuit = .text:0x800AF7E8; // type:function size:0x48 scope:local +UpdatePadConfig = .text:0x800AF830; // type:function size:0xD4 scope:local +CreatePadConfig = .text:0x800AF904; // type:function size:0x1CC scope:local +ScrollInPadConfig = .text:0x800AFAD0; // type:function size:0x178 scope:local +CursorMovePadConfig = .text:0x800AFC48; // type:function size:0x238 scope:local +ChangeDiffPadConfig = .text:0x800AFE80; // type:function size:0x3B0 scope:local +ScrollOutPadConfig = .text:0x800B0230; // type:function size:0x154 scope:local +UpdatePauseBox = .text:0x800B0384; // type:function size:0x390 scope:local +UpdatePauseBoxExt = .text:0x800B0714; // type:function size:0x3E4 scope:local +ExecPauseConfig = .text:0x800B0AF8; // type:function size:0x240 scope:local +CreatePauseControlWin = .text:0x800B0D38; // type:function size:0x210 scope:local +DeletePauseControlWin = .text:0x800B0F48; // type:function size:0x70 scope:local +WaitPauseInput = .text:0x800B0FB8; // type:function size:0x1B8 scope:local +ShowPauseConfig = .text:0x800B1170; // type:function size:0x12C scope:local +CreatePadConfigSprite = .text:0x800B129C; // type:function size:0x1A4 scope:local +ShowPadConfigSprite = .text:0x800B1440; // type:function size:0x10C scope:local +PauseCreateNumber = .text:0x800B154C; // type:function size:0xDC scope:local BoardPauseActiveCheck = .text:0x800B1628; // type:function size:0x34 BoardPauseReqCheck = .text:0x800B165C; // type:function size:0x12C -fn_800B1788 = .text:0x800B1788; // type:function size:0x4C -fn_800B17D4 = .text:0x800B17D4; // type:function size:0xC0 -fn_800B1894 = .text:0x800B1894; // type:function size:0x60 -fn_800B18F4 = .text:0x800B18F4; // type:function size:0x180 -fn_800B1A74 = .text:0x800B1A74; // type:function size:0xE4 -fn_800B1B58 = .text:0x800B1B58; // type:function size:0xB4 -fn_800B1C0C = .text:0x800B1C0C; // type:function size:0xD0 -fn_800B1CDC = .text:0x800B1CDC; // type:function size:0x30 -fn_800B1D0C = .text:0x800B1D0C; // type:function size:0xAC -fn_800B1DB8 = .text:0x800B1DB8; // type:function size:0xF0 +CheckPort = .text:0x800B1788; // type:function size:0x4C scope:local +RotateBox = .text:0x800B17D4; // type:function size:0xC0 scope:local +SearchPathNodeSpace = .text:0x800B1894; // type:function size:0x60 scope:local +InitPathNode = .text:0x800B18F4; // type:function size:0x180 scope:local +FindChildNode = .text:0x800B1A74; // type:function size:0xE4 scope:local +GetNumValidLinks = .text:0x800B1B58; // type:function size:0xB4 scope:local +AddValidLinks = .text:0x800B1C0C; // type:function size:0xD0 scope:local +CheckPathSpace = .text:0x800B1CDC; // type:function size:0x30 scope:local +FindValidLink = .text:0x800B1D0C; // type:function size:0xAC scope:local +CheckEndSpace = .text:0x800B1DB8; // type:function size:0xF0 scope:local BoardComPathShortcutLenGet = .text:0x800B1EA8; // type:function size:0x74C BoardComPathBestGet = .text:0x800B25F4; // type:function size:0x3E4 BoardComPathLenGet = .text:0x800B29D8; // type:function size:0x65C -fn_800B3034 = .text:0x800B3034; // type:function size:0x488 +CheckPath = .text:0x800B3034; // type:function size:0x488 scope:local BoardComPathBestGetFlag = .text:0x800B34BC; // type:function size:0x45C -fn_800B3918 = .text:0x800B3918; // type:function size:0x4E0 -fn_800B3DF8 = .text:0x800B3DF8; // type:function size:0x34 +CheckPathFlag = .text:0x800B3918; // type:function size:0x4E0 scope:local +TutorialProcFunc = .text:0x800B3DF8; // type:function size:0x34 scope:local BoardTutorialInit = .text:0x800B3E2C; // type:function size:0x80 BoardTutorialKill = .text:0x800B3EAC; // type:function size:0x4C BoardTutorialHookSet = .text:0x800B3EF8; // type:function size:0x8 @@ -2035,7 +2035,7 @@ OSExceptionInit = .text:0x800B4800; // type:function size:0x280 scope:local __OSDBINTSTART = .text:0x800B4A80; // type:label scope:global __OSDBIntegrator = .text:0x800B4A80; // type:function size:0x24 scope:local __OSDBINTEND = .text:0x800B4AA4; // type:label scope:global -fn_800B4AA4 = .text:0x800B4AA4; // type:function size:0x4 +__OSDBJump = .text:0x800B4AA4; // type:function size:0x4 scope:local __OSDBJUMPEND = .text:0x800B4AA8; // type:label scope:global __OSSetExceptionHandler = .text:0x800B4AA8; // type:function size:0x1C scope:global __OSGetExceptionHandler = .text:0x800B4AC4; // type:function size:0x14 scope:global @@ -2046,7 +2046,7 @@ __OSEVSetNumber = .text:0x800B4B40; // type:label scope:global data:4byte __OSEVEnd = .text:0x800B4B70; // type:label scope:global OSDefaultExceptionHandler = .text:0x800B4B74; // type:function size:0x58 scope:global __OSPSInit = .text:0x800B4BCC; // type:function size:0x38 scope:global -fn_800B4C04 = .text:0x800B4C04; // type:function size:0x14 +__OSGetDIConfig = .text:0x800B4C04; // type:function size:0x14 OSInitAlarm = .text:0x800B4C18; // type:function size:0x4C scope:global OSCreateAlarm = .text:0x800B4C64; // type:function size:0xC scope:global InsertAlarm = .text:0x800B4C70; // type:function size:0x250 scope:local @@ -5306,43 +5306,63 @@ battleSprPrioTbl = .data:0x80157E20; // type:object size:0x16 scope:local jumptable_80157E38 = .data:0x80157E38; // type:object size:0x24 scope:local battleChanceTbl = .data:0x80157E5C; // type:object size:0x3C scope:local comPrizeMessTbl = .data:0x80157E98; // type:object size:0x18 scope:local -lbl_80157EB0 = .data:0x80157EB0; // type:object size:0xC0 -lbl_80157F70 = .data:0x80157F70; // type:object size:0x80 -lbl_80157FF0 = .data:0x80157FF0; // type:object size:0x18 +booPlayerMotTbl = .data:0x80157EB0; // type:object size:0xC0 scope:local +booSfxTbl = .data:0x80157F70; // type:object size:0x80 scope:local +hostMess = .data:0x80157FF0; // type:object size:0x18 scope:local lbl_80158008 = .data:0x80158008; // type:object size:0xC data:string -lbl_80158014 = .data:0x80158014; // type:object size:0x18 +ballBooMdl = .data:0x80158014; // type:object size:0x18 scope:local jumptable_8015802C = .data:0x8015802C; // type:object size:0x20 scope:local -lbl_8015804C = .data:0x8015804C; // type:object size:0x24 -lbl_80158070 = .data:0x80158070; // type:object size:0x18 -lbl_80158088 = .data:0x80158088; // type:object size:0x34 -lbl_801580BC = .data:0x801580BC; // type:object size:0x30 -lbl_801580EC = .data:0x801580EC; // type:object size:0x30 -lbl_8015811C = .data:0x8015811C; // type:object size:0x30 -lbl_8015814C = .data:0x8015814C; // type:object size:0x24 +stealSuccessTbl = .data:0x8015804C; // type:object size:0x24 scope:local +stealTbl = .data:0x80158070; // type:object size:0x12 scope:local +mgSetupSprTbl = .data:0x80158088; // type:object size:0x34 scope:local +statusLayout4P = .data:0x801580BC; // type:object size:0x30 scope:local +statusLayout1Vs3 = .data:0x801580EC; // type:object size:0x30 scope:local +statusLayout2Vs2 = .data:0x8015811C; // type:object size:0x30 scope:local +luckyMessTbl = .data:0x8015814C; // type:object size:0x24 scope:local jumptable_80158170 = .data:0x80158170; // type:object size:0x20 scope:local -lbl_801581C0 = .data:0x801581C0; // type:object size:0x90 -lbl_80158250 = .data:0x80158250; // type:object size:0x30 -lbl_80158280 = .data:0x80158280; // type:object size:0xC -lbl_8015828C = .data:0x8015828C; // type:object size:0x6C -lbl_801582F8 = .data:0x801582F8; // type:object size:0x10 data:4byte -lbl_80158308 = .data:0x80158308; // type:object size:0xC4 -lbl_801583CC = .data:0x801583CC; // type:object size:0x24 +cursorYTbl = .data:0x80158190; // type:object size:0x10 scope:local +hiliteYTbl = .data:0x801581A0; // type:object size:0x10 scope:local +hiliteColTbl = .data:0x801581B0; // type:object size:0xC scope:local +hostMesTbl = .data:0x801581C0; // type:object size:0x90 scope:local +houseMdlTbl = .data:0x80158250; // type:object size:0x30 scope:local +booMotTbl = .data:0x80158280; // type:object size:0xC scope:local +hostMotTbl = .data:0x8015828C; // type:object size:0x6C scope:local +playerStartObj = .data:0x801582F8; // type:object size:0x10 scope:local data:4byte +hitFX = .data:0x80158308; // type:object size:0x10 scope:local +startMesTbl = .data:0x80158318; // type:object size:0xB4 scope:local +logoSprTbl = .data:0x801583CC; // type:object size:0x24 scope:local jumptable_801583F0 = .data:0x801583F0; // type:object size:0x1C scope:local -lbl_8015840C = .data:0x8015840C; // type:object size:0x30 +digitMdlTbl = .data:0x8015840C; // type:object size:0x24 scope:local +playerOrderMesTbl = .data:0x80158430; // type:object size:0xC scope:local jumptable_8015843C = .data:0x8015843C; // type:object size:0x24 scope:local -lbl_80158460 = .data:0x80158460; // type:object size:0x120 -lbl_80158580 = .data:0x80158580; // type:object size:0x24 -lbl_801585A4 = .data:0x801585A4; // type:object size:0x28 -lbl_801585CC = .data:0x801585CC; // type:object size:0x1AC -lbl_80158778 = .data:0x80158778; // type:object size:0x10 data:2byte -lbl_80158788 = .data:0x80158788; // type:object size:0x40 data:float -lbl_801587C8 = .data:0x801587C8; // type:object size:0x74 +hostMotTbl = .data:0x80158460; // type:object size:0x120 scope:local +messBaseTbl = .data:0x80158580; // type:object size:0x24 scope:local +playerOfsTbl = .data:0x801585A4; // type:object size:0x18 scope:local +plateObjNameTbl = .data:0x801585BC; // type:object size:0x10 scope:local +hiliteObjNameTbl = .data:0x801585CC; // type:object size:0x10 scope:local +faceObjNameTbl = .data:0x801585DC; // type:object size:0x10 scope:local +resultRankFX12Tbl = .data:0x801585EC; // type:object size:0x20 scope:local +resultRankFX3Tbl = .data:0x8015860C; // type:object size:0x20 scope:local +resultRankFX4Tbl = .data:0x8015862C; // type:object size:0x20 scope:local +impactFXTbl = .data:0x8015864C; // type:object size:0x20 scope:local +lotteryWheelMdlTbl = .data:0x8015866C; // type:object size:0x20 scope:local +teamSprPrioTbl = .data:0x8015868C; // type:object size:0x1E scope:local +teamSprTbl = .data:0x801586AC; // type:object size:0x34 scope:local +teamSprPosTbl = .data:0x801586E0; // type:object size:0x78 scope:local +teamCharSprTbl = .data:0x80158758; // type:object size:0x20 scope:local +boxModelID = .data:0x80158778; // type:object size:0x10 scope:local data:2byte +boxPosTbl = .data:0x80158788; // type:object size:0x40 scope:local data:float +padConfigPosTbl = .data:0x801587C8; // type:object size:0x20 scope:local +boardLogoTbl = .data:0x801587E8; // type:object size:0x24 scope:local +turnDigitPosTbl = .data:0x8015880C; // type:object size:0x10 scope:local +boxMdlTbl = .data:0x8015881C; // type:object size:0x20 scope:local jumptable_8015883C = .data:0x8015883C; // type:object size:0x20 scope:local jumptable_8015885C = .data:0x8015885C; // type:object size:0x20 scope:local jumptable_8015887C = .data:0x8015887C; // type:object size:0x20 scope:local lbl_801588A0 = .data:0x801588A0; // type:object size:0x24 data:string lbl_801588C4 = .data:0x801588C4; // type:object size:0x24 data:string @84 = .data:0x801588E8; // type:object size:0x1E scope:local data:string +__OSExceptionLocations = .data:0x801589D0; // type:object size:0x3C scope:local lbl_80158AA8 = .data:0x80158AA8; // type:object size:0x398 DSPInitCode = .data:0x80158E40; // type:object size:0x80 scope:local @69 = .data:0x80158EC0; // type:object size:0x29 scope:local data:string @@ -5600,23 +5620,26 @@ bowserEvent = .bss:0x801C1FB8; // type:object size:0x16 scope:local battleMGList = .bss:0x801C1FD0; // type:object size:0x10 scope:local data:2byte camPosFortune = .bss:0x801C1FE0; // type:object size:0xC scope:local data:4byte camTargetFortune = .bss:0x801C1FEC; // type:object size:0xC scope:local data:float -lbl_801C1FF8 = .bss:0x801C1FF8; // type:object size:0x20 data:2byte -lbl_801C2018 = .bss:0x801C2018; // type:object size:0x40 data:2byte -lbl_801C2058 = .bss:0x801C2058; // type:object size:0x10 -lbl_801C2068 = .bss:0x801C2068; // type:object size:0x10 data:2byte -lbl_801C2078 = .bss:0x801C2078; // type:object size:0xC data:float -lbl_801C2084 = .bss:0x801C2084; // type:object size:0xC data:float -lbl_801C2090 = .bss:0x801C2090; // type:object size:0xC data:float -lbl_801C209C = .bss:0x801C209C; // type:object size:0xC data:float -lbl_801C20A8 = .bss:0x801C20A8; // type:object size:0xC -lbl_801C20B4 = .bss:0x801C20B4; // type:object size:0x10 data:2byte -lbl_801C20C4 = .bss:0x801C20C4; // type:object size:0x14 data:4byte -lbl_801C20D8 = .bss:0x801C20D8; // type:object size:0x20 -lbl_801C20F8 = .bss:0x801C20F8; // type:object size:0x10 data:float -lbl_801C2108 = .bss:0x801C2108; // type:object size:0x500 data:byte -lbl_801C2608 = .bss:0x801C2608; // type:object size:0x80 +activeMG = .bss:0x801C1FF8; // type:object size:0x20 scope:local data:2byte +mgListAll = .bss:0x801C2018; // type:object size:0x40 scope:local data:2byte +mgPlay4P = .bss:0x801C2058; // type:object size:0x10 scope:local +houseMdl = .bss:0x801C2068; // type:object size:0xC scope:local data:2byte +spacePos = .bss:0x801C2078; // type:object size:0xC scope:local data:float +camStartFocusPos = .bss:0x801C2084; // type:object size:0xC scope:local data:float +spacePos = .bss:0x801C2090; // type:object size:0xC scope:local data:float +focusPos = .bss:0x801C209C; // type:object size:0xC scope:local data:float +hostPos = .bss:0x801C20A8; // type:object size:0xC scope:local +hostMot = .bss:0x801C20B4; // type:object size:0x10 scope:local data:2byte +lotteryTicketObj = .bss:0x801C20C4; // type:object size:0x10 scope:local data:4byte +boxRot = .bss:0x801C20D8; // type:object size:0x20 scope:local +padBoxPos = .bss:0x801C20F8; // type:object size:0xC scope:local data:float +pathNodeData = .bss:0x801C2108; // type:object size:0x500 scope:local data:byte +candidateNodes = .bss:0x801C2608; // type:object size:0x40 scope:local +startPathSpaceSearch = .bss:0x801C2648; // type:object size:0x20 scope:local +startPathSpace = .bss:0x801C2668; // type:object size:0x20 scope:local boardTutorialData = .bss:0x801C2688; // type:object size:0x10 data:4byte -DriveInfo = .bss:0x801C26A0; // type:object size:0x20 scope:local +DriveInfo = .bss:0x801C26A0; // type:object size:0x20 scope:local align:32 +DriveBlock = .bss:0x801C26C0; // type:object size:0x30 scope:local __OSErrorTable = .bss:0x801C26F0; // type:object size:0x40 scope:global lbl_801C2740 = .bss:0x801C2740; // type:object size:0x20 Scb = .bss:0x801C2760; // type:object size:0x54 scope:local data:4byte @@ -5919,17 +5942,17 @@ lbl_801F0B60 = .sdata:0x801F0B60; // type:object size:0x3 data:string lbl_801F0B63 = .sdata:0x801F0B63; // type:object size:0x8 data:string lbl_801F0B70 = .sdata:0x801F0B70; // type:object size:0x8 lbl_801F0B78 = .sdata:0x801F0B78; // type:object size:0x8 -lbl_801F0B80 = .sdata:0x801F0B80; // type:object size:0x8 +ballMdlTbl = .sdata:0x801F0B80; // type:object size:0x8 scope:local lbl_801F0B88 = .sdata:0x801F0B88; // type:object size:0x8 -lbl_801F0B90 = .sdata:0x801F0B90; // type:object size:0x1 data:byte -lbl_801F0B91 = .sdata:0x801F0B91; // type:object size:0x7 data:byte -lbl_801F0B98 = .sdata:0x801F0B98; // type:object size:0x2 data:2byte -lbl_801F0B9A = .sdata:0x801F0B9A; // type:object size:0x2 data:2byte -lbl_801F0B9C = .sdata:0x801F0B9C; // type:object size:0x2 data:2byte -lbl_801F0B9E = .sdata:0x801F0B9E; // type:object size:0x2 data:2byte -lbl_801F0BA0 = .sdata:0x801F0BA0; // type:object size:0x2 data:2byte -lbl_801F0BA2 = .sdata:0x801F0BA2; // type:object size:0x2 data:2byte -lbl_801F0BA4 = .sdata:0x801F0BA4; // type:object size:0x6 data:2byte +luckyValue = .sdata:0x801F0B90; // type:object size:0x1 scope:local data:byte +cursorPos = .sdata:0x801F0B91; // type:object size:0x1 scope:local data:byte +houseShowMot = .sdata:0x801F0B98; // type:object size:0x2 scope:local data:2byte +houseHideMot = .sdata:0x801F0B9A; // type:object size:0x2 scope:local data:2byte +ballMdl = .sdata:0x801F0B9C; // type:object size:0x2 scope:local data:2byte +booMdl = .sdata:0x801F0B9E; // type:object size:0x2 scope:local data:2byte +smokeMdl = .sdata:0x801F0BA0; // type:object size:0x2 scope:local data:2byte +hostMdl = .sdata:0x801F0BA2; // type:object size:0x2 scope:local data:2byte +hostMot = .sdata:0x801F0BA4; // type:object size:0x6 scope:local data:2byte lbl_801F0BAA = .sdata:0x801F0BAA; // type:object size:0x7 data:string lbl_801F0BB1 = .sdata:0x801F0BB1; // type:object size:0x7 data:string lbl_801F0BB8 = .sdata:0x801F0BB8; // type:object size:0x7 data:string @@ -5938,18 +5961,18 @@ lbl_801F0BC6 = .sdata:0x801F0BC6; // type:object size:0x7 data:string lbl_801F0BCD = .sdata:0x801F0BCD; // type:object size:0x6 data:string lbl_801F0BD3 = .sdata:0x801F0BD3; // type:object size:0x7 data:string lbl_801F0BDA = .sdata:0x801F0BDA; // type:object size:0x6 data:string -lbl_801F0BE0 = .sdata:0x801F0BE0; // type:object size:0x8 -lbl_801F0BE8 = .sdata:0x801F0BE8; // type:object size:0x2 data:2byte -lbl_801F0BEA = .sdata:0x801F0BEA; // type:object size:0x2 data:2byte -lbl_801F0BEC = .sdata:0x801F0BEC; // type:object size:0x2 data:2byte -lbl_801F0BEE = .sdata:0x801F0BEE; // type:object size:0x2 data:2byte -lbl_801F0BF0 = .sdata:0x801F0BF0; // type:object size:0x4 data:4byte -lbl_801F0BF4 = .sdata:0x801F0BF4; // type:object size:0x4 -lbl_801F0BF8 = .sdata:0x801F0BF8; // type:object size:0x2 data:2byte -lbl_801F0BFA = .sdata:0x801F0BFA; // type:object size:0x2 data:2byte -lbl_801F0BFC = .sdata:0x801F0BFC; // type:object size:0x2 data:2byte -lbl_801F0BFE = .sdata:0x801F0BFE; // type:object size:0x2 data:2byte -lbl_801F0C00 = .sdata:0x801F0C00; // type:object size:0x4 data:4byte +lbl_801F0BE0 = .sdata:0x801F0BE0; // type:object size:0x3 data:string +logoSprGrp = .sdata:0x801F0BE8; // type:object size:0x2 scope:local data:2byte +logoSpr = .sdata:0x801F0BEA; // type:object size:0x2 scope:local data:2byte +camFocus = .sdata:0x801F0BEC; // type:object size:0x2 scope:local data:2byte +tapWin = .sdata:0x801F0BEE; // type:object size:0x2 scope:local data:2byte +streamStatus = .sdata:0x801F0BF0; // type:object size:0x4 scope:local data:4byte +tutorialRollTbl = .sdata:0x801F0BF4; // type:object size:0x4 scope:local +stopWin = .sdata:0x801F0BF8; // type:object size:0x2 scope:local data:2byte +wheelMdl = .sdata:0x801F0BFA; // type:object size:0x2 scope:local data:2byte +lbl_801D3854 = .sdata:0x801F0BFC; // type:object size:0x2 data:2byte +focusMdl = .sdata:0x801F0BFE; // type:object size:0x2 scope:local data:2byte +messBase = .sdata:0x801F0C00; // type:object size:0x4 scope:local data:4byte lbl_801F0C04 = .sdata:0x801F0C04; // type:object size:0x6 data:string lbl_801F0C0A = .sdata:0x801F0C0A; // type:object size:0x7 data:string lbl_801F0C11 = .sdata:0x801F0C11; // type:object size:0x7 data:string @@ -5962,14 +5985,14 @@ lbl_801F0C36 = .sdata:0x801F0C36; // type:object size:0x4 data:string lbl_801F0C3A = .sdata:0x801F0C3A; // type:object size:0x5 data:string lbl_801F0C3F = .sdata:0x801F0C3F; // type:object size:0x5 data:string lbl_801F0C44 = .sdata:0x801F0C44; // type:object size:0xC -lbl_801F0C50 = .sdata:0x801F0C50; // type:object size:0x1 data:byte -lbl_801F0C52 = .sdata:0x801F0C52; // type:object size:0x2 data:2byte -lbl_801F0C54 = .sdata:0x801F0C54; // type:object size:0x2 data:2byte -lbl_801F0C56 = .sdata:0x801F0C56; // type:object size:0x2 data:2byte -lbl_801F0C58 = .sdata:0x801F0C58; // type:object size:0x2 data:2byte -lbl_801F0C5A = .sdata:0x801F0C5A; // type:object size:0x2 data:2byte -lbl_801F0C5C = .sdata:0x801F0C5C; // type:object size:0x2 data:2byte -lbl_801F0C5E = .sdata:0x801F0C5E; // type:object size:0x2 data:2byte +pausePad = .sdata:0x801F0C50; // type:object size:0x1 scope:local data:byte +pauseSprGrp = .sdata:0x801F0C52; // type:object size:0x2 scope:local data:2byte +padConfigSprGrp = .sdata:0x801F0C54; // type:object size:0x2 scope:local data:2byte +pauseCursorPos = .sdata:0x801F0C56; // type:object size:0x2 scope:local data:2byte +settingsControlWin = .sdata:0x801F0C58; // type:object size:0x2 scope:local data:2byte +controlWin = .sdata:0x801F0C5A; // type:object size:0x2 scope:local data:2byte +quitWin = .sdata:0x801F0C5C; // type:object size:0x2 scope:local data:2byte +settingsWin = .sdata:0x801F0C5E; // type:object size:0x2 scope:local data:2byte __OSCurrHeap = .sdata:0x801F0C60; // type:object size:0x8 data:4byte __OSArenaLo = .sdata:0x801F0C68; // type:object size:0x4 scope:local data:4byte @32 = .sdata:0x801F0C70; // type:object size:0x2 scope:local data:string @@ -6518,79 +6541,79 @@ comPrize = .sbss:0x801F1562; // type:object size:0x1 scope:local data:byte comPlayer1 = .sbss:0x801F1563; // type:object size:0x1 scope:local data:byte comPlayer2 = .sbss:0x801F1564; // type:object size:0x1 scope:local data:byte currPlayer = .sbss:0x801F1565; // type:object size:0x1 scope:local data:byte -lbl_801F1568 = .sbss:0x801F1568; // type:object size:0x4 data:4byte -lbl_801F156C = .sbss:0x801F156C; // type:object size:0x4 data:4byte -lbl_801F1570 = .sbss:0x801F1570; // type:object size:0x4 data:4byte -lbl_801F1574 = .sbss:0x801F1574; // type:object size:0x4 data:4byte -lbl_801F1578 = .sbss:0x801F1578; // type:object size:0x4 data:4byte -lbl_801F157C = .sbss:0x801F157C; // type:object size:0x4 data:4byte -lbl_801F1580 = .sbss:0x801F1580; // type:object size:0x4 data:4byte -lbl_801F1584 = .sbss:0x801F1584; // type:object size:0x4 data:4byte -lbl_801F1588 = .sbss:0x801F1588; // type:object size:0x3 -lbl_801F158B = .sbss:0x801F158B; // type:object size:0x3 -lbl_801F158E = .sbss:0x801F158E; // type:object size:0x1 data:byte -lbl_801F158F = .sbss:0x801F158F; // type:object size:0x1 data:byte -lbl_801F1590 = .sbss:0x801F1590; // type:object size:0x1 data:byte -lbl_801F1594 = .sbss:0x801F1594; // type:object size:0x4 data:4byte -lbl_801F1598 = .sbss:0x801F1598; // type:object size:0x1 data:byte -lbl_801F1599 = .sbss:0x801F1599; // type:object size:0x1 data:byte -lbl_801F159A = .sbss:0x801F159A; // type:object size:0x6 data:byte -lbl_801F15A0 = .sbss:0x801F15A0; // type:object size:0x4 data:4byte -lbl_801F15A4 = .sbss:0x801F15A4; // type:object size:0x4 data:4byte -lbl_801F15A8 = .sbss:0x801F15A8; // type:object size:0x1 data:byte -lbl_801F15A9 = .sbss:0x801F15A9; // type:object size:0x1 data:byte -lbl_801F15AA = .sbss:0x801F15AA; // type:object size:0x1 data:byte -lbl_801F15AC = .sbss:0x801F15AC; // type:object size:0x4 -lbl_801F15B0 = .sbss:0x801F15B0; // type:object size:0x6 -lbl_801F15B6 = .sbss:0x801F15B6; // type:object size:0x6 -lbl_801F15BC = .sbss:0x801F15BC; // type:object size:0x1 data:byte -lbl_801F15BD = .sbss:0x801F15BD; // type:object size:0x1 data:byte -lbl_801F15BE = .sbss:0x801F15BE; // type:object size:0x1 data:byte -lbl_801F15BF = .sbss:0x801F15BF; // type:object size:0x1 data:byte -lbl_801F15C0 = .sbss:0x801F15C0; // type:object size:0x2 data:2byte -lbl_801F15C4 = .sbss:0x801F15C4; // type:object size:0x4 data:float -lbl_801F15C8 = .sbss:0x801F15C8; // type:object size:0x4 data:4byte -lbl_801F15CC = .sbss:0x801F15CC; // type:object size:0x1 data:byte -lbl_801F15D0 = .sbss:0x801F15D0; // type:object size:0x4 data:4byte -lbl_801F15D4 = .sbss:0x801F15D4; // type:object size:0x8 -lbl_801F15DC = .sbss:0x801F15DC; // type:object size:0x4 data:4byte -lbl_801F15E0 = .sbss:0x801F15E0; // type:object size:0x1 data:byte -lbl_801F15E1 = .sbss:0x801F15E1; // type:object size:0x1 data:byte -lbl_801F15E2 = .sbss:0x801F15E2; // type:object size:0x6 data:byte -lbl_801F15E8 = .sbss:0x801F15E8; // type:object size:0x4 data:4byte -lbl_801F15EC = .sbss:0x801F15EC; // type:object size:0x4 -lbl_801F15F0 = .sbss:0x801F15F0; // type:object size:0x4 -lbl_801F15F4 = .sbss:0x801F15F4; // type:object size:0x2 data:2byte -lbl_801F15F6 = .sbss:0x801F15F6; // type:object size:0x2 data:2byte -lbl_801F15F8 = .sbss:0x801F15F8; // type:object size:0x4 data:4byte -lbl_801F15FC = .sbss:0x801F15FC; // type:object size:0x4 data:4byte -lbl_801F1600 = .sbss:0x801F1600; // type:object size:0x4 data:4byte -lbl_801F1604 = .sbss:0x801F1604; // type:object size:0x4 data:4byte -lbl_801F1608 = .sbss:0x801F1608; // type:object size:0x4 data:4byte -lbl_801F160C = .sbss:0x801F160C; // type:object size:0x4 data:4byte -lbl_801F1610 = .sbss:0x801F1610; // type:object size:0x2 data:2byte -lbl_801F1612 = .sbss:0x801F1612; // type:object size:0x2 data:2byte -lbl_801F1614 = .sbss:0x801F1614; // type:object size:0x1 data:byte -lbl_801F1615 = .sbss:0x801F1615; // type:object size:0x1 data:byte -lbl_801F1616 = .sbss:0x801F1616; // type:object size:0x1 data:byte -lbl_801F1618 = .sbss:0x801F1618; // type:object size:0x4 data:4byte -lbl_801F161C = .sbss:0x801F161C; // type:object size:0x4 data:4byte -lbl_801F1620 = .sbss:0x801F1620; // type:object size:0x4 data:4byte -lbl_801F1624 = .sbss:0x801F1624; // type:object size:0x8 -lbl_801F162C = .sbss:0x801F162C; // type:object size:0x1 data:byte -lbl_801F162E = .sbss:0x801F162E; // type:object size:0x2 data:2byte -lbl_801F1630 = .sbss:0x801F1630; // type:object size:0x1 data:byte -lbl_801F1631 = .sbss:0x801F1631; // type:object size:0x1 data:byte -lbl_801F1632 = .sbss:0x801F1632; // type:object size:0x6 data:byte -lbl_801F1638 = .sbss:0x801F1638; // type:object size:0x2 data:2byte -lbl_801F163A = .sbss:0x801F163A; // type:object size:0x6 data:2byte -lbl_801F1640 = .sbss:0x801F1640; // type:object size:0x4 data:4byte -lbl_801F1644 = .sbss:0x801F1644; // type:object size:0x4 data:4byte -lbl_801F1648 = .sbss:0x801F1648; // type:object size:0x4 data:4byte -lbl_801F164C = .sbss:0x801F164C; // type:object size:0x4 data:4byte -lbl_801F1650 = .sbss:0x801F1650; // type:object size:0x4 data:4byte +booEventObj = .sbss:0x801F1568; // type:object size:0x4 scope:local data:4byte +ballObj = .sbss:0x801F156C; // type:object size:0x4 scope:local data:4byte +ballCameraObj = .sbss:0x801F1570; // type:object size:0x4 scope:local data:4byte +ballBooObj = .sbss:0x801F1574; // type:object size:0x4 scope:local data:4byte +ballPlayerObj = .sbss:0x801F1578; // type:object size:0x4 scope:local data:4byte +ballTakeCoinObj = .sbss:0x801F157C; // type:object size:0x4 scope:local data:4byte +attackTimer = .sbss:0x801F1580; // type:object size:0x4 scope:local data:4byte +battleTimer = .sbss:0x801F1584; // type:object size:0x4 scope:local data:4byte +starChoiceEnable = .sbss:0x801F1588; // type:object size:0x3 scope:local +stealAvail = .sbss:0x801F158B; // type:object size:0x3 scope:local +punchCount = .sbss:0x801F158E; // type:object size:0x1 scope:local data:byte +stealSuccess = .sbss:0x801F158F; // type:object size:0x1 scope:local data:byte +stealValue = .sbss:0x801F1590; // type:object size:0x1 scope:local data:byte +booKillF = .sbss:0x801F1594; // type:object size:0x4 scope:local data:4byte +stealType = .sbss:0x801F1598; // type:object size:0x1 scope:local data:byte +stealTarget = .sbss:0x801F1599; // type:object size:0x1 scope:local data:byte +lbl_801D41E2 = .sbss:0x801F159A; // type:object size:0x1 data:byte +mgSetupProc = .sbss:0x801F15A0; // type:object size:0x4 scope:local data:4byte +mgSetupObj = .sbss:0x801F15A4; // type:object size:0x4 scope:local data:4byte +hiliteShowF = .sbss:0x801F15A8; // type:object size:0x1 scope:local data:byte +hiliteBlinkLen = .sbss:0x801F15A9; // type:object size:0x1 scope:local data:byte +hiliteTimer = .sbss:0x801F15AA; // type:object size:0x1 scope:local data:byte +mgPlayBattle = .sbss:0x801F15AC; // type:object size:0x4 scope:local +mgPlay2Vs2 = .sbss:0x801F15B0; // type:object size:0x6 scope:local +mgPlay1Vs3 = .sbss:0x801F15B6; // type:object size:0x6 scope:local +mgPlayBattleLen = .sbss:0x801F15BC; // type:object size:0x1 scope:local data:byte +mgPlay2Vs2Len = .sbss:0x801F15BD; // type:object size:0x1 scope:local data:byte +mgPlay1Vs3Len = .sbss:0x801F15BE; // type:object size:0x1 scope:local data:byte +mgPlay4PLen = .sbss:0x801F15BF; // type:object size:0x1 scope:local data:byte +mgNext = .sbss:0x801F15C0; // type:object size:0x2 scope:local data:2byte +hilitePos = .sbss:0x801F15C4; // type:object size:0x4 scope:local data:float +luckyF = .sbss:0x801F15C8; // type:object size:0x4 scope:local data:4byte +mgType = .sbss:0x801F15CC; // type:object size:0x1 scope:local data:byte +houseProc = .sbss:0x801F15D0; // type:object size:0x4 scope:local data:4byte +stealAmountStr = .sbss:0x801F15D4; // type:object size:0x8 scope:local +comCoinStealTarget = .sbss:0x801F15DC; // type:object size:0x4 scope:local data:4byte +comStarStealTarget = .sbss:0x801F15E0; // type:object size:0x1 scope:local data:byte +stealTarget = .sbss:0x801F15E1; // type:object size:0x1 scope:local data:byte +currPlayer = .sbss:0x801F15E2; // type:object size:0x1 scope:local data:byte +startProc = .sbss:0x801F15E8; // type:object size:0x4 scope:local data:4byte +playerOrderOld = .sbss:0x801F15EC; // type:object size:0x4 scope:local +playerOrderNew = .sbss:0x801F15F0; // type:object size:0x4 scope:local +startSpace = .sbss:0x801F15F4; // type:object size:0x2 scope:local data:2byte +hostMdl = .sbss:0x801F15F6; // type:object size:0x2 scope:local data:2byte +lotteryDrawWheelObj = .sbss:0x801F15F8; // type:object size:0x4 scope:local data:4byte +lotteryDrawObj = .sbss:0x801F15FC; // type:object size:0x4 scope:local data:4byte +hostMoveObj = .sbss:0x801F1600; // type:object size:0x4 scope:local data:4byte +teamResultObj = .sbss:0x801F1604; // type:object size:0x4 scope:local data:4byte +last5Proc = .sbss:0x801F1608; // type:object size:0x4 scope:local data:4byte +last5RouletteObj = .sbss:0x801F160C; // type:object size:0x4 scope:local data:4byte +hostMdl = .sbss:0x801F1610; // type:object size:0x2 scope:local data:2byte +last5Space = .sbss:0x801F1612; // type:object size:0x2 scope:local data:2byte +last5Player = .sbss:0x801F1614; // type:object size:0x1 scope:local data:byte +numTickets = .sbss:0x801F1615; // type:object size:0x1 scope:local data:byte +currTicket = .sbss:0x801F1616; // type:object size:0x1 scope:local data:byte +mainProcess = .sbss:0x801F1618; // type:object size:0x4 scope:local data:4byte +quitProcess = .sbss:0x801F161C; // type:object size:0x4 scope:local data:4byte +configObj = .sbss:0x801F1620; // type:object size:0x4 scope:local data:4byte +boxState = .sbss:0x801F1624; // type:object size:0x8 scope:local +cursorPos = .sbss:0x801F162C; // type:object size:0x1 scope:local data:byte +hostMdl = .sbss:0x801F162E; // type:object size:0x2 scope:local data:2byte +hostOldLayer = .sbss:0x801F1630; // type:object size:0x1 scope:local data:byte +mainScreenF = .sbss:0x801F1631; // type:object size:0x1 scope:local data:byte +pauseQuitF = .sbss:0x801F1632; // type:object size:0x1 scope:local data:byte +childNodeCnt = .sbss:0x801F1638; // type:object size:0x2 scope:local data:2byte +numCandidates = .sbss:0x801F163A; // type:object size:0x2 scope:local data:2byte +gameStatCopy = .sbss:0x801F1640; // type:object size:0x4 scope:local data:4byte +systemCopy = .sbss:0x801F1644; // type:object size:0x4 scope:local data:4byte +playerCopy = .sbss:0x801F1648; // type:object size:0x4 scope:local data:4byte +playerCfgCopy = .sbss:0x801F164C; // type:object size:0x4 scope:local data:4byte +tutorialProcess = .sbss:0x801F1650; // type:object size:0x4 scope:local data:4byte boardTutorialF = .sbss:0x801F1654; // type:object size:0x1 data:byte -lbl_801F1656 = .sbss:0x801F1656; // type:object size:0x2 data:2byte +hostMdl = .sbss:0x801F1656; // type:object size:0x2 scope:local data:2byte boardTutorialUseItem = .sbss:0x801F1658; // type:object size:0x1 data:byte boardTutorialBlockF = .sbss:0x801F1659; // type:object size:0x1 data:byte boardTutorialBlockItem = .sbss:0x801F165A; // type:object size:0x1 data:byte @@ -6598,7 +6621,7 @@ boardTutorialBlockPos = .sbss:0x801F165C; // type:object size:0x4 data:4byte boardTutorialDirInputTime = .sbss:0x801F1660; // type:object size:0x2 data:2byte boardTutorialDirInputY = .sbss:0x801F1662; // type:object size:0x1 data:byte boardTutorialDirInputX = .sbss:0x801F1663; // type:object size:0x1 data:byte -lbl_801F1664 = .sbss:0x801F1664; // type:object size:0x4 data:4byte +tutorialHook = .sbss:0x801F1664; // type:object size:0x4 scope:local data:4byte BootInfo = .sbss:0x801F1668; // type:object size:0x4 scope:local data:4byte BI2DebugFlag = .sbss:0x801F166C; // type:object size:0x4 scope:local data:4byte BI2DebugFlagHolder = .sbss:0x801F1670; // type:object size:0x4 scope:local data:4byte diff --git a/configure.py b/configure.py index 1d2efd07..3dede393 100644 --- a/configure.py +++ b/configure.py @@ -444,14 +444,14 @@ config.libs = [ Object(Matching, "game/board/bowser.c"), Object(Matching, "game/board/battle.c"), Object(Matching, "game/board/fortune.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "game/board/boo.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "game/board/mg_setup.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "game/board/boo_house.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "game/board/start.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "game/board/last5.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "game/board/pause.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "game/board/com_path.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "game/board/tutorial.c"), + Object(Matching, "game/board/boo.c"), + Object(Matching, "game/board/mg_setup.c"), + Object(Matching, "game/board/boo_house.c"), + Object(Matching, "game/board/start.c"), + Object(Matching, "game/board/last5.c"), + Object(Matching, "game/board/pause.c"), + Object(Matching, "game/board/com_path.c"), + Object(Matching, "game/board/tutorial.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "game/kerent.c"), ], }, @@ -464,7 +464,7 @@ config.libs = [ DolphinLib( "os", [ - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "dolphin/os/OS.c"), + Object(Matching, "dolphin/os/OS.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "dolphin/os/OSAlarm.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "dolphin/os/OSAlloc.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "dolphin/os/OSArena.c"), @@ -486,7 +486,7 @@ config.libs = [ Object(MatchingFor("GMPE01_00", "GMPE01_01"), "dolphin/os/OSSync.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "dolphin/os/OSThread.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "dolphin/os/OSTime.c"), - Object(MatchingFor("GMPE01_00", "GMPE01_01"), "dolphin/os/__start.c"), + Object(Matching, "dolphin/os/__start.c"), Object(MatchingFor("GMPE01_00", "GMPE01_01"), "dolphin/os/__ppc_eabi_init.c"), ], ), diff --git a/src/game/board/boo.c b/src/game/board/boo.c index dc546aeb..56dff9ce 100755 --- a/src/game/board/boo.c +++ b/src/game/board/boo.c @@ -1335,7 +1335,7 @@ static void TakeBallCoinPosSet(BallTakeCoinData *arg0, Vec *arg1) { BoardModelPosSetV(arg0->unk00, &arg0->unk04); } -BOOL CheckBallCoinDone(void) { +static BOOL CheckBallCoinDone(void) { BallTakeCoinData *var_r31; s32 i; @@ -1351,7 +1351,7 @@ BOOL CheckBallCoinDone(void) { return TRUE; } -void TakeBallStar(void) { +static void TakeBallStar(void) { BallTakeCoinWork *temp_r31; Vec sp8; @@ -1376,7 +1376,7 @@ void TakeBallStar(void) { HuAudFXPlay(0x361); } -void ExecTakeBallStar(omObjData *arg0) { +static void ExecTakeBallStar(omObjData *arg0) { BallTakeCoinWork *temp_r29 = OM_GET_WORK_PTR(arg0, BallTakeCoinWork); Vec sp8; float var_f30; @@ -1405,7 +1405,7 @@ void ExecTakeBallStar(omObjData *arg0) { BoardModelRotYSet(temp_r29->unk02, arg0->rot.y); } -BOOL CheckTakeBallStarDone(void) { +static BOOL CheckTakeBallStarDone(void) { if (ballTakeCoinObj) { return FALSE; } else {