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

Label lottery code

Browse source
This commit is contained in:
gamemasterplc 2024-01-17 11:06:42 -06:00
parent 64bbeb6e79
commit d2caf8abf6
7 changed files with 53 additions and 53 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

86
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
@ -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
@ -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
@ -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
@ -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

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
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) {