Compare commits
10 Commits
cleanup/ru
...
cleanup/ch
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
292ff0df25 | ||
|
|
df48bc9f76 | ||
|
|
3bd814f042 | ||
|
|
51b78ed7da | ||
|
|
3eb5d8faee | ||
|
|
d99950fc88 | ||
|
|
98d03059bd | ||
|
|
830e2f3920 | ||
|
|
c1b00d8a14 | ||
|
|
9acdd7f8dc |
@@ -29,8 +29,8 @@ force_active:
|
||||
- strspn
|
||||
- strcspn
|
||||
- padding__Q23ipl5scene
|
||||
- lbl_81695063
|
||||
- lbl_81695067
|
||||
- scRsnOuiPad
|
||||
- scWpaOuiPad
|
||||
- __vt__Q49textinput6extend4memo19NigaoeEventObserver
|
||||
|
||||
# textinput::toolbar::csPaneToAnimation points one past the end of csAninationFile.
|
||||
|
||||
@@ -4866,7 +4866,7 @@ onDialogState9__Q33ipl5scene8SDMemoryFv = .text:0x813EDF04; // type:function siz
|
||||
onDialogState10__Q33ipl5scene8SDMemoryFv = .text:0x813EDFA8; // type:function size:0x130
|
||||
onDialogState11__Q33ipl5scene8SDMemoryFv = .text:0x813EE0D8; // type:function size:0xE0
|
||||
onDialogState12__Q33ipl5scene8SDMemoryFv = .text:0x813EE1B8; // type:function size:0x1A0
|
||||
iplSDMemory_813EE358 = .text:0x813EE358; // type:function size:0x44
|
||||
iplSDMemory_containsTitleId = .text:0x813EE358; // type:function size:0x44
|
||||
onDialogState13__Q33ipl5scene8SDMemoryFv = .text:0x813EE39C; // type:function size:0xEC
|
||||
onDialogState14__Q33ipl5scene8SDMemoryFv = .text:0x813EE488; // type:function size:0x1C4
|
||||
onDialogState15__Q33ipl5scene8SDMemoryFv = .text:0x813EE64C; // type:function size:0x12C
|
||||
@@ -6804,7 +6804,7 @@ VmStringSplice = .text:0x8144FDD8; // type:function size:0x1E4
|
||||
VmStringSplit = .text:0x8144FFBC; // type:function size:0x378
|
||||
VmStringToLowerCase = .text:0x81450334; // type:function size:0xB4
|
||||
VmStringToUpperCase = .text:0x814503E8; // type:function size:0xB4
|
||||
CHANSVm_8145049C = .text:0x8145049C; // type:function size:0x6BC
|
||||
CHANSVmFormatString = .text:0x8145049C; // type:function size:0x6BC
|
||||
VmStringFormat = .text:0x81450B58; // type:function size:0x4C
|
||||
VmGetStrFromObjHdr = .text:0x81450BA4; // type:function size:0x24
|
||||
VmGetIntFromObjHdr = .text:0x81450BC8; // type:function size:0x24
|
||||
@@ -6875,7 +6875,7 @@ CHANSVmGetFreeExeSize = .text:0x81455198; // type:function size:0x28
|
||||
CHANSVmAddExe = .text:0x814551C0; // type:function size:0x3F8
|
||||
VmOffsU32ToPtr = .text:0x814555B8; // type:function size:0x18 scope:local
|
||||
CHANSConvertModuleOfsToPtr = .text:0x814555D0; // type:function size:0x84
|
||||
CHANSVm_81455654 = .text:0x81455654; // type:function size:0x8C
|
||||
CHANSVmLookupScopedObject = .text:0x81455654; // type:function size:0x8C
|
||||
VmPushFuncReturnInfo = .text:0x814556E0; // type:function size:0x1AC scope:local
|
||||
VmReturnWithValue = .text:0x8145588C; // type:function size:0x1D4 scope:local
|
||||
CHANSVmLinkModules = .text:0x81455A60; // type:function size:0x2F4
|
||||
@@ -20244,10 +20244,10 @@ lbl_81694654 = .sdata2:0x81694654; // type:object size:0x4 align:4 data:float
|
||||
@10044 = .sdata2:0x8169469C; // type:object size:0x4 scope:local align:4 data:float
|
||||
lbl_816946A0 = .sdata2:0x816946A0; // type:object size:0x4 align:4 data:float
|
||||
scSoundZeroF = .sdata2:0x816946A4; // type:object size:0x4 align:4 data:float
|
||||
lbl_816946A8 = .sdata2:0x816946A8; // type:object size:0x4 align:4 data:float
|
||||
lbl_816946AC = .sdata2:0x816946AC; // type:object size:0x4 align:4 data:float
|
||||
lbl_816946B0 = .sdata2:0x816946B0; // type:object size:0x4 align:4 data:float
|
||||
lbl_816946B4 = .sdata2:0x816946B4; // type:object size:0x4 align:4 data:float
|
||||
scSoundTwoF = .sdata2:0x816946A8; // type:object size:0x4 align:4 data:float
|
||||
scSoundOneF = .sdata2:0x816946AC; // type:object size:0x4 align:4 data:float
|
||||
scSoundThirtyF = .sdata2:0x816946B0; // type:object size:0x4 align:4 data:float
|
||||
scSoundSixtyF = .sdata2:0x816946B4; // type:object size:0x4 align:4 data:float
|
||||
lbl_816946B8 = .sdata2:0x816946B8; // type:object size:0x8 align:8 data:double
|
||||
lbl_816946C0 = .sdata2:0x816946C0; // type:object size:0x8 align:8 data:double
|
||||
lbl_816946C8 = .sdata2:0x816946C8; // type:object size:0x8 align:8 data:double
|
||||
|
||||
@@ -14,8 +14,8 @@ namespace ipl {
|
||||
WAIT_UNTIL_FADE_IN = 15
|
||||
};
|
||||
|
||||
TextBalloon(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* directory, const char* fileName, const ipl::math::VEC3& unk2,
|
||||
f32 unk3 = 120.0f, f32 unk4 = 30.0f);
|
||||
TextBalloon(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* directory, const char* fileName, const ipl::math::VEC3& initialPos,
|
||||
f32 margin16x9 = 120.0f, f32 margin4x3 = 30.0f);
|
||||
~TextBalloon();
|
||||
|
||||
void calc();
|
||||
@@ -31,7 +31,7 @@ namespace ipl {
|
||||
void fadeout();
|
||||
void fadeoutForce();
|
||||
|
||||
void setPos(const math::VEC3& pos, bool unk0, int unk1);
|
||||
void setPos(const math::VEC3& pos, bool use16x9X, int hAlign);
|
||||
void updatePos(const math::VEC3& pos);
|
||||
|
||||
void set_translate(const math::VEC3& trans);
|
||||
@@ -50,7 +50,7 @@ namespace ipl {
|
||||
|
||||
undefined4 unk_0x00;
|
||||
undefined4 unk_0x04;
|
||||
BOOL unk_0x08;
|
||||
BOOL mbWaitingFadeIn; // 0x08
|
||||
|
||||
layout::Object* mpLayout; // 0x0C
|
||||
|
||||
@@ -60,10 +60,10 @@ namespace ipl {
|
||||
|
||||
u32 mTextLen; // 0x18
|
||||
math::VEC3 mBalloonPos; // 0x1C
|
||||
undefined4 unk_0x28;
|
||||
undefined unk_0x2C;
|
||||
f32 unk_0x30;
|
||||
f32 unk_0x34;
|
||||
undefined4 mHAlign; // 0x28
|
||||
undefined mbUse16x9X; // 0x2C
|
||||
f32 mMargin16x9; // 0x30
|
||||
f32 mMargin4x3; // 0x34
|
||||
|
||||
int mWaitUntilFadeIn; // 0x38
|
||||
|
||||
|
||||
@@ -13,22 +13,22 @@
|
||||
const u8 scRsnOui0 = 0;
|
||||
const u8 scRsnOui1 = 0x0F;
|
||||
const u8 scRsnOui2 = 0xAC;
|
||||
const u8 lbl_81695063 = 0;
|
||||
const u8 scRsnOuiPad = 0;
|
||||
const u8 scWpaOui0 = 0;
|
||||
const u8 scWpaOui1 = 0x50;
|
||||
const u8 scWpaOui2 = 0xF2;
|
||||
const u8 lbl_81695067 = 0;
|
||||
const u8 scWpaOuiPad = 0;
|
||||
#pragma pop
|
||||
#pragma push
|
||||
#pragma section sconst_type ".sdata"
|
||||
const u8 scWpaFindOui0 = 0;
|
||||
const u8 scWpaFindOui1 = 0x50;
|
||||
const u8 scWpaFindOui2 = 0xF2;
|
||||
const u8 lbl_81697D73 = 0;
|
||||
const u8 lbl_81697D74 = 0;
|
||||
const u8 lbl_81697D75 = 0;
|
||||
const u8 lbl_81697D76 = 0;
|
||||
const u8 lbl_81697D77 = 0;
|
||||
const u8 scWpaFindOuiPad0 = 0;
|
||||
const u8 scWpaFindOuiPad1 = 0;
|
||||
const u8 scWpaFindOuiPad2 = 0;
|
||||
const u8 scWpaFindOuiPad3 = 0;
|
||||
const u8 scWpaFindOuiPad4 = 0;
|
||||
#pragma pop
|
||||
|
||||
#define scRsnOui0 (*((volatile const u8*)&scRsnOui0))
|
||||
|
||||
@@ -3400,7 +3400,7 @@ VmMethodDefine(String, ToUpperCase) {
|
||||
return vmFalse;
|
||||
}
|
||||
|
||||
CHANSVmObjHdr* CHANSVm_8145049C(CHANSVm* vm, CHANSVmObjHdr* obj, u32 arg) {
|
||||
CHANSVmObjHdr* CHANSVmFormatString(CHANSVm* vm, CHANSVmObjHdr* obj, u32 arg) {
|
||||
u8 pad0[8];
|
||||
u8 tempBuf[16];
|
||||
u8 fmtBufData[32];
|
||||
@@ -3745,7 +3745,7 @@ null_return:
|
||||
VmMethodDefine(String, Format) {
|
||||
u32 result;
|
||||
if (VmParentObj != vmNull && VmParentObj->type == CHANS_VM_TYPE_CLASS_REF) {
|
||||
result = (u32)CHANSVm_8145049C(VmInst, VmReturnObj, 0);
|
||||
result = (u32)CHANSVmFormatString(VmInst, VmReturnObj, 0);
|
||||
return result != 0;
|
||||
}
|
||||
return 0;
|
||||
@@ -6466,7 +6466,7 @@ void CHANSConvertModuleOfsToPtr(CHANSVmModule* ptr) {
|
||||
VmOffsU32ToPtr((void**)&ptr->pLineTbl, ptr);
|
||||
}
|
||||
|
||||
static CHANSVmObjHdr* CHANSVm_81455654(CHANSVm* vm, s32 id) {
|
||||
static CHANSVmObjHdr* CHANSVmLookupScopedObject(CHANSVm* vm, s32 id) {
|
||||
CHANSVmObjHdr* data = vmNull;
|
||||
CHANSVmPrivate* pVm = (CHANSVmPrivate*)vm;
|
||||
CHANSVmExecutionCtx* ctx = pVm->pActiveCtx;
|
||||
@@ -6755,7 +6755,7 @@ static CHANSVmErr VmReturnWithValue(CHANSVm* vm, u32 val) {
|
||||
}
|
||||
} else {
|
||||
for (i = 0; i < pVm->pActiveCtx->pDbg->moduleCount; i++) {
|
||||
if (CHANSVmDeleteObject(vm, CHANSVm_81455654(vm, i)) != CHANS_VM_OK) {
|
||||
if (CHANSVmDeleteObject(vm, CHANSVmLookupScopedObject(vm, i)) != CHANS_VM_OK) {
|
||||
return CHANS_VM_ERR_RETURN;
|
||||
}
|
||||
}
|
||||
@@ -6873,7 +6873,7 @@ CHANSVmErr CHANSVmLinkModules(CHANSVm* vm, vmS32 unk0) {
|
||||
CHANSVmObjHdr* obj;
|
||||
if (idx >= module->moduleCount) {
|
||||
goto pass3_idx_err;
|
||||
} else if (obj = CHANSVm_81455654(vm, idx), obj == vmNull) {
|
||||
} else if (obj = CHANSVmLookupScopedObject(vm, idx), obj == vmNull) {
|
||||
goto pass3_obj_err;
|
||||
} else if (obj->type == CHANS_VM_OBJ_TYPE_BLANK) {
|
||||
goto pass3_success;
|
||||
@@ -7818,7 +7818,7 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
|
||||
result = CHANS_VM_ERR_GET_PROPERTY_NAME;
|
||||
arrayIdx = 0;
|
||||
imm16Val = VM_READ_BE_U16(operandBuf, 0);
|
||||
foundObj = CHANSVm_81455654(vm, imm16Val);
|
||||
foundObj = CHANSVmLookupScopedObject(vm, imm16Val);
|
||||
accumulator = &pVm->accumulator;
|
||||
if (foundObj != vmNull && accumulator->type == CHANS_VM_OBJ_TYPE_INTEGER &&
|
||||
(computedAddr = accumulator->value.data.len, (u64)accumulator->value.int_v <= ~1U)) {
|
||||
@@ -7954,7 +7954,7 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
|
||||
if (operandBuf == vmNull) {
|
||||
return CHANS_VM_ERR_CODE_RANGE;
|
||||
}
|
||||
foundObj = CHANSVm_81455654(vm, (VM_READ_BE_U16(operandBuf, 0)) & 0x1FFF);
|
||||
foundObj = CHANSVmLookupScopedObject(vm, (VM_READ_BE_U16(operandBuf, 0)) & 0x1FFF);
|
||||
result = VmDeleteCommon(vm, foundObj);
|
||||
break;
|
||||
}
|
||||
@@ -7982,12 +7982,12 @@ CHANSVmErr CHANSVmStep(CHANSVm* vm, int stepCount) {
|
||||
imm16Val = (opcodeVal << 8 | operandBuf[1]) & 0x1FFF;
|
||||
switch (opcodeVal & CHANS_VM_OP_SYMBOL_STORE) {
|
||||
case 0: {
|
||||
foundObj = CHANSVm_81455654(vm, imm16Val);
|
||||
foundObj = CHANSVmLookupScopedObject(vm, imm16Val);
|
||||
result = VmStore(vm, &pVm->accumulator, foundObj);
|
||||
break;
|
||||
}
|
||||
case CHANS_VM_OP_SYMBOL_STORE: {
|
||||
foundObj = CHANSVm_81455654(vm, imm16Val);
|
||||
foundObj = CHANSVmLookupScopedObject(vm, imm16Val);
|
||||
result = VmStore(vm, foundObj, &pVm->accumulator);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -5,13 +5,6 @@
|
||||
|
||||
#include <new>
|
||||
|
||||
extern "C" const f32 lbl_81694D90;
|
||||
extern "C" const f32 lbl_81694DA8;
|
||||
extern "C" const f32 lbl_81694DAC;
|
||||
extern "C" const f32 lbl_81694DB0;
|
||||
extern "C" const f32 lbl_81694DB4;
|
||||
extern "C" const f32 lbl_81694DBC;
|
||||
extern "C" const double lbl_81694DC8;
|
||||
extern "C" void _savegpr_24();
|
||||
extern "C" void _restgpr_24();
|
||||
extern "C" void GetFont__Q34nw4r3lyt8TextBoxCFv();
|
||||
|
||||
@@ -486,12 +486,12 @@ namespace ipl {
|
||||
|
||||
void BoardObject::stt_stand() {
|
||||
f32 degrees = mStandData.unk_0x0C * 30.0f + 30.0f;
|
||||
f32 dVar2 = nw4r::math::CosFIdx(degrees * 0.7111111f);
|
||||
f32 cosF = nw4r::math::CosFIdx(degrees * 0.7111111f);
|
||||
degrees = mStandData.unk_0x0C * 30.0f + 30.0f;
|
||||
f32 dVar3 = nw4r::math::SinFIdx(degrees * 0.7111111f);
|
||||
f32 sinF = nw4r::math::SinFIdx(degrees * 0.7111111f);
|
||||
|
||||
math::VEC2 standPos;
|
||||
__ct__Q33ipl4math4VEC2Fff(&standPos, dVar3 * 160.0f, dVar2 * 160.0f);
|
||||
__ct__Q33ipl4math4VEC2Fff(&standPos, sinF * 160.0f, cosF * 160.0f);
|
||||
mBoardPos = (((mStandData.pos * (f32)(10 - mStandData.unk_0x08)) + (standPos * mStandData.unk_0x08)) / 10.0f);
|
||||
|
||||
if ((mStandData.unk_0x08 += 1) > 10) {
|
||||
|
||||
@@ -313,7 +313,6 @@ namespace ipl {
|
||||
#pragma push
|
||||
#pragma section sconst_type ".sdata2"
|
||||
extern "C" const f32 scDateZeroF = 0.0f;
|
||||
extern "C" const f32 lbl_816948F0;
|
||||
#pragma pop
|
||||
} // namespace scene
|
||||
} // namespace ipl
|
||||
|
||||
@@ -934,7 +934,7 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" bool iplSDMemory_813EE358(const SDMemory* memory,
|
||||
extern "C" bool iplSDMemory_containsTitleId(const SDMemory* memory,
|
||||
ESTitleId titleId,
|
||||
const ESTitleId* titleIds, u32 titleCount) {
|
||||
for (u32 i = 0; i < titleCount; i++) {
|
||||
@@ -951,7 +951,7 @@ namespace ipl {
|
||||
s32 result = mpSDChannelSelect->getWorker()->get_async_result();
|
||||
if (result == 0) {
|
||||
ESTitleId titleId = mTitleIds[mCurrentTitle];
|
||||
if (iplSDMemory_813EE358(this, titleId,
|
||||
if (iplSDMemory_containsTitleId(this, titleId,
|
||||
mNandTitleIds, mNandTitleCount)) {
|
||||
mDialogState = 17;
|
||||
} else {
|
||||
@@ -984,8 +984,8 @@ namespace ipl {
|
||||
swprintf(mCurrentTitleName, 0x107f, L"%ls\n%ls", titleName, message);
|
||||
System::getDialog()->setTitleForSDMemory(mCurrentTitleName);
|
||||
|
||||
if (iplSDMemory_813EE358(this, mTitleIds[mCurrentTitle], mSDTitleIds, mTitleNameCount) ||
|
||||
iplSDMemory_813EE358(this, mTitleIds[mCurrentTitle], mNandTitleIds, mNandTitleCount)) {
|
||||
if (iplSDMemory_containsTitleId(this, mTitleIds[mCurrentTitle], mSDTitleIds, mTitleNameCount) ||
|
||||
iplSDMemory_containsTitleId(this, mTitleIds[mCurrentTitle], mNandTitleIds, mNandTitleCount)) {
|
||||
ESTitleId titleId = mTitleIds[mCurrentTitle];
|
||||
if (iplSDChannelSelect_813DB478(mpSDChannelSelect, titleId)) {
|
||||
mDialogState = 14;
|
||||
@@ -1064,7 +1064,7 @@ namespace ipl {
|
||||
mCurrentTitle++;
|
||||
if (mTitleCount > mCurrentTitle) {
|
||||
ESTitleId nextTitleId = mTitleIds[mCurrentTitle];
|
||||
if (iplSDMemory_813EE358(this, nextTitleId,
|
||||
if (iplSDMemory_containsTitleId(this, nextTitleId,
|
||||
mNandTitleIds, mNandTitleCount)) {
|
||||
mDialogState = 17;
|
||||
} else {
|
||||
|
||||
@@ -311,9 +311,9 @@ FaderSceneCommand SDChannelTitle::calcNormal() {
|
||||
case 18: if (SCCheckStatus() != 1) { mState = 21; } break;
|
||||
case 19: iplSDChannelTitle_startCopyProgress(this); break;
|
||||
case 20: iplSDChannelTitle_updateCopyPrepare(this); break;
|
||||
case 23: iplSDChannelTitle_updateMemoryCalc(this); break;
|
||||
case 21: iplSDChannelTitle_updateEnqueueNotice(this); break;
|
||||
case 22: iplSDChannelTitle_updateCopyProgress(this); break;
|
||||
case 23: iplSDChannelTitle_updateMemoryCalc(this); break;
|
||||
case 24: iplSDChannelTitle_loadTitleBanner(this); break;
|
||||
case 25: iplSDChannelTitle_updateBannerLoad(this); break;
|
||||
case 26: iplSDChannelTitle_showCopyError(this); break;
|
||||
|
||||
@@ -64,6 +64,11 @@ namespace ipl {
|
||||
static s32 sAOSSState;
|
||||
static s32 sAOSSUnk;
|
||||
|
||||
struct AOSSStack {
|
||||
u32 storage[4080];
|
||||
u32 sentinel;
|
||||
};
|
||||
|
||||
class AOSSThread : public utility::ut_thread {
|
||||
public:
|
||||
AOSSThread(EGG::Heap* heap);
|
||||
@@ -84,7 +89,7 @@ namespace ipl {
|
||||
private:
|
||||
s32 mState; // 0x32C
|
||||
s32 mThreadPriority; // 0x330
|
||||
u8* mpStackBuffer; // 0x334
|
||||
AOSSStack* mpStack; // 0x334
|
||||
u8* mpHeapBuffer; // 0x338
|
||||
MEMHeapHandle mpExpHeap; // 0x33C
|
||||
AOSSConfig mAoss; // 0x340
|
||||
@@ -94,7 +99,7 @@ namespace ipl {
|
||||
mpExpHeap = NULL;
|
||||
sAOSSState = 0;
|
||||
mpHeapBuffer = (u8*)heap->alloc(0x40000, 0x20);
|
||||
mpStackBuffer = (u8*)heap->alloc(0x1000, 0x20);
|
||||
mpStack = (AOSSStack*)heap->alloc(0x1000, 0x20);
|
||||
}
|
||||
|
||||
void AOSSThread::destroy(int flag) {
|
||||
@@ -137,8 +142,8 @@ namespace ipl {
|
||||
mThreadPriority = OSGetThreadPriority(OSGetCurrentThread()) - 2;
|
||||
sAOSSState = 1;
|
||||
SOInit(&config);
|
||||
memset(mpStackBuffer, 0, 4);
|
||||
Create(mpStackBuffer, 0x1000, mThreadPriority, TRUE);
|
||||
memset(mpStack, 0, 4);
|
||||
Create(mpStack, 0x1000, mThreadPriority, TRUE);
|
||||
|
||||
OSRestoreInterrupts(level);
|
||||
return 1;
|
||||
@@ -178,7 +183,7 @@ namespace ipl {
|
||||
mAoss.unk_0x04 = 4;
|
||||
NETGetWirelessMacAddress(mAoss.mac);
|
||||
|
||||
*(u32*)(mpStackBuffer + 0x3FC0) = 0x97654321;
|
||||
mpStack->sentinel = 0x97654321;
|
||||
|
||||
mState = AOSSi_Init(&mAoss);
|
||||
AOSSi_EndLocal();
|
||||
|
||||
@@ -10,9 +10,9 @@
|
||||
|
||||
namespace ipl {
|
||||
namespace scene {
|
||||
TextBalloon::TextBalloon(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* directory, const char* fileName, const math::VEC3& unk2,
|
||||
f32 unk3, f32 unk4)
|
||||
: unk_0x08(FALSE), mpText(NULL), mTextLen(0), mBalloonPos(unk2), unk_0x28(0), unk_0x2C(1), unk_0x30(unk3), unk_0x34(unk4),
|
||||
TextBalloon::TextBalloon(EGG::Heap* heap, nand::LayoutFile* layoutFile, const char* directory, const char* fileName, const math::VEC3& initialPos,
|
||||
f32 margin16x9, f32 margin4x3)
|
||||
: mbWaitingFadeIn(FALSE), mpText(NULL), mTextLen(0), mBalloonPos(initialPos), mHAlign(0), mbUse16x9X(1), mMargin16x9(margin16x9), mMargin4x3(margin4x3),
|
||||
mWaitUntilFadeIn(0) {
|
||||
mpLayout = new (heap, 4) layout::Object(heap, layoutFile, directory, fileName);
|
||||
mpLayout->bind("my_IplTopBalloon_a_BalloonInOut.brlan");
|
||||
@@ -31,7 +31,7 @@ namespace ipl {
|
||||
void TextBalloon::calc() {
|
||||
mpLayout->calc();
|
||||
|
||||
switch (unk_0x08) {
|
||||
switch (mbWaitingFadeIn) {
|
||||
case TRUE: {
|
||||
break;
|
||||
}
|
||||
@@ -73,7 +73,7 @@ namespace ipl {
|
||||
|
||||
balloonPane->SetVisible(false);
|
||||
|
||||
unk_0x08 = FALSE;
|
||||
mbWaitingFadeIn = FALSE;
|
||||
}
|
||||
|
||||
void TextBalloon::fadein() {
|
||||
@@ -81,7 +81,7 @@ namespace ipl {
|
||||
mpLayout->FindPaneByName("N_Balloon")->SetVisible(false);
|
||||
|
||||
mWaitUntilFadeIn = 0;
|
||||
unk_0x08 = TRUE;
|
||||
mbWaitingFadeIn = TRUE;
|
||||
|
||||
set_textbox(mpText);
|
||||
set_translate(mBalloonPos);
|
||||
@@ -91,17 +91,17 @@ namespace ipl {
|
||||
void TextBalloon::fadeinNoSetTextbox() {
|
||||
if (mpText != NULL) {
|
||||
mWaitUntilFadeIn = 0;
|
||||
unk_0x08 = TRUE;
|
||||
mbWaitingFadeIn = TRUE;
|
||||
|
||||
set_translate(mBalloonPos);
|
||||
}
|
||||
}
|
||||
|
||||
void TextBalloon::setPos(const math::VEC3& pos, bool unk0, int unk1) {
|
||||
void TextBalloon::setPos(const math::VEC3& pos, bool use16x9X, int hAlign) {
|
||||
mBalloonPos = pos;
|
||||
|
||||
unk_0x28 = unk1;
|
||||
unk_0x2C = unk0;
|
||||
mHAlign = hAlign;
|
||||
mbUse16x9X = use16x9X;
|
||||
|
||||
nw4r::ut::Rect proj16x9;
|
||||
nw4r::ut::Rect proj4x3;
|
||||
@@ -109,7 +109,7 @@ namespace ipl {
|
||||
System::getProjectionRect(&proj16x9);
|
||||
System::getProjectionRect4x3(&proj4x3);
|
||||
|
||||
if (unk_0x2C == 0) {
|
||||
if (mbUse16x9X == 0) {
|
||||
mBalloonPos.x *= proj4x3.GetWidth() / proj16x9.GetWidth();
|
||||
}
|
||||
}
|
||||
@@ -122,7 +122,7 @@ namespace ipl {
|
||||
System::getProjectionRect(&proj16x9);
|
||||
System::getProjectionRect4x3(&proj4x3);
|
||||
|
||||
if (unk_0x2C == 0) {
|
||||
if (mbUse16x9X == 0) {
|
||||
mBalloonPos.x *= proj4x3.GetWidth() / proj16x9.GetWidth();
|
||||
}
|
||||
|
||||
@@ -133,27 +133,27 @@ namespace ipl {
|
||||
if (mWaitUntilFadeIn++ > WAIT_UNTIL_FADE_IN) {
|
||||
anm_fadein();
|
||||
snd::getSystem()->startSE("WIPL_SE_BALLOON");
|
||||
unk_0x08 = FALSE;
|
||||
mbWaitingFadeIn = FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
void TextBalloon::fadeout() {
|
||||
if (!unk_0x08) {
|
||||
if (!mbWaitingFadeIn) {
|
||||
mpLayout->setAnmType(ANIM_TYPE_BACKWARD);
|
||||
mpLayout->start();
|
||||
}
|
||||
unk_0x08 = FALSE;
|
||||
mbWaitingFadeIn = FALSE;
|
||||
}
|
||||
|
||||
void TextBalloon::fadeoutForce() {
|
||||
if (!unk_0x08) {
|
||||
if (!mbWaitingFadeIn) {
|
||||
if (mpLayout->getAnim()->getAnmType() == ANIM_TYPE_FORWARD) {
|
||||
mpLayout->getAnim()->setAnmType(ANIM_TYPE_BACKWARD);
|
||||
mpLayout->getAnim()->restart();
|
||||
}
|
||||
} else if (unk_0x08 == TRUE) {
|
||||
} else if (mbWaitingFadeIn == TRUE) {
|
||||
mWaitUntilFadeIn = 0;
|
||||
unk_0x08 = FALSE;
|
||||
mbWaitingFadeIn = FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -167,9 +167,9 @@ namespace ipl {
|
||||
f32 temp0;
|
||||
|
||||
if (SCGetAspectRatio() == SC_ASPECT_RATIO_16x9) {
|
||||
temp0 = unk_0x30;
|
||||
temp0 = mMargin16x9;
|
||||
} else {
|
||||
temp0 = unk_0x34;
|
||||
temp0 = mMargin4x3;
|
||||
}
|
||||
|
||||
nw4r::lyt::Pane* balloonPane = mpLayout->FindPaneByName("N_Balloon");
|
||||
@@ -181,7 +181,7 @@ namespace ipl {
|
||||
System::getProjectionRect(&proj16x9);
|
||||
System::getProjectionRect4x3(&proj4x3);
|
||||
|
||||
switch (unk_0x28) {
|
||||
switch (mHAlign) {
|
||||
case 1: {
|
||||
temp1 = get_size("W_Base")->width / 2;
|
||||
break;
|
||||
@@ -192,7 +192,7 @@ namespace ipl {
|
||||
}
|
||||
}
|
||||
|
||||
if (unk_0x2C == 0) {
|
||||
if (mbUse16x9X == 0) {
|
||||
temp1 *= proj4x3.GetWidth() / proj16x9.GetWidth();
|
||||
}
|
||||
|
||||
|
||||
@@ -20,10 +20,10 @@ extern "C" {
|
||||
extern "C" void _seBlk__Q23ipl3snd();
|
||||
extern "C" nw4r::snd::SoundHandle* _mainBGMHandle__Q23ipl3snd;
|
||||
extern "C" const f32 scSoundZeroF;
|
||||
extern "C" const f32 lbl_816946AC;
|
||||
extern "C" const f32 lbl_816946A8;
|
||||
extern "C" const f32 lbl_816946B0;
|
||||
extern "C" const f32 lbl_816946B4;
|
||||
extern "C" const f32 scSoundOneF;
|
||||
extern "C" const f32 scSoundTwoF;
|
||||
extern "C" const f32 scSoundThirtyF;
|
||||
extern "C" const f32 scSoundSixtyF;
|
||||
extern "C" {
|
||||
void _savegpr_29();
|
||||
void pauseOffSE__Q33ipl3snd6SystemFv();
|
||||
@@ -500,21 +500,21 @@ namespace snd {
|
||||
if (block->handle.detail_GetAttachedSound() != NULL) {
|
||||
block->handle.detail_GetAttachedSound()->SetPan(pan);
|
||||
}
|
||||
f32 pitch = lbl_816946A8 * y / rect.right;
|
||||
if (lbl_816946AC < pitch) {
|
||||
pitch = lbl_816946AC;
|
||||
f32 pitch = scSoundTwoF * y / rect.right;
|
||||
if (scSoundOneF < pitch) {
|
||||
pitch = scSoundOneF;
|
||||
}
|
||||
if (block->handle.detail_GetAttachedSound() != NULL) {
|
||||
block->handle.detail_GetAttachedSound()->SetVolume(pitch, 0);
|
||||
}
|
||||
if (lbl_816946B0 < y) {
|
||||
f32 pitch2 = y / lbl_816946B0;
|
||||
if (scSoundThirtyF < y) {
|
||||
f32 pitch2 = y / scSoundThirtyF;
|
||||
if (block->handle.detail_GetAttachedSound() != NULL) {
|
||||
block->handle.detail_GetAttachedSound()->SetPitch(pitch2);
|
||||
}
|
||||
} else if (lbl_816946B4 < y) {
|
||||
} else if (scSoundSixtyF < y) {
|
||||
if (block->handle.detail_GetAttachedSound() != NULL) {
|
||||
block->handle.detail_GetAttachedSound()->SetPitch(lbl_816946A8);
|
||||
block->handle.detail_GetAttachedSound()->SetPitch(scSoundTwoF);
|
||||
}
|
||||
}
|
||||
return (int)block;
|
||||
|
||||
Reference in New Issue
Block a user