From 17401978c44e6efbe27d9676d045bec266bbd6a9 Mon Sep 17 00:00:00 2001 From: Treeki Date: Fri, 22 Feb 2013 00:18:50 +0100 Subject: fix using a mushroom from stock item when you have a hammer suit --- poweruphax.yaml | 6 ++++++ src/poweruphax.S | 6 ++++++ 2 files changed, 12 insertions(+) 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 -- cgit v1.2.3