Port ztardll to JP
This commit is contained in:
dbalatoni13
parent
306ba21ebb
commit
9c915a08fd
6 changed files with 309 additions and 219 deletions
|
|
@ -1,8 +1,9 @@
|
|||
#include "game/sprite.h"
|
||||
#include "game/minigame_seq.h"
|
||||
#include "game/sprite.h"
|
||||
|
||||
#include "REL/ztardll.h"
|
||||
|
||||
#if VERSION_ENG
|
||||
s32 lbl_1_data_B0[0xC6] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, DATA_MAKE_NUM(DATADIR_INSTFONT, 0x00), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x01), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x02),
|
||||
DATA_MAKE_NUM(DATADIR_INSTFONT, 0x03), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x04), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x05),
|
||||
|
|
@ -54,6 +55,33 @@ s32 lbl_1_data_B0[0xC6] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
|
|||
DATA_MAKE_NUM(DATADIR_INSTFONT, 0x00), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x00), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x00),
|
||||
DATA_MAKE_NUM(DATADIR_INSTFONT, 0x00), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x00), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x0B),
|
||||
DATA_MAKE_NUM(DATADIR_INSTFONT, 0x0C), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x00), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x00) };
|
||||
#elif VERSION_PAL
|
||||
|
||||
#else
|
||||
s32 lbl_1_data_B0[0x132] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0x00150000, 0x00150001, 0x00150002, 0x00150003, 0x00150004, 0x00150005, 0x00150006, 0x00150007, 0x00150008, 0x00150009,
|
||||
0x0013000A, 0x0013000A, 0x0013000A, 0x0015000A, 0x0013000A, 0x0013000A, 0x0013000A, 0x00130014, 0x00130015, 0x00130016, 0x00130017, 0x00130018,
|
||||
0x00130019, 0x001500AE, 0x0013001B, 0x0013001C, 0x0013001D, 0x0013001E, 0x0013001F, 0x00130020, 0x00130021, 0x001500AF, 0x00130023, 0x00130024,
|
||||
0x00130025, 0x00130026, 0x00130027, 0x00130028, 0x00130029, 0x0013002A, 0x0013002B, 0x0013002C, 0x0013002D, 0x00130022, 0x00130022, 0x00130022,
|
||||
0x00130022, 0x00130022, 0x00130022, 0x0013002E, 0x0013002F, 0x00130030, 0x00130031, 0x00130032, 0x00130033, 0x00130034, 0x00130035, 0x00130036,
|
||||
0x00130037, 0x00130038, 0x00130039, 0x0013003A, 0x0013003B, 0x0013003C, 0x0013003D, 0x0013003E, 0x0013003F, 0x00130040, 0x00130041, 0x00130042,
|
||||
0x00130043, 0x00130044, 0x00130045, 0x00130046, 0x00130047, 0x0013000A, 0x0013000A, 0x0013000A, 0x0013000A, 0x0013000A, 0x0013000A, 0x0013000A,
|
||||
0x0013000A, 0x0013000A, 0x0015000A, 0x0013000A, 0x0015008A, 0x0015008C, 0x0015008D, 0x0015008E, 0x0015008F, 0x00150090, 0x00150091, 0x00150092,
|
||||
0x00150093, 0x00150094, 0x0013000A, 0x0015005E, 0x0015005F, 0x00150060, 0x00150061, 0x00150062, 0x00150063, 0x00150064, 0x00150065, 0x00150066,
|
||||
0x00150067, 0x00150068, 0x00150069, 0x0015006A, 0x0015006B, 0x0015006C, 0x0015006D, 0x0015006E, 0x0015006F, 0x00150070, 0x00150071, 0x00150072,
|
||||
0x00150073, 0x00150074, 0x00150075, 0x00150076, 0x00150077, 0x00150078, 0x00150079, 0x0015007A, 0x0015007B, 0x0015007C, 0x0015007D, 0x0015007E,
|
||||
0x0015007F, 0x00150080, 0x00150081, 0x00150082, 0x00150083, 0x00150084, 0x00150085, 0x00150086, 0x00150087, 0x00150088, 0x00150089, 0x0015008B,
|
||||
0x0013000A, 0x0013000A, 0x0013000A, 0x0013000A, 0x0015000B, 0x0015000C, 0x0013000A, 0x0013000A, 0x0015003A, 0x0015003C, 0x0015003D, 0x0015003E,
|
||||
0x0015003F, 0x00150040, 0x00150041, 0x00150042, 0x00150043, 0x00150044, 0x0013000A, 0x0015000E, 0x0015000F, 0x00150010, 0x00150011, 0x00150012,
|
||||
0x00150013, 0x00150014, 0x00150015, 0x00150016, 0x00150017, 0x00150018, 0x00150019, 0x0015001A, 0x0015001B, 0x0015001C, 0x0015001D, 0x0015001E,
|
||||
0x0015001F, 0x00150020, 0x00150021, 0x00150022, 0x00150023, 0x00150024, 0x00150025, 0x00150026, 0x00150027, 0x00150028, 0x00150029, 0x0015002A,
|
||||
0x0015002B, 0x0015002C, 0x0015002D, 0x0015002E, 0x0015002F, 0x00150030, 0x00150031, 0x00150032, 0x00150033, 0x00150034, 0x00150035, 0x00150036,
|
||||
0x00150037, 0x00150038, 0x00150039, 0x0015003B, 0x0013000A, 0x0013000A, 0x00150095, 0x00150096, 0x00150097, 0x00150098, 0x00150099, 0x0015009A,
|
||||
0x0015009B, 0x0015009C, 0x0015009D, 0x0015009E, 0x0015009F, 0x001500A0, 0x001500A1, 0x001500A2, 0x001500A3, 0x001500A4, 0x001500A5, 0x001500A6,
|
||||
0x001500A7, 0x001500A8, 0x001500A9, 0x001500AA, 0x001500AB, 0x001500AC, 0x001500AD, 0x00150045, 0x00150046, 0x00150047, 0x00150048, 0x00150049,
|
||||
0x0015004A, 0x0015004B, 0x0015004C, 0x0015004D, 0x0015004E, 0x0015004F, 0x00150050, 0x00150051, 0x00150052, 0x00150053, 0x00150054, 0x00150055,
|
||||
0x00150056, 0x00150057, 0x00150058, 0x00150059, 0x0015005A, 0x0015005B, 0x0015005C, 0x0015005D };
|
||||
#endif
|
||||
|
||||
s32 fn_1_7754(SeqWork *work, char *mess)
|
||||
{
|
||||
|
|
@ -84,7 +112,7 @@ s32 fn_1_7754(SeqWork *work, char *mess)
|
|||
var_r29 = HuMemDirectMalloc(HEAP_SYSTEM, 0xC8);
|
||||
for (var_r31 = mess, var_r30 = 0, var_r28 = 0; var_r31[0] != 0; var_r31++) {
|
||||
if (var_r31[0] == 0x20 || var_r31[0] == 0x10) {
|
||||
var_r30 += 0xE;
|
||||
var_r30 += VERSION_JP ? 0x1C : 0xE;
|
||||
}
|
||||
else if (var_r31[0] < 0x30) {
|
||||
}
|
||||
|
|
@ -140,10 +168,12 @@ s32 fn_1_7754(SeqWork *work, char *mess)
|
|||
var_r29[var_r28] = 4;
|
||||
var_r30 += 0x18;
|
||||
}
|
||||
#if !VERSION_JP
|
||||
else if ((var_r31[0] == 0x3D) || (var_r31[0] == 0x84)) {
|
||||
var_r29[var_r28] = 0;
|
||||
var_r30 += 0x14;
|
||||
}
|
||||
#endif
|
||||
else {
|
||||
var_r29[var_r28] = 0;
|
||||
var_r30 += 0x1C;
|
||||
|
|
|
|||
|
|
@ -763,7 +763,7 @@ void fn_1_33B0(void)
|
|||
var_r30 = HuSprCreate(var_r29, 0x64, mgBattleStarMax + 1);
|
||||
}
|
||||
HuSprGrpMemberSet(lbl_1_bss_50, 1, var_r30);
|
||||
HuSprPosSet(lbl_1_bss_50, 1, 342.0f, 80.0f);
|
||||
HuSprPosSet(lbl_1_bss_50, 1, VERSION_JP ? 234.0f : 342.0f, 80.0f);
|
||||
HuSprScaleSet(lbl_1_bss_50, 1, 0.0f, 0.0f);
|
||||
HuSprGrpDrawNoSet(lbl_1_bss_50, 0x7F);
|
||||
var_r29 = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_ZTAR, 9));
|
||||
|
|
@ -1096,17 +1096,36 @@ void fn_1_4948(void)
|
|||
|
||||
void fn_1_51BC(s16 arg0)
|
||||
{
|
||||
omOvlHisData *var_r31;
|
||||
s16 var_r31;
|
||||
omOvlHisData *var_r30;
|
||||
u32 var_r29;
|
||||
|
||||
WipeColorSet(0xFF, 0xFF, 0xFF);
|
||||
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 60);
|
||||
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 0x3C);
|
||||
HuAudSeqAllFadeOut(0x3E8);
|
||||
|
||||
while (WipeStatGet() != 0) {
|
||||
HuPrcVSleep();
|
||||
}
|
||||
var_r31 = omOvlHisGet(0);
|
||||
omOvlHisChg(0, OVL_ZTAR, arg0, var_r31->stat);
|
||||
#if VERSION_JP
|
||||
if ((GWPlayerCfg->character >= 8) && (GWPlayerCfg->character >= 8) && (GWPlayerCfg->character >= 8) && (GWPlayerCfg->character >= 8)) {
|
||||
msmMusStopAll(1, 0);
|
||||
msmSeStopAll(1, 0);
|
||||
var_r29 = OSGetTick();
|
||||
while (TRUE) {
|
||||
if ((msmMusGetNumPlay(1) != 0) || (msmSeGetNumPlay(1) != 0)) {
|
||||
if (((OSGetTick() - var_r29) / (*((u32 *)0x800000F8) / 4 / 1000)) >= 0x1F4) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
msmSysDelGroupBase(0);
|
||||
}
|
||||
#endif
|
||||
var_r30 = omOvlHisGet(0);
|
||||
omOvlHisChg(0, OVL_ZTAR, arg0, var_r30->stat);
|
||||
omOvlCallEx(OVL_M433, 1, 0, 0);
|
||||
while (TRUE) {
|
||||
HuPrcVSleep();
|
||||
|
|
|
|||
|
|
@ -3028,6 +3028,12 @@ void fn_1_114EC(u32 arg0, s32 arg1)
|
|||
s32 var_r29;
|
||||
s32 var_r28;
|
||||
|
||||
#if VERSION_JP
|
||||
if (lbl_1_data_670 != -1) {
|
||||
HuWinMesSet(lbl_1_data_670, arg0);
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
HuWinMesMaxSizeGet(1, spC, arg0);
|
||||
var_r29 = spC[0];
|
||||
var_r31 = spC[1];
|
||||
|
|
@ -3038,6 +3044,9 @@ void fn_1_114EC(u32 arg0, s32 arg1)
|
|||
else {
|
||||
var_r30 = 0x181 - var_r31;
|
||||
}
|
||||
#if VERSION_JP
|
||||
lbl_1_data_670 = HuWinExCreateStyled(var_r28, var_r30, var_r29, var_r31, -1, 1);
|
||||
#else
|
||||
if (lbl_1_data_670 != -1) {
|
||||
fn_1_1190C();
|
||||
lbl_1_data_670 = HuWinExCreateStyled(var_r28, var_r30, var_r29, var_r31, -1, 1);
|
||||
|
|
@ -3045,6 +3054,7 @@ void fn_1_114EC(u32 arg0, s32 arg1)
|
|||
else {
|
||||
lbl_1_data_670 = HuWinExCreateStyled(var_r28, var_r30, var_r29, var_r31, -1, 1);
|
||||
}
|
||||
#endif
|
||||
HuWinBGTPLvlSet(lbl_1_data_670, 0.0f);
|
||||
HuWinDispOn(lbl_1_data_670);
|
||||
HuWinMesSet(lbl_1_data_670, arg0);
|
||||
|
|
@ -3059,11 +3069,21 @@ void fn_1_11708(u32 arg0)
|
|||
s32 var_r29;
|
||||
s32 var_r28;
|
||||
|
||||
#if VERSION_JP
|
||||
if (lbl_1_data_670 != -1) {
|
||||
HuWinMesSet(lbl_1_data_670, arg0);
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
HuWinMesMaxSizeGet(1, sp8, arg0);
|
||||
var_r30 = sp8[0];
|
||||
var_r31 = sp8[1];
|
||||
var_r28 = (0x240 - var_r30) / 2.0f;
|
||||
var_r29 = 0x181 - var_r31;
|
||||
#if VERSION_JP
|
||||
lbl_1_data_670 = HuWinExCreateStyled(var_r28, var_r29, var_r30, var_r31, -1, 1);
|
||||
(void)var_r29;
|
||||
#else
|
||||
if (lbl_1_data_670 != -1) {
|
||||
fn_1_1190C();
|
||||
lbl_1_data_670 = HuWinExCreateStyled(var_r28, var_r29, var_r30, var_r31, -1, 1);
|
||||
|
|
@ -3071,6 +3091,7 @@ void fn_1_11708(u32 arg0)
|
|||
else {
|
||||
lbl_1_data_670 = HuWinExCreateStyled(var_r28, var_r29, var_r30, var_r31, -1, 1);
|
||||
}
|
||||
#endif
|
||||
HuWinBGTPLvlSet(lbl_1_data_670, 0.0f);
|
||||
HuWinDispOn(lbl_1_data_670);
|
||||
HuWinMesSet(lbl_1_data_670, arg0);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue