encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07: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-13 09:24:50 +03: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/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;