From 10cf70ab2293ffe4e1e10bd47322a0036233de0d Mon Sep 17 00:00:00 2001 From: gamemasterplc Date: Tue, 23 Jan 2024 20:59:22 -0600 Subject: [PATCH] Various Board Symbol Fixes --- config/GMPE01_00/symbols.txt | 8 ++++---- include/game/board/player.h | 2 +- src/game/board/player.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/GMPE01_00/symbols.txt b/config/GMPE01_00/symbols.txt index 59d67ca6..18cebb77 100644 --- a/config/GMPE01_00/symbols.txt +++ b/config/GMPE01_00/symbols.txt @@ -1166,7 +1166,7 @@ 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 +InitJunction = .text:0x80064DB0; // type:function size:0x634 scope:local 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 @@ -1208,15 +1208,15 @@ 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 +BoardPlayerSparkSet = .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 +BoardRollResizeCheck = .text:0x8006AF50; // type:function size:0x8 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 +MegaExecJump = .text:0x8006C5B4; // type:function size:0xA48 scope:local BoardPlayerCopyEyeMat = .text:0x8006CFFC; // type:function size:0x24C BoardPlayerCopyMat = .text:0x8006D248; // type:function size:0xC0 BoardModelInit = .text:0x8006D308; // type:function size:0xF0 diff --git a/include/game/board/player.h b/include/game/board/player.h index cce446c9..6ca4c694 100644 --- a/include/game/board/player.h +++ b/include/game/board/player.h @@ -16,7 +16,7 @@ extern s16 boardPlayerMdl[4]; -static inline s16 BoardPlayerHandicapGet(s32 player) +static inline s32 BoardPlayerHandicapGet(s32 player) { return GWPlayer[player].handicap; } diff --git a/src/game/board/player.c b/src/game/board/player.c index 0da38a9c..59e7ee51 100644 --- a/src/game/board/player.c +++ b/src/game/board/player.c @@ -1029,7 +1029,7 @@ static inline GetLinkCount(s32 playerIdx, s32 boardIdx) { return linkCount; } -void InitJunction(s32 arg0, s32 arg1, f32 arg8) { +static void InitJunction(s32 arg0, s32 arg1, f32 arg8) { Point3d sp68; Point3d sp5C; Point3d sp50;