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

Merge pull request #119 from gamemasterplc/main

Browse source 
Label dice roll stuff
This commit is contained in:
gamemasterplc 2024-01-17 13:16:42 -06:00 • committed by GitHub
commit 9b205bd0a8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 83 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

8
config/GMPE01_00/splits.txt
View file

@ -407,14 +407,14 @@ game/board/warp.c:
.sbss start:0x801D4028 end:0x801D4040
.sdata2 start:0x801D5730 end:0x801D5780
game/board/char_roulette.c:
game/board/char_wheel.c:
.text start:0x800816CC end:0x80082C90
.data start:0x8013A248 end:0x8013A2B0
.sdata start:0x801D3758 end:0x801D3760
.sbss start:0x801D4040 end:0x801D4060
.sdata2 start:0x801D5780 end:0x801D5810
game/board/mushroom_space.c:
game/board/mushroom.c:
.text start:0x80082C90 end:0x80083EDC
.sdata start:0x801D3760 end:0x801D3770
.sbss start:0x801D4060 end:0x801D4070
@ -429,7 +429,7 @@ game/board/star.c:
.sbss start:0x801D4070 end:0x801D4088
.sdata2 start:0x801D5898 end:0x801D5938
game/board/dice_roll.c:
game/board/roll.c:
.text start:0x80085CC8 end:0x80088368
.rodata start:0x8011E0B0 end:0x8011E118
.data start:0x8013A368 end:0x8013A408
@ -483,7 +483,7 @@ game/board/battle.c:
.sbss start:0x801D4178 end:0x801D41A0
.sdata2 start:0x801D5DE0 end:0x801D5E88
game/board/fortune_space.c:
game/board/fortune.c:
.text start:0x8009D148 end:0x8009DFD0
.rodata start:0x8011E380 end:0x8011E3A8
.data start:0x8013AB10 end:0x8013AB28

109
config/GMPE01_00/symbols.txt
View file

