summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeki <treeki@gmail.com>2012-12-02 01:52:08 +0100
committerTreeki <treeki@gmail.com>2012-12-02 01:52:08 +0100
commit25bb4867ecfde3ec489b891b182cc0fdd2711ad3 (patch)
treedad91743bd59432bbacbf96fbb18380f5cd69e70
parent834fa727b32302a8580690c8aa94507b03223189 (diff)
downloadkamek-25bb4867ecfde3ec489b891b182cc0fdd2711ad3.tar.gz
kamek-25bb4867ecfde3ec489b891b182cc0fdd2711ad3.zip
finally fixed the chest shits
-rw-r--r--poweruphax.yaml5
-rw-r--r--src/poweruphax.S3
2 files changed, 7 insertions, 1 deletions
diff --git a/poweruphax.yaml b/poweruphax.yaml
index 12060d1..eed8785 100644
--- a/poweruphax.yaml
+++ b/poweruphax.yaml
@@ -740,3 +740,8 @@ hooks:
type: nop_insn
area_pal: [0x807B9F74,0x807B9F88]
+ - name: NoBattleFanfare
+ type: patch
+ addr_pal: 0x8019C290
+ data: '4E800020'
+
diff --git a/src/poweruphax.S b/src/poweruphax.S
index 16576c1..49babc5 100644
--- a/src/poweruphax.S
+++ b/src/poweruphax.S
@@ -1028,7 +1028,8 @@ StrongboxGiveBattleItem:
stfs f1, 0x18(r1)
li r3, 0x25
- or r4, r4, r7
+ slwi r4, r31, 4
+ or r4, r4, r29
addi r5, r1, 0x10
li r6, 0
li r7, 0