mirror of
https://github.com/zeldaret/tp
synced 2026-06-07 03:57:56 -04:00
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:
@@ -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_;
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user