This commit is contained in:
CreateSource 2024-01-01 23:45:06 -05:00
commit b2c2f821da
19 changed files with 792 additions and 161 deletions

View file

@ -1,7 +1,7 @@
#include "REL/board_executor.h"
static void InitBoard(void) {
BoardCommonInit(BoardInit, BoardDestroy);
BoardCommonInit(BoardCreate, BoardDestroy);
}
int _prolog(void) {

View file

@ -66,7 +66,7 @@ inline s32 get_current_board(void) {
return GWSystem.board;
}
void BoardInit(void) {
void BoardCreate(void) {
f32 sp10;
f32 spC[2];
s32 sp8;

View file

@ -210,7 +210,7 @@ void fn_1_13A4(void) {
BoardCameraStartMotion2(lbl_1_bss_0->unk8, &sp8, 0, 3200.0f, -1.0f, 0x1E);
BoardCameraMotionWait();
fn_1_BA0(0x2E0032);
BoardCameraTargetSetModel(fn_80083F84());
BoardCameraTargetModelSet(fn_80083F84());
BoardCameraMotionWait();
fn_1_BA0(0x2E0033);
fn_1_BA0(0x2E0034);

628
src/game/board/main.c Normal file
View file

@ -0,0 +1,628 @@
#include "common.h"
#include "math.h"
#include "game/object.h"
#include "game/flag.h"
#include "game/data.h"
#include "game/wipe.h"
typedef void (*VoidFunc)(void);
omObjData *boardMainObj;
u32 boardRandSeed;
static omObjData *last5GfxObj;
static omObjData *confettiObj;
static omObjData *filterObj;
void *boardTurnStartFunc;
u32 lbl_801D3F00;
u32 lbl_801D3EFC;
u32 lbl_801D3EF8;
VoidFunc boardTurnFunc;
void *boardLightSetHook;
void *boardLightResetHook;
static VoidFunc destroyFunc;
static VoidFunc createFunc;
static BOOL cameraUseBackup;
static omObjData *tauntObj;
static omObjData *cameraObj;
Process *boardObjMan;
Process *boardMainProc;
static OverlayID nextOvl = OVL_INVALID;
extern void BoardPlayerCoinsSet(s32 player, s32 value);
extern void BoardPlayerAutoSizeSet(s32 player, s32 value);
extern void fn_800A4A7C(void);
extern void fn_800A6EE4(void);
extern s8 boardTutorialF;
void BoardKill(void);
static void InitBoardFunc(omObjData *object);
static void ExecBoardFunc(omObjData *object);
static void KillBoardFunc(omObjData *object);
static void MainFunc(void);
static void DestroyMainFunc(void);
static void CreateBoard(void);
static void DestroyBoard(void);
static inline s32 BoardCurrGet()
{
return GWSystem.board;
}
static inline s32 BoardPartyFlagGet()
{
s32 value = GWSystem.party;
return value;
}
static inline s16 BoardHandicapGet(s32 player)
{
return GWPlayer[player].handicap;
}
void BoardCommonInit(VoidFunc create, VoidFunc destroy)
{
omSysPauseEnable(FALSE);
if(!_CheckFlag(FLAG_ID_MAKE(1, 0))) {
_SetFlag(FLAG_ID_MAKE(1, 0));
_ClearFlag(FLAG_ID_MAKE(2, 1));
_ClearFlag(FLAG_ID_MAKE(2, 3));
_ClearFlag(FLAG_ID_MAKE(2, 0));
_ClearFlag(FLAG_ID_MAKE(2, 2));
_ClearFlag(FLAG_ID_MAKE(2, 4));
_ClearFlag(FLAG_ID_MAKE(2, 5));
_ClearFlag(FLAG_ID_MAKE(1, 6));
_ClearFlag(FLAG_ID_MAKE(1, 9));
_ClearFlag(FLAG_ID_MAKE(0, 8));
_ClearFlag(FLAG_ID_MAKE(0, 10));
fn_800A4A7C();
}
nextOvl = OVL_INVALID;
_SetFlag(FLAG_ID_MAKE(1, 28));
_SetFlag(FLAG_ID_MAKE(1, 14));
_ClearFlag(FLAG_ID_MAKE(1, 16));
_ClearFlag(FLAG_ID_MAKE(1, 17));
_ClearFlag(FLAG_ID_MAKE(1, 18));
_ClearFlag(FLAG_ID_MAKE(1, 19));
_ClearFlag(FLAG_ID_MAKE(1, 20));
_ClearFlag(FLAG_ID_MAKE(1, 21));
_ClearFlag(FLAG_ID_MAKE(1, 23));
_ClearFlag(FLAG_ID_MAKE(1, 24));
_ClearFlag(FLAG_ID_MAKE(1, 25));
_ClearFlag(FLAG_ID_MAKE(1, 27));
createFunc = create;
destroyFunc = destroy;
boardTurnFunc = NULL;
lbl_801D3EFC = 0;
lbl_801D3F00 = 0;
lbl_801D3EF8 = 0;
boardTurnStartFunc = NULL;
boardObjMan = omInitObjMan(64, 8192);
omSystemKeyCheckSetup(boardObjMan);
boardMainObj = omAddObjEx(boardObjMan, 0, 0, 0, 1, InitBoardFunc);
switch(omcurovl) {
case OVL_W01:
GWSystem.board = 0;
break;
case OVL_W02:
GWSystem.board = 1;
break;
case OVL_W03:
GWSystem.board = 2;
break;
case OVL_W04:
GWSystem.board = 3;
break;
case OVL_W05:
GWSystem.board = 4;
break;
case OVL_W06:
GWSystem.board = 5;
break;
case OVL_W10:
GWSystem.board = 6;
break;
case OVL_W20:
GWSystem.board = 7;
break;
case OVL_W21:
GWSystem.board = 8;
break;
}
}
static void InitBoardFunc(omObjData *object)
{
boardMainProc = HuPrcChildCreate(MainFunc, 8194, 0x6000, 0, boardObjMan);
HuPrcDestructorSet2(boardMainProc, DestroyMainFunc);
object->func = ExecBoardFunc;
}
static void ExecBoardFunc(omObjData *object)
{
if(!_CheckFlag(FLAG_ID_MAKE(1, 16))) {
return;
}
if(!_CheckFlag(FLAG_ID_MAKE(1, 17))) {
if(omSysExitReq) {
BoardKill();
} else {
if(BoardPauseReqCheck()) {
BoardPauseStart();
} else {
return;
}
}
} else {
if(boardMainProc) {
HuPrcKill(boardMainProc);
}
object->func = KillBoardFunc;
}
}
static void KillBoardFunc(omObjData *object)
{
if(boardMainProc) {
return;
}
if(WipeStatGet()) {
return;
return_alt:
return;
} else {
if(HuARDMACheck()) {
goto return_alt;
}
if(nextOvl != OVL_INVALID) {
omOvlCallEx(nextOvl, 1, 0, 0);
} else {
if(_CheckFlag(FLAG_ID_MAKE(1, 11))) {
BoardTutorialKill();
BoardTutorialWorkRestore();
}
_ClearFlag(FLAG_ID_MAKE(1, 0));
HuARDirFree(MAKE_DIR_NUM(DATADIR_BOARD));
if(_CheckFlag(FLAG_ID_MAKE(1, 27))) {
omOvlReturnEx(2, 1);
} else {
omOvlReturnEx(1, 1);
}
}
}
}
void BoardKill(void)
{
_SetFlag(FLAG_ID_MAKE(1, 28));
_SetFlag(FLAG_ID_MAKE(1, 14));
if(_CheckFlag(FLAG_ID_MAKE(1, 11))) {
BoardTutorialHookExec(29, 0);
}
HuAudFXAllStop();
if(!BoardIsStarted()) {
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, -1);
boardTutorialF = 1;
while(WipeStatGet()) {
HuPrcVSleep();
}
}
_SetFlag(FLAG_ID_MAKE(1, 17));
HuPrcKill(boardMainProc);
DestroyBoard();
}
s32 BoardIsKill(void)
{
return (_CheckFlag(FLAG_ID_MAKE(1, 17))) ? 1 : 0;
}
void BoardPauseEnableSet(s32 value)
{
if(_CheckFlag(FLAG_ID_MAKE(1, 11))) {
_SetFlag(FLAG_ID_MAKE(1, 25));
omSysPauseEnable(FALSE);
} else {
if(value) {
_SetFlag(FLAG_ID_MAKE(1, 25));
} else {
_ClearFlag(FLAG_ID_MAKE(1, 25));
}
}
}
s32 BoardPauseEnableGet()
{
return (_CheckFlag(FLAG_ID_MAKE(1, 25))) ? 1 : 0;
}
void BoardSaveInit(s32 board)
{
int i;
GWSystem.board = board;
_ClearFlag(FLAG_ID_MAKE(1, 0));
_ClearFlag(FLAG_ID_MAKE(1, 1));
_ClearFlag(FLAG_ID_MAKE(1, 5));
_ClearFlag(FLAG_ID_MAKE(1, 4));
_ClearFlag(FLAG_ID_MAKE(1, 6));
_ClearFlag(FLAG_ID_MAKE(1, 2));
_ClearFlag(FLAG_ID_MAKE(1, 9));
_ClearFlag(FLAG_ID_MAKE(1, 7));
_ClearFlag(FLAG_ID_MAKE(1, 8));
_ClearFlag(FLAG_ID_MAKE(0, 8));
_ClearFlag(FLAG_ID_MAKE(1, 12));
_ClearFlag(FLAG_ID_MAKE(1, 3));
GWSystem.turn = 1;
GWSystem.star_flag = 0;
GWSystem.star_pos = 0;
GWSystem.star_total = 1;
GWSystem.last5_effect = 0;
GWSystem.player_curr = -1;
GWSystem.field31_bit0 = 0;
GWSystem.field31_bit4 = 0;
GWSystem.unk_32 = 1;
GWSystem.mg_next = 0;
GWSystem.mg_next_extra = 0;
GWSystem.unk_38 = 0;
GWSystem.block_pos = 0;
memset(GWSystem.board_data, 0, 32);
for(i=0; i<4; i++) {
BoardPlayerAutoSizeSet(i, 0);
GWPlayer[i].field00_bit9 = 0;
GWPlayer[i].color = 0;
GWPlayer[i].bowser_suit = 0;
GWPlayer[i].field08_bit3 = 0;
GWPlayer[i].space_shock = 0;
GWPlayer[i].field02_bit1 = 0;
GWPlayer[i].show_next = 1;
BoardPlayerCoinsSet(i, 0);
if(_CheckFlag(FLAG_ID_MAKE(1, 11))) {
GWSystem.team = 0;
}
GWPlayer[i].blue_count = 0;
GWPlayer[i].red_count = 0;
GWPlayer[i].question_count = 0;
GWPlayer[i].fortune_count = 0;
GWPlayer[i].bowser_count = 0;
GWPlayer[i].battle_count = 0;
GWPlayer[i].mushroom_count = 0;
GWPlayer[i].warp_count = 0;
GWPlayer[i].coins_mg = 0;
GWPlayer[i].coins_total = 0;
GWPlayer[i].coins_max = 0;
GWPlayer[i].stars_max = 0;
GWPlayer[i].coins_battle = 0;
GWPlayer[i].unk_26 = 0;
GWPlayer[i].coins_mg_gain = 0;
GWPlayer[i].items[0] = -1;
GWPlayer[i].items[1] = -1;
GWPlayer[i].items[2] = -1;
if(!BoardPartyFlagGet() || _CheckFlag(FLAG_ID_MAKE(1, 11))) {
GWStarsSet(i, 0);
} else {
GWStarsSet(i, BoardHandicapGet(i));
}
}
}
void BoardStoryConfigSet(s32 mg_type, s32 diff_story)
{
GWSystem.party = 0;
GWSystem.team = 0;
GWSystem.diff_story = diff_story;
GWSystem.bonus_star = 0;
GWSystem.mg_type = mg_type;
GWPlayer[0].handicap = 0;
GWPlayer[1].handicap = 0;
GWPlayer[2].handicap = 0;
GWPlayer[3].handicap = 0;
GWSystem.max_turn = 15;
memset(GWPlayer, 0, 4*sizeof(PlayerState));
_ClearFlag(FLAG_ID_MAKE(0, 2));
_ClearFlag(FLAG_ID_MAKE(0, 3));
_ClearFlag(FLAG_ID_MAKE(0, 4));
_ClearFlag(FLAG_ID_MAKE(0, 5));
_ClearFlag(FLAG_ID_MAKE(0, 6));
_ClearFlag(FLAG_ID_MAKE(0, 7));
_ClearFlag(FLAG_ID_MAKE(1, 11));
_SetFlag(FLAG_ID_MAKE(0, 11));
_SetFlag(FLAG_ID_MAKE(1, 10));
}
void BoardPartyConfigSet(s32 team, s32 bonus_star, s32 mg_type, s32 max_turn, s32 p1_handicap, s32 p2_handicap, s32 p3_handicap, s32 p4_handicap)
{
GWSystem.party = 1;
GWSystem.team = team;
GWSystem.diff_story = 0;
GWSystem.bonus_star = bonus_star;
GWSystem.mg_type = mg_type;
GWSystem.max_turn = max_turn;
memset(GWPlayer, 0, 4*sizeof(PlayerState));
GWPlayer[0].handicap = p1_handicap;
GWPlayer[1].handicap = p2_handicap;
GWPlayer[2].handicap = p3_handicap;
GWPlayer[3].handicap = p4_handicap;
_ClearFlag(FLAG_ID_MAKE(1, 11));
_SetFlag(FLAG_ID_MAKE(0, 11));
_SetFlag(FLAG_ID_MAKE(1, 10));
}
static void DestroyMainFunc(void)
{
boardMainProc = NULL;
}
static void MainFunc(void)
{
s32 i;
s32 fade_enable, turn_cont, fade_type;
fade_enable = 0;
turn_cont = 0;
BoardPauseEnableSet(1);
if(_CheckFlag(FLAG_ID_MAKE(0, 10))) {
_ClearFlag(FLAG_ID_MAKE(0, 10));
_SetFlag(FLAG_ID_MAKE(1, 16));
BoardKill();
HuPrcSleep(-1);
}
_ClearFlag(FLAG_ID_MAKE(0, 10));
BoardTutorialInit();
if(_CheckFlag(FLAG_ID_MAKE(1, 11))) {
BoardTutorialWorkSave();
BoardTutorialPlayerInit();
GWSystem.mess_speed = 1;
GWSystem.mess_delay = 32;
}
CreateBoard();
if(!_CheckFlag(FLAG_ID_MAKE(1, 1))) {
GWSystem.player_curr = -1;
fn_800A6EE4();
GWSystem.player_curr = 0;
fade_enable = 1;
_SetFlag(FLAG_ID_MAKE(1, 1));
} else {
fade_enable = 0;
}
if(BoardIsTurnCont()) {
turn_cont = 1;
}
if((int)(GWSystem.max_turn-GWSystem.turn) < 5 && GWSystem.player_curr == 0 && !turn_cont) {
if(!_CheckFlag(FLAG_ID_MAKE(0, 8))) {
fn_800A9708();
_SetFlag(FLAG_ID_MAKE(0, 8));
} else {
BoardLast5GfxInit();
}
}
if(!turn_cont) {
fade_type = 1;
} else {
fade_type = 0;
}
_ClearFlag(FLAG_ID_MAKE(1, 28));
do {
BoardStatusShowSetAll(1);
if(BoardCurrGet() == 5 && GWSystem.player_curr == 0 && !turn_cont && boardTurnFunc) {
GWSystem.player_curr = -1;
boardTurnFunc();
GWSystem.player_curr = 0;
}
fn_80070D84();
for(i=GWSystem.player_curr; i<4; i++) {
if(BoardCurrGet() == 7 || BoardCurrGet() == 8) {
if((int)(GWSystem.max_turn-GWSystem.turn) < 5 && i == 0 && !turn_cont) {
BoardLast5GfxInit();
_SetFlag(FLAG_ID_MAKE(0, 8));
}
}
if(_CheckFlag(FLAG_ID_MAKE(1, 6))) {
BoardPlayerTurnExec(i);
} else {
if(!turn_cont) {
BoardCameraVisibleSet(0);
GWSystem.player_curr = i;
BoardCameraTargetModelSet(i);
BoardCameraMotionWait();
{
Vec pos;
BoardSpacePosGet(0, GWPlayer[i].space_curr, &pos);
BoardPlayerPosSetV(i, &pos);
}
while(WipeStatGet()) {
HuPrcVSleep();
}
if(!fade_enable) {
if(!fade_type) {
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_CROSS, 30);
while(WipeStatGet()) {
HuPrcVSleep();
}
} else {
fade_type = 0;
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 21);
while(WipeStatGet()) {
HuPrcVSleep();
}
}
} else {
fade_enable = 0;
}
BoardPlayerTurnExec(i);
}
}
turn_cont = 0;
if(_CheckFlag(FLAG_ID_MAKE(1, 11))) {
BoardTutorialHookExec(9, 0);
}
if(i != 3 || _CheckFlag(FLAG_ID_MAKE(1, 11))) {
WipeColorSet(255, 255, 255);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_CROSS, 1);
while(WipeStatGet()) {
HuPrcVSleep();
}
BoardPlayerCurrMoveAwayStart(GWPlayer[i].space_curr, 1);
fade_type = 0;
} else {
if(BoardCurrGet() == 7 || BoardCurrGet() == 8) {
if(GWSystem.turn != GWSystem.max_turn) {
WipeColorSet(255, 255, 255);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_CROSS, 1);
while(WipeStatGet()) {
HuPrcVSleep();
}
BoardPlayerCurrMoveAwayStart(GWPlayer[i].space_curr, 1);
fade_type = 0;
}
} else {
WipeColorSet(0, 0, 0);
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 21);
while(WipeStatGet()) {
HuPrcVSleep();
}
}
}
BoardPlayerPostTurnHookExec(i);
}
if(BoardCurrGet() == 7 || BoardCurrGet() == 8) {
GWSystem.player_curr = 0;
if(BoardTurnNext()) {
fn_80070EE8(0, 500);
BoardKill();
HuPrcEnd();
HuPrcSleep(-1);
}
} else {
_SetFlag(FLAG_ID_MAKE(1, 28));
_SetFlag(FLAG_ID_MAKE(1, 14));
BoardPauseEnableSet(1);
_CheckFlag(FLAG_ID_MAKE(1, 9));
if(_CheckFlag(FLAG_ID_MAKE(2, 0)) || _CheckFlag(FLAG_ID_MAKE(1, 11)) ) {
for(i=0; i<4; i++) {
GWPlayer[i].color = 0;
}
GWSystem.player_curr = (GWSystem.player_curr+1)&3;
} else {
fn_800A1A34();
HuPrcSleep(-1);
}
}
} while(1);
}
BOOL BoardTurnNext(void)
{
s32 i;
for(i=0; i<4; i++) {
GWPlayer[i].color = 0;
}
GWSystem.turn++;
if(GWSystem.turn > GWSystem.max_turn) {
return 1;
} else {
return 0;
}
}
void BoardNextOvlSet(OverlayID overlay)
{
nextOvl = overlay;
fn_80070EE8(0, 1000);
BoardKill();
}
BOOL BoardIsStarted(void)
{
if(_CheckFlag(FLAG_ID_MAKE(1, 2)) || _CheckFlag(FLAG_ID_MAKE(1, 3)) || _CheckFlag(FLAG_ID_MAKE(1, 4)) || _CheckFlag(FLAG_ID_MAKE(1, 5)) || _CheckFlag(FLAG_ID_MAKE(1, 6))) {
return 1;
} else {
return 0;
}
}
static void CreateBoard(void)
{
}
static void DestroyBoard(void)
{
}
u32 BoardRand(void)
{
boardRandSeed = (boardRandSeed*0x19660D)+(0x3C6EF35F);
return boardRandSeed;
}
u32 BoardRandMod(u32 value)
{
return (BoardRand() & 0x7FFFFFFF)%value;
}
float BoardRandFloat(void)
{
float value;
*((u32 *)&value) = (BoardRand() & 0x7FFFFF)|0x3F800000;
return value-1.0f;
}
float BoardVecDistXZCalc(Vec *vec1, Vec *vec2)
{
float x = vec1->x-vec2->x;
float z = vec1->z-vec2->z;
return sqrtf((x*x)+(z*z));
}
s32 BoardVecMaxDistXZCheck(Vec *vec1, Vec *vec2, float max_dist)
{
float z = vec1->z-vec2->z;
float x = vec1->x-vec2->x;
float dist = sqrtf((x*x)+(z*z));
if(dist <= max_dist) {
return 1;
} else {
return 0;
}
}
s32 BoardVecMinDistCheck(Vec *vec1, Vec *vec2, float min_dist)
{
Vec temp;
Mtx temp_mtx;
VECSubtract(vec1, vec2, &temp);
if(VECSquareMag(&temp) >= (min_dist*min_dist)) {
return 0;
} else {
return 1;
}
}
s32 BoardDataDirReadAsync(s32 data_num)
{
s32 status = HuDataDirReadAsync(data_num);
return status;
}
void BoardDataAsyncWait(s32 status)
{
if(status == -1) {
return;
}
while(!HuDataGetAsyncStat(status)) {
HuPrcVSleep();
}
}