@ -1541,7 +1541,7 @@ 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
BoardStarHostRestore = .text:0x80083EDC; // type:function size:0xA8
BoardStarHostSet = .text:0x80083EDC; // type:function size:0xA8
BoardStarHostMdlGet = .text:0x80083F84; // type:function size:0x8
BoardStarExec = .text:0x80083F8C; // type:function size:0xCC
ExecStar = .text:0x80084058; // type:function size:0x8F4 scope:local
@ -1552,41 +1552,41 @@ 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
InitGiveStarEffect = .text:0x8008513C; // type:function size:0xB4 scope:local
KillGiveStarEffect = .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
fn_80085F70 = .text:0x80085F70; // type:function size:0x4C
fn_80085FBC = .text:0x80085FBC; // type:function size:0x490
fn_8008644C = .text:0x8008644C; // type:function size:0x280
fn_800866CC = .text:0x800866CC; // type:function size:0x1C8
fn_80086894 = .text:0x80086894; // type:function size:0x60
fn_800868F4 = .text:0x800868F4; // type:function size:0x130
fn_80086A24 = .text:0x80086A24; // type:function size:0x60
fn_80086A84 = .text:0x80086A84; // type:function size:0x7E4
fn_80087268 = .text:0x80087268; // type:function size:0x40
fn_800872A8 = .text:0x800872A8; // type:function size:0x90
fn_80087338 = .text:0x80087338; // type:function size:0xE0
fn_80087418 = .text:0x80087418; // type:function size:0x84
fn_8008749C = .text:0x8008749C; // type:function size:0x94
fn_80087530 = .text:0x80087530; // type:function size:0x8C
fn_800875BC = .text:0x800875BC; // type:function size:0x58
fn_80087614 = .text:0x80087614; // type:function size:0xC0
fn_800876D4 = .text:0x800876D4; // type:function size:0x200
fn_800878D4 = .text:0x800878D4; // type:function size:0xAC
fn_80087980 = .text:0x80087980; // type:function size:0x68
fn_800879E8 = .text:0x800879E8; // type:function size:0xB4
fn_80087A9C = .text:0x80087A9C; // type:function size:0x390
fn_80087E2C = .text:0x80087E2C; // type:function size:0x110
fn_80087F3C = .text:0x80087F3C; // type:function size:0x248
fn_80088184 = .text:0x80088184; // type:function size:0x110
fn_80088294 = .text:0x80088294; // type:function size:0x88
fn_8008831C = .text:0x8008831C; // type:function size:0x4C
BoardRollExec = .text:0x80085CC8; // type:function size:0x1EC
BoardRollKill = .text:0x80085EB4; // type:function size:0x38
BoardRollUPauseSet = .text:0x80085EEC; // type:function size:0x84
BoardRollWinDispSet = .text:0x80085F70; // type:function size:0x4C
RollMain = .text:0x80085FBC; // type:function size:0x490 scope:local
DiceCreate = .text:0x8008644C; // type:function size:0x280 scope:local
DoInput = .text:0x800866CC; // type:function size:0x1C8 scope:local
DiceWaitFull = .text:0x80086894; // type:function size:0x60 scope:local
DiceSetHit = .text:0x800868F4; // type:function size:0x130 scope:local
RollDestroy = .text:0x80086A24; // type:function size:0x60 scope:local
DiceMain = .text:0x80086A84; // type:function size:0x7E4 scope:local
DicePause = .text:0x80087268; // type:function size:0x40 scope:local
DicePauseAll = .text:0x800872A8; // type:function size:0x90 scope:local
BoardDiceEffectCreate = .text:0x80087338; // type:function size:0xE0
DiceHideEffect = .text:0x80087418; // type:function size:0x84 scope:local
BoardDicePauseAll = .text:0x8008749C; // type:function size:0x94
BoardDiceDoneCheck = .text:0x80087530; // type:function size:0x8C
BoardDiceStop = .text:0x800875BC; // type:function size:0x58
BoardDiceVisibleSet = .text:0x80087614; // type:function size:0xC0
BoardDiceValueSet = .text:0x800876D4; // type:function size:0x200
DiceDigitMain = .text:0x800878D4; // type:function size:0xAC scope:local
DiceDigitKill = .text:0x80087980; // type:function size:0x68 scope:local
DiceKill = .text:0x800879E8; // type:function size:0xB4 scope:local
DiceDigitMove = .text:0x80087A9C; // type:function size:0x390 scope:local
DiceDigitRotate = .text:0x80087E2C; // type:function size:0x110 scope:local
SameRollExec = .text:0x80087F3C; // type:function size:0x248 scope:local
GetBtnRoll = .text:0x80088184; // type:function size:0x110 scope:local
GetComBtnRoll = .text:0x80088294; // type:function size:0x88 scope:local
BoardRollTutorialSet = .text:0x8008831C; // type:function size:0x4C
BoardItemModelGet = .text:0x80088368; // type:function size:0x90
BoardItemNameGet = .text:0x800883F8; // type:function size:0x98
BoardStatusStopCheck = .text:0x80088490; // type:function size:0x48
@ -4627,7 +4627,8 @@ lbl_8011E010 = .rodata:0x8011E010; // type:object size:0x10
lbl_8011E020 = .rodata:0x8011E020; // type:object size:0x20 data:4byte
lbl_8011E040 = .rodata:0x8011E040; // type:object size:0x24
lbl_8011E064 = .rodata:0x8011E064; // type:object size:0x4C
lbl_8011E0B0 = .rodata:0x8011E0B0; // type:object size:0x68 data:4byte
lbl_8011E0B0 = .rodata:0x8011E0B0; // type:object size:0x10 data:4byte
lbl_8011E0C0 = .rodata:0x8011E0C0; // type:object size:0x54 data:4byte
lbl_8011E118 = .rodata:0x8011E118; // type:object size:0x38 data:4byte
lbl_8011E150 = .rodata:0x8011E150; // type:object size:0x3C data:4byte
lbl_8011E18C = .rodata:0x8011E18C; // type:object size:0x14 data:2byte
@ -5223,12 +5224,12 @@ lbl_8013A248 = .data:0x8013A248; // type:object size:0x58
lbl_8013A2A0 = .data:0x8013A2A0; // type:object size:0x10
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
lbl_8013A38C = .data:0x8013A38C; // type:object size:0x50
lbl_8013A3DC = .data:0x8013A3DC; // type:object size:0x2C
starEffParam = .data:0x8013A318; // type:object size:0x50 scope:local noreloc
diceObj = .data:0x8013A368; // type:object size:0xC scope:local data:4byte
diceDigitObj = .data:0x8013A374; // type:object size:0xC scope:local data:4byte
diceSndStatus = .data:0x8013A380; // type:object size:0xC scope:local
diceEffParam = .data:0x8013A38C; // type:object size:0x50 scope:local
diceDigitMdlTbl = .data:0x8013A3DC; // type:object size:0x28 scope:local
uiStatus = .data:0x8013A408; // type:object size:0x70 scope:local data:4byte
statusSprTbl = .data:0x8013A478; // type:object size:0x2C scope:local
statusSprPrioTbl = .data:0x8013A4A4; // type:object size:0x18 scope:local
@ -5568,7 +5569,7 @@ 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
starCharPos = .bss:0x801A4AD0; // type:object size:0xC scope:local data:4byte
lbl_801A4AE0 = .bss:0x801A4AE0; // type:object size:0x10
tutorialRoll = .bss:0x801A4AE0; // type:object size:0xC scope:local
itemMdlId = .bss:0x801A4AF0; // type:object size:0x18 scope:local
pickerPos = .bss:0x801A4B08; // type:object size:0x30 scope:local
itemPosTemp = .bss:0x801A4B38; // type:object size:0x48 scope:local
@ -5889,10 +5890,10 @@ lbl_801D3760 = .sdata:0x801D3760; // type:object size:0x8
lbl_801D3768 = .sdata:0x801D3768; // type:object size:0x8 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
lbl_801D3786 = .sdata:0x801D3786; // type:object size:0xA
diceMdl = .sdata:0x801D3778; // type:object size:0x6 scope:local
diceEff = .sdata:0x801D377E; // type:object size:0x6 scope:local
rollWin = .sdata:0x801D3784; // type:object size:0x2 scope:local data:2byte
lbl_801D3786 = .sdata:0x801D3786; // type:object size:0x3 scope:local data:string
itemPickupMdlId = .sdata:0x801D3790; // type:object size:0x2 scope:local data:2byte
yourTurnSprGrp = .sdata:0x801D3792; // type:object size:0x2 scope:local data:2byte
jumpMot = .sdata:0x801D3798; // type:object size:0x2 scope:local data:2byte
@ -6424,17 +6425,17 @@ 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
rollProc = .sbss:0x801D4088; // type:object size:0x4 scope:local data:4byte
tutorialRollF = .sbss:0x801D408C; // type:object size:0x1 scope:local data:byte
sameRollCoinStr = .sbss:0x801D408D; // type:object size:0x8 scope:local
lbl_801D4098 = .sbss:0x801D4098; // type:object size:0x4 data:4byte
lbl_801D409C = .sbss:0x801D409C; // type:object size:0x1 data:byte
lbl_801D409D = .sbss:0x801D409D; // type:object size:0x1 data:byte
lbl_801D409E = .sbss:0x801D409E; // type:object size:0x1 data:byte
lbl_801D409F = .sbss:0x801D409F; // type:object size:0x1 data:byte
lbl_801D40A0 = .sbss:0x801D40A0; // type:object size:0x1 data:byte
lbl_801D40A1 = .sbss:0x801D40A1; // type:object size:0x1 data:byte
lbl_801D40A2 = .sbss:0x801D40A2; // type:object size:0x6 data:byte
diceSize = .sbss:0x801D409C; // type:object size:0x1 scope:local data:byte
destMode = .sbss:0x801D409D; // type:object size:0x1 scope:local data:byte
maxRoll = .sbss:0x801D409E; // type:object size:0x1 scope:local data:byte
inputTimer = .sbss:0x801D409F; // type:object size:0x1 scope:local data:byte
numDice = .sbss:0x801D40A0; // type:object size:0x1 scope:local data:byte
rollPlayer = .sbss:0x801D40A1; // type:object size:0x1 scope:local data:byte
diceValue = .sbss:0x801D40A2; // type:object size:0x3 scope:local data:byte
statusProc = .sbss:0x801D40A8; // type:object size:0x4 scope:local data:4byte
itemWindowObj = .sbss:0x801D40AC; // type:object size:0x4 scope:local data:4byte
pickerObj = .sbss:0x801D40B0; // type:object size:0x4 scope:local data:4byte

