summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTreeki <treeki@gmail.com>2013-02-22 00:18:50 +0100
committerTreeki <treeki@gmail.com>2013-02-22 00:18:50 +0100
commit17401978c44e6efbe27d9676d045bec266bbd6a9 (patch)
tree266ce64e185fe26042006a38dfabf02bbd7383d6 /src
parentbe4cb117959484a37de3613a484988445c9a3d86 (diff)
downloadkamek-17401978c44e6efbe27d9676d045bec266bbd6a9.tar.gz
kamek-17401978c44e6efbe27d9676d045bec266bbd6a9.zip
fix using a mushroom from stock item when you have a hammer suit
Diffstat (limited to 'src')
-rw-r--r--src/poweruphax.S6
1 files changed, 6 insertions, 0 deletions
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