mirror of
https://github.com/zeldaret/tp
synced 2026-08-16 13:17:11 -04:00
Remove fake matches, fix false equivalencies, and other small matches (#2837)
* Debug matches and remove fake matches * Fix false equivalencies, regallocs, and vtable orders * Fix PAL splits
This commit is contained in:
@@ -3359,11 +3359,7 @@ public:
|
||||
BOOL checkSmallUpperGuardAnime() const { return checkUpperAnime(0x16); }
|
||||
BOOL checkFmChainGrabAnime() const { return checkUpperAnime(0x62) || checkUpperAnime(0x2A0); }
|
||||
|
||||
// this might be a fake match, but helps fix usage in many functions
|
||||
#pragma push
|
||||
#pragma optimization_level 2
|
||||
BOOL checkAttentionLock() { return mAttention->Lockon(); }
|
||||
#pragma pop
|
||||
|
||||
bool checkUpperAnime(u16 i_idx) const { return mUpperAnmHeap[UPPER_2].getIdx() == i_idx; }
|
||||
bool checkUnderAnime(u16 i_idx) const { return mUnderAnmHeap[UNDER_2].getIdx() == i_idx; }
|
||||
|
||||
@@ -75,7 +75,6 @@ public:
|
||||
/* 80A28F74 */ int escape(int);
|
||||
/* 80A2908C */ int iyan_look(int);
|
||||
/* 80A29164 */ int turn_hana(int);
|
||||
void dummy();
|
||||
/* 80A291E8 */ int wait_dummy(int);
|
||||
/* 80A2926C */ int cheer(int);
|
||||
/* 80A29458 */ BOOL _turn_to_link(s16);
|
||||
|
||||
@@ -27,6 +27,7 @@ public:
|
||||
|
||||
u8 getSwitchNo() { return (fopAcM_GetParam(this) >> 8) & 0xff; }
|
||||
void setAnmSpeed(f32 speed) { mpTableUpBckAnm->setPlaySpeed(speed); }
|
||||
void setEffect() { field_0x874 = true; }
|
||||
|
||||
/* 0x568 */ J3DModel* mpTableModel;
|
||||
/* 0x56C */ J3DModel* mpMirrorModel;
|
||||
|
||||
@@ -44,8 +44,8 @@ public:
|
||||
/* 80CE6454 */ int talk(void*);
|
||||
/* 80CE6514 */ int drink(void*);
|
||||
|
||||
/* 80CE59FC */ virtual void setSoldOut();
|
||||
/* 80CE4F78 */ virtual ~daObj_SSDrink_c();
|
||||
/* 80CE59FC */ virtual void setSoldOut();
|
||||
|
||||
static dCcD_SrcGObjInf const mCcDObjInfo;
|
||||
static dCcD_SrcCyl mCcDCyl;
|
||||
|
||||
@@ -50,8 +50,6 @@ public:
|
||||
/* 80CFC6AC */ void modeOffWait();
|
||||
/* 80CFCA34 */ void init_modeOnWait();
|
||||
/* 80CFCA40 */ void modeOnWait();
|
||||
/* 80CFCCE0 */ bool eventStart();
|
||||
/* 80CFD034 */ virtual ~daObjSwHang_c() {}
|
||||
|
||||
daObjSwHang_c() : dEvLib_callback_c(this) {}
|
||||
|
||||
@@ -61,6 +59,9 @@ public:
|
||||
/* 80CFCD04 */ virtual int Draw();
|
||||
/* 80CFCD98 */ virtual int Delete();
|
||||
|
||||
/* 80CFCCE0 */ virtual bool eventStart();
|
||||
/* 80CFD034 */ virtual ~daObjSwHang_c() {}
|
||||
|
||||
cXyz getHangPos() { return mHangPos; }
|
||||
|
||||
void setHangPlayer() { mHangPlayer = 1; }
|
||||
|
||||
@@ -39,8 +39,8 @@ public:
|
||||
/* 801958E0 */ void setBckAnimation(J2DAnmTransformKey*);
|
||||
/* 80195940 */ void moveCenter(J2DPane*, f32, f32);
|
||||
|
||||
/* 80194C30 */ virtual void draw();
|
||||
/* 801949EC */ virtual ~dSelect_cursor_c();
|
||||
/* 80194C30 */ virtual void draw();
|
||||
|
||||
void setPos(f32 x, f32 y) {
|
||||
mPositionX = x;
|
||||
|
||||
@@ -83,9 +83,9 @@ enum fopAc_Cull_e {
|
||||
};
|
||||
|
||||
enum fopAc_attention_type {
|
||||
fopAc_attn_LOCK_e,
|
||||
fopAc_attn_TALK_e,
|
||||
fopAc_attn_BATTLE_e,
|
||||
/* 0x0 */ fopAc_attn_LOCK_e,
|
||||
/* 0x1 */ fopAc_attn_TALK_e,
|
||||
/* 0x2 */ fopAc_attn_BATTLE_e,
|
||||
|
||||
#if !PLATFORM_GCN
|
||||
fopAc_attn_UNK_3,
|
||||
@@ -93,17 +93,17 @@ enum fopAc_attention_type {
|
||||
fopAc_attn_UNK_5,
|
||||
#endif
|
||||
|
||||
fopAc_attn_SPEAK_e,
|
||||
fopAc_attn_CARRY_e,
|
||||
fopAc_attn_DOOR_e,
|
||||
fopAc_attn_JUEL_e,
|
||||
/* 0x3 */ fopAc_attn_SPEAK_e,
|
||||
/* 0x4 */ fopAc_attn_CARRY_e,
|
||||
/* 0x5 */ fopAc_attn_DOOR_e,
|
||||
/* 0x6 */ fopAc_attn_JUEL_e,
|
||||
|
||||
#if !PLATFORM_GCN
|
||||
fopAc_attn_UNK_10,
|
||||
#endif
|
||||
|
||||
fopAc_attn_ETC_e,
|
||||
fopAc_attn_CHECK_e,
|
||||
/* 0x7 */ fopAc_attn_ETC_e,
|
||||
/* 0x8 */ fopAc_attn_CHECK_e,
|
||||
|
||||
fopAc_attn_MAX_e,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user