From ead037af2d2665e94ed8d804a1e220c47ba54db9 Mon Sep 17 00:00:00 2001 From: Colin Noga Date: Sun, 14 Aug 2011 13:36:51 -0500 Subject: Bobomb bros, colour snow, pipe spawner, and other fixes. --- src/growup.s | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/growup.s') 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 -- cgit v1.2.3