mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-06 19:51:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Lv5key / Iceblock done (#2177)

Browse Source 
* obj_lv5key

* obj_iceblock done

* remove asm
This commit is contained in:
TakaRikka
2024-07-12 23:24:50 -07:00
committed by GitHub
parent 89e14f9f97
commit ca1ece683b
94 changed files with 1303 additions and 5515 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/a/d_a_alink.h
+3 -1
View File
@@ -1994,7 +1994,7 @@ public:
/* 800E7EE4 */ int getWallGrabStatus();
/* 800E7EF4 */ BOOL wallGrabTrigger();
/* 800E7F18 */ BOOL wallGrabButton();
/* 800E7F3C */ void setPushPullKeepData(dBgW_Base::PushPullLabel, int);
/* 800E7F3C */ int setPushPullKeepData(dBgW_Base::PushPullLabel, int);
/* 800E80A4 */ void checkPushPullTurnBlock();
/* 800E8148 */ void checkPullBehindWall();
/* 800E8298 */ void offGoatStopGame();
@@ -3288,6 +3288,8 @@ public:
bool checkWolfDashMode() const { return checkNoResetFlg1(FLG1_DASH_MODE); }
bool checkWolfLieWaterIn() const { return mWaterY > current.pos.y + 20.5f; }
BOOL checkPowerGloveGet() { return false; }
J3DModel* initModel(J3DModelData* p_modelData, u32 param_1) {
return initModel(p_modelData, 0x80000, param_1);
}
include/d/bg/d_bg_s.h
+1 -1
View File
@@ -105,7 +105,7 @@ public:
void MoveBgMatrixCrrPos(cBgS_PolyInfo const&, bool, cXyz*, csXyz*, csXyz*);
void RideCallBack(cBgS_PolyInfo const&, fopAc_ac_c*);
void ArrowStickCallBack(cBgS_PolyInfo const&, fopAc_ac_c*, cXyz&);
bool PushPullCallBack(cBgS_PolyInfo const&, fopAc_ac_c*, s16, dBgW_Base::PushPullLabel);
fopAc_ac_c* PushPullCallBack(cBgS_PolyInfo const&, fopAc_ac_c*, s16, dBgW_Base::PushPullLabel);
bool WaterChk(dBgS_SplGrpChk* chk) { return SplGrpChk(chk); }
u32 GetMtrlSndId(cBgS_PolyInfo* param_0) { return dKy_pol_sound_get(param_0); }
include/d/bg/d_bg_w_base.h
+8 -2
View File
@@ -18,14 +18,18 @@ class fopAc_ac_c;
class dBgW_Base : public cBgW_BgId {
public:
enum PushPullLabel {
PUSHPULL_LABEL1 = 1,
PPLABEL_NONE = 0,
PPLABEL_PUSH = 1,
PPLABEL_PULL = 2,
PPLABEL_4 = 4,
PPLABEL_HEAVY = 8,
};
enum PRIORITY {
PRIORITY_0,
};
typedef bool (*PushPull_CallBack)(fopAc_ac_c*, fopAc_ac_c*, s16,
typedef fopAc_ac_c* (*PushPull_CallBack)(fopAc_ac_c*, fopAc_ac_c*, s16,
dBgW_Base::PushPullLabel);
/* 8007E5A8 */ dBgW_Base();
@@ -103,6 +107,8 @@ public:
void SetPriority(PRIORITY priority) { m_priority = priority; }
void onStickWall() { field_0xb |= 1; }
void onStickRoof() { field_0xb |= 2; }
void OnPushPullOk() { m_pushPull_Ok = true; }
void OffPushPullOk() { m_pushPull_Ok = false; }
private:
/* 0x08 */ u8 m_priority;