Applied DATA_MAKE_NUM and MAKE_MESSID macros
This commit is contained in:
kabiskac
parent
c1c506360c
commit
a0ebc7588d
116 changed files with 38174 additions and 37156 deletions
|
|
@ -1,52 +1,52 @@
|
|||
#include "REL/mgmodedll.h"
|
||||
|
||||
DataListModel lbl_1_data_490[] = {
|
||||
{ 0x620000, 0, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
|
||||
{ 0x620001, 0x40000001, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
|
||||
{ 0x620002, 0, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
|
||||
{ 0x620003, 0, 1, -1, 2, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
|
||||
{ 0x620004, 0, 1, -1, 2, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
|
||||
{ 0x62005E, 0, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
|
||||
{ 0x62005F, 0, 1, -1, 5, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
|
||||
{ 0x620060, 0, 1, -1, 5, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
|
||||
{ 0x620061, 0, 1, -1, 5, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
|
||||
{ 0x620005, 0x1, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
|
||||
{ 0x620006, 0x1, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
|
||||
{ 0x620007, 0x1, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
|
||||
{ 0x620008, 0x1, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x00), 0, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x01), 0x40000001, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x02), 0, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x03), 0, 1, -1, 2, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x04), 0, 1, -1, 2, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x5E), 0, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x5F), 0, 1, -1, 5, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x60), 0, 1, -1, 5, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x61), 0, 1, -1, 5, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x05), 0x1, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x06), 0x1, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x07), 0x1, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x08), 0x1, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
|
||||
{ -1, 0, 0, -1, -1, { 0, 0, 0 }, { 0, 0, 0 }, { 1, 1, 1 } },
|
||||
};
|
||||
|
||||
DataListSprite lbl_1_data_768[] = {
|
||||
{ 0x62000C, 0, 10, 288, -200, { 255, 255, 255, 255 } },
|
||||
{ 0x620009, 0, 10, 288, -200, { 255, 255, 255, 255 } },
|
||||
{ 0x62000A, 0, 10, 288, -200, { 255, 255, 255, 255 } },
|
||||
{ 0x62000D, 4, 100, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ 0x620018, 4, 200, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ 0x62001A, 4, 20, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ 0x62001B, 4, 30, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ 0x62001C, 4, 40, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ 0x62001D, 4, 50, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ 0x62001E, 4, 50, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ 0x62001F, 4, 50, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ 0x620020, 4, 50, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ 0x620021, 4, 50, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ 0x620025, 4, 200, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ 0x62000E, 4, 210, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ 0x62000F, 4, 210, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ 0x620019, 4, 200, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ 0x620028, 4, 10, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ 0x620028, 4, 10, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ 0x62002A, 4, 10, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ 0x62002E, 4, 200, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ 0x62002F, 4, 200, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ 0x620032, 4, 5, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ 0x620031, 4, 4, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ 0x620030, 4, 4, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ 0x620029, 4, 4, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ 0x620029, 4, 4, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ 0x620033, 4, 50, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ 0x620034, 4, 50, 288, 256, { 255, 255, 255, 255 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x0C), 0, 10, 288, -200, { 255, 255, 255, 255 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x09), 0, 10, 288, -200, { 255, 255, 255, 255 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x0A), 0, 10, 288, -200, { 255, 255, 255, 255 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x0D), 4, 100, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x18), 4, 200, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x1A), 4, 20, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x1B), 4, 30, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x1C), 4, 40, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x1D), 4, 50, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x1E), 4, 50, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x1F), 4, 50, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x20), 4, 50, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x21), 4, 50, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x25), 4, 200, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x0E), 4, 210, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x0F), 4, 210, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x19), 4, 200, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x28), 4, 10, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x28), 4, 10, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x2A), 4, 10, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x2E), 4, 200, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x2F), 4, 200, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x32), 4, 5, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x31), 4, 4, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x30), 4, 4, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x29), 4, 4, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x29), 4, 4, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x33), 4, 50, 288, 240, { 255, 255, 255, 255 } },
|
||||
{ DATA_MAKE_NUM(DATADIR_MGMODE, 0x34), 4, 50, 288, 256, { 255, 255, 255, 255 } },
|
||||
{ 0, 0, 0, 0, 0, { 0, 0, 0, 0 } },
|
||||
};
|
||||
|
||||
|
|
@ -128,4 +128,4 @@ void fn_1_26BB0(void)
|
|||
espKill(lbl_1_bss_2C2C[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1321,7 +1321,7 @@ void fn_1_6C18(void)
|
|||
HuSprInit();
|
||||
espInit();
|
||||
HuPrcVSleep();
|
||||
sprite = espEntry(0x860020, 5000, 0);
|
||||
sprite = espEntry(DATA_MAKE_NUM(DATADIR_WIN, 0x20), 5000, 0);
|
||||
espPosSet(sprite, 288.0, 240.0);
|
||||
espAttrReset(sprite, 4);
|
||||
Hu3DBGColorSet(0, 0, 0);
|
||||
|
|
@ -1337,4 +1337,4 @@ void fn_1_6C18(void)
|
|||
while(WipeStatGet()) {
|
||||
HuPrcVSleep();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,13 @@
|
|||
#include "REL/mgmodedll.h"
|
||||
#include "game/gamework_data.h"
|
||||
#include "game/gamework.h"
|
||||
#include "game/wipe.h"
|
||||
#include "game/audio.h"
|
||||
#include "game/gamework.h"
|
||||
#include "game/gamework_data.h"
|
||||
#include "game/wipe.h"
|
||||
|
||||
#include "game/chrman.h"
|
||||
|
||||
#include "math.h"
|
||||
|
||||
|
||||
s16 lbl_1_bss_2C80[13];
|
||||
s16 lbl_1_bss_2C66[13];
|
||||
s16 lbl_1_bss_2C2C[29];
|
||||
|
|
@ -24,25 +23,25 @@ s16 lbl_1_bss_20AA;
|
|||
s16 lbl_1_bss_20A8;
|
||||
|
||||
s32 lbl_1_data_9C0[8] = {
|
||||
0x005F0000,
|
||||
0x001A0000,
|
||||
0x006D0000,
|
||||
0x008A0000,
|
||||
0x00850000,
|
||||
0x00110000,
|
||||
0x000D0000,
|
||||
0x00810000
|
||||
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00),
|
||||
DATA_MAKE_NUM(DATADIR_LUIGIMOT, 0x00),
|
||||
DATA_MAKE_NUM(DATADIR_PEACHMOT, 0x00),
|
||||
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 0x00),
|
||||
DATA_MAKE_NUM(DATADIR_WARIOMOT, 0x00),
|
||||
DATA_MAKE_NUM(DATADIR_DONKEYMOT, 0x00),
|
||||
DATA_MAKE_NUM(DATADIR_DAISYMOT, 0x00),
|
||||
DATA_MAKE_NUM(DATADIR_WALUIGIMOT, 0x00),
|
||||
};
|
||||
|
||||
s32 lbl_1_data_9E0[8] = {
|
||||
0x005E0000,
|
||||
0x00190000,
|
||||
0x006C0000,
|
||||
0x00890000,
|
||||
0x00840000,
|
||||
0x00100000,
|
||||
0x000C0000,
|
||||
0x00800000
|
||||
DATADIR_MARIOMDL1,
|
||||
DATADIR_LUIGIMDL1,
|
||||
DATADIR_PEACHMDL1,
|
||||
DATADIR_YOSHIMDL1,
|
||||
DATADIR_WARIOMDL1,
|
||||
DATADIR_DONKEYMDL1,
|
||||
DATADIR_DAISYMDL1,
|
||||
DATADIR_WALUIGIMDL1,
|
||||
};
|
||||
|
||||
s16 lbl_1_data_A00 = -1;
|
||||
|
|
@ -51,111 +50,111 @@ void fn_1_26C54(s16 layer);
|
|||
|
||||
void fn_1_26C28(void)
|
||||
{
|
||||
Hu3DLayerHookSet(2, fn_1_26C54);
|
||||
Hu3DLayerHookSet(2, fn_1_26C54);
|
||||
}
|
||||
|
||||
void fn_1_26C54(s16 layer)
|
||||
{
|
||||
Mtx44 proj;
|
||||
Mtx modelview;
|
||||
Vec pos, target, up;
|
||||
GXColor color;
|
||||
CameraData *camera = &Hu3DCamera[0];
|
||||
MTXPerspective(proj, camera->fov, camera->aspect, camera->near, camera->far);
|
||||
GXSetProjection(proj, GX_PERSPECTIVE);
|
||||
GXSetViewport(0, 0, 640, 480, 0, 1);
|
||||
GXSetScissor(0, 0, 640, 480);
|
||||
GXClearVtxDesc();
|
||||
GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
|
||||
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
|
||||
color.a = 255;
|
||||
GXSetTevColor(GX_TEVREG0, color);
|
||||
GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD_NULL, GX_TEXMAP_NULL, GX_COLOR0A0);
|
||||
GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO, GX_CC_C0);
|
||||
GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
|
||||
GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO);
|
||||
GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
|
||||
GXSetNumTexGens(0);
|
||||
GXSetNumTevStages(01);
|
||||
GXSetCullMode(GX_CULL_NONE);
|
||||
GXSetAlphaCompare(GX_GEQUAL, 0, GX_AOP_AND, GX_GEQUAL, 0);
|
||||
GXSetZMode(GX_TRUE, GX_ALWAYS, GX_TRUE);
|
||||
pos.x = pos.y = pos.z = 0;
|
||||
target.x = target.y = 0;
|
||||
target.z = -100;
|
||||
up.x = up.z = 0;
|
||||
up.y = 1;
|
||||
MTXLookAt(modelview, &pos, &up, &target);
|
||||
GXLoadPosMtxImm(modelview, GX_PNMTX0);
|
||||
pos.x = (10000.0f*(-sin(camera->fov/2.0f)))*1.2f;
|
||||
pos.y = (10000.0f*(-sin(camera->fov/2.0f)))*(5.0f/6.0f);
|
||||
GXBegin(GX_QUADS, GX_VTXFMT0, 4);
|
||||
GXPosition3f32(-pos.x, -pos.y, -10000.0f);
|
||||
GXPosition3f32(pos.x, -pos.y, -10000.0f);
|
||||
GXPosition3f32(pos.x, pos.y, -10000.0f);
|
||||
GXPosition3f32(-pos.x, pos.y, -10000.0f);
|
||||
GXEnd();
|
||||
Mtx44 proj;
|
||||
Mtx modelview;
|
||||
Vec pos, target, up;
|
||||
GXColor color;
|
||||
CameraData *camera = &Hu3DCamera[0];
|
||||
MTXPerspective(proj, camera->fov, camera->aspect, camera->near, camera->far);
|
||||
GXSetProjection(proj, GX_PERSPECTIVE);
|
||||
GXSetViewport(0, 0, 640, 480, 0, 1);
|
||||
GXSetScissor(0, 0, 640, 480);
|
||||
GXClearVtxDesc();
|
||||
GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
|
||||
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
|
||||
color.a = 255;
|
||||
GXSetTevColor(GX_TEVREG0, color);
|
||||
GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD_NULL, GX_TEXMAP_NULL, GX_COLOR0A0);
|
||||
GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO, GX_CC_C0);
|
||||
GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
|
||||
GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO);
|
||||
GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE, GX_TEVPREV);
|
||||
GXSetNumTexGens(0);
|
||||
GXSetNumTevStages(01);
|
||||
GXSetCullMode(GX_CULL_NONE);
|
||||
GXSetAlphaCompare(GX_GEQUAL, 0, GX_AOP_AND, GX_GEQUAL, 0);
|
||||
GXSetZMode(GX_TRUE, GX_ALWAYS, GX_TRUE);
|
||||
pos.x = pos.y = pos.z = 0;
|
||||
target.x = target.y = 0;
|
||||
target.z = -100;
|
||||
up.x = up.z = 0;
|
||||
up.y = 1;
|
||||
MTXLookAt(modelview, &pos, &up, &target);
|
||||
GXLoadPosMtxImm(modelview, GX_PNMTX0);
|
||||
pos.x = (10000.0f * (-sin(camera->fov / 2.0f))) * 1.2f;
|
||||
pos.y = (10000.0f * (-sin(camera->fov / 2.0f))) * (5.0f / 6.0f);
|
||||
GXBegin(GX_QUADS, GX_VTXFMT0, 4);
|
||||
GXPosition3f32(-pos.x, -pos.y, -10000.0f);
|
||||
GXPosition3f32(pos.x, -pos.y, -10000.0f);
|
||||
GXPosition3f32(pos.x, pos.y, -10000.0f);
|
||||
GXPosition3f32(-pos.x, pos.y, -10000.0f);
|
||||
GXEnd();
|
||||
}
|
||||
|
||||
void fn_1_27080(void)
|
||||
{
|
||||
s16 i;
|
||||
s32 status;
|
||||
CharModelDataClose(-1);
|
||||
CharKill(-1);
|
||||
for(i=0; i<4; i++) {
|
||||
status = HuDataDirReadAsync(lbl_1_data_9C0[GWPlayerCfg[i].character]);
|
||||
if(status != -1) {
|
||||
while(!HuDataGetAsyncStat(status)) {
|
||||
HuPrcVSleep();
|
||||
}
|
||||
}
|
||||
CharARAMOpen(GWPlayerCfg[i].character);
|
||||
}
|
||||
for(i=0; i<2; i++) {
|
||||
status = HuDataDirReadAsync(lbl_1_data_9E0[GWPlayerCfg[i].character]);
|
||||
if(status != -1) {
|
||||
while(!HuDataGetAsyncStat(status)) {
|
||||
HuPrcVSleep();
|
||||
}
|
||||
}
|
||||
}
|
||||
lbl_1_bss_20AA = 0;
|
||||
HuPrcEnd();
|
||||
while(1) {
|
||||
HuPrcVSleep();
|
||||
}
|
||||
s16 i;
|
||||
s32 status;
|
||||
CharModelDataClose(-1);
|
||||
CharKill(-1);
|
||||
for (i = 0; i < 4; i++) {
|
||||
status = HuDataDirReadAsync(lbl_1_data_9C0[GWPlayerCfg[i].character]);
|
||||
if (status != -1) {
|
||||
while (!HuDataGetAsyncStat(status)) {
|
||||
HuPrcVSleep();
|
||||
}
|
||||
}
|
||||
CharARAMOpen(GWPlayerCfg[i].character);
|
||||
}
|
||||
for (i = 0; i < 2; i++) {
|
||||
status = HuDataDirReadAsync(lbl_1_data_9E0[GWPlayerCfg[i].character]);
|
||||
if (status != -1) {
|
||||
while (!HuDataGetAsyncStat(status)) {
|
||||
HuPrcVSleep();
|
||||
}
|
||||
}
|
||||
}
|
||||
lbl_1_bss_20AA = 0;
|
||||
HuPrcEnd();
|
||||
while (1) {
|
||||
HuPrcVSleep();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
s16 fn_1_271B4(s16 mgNo, s16 x, s16 y)
|
||||
{
|
||||
s16 time;
|
||||
AnimData *anim;
|
||||
s16 sprite;
|
||||
s32 mgpic;
|
||||
if(mgNo == -1) {
|
||||
if(lbl_1_data_A00 == -1) {
|
||||
s16 time;
|
||||
AnimData *anim;
|
||||
s16 sprite;
|
||||
s32 mgpic;
|
||||
if (mgNo == -1) {
|
||||
if (lbl_1_data_A00 == -1) {
|
||||
return;
|
||||
}
|
||||
for(time=0; time<=10; time++) {
|
||||
HuSprGrpTPLvlSet(lbl_1_data_A00, 1.0-(time/10.0));
|
||||
}
|
||||
for (time = 0; time <= 10; time++) {
|
||||
HuSprGrpTPLvlSet(lbl_1_data_A00, 1.0 - (time / 10.0));
|
||||
HuPrcVSleep();
|
||||
}
|
||||
HuSprGrpKill(lbl_1_data_A00);
|
||||
lbl_1_data_A00 = -1;
|
||||
return;
|
||||
}
|
||||
|
||||
if(lbl_1_data_A00 != -1) {
|
||||
}
|
||||
|
||||
if (lbl_1_data_A00 != -1) {
|
||||
HuSprGrpKill(lbl_1_data_A00);
|
||||
}
|
||||
lbl_1_data_A00 = HuSprGrpCreate(1);
|
||||
mgpic = mgInfoTbl[mgNo].mg_pic[0];
|
||||
if(GWMGAvailGet(mgNo+401)) {
|
||||
if (GWMGAvailGet(mgNo + 401)) {
|
||||
anim = HuSprAnimReadFile(mgpic);
|
||||
} else {
|
||||
anim = HuSprAnimReadFile(0x62002C);
|
||||
}
|
||||
else {
|
||||
anim = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_MGMODE, 0x2C));
|
||||
}
|
||||
sprite = HuSprCreate(anim, 100, 0);
|
||||
HuSprGrpMemberSet(lbl_1_data_A00, 0, sprite);
|
||||
|
|
@ -167,110 +166,111 @@ s16 fn_1_271B4(s16 mgNo, s16 x, s16 y)
|
|||
|
||||
void fn_1_27418(void)
|
||||
{
|
||||
s16 i;
|
||||
s16 j;
|
||||
for(i=0; i<4; i++) {
|
||||
lbl_1_bss_2C1C[i] = i;
|
||||
}
|
||||
for(i=0; i<4; i++) {
|
||||
for(j=0; j<3-i; j++) {
|
||||
if(GWPlayerCfg[lbl_1_bss_2C1C[j]].group > GWPlayerCfg[lbl_1_bss_2C1C[j+1]].group) {
|
||||
s16 temp = lbl_1_bss_2C1C[j];
|
||||
lbl_1_bss_2C1C[j] = lbl_1_bss_2C1C[j+1];
|
||||
lbl_1_bss_2C1C[j+1] = temp;
|
||||
}
|
||||
}
|
||||
}
|
||||
for(i=0; i<4; i++) {
|
||||
s16 charNo;
|
||||
lbl_1_bss_2C24[i] = charNo = GWPlayerCfg[lbl_1_bss_2C1C[i]].character;
|
||||
lbl_1_bss_2C14[i] = CharModelCreate(charNo, 2);
|
||||
lbl_1_bss_2BC4[i][0] = CharModelMotionCreate(charNo, 0x5F0000);
|
||||
lbl_1_bss_2BC4[i][1] = CharModelMotionCreate(charNo, 0x5F0002);
|
||||
lbl_1_bss_2BC4[i][2] = CharModelMotionCreate(charNo, 0x5F0003);
|
||||
lbl_1_bss_2BC4[i][3] = CharModelMotionCreate(charNo, 0x5F0048);
|
||||
lbl_1_bss_2BC4[i][4] = CharModelMotionCreate(charNo, 0x5F0049);
|
||||
lbl_1_bss_2BC4[i][5] = CharModelMotionCreate(charNo, 0x5F0017);
|
||||
lbl_1_bss_2BC4[i][6] = CharModelMotionCreate(charNo, 0x5F0018);
|
||||
CharModelVoiceEnableSet(GWPlayerCfg[lbl_1_bss_2C1C[i]].character, lbl_1_bss_2BC4[i][1], 0);
|
||||
CharModelVoiceEnableSet(GWPlayerCfg[lbl_1_bss_2C1C[i]].character, lbl_1_bss_2BC4[i][2], 0);
|
||||
Hu3DModelPosSet(lbl_1_bss_2C14[i], 600, 0, 800);
|
||||
Hu3DModelLayerSet(lbl_1_bss_2C14[i], 3);
|
||||
CharModelDataClose(charNo);
|
||||
Hu3DModelShadowSet(lbl_1_bss_2C14[i]);
|
||||
}
|
||||
s16 i;
|
||||
s16 j;
|
||||
for (i = 0; i < 4; i++) {
|
||||
lbl_1_bss_2C1C[i] = i;
|
||||
}
|
||||
for (i = 0; i < 4; i++) {
|
||||
for (j = 0; j < 3 - i; j++) {
|
||||
if (GWPlayerCfg[lbl_1_bss_2C1C[j]].group > GWPlayerCfg[lbl_1_bss_2C1C[j + 1]].group) {
|
||||
s16 temp = lbl_1_bss_2C1C[j];
|
||||
lbl_1_bss_2C1C[j] = lbl_1_bss_2C1C[j + 1];
|
||||
lbl_1_bss_2C1C[j + 1] = temp;
|
||||
}
|
||||
}
|
||||
}
|
||||
for (i = 0; i < 4; i++) {
|
||||
s16 charNo;
|
||||
lbl_1_bss_2C24[i] = charNo = GWPlayerCfg[lbl_1_bss_2C1C[i]].character;
|
||||
lbl_1_bss_2C14[i] = CharModelCreate(charNo, 2);
|
||||
lbl_1_bss_2BC4[i][0] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00));
|
||||
lbl_1_bss_2BC4[i][1] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x02));
|
||||
lbl_1_bss_2BC4[i][2] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x03));
|
||||
lbl_1_bss_2BC4[i][3] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x48));
|
||||
lbl_1_bss_2BC4[i][4] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x49));
|
||||
lbl_1_bss_2BC4[i][5] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x17));
|
||||
lbl_1_bss_2BC4[i][6] = CharModelMotionCreate(charNo, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x18));
|
||||
CharModelVoiceEnableSet(GWPlayerCfg[lbl_1_bss_2C1C[i]].character, lbl_1_bss_2BC4[i][1], 0);
|
||||
CharModelVoiceEnableSet(GWPlayerCfg[lbl_1_bss_2C1C[i]].character, lbl_1_bss_2BC4[i][2], 0);
|
||||
Hu3DModelPosSet(lbl_1_bss_2C14[i], 600, 0, 800);
|
||||
Hu3DModelLayerSet(lbl_1_bss_2C14[i], 3);
|
||||
CharModelDataClose(charNo);
|
||||
Hu3DModelShadowSet(lbl_1_bss_2C14[i]);
|
||||
}
|
||||
}
|
||||
|
||||
s32 fn_1_2783C(s16 evtno)
|
||||
{
|
||||
s16 i;
|
||||
omOvlHisData *his;
|
||||
for(i=0; i<4; i++) {
|
||||
GWPlayerCfg[i].character = lbl_1_bss_8.unk24[i].unk68;
|
||||
GWPlayerCfg[i].iscom = lbl_1_bss_8.unk24[i].unk60;
|
||||
GWPlayerCfg[i].pad_idx = lbl_1_bss_8.unk24[i].unk6C;
|
||||
GWPlayerCfg[i].diff = lbl_1_bss_8.unk24[i].unk64;
|
||||
}
|
||||
WipeColorSet(255, 255, 255);
|
||||
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
|
||||
HuAudSeqAllFadeOut(1000);
|
||||
while(WipeStatGet()) {
|
||||
HuPrcVSleep();
|
||||
}
|
||||
CharKill(-1);
|
||||
for(i=0; i<4; i++) {
|
||||
CharARAMOpen(GWPlayerCfg[i].character);
|
||||
}
|
||||
HuAudVoiceInit(-1);
|
||||
his = omOvlHisGet(0);
|
||||
omOvlHisChg(0, OVL_MGMODE, evtno, his->stat);
|
||||
omOvlCallEx(OVL_INST, 1, 0, 0);
|
||||
while(1) {
|
||||
HuPrcVSleep();
|
||||
}
|
||||
s16 i;
|
||||
omOvlHisData *his;
|
||||
for (i = 0; i < 4; i++) {
|
||||
GWPlayerCfg[i].character = lbl_1_bss_8.unk24[i].unk68;
|
||||
GWPlayerCfg[i].iscom = lbl_1_bss_8.unk24[i].unk60;
|
||||
GWPlayerCfg[i].pad_idx = lbl_1_bss_8.unk24[i].unk6C;
|
||||
GWPlayerCfg[i].diff = lbl_1_bss_8.unk24[i].unk64;
|
||||
}
|
||||
WipeColorSet(255, 255, 255);
|
||||
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
|
||||
HuAudSeqAllFadeOut(1000);
|
||||
while (WipeStatGet()) {
|
||||
HuPrcVSleep();
|
||||
}
|
||||
CharKill(-1);
|
||||
for (i = 0; i < 4; i++) {
|
||||
CharARAMOpen(GWPlayerCfg[i].character);
|
||||
}
|
||||
HuAudVoiceInit(-1);
|
||||
his = omOvlHisGet(0);
|
||||
omOvlHisChg(0, OVL_MGMODE, evtno, his->stat);
|
||||
omOvlCallEx(OVL_INST, 1, 0, 0);
|
||||
while (1) {
|
||||
HuPrcVSleep();
|
||||
}
|
||||
}
|
||||
|
||||
void fn_1_279FC(s32 coinSkipF)
|
||||
{
|
||||
s16 i;
|
||||
s16 mgNum;
|
||||
for(mgNum=0; mgInfoTbl[mgNum].ovl != 65535; mgNum++);
|
||||
for(i=0; i<9; i++) {
|
||||
lbl_1_bss_2638[i] = lbl_1_bss_20AC[i] = 0;
|
||||
}
|
||||
for(i=0; i<mgNum; i++) {
|
||||
s16 type = mgInfoTbl[i].type;
|
||||
if(type >= 0 && type < 9) {
|
||||
if(coinSkipF) {
|
||||
s16 ovl = mgInfoTbl[i].ovl;
|
||||
if(ovl == OVL_M408 || ovl == OVL_M422 || ovl == OVL_M430) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
lbl_1_bss_264C[type][lbl_1_bss_2638[type]] = i;
|
||||
lbl_1_bss_2638[type]++;
|
||||
if(GWMGAvailGet(i+401)) {
|
||||
lbl_1_bss_20C0[type][lbl_1_bss_20AC[type]] = i;
|
||||
lbl_1_bss_20AC[type]++;
|
||||
}
|
||||
}
|
||||
}
|
||||
s16 i;
|
||||
s16 mgNum;
|
||||
for (mgNum = 0; mgInfoTbl[mgNum].ovl != 65535; mgNum++)
|
||||
;
|
||||
for (i = 0; i < 9; i++) {
|
||||
lbl_1_bss_2638[i] = lbl_1_bss_20AC[i] = 0;
|
||||
}
|
||||
for (i = 0; i < mgNum; i++) {
|
||||
s16 type = mgInfoTbl[i].type;
|
||||
if (type >= 0 && type < 9) {
|
||||
if (coinSkipF) {
|
||||
s16 ovl = mgInfoTbl[i].ovl;
|
||||
if (ovl == OVL_M408 || ovl == OVL_M422 || ovl == OVL_M430) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
lbl_1_bss_264C[type][lbl_1_bss_2638[type]] = i;
|
||||
lbl_1_bss_2638[type]++;
|
||||
if (GWMGAvailGet(i + 401)) {
|
||||
lbl_1_bss_20C0[type][lbl_1_bss_20AC[type]] = i;
|
||||
lbl_1_bss_20AC[type]++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void fn_1_27C0C(s16 type)
|
||||
{
|
||||
s16 i;
|
||||
s16 j;
|
||||
for(i=0; i<256;) {
|
||||
for(j=0; j<lbl_1_bss_20AC[type]; j++, i++) {
|
||||
if(i > 256) {
|
||||
break;
|
||||
}
|
||||
mgIndexList[i] = lbl_1_bss_20C0[type][j];
|
||||
}
|
||||
}
|
||||
for(i=0; i<256; i++) {
|
||||
mgIndexList[i];
|
||||
}
|
||||
lbl_801D3E94 = 0;
|
||||
}
|
||||
s16 i;
|
||||
s16 j;
|
||||
for (i = 0; i < 256;) {
|
||||
for (j = 0; j < lbl_1_bss_20AC[type]; j++, i++) {
|
||||
if (i > 256) {
|
||||
break;
|
||||
}
|
||||
mgIndexList[i] = lbl_1_bss_20C0[type][j];
|
||||
}
|
||||
}
|
||||
for (i = 0; i < 256; i++) {
|
||||
mgIndexList[i];
|
||||
}
|
||||
lbl_801D3E94 = 0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue