Added custom gfx for Ped and Murahdahla

elder.asm

@@ -142,19 +142,35 @@ MasterSword_CheckIfPulled:
 
 MasterSword_ConditionalActivateCutscene:
     LDA.w SpriteMovement,X : BNE .specialCutscene
+        PHX
+            REP #$30
+            LDA.w SprRedrawFlag, X : BNE .doNormalPed
+            INC.w SprRedrawFlag, X
+            LDA.l PedPullGfx : BEQ .doNormalPed
+            LDX.w ItemStackPtr : STA.l ItemGFXStack,X
+            LDA.w #$BCE0>>1 : STA.l ItemTargetStack,X
+            TXA : INC #2 : STA.w ItemStackPtr
+    .doNormalPed
+            SEP #$30
+        PLX
         JML Sprite_CheckDamageToPlayerSameLayerLong ; what we wrote over
     .specialCutscene
     LDA.b #$02 : STA.w ItemReceiptPose ; Link's 2-hands-up pose
     STA.b LinkLayer ; draw Link on top
     ; draw Triforce piece in VRAM
+    LDA.w SprRedrawFlag, X : BNE .skipTransfer
+    INC.w SprRedrawFlag, X
     PHX
         REP #$30
-        LDX.w #$006A<<1
+        LDA.l MurahdahlaGfx : BNE .submitRequest
-        LDA.l StandingItemGraphicsOffsets,X : LDX.w ItemStackPtr : STA.l ItemGFXStack,X
+        LDX.w #$006A<<1 : LDA.l StandingItemGraphicsOffsets,X
+    .submitRequest
+        LDX.w ItemStackPtr : STA.l ItemGFXStack,X
         LDA.w #$9CE0>>1 : STA.l ItemTargetStack,X
         TXA : INC #2 : STA.w ItemStackPtr
 	    SEP #$30
     PLX
+    .skipTransfer
     PLA : PLA : PLA : JML MasterSword_InPedestal_DoCutscene ; do cutscene
 
 MasterSword_ConditionalGrabPose:
@@ -171,10 +187,20 @@ RTL
 MasterSword_SpawnPendantProp_ChangePalette:
     STA.w SpriteVelocityY,Y : PLX ; what we wrote over
     LDA.w SpriteMovement,X : BNE .specialCutscene
+        LDA.l PedPullGfx : BNE .customPedGfx
+        LDA.l PedPullGfx+1 : BNE .customPedGfx
         BRA .done
+    .customPedGfx
+        LDA.l PedPullPalette : ASL : INC : BRA .setPalette
     .specialCutscene
-    LDA.b #$08 : STA.w SpriteOAMProp,Y ; change palette
     LDA.b #$02 : STA.w SpriteLayer,Y ; change layer
+    LDA.l MurahdahlaGfx : BNE .customGfx
+    LDA.l MurahdahlaGfx+1 : BNE .customGfx
+        LDA.b #$08 : BRA .setPalette
+    .customGfx
+    LDA.l MurahdahlaPalette : ASL
+    .setPalette
+    STA.w SpriteOAMProp,Y ; change palette
 .done
 JML MasterSword_SpawnPendantProp_ChangePalette_return
 

tables.asm

@@ -953,21 +953,21 @@ dw $0000, $0000, $0000, $0000, $0000, $0000
 GanonsTowerOpenPalette:  ; 0x1801E6-0x1801EC
 db $00                   ; Palette for GanonsTowerOpenGfx
 db $00, $00, $00, $00, $00, $00
-; VHPP  CCCO (VertFlip, HorizFlip, Priority, ColorPalette, OAM Sheet)
+; -VHPPCCC (VertFlip, HorizFlip, Priority, ColorPalette)
 PedPullGfx:              ; 0x1801ED-0x1801F2
 dw $0000                 ; Gfx used for ped pull animation, similar to StandingItemGraphicsOffsets
 dw $0000, $0000
 PedPullPalette:          ; 0x1801F3-0x1801F5
 db $00                   ; Palette for PedPullGfx
 db $00, $00
-; VHPP  CCCO (VertFlip, HorizFlip, Priority, ColorPalette, OAM Sheet)
+; -VHPPCCC (VertFlip, HorizFlip, Priority, ColorPalette)
 MurahdahlaGfx:           ; 0x1801F6-0x1801FB
 dw $0000                 ; Gfx used for ped pull animation, similar to StandingItemGraphicsOffsets
 dw $0000, $0000
 MurahdahlaPalette:       ; 0x1801FC-0x1801FE
 db $00                   ; Palette for MurahdahlaGfx
 db $00, $00
-; VHPP  CCCO (VertFlip, HorizFlip, Priority, ColorPalette, OAM Sheet)
+; -VHPPCCCO (VertFlip, HorizFlip, Priority, ColorPalette)
 ;--------------------------------------------------------------------------------
 ; 0x1801FF (unused)
 ;================================================================================