Smash Remix 1.2.2

JSsixtyfour · Sep 7, 2022 · 4efb87f · 4efb87f
1 parent 99d29aa
commit 4efb87f
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 20 deletions.
diff --git a/original.xdelta b/original.xdelta
diff --git a/src/Boot.asm b/src/Boot.asm
@@ -139,7 +139,7 @@ scope Boot {
         nop
     }
 
-    string_version:; String.insert("Smash Remix v1.2.1")
+    string_version:; String.insert("Smash Remix v1.2.2")
 
     // @ Description
     // Nintendo 64 logo cannot be skipped.

diff --git a/src/KirbyHats.asm b/src/KirbyHats.asm
@@ -607,31 +607,36 @@ scope KirbyHats {
         j       _return
         lw      a0, 0x0084(a0)              // original line 2
     }
-    
+
     // @ Description
     // Prevents kirby from having his power ID set to 0
     scope kirby_power_loss_prevent_: {
-        OS.patch_start(0xD18E4, 0x80156EA4)
+        OS.patch_start(0xDE060, 0x80163620)
         j       kirby_power_loss_prevent_
-        lbu     a1, 0x000D(a0)              // amount of port loops
+        addiu   a0, r0, Character.id.KIRBY
         _return:
         OS.patch_end()
-
+        
+        lw      a2, 0x0008(t8)              // load character ID
+        beq     a0, a2, _check              // check if kirby
+        addiu   a0, r0, Character.id.JKIRBY // JKIRBY ID     
+        bnel    a0, a2, _no_kirbyhat_selected   // check if jkirby
+        sw      t7, 0x0ADC(t8)              // original line 2, remove power
+        
+        _check:
         li      a2, spawn_with_hat          // pointer to kirby hat settings
-
+        lbu     a0, 0x000D(t8)              // amount of port loops
+        
         _loop:
-        sll     a1, a1, 0x0002              // a1 = offset to port
-        addu    a1, a2, a1                  // a0 = address of spawn with hat id
-        lbu     a2, 0x0003(a1)              // at = hat_id
+        sll     a0, a0, 0x0002              // a1 = offset to port
+        addu    a0, a2, a0                  // a0 = address of spawn with hat id
+        lbu     a2, 0x0003(a0)              // at = hat_id
         
         beqzl   a2, _no_kirbyhat_selected   // if default, remove power, if have a hat selected, do not
-        sw      r0, 0x0AE0(a0)              // original line 2, remove power
-
-        _no_kirbyhat_selected:
-        jal     0x80156E60                  // original line 1
-        nop
+        sw      t7, 0x0ADC(t8)              // original line 1, remove power
         
+        _no_kirbyhat_selected:
         j       _return
-        nop
+        lw      a0, 0x0020(sp)              // original line 2
     }
 }
diff --git a/src/SRAM.asm b/src/SRAM.asm
@@ -19,7 +19,7 @@ scope SRAM {
     //  - A new MIDI is added
     //  - A new toggle is added
     //  - The order of the toggles is changed
-    constant REVISION(0x0083)
+    constant REVISION(0x0084)
 
     // @ Description
     // Struct that holds information for a block of save data.

diff --git a/src/Sheik/SheikSpecial.asm b/src/Sheik/SheikSpecial.asm
@@ -1506,7 +1506,7 @@ scope SheikNSP {
         jal     0x800E6F24                  // change action
         sw      t6, 0x0024(sp)              // 0x0024(sp) = player struct
 
-
+        lw      t9, 0x0024(sp)              // 0x0024(sp) = player struct
         lw      t7, 0x0008(t9)              // t7 = current character ID
         lli     at, Character.id.KIRBY      // at = id.KIRBY
         beq     t7, at, _kirby              // branch if character = KIRBY

diff --git a/src/items/BlueShell.asm b/src/items/BlueShell.asm
@@ -1375,11 +1375,14 @@ scope target_player_: {
     lw      v0, 0x0074(a0)              // v0 = item object
 
     beqz    s0, _apply_speed            // skip if no player found
-    or      s1, r0, r0                  // s1(i) = 0
+    nop
+    lw      at, 0x0074(s0)              // a1 = player location struct
+    beqz    at, _apply_speed            // failsafe, use current speed if no player coords
+    nop
+    or      a1, at, r0                  // if here, a1 = player location struct
 
     lwc1    f20, 0x0048(sp)             // f20 = 0
     addiu   s3, sp, 0x003c              // s3 = some pointer in sp
-    lw      a1, 0x0074(s0)              // a1 = player location struct
     addiu   s2, v0, 0x001c              // s2 = item object.x
 
     or      a0, s3, r0                  //

diff --git a/src/stages/zebes_o.asm b/src/stages/zebes_o.asm
@@ -4,7 +4,7 @@ constant NUM_SPRITE_INFO_ARRAYS(0x03)
 
 // @ Description
 // Not sure what the data is at this offset.
-constant STAGE_FILE_OFFSET(0x00006CC8)
+constant STAGE_FILE_OFFSET(0x00007128)
 
 // @ Description
 // Here, need to add a sprite info array for each sprite animation option

diff --git a/src/stages/zebes_o.bin b/src/stages/zebes_o.bin