From 4ed69ffe0b65f47a10c5a0a84ec74ead05b65f69 Mon Sep 17 00:00:00 2001 From: Colin Noga Date: Sat, 9 Apr 2011 18:39:38 -0400 Subject: Additions/fixes to sprite retextures --- spritetex.yaml | 40 ++++++++++++++++++++-------------------- src/spritetex.S | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/spritetex.yaml b/spritetex.yaml index 89e6ae1..cf0fd47 100644 --- a/spritetex.yaml +++ b/spritetex.yaml @@ -84,18 +84,18 @@ hooks: target_func: 'TEX_Spiny' -# - name: TEX_SpringBlock -# type: branch_insn -# branch_type: bl -# src_addr_pal: 0x80AC8640 -# target_func: 'TEX_SpringBlock' + - name: TEX_SpringBlock + type: branch_insn + branch_type: bl + src_addr_pal: 0x80AC8640 + target_func: 'TEX_SpringBlock' -# - name: TEX_Coaster -# type: branch_insn -# branch_type: bl -# src_addr_pal: 0x80859714 -# target_func: 'TEX_Coaster' + - name: TEX_Coaster + type: branch_insn + branch_type: bl + src_addr_pal: 0x80859714 + target_func: 'TEX_Coaster' # - name: TEX_Koopa @@ -112,11 +112,11 @@ hooks: # target_func: 'TEX_Gabon' -# - name: TEX_Podoboo -# type: branch_insn -# branch_type: bl -# src_addr_pal: 0x809D0CC0 -# target_func: 'TEX_Podoboo' + - name: TEX_Podoboo + type: branch_insn + branch_type: bl + src_addr_pal: 0x809D0CC0 + target_func: 'TEX_Podoboo' # - name: TEX_Switch @@ -154,11 +154,11 @@ hooks: # target_func: 'TEX_ChainChomp' -# - name: TEX_Manta -# type: branch_insn -# branch_type: bl -# src_addr_pal: 0x8085DAA8 -# target_func: 'TEX_Manta' + - name: TEX_Manta + type: branch_insn + branch_type: bl + src_addr_pal: 0x8085DAA8 + target_func: 'TEX_Manta' # - name: TEX_Parabeetle diff --git a/src/spritetex.S b/src/spritetex.S index ebc22f1..fa117eb 100644 --- a/src/spritetex.S +++ b/src/spritetex.S @@ -286,7 +286,7 @@ TEX_Boo: TEX_Midway: lwz r5, 4(r29) srwi r5, r5, 24 - andi. r5, r5, 0xF + andi. r5, r5, 0xFF b GetTexFilenameForR5 -- cgit v1.2.3