diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2024-07-12 23:24:50 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-13 09:24:50 +0300 |
| commit | ca1ece683b3eae1a9dcf4fe9ba971d2eb82b64ae (patch) | |
| tree | 1239ea38a08ba8760bb1c9f5cbf718bef6f03085 /include/d/a | |
| parent | 89e14f9f9744cd2b47fe8dd28ee4fffafba0b716 (diff) | |
Lv5key / Iceblock done (#2177)
* obj_lv5key
* obj_iceblock done
* remove asm
Diffstat (limited to 'include/d/a')
| -rw-r--r-- | include/d/a/d_a_alink.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/d/a/d_a_alink.h b/include/d/a/d_a_alink.h index 5087638ad4..a409cb4df3 100644 --- a/include/d/a/d_a_alink.h +++ b/include/d/a/d_a_alink.h @@ -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); } |