Finish naming option REL
This commit is contained in:
gamemasterplc
parent
997cd0bf4c
commit
0687fd8abb
11 changed files with 1493 additions and 1462 deletions
|
|
@ -12,9 +12,9 @@ typedef struct {
|
|||
/* 0x04 */ omObjData *pad;
|
||||
/* 0x08 */ omObjData *padFilter;
|
||||
/* 0x0C */ omObjData *hand;
|
||||
/* 0x10 */ omObjData *highlightOn;
|
||||
/* 0x14 */ WindowWork *window[2];
|
||||
/* 0x20 */ s32 mode;
|
||||
/* 0x10 */ omObjData *hiliteOn;
|
||||
/* 0x14 */ OptionWindow *window[2];
|
||||
/* 0x20 */ s32 execMode;
|
||||
/* 0x20 */ BOOL rumbleF;
|
||||
/* 0x24 */ BOOL cameraDoneF;
|
||||
/* 0x28 */ s32 changeTimer;
|
||||
|
|
@ -23,7 +23,7 @@ typedef struct {
|
|||
#define MODE_DISABLED 0
|
||||
#define MODE_HANDLE_RUMBLE 1 // TODO room.c should have access to this
|
||||
|
||||
static void HandleRumble(omObjData *object);
|
||||
static void ExecRumble(omObjData *object);
|
||||
static omObjData *CreateHand(void);
|
||||
static void KillHand(omObjData *hand);
|
||||
static omObjData *CreateSystem(void);
|
||||
|
|
@ -33,20 +33,20 @@ static omObjData *CreatePad(void);
|
|||
static void KillPad(omObjData *pad);
|
||||
static void ShakePad(omObjData *pad, BOOL on);
|
||||
static omObjData *CreatePadFilter(void);
|
||||
static void KillPadFilter(omObjData *padFilter);
|
||||
static omObjData *CreateHighlightOn(void);
|
||||
static void KillHighlightOn(omObjData *highlightOn);
|
||||
static void KillPadFilter(omObjData *object);
|
||||
static omObjData *CreateHiliteOn(void);
|
||||
static void KillHiliteOn(omObjData *object);
|
||||
|
||||
omObjData *lbl_1_bss_30;
|
||||
omObjData *optionRumble;
|
||||
|
||||
static omObjFunc modes[] = { NULL, HandleRumble };
|
||||
static omObjFunc execModeTbl[] = { NULL, ExecRumble };
|
||||
|
||||
omObjData *fn_1_3158(void)
|
||||
omObjData *OptionRumbleCreate(void)
|
||||
{
|
||||
omObjData *object;
|
||||
RumbleWork *work;
|
||||
|
||||
object = omAddObjEx(lbl_1_bss_8, 1003, 0, 0, 1, NULL);
|
||||
object = omAddObjEx(optionObjMan, 1003, 0, 0, 1, NULL);
|
||||
work = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(RumbleWork), MEMORY_DEFAULT_NUM);
|
||||
object->data = work;
|
||||
work->rumbleF = GWGameStat.rumble;
|
||||
|
|
@ -55,60 +55,60 @@ omObjData *fn_1_3158(void)
|
|||
work->pad = CreatePad();
|
||||
ShakePad(work->pad, work->rumbleF);
|
||||
work->padFilter = CreatePadFilter();
|
||||
work->highlightOn = CreateHighlightOn();
|
||||
work->hiliteOn = CreateHiliteOn();
|
||||
work->hand = CreateHand();
|
||||
fn_1_3290(object, MODE_DISABLED);
|
||||
OptionRumbleExecModeSet(object, MODE_DISABLED);
|
||||
|
||||
return object;
|
||||
}
|
||||
|
||||
void fn_1_322C(omObjData *object)
|
||||
void OptionRumbleKill(omObjData *object)
|
||||
{
|
||||
RumbleWork *work = object->data;
|
||||
|
||||
KillHand(work->hand);
|
||||
KillSystem(work->system);
|
||||
KillPad(work->pad);
|
||||
KillHighlightOn(work->highlightOn);
|
||||
KillHiliteOn(work->hiliteOn);
|
||||
KillPadFilter(work->padFilter);
|
||||
HuMemDirectFree(work);
|
||||
}
|
||||
// SetMode
|
||||
void fn_1_3290(omObjData *object, s32 mode)
|
||||
|
||||
void OptionRumbleExecModeSet(omObjData *object, s32 execMode)
|
||||
{
|
||||
RumbleWork *work = object->data;
|
||||
|
||||
work->mode = mode;
|
||||
object->func = modes[mode];
|
||||
work->execMode = execMode;
|
||||
object->func = execModeTbl[execMode];
|
||||
object->unk10 = 0;
|
||||
object->unk10 = 0;
|
||||
}
|
||||
// GetMode
|
||||
s32 fn_1_39D4(omObjData *object)
|
||||
|
||||
s32 OptionRumbleExecModeGet(omObjData *object)
|
||||
{
|
||||
RumbleWork *work = object->data;
|
||||
|
||||
return work->mode;
|
||||
return work->execMode;
|
||||
}
|
||||
|
||||
static void HandleRumble(omObjData *object)
|
||||
static void ExecRumble(omObjData *object)
|
||||
{
|
||||
RumbleWork *work = object->data;
|
||||
s32 i;
|
||||
|
||||
switch (object->unk10) {
|
||||
case 0:
|
||||
work->window[0] = fn_1_A44C(0);
|
||||
work->window[1] = fn_1_A44C(1);
|
||||
fn_1_AF0(lbl_1_bss_10, -519.62f, 135.0f, 300.0f, 0x28);
|
||||
fn_1_A6C(lbl_1_bss_10, -315.64f, 135.0f, 182.25f, 0x28);
|
||||
fn_1_3D54(object);
|
||||
work->window[0] = OptionWinCreate(0);
|
||||
work->window[1] = OptionWinCreate(1);
|
||||
OptionCameraFocusSet(optionCamera, -519.62f, 135.0f, 300.0f, 0x28);
|
||||
OptionCameraTargetSet(optionCamera, -315.64f, 135.0f, 182.25f, 0x28);
|
||||
OptionRumbleMotionShowStart(object);
|
||||
Hu3DModelLayerSet(work->padFilter->model[0], 1);
|
||||
work->cameraDoneF = FALSE;
|
||||
object->unk10 = 1;
|
||||
/* fallthrough */
|
||||
case 1:
|
||||
if (fn_1_CB8(lbl_1_bss_10) != 0) {
|
||||
if (OptionCameraDoneCheck(optionCamera) != 0) {
|
||||
break;
|
||||
}
|
||||
if (!work->cameraDoneF) {
|
||||
|
|
@ -116,31 +116,31 @@ static void HandleRumble(omObjData *object)
|
|||
work->cameraDoneF = TRUE;
|
||||
Hu3DModelHookSet(work->system->model[0], "target", work->hand->model[0]);
|
||||
}
|
||||
fn_1_A6EC(work->window[1]);
|
||||
fn_1_A71C(work->window[1], MAKE_MESSID(47, 15));
|
||||
fn_1_A6EC(work->window[0]);
|
||||
OptionWinAnimIn(work->window[1]);
|
||||
OptionWinMesSet(work->window[1], MAKE_MESSID(47, 15));
|
||||
OptionWinAnimIn(work->window[0]);
|
||||
if (work->rumbleF) {
|
||||
fn_1_A71C(work->window[0], MAKE_MESSID(47, 2));
|
||||
OptionWinMesSet(work->window[0], MAKE_MESSID(47, 2));
|
||||
}
|
||||
else {
|
||||
fn_1_A71C(work->window[0], MAKE_MESSID(47, 3));
|
||||
OptionWinMesSet(work->window[0], MAKE_MESSID(47, 3));
|
||||
}
|
||||
object->unk10 = 2;
|
||||
/* fallthrough */
|
||||
case 2:
|
||||
if (work->window[0]->state == 0 && work->window[1]->state == 0) {
|
||||
if (fn_1_550(PAD_BUTTON_B)) {
|
||||
if (OptionPadCheck(PAD_BUTTON_B)) {
|
||||
HuAudFXPlay(3);
|
||||
object->unk10 = 4;
|
||||
}
|
||||
else if (fn_1_584(8) && !work->rumbleF) {
|
||||
else if (OptionPadDStkRepCheck(8) && !work->rumbleF) {
|
||||
StartSystemMotion(work->system, 1, TRUE);
|
||||
work->rumbleF = TRUE;
|
||||
work->changeTimer = 0;
|
||||
GWRumbleSet(1);
|
||||
object->unk10 = 3;
|
||||
}
|
||||
else if (fn_1_584(4) && work->rumbleF) {
|
||||
else if (OptionPadDStkRepCheck(4) && work->rumbleF) {
|
||||
StartSystemMotion(work->system, 0, TRUE);
|
||||
work->rumbleF = FALSE;
|
||||
work->changeTimer = 0;
|
||||
|
|
@ -155,31 +155,31 @@ static void HandleRumble(omObjData *object)
|
|||
ShakePad(work->pad, work->rumbleF);
|
||||
if (work->rumbleF) {
|
||||
HuPadRumbleSet(0, 60, 10, 5);
|
||||
Hu3DMotionTimeSet(work->highlightOn->model[0], 0.0f);
|
||||
Hu3DModelAttrReset(work->highlightOn->model[0], 1);
|
||||
Hu3DMotionTimeSet(work->hiliteOn->model[0], 0.0f);
|
||||
Hu3DModelAttrReset(work->hiliteOn->model[0], 1);
|
||||
}
|
||||
else {
|
||||
Hu3DModelAttrSet(work->highlightOn->model[0], 1);
|
||||
Hu3DModelAttrSet(work->hiliteOn->model[0], 1);
|
||||
}
|
||||
object->unk10 = 1;
|
||||
}
|
||||
break;
|
||||
case 4:
|
||||
fn_1_A704(work->window[1]);
|
||||
fn_1_A704(work->window[0]);
|
||||
OptionWinAnimOut(work->window[1]);
|
||||
OptionWinAnimOut(work->window[0]);
|
||||
Hu3DModelAttrSet(work->hand->model[0], 1);
|
||||
fn_1_3E1C(object);
|
||||
OptionRumbleMotionHideStart(object);
|
||||
object->unk10 = 5;
|
||||
/* fallthrough */
|
||||
case 5:
|
||||
if (work->window[1]->state == 0 && work->window[0]->state == 0 && !fn_1_3ED0(lbl_1_bss_30)) {
|
||||
if (work->window[1]->state == 0 && work->window[0]->state == 0 && !OptionRumbleMotionCheck(optionRumble)) {
|
||||
for (i = 0; i < 2; i++) {
|
||||
fn_1_A6AC(work->window[i]);
|
||||
OptionWinKill(work->window[i]);
|
||||
}
|
||||
Hu3DModelHookReset(work->system->model[0]);
|
||||
fn_1_AF0(lbl_1_bss_10, -519.62f, 120.0f, 300.0f, 0x28);
|
||||
fn_1_A6C(lbl_1_bss_10, 0.0f, 120.0f, 0.0f, 0x28);
|
||||
fn_1_3290(object, MODE_DISABLED);
|
||||
OptionCameraFocusSet(optionCamera, -519.62f, 120.0f, 300.0f, 0x28);
|
||||
OptionCameraTargetSet(optionCamera, 0.0f, 120.0f, 0.0f, 0x28);
|
||||
OptionRumbleExecModeSet(object, MODE_DISABLED);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -189,7 +189,7 @@ static omObjData *CreateHand(void)
|
|||
{
|
||||
omObjData *hand;
|
||||
|
||||
hand = omAddObjEx(lbl_1_bss_8, 1003, 1, 0, 1, NULL);
|
||||
hand = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL);
|
||||
hand->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 15));
|
||||
Hu3DModelLayerSet(hand->model[0], 3);
|
||||
omSetRot(hand, 0.0f, 180.0f, 0.0f);
|
||||
|
|
@ -210,7 +210,7 @@ static omObjData *CreateSystem(void)
|
|||
{
|
||||
omObjData *system;
|
||||
|
||||
system = omAddObjEx(lbl_1_bss_8, 1003, 1, 0, 1, NULL);
|
||||
system = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL);
|
||||
system->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 2));
|
||||
Hu3DModelAttrSet(system->model[0], 0x40000002);
|
||||
if (GWRumbleGet()) {
|
||||
|
|
@ -261,7 +261,7 @@ static omObjData *CreatePad(void)
|
|||
{
|
||||
omObjData *pad;
|
||||
|
||||
pad = omAddObjEx(lbl_1_bss_8, 1003, 1, 0, 1, NULL);
|
||||
pad = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL);
|
||||
pad->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 9));
|
||||
Hu3DModelAttrSet(pad->model[0], 0x40000001);
|
||||
return pad;
|
||||
|
|
@ -292,7 +292,7 @@ static omObjData *CreatePadFilter(void)
|
|||
{
|
||||
omObjData *object;
|
||||
|
||||
object = omAddObjEx(lbl_1_bss_8, 1003, 1, 0, 1, NULL);
|
||||
object = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL);
|
||||
object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 10));
|
||||
Hu3DModelAttrSet(object->model[0], 0x40000002);
|
||||
Hu3DModelLayerSet(object->model[0], 2);
|
||||
|
|
@ -300,16 +300,16 @@ static omObjData *CreatePadFilter(void)
|
|||
return object;
|
||||
}
|
||||
|
||||
static void KillPadFilter(omObjData *padFilter)
|
||||
static void KillPadFilter(omObjData *object)
|
||||
{
|
||||
s32 i;
|
||||
|
||||
for (i = 0; i < 1; i++) {
|
||||
Hu3DModelKill(padFilter->model[i]);
|
||||
Hu3DModelKill(object->model[i]);
|
||||
}
|
||||
}
|
||||
// ZoomIn
|
||||
void fn_1_3D54(omObjData *object)
|
||||
|
||||
void OptionRumbleMotionShowStart(omObjData *object)
|
||||
{
|
||||
RumbleWork *work = object->data;
|
||||
s16 model = work->padFilter->model[0];
|
||||
|
|
@ -321,8 +321,8 @@ void fn_1_3D54(omObjData *object)
|
|||
Hu3DModelLayerSet(work->padFilter->model[0], 2);
|
||||
HuAudFXPlay(0x83D);
|
||||
}
|
||||
// ZoomOut
|
||||
void fn_1_3E1C(omObjData *object)
|
||||
|
||||
void OptionRumbleMotionHideStart(omObjData *object)
|
||||
{
|
||||
RumbleWork *work = object->data;
|
||||
s16 model = work->padFilter->model[0];
|
||||
|
|
@ -333,8 +333,8 @@ void fn_1_3E1C(omObjData *object)
|
|||
Hu3DModelAttrReset(work->padFilter->model[0], 0x40000001);
|
||||
HuAudFXPlay(0x83E);
|
||||
}
|
||||
// GetPadFilterMotionDone
|
||||
BOOL fn_1_3ED0(omObjData *object)
|
||||
|
||||
BOOL OptionRumbleMotionCheck(omObjData *object)
|
||||
{
|
||||
RumbleWork *work = object->data;
|
||||
s16 padFilterModel = work->padFilter->model[0];
|
||||
|
|
@ -342,26 +342,26 @@ BOOL fn_1_3ED0(omObjData *object)
|
|||
return !Hu3DMotionEndCheck(padFilterModel);
|
||||
}
|
||||
|
||||
static omObjData *CreateHighlightOn(void)
|
||||
static omObjData *CreateHiliteOn(void)
|
||||
{
|
||||
omObjData *highlightOn;
|
||||
omObjData *object;
|
||||
|
||||
highlightOn = omAddObjEx(lbl_1_bss_8, 1003, 1, 0, 1, NULL);
|
||||
highlightOn->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 11));
|
||||
object = omAddObjEx(optionObjMan, 1003, 1, 0, 1, NULL);
|
||||
object->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 11));
|
||||
if (GWRumbleGet()) {
|
||||
Hu3DModelAttrReset(highlightOn->model[0], 1);
|
||||
Hu3DModelAttrReset(object->model[0], 1);
|
||||
}
|
||||
else {
|
||||
Hu3DModelAttrSet(highlightOn->model[0], 1);
|
||||
Hu3DModelAttrSet(object->model[0], 1);
|
||||
}
|
||||
return highlightOn;
|
||||
return object;
|
||||
}
|
||||
|
||||
static void KillHighlightOn(omObjData *highlightOn)
|
||||
static void KillHiliteOn(omObjData *object)
|
||||
{
|
||||
s32 i;
|
||||
|
||||
for (i = 0; i < 1; i++) {
|
||||
Hu3DModelKill(highlightOn->model[i]);
|
||||
Hu3DModelKill(object->model[i]);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue