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

Merge branch 'Rainchus:main' into main

Browse source
This commit is contained in:
CreateSource 2024-06-29 22:41:38 -04:00 • committed by GitHub
commit d17439b3c3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
InitBoard = .text:0x00000000; // type:function size:0x30 scope:local
ObjectSetup = .text:0x00000000; // type:function size:0x30 scope:local
_prolog = .text:0x00000030; // type:function size:0x64 scope:global
_epilog = .text:0x00000094; // type:function size:0x4C scope:global
BoardCreate = .text:0x000000E0; // type:function size:0x4BC

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

@ -1,4 +1,4 @@
InitBoard = .text:0x00000000; // type:function size:0x30 scope:local
ObjectSetup = .text:0x00000000; // type:function size:0x30 scope:local
_prolog = .text:0x00000030; // type:function size:0x64 scope:global
_epilog = .text:0x00000094; // type:function size:0x4C scope:global
BoardCreate = .text:0x000000E0; // type:function size:0x4F4

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

@ -1,4 +1,4 @@
InitBoard = .text:0x00000000; // type:function size:0x30 scope:local
ObjectSetup = .text:0x00000000; // type:function size:0x30 scope:local
_prolog = .text:0x00000030; // type:function size:0x64 scope:global
_epilog = .text:0x00000094; // type:function size:0x4C scope:global
BoardCreate = .text:0x000000E0; // type:function size:0x660

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

@ -1,4 +1,4 @@
InitBoard = .text:0x00000000; // type:function size:0x30 scope:local
ObjectSetup = .text:0x00000000; // type:function size:0x30 scope:local
_prolog = .text:0x00000030; // type:function size:0x64 scope:global
_epilog = .text:0x00000094; // type:function size:0x4C scope:global
BoardCreate = .text:0x000000E0; // type:function size:0x514

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

@ -1,4 +1,4 @@
InitBoard = .text:0x00000000; // type:function size:0x30 scope:local
ObjectSetup = .text:0x00000000; // type:function size:0x30 scope:local
_prolog = .text:0x00000030; // type:function size:0x64 scope:global
_epilog = .text:0x00000094; // type:function size:0x4C scope:global
BoardCreate = .text:0x000000E0; // type:function size:0x4D8

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

@ -1,4 +1,4 @@
InitBoard = .text:0x00000000; // type:function size:0x30 scope:local
ObjectSetup = .text:0x00000000; // type:function size:0x30 scope:local
_prolog = .text:0x00000030; // type:function size:0x64 scope:global
_epilog = .text:0x00000094; // type:function size:0x4C scope:global
BoardCreate = .text:0x000000E0; // type:function size:0x4C4

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

@ -1,4 +1,4 @@
InitBoard = .text:0x00000000; // type:function size:0x30 scope:local
ObjectSetup = .text:0x00000000; // type:function size:0x30 scope:local
_prolog = .text:0x00000030; // type:function size:0x64 scope:global
_epilog = .text:0x00000094; // type:function size:0x4C scope:global
BoardCreate = .text:0x000000E0; // type:function size:0x5F8

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

@ -1,4 +1,4 @@
InitBoard = .text:0x00000000; // type:function size:0x30 scope:local
ObjectSetup = .text:0x00000000; // type:function size:0x30 scope:local
_prolog = .text:0x00000030; // type:function size:0x64 scope:global
_epilog = .text:0x00000094; // type:function size:0x4C scope:global
BoardCreate = .text:0x000000E0; // type:function size:0x2B0

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

@ -1,4 +1,4 @@
InitBoard = .text:0x00000000; // type:function size:0x30 scope:local
ObjectSetup = .text:0x00000000; // type:function size:0x30 scope:local
_prolog = .text:0x00000030; // type:function size:0x64 scope:global
_epilog = .text:0x00000094; // type:function size:0x4C scope:global
BoardCreate = .text:0x000000E0; // type:function size:0x1D4

2
config/GMPE01_00/symbols.txt
View file

@ -999,7 +999,7 @@ HuRestartSystem = .text:0x8005AE34; // type:function size:0xDC
HuSoftResetCheck = .text:0x8005AF10; // type:function size:0xFC scope:local
HuSoftResetCountCheck = .text:0x8005B00C; // type:function size:0xCC scope:local
HuSoftResetPostProc = .text:0x8005B0D8; // type:function size:0x78 scope:local
BoardCommonInit = .text:0x8005B150; // type:function size:0x2E0
BoardObjectSetup = .text:0x8005B150; // type:function size:0x2E0
InitBoardFunc = .text:0x8005B430; // type:function size:0x64 scope:local
ExecBoardFunc = .text:0x8005B494; // type:function size:0x9C scope:local
KillBoardFunc = .text:0x8005B530; // type:function size:0xCC scope:local

2
include/REL/board_executor.h
View file

@ -14,7 +14,7 @@ typedef void (*VoidFunc)(void);
extern const VoidFunc _ctors[];
extern const VoidFunc _dtors[];
extern void BoardCommonInit(VoidFunc create, VoidFunc destroy);
extern void BoardObjectSetup(VoidFunc create, VoidFunc destroy);
extern void BoardCreate(void);
extern void BoardDestroy(void);

6
src/REL/board_executor.c
View file

@ -1,8 +1,8 @@
#include "REL/board_executor.h"
#include "rel_sqrt_consts.h"
static void InitBoard(void) {
BoardCommonInit(BoardCreate, BoardDestroy);
static void ObjectSetup(void) {
BoardObjectSetup(BoardCreate, BoardDestroy);
}
s32 _prolog(void) {
@ -11,7 +11,7 @@ s32 _prolog(void) {
(**ctors)();
ctors++;
}
InitBoard();
ObjectSetup();
return 0;
}

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

@ -80,7 +80,7 @@ static s32 ExecTurnStart(void);
static void CreateBoard(void);
static void DestroyBoard(void);
void BoardCommonInit(BoardFunc create, BoardFunc destroy)
void BoardObjectSetup(BoardFunc create, BoardFunc destroy)
{
omSysPauseEnable(FALSE);
if(!_CheckFlag(FLAG_ID_MAKE(1, 0))) {

8
src/game/kerent.c
View file

@ -652,7 +652,7 @@ void BoardDiceValueSet(void);
void BoardDiceStop(void);
void BoardDicePauseAll(void);
void BoardDiceDoneCheck(void);
void BoardCommonInit(void);
void BoardObjectSetup(void);
void BoardStoryConfigSet(void);
void BoardPartyConfigSet(void);
void BoardSaveInit(void);
@ -1669,7 +1669,7 @@ extern void _kerjmp_BoardDiceValueSet(void);
extern void _kerjmp_BoardDiceStop(void);
extern void _kerjmp_BoardDicePauseAll(void);
extern void _kerjmp_BoardDiceDoneCheck(void);
extern void _kerjmp_BoardCommonInit(void);
extern void _kerjmp_BoardObjectSetup(void);
extern void _kerjmp_BoardStoryConfigSet(void);
extern void _kerjmp_BoardPartyConfigSet(void);
extern void _kerjmp_BoardSaveInit(void);
@ -3343,8 +3343,8 @@ asm void _kerent(void) {
b BoardDicePauseAll
entry _kerjmp_BoardDiceDoneCheck
b BoardDiceDoneCheck
entry _kerjmp_BoardCommonInit
b BoardCommonInit
entry _kerjmp_BoardObjectSetup
b BoardObjectSetup
entry _kerjmp_BoardStoryConfigSet
b BoardStoryConfigSet
entry _kerjmp_BoardPartyConfigSet