summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeki <treeki@gmail.com>2012-08-25 03:20:03 +0200
committerTreeki <treeki@gmail.com>2012-08-25 03:20:03 +0200
commitf65f7b8050e2922900dcbebada6ca5ee875873f7 (patch)
tree7adc3ffcec8822d93ed15764e96e0fb50f7ca15c
parent3a11a06438d1f13d5c260e1083e70c144cff0463 (diff)
downloadkamek-f65f7b8050e2922900dcbebada6ca5ee875873f7.tar.gz
kamek-f65f7b8050e2922900dcbebada6ca5ee875873f7.zip
made hammers use a separate model/arc
-rw-r--r--poweruphax.yaml5
-rw-r--r--src/poweruphax.S2
2 files changed, 6 insertions, 1 deletions
diff --git a/poweruphax.yaml b/poweruphax.yaml
index 5992453..08c000b 100644
--- a/poweruphax.yaml
+++ b/poweruphax.yaml
@@ -134,6 +134,11 @@ hooks:
type: add_func_pointer
src_addr_pal: 0x8098C488
target_func: 'BrosArcFileName'
+
+ - name: LoadHammerFromHammerMArc
+ type: patch
+ addr_pal: 0x8095CDD4
+ data: '68616D6D65724D00' # "hammerM\0"
- name: AlwaysLoadBrosArc
type: add_func_pointer
diff --git a/src/poweruphax.S b/src/poweruphax.S
index 1d849c1..899b5e4 100644
--- a/src/poweruphax.S
+++ b/src/poweruphax.S
@@ -718,7 +718,7 @@ ToadTextures:
.global BrosArcFileName
BrosArcFileName:
- .string "bros"
+ .string "hammerM"
.global I_hammerArcFilename
I_hammerArcFilename: