diff options
| author | Treeki <treeki@gmail.com> | 2012-10-02 00:40:23 +0200 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2012-10-02 00:40:23 +0200 |
| commit | 21d8492ded507f8f09bc28919b8d351b86fa0dd0 (patch) | |
| tree | c1729468fd611f9523e3a2bf492363e34c2fb879 | |
| parent | aa0105c53dc74583831c88761e542f1d1baee463 (diff) | |
| download | kamek-21d8492ded507f8f09bc28919b8d351b86fa0dd0.tar.gz kamek-21d8492ded507f8f09bc28919b8d351b86fa0dd0.zip | |
completed flip block
Diffstat (limited to '')
| -rw-r--r-- | flipblock.yaml | 2 | ||||
| -rw-r--r-- | src/flipblock.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/flipblock.yaml b/flipblock.yaml index 0656091..38b6b7b 100644 --- a/flipblock.yaml +++ b/flipblock.yaml @@ -10,7 +10,7 @@ hooks: addr_pal: 0x8030D518 # -ID- ---- -X Offs- -Y Offs- -RectX1- -RectY1- -RectX2- -RectY2- -1C- -1E- -20- -22- Flag ---- # Orig 02EB 0000 00000000 00000000 00000000 00000000 00000000 00000000 0000 0000 0000 0000 0000 0000 - data: '0299 0000 00000000 00000000 00000000 00000000 00000100 00000100 0000 0000 0000 0000 0000 0000' + data: '0299 0000 00000008 FFFFFFF8 00000000 00000000 00000100 00000100 0000 0000 0000 0000 0000 0000' - name: FlipBlockSpriteFileInfo type: add_func_pointer src_addr_pal: 0x8031B048 diff --git a/src/flipblock.cpp b/src/flipblock.cpp index c521e87..a9db0fa 100644 --- a/src/flipblock.cpp +++ b/src/flipblock.cpp @@ -159,14 +159,14 @@ void daEnFlipBlock_c::executeState_Wait() { void daEnFlipBlock_c::beginState_Flipping() { - flipsRemaining = 5; + flipsRemaining = 7; physics.removeFromList(); } void daEnFlipBlock_c::executeState_Flipping() { if (isGroundPound) - rot.x += 0x200; + rot.x += 0x800; else - rot.x -= 0x200; + rot.x -= 0x800; if (rot.x == 0) { flipsRemaining--; |