Introduce enums for specific data directories
This commit is contained in:
gamemasterplc
parent
ce056b82a0
commit
6d67132ca4
21 changed files with 603 additions and 535 deletions
|
|
@ -14,6 +14,8 @@
|
|||
#include "math.h"
|
||||
#include "rel_sqrt_consts.h"
|
||||
|
||||
#include "data_num/title.h"
|
||||
|
||||
#define HU_PAD_BTN_ALL (HuPadBtn[0] | HuPadBtn[1] | HuPadBtn[2] | HuPadBtn[3])
|
||||
#define HU_PAD_BTNDOWN_ALL (HuPadBtnDown[0] | HuPadBtnDown[1] | HuPadBtnDown[2] | HuPadBtnDown[3])
|
||||
#define HU_PAD_DSTK_ALL (HuPadDStkRep[0] | HuPadDStkRep[1] | HuPadDStkRep[2] | HuPadDStkRep[3])
|
||||
|
|
@ -86,7 +88,7 @@ static void BootProc(void)
|
|||
HuSprAttrSet(group, 0, SPRITE_ATTR_HIDDEN);
|
||||
if(omovlevtno != 0) {
|
||||
HuAudSndGrpSetSet(0);
|
||||
data = HuSprAnimReadFile(MAKE_DATA_NUM(DATADIR_TITLE, 1));
|
||||
data = HuSprAnimReadFile(TITLE_HUDSON_ANM);
|
||||
sprite_hudson = HuSprCreate(data, 0, 0);
|
||||
HuSprGrpMemberSet(group, 1, sprite_hudson);
|
||||
HuSprPosSet(group, 1, 288, 240);
|
||||
|
|
@ -116,7 +118,7 @@ static void BootProc(void)
|
|||
MGSeqInit();
|
||||
HuWinInit(1);
|
||||
TitleInit();
|
||||
data = HuSprAnimReadFile(MAKE_DATA_NUM(DATADIR_TITLE, 1));
|
||||
data = HuSprAnimReadFile(TITLE_HUDSON_ANM);
|
||||
sprite_hudson = HuSprCreate(data, 0, 0);
|
||||
HuSprGrpMemberSet(group, 1, sprite_hudson);
|
||||
HuSprPosSet(group, 1, 288, 240);
|
||||
|
|
@ -287,15 +289,15 @@ static void ProgressiveProc(void)
|
|||
VIFlush();
|
||||
}
|
||||
group = HuSprGrpCreate(3);
|
||||
data = HuSprAnimReadFile(MAKE_DATA_NUM(DATADIR_TITLE, 3));
|
||||
data = HuSprAnimReadFile(TITLE_PROGRESSIVE_CHOOSE_ANM);
|
||||
sprite = HuSprCreate(data, 0, 0);
|
||||
HuSprGrpMemberSet(group, 0, sprite);
|
||||
HuSprPosSet(group, 0, 288, 240);
|
||||
data = HuSprAnimReadFile(MAKE_DATA_NUM(DATADIR_TITLE, 6));
|
||||
data = HuSprAnimReadFile(TITLE_PROGRESSIVE_CURSOR_ON_ANM);
|
||||
sprite = HuSprCreate(data, 0, 0);
|
||||
HuSprGrpMemberSet(group, 1, sprite);
|
||||
HuSprPosSet(group, 1, progressivePosTbl[option*2], progressivePosTbl[(option*2)+1]);
|
||||
data = HuSprAnimReadFile(MAKE_DATA_NUM(DATADIR_TITLE, 7));
|
||||
data = HuSprAnimReadFile(TITLE_PROGRESSIVE_CURSOR_OFF_ANM);
|
||||
sprite = HuSprCreate(data, 0, 0);
|
||||
HuSprGrpMemberSet(group, 2, sprite);
|
||||
HuSprPosSet(group, 2, progressivePosTbl[option*2], progressivePosTbl[(option*2)+1]);
|
||||
|
|
@ -333,9 +335,9 @@ static void ProgressiveProc(void)
|
|||
HuSprGrpKill(group);
|
||||
group = HuSprGrpCreate(1);
|
||||
if(!option) {
|
||||
data = HuSprAnimReadFile(MAKE_DATA_NUM(DATADIR_TITLE, 4));
|
||||
data = HuSprAnimReadFile(TITLE_PROGRESSIVE_ON_ANM);
|
||||
} else {
|
||||
data = HuSprAnimReadFile(MAKE_DATA_NUM(DATADIR_TITLE, 5));
|
||||
data = HuSprAnimReadFile(TITLE_PROGRESSIVE_OFF_ANM);
|
||||
}
|
||||
sprite = HuSprCreate(data, 0, 0);
|
||||
HuSprGrpMemberSet(group, 0, sprite);
|
||||
|
|
@ -452,35 +454,35 @@ static void TitleInit(void)
|
|||
s16 model;
|
||||
s16 sprite;
|
||||
AnimData *sprite_data;
|
||||
titleModel[0] = model = Hu3DModelCreateFile(MAKE_DATA_NUM(DATADIR_TITLE, 11));
|
||||
titleModel[0] = model = Hu3DModelCreateFile(TITLE_CHAR_HSF);
|
||||
Hu3DModelAttrSet(model, 1);
|
||||
Hu3DModelAttrSet(model, 0x40000001);
|
||||
titleModel[1] = model = Hu3DModelCreateFile(MAKE_DATA_NUM(DATADIR_TITLE, 12));
|
||||
titleModel[1] = model = Hu3DModelCreateFile(TITLE_CUBE_HSF);
|
||||
Hu3DModelAttrSet(model, 1);
|
||||
Hu3DModelAttrSet(model, 0x40000001);
|
||||
titleModel[2] = model = Hu3DModelCreateFile(MAKE_DATA_NUM(DATADIR_TITLE, 13));
|
||||
titleModel[2] = model = Hu3DModelCreateFile(TITLE_SKY_HSF);
|
||||
Hu3DModelAttrSet(model, 1);
|
||||
Hu3DModelAttrSet(model, 0x40000001);
|
||||
Hu3DModelCameraInfoSet(model, 1);
|
||||
Hu3DModelLightInfoSet(model, 1);
|
||||
titleGroup = HuSprGrpCreate(4);
|
||||
sprite_data = HuSprAnimReadFile(MAKE_DATA_NUM(DATADIR_TITLE, 8));
|
||||
sprite_data = HuSprAnimReadFile(TITLE_BG_ANM);
|
||||
sprite = HuSprCreate(sprite_data, 0, 0);
|
||||
HuSprGrpMemberSet(titleGroup, 0, sprite);
|
||||
HuSprAttrSet(titleGroup, 0, SPRITE_ATTR_HIDDEN);
|
||||
HuSprDrawNoSet(titleGroup, 0, 127);
|
||||
HuSprPosSet(titleGroup, 0, 288, 240);
|
||||
sprite_data = HuSprAnimReadFile(MAKE_DATA_NUM(DATADIR_TITLE, 10));
|
||||
sprite_data = HuSprAnimReadFile(TITLE_COPYRIGHT_ANM);
|
||||
sprite = HuSprCreate(sprite_data, 1, 0);
|
||||
HuSprGrpMemberSet(titleGroup, 1, sprite);
|
||||
HuSprAttrSet(titleGroup, 1, SPRITE_ATTR_HIDDEN);
|
||||
HuSprPosSet(titleGroup, 1, 288, 420);
|
||||
sprite_data = HuSprAnimReadFile(MAKE_DATA_NUM(DATADIR_TITLE, 2));
|
||||
sprite_data = HuSprAnimReadFile(TITLE_PRESS_START_ANM);
|
||||
sprite = HuSprCreate(sprite_data, 2, 0);
|
||||
HuSprGrpMemberSet(titleGroup, 2, sprite);
|
||||
HuSprAttrSet(titleGroup, 2, SPRITE_ATTR_HIDDEN|SPRITE_ATTR_BILINEAR);
|
||||
HuSprPosSet(titleGroup, 2, 288, 380);
|
||||
sprite_data = HuSprAnimReadFile(MAKE_DATA_NUM(DATADIR_TITLE, 9));
|
||||
sprite_data = HuSprAnimReadFile(TITLE_LOGO_ANM);
|
||||
sprite = HuSprCreate(sprite_data, 0, 0);
|
||||
HuSprGrpMemberSet(titleGroup, 3, sprite);
|
||||
HuSprAttrSet(titleGroup, 3, SPRITE_ATTR_HIDDEN|SPRITE_ATTR_BILINEAR);
|
||||
|
|
|
|||
|
|
@ -44,18 +44,18 @@ u8 WipeStatGet(void);
|
|||
|
||||
//DATA
|
||||
w03StructUnk0 lbl_1_data_0[] = {
|
||||
{{0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, MAKE_DATA_NUM(0x0077, 0x0004)},
|
||||
{{145.0988f, 65.6173f, -2004.14f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, MAKE_DATA_NUM(0x0077, 0x0005)},
|
||||
{{-1548.14f, -1148.76f, -1095.54f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, MAKE_DATA_NUM(0x0077, 0x0006)},
|
||||
{{1050.0f, 50.0f, -1810.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, MAKE_DATA_NUM(0x0077, 0x000B)},
|
||||
{{-1950.0f, 50.0f, 1790.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 0.914f, 1.0f}, MAKE_DATA_NUM(0x0077, 0x000B)},
|
||||
{{1050.0f, 0.0f, -1750.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, MAKE_DATA_NUM(0x0077, 0x000A)},
|
||||
{{-1950.0f, 0.0f, 1850.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 0.914f, 1.0f}, MAKE_DATA_NUM(0x0077, 0x000A)},
|
||||
{{1950.0f, 0.0f, -1800.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, MAKE_DATA_NUM(0x0077, 0x0010)},
|
||||
{{-3150.0f, 0.0f, -600.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, MAKE_DATA_NUM(0x0077, 0x0011)},
|
||||
{{-3150.0f, 270.0f, -600.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, MAKE_DATA_NUM(0x0077, 0x0012)},
|
||||
{{2080.0f, 0.0f, -1635.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, MAKE_DATA_NUM(0x0002, 0x000D)},
|
||||
{{-3000.0f, 0.0f, -500.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, MAKE_DATA_NUM(0x0002, 0x000D)},
|
||||
{{0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, DATA_MAKE_NUM(DATADIR_W03, 0x0004)},
|
||||
{{145.0988f, 65.6173f, -2004.14f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, DATA_MAKE_NUM(DATADIR_W03, 0x0005)},
|
||||
{{-1548.14f, -1148.76f, -1095.54f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, DATA_MAKE_NUM(DATADIR_W03, 0x0006)},
|
||||
{{1050.0f, 50.0f, -1810.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, DATA_MAKE_NUM(DATADIR_W03, 0x000B)},
|
||||
{{-1950.0f, 50.0f, 1790.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 0.914f, 1.0f}, DATA_MAKE_NUM(DATADIR_W03, 0x000B)},
|
||||
{{1050.0f, 0.0f, -1750.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, DATA_MAKE_NUM(DATADIR_W03, 0x000A)},
|
||||
{{-1950.0f, 0.0f, 1850.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 0.914f, 1.0f}, DATA_MAKE_NUM(DATADIR_W03, 0x000A)},
|
||||
{{1950.0f, 0.0f, -1800.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, DATA_MAKE_NUM(DATADIR_W03, 0x0010)},
|
||||
{{-3150.0f, 0.0f, -600.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, DATA_MAKE_NUM(DATADIR_W03, 0x0011)},
|
||||
{{-3150.0f, 270.0f, -600.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, DATA_MAKE_NUM(DATADIR_W03, 0x0012)},
|
||||
{{2080.0f, 0.0f, -1635.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, DATA_MAKE_NUM(DATADIR_BGUEST, 0x000D)},
|
||||
{{-3000.0f, 0.0f, -500.0f}, {0.0f, 0.0f, 0.0f}, {1.0f, 1.0f, 1.0f}, DATA_MAKE_NUM(DATADIR_BGUEST, 0x000D)},
|
||||
};
|
||||
|
||||
s16 lbl_1_data_1E0 = -1;
|
||||
|
|
@ -80,12 +80,12 @@ w03StructUnk1 lbl_1_data_1EC = {
|
|||
};
|
||||
|
||||
s32 lbl_1_data_20C[] = {
|
||||
MAKE_DATA_NUM(0x0077, 0x001C),
|
||||
DATA_MAKE_NUM(DATADIR_W03, 0x001C),
|
||||
DATA_NUM_LISTEND
|
||||
};
|
||||
|
||||
s32 lbl_1_data_214[] = {
|
||||
MAKE_DATA_NUM(0x0002, 0x000E),
|
||||
DATA_MAKE_NUM(DATADIR_BGUEST, 0x000E),
|
||||
DATA_NUM_LISTEND
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -130,20 +130,20 @@ char* lbl_1_data_508[] = {
|
|||
};
|
||||
|
||||
s32 lbl_1_data_514[] = {
|
||||
MAKE_DATA_NUM(7, 0x6D),
|
||||
MAKE_DATA_NUM(7, 0x6E),
|
||||
MAKE_DATA_NUM(7, 0x6F),
|
||||
MAKE_DATA_NUM(7, 0x70),
|
||||
MAKE_DATA_NUM(7, 0x71),
|
||||
MAKE_DATA_NUM(7, 0x72),
|
||||
MAKE_DATA_NUM(7, 0x73),
|
||||
MAKE_DATA_NUM(7, 0x74),
|
||||
MAKE_DATA_NUM(7, 0x76),
|
||||
MAKE_DATA_NUM(7, 0x77),
|
||||
MAKE_DATA_NUM(7, 0x78),
|
||||
MAKE_DATA_NUM(7, 0x79),
|
||||
MAKE_DATA_NUM(7, 0x7A),
|
||||
MAKE_DATA_NUM(7, 0x7B),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x6D),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x6E),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x6F),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x70),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x71),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x72),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x73),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x74),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x76),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x77),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x78),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x79),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x7A),
|
||||
DATA_MAKE_NUM(DATADIR_BOARD, 0x7B),
|
||||
};
|
||||
|
||||
//BSS
|
||||
|
|
|
|||
|
|
@ -41,26 +41,26 @@ s32 lbl_1_data_288 = -1;
|
|||
|
||||
char lbl_1_data_28C[] = "%d";
|
||||
|
||||
s32 lbl_1_data_290[] = { //TODO: make sure this actually uses MAKE_DATA_NUM macro
|
||||
MAKE_DATA_NUM(0x5F, 0x62),
|
||||
MAKE_DATA_NUM(0x1A, 0x62),
|
||||
MAKE_DATA_NUM(0x6D, 0x62),
|
||||
MAKE_DATA_NUM(0x8A, 0x62),
|
||||
MAKE_DATA_NUM(0x85, 0x62),
|
||||
MAKE_DATA_NUM(0x11, 0x62),
|
||||
MAKE_DATA_NUM(0x0D, 0x62),
|
||||
MAKE_DATA_NUM(0x81, 0x62),
|
||||
s32 lbl_1_data_290[] = { //TODO: make sure this actually uses DATA_MAKE_NUM macro
|
||||
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x62),
|
||||
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x62),
|
||||
DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x62),
|
||||
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x62),
|
||||
DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x62),
|
||||
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x62),
|
||||
DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x62),
|
||||
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x62),
|
||||
};
|
||||
|
||||
s32 lbl_1_data_2B0[] = { //TODO: make sure this actually uses MAKE_DATA_NUM macro
|
||||
MAKE_DATA_NUM(0x5F, 0x33),
|
||||
MAKE_DATA_NUM(0x1A, 0x33),
|
||||
MAKE_DATA_NUM(0x6D, 0x33),
|
||||
MAKE_DATA_NUM(0x8A, 0x33),
|
||||
MAKE_DATA_NUM(0x85, 0x33),
|
||||
MAKE_DATA_NUM(0x11, 0x33),
|
||||
MAKE_DATA_NUM(0x0D, 0x33),
|
||||
MAKE_DATA_NUM(0x81, 0x33),
|
||||
s32 lbl_1_data_2B0[] = { //TODO: make sure this actually uses DATA_MAKE_NUM macro
|
||||
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x33),
|
||||
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x33),
|
||||
DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x33),
|
||||
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x33),
|
||||
DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x33),
|
||||
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x33),
|
||||
DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x33),
|
||||
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x33),
|
||||
};
|
||||
|
||||
s32 lbl_1_data_2D0[] = {
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#include "game/board/window.h"
|
||||
|
||||
s32 lbl_1_data_78[2] = {
|
||||
MAKE_DATA_NUM(DATADIR_W10, 16),
|
||||
DATA_MAKE_NUM(DATADIR_W10, 16),
|
||||
-1
|
||||
};
|
||||
|
||||
|
|
@ -14,7 +14,7 @@ Vec lbl_1_data_80[2] = {
|
|||
|
||||
void fn_1_AEC(void) {
|
||||
lbl_1_bss_1C = 0;
|
||||
lbl_1_bss_1E = BoardModelCreate(MAKE_DATA_NUM(DATADIR_W10, 15), lbl_1_data_78, 0);
|
||||
lbl_1_bss_1E = BoardModelCreate(DATA_MAKE_NUM(DATADIR_W10, 15), lbl_1_data_78, 0);
|
||||
BoardModelMotionStart(lbl_1_bss_1E, 1, 0x40000001);
|
||||
BoardTutorialHostSet(lbl_1_bss_1E);
|
||||
BoardModelLayerSet(lbl_1_bss_1E, 6);
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ unkw10Dll lbl_1_data_0[1] = {
|
|||
3300.0f, 100.0f, -900.0f,
|
||||
0.0f, 0.0f, 0.0f,
|
||||
1.0f, 1.0f, 1.0f,
|
||||
MAKE_DATA_NUM(DATADIR_W10, 3)
|
||||
DATA_MAKE_NUM(DATADIR_W10, 3)
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -42,22 +42,22 @@ s32 lbl_1_data_34[] = {
|
|||
};
|
||||
|
||||
s32 lbl_1_data_54[2] = {
|
||||
MAKE_DATA_NUM(DATADIR_W10, 18),
|
||||
DATA_MAKE_NUM(DATADIR_W10, 18),
|
||||
DATA_NUM_LISTEND
|
||||
};
|
||||
|
||||
s32 lbl_1_data_5C[2] = {
|
||||
MAKE_DATA_NUM(DATADIR_BGUEST, 9),
|
||||
DATA_MAKE_NUM(DATADIR_BGUEST, 9),
|
||||
DATA_NUM_LISTEND
|
||||
};
|
||||
|
||||
s32 lbl_1_data_64[2] = {
|
||||
MAKE_DATA_NUM(DATADIR_BGUEST, 24),
|
||||
DATA_MAKE_NUM(DATADIR_BGUEST, 24),
|
||||
DATA_NUM_LISTEND
|
||||
};
|
||||
|
||||
s32 lbl_1_data_6C[2] = {
|
||||
MAKE_DATA_NUM(DATADIR_BGUEST, 14),
|
||||
DATA_MAKE_NUM(DATADIR_BGUEST, 14),
|
||||
DATA_NUM_LISTEND
|
||||
};
|
||||
|
||||
|
|
@ -85,26 +85,26 @@ void BoardCreate(void) {
|
|||
fn_1_AEC();
|
||||
fn_1_1D68();
|
||||
lbl_1_bss_C = 0;
|
||||
BoardSpaceInit(MAKE_DATA_NUM(DATADIR_W10, 0));
|
||||
BoardSpaceInit(DATA_MAKE_NUM(DATADIR_W10, 0));
|
||||
temp = BoardSpaceFlagSearch(0, 1);
|
||||
BoardTutorialBlockSetPos(temp, 1);
|
||||
lbl_1_data_28 = BoardModelCreate(MAKE_DATA_NUM(DATADIR_W10, 1), NULL, 0);
|
||||
lbl_1_data_28 = BoardModelCreate(DATA_MAKE_NUM(DATADIR_W10, 1), NULL, 0);
|
||||
fn_8006DDE8(lbl_1_data_28, -1.0f);
|
||||
BoardModelPosSet(lbl_1_data_28, 0.0f, 0.0f, 0.0f);
|
||||
BoardModelMotionStart(lbl_1_data_28, 0, 0x40000001);
|
||||
BoardModelMotionSpeedSet(lbl_1_data_28, 1.0f);
|
||||
lbl_1_data_2A = BoardModelCreate(MAKE_DATA_NUM(DATADIR_W10, 2), NULL, 0);
|
||||
lbl_1_data_2A = BoardModelCreate(DATA_MAKE_NUM(DATADIR_W10, 2), NULL, 0);
|
||||
fn_8006DDE8(lbl_1_data_2A, -1.0f);
|
||||
BoardModelPosSet(lbl_1_data_2A, 0.0f, 0.0f, 0.0f);
|
||||
BoardModelMotionStart(lbl_1_data_2A, 0, 0x40000001);
|
||||
lbl_1_data_2C = BoardModelCreate(MAKE_DATA_NUM(DATADIR_W10, 17), lbl_1_data_54, 0);
|
||||
lbl_1_data_2C = BoardModelCreate(DATA_MAKE_NUM(DATADIR_W10, 17), lbl_1_data_54, 0);
|
||||
BoardModelPosSet(lbl_1_data_2C, 0.0f, 0.0f, 0.0f);
|
||||
BoardModelMotionStart(lbl_1_data_2C, 1, 0x40000001);
|
||||
lbl_1_data_2E = BoardModelCreate(MAKE_DATA_NUM(DATADIR_BGUEST, 5), lbl_1_data_5C, 0);
|
||||
lbl_1_data_2E = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BGUEST, 5), lbl_1_data_5C, 0);
|
||||
BoardModelMotionStart(lbl_1_data_2E, 1, 0x40000001);
|
||||
lbl_1_data_32 = BoardModelCreate(MAKE_DATA_NUM(DATADIR_BGUEST, 18), lbl_1_data_64, 0);
|
||||
lbl_1_data_32 = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BGUEST, 18), lbl_1_data_64, 0);
|
||||
BoardModelMotionStart(lbl_1_data_32, 1, 0x40000001);
|
||||
lbl_1_data_30 = BoardModelCreate(MAKE_DATA_NUM(DATADIR_BGUEST, 13), lbl_1_data_6C, 0);
|
||||
lbl_1_data_30 = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BGUEST, 13), lbl_1_data_6C, 0);
|
||||
BoardModelMotionStart(lbl_1_data_30, 1, 0x40000001);
|
||||
BoardLightHookSet(&fn_1_8C0, &fn_1_904);
|
||||
for (i = 0; i < ARRAY_COUNT(lbl_1_data_0); i++) {
|
||||
|
|
|
|||
|
|
@ -68,17 +68,17 @@ w10DllUnk04 lbl_1_data_108[42] = {
|
|||
char lbl_1_data_258[] = "Tutorial Hook P0:%d P1:%d P2:%d P3:%d SCEN:%d CUE:%d PRM:%d DICE:%d MSG:%d\n";
|
||||
|
||||
s32 lbl_1_data_2A8[11] = {
|
||||
MAKE_DATA_NUM(DATADIR_W10, 4),
|
||||
MAKE_DATA_NUM(DATADIR_W10, 5),
|
||||
MAKE_DATA_NUM(DATADIR_W10, 6),
|
||||
MAKE_DATA_NUM(DATADIR_W10, 7),
|
||||
MAKE_DATA_NUM(DATADIR_W10, 8),
|
||||
MAKE_DATA_NUM(DATADIR_W10, 9),
|
||||
MAKE_DATA_NUM(DATADIR_W10, 10),
|
||||
MAKE_DATA_NUM(DATADIR_W10, 11),
|
||||
MAKE_DATA_NUM(DATADIR_W10, 12),
|
||||
MAKE_DATA_NUM(DATADIR_W10, 13),
|
||||
MAKE_DATA_NUM(DATADIR_W10, 14)
|
||||
DATA_MAKE_NUM(DATADIR_W10, 4),
|
||||
DATA_MAKE_NUM(DATADIR_W10, 5),
|
||||
DATA_MAKE_NUM(DATADIR_W10, 6),
|
||||
DATA_MAKE_NUM(DATADIR_W10, 7),
|
||||
DATA_MAKE_NUM(DATADIR_W10, 8),
|
||||
DATA_MAKE_NUM(DATADIR_W10, 9),
|
||||
DATA_MAKE_NUM(DATADIR_W10, 10),
|
||||
DATA_MAKE_NUM(DATADIR_W10, 11),
|
||||
DATA_MAKE_NUM(DATADIR_W10, 12),
|
||||
DATA_MAKE_NUM(DATADIR_W10, 13),
|
||||
DATA_MAKE_NUM(DATADIR_W10, 14)
|
||||
};
|
||||
|
||||
void fn_1_176C(void) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue