summaryrefslogtreecommitdiff
path: root/src/spritetex.S
diff options
context:
space:
mode:
authorTreeki <treeki@gmail.com>2012-02-05 20:39:00 +0100
committerTreeki <treeki@gmail.com>2012-02-05 20:39:00 +0100
commit9bc3404ab2404ac77a213ba678e88de8c27973e9 (patch)
tree6ff0bb976fe628ea0f10eefec6f76da05e17df32 /src/spritetex.S
parent155c87d40aa4854056836c0fefc5f50d3a4bd024 (diff)
downloadkamek-9bc3404ab2404ac77a213ba678e88de8c27973e9.tar.gz
kamek-9bc3404ab2404ac77a213ba678e88de8c27973e9.zip
shaved a ton of redundant code off spritetex.S, hopefully didn't break anything
Diffstat (limited to '')
-rwxr-xr-xsrc/spritetex.S341
1 files changed, 69 insertions, 272 deletions
diff --git a/src/spritetex.S b/src/spritetex.S
index 2bfd165..2af1743 100755
--- a/src/spritetex.S
+++ b/src/spritetex.S
@@ -198,38 +198,36 @@ TEX_Bush:
.global TEX_Goomba
TEX_Goomba:
+.global TEX_BuzzyShell
+TEX_BuzzyShell:
+.global TEX_SpinyShell
+TEX_SpinyShell:
+.global TEX_Coaster
+TEX_Coaster:
lwz r5, 4(r3)
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
-TEX_Barrel:
- lwz r5, 4(r30)
- srwi r5, r5, 24
- andi. r5, r5, 0xF
- b GetTexFilenameForR5
-
-
-.global TEX_Blooper
-TEX_Blooper:
- lwz r5, 4(r30)
+.global TEX_BigBoo
+TEX_BigBoo:
+ lwz r5, 4(r27)
srwi r5, r5, 24
andi. r5, r5, 0xF
b GetTexFilenameForR5
+.global TEX_GabonRock
+TEX_GabonRock:
.global TEX_BigBlock
TEX_BigBlock:
+.global TEX_Manta
+TEX_Manta:
+.global TEX_BlockSlide
+TEX_BlockSlide:
+.global TEX_CloudBounce
+TEX_CloudBounce:
lwz r5, 4(r28)
srwi r5, r5, 24
andi. r5, r5, 0xF
@@ -238,112 +236,91 @@ TEX_BigBlock:
.global TEX_Thwomp
TEX_Thwomp:
- lwz r5, 4(r29)
- srwi r5, r5, 24
- andi. r5, r5, 0xF
- b GetTexFilenameForR5
-
-
.global TEX_GiantBuzzy
TEX_GiantBuzzy:
- lwz r5, 4(r29)
- srwi r5, r5, 24
- andi. r5, r5, 0xF
- b GetTexFilenameForR5
-
-
.global TEX_Buzzy
TEX_Buzzy:
- lwz r5, 4(r29)
- srwi r5, r5, 24
- andi. r5, r5, 0xF
- b GetTexFilenameForR5
-
-.global TEX_BuzzyShell
-TEX_BuzzyShell:
- lwz r5, 4(r3)
- srwi r5, r5, 24
- andi. r5, r5, 0xF
- b GetTexFilenameForR5
-
-
.global TEX_SpikeTop
TEX_SpikeTop:
+.global TEX_Koopa
+TEX_Koopa:
+.global TEX_Gabon
+TEX_Gabon:
+.global TEX_Bramball
+TEX_Bramball:
+.global TEX_Monty
+TEX_Monty:
+.global TEX_ChainChomp
+TEX_ChainChomp:
+.global TEX_Parabeetle
+TEX_Parabeetle:
+.global TEX_Bomb
+TEX_Bomb:
+.global TEX_ParaBomb
+TEX_ParaBomb:
+.global TEX_CheepChomp
+TEX_CheepChomp:
+.global TEX_PokeyB
+TEX_PokeyB:
+.global TEX_Huckit
+TEX_Huckit:
lwz r5, 4(r29)
srwi r5, r5, 24
andi. r5, r5, 0xF
b GetTexFilenameForR5
+.global TEX_BigGoomba
+TEX_BigGoomba:
+.global TEX_Barrel
+TEX_Barrel:
+.global TEX_Blooper
+TEX_Blooper:
.global TEX_Spiny
TEX_Spiny:
- lwz r5, 4(r30)
- srwi r5, r5, 24
- andi. r5, r5, 0xF
- b GetTexFilenameForR5
-
-
-.global TEX_SpinyShell
-TEX_SpinyShell:
- lwz r5, 4(r3)
- srwi r5, r5, 24
- andi. r5, r5, 0xF
- b GetTexFilenameForR5
-
-
.global TEX_SpringBlock
TEX_SpringBlock:
+.global TEX_Boo
+TEX_Boo:
+.global TEX_Goal
+TEX_Goal:
+.global TEX_StretchMush
+TEX_StretchMush:
+.global TEX_Spinner
+TEX_Spinner:
+.global TEX_AirshipGear
+TEX_AirshipGear:
+.global TEX_BigShell
+TEX_BigShell:
+.global TEX_PokeyA
+TEX_PokeyA:
+.global TEX_SpikeBall
+TEX_SpikeBall:
+.global TEX_HuckitBalls
+TEX_HuckitBalls:
+.global HammerColour
+HammerColour:
lwz r5, 4(r30)
srwi r5, r5, 24
andi. r5, r5, 0xF
b GetTexFilenameForR5
-.global TEX_Coaster
-TEX_Coaster:
- lwz r5, 4(r3)
- srwi r5, r5, 24
- andi. r5, r5, 0xF
- b GetTexFilenameForR5
-
-
-.global TEX_Koopa
-TEX_Koopa:
- lwz r5, 4(r29)
+.global TEX_Podoboo
+TEX_Podoboo:
+ lwz r5, 4(r31)
srwi r5, r5, 24
andi. r5, r5, 0xF
b GetTexFilenameForR5
-.global TEX_Gabon
-TEX_Gabon:
- lwz r5, 4(r29)
- srwi r5, r5, 24
- andi. r5, r5, 0xF
- b GetTexFilenameForR5
-
+# All these vary
.global TEX_Gabon_Spike
TEX_Gabon_Spike:
andis. r4, r4, 0xFFF0
blr
-.global TEX_GabonRock
-TEX_GabonRock:
- lwz r5, 4(r28)
- srwi r5, r5, 24
- andi. r5, r5, 0xF
- b GetTexFilenameForR5
-
-
-.global TEX_Podoboo
-TEX_Podoboo:
- lwz r5, 4(r31)
- srwi r5, r5, 24
- andi. r5, r5, 0xF
- b GetTexFilenameForR5
-
-
.global TEX_Switch
TEX_Switch:
lwz r5, 4(r29)
@@ -372,36 +349,6 @@ TEX_WiggleShroom:
b GetTexFilenameForR5
-.global TEX_Bramball
-TEX_Bramball:
- lwz r5, 4(r29)
- srwi r5, r5, 24
- andi. r5, r5, 0xF
- b GetTexFilenameForR5
-
-
-.global TEX_Monty
-TEX_Monty:
- lwz r5, 4(r29)
- srwi r5, r5, 24
- andi. r5, r5, 0xF
- b GetTexFilenameForR5
-
-
-.global TEX_ChainChomp
-TEX_ChainChomp:
- lwz r5, 4(r29)
- srwi r5, r5, 24
- andi. r5, r5, 0xF
- b GetTexFilenameForR5
-
-
-.global TEX_Manta
-TEX_Manta:
- lwz r5, 4(r28)
- srwi r5, r5, 24
- andi. r5, r5, 0xF
- b GetTexFilenameForR5
.global TEX_MantaInherit
TEX_MantaInherit:
@@ -413,29 +360,6 @@ TEX_MantaInherit:
blr
-.global TEX_Parabeetle
-TEX_Parabeetle:
- lwz r5, 4(r29)
- srwi r5, r5, 24
- andi. r5, r5, 0xF
- b GetTexFilenameForR5
-
-
-.global TEX_Bomb
-TEX_Bomb:
- lwz r5, 4(r29)
- srwi r5, r5, 24
- andi. r5, r5, 0xF
- b GetTexFilenameForR5
-
-
-.global TEX_ParaBomb
-TEX_ParaBomb:
- lwz r5, 4(r29)
- srwi r5, r5, 24
- andi. r5, r5, 0xF
- b GetTexFilenameForR5
-
.global TEX_CheepA
TEX_CheepA:
@@ -461,28 +385,6 @@ TEX_CheepC:
b GetTexFilenameForR5
-.global TEX_CheepChomp
-TEX_CheepChomp:
- lwz r5, 4(r29)
- srwi r5, r5, 24
- andi. r5, r5, 0xF
- b GetTexFilenameForR5
-
-
-.global TEX_BigBoo
-TEX_BigBoo:
- lwz r5, 4(r27)
- srwi r5, r5, 24
- andi. r5, r5, 0xF
- b GetTexFilenameForR5
-
-.global TEX_Boo
-TEX_Boo:
- lwz r5, 4(r30)
- srwi r5, r5, 24
- andi. r5, r5, 0xF
- b GetTexFilenameForR5
-
.global TEX_Midway
TEX_Midway:
lwz r5, 4(r29)
@@ -491,53 +393,6 @@ TEX_Midway:
b GetTexFilenameForR5
-.global TEX_Goal
-TEX_Goal:
- lwz r5, 4(r30)
- srwi r5, r5, 24
- andi. r5, r5, 0xF
- b GetTexFilenameForR5
-
-
-.global TEX_StretchMush
-TEX_StretchMush:
- 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
-
-
-.global TEX_Spinner
-TEX_Spinner:
- lwz r5, 4(r30)
- srwi r5, r5, 24
- andi. r5, r5, 0xF
- b GetTexFilenameForR5
-
-
-.global TEX_AirshipGear
-TEX_AirshipGear:
- lwz r5, 4(r30)
- srwi r5, r5, 24
- andi. r5, r5, 0xF
- b GetTexFilenameForR5
-
-
-.global TEX_BigShell
-TEX_BigShell:
- lwz r5, 4(r30)
- srwi r5, r5, 24
- andi. r5, r5, 0xF
- b GetTexFilenameForR5
-
.global TEX_Platforms
@@ -627,23 +482,6 @@ TEX_Platform_ShifterSL:
-.global TEX_PokeyA
-TEX_PokeyA:
- lwz r5, 4(r30)
- srwi r5, r5, 24
- andi. r5, r5, 0xF
- b GetTexFilenameForR5
-
-
-.global TEX_PokeyB
-TEX_PokeyB:
- lwz r5, 4(r29)
- srwi r5, r5, 24
- andi. r5, r5, 0xF
-
- b GetTexFilenameForR5
-
-
.global TEX_PokeySnowman
TEX_PokeySnowman:
@@ -832,39 +670,6 @@ TEX_PokeyNoSand:
blr
-
-.global TEX_CloudBounce
-TEX_CloudBounce:
- lwz r5, 4(r28)
- srwi r5, r5, 24
- andi. r5, r5, 0xF
- b GetTexFilenameForR5
-
-
-.global TEX_SpikeBall
-TEX_SpikeBall:
- lwz r5, 4(r30)
- srwi r5, r5, 24
- andi. r5, r5, 0xF
- b GetTexFilenameForR5
-
-
-.global TEX_Huckit
-TEX_Huckit:
- lwz r5, 4(r29)
- srwi r5, r5, 24
- andi. r5, r5, 0xF
- b GetTexFilenameForR5
-
-
-.global TEX_HuckitBalls
-TEX_HuckitBalls:
- lwz r5, 4(r30)
- srwi r5, r5, 24
- andi. r5, r5, 0xF
- b GetTexFilenameForR5
-
-
.global TEX_HuckitBallsInherit
TEX_HuckitBallsInherit:
lwz r10, 4(r9)
@@ -875,14 +680,6 @@ TEX_HuckitBallsInherit:
-.global HammerColour
-HammerColour:
- lwz r5, 4(r30)
- srwi r5, r5, 24
- andi. r5, r5, 0xF
- b GetTexFilenameForR5
-
-
.global HammerTime
HammerTime:
lwz r8, 4(r31)