diff options
Diffstat (limited to '')
| -rw-r--r-- | spritetex.yaml | 243 | ||||
| -rw-r--r-- | src/spritetex.S | 79 | ||||
| -rwxr-xr-x[-rw-r--r--] | tools/hooks.pyc | bin | 5873 -> 6048 bytes | |||
| -rw-r--r-- | tools/mapfile_tool.pyc | bin | 5880 -> 0 bytes |
4 files changed, 236 insertions, 86 deletions
diff --git a/spritetex.yaml b/spritetex.yaml index aaa2a2d..feeec7c 100644 --- a/spritetex.yaml +++ b/spritetex.yaml @@ -18,120 +18,251 @@ hooks: -# The below was added by Tempus
-
-
+# The below was added by Tempus + + - name: TEX_Goomba
type: branch_insn
branch_type: bl
src_addr_pal: 0x80031384
target_func: 'TEX_Goomba'
-
-
+ + - name: TEX_Barrel
type: branch_insn
branch_type: bl
src_addr_pal: 0x809AB3B4
target_func: 'TEX_Barrel'
-
-
+ + # - 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_Thwomp
# type: branch_insn
# branch_type: bl
# src_addr_pal: 0x809F63F4
# target_func: 'TEX_Thwomp'
-
-
+ + - name: TEX_GiantBuzzy
type: branch_insn
branch_type: bl
src_addr_pal: 0x809B6B44
target_func: 'TEX_GiantBuzzy'
-
-
+ + - name: TEX_Buzzy
type: branch_insn
branch_type: bl
src_addr_pal: 0x80A67834
target_func: 'TEX_Buzzy'
-
-
+ + - name: TEX_SpikeTop
type: branch_insn
branch_type: bl
src_addr_pal: 0x80AB2C34
target_func: 'TEX_SpikeTop'
-
-
+ + - name: TEX_Spiny
type: branch_insn
branch_type: bl
- src_addr_pal: 0x8003DBF8
+ src_addr_pal: 0x80038208
target_func: 'TEX_Spiny'
-
-
+ + - name: TEX_SpringBlock
type: branch_insn
branch_type: bl
src_addr_pal: 0x80AC8640
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: 0x800BC9D8
+ target_func: 'TEX_WiggleShroom'
+ + + - 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_ChainChomp
# type: branch_insn
# branch_type: bl
-# src_addr_pal: 0x80859714
-# target_func: 'TEX_Coaster'
-
-
-# - name: TEX_Koopa
+# src_addr_pal: 0x80ABF934
+# target_func: 'TEX_ChainChomp'
+ + + - name: TEX_Manta
+ type: branch_insn
+ branch_type: bl
+ src_addr_pal: 0x8085DAA8
+ target_func: 'TEX_Manta'
+ + + - 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_CheepA
# type: branch_insn
# branch_type: bl
-# src_addr_pal: 0x80A72904
-# target_func: 'TEX_Koopa'
-
-
-# - name: TEX_Gabon
+# src_addr_pal: 0x80A3B8F8
+# target_func: 'TEX_CheepA'
+ + +# - name: TEX_CheepB
# type: branch_insn
# branch_type: bl
-# src_addr_pal: 0x80A00284
-# target_func: 'TEX_Gabon'
-
-
-# - name: TEX_Podoboo
+# src_addr_pal: 0x80AB2288
+# target_func: 'TEX_CheepB'
+ + +# - name: TEX_CheepC
# type: branch_insn
# branch_type: bl
-# src_addr_pal: 0x809D0CC0
-# target_func: 'TEX_Podoboo'
-
-
-# - name: TEX_Switch
+# src_addr_pal: 0x80A8A008
+# target_func: 'TEX_CheepC'
+ + +# - name: TEX_CheepChomp
# type: branch_insn
# branch_type: bl
-# src_addr_pal: 0x80A19EC8
-# target_func: 'TEX_Switch'
-
-
- - name: TEX_WiggleShroom
+# src_addr_pal: 0x809A67F4
+# target_func: 'TEX_CheepChomp'
+ + +# - name: TEX_Boo
+# type: branch_insn
+# branch_type: bl
+# src_addr_pal: 0x80AAF5E0
+# target_func: 'TEX_Boo'
+ + + - name: TEX_Midway
type: branch_insn
branch_type: bl
- src_addr_pal: 0x800BC9D8
- target_func: 'TEX_WiggleShroom'
-
-
-
-
+ src_addr_pal: 0x807E22C4
+ target_func: 'TEX_Midway'
+ + +# - name: TEX_Goal
+# type: branch_insn
+# branch_type: bl
+# src_addr_pal: 0x80A0A0E8
+# target_func: 'TEX_Goal'
+ + + - 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_Spinner
+ type: branch_insn
+ branch_type: bl
+ src_addr_pal: 0x8084F9E0
+ target_func: 'TEX_Spinner'
+ + +# - name: TEX_Platforms
+# type: branch_insn
+# branch_type: bl
+# src_addr_pal: 0x800C03A0
+# target_func: 'TEX_Platforms'
+ + + - 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'
+ + diff --git a/src/spritetex.S b/src/spritetex.S index 723fcb5..504cf5f 100644 --- a/src/spritetex.S +++ b/src/spritetex.S @@ -92,7 +92,7 @@ TEX_Blooper: .global TEX_BigBlock
TEX_BigBlock:
- lwz r5, 4(r30)
+ lwz r5, 4(r28)
srwi r5, r5, 24
andi. r5, r5, 0xF
b GetTexFilenameForR5
@@ -100,7 +100,7 @@ TEX_BigBlock: .global TEX_Thwomp
TEX_Thwomp:
- lwz r5, 4(r30)
+ lwz r5, 4(r29)
srwi r5, r5, 24
andi. r5, r5, 0xF
b GetTexFilenameForR5
@@ -108,7 +108,7 @@ TEX_Thwomp: .global TEX_GiantBuzzy
TEX_GiantBuzzy:
- lwz r5, 4(r30)
+ lwz r5, 4(r29)
srwi r5, r5, 24
andi. r5, r5, 0xF
b GetTexFilenameForR5
@@ -116,7 +116,7 @@ TEX_GiantBuzzy: .global TEX_Buzzy
TEX_Buzzy:
- lwz r5, 4(r30)
+ lwz r5, 4(r29)
srwi r5, r5, 24
andi. r5, r5, 0xF
b GetTexFilenameForR5
@@ -124,7 +124,7 @@ TEX_Buzzy: .global TEX_SpikeTop
TEX_SpikeTop:
- lwz r5, 4(r30)
+ lwz r5, 4(r29)
srwi r5, r5, 24
andi. r5, r5, 0xF
b GetTexFilenameForR5
@@ -132,7 +132,7 @@ TEX_SpikeTop: .global TEX_Spiny
TEX_Spiny:
- lwz r5, 4(r31)
+ lwz r5, 4(r27)
srwi r5, r5, 24
andi. r5, r5, 0xF
b GetTexFilenameForR5
@@ -140,7 +140,7 @@ TEX_Spiny: .global TEX_SpringBlock
TEX_SpringBlock:
- lwz r5, 4(r31)
+ lwz r5, 4(r30)
srwi r5, r5, 24
andi. r5, r5, 0xF
b GetTexFilenameForR5
@@ -148,7 +148,7 @@ TEX_SpringBlock: .global TEX_Coaster
TEX_Coaster:
- lwz r5, 4(r5)
+ lwz r5, 4(r31)
srwi r5, r5, 24
andi. r5, r5, 0xF
b GetTexFilenameForR5
@@ -156,14 +156,20 @@ TEX_Coaster: .global TEX_Koopa
TEX_Koopa:
+<<<<<<< HEAD + lwz r5, 4(r29)
+ srwi r5, r5, 24
+ andi. r5, r5, 0xF +======= lwz r5, 4(r30)
andi. r5, r5, 0xF
+>>>>>>> 6e93a3612c2d4ce6e11ab53d2490eb30c0e262bf b GetTexFilenameForR5
.global TEX_Gabon
TEX_Gabon:
- lwz r5, 4(r30)
+ lwz r5, 4(r29)
srwi r5, r5, 24
andi. r5, r5, 0xF
b GetTexFilenameForR5
@@ -171,7 +177,7 @@ TEX_Gabon: .global TEX_Podoboo
TEX_Podoboo:
- lwz r5, 4(r27)
+ lwz r5, 4(r31)
srwi r5, r5, 24
andi. r5, r5, 0xF
b GetTexFilenameForR5
@@ -179,7 +185,7 @@ TEX_Podoboo: .global TEX_Switch
TEX_Switch:
- lwz r5, 4(r30)
+ lwz r5, 4(r29)
srwi r5, r5, 16
andi. r5, r5, 0xF
b GetTexFilenameForR5
@@ -187,7 +193,8 @@ TEX_Switch: .global TEX_WiggleShroom
TEX_WiggleShroom:
- lwz r5, 4(r31)
+ lwz r5, 4(r30)
+ # This could be r29, or r28 srwi r5, r5, 24
andi. r5, r5, 0xF
b GetTexFilenameForR5
@@ -195,7 +202,7 @@ TEX_WiggleShroom: .global TEX_Bramball
TEX_Bramball:
- lwz r5, 4(r30)
+ lwz r5, 4(r29)
srwi r5, r5, 24
andi. r5, r5, 0xF
b GetTexFilenameForR5
@@ -203,7 +210,7 @@ TEX_Bramball: .global TEX_Monty
TEX_Monty:
- lwz r5, 4(r30)
+ lwz r5, 4(r29)
srwi r5, r5, 24
andi. r5, r5, 0xF
b GetTexFilenameForR5
@@ -211,7 +218,7 @@ TEX_Monty: .global TEX_ChainChomp
TEX_ChainChomp:
- lwz r5, 4(r30)
+ lwz r5, 4(r29)
srwi r5, r5, 24
andi. r5, r5, 0xF
b GetTexFilenameForR5
@@ -219,7 +226,7 @@ TEX_ChainChomp: .global TEX_Manta
TEX_Manta:
- lwz r5, 4(r29)
+ lwz r5, 4(r28)
srwi r5, r5, 24
andi. r5, r5, 0xF
b GetTexFilenameForR5
@@ -227,7 +234,7 @@ TEX_Manta: .global TEX_Parabeetle
TEX_Parabeetle:
- lwz r5, 4(r31)
+ lwz r5, 4(r29)
srwi r5, r5, 24
andi. r5, r5, 0xF
b GetTexFilenameForR5
@@ -235,7 +242,7 @@ TEX_Parabeetle: .global TEX_Bomb
TEX_Bomb:
- lwz r5, 4(r30)
+ lwz r5, 4(r29)
srwi r5, r5, 24
andi. r5, r5, 0xF
b GetTexFilenameForR5
@@ -243,7 +250,7 @@ TEX_Bomb: .global TEX_CheepA
TEX_CheepA:
- lwz r5, 4(r28)
+ lwz r5, 4(r27)
srwi r5, r5, 20
andi. r5, r5, 0xF
b GetTexFilenameForR5
@@ -251,7 +258,7 @@ TEX_CheepA: .global TEX_CheepB
TEX_CheepB:
- lwz r5, 4(r29)
+ lwz r5, 4(r28)
srwi r5, r5, 20
andi. r5, r5, 0xF
b GetTexFilenameForR5
@@ -259,7 +266,7 @@ TEX_CheepB: .global TEX_CheepC
TEX_CheepC:
- lwz r5, 4(r29)
+ lwz r5, 4(r28)
srwi r5, r5, 20
andi. r5, r5, 0xF
b GetTexFilenameForR5
@@ -267,7 +274,7 @@ TEX_CheepC: .global TEX_CheepChomp
TEX_CheepChomp:
- lwz r5, 4(r31)
+ lwz r5, 4(r29)
srwi r5, r5, 24
andi. r5, r5, 0xF
b GetTexFilenameForR5
@@ -275,7 +282,7 @@ TEX_CheepChomp: .global TEX_Boo
TEX_Boo:
- lwz r5, 4(r28)
+ lwz r5, 4(r27)
srwi r5, r5, 24
andi. r5, r5, 0xF
b GetTexFilenameForR5
@@ -283,15 +290,19 @@ TEX_Boo: .global TEX_Midway
TEX_Midway:
- lwz r5, 4(r30)
+ lwz r5, 4(r29)
srwi r5, r5, 24
+<<<<<<< HEAD + andi. r5, r5, 0xFF +======= andi. r5, r5, 0xF
+>>>>>>> 6e93a3612c2d4ce6e11ab53d2490eb30c0e262bf b GetTexFilenameForR5
.global TEX_Goal
TEX_Goal:
- lwz r5, 4(r31)
+ lwz r5, 4(r30)
srwi r5, r5, 24
andi. r5, r5, 0xF
b GetTexFilenameForR5
@@ -299,7 +310,15 @@ TEX_Goal: .global TEX_StretchMush
TEX_StretchMush:
- lwz r5, 4(r31)
+ lwz r5, 4(r30)
+ srwi r5, r5, 24
+ andi. r5, r5, 0xF + b GetTexFilenameForR5
+ + +.global TEX_BlockSlide
+TEX_BlockSlide:
+ lwz r5, 4(r28)
srwi r5, r5, 24
andi. r5, r5, 0xF
b GetTexFilenameForR5
@@ -307,7 +326,7 @@ TEX_StretchMush: .global TEX_Spinner
TEX_Spinner:
- lwz r5, 4(r31)
+ lwz r5, 4(r30)
srwi r5, r5, 24
andi. r5, r5, 0xF
b GetTexFilenameForR5
@@ -315,7 +334,7 @@ TEX_Spinner: .global TEX_Platforms
TEX_Platforms:
- lwz r5, 4(r31)
+ lwz r5, 4(r29)
srwi r5, r5, 4
andi. r5, r5, 0xF
b GetTexFilenameForR5
@@ -323,7 +342,7 @@ TEX_Platforms: .global TEX_PokeyA
TEX_PokeyA:
- lwz r5, 4(r31)
+ lwz r5, 4(r30)
srwi r5, r5, 24
andi. r5, r5, 0xF
b GetTexFilenameForR5
@@ -331,7 +350,7 @@ TEX_PokeyA: .global TEX_PokeyB
TEX_PokeyB:
- lwz r5, 4(r31)
+ lwz r5, 4(r29)
srwi r5, r5, 24
andi. r5, r5, 0xF
b GetTexFilenameForR5
diff --git a/tools/hooks.pyc b/tools/hooks.pyc Binary files differindex e345d54..f83e366 100644..100755 --- a/tools/hooks.pyc +++ b/tools/hooks.pyc diff --git a/tools/mapfile_tool.pyc b/tools/mapfile_tool.pyc Binary files differdeleted file mode 100644 index 0bd4c39..0000000 --- a/tools/mapfile_tool.pyc +++ /dev/null |