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

Merge pull request #70 from gamemasterplc/main

Browse source 
Label board/spaces.c
This commit is contained in:
gamemasterplc 2023-12-28 21:54:34 -06:00 • committed by GitHub
commit ecdc403d69
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 91 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

124
config/GMPE01_00/symbols.txt
View file

@ -1223,7 +1223,7 @@ BoardModelInit = .text:0x8006D308; // type:function size:0xF0
BoardModelKillAll = .text:0x8006D3F8; // type:function size:0xA0
ModelMgrObjFunc = .text:0x8006D498; // type:function size:0x70 scope:local
stubfn_8006D508 = .text:0x8006D508; // type:function size:0x4
BoardModelUpdateVisibility = .text:0x8006D50C; // type:function size:0xCC
BoardModelVisibilityUpdate = .text:0x8006D50C; // type:function size:0xCC
BoardModelShowSetAll = .text:0x8006D5D8; // type:function size:0x90
BoardModelPosSetAll = .text:0x8006D668; // type:function size:0x70
BoardModelCameraSetAll = .text:0x8006D6D8; // type:function size:0x7C
@ -1276,8 +1276,8 @@ BoardModelScaleSet = .text:0x8006F338; // type:function size:0x78
BoardModelPosGet = .text:0x8006F3B0; // type:function size:0x74
BoardModelRotGet = .text:0x8006F424; // type:function size:0x74
BoardModelScaleGet = .text:0x8006F498; // type:function size:0x74
fn_8006F50C = .text:0x8006F50C; // type:function size:0x60
fn_8006F56C = .text:0x8006F56C; // type:function size:0x4C
BoardModelVisibilitySet = .text:0x8006F50C; // type:function size:0x60
BoardModelVisibilityGet = .text:0x8006F56C; // type:function size:0x4C
BoardModelCameraSet = .text:0x8006F5B8; // type:function size:0x64
BoardModelLayerSet = .text:0x8006F61C; // type:function size:0x64
BoardModelLayerGet = .text:0x8006F680; // type:function size:0x48
@ -1372,48 +1372,48 @@ fn_8007382C = .text:0x8007382C; // type:function size:0x374
fn_80073BA0 = .text:0x80073BA0; // type:function size:0x24
fn_80073BC4 = .text:0x80073BC4; // type:function size:0x400
fn_80073FC4 = .text:0x80073FC4; // type:function size:0x30
fn_80073FF4 = .text:0x80073FF4; // type:function size:0x8
fn_80073FFC = .text:0x80073FFC; // type:function size:0x8
fn_80074004 = .text:0x80074004; // type:function size:0x8
BoardSpaceExecPassEvent = .text:0x8007400C; // type:function size:0x48
fn_80074054 = .text:0x80074054; // type:function size:0x60
fn_800740B4 = .text:0x800740B4; // type:function size:0x10
fn_800740C4 = .text:0x800740C4; // type:function size:0x44
fn_80074108 = .text:0x80074108; // type:function size:0x18
fn_80074120 = .text:0x80074120; // type:function size:0x18
fn_80074138 = .text:0x80074138; // type:function size:0x48
fn_80074180 = .text:0x80074180; // type:function size:0x48
fn_800741C8 = .text:0x800741C8; // type:function size:0x48
fn_80074210 = .text:0x80074210; // type:function size:0x8C
fn_8007429C = .text:0x8007429C; // type:function size:0x2C8
fn_80074564 = .text:0x80074564; // type:function size:0x8C
fn_800745F0 = .text:0x800745F0; // type:function size:0xA0
fn_80074690 = .text:0x80074690; // type:function size:0x134
fn_800747C4 = .text:0x800747C4; // type:function size:0x134
fn_800748F8 = .text:0x800748F8; // type:function size:0x148
fn_80074A40 = .text:0x80074A40; // type:function size:0x104
fn_80074B44 = .text:0x80074B44; // type:function size:0x110
fn_80074C54 = .text:0x80074C54; // type:function size:0x1FC
fn_80074E50 = .text:0x80074E50; // type:function size:0x1BC
fn_8007500C = .text:0x8007500C; // type:function size:0x4AC
fn_800754B8 = .text:0x800754B8; // type:function size:0x344
fn_800757FC = .text:0x800757FC; // type:function size:0x9C
fn_80075898 = .text:0x80075898; // type:function size:0xF0
fn_80075988 = .text:0x80075988; // type:function size:0x1C
fn_800759A4 = .text:0x800759A4; // type:function size:0x3C
fn_800759E0 = .text:0x800759E0; // type:function size:0x110
fn_80075AF0 = .text:0x80075AF0; // type:function size:0x474
fn_80075F64 = .text:0x80075F64; // type:function size:0x2A4
fn_80076208 = .text:0x80076208; // type:function size:0x180
fn_80076388 = .text:0x80076388; // type:function size:0x268
fn_800765F0 = .text:0x800765F0; // type:function size:0x5C
fn_8007664C = .text:0x8007664C; // type:function size:0x48
fn_80076694 = .text:0x80076694; // type:function size:0x9E8
fn_8007707C = .text:0x8007707C; // type:function size:0x174
fn_800771F0 = .text:0x800771F0; // type:function size:0x2C
fn_8007721C = .text:0x8007721C; // type:function size:0xD0
fn_800772EC = .text:0x800772EC; // type:function size:0x750
fn_80077A3C = .text:0x80077A3C; // type:function size:0x70
BoardSpaceWalkEventFuncSet = .text:0x80073FF4; // type:function size:0x8
BoardSpaceWalkMiniEventFuncSet = .text:0x80073FFC; // type:function size:0x8
BoardSpaceLandEventFuncSet = .text:0x80074004; // type:function size:0x8
BoardSpaceWalkEventExec = .text:0x8007400C; // type:function size:0x48
BoardSpaceWalkMiniEventExec = .text:0x80074054; // type:function size:0x60
BoardSpaceCountGet = .text:0x800740B4; // type:function size:0x10
BoardSpaceGet = .text:0x800740C4; // type:function size:0x44
BoardSpaceAttrSet = .text:0x80074108; // type:function size:0x18
BoardSpaceAttrReset = .text:0x80074120; // type:function size:0x18
BoardSpaceFlagGet = .text:0x80074138; // type:function size:0x48
BoardSpaceTypeGet = .text:0x80074180; // type:function size:0x48
BoardSpaceTypeSet = .text:0x800741C8; // type:function size:0x48
BoardSpacePosGet = .text:0x80074210; // type:function size:0x8C
BoardSpaceDirPosGet = .text:0x8007429C; // type:function size:0x2C8
BoardSpaceRotGet = .text:0x80074564; // type:function size:0x8C
BoardSpaceFlagSearch = .text:0x800745F0; // type:function size:0xA0
BoardSpaceFlagPosGet = .text:0x80074690; // type:function size:0x134
BoardSpaceLinkFlagSearch = .text:0x800747C4; // type:function size:0x134
BoardSpaceLinkGet = .text:0x800748F8; // type:function size:0x148
BoardSpaceLinkTargetGet = .text:0x80074A40; // type:function size:0x104
BoardSpaceLinkSearch = .text:0x80074B44; // type:function size:0x110
BoardSpaceTransformGet = .text:0x80074C54; // type:function size:0x1FC
BoardSpaceStarSet = .text:0x80074E50; // type:function size:0x1BC
BoardSpaceStarSetIndex = .text:0x8007500C; // type:function size:0x4AC
BoardSpaceStarNextGet = .text:0x800754B8; // type:function size:0x344
BoardSpaceStarRandomGet = .text:0x800757FC; // type:function size:0x9C
BoardSpaceStarMove = .text:0x80075898; // type:function size:0xF0
BoardSpaceStarGet = .text:0x80075988; // type:function size:0x1C
BoardSpaceStarCurrGet = .text:0x800759A4; // type:function size:0x3C
BoardSpaceStarCheck = .text:0x800759E0; // type:function size:0x110
BoardSpaceLandExec = .text:0x80075AF0; // type:function size:0x474
BoardSpaceWalkExec = .text:0x80075F64; // type:function size:0x2A4
BoardSpaceHiddenBlockExec = .text:0x80076208; // type:function size:0x180
BoardSpacePipeJumpExec = .text:0x80076388; // type:function size:0x268
BoardSpaceTypeForce = .text:0x800765F0; // type:function size:0x5C
BoardSpaceHide = .text:0x8007664C; // type:function size:0x48
DrawSpaces = .text:0x80076694; // type:function size:0x9E8 scope:local
BoardSpaceRead = .text:0x8007707C; // type:function size:0x174
BoardSpaceSetCamera = .text:0x800771F0; // type:function size:0x2C
BoardSpaceHiddenBlockSetNextPos = .text:0x8007721C; // type:function size:0xD0
BoardSpaceInit = .text:0x800772EC; // type:function size:0x750
BoardSpaceDestroy = .text:0x80077A3C; // type:function size:0x70
fn_80077AAC = .text:0x80077AAC; // type:function size:0x8
fn_80077AB4 = .text:0x80077AB4; // type:function size:0x8
fn_80077ABC = .text:0x80077ABC; // type:function size:0xD4
@ -5168,8 +5168,8 @@ lbl_80139B98 = .data:0x80139B98; // type:object size:0x30
lbl_80139BC8 = .data:0x80139BC8; // type:object size:0xB8
lbl_80139C80 = .data:0x80139C80; // type:object size:0x24
lbl_80139CA4 = .data:0x80139CA4; // type:object size:0x24
lbl_80139CC8 = .data:0x80139CC8; // type:object size:0xC
lbl_80139CD4 = .data:0x80139CD4; // type:object size:0xC
spaceImgIdx = .data:0x80139CC8; // type:object size:0xC scope:local
spaceHiliteImgIdx = .data:0x80139CD4; // type:object size:0xC scope:local
jumptable_80139CE0 = .data:0x80139CE0; // type:object size:0x28 scope:local
lbl_80139D08 = .data:0x80139D08; // type:object size:0x24
ItemPriceTbl = .data:0x80139D2C; // type:object size:0x10 scope:local
@ -5505,7 +5505,9 @@ choiceDisableTbl = .bss:0x8019D9B8; // type:object size:0x40 scope:local
lbl_8019D9F8 = .bss:0x8019D9F8; // type:object size:0xC data:float
lbl_8019DA04 = .bss:0x8019DA04; // type:object size:0xC data:4byte
SpaceData = .bss:0x8019DA10; // type:object size:0x7000 scope:local data:float
lbl_801A4A10 = .bss:0x801A4A10; // type:object size:0x50
boardSpaceStarTbl = .bss:0x801A4A10; // type:object size:0x10
spaceTex = .bss:0x801A4A20; // type:object size:0x20 scope:local
spaceHiliteTex = .bss:0x801A4A40; // type:object size:0x20 scope:local
lbl_801A4A60 = .bss:0x801A4A60; // type:object size:0x14 data:4byte
lbl_801A4A74 = .bss:0x801A4A74; // type:object size:0x1C
lbl_801A4A90 = .bss:0x801A4A90; // type:object size:0xC data:2byte
@ -5796,8 +5798,8 @@ lbl_801D36E8 = .sdata:0x801D36E8; // type:object size:0x8 data:4byte
lbl_801D36F0 = .sdata:0x801D36F0; // type:object size:0x8 data:byte
lbl_801D36F8 = .sdata:0x801D36F8; // type:object size:0x2 data:2byte
lbl_801D36FA = .sdata:0x801D36FA; // type:object size:0x6 data:2byte
lbl_801D3700 = .sdata:0x801D3700; // type:object size:0x2 data:2byte
lbl_801D3702 = .sdata:0x801D3702; // type:object size:0x6 data:2byte
spaceDrawMdl = .sdata:0x801D3700; // type:object size:0x2 scope:local data:2byte
starMdl = .sdata:0x801D3702; // type:object size:0x2 scope:local data:2byte
lbl_801D3708 = .sdata:0x801D3708; // type:object size:0x2 data:2byte
lbl_801D370A = .sdata:0x801D370A; // type:object size:0x1 data:byte
lbl_801D370C = .sdata:0x801D370C; // type:object size:0x8
@ -6303,18 +6305,18 @@ lbl_801D3FA6 = .sbss:0x801D3FA6; // type:object size:0x1 data:byte
lbl_801D3FA7 = .sbss:0x801D3FA7; // type:object size:0x1 data:byte
lbl_801D3FA8 = .sbss:0x801D3FA8; // type:object size:0x1 data:byte
lbl_801D3FA9 = .sbss:0x801D3FA9; // type:object size:0x7 data:byte
lbl_801D3FB0 = .sbss:0x801D3FB0; // type:object size:0x2 data:2byte
lbl_801D3FB4 = .sbss:0x801D3FB4; // type:object size:0x4 data:4byte
lbl_801D3FB8 = .sbss:0x801D3FB8; // type:object size:0x4 data:4byte
lbl_801D3FBC = .sbss:0x801D3FBC; // type:object size:0x4 data:4byte
lbl_801D3FC0 = .sbss:0x801D3FC0; // type:object size:0x4 data:4byte
spaceDrawF = .sbss:0x801D3FB0; // type:object size:0x2 scope:local data:2byte
spaceDrawCnt = .sbss:0x801D3FB4; // type:object size:0x4 scope:local data:4byte
walkEventFunc = .sbss:0x801D3FB8; // type:object size:0x4 scope:local data:4byte
walkMiniEventFunc = .sbss:0x801D3FBC; // type:object size:0x4 scope:local data:4byte
landEventFunc = .sbss:0x801D3FC0; // type:object size:0x4 scope:local data:4byte
lbl_801D3FC4 = .sbss:0x801D3FC4; // type:object size:0x8 data:2byte
lbl_801D3FCC = .sbss:0x801D3FCC; // type:object size:0x4 data:4byte
lbl_801D3FD0 = .sbss:0x801D3FD0; // type:object size:0x4 data:4byte
lbl_801D3FD4 = .sbss:0x801D3FD4; // type:object size:0x4 data:4byte
lbl_801D3FD8 = .sbss:0x801D3FD8; // type:object size:0x4 data:4byte
lbl_801D3FDC = .sbss:0x801D3FDC; // type:object size:0x8 data:4byte
lbl_801D3FE4 = .sbss:0x801D3FE4; // type:object size:0x2 data:2byte
spaceHiliteTexFmt = .sbss:0x801D3FCC; // type:object size:0x4 scope:local data:4byte
spaceTexFmt = .sbss:0x801D3FD0; // type:object size:0x4 scope:local data:4byte
spaceHiliteTexData = .sbss:0x801D3FD4; // type:object size:0x4 scope:local data:4byte
spaceTexData = .sbss:0x801D3FD8; // type:object size:0x4 scope:local data:4byte
spaceAttr = .sbss:0x801D3FDC; // type:object size:0x8 scope:local data:4byte
spaceCnt = .sbss:0x801D3FE4; // type:object size:0x4 scope:local data:2byte
lbl_801D3FE8 = .sbss:0x801D3FE8; // type:object size:0x4 data:4byte
lbl_801D3FEC = .sbss:0x801D3FEC; // type:object size:0x4 data:4byte
lbl_801D3FF0 = .sbss:0x801D3FF0; // type:object size:0x4 data:4byte

