diff options
| author | Treeki <treeki@gmail.com> | 2011-06-17 04:14:18 +0200 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2011-06-17 04:14:18 +0200 |
| commit | 6e72f2c302a4ff0658afb29d9b7799768ca4baf6 (patch) | |
| tree | 27c23aba3b2693a0d3f9c730d6267fefbd06468c /src/spritetex.S | |
| parent | e74f7b687c4d4196979933d73aaf54747fd0de85 (diff) | |
| download | kamek-6e72f2c302a4ff0658afb29d9b7799768ca4baf6.tar.gz kamek-6e72f2c302a4ff0658afb29d9b7799768ca4baf6.zip | |
merged Tempus's changes into the master branch
Diffstat (limited to 'src/spritetex.S')
| -rw-r--r-- | src/spritetex.S | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/spritetex.S b/src/spritetex.S index 0f89cd5..0336a5c 100644 --- a/src/spritetex.S +++ b/src/spritetex.S @@ -80,6 +80,14 @@ TEX_Goomba: srwi r5, r5, 24
andi. r5, r5, 0xF
b GetTexFilenameForR5
+ + +.global TEX_BigGoomba
+TEX_BigGoomba:
+ lwz r5, 4(r30)
+ srwi r5, r5, 24
+ andi. r5, r5, 0xF
+ b GetTexFilenameForR5
.global TEX_Barrel
@@ -171,7 +179,7 @@ TEX_SpringBlock: .global TEX_Coaster
TEX_Coaster:
- lwz r5, 4(r31)
+ lwz r5, 4(r3)
srwi r5, r5, 24
andi. r5, r5, 0xF
b GetTexFilenameForR5
@@ -395,8 +403,13 @@ TEX_PokeyB: srwi r5, r5, 24
andi. r5, r5, 0xF
b GetTexFilenameForR5
+ -
+.global TEX_PokeyC
+TEX_PokeyC:
+ lwz r5, 4(r30) + or r5, r5, r31
+ blr
|