Misc matches (#2845)

* Misc debug matches

* Fix d_map weak function order

* Remove old nonmatching comments

* d_menu_dmap and JASAudioThread OK, fix weak func order and rodata alignment

* More misc matches
This commit is contained in:
LagoLunatic
2025-11-21 15:52:16 -08:00
committed by GitHub
parent 31621c3dac
commit e2fddadf32
55 changed files with 341 additions and 266 deletions
+2 -2
View File
@@ -1008,7 +1008,7 @@ d/d_menu_collect.cpp:
d/d_menu_dmap.cpp:
.text start:0x801B7F20 end:0x801C084C
.ctors start:0x8037385C end:0x80373860
.rodata start:0x80395518 end:0x80395860
.rodata start:0x80395518 end:0x8039584B
.data start:0x803BC7E0 end:0x803BCB60
.sbss start:0x80451078 end:0x80451088
.sdata2 start:0x80453FE8 end:0x80454060
@@ -2013,7 +2013,7 @@ JSystem/JAudio2/JASAiCtrl.cpp:
JSystem/JAudio2/JASAudioThread.cpp:
.text start:0x8029CCDC end:0x8029D0B4
.rodata start:0x8039B338 end:0x8039B360
.rodata start:0x8039B338 end:0x8039B34C
.data start:0x803C78E0 end:0x803C78F0
.bss start:0x80431C68 end:0x80431C78
.sbss start:0x804512D8 end:0x804512E0
+4 -4
View File
@@ -606,7 +606,7 @@ config.libs = [
Object(NonMatching, "d/d_home_button.cpp"),
Object(NonMatching, "d/d_cursor_mng.cpp"),
Object(MatchingFor(ALL_GCN), "d/d_stage.cpp"),
Object(Equivalent, "d/d_map.cpp"), # weak func order
Object(MatchingFor(ALL_GCN), "d/d_map.cpp"),
Object(MatchingFor(ALL_GCN), "d/d_com_inf_game.cpp"),
Object(MatchingFor(ALL_GCN), "d/d_com_static.cpp"),
Object(MatchingFor(ALL_GCN), "d/d_com_inf_actor.cpp"),
@@ -709,7 +709,7 @@ config.libs = [
Object(MatchingFor(ALL_GCN), "d/d_kantera_icon_meter.cpp"),
Object(MatchingFor(ALL_GCN), "d/d_menu_calibration.cpp"),
Object(NonMatching, "d/d_menu_collect.cpp"),
Object(NonMatching, "d/d_menu_dmap.cpp"),
Object(MatchingFor(ALL_GCN), "d/d_menu_dmap.cpp"),
Object(MatchingFor(ALL_GCN), "d/d_menu_dmap_map.cpp"),
Object(MatchingFor(ALL_GCN), "d/d_menu_map_common.cpp"),
Object(MatchingFor(ALL_GCN), "d/d_menu_fishing.cpp"),
@@ -968,7 +968,7 @@ config.libs = [
Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASLfo.cpp"),
Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASOscillator.cpp"),
Object(NonMatching, "JSystem/JAudio2/JASAiCtrl.cpp"),
Object(NonMatching, "JSystem/JAudio2/JASAudioThread.cpp"),
Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASAudioThread.cpp"),
Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASAudioReseter.cpp"),
Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASDSPChannel.cpp"),
Object(MatchingFor(ALL_GCN), "JSystem/JAudio2/JASDSPInterface.cpp"),
@@ -1944,7 +1944,7 @@ config.libs = [
ActorRel(MatchingFor(ALL_GCN), "d_a_npc_tk"),
ActorRel(MatchingFor(ALL_GCN), "d_a_npc_tkc"),
ActorRel(MatchingFor(ALL_GCN), "d_a_npc_tkj2"),
ActorRel(NonMatching, "d_a_npc_tks"),
ActorRel(NonMatching, "d_a_npc_tks"), # weak func order (sinShort)
ActorRel(MatchingFor(ALL_GCN), "d_a_npc_toby"),
ActorRel(MatchingFor(ALL_GCN), "d_a_npc_tr"),
ActorRel(MatchingFor(ALL_GCN), "d_a_npc_uri"),
+2 -2
View File
@@ -90,8 +90,8 @@ public:
/* 802FF320 */ virtual void prepend(JUTTexture* param_0, f32 param_1) {
insert(param_0, 0, param_1);
}
/* 801BDD70 */ virtual bool insert(ResTIMG const*, u8, f32) {
// NONMATCHING
/* 801BDD70 */ virtual bool insert(ResTIMG const* param_0, u8 param_1, f32 param_2) {
return insert(param_0, NULL, param_1, param_2);
}
/* 802FD168 */ virtual bool insert(ResTIMG const*, JUTPalette*, u8, f32);
/* 80020368 */ virtual bool insert(char const* param_0, u8 param_1, f32 param_2) {
@@ -93,11 +93,7 @@ struct TAdaptor_sound : public JStudio::TAdaptor_sound {
void set_bPermit_onExit_notEnd_(bool param_1) { field_0x11c = param_1; }
#ifndef NONMATCHING
static TVVOSetValue_ saoVVOSetValue_[6];
#else
static u8 saoVVOSetValue_[72];
#endif
/* 0x114 */ TCreateObject* pCreateObject_;
/* 0x118 */ JAISoundHandle opJAISoundHandle_;
+4 -1
View File
@@ -30,9 +30,12 @@
#define JUT_LOG(LINE, ...) \
JUTAssertion::setLogMessage_f(JUTAssertion::getSDevice(), __FILE__, LINE, __VA_ARGS__)
#define JUT_CONFIRM(LINE, COND) \
#define JUT_SET_CONFIRM(LINE, COND) \
JUTAssertion::setConfirmMessage(JUTAssertion::getSDevice(), __FILE__, LINE, COND, #COND)
#define JUT_CONFIRM(LINE, COND) \
JUT_SET_CONFIRM(LINE, COND)
#else
#define JUT_ASSERT(...) (void)0;
#define JUT_ASSERT_MSG(...) (void)0;
+4 -11
View File
@@ -50,18 +50,11 @@ public:
dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354]);
}
void setAction(Mode_e i_action) {
mMode = i_action;
mAction = ActionTable[mMode];
inline void setAction(Mode_e i_action);
inline void callInit();
inline void callExecute();
callInit();
}
void callInit() { (this->*mAction[0])(); }
void callExecute() { (this->*mAction[1])(); }
static actionFunc ActionTable[][2];
static const actionFunc ActionTable[][2];
private:
/* 0x568 */ J3DModel* mpModel;
-5
View File
@@ -32,12 +32,7 @@ class dDlst_base_c {
public:
dDlst_base_c() {}
// hack, remove later
#ifdef NO_INLINE_DLSTBASE_DRAW
virtual void draw();
#else
virtual void draw() {}
#endif
};
class dDlst_snapShot_c : public dDlst_base_c {
-1
View File
@@ -25,7 +25,6 @@ struct dMenu_DmapMapCtrl_c;
class renderingDmap_c : public renderingPlusDoor_c {
public:
/* 801C0380 */ virtual ~renderingDmap_c() {}
/* 801C051C */ renderingDmap_c() {}
/* 801C0C48 */ virtual const GXColor* getColor(int);
/* 801C0C10 */ virtual int getLineWidth(int);
-1
View File
@@ -204,7 +204,6 @@ public:
class dMenu_DmapMapCtrl_c : public dMenu_StageMapCtrl_c {
public:
/* 801BD144 */ virtual ~dMenu_DmapMapCtrl_c() {}
/* 801C2028 */ virtual bool isEnableZoomMove() const;
/* 801C1B14 */ virtual void calcZoomCenter(f32*, f32*);
/* 801C2598 */ virtual void getInitWholeMapScale(f32*, f32, f32, f32, f32);
+1 -1
View File
@@ -182,7 +182,7 @@ public:
u16 getSelectNum() { return query005(NULL, NULL, 0); }
int getChoiceNo() { return (s16)mChoiceNo; }
void setMsg(u32 msg) { mMsg = msg; }
bool checkEndFlow() { return field_0x26 == 1; }
bool checkEndFlow() { return (u32)field_0x26 == 1; }
static queryFunc mQueryList[53];
static eventFunc mEventList[43];
+1 -2
View File
@@ -4,7 +4,6 @@
#include "SSystem/SComponent/c_lib.h"
#include "d/d_kankyo.h"
#include "d/d_kankyo_data.h"
#include "d/d_map_path_dmap.h"
#include "f_op/f_op_actor_mng.h"
#include "global.h"
@@ -217,7 +216,7 @@ struct stage_tgsc_class {
// MPAT
struct map_path_class {
/* 0x0 */ int num;
/* 0x4 */ dDrawPath_c::room_class* m_entries;
/* 0x4 */ void* m_entries;
};
// RTBL
+2 -2
View File
@@ -85,7 +85,7 @@ void JASDsp::invalChannelAll() {
}
/* 8039B360-8039B3A0 0279C0 0040+00 1/1 0/0 0/0 .rodata DSPADPCM_FILTER__6JASDsp */
u8 const JASDsp::DSPADPCM_FILTER[64] = {
u8 const ALIGN_DECL(32) JASDsp::DSPADPCM_FILTER[64] = {
0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x04, 0x00,
0x10, 0x00, 0xF8, 0x00, 0x0E, 0x00, 0xFA, 0x00, 0x0C, 0x00, 0xFC, 0x00, 0x12, 0x00, 0xF6, 0x00,
0x10, 0x68, 0xF7, 0x38, 0x12, 0xC0, 0xF7, 0x04, 0x14, 0x00, 0xF4, 0x00, 0x08, 0x00, 0xF8, 0x00,
@@ -93,7 +93,7 @@ u8 const JASDsp::DSPADPCM_FILTER[64] = {
};
/* 8039B3A0-8039B8A0 -00001 0500+00 1/1 0/0 0/0 .rodata DSPRES_FILTER__6JASDsp */
u32 const JASDsp::DSPRES_FILTER[320] = {
u32 const ALIGN_DECL(32) JASDsp::DSPRES_FILTER[320] = {
0x0C3966AD,
0x0D46FFDF,
0x0B396696,
+5 -5
View File
@@ -317,7 +317,7 @@ JASWaveBank* JAUSection::newWaveBank(u32 bank_no, void const* param_1) {
s32 r27 = getHeap_()->getFreeSize();
JASWaveBank* waveBank = JASWSParser::createWaveBank(param_1, getHeap_());
if (waveBank) {
JUT_ASSERT(536, sectionHeap_->getWaveBankTable().getWaveBank( bank_no ) == 0);
JUT_ASSERT(536, sectionHeap_->getWaveBankTable().getWaveBank( bank_no ) == NULL);
sectionHeap_->getWaveBankTable().registWaveBank(bank_no, waveBank);
data_.registeredWaveBankTables.set(bank_no, true);
data_.field_0xa0 += r27 - getHeap_()->getFreeSize();
@@ -355,10 +355,10 @@ JASBank* JAUSection::newBank(void const* param_0, u32 param_1) {
JASBank* bank = JASBNKParser::createBank(param_0, getHeap_());
if (bank) {
if (buildingBankTable_) {
JUT_ASSERT(660, buildingBankTable_->getBank( bank_no ) == 0);
JUT_ASSERT(660, buildingBankTable_->getBank( bank_no ) == NULL);
buildingBankTable_->registBank(bank_no, bank);
} else {
JUT_ASSERT(665, JASDefaultBankTable::getInstance() ->getBank( bank_no ) == 0);
JUT_ASSERT(665, JASDefaultBankTable::getInstance() ->getBank( bank_no ) == NULL);
JASDefaultBankTable::getInstance()->registBank(bank_no, bank);
data_.registeredBankTables.set(bank_no, true);
}
@@ -380,10 +380,10 @@ JASVoiceBank* JAUSection::newVoiceBank(u32 bank_no, u32 param_1) {
JASBank* voiceBank = new JASVoiceBank();
if (voiceBank) {
if (buildingBankTable_) {
JUT_ASSERT(696, buildingBankTable_->getBank( bank_no ) == 0);
JUT_ASSERT(696, buildingBankTable_->getBank( bank_no ) == NULL);
buildingBankTable_->registBank(bank_no, voiceBank);
} else {
JUT_ASSERT(701, JASDefaultBankTable::getInstance() ->getBank( bank_no ) == 0);
JUT_ASSERT(701, JASDefaultBankTable::getInstance() ->getBank( bank_no ) == NULL);
JASDefaultBankTable::getInstance()->registBank(bank_no, voiceBank);
data_.registeredBankTables.set(bank_no, true);
}
+1 -1
View File
@@ -60,7 +60,7 @@ JAUSeqDataMgr_SeqCollection::JAUSeqDataMgr_SeqCollection() {
/* 802A67D0-802A67DC 2A1110 000C+00 1/0 0/0 0/0 .text
* setSeqDataUser__27JAUSeqDataMgr_SeqCollectionFP14JAISeqDataUser */
bool JAUSeqDataMgr_SeqCollection::setSeqDataUser(JAISeqDataUser* param_0) {
JUT_ASSERT(60, user_ == 0);
JUT_ASSERT(60, user_ == NULL);
user_ = param_0;
return true;
}
+1 -1
View File
@@ -13,7 +13,7 @@ JKRSolidHeap* JKRSolidHeap::create(u32 size, JKRHeap* heap, bool useErrorHandler
heap = getRootHeap();
}
if (size == 0xffffffff) {
if (size == -1) {
size = heap->getMaxAllocatableSize(0x10);
}
+2 -1
View File
@@ -748,9 +748,10 @@ void JMessage::TRenderingProcessor::do_tag_(u32 uTag, void const* pData, u32 uSi
case 0:
case 1:
case 2:
case 3:
case 3: {
JGADGET_WARNMSG1(1047, "system-tag-code ignored : ", uCode & 0xFFFF);
break;
}
case 6:
break;
case 7:
+9 -9
View File
@@ -17,8 +17,8 @@ TObject::~TObject() {
}
void TObject::prepare(data::TParse_TBlock const& rBlock, TControl* pControl) {
JUT_ASSERT(35, pfv_!=0);
JUT_ASSERT(36, pControl!=0);
JUT_ASSERT(35, pfv_!=NULL);
JUT_ASSERT(36, pControl!=NULL);
TFunctionValueAttributeSet set = pfv_->getAttributeSet();
const void* pNext = (const void*)rBlock.getNext();
const void* pData = (const void*)rBlock.getContent();
@@ -37,7 +37,7 @@ void TObject::prepare(data::TParse_TBlock const& rBlock, TControl* pControl) {
break;
case 0x10: {
JGADGET_ASSERTWARN(61, u32Size>=4);
JUT_ASSERT(62, pContent!=0);
JUT_ASSERT(62, pContent!=NULL);
TFunctionValueAttribute_refer* pfvaRefer = set.refer_get();
JGADGET_ASSERTWARN(64, pfvaRefer!=NULL);
if (pfvaRefer == NULL) {
@@ -63,7 +63,7 @@ void TObject::prepare(data::TParse_TBlock const& rBlock, TControl* pControl) {
} break;
case 0x11: {
JGADGET_ASSERTWARN(93, u32Size>=4);
JUT_ASSERT(94, pContent!=0);
JUT_ASSERT(94, pContent!=NULL);
TFunctionValueAttribute_refer* pfvaRefer = set.refer_get();
JGADGET_ASSERTWARN(96, pfvaRefer!=NULL);
if (pfvaRefer == NULL) {
@@ -88,7 +88,7 @@ void TObject::prepare(data::TParse_TBlock const& rBlock, TControl* pControl) {
} break;
case 0x12: {
JGADGET_ASSERTWARN(121, u32Size==8);
JUT_ASSERT(122, pContent!=0);
JUT_ASSERT(122, pContent!=NULL);
TFunctionValueAttribute_range* pfvaRange = set.range_get();
JGADGET_ASSERTWARN(124, pfvaRange!=NULL);
if (pfvaRange == NULL) {
@@ -100,7 +100,7 @@ void TObject::prepare(data::TParse_TBlock const& rBlock, TControl* pControl) {
} break;
case 0x13: {
JGADGET_ASSERTWARN(138, u32Size==4);
JUT_ASSERT(139, pContent!=0);
JUT_ASSERT(139, pContent!=NULL);
TFunctionValueAttribute_range* pfvaRange = set.range_get();
JGADGET_ASSERTWARN(141, pfvaRange!=NULL);
if (pfvaRange == NULL) {
@@ -113,7 +113,7 @@ void TObject::prepare(data::TParse_TBlock const& rBlock, TControl* pControl) {
} break;
case 0x14: {
JGADGET_ASSERTWARN(156, u32Size==4);
JUT_ASSERT(157, pContent!=0);
JUT_ASSERT(157, pContent!=NULL);
TFunctionValueAttribute_range* pfvaRange = set.range_get();
JGADGET_ASSERTWARN(159, pfvaRange!=NULL);
if (pfvaRange == NULL) {
@@ -126,7 +126,7 @@ void TObject::prepare(data::TParse_TBlock const& rBlock, TControl* pControl) {
} break;
case 0x15: {
JGADGET_ASSERTWARN(174, u32Size==4);
JUT_ASSERT(175, pContent!=0);
JUT_ASSERT(175, pContent!=NULL);
TFunctionValueAttribute_range* pfvaRange = set.range_get();
JGADGET_ASSERTWARN(177, pfvaRange!=NULL);
if (pfvaRange == NULL) {
@@ -140,7 +140,7 @@ void TObject::prepare(data::TParse_TBlock const& rBlock, TControl* pControl) {
} break;
case 0x16: {
JGADGET_ASSERTWARN(193, u32Size==4);
JUT_ASSERT(194, pContent!=0);
JUT_ASSERT(194, pContent!=NULL);
TFunctionValueAttribute_interpolate* pfvaInterpolate = set.interpolate_get();
JGADGET_ASSERTWARN(197, pfvaInterpolate!=NULL);
if (pfvaInterpolate == NULL) {
@@ -8,6 +8,9 @@
#include "JSystem/JStudio/JStudio_JAudio2/control.h"
#include "JSystem/JStudio/JStudio_JStage/control.h"
namespace JStudio_JAudio2 {
namespace {
/* 8028D728-8028D750 288068 0028+00 1/1 0/0 0/0 .text
* setValue_VOLUME___Q215JStudio_JAudio226@unnamed@object_sound_cpp@FP8JAISoundf */
static void setValue_VOLUME_(JAISound *param_1, float param_2) {
@@ -41,6 +44,9 @@ static void setValue_ECHO_(JAISound *param_1, float param_2) {
param_1->getAuxiliary().moveFxMix(param_2, 0);
}
}; // namespace
}; // namespace JStudio_JAudio2
/* 8028D828-8028D8F4 288168 00CC+00 0/0 1/1 0/0 .text
* __ct__Q215JStudio_JAudio214TAdaptor_soundFPQ215JStudio_JAudio213TCreateObject */
JStudio_JAudio2::TAdaptor_sound::TAdaptor_sound(JStudio_JAudio2::TCreateObject* param_1) :
@@ -139,10 +145,11 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_update(u32 param_1) {
field_0x130 = *pVVar2;
if (field_0x11d) {
switch(field_0x120) {
case 2:
case 2: {
JAISoundStarter* soundStarter = pCreateObject_->get_pJAISoundStarter_();
soundStarter->startLevelSound(field_0x124, &opJAISoundHandle_, field_0x12c);
break;
}
case 1:
field_0x120 = 2;
break;
+11 -11
View File
@@ -7,6 +7,7 @@
#include "JSystem/JUtility/JUTXfb.h"
#include "JSystem/JKernel/JKRHeap.h"
#include "JSystem/JUtility/JUTAssert.h"
#include "dolphin/gx.h"
void JUTXfb::clearIndex() {
@@ -29,10 +30,10 @@ JUTXfb::JUTXfb(GXRenderModeObj const* pObj, JKRHeap* pHeap, JUTXfb::EXfbNumber x
if (pObj) {
initiate(pObj->fbWidth, pObj->xfbHeight, pHeap, xfbNum);
} else {
u16 fbWidth = JUTVideo::getManager()->getRenderMode()->fbWidth;
u16 fbWidth = (u32)JUTVideo::getManager()->getRenderMode()->fbWidth;
u16 xfbHeight = (u32)JUTVideo::getManager()->getRenderMode()->xfbHeight;
u16 efbHeight = (u32)JUTVideo::getManager()->getRenderMode()->efbHeight;
u16 xfb_height = JUTVideo::getManager()->getRenderMode()->xfbHeight;
f32 scale_factor = GXGetYScaleFactor(efbHeight, xfb_height);
f32 scale_factor = GXGetYScaleFactor(efbHeight, xfbHeight);
u16 xfb_lines = GXGetNumXfbLines(efbHeight, scale_factor);
initiate(fbWidth, xfb_lines, pHeap, xfbNum);
@@ -55,6 +56,7 @@ void JUTXfb::delXfb(int xfbIdx) {
}
JUTXfb* JUTXfb::createManager(JKRHeap* pHeap, JUTXfb::EXfbNumber xfbNum) {
JUT_CONFIRM(273, sManager == NULL);
if (sManager == NULL) {
sManager = new JUTXfb(NULL, pHeap, xfbNum);
}
@@ -62,24 +64,23 @@ JUTXfb* JUTXfb::createManager(JKRHeap* pHeap, JUTXfb::EXfbNumber xfbNum) {
}
void JUTXfb::destroyManager() {
JUT_CONFIRM(344, sManager);
delete sManager;
sManager = NULL;
}
void JUTXfb::initiate(u16 width, u16 height, JKRHeap* pHeap, JUTXfb::EXfbNumber xfbNum) {
if (pHeap == NULL) {
pHeap = JKRHeap::getSystemHeap();
pHeap = JKRGetSystemHeap();
}
int size = ((u32)width + 0xf & 0xfff0) * (u32)height * 2;
int size = (u16)((u16)width + 0xf & ~0xf) * height * 2;
void* buf = ::operator new[](size, pHeap, 0x20);
mBuffer[0] = buf;
mBuffer[0] = ::operator new[](size, pHeap, 0x20);
mXfbAllocated[0] = true;
if (xfbNum >= 2) {
buf = ::operator new[](size, pHeap, 0x20);
mBuffer[1] = buf;
mBuffer[1] = ::operator new[](size, pHeap, 0x20);
mXfbAllocated[1] = true;
} else {
mBuffer[1] = NULL;
@@ -87,8 +88,7 @@ void JUTXfb::initiate(u16 width, u16 height, JKRHeap* pHeap, JUTXfb::EXfbNumber
}
if (xfbNum >= 3) {
buf = ::operator new[](size, pHeap, 0x20);
mBuffer[2] = buf;
mBuffer[2] = ::operator new[](size, pHeap, 0x20);
mXfbAllocated[2] = true;
} else {
mBuffer[2] = NULL;
+1 -1
View File
@@ -59,7 +59,7 @@ cXyz cXyz::outprod(const Vec& vec) const {
/* 80266CE4-80266D30 004C+00 s=0 e=10 z=1 None .text norm__4cXyzCFv */
cXyz cXyz::norm() const {
Vec ret;
JUT_CONFIRM(251, isNearZeroSquare() == 0);
JUT_CONFIRM(251, isNearZeroSquare() == FALSE);
PSVECNormalize(this, &ret);
return ret;
}

Some files were not shown because too many files have changed in this diff Show More