kobayashi90/marioparty4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Label hidden block and com path code

Browse source
This commit is contained in:
gamemasterplc 2024-01-16 20:38:55 -06:00
parent 6a973939d7
commit 8f30df6f7e
4 changed files with 48 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/GMPE01_00/splits.txt
View file

@ -447,7 +447,7 @@ game/board/ui.c:
.sbss start:0x801D40A8 end:0x801D40E0 .sbss start:0x801D40A8 end:0x801D40E0
.sdata2 start:0x801D59E0 end:0x801D5AA0 .sdata2 start:0x801D59E0 end:0x801D5AA0
game/board/hidden_block.c: game/board/block.c:
.text start:0x8008DF68 end:0x8008EE28 .text start:0x8008DF68 end:0x8008EE28
.rodata start:0x8011E200 end:0x8011E220 .rodata start:0x8011E200 end:0x8011E220
.data start:0x8013A608 end:0x8013A620 .data start:0x8013A608 end:0x8013A620

88
config/GMPE01_00/symbols.txt
View file

@ -1351,7 +1351,7 @@ CheckSwapUse = .text:0x80072370; // type:function size:0x198 scope:local
CheckBooUse = .text:0x80072508; // type:function size:0x7C scope:local CheckBooUse = .text:0x80072508; // type:function size:0x7C scope:local
CheckLampUse = .text:0x80072584; // type:function size:0x74 scope:local CheckLampUse = .text:0x80072584; // type:function size:0x74 scope:local
BoardComJunctionInputGet = .text:0x800725F8; // type:function size:0x304 BoardComJunctionInputGet = .text:0x800725F8; // type:function size:0x304
BoardComPlayerPathCheck = .text:0x800728FC; // type:function size:0xA8 BoardComBestPlayerFind = .text:0x800728FC; // type:function size:0xA8
BoardViewOverheadExec = .text:0x800729A4; // type:function size:0x134 BoardViewOverheadExec = .text:0x800729A4; // type:function size:0x134
BoardViewFocusGetPos = .text:0x80072AD8; // type:function size:0x3C BoardViewFocusGetPos = .text:0x80072AD8; // type:function size:0x3C
BoardViewFocusSet = .text:0x80072B14; // type:function size:0xF0 BoardViewFocusSet = .text:0x80072B14; // type:function size:0xF0
@ -1654,21 +1654,21 @@ UpdateItemWindow = .text:0x8008DA8C; // type:function size:0x350 scope:local
CreatePickerWindow = .text:0x8008DDDC; // type:function size:0x148 scope:local CreatePickerWindow = .text:0x8008DDDC; // type:function size:0x148 scope:local
KillPickerWindow = .text:0x8008DF24; // type:function size:0x44 scope:local KillPickerWindow = .text:0x8008DF24; // type:function size:0x44 scope:local
BoardBlockExec = .text:0x8008DF68; // type:function size:0x84 BoardBlockExec = .text:0x8008DF68; // type:function size:0x84
fn_8008DFEC = .text:0x8008DFEC; // type:function size:0x358 BlockProc = .text:0x8008DFEC; // type:function size:0x358 scope:local
fn_8008E344 = .text:0x8008E344; // type:function size:0x54 DestroyBlock = .text:0x8008E344; // type:function size:0x54 scope:local
fn_8008E398 = .text:0x8008E398; // type:function size:0x1F4 CreateBlockObj = .text:0x8008E398; // type:function size:0x1F4 scope:local
fn_8008E58C = .text:0x8008E58C; // type:function size:0x12C ExecBlockObj = .text:0x8008E58C; // type:function size:0x12C scope:local
fn_8008E6B8 = .text:0x8008E6B8; // type:function size:0x38 DestroyBlockObj = .text:0x8008E6B8; // type:function size:0x38 scope:local
fn_8008E6F0 = .text:0x8008E6F0; // type:function size:0x120 SpawnBlock = .text:0x8008E6F0; // type:function size:0x120 scope:local
fn_8008E810 = .text:0x8008E810; // type:function size:0xCC HitBlock = .text:0x8008E810; // type:function size:0xCC scope:local
fn_8008E8DC = .text:0x8008E8DC; // type:function size:0x140 OpenBlock = .text:0x8008E8DC; // type:function size:0x140 scope:local
fn_8008EA1C = .text:0x8008EA1C; // type:function size:0x2C SetBlockOpen = .text:0x8008EA1C; // type:function size:0x2C scope:local
fn_8008EA48 = .text:0x8008EA48; // type:function size:0x2C SetBlockStop = .text:0x8008EA48; // type:function size:0x2C scope:local
fn_8008EA74 = .text:0x8008EA74; // type:function size:0x48 WaitBlockHit = .text:0x8008EA74; // type:function size:0x48 scope:local
fn_8008EABC = .text:0x8008EABC; // type:function size:0x94 CreateCoinMdl = .text:0x8008EABC; // type:function size:0x94 scope:local
fn_8008EB50 = .text:0x8008EB50; // type:function size:0x9C KillCoinMdl = .text:0x8008EB50; // type:function size:0x9C scope:local
fn_8008EBEC = .text:0x8008EBEC; // type:function size:0x10C PopupCoin = .text:0x8008EBEC; // type:function size:0x10C scope:local
fn_8008ECF8 = .text:0x8008ECF8; // type:function size:0x130 PopupCoinExec = .text:0x8008ECF8; // type:function size:0x130 scope:local
fn_8008EE28 = .text:0x8008EE28; // type:function size:0x74 fn_8008EE28 = .text:0x8008EE28; // type:function size:0x74
fn_8008EE9C = .text:0x8008EE9C; // type:function size:0x1C fn_8008EE9C = .text:0x8008EE9C; // type:function size:0x1C
fn_8008EEB8 = .text:0x8008EEB8; // type:function size:0x6C fn_8008EEB8 = .text:0x8008EEB8; // type:function size:0x6C
@ -1983,20 +1983,20 @@ BoardPauseActiveCheck = .text:0x800B1708; // type:function size:0x34
BoardPauseReqCheck = .text:0x800B173C; // type:function size:0x12C BoardPauseReqCheck = .text:0x800B173C; // type:function size:0x12C
CheckPort = .text:0x800B1868; // type:function size:0x4C scope:local CheckPort = .text:0x800B1868; // type:function size:0x4C scope:local
RotateBox = .text:0x800B18B4; // type:function size:0xC0 scope:local RotateBox = .text:0x800B18B4; // type:function size:0xC0 scope:local
fn_800B1974 = .text:0x800B1974; // type:function size:0x60 SearchPathNodeSpace = .text:0x800B1974; // type:function size:0x60 scope:local
fn_800B19D4 = .text:0x800B19D4; // type:function size:0x180 InitPathNode = .text:0x800B19D4; // type:function size:0x180 scope:local
fn_800B1B54 = .text:0x800B1B54; // type:function size:0xE4 FindChildNode = .text:0x800B1B54; // type:function size:0xE4 scope:local
fn_800B1C38 = .text:0x800B1C38; // type:function size:0xB4 GetNumValidLinks = .text:0x800B1C38; // type:function size:0xB4 scope:local
fn_800B1CEC = .text:0x800B1CEC; // type:function size:0xD0 AddValidLinks = .text:0x800B1CEC; // type:function size:0xD0 scope:local
fn_800B1DBC = .text:0x800B1DBC; // type:function size:0x30 CheckPathSpace = .text:0x800B1DBC; // type:function size:0x30 scope:local
fn_800B1DEC = .text:0x800B1DEC; // type:function size:0xAC FindValidLink = .text:0x800B1DEC; // type:function size:0xAC scope:local
fn_800B1E98 = .text:0x800B1E98; // type:function size:0xF0 CheckEndSpace = .text:0x800B1E98; // type:function size:0xF0 scope:local
fn_800B1F88 = .text:0x800B1F88; // type:function size:0x74C BoardComPathReachCheck = .text:0x800B1F88; // type:function size:0x74C
fn_800B26D4 = .text:0x800B26D4; // type:function size:0x3E4 BoardComPathBestGet = .text:0x800B26D4; // type:function size:0x3E4
fn_800B2AB8 = .text:0x800B2AB8; // type:function size:0x65C BoardComPathLenGet = .text:0x800B2AB8; // type:function size:0x65C
fn_800B3114 = .text:0x800B3114; // type:function size:0x488 CheckPath = .text:0x800B3114; // type:function size:0x488 scope:local
fn_800B359C = .text:0x800B359C; // type:function size:0x45C BoardComPathW20BestGet = .text:0x800B359C; // type:function size:0x45C
fn_800B39F8 = .text:0x800B39F8; // type:function size:0x4E0 CheckW20Path = .text:0x800B39F8; // type:function size:0x4E0 scope:local
TutorialProcFunc = .text:0x800B3ED8; // type:function size:0x34 scope:local TutorialProcFunc = .text:0x800B3ED8; // type:function size:0x34 scope:local
BoardTutorialInit = .text:0x800B3F0C; // type:function size:0x80 BoardTutorialInit = .text:0x800B3F0C; // type:function size:0x80
BoardTutorialKill = .text:0x800B3F8C; // type:function size:0x4C BoardTutorialKill = .text:0x800B3F8C; // type:function size:0x4C
@ -5234,7 +5234,7 @@ statusSprPosTbl = .data:0x8013A4FC; // type:object size:0x88 scope:local data:fl
statusItemPosTbl = .data:0x8013A584; // type:object size:0x30 scope:local data:float statusItemPosTbl = .data:0x8013A584; // type:object size:0x30 scope:local data:float
itemMdlTbl = .data:0x8013A5B4; // type:object size:0x38 scope:local itemMdlTbl = .data:0x8013A5B4; // type:object size:0x38 scope:local
teamItemStatusPosTbl = .data:0x8013A5EC; // type:object size:0x18 scope:local data:float teamItemStatusPosTbl = .data:0x8013A5EC; // type:object size:0x18 scope:local data:float
lbl_8013A608 = .data:0x8013A608; // type:object size:0x18 coinMdl = .data:0x8013A608; // type:object size:0x14 scope:local
lbl_8013A620 = .data:0x8013A620; // type:object size:0x38 lbl_8013A620 = .data:0x8013A620; // type:object size:0x38
lbl_8013A658 = .data:0x8013A658; // type:object size:0x38 lbl_8013A658 = .data:0x8013A658; // type:object size:0x38
lbl_8013A690 = .data:0x8013A690; // type:object size:0x70 lbl_8013A690 = .data:0x8013A690; // type:object size:0x70
@ -5554,7 +5554,7 @@ lbl_801A4AE0 = .bss:0x801A4AE0; // type:object size:0x10
itemMdlId = .bss:0x801A4AF0; // type:object size:0x18 scope:local itemMdlId = .bss:0x801A4AF0; // type:object size:0x18 scope:local
pickerPos = .bss:0x801A4B08; // type:object size:0x30 scope:local pickerPos = .bss:0x801A4B08; // type:object size:0x30 scope:local
itemPosTemp = .bss:0x801A4B38; // type:object size:0x48 scope:local itemPosTemp = .bss:0x801A4B38; // type:object size:0x48 scope:local
lbl_801A4B80 = .bss:0x801A4B80; // type:object size:0x28 coinF = .bss:0x801A4B80; // type:object size:0x28 scope:local
lbl_801A4BA8 = .bss:0x801A4BA8; // type:object size:0xC data:4byte lbl_801A4BA8 = .bss:0x801A4BA8; // type:object size:0xC data:4byte
lbl_801A4BB4 = .bss:0x801A4BB4; // type:object size:0x34 data:float lbl_801A4BB4 = .bss:0x801A4BB4; // type:object size:0x34 data:float
lbl_801A4BE8 = .bss:0x801A4BE8; // type:object size:0x30 lbl_801A4BE8 = .bss:0x801A4BE8; // type:object size:0x30
@ -5575,8 +5575,10 @@ lbl_801A4D14 = .bss:0x801A4D14; // type:object size:0x10 data:2byte
lbl_801A4D24 = .bss:0x801A4D24; // type:object size:0x14 data:4byte lbl_801A4D24 = .bss:0x801A4D24; // type:object size:0x14 data:4byte
boxRot = .bss:0x801A4D38; // type:object size:0x20 scope:local boxRot = .bss:0x801A4D38; // type:object size:0x20 scope:local
padBoxPos = .bss:0x801A4D58; // type:object size:0xC scope:local data:float padBoxPos = .bss:0x801A4D58; // type:object size:0xC scope:local data:float
lbl_801A4D68 = .bss:0x801A4D68; // type:object size:0x500 data:byte pathNodeData = .bss:0x801A4D68; // type:object size:0x500 scope:local data:byte
lbl_801A5268 = .bss:0x801A5268; // type:object size:0x80 candidateNodes = .bss:0x801A5268; // type:object size:0x40 scope:local
startPathSpaceSearch = .bss:0x801A52A8; // type:object size:0x20 scope:local
startPathSpace = .bss:0x801A52C8; // type:object size:0x20 scope:local
boardTutorialData = .bss:0x801A52E8; // type:object size:0x10 data:4byte boardTutorialData = .bss:0x801A52E8; // type:object size:0x10 data:4byte
DriveInfo = .bss:0x801A5300; // type:object size:0x20 scope:local align:32 DriveInfo = .bss:0x801A5300; // type:object size:0x20 scope:local align:32
DriveBlock = .bss:0x801A5320; // type:object size:0x30 scope:local DriveBlock = .bss:0x801A5320; // type:object size:0x30 scope:local
@ -5872,8 +5874,8 @@ lbl_801D3784 = .sdata:0x801D3784; // type:object size:0x2 data:2byte
lbl_801D3786 = .sdata:0x801D3786; // type:object size:0xA lbl_801D3786 = .sdata:0x801D3786; // type:object size:0xA
itemPickupMdlId = .sdata:0x801D3790; // type:object size:0x2 scope:local data:2byte itemPickupMdlId = .sdata:0x801D3790; // type:object size:0x2 scope:local data:2byte
yourTurnSprGrp = .sdata:0x801D3792; // type:object size:0x2 scope:local data:2byte yourTurnSprGrp = .sdata:0x801D3792; // type:object size:0x2 scope:local data:2byte
lbl_801D3798 = .sdata:0x801D3798; // type:object size:0x2 data:2byte jumpMot = .sdata:0x801D3798; // type:object size:0x2 scope:local data:2byte
lbl_801D379A = .sdata:0x801D379A; // type:object size:0x6 data:2byte starMdl = .sdata:0x801D379A; // type:object size:0x2 scope:local data:2byte
lbl_801D37A0 = .sdata:0x801D37A0; // type:object size:0x8 lbl_801D37A0 = .sdata:0x801D37A0; // type:object size:0x8
lbl_801D37A8 = .sdata:0x801D37A8; // type:object size:0x8 lbl_801D37A8 = .sdata:0x801D37A8; // type:object size:0x8
lbl_801D37B0 = .sdata:0x801D37B0; // type:object size:0x2 data:2byte lbl_801D37B0 = .sdata:0x801D37B0; // type:object size:0x2 data:2byte
@ -6431,11 +6433,11 @@ pickerChoice = .sbss:0x801D40D9; // type:object size:0x1 scope:local data:byte
boardItemUser = .sbss:0x801D40DA; // type:object size:0x1 data:byte boardItemUser = .sbss:0x801D40DA; // type:object size:0x1 data:byte
itemTeamF = .sbss:0x801D40DB; // type:object size:0x1 scope:local data:byte itemTeamF = .sbss:0x801D40DB; // type:object size:0x1 scope:local data:byte
itemTeam = .sbss:0x801D40DC; // type:object size:0x1 scope:local data:byte itemTeam = .sbss:0x801D40DC; // type:object size:0x1 scope:local data:byte
lbl_801D40E0 = .sbss:0x801D40E0; // type:object size:0x4 data:4byte blockProc = .sbss:0x801D40E0; // type:object size:0x4 scope:local data:4byte
lbl_801D40E4 = .sbss:0x801D40E4; // type:object size:0x4 data:4byte blockObj = .sbss:0x801D40E4; // type:object size:0x4 scope:local data:4byte
lbl_801D40E8 = .sbss:0x801D40E8; // type:object size:0x4 data:float rotY = .sbss:0x801D40E8; // type:object size:0x4 scope:local data:float
lbl_801D40EC = .sbss:0x801D40EC; // type:object size:0x4 data:float scaleAngle = .sbss:0x801D40EC; // type:object size:0x4 scope:local data:float
lbl_801D40F0 = .sbss:0x801D40F0; // type:object size:0x8 data:float rotMax = .sbss:0x801D40F0; // type:object size:0x4 scope:local data:float
lbl_801D40F8 = .sbss:0x801D40F8; // type:object size:0x4 data:4byte lbl_801D40F8 = .sbss:0x801D40F8; // type:object size:0x4 data:4byte
lbl_801D40FC = .sbss:0x801D40FC; // type:object size:0x8 data:2byte lbl_801D40FC = .sbss:0x801D40FC; // type:object size:0x8 data:2byte
lbl_801D4104 = .sbss:0x801D4104; // type:object size:0x4 data:4byte lbl_801D4104 = .sbss:0x801D4104; // type:object size:0x4 data:4byte
@ -6547,8 +6549,8 @@ hostMdl = .sbss:0x801D4276; // type:object size:0x2 scope:local data:2byte
hostOldLayer = .sbss:0x801D4278; // type:object size:0x1 scope:local data:byte hostOldLayer = .sbss:0x801D4278; // type:object size:0x1 scope:local data:byte
mainScreenF = .sbss:0x801D4279; // type:object size:0x1 scope:local data:byte mainScreenF = .sbss:0x801D4279; // type:object size:0x1 scope:local data:byte
pauseQuitF = .sbss:0x801D427A; // type:object size:0x1 scope:local data:byte pauseQuitF = .sbss:0x801D427A; // type:object size:0x1 scope:local data:byte
lbl_801D4280 = .sbss:0x801D4280; // type:object size:0x2 data:2byte childNodeCnt = .sbss:0x801D4280; // type:object size:0x2 scope:local data:2byte
lbl_801D4282 = .sbss:0x801D4282; // type:object size:0x6 data:2byte numCandidates = .sbss:0x801D4282; // type:object size:0x2 scope:local data:2byte
gameStatCopy = .sbss:0x801D4288; // type:object size:0x4 scope:local data:4byte gameStatCopy = .sbss:0x801D4288; // type:object size:0x4 scope:local data:4byte
systemCopy = .sbss:0x801D428C; // type:object size:0x4 scope:local data:4byte systemCopy = .sbss:0x801D428C; // type:object size:0x4 scope:local data:4byte
playerCopy = .sbss:0x801D4290; // type:object size:0x4 scope:local data:4byte playerCopy = .sbss:0x801D4290; // type:object size:0x4 scope:local data:4byte