18
include/functions.h
View file

@ -52,7 +52,7 @@ s32 rand8(void);
void BoardCameraTargetSetModel(s16 model);
void BoardCameraStartMotion2(s16, Vec*, s32, f32, f32, s32);
void BoardCameraMotionWait(void);
void fn_80074210(s32, s32, Vec*);
void BoardSpacePosGet(s32, s32, Vec*);
void fn_8007A360(s32);
void fn_8007F894(void);
s16 fn_80083F84(void);
@ -63,7 +63,7 @@ void fn_8008853C(s32);
void fn_800B42B4(s32);
void fn_80082AAC(s32);
void fn_800B4264(s32, s32, s32);
void fn_8007500C(s32);
void BoardSpaceStarSetIndex(s32);
void BoardModelRotYSet(s32, f32);
f32 BoardModelRotYGet(s32);
void BoardModelLayerSet(s16, s32);
@ -80,13 +80,13 @@ void BoardModelMotionSpeedSet(s16, f32);
void BoardModelPosSetV(s16, void*);
void BoardModelPosSet(s16, f32, f32, f32);
s32 BoardModelRotSetV(s16 arg0, Vec* arg1);
void fn_8006F50C(s16, s32);
void fn_80073FF4(void*);
void fn_80073FFC(void*);
void fn_80074004(void*);
s32 fn_800745F0(s32, s32);
void fn_800772EC(s32);
void fn_80077A3C(void);
void BoardModelVisibilitySet(s16, s32);
void BoardSpaceWalkEventFuncSet(void*);
void BoardSpaceWalkMiniEventFuncSet(void*);
void BoardSpaceLandEventFuncSet(void*);
s32 BoardSpaceFlagSearch(s32, s32);
void BoardSpaceInit(s32);
void BoardSpaceDestroy(void);
void fn_80077AAC(s16);
void fn_8007A83C(s16);
void fn_80083EDC(s16);

