From 6bf39a0617fe0b6e288ea98b1dd7ef764d95b258 Mon Sep 17 00:00:00 2001
From: FitzRoyX <57089001+FitzRoyX@users.noreply.github.com>
Date: Sun, 5 Mar 2023 18:31:59 -0600
Subject: [PATCH] Fix dying as permabunny palette bug (#184)

* fix dying as permabunny palette bug (#126)

* fix dying as a permabunny palette bug (#126)
---
 ancilla.c   | 3 +++
 messaging.c | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/ancilla.c b/ancilla.c
index f5b9c12..a984b9d 100644
--- a/ancilla.c
+++ b/ancilla.c
@@ -5487,6 +5487,9 @@ void RevivalFairy_MonitorHP() {  // 88f430
     } else if (link_is_bunny) {
       link_player_handler_state = kPlayerState_PermaBunny;
       link_is_bunny_mirror = 1;
+      //bugfix: dying as permabunny doesn't restore link palette during death animation
+      if (enhanced_features0 & kFeatures0_MiscBugFixes)
+        LoadGearPalettes_bunny();
     } else {
       link_player_handler_state = kPlayerState_Ground;
     }
diff --git a/messaging.c b/messaging.c
index b94ebae..7ddcf18 100644
--- a/messaging.c
+++ b/messaging.c
@@ -3008,6 +3008,9 @@ void Death_PrepFaint() {  // 8ffa6f
   if (link_item_moon_pearl)
     link_is_bunny = 0;
   link_timer_tempbunny = 0;
+  //bugfix: dying as permabunny doesn't restore link palette during death animation
+  if (enhanced_features0 & kFeatures0_MiscBugFixes)
+    LoadActualGearPalettes();
   sound_effect_1 = 0x27 | Link_CalculateSfxPan();
   for (int i = 0; i != 4; i++) {
     if (link_bottle_info[i] == 6)