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

Merge pull request #118 from gamemasterplc/main

Browse source 
Label lottery and star code
This commit is contained in:
gamemasterplc 2024-01-17 11:40:20 -06:00 • committed by GitHub
commit 5dce62b8d6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 106 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/GMPE01_00/rels/w03Dll/symbols.txt
View file

@ -134,7 +134,7 @@ lbl_1_rodata_20 = .rodata:0x00000020; // type:object size:0x4 scope:local data:f
lbl_1_rodata_24 = .rodata:0x00000024; // type:object size:0x4 scope:local data:float
lbl_1_rodata_28 = .rodata:0x00000028; // type:object size:0x4 scope:local data:float
lbl_1_rodata_2C = .rodata:0x0000002C; // type:object size:0x4 scope:local data:float
lbl_1_rodata_30 = .rodata:0x00000030; // type:object size:0x4 data:float
lbl_1_rodata_30 = .rodata:0x00000030; // type:object size:0x4 scope:local data:float
lbl_1_rodata_38 = .rodata:0x00000038; // type:object size:0x8 data:double
lbl_1_rodata_40 = .rodata:0x00000040; // type:object size:0x8 data:double
lbl_1_rodata_48 = .rodata:0x00000048; // type:object size:0x4 data:float

154
config/GMPE01_00/symbols.txt
View file

