diff options
| author | Treeki <treeki@gmail.com> | 2013-02-22 00:18:50 +0100 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2013-02-22 00:18:50 +0100 |
| commit | 17401978c44e6efbe27d9676d045bec266bbd6a9 (patch) | |
| tree | 266ce64e185fe26042006a38dfabf02bbd7383d6 | |
| parent | be4cb117959484a37de3613a484988445c9a3d86 (diff) | |
| download | kamek-17401978c44e6efbe27d9676d045bec266bbd6a9.tar.gz kamek-17401978c44e6efbe27d9676d045bec266bbd6a9.zip | |
fix using a mushroom from stock item when you have a hammer suit
Diffstat (limited to '')
| -rw-r--r-- | poweruphax.yaml | 6 | ||||
| -rw-r--r-- | src/poweruphax.S | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/poweruphax.yaml b/poweruphax.yaml index 07ad22f..24d3115 100644 --- a/poweruphax.yaml +++ b/poweruphax.yaml @@ -930,6 +930,12 @@ hooks: src_addr_pal: 0x800FC9B4 target_func: 'UpdateCalcPowerupResult' + - name: FixCalcPowerupResultForMushroom + type: branch_insn + branch_type: b + src_addr_pal: 0x800FC9E8 + target_func: 'FixCalcPowerupResultForMushroom' + # THE WONDERS OF STOCK ITEM SHADOW # Current size: 0x280 # New size: 0x290 diff --git a/src/poweruphax.S b/src/poweruphax.S index e2517e7..2779906 100644 --- a/src/poweruphax.S +++ b/src/poweruphax.S @@ -1335,6 +1335,12 @@ UpdateCalcPowerupResult: cprIsDone: b ContinueFromCalcPowerupResult +.global FixCalcPowerupResultForMushroom +.extern ContinueFromFixCalcPowerupResultForMushroom +FixCalcPowerupResultForMushroom: + stb r0, 0xF(r1) + li r6, 1 + b ContinueFromFixCalcPowerupResultForMushroom |