18
src/REL/w10Dll/w10Dll.c
View file

@ -84,8 +84,8 @@ void fn_1_E0(void) {
fn_1_AEC();
fn_1_1D68();
lbl_1_bss_C = 0;
fn_800772EC(MAKE_DATA_NUM(DATADIR_W10, 0));
temp = fn_800745F0(0, 1);
BoardSpaceInit(MAKE_DATA_NUM(DATADIR_W10, 0));
temp = BoardSpaceFlagSearch(0, 1);
fn_800B4274(temp, 1);
lbl_1_data_28 = BoardModelCreate(MAKE_DATA_NUM(DATADIR_W10, 1), NULL, 0);
fn_8006DDE8(lbl_1_data_28, -1.0f);
@ -114,18 +114,18 @@ void fn_1_E0(void) {
BoardModelPosSetV(lbl_1_bss_10[i], temp_r30);
BoardModelRotSetV(lbl_1_bss_10[i], &temp_r30->unk0C);
BoardModelScaleSetV(lbl_1_bss_10[i], &temp_r30->unk18);
fn_8006F50C(lbl_1_bss_10[i], 1);
BoardModelVisibilitySet(lbl_1_bss_10[i], 1);
if (lbl_1_bss_8 != NULL) {
BoardModelMotionStart(lbl_1_bss_10[i], 0, 0x40000001);
}
}
}
fn_8006F50C(lbl_1_bss_10[0], 0);
BoardModelVisibilitySet(lbl_1_bss_10[0], 0);
lbl_1_bss_0->unk8 = BoardModelCreate(0x7000A, NULL, 0);
fn_8006F50C(lbl_1_bss_0->unk8, 0);
fn_80073FF4(&fn_1_90C);
fn_80073FFC(&fn_1_91C);
fn_80074004(&fn_1_908);
BoardModelVisibilitySet(lbl_1_bss_0->unk8, 0);
BoardSpaceWalkEventFuncSet(&fn_1_90C);
BoardSpaceWalkMiniEventFuncSet(&fn_1_91C);
BoardSpaceLandEventFuncSet(&fn_1_908);
fn_80083EDC(lbl_1_data_2C);
fn_800A4F6C(lbl_1_data_32);
fn_80077AAC(lbl_1_data_2E);
@ -173,7 +173,7 @@ void fn_1_6D8(void) {
BoardModelKill(lbl_1_bss_0->unk8);
fn_1_1DEC();
HuWinKill(lbl_1_bss_E);
fn_80077A3C();
BoardSpaceDestroy();
}
void fn_1_8C0(void) {

20
src/REL/w10Dll/w10Dll3.c
View file

@ -31,8 +31,8 @@ void fn_1_E1C(void) {
void fn_1_E44(void) {
fn_1_BA0(0x2E0008);
fn_1_BA0(0x2E0009);
fn_8007500C(0);
fn_8006F50C(lbl_1_data_2C, 1);
BoardSpaceStarSetIndex(0);
BoardModelVisibilitySet(lbl_1_data_2C, 1);
}
void fn_1_E94(void) {
@ -118,7 +118,7 @@ void fn_1_11A0(void) {
s32 temp;
fn_1_BA0(0x2E0019);
temp = fn_800745F0(0, 1);
temp = BoardSpaceFlagSearch(0, 1);
fn_800B4274(temp, 0);
}
@ -126,7 +126,7 @@ void fn_1_11EC(void) {
s32 temp;
fn_1_BA0(0x2E001A);
temp = fn_800745F0(0, 1);
temp = BoardSpaceFlagSearch(0, 1);
fn_800B4274(temp, 0);
fn_800B42B4(0);
}
@ -182,8 +182,8 @@ void fn_1_13A4(void) {
fn_1_BA0(0x2E002B);
sp8.x = -33.0f;
sp8.y = sp8.z = 0.0f;
temp_r3_2 = fn_800745F0(0, 0x80000);
fn_80074210(0, temp_r3_2, &sp14);
temp_r3_2 = BoardSpaceFlagSearch(0, 0x80000);
BoardSpacePosGet(0, temp_r3_2, &sp14);
BoardModelPosSetV(lbl_1_bss_0->unk8, &sp14);
BoardCameraStartMotion2(lbl_1_bss_0->unk8, &sp8, 0, 3200.0f, -1.0f, 0x1E);
BoardCameraMotionWait();
@ -191,8 +191,8 @@ void fn_1_13A4(void) {
fn_8007A360(temp_r3_2);
BoardCameraStartMotion2(lbl_1_bss_0->unk8, &sp8, 0, 3200.0f, -1.0f, 0x1E);
BoardCameraMotionWait();
temp_r3_2 = fn_800745F0(0, 0x10000000);
fn_80074210(0, temp_r3_2, &sp14);
temp_r3_2 = BoardSpaceFlagSearch(0, 0x10000000);
BoardSpacePosGet(0, temp_r3_2, &sp14);
BoardModelPosSetV(lbl_1_bss_0->unk8, &sp14);
BoardCameraStartMotion2(lbl_1_bss_0->unk8, &sp8, 0, 3200.0f, -1.0f, 0x1E);
BoardCameraMotionWait();
@ -200,8 +200,8 @@ void fn_1_13A4(void) {
fn_8007F894();
BoardCameraStartMotion2(lbl_1_bss_0->unk8, &sp8, 0, 3200.0f, -1.0f, 0x1E);
BoardCameraMotionWait();
temp_r3_2 = fn_800745F0(0, 0x08000000);
fn_80074210(0, temp_r3_2, &sp14);
temp_r3_2 = BoardSpaceFlagSearch(0, 0x08000000);
BoardSpacePosGet(0, temp_r3_2, &sp14);
BoardModelPosSetV(lbl_1_bss_0->unk8, &sp14);
BoardCameraStartMotion2(lbl_1_bss_0->unk8, &sp8, 0, 3200.0f, -1.0f, 0x1E);
BoardCameraMotionWait();