mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-06-01 17:27:19 -04:00
Minimap fixes (needs change for intensityI8 in aurora) and some other BE fixes
This commit is contained in:
+8
-8
@@ -66,14 +66,14 @@ struct dMap_prm_res_s {
|
||||
/* 0x1A7 */ u8 field_0x1a7;
|
||||
/* 0x1A8 */ u8 field_0x1a8;
|
||||
/* 0x1A9 */ u8 field_0x1a9;
|
||||
/* 0x1AA */ s16 field_0x1aa;
|
||||
/* 0x1AC */ s16 field_0x1ac;
|
||||
/* 0x1AE */ s16 field_0x1ae;
|
||||
/* 0x1B0 */ s16 field_0x1b0;
|
||||
/* 0x1B2 */ s16 field_0x1b2;
|
||||
/* 0x1B4 */ s16 field_0x1b4;
|
||||
/* 0x1B6 */ s16 field_0x1b6;
|
||||
/* 0x1B8 */ f32 cursor_size;
|
||||
/* 0x1AA */ BE(s16) field_0x1aa;
|
||||
/* 0x1AC */ BE(s16) field_0x1ac;
|
||||
/* 0x1AE */ BE(s16) field_0x1ae;
|
||||
/* 0x1B0 */ BE(s16) field_0x1b0;
|
||||
/* 0x1B2 */ BE(s16) field_0x1b2;
|
||||
/* 0x1B4 */ BE(s16) field_0x1b4;
|
||||
/* 0x1B6 */ BE(s16) field_0x1b6;
|
||||
/* 0x1B8 */ BE(f32) cursor_size;
|
||||
};
|
||||
|
||||
struct dMap_prm_hio_s {
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include "JSystem/JHostIO/JORMContext.h"
|
||||
|
||||
struct dMpath_RGB5A3_s {
|
||||
u16 color;
|
||||
BE(u16) color;
|
||||
};
|
||||
|
||||
namespace dMpath_ColorCnv_n {
|
||||
|
||||
@@ -276,7 +276,7 @@ bool isTexNoReg(void* pDL) {
|
||||
}
|
||||
|
||||
u16 getTexNoReg(void* pDL) {
|
||||
u32 var_r31 = *(u32*)((u8*)pDL + 1);
|
||||
u32 var_r31 = *(BE(u32)*)((u8*)pDL + 1);
|
||||
return var_r31 & 0xFFFFFF;
|
||||
}
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ daObjFlag_c::M_attrs const daObjFlag_c::M_attr = {
|
||||
};
|
||||
|
||||
void daObjFlag_c::create_init() {
|
||||
field_0x5dc = (*(u32*)dComIfG_getObjectRes(daSetBgObj_c::getArcName(this), "spec.dat")) & 0xffff;
|
||||
field_0x5dc = (*(BE(u32)*)dComIfG_getObjectRes(daSetBgObj_c::getArcName(this), "spec.dat")) & 0xffff;
|
||||
mPos = cXyz(current.pos.x, current.pos.y + field_0x5dc, current.pos.z);
|
||||
mFlagJoints[0].mRv = (short)(cM_rnd() * 65535.0f);
|
||||
mFlagJoints[1].mRv = (short)(cM_rnd() * 65535.0f);
|
||||
|
||||
@@ -106,7 +106,7 @@ void dBgp_c::modelMaterial_c::set(J3DModelData* i_modelData, J3DMaterial* i_mate
|
||||
void dBgp_c::model_c::create(J3DModelData* i_modelData, Mtx i_mtx) {
|
||||
const void* binary = i_modelData->getBinary();
|
||||
|
||||
mId = *(u32*)((char*)binary + 0x1C);
|
||||
mId = *(BE(u32)*)((char*)binary + 0x1C);
|
||||
if (mId != 0xFFFF) {
|
||||
addShare(mId);
|
||||
}
|
||||
|
||||
@@ -2278,7 +2278,7 @@ void dMenu_Fmap_c::decodeFieldMapData() {
|
||||
dMenuMapCommon_c::Stage_c* stage_data
|
||||
= (dMenuMapCommon_c::Stage_c*)(field_data + mpFieldDat->mStageDataOffset);
|
||||
mDataNumMax = stage_data->mCount;
|
||||
mAllTitleName = *(u16*)(field_data + 0x16);
|
||||
mAllTitleName = *(BE(u16)*)(field_data + 0x16);
|
||||
setTitleName(mAllTitleName);
|
||||
dMenu_Fmap_field_region_data_c::data* regions = region_data->mData;
|
||||
char tex_path[20];
|
||||
|
||||
@@ -656,7 +656,7 @@ void dMsgObject_c::setMessageIndexDemo(u32 revoMsgIndex, bool param_2) {
|
||||
u32 dMsgObject_c::getMessageIndex(u32 param_0) {
|
||||
u32 i = 0;
|
||||
JMSMesgInfo_c* pMsg = (JMSMesgInfo_c*)((char*)mpMsgDt + 0x20);
|
||||
u32 msgIndexCount = *((u16*)((char*)mpMsgDt + 0x28));
|
||||
u32 msgIndexCount = *((BE(u16)*)((char*)mpMsgDt + 0x28));
|
||||
int rv;
|
||||
for (; i < msgIndexCount; i++) {
|
||||
if (pMsg->entries[i].message_id == param_0) {
|
||||
@@ -683,12 +683,12 @@ u32 dMsgObject_c::getRevoMessageIndex(u32 param_1) {
|
||||
JUT_ASSERT(1916, groupID==s_groupID || groupID == 0)
|
||||
changeGroup(groupID);
|
||||
pMsg = (JMSMesgInfo_c*)((char*)mpMsgDt + 0x20);
|
||||
msgIndexCount = *((u16*)((char*)mpMsgDt + 0x28));
|
||||
msgIndexCount = *((BE(u16)*)((char*)mpMsgDt + 0x28));
|
||||
for (; i < msgIndexCount; i++) {
|
||||
if (pMsg->entries[i].message_id == param_1) {
|
||||
s8* ptr = (s8*)pMsg + pMsg->header.size + pMsg->entries[i].string_offset + 8;
|
||||
if (ptr[0] == 26 && ptr[2] == 3 && (s8)ptr[4] == 0) {
|
||||
rv = pMsg->entries[*(int*)(ptr + 5)].message_id;
|
||||
rv = pMsg->entries[*(BE(int)*)(ptr + 5)].message_id;
|
||||
} else {
|
||||
rv = param_1;
|
||||
}
|
||||
@@ -706,7 +706,7 @@ u32 dMsgObject_c::getRevoMessageIndex(u32 param_1) {
|
||||
u32 dMsgObject_c::getMessageIndexAlways(u32 param_0) {
|
||||
u32 i = 0;
|
||||
JMSMesgInfo_c* pMsg = (JMSMesgInfo_c*)((char*)mpMsgRes + 0x20);
|
||||
u32 msgIndexCount = *((u16*)((char*)mpMsgRes + 0x28));
|
||||
u32 msgIndexCount = *((BE(u16)*)((char*)mpMsgRes + 0x28));
|
||||
int rv;
|
||||
for (; i < msgIndexCount; i++) {
|
||||
if (pMsg->entries[i].message_id == param_0) {
|
||||
|
||||
Reference in New Issue
Block a user