v1.9.15

Author: jamesbrq

asm/Logic.asm

@@ -7,6 +7,16 @@
     .include "Sprites.asm"
     .include "Pipes.asm"
 
+
+    .org 0x08289EFA ; Mom piranha battle script disable
+        db 0x2, 0x20, 0x60, 0x9F, 0x28, 0x8
+
+    .org 0x0829008E ; Mom piranha healing disable
+        db 0x2, 0x20, 0x96, 0x00, 0x29, 0x8
+
+    .org 0x08292187 ; Hermie healing disable
+        db 0x2, 0x20, 0x8F, 0x21, 0x29, 0x8
+
     .org 0x08240290 ; Prevent neon egg turn in from removing 7 beanfruits
         db 0x2, 0x0
         dw 0x082402C1
@@ -6086,6 +6096,36 @@
 
 
 
+    .org MOM_PIRANHA
+    push lr
+    ldr r0, =0x02004309
+    ldrb r0, [r0]
+    mov r1, #0x8
+    and r1, r0
+    cmp r1, #0x8
+    bne .mp_end
+    ldr r0, =0x0200433D
+    ldrb r1, [r0]
+    mov r2, #0x2
+    orr r1, r2
+    strb r1, [r0]
+    ldr r0, =0x0200433E
+    ldrb r1, [r0]
+    mov r2, #0x80
+    orr r1, r2
+    strb r1, [r0]
+    ldr r0, =0x0200433F
+    ldrb r1, [r0]
+    mov r2, #0x7
+    orr r1, r2
+    strb r1, [r0]
+    .mp_end:
+    pop pc
+    .pool
+
+
+
+
 
     .org ROCK_BLOCK
     push lr
@@ -7116,6 +7156,7 @@
     bl BLABLANADON
     bl PEACH_ARRIVAL
     bl ULTRA_HAMMERS
+    bl MOM_PIRANHA
     ldr r0, =FAWFUL_STONE
     ldrb r0, [r0]
     mov r1, #0x1

asm/Sprites.asm

@@ -7,7 +7,10 @@ WINKLE_FIX equ 0x0821E477
 	db 0x0
 
 .org NOTHING_BRANCH_HOOK
-	dw NOTHING_BRANCH_SCRIPT
+	;dw NOTHING_BRANCH_SCRIPT
+
+.org 0x080f15fa ;VERY EXPERIMENTAL SPRITE CHANGE
+	db 0x0, 0x21
 
 .org NOTHING_BRANCH_SCRIPT
 	db 0x13, 0x14, 0x0, 0x82, 0x0

asm/Variables.asm

@@ -371,4 +371,5 @@
     EMBLEM_OPTION equ 0x08D00008
     EMBLEM_REQUIRED equ 0x08D00009
     BORDER_JUMP_HOOK equ 0x08164978
-    BORDER_JUMP_SUBR equ 0x081E0BB0
+    BORDER_JUMP_SUBR equ 0x081E0BB0
+    MOM_PIRANHA equ 0x08E01800

items/Enemies/BossEncounters.txt

@@ -5,6 +5,7 @@
 0x50360C,
 0x5037AC,
 0x5037CC,
+0x50396C,
 0x503A8C,
 0x503D6C,
 0x503F0C,