diff --git a/config/GMPE01_00/symbols.txt b/config/GMPE01_00/symbols.txt index 81ba21a2..fef6092a 100644 --- a/config/GMPE01_00/symbols.txt +++ b/config/GMPE01_00/symbols.txt @@ -544,35 +544,35 @@ XFB_putcS = .text:0x800303C4; // type:function size:0x150 XFB_putcProgressive = .text:0x80030514; // type:function size:0x1F0 XFB_putcInterlace = .text:0x80030704; // type:function size:0x1B4 GWInit = .text:0x800308B8; // type:function size:0x14C -GWResetGameStat = .text:0x80030A04; // type:function size:0x318 -GWGetMessSpeed = .text:0x80030D1C; // type:function size:0x4C -GWSetMGRecord = .text:0x80030D68; // type:function size:0x54 -GWGetMGRecord = .text:0x80030DBC; // type:function size:0x18 -GWGetCharColor = .text:0x80030DD4; // type:function size:0x140 -GWSetBoardPlayCount = .text:0x80030F14; // type:function size:0x24 -GWAddBoardPlayCount = .text:0x80030F38; // type:function size:0x38 -GWGetBoardPlayCount = .text:0x80030F70; // type:function size:0x14 -GWSetBoardMaxStars = .text:0x80030F84; // type:function size:0x1C -GWGetBoardMaxStars = .text:0x80030FA0; // type:function size:0x18 -GWSetBoardMaxCoins = .text:0x80030FB8; // type:function size:0x1C -GWGetBoardMaxCoins = .text:0x80030FD4; // type:function size:0x18 -GWIncBoardWinCount = .text:0x80030FEC; // type:function size:0x5C -GWGetBoardWinCount = .text:0x80031048; // type:function size:0x1C -GWSetBoardWinCount = .text:0x80031064; // type:function size:0x20 -GWGetMGAvail = .text:0x80031084; // type:function size:0x6C -GWSetMGAvail = .text:0x800310F0; // type:function size:0x5C -GWGetMGCustom = .text:0x8003114C; // type:function size:0x6C -GWSetMGCustom = .text:0x800311B8; // type:function size:0x5C -GWResetMGCustom = .text:0x80031214; // type:function size:0x60 -GWGetCoins = .text:0x80031274; // type:function size:0x18 -GWSetCoins = .text:0x8003128C; // type:function size:0xB0 -GWAddCoins = .text:0x8003133C; // type:function size:0xD0 -GWSetStars = .text:0x8003140C; // type:function size:0x6C -GWAddStars = .text:0x80031478; // type:function size:0x94 -GWGetStars = .text:0x8003150C; // type:function size:0x18 -GWSetTotalStars = .text:0x80031524; // type:function size:0x34 -GWAddTotalStars = .text:0x80031558; // type:function size:0x54 -GWGetTotalStars = .text:0x800315AC; // type:function size:0x10 +GWGameStatReset = .text:0x80030A04; // type:function size:0x318 +GWMessSpeedGet = .text:0x80030D1C; // type:function size:0x4C +GWMGRecordSet = .text:0x80030D68; // type:function size:0x54 +GWMGRecordGet = .text:0x80030DBC; // type:function size:0x18 +GWCharColorGet = .text:0x80030DD4; // type:function size:0x140 +GWBoardPlayCountSet = .text:0x80030F14; // type:function size:0x24 +GWBoardPlayCountAdd = .text:0x80030F38; // type:function size:0x38 +GWBoardPlayCountGet = .text:0x80030F70; // type:function size:0x14 +GWBoardMaxStarsSet = .text:0x80030F84; // type:function size:0x1C +GWBoardMaxStarsGet = .text:0x80030FA0; // type:function size:0x18 +GWBoardMaxCoinsSet = .text:0x80030FB8; // type:function size:0x1C +GWBoardMaxCoinsGet = .text:0x80030FD4; // type:function size:0x18 +GWBoardWinCountInc = .text:0x80030FEC; // type:function size:0x5C +GWBoardWinCountGet = .text:0x80031048; // type:function size:0x1C +GWBoardWinCountSet = .text:0x80031064; // type:function size:0x20 +GWMGAvailGet = .text:0x80031084; // type:function size:0x6C +GWMGAvailSet = .text:0x800310F0; // type:function size:0x5C +GWMGCustomGet = .text:0x8003114C; // type:function size:0x6C +GWMGCustomSet = .text:0x800311B8; // type:function size:0x5C +GWMGCustomReset = .text:0x80031214; // type:function size:0x60 +GWCoinsGet = .text:0x80031274; // type:function size:0x18 +GWCoinsSet = .text:0x8003128C; // type:function size:0xB0 +GWCoinsAdd = .text:0x8003133C; // type:function size:0xD0 +GWStarsSet = .text:0x8003140C; // type:function size:0x6C +GWStarsAdd = .text:0x80031478; // type:function size:0x94 +GWStarsGet = .text:0x8003150C; // type:function size:0x18 +GWTotalStarsSet = .text:0x80031524; // type:function size:0x34 +GWTotalStarsAdd = .text:0x80031558; // type:function size:0x54 +GWTotalStarsGet = .text:0x800315AC; // type:function size:0x10 omOutView = .text:0x800315BC; // type:function size:0x238 omOutViewMulti = .text:0x800317F4; // type:function size:0x2C4 omSystemKeyCheckSetup = .text:0x80031AB8; // type:function size:0x74 @@ -889,7 +889,7 @@ fn_8004EDA4 = .text:0x8004EDA4; // type:function size:0x2B4 fn_8004F058 = .text:0x8004F058; // type:function size:0xE4 fn_8004F13C = .text:0x8004F13C; // type:function size:0x2B4 CharModelLayerSetAll2 = .text:0x8004F3F0; // type:function size:0x80 -CharModelSetVoiceEnable = .text:0x8004F470; // type:function size:0xBC +CharModelVoiceEnableSet = .text:0x8004F470; // type:function size:0xBC fn_8004F52C = .text:0x8004F52C; // type:function size:0x4C fn_8004F578 = .text:0x8004F578; // type:function size:0xB0 fn_8004F628 = .text:0x8004F628; // type:function size:0x2CC @@ -1098,127 +1098,127 @@ BoardLast5GfxHide = .text:0x80061A20; // type:function size:0xAC BoardTauntInit = .text:0x80061ACC; // type:function size:0x80 BoardTauntKill = .text:0x80061B4C; // type:function size:0x54 TauntUpdate = .text:0x80061BA0; // type:function size:0x3A4 scope:local -fn_80061F44 = .text:0x80061F44; // type:function size:0x38 -fn_80061F7C = .text:0x80061F7C; // type:function size:0x48 -fn_80061FC4 = .text:0x80061FC4; // type:function size:0xC -fn_80061FD0 = .text:0x80061FD0; // type:function size:0xC -fn_80061FDC = .text:0x80061FDC; // type:function size:0x78 -fn_80062054 = .text:0x80062054; // type:function size:0x78 +BoardDataDirReadAsync = .text:0x80061F44; // type:function size:0x38 +BoardDataAsyncWait = .text:0x80061F7C; // type:function size:0x48 +BoardRollTypeGet = .text:0x80061FC4; // type:function size:0xC +BoardRollTypeSet = .text:0x80061FD0; // type:function size:0xC +BoardPlayerGetCharMess = .text:0x80061FDC; // type:function size:0x78 +BoardPlayerGetCharName = .text:0x80062054; // type:function size:0x78 BoardPlayerIsAllCom = .text:0x800620CC; // type:function size:0x80 -fn_8006214C = .text:0x8006214C; // type:function size:0x16C -fn_800622B8 = .text:0x800622B8; // type:function size:0x588 -fn_80062840 = .text:0x80062840; // type:function size:0xFC -fn_8006293C = .text:0x8006293C; // type:function size:0x84 -fn_800629C0 = .text:0x800629C0; // type:function size:0x80 +BoardPlayerInit = .text:0x8006214C; // type:function size:0x16C +BoardPlayerModelInit = .text:0x800622B8; // type:function size:0x588 +BoardPlayerModelKill = .text:0x80062840; // type:function size:0xFC +BoardPlayerLayerSet = .text:0x8006293C; // type:function size:0x84 +BoardPlayerCameraSet = .text:0x800629C0; // type:function size:0x80 fn_80062A40 = .text:0x80062A40; // type:function size:0x80 -fn_80062AC0 = .text:0x80062AC0; // type:function size:0xB4 -fn_80062B74 = .text:0x80062B74; // type:function size:0xB0 -fn_80062C24 = .text:0x80062C24; // type:function size:0xB4 -fn_80062CD8 = .text:0x80062CD8; // type:function size:0x58 -fn_80062D30 = .text:0x80062D30; // type:function size:0x60 +BoardPlayerExistCheck = .text:0x80062AC0; // type:function size:0xB4 +BoardPlayerItemAdd = .text:0x80062B74; // type:function size:0xB0 +BoardPlayerItemRemove = .text:0x80062C24; // type:function size:0xB4 +BoardPlayerItemFind = .text:0x80062CD8; // type:function size:0x58 +BoardPlayerItemCount = .text:0x80062D30; // type:function size:0x60 fn_80062D90 = .text:0x80062D90; // type:function size:0x40 -fn_80062DD0 = .text:0x80062DD0; // type:function size:0xC4 -fn_80062E94 = .text:0x80062E94; // type:function size:0x90 -fn_80062F24 = .text:0x80062F24; // type:function size:0x80 -fn_80062FA4 = .text:0x80062FA4; // type:function size:0x9C -fn_80063040 = .text:0x80063040; // type:function size:0xCC -fn_8006310C = .text:0x8006310C; // type:function size:0x80 -fn_8006318C = .text:0x8006318C; // type:function size:0x9C -fn_80063228 = .text:0x80063228; // type:function size:0xCC -fn_800632F4 = .text:0x800632F4; // type:function size:0x80 -fn_80063374 = .text:0x80063374; // type:function size:0xD4 -fn_80063448 = .text:0x80063448; // type:function size:0xA8 -fn_800634F0 = .text:0x800634F0; // type:function size:0x80 -fn_80063570 = .text:0x80063570; // type:function size:0x90 -fn_80063600 = .text:0x80063600; // type:function size:0x80 -fn_80063680 = .text:0x80063680; // type:function size:0x44 -fn_800636C4 = .text:0x800636C4; // type:function size:0x88 -fn_8006374C = .text:0x8006374C; // type:function size:0x80 -fn_800637CC = .text:0x800637CC; // type:function size:0x80 -fn_8006384C = .text:0x8006384C; // type:function size:0x78 -fn_800638C4 = .text:0x800638C4; // type:function size:0x88 -fn_8006394C = .text:0x8006394C; // type:function size:0xD0 -fn_80063A1C = .text:0x80063A1C; // type:function size:0xE0 -fn_80063AFC = .text:0x80063AFC; // type:function size:0x80 -fn_80063B7C = .text:0x80063B7C; // type:function size:0x80 -fn_80063BFC = .text:0x80063BFC; // type:function size:0x78 -fn_80063C74 = .text:0x80063C74; // type:function size:0x78 -fn_80063CEC = .text:0x80063CEC; // type:function size:0xA0 -fn_80063D8C = .text:0x80063D8C; // type:function size:0x80 -fn_80063E0C = .text:0x80063E0C; // type:function size:0x80 -fn_80063E8C = .text:0x80063E8C; // type:function size:0x34 -fn_80063EC0 = .text:0x80063EC0; // type:function size:0x2C -fn_80063EEC = .text:0x80063EEC; // type:function size:0x9C -fn_80063F88 = .text:0x80063F88; // type:function size:0x48 -fn_80063FD0 = .text:0x80063FD0; // type:function size:0x16C -fn_8006413C = .text:0x8006413C; // type:function size:0x40 -fn_8006417C = .text:0x8006417C; // type:function size:0x7C -fn_800641F8 = .text:0x800641F8; // type:function size:0x7C -fn_80064274 = .text:0x80064274; // type:function size:0xC4 -fn_80064338 = .text:0x80064338; // type:function size:0x18 -fn_80064350 = .text:0x80064350; // type:function size:0x18 -fn_80064368 = .text:0x80064368; // type:function size:0x15C -fn_800644C4 = .text:0x800644C4; // type:function size:0x160 -fn_80064624 = .text:0x80064624; // type:function size:0x420 -fn_80064A44 = .text:0x80064A44; // type:function size:0x80 -fn_80064AC4 = .text:0x80064AC4; // type:function size:0x18C -fn_80064C50 = .text:0x80064C50; // type:function size:0x134 -fn_80064D84 = .text:0x80064D84; // type:function size:0x10 -fn_80064D94 = .text:0x80064D94; // type:function size:0x10 -fn_80064DA4 = .text:0x80064DA4; // type:function size:0xC -fn_80064DB0 = .text:0x80064DB0; // type:function size:0x634 -fn_800653E4 = .text:0x800653E4; // type:function size:0x1A0 -fn_80065584 = .text:0x80065584; // type:function size:0x70 -fn_800655F4 = .text:0x800655F4; // type:function size:0x180 -fn_80065774 = .text:0x80065774; // type:function size:0x114 -fn_80065888 = .text:0x80065888; // type:function size:0x8E8 -fn_80066170 = .text:0x80066170; // type:function size:0xBF8 -fn_80066D68 = .text:0x80066D68; // type:function size:0xBC -fn_80066E24 = .text:0x80066E24; // type:function size:0x90 -fn_80066EB4 = .text:0x80066EB4; // type:function size:0x90 -fn_80066F44 = .text:0x80066F44; // type:function size:0x430 -fn_80067374 = .text:0x80067374; // type:function size:0x218 -fn_8006758C = .text:0x8006758C; // type:function size:0x1D4 -fn_80067760 = .text:0x80067760; // type:function size:0x54 -fn_800677B4 = .text:0x800677B4; // type:function size:0x3E4 -fn_80067B98 = .text:0x80067B98; // type:function size:0xF8 -fn_80067C90 = .text:0x80067C90; // type:function size:0x5A0 -fn_80068230 = .text:0x80068230; // type:function size:0x51C -fn_8006874C = .text:0x8006874C; // type:function size:0x2C -fn_80068778 = .text:0x80068778; // type:function size:0x138 -fn_800688B0 = .text:0x800688B0; // type:function size:0x38 -fn_800688E8 = .text:0x800688E8; // type:function size:0x10C -fn_800689F4 = .text:0x800689F4; // type:function size:0x194 -fn_80068B88 = .text:0x80068B88; // type:function size:0x278 -fn_80068E00 = .text:0x80068E00; // type:function size:0x6C -fn_80068E6C = .text:0x80068E6C; // type:function size:0x9C -fn_80068F08 = .text:0x80068F08; // type:function size:0x40 +BoardPlayerCurrSpacePosDirGet = .text:0x80062DD0; // type:function size:0xC4 +BoardPlayerAmbSet = .text:0x80062E94; // type:function size:0x90 +BoardPlayerMtxSet = .text:0x80062F24; // type:function size:0x80 +BoardPlayerPosSetV = .text:0x80062FA4; // type:function size:0x9C +BoardPlayerPosSet = .text:0x80063040; // type:function size:0xCC +BoardPlayerPosGet = .text:0x8006310C; // type:function size:0x80 +BoardPlayerRotSetV = .text:0x8006318C; // type:function size:0x9C +BoardPlayerRotSet = .text:0x80063228; // type:function size:0xCC +BoardPlayerRotGet = .text:0x800632F4; // type:function size:0x80 +BoardPlayerRotYSet = .text:0x80063374; // type:function size:0xD4 +BoardPlayerRotYGet = .text:0x80063448; // type:function size:0xA8 +BoardPlayerScaleSetV = .text:0x800634F0; // type:function size:0x80 +BoardPlayerScaleSet = .text:0x80063570; // type:function size:0x90 +BoardPlayerScaleGet = .text:0x80063600; // type:function size:0x80 +BoardPlayerCurrMotionGet = .text:0x80063680; // type:function size:0x44 +BoardPlayerVoiceEnableSet = .text:0x800636C4; // type:function size:0x88 +BoardPlayerMotionCreate = .text:0x8006374C; // type:function size:0x80 +BoardPlayerMotionKill = .text:0x800637CC; // type:function size:0x80 +BoardPlayerMotionEndCheck = .text:0x8006384C; // type:function size:0x78 +BoardPlayerMotionEndWait = .text:0x800638C4; // type:function size:0x88 +BoardPlayerMotionStart = .text:0x8006394C; // type:function size:0xD0 +BoardPlayerMotionShiftSet = .text:0x80063A1C; // type:function size:0xE0 +BoardPlayerMotionSpeedSet = .text:0x80063AFC; // type:function size:0x80 +BoardPlayerMotionTimeSet = .text:0x80063B7C; // type:function size:0x80 +BoardPlayerMotionTimeGet = .text:0x80063BFC; // type:function size:0x78 +BoardPlayerMotionMaxTimeGet = .text:0x80063C74; // type:function size:0x78 +BoardPlayerMotionTimeRangeSet = .text:0x80063CEC; // type:function size:0xA0 +BoardPlayerModelAttrSet = .text:0x80063D8C; // type:function size:0x80 +BoardPlayerModelAttrReset = .text:0x80063E0C; // type:function size:0x80 +BoardPlayerCoinsSet = .text:0x80063E8C; // type:function size:0x34 +BoardPlayerCoinsGet = .text:0x80063EC0; // type:function size:0x2C +BoardPlayerCoinsAdd = .text:0x80063EEC; // type:function size:0x9C +BoardPlayerStarsAdd = .text:0x80063F88; // type:function size:0x48 +BoardPlayerSizeSet = .text:0x80063FD0; // type:function size:0x16C +BoardPlayerSizeGet = .text:0x8006413C; // type:function size:0x40 +BoardPlayerTeamCount = .text:0x8006417C; // type:function size:0x7C +BoardPlayerTeamFind = .text:0x800641F8; // type:function size:0x7C +BoardPlayerRankCalc = .text:0x80064274; // type:function size:0xC4 +BoardPlayerPreTurnHookSet = .text:0x80064338; // type:function size:0x18 +BoardPlayerPostTurnHookSet = .text:0x80064350; // type:function size:0x18 +BoardPlayerTurnExec = .text:0x80064368; // type:function size:0x15C +BoardPlayerTurnRollExec = .text:0x800644C4; // type:function size:0x160 +BoardPlayerTurnMoveExec = .text:0x80064624; // type:function size:0x420 +BoardPlayerPostTurnHookExec = .text:0x80064A44; // type:function size:0x80 +BoardPlayerSizeRestore = .text:0x80064AC4; // type:function size:0x18C +BoardPlayerZoomRestore = .text:0x80064C50; // type:function size:0x134 +BoardJunctionMaskSet = .text:0x80064D84; // type:function size:0x10 +BoardJunctionMaskReset = .text:0x80064D94; // type:function size:0x10 +BoardJunctionMaskZero = .text:0x80064DA4; // type:function size:0xC +InitJunction = .text:0x80064DB0; // type:function size:0x634 +UpdateJunctionGfx = .text:0x800653E4; // type:function size:0x1A0 scope:local +StopJunctionPlayer = .text:0x80065584; // type:function size:0x70 scope:local +RestoreJunction = .text:0x800655F4; // type:function size:0x180 scope:local +GetDefaultDirection = .text:0x80065774; // type:function size:0x114 scope:local +DoDebugMove = .text:0x80065888; // type:function size:0x8E8 scope:local +ExecJunction = .text:0x80066170; // type:function size:0xBF8 scope:local +BoardPlayerMoveTo = .text:0x80066D68; // type:function size:0xBC +BoardPlayerMoveBetween = .text:0x80066E24; // type:function size:0x90 +BoardPlayerMoveToAsync = .text:0x80066EB4; // type:function size:0x90 +BoardPlayerPosLerpStart = .text:0x80066F44; // type:function size:0x430 +PlayerPosLerpFunc = .text:0x80067374; // type:function size:0x218 scope:local +BoardPlayerDiceJumpStart = .text:0x8006758C; // type:function size:0x1D4 +BoardPlayerDiceJumpCheck = .text:0x80067760; // type:function size:0x54 +DiceJumpFunc = .text:0x800677B4; // type:function size:0x3E4 scope:local +BoardRotateDiceNumbers = .text:0x80067B98; // type:function size:0xF8 +BoardPlayerAnimBlendSet = .text:0x80067C90; // type:function size:0x5A0 +BoardPlayerAnimBlendExec = .text:0x80068230; // type:function size:0x51C +BoardPlayerAnimBlendCheck = .text:0x8006874C; // type:function size:0x2C +BoardDiceDigit2DInit = .text:0x80068778; // type:function size:0x138 +BoardDiceDigit2DUpdateEnable = .text:0x800688B0; // type:function size:0x38 +BoardDiceDigit2DShowSet = .text:0x800688E8; // type:function size:0x10C +UpdateDiceDigitSprite = .text:0x800689F4; // type:function size:0x194 scope:local +UpdateDiceDigit2D = .text:0x80068B88; // type:function size:0x278 scope:local +BoardPlayerBtnDownWait = .text:0x80068E00; // type:function size:0x6C +BoardPlayerAutoSizeSet = .text:0x80068E6C; // type:function size:0x9C +BoardPlayerAutoSizeGet = .text:0x80068F08; // type:function size:0x40 fn_80068F48 = .text:0x80068F48; // type:function size:0x1C fn_80068F64 = .text:0x80068F64; // type:function size:0x224 fn_80069188 = .text:0x80069188; // type:function size:0x40 fn_800691C8 = .text:0x800691C8; // type:function size:0x100 -fn_800692C8 = .text:0x800692C8; // type:function size:0x1A4 -fn_8006946C = .text:0x8006946C; // type:function size:0x128 -fn_80069594 = .text:0x80069594; // type:function size:0x8 -fn_8006959C = .text:0x8006959C; // type:function size:0x8 -fn_800695A4 = .text:0x800695A4; // type:function size:0x74 -fn_80069618 = .text:0x80069618; // type:function size:0x54 -fn_8006966C = .text:0x8006966C; // type:function size:0x4C -fn_800696B8 = .text:0x800696B8; // type:function size:0x44 -fn_800696FC = .text:0x800696FC; // type:function size:0x44 -fn_80069740 = .text:0x80069740; // type:function size:0x44 -fn_80069784 = .text:0x80069784; // type:function size:0x1F0 -fn_80069974 = .text:0x80069974; // type:function size:0x5C -fn_800699D0 = .text:0x800699D0; // type:function size:0x1294 -fn_8006AC64 = .text:0x8006AC64; // type:function size:0xA0 -fn_8006AD04 = .text:0x8006AD04; // type:function size:0x24C -fn_8006AF50 = .text:0x8006AF50; // type:function size:0x8 -fn_8006AF58 = .text:0x8006AF58; // type:function size:0x38C -fn_8006B2E4 = .text:0x8006B2E4; // type:function size:0x950 -fn_8006BC34 = .text:0x8006BC34; // type:function size:0x980 -fn_8006C5B4 = .text:0x8006C5B4; // type:function size:0xA48 -fn_8006CFFC = .text:0x8006CFFC; // type:function size:0x24C -fn_8006D248 = .text:0x8006D248; // type:function size:0xC0 +BoardBowserSuitInit = .text:0x800692C8; // type:function size:0x1A4 +BoardBowserSuitKill = .text:0x8006946C; // type:function size:0x128 +BoardBowserSuitModelGet = .text:0x80069594; // type:function size:0x8 +BoardBowserSuitPlayerModelGet = .text:0x8006959C; // type:function size:0x8 +BoardBowserSuitMotionCreate = .text:0x800695A4; // type:function size:0x74 +BoardBowserSuitMotionSetWait = .text:0x80069618; // type:function size:0x54 +BoardBowserSuitMotionSetWalk = .text:0x8006966C; // type:function size:0x4C +BoardBowserSuitMotionSetWin = .text:0x800696B8; // type:function size:0x44 +BoardBowserSuitMotionSetJump = .text:0x800696FC; // type:function size:0x44 +BoardBowserSuitPlayerModelKill = .text:0x80069740; // type:function size:0x44 +UpdateBowserSuit = .text:0x80069784; // type:function size:0x1F0 scope:local +BoardSpaceShockSpaceSet = .text:0x80069974; // type:function size:0x5C +DoSparkSpace = .text:0x800699D0; // type:function size:0x1294 scope:local +RemoveSparkSpace = .text:0x8006AC64; // type:function size:0xA0 scope:local +SetRollPlayerSize = .text:0x8006AD04; // type:function size:0x24C scope:local +BoardRollResizeCheck = .text:0x8006AF50; // type:function size:0x8 scope:local +BoardPlayerResizeAnimExec = .text:0x8006AF58; // type:function size:0x38C +MegaSquishFunc = .text:0x8006B2E4; // type:function size:0x950 scope:local +MegaPlayerPassFunc = .text:0x8006BC34; // type:function size:0x980 scope:local +MegaExecJump = .text:0x8006C5B4; // type:function size:0xA48 +BoardPlayerCopyEyeMat = .text:0x8006CFFC; // type:function size:0x24C +BoardPlayerCopyMat = .text:0x8006D248; // type:function size:0xC0 BoardModelInit = .text:0x8006D308; // type:function size:0xF0 BoardModelKillAll = .text:0x8006D3F8; // type:function size:0xA0 ModelMgrObjFunc = .text:0x8006D498; // type:function size:0x70 scope:local @@ -1236,20 +1236,20 @@ BoardModelIDGet = .text:0x8006DBD4; // type:function size:0x48 fn_8006DC1C = .text:0x8006DC1C; // type:function size:0x60 BoardModelSetPass = .text:0x8006DC7C; // type:function size:0x74 BoardModelAmbSet = .text:0x8006DCF0; // type:function size:0x68 -BoardModelExist = .text:0x8006DD58; // type:function size:0x48 +BoardModelExistCheck = .text:0x8006DD58; // type:function size:0x48 BoardModelExistDupe = .text:0x8006DDA0; // type:function size:0x48 fn_8006DDE8 = .text:0x8006DDE8; // type:function size:0x70 BoardModelMotionCreate = .text:0x8006DE58; // type:function size:0x140 BoardModelMotionKill = .text:0x8006DF98; // type:function size:0x118 BoardModelMotionTimeRangeSet = .text:0x8006E0B0; // type:function size:0xE8 BoardModelMotionUpdateSet = .text:0x8006E198; // type:function size:0x7C -fn_8006E214 = .text:0x8006E214; // type:function size:0xA4 +BoardModelVoiceEnableSet = .text:0x8006E214; // type:function size:0xA4 BoardModelMotionStart = .text:0x8006E2B8; // type:function size:0x174 BoardModelMotionShiftIDGet = .text:0x8006E42C; // type:function size:0x50 BoardModelMotionShiftSet = .text:0x8006E47C; // type:function size:0x148 BoardModelAttrSet = .text:0x8006E5C4; // type:function size:0x58 BoardModelAttrReset = .text:0x8006E61C; // type:function size:0x58 -BoardModelMotionTimeReset = .text:0x8006E674; // type:function size:0x84 +BoardModelMotionTimeSet = .text:0x8006E674; // type:function size:0x84 BoardModelMotionTimeGet = .text:0x8006E6F8; // type:function size:0x94 BoardModelMotionMaxTimeGet = .text:0x8006E78C; // type:function size:0x88 BoardModelMotionSpeedGet = .text:0x8006E814; // type:function size:0x64 @@ -4610,7 +4610,8 @@ lbl_8011DD50 = .rodata:0x8011DD50; // type:object size:0x10 data:4byte lbl_8011DD60 = .rodata:0x8011DD60; // type:object size:0x24 data:4byte lbl_8011DD84 = .rodata:0x8011DD84; // type:object size:0xC data:4byte lbl_8011DD90 = .rodata:0x8011DD90; // type:object size:0x20 data:4byte -lbl_8011DDB0 = .rodata:0x8011DDB0; // type:object size:0x7C data:4byte +lbl_8011DDB0 = .rodata:0x8011DDB0; // type:object size:0x20 data:4byte +lbl_8011DDD0 = .rodata:0x8011DDD0; // type:object size:0x5C data:4byte lbl_8011DE2C = .rodata:0x8011DE2C; // type:object size:0x24 data:4byte lbl_8011DE50 = .rodata:0x8011DE50; // type:object size:0x10 data:4byte lbl_8011DE60 = .rodata:0x8011DE60; // type:object size:0x38 data:4byte @@ -5158,19 +5159,25 @@ last5GfxSprTbl = .data:0x80139828; // type:object size:0xC scope:local last5GfxPosTbl = .data:0x80139834; // type:object size:0x30 scope:local tauntActiveSfxTbl = .data:0x80139864; // type:object size:0x10 scope:local tauntSfxTbl = .data:0x80139874; // type:object size:0x24 scope:local -lbl_80139898 = .data:0x80139898; // type:object size:0x10 -lbl_801398A8 = .data:0x801398A8; // type:object size:0x10 -lbl_801398B8 = .data:0x801398B8; // type:object size:0xA data:2byte +diceJumpObj = .data:0x80139898; // type:object size:0x10 scope:local +animDoneF = .data:0x801398A8; // type:object size:0x10 scope:local +bowserSuitMot = .data:0x801398B8; // type:object size:0xA scope:local data:2byte lbl_801398C2 = .data:0x801398C2; // type:object size:0x17 data:string lbl_801398D9 = .data:0x801398D9; // type:object size:0x17 data:string lbl_801398F0 = .data:0x801398F0; // type:object size:0xE data:string lbl_801398FE = .data:0x801398FE; // type:object size:0xE data:string lbl_8013990C = .data:0x8013990C; // type:object size:0x18 data:string lbl_80139924 = .data:0x80139924; // type:object size:0x18 data:string -lbl_8013993C = .data:0x8013993C; // type:object size:0xA0 -lbl_801399DC = .data:0x801399DC; // type:object size:0x20 -lbl_801399FC = .data:0x801399FC; // type:object size:0x74 -lbl_80139A70 = .data:0x80139A70; // type:object size:0x30 +lbl_8013993C = .data:0x8013993C; // type:object size:0x40 +lbl_8013997C = .data:0x8013997C; // type:object size:0x20 +boardAnimTbl = .data:0x8013999C; // type:object size:0x20 scope:local +boardAnimRevTbl = .data:0x801399BC; // type:object size:0x20 scope:local +bowserSuitCharMdlTbl = .data:0x801399DC; // type:object size:0x20 scope:local +bowserSuitMotTbl = .data:0x801399FC; // type:object size:0x34 scope:local +boardSparkSfxTbl = .data:0x80139A30; // type:object size:0x20 scope:local +boardSparkSfxTblAlt = .data:0x80139A50; // type:object size:0x20 scope:local +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 @@ -5515,9 +5522,9 @@ ToeThread = .bss:0x8019C4D0; // type:object size:0x310 scope:local align:8 ToeThreadStack = .bss:0x8019C7E0; // type:object size:0x1000 scope:local boardCamera = .bss:0x8019D7E0; // type:object size:0xC4 data:byte cameraBackup = .bss:0x8019D8A4; // type:object size:0xC4 scope:local -lbl_8019D968 = .bss:0x8019D968; // type:object size:0x10 -lbl_8019D978 = .bss:0x8019D978; // type:object size:0x10 -lbl_8019D988 = .bss:0x8019D988; // type:object size:0x10 +preTurnHook = .bss:0x8019D968; // type:object size:0x10 scope:local +postTurnHook = .bss:0x8019D978; // type:object size:0x10 scope:local +playerMatCopy = .bss:0x8019D988; // type:object size:0x10 scope:local winInsertMesTbl = .bss:0x8019D998; // type:object size:0x20 scope:local choiceDisableTbl = .bss:0x8019D9B8; // type:object size:0x40 scope:local lbl_8019D9F8 = .bss:0x8019D9F8; // type:object size:0xC data:float @@ -5798,9 +5805,9 @@ Xfb = .sdata:0x801D3664; // type:object size:0x8 scope:local data:4byte boardNextScene = .sdata:0x801D3670; // type:object size:0x4 scope:local data:4byte filterColor = .sdata:0x801D3674; // type:object size:0x4 scope:local data:byte lbl_801D3678 = .sdata:0x801D3678; // type:object size:0x8 -lbl_801D3680 = .sdata:0x801D3680; // type:object size:0x2 data:2byte -lbl_801D3682 = .sdata:0x801D3682; // type:object size:0x2 data:2byte -lbl_801D3684 = .sdata:0x801D3684; // type:object size:0x2 data:2byte +suitMdl = .sdata:0x801D3680; // type:object size:0x2 scope:local data:2byte +suitPlayerMdl = .sdata:0x801D3682; // type:object size:0x2 scope:local data:2byte +suitCurrMot = .sdata:0x801D3684; // type:object size:0x2 scope:local data:2byte lbl_801D3686 = .sdata:0x801D3686; // type:object size:0x5 data:string lbl_801D368B = .sdata:0x801D368B; // type:object size:0x5 data:string lbl_801D3690 = .sdata:0x801D3690; // type:object size:0x6 data:string @@ -5814,7 +5821,7 @@ lbl_801D36BA = .sdata:0x801D36BA; // type:object size:0x6 data:string lbl_801D36C0 = .sdata:0x801D36C0; // type:object size:0x6 data:string 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:0xE +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 lbl_801D36F0 = .sdata:0x801D36F0; // type:object size:0x8 data:byte @@ -6289,17 +6296,17 @@ confettiObj = .sbss:0x801D3F0C; // type:object size:0x4 scope:local data:4byte last5GfxObj = .sbss:0x801D3F10; // type:object size:0x4 scope:local data:4byte boardRandSeed = .sbss:0x801D3F14; // type:object size:0x4 data:4byte boardMainObj = .sbss:0x801D3F18; // type:object size:0x4 data:4byte -lbl_801D3F20 = .sbss:0x801D3F20; // type:object size:0x4 data:4byte -lbl_801D3F24 = .sbss:0x801D3F24; // type:object size:0x4 data:4byte -lbl_801D3F28 = .sbss:0x801D3F28; // type:object size:0x4 data:4byte -lbl_801D3F2C = .sbss:0x801D3F2C; // type:object size:0x4 data:4byte -lbl_801D3F30 = .sbss:0x801D3F30; // type:object size:0x4 data:4byte +rollResized = .sbss:0x801D3F20; // type:object size:0x4 scope:local data:4byte +bowserSuitObj = .sbss:0x801D3F24; // type:object size:0x4 scope:local data:4byte +junctionMask = .sbss:0x801D3F28; // type:object size:0x4 scope:local data:4byte +junctionObj = .sbss:0x801D3F2C; // type:object size:0x4 scope:local data:4byte +diceDigit2DObj = .sbss:0x801D3F30; // type:object size:0x4 scope:local data:4byte lbl_801D3F34 = .sbss:0x801D3F34; // type:object size:0x4 data:4byte -lbl_801D3F38 = .sbss:0x801D3F38; // type:object size:0x8 -lbl_801D3F40 = .sbss:0x801D3F40; // type:object size:0x1 data:byte -lbl_801D3F44 = .sbss:0x801D3F44; // type:object size:0x1 data:byte -lbl_801D3F46 = .sbss:0x801D3F46; // type:object size:0x8 -lbl_801D3F4E = .sbss:0x801D3F4E; // type:object size:0xA +junctionArrowRot = .sbss:0x801D3F38; // type:object size:0x8 scope:local +lbl_801D3F40 = .sbss:0x801D3F40; // type:object size:0x4 data:byte +rollType = .sbss:0x801D3F44; // type:object size:0x1 scope:local data:byte +playerMot = .sbss:0x801D3F46; // type:object size:0x8 scope:local +boardPlayerMdl = .sbss:0x801D3F4E; // type:object size:0x8 modelDataList = .sbss:0x801D3F58; // type:object size:0x4 scope:local data:4byte modelMgrObj = .sbss:0x801D3F5C; // type:object size:0x4 scope:local data:4byte modelDataNum = .sbss:0x801D3F60; // type:object size:0x2 scope:local data:2byte diff --git a/include/common_structs.h b/include/common_structs.h index bb1c8bb0..50fe5290 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -80,7 +80,7 @@ typedef struct player_state { /* 0x0C */ s16 space_curr; /* 0x0E */ s16 space_prev; /* 0x10 */ s16 space_next; -/* 0x12 */ s16 unk_12; +/* 0x12 */ s16 space_shock; /* 0x14 */ u8 blue_count; /* 0x15 */ u8 red_count; /* 0x16 */ u8 question_count; diff --git a/include/game/gamework.h b/include/game/gamework.h index 9cdb46b1..2eb7753b 100644 --- a/include/game/gamework.h +++ b/include/game/gamework.h @@ -4,34 +4,34 @@ #include "dolphin.h" void GWInit(void); -void GWResetGameStat(void); -s16 GWGetMessSpeed(void); -void GWSetMGRecord(int index, s32 value); -s32 GWGetMGRecord(int index); -void GWGetCharColor(int character, GXColor *color); -void GWSetBoardPlayCount(int board, u8 value); -void GWAddBoardPlayCount(int board, u8 value); -u8 GWGetBoardPlayCount(int board); -void GWSetBoardMaxStars(int board, int value); -u16 GWGetBoardMaxStars(int board); -void GWSetBoardMaxCoins(int board, int value); -u16 GWGetBoardMaxCoins(int board); -int GWIncBoardWinCount(int character, int board); -int GWGetBoardWinCount(int character, int board); -void GWSetBoardWinCount(int character, int board, int value); -int GWGetMGAvail(int id); -int GWSetMGAvail(int id); -int GWGetMGCustom(int id); -int GWSetMGCustom(int id); -int GWResetMGCustom(int id); -s16 GWGetCoins(int player); -void GWSetCoins(int player, s16 value); -void GWAddCoins(int player, s16 amount); -void GWSetStars(int player, s16 value); -void GWAddStars(int player, s16 amount); -s16 GWGetStars(int player); -void GWSetTotalStars(s16 value); -void GWAddTotalStars(s16 amount); -u16 GWGetTotalStars(void); +void GWGameStatReset(void); +s16 GWMessSpeedGet(void); +void GWMGRecordSet(int index, s32 value); +s32 GWMGRecordGet(int index); +void GWCharColorGet(int character, GXColor *color); +void GWBoardPlayCountSet(int board, u8 value); +void GWBoardPlayCountAdd(int board, u8 value); +u8 GWBoardPlayCountGet(int board); +void GWBoardMaxStarsSet(int board, int value); +u16 GWBoardMaxStarsGet(int board); +void GWBoardMaxCoinsSet(int board, int value); +u16 GWBoardMaxCoinsGet(int board); +int GWBoardWinCountInc(int character, int board); +int GWBoardWinCountGet(int character, int board); +void GWBoardWinCountSet(int character, int board, int value); +int GWMGAvailGet(int id); +int GWMGAvailSet(int id); +int GWMGCustomGet(int id); +int GWMGCustomSet(int id); +int GWMGCustomReset(int id); +s16 GWCoinsGet(int player); +void GWCoinsSet(int player, s16 value); +void GWCoinsAdd(int player, s16 amount); +void GWStarsSet(int player, s16 value); +void GWStarsAdd(int player, s16 amount); +s16 GWStarsGet(int player); +void GWTotalStarsSet(s16 value); +void GWTotalStarsAdd(s16 amount); +u16 GWTotalStarsGet(void); #endif \ No newline at end of file diff --git a/src/REL/w10Dll/scene.c b/src/REL/w10Dll/scene.c index f5cd9be3..c3e6d1dc 100644 --- a/src/REL/w10Dll/scene.c +++ b/src/REL/w10Dll/scene.c @@ -142,7 +142,7 @@ void fn_1_1278(void) { void fn_1_12A0(void) { fn_1_BA0(0x2E001D); - fn_80062B74(2, 1); + BoardPlayerItemAdd(2, 1); BoardTutorialItemSet(1); } diff --git a/src/game/gamework.c b/src/game/gamework.c index d0bd669c..1b751efa 100644 --- a/src/game/gamework.c +++ b/src/game/gamework.c @@ -46,7 +46,7 @@ static inline void ResetBoardSettings(void) void GWInit(void) { - GWResetGameStat(); + GWGameStatReset(); _InitFlag(); GWErase(); InitPlayerConfig(); @@ -112,7 +112,7 @@ static inline void ResetFlag(GameStat *game_stat) game_stat->field10F_bit6 = game_stat->field110_bit6 = 0; } -void GWResetGameStat(void) +void GWGameStatReset(void) { GameStat *game_stat = &GWGameStatDefault; memset(game_stat, 0, sizeof(GameStat)); @@ -134,7 +134,7 @@ void GWResetGameStat(void) ResetBoardSettings(); } -s16 GWGetMessSpeed(void) +s16 GWMessSpeedGet(void) { if(GWSystem.mess_delay > 48) { GWSystem.mess_speed = 1; @@ -143,19 +143,19 @@ s16 GWGetMessSpeed(void) return GWSystem.mess_delay; } -void GWSetMGRecord(int index, s32 value) +void GWMGRecordSet(int index, s32 value) { if(!_CheckFlag(FLAG_ID_MAKE(1, 12))) { GWGameStat.mg_record[index] = value; } } -s32 GWGetMGRecord(int index) +s32 GWMGRecordGet(int index) { return GWGameStat.mg_record[index]; } -void GWGetCharColor(int character, GXColor *color) +void GWCharColorGet(int character, GXColor *color) { GXColor char_color[] = { { 227, 67, 67, 255 }, @@ -170,7 +170,7 @@ void GWGetCharColor(int character, GXColor *color) *color = char_color[character]; } -void GWSetBoardPlayCount(int board, u8 value) +void GWBoardPlayCountSet(int board, u8 value) { if(value > 99) { value = 99; @@ -178,7 +178,7 @@ void GWSetBoardPlayCount(int board, u8 value) GWGameStat.board_play_count[board] = value; } -void GWAddBoardPlayCount(int board, u8 value) +void GWBoardPlayCountAdd(int board, u8 value) { value += GWGameStat.board_play_count[board]; if(value > 99) { @@ -188,32 +188,32 @@ void GWAddBoardPlayCount(int board, u8 value) } -u8 GWGetBoardPlayCount(int board) +u8 GWBoardPlayCountGet(int board) { return GWGameStat.board_play_count[board]; } -void GWSetBoardMaxStars(int board, int value) +void GWBoardMaxStarsSet(int board, int value) { GWGameStat.board_max_stars[board] = value; } -u16 GWGetBoardMaxStars(int board) +u16 GWBoardMaxStarsGet(int board) { return GWGameStat.board_max_stars[board]; } -void GWSetBoardMaxCoins(int board, int value) +void GWBoardMaxCoinsSet(int board, int value) { GWGameStat.board_max_coins[board] = value; } -u16 GWGetBoardMaxCoins(int board) +u16 GWBoardMaxCoinsGet(int board) { return GWGameStat.board_max_coins[board]; } -int GWIncBoardWinCount(int character, int board) +int GWBoardWinCountInc(int character, int board) { int win_count = GWGameStat.board_win_count[board][character]+1; if(win_count > 99) { @@ -223,17 +223,17 @@ int GWIncBoardWinCount(int character, int board) return win_count; } -int GWGetBoardWinCount(int character, int board) +int GWBoardWinCountGet(int character, int board) { return GWGameStat.board_win_count[board][character]; } -void GWSetBoardWinCount(int character, int board, int value) +void GWBoardWinCountSet(int character, int board, int value) { GWGameStat.board_win_count[board][character] = value; } -int GWGetMGAvail(int id) +int GWMGAvailGet(int id) { int word; int bit; @@ -247,7 +247,7 @@ int GWGetMGAvail(int id) } } -int GWSetMGAvail(int id) +int GWMGAvailSet(int id) { int word; int bit; @@ -257,7 +257,7 @@ int GWSetMGAvail(int id) GWGameStat.mg_avail[word] |= (1 << bit); } -int GWGetMGCustom(int id) +int GWMGCustomGet(int id) { int word; int bit; @@ -271,7 +271,7 @@ int GWGetMGCustom(int id) } } -int GWSetMGCustom(int id) +int GWMGCustomSet(int id) { int word; int bit; @@ -281,7 +281,7 @@ int GWSetMGCustom(int id) GWGameStat.mg_custom[word] |= (1 << bit); } -int GWResetMGCustom(int id) +int GWMGCustomReset(int id) { int word; int bit; @@ -291,12 +291,12 @@ int GWResetMGCustom(int id) GWGameStat.mg_custom[word] &= ~(1 << bit); } -s16 GWGetCoins(int player) +s16 GWCoinsGet(int player) { return GWPlayer[player].coins; } -void GWSetCoins(int player, s16 value) +void GWCoinsSet(int player, s16 value) { if(!_CheckFlag(FLAG_ID_MAKE(1, 12))) { if(value < 0) { @@ -312,12 +312,12 @@ void GWSetCoins(int player, s16 value) } } -void GWAddCoins(int player, s16 amount) +void GWCoinsAdd(int player, s16 amount) { - GWSetCoins(player, GWPlayer[player].coins+amount); + GWCoinsSet(player, GWPlayer[player].coins+amount); } -void GWSetStars(int player, s16 value) +void GWStarsSet(int player, s16 value) { if(value < 0) { value = 0; @@ -331,17 +331,17 @@ void GWSetStars(int player, s16 value) GWPlayer[player].stars = value; } -void GWAddStars(int player, s16 amount) +void GWStarsAdd(int player, s16 amount) { - GWSetStars(player, GWPlayer[player].stars+amount); + GWStarsSet(player, GWPlayer[player].stars+amount); } -s16 GWGetStars(int player) +s16 GWStarsGet(int player) { return GWPlayer[player].stars; } -void GWSetTotalStars(s16 value) +void GWTotalStarsSet(s16 value) { if(value < 0) { value = 0; @@ -352,12 +352,12 @@ void GWSetTotalStars(s16 value) GWGameStat.total_stars = value; } -void GWAddTotalStars(s16 amount) +void GWTotalStarsAdd(s16 amount) { - GWSetTotalStars(GWGameStat.total_stars+amount); + GWTotalStarsSet(GWGameStat.total_stars+amount); } -u16 GWGetTotalStars(void) +u16 GWTotalStarsGet(void) { return GWGameStat.total_stars; } \ No newline at end of file