From 270e67e011530bec2d461297d5674c793a2620a8 Mon Sep 17 00:00:00 2001 From: gamemasterplc Date: Thu, 18 Jan 2024 11:29:30 -0600 Subject: [PATCH] Label most of rest of board code start.c and last5.c are still unabled. --- config/GMPE01_00/symbols.txt | 527 ++++++++++++++++++----------------- include/board_unsplit.h | 6 +- src/REL/w03Dll/main.c | 2 +- src/REL/w10Dll/main.c | 2 +- src/REL/w10Dll/scene.c | 6 +- src/REL/w10Dll/tutorial.c | 4 +- src/game/board/main.c | 12 +- 7 files changed, 281 insertions(+), 278 deletions(-) diff --git a/config/GMPE01_00/symbols.txt b/config/GMPE01_00/symbols.txt index a0bcd3b7..f4e353fd 100644 --- a/config/GMPE01_00/symbols.txt +++ b/config/GMPE01_00/symbols.txt @@ -1315,18 +1315,18 @@ BoardWinPortraitGetStar = .text:0x800709C8; // type:function size:0x38 BoardWinPlayerSet = .text:0x80070A00; // type:function size:0x168 BoardWinStartComKeySet = .text:0x80070B68; // type:function size:0x214 BoardWinComKeyFuncSet = .text:0x80070D7C; // type:function size:0x8 -fn_80070D84 = .text:0x80070D84; // type:function size:0x68 -fn_80070DEC = .text:0x80070DEC; // type:function size:0xD0 -fn_80070EBC = .text:0x80070EBC; // type:function size:0x2C -fn_80070EE8 = .text:0x80070EE8; // type:function size:0x60 -fn_80070F48 = .text:0x80070F48; // type:function size:0x5C -fn_80070FA4 = .text:0x80070FA4; // type:function size:0x90 -fn_80071034 = .text:0x80071034; // type:function size:0x94 -fn_800710C8 = .text:0x800710C8; // type:function size:0x54 -fn_8007111C = .text:0x8007111C; // type:function size:0x50 -fn_8007116C = .text:0x8007116C; // type:function size:0x74 -fn_800711E0 = .text:0x800711E0; // type:function size:0x78 -fn_80071258 = .text:0x80071258; // type:function size:0x38 +BoardMusStartBoard = .text:0x80070D84; // type:function size:0x68 +BoardMusStart = .text:0x80070DEC; // type:function size:0xD0 +BoardAudSeqFadeOutFast = .text:0x80070EBC; // type:function size:0x2C +BoardAudSeqFadeOut = .text:0x80070EE8; // type:function size:0x60 +BoardMusLoudSet = .text:0x80070F48; // type:function size:0x5C +BoardMusVolPanSet = .text:0x80070FA4; // type:function size:0x90 +BoardAudSeqPause = .text:0x80071034; // type:function size:0x94 +BoardMusStatusGet = .text:0x800710C8; // type:function size:0x54 +BoardAudSeqClear = .text:0x8007111C; // type:function size:0x50 +BoardAudSeqFadeOutAll = .text:0x8007116C; // type:function size:0x74 +BoardAudFXPlay = .text:0x800711E0; // type:function size:0x78 +BoardAudFXStop = .text:0x80071258; // type:function size:0x38 ExecComKeyLeft = .text:0x80071290; // type:function size:0x38 scope:local BoardComKeySetLeft = .text:0x800712C8; // type:function size:0x28 ExecComKeyRight = .text:0x800712F0; // type:function size:0x38 scope:local @@ -1710,61 +1710,61 @@ RestoreItemMiniSuper = .text:0x800972D0; // type:function size:0x2C scope:local RestoreItemMegaSuper = .text:0x800972FC; // type:function size:0x2C scope:local RestoreItemBowser = .text:0x80097328; // type:function size:0x284 scope:local BoardBowserExec = .text:0x800975AC; // type:function size:0x144 -fn_800976F0 = .text:0x800976F0; // type:function size:0x28C -fn_8009797C = .text:0x8009797C; // type:function size:0x208 -fn_80097B84 = .text:0x80097B84; // type:function size:0x1DC -fn_80097D60 = .text:0x80097D60; // type:function size:0x30 -fn_80097D90 = .text:0x80097D90; // type:function size:0x148 -fn_80097ED8 = .text:0x80097ED8; // type:function size:0x1B4 -fn_8009808C = .text:0x8009808C; // type:function size:0x250 -fn_800982DC = .text:0x800982DC; // type:function size:0x220 -fn_800984FC = .text:0x800984FC; // type:function size:0x2B0 -fn_800987AC = .text:0x800987AC; // type:function size:0x160 -fn_8009890C = .text:0x8009890C; // type:function size:0xB8 -fn_800989C4 = .text:0x800989C4; // type:function size:0x1C -fn_800989E0 = .text:0x800989E0; // type:function size:0x148 -fn_80098B28 = .text:0x80098B28; // type:function size:0x210 -fn_80098D38 = .text:0x80098D38; // type:function size:0x228 -fn_80098F60 = .text:0x80098F60; // type:function size:0x230 -fn_80099190 = .text:0x80099190; // type:function size:0x270 -fn_80099400 = .text:0x80099400; // type:function size:0x58 -fn_80099458 = .text:0x80099458; // type:function size:0x44 -fn_8009949C = .text:0x8009949C; // type:function size:0x150 -fn_800995EC = .text:0x800995EC; // type:function size:0x128 -fn_80099714 = .text:0x80099714; // type:function size:0x34 -fn_80099748 = .text:0x80099748; // type:function size:0x5C -fn_800997A4 = .text:0x800997A4; // type:function size:0xD4 -fn_80099878 = .text:0x80099878; // type:function size:0x1C -fn_80099894 = .text:0x80099894; // type:function size:0x18C -fn_80099A20 = .text:0x80099A20; // type:function size:0x1E8 -fn_80099C08 = .text:0x80099C08; // type:function size:0x38 -fn_80099C40 = .text:0x80099C40; // type:function size:0x24 -fn_80099C64 = .text:0x80099C64; // type:function size:0xEC -fn_80099D50 = .text:0x80099D50; // type:function size:0x1C8 -fn_80099F18 = .text:0x80099F18; // type:function size:0x108 -fn_8009A020 = .text:0x8009A020; // type:function size:0x160 -fn_8009A180 = .text:0x8009A180; // type:function size:0x1AC -fn_8009A32C = .text:0x8009A32C; // type:function size:0xB8 -fn_8009A3E4 = .text:0x8009A3E4; // type:function size:0x90 -fn_8009A474 = .text:0x8009A474; // type:function size:0x160 -fn_8009A5D4 = .text:0x8009A5D4; // type:function size:0xE4 -fn_8009A6B8 = .text:0x8009A6B8; // type:function size:0xCC -fn_8009A784 = .text:0x8009A784; // type:function size:0x40 -fn_8009A7C4 = .text:0x8009A7C4; // type:function size:0x188 -fn_8009A94C = .text:0x8009A94C; // type:function size:0x2C4 -fn_8009AC10 = .text:0x8009AC10; // type:function size:0x2B8 -fn_8009AEC8 = .text:0x8009AEC8; // type:function size:0x24 -fn_8009AEEC = .text:0x8009AEEC; // type:function size:0xC -fn_8009AEF8 = .text:0x8009AEF8; // type:function size:0x10 -fn_8009AF08 = .text:0x8009AF08; // type:function size:0x14C -fn_8009B054 = .text:0x8009B054; // type:function size:0x120 -fn_8009B174 = .text:0x8009B174; // type:function size:0xB4 -fn_8009B228 = .text:0x8009B228; // type:function size:0x88 -fn_8009B2B0 = .text:0x8009B2B0; // type:function size:0x80 -fn_8009B330 = .text:0x8009B330; // type:function size:0xD8 -fn_8009B408 = .text:0x8009B408; // type:function size:0x6C -fn_8009B474 = .text:0x8009B474; // type:function size:0x60 -BoardBattleExec = .text:0x8009B4D4; // type:function size:0x124 +ExecBowser = .text:0x800976F0; // type:function size:0x28C scope:local +ExecBowserMain = .text:0x8009797C; // type:function size:0x208 scope:local +ExecMGReturn = .text:0x80097B84; // type:function size:0x1DC scope:local +DestroyBowser = .text:0x80097D60; // type:function size:0x30 scope:local +SquishPlayers = .text:0x80097D90; // type:function size:0x148 scope:local +ExecBowserSpecial = .text:0x80097ED8; // type:function size:0x1B4 scope:local +ExecBowserGame = .text:0x8009808C; // type:function size:0x250 scope:local +DoMGReturnEffect = .text:0x800982DC; // type:function size:0x220 scope:local +ExecBowserShuffle = .text:0x800984FC; // type:function size:0x2B0 scope:local +ExecBowserRevo = .text:0x800987AC; // type:function size:0x160 scope:local +ExecBowserSuit = .text:0x8009890C; // type:function size:0xB8 scope:local +CheckSuitGive = .text:0x800989C4; // type:function size:0x1C scope:local +StartSuitGive = .text:0x800989E0; // type:function size:0x148 scope:local +SuitGiveMain = .text:0x80098B28; // type:function size:0x210 scope:local +CreateBowserObj = .text:0x80098D38; // type:function size:0x228 scope:local +ExecBowserObj = .text:0x80098F60; // type:function size:0x230 scope:local +ExecBowserFall = .text:0x80099190; // type:function size:0x270 scope:local +ExecBowserLaugh = .text:0x80099400; // type:function size:0x58 scope:local +ExecBowserFire = .text:0x80099458; // type:function size:0x44 scope:local +ExecBowserJump = .text:0x8009949C; // type:function size:0x150 scope:local +ExecBowserPowerUp = .text:0x800995EC; // type:function size:0x128 scope:local +SetBowserState = .text:0x80099714; // type:function size:0x34 scope:local +CheckBowserIdle = .text:0x80099748; // type:function size:0x5C scope:local +CreateMiniBowser = .text:0x800997A4; // type:function size:0xD4 scope:local +CheckMiniBowser = .text:0x80099878; // type:function size:0x1C scope:local +ExecMiniBowser = .text:0x80099894; // type:function size:0x18C scope:local +CreateBowserEvent = .text:0x80099A20; // type:function size:0x1E8 scope:local +CheckBowserEvent = .text:0x80099C08; // type:function size:0x38 scope:local +StopBowserEvent = .text:0x80099C40; // type:function size:0x24 scope:local +ExecBowserEvent = .text:0x80099C64; // type:function size:0xEC scope:local +ShowBowserEvent = .text:0x80099D50; // type:function size:0x1C8 scope:local +HideBowserEvent = .text:0x80099F18; // type:function size:0x108 scope:local +ConfigBowserEvent = .text:0x8009A020; // type:function size:0x160 scope:local +CreatePlayerMot = .text:0x8009A180; // type:function size:0x1AC scope:local +KillPlayerMot = .text:0x8009A32C; // type:function size:0xB8 scope:local +InitBowserFire = .text:0x8009A3E4; // type:function size:0x90 scope:local +BowserFireHook = .text:0x8009A474; // type:function size:0x160 scope:local +SpawnBowserFire = .text:0x8009A5D4; // type:function size:0xE4 scope:local +CheckBowserFire = .text:0x8009A6B8; // type:function size:0xCC scope:local +KillBowserFire = .text:0x8009A784; // type:function size:0x40 scope:local +ExecMiniBowserEvent = .text:0x8009A7C4; // type:function size:0x188 scope:local +MiniBowserTakeAll = .text:0x8009A94C; // type:function size:0x2C4 scope:local +MiniBowserTake = .text:0x8009AC10; // type:function size:0x2B8 scope:local +MiniBowserBalloonStop = .text:0x8009AEC8; // type:function size:0x24 scope:local +GetMiniBowserBalloonState = .text:0x8009AEEC; // type:function size:0xC scope:local +SetMiniBowserBalloonState = .text:0x8009AEF8; // type:function size:0x10 scope:local +CreateMiniBowserBalloon = .text:0x8009AF08; // type:function size:0x14C scope:local +ExecMiniBowserBalloon = .text:0x8009B054; // type:function size:0x120 scope:local +MiniBowserBalloonHover = .text:0x8009B174; // type:function size:0xB4 scope:local +MiniBowserBalloonFall = .text:0x8009B228; // type:function size:0x88 scope:local +MiniBowserBalloonRaise = .text:0x8009B2B0; // type:function size:0x80 scope:local +SetMiniBowserMotion = .text:0x8009B330; // type:function size:0xD8 scope:local +SetMiniBowserMotionPause = .text:0x8009B408; // type:function size:0x6C scope:local +WaitMiniBowserMotion = .text:0x8009B474; // type:function size:0x60 scope:local +BoardBattleExec = .text:0x8009B4D4; // type:function size:0x124 scope:local DestroyBattle = .text:0x8009B5F8; // type:function size:0x2C scope:local ExecBattle = .text:0x8009B624; // type:function size:0x708 scope:local TakeCoins = .text:0x8009BD2C; // type:function size:0x1D4 scope:local @@ -1787,110 +1787,110 @@ GetBattleBombState = .text:0x8009CFA8; // type:function size:0x10 scope:local SetBattleBombState = .text:0x8009CFB8; // type:function size:0x34 scope:local SetBattleCoinValue = .text:0x8009CFEC; // type:function size:0x15C scope:local BoardFortuneExec = .text:0x8009D148; // type:function size:0x124 -fn_8009D26C = .text:0x8009D26C; // type:function size:0x74 -fn_8009D2E0 = .text:0x8009D2E0; // type:function size:0xC -fn_8009D2EC = .text:0x8009D2EC; // type:function size:0x340 -fn_8009D62C = .text:0x8009D62C; // type:function size:0xF8 -fn_8009D724 = .text:0x8009D724; // type:function size:0x160 -fn_8009D884 = .text:0x8009D884; // type:function size:0x5C -fn_8009D8E0 = .text:0x8009D8E0; // type:function size:0x198 -fn_8009DA78 = .text:0x8009DA78; // type:function size:0x18C -fn_8009DC04 = .text:0x8009DC04; // type:function size:0x20C -fn_8009DE10 = .text:0x8009DE10; // type:function size:0x78 -fn_8009DE88 = .text:0x8009DE88; // type:function size:0x78 -fn_8009DF00 = .text:0x8009DF00; // type:function size:0x68 -fn_8009DF68 = .text:0x8009DF68; // type:function size:0x68 -fn_8009DFD0 = .text:0x8009DFD0; // type:function size:0x11C -fn_8009E0EC = .text:0x8009E0EC; // type:function size:0x2C -fn_8009E118 = .text:0x8009E118; // type:function size:0x2A8 -fn_8009E3C0 = .text:0x8009E3C0; // type:function size:0x1D4 -fn_8009E594 = .text:0x8009E594; // type:function size:0xE8 -fn_8009E67C = .text:0x8009E67C; // type:function size:0x280 -fn_8009E8FC = .text:0x8009E8FC; // type:function size:0xC0 -fn_8009E9BC = .text:0x8009E9BC; // type:function size:0xA8 -fn_8009EA64 = .text:0x8009EA64; // type:function size:0x94 -fn_8009EAF8 = .text:0x8009EAF8; // type:function size:0x10 -fn_8009EB08 = .text:0x8009EB08; // type:function size:0xBC -fn_8009EBC4 = .text:0x8009EBC4; // type:function size:0x1D4 -fn_8009ED98 = .text:0x8009ED98; // type:function size:0xAC -fn_8009EE44 = .text:0x8009EE44; // type:function size:0x28 -fn_8009EE6C = .text:0x8009EE6C; // type:function size:0x4C -fn_8009EEB8 = .text:0x8009EEB8; // type:function size:0x300 -fn_8009F1B8 = .text:0x8009F1B8; // type:function size:0x4A0 -fn_8009F658 = .text:0x8009F658; // type:function size:0x9C -fn_8009F6F4 = .text:0x8009F6F4; // type:function size:0x1DC -fn_8009F8D0 = .text:0x8009F8D0; // type:function size:0x358 -fn_8009FC28 = .text:0x8009FC28; // type:function size:0x24 -fn_8009FC4C = .text:0x8009FC4C; // type:function size:0x2C -fn_8009FC78 = .text:0x8009FC78; // type:function size:0x214 -fn_8009FE8C = .text:0x8009FE8C; // type:function size:0x15C -fn_8009FFE8 = .text:0x8009FFE8; // type:function size:0x110 -fn_800A00F8 = .text:0x800A00F8; // type:function size:0x68 -fn_800A0160 = .text:0x800A0160; // type:function size:0x1E0 -fn_800A0340 = .text:0x800A0340; // type:function size:0x10C -fn_800A044C = .text:0x800A044C; // type:function size:0x190 -fn_800A05DC = .text:0x800A05DC; // type:function size:0x328 -fn_800A0904 = .text:0x800A0904; // type:function size:0x170 -fn_800A0A74 = .text:0x800A0A74; // type:function size:0x24 -fn_800A0A98 = .text:0x800A0A98; // type:function size:0x128 -fn_800A0BC0 = .text:0x800A0BC0; // type:function size:0x54 -fn_800A0C14 = .text:0x800A0C14; // type:function size:0x104 -fn_800A0D18 = .text:0x800A0D18; // type:function size:0x218 -fn_800A0F30 = .text:0x800A0F30; // type:function size:0xF4 -fn_800A1024 = .text:0x800A1024; // type:function size:0x178 -fn_800A119C = .text:0x800A119C; // type:function size:0x1B0 -fn_800A134C = .text:0x800A134C; // type:function size:0xDC -fn_800A1428 = .text:0x800A1428; // type:function size:0x9C -fn_800A14C4 = .text:0x800A14C4; // type:function size:0x68 -fn_800A152C = .text:0x800A152C; // type:function size:0x168 -fn_800A1694 = .text:0x800A1694; // type:function size:0x184 -fn_800A1818 = .text:0x800A1818; // type:function size:0x1C -fn_800A1834 = .text:0x800A1834; // type:function size:0x30 -fn_800A1864 = .text:0x800A1864; // type:function size:0x20 -fn_800A1884 = .text:0x800A1884; // type:function size:0x1B0 -fn_800A1A34 = .text:0x800A1A34; // type:function size:0x60 -fn_800A1A94 = .text:0x800A1A94; // type:function size:0x1C -fn_800A1AB0 = .text:0x800A1AB0; // type:function size:0x6FC -fn_800A21AC = .text:0x800A21AC; // type:function size:0x3B0 -fn_800A255C = .text:0x800A255C; // type:function size:0x3A8 -fn_800A2904 = .text:0x800A2904; // type:function size:0x388 -fn_800A2C8C = .text:0x800A2C8C; // type:function size:0x3A4 -fn_800A3030 = .text:0x800A3030; // type:function size:0x194 -fn_800A31C4 = .text:0x800A31C4; // type:function size:0x198 -fn_800A335C = .text:0x800A335C; // type:function size:0x174 -fn_800A34D0 = .text:0x800A34D0; // type:function size:0x200 -fn_800A36D0 = .text:0x800A36D0; // type:function size:0x20C -fn_800A38DC = .text:0x800A38DC; // type:function size:0x1C8 -fn_800A3AA4 = .text:0x800A3AA4; // type:function size:0x204 -fn_800A3CA8 = .text:0x800A3CA8; // type:function size:0xA8 -fn_800A3D50 = .text:0x800A3D50; // type:function size:0x430 -fn_800A4180 = .text:0x800A4180; // type:function size:0x8FC -fn_800A4A7C = .text:0x800A4A7C; // type:function size:0x74 -fn_800A4AF0 = .text:0x800A4AF0; // type:function size:0xC8 -fn_800A4BB8 = .text:0x800A4BB8; // type:function size:0xD0 -fn_800A4C88 = .text:0x800A4C88; // type:function size:0x2E4 -fn_800A4F6C = .text:0x800A4F6C; // type:function size:0x8 -fn_800A4F74 = .text:0x800A4F74; // type:function size:0x8 -fn_800A4F7C = .text:0x800A4F7C; // type:function size:0xB4 -fn_800A5030 = .text:0x800A5030; // type:function size:0x50 +FortuneExec = .text:0x8009D26C; // type:function size:0x74 scope:local +DestroyFortune = .text:0x8009D2E0; // type:function size:0xC scope:local +FortuneMain = .text:0x8009D2EC; // type:function size:0x340 scope:local +FortunePostMG = .text:0x8009D62C; // type:function size:0xF8 scope:local +CreateFortunePlatform = .text:0x8009D724; // type:function size:0x160 scope:local +CameraCalcFortune = .text:0x8009D884; // type:function size:0x5C scope:local +ExecFortunePlatform = .text:0x8009D8E0; // type:function size:0x198 scope:local +ExecComFortuneWin = .text:0x8009DA78; // type:function size:0x18C scope:local +ConfigComFortune = .text:0x8009DC04; // type:function size:0x20C scope:local +ComFortuneAddStar = .text:0x8009DE10; // type:function size:0x78 scope:local +ComFortuneAddCoin = .text:0x8009DE88; // type:function size:0x78 scope:local +ComFortuneSwapCoin = .text:0x8009DF00; // type:function size:0x68 +ComFortuneSwapStar = .text:0x8009DF68; // type:function size:0x68 +BoardBooCreate = .text:0x8009DFD0; // type:function size:0x11C +BoardBooKill = .text:0x8009E0EC; // type:function size:0x2C +BoardBooStealTypeSet = .text:0x8009E118; // type:function size:0x2A8 +ComSetupStealPlayer = .text:0x8009E3C0; // type:function size:0x1D4 scope:local +ComSetStealPlayerInput = .text:0x8009E594; // type:function size:0xE8 scope:local +BoardBooStealMain = .text:0x8009E67C; // type:function size:0x280 +ExecCoinSteal = .text:0x8009E8FC; // type:function size:0xC0 scope:local +ExecStarSteal = .text:0x8009E9BC; // type:function size:0xA8 scope:local +ExecLightSteal = .text:0x8009EA64; // type:function size:0x94 scope:local +SetBooMode = .text:0x8009EAF8; // type:function size:0x10 scope:local +CreateBallMdl = .text:0x8009EB08; // type:function size:0xBC scope:local +CreateBallView = .text:0x8009EBC4; // type:function size:0x1D4 scope:local +SetBallView = .text:0x8009ED98; // type:function size:0xAC scope:local +SetBallActive = .text:0x8009EE44; // type:function size:0x28 scope:local +CheckBallKill = .text:0x8009EE6C; // type:function size:0x4C scope:local +BallMain = .text:0x8009EEB8; // type:function size:0x300 scope:local +BallRenderHook = .text:0x8009F1B8; // type:function size:0x4A0 scope:local +ExecBoo = .text:0x8009F658; // type:function size:0x9C scope:local +UpdateBallCamera = .text:0x8009F6F4; // type:function size:0x1DC scope:local +CreateBallPlayer = .text:0x8009F8D0; // type:function size:0x358 scope:local +GetBallPlayerState = .text:0x8009FC28; // type:function size:0x24 scope:local +SetBallPlayerState = .text:0x8009FC4C; // type:function size:0x2C scope:local +ExecBallPlayer = .text:0x8009FC78; // type:function size:0x214 scope:local +BallPlayerZoomOut = .text:0x8009FE8C; // type:function size:0x15C scope:local +BallPlayerScare = .text:0x8009FFE8; // type:function size:0x110 scope:local +BallPlayerTurn = .text:0x800A00F8; // type:function size:0x68 scope:local +BallPlayerPunch = .text:0x800A0160; // type:function size:0x1E0 scope:local +BallPlayerUseLight = .text:0x800A0340; // type:function size:0x10C scope:local +BallPlayerCatch = .text:0x800A044C; // type:function size:0x190 scope:local +BallBooCreate = .text:0x800A05DC; // type:function size:0x328 scope:local +SetBallBooState = .text:0x800A0904; // type:function size:0x170 scope:local +GetBallBooState = .text:0x800A0A74; // type:function size:0x24 scope:local +ExecBallBoo = .text:0x800A0A98; // type:function size:0x128 scope:local +BallBooSpawn = .text:0x800A0BC0; // type:function size:0x54 scope:local +BallBooChase = .text:0x800A0C14; // type:function size:0x104 scope:local +BallBooBattle = .text:0x800A0D18; // type:function size:0x218 scope:local +BallBooAttack = .text:0x800A0F30; // type:function size:0xF4 scope:local +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 +BoardBooStealValueGet = .text:0x800A1834; // type:function size:0x30 +BoardBooStealLightCheck = .text:0x800A1864; // type:function size:0x20 +UpdatePlayerCoins = .text:0x800A1884; // type:function size:0x1B0 scope:local +BoardMGSetupExec = .text:0x800A1A34; // type:function size:0x60 +DestroyMGSetup = .text:0x800A1A94; // type:function size:0x1C scope:local +ExecMGSetup = .text:0x800A1AB0; // type:function size:0x6FC scope:local +DetermineMGList = .text:0x800A21AC; // type:function size:0x3B0 scope:local +SetupStatusLayout = .text:0x800A255C; // type:function size:0x3A8 scope:local +GetMGType = .text:0x800A2904; // type:function size:0x388 scope:local +GetMGTypeTeam = .text:0x800A2C8C; // type:function size:0x3A4 scope:local +CreateMGSetup = .text:0x800A3030; // type:function size:0x194 scope:local +UpdateMGSetup = .text:0x800A31C4; // type:function size:0x198 scope:local +CenterStatus = .text:0x800A335C; // type:function size:0x174 scope:local +SeparateStatus = .text:0x800A34D0; // type:function size:0x200 scope:local +PopupVS = .text:0x800A36D0; // type:function size:0x20C scope:local +FallMGType = .text:0x800A38DC; // type:function size:0x1C8 scope:local +LuckyMGFall = .text:0x800A3AA4; // type:function size:0x204 scope:local +HideLuckyValue = .text:0x800A3CA8; // type:function size:0xA8 scope:local +UpdateLuckyValue = .text:0x800A3D50; // type:function size:0x430 scope:local +UpdateMGList = .text:0x800A4180; // type:function size:0x8FC scope:local +BoardMGSetupPlayClear = .text:0x800A4A7C; // type:function size:0x74 +BoardMGSetupPlayPush = .text:0x800A4AF0; // type:function size:0xC8 +BoardMGSetupPlayPop = .text:0x800A4BB8; // type:function size:0xD0 +BoardMGSetupTutorialExec = .text:0x800A4C88; // type:function size:0x2E4 +BoardBooHouseHostSet = .text:0x800A4F6C; // type:function size:0x8 +BoardBooHouseHostGet = .text:0x800A4F74; // type:function size:0x8 +BoardBooHouseCreate = .text:0x800A4F7C; // type:function size:0xB4 +BoardBooHouseKill = .text:0x800A5030; // type:function size:0x50 BoardBooHouseExec = .text:0x800A5080; // type:function size:0x94 -fn_800A5114 = .text:0x800A5114; // type:function size:0x538 -fn_800A564C = .text:0x800A564C; // type:function size:0xF0 -fn_800A573C = .text:0x800A573C; // type:function size:0xFC -fn_800A5838 = .text:0x800A5838; // type:function size:0x3A0 -fn_800A5BD8 = .text:0x800A5BD8; // type:function size:0x124 -fn_800A5CFC = .text:0x800A5CFC; // type:function size:0xB0 -fn_800A5DAC = .text:0x800A5DAC; // type:function size:0xD4 -fn_800A5E80 = .text:0x800A5E80; // type:function size:0x68 -fn_800A5EE8 = .text:0x800A5EE8; // type:function size:0x2AC -fn_800A6194 = .text:0x800A6194; // type:function size:0x2AC -fn_800A6440 = .text:0x800A6440; // type:function size:0x188 -fn_800A65C8 = .text:0x800A65C8; // type:function size:0x16C -fn_800A6734 = .text:0x800A6734; // type:function size:0x164 -fn_800A6898 = .text:0x800A6898; // type:function size:0x70 -fn_800A6908 = .text:0x800A6908; // type:function size:0x60 -fn_800A6968 = .text:0x800A6968; // type:function size:0x1A8 -fn_800A6B10 = .text:0x800A6B10; // type:function size:0x3D4 +ExecBooHouse = .text:0x800A5114; // type:function size:0x538 scope:local +DestroyBooHouse = .text:0x800A564C; // type:function size:0xF0 scope:local +PickComStealType = .text:0x800A573C; // type:function size:0xFC scope:local +OpenBooHouse = .text:0x800A5838; // type:function size:0x3A0 scope:local +CloseBooHouse = .text:0x800A5BD8; // type:function size:0x124 scope:local +CreateBooHouseModel = .text:0x800A5CFC; // type:function size:0xB0 scope:local +KillBooHouseModel = .text:0x800A5DAC; // type:function size:0xD4 scope:local +ExecNullSteal = .text:0x800A5E80; // type:function size:0x68 scope:local +ExecStarSteal = .text:0x800A5EE8; // type:function size:0x2AC scope:local +ExecCoinSteal = .text:0x800A6194; // type:function size:0x2AC scope:local +ApplySteal = .text:0x800A6440; // type:function size:0x188 scope:local +ApplyCoinSteal = .text:0x800A65C8; // type:function size:0x16C scope:local +ApplyStarSteal = .text:0x800A6734; // type:function size:0x164 scope:local +ApplyBooLight = .text:0x800A6898; // type:function size:0x70 scope:local +SetBooBallPos = .text:0x800A6908; // type:function size:0x60 scope:local +BoardBooComUseCheck = .text:0x800A6968; // type:function size:0x1A8 +BoardBooHouseTutorialExec = .text:0x800A6B10; // type:function size:0x3D4 fn_800A6EE4 = .text:0x800A6EE4; // type:function size:0x64 fn_800A6F48 = .text:0x800A6F48; // type:function size:0x84 fn_800A6FCC = .text:0x800A6FCC; // type:function size:0x400 @@ -4640,16 +4640,17 @@ lbl_8011E220 = .rodata:0x8011E220; // type:object size:0xC data:4byte lbl_8011E22C = .rodata:0x8011E22C; // type:object size:0xC data:4byte lbl_8011E238 = .rodata:0x8011E238; // type:object size:0xC data:4byte lbl_8011E244 = .rodata:0x8011E244; // type:object size:0xC data:4byte -lbl_8011E250 = .rodata:0x8011E250; // type:object size:0x18 -lbl_8011E268 = .rodata:0x8011E268; // type:object size:0x70 data:4byte +bowserMotTbl = .rodata:0x8011E250; // type:object size:0x18 scope:local +lbl_8011E268 = .rodata:0x8011E268; // type:object size:0x10 data:4byte +lbl_8011E278 = .rodata:0x8011E278; // type:object size:0x60 data:4byte lbl_8011E2D8 = .rodata:0x8011E2D8; // type:object size:0xC data:byte -lbl_8011E2E4 = .rodata:0x8011E2E4; // type:object size:0x1C +miniBowserMotTbl = .rodata:0x8011E2E4; // type:object size:0x1C scope:local lbl_8011E300 = .rodata:0x8011E300; // type:object size:0x24 data:4byte lbl_8011E324 = .rodata:0x8011E324; // type:object size:0x20 data:4byte lbl_8011E344 = .rodata:0x8011E344; // type:object size:0x2C data:4byte lbl_8011E370 = .rodata:0x8011E370; // type:object size:0x10 data:4byte lbl_8011E380 = .rodata:0x8011E380; // type:object size:0x28 data:4byte -lbl_8011E3A8 = .rodata:0x8011E3A8; // type:object size:0x28 data:4byte +lbl_8011E3A8 = .rodata:0x8011E3A8; // type:object size:0x24 data:4byte lbl_8011E3D0 = .rodata:0x8011E3D0; // type:object size:0x20 data:4byte lbl_8011E3F0 = .rodata:0x8011E3F0; // type:object size:0x20 data:4byte lbl_8011E410 = .rodata:0x8011E410; // type:object size:0x20 data:4byte @@ -5181,7 +5182,7 @@ megaSquishObj = .data:0x80139A70; // type:object size:0x10 scope:local megaSquishSfxTbl = .data:0x80139A80; // type:object size:0x20 scope:local PortraitTbl = .data:0x80139AA0; // type:object size:0x24 scope:local StarPortraitTbl = .data:0x80139AC4; // type:object size:0x24 scope:local -lbl_80139AE8 = .data:0x80139AE8; // type:object size:0x18 +boardMusTbl = .data:0x80139AE8; // type:object size:0x12 scope:local comItemWeightTbl = .data:0x80139B00; // type:object size:0x60 scope:local comItemUseCheckFuncTbl = .data:0x80139B60; // type:object size:0x38 scope:local comJunctionDirTbl = .data:0x80139B98; // type:object size:0x30 scope:local @@ -5271,29 +5272,31 @@ scareMotTbl = .data:0x8013A888; // type:object size:0x20 scope:local impactMotTbl = .data:0x8013A8A8; // type:object size:0x20 scope:local cameraDataTbl = .data:0x8013A8C8; // type:object size:0x134 scope:local genieMotTbl = .data:0x8013A9FC; // type:object size:0x10 scope:local -lbl_8013AA10 = .data:0x8013AA10; // type:object size:0x20 +scareFXTbl = .data:0x8013AA10; // type:object size:0x20 scope:local jumptable_8013AA30 = .data:0x8013AA30; // type:object size:0x1C scope:local -lbl_8013AA4C = .data:0x8013AA4C; // type:object size:0x14 +lbl_8013AA4C = .data:0x8013AA4C; // type:object size:0xD data:string battleCursorPosTbl = .data:0x8013AA60; // type:object size:0x18 scope:local data:float bombFXTbl = .data:0x8013AA78; // type:object size:0x20 scope:local battleSprPrioTbl = .data:0x8013AA98; // type:object size:0x16 scope:local jumptable_8013AAB0 = .data:0x8013AAB0; // type:object size:0x24 scope:local battleChanceTbl = .data:0x8013AAD4; // type:object size:0x3C scope:local -lbl_8013AB10 = .data:0x8013AB10; // type:object size:0x18 -lbl_8013AB28 = .data:0x8013AB28; // type:object size:0xC0 -lbl_8013ABE8 = .data:0x8013ABE8; // type:object size:0x80 -lbl_8013AC68 = .data:0x8013AC68; // type:object size:0x18 +comFortuneMessTbl = .data:0x8013AB10; // type:object size:0x18 scope:local +booPlayerMotTbl = .data:0x8013AB28; // type:object size:0xC0 +booSfxTbl = .data:0x8013ABE8; // type:object size:0x80 +hostMess = .data:0x8013AC68; // type:object size:0x18 lbl_8013AC80 = .data:0x8013AC80; // type:object size:0xC data:string -lbl_8013AC8C = .data:0x8013AC8C; // type:object size:0x18 +ballBooMdl = .data:0x8013AC8C; // type:object size:0x18 scope:local jumptable_8013ACA4 = .data:0x8013ACA4; // type:object size:0x20 scope:local -lbl_8013ACC4 = .data:0x8013ACC4; // type:object size:0x24 -lbl_8013ACE8 = .data:0x8013ACE8; // type:object size:0x18 -lbl_8013AD00 = .data:0x8013AD00; // type:object size:0x34 -lbl_8013AD34 = .data:0x8013AD34; // type:object size:0x30 -lbl_8013AD64 = .data:0x8013AD64; // type:object size:0x30 -lbl_8013AD94 = .data:0x8013AD94; // type:object size:0x30 -lbl_8013ADC4 = .data:0x8013ADC4; // type:object size:0x24 +stealSuccessTbl = .data:0x8013ACC4; // type:object size:0x24 scope:local +stealTbl = .data:0x8013ACE8; // type:object size:0x12 scope:local +mgSetupSprTbl = .data:0x8013AD00; // type:object size:0x34 scope:local +statusLayout4P = .data:0x8013AD34; // type:object size:0x30 scope:local data:float +statusLayout1Vs3 = .data:0x8013AD64; // type:object size:0x30 scope:local data:float +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 +cursorYTbl = .data:0x8013AE08; // type:object size:0x20 scope:local +hiliteColTbl = .data:0x8013AE28; // type:object size:0xC scope:local lbl_8013AE38 = .data:0x8013AE38; // type:object size:0x90 lbl_8013AEC8 = .data:0x8013AEC8; // type:object size:0x30 lbl_8013AEF8 = .data:0x8013AEF8; // type:object size:0xC @@ -5582,14 +5585,14 @@ booBallScale = .bss:0x801A4BB4; // type:object size:0xC scope:local data:float booCamPos = .bss:0x801A4BC0; // type:object size:0xC scope:local data:float booCamTarget = .bss:0x801A4BCC; // type:object size:0xC scope:local data:float booCamUp = .bss:0x801A4BD8; // type:object size:0xC scope:local data:float -lbl_801A4BE8 = .bss:0x801A4BE8; // type:object size:0x30 -lbl_801A4C18 = .bss:0x801A4C18; // type:object size:0x18 +playerPosTemp = .bss:0x801A4BE8; // type:object size:0x30 scope:local +bowserSpr = .bss:0x801A4C18; // type:object size:0x16 scope:local battleMGList = .bss:0x801A4C30; // type:object size:0x10 scope:local data:2byte -lbl_801A4C40 = .bss:0x801A4C40; // type:object size:0xC data:4byte -lbl_801A4C4C = .bss:0x801A4C4C; // type:object size:0xC data:float -lbl_801A4C58 = .bss:0x801A4C58; // type:object size:0x20 data:2byte -lbl_801A4C78 = .bss:0x801A4C78; // type:object size:0x40 data:2byte -lbl_801A4CB8 = .bss:0x801A4CB8; // type:object size:0x10 +camPosFortune = .bss:0x801A4C40; // type:object size:0xC scope:local data:4byte +camTargetFortune = .bss:0x801A4C4C; // type:object size:0xC scope:local data:float +activeMG = .bss:0x801A4C58; // type:object size:0x20 scope:local data:2byte +mgListAll = .bss:0x801A4C78; // type:object size:0x40 scope:local data:2byte +mgPlay4P = .bss:0x801A4CB8; // type:object size:0x10 scope:local lbl_801A4CC8 = .bss:0x801A4CC8; // type:object size:0x10 data:2byte lbl_801A4CD8 = .bss:0x801A4CD8; // type:object size:0xC data:float lbl_801A4CE4 = .bss:0x801A4CE4; // type:object size:0xC data:float @@ -5860,7 +5863,7 @@ lbl_801D36C6 = .sdata:0x801D36C6; // type:object size:0x6 data:string lbl_801D36CC = .sdata:0x801D36CC; // type:object size:0x6 data:string lbl_801D36D2 = .sdata:0x801D36D2; // type:object size:0x8 data:string windowID = .sdata:0x801D36E0; // type:object size:0x2 scope:local data:2byte -lbl_801D36E8 = .sdata:0x801D36E8; // type:object size:0x8 data:4byte +boardFX = .sdata:0x801D36E8; // type:object size:0x4 scope:local data:4byte itemUse = .sdata:0x801D36F0; // type:object size:0x1 scope:local data:byte buttonWin = .sdata:0x801D36F8; // type:object size:0x2 scope:local data:2byte focusMdl = .sdata:0x801D36FA; // type:object size:0x2 scope:local data:2byte @@ -5905,16 +5908,16 @@ lbl_801D37A0 = .sdata:0x801D37A0; // type:object size:0x8 lbl_801D37A8 = .sdata:0x801D37A8; // type:object size:0x8 lbl_801D37B0 = .sdata:0x801D37B0; // type:object size:0x2 data:2byte lbl_801D37B2 = .sdata:0x801D37B2; // type:object size:0x2 data:2byte -lbl_801D37B4 = .sdata:0x801D37B4; // type:object size:0x2 data:2byte -lbl_801D37B6 = .sdata:0x801D37B6; // type:object size:0x2 data:2byte +suitItemMdl = .sdata:0x801D37B4; // type:object size:0x2 scope:local data:2byte +bowserMdl = .sdata:0x801D37B6; // type:object size:0x2 scope:local data:2byte lbl_801D37B8 = .sdata:0x801D37B8; // type:object size:0x3 data:string -lbl_801D37BB = .sdata:0x801D37BB; // type:object size:0xD +lbl_801D37BB = .sdata:0x801D37BB; // type:object size:0x8 data:string lbl_801D37C8 = .sdata:0x801D37C8; // type:object size:0x3 data:string -lbl_801D37D0 = .sdata:0x801D37D0; // type:object size:0x8 -lbl_801D37D8 = .sdata:0x801D37D8; // type:object size:0x8 -lbl_801D37E0 = .sdata:0x801D37E0; // type:object size:0x8 -lbl_801D37E8 = .sdata:0x801D37E8; // type:object size:0x1 data:byte -lbl_801D37E9 = .sdata:0x801D37E9; // type:object size:0x7 data:byte +lbl_801D37D0 = .sdata:0x801D37D0; // type:object size:0x7 data:string +ballMdlTbl = .sdata:0x801D37D8; // type:object size:0x8 scope:local +lbl_801D37E0 = .sdata:0x801D37E0; // type:object size:0x4 data:string +luckyValue = .sdata:0x801D37E8; // type:object size:0x1 scope:local data:byte +cursorPos = .sdata:0x801D37E9; // type:object size:0x1 scope:local data:byte lbl_801D37F0 = .sdata:0x801D37F0; // type:object size:0x2 data:2byte lbl_801D37F2 = .sdata:0x801D37F2; // type:object size:0x2 data:2byte lbl_801D37F4 = .sdata:0x801D37F4; // type:object size:0x2 data:2byte @@ -6326,7 +6329,7 @@ boardLightResetHook = .sbss:0x801D3EF0; // type:object size:0x4 data:4byte boardTurnFunc = .sbss:0x801D3EF4; // type:object size:0x4 data:4byte lbl_801D3EF8 = .sbss:0x801D3EF8; // type:object size:0x4 data:4byte lbl_801D3EFC = .sbss:0x801D3EFC; // type:object size:0x4 data:4byte -lbl_801D3F00 = .sbss:0x801D3F00; // type:object size:0x4 data:4byte +boardBowserHook = .sbss:0x801D3F00; // type:object size:0x4 data:4byte boardTurnStartFunc = .sbss:0x801D3F04; // type:object size:0x4 data:4byte filterObj = .sbss:0x801D3F08; // type:object size:0x4 scope:local data:4byte confettiObj = .sbss:0x801D3F0C; // type:object size:0x4 scope:local data:4byte @@ -6362,7 +6365,7 @@ winPosIdx = .sbss:0x801D3F89; // type:object size:0x1 scope:local data:byte winPortrait = .sbss:0x801D3F8A; // type:object size:0x1 scope:local data:byte autoPickF = .sbss:0x801D3F8B; // type:object size:0x1 scope:local data:byte winChoice = .sbss:0x801D3F8C; // type:object size:0x1 scope:local data:byte -lbl_801D3F90 = .sbss:0x801D3F90; // type:object size:0x8 +boardSeq = .sbss:0x801D3F90; // type:object size:0x8 scope:local viewProc = .sbss:0x801D3F98; // type:object size:0x4 scope:local data:4byte pauseDisableF = .sbss:0x801D3F9C; // type:object size:0x1 scope:local data:byte overheadObj = .sbss:0x801D3FA0; // type:object size:0x4 scope:local data:4byte @@ -6476,20 +6479,20 @@ suitMdl = .sbss:0x801D412C; // type:object size:0x2 scope:local data:2byte currItem = .sbss:0x801D412E; // type:object size:0x1 scope:local data:byte currItemRestore = .sbss:0x801D412F; // type:object size:0x1 scope:local data:byte itemBagItems = .sbss:0x801D4130; // type:object size:0x6 scope:local -lbl_801D4138 = .sbss:0x801D4138; // type:object size:0x4 data:4byte -lbl_801D413C = .sbss:0x801D413C; // type:object size:0x4 data:4byte -lbl_801D4140 = .sbss:0x801D4140; // type:object size:0x4 data:4byte -lbl_801D4144 = .sbss:0x801D4144; // type:object size:0x4 data:4byte -lbl_801D4148 = .sbss:0x801D4148; // type:object size:0x4 data:4byte -lbl_801D414C = .sbss:0x801D414C; // type:object size:0x4 data:4byte -lbl_801D4150 = .sbss:0x801D4150; // type:object size:0x8 -lbl_801D4158 = .sbss:0x801D4158; // type:object size:0x8 -lbl_801D4160 = .sbss:0x801D4160; // type:object size:0x4 data:4byte -lbl_801D4164 = .sbss:0x801D4164; // type:object size:0x2 data:2byte -lbl_801D4166 = .sbss:0x801D4166; // type:object size:0x8 data:2byte -lbl_801D416E = .sbss:0x801D416E; // type:object size:0x2 data:2byte -lbl_801D4170 = .sbss:0x801D4170; // type:object size:0x1 data:byte -lbl_801D4171 = .sbss:0x801D4171; // type:object size:0x7 data:byte +bowserProc = .sbss:0x801D4138; // type:object size:0x4 scope:local data:4byte +bowserObj = .sbss:0x801D413C; // type:object size:0x4 scope:local data:4byte +miniBowserObj = .sbss:0x801D4140; // type:object size:0x4 scope:local data:4byte +bowserEventObj = .sbss:0x801D4144; // type:object size:0x4 scope:local data:4byte +miniBowserBalloonObj = .sbss:0x801D4148; // type:object size:0x4 scope:local data:4byte +suitGiveObj = .sbss:0x801D414C; // type:object size:0x4 scope:local data:4byte +coinStealStr = .sbss:0x801D4150; // type:object size:0x8 scope:local +coinStealStrAll = .sbss:0x801D4158; // type:object size:0x8 scope:local +fireAnim = .sbss:0x801D4160; // type:object size:0x4 scope:local data:4byte +fireParMan = .sbss:0x801D4164; // type:object size:0x2 scope:local data:2byte +playerMot = .sbss:0x801D4166; // type:object size:0x8 scope:local data:2byte +eventSpace = .sbss:0x801D416E; // type:object size:0x2 scope:local data:2byte +eventType = .sbss:0x801D4170; // type:object size:0x1 scope:local data:byte +eventPlayer = .sbss:0x801D4171; // type:object size:0x1 scope:local data:byte battleProc = .sbss:0x801D4178; // type:object size:0x4 scope:local data:4byte battleObj = .sbss:0x801D417C; // type:object size:0x4 scope:local data:4byte explodeObj = .sbss:0x801D4180; // type:object size:0x4 scope:local data:4byte @@ -6502,47 +6505,47 @@ currSpace = .sbss:0x801D4198; // type:object size:0x2 scope:local data:2byte mgChoice = .sbss:0x801D419A; // type:object size:0x1 scope:local data:byte coinTakeMax = .sbss:0x801D419B; // type:object size:0x1 scope:local data:byte currPlayer = .sbss:0x801D419C; // type:object size:0x1 scope:local data:byte -lbl_801D41A0 = .sbss:0x801D41A0; // type:object size:0x4 data:4byte -lbl_801D41A4 = .sbss:0x801D41A4; // type:object size:0x4 data:4byte -lbl_801D41A8 = .sbss:0x801D41A8; // type:object size:0x1 data:byte -lbl_801D41A9 = .sbss:0x801D41A9; // type:object size:0x1 data:byte -lbl_801D41AA = .sbss:0x801D41AA; // type:object size:0x1 data:byte -lbl_801D41AB = .sbss:0x801D41AB; // type:object size:0x1 data:byte -lbl_801D41AC = .sbss:0x801D41AC; // type:object size:0x1 data:byte -lbl_801D41AD = .sbss:0x801D41AD; // type:object size:0x1 data:byte -lbl_801D41B0 = .sbss:0x801D41B0; // type:object size:0x4 data:4byte -lbl_801D41B4 = .sbss:0x801D41B4; // type:object size:0x4 data:4byte -lbl_801D41B8 = .sbss:0x801D41B8; // type:object size:0x4 data:4byte -lbl_801D41BC = .sbss:0x801D41BC; // type:object size:0x4 data:4byte -lbl_801D41C0 = .sbss:0x801D41C0; // type:object size:0x4 data:4byte -lbl_801D41C4 = .sbss:0x801D41C4; // type:object size:0x4 data:4byte -lbl_801D41C8 = .sbss:0x801D41C8; // type:object size:0x4 data:4byte -lbl_801D41CC = .sbss:0x801D41CC; // type:object size:0x4 data:4byte -lbl_801D41D0 = .sbss:0x801D41D0; // type:object size:0x3 -lbl_801D41D3 = .sbss:0x801D41D3; // type:object size:0x3 -lbl_801D41D6 = .sbss:0x801D41D6; // type:object size:0x1 data:byte -lbl_801D41D7 = .sbss:0x801D41D7; // type:object size:0x1 data:byte -lbl_801D41D8 = .sbss:0x801D41D8; // type:object size:0x1 data:byte -lbl_801D41DC = .sbss:0x801D41DC; // type:object size:0x4 data:4byte -lbl_801D41E0 = .sbss:0x801D41E0; // type:object size:0x1 data:byte -lbl_801D41E1 = .sbss:0x801D41E1; // type:object size:0x1 data:byte -lbl_801D41E2 = .sbss:0x801D41E2; // type:object size:0x6 data:byte -lbl_801D41E8 = .sbss:0x801D41E8; // type:object size:0x4 data:4byte -lbl_801D41EC = .sbss:0x801D41EC; // type:object size:0x4 data:4byte -lbl_801D41F0 = .sbss:0x801D41F0; // type:object size:0x1 data:byte -lbl_801D41F1 = .sbss:0x801D41F1; // type:object size:0x1 data:byte -lbl_801D41F2 = .sbss:0x801D41F2; // type:object size:0x1 data:byte -lbl_801D41F4 = .sbss:0x801D41F4; // type:object size:0x4 -lbl_801D41F8 = .sbss:0x801D41F8; // type:object size:0x6 -lbl_801D41FE = .sbss:0x801D41FE; // type:object size:0x6 -lbl_801D4204 = .sbss:0x801D4204; // type:object size:0x1 data:byte -lbl_801D4205 = .sbss:0x801D4205; // type:object size:0x1 data:byte -lbl_801D4206 = .sbss:0x801D4206; // type:object size:0x1 data:byte -lbl_801D4207 = .sbss:0x801D4207; // type:object size:0x1 data:byte -lbl_801D4208 = .sbss:0x801D4208; // type:object size:0x2 data:2byte -lbl_801D420C = .sbss:0x801D420C; // type:object size:0x4 data:float -lbl_801D4210 = .sbss:0x801D4210; // type:object size:0x4 data:4byte -lbl_801D4214 = .sbss:0x801D4214; // type:object size:0x1 data:byte +fortuneProc = .sbss:0x801D41A0; // type:object size:0x4 scope:local data:4byte +fortunePlatformObj = .sbss:0x801D41A4; // type:object size:0x4 scope:local data:4byte +comStar = .sbss:0x801D41A8; // type:object size:0x1 scope:local data:byte +comCoin = .sbss:0x801D41A9; // type:object size:0x1 scope:local data:byte +comType = .sbss:0x801D41AA; // type:object size:0x1 scope:local data:byte +comPlayer1 = .sbss:0x801D41AB; // type:object size:0x1 scope:local data:byte +comPlayer2 = .sbss:0x801D41AC; // type:object size:0x1 scope:local data:byte +currPlayer = .sbss:0x801D41AD; // type:object size:0x1 scope:local data:byte +booEventObj = .sbss:0x801D41B0; // type:object size:0x4 scope:local data:4byte +ballObj = .sbss:0x801D41B4; // type:object size:0x4 scope:local data:4byte +ballCameraObj = .sbss:0x801D41B8; // type:object size:0x4 scope:local data:4byte +ballBooObj = .sbss:0x801D41BC; // type:object size:0x4 scope:local data:4byte +ballPlayerObj = .sbss:0x801D41C0; // type:object size:0x4 scope:local data:4byte +ballTakeCoinObj = .sbss:0x801D41C4; // type:object size:0x4 scope:local data:4byte +attackTimer = .sbss:0x801D41C8; // type:object size:0x4 scope:local data:4byte +battleTimer = .sbss:0x801D41CC; // type:object size:0x4 scope:local data:4byte +starChoiceEnable = .sbss:0x801D41D0; // type:object size:0x3 scope:local +stealAvail = .sbss:0x801D41D3; // type:object size:0x3 scope:local +punchCount = .sbss:0x801D41D6; // type:object size:0x1 scope:local data:byte +stealSuccess = .sbss:0x801D41D7; // type:object size:0x1 scope:local data:byte +stealValue = .sbss:0x801D41D8; // type:object size:0x1 scope:local data:byte +booKillF = .sbss:0x801D41DC; // type:object size:0x4 scope:local data:4byte +stealType = .sbss:0x801D41E0; // type:object size:0x1 scope:local data:byte +stealTarget = .sbss:0x801D41E1; // type:object size:0x1 scope:local data:byte +lbl_801D41E2 = .sbss:0x801D41E2; // type:object size:0x1 data:byte +mgSetupProc = .sbss:0x801D41E8; // type:object size:0x4 scope:local data:4byte +mgSetupObj = .sbss:0x801D41EC; // type:object size:0x4 scope:local data:4byte +hiliteShowF = .sbss:0x801D41F0; // type:object size:0x1 scope:local data:byte +hiliteBlinkLen = .sbss:0x801D41F1; // type:object size:0x1 scope:local data:byte +hiliteTimer = .sbss:0x801D41F2; // type:object size:0x1 scope:local data:byte +mgPlayBattle = .sbss:0x801D41F4; // type:object size:0x4 scope:local +mgPlay2Vs2 = .sbss:0x801D41F8; // type:object size:0x6 scope:local +mgPlay1Vs3 = .sbss:0x801D41FE; // type:object size:0x6 scope:local +mgPlayBattleLen = .sbss:0x801D4204; // type:object size:0x1 scope:local data:byte +mgPlay2Vs2Len = .sbss:0x801D4205; // type:object size:0x1 scope:local data:byte +mgPlay1Vs3Len = .sbss:0x801D4206; // type:object size:0x1 scope:local data:byte +mgPlay4PLen = .sbss:0x801D4207; // type:object size:0x1 scope:local data:byte +mgNext = .sbss:0x801D4208; // type:object size:0x2 scope:local data:2byte +hilitePos = .sbss:0x801D420C; // type:object size:0x4 scope:local data:float +luckyF = .sbss:0x801D4210; // type:object size:0x4 scope:local data:4byte +mgType = .sbss:0x801D4214; // type:object size:0x1 scope:local data:byte lbl_801D4218 = .sbss:0x801D4218; // type:object size:0x4 data:4byte lbl_801D421C = .sbss:0x801D421C; // type:object size:0x8 lbl_801D4224 = .sbss:0x801D4224; // type:object size:0x4 data:4byte diff --git a/include/board_unsplit.h b/include/board_unsplit.h index b31e369a..be7dcee5 100644 --- a/include/board_unsplit.h +++ b/include/board_unsplit.h @@ -11,8 +11,8 @@ void BoardShopTutorialExec(s32); void BoardLotteryTutorialExec(void); s16 BoardStarHostMdlGet(void); void BoardStatusShowSetAll(s32); -void fn_800A4C88(void); -void fn_800A6B10(void); +void BoardMGSetupTutorialExec(void); +void BoardBooHouseTutorialExec(void); void BoardStatusItemSet(s32); void BoardTutorialItemSet(s32); void BoardCharWheelSetTarget(s32); @@ -43,7 +43,7 @@ void BoardSpaceDestroy(void); void BoardShopHostSet(s16); void BoardLotteryHostSet(s16); void BoardStarHostSet(s16); -void fn_800A4F6C(s16); +void BoardBooHouseHostSet(s16); void BoardTutorialHookSet(void*); void BoardTutorialBlockSetPos(s32, s32); s32 BoardCameraRotGet(Vec*); diff --git a/src/REL/w03Dll/main.c b/src/REL/w03Dll/main.c index 85a2b301..8c521919 100644 --- a/src/REL/w03Dll/main.c +++ b/src/REL/w03Dll/main.c @@ -174,7 +174,7 @@ void BoardCreate(void) { BoardSpaceWalkMiniEventFuncSet(&fn_1_A74); BoardSpaceLandEventFuncSet((void*)&fn_1_AF8); BoardStarHostSet(lbl_1_data_1E4); - fn_800A4F6C(lbl_1_data_1E6); + BoardBooHouseHostSet(lbl_1_data_1E6); BoardLotteryHostSet(lbl_1_data_1E6); BoardShopHostSet(lbl_1_data_1E6); BoardJunctionMaskSet(0x0000C000); diff --git a/src/REL/w10Dll/main.c b/src/REL/w10Dll/main.c index 03287121..18ef6902 100644 --- a/src/REL/w10Dll/main.c +++ b/src/REL/w10Dll/main.c @@ -128,7 +128,7 @@ void BoardCreate(void) { BoardSpaceWalkMiniEventFuncSet(&fn_1_91C); BoardSpaceLandEventFuncSet(&fn_1_908); BoardStarHostSet(lbl_1_data_2C); - fn_800A4F6C(lbl_1_data_32); + BoardBooHouseHostSet(lbl_1_data_32); BoardShopHostSet(lbl_1_data_2E); BoardLotteryHostSet(lbl_1_data_30); HuWinMesMaxSizeGet(1, spC, 0x2E003A); diff --git a/src/REL/w10Dll/scene.c b/src/REL/w10Dll/scene.c index e2798d31..420a5450 100644 --- a/src/REL/w10Dll/scene.c +++ b/src/REL/w10Dll/scene.c @@ -176,7 +176,7 @@ void fn_1_13A4(void) { for (i = 0; i < 4; i++) { GWPlayer[i].color = 1; } - fn_800A4C88(); + BoardMGSetupTutorialExec(); BoardStatusShowSetAll(0); fn_1_C10(0); fn_1_BA0(0x2E002B); @@ -206,7 +206,7 @@ void fn_1_13A4(void) { BoardCameraMotionStartEx(lbl_1_bss_0->unk8, &sp8, NULL, 3200.0f, -1.0f, 30); BoardCameraMotionWait(); fn_1_BA0(0x2E0030); - fn_800A6B10(); + BoardBooHouseTutorialExec(); BoardCameraMotionStartEx(lbl_1_bss_0->unk8, &sp8, NULL, 3200.0f, -1.0f, 30); BoardCameraMotionWait(); fn_1_BA0(0x2E0032); @@ -227,7 +227,7 @@ void fn_1_13A4(void) { fn_1_BA0(0x2E0039); if (lbl_1_bss_C == 0) { lbl_1_bss_C = 1; - fn_80070EE8(0, 0x1F3); + BoardAudSeqFadeOut(0, 0x1F3); BoardKill(); } BoardTutorialHookSet(NULL); diff --git a/src/REL/w10Dll/tutorial.c b/src/REL/w10Dll/tutorial.c index 98866afe..2425dadf 100644 --- a/src/REL/w10Dll/tutorial.c +++ b/src/REL/w10Dll/tutorial.c @@ -153,7 +153,7 @@ void fn_1_1984(void) { if (i != 4) { lbl_1_bss_C = 1; OSReport(lbl_1_data_98); - fn_80070EE8(0, 0x1F3); + BoardAudSeqFadeOut(0, 0x1F3); BoardKill(); BoardTutorialHookSet(NULL); } @@ -182,7 +182,7 @@ int fn_1_1AAC(s16 arg0, s32 arg1) { if (i != 4) { lbl_1_bss_C = 1; OSReport(lbl_1_data_98); - fn_80070EE8(0, 0x1F3); + BoardAudSeqFadeOut(0, 0x1F3); BoardKill(); BoardTutorialHookSet(NULL); } diff --git a/src/game/board/main.c b/src/game/board/main.c index d5508e2f..92f42bc2 100644 --- a/src/game/board/main.c +++ b/src/game/board/main.c @@ -23,7 +23,7 @@ static omObjData *last5GfxObj; static omObjData *confettiObj; static omObjData *filterObj; void *boardTurnStartFunc; -u32 lbl_801D3F00; +void *boardBowserHook; u32 lbl_801D3EFC; u32 lbl_801D3EF8; BoardFunc boardTurnFunc; @@ -55,7 +55,7 @@ static CameraView camViewTbl[] = { extern void BoardModelPosGet(s16 model, Vec *pos); extern void BoardSpacePosGet(s32 layer, s32 space, Vec *pos); -extern void fn_800A4A7C(void); +extern void BoardMGSetupPlayClear(void); extern void fn_800A6EE4(void); extern s8 boardTutorialF; @@ -116,7 +116,7 @@ void BoardCommonInit(BoardFunc create, BoardFunc destroy) _ClearFlag(FLAG_ID_MAKE(1, 9)); _ClearFlag(FLAG_ID_MAKE(0, 8)); _ClearFlag(FLAG_ID_MAKE(0, 10)); - fn_800A4A7C(); + BoardMGSetupPlayClear(); } nextOvl = OVL_INVALID; @@ -136,7 +136,7 @@ void BoardCommonInit(BoardFunc create, BoardFunc destroy) destroyFunc = destroy; boardTurnFunc = NULL; lbl_801D3EFC = 0; - lbl_801D3F00 = 0; + boardBowserHook = NULL; lbl_801D3EF8 = 0; boardTurnStartFunc = NULL; boardObjMan = omInitObjMan(64, 8192); @@ -664,7 +664,7 @@ static void CreateBoard(void) BoardLightSetExec(); BoardLotteryInit(); BoardShopInit(); - fn_800A4F7C(); + BoardBooHouseCreate(); BoardCameraInit(); BoardStatusCreate(); CharModelKillIndex(-1); @@ -710,7 +710,7 @@ static void DestroyBoard(void) HuAudAllStop(); fn_80085EB4(); BoardStatusKill(); - fn_800A5030(); + BoardBooHouseKill(); BoardShopKill(); BoardLotteryKill(); BoardSpaceDestroy();