@ -1116,8 +1116,8 @@ 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
BoardPlayerCurrSpacePosDirGet = .text:0x80062DD0; // type:function size:0xC4
BoardPlayerCornerPosSet = .text:0x80062D90; // type:function size:0x40
BoardPlayerCornerPosGet = .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
@ -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
@ -1446,44 +1446,44 @@ MoveShopItemChoice = .text:0x80079FCC; // type:function size:0x260 scope:local
UpdateShopItemChoice = .text:0x8007A22C; // type:function size:0x104 scope:local
GetShopItemChoiceInput = .text:0x8007A330; // type:function size:0x30 scope:local
BoardShopTutorialExec = .text:0x8007A360; // type:function size:0x4DC
fn_8007A83C = .text:0x8007A83C; // type:function size:0x8
fn_8007A844 = .text:0x8007A844; // type:function size:0x8
BoardLotteryHostSet = .text:0x8007A83C; // type:function size:0x8
BoardLotteryHostGet = .text:0x8007A844; // type:function size:0x8
BoardLotteryExec = .text:0x8007A84C; // type:function size:0x8C
fn_8007A8D8 = .text:0x8007A8D8; // type:function size:0x16C
fn_8007AA44 = .text:0x8007AA44; // type:function size:0x3B4
fn_8007ADF8 = .text:0x8007ADF8; // type:function size:0x1FC
fn_8007AFF4 = .text:0x8007AFF4; // type:function size:0x64
fn_8007B058 = .text:0x8007B058; // type:function size:0xB0
fn_8007B108 = .text:0x8007B108; // type:function size:0x798
fn_8007B8A0 = .text:0x8007B8A0; // type:function size:0x20C
fn_8007BAAC = .text:0x8007BAAC; // type:function size:0x1BC
fn_8007BC68 = .text:0x8007BC68; // type:function size:0xF0
fn_8007BD58 = .text:0x8007BD58; // type:function size:0x3C8
fn_8007C120 = .text:0x8007C120; // type:function size:0x140
fn_8007C260 = .text:0x8007C260; // type:function size:0x914
fn_8007CB74 = .text:0x8007CB74; // type:function size:0xC8
fn_8007CC3C = .text:0x8007CC3C; // type:function size:0x27C
fn_8007CEB8 = .text:0x8007CEB8; // type:function size:0x30C
fn_8007D1C4 = .text:0x8007D1C4; // type:function size:0x3AC
fn_8007D570 = .text:0x8007D570; // type:function size:0x6C
fn_8007D5DC = .text:0x8007D5DC; // type:function size:0x21C
fn_8007D7F8 = .text:0x8007D7F8; // type:function size:0x68
fn_8007D860 = .text:0x8007D860; // type:function size:0x288
fn_8007DAE8 = .text:0x8007DAE8; // type:function size:0x3DC
fn_8007DEC4 = .text:0x8007DEC4; // type:function size:0x14C
fn_8007E010 = .text:0x8007E010; // type:function size:0xD0
fn_8007E0E0 = .text:0x8007E0E0; // type:function size:0x160
fn_8007E240 = .text:0x8007E240; // type:function size:0xA8
fn_8007E2E8 = .text:0x8007E2E8; // type:function size:0x84
fn_8007E36C = .text:0x8007E36C; // type:function size:0x6B0
fn_8007EA1C = .text:0x8007EA1C; // type:function size:0x440
fn_8007EE5C = .text:0x8007EE5C; // type:function size:0x338
fn_8007F194 = .text:0x8007F194; // type:function size:0x68
fn_8007F1FC = .text:0x8007F1FC; // type:function size:0x4C0
fn_8007F6BC = .text:0x8007F6BC; // type:function size:0xA4
fn_8007F760 = .text:0x8007F760; // type:function size:0xFC
fn_8007F85C = .text:0x8007F85C; // type:function size:0x38
fn_8007F894 = .text:0x8007F894; // type:function size:0x2BC
BoardLotteryInit = .text:0x8007A8D8; // type:function size:0x16C
CreateModel = .text:0x8007AA44; // type:function size:0x3B4 scope:local
KillModel = .text:0x8007ADF8; // type:function size:0x1FC scope:local
BoardLotteryKill = .text:0x8007AFF4; // type:function size:0x64
DestroyLottery = .text:0x8007B058; // type:function size:0xB0 scope:local
ExecLottery = .text:0x8007B108; // type:function size:0x798 scope:local
DoMiniJumpUp = .text:0x8007B8A0; // type:function size:0x20C scope:local
DoMiniJumpDown = .text:0x8007BAAC; // type:function size:0x1BC scope:local
PayEnterFee = .text:0x8007BC68; // type:function size:0xF0 scope:local
ShowTicket = .text:0x8007BD58; // type:function size:0x3C8 scope:local
SetupTicket = .text:0x8007C120; // type:function size:0x140 scope:local
ExecBallGame = .text:0x8007C260; // type:function size:0x914 scope:local
SetBallPrize = .text:0x8007CB74; // type:function size:0xC8 scope:local
ExecBallPrize = .text:0x8007CC3C; // type:function size:0x27C scope:local
ExecScratchTicket = .text:0x8007CEB8; // type:function size:0x30C scope:local
ExecScratch = .text:0x8007D1C4; // type:function size:0x3AC scope:local
KillScratch = .text:0x8007D570; // type:function size:0x6C scope:local
ExecScratchSpr = .text:0x8007D5DC; // type:function size:0x21C scope:local
HideScratchSpr = .text:0x8007D7F8; // type:function size:0x68 scope:local
InitScratchSpr = .text:0x8007D860; // type:function size:0x288 scope:local
ExecScratchPick = .text:0x8007DAE8; // type:function size:0x3DC scope:local
InitScratchPick = .text:0x8007DEC4; // type:function size:0x14C scope:local
InitTicketPrizes = .text:0x8007E010; // type:function size:0xD0 scope:local
ExecTicketFocus = .text:0x8007E0E0; // type:function size:0x160 scope:local
ScratchTicketCheckDone = .text:0x8007E240; // type:function size:0xA8 scope:local
TicketGetPixel = .text:0x8007E2E8; // type:function size:0x84 scope:local
TicketUpdate = .text:0x8007E36C; // type:function size:0x6B0 scope:local
ExecCoinPrize = .text:0x8007EA1C; // type:function size:0x440 scope:local
ExecItemPrize = .text:0x8007EE5C; // type:function size:0x338 scope:local
KillCoin = .text:0x8007F194; // type:function size:0x68 scope:local
ExecPrize = .text:0x8007F1FC; // type:function size:0x4C0 scope:local
ExecLose = .text:0x8007F6BC; // type:function size:0xA4 scope:local
CreateLotteryWin = .text:0x8007F760; // type:function size:0xFC scope:local
KillLotteryWin = .text:0x8007F85C; // type:function size:0x38 scope:local
BoardLotteryTutorialExec = .text:0x8007F894; // type:function size:0x2BC
BoardLandBlueExec = .text:0x8007FB50; // type:function size:0x184
BoardLandRedExec = .text:0x8007FCD4; // type:function size:0x19C
BoardCoinChgCreate = .text:0x8007FE70; // type:function size:0x1E8
@ -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
@ -5211,8 +5211,8 @@ lbl_8013A11D = .data:0x8013A11D; // type:object size:0xE data:string
lbl_8013A12B = .data:0x8013A12B; // type:object size:0xA data:string
lbl_8013A135 = .data:0x8013A135; // type:object size:0xB data:string
jumptable_8013A140 = .data:0x8013A140; // type:object size:0x24 scope:local
cardObj = .data:0x8013A164; // type:object size:0x30 scope:local
cardPrize = .data:0x8013A194; // type:object size:0xC scope:local
ticketObj = .data:0x8013A164; // type:object size:0x30 scope:local
ticketPrize = .data:0x8013A194; // type:object size:0xC scope:local
handLastPos = .data:0x8013A1A0; // type:object size:0xC scope:local data:4byte
loseSoundTbl = .data:0x8013A1AC; // type:object size:0x20 scope:local
loseMotTbl = .data:0x8013A1CC; // 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
@ -5877,7 +5877,7 @@ gripMdl = .sdata:0x801D3736; // type:object size:0x4 scope:local data:2byte
turnMot = .sdata:0x801D373A; // type:object size:0x2 scope:local data:2byte
ballMdl = .sdata:0x801D373C; // type:object size:0x8 scope:local
loseMot = .sdata:0x801D3744; // type:object size:0x2 scope:local data:2byte
cardSprGrp = .sdata:0x801D3746; // type:object size:0x2 scope:local data:2byte
ticketSprGrp = .sdata:0x801D3746; // type:object size:0x2 scope:local data:2byte
warpSpringMdl = .sdata:0x801D3748; // type:object size:0x2 scope:local data:2byte
warpImpactMdl = .sdata:0x801D374A; // type:object size:0x2 scope:local data:2byte
warpImpactPlayer = .sdata:0x801D374C; // type:object size:0x4 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
@ -6390,7 +6390,7 @@ shopMdlPtr = .sbss:0x801D4000; // type:object size:0x4 scope:local data:4byte
shopMdlIdx = .sbss:0x801D4004; // type:object size:0x4 scope:local
lotteryProc = .sbss:0x801D4008; // type:object size:0x4 data:4byte
comInputDrawP = .sbss:0x801D400C; // type:object size:0x4 scope:local data:4byte
lotteryCardPickObj = .sbss:0x801D4010; // type:object size:0x4 scope:local data:4byte
lotteryTicketPickObj = .sbss:0x801D4010; // type:object size:0x4 scope:local data:4byte
handUpdateF = .sbss:0x801D4014; // type:object size:0x4 scope:local data:4byte
comInputPos = .sbss:0x801D4018; // type:object size:0x1 scope:local data:byte
comLotteryWinType = .sbss:0x801D4019; // type:object size:0x1 scope:local data:byte
@ -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

