diff options
| author | Treeki <treeki@gmail.com> | 2012-11-02 22:44:17 +0100 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2012-11-02 22:44:17 +0100 |
| commit | 38d26dfb0f71a9cdccf657c7ec16d0b224991cc7 (patch) | |
| tree | 402214f2f7e823c68a12a56fba8b03e0c3f82823 | |
| parent | b580f73da297a54f1e6afdbb2e8430f12537c9b0 (diff) | |
| download | kamek-38d26dfb0f71a9cdccf657c7ec16d0b224991cc7.tar.gz kamek-38d26dfb0f71a9cdccf657c7ec16d0b224991cc7.zip | |
failed/unfinished attempt at fixing gabon rock with hammers
| -rw-r--r-- | poweruphax.yaml | 6 | ||||
| -rw-r--r-- | src/poweruphax.S | 30 |
2 files changed, 36 insertions, 0 deletions
diff --git a/poweruphax.yaml b/poweruphax.yaml index 3a521c3..d4a1f1d 100644 --- a/poweruphax.yaml +++ b/poweruphax.yaml @@ -484,6 +484,12 @@ hooks: data: '00000047' +# - name: HammerGabonRock +# type: branch_insn +# src_addr_pal: 0x807F9694 +# target_func: 'HammerGabonRock' + + - name: Icicle diff --git a/src/poweruphax.S b/src/poweruphax.S index 43480c3..a4c7f14 100644 --- a/src/poweruphax.S +++ b/src/poweruphax.S @@ -838,6 +838,36 @@ Wm2dPlayerDrawHS: .extern draw__21dHammerSuitRenderer_cFv .extern draw__21dPlayerModelHandler_cFv + + + +.global HammerGabonRock +HammerGabonRock: + # r27 = apOther + # r28 = apThis + # r29 = objOther + # r31 = objThis + lbz r0, 0x2D(r27) + cmpwi r0, 19 + bne hgrExit + + + + lbz r0, 0xA1(r28) + ori r0, r0, 2 + stb r0, 0xA1(r28) +hgrExit: + lwz r27, 0x2C(r1) + lwz r28, 0x30(r1) + lwz r29, 0x34(r1) + lwz r30, 0x38(r1) + lwz r31, 0x3C(r1) + lwz r0, 0x44(r1) + mtlr r0 + addi r1, r1, 0x40 + blr + + .data PowerupSounds: |