View file

@ -16,7 +16,7 @@ static s16 defaultChoice;
static s32 winMess;
static s32 winAttr;
f32 lbl_801D3F70[2];
static void (*comKeyFunc)();
static BoardWinComKeyFunc comKeyFunc;
static Process* winProc;
static s32 choiceDisableTbl[0x10];
static u32 winInsertMesTbl[8];
@ -33,7 +33,7 @@ static s32 StarPortraitTbl[] = {
};
static s16 windowID = -1;
const s8 lbl_801D5318[4] = {0, 1, 4, 0};
static const s8 winSpeedTbl[4] = {0, 1, 4, 0};
void BoardWinInit(void) {
HuWinInit(1);
@ -67,13 +67,13 @@ void BoardWinDestroy(void) {
winProc = 0;
}
void BoardWinProc(void) {
f32 sp10[2];
f32 sp8[2];
s32 var_r31;
f32* temp_r29;
f32* temp_r30;
WindowData *var_r28 = NULL;
static void ExecBoardWindow(void) {
f32 size[2];
f32 pos[2];
s32 i;
f32 *pos_win;
f32 *size_win;
WindowData *win_curr = NULL;
f32 var_50[7][2] = {
{384.0f, 64.0f}, {432.0f, 192.0f},
@ -89,26 +89,26 @@ void BoardWinProc(void) {
};
if (windowID < 0) {
temp_r30 = var_50[winPosIdx];
temp_r29 = var_18[winPosIdx];
HuWinMesMaxSizeGet(1, sp10, winMess);
if (sp10[0] <= temp_r30[0]) {
sp10[0] = temp_r30[0];
sp8[0] = temp_r29[0];
size_win = var_50[winPosIdx];
pos_win = var_18[winPosIdx];
HuWinMesMaxSizeGet(1, size, winMess);
if (size[0] <= size_win[0]) {
size[0] = size_win[0];
pos[0] = pos_win[0];
} else {
sp8[0] = -10000.0f;
pos[0] = -10000.0f;
}
if (sp10[1] <= temp_r30[1]) {
sp10[1] = temp_r30[1];
if (size[1] <= size_win[1]) {
size[1] = size_win[1];
}
sp8[1] = temp_r29[1];
pos[1] = pos_win[1];
if ((winPosIdx == 5) || (winPosIdx == 6)) {
windowID = HuWinExCreateStyled(sp8[0], sp8[1], sp10[0], sp10[1], -1, 1);
windowID = HuWinExCreateStyled(pos[0], pos[1], size[0], size[1], -1, 1);
HuWinMesPalSet(windowID, 7, 0, 0, 0);
} else if (winPortrait == -1) {
windowID = HuWinExCreate(sp8[0], sp8[1], sp10[0], sp10[1], -1);
windowID = HuWinExCreate(pos[0], pos[1], size[0], size[1], -1);
} else {
windowID = HuWinExCreate(sp8[0], sp8[1], sp10[0], sp10[1], winPortrait);
windowID = HuWinExCreate(pos[0], pos[1], size[0], size[1], winPortrait);
}
if (windowID == -1) {
HuPrcEnd();
@ -131,26 +131,26 @@ void BoardWinProc(void) {
HuWinMesSpeedSet(windowID, messSpeed);
HuWinMesSet(windowID, winMess);
for (var_r31 = 0; var_r31 < 8; var_r31++) {
if (winInsertMesTbl[var_r31] != -1) {
HuWinInsertMesSet(windowID, winInsertMesTbl[var_r31], var_r31);
for (i = 0; i < 8; i++) {
if (winInsertMesTbl[i] != -1) {
HuWinInsertMesSet(windowID, winInsertMesTbl[i], i);
}
}
HuWinAttrSet(windowID, winAttr);
for (var_r31 = 0; var_r31 < 0x10; var_r31++) {
if (choiceDisableTbl[var_r31] != 0) {
HuWinChoiceDisable(windowID, var_r31);
for (i = 0; i < 16; i++) {
if (choiceDisableTbl[i] != 0) {
HuWinChoiceDisable(windowID, i);
}
}
if (autoPickF != 0) {
BoardWinStartComKeySet();
if (comKeyFunc != 0) {
if (comKeyFunc) {
comKeyFunc();
}
} else if ((_CheckFlag(0x1000B) != 0) && ((winPosIdx == 5) || (winPosIdx == 6))) {
var_r28 = &winData[windowID];
var_r28->active_pad = 0xF;
win_curr = &winData[windowID];
win_curr->active_pad = 0xF;
HuWinComKeyWait(-1, -1, -1, -1, 0);
} else {
BoardWinStartComKeySet();
@ -180,16 +180,15 @@ void BoardWinPause(void) {
winPause = 1;
}
void BoardWinCreateChoice(s32 arg0, s32 arg1, s32 arg2, s32 arg3) {
s32 var_r31;
SystemState* temp_r3;
s32 var_r30;
void BoardWinCreateChoice(s32 pos, u32 mess, s32 portrait, s32 choice) {
s32 i;
s32 speed;
winPosIdx = arg0;
winPosIdx = pos;
winChoice = 0;
defaultChoice = arg3;
winPortrait = arg2;
defaultChoice = choice;
winPortrait = portrait;
winAttr = 0;
autoPickF = 1;
winWait = 0;
@ -199,35 +198,34 @@ void BoardWinCreateChoice(s32 arg0, s32 arg1, s32 arg2, s32 arg3) {
winPause = 0;
HuWinComKeyReset();
for (var_r31 = 0; var_r31 < 0x10; var_r31++) {
choiceDisableTbl[var_r31] = 0;
for (i = 0; i < 16; i++) {
choiceDisableTbl[i] = 0;
}
for (var_r31 = 0; var_r31 < 8; var_r31++) {
winInsertMesTbl[var_r31] = -1;
for (i = 0; i < 8; i++) {
winInsertMesTbl[i] = -1;
}
if (winProc == 0) {
winProc = HuPrcChildCreate(&BoardWinProc, 0x2009, 0x4000, 0, boardMainProc);
winProc = HuPrcChildCreate(&ExecBoardWindow, 0x2009, 0x4000, 0, boardMainProc);
HuPrcDestructorSet2(winProc, &BoardWinDestroy);
}
winMess = arg1;
winMess = mess;
if (GWSystem.mess_speed == 3) {
GWSystem.mess_speed = 1;
}
var_r30 = GWSystem.mess_speed;
BoardWinSpeedSet(var_r30);
speed = GWSystem.mess_speed;
BoardWinSpeedSet(speed);
BoardWinPlayerSet(GWSystem.player_curr);
}
void BoardWinCreate(s32 arg0, s32 arg1, s32 arg2) {
s32 var_r30;
s32 var_r31;
void* temp_r3;
void BoardWinCreate(s32 pos, u32 mess, s32 portrait) {
s32 speed;
s32 i;
winPosIdx = arg0;
winPosIdx = pos;
winChoice = 0;
defaultChoice = -1;
winPortrait = arg2;
winPortrait = portrait;
winAttr = 0;
autoPickF = 1;
winWait = 0;
@ -237,28 +235,28 @@ void BoardWinCreate(s32 arg0, s32 arg1, s32 arg2) {
winPause = 0;
HuWinComKeyReset();
for (var_r31 = 0; var_r31 < 0x10; var_r31++) {
choiceDisableTbl[var_r31] = 0;
for (i = 0; i < 0x10; i++) {
choiceDisableTbl[i] = 0;
}
for (var_r31 = 0; var_r31 < 8; var_r31++) {
winInsertMesTbl[var_r31] = -1;
for (i = 0; i < 8; i++) {
winInsertMesTbl[i] = -1;
}
if (winProc == 0) {
winProc = HuPrcChildCreate(&BoardWinProc, 0x2009U, 0x4000U, 0, boardMainProc);
winProc = HuPrcChildCreate(&ExecBoardWindow, 0x2009U, 0x4000U, 0, boardMainProc);
HuPrcDestructorSet2(winProc, &BoardWinDestroy);
}
winMess = arg1;
winMess = mess;
if (GWSystem.mess_speed == 3) {
GWSystem.mess_speed = 1;
}
var_r30 = GWSystem.mess_speed;
BoardWinSpeedSet(var_r30);
speed = GWSystem.mess_speed;
BoardWinSpeedSet(speed);
BoardWinPlayerSet(GWSystem.player_curr);
autoPickF = 0;
}
void BoardWinInsertMesSet(s32 value, s32 index) {
void BoardWinInsertMesSet(u32 value, s32 index) {
winInsertMesTbl[index] = value;
}
@ -283,22 +281,22 @@ void BoardWinKill(void) {
}
}
void BoardWinSetAttr(s32 arg0) {
winAttr |= arg0;
void BoardWinSetAttr(s32 attr) {
winAttr |= attr;
if (windowID >= 0) {
HuWinAttrSet(windowID, winAttr);
}
}
void BoardWinResetAttr(s32 arg0) {
winAttr &= ~arg0;
void BoardWinResetAttr(s32 attr) {
winAttr &= ~attr;
if (windowID >= 0) {
HuWinAttrSet(windowID, winAttr);
}
}
void BoardWinChoiceDisable(s32 index) {
choiceDisableTbl[index] = 1;
void BoardWinChoiceDisable(s32 choice) {
choiceDisableTbl[choice] = 1;
}
void BoardWinKeyWait(void) {
@ -306,17 +304,17 @@ void BoardWinKeyWait(void) {
}
int BoardWinSpeedGet(void) {
s32 temp_r31;
s32 speed;
if (GWSystem.mess_speed == 3) {
GWSystem.mess_speed = 1;
}
temp_r31 = GWSystem.mess_speed;
return lbl_801D5318[temp_r31];
speed = GWSystem.mess_speed;
return winSpeedTbl[speed];
}
void BoardWinSpeedSet(s32 arg0) {
messSpeed = lbl_801D5318[arg0];
void BoardWinSpeedSet(s32 value) {
messSpeed = winSpeedTbl[value];
if (windowID != -1) {
HuWinMesSpeedSet(windowID, messSpeed);
}
@ -329,10 +327,10 @@ s16 BoardWinChoiceNowGet(void) {
return HuWinChoiceNowGet(windowID);
}
void BoardWinPriSet(s16 arg0) {
winPrio = arg0;
void BoardWinPriSet(s16 prio) {
winPrio = prio;
if (windowID != -1) {
HuWinPriSet(windowID, arg0);
HuWinPriSet(windowID, prio);
}
}
@ -353,13 +351,13 @@ s32 BoardWinPortraitGetStar(void) {
return StarPortraitTbl[temp];
}
void BoardWinPlayerSet(s32 arg0) {
s32 temp_r0;
void BoardWinPlayerSet(s32 player) {
s32 temp;
s32 i;
if (arg0 == -1) {
temp_r0 = GWSystem.story;
if (temp_r0 != 1) {
if (player == -1) {
temp = GWSystem.party;
if (temp != 1) {
for (i = 0, disablePlayer = i; i < 4; i++) {
if (GWPlayer[i].com != 0) {
disablePlayer |= 1 << GWPlayer[i].port;
@ -368,10 +366,10 @@ void BoardWinPlayerSet(s32 arg0) {
} else {
disablePlayer = 0;
}
} else if (GWPlayer[arg0].com != 0) {
} else if (GWPlayer[player].com != 0) {
disablePlayer = 0xF;
} else {
disablePlayer = ~(1 << GWPlayer[arg0].port);
disablePlayer = ~(1 << GWPlayer[player].port);
}
if (_CheckFlag(0x1000BU) != 0) {
disablePlayer = 0;
@ -382,14 +380,13 @@ void BoardWinPlayerSet(s32 arg0) {
}
void BoardWinStartComKeySet(void) {
s32 sp8[4];
s16 temp_r28;
s32 temp_r30;
s32 var_r31;
s32 temp_r29;
s32 comkey[4];
s32 speed;
s32 waitnum;
s32 i;
if (BoardPlayerIsAllCom() != 0) {
sp8[0] = sp8[1] = sp8[2] = sp8[3] = 0x100;
comkey[0] = comkey[1] = comkey[2] = comkey[3] = 0x100;
} else {
if (GWSystem.player_curr == -1) {
if ((GWPlayer[0].com == 0) || (GWPlayer[1].com == 0) || (GWPlayer[2].com == 0) || (GWPlayer[3].com == 0)) {
@ -399,30 +396,30 @@ void BoardWinStartComKeySet(void) {
return;
}
if (GWSystem.player_curr != -1) {
for (var_r31 = 0; var_r31 < 4; var_r31++) {
temp_r29 = GWPlayer[var_r31].port;
if (GWSystem.player_curr == var_r31) {
sp8[temp_r29] = 0x100;
for (i = 0; i < 4; i++) {
s32 port = GWPlayer[i].port;
if (GWSystem.player_curr == i) {
comkey[port] = 0x100;
} else {
sp8[temp_r29] = 0;
comkey[port] = 0;
}
}
} else {
for (var_r31 = 0; var_r31 < 4; var_r31++) {
sp8[var_r31] = 0x100;
for (i = 0; i < 4; i++) {
comkey[i] = 0x100;
}
}
}
temp_r28 = GWMessSpeedGet();
temp_r30 = HuWinKeyWaitNumGet(winMess);
if (temp_r30 != 0) {
speed = GWMessSpeedGet();
waitnum = HuWinKeyWaitNumGet(winMess);
if (waitnum != 0) {
HuWinComKeyReset();
for (var_r31 = 0; var_r31 < temp_r30; var_r31++) {
HuWinComKeyWait(sp8[0], sp8[1], sp8[2], sp8[3], (s32)temp_r28);
for (i = 0; i < waitnum; i++) {
HuWinComKeyWait(comkey[0], comkey[1], comkey[2], comkey[3], speed);
}
}
}
void BoardWinComKeyFuncSet(void (*func)) {
void BoardWinComKeyFuncSet(BoardWinComKeyFunc func) {
comKeyFunc = func;
}

View file

@ -134,7 +134,7 @@ void GWGameStatReset(void)
ResetBoardSettings();
}
s16 GWMessSpeedGet(void)
s32 GWMessSpeedGet(void)
{
if(GWSystem.mess_delay > 48) {
GWSystem.mess_speed = 1;