diff --git a/config/GMPE01_00/rels/w01Dll/symbols.txt b/config/GMPE01_00/rels/w01Dll/symbols.txt index 83c6fcbc..ad0e3d24 100644 --- a/config/GMPE01_00/rels/w01Dll/symbols.txt +++ b/config/GMPE01_00/rels/w01Dll/symbols.txt @@ -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 diff --git a/config/GMPE01_00/rels/w02Dll/symbols.txt b/config/GMPE01_00/rels/w02Dll/symbols.txt index 8aa80e00..b60b64cf 100644 --- a/config/GMPE01_00/rels/w02Dll/symbols.txt +++ b/config/GMPE01_00/rels/w02Dll/symbols.txt @@ -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 diff --git a/config/GMPE01_00/rels/w03Dll/symbols.txt b/config/GMPE01_00/rels/w03Dll/symbols.txt index 875a8237..55a99df3 100644 --- a/config/GMPE01_00/rels/w03Dll/symbols.txt +++ b/config/GMPE01_00/rels/w03Dll/symbols.txt @@ -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 diff --git a/config/GMPE01_00/rels/w04Dll/symbols.txt b/config/GMPE01_00/rels/w04Dll/symbols.txt index 451fcdf4..98a6b456 100644 --- a/config/GMPE01_00/rels/w04Dll/symbols.txt +++ b/config/GMPE01_00/rels/w04Dll/symbols.txt @@ -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 diff --git a/config/GMPE01_00/rels/w05Dll/symbols.txt b/config/GMPE01_00/rels/w05Dll/symbols.txt index f8aa4f06..4f1ddabd 100644 --- a/config/GMPE01_00/rels/w05Dll/symbols.txt +++ b/config/GMPE01_00/rels/w05Dll/symbols.txt @@ -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 diff --git a/config/GMPE01_00/rels/w06Dll/symbols.txt b/config/GMPE01_00/rels/w06Dll/symbols.txt index c86ec89b..5c593e3e 100644 --- a/config/GMPE01_00/rels/w06Dll/symbols.txt +++ b/config/GMPE01_00/rels/w06Dll/symbols.txt @@ -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 diff --git a/config/GMPE01_00/rels/w10Dll/symbols.txt b/config/GMPE01_00/rels/w10Dll/symbols.txt index 516c32af..89f2a634 100644 --- a/config/GMPE01_00/rels/w10Dll/symbols.txt +++ b/config/GMPE01_00/rels/w10Dll/symbols.txt @@ -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 diff --git a/config/GMPE01_00/rels/w20Dll/symbols.txt b/config/GMPE01_00/rels/w20Dll/symbols.txt index 471db631..2b0115b2 100644 --- a/config/GMPE01_00/rels/w20Dll/symbols.txt +++ b/config/GMPE01_00/rels/w20Dll/symbols.txt @@ -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 diff --git a/config/GMPE01_00/rels/w21Dll/symbols.txt b/config/GMPE01_00/rels/w21Dll/symbols.txt index 1b629d3d..708d3b88 100644 --- a/config/GMPE01_00/rels/w21Dll/symbols.txt +++ b/config/GMPE01_00/rels/w21Dll/symbols.txt @@ -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 diff --git a/config/GMPE01_00/symbols.txt b/config/GMPE01_00/symbols.txt index 2fe543bf..8d327e2d 100644 --- a/config/GMPE01_00/symbols.txt +++ b/config/GMPE01_00/symbols.txt @@ -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 diff --git a/include/REL/board_executor.h b/include/REL/board_executor.h index 47d3f448..dbaaa4fd 100644 --- a/include/REL/board_executor.h +++ b/include/REL/board_executor.h @@ -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); diff --git a/src/REL/board_executor.c b/src/REL/board_executor.c index c884fbb7..04e59a3a 100644 --- a/src/REL/board_executor.c +++ b/src/REL/board_executor.c @@ -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; } diff --git a/src/game/board/main.c b/src/game/board/main.c index 936e50c7..61f8868b 100644 --- a/src/game/board/main.c +++ b/src/game/board/main.c @@ -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))) { diff --git a/src/game/kerent.c b/src/game/kerent.c index 68e81c2a..e872e2ad 100644 --- a/src/game/kerent.c +++ b/src/game/kerent.c @@ -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