summaryrefslogtreecommitdiff
path: root/src/growup.s
diff options
context:
space:
mode:
authorColin Noga <Tempus@Spectrum-Song.local>2011-08-14 13:36:51 -0500
committerColin Noga <Tempus@Spectrum-Song.local>2011-08-14 13:36:51 -0500
commitead037af2d2665e94ed8d804a1e220c47ba54db9 (patch)
tree73a9b2ade2494b17caf3d1e1cd7f3bffca72c917 /src/growup.s
parent16ddd9a408d1a02f99b9a9851d412dcebf2a8483 (diff)
downloadkamek-ead037af2d2665e94ed8d804a1e220c47ba54db9.tar.gz
kamek-ead037af2d2665e94ed8d804a1e220c47ba54db9.zip
Bobomb bros, colour snow, pipe spawner, and other fixes.
Diffstat (limited to '')
-rwxr-xr-xsrc/growup.s6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/growup.s b/src/growup.s
index 11fa5b4..0576ebe 100755
--- a/src/growup.s
+++ b/src/growup.s
@@ -868,7 +868,6 @@ ModifyRiderInitD:
blr # Off we go!
-
.global InheritSettings
InheritSettings:
@@ -881,6 +880,7 @@ InheritSettings:
InheritSettings_B:
lwz r5, 4(r3)
+ andis. r5, r5, 0x0FF0
blr
@@ -894,7 +894,9 @@ InheritSettings_C:
.global InheritSettings_D
InheritSettings_D:
- ori r4, r4, 0x2
+ lwz r0, 4(r3)
+ andis. r0, r0, 0xFFF0
+ or r4, r4, r0
blr