summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Noga <Tempus@Spectrum-Song.local>2011-04-06 22:27:10 -0400
committerColin Noga <Tempus@Spectrum-Song.local>2011-04-06 22:27:10 -0400
commit07c96a42df9bd2ab711cf42f389a3b61147b1f63 (patch)
treedb3bea288affe3f1aa9d6cc04a6ee4fc2b48f335
parentbc6353dd5424fa5ec8a4592fc89512f89036665d (diff)
downloadkamek-07c96a42df9bd2ab711cf42f389a3b61147b1f63.tar.gz
kamek-07c96a42df9bd2ab711cf42f389a3b61147b1f63.zip
Moar sprites: commented out ones without arcs
-rw-r--r--spritetex.s41
-rw-r--r--spritetex.yaml73
2 files changed, 96 insertions, 18 deletions
diff --git a/spritetex.s b/spritetex.s
index fc66898..e5164de 100644
--- a/spritetex.s
+++ b/spritetex.s
@@ -142,3 +142,44 @@ TEX_Coaster:
srwi %r5, %r5, 24
andi. r5, r5, 0xF
b GetTexFilenameForR5
+
+
+.global TEX_Koopa
+TEX_Koopa:
+ lwz %r5, 4(%r30)
+ andi. r5, r5, 0xF
+ b GetTexFilenameForR5
+
+
+.global TEX_Gabon
+TEX_Gabon:
+ lwz %r5, 4(%r30)
+ srwi %r5, %r5, 24
+ andi. r5, r5, 0xF
+ b GetTexFilenameForR5
+
+
+.global TEX_Podoboo
+TEX_Podoboo:
+ lwz %r5, 4(%r27)
+ srwi %r5, %r5, 24
+ andi. r5, r5, 0xF
+ b GetTexFilenameForR5
+
+
+.global TEX_Switch
+TEX_Switch:
+ lwz %r5, 4(%r30)
+ srwi %r5, %r5, 16
+ andi. r5, r5, 0xF
+ b GetTexFilenameForR5
+
+
+.global TEX_WiggleShroom
+TEX_WiggleShroom:
+ lwz %r5, 4(%r31)
+ srwi %r5, %r5, 24
+ andi. r5, r5, 0xF
+ b GetTexFilenameForR5
+
+
diff --git a/spritetex.yaml b/spritetex.yaml
index af0c077..2403dac 100644
--- a/spritetex.yaml
+++ b/spritetex.yaml
@@ -35,25 +35,25 @@ hooks:
target_func: 'TEX_Barrel'
- - name: TEX_Blooper
- type: branch_insn
- branch_type: bl
- src_addr_pal: 0x80A0451C
- target_func: 'TEX_Blooper'
+# - name: TEX_Blooper
+# type: branch_insn
+# branch_type: bl
+# src_addr_pal: 0x80A0451C
+# target_func: 'TEX_Blooper'
- - name: TEX_BigBlock
- type: branch_insn
- branch_type: bl
- src_addr_pal: 0x809B8DB8
- target_func: 'TEX_BigBlock'
+# - name: TEX_BigBlock
+# type: branch_insn
+# branch_type: bl
+# src_addr_pal: 0x809B8DB8
+# target_func: 'TEX_BigBlock'
- - name: TEX_Thwomp
- type: branch_insn
- branch_type: bl
- src_addr_pal: 0x809F63F4
- target_func: 'TEX_Thwomp'
+# - name: TEX_Thwomp
+# type: branch_insn
+# branch_type: bl
+# src_addr_pal: 0x809F63F4
+# target_func: 'TEX_Thwomp'
- name: TEX_GiantBuzzy
@@ -91,10 +91,47 @@ hooks:
target_func: 'TEX_SpringBlock'
- - name: TEX_Coaster
+# - name: TEX_Coaster
+# type: branch_insn
+# branch_type: bl
+# src_addr_pal: 0x80859714
+# target_func: 'TEX_Coaster'
+
+
+# - name: TEX_Koopa
+# type: branch_insn
+# branch_type: bl
+# src_addr_pal: 0x80A72904
+# target_func: 'TEX_Koopa'
+
+
+# - name: TEX_Gabon
+# type: branch_insn
+# branch_type: bl
+# src_addr_pal: 0x80A00284
+# target_func: 'TEX_Gabon'
+
+
+# - name: TEX_Podoboo
+# type: branch_insn
+# branch_type: bl
+# src_addr_pal: 0x809D0CC0
+# target_func: 'TEX_Podoboo'
+
+
+# - name: TEX_Switch
+# type: branch_insn
+# branch_type: bl
+# src_addr_pal: 0x80A19EC8
+# target_func: 'TEX_Switch'
+
+
+ - name: TEX_WiggleShroom
type: branch_insn
branch_type: bl
- src_addr_pal: 0x80859714
- target_func: 'TEX_Coaster'
+ src_addr_pal: 800BC9D8
+ target_func: 'TEX_WiggleShroom'
+
+