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

Merge pull request #157 from mrshigure/boo

Browse source 
Matched board/boo
This commit is contained in:
gamemasterplc 2024-02-01 16:50:37 -06:00 • committed by GitHub
commit 8b48083d36
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 1514 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
config/GMPE01_00/splits.txt
View file

@ -497,7 +497,7 @@ game/board/boo.c:
.data start:0x8013AB28 end:0x8013AD00
.sdata start:0x801D37D8 end:0x801D37E8
.sbss start:0x801D41B0 end:0x801D41E8
.sdata2 start:0x801D5E98 end:0x801D5FA0
.sdata2 start:0x801D5E98 end:0x801D5FA8
game/board/mg_setup.c:
.text start:0x800A1A34 end:0x800A4F6C
@ -506,7 +506,7 @@ game/board/mg_setup.c:
.bss start:0x801A4C58 end:0x801A4CC8
.sdata start:0x801D37E8 end:0x801D37F0
.sbss start:0x801D41E8 end:0x801D4218
.sdata2 start:0x801D5FA0 end:0x801D6080
.sdata2 start:0x801D5FA8 end:0x801D6080
game/board/boo_house.c:
.text start:0x800A4F6C end:0x800A6EE4

2
configure.py
View file

@ -381,7 +381,7 @@ config.libs = [
Object(NonMatching, "game/board/bowser.c"),
Object(NonMatching, "game/board/battle.c"),
Object(NonMatching, "game/board/fortune.c"),
Object(NonMatching, "game/board/boo.c"),
Object(Matching, "game/board/boo.c"),
Object(NonMatching, "game/board/mg_setup.c"),
Object(NonMatching, "game/board/boo_house.c"),
Object(NonMatching, "game/board/start.c"),

18
include/game/board/boo.h Executable file
View file

@ -0,0 +1,18 @@
#ifndef _BOARD_BOO_H
#define _BOARD_BOO_H
#include "dolphin.h"
#include "game/object.h"
s16 BoardBooCreate(s32 arg0, Vec *arg1);
void BoardBooKill(void);
s32 BoardBooStealTypeSet(s32 arg0);
s32 BoardBooStealMain(void);
BOOL CheckBallCoinDone(void);
void TakeBallStar(void);
void ExecTakeBallStar(omObjData *arg0);
BOOL CheckTakeBallStarDone(void);
s32 BoardBooStealValueGet(s16 *arg0, s16 *arg1);
BOOL BoardBooStealLightCheck(void);
#endif

1
include/game/board/window.h
View file

@ -12,6 +12,7 @@ void BoardWinKillAll(void);
void BoardWinDestroy(void);
void BoardWinProc(void);
int BoardWinChoiceGet(void);
void BoardWinPause(void);
void BoardWinCreateChoice(s32 pos, u32 mess, s32 portrait, s32 choice);
void BoardWinCreate(s32 pos, u32 mess, s32 portrait);
void BoardWinInsertMesSet(u32 value, s32 index);

2
include/game/hsfman.h
View file

@ -222,7 +222,7 @@ void Hu3DShadowSizeSet(u16);
void Hu3DShadowExec(void);
s16 Hu3DProjectionCreate(void*, f32, f32, f32);
void Hu3DProjectionKill(s16);
void Hu3DProjectionPosSet(s16, Vec, Vec, Vec);
void Hu3DProjectionPosSet(s16, Vec*, Vec*, Vec*);
void Hu3DProjectionTPLvlSet(s16, f32);
void Hu3DMipMapSet(char*, s16, s32, f32);

1487
src/game/board/boo.c Executable file
View file

File diff suppressed because it is too large Load diff

8
src/game/hsfman.c
View file

@ -2063,10 +2063,10 @@ void Hu3DProjectionKill(s16 arg0) {
Hu3DProjection[arg0].unk_04 = NULL;
}
void Hu3DProjectionPosSet(s16 arg0, Vec arg1, Vec arg2, Vec arg3) {
Hu3DProjection[arg0].unk_14 = arg1;
Hu3DProjection[arg0].unk_20 = arg3;
Hu3DProjection[arg0].unk_2C = arg2;
void Hu3DProjectionPosSet(s16 arg0, Vec* arg1, Vec* arg2, Vec* arg3) {
Hu3DProjection[arg0].unk_14 = *arg1;
Hu3DProjection[arg0].unk_20 = *arg3;
Hu3DProjection[arg0].unk_2C = *arg2;
}
void Hu3DProjectionTPLvlSet(s16 arg0, f32 arg8) {