3
include/game/board/space.h
View file

@ -22,8 +22,7 @@ void BoardSpaceWalkMiniEventFuncSet(BoardSpaceEventFunc func);
void BoardSpaceLandEventFuncSet(BoardSpaceEventFunc func); void BoardSpaceLandEventFuncSet(BoardSpaceEventFunc func);
s32 BoardSpaceWalkEventExec(void); s32 BoardSpaceWalkEventExec(void);
s32 BoardSpaceWalkMiniEventExec(void); s32 BoardSpaceWalkMiniEventExec(void);
s16 BoardSpaceCountGet(s32 layer); s32 BoardSpaceCountGet(s32 layer);
s16 BoardSpaceCountGet(s32 layer);
BoardSpace *BoardSpaceGet(s32 layer, s32 index); BoardSpace *BoardSpaceGet(s32 layer, s32 index);
void BoardSpaceAttrSet(s32 layer, u32 attr); void BoardSpaceAttrSet(s32 layer, u32 attr);
void BoardSpaceAttrReset(s32 layer, u32 attr); void BoardSpaceAttrReset(s32 layer, u32 attr);

2
src/game/board/space.c
View file

@ -92,7 +92,7 @@ s32 BoardSpaceWalkMiniEventExec(void)
return ret; return ret;
} }
s16 BoardSpaceCountGet(s32 layer) s32 BoardSpaceCountGet(s32 layer)
{ {
return spaceCnt[layer]; return spaceCnt[layer];
} }