Actions

SCHG How-to

Difference between revisions of "Fix Scattered Rings Underwater Physics"

From Sonic Retro

m (Sonic 1 fix: Changed these to Sonic 1 labeled variables.)
(Removed Sonic 2 SVN workaround and directly fixed problem. Replaced spaces in code with tabs. Overall cleanup.)
Line 1: Line 1:
''(Original Guide for all 3 games written by [[redhotsonic]].)''
+
''(Original guide for all 3 games by [[redhotsonic]])''
  
 
Quote from ''redhotsonic'', - "Ah, the scattered rings when you get hurt. It can cause slowdown to your game, and even mess up the underwater palette. Now, when Sonic is underwater, his movement and his gravity is changed so he moves slower to act like he's in water. But when he is hurt under water, isn't it funny that the scattered rings still act the same as if you weren't in water?"
 
Quote from ''redhotsonic'', - "Ah, the scattered rings when you get hurt. It can cause slowdown to your game, and even mess up the underwater palette. Now, when Sonic is underwater, his movement and his gravity is changed so he moves slower to act like he's in water. But when he is hurt under water, isn't it funny that the scattered rings still act the same as if you weren't in water?"
  
This is something that occurs in all 3 Sonic the Hedgehog Mega Drive games (and by 3, that IS counting S3&K as one game, though S&K has no water anyway, so it wouldn't be included regardless... but I digress). But is it really a bug? or is it merely a design choice? In either case, it's something that could stand to be fixed, and this guide tells you how to fix the ring physics in all of the games. First off... let's start with the original...
+
This is something that occurs in all 3 Sonic the Hedgehog Mega Drive games (and by 3, that IS counting S3&K as one game, though S&K has no water anyway, so it wouldn't be included regardless... but I digress). But is it really a bug, or is it merely a design choice? In either case, it's something that could stand to be fixed, and this guide tells you how to fix the ring physics in all of the games. First off... let's start with the original:
  
  
 
==Sonic 1 fix==
 
==Sonic 1 fix==
''This guide uses the SVN disassembly.''
+
''This guide uses the Git disassembly.''
  
First, In your disassembly, go to "_incObj\'''''25 & 37 Rings.asm'''''"
+
First, in your disassembly, go to "'''''_incObj\25 & 37 Rings.asm'''''"
 
Go to ''@makerings:'' (part of the scattered rings object code) and find this bit of coding:
 
Go to ''@makerings:'' (part of the scattered rings object code) and find this bit of coding:
 
<asm>
 
<asm>
    bsr.w   CalcSine
+
bsr.w CalcSine
    move.w d4,d2
+
move.w d4,d2
    lsr.w   #8,d2
+
lsr.w #8,d2
 
</asm>
 
</asm>
 +
  
 
Just underneath, paste this:
 
Just underneath, paste this:
 
<asm>
 
<asm>
                tst.b   ($FFFFF64C).w           ; Does the level have water?
+
tst.b ($FFFFF64C).w ; Does the level have water?
                beq.s   @skiphalvingvel         ; If not, branch and skip underwater checks
+
beq.s @skiphalvingvel ; If not, branch and skip underwater checks
                move.w ($FFFFF646).w,d6       ; Move water level to d6
+
move.w ($FFFFF646).w,d6 ; Move water level to d6
                cmp.w   obY(a0),d6           ; Is the ring object underneath the water level?
+
cmp.w obY(a0),d6 ; Is the ring object underneath the water level?
                bgt.s   @skiphalvingvel         ; If not, branch and skip underwater commands
+
bgt.s @skiphalvingvel ; If not, branch and skip underwater commands
                asr.w   #$1,d0                 ; Half d0. Makes the ring's x_vel bounce to the left/right slower
+
asr.w d0 ; Half d0. Makes the ring's x_vel bounce to the left/right slower
                asr.w   #$1,d1                 ; Half d1. Makes the ring's y_vel bounce up/down slower
+
asr.w d1 ; Half d1. Makes the ring's y_vel bounce up/down slower
 
@skiphalvingvel:
 
@skiphalvingvel:
 
</asm>
 
</asm>
  
'You should end up with something looking like this:'
+
 
 +
You should end up with something looking like this:
 
<asm>
 
<asm>
 
@makerings:
 
@makerings:
                move.b #id_RingLoss,0(a1) ; load bouncing ring object
+
move.b #id_RingLoss,0(a1) ; load bouncing ring object
                addq.b #2,obRoutine(a1)
+
addq.b #2,obRoutine(a1)
                move.b #8,obHeight(a1)
+
move.b #8,obHeight(a1)
                move.b #8,obWidth(a1)
+
move.b #8,obWidth(a1)
                move.w obX(a0),obX(a1)
+
move.w obX(a0),obX(a1)
                move.w obY(a0),obY(a1)
+
move.w obY(a0),obY(a1)
                move.l #Map_Ring,obMap(a1)
+
move.l #Map_Ring,obMap(a1)
                move.w #$27B2,obGfx(a1)
+
move.w #$27B2,obGfx(a1)
                move.b #4,obRender(a1)
+
move.b #4,obRender(a1)
                move.b #3,obPriority(a1)
+
move.b #3,obPriority(a1)
                move.b #$47,obColType(a1)
+
move.b #$47,obColType(a1)
                move.b #8,obActWid(a1)
+
move.b #8,obActWid(a1)
                move.b #-1,(v_ani3_time).w
+
move.b #-1,(v_ani3_time).w
                tst.w   d4
+
tst.w d4
                bmi.s   @loc_9D62
+
bmi.s @loc_9D62
                move.w d4,d0
+
move.w d4,d0
                bsr.w   CalcSine
+
bsr.w CalcSine
                move.w d4,d2
+
move.w d4,d2
                lsr.w   #8,d2
+
lsr.w #8,d2
                tst.b   ($FFFFF64C).w           ; Does the level have water?
+
tst.b ($FFFFF64C).w ; Does the level have water?
                beq.s   @skiphalvingvel         ; If not, branch and skip underwater checks
+
beq.s @skiphalvingvel ; If not, branch and skip underwater checks
                move.w ($FFFFF646).w,d6       ; Move water level to d6
+
move.w ($FFFFF646).w,d6 ; Move water level to d6
                cmp.w   obY(a0),d6           ; Is the ring object underneath the water level?
+
cmp.w obY(a0),d6 ; Is the ring object underneath the water level?
                bgt.s   @skiphalvingvel         ; If not, branch and skip underwater commands
+
bgt.s @skiphalvingvel ; If not, branch and skip underwater commands
                asr.w   #$1,d0                 ; Half d0. Makes the ring's x_vel bounce to the left/right slower
+
asr.w d0 ; Half d0. Makes the ring's x_vel bounce to the left/right slower
                asr.w   #$1,d1                 ; Half d1. Makes the ring's y_vel bounce up/down slower
+
asr.w d1 ; Half d1. Makes the ring's y_vel bounce up/down slower
 
@skiphalvingvel:
 
@skiphalvingvel:
                asl.w   d2,d0
+
asl.w d2,d0
                asl.w   d2,d1
+
asl.w d2,d1
                move.w d0,d2
+
move.w d0,d2
                move.w d1,d3
+
move.w d1,d3
                addi.b #$10,d4
+
addi.b #$10,d4
                bcc.s   @loc_9D62
+
bcc.s @loc_9D62
                subi.w #$80,d4
+
subi.w #$80,d4
                bcc.s   @loc_9D62
+
bcc.s @loc_9D62
                move.w #$288,d4
+
move.w #$288,d4
 
</asm>
 
</asm>
This ensures that when underwater, the rings x_vel and y_vel are halved so they appear to be moving slower.
 
  
Next, go to label "RLoss_Bounce:" and under
+
 
 +
This ensures that, when underwater, the rings' x_vel and y_vel are halved so they appear to be moving slower.
 +
 
 +
Next, go to label "''RLoss_Bounce:''" and under this...
 
<asm>
 
<asm>
                move.b (v_ani3_frame).w,obFrame(a0)
+
move.b (v_ani3_frame).w,obFrame(a0)
                bsr.w   SpeedToPos
+
bsr.w SpeedToPos
                addi.w #$18,obVelY(a0)
+
addi.w #$18,obVelY(a0)
 
</asm>
 
</asm>
place this:
+
 
 +
 
 +
...place this:
 
<asm>
 
<asm>
                tst.b   ($FFFFF64C).w           ; Does the level have water?
+
tst.b ($FFFFF64C).w ; Does the level have water?
                beq.s   @skipbounceslow         ; If not, branch and skip underwater checks
+
beq.s @skipbounceslow ; If not, branch and skip underwater checks
                move.w ($FFFFF646).w,d6       ; Move water level to d6
+
move.w ($FFFFF646).w,d6 ; Move water level to d6
                cmp.w   obY(a0),d6           ; Is the ring object underneath the water level?
+
cmp.w obY(a0),d6 ; Is the ring object underneath the water level?
                bgt.s   @skipbounceslow         ; If not, branch and skip underwater commands
+
bgt.s @skipbounceslow ; If not, branch and skip underwater commands
                subi.w #$E,obVelY(a0)         ; Reduce gravity by $E ($18-$E=$A), giving the underwater effect
+
subi.w #$E,obVelY(a0) ; Reduce gravity by $E ($18-$E=$A), giving the underwater effect
 
@skipbounceslow:
 
@skipbounceslow:
 
</asm>
 
</asm>
 +
 +
 
You can change the value of the gravity if you like, but I found $E to suit.
 
You can change the value of the gravity if you like, but I found $E to suit.
 
Anyway, you should have something looking like this:
 
Anyway, you should have something looking like this:
 
<asm>
 
<asm>
RLoss_Bounce:   ; Routine 2
+
RLoss_Bounce: ; Routine 2
                move.b (v_ani3_frame).w,obFrame(a0)
+
move.b (v_ani3_frame).w,obFrame(a0)
                bsr.w   SpeedToPos
+
bsr.w SpeedToPos
                addi.w #$18,obVelY(a0)
+
addi.w #$18,obVelY(a0)
                tst.b   ($FFFFF64C).w           ; Does the level have water?
+
tst.b ($FFFFF64C).w ; Does the level have water?
                beq.s   @skipbounceslow         ; If not, branch and skip underwater checks
+
beq.s @skipbounceslow ; If not, branch and skip underwater checks
                move.w ($FFFFF646).w,d6       ; Move water level to d6
+
move.w ($FFFFF646).w,d6 ; Move water level to d6
                cmp.w   obY(a0),d6           ; Is the ring object underneath the water level?
+
cmp.w obY(a0),d6 ; Is the ring object underneath the water level?
                bgt.s   @skipbounceslow         ; If not, branch and skip underwater commands
+
bgt.s @skipbounceslow ; If not, branch and skip underwater commands
                subi.w #$E,obVelY(a0)         ; Reduce gravity by $E ($18-$E=$A), giving the underwater effect
+
subi.w #$E,obVelY(a0) ; Reduce gravity by $E ($18-$E=$A), giving the underwater effect
 
@skipbounceslow:
 
@skipbounceslow:
                bmi.s   @chkdel
+
bmi.s @chkdel
                move.b (v_vbla_byte).w,d0
+
move.b (v_vbla_byte).w,d0
                add.b   d7,d0
+
add.b d7,d0
                andi.b #3,d0
+
andi.b #3,d0
                bne.s   @chkdel
+
bne.s @chkdel
                jsr     ObjFloorDist
+
jsr ObjFloorDist
                tst.w   d1
+
tst.w d1
                bpl.s   @chkdel
+
bpl.s @chkdel
                add.w   d1,obY(a0)
+
add.w d1,obY(a0)
                move.w obVelY(a0),d0
+
move.w obVelY(a0),d0
                asr.w   #2,d0
+
asr.w #2,d0
                sub.w   d0,obVelY(a0)
+
sub.w d0,obVelY(a0)
                neg.w   obVelY(a0)
+
neg.w obVelY(a0)
 
</asm>
 
</asm>
This ensures when underwater, the gravity is not as great. Otherwise, the rings will gain speed and then it won't give the desired underwater effect.
+
 
 +
 
 +
This ensures that, when underwater, the gravity is not as great. Otherwise, the rings will gain speed and then it won't give the desired underwater effect.
  
 
==Sonic 2 fix==
 
==Sonic 2 fix==
''This guide uses the Xenowhirl disassembly. See below for the SVN fix.''
+
''This guide uses the Xenowhirl disassembly, but notes for Git users are available.''
  
First, go to "''loc_120BA:''" (part of the scattered rings object code) and find this bit of coding:
+
First, go to "''loc_120BA:''" (part of the scattered rings object code. Git users, ''Obj37_Init'', three '+'s down) and find this bit of coding:
 
<asm>
 
<asm>
  bsr.w JmpTo4_CalcSine
+
bsr.w JmpTo4_CalcSine
  move.w d4,d2
+
move.w d4,d2
  lsr.w #8,d2
+
lsr.w #8,d2
 
</asm>
 
</asm>
  
  
 
Just underneath, paste this:
 
Just underneath, paste this:
 
 
<asm>
 
<asm>
        tst.b   (Water_flag).w         ; Does the level have water?
+
tst.b (Water_flag).w ; Does the level have water?
        beq.s   +                      ; If not, branch and skip underwater checks
+
beq.s .skiphalvingvel ; If not, branch and skip underwater checks
        move.w (Water_Level_2).w,d6   ; Move water level to d6
+
move.w (Water_Level_2).w,d6 ; Move water level to d6
        cmp.w   y_pos(a0),d6           ; Is the ring object underneath the water level?
+
cmp.w y_pos(a0),d6 ; Is the ring object underneath the water level?
        bgt.s   +                      ; If not, branch and skip underwater commands
+
bgt.s .skiphalvingvel ; If not, branch and skip underwater commands
        asr.w   #$1,d0                 ; Half d0. Makes the ring's x_vel bounce to the left/right slower
+
asr.w d0 ; Half d0. Makes the ring's x_vel bounce to the left/right slower
        asr.w   #$1,d1                 ; Half d1. Makes the ring's y_vel bounce up/down slower
+
asr.w d1 ; Half d1. Makes the ring's y_vel bounce up/down slower
+
+
.skiphalvingvel:
 
</asm>
 
</asm>
 
  
  
 
So, you should end up with something looking like this:
 
So, you should end up with something looking like this:
 
 
<asm>
 
<asm>
 
loc_120BA:
 
loc_120BA:
        _move.b #$37,0(a1) ; load obj37
+
_move.b #$37,0(a1) ; load obj37
        addq.b  #2,routine(a1)
 
        move.b  #8,y_radius(a1)
 
        move.b  #8,x_radius(a1)
 
        move.w  x_pos(a0),x_pos(a1)
 
        move.w  y_pos(a0),y_pos(a1)
 
        move.l  #Obj25_MapUnc_12382,mappings(a1)
 
        move.w  #$26BC,art_tile(a1)
 
        bsr.w  Adjust2PArtPointer2
 
        move.b  #$84,render_flags(a1)
 
        move.b  #3,priority(a1)
 
        move.b  #$47,collision_flags(a1)
 
        move.b  #8,width_pixels(a1)
 
        move.b  #-1,(Ring_spill_anim_counter).w
 
        tst.w  d4
 
        bmi.s  loc_12132
 
        move.w  d4,d0
 
        bsr.w  JmpTo4_CalcSine
 
        move.w  d4,d2
 
        lsr.w  #8,d2
 
        tst.b  (Water_flag).w          ; Does the level have water?
 
        beq.s  +                      ; If not, branch and skip underwater checks
 
        move.w  (Water_Level_2).w,d6    ; Move water level to d6
 
        cmp.w  y_pos(a0),d6            ; Is the ring object underneath the water level?
 
        bgt.s  +                      ; If not, branch and skip underwater commands
 
        asr.w  #$1,d0                  ; Half d0.  Makes the ring's x_vel bounce to the left/right slower
 
        asr.w  #$1,d1                  ; Half d1.  Makes the ring's y_vel bounce up/down slower
 
+
 
        asl.w  d2,d0
 
        asl.w  d2,d1
 
        move.w  d0,d2
 
        move.w  d1,d3
 
        addi.b  #$10,d4
 
        bcc.s  loc_12132
 
        subi.w  #$80,d4
 
        bcc.s  loc_12132
 
        move.w  #$288,d4
 
</asm>
 
 
 
This ensures that when underwater, the rings x_vel and y_vel are halved so they appear to be moving slower.
 
 
 
 
 
Next, go to label "Obj_37_sub_2:" and under
 
 
 
<asm>
 
        move.b  (Ring_spill_anim_frame).w,mapping_frame(a0)
 
        bsr.w  ObjectMove
 
        addi.w  #$18,y_vel(a0)
 
</asm>
 
 
 
 
 
Put this:
 
<asm>
 
        tst.b  (Water_flag).w          ; Does the level have water?
 
        beq.s  +                      ; If not, branch and skip underwater checks
 
        move.w  (Water_Level_2).w,d6    ; Move water level to d6
 
        cmp.w  y_pos(a0),d6            ; Is the ring object underneath the water level?
 
        bgt.s  +                      ; If not, branch and skip underwater commands
 
        subi.w  #$E,y_vel(a0)          ; Reduce gravity by $E ($18-$E=$A), giving the underwater effect for the rings
 
+
 
</asm>
 
 
 
You can change the value of the gravity if you like, but I found $E to suit.
 
Anyway, you should have something looking like this:
 
 
 
<asm>
 
Obj_37_sub_2:
 
        move.b  (Ring_spill_anim_frame).w,mapping_frame(a0)
 
        bsr.w  ObjectMove
 
        addi.w  #$18,y_vel(a0)
 
        tst.b  (Water_flag).w          ; Does the level have water?
 
        beq.s  +                      ; If not, branch and skip underwater checks
 
        move.w  (Water_Level_2).w,d6    ; Move water level to d6
 
        cmp.w  y_pos(a0),d6            ; Is the ring object underneath the water level?
 
        bgt.s  +                      ; If not, branch and skip underwater commands
 
        subi.w  #$E,y_vel(a0)          ; Reduce gravity by $E ($18-$E=$A), giving the underwater effect for the rings
 
+
 
        bmi.s  loc_121B8
 
        move.b  ($FFFFFE0F).w,d0
 
        add.b  d7,d0
 
        andi.b  #7,d0
 
        bne.s  loc_121B8
 
        tst.b  render_flags(a0)
 
        bpl.s  loc_121D0
 
        jsr    (RingCheckFloorDist).l
 
        tst.w  d1
 
        bpl.s  loc_121B8
 
        add.w  d1,y_pos(a0)
 
        move.w  y_vel(a0),d0
 
        asr.w  #2,d0
 
        sub.w  d0,y_vel(a0)
 
        neg.w  y_vel(a0)
 
</asm>
 
 
 
This ensures when underwater, the gravity is not as great. Otherwise, the rings will gain speed and then it won't give the desired underwater effect.
 
 
 
===Sonic 2 SVN fix===
 
(SVN fix by [[User:KingofHarts|KingofHarts]])
 
 
 
There is ONE small hiccup when trying to apply this to the SVN disassembly of Sonic 2. If you go ahead and apply the above changes to the corresponding code, and build & run, you will find that there is a SERIOUS error with your ring loss. This is due to the way that the SVN disassembly is labeled, compared to the original Xenowhirl disassembly, and is a REALLY EASY thing to fix. I'll take a second to show you what you need to do. After you have finished applying the steps above, please go back to the first section you edited. It should now look something like this, perhaps minus the extra comments I made to guide me.
 
<asm>
 
; loc_120B2:
 
- bsr.w SingleObjLoad
 
bne.w +++
 
; loc_120BA:
 
+
 
_move.b #ObjID_LostRings,id(a1) ; load obj37
 
 
addq.b #2,routine(a1)
 
addq.b #2,routine(a1)
 
move.b #8,y_radius(a1)
 
move.b #8,y_radius(a1)
Line 260: Line 161:
 
move.w y_pos(a0),y_pos(a1)
 
move.w y_pos(a0),y_pos(a1)
 
move.l #Obj25_MapUnc_12382,mappings(a1)
 
move.l #Obj25_MapUnc_12382,mappings(a1)
move.w #make_art_tile(ArtTile_ArtNem_Ring,1,0),art_tile(a1)
+
move.w #$26BC,art_tile(a1)
 
bsr.w Adjust2PArtPointer2
 
bsr.w Adjust2PArtPointer2
 
move.b #$84,render_flags(a1)
 
move.b #$84,render_flags(a1)
Line 268: Line 169:
 
move.b #-1,(Ring_spill_anim_counter).w
 
move.b #-1,(Ring_spill_anim_counter).w
 
tst.w d4
 
tst.w d4
bmi.s + ; <- This line is incorrectly branching.
+
bmi.s loc_12132
 
move.w d4,d0
 
move.w d4,d0
 
bsr.w JmpTo4_CalcSine
 
bsr.w JmpTo4_CalcSine
 
move.w d4,d2
 
move.w d4,d2
 
lsr.w #8,d2
 
lsr.w #8,d2
; RHS FIX
+
tst.b (Water_flag).w ; Does the level have water?
        tst.b   (Water_flag).w         ; Does the level have water?
+
beq.s .skiphalvingvel ; If not, branch and skip underwater checks
        beq.s   +                      ; If not, branch and skip underwater checks
+
move.w (Water_Level_2).w,d6 ; Move water level to d6
        move.w (Water_Level_2).w,d6   ; Move water level to d6
+
cmp.w y_pos(a0),d6 ; Is the ring object underneath the water level?
        cmp.w   y_pos(a0),d6           ; Is the ring object underneath the water level?
+
bgt.s .skiphalvingvel ; If not, branch and skip underwater commands
        bgt.s   +                      ; If not, branch and skip underwater commands
+
asr.w d0 ; Half d0. Makes the ring's x_vel bounce to the left/right slower
        asr.w   #$1,d0                 ; Half d0. Makes the ring's x_vel bounce to the left/right slower
+
asr.w d1 ; Half d1. Makes the ring's y_vel bounce up/down slower
        asr.w   #$1,d1                 ; Half d1. Makes the ring's y_vel bounce up/down slower
+
.skiphalvingvel:
+
+
asl.w d2,d0
; RHS FIX
 
        asl.w d2,d0
 
 
asl.w d2,d1
 
asl.w d2,d1
 
move.w d0,d2
 
move.w d0,d2
 
move.w d1,d3
 
move.w d1,d3
 
addi.b #$10,d4
 
addi.b #$10,d4
bcc.s + ; <- This line is branching correctly, BUT we will need to change it.
+
bcc.s loc_12132
 
subi.w #$80,d4
 
subi.w #$80,d4
bcc.s + ; <- This line is branching correctly, BUT we will need to change it.
+
bcc.s loc_12132
 
move.w #$288,d4
 
move.w #$288,d4
;loc_12132
 
+
 
move.w d2,x_vel(a1)
 
move.w d3,y_vel(a1)
 
...
 
 
</asm>
 
</asm>
  
Now, as you can see, the SVN has relabeled a LOT of these sections of code with "+". This is all well and good, BUT it causes problems for us when applying this fix. Note the first line I marked. It is supposed to branch to the former "loc_12132". Instead it branches to "+". But there is a "+" section BEFORE that, causing the issue. My fix is to relabel "loc_12132" back to its former label, and then I want you to edit all 3 lines I marked, and have them branch to this label. That's it! Everything SHOULD work out fine now for your SVN disassembly.
+
 
 +
This ensures that, when underwater, the rings' x_vel and y_vel are halved so they appear to be moving slower.
 +
 
 +
 
 +
Next, go to label "''Obj_37_sub_2:''" and under this...
 +
<asm>
 +
move.b (Ring_spill_anim_frame).w,mapping_frame(a0)
 +
bsr.w ObjectMove
 +
addi.w #$18,y_vel(a0)
 +
</asm>
 +
 
 +
 
 +
...put this:
 +
<asm>
 +
tst.b (Water_flag).w ; Does the level have water?
 +
beq.s .skipbounceslow ; If not, branch and skip underwater checks
 +
move.w (Water_Level_2).w,d6 ; Move water level to d6
 +
cmp.w y_pos(a0),d6 ; Is the ring object underneath the water level?
 +
bgt.s .skipbounceslow ; If not, branch and skip underwater commands
 +
subi.w #$E,y_vel(a0) ; Reduce gravity by $E ($18-$E=$A), giving the underwater effect for the rings
 +
.skipbounceslow:
 +
</asm>
 +
 
 +
 
 +
You can change the value of the gravity if you like, but I found $E to suit.
 +
Anyway, you should have something looking like this:
 +
<asm>
 +
Obj_37_sub_2:
 +
move.b (Ring_spill_anim_frame).w,mapping_frame(a0)
 +
bsr.w ObjectMove
 +
addi.w #$18,y_vel(a0)
 +
tst.b (Water_flag).w ; Does the level have water?
 +
beq.s .skipbounceslow ; If not, branch and skip underwater checks
 +
move.w (Water_Level_2).w,d6 ; Move water level to d6
 +
cmp.w y_pos(a0),d6 ; Is the ring object underneath the water level?
 +
bgt.s .skipbounceslow ; If not, branch and skip underwater commands
 +
subi.w #$E,y_vel(a0) ; Reduce gravity by $E ($18-$E=$A), giving the underwater effect for the rings
 +
.skipbounceslow:
 +
bmi.s loc_121B8
 +
move.b ($FFFFFE0F).w,d0
 +
add.b d7,d0
 +
andi.b #7,d0
 +
bne.s loc_121B8
 +
tst.b render_flags(a0)
 +
bpl.s loc_121D0
 +
jsr (RingCheckFloorDist).l
 +
tst.w d1
 +
bpl.s loc_121B8
 +
add.w d1,y_pos(a0)
 +
move.w y_vel(a0),d0
 +
asr.w #2,d0
 +
sub.w d0,y_vel(a0)
 +
neg.w y_vel(a0)
 +
</asm>
 +
 
 +
 
 +
This ensures that, when underwater, the gravity is not as great. Otherwise, the rings will gain speed and then it won't give the desired underwater effect.
  
 
==Sonic 3&K fix==
 
==Sonic 3&K fix==
 
''This guide uses the SVN disassembly.''
 
''This guide uses the SVN disassembly.''
  
Go to "off_1A658:" (the routines of the scattered rings). You'll see that it's first job is to go to "loc_1A67A". That needs changing to "loc_1A68C".
+
Go to "''off_1A658:''" (the routines of the scattered rings). You'll see that its first job is to go to "''loc_1A67A''". That needs changing to "''loc_1A68C''".
So, from this:
+
So, find this...
 
<asm>
 
<asm>
off_1A658:     dc.w loc_1A67A-off_1A658
+
off_1A658: dc.w loc_1A67A-off_1A658
  
                dc.w loc_1A75C-off_1A658
+
dc.w loc_1A75C-off_1A658
                dc.w loc_1A7C2-off_1A658
+
dc.w loc_1A7C2-off_1A658
                dc.w loc_1A7D6-off_1A658
+
dc.w loc_1A7D6-off_1A658
                dc.w loc_1A7E4-off_1A658
+
dc.w loc_1A7E4-off_1A658
 
</asm>
 
</asm>
  
  
And replace with this:
+
...and replace it with this:
 
<asm>
 
<asm>
off_1A658:     dc.w loc_1A68C-off_1A658
+
off_1A658: dc.w loc_1A68C-off_1A658
  
                dc.w loc_1A75C-off_1A658
+
dc.w loc_1A75C-off_1A658
                dc.w loc_1A7C2-off_1A658
+
dc.w loc_1A7C2-off_1A658
                dc.w loc_1A7D6-off_1A658
+
dc.w loc_1A7D6-off_1A658
                dc.w loc_1A7E4-off_1A658
+
dc.w loc_1A7E4-off_1A658
 
</asm>
 
</asm>
  
  
This will skip "loc_1A67A" commands. This is because this location pushes the scattered rings object (or the reverse scattered rings object) to d6. For our water code, we need d6, because all other data registers are being used. It doesn't do this in Sonic 1 or 2 because there's no such thing as "reverse gravity". The scattered rings object needs to be moved to a1, but we can't do it here, because shortly after, a1 is being used for the amount of rings.
+
This will skip "''loc_1A67A''" commands. This is because this location pushes the scattered rings object (or the reverse scattered rings object) to d6. For our water code, we need d6, because all other data registers are being used. It doesn't do this in Sonic 1 or 2 because there's no such thing as "reverse gravity". The scattered rings object needs to be moved to a1, but we can't do it here, because shortly after, a1 is being used for the amount of rings.
  
Next, go to "off_1A670:" This is extremely similar to what we just done, but for reverse gravity. so no point explaining what it's doing here as I just did that. Anyway, you should see:
+
Next, go to "''off_1A670:''" This is extremely similar to what we just done, but for reverse gravity, so there's no point explaining what it's doing here as I just did that. Anyway, you should see this...
 
<asm>
 
<asm>
off_1A670:     dc.w loc_1A67A-off_1A670
+
off_1A670: dc.w loc_1A67A-off_1A670
  
                dc.w loc_1A7E8-off_1A670
+
dc.w loc_1A7E8-off_1A670
                dc.w loc_1A7C2-off_1A670
+
dc.w loc_1A7C2-off_1A670
                dc.w loc_1A7D6-off_1A670
+
dc.w loc_1A7D6-off_1A670
                dc.w loc_1A7E4-off_1A670
+
dc.w loc_1A7E4-off_1A670
 
</asm>
 
</asm>
  
  
And replace with:
+
...replace it with:
 
<asm>
 
<asm>
off_1A670:     dc.w loc_1A68C-off_1A670
+
off_1A670: dc.w loc_1A68C-off_1A670
  
                dc.w loc_1A7E8-off_1A670
+
dc.w loc_1A7E8-off_1A670
                dc.w loc_1A7C2-off_1A670
+
dc.w loc_1A7C2-off_1A670
                dc.w loc_1A7D6-off_1A670
+
dc.w loc_1A7D6-off_1A670
                dc.w loc_1A7E4-off_1A670
+
dc.w loc_1A7E4-off_1A670
 
</asm>
 
</asm>
  
  
Again, this will skip "loc_1A67A" commands. Explained why above.
+
Again, this will skip "''loc_1A67A''" commands. Explained why above.
 
 
Next, go to "loc_1A67A:" and you should see this.
 
  
 +
Next, go to "''loc_1A67A:''" and you should see this:
 
<asm>
 
<asm>
 
loc_1A67A:
 
loc_1A67A:
  
                move.l #Obj_Bouncing_Ring,d6
+
move.l #Obj_Bouncing_Ring,d6
                tst.b   (Reverse_gravity_flag).w
+
tst.b (Reverse_gravity_flag).w
                beq.s   loc_1A68C
+
beq.s loc_1A68C
                move.l #Obj_Bouncing_Ring_Reverse_Gravity,d6
+
move.l #Obj_Bouncing_Ring_Reverse_Gravity,d6
 
</asm>
 
</asm>
  
  
Notice "Bouncing_ring" (and the reverse one) are being pushed to d6. We need d6, so, delete it. It's no longer needed. Trust me. We have now free'd d6. Although we've lost pushing the scattered rings into place. Do not worry, that's next.
+
Notice "Bouncing_Ring" (and the reverse one) is being pushed to d6. We need d6, so, delete it. It's no longer needed. Trust me. We have now freed d6, although we've lost pushing the scattered rings into place. Do not worry, that's next.
  
  
Next, go to "loc_1A6B6:". The very first command should be "addq.b #2,5(a1)" Just before that, add this:
+
Next, go to "''loc_1A6B6:''". The very first command should be "addq.b #2,5(a1)" Just before that, add this:
 
<asm>
 
<asm>
                move.l #Obj_Bouncing_Ring,(a1)
+
move.l #Obj_Bouncing_Ring,(a1)
                tst.b   (Reverse_gravity_flag).w
+
tst.b (Reverse_gravity_flag).w
                beq.s   loc_1A6B6CONTINUE
+
beq.s .notreverse
                move.l #Obj_Bouncing_Ring_Reverse_Gravity,(a1)
+
move.l #Obj_Bouncing_Ring_Reverse_Gravity,(a1)
loc_1A6B6CONTINUE:
+
.notreverse:
 
</asm>
 
</asm>
  
Yes, you might recognize this. It's part of that code you just this second deleted. We're pushing the scattered rings back into place. But instead of putting it to d6, we're putting it to a1. a1 is now available as it's not being used again for a while.
+
 
 +
Yes, you might recognize this. It's part of that code you'd just deleted. We're pushing the scattered rings back into place. But instead of putting it to d6, we're putting it to a1. a1 is now available as it's not being used again for a while.
  
 
So you have something looking at this:
 
So you have something looking at this:
 
<asm>
 
<asm>
 
loc_1A6B6:
 
loc_1A6B6:
                move.l #Obj_Bouncing_Ring,(a1)
+
move.l #Obj_Bouncing_Ring,(a1)
                tst.b   (Reverse_gravity_flag).w
+
tst.b (Reverse_gravity_flag).w
                beq.s   loc_1A6B6CONTINUE
+
beq.s .notreverse
                move.l #Obj_Bouncing_Ring_Reverse_Gravity,(a1)
+
move.l #Obj_Bouncing_Ring_Reverse_Gravity,(a1)
loc_1A6B6CONTINUE:
+
.notreverse:
                addq.b #2,5(a1)
+
addq.b #2,5(a1)
                move.b #8,$1E(a1)
+
move.b #8,$1E(a1)
                move.b #8,$1F(a1)
+
move.b #8,$1F(a1)
                move.w $10(a0),$10(a1)
+
move.w $10(a0),$10(a1)
                move.w $14(a0),$14(a1)
+
move.w $14(a0),$14(a1)
                move.l #Map_Ring,$C(a1)
+
move.l #Map_Ring,$C(a1)
                move.w #$A6BC,$A(a1)
+
move.w #$A6BC,$A(a1)
                move.b #$84,4(a1)
+
move.b #$84,4(a1)
                move.w #$180,8(a1)
+
move.w #$180,8(a1)
                move.b #$47,$28(a1)
+
move.b #$47,$28(a1)
                move.b #8,7(a1)
+
move.b #8,7(a1)
                move.b #-1,(Ring_spill_anim_counter).w
+
move.b #-1,(Ring_spill_anim_counter).w
                tst.w   d4
+
tst.w d4
                bmi.s   loc_1A728
+
bmi.s loc_1A728
                move.w d4,d0
+
move.w d4,d0
                jsr     (GetSineCosine).l
+
jsr (GetSineCosine).l
                move.w d4,d2
+
move.w d4,d2
                lsr.w   #8,d2
+
lsr.w #8,d2
                asl.w   d2,d0
+
asl.w d2,d0
                asl.w   d2,d1
+
asl.w d2,d1
                move.w d0,d2
+
move.w d0,d2
                move.w d1,d3
+
move.w d1,d3
                addi.b #$10,d4
+
addi.b #$10,d4
                bcc.s   loc_1A728
+
bcc.s loc_1A728
                subi.w #$80,d4
+
subi.w #$80,d4
                bcc.s   loc_1A728
+
bcc.s loc_1A728
                move.w #$288,d4
+
move.w #$288,d4
 
</asm>
 
</asm>
  
  
 
+
Still looking at "''loc_1A6B6:''", look and find this bit of coding:
Still looking at "loc_1A6B6:" look and find this bit of coding:
 
 
<asm>
 
<asm>
                jsr     (GetSineCosine).l
+
jsr (GetSineCosine).l
                move.w d4,d2
+
move.w d4,d2
                lsr.w   #8,d2
+
lsr.w #8,d2
 
</asm>
 
</asm>
  
Line 428: Line 377:
 
Just underneath, paste this:
 
Just underneath, paste this:
 
<asm>
 
<asm>
                tst.b   (Water_flag).w         ; Does the level have water?
+
tst.b (Water_flag).w ; Does the level have water?
                beq.s   skiphalvingvel         ; If not, branch and skip underwater checks
+
beq.s .skiphalvingvel ; If not, branch and skip underwater checks
                move.w (Water_level).w,d6     ; Move water level to d6
+
move.w (Water_level).w,d6 ; Move water level to d6
                cmp.w   y_pos(a0),d6           ; Is the ring object underneath the water level?
+
cmp.w y_pos(a0),d6 ; Is the ring object underneath the water level?
                bgt.s   skiphalvingvel         ; If not, branch and skip underwater commands
+
bgt.s .skiphalvingvel ; If not, branch and skip underwater commands
                asr.w   #$1,d0                 ; Half d0. Makes the ring's x_vel bounce to the left/right slower
+
asr.w d0 ; Half d0. Makes the ring's x_vel bounce to the left/right slower
                asr.w   #$1,d1                 ; Half d1. Makes the ring's y_vel bounce up/down slower
+
asr.w d1 ; Half d1. Makes the ring's y_vel bounce up/down slower
skiphalvingvel:
+
.skiphalvingvel:
 
</asm>
 
</asm>
 
  
  
Line 443: Line 391:
 
<asm>
 
<asm>
 
loc_1A6B6:
 
loc_1A6B6:
                move.l #Obj_Bouncing_Ring,(a1)
+
move.l #Obj_Bouncing_Ring,(a1)
                tst.b   (Reverse_gravity_flag).w
+
tst.b (Reverse_gravity_flag).w
                beq.s   loc_1A6B6CONTINUE
+
beq.s .notreverse
                move.l #Obj_Bouncing_Ring_Reverse_Gravity,(a1)
+
move.l #Obj_Bouncing_Ring_Reverse_Gravity,(a1)
loc_1A6B6CONTINUE:
+
.notreverse:
                addq.b #2,5(a1)
+
addq.b #2,5(a1)
                move.b #8,$1E(a1)
+
move.b #8,$1E(a1)
                move.b #8,$1F(a1)
+
move.b #8,$1F(a1)
                move.w $10(a0),$10(a1)
+
move.w $10(a0),$10(a1)
                move.w $14(a0),$14(a1)
+
move.w $14(a0),$14(a1)
                move.l #Map_Ring,$C(a1)
+
move.l #Map_Ring,$C(a1)
                move.w #$A6BC,$A(a1)
+
move.w #$A6BC,$A(a1)
                move.b #$84,4(a1)
+
move.b #$84,4(a1)
                move.w #$180,8(a1)
+
move.w #$180,8(a1)
                move.b #$47,$28(a1)
+
move.b #$47,$28(a1)
                move.b #8,7(a1)
+
move.b #8,7(a1)
                move.b #-1,(Ring_spill_anim_counter).w
+
move.b #-1,(Ring_spill_anim_counter).w
                tst.w   d4
+
tst.w d4
                bmi.s   loc_1A728
+
bmi.s loc_1A728
                move.w d4,d0
+
move.w d4,d0
                jsr     (GetSineCosine).l
+
jsr (GetSineCosine).l
                move.w d4,d2
+
move.w d4,d2
                lsr.w   #8,d2
+
lsr.w #8,d2
                tst.b   (Water_flag).w         ; Does the level have water?
+
tst.b (Water_flag).w ; Does the level have water?
                beq.s   skiphalvingvel         ; If not, branch and skip underwater checks
+
beq.s .skiphalvingvel ; If not, branch and skip underwater checks
                move.w (Water_level).w,d6     ; Move water level to d6
+
move.w (Water_level).w,d6 ; Move water level to d6
                cmp.w   y_pos(a0),d6           ; Is the ring object underneath the water level?
+
cmp.w y_pos(a0),d6 ; Is the ring object underneath the water level?
                bgt.s   skiphalvingvel         ; If not, branch and skip underwater commands
+
bgt.s .skiphalvingvel ; If not, branch and skip underwater commands
                asr.w   #$1,d0                 ; Half d0. Makes the ring's x_vel bounce to the left/right slower
+
asr.w d0 ; Half d0. Makes the ring's x_vel bounce to the left/right slower
                asr.w   #$1,d1                 ; Half d1. Makes the ring's y_vel bounce up/down slower
+
asr.w d1 ; Half d1. Makes the ring's y_vel bounce up/down slower
skiphalvingvel:
+
.skiphalvingvel:
                asl.w   d2,d0
+
asl.w d2,d0
                asl.w   d2,d1
+
asl.w d2,d1
                move.w d0,d2
+
move.w d0,d2
                move.w d1,d3
+
move.w d1,d3
                addi.b #$10,d4
+
addi.b #$10,d4
                bcc.s   loc_1A728
+
bcc.s loc_1A728
                subi.w #$80,d4
+
subi.w #$80,d4
                bcc.s   loc_1A728
+
bcc.s loc_1A728
                move.w #$288,d4
+
move.w #$288,d4
 
</asm>
 
</asm>
  
  
This ensures that when underwater, the rings x_vel and y_vel are halved so they appear to be moving slower.
+
This ensures that, when underwater, the rings' x_vel and y_vel are halved so they appear to be moving slower.
  
  
Next, go to label "loc_1A75C:" and under
+
Next, go to label "''loc_1A75C:''" and under this...
 
<asm>
 
<asm>
                move.b (Ring_spill_anim_frame).w,$22(a0)
+
move.b (Ring_spill_anim_frame).w,$22(a0)
                bsr.w   MoveSprite2
+
bsr.w MoveSprite2
                addi.w #$18,$1A(a0)
+
addi.w #$18,$1A(a0)
 
</asm>
 
</asm>
  
  
Put this:
+
...put this:
 
<asm>
 
<asm>
                tst.b   (Water_flag).w         ; Does the level have water?
+
tst.b (Water_flag).w ; Does the level have water?
                beq.s   skiphalvinggrav         ; If not, branch and skip underwater checks
+
beq.s .skiphalvinggrav ; If not, branch and skip underwater checks
                move.w (Water_level).w,d6     ; Move water level to d6
+
move.w (Water_level).w,d6 ; Move water level to d6
                cmp.w   y_pos(a0),d6           ; Is the ring object underneath the water level?
+
cmp.w y_pos(a0),d6 ; Is the ring object underneath the water level?
                bgt.s   skiphalvinggrav         ; If not, branch and skip underwater commands
+
bgt.s .skiphalvinggrav ; If not, branch and skip underwater commands
                subi.w #$E,$1A(a0)             ; Reduce gravity by $E ($18-$E=$A), giving the underwater effect
+
subi.w #$E,$1A(a0) ; Reduce gravity by $E ($18-$E=$A), giving the underwater effect
skiphalvinggrav:
+
.skiphalvinggrav:
 
</asm>
 
</asm>
  
Line 513: Line 461:
 
<asm>
 
<asm>
 
loc_1A75C:
 
loc_1A75C:
                move.b (Ring_spill_anim_frame).w,$22(a0)
+
move.b (Ring_spill_anim_frame).w,$22(a0)
                bsr.w   MoveSprite2
+
bsr.w MoveSprite2
                addi.w #$18,$1A(a0)
+
addi.w #$18,$1A(a0)
                tst.b   (Water_flag).w         ; Does the level have water?
+
tst.b (Water_flag).w ; Does the level have water?
                beq.s   skiphalvinggrav         ; If not, branch and skip underwater checks
+
beq.s .skiphalvinggrav ; If not, branch and skip underwater checks
                move.w (Water_level).w,d6     ; Move water level to d6
+
move.w (Water_level).w,d6 ; Move water level to d6
                cmp.w   y_pos(a0),d6           ; Is the ring object underneath the water level?
+
cmp.w y_pos(a0),d6 ; Is the ring object underneath the water level?
                bgt.s   skiphalvinggrav         ; If not, branch and skip underwater commands
+
bgt.s .skiphalvinggrav ; If not, branch and skip underwater commands
                subi.w #$E,$1A(a0)             ; Reduce gravity by $E ($18-$E=$A), giving the underwater effect
+
subi.w #$E,$1A(a0) ; Reduce gravity by $E ($18-$E=$A), giving the underwater effect
skiphalvinggrav:
+
.skiphalvinggrav:
                bmi.s   loc_1A7B0
+
bmi.s loc_1A7B0
                move.b (V_int_run_count+3).w,d0
+
move.b (V_int_run_count+3).w,d0
                add.b   d7,d0
+
add.b d7,d0
                andi.b #7,d0
+
andi.b #7,d0
                bne.s   loc_1A7B0
+
bne.s loc_1A7B0
                tst.b   4(a0)
+
tst.b 4(a0)
                bpl.s   loc_1A79C
+
bpl.s loc_1A79C
                jsr     (sub_F994).l
+
jsr (sub_F994).l
                tst.w   d1
+
tst.w d1
                bpl.s   loc_1A79C
+
bpl.s loc_1A79C
                add.w   d1,$14(a0)
+
add.w d1,$14(a0)
                move.w $1A(a0),d0
+
move.w $1A(a0),d0
                asr.w   #2,d0
+
asr.w #2,d0
                sub.w   d0,$1A(a0)
+
sub.w d0,$1A(a0)
                neg.w   $1A(a0)
+
neg.w $1A(a0)
 
</asm>
 
</asm>
  
  
This ensures when underwater, the gravity is not as great. Otherwise, the rings will gain speed and then it won't give the desired underwater effect.
+
This ensures that, when underwater, the gravity is not as great. Otherwise, the rings will gain speed and then it won't give the desired underwater effect.
  
  
 
This last bit is optional. You only need to do this if you're planning to have reverse gravity underwater. You'd be a bit mental if you do have this, but you never know =P
 
This last bit is optional. You only need to do this if you're planning to have reverse gravity underwater. You'd be a bit mental if you do have this, but you never know =P
  
Go to label "loc_1A7E8:" and under
+
Go to label "''loc_1A7E8:''" and under this...
 
<asm>
 
<asm>
                move.b (Ring_spill_anim_frame).w,$22(a0)
+
move.b (Ring_spill_anim_frame).w,$22(a0)
                bsr.w   MoveSprite_TestGravity2
+
bsr.w MoveSprite_TestGravity2
                addi.w #$18,$1A(a0)
+
addi.w #$18,$1A(a0)
 
</asm>
 
</asm>
  
  
Put this:
+
...put this:
 
<asm>
 
<asm>
                tst.b   (Water_flag).w         ; Does the level have water?
+
tst.b (Water_flag).w ; Does the level have water?
                beq.s   skiphalvingrevgrav             ; If not, branch and skip underwater checks
+
beq.s .skiphalvingrevgrav ; If not, branch and skip underwater checks
                move.w (Water_level).w,d6     ; Move water level to d6
+
move.w (Water_level).w,d6 ; Move water level to d6
                cmp.w   y_pos(a0),d6           ; Is the ring object underneath the water level?
+
cmp.w y_pos(a0),d6 ; Is the ring object underneath the water level?
                bgt.s   skiphalvingrevgrav             ; If not, branch and skip underwater commands
+
bgt.s .skiphalvingrevgrav ; If not, branch and skip underwater commands
                subi.w #$E,$1A(a0)             ; Reduce gravity by $E ($18-$E=$A), giving the underwater effect
+
subi.w #$E,$1A(a0) ; Reduce gravity by $E ($18-$E=$A), giving the underwater effect
skiphalvingrevgrav:
+
.skiphalvingrevgrav:
 
</asm>
 
</asm>
  
Line 571: Line 519:
 
loc_1A7E8:
 
loc_1A7E8:
  
                move.b (Ring_spill_anim_frame).w,$22(a0)
+
move.b (Ring_spill_anim_frame).w,$22(a0)
                bsr.w   MoveSprite_TestGravity2
+
bsr.w MoveSprite_TestGravity2
                addi.w #$18,$1A(a0)
+
addi.w #$18,$1A(a0)
                tst.b   (Water_flag).w         ; Does the level have water?
+
tst.b (Water_flag).w ; Does the level have water?
                beq.s   skiphalvingrevgrav     ; If not, branch and skip underwater checks
+
beq.s .skiphalvingrevgrav ; If not, branch and skip underwater checks
                move.w (Water_level).w,d6     ; Move water level to d6
+
move.w (Water_level).w,d6 ; Move water level to d6
                cmp.w   y_pos(a0),d6           ; Is the ring object underneath the water level?
+
cmp.w y_pos(a0),d6 ; Is the ring object underneath the water level?
                bgt.s   skiphalvingrevgrav     ; If not, branch and skip underwater commands
+
bgt.s .skiphalvingrevgrav ; If not, branch and skip underwater commands
                subi.w #$E,$1A(a0)             ; Reduce gravity by $E ($18-$E=$A), giving the underwater effect
+
subi.w #$E,$1A(a0) ; Reduce gravity by $E ($18-$E=$A), giving the underwater effect
skiphalvingrevgrav:
+
.skiphalvingrevgrav:
                bmi.s   loc_1A83C
+
bmi.s loc_1A83C
                move.b (V_int_run_count+3).w,d0
+
move.b (V_int_run_count+3).w,d0
                add.b   d7,d0
+
add.b d7,d0
                andi.b #7,d0
+
andi.b #7,d0
                bne.s   loc_1A83C
+
bne.s loc_1A83C
                tst.b   4(a0)
+
tst.b 4(a0)
                bpl.s   loc_1A828
+
bpl.s loc_1A828
                jsr     (sub_FCA0).l
+
jsr (sub_FCA0).l
                tst.w   d1
+
tst.w d1
                bpl.s   loc_1A828
+
bpl.s loc_1A828
                sub.w   d1,$14(a0)
+
sub.w d1,$14(a0)
                move.w $1A(a0),d0
+
move.w $1A(a0),d0
                asr.w   #2,d0
+
asr.w #2,d0
                sub.w   d0,$1A(a0)
+
sub.w d0,$1A(a0)
                neg.w   $1A(a0)
+
neg.w $1A(a0)
 
</asm>
 
</asm>
  
  
This ensures when underwater, the gravity is not as great when it's in reverse gravity mode.
+
This ensures that, when underwater, the gravity is not as great when it's in reverse gravity mode.
  
  

Revision as of 14:12, 12 September 2014

(Original guide for all 3 games by redhotsonic)

Quote from redhotsonic, - "Ah, the scattered rings when you get hurt. It can cause slowdown to your game, and even mess up the underwater palette. Now, when Sonic is underwater, his movement and his gravity is changed so he moves slower to act like he's in water. But when he is hurt under water, isn't it funny that the scattered rings still act the same as if you weren't in water?"

This is something that occurs in all 3 Sonic the Hedgehog Mega Drive games (and by 3, that IS counting S3&K as one game, though S&K has no water anyway, so it wouldn't be included regardless... but I digress). But is it really a bug, or is it merely a design choice? In either case, it's something that could stand to be fixed, and this guide tells you how to fix the ring physics in all of the games. First off... let's start with the original:


Sonic 1 fix

This guide uses the Git disassembly.

First, in your disassembly, go to "_incObj\25 & 37 Rings.asm" Go to @makerings: (part of the scattered rings object code) and find this bit of coding: <asm> bsr.w CalcSine move.w d4,d2 lsr.w #8,d2 </asm>


Just underneath, paste this: <asm> tst.b ($FFFFF64C).w ; Does the level have water? beq.s @skiphalvingvel ; If not, branch and skip underwater checks move.w ($FFFFF646).w,d6 ; Move water level to d6 cmp.w obY(a0),d6 ; Is the ring object underneath the water level? bgt.s @skiphalvingvel ; If not, branch and skip underwater commands asr.w d0 ; Half d0. Makes the ring's x_vel bounce to the left/right slower asr.w d1 ; Half d1. Makes the ring's y_vel bounce up/down slower @skiphalvingvel: </asm>


You should end up with something looking like this: <asm> @makerings: move.b #id_RingLoss,0(a1) ; load bouncing ring object addq.b #2,obRoutine(a1) move.b #8,obHeight(a1) move.b #8,obWidth(a1) move.w obX(a0),obX(a1) move.w obY(a0),obY(a1) move.l #Map_Ring,obMap(a1) move.w #$27B2,obGfx(a1) move.b #4,obRender(a1) move.b #3,obPriority(a1) move.b #$47,obColType(a1) move.b #8,obActWid(a1) move.b #-1,(v_ani3_time).w tst.w d4 bmi.s @loc_9D62 move.w d4,d0 bsr.w CalcSine move.w d4,d2 lsr.w #8,d2 tst.b ($FFFFF64C).w ; Does the level have water? beq.s @skiphalvingvel ; If not, branch and skip underwater checks move.w ($FFFFF646).w,d6 ; Move water level to d6 cmp.w obY(a0),d6 ; Is the ring object underneath the water level? bgt.s @skiphalvingvel ; If not, branch and skip underwater commands asr.w d0 ; Half d0. Makes the ring's x_vel bounce to the left/right slower asr.w d1 ; Half d1. Makes the ring's y_vel bounce up/down slower @skiphalvingvel: asl.w d2,d0 asl.w d2,d1 move.w d0,d2 move.w d1,d3 addi.b #$10,d4 bcc.s @loc_9D62 subi.w #$80,d4 bcc.s @loc_9D62 move.w #$288,d4 </asm>


This ensures that, when underwater, the rings' x_vel and y_vel are halved so they appear to be moving slower.

Next, go to label "RLoss_Bounce:" and under this... <asm> move.b (v_ani3_frame).w,obFrame(a0) bsr.w SpeedToPos addi.w #$18,obVelY(a0) </asm>


...place this: <asm> tst.b ($FFFFF64C).w ; Does the level have water? beq.s @skipbounceslow ; If not, branch and skip underwater checks move.w ($FFFFF646).w,d6 ; Move water level to d6 cmp.w obY(a0),d6 ; Is the ring object underneath the water level? bgt.s @skipbounceslow ; If not, branch and skip underwater commands subi.w #$E,obVelY(a0) ; Reduce gravity by $E ($18-$E=$A), giving the underwater effect @skipbounceslow: </asm>


You can change the value of the gravity if you like, but I found $E to suit. Anyway, you should have something looking like this: <asm> RLoss_Bounce: ; Routine 2 move.b (v_ani3_frame).w,obFrame(a0) bsr.w SpeedToPos addi.w #$18,obVelY(a0) tst.b ($FFFFF64C).w ; Does the level have water? beq.s @skipbounceslow ; If not, branch and skip underwater checks move.w ($FFFFF646).w,d6 ; Move water level to d6 cmp.w obY(a0),d6 ; Is the ring object underneath the water level? bgt.s @skipbounceslow ; If not, branch and skip underwater commands subi.w #$E,obVelY(a0) ; Reduce gravity by $E ($18-$E=$A), giving the underwater effect @skipbounceslow: bmi.s @chkdel move.b (v_vbla_byte).w,d0 add.b d7,d0 andi.b #3,d0 bne.s @chkdel jsr ObjFloorDist tst.w d1 bpl.s @chkdel add.w d1,obY(a0) move.w obVelY(a0),d0 asr.w #2,d0 sub.w d0,obVelY(a0) neg.w obVelY(a0) </asm>


This ensures that, when underwater, the gravity is not as great. Otherwise, the rings will gain speed and then it won't give the desired underwater effect.

Sonic 2 fix

This guide uses the Xenowhirl disassembly, but notes for Git users are available.

First, go to "loc_120BA:" (part of the scattered rings object code. Git users, Obj37_Init, three '+'s down) and find this bit of coding: <asm> bsr.w JmpTo4_CalcSine move.w d4,d2 lsr.w #8,d2 </asm>


Just underneath, paste this: <asm> tst.b (Water_flag).w ; Does the level have water? beq.s .skiphalvingvel ; If not, branch and skip underwater checks move.w (Water_Level_2).w,d6 ; Move water level to d6 cmp.w y_pos(a0),d6 ; Is the ring object underneath the water level? bgt.s .skiphalvingvel ; If not, branch and skip underwater commands asr.w d0 ; Half d0. Makes the ring's x_vel bounce to the left/right slower asr.w d1 ; Half d1. Makes the ring's y_vel bounce up/down slower .skiphalvingvel: </asm>


So, you should end up with something looking like this: <asm> loc_120BA: _move.b #$37,0(a1) ; load obj37 addq.b #2,routine(a1) move.b #8,y_radius(a1) move.b #8,x_radius(a1) move.w x_pos(a0),x_pos(a1) move.w y_pos(a0),y_pos(a1) move.l #Obj25_MapUnc_12382,mappings(a1) move.w #$26BC,art_tile(a1) bsr.w Adjust2PArtPointer2 move.b #$84,render_flags(a1) move.b #3,priority(a1) move.b #$47,collision_flags(a1) move.b #8,width_pixels(a1) move.b #-1,(Ring_spill_anim_counter).w tst.w d4 bmi.s loc_12132 move.w d4,d0 bsr.w JmpTo4_CalcSine move.w d4,d2 lsr.w #8,d2 tst.b (Water_flag).w ; Does the level have water? beq.s .skiphalvingvel ; If not, branch and skip underwater checks move.w (Water_Level_2).w,d6 ; Move water level to d6 cmp.w y_pos(a0),d6 ; Is the ring object underneath the water level? bgt.s .skiphalvingvel ; If not, branch and skip underwater commands asr.w d0 ; Half d0. Makes the ring's x_vel bounce to the left/right slower asr.w d1 ; Half d1. Makes the ring's y_vel bounce up/down slower .skiphalvingvel: asl.w d2,d0 asl.w d2,d1 move.w d0,d2 move.w d1,d3 addi.b #$10,d4 bcc.s loc_12132 subi.w #$80,d4 bcc.s loc_12132 move.w #$288,d4 </asm>


This ensures that, when underwater, the rings' x_vel and y_vel are halved so they appear to be moving slower.


Next, go to label "Obj_37_sub_2:" and under this... <asm> move.b (Ring_spill_anim_frame).w,mapping_frame(a0) bsr.w ObjectMove addi.w #$18,y_vel(a0) </asm>


...put this: <asm> tst.b (Water_flag).w ; Does the level have water? beq.s .skipbounceslow ; If not, branch and skip underwater checks move.w (Water_Level_2).w,d6 ; Move water level to d6 cmp.w y_pos(a0),d6 ; Is the ring object underneath the water level? bgt.s .skipbounceslow ; If not, branch and skip underwater commands subi.w #$E,y_vel(a0) ; Reduce gravity by $E ($18-$E=$A), giving the underwater effect for the rings .skipbounceslow: </asm>


You can change the value of the gravity if you like, but I found $E to suit. Anyway, you should have something looking like this: <asm> Obj_37_sub_2: move.b (Ring_spill_anim_frame).w,mapping_frame(a0) bsr.w ObjectMove addi.w #$18,y_vel(a0) tst.b (Water_flag).w ; Does the level have water? beq.s .skipbounceslow ; If not, branch and skip underwater checks move.w (Water_Level_2).w,d6 ; Move water level to d6 cmp.w y_pos(a0),d6 ; Is the ring object underneath the water level? bgt.s .skipbounceslow ; If not, branch and skip underwater commands subi.w #$E,y_vel(a0) ; Reduce gravity by $E ($18-$E=$A), giving the underwater effect for the rings .skipbounceslow: bmi.s loc_121B8 move.b ($FFFFFE0F).w,d0 add.b d7,d0 andi.b #7,d0 bne.s loc_121B8 tst.b render_flags(a0) bpl.s loc_121D0 jsr (RingCheckFloorDist).l tst.w d1 bpl.s loc_121B8 add.w d1,y_pos(a0) move.w y_vel(a0),d0 asr.w #2,d0 sub.w d0,y_vel(a0) neg.w y_vel(a0) </asm>


This ensures that, when underwater, the gravity is not as great. Otherwise, the rings will gain speed and then it won't give the desired underwater effect.

Sonic 3&K fix

This guide uses the SVN disassembly.

Go to "off_1A658:" (the routines of the scattered rings). You'll see that its first job is to go to "loc_1A67A". That needs changing to "loc_1A68C". So, find this... <asm> off_1A658: dc.w loc_1A67A-off_1A658

dc.w loc_1A75C-off_1A658 dc.w loc_1A7C2-off_1A658 dc.w loc_1A7D6-off_1A658 dc.w loc_1A7E4-off_1A658 </asm>


...and replace it with this: <asm> off_1A658: dc.w loc_1A68C-off_1A658

dc.w loc_1A75C-off_1A658 dc.w loc_1A7C2-off_1A658 dc.w loc_1A7D6-off_1A658 dc.w loc_1A7E4-off_1A658 </asm>


This will skip "loc_1A67A" commands. This is because this location pushes the scattered rings object (or the reverse scattered rings object) to d6. For our water code, we need d6, because all other data registers are being used. It doesn't do this in Sonic 1 or 2 because there's no such thing as "reverse gravity". The scattered rings object needs to be moved to a1, but we can't do it here, because shortly after, a1 is being used for the amount of rings.

Next, go to "off_1A670:" This is extremely similar to what we just done, but for reverse gravity, so there's no point explaining what it's doing here as I just did that. Anyway, you should see this... <asm> off_1A670: dc.w loc_1A67A-off_1A670

dc.w loc_1A7E8-off_1A670 dc.w loc_1A7C2-off_1A670 dc.w loc_1A7D6-off_1A670 dc.w loc_1A7E4-off_1A670 </asm>


...replace it with: <asm> off_1A670: dc.w loc_1A68C-off_1A670

dc.w loc_1A7E8-off_1A670 dc.w loc_1A7C2-off_1A670 dc.w loc_1A7D6-off_1A670 dc.w loc_1A7E4-off_1A670 </asm>


Again, this will skip "loc_1A67A" commands. Explained why above.

Next, go to "loc_1A67A:" and you should see this: <asm> loc_1A67A:

move.l #Obj_Bouncing_Ring,d6 tst.b (Reverse_gravity_flag).w beq.s loc_1A68C move.l #Obj_Bouncing_Ring_Reverse_Gravity,d6 </asm>


Notice "Bouncing_Ring" (and the reverse one) is being pushed to d6. We need d6, so, delete it. It's no longer needed. Trust me. We have now freed d6, although we've lost pushing the scattered rings into place. Do not worry, that's next.


Next, go to "loc_1A6B6:". The very first command should be "addq.b #2,5(a1)" Just before that, add this: <asm> move.l #Obj_Bouncing_Ring,(a1) tst.b (Reverse_gravity_flag).w beq.s .notreverse move.l #Obj_Bouncing_Ring_Reverse_Gravity,(a1) .notreverse: </asm>


Yes, you might recognize this. It's part of that code you'd just deleted. We're pushing the scattered rings back into place. But instead of putting it to d6, we're putting it to a1. a1 is now available as it's not being used again for a while.

So you have something looking at this: <asm> loc_1A6B6: move.l #Obj_Bouncing_Ring,(a1) tst.b (Reverse_gravity_flag).w beq.s .notreverse move.l #Obj_Bouncing_Ring_Reverse_Gravity,(a1) .notreverse: addq.b #2,5(a1) move.b #8,$1E(a1) move.b #8,$1F(a1) move.w $10(a0),$10(a1) move.w $14(a0),$14(a1) move.l #Map_Ring,$C(a1) move.w #$A6BC,$A(a1) move.b #$84,4(a1) move.w #$180,8(a1) move.b #$47,$28(a1) move.b #8,7(a1) move.b #-1,(Ring_spill_anim_counter).w tst.w d4 bmi.s loc_1A728 move.w d4,d0 jsr (GetSineCosine).l move.w d4,d2 lsr.w #8,d2 asl.w d2,d0 asl.w d2,d1 move.w d0,d2 move.w d1,d3 addi.b #$10,d4 bcc.s loc_1A728 subi.w #$80,d4 bcc.s loc_1A728 move.w #$288,d4 </asm>


Still looking at "loc_1A6B6:", look and find this bit of coding: <asm> jsr (GetSineCosine).l move.w d4,d2 lsr.w #8,d2 </asm>


Just underneath, paste this: <asm> tst.b (Water_flag).w ; Does the level have water? beq.s .skiphalvingvel ; If not, branch and skip underwater checks move.w (Water_level).w,d6 ; Move water level to d6 cmp.w y_pos(a0),d6 ; Is the ring object underneath the water level? bgt.s .skiphalvingvel ; If not, branch and skip underwater commands asr.w d0 ; Half d0. Makes the ring's x_vel bounce to the left/right slower asr.w d1 ; Half d1. Makes the ring's y_vel bounce up/down slower .skiphalvingvel: </asm>


So, you should end up with something looking like this: <asm> loc_1A6B6: move.l #Obj_Bouncing_Ring,(a1) tst.b (Reverse_gravity_flag).w beq.s .notreverse move.l #Obj_Bouncing_Ring_Reverse_Gravity,(a1) .notreverse: addq.b #2,5(a1) move.b #8,$1E(a1) move.b #8,$1F(a1) move.w $10(a0),$10(a1) move.w $14(a0),$14(a1) move.l #Map_Ring,$C(a1) move.w #$A6BC,$A(a1) move.b #$84,4(a1) move.w #$180,8(a1) move.b #$47,$28(a1) move.b #8,7(a1) move.b #-1,(Ring_spill_anim_counter).w tst.w d4 bmi.s loc_1A728 move.w d4,d0 jsr (GetSineCosine).l move.w d4,d2 lsr.w #8,d2 tst.b (Water_flag).w ; Does the level have water? beq.s .skiphalvingvel ; If not, branch and skip underwater checks move.w (Water_level).w,d6 ; Move water level to d6 cmp.w y_pos(a0),d6 ; Is the ring object underneath the water level? bgt.s .skiphalvingvel ; If not, branch and skip underwater commands asr.w d0 ; Half d0. Makes the ring's x_vel bounce to the left/right slower asr.w d1 ; Half d1. Makes the ring's y_vel bounce up/down slower .skiphalvingvel: asl.w d2,d0 asl.w d2,d1 move.w d0,d2 move.w d1,d3 addi.b #$10,d4 bcc.s loc_1A728 subi.w #$80,d4 bcc.s loc_1A728 move.w #$288,d4 </asm>


This ensures that, when underwater, the rings' x_vel and y_vel are halved so they appear to be moving slower.


Next, go to label "loc_1A75C:" and under this... <asm> move.b (Ring_spill_anim_frame).w,$22(a0) bsr.w MoveSprite2 addi.w #$18,$1A(a0) </asm>


...put this: <asm> tst.b (Water_flag).w ; Does the level have water? beq.s .skiphalvinggrav ; If not, branch and skip underwater checks move.w (Water_level).w,d6 ; Move water level to d6 cmp.w y_pos(a0),d6 ; Is the ring object underneath the water level? bgt.s .skiphalvinggrav ; If not, branch and skip underwater commands subi.w #$E,$1A(a0) ; Reduce gravity by $E ($18-$E=$A), giving the underwater effect .skiphalvinggrav: </asm>


You can change the value of the gravity if you like, but I found $E to suit. Anyway, you should have something looking like this: <asm> loc_1A75C: move.b (Ring_spill_anim_frame).w,$22(a0) bsr.w MoveSprite2 addi.w #$18,$1A(a0) tst.b (Water_flag).w ; Does the level have water? beq.s .skiphalvinggrav ; If not, branch and skip underwater checks move.w (Water_level).w,d6 ; Move water level to d6 cmp.w y_pos(a0),d6 ; Is the ring object underneath the water level? bgt.s .skiphalvinggrav ; If not, branch and skip underwater commands subi.w #$E,$1A(a0) ; Reduce gravity by $E ($18-$E=$A), giving the underwater effect .skiphalvinggrav: bmi.s loc_1A7B0 move.b (V_int_run_count+3).w,d0 add.b d7,d0 andi.b #7,d0 bne.s loc_1A7B0 tst.b 4(a0) bpl.s loc_1A79C jsr (sub_F994).l tst.w d1 bpl.s loc_1A79C add.w d1,$14(a0) move.w $1A(a0),d0 asr.w #2,d0 sub.w d0,$1A(a0) neg.w $1A(a0) </asm>


This ensures that, when underwater, the gravity is not as great. Otherwise, the rings will gain speed and then it won't give the desired underwater effect.


This last bit is optional. You only need to do this if you're planning to have reverse gravity underwater. You'd be a bit mental if you do have this, but you never know =P

Go to label "loc_1A7E8:" and under this... <asm> move.b (Ring_spill_anim_frame).w,$22(a0) bsr.w MoveSprite_TestGravity2 addi.w #$18,$1A(a0) </asm>


...put this: <asm> tst.b (Water_flag).w ; Does the level have water? beq.s .skiphalvingrevgrav ; If not, branch and skip underwater checks move.w (Water_level).w,d6 ; Move water level to d6 cmp.w y_pos(a0),d6 ; Is the ring object underneath the water level? bgt.s .skiphalvingrevgrav ; If not, branch and skip underwater commands subi.w #$E,$1A(a0) ; Reduce gravity by $E ($18-$E=$A), giving the underwater effect .skiphalvingrevgrav: </asm>


Again, you can change the value of the reverse gravity if you like. So, you should have something looking like this: <asm> loc_1A7E8:

move.b (Ring_spill_anim_frame).w,$22(a0) bsr.w MoveSprite_TestGravity2 addi.w #$18,$1A(a0) tst.b (Water_flag).w ; Does the level have water? beq.s .skiphalvingrevgrav ; If not, branch and skip underwater checks move.w (Water_level).w,d6 ; Move water level to d6 cmp.w y_pos(a0),d6 ; Is the ring object underneath the water level? bgt.s .skiphalvingrevgrav ; If not, branch and skip underwater commands subi.w #$E,$1A(a0) ; Reduce gravity by $E ($18-$E=$A), giving the underwater effect .skiphalvingrevgrav: bmi.s loc_1A83C move.b (V_int_run_count+3).w,d0 add.b d7,d0 andi.b #7,d0 bne.s loc_1A83C tst.b 4(a0) bpl.s loc_1A828 jsr (sub_FCA0).l tst.w d1 bpl.s loc_1A828 sub.w d1,$14(a0) move.w $1A(a0),d0 asr.w #2,d0 sub.w d0,$1A(a0) neg.w $1A(a0) </asm>


This ensures that, when underwater, the gravity is not as great when it's in reverse gravity mode.


SCHG How-To Guide: Sonic the Hedgehog (16-bit)
Fixing Bugs
Fix Demo Playback | Fix a Race Condition with Pattern Load Cues | Fix the SEGA Sound | Display the Press Start Button Text | Fix the Level Select Menu | Fix the Hidden Points Bug | Fix Accidental Deletion of Scattered Rings | Fix Ring Timers | Fix the Walk-Jump Bug | Correct Drowning Bugs | Fix the Death Boundary Bug | Fix the Camera Follow Bug | Fix Song Restoration Bugs | Fix the HUD Blinking | Fix the Level Select Graphics Bug | Fix a remember sprite related bug
Changing Design Choices
Change Spike Behavior | Collide with Water After Being Hurt | Fix Special Stage Jumping Physics | Improve the Fade In\Fade Out Progression Routines | Fix Scattered Rings' Underwater Physics | Remove the Speed Cap | Port the REV01 Background Effects | Port Sonic 2's Level Art Loader | Retain Rings Between Acts | Add Sonic 2 (Simon Wai Prototype) Level Select | Improve ObjectMove Subroutines | Port Sonic 2 Level Select
Adding Features
Add Spin Dash ( Part 1 / Part 2 / Part 3 / Part 4 ) | Add Eggman Monitor | Add Super Sonic | Add the Air Roll
Sound Features
Expand the Sound Index | Play Different Songs Per Act | Port Sonic 2 Final Sound Driver | Port Sonic 3's Sound Driver | Port Flamewing's Sonic 3 & Knuckles Sound Driver | Change The SEGA Sound
Extending the Game
Load Chunks From ROM | Add Extra Characters | Make an Alternative Title Screen | Use Dynamic Tilesets | Make GHZ Load Alternate Art | Make Ending Load Alternate Art | Add a New Zone | Set Up the Goggle Monitor | Add New Moves | Add a Dynamic Collision System | Dynamic Special Stage Walls System | Extend Sprite Mappings and Art Limit | Enigma Credits | Use Dynamic Palettes
Miscellaneous
Convert the Hivebrain 2005 Disassembly to ASM68K
Split Disassembly Guides
Set Up a Split Disassembly | Basic Level Editing | Basic Art Editing | Basic ASM Editing (Spin Dash)
SCHG How-To Guide: Sonic the Hedgehog 2 (16-bit)
Fixing Bugs
Fix Demo Playback | Fix a Race Condition with Pattern Load Cues | Fix Super Sonic Bugs | Use Correct Height When Roll Jumping | Fix Jump Height Bug When Exiting Water | Fix Screen Boundary Spin Dash Bug | Correct Drowning Bugs | Fix Camera Y Position for Tails | Fix Tails Subanimation Error | Fix Tails' Respawn Speeds | Fix Accidental Deletion of Scattered Rings | Fix Ring Timers | Fix Rexon Crash | Fix Monitor Collision Bug | Fix EHZ Deformation Bug | Correct CPZ Boss Attack Behavior | Fix Bug in ARZ Boss Arrow's Platform Behavior | Fix ARZ Boss Walking on Air Glitch | Fix ARZ Boss Sprite Behavior | Fix Multiple CNZ Boss Bugs | Fix HTZ Background Scrolling Mountains | Fix OOZ Launcher Speed Up Glitch | Fix DEZ Giant Mech Collision Glitch | Fix Boss Deconstruction Behavior | Fix Speed Bugs | Fix 14 Continues Cheat | Fix Debug Mode Crash | Fix 99+ Lives | Fix Sonic 2's Sega Screen
Design Choices
Remove the Air Speed Cap | Disable Floor Collision While Dying | Modify Super Sonic Transformation Methods & Behavior | Enable/Disable Tails in Certain Levels | Collide with Water After Being Hurt | Retain Rings When Returning at a Star Post | Improve the Fade In\Fade Out Progression Routines | Fix Scattered Rings' Underwater Physics | Insert LZ Water Ripple Effect | Restore Lost CPZ Boss Feature | Prevent SCZ Tornado Spin Dash Death | Improve ObjectMove Subroutines | Port S3K Rings Manager | Port S3K Object Manager | Port S3K Priority Manager | Edit Level Order with ASM‎ | Alter Ring Requirements in Special Stages | Make Special Stage Characters Use Normal DPLCs | Speed Up Ring Loss Process | Change spike behaviour in Sonic 2
Adding Features
Create Insta-kill and High Jump Monitors | Create Clone and Special Stage Monitors | Port Knuckles
Sound Features
Expand Music Index to Start at $00 | Port Sonic 1 Sound Driver | Port Sonic 2 Clone Driver | Port Sonic 3 Sound Driver | Port Flamewing's Sonic 3 & Knuckles Sound Driver | Expand the Music Index to Start at $00 (Sonic 2 Clone Driver Version) | Play Different Songs Per Act
Extending the Game
Extend the Level Index Past $10 | Extend the Level Select | Extend Water Tables | Add Extra Characters | Free Up 2 Universal SSTs