fixed some yoshi issues

TheLX5 · Feb 24, 2021 · 7e58f22 · 7e58f22
1 parent d6bb970
commit 7e58f22
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/pixi/asm/dss/original_sprites/shared_gfx_routines.asm b/pixi/asm/dss/original_sprites/shared_gfx_routines.asm
@@ -286,6 +286,8 @@ pushpc
             pei ($00)
             ldy !9E,x
             lda !1602,x
+            cmp #$FF
+            beq .original
             clc
             adc.w shared_sprite_offset,y
             tax
@@ -305,9 +307,9 @@ pushpc
         .original
             jml third_shared_gfx_original
 
-        warnpc $019F40
+        warnpc $019F44
 
-    org $019F40
+    org $019F44
         third_shared_gfx_end:
 pullpc
 
@@ -467,6 +469,9 @@ pullpc
         lsr 
         lda #$00
         ora !15F6,x
+        bcs .flip
+        eor #$40
+    .flip
         jml third_shared_gfx_end
 
     third_shared_gfx:

diff --git a/pixi/asm/dss/original_sprites/yoshi_egg.asm b/pixi/asm/dss/original_sprites/yoshi_egg.asm
@@ -17,6 +17,9 @@ pushpc
         warnpc $01F7C1
     org $01F7C1
         hatching_egg_write_end:
+    org $018335
+        yoshi_egg_props_2:
+            db $09,$07,$05,$07
 
 pullpc
 

diff --git a/pixi/asm/dss/remaps.asm b/pixi/asm/dss/remaps.asm
@@ -77,6 +77,16 @@ pushpc
     org $028EB2
         yoshi_egg_piece_tilemap:
             db !yoshi_egg_tile
+    org $028EBC
+        yoshi_egg_piece_props:
+            db $02
+
+    org $01F08B
+        yoshi_throat_tilemap:
+            db !yoshi_throat_tile
+    org $01F097
+        yoshi_throat_props:
+            db $00
 
     org $029F5C
         water_bubble_tilemap:

diff --git a/pixi/asm/dss/tweaker.asm b/pixi/asm/dss/tweaker.asm
@@ -9,7 +9,7 @@ pushpc
         db $85,$0B,$09,$01,$13,$15,$09,$4F		; f = disable fireball killing
 
         db $1C,$24,$0B,$09,$0B,$09,$33,$33		; ppp = palette
-        db $FD,$2B,$09,$35,$3A,$3A,$19,$3B		; g = use second graphics page
+        db $FD,$2B,$09,$35,$3B,$3A,$19,$3B		; g = use second graphics page
 
         db $13,$13,$13,$34,$39,$2A,$15,$F3
         db $FD,$FD,$37,$37,$37,$C7,$31,$05