diff --git a/config/GMPE01_00/symbols.txt b/config/GMPE01_00/symbols.txt index f23b73ff..36eb5b19 100644 --- a/config/GMPE01_00/symbols.txt +++ b/config/GMPE01_00/symbols.txt @@ -1182,9 +1182,9 @@ 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 +BoardPlayerMotBlendSet = .text:0x80067C90; // type:function size:0x5A0 +BoardPlayerMotBlendExec = .text:0x80068230; // type:function size:0x51C +BoardPlayerMotBlendCheck = .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 @@ -1394,7 +1394,7 @@ BoardSpaceLinkTypeListGet = .text:0x800748F8; // type:function size:0x148 BoardSpaceLinkTargetListGet = .text:0x80074A40; // type:function size:0x104 BoardSpaceLinkTypeSearch = .text:0x80074B44; // type:function size:0x110 BoardSpaceLinkTransformGet = .text:0x80074C54; // type:function size:0x1FC -BoardSpaceStarSet = .text:0x80074E50; // type:function size:0x1BC +BoardSpaceHostSet = .text:0x80074E50; // type:function size:0x1BC BoardSpaceStarSetIndex = .text:0x8007500C; // type:function size:0x4AC BoardSpaceStarGetNext = .text:0x800754B8; // type:function size:0x344 BoardSpaceStarGetRandom = .text:0x800757FC; // type:function size:0x9C @@ -1541,23 +1541,23 @@ fn_80083D40 = .text:0x80083D40; // type:function size:0xD4 fn_80083E14 = .text:0x80083E14; // type:function size:0x38 fn_80083E4C = .text:0x80083E4C; // type:function size:0x48 fn_80083E94 = .text:0x80083E94; // type:function size:0x48 -fn_80083EDC = .text:0x80083EDC; // type:function size:0xA8 +BoardStarHostRestore = .text:0x80083EDC; // type:function size:0xA8 BoardStarHostMdlGet = .text:0x80083F84; // type:function size:0x8 BoardStarExec = .text:0x80083F8C; // type:function size:0xCC -fn_80084058 = .text:0x80084058; // type:function size:0x8F4 -fn_8008494C = .text:0x8008494C; // type:function size:0x84 -fn_800849D0 = .text:0x800849D0; // type:function size:0x160 -fn_80084B30 = .text:0x80084B30; // type:function size:0x144 -fn_80084C74 = .text:0x80084C74; // type:function size:0x10C -fn_80084D80 = .text:0x80084D80; // type:function size:0x180 -fn_80084F00 = .text:0x80084F00; // type:function size:0x204 -fn_80085104 = .text:0x80085104; // type:function size:0x38 -fn_8008513C = .text:0x8008513C; // type:function size:0xB4 -fn_800851F0 = .text:0x800851F0; // type:function size:0x40 -fn_80085230 = .text:0x80085230; // type:function size:0x31C -fn_8008554C = .text:0x8008554C; // type:function size:0x628 -fn_80085B74 = .text:0x80085B74; // type:function size:0x130 -fn_80085CA4 = .text:0x80085CA4; // type:function size:0x24 +ExecStar = .text:0x80084058; // type:function size:0x8F4 scope:local +DestroyStar = .text:0x8008494C; // type:function size:0x84 scope:local +GiveStarMain = .text:0x800849D0; // type:function size:0x160 scope:local +UpdateStarAngle = .text:0x80084B30; // type:function size:0x144 scope:local +InitGiveStar = .text:0x80084C74; // type:function size:0x10C scope:local +MoveGiveStar = .text:0x80084D80; // type:function size:0x180 scope:local +ShrinkGiveStar = .text:0x80084F00; // type:function size:0x204 scope:local +StopGiveStar = .text:0x80085104; // type:function size:0x38 scope:local +InitGiveStarEff = .text:0x8008513C; // type:function size:0xB4 scope:local +KillGiveStarEff = .text:0x800851F0; // type:function size:0x40 scope:local +BoardStarGive = .text:0x80085230; // type:function size:0x31C +BoardStarShowNext = .text:0x8008554C; // type:function size:0x628 +ShowNextUpdate = .text:0x80085B74; // type:function size:0x130 scope:local +HideNextHost = .text:0x80085CA4; // type:function size:0x24 scope:local fn_80085CC8 = .text:0x80085CC8; // type:function size:0x1EC fn_80085EB4 = .text:0x80085EB4; // type:function size:0x38 fn_80085EEC = .text:0x80085EEC; // type:function size:0x84 @@ -5160,7 +5160,7 @@ 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 diceJumpObj = .data:0x80139898; // type:object size:0x10 scope:local -animDoneF = .data:0x801398A8; // type:object size:0x10 scope:local +motDoneF = .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 @@ -5170,8 +5170,8 @@ 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: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 +boardMotTbl = .data:0x8013999C; // type:object size:0x20 scope:local +boardMotRevTbl = .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 @@ -5221,9 +5221,9 @@ coinDigitMdl = .data:0x8013A200; // type:object size:0x28 scope:local jumptable_8013A228 = .data:0x8013A228; // type:object size:0x1C scope:local lbl_8013A248 = .data:0x8013A248; // type:object size:0x58 lbl_8013A2A0 = .data:0x8013A2A0; // type:object size:0x10 -lbl_8013A2B0 = .data:0x8013A2B0; // type:object size:0x20 -lbl_8013A2D0 = .data:0x8013A2D0; // type:object size:0x48 -lbl_8013A318 = .data:0x8013A318; // type:object size:0x50 noreloc +boardStarSndTbl = .data:0x8013A2B0; // type:object size:0x20 +hostMotTbl = .data:0x8013A2D0; // type:object size:0x48 scope:local +starParmanParam = .data:0x8013A318; // type:object size:0x4E scope:local noreloc lbl_8013A368 = .data:0x8013A368; // type:object size:0xC data:4byte lbl_8013A374 = .data:0x8013A374; // type:object size:0xC data:4byte lbl_8013A380 = .data:0x8013A380; // type:object size:0xC @@ -5567,7 +5567,7 @@ lotteryMdl = .bss:0x801A4A90; // type:object size:0xC scope:local data:2byte coinF = .bss:0x801A4A9C; // type:object size:0xC scope:local coinMdl = .bss:0x801A4AA8; // type:object size:0x14 scope:local data:2byte warpPos = .bss:0x801A4AC0; // type:object size:0x10 scope:local -lbl_801A4AD0 = .bss:0x801A4AD0; // type:object size:0x10 data:4byte +starCharPos = .bss:0x801A4AD0; // type:object size:0xC scope:local data:4byte lbl_801A4AE0 = .bss:0x801A4AE0; // type:object size:0x10 itemMdlId = .bss:0x801A4AF0; // type:object size:0x18 scope:local pickerPos = .bss:0x801A4B08; // type:object size:0x30 scope:local @@ -5887,8 +5887,8 @@ lbl_801D375A = .sdata:0x801D375A; // type:object size:0x2 data:2byte lbl_801D375C = .sdata:0x801D375C; // type:object size:0x4 data:4byte lbl_801D3760 = .sdata:0x801D3760; // type:object size:0x8 lbl_801D3768 = .sdata:0x801D3768; // type:object size:0x8 data:2byte -lbl_801D3770 = .sdata:0x801D3770; // type:object size:0x2 data:2byte -lbl_801D3772 = .sdata:0x801D3772; // type:object size:0x6 data:2byte +starParman = .sdata:0x801D3770; // type:object size:0x2 scope:local data:2byte +hostMdl = .sdata:0x801D3772; // type:object size:0x2 scope:local data:2byte lbl_801D3778 = .sdata:0x801D3778; // type:object size:0x6 lbl_801D377E = .sdata:0x801D377E; // type:object size:0x6 lbl_801D3784 = .sdata:0x801D3784; // type:object size:0x2 data:2byte @@ -6418,12 +6418,12 @@ lbl_801D4060 = .sbss:0x801D4060; // type:object size:0x4 data:4byte lbl_801D4064 = .sbss:0x801D4064; // type:object size:0x4 data:4byte lbl_801D4068 = .sbss:0x801D4068; // type:object size:0x1 data:byte lbl_801D4069 = .sbss:0x801D4069; // type:object size:0x7 data:byte -lbl_801D4070 = .sbss:0x801D4070; // type:object size:0x4 data:4byte -lbl_801D4074 = .sbss:0x801D4074; // type:object size:0x4 data:4byte -lbl_801D4078 = .sbss:0x801D4078; // type:object size:0x4 data:4byte -lbl_801D407C = .sbss:0x801D407C; // type:object size:0x2 data:2byte -lbl_801D4080 = .sbss:0x801D4080; // type:object size:0x4 data:4byte -lbl_801D4084 = .sbss:0x801D4084; // type:object size:0x2 data:2byte +starProc = .sbss:0x801D4070; // type:object size:0x4 scope:local data:4byte +giveStarObj = .sbss:0x801D4074; // type:object size:0x4 scope:local data:4byte +starEffAnim = .sbss:0x801D4078; // type:object size:0x4 scope:local data:4byte +starDoneF = .sbss:0x801D407C; // type:object size:0x2 scope:local data:2byte +showNextObj = .sbss:0x801D4080; // type:object size:0x4 scope:local data:4byte +hostMot = .sbss:0x801D4084; // type:object size:0x4 scope:local data:2byte lbl_801D4088 = .sbss:0x801D4088; // type:object size:0x4 data:4byte lbl_801D408C = .sbss:0x801D408C; // type:object size:0x1 data:byte lbl_801D408D = .sbss:0x801D408D; // type:object size:0xB diff --git a/include/game/board/player.h b/include/game/board/player.h index c9c9bcd2..53f3893d 100644 --- a/include/game/board/player.h +++ b/include/game/board/player.h @@ -43,7 +43,7 @@ void BoardPlayerPosGet(s32, Vec*); void BoardPlayerCoinsSet(s32 player, s32 value); s32 BoardPlayerSizeGet(s32 player); void BoardPlayerAutoSizeSet(s32 player, s32 value); -void BoardPlayerMotionStart(s16, s32, s32); +void BoardPlayerMotionStart(s32, s32, s32); void BoardPlayerMotionShiftSet(s32 player, s32 arg1, float start, float end, u32 attr); void BoardPlayerRotYSet(s32 player, float rot_y); diff --git a/include/game/board/space.h b/include/game/board/space.h index f092160a..3c948eef 100644 --- a/include/game/board/space.h +++ b/include/game/board/space.h @@ -39,7 +39,7 @@ s32 BoardSpaceLinkTypeListGet(s32 layer, s32 index, s32 type, s16 *list); s32 BoardSpaceLinkTargetListGet(s32 layer, s32 target, s16 *list); s32 BoardSpaceLinkTypeSearch(s32 layer, s32 target, u16 type); s32 BoardSpaceLinkTransformGet(s32 flag, Vec *pos, Vec *rot, Vec *scale); -void BoardSpaceStarSet(s32 space); +void BoardSpaceHostSet(s32 space); void BoardSpaceStarSetIndex(s32 index); s32 BoardSpaceStarGetNext(void); s32 BoardSpaceStarGetRandom(s32 excl_pos); diff --git a/src/game/board/player.c b/src/game/board/player.c index 17786845..448a104b 100644 --- a/src/game/board/player.c +++ b/src/game/board/player.c @@ -10,7 +10,7 @@ //// #include "game/board/space.h" extern s32 BoardSpaceFlagPosGet(s32, s32, u32); -extern void BoardSpaceDirPosGet(s32, s32, Vec*); +extern void BoardSpaceCornerPosGet(s32, s32, Vec*); extern void BoardSpaceLandExec(s32, s16); extern s32 BoardSpaceFlagGet(s32, s16); extern s32 BoardSpaceHiddenBlockExec(s32, s16); @@ -86,8 +86,8 @@ s32 BoardPlayerItemAdd(s32, s32); s32 BoardPlayerItemRemove(s32, s32); s32 BoardPlayerItemFind(s32, s32); s32 BoardPlayerItemCount(s32); -void fn_80062D90(s32); -void BoardPlayerCurrSpacePosDirGet(s32, Vec*); +void BoardPlayerCornerPosSet(s32); +void BoardPlayerCornerPosGet(s32, Vec*); void BoardPlayerAmbSet(s32, f32, f32, f32); void BoardPlayerMtxSet(s32, Mtx); void BoardPlayerPosSetV(s32, Vec*); @@ -105,7 +105,6 @@ void BoardPlayerMotionCreate(s32, s32); void BoardPlayerMotionKill(s32, s32); void BoardPlayerMotionEndCheck(s32); void BoardPlayerMotionEndWait(s32); -void BoardPlayerMotionStart(s32, s32, s32); void BoardPlayerMotionShiftSet(s32, s32, f32, f32, u32); void BoardPlayerMotionSpeedSet(s32, f32); void BoardPlayerMotionTimeSet(s32, f32); @@ -148,7 +147,7 @@ s32 DoDebugMove(s32, s16*); s32 DoSparkSpace(s32, s16*); s32 ExecJunction(s32, s16*); s32 MegaPlayerPassFunc(s32, s16); -s32 BoardPlayerAnimBlendCheck(s32); +s32 BoardPlayerMotBlendCheck(s32); static HsfMaterial *playerMatCopy[4]; static s32 (*postTurnHook[4])(); @@ -167,7 +166,7 @@ static s16 suitPlayerMdl = -1; static s16 suitCurrMot = -1; static s32 diceJumpObj[4] = {0, 0, 0, 0}; -static s32 animDoneF[4] = {0, 0, 0, 0}; +static s32 motDoneF[4] = {0, 0, 0, 0}; static s16 bowserSuitMot[5] = {-1, -1, -1, -1, -1}; char* lbl_8013993C[] = { "eye1", @@ -231,7 +230,7 @@ void BoardPlayerInit(void) { for (var_r31 = 0; var_r31 < 4; var_r31++) { GWPlayer[var_r31].space_curr = temp_r30; - fn_80062D90(var_r31); + BoardPlayerCornerPosSet(var_r31); BoardPlayerSizeSet(var_r31, 0); GWPlayer[var_r31].color = 0; GWPlayer[var_r31].bowser_suit = 0; @@ -242,7 +241,7 @@ void BoardPlayerInit(void) { } for (var_r31 = 0; var_r31 < 4; var_r31++) { - fn_80062D90(var_r31); + BoardPlayerCornerPosSet(var_r31); if (BoardPlayerAutoSizeGet(var_r31) != 0) { BoardPlayerAutoSizeSet(var_r31, BoardPlayerAutoSizeGet(var_r31)); BoardStatusHammerShowSet(var_r31, 0); @@ -279,7 +278,7 @@ void BoardPlayerModelInit(void) { for (var_r31 = 0; var_r31 < 4; var_r31++) { preTurnHook[var_r31] = 0; postTurnHook[var_r31] = 0; - animDoneF[var_r31] = 0; + motDoneF[var_r31] = 0; diceJumpObj[var_r31] = 0; temp_r22 = &GWPlayer[var_r31]; temp_r27 = temp_r22; @@ -427,14 +426,14 @@ s32 BoardPlayerItemCount(s32 arg0) { return var_r30; } -void fn_80062D90(s32 arg0) { +void BoardPlayerCornerPosSet(s32 arg0) { Vec sp8; - BoardPlayerCurrSpacePosDirGet(arg0, &sp8); + BoardPlayerCornerPosGet(arg0, &sp8); BoardPlayerPosSetV(arg0, &sp8); } -void BoardPlayerCurrSpacePosDirGet(s32 arg0, Point3d* arg1) { +void BoardPlayerCornerPosGet(s32 arg0, Point3d* arg1) { s32 var_r31; s32 var_r30; s32 var_r29; @@ -452,7 +451,7 @@ void BoardPlayerCurrSpacePosDirGet(s32 arg0, Point3d* arg1) { var_r29 += 1; } } - BoardSpaceDirPosGet(temp_r28, var_r29, arg1); + BoardSpaceCornerPosGet(temp_r28, var_r29, arg1); } } @@ -970,10 +969,10 @@ void BoardPlayerZoomRestore(s32 arg0) { var_r31 = (var_r31 + 1) & 3; (void)var_r29; // } - BoardSpaceDirPosGet(temp_r27, var_r29, &sp18); - BoardPlayerAnimBlendSet(arg0, 0, 0xF); + BoardSpaceCornerPosGet(temp_r27, var_r29, &sp18); + BoardPlayerMotBlendSet(arg0, 0, 0xF); - while (BoardPlayerAnimBlendCheck(arg0) == 0) { + while (BoardPlayerMotBlendCheck(arg0) == 0) { HuPrcVSleep(); } BoardRotateDiceNumbers(arg0); diff --git a/src/game/board/space.c b/src/game/board/space.c index 963468c3..174090f4 100644 --- a/src/game/board/space.c +++ b/src/game/board/space.c @@ -304,7 +304,7 @@ s32 BoardSpaceLinkTransformGet(s32 flag, Vec *pos, Vec *rot, Vec *scale) return -1; } -void BoardSpaceStarSet(s32 space) +void BoardSpaceHostSet(s32 space) { s16 host_space; Vec pos; @@ -334,7 +334,7 @@ void BoardSpaceStarSetIndex(s32 index) BoardSpaceTypeSet(0, boardSpaceStarTbl[GWSystem.star_pos], 1); } GWSystem.star_pos = index & 0x7; - BoardSpaceStarSet(BoardSpaceStarGetCurr()); + BoardSpaceHostSet(BoardSpaceStarGetCurr()); space = BoardSpaceLinkFlagSearch(0, BoardSpaceStarGetCurr(), 0x04000000); BoardSpacePosGet(0, space, &pos); BoardModelPosSetV(StarPlatGetMdl(), &pos);