4
include/board_unsplit.h
View file

@ -8,7 +8,7 @@ void BoardCameraMotionStartEx(s16, Vec *, Vec *, f32, f32, s16);
void BoardCameraMotionWait(void);
void BoardSpacePosGet(s32, s32, Vec*);
void BoardShopTutorialExec(s32);
void fn_8007F894(void);
void BoardLotteryTutorialExec(void);
s16 BoardStarHostMdlGet(void);
void BoardStatusShowSetAll(s32);
void fn_800A4C88(void);
@ -41,7 +41,7 @@ s32 BoardSpaceFlagSearch(s32, s32);
void BoardSpaceInit(s32);
void BoardSpaceDestroy(void);
void BoardShopHostSet(s16);
void fn_8007A83C(s16);
void BoardLotteryHostSet(s16);
void fn_80083EDC(s16);
void fn_800A4F6C(s16);
void BoardTutorialHookSet(void*);

2
include/game/board/player.h
View file

@ -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);

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

@ -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);

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

@ -175,7 +175,7 @@ void BoardCreate(void) {
BoardSpaceLandEventFuncSet((void*)&fn_1_AF8);
fn_80083EDC(lbl_1_data_1E4);
fn_800A4F6C(lbl_1_data_1E6);
fn_8007A83C(lbl_1_data_1E6);
BoardLotteryHostSet(lbl_1_data_1E6);
BoardShopHostSet(lbl_1_data_1E6);
BoardJunctionMaskSet(0x0000C000);
BoardJunctionMaskSet(0x3000);

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

@ -130,7 +130,7 @@ void BoardCreate(void) {
fn_80083EDC(lbl_1_data_2C);
fn_800A4F6C(lbl_1_data_32);
BoardShopHostSet(lbl_1_data_2E);
fn_8007A83C(lbl_1_data_30);
BoardLotteryHostSet(lbl_1_data_30);
HuWinMesMaxSizeGet(1, spC, 0x2E003A);
lbl_1_bss_E = HuWinCreate(-10000.0f, 390.0f, spC[0], spC[1], 1);
HuWinMesSet(lbl_1_bss_E, 0x2E003A);

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

@ -197,7 +197,7 @@ void fn_1_13A4(void) {
BoardCameraMotionStartEx(lbl_1_bss_0->unk8, &sp8, NULL, 3200.0f, -1.0f, 30);
BoardCameraMotionWait();
fn_1_BA0(0x2E002E);
fn_8007F894();
BoardLotteryTutorialExec();
BoardCameraMotionStartEx(lbl_1_bss_0->unk8, &sp8, NULL, 3200.0f, -1.0f, 30);
BoardCameraMotionWait();
temp_r3_2 = BoardSpaceFlagSearch(0, 0x08000000);

8
src/game/board/main.c
View file

@ -662,8 +662,8 @@ static void CreateBoard(void)
BoardPlayerModelInit();
createFunc();
BoardLightSetExec();
fn_8007A8D8();
fn_80077ABC();
BoardLotteryInit();
BoardShopInit();
fn_800A4F7C();
BoardCameraInit();
BoardStatusCreate();
@ -711,8 +711,8 @@ static void DestroyBoard(void)
fn_80085EB4();
BoardStatusKill();
fn_800A5030();
fn_80077B90();
fn_8007AFF4();
BoardShopKill();
BoardLotteryKill();
BoardSpaceDestroy();
BoardPlayerModelKill();
if(destroyFunc) {

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

@ -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);

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

@ -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);