diff options
| -rw-r--r-- | spritetex.yaml | 130 | ||||
| -rw-r--r-- | src/spritetex.S | 1 |
2 files changed, 66 insertions, 65 deletions
diff --git a/spritetex.yaml b/spritetex.yaml index cf0fd47..feeec7c 100644 --- a/spritetex.yaml +++ b/spritetex.yaml @@ -98,18 +98,18 @@ hooks: target_func: 'TEX_Coaster'
-# - name: TEX_Koopa
-# type: branch_insn
-# branch_type: bl
-# src_addr_pal: 0x80A72904
-# target_func: 'TEX_Koopa'
+ - 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_Gabon
+ type: branch_insn
+ branch_type: bl
+ src_addr_pal: 0x80A00284
+ target_func: 'TEX_Gabon'
- name: TEX_Podoboo
@@ -119,11 +119,11 @@ hooks: target_func: 'TEX_Podoboo'
-# - name: TEX_Switch
-# type: branch_insn
-# branch_type: bl
-# src_addr_pal: 0x80A19EC8
-# target_func: 'TEX_Switch'
+ - name: TEX_Switch
+ type: branch_insn
+ branch_type: bl
+ src_addr_pal: 0x80A19EC8
+ target_func: 'TEX_Switch'
- name: TEX_WiggleShroom
@@ -133,18 +133,18 @@ hooks: target_func: 'TEX_WiggleShroom'
-# - name: TEX_Bramball
-# type: branch_insn
-# branch_type: bl
-# src_addr_pal: 0x80A1C844
-# target_func: 'TEX_Bramball'
+ - name: TEX_Bramball
+ type: branch_insn
+ branch_type: bl
+ src_addr_pal: 0x80A1C844
+ target_func: 'TEX_Bramball'
-# - name: TEX_Monty
-# type: branch_insn
-# branch_type: bl
-# src_addr_pal: 0x809D8DB4
-# target_func: 'TEX_Monty'
+ - name: TEX_Monty
+ type: branch_insn
+ branch_type: bl
+ src_addr_pal: 0x809D8DB4
+ target_func: 'TEX_Monty'
# - name: TEX_ChainChomp
@@ -161,18 +161,18 @@ hooks: target_func: 'TEX_Manta'
-# - name: TEX_Parabeetle
-# type: branch_insn
-# branch_type: bl
-# src_addr_pal: 0x80A83254
-# target_func: 'TEX_Parabeetle'
+ - name: TEX_Parabeetle
+ type: branch_insn
+ branch_type: bl
+ src_addr_pal: 0x80A83254
+ target_func: 'TEX_Parabeetle'
-# - name: TEX_Bomb
-# type: branch_insn
-# branch_type: bl
-# src_addr_pal: 0x809C90A4
-# target_func: 'TEX_Bomb'
+ - name: TEX_Bomb
+ type: branch_insn
+ branch_type: bl
+ src_addr_pal: 0x809C90A4
+ target_func: 'TEX_Bomb'
# - name: TEX_CheepA
@@ -210,11 +210,11 @@ hooks: # target_func: 'TEX_Boo'
-# - name: TEX_Midway
-# type: branch_insn
-# branch_type: bl
-# src_addr_pal: 0x807E22C4
-# target_func: 'TEX_Midway'
+ - name: TEX_Midway
+ type: branch_insn
+ branch_type: bl
+ src_addr_pal: 0x807E22C4
+ target_func: 'TEX_Midway'
# - name: TEX_Goal
@@ -224,25 +224,25 @@ hooks: # target_func: 'TEX_Goal'
-# - name: TEX_StretchMush
-# type: branch_insn
-# branch_type: bl
-# src_addr_pal: 0x8084AD10
-# target_func: 'TEX_StretchMush'
+ - name: TEX_StretchMush
+ type: branch_insn
+ branch_type: bl
+ src_addr_pal: 0x8084AD10
+ target_func: 'TEX_StretchMush'
-# - name: TEX_BlockSlide
-# type: branch_insn
-# branch_type: bl
-# src_addr_pal: 0x807E54AC
-# target_func: 'TEX_BlockSlide'
+ - name: TEX_BlockSlide
+ type: branch_insn
+ branch_type: bl
+ src_addr_pal: 0x807E54AC
+ target_func: 'TEX_BlockSlide'
-# - name: TEX_Spinner
-# type: branch_insn
-# branch_type: bl
-# src_addr_pal: 0x8084F9E0
-# target_func: 'TEX_Spinner'
+ - name: TEX_Spinner
+ type: branch_insn
+ branch_type: bl
+ src_addr_pal: 0x8084F9E0
+ target_func: 'TEX_Spinner'
# - name: TEX_Platforms
@@ -252,17 +252,17 @@ hooks: # target_func: 'TEX_Platforms'
-# - name: TEX_PokeyA
-# type: branch_insn
-# branch_type: bl
-# src_addr_pal: 0x80AA1DB0
-# target_func: 'TEX_PokeyA'
+ - name: TEX_PokeyA
+ type: branch_insn
+ branch_type: bl
+ src_addr_pal: 0x80AA1DB0
+ target_func: 'TEX_PokeyA'
-# - name: TEX_PokeyB
-# type: branch_insn
-# branch_type: bl
-# src_addr_pal: 0x80A9F834
-# target_func: 'TEX_PokeyB'
+ - name: TEX_PokeyB
+ type: branch_insn
+ branch_type: bl
+ src_addr_pal: 0x80A9F834
+ target_func: 'TEX_PokeyB'
diff --git a/src/spritetex.S b/src/spritetex.S index fa117eb..d8caf94 100644 --- a/src/spritetex.S +++ b/src/spritetex.S @@ -157,6 +157,7 @@ TEX_Coaster: .global TEX_Koopa
TEX_Koopa:
lwz r5, 4(r29)
+ srwi r5, r5, 24
andi. r5, r5, 0xF b GetTexFilenameForR5
|