kobayashi90/marioparty4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Applied DATA_MAKE_NUM and MAKE_MESSID macros

Browse source
This commit is contained in:
kabiskac 2024-08-09 01:37:36 +02:00
parent c1c506360c
commit a0ebc7588d
116 changed files with 38174 additions and 37156 deletions
Download patch file Download diff file Expand all files Collapse all files

61
src/REL/ztardll/font.c
View file

@ -3,17 +3,56 @@
#include "REL/ztardll.h"
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, 0x150000, 0x150001, 0x150002, 0x150003, 0x150004, 0x150005, 0x150006, 0x150007, 0x150008, 0x150009, 0x150000, 0x150000,
0x150000, 0x15000A, 0x150000, 0x150000, 0x150000, 0x15000F, 0x150010, 0x150011, 0x150012, 0x150013, 0x150014, 0x150015, 0x150016, 0x150017,
0x150018, 0x150019, 0x15001A, 0x15001B, 0x15001C, 0x15001D, 0x15001E, 0x15001F, 0x150020, 0x150021, 0x150022, 0x150023, 0x150024, 0x150025,
0x150026, 0x150027, 0x150028, 0x15001D, 0x15000D, 0x15001D, 0x15001D, 0x15001D, 0x15001D, 0x150029, 0x15002A, 0x15002B, 0x15002C, 0x15002D,
0x15002E, 0x15002F, 0x150030, 0x150031, 0x150032, 0x150033, 0x150034, 0x150035, 0x150036, 0x150037, 0x150038, 0x150039, 0x15003A, 0x15003B,
0x15003C, 0x15003D, 0x15003E, 0x15003F, 0x150040, 0x150041, 0x150042, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000,
0x150000, 0x150000, 0x15000A, 0x15000E, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000,
0x150000, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000,
0x150000, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000,
0x150000, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000,
0x150000, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000, 0x150000, 0x15000B, 0x15000C, 0x150000, 0x150000 };
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),
DATA_MAKE_NUM(DATADIR_INSTFONT, 0x06), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x07), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x08),
DATA_MAKE_NUM(DATADIR_INSTFONT, 0x09), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x00), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x00),
DATA_MAKE_NUM(DATADIR_INSTFONT, 0x00), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x0A), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x00),
DATA_MAKE_NUM(DATADIR_INSTFONT, 0x00), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x00), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x0F),
DATA_MAKE_NUM(DATADIR_INSTFONT, 0x10), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x11), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x12),
DATA_MAKE_NUM(DATADIR_INSTFONT, 0x13), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x14), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x15),
DATA_MAKE_NUM(DATADIR_INSTFONT, 0x16), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x17), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x18),
DATA_MAKE_NUM(DATADIR_INSTFONT, 0x19), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x1A), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x1B),
DATA_MAKE_NUM(DATADIR_INSTFONT, 0x1C), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x1D), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x1E),
DATA_MAKE_NUM(DATADIR_INSTFONT, 0x1F), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x20), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x21),
DATA_MAKE_NUM(DATADIR_INSTFONT, 0x22), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x23), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x24),
DATA_MAKE_NUM(DATADIR_INSTFONT, 0x25), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x26), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x27),
DATA_MAKE_NUM(DATADIR_INSTFONT, 0x28), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x1D), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x0D),
DATA_MAKE_NUM(DATADIR_INSTFONT, 0x1D), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x1D), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x1D),
DATA_MAKE_NUM(DATADIR_INSTFONT, 0x1D), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x29), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x2A),
DATA_MAKE_NUM(DATADIR_INSTFONT, 0x2B), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x2C), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x2D),
DATA_MAKE_NUM(DATADIR_INSTFONT, 0x2E), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x2F), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x30),
DATA_MAKE_NUM(DATADIR_INSTFONT, 0x31), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x32), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x33),
DATA_MAKE_NUM(DATADIR_INSTFONT, 0x34), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x35), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x36),
DATA_MAKE_NUM(DATADIR_INSTFONT, 0x37), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x38), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x39),
DATA_MAKE_NUM(DATADIR_INSTFONT, 0x3A), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x3B), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x3C),
DATA_MAKE_NUM(DATADIR_INSTFONT, 0x3D), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x3E), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x3F),
DATA_MAKE_NUM(DATADIR_INSTFONT, 0x40), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x41), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x42),
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, 0x00),
DATA_MAKE_NUM(DATADIR_INSTFONT, 0x00), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x00), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x00),
DATA_MAKE_NUM(DATADIR_INSTFONT, 0x0A), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x0E), 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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) };
s32 fn_1_7754(ZtarDllUnkStruct *arg0, u8 *arg1)
{

46
src/REL/ztardll/main.c
View file

@ -120,7 +120,7 @@ void fn_1_424(void)
var_r27 = 0;
fn_1_7D6C(lbl_1_bss_68);
HuPrcVSleep();
HuDataDirClose(0x640000);
HuDataDirClose(DATADIR_MPEX);
lbl_1_bss_5A = 0;
if (mgQuitExtraF != 0) {
mgQuitExtraF = 0;
@ -192,14 +192,14 @@ block_7:
}
loop_19:
fn_1_11020();
fn_1_11264(0x330024, 0, 0);
fn_1_11264(MAKE_MESSID(0x33, 0x24), 0, 0);
if (lbl_1_bss_5A == 0) {
fn_1_11264(0x330025, 0, 1);
fn_1_11264(MAKE_MESSID(0x33, 0x25), 0, 1);
}
else {
fn_1_11264(0x33002A, 0, 1);
fn_1_11264(MAKE_MESSID(0x33, 0x2A), 0, 1);
}
fn_1_11708(0x33008D);
fn_1_11708(MAKE_MESSID(0x33, 0x8D));
for (var_r31 = 0; var_r31 <= 0x0A; var_r31++) {
var_f31 = var_r31 / 10.0;
@ -226,10 +226,10 @@ loop_19:
HuPrcVSleep();
}
if (lbl_1_bss_5A == 0) {
fn_1_11264(0x330025, 0, 1);
fn_1_11264(MAKE_MESSID(0x33, 0x25), 0, 1);
}
else {
fn_1_11264(0x33002A, 0, 1);
fn_1_11264(MAKE_MESSID(0x33, 0x2A), 0, 1);
}
}
}
@ -324,7 +324,7 @@ loop_19:
HuPrcChildCreate(fn_1_7C00, 0x64, 0x2000, 0, lbl_1_bss_68);
}
fn_1_11020();
fn_1_11264(0x33002C, 0, 0);
fn_1_11264(MAKE_MESSID(0x33, 0x2C), 0, 0);
var_r30 = fn_1_11390(0);
if (var_r30 != -1) {
if (var_r30 != 1) {
@ -392,7 +392,7 @@ void fn_1_1774(void)
for (var_r30 = 0; var_r30 < 0x10; var_r30++) {
sp8.unk_5A[var_r30] = sp8.unk_3A[var_r30] = -1;
}
var_r29 = MessData_MesPtrGet(messDataPtr, 0x170021);
var_r29 = MessData_MesPtrGet(messDataPtr, MAKE_MESSID(0x17, 0x21));
for (var_r26 = var_r29; *var_r29 != 0; var_r29++) {
if (*var_r29 == 0xA) {
*var_r29 = 0x10;
@ -588,11 +588,11 @@ void fn_1_2350(void)
fn_1_11020();
fn_1_11338(GWPlayerCfg[spC[0]].character, 0);
fn_1_11338(GWPlayerCfg[spC[1]].character, 1);
fn_1_11264(0x3300A0, 0, 0);
fn_1_11264(MAKE_MESSID(0x33, 0xA0), 0, 0);
if (GWMGAvailGet(var_r31 + 0x191) == 0) {
GWMGAvailSet(var_r31 + 0x191);
GWGameStat.present[0x37] = 1;
fn_1_11264(0x330029, 0, 0);
fn_1_11264(MAKE_MESSID(0x33, 0x29), 0, 0);
}
fn_1_111E0();
WipeCreate(2, 0, 0x1E);
@ -671,7 +671,7 @@ void fn_1_2350(void)
HuSprTPLvlSet(lbl_1_bss_50, 2, var_r31 / 20.0);
HuPrcVSleep();
}
fn_1_114EC(0x33004F, 1);
fn_1_114EC(MAKE_MESSID(0x33, 0x4F), 1);
while (TRUE) {
if ((*HuPadBtnDown & 0x100) != 0) {
HuAudFXPlay(2);
@ -827,12 +827,12 @@ void fn_1_33B0(void)
if (var_r28 != 0xFF) {
if (var_r28 < 8) {
lbl_1_bss_36[var_r31] = CharModelCreate(var_r28, 2);
lbl_1_bss_E[var_r31][0] = CharModelMotionCreate(var_r28, 0x5F0000);
lbl_1_bss_E[var_r31][1] = CharModelMotionCreate(var_r28, 0x5F0003);
lbl_1_bss_E[var_r31][0] = CharModelMotionCreate(var_r28, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00));
lbl_1_bss_E[var_r31][1] = CharModelMotionCreate(var_r28, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x03));
if (var_r31 < 2) {
lbl_1_bss_E[var_r31][2] = CharModelMotionCreate(var_r28, 0x5F0048);
lbl_1_bss_E[var_r31][3] = CharModelMotionCreate(var_r28, 0x5F0017);
lbl_1_bss_E[var_r31][4] = CharModelMotionCreate(var_r28, 0x5F0018);
lbl_1_bss_E[var_r31][2] = CharModelMotionCreate(var_r28, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x48));
lbl_1_bss_E[var_r31][3] = CharModelMotionCreate(var_r28, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x17));
lbl_1_bss_E[var_r31][4] = CharModelMotionCreate(var_r28, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x18));
}
CharModelVoiceEnableSet(GWPlayerCfg[spC[var_r31]].character, lbl_1_bss_E[var_r31][1], 0);
Hu3DModelScaleSet(lbl_1_bss_36[var_r31], 0.8f, 0.8f, 0.8f);
@ -966,7 +966,7 @@ void fn_1_4374(void)
HuPrcVSleep();
}
}
fn_1_114EC(0x33004F, 1);
fn_1_114EC(MAKE_MESSID(0x33, 0x4F), 1);
while (TRUE) {
if (HuPadBtnDown[0] & PAD_BUTTON_A) {
HuAudFXPlay(2);
@ -1058,9 +1058,9 @@ void fn_1_4948(void)
var_r30 = GWPlayerCfg[spC[var_r31]].character;
if (var_r30 < 8) {
lbl_1_bss_36[var_r31] = CharModelCreate(var_r30, 2);
lbl_1_bss_E[var_r31][0] = CharModelMotionCreate(var_r30, 0x5F0000);
lbl_1_bss_E[var_r31][3] = CharModelMotionCreate(var_r30, 0x5F0017);
lbl_1_bss_E[var_r31][4] = CharModelMotionCreate(var_r30, 0x5F0018);
lbl_1_bss_E[var_r31][0] = CharModelMotionCreate(var_r30, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00));
lbl_1_bss_E[var_r31][3] = CharModelMotionCreate(var_r30, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x17));
lbl_1_bss_E[var_r31][4] = CharModelMotionCreate(var_r30, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x18));
Hu3DModelScaleSet(lbl_1_bss_36[var_r31], 0.8f, 0.8f, 0.8f);
}
else {
@ -1236,7 +1236,7 @@ s32 fn_1_524C(s32 arg0)
var_r24 = HuWinCreate(0.0f, 0.0f, 0x1E0, 0x28, 0);
HuWinMesSpeedSet(var_r24, 0);
HuWinBGTPLvlSet(var_r24, 0.0f);
HuWinMesSet(var_r24, 0x1A0020);
HuWinMesSet(var_r24, MAKE_MESSID(0x1A, 0x20));
var_r22 = &winData[var_r24];
HuWinPriSet(var_r24, 5);
HuWinPosSet(var_r24, (576.0f - var_r22->w) / 2, 300.0f);
@ -1393,7 +1393,7 @@ void fn_1_66F8(void)
while (WipeStatGet() != 0) {
HuPrcVSleep();
}
HuDataDirClose(0x160000);
HuDataDirClose(DATADIR_INSTPIC);
while (lbl_1_bss_4 != 0) {
HuPrcVSleep();
}

90
src/REL/ztardll/select.c
View file

@ -77,24 +77,24 @@ void fn_1_FD90(s32 arg0);
extern s16 lbl_1_bss_4;
s32 lbl_1_data_3C8[8] = {
0x5F0000,
0x1A0000,
0x6D0000,
0x8A0000,
0x850000,
0x110000,
0xD0000,
0x810000,
DATADIR_MARIOMOT,
DATADIR_LUIGIMOT,
DATADIR_PEACHMOT,
DATADIR_YOSHIMOT,
DATADIR_WARIOMOT,
DATADIR_DONKEYMOT,
DATADIR_DAISYMOT,
DATADIR_WALUIGIMOT,
};
s32 lbl_1_data_3E8[8] = {
0x5E0000,
0x190000,
0x6C0000,
0x890000,
0x840000,
0x100000,
0xC0000,
0x800000,
DATADIR_MARIOMDL1,
DATADIR_LUIGIMDL1,
DATADIR_PEACHMDL1,
DATADIR_YOSHIMDL1,
DATADIR_WARIOMDL1,
DATADIR_DONKEYMDL1,
DATADIR_DAISYMDL1,
DATADIR_WALUIGIMDL1,
};
s32 lbl_1_bss_26C[0x1B];
@ -164,9 +164,9 @@ s32 fn_1_7E0C(s32 arg0)
var_r29 = -1;
fn_1_A610();
fn_1_11020();
fn_1_11264(0x1A0005, -1, -1);
fn_1_11264(MAKE_MESSID(0x1A, 0x05), -1, -1);
fn_1_10FBC(1);
fn_1_11708(0x330091);
fn_1_11708(MAKE_MESSID(0x33, 0x91));
lbl_1_bss_20C.unk_04 = (ZtarUnkFunc)fn_1_AEE4;
var_r29 = -1;
while (TRUE) {
@ -179,7 +179,7 @@ s32 fn_1_7E0C(s32 arg0)
}
if (var_r29 != var_r30) {
var_r29 = var_r30;
fn_1_11264(var_r30 + 0x1A001B, -1, 1);
fn_1_11264(var_r30 + MAKE_MESSID(0x1A, 0x1B), -1, 1);
}
if (lbl_1_bss_20C.unk_28 == 0) {
if (HuPadBtnDown[0] & PAD_BUTTON_A) {
@ -253,12 +253,12 @@ s32 fn_1_8030(s32 arg0, s32 arg1)
fn_1_11020();
fn_1_10FBC(1);
if (arg1 == 1) {
fn_1_11264(0x1E005E, -1, -1);
fn_1_11264(MAKE_MESSID(0x1E, 0x5E), -1, -1);
}
else {
fn_1_11264(0x1A0009, -1, -1);
fn_1_11264(MAKE_MESSID(0x1A, 0x09), -1, -1);
}
fn_1_11708(0x330092);
fn_1_11708(MAKE_MESSID(0x33, 0x92));
for (var_r31 = 0; var_r31 < var_r30; var_r31++) {
if (lbl_1_bss_8C[var_r31].unk_50 == 0) {
lbl_1_bss_8C[var_r31].unk_04 = (ZtarUnkFunc)fn_1_D280;
@ -352,15 +352,15 @@ s32 fn_1_8338(s32 arg0, s32 arg1)
}
}
if (var_r26 == -1) {
fn_1_11338(var_r25 + 0x1A0023, 1);
fn_1_11264(0x1A0028, -1, var_r26);
fn_1_11338(var_r25 + MAKE_MESSID(0x1A, 0x23), 1);
fn_1_11264(MAKE_MESSID(0x1A, 0x28), -1, var_r26);
}
else {
fn_1_11338(var_r25 + 0x1A0023, 1);
fn_1_11264(0x1A0028, -1, var_r26);
fn_1_11338(var_r25 + MAKE_MESSID(0x1A, 0x23), 1);
fn_1_11264(MAKE_MESSID(0x1A, 0x28), -1, var_r26);
}
var_r26 = 1;
fn_1_11708(0x330092);
fn_1_11708(MAKE_MESSID(0x33, 0x92));
for (var_r31 = 0; var_r31 < arg1; var_r31++) {
if ((lbl_1_bss_8C[var_r31].unk_50 != 0) && (lbl_1_bss_8C[var_r31].unk_08 == 0)) {
var_r30 = var_r31;
@ -389,9 +389,9 @@ s32 fn_1_8338(s32 arg0, s32 arg1)
}
}
lbl_1_bss_8C[var_r30].unk_04 = NULL;
fn_1_11264(0x1A0022, -1, 1);
fn_1_11264(MAKE_MESSID(0x1A, 0x22), -1, 1);
fn_1_10FBC(1);
fn_1_11708(0x330093);
fn_1_11708(MAKE_MESSID(0x33, 0x93));
var_r29 = fn_1_F214(&lbl_1_bss_8C[var_r30]);
if (var_r29 == 1) {
HuAudFXPlay(2);
@ -470,9 +470,9 @@ s32 fn_1_88A4(void)
var_r26 = -1;
fn_1_A8E8();
fn_1_11020();
fn_1_11264(0x1A0005, -1, -1);
fn_1_11264(MAKE_MESSID(0x1A, 0x05), -1, -1);
fn_1_10FBC(1);
fn_1_11708(0x330091);
fn_1_11708(MAKE_MESSID(0x33, 0x91));
lbl_1_bss_20C.unk_04 = (ZtarUnkFunc)fn_1_B468;
while (TRUE) {
fn_1_10FBC(1);
@ -484,7 +484,7 @@ s32 fn_1_88A4(void)
}
if (var_r26 != var_r30) {
var_r26 = var_r30;
fn_1_11264(var_r30 + 0x330093, -1, 1);
fn_1_11264(var_r30 + MAKE_MESSID(0x33, 0x93), -1, 1);
}
if (lbl_1_bss_20C.unk_28 != 0) {
continue;
@ -581,8 +581,8 @@ s32 fn_1_8B94(s32 arg0)
}
fn_1_11020();
fn_1_10FBC(1);
fn_1_11264(0x1A0009, -1, -1);
fn_1_11708(0x330092);
fn_1_11264(MAKE_MESSID(0x1A, 0x09), -1, -1);
fn_1_11708(MAKE_MESSID(0x33, 0x92));
for (var_r31 = 0; var_r31 < var_r30; var_r31++) {
if (lbl_1_bss_8C[var_r31].unk_50 == 0) {
lbl_1_bss_8C[var_r31].unk_04 = (ZtarUnkFunc)fn_1_D280;
@ -668,15 +668,15 @@ s32 fn_1_8E50(s32 arg0)
}
}
if (var_r26 == -1) {
fn_1_11338(var_r25 + 0x1A0023, 1);
fn_1_11264(0x1A0028, -1, var_r26);
fn_1_11338(var_r25 + MAKE_MESSID(0x1A, 0x23), 1);
fn_1_11264(MAKE_MESSID(0x1A, 0x28), -1, var_r26);
}
else {
fn_1_11338(var_r25 + 0x1A0023, 1);
fn_1_11264(0x1A0028, -1, var_r26);
fn_1_11338(var_r25 + MAKE_MESSID(0x1A, 0x23), 1);
fn_1_11264(MAKE_MESSID(0x1A, 0x28), -1, var_r26);
}
var_r26 = 1;
fn_1_11708(0x330092);
fn_1_11708(MAKE_MESSID(0x33, 0x92));
for (var_r31 = 0; var_r31 < var_r28; var_r31++) {
if ((lbl_1_bss_8C[var_r31].unk_50 != 0) && (lbl_1_bss_8C[var_r31].unk_08 == 0)) {
var_r30 = var_r31;
@ -705,9 +705,9 @@ s32 fn_1_8E50(s32 arg0)
}
}
lbl_1_bss_8C[var_r30].unk_04 = NULL;
fn_1_11264(0x1A0022, -1, 1);
fn_1_11264(MAKE_MESSID(0x1A, 0x22), -1, 1);
fn_1_10FBC(1);
fn_1_11708(0x330093);
fn_1_11708(MAKE_MESSID(0x33, 0x93));
var_r29 = fn_1_F214(&lbl_1_bss_8C[var_r30]);
if (var_r29 == 1) {
HuAudFXPlay(2);
@ -2947,7 +2947,7 @@ void fn_1_11020(void)
void fn_1_111E0(void)
{
if (lbl_1_data_66C != -1) {
HuWinMesSet(lbl_1_data_66C, 0x250004);
HuWinMesSet(lbl_1_data_66C, MAKE_MESSID(0x25, 0x04));
HuWinExAnimOut(lbl_1_data_66C);
HuWinExCleanup(lbl_1_data_66C);
lbl_1_data_66C = -1;
@ -2993,7 +2993,7 @@ s32 fn_1_11390(s32 arg0)
s32 var_r27;
s32 var_r26;
HuWinMesMaxSizeGet(1, spC, 0x1E0035);
HuWinMesMaxSizeGet(1, spC, MAKE_MESSID(0x1E, 0x35));
var_r30 = spC[0];
var_r29 = spC[1];
var_r27 = 0x22C - var_r30;
@ -3003,9 +3003,9 @@ s32 fn_1_11390(s32 arg0)
HuWinMesPalSet(var_r31, 7, 0, 0, 0);
HuWinExAnimIn(var_r31);
HuWinMesSpeedSet(var_r31, 0);
HuWinMesSet(var_r31, 0x1E0035);
HuWinMesSet(var_r31, MAKE_MESSID(0x1E, 0x35));
var_r28 = HuWinChoiceGet(var_r31, arg0);
HuWinMesSet(var_r31, 0x250004);
HuWinMesSet(var_r31, MAKE_MESSID(0x25, 0x04));
HuWinExAnimOut(var_r31);
HuWinExCleanup(var_r31);