Port early board TUs to PAL
This commit is contained in:
parent
539079e05c
commit
4ee28d83a1
7 changed files with 774 additions and 646 deletions
|
|
@ -403,8 +403,11 @@ static void MainFunc(void)
|
|||
if(_CheckFlag(FLAG_ID_MAKE(1, 11))) {
|
||||
BoardTutorialWorkSave();
|
||||
BoardTutorialPlayerInit();
|
||||
GWSystem.mess_speed = 1;
|
||||
GWSystem.mess_delay = 32;
|
||||
#if VERSION_PAL
|
||||
GWMessSpeedSet(3);
|
||||
#else
|
||||
GWMessSpeedSet(1);
|
||||
#endif
|
||||
}
|
||||
CreateBoard();
|
||||
if(!_CheckFlag(FLAG_ID_MAKE(1, 1))) {
|
||||
|
|
|
|||
|
|
@ -396,20 +396,32 @@ static void DestroyFocus(void) {
|
|||
|
||||
static void CreateButtonWin(void) {
|
||||
float sp8[2];
|
||||
float var_f31;
|
||||
float var_f30;
|
||||
float posX;
|
||||
float posY;
|
||||
s32 var_r31;
|
||||
|
||||
if (viewControls != 2) {
|
||||
var_r31 = MAKE_MESSID(0x09, 0x05);
|
||||
var_f31 = 286.0f;
|
||||
#if VERSION_PAL
|
||||
HuWinMesMaxSizeGet(1, sp8, var_r31);
|
||||
posX = 288-((sp8[0]/2)-32);
|
||||
#endif
|
||||
posY = 286.0f;
|
||||
} else {
|
||||
var_r31 = MAKE_MESSID(0x10, 0x4D);
|
||||
var_f31 = 328.0f;
|
||||
#if VERSION_PAL
|
||||
posX = -10000.0f;
|
||||
posY = 324.0f;
|
||||
#else
|
||||
posY = 328.0f;
|
||||
#endif
|
||||
|
||||
}
|
||||
HuWinMesMaxSizeGet(1, sp8, var_r31);
|
||||
var_f30 = -10000.0f;
|
||||
buttonWin = HuWinCreate(var_f30, var_f31, sp8[0], sp8[1], 0);
|
||||
#if VERSION_NTSC
|
||||
posX = -10000.0f;
|
||||
#endif
|
||||
buttonWin = HuWinCreate(posX, posY, sp8[0], sp8[1], 0);
|
||||
HuWinBGTPLvlSet(buttonWin, 0.0f);
|
||||
HuWinMesSpeedSet(buttonWin, 0);
|
||||
HuWinMesSet(buttonWin, var_r31);
|
||||
|
|
|
|||
|
|
@ -97,6 +97,11 @@ static void ExecBoardWindow(void) {
|
|||
if (size[0] <= size_win[0]) {
|
||||
size[0] = size_win[0];
|
||||
pos[0] = pos_win[0];
|
||||
#if VERSION_PAL
|
||||
if(winPosIdx == 1) {
|
||||
size[0] += 4;
|
||||
}
|
||||
#endif
|
||||
} else {
|
||||
pos[0] = -10000.0f;
|
||||
}
|
||||
|
|
@ -338,7 +343,7 @@ s32 BoardWinPortraitGetStar(void) {
|
|||
|
||||
void BoardWinPlayerSet(s32 player) {
|
||||
s32 i;
|
||||
|
||||
#if VERSION_NTSC
|
||||
if (player == -1) {
|
||||
if (GWPartyGet() != 1) {
|
||||
for (i = 0, disablePlayer = i; i < 4; i++) {
|
||||
|
|
@ -354,6 +359,21 @@ void BoardWinPlayerSet(s32 player) {
|
|||
} else {
|
||||
disablePlayer = ~(1 << GWPlayer[player].port);
|
||||
}
|
||||
#else
|
||||
if (player == -1) {
|
||||
if (GWPartyGet() != 1) {
|
||||
for (i = 0, disablePlayer = i; i < 4; i++) {
|
||||
if (GWPlayer[i].com != 0) {
|
||||
disablePlayer |= 1 << GWPlayer[i].port;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
disablePlayer = 0;
|
||||
}
|
||||
} else {
|
||||
disablePlayer = ~(1 << GWPlayer[player].port);
|
||||
}
|
||||
#endif
|
||||
if (_CheckFlag(FLAG_ID_MAKE(1, 11)) != 0) {
|
||||
disablePlayer = 0;
|
||||
}
|
||||
|
|
@ -405,4 +425,9 @@ void BoardWinStartComKeySet(void) {
|
|||
|
||||
void BoardWinComKeyFuncSet(BoardWinComKeyFunc func) {
|
||||
comKeyFunc = func;
|
||||
}
|
||||
|
||||
s16 BoardWinIDGet(void)
|
||||
{
|
||||
return windowID;
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue