merged

1 files changed, 20 insertions, 20 deletions

diff --git a/src/growup.s b/src/growup.s
index b8d8922..11fa5b4 100755
--- a/src/growup.s
+++ b/src/growup.s
@@ -1,14 +1,14 @@
-#ifndef __MWERKS__

-.set r0,0;   .set r1,1;   .set r2,2; .set r3,3;   .set r4,4

-.set r5,5;   .set r6,6;   .set r7,7;   .set r8,8;   .set r9,9

-.set r10,10; .set r11,11; .set r12,12; .set r13,13; .set r14,14

-.set r15,15; .set r16,16; .set r17,17; .set r18,18; .set r19,19

-.set r20,20; .set r21,21; .set r22,22; .set r23,23; .set r24,24

-.set r25,25; .set r26,26; .set r27,27; .set r28,28; .set r29,29

+#ifndef __MWERKS__
+.set r0,0;   .set r1,1;   .set r2,2; .set r3,3;   .set r4,4
+.set r5,5;   .set r6,6;   .set r7,7;   .set r8,8;   .set r9,9
+.set r10,10; .set r11,11; .set r12,12; .set r13,13; .set r14,14
+.set r15,15; .set r16,16; .set r17,17; .set r18,18; .set r19,19
+.set r20,20; .set r21,21; .set r22,22; .set r23,23; .set r24,24
+.set r25,25; .set r26,26; .set r27,27; .set r28,28; .set r29,29
 .set r30,30; .set r31,31; .set f0,0; .set f1,1; .set f2,2
 .set f3,3; .set f4,4; .set f5,5; .set f6,6; .set f8,8
-.set f31,31; .set f30,30

-#endif

+.set f31,31; .set f30,30
+#endif
 
 
 .text
@@ -24,7 +24,7 @@ LoadFromSettingsS:
 	# we can trash r12 for now, it's not supposed to be guaranteed anyway
 	lwz r12, 4(r3)		# get the sprite settings
 	srwi r12, r12, 20	# get the highest nybble as r10 (maps to Nyb7 in Reggie)
-	andi. r12, r12, 0xF

+	andi. r12, r12, 0xF
 
 	# first off, get the value from the lookup table
 	lis r11, LookupTable@h
@@ -38,7 +38,7 @@ LoadFromSettingsSF:
 	# we can trash r12 for now, it's not supposed to be guaranteed anyway
 	lwz r12, 4(r3)		# get the sprite settings
 	srwi r12, r12, 28	# get the highest nybble as r12 (maps to Nyb5 in Reggie)
-	andi. r12, r12, 0xF

+	andi. r12, r12, 0xF
 
 	# first off, get the value from the lookup table
 	lis r11, LookupTable@h
@@ -52,7 +52,7 @@ LoadFromSettingsC:
 	# we can trash r12 for now, it's not supposed to be guaranteed anyway
 	lwz r12, 4(r4)		# get the sprite settings
 	srwi r12, r12, 20	# get the highest nybble as r12 (maps to Nyb7 in Reggie)
-	andi. r12, r12, 0xF

+	andi. r12, r12, 0xF
 
 	# first off, get the value from the lookup table
 	lis r11, LookupTable@h
@@ -66,7 +66,7 @@ LoadFromSettingsCF:
 	# we can trash r12 for now, it's not supposed to be guaranteed anyway
 	lwz r12, 4(r4)		# get the sprite settings
 	srwi r12, r12, 28	# get the highest nybble as r12 (maps to Nyb5 in Reggie)
-	andi. r12, r12, 0xF

+	andi. r12, r12, 0xF
 
 	# first off, get the value from the lookup table
 	lis r11, LookupTable@h
@@ -80,7 +80,7 @@ LoadFromSettingsH:
 	# we can trash r12 for now, it's not supposed to be guaranteed anyway
 	lwz r12, 4(r30)		# get the sprite settings
 	srwi r12, r12, 20	# get the highest nybble as r12 (maps to Nyb7 in Reggie)
-	andi. r12, r12, 0xF

+	andi. r12, r12, 0xF
 
 	# first off, get the value from the lookup table
 	lis r11, RiderLookupTable@h
@@ -94,7 +94,7 @@ LoadFromSettingsHF:
 	# we can trash r12 for now, it's not supposed to be guaranteed anyway
 	lwz r12, 4(r30)		# get the sprite settings
 	srwi r12, r12, 28	# get the highest nybble as r12 (maps to Nyb5 in Reggie)
-	andi. r12, r12, 0xF

+	andi. r12, r12, 0xF
 
 	# first off, get the value from the lookup table
 	lis r11, RiderLookupTable@h
@@ -108,7 +108,7 @@ LoadFromSettingsL:
 	# we can trash r12 for now, it's not supposed to be guaranteed anyway
 	lwz r12, 8(r30)		# get the sprite settings
 	srwi r12, r12, 20	# get the highest nybble as r12 (maps to Nyb7 in Reggie)
-	andi. r12, r12, 0xF

+	andi. r12, r12, 0xF
 
 	# first off, get the value from the lookup table
 	lis r11, LookupTable@h
@@ -122,7 +122,7 @@ LoadFromSettingsLF:
 	# we can trash r12 for now, it's not supposed to be guaranteed anyway
 	lwz r12, 8(r30)		# get the sprite settings
 	srwi r12, r12, 28	# get the highest nybble as r12 (maps to Nyb5 in Reggie)
-	andi. r12, r12, 0xF

+	andi. r12, r12, 0xF
 
 	# first off, get the value from the lookup table
 	lis r11, LookupTable@h
@@ -531,7 +531,7 @@ ModifyStandOnTopInitA:
 	lwz r10, 4(r3)
 	lwz r10, 4(r10)		# get the sprite settings
 	srwi r10, r10, 20	# get the highest nybble as r10 (maps to Nyb5 in Reggie)
-	andi. r10, r10, 0xF

+	andi. r10, r10, 0xF
 
 	# first off, get the value from the lookup table
 	lis r11, LookupTable@h
@@ -562,7 +562,7 @@ ModifyStandOnTopInitB:
 	lwz r10, 4(r3)
 	lwz r10, 4(r10)		# get the sprite settings
 	srwi r10, r10, 20	# get the highest nybble as r10 (maps to Nyb5 in Reggie)
-	andi. r10, r10, 0xF

+	andi. r10, r10, 0xF
 
 	# first off, get the value from the lookup table
 	lis r11, LookupTable@h
@@ -618,7 +618,7 @@ ModifyStandOnTopInitD:
 	lwz r10, 4(r3)
 	lwz r10, 4(r10)		# get the sprite settings
 	srwi r10, r10, 20	# get the highest nybble as r10 (maps to Nyb5 in Reggie)
-	andi. r10, r10, 0xF

+	andi. r10, r10, 0xF
 
 	# first off, get the value from the lookup table
 	lis r11, LookupTable@h