8
configure.py
View file

@ -371,16 +371,16 @@ config.libs = [
Object(NonMatching, "game/board/lottery.c"),
Object(Matching, "game/board/basic_space.c"),
Object(Matching, "game/board/warp.c"),
Object(NonMatching, "game/board/char_roulette.c"),
Object(NonMatching, "game/board/mushroom_space.c"),
Object(NonMatching, "game/board/char_wheel.c"),
Object(NonMatching, "game/board/mushroom.c"),
Object(NonMatching, "game/board/star.c"),
Object(NonMatching, "game/board/dice_roll.c"),
Object(NonMatching, "game/board/roll.c"),
Object(NonMatching, "game/board/ui.c"),
Object(NonMatching, "game/board/block.c"),
Object(NonMatching, "game/board/item.c"),
Object(NonMatching, "game/board/bowser.c"),
Object(NonMatching, "game/board/battle.c"),
Object(NonMatching, "game/board/fortune_space.c"),
Object(NonMatching, "game/board/fortune.c"),
Object(NonMatching, "game/board/boo.c"),
Object(NonMatching, "game/board/mg_setup.c"),
Object(NonMatching, "game/board/boo_house.c"),

2
include/board_unsplit.h
View file

@ -42,7 +42,7 @@ void BoardSpaceInit(s32);
void BoardSpaceDestroy(void);
void BoardShopHostSet(s16);
void BoardLotteryHostSet(s16);
void fn_80083EDC(s16);
void BoardStarHostSet(s16);
void fn_800A4F6C(s16);
void BoardTutorialHookSet(void*);
void BoardTutorialBlockSetPos(s32, s32);

2
src/REL/w03Dll/main.c
View file

@ -173,7 +173,7 @@ void BoardCreate(void) {
BoardSpaceWalkEventFuncSet(&fn_1_910);
BoardSpaceWalkMiniEventFuncSet(&fn_1_A74);
BoardSpaceLandEventFuncSet((void*)&fn_1_AF8);
fn_80083EDC(lbl_1_data_1E4);
BoardStarHostSet(lbl_1_data_1E4);
fn_800A4F6C(lbl_1_data_1E6);
BoardLotteryHostSet(lbl_1_data_1E6);
BoardShopHostSet(lbl_1_data_1E6);

2
src/REL/w10Dll/main.c
View file

@ -127,7 +127,7 @@ void BoardCreate(void) {
BoardSpaceWalkEventFuncSet(&fn_1_90C);
BoardSpaceWalkMiniEventFuncSet(&fn_1_91C);
BoardSpaceLandEventFuncSet(&fn_1_908);
fn_80083EDC(lbl_1_data_2C);
BoardStarHostSet(lbl_1_data_2C);
fn_800A4F6C(lbl_1_data_32);
BoardShopHostSet(lbl_1_data_2E);
BoardLotteryHostSet(lbl_1_data_30);

2
src/REL/w10Dll/tutorial.c
View file

@ -198,7 +198,7 @@ int fn_1_1AAC(s16 arg0, s32 arg1) {
lbl_1_bss_0->unk0, arg0, arg1, lbl_1_bss_0->unk4, lbl_1_bss_0->unk6);
if (lbl_1_data_108[lbl_1_bss_0->unk0].unk0 != -1) {
if (arg0 == 5) {
fn_8008831C(&lbl_1_data_C6[lbl_1_bss_0->unk4++]);
BoardRollTutorialSet(&lbl_1_data_C6[lbl_1_bss_0->unk4++]);
}
if (arg0 == lbl_1_data_108[lbl_1_bss_0->unk0].unk0) {
void (*temp_r3_3)() = lbl_1_data_108[lbl_1_bss_0->unk0++].unk4;

12
src/game/board/basic_space.c
View file

@ -41,8 +41,8 @@ extern void BoardPlayerMotionEndWait(s32);
extern void BoardPlayerMotionShiftSet(s32, s32, f32, f32, s32);
extern void BoardPlayerCoinsAdd(s32, s32);
extern void BoardRotateDiceNumbers(s32);
extern void BoardCameraAnimBlendSet(s32, s16, s16);
extern s32 BoardPlayerAnimBlendCheck(s32);
extern void BoardCameraMotBlendSet(s32, s16, s16);
extern s32 BoardPlayerMotBlendCheck(s32);
static omObjData *coinChgObj[4] = {
NULL,
@ -72,8 +72,8 @@ void BoardLandBlueExec(s32 player, s32 space) {
BoardCameraViewSet(2);
BoardPlayerAnimBlendSet(player, 0, 15);
while (BoardPlayerAnimBlendCheck(player) == 0) {
BoardPlayerMotBlendSet(player, 0, 15);
while (BoardPlayerMotBlendCheck(player) == 0) {
HuPrcVSleep();
}
if (_CheckFlag(FLAG_ID_MAKE(1, 11)) != 0) {
@ -113,8 +113,8 @@ void BoardLandRedExec(s32 player, s32 space) {
BoardCameraViewSet(2);
omVibrate(player, 12, 6, 6);
BoardPlayerAnimBlendSet(player, 0, 15);
while (BoardPlayerAnimBlendCheck(player) == 0) {
BoardPlayerMotBlendSet(player, 0, 15);
while (BoardPlayerMotBlendCheck(player) == 0) {
HuPrcVSleep();
}
if (_CheckFlag(FLAG_ID_MAKE(1, 11)) != 0) {

14
src/game/board/player.c
View file

@ -58,11 +58,11 @@ extern void BoardModelAttrReset(s16, s32);
//// #include "game/board/tutorial.h"
extern BoardTutorialHookExec(s16, s32);
//// #include "game/board/com.h"
extern void fn_8007185C(s32, s32);
extern void BoardComUseItemSet(s32, s32);
//// #include "game/board/overhead.h"
extern void fn_800729A4(s32);
extern void fn_80072DA8(s32);
//// #include "game/board/dice_roll.h"
extern void BoardViewOverheadExec(s32);
extern void BoardViewMapExec(s32);
//// #include "game/board/roll.h"
extern s32 fn_80085CC8(s32);
extern void fn_80085EB4(void);
//// #include "game/chrman.h"
@ -733,7 +733,7 @@ void BoardPlayerPostTurnHookSet(s32 arg0, s32 (*arg1)()) {
void BoardPlayerTurnExec(s32 arg0) {
BoardPauseEnableSet(1);
fn_8007185C(arg0, -1);
BoardComUseItemSet(arg0, -1);
GWSystem.field31_bit4 = 0xF;
_ClearFlag(0x10016);
_ClearFlag(0x1000E);
@ -792,11 +792,11 @@ void BoardPlayerTurnRollExec(s32 arg0) {
break;
case -3:
fn_80085EB4();
fn_80072DA8(arg0);
BoardViewMapExec(arg0);
break;
case -4:
fn_80085EB4();
fn_800729A4(arg0);
BoardViewOverheadExec(arg0);
break;
}
} while (temp_r30 <= 0);

6
src/game/board/warp.c
View file

@ -66,9 +66,9 @@ void WarpProcess(void) {
HuAudFXPlay(842);
BoardCameraViewSet(3);
BoardCameraMotionWait();
BoardPlayerAnimBlendSet(curr_player, 0, 15);
BoardPlayerMotBlendSet(curr_player, 0, 15);
while (BoardPlayerAnimBlendCheck(curr_player) == 0) {
while (BoardPlayerMotBlendCheck(curr_player) == 0) {
HuPrcVSleep();
}
@ -232,7 +232,7 @@ static void WarpImpact(s32 player) {
BoardModelMotionStart(warpImpactMdl, 0, 0x40000001);
for (i = 0; i < warpImpactCnt; i++) {
s32 player = warpImpactPlayer[i];
s16 player = warpImpactPlayer[i];
omVibrate(player, 0xC, 4, 2);
BoardPlayerMotionStart(player, 6, 0x40000001);
}