Merge pull request #2243 from AlmostSeagull/unKrasha

Revert PR2204

Author: AlmostSeagull

base-hack/Build/BuildEnums.py

@@ -866,16 +866,6 @@ class ExtraTextures(IntEnum):
     BeanSpin10 = auto()
     BeanSpin11 = auto()
     BeanSpin12 = auto()
-    KrushaFace1 = auto()
-    KrushaFace2 = auto()
-    KrushaFace3 = auto()
-    KrushaFace4 = auto()
-    KrushaFace5 = auto()
-    KrushaFace321 = auto()
-    KrushaFace322 = auto()
-    KrushaFace323 = auto()
-    KrushaFace324 = auto()
-    KrushaFace325 = auto()
 
 
 class MoveTypes(IntEnum):

base-hack/Build/build.py

@@ -1127,27 +1127,6 @@
         )
     )
 
-
-for x in range(5):
-    file_dict.append(
-        File(
-            name=f"Krusha Head {x + 1}",
-            pointer_table_index=TableNames.TexturesGeometry,
-            file_index=getBonusSkinOffset(ExtraTextures.KrushaFace1 + x),
-            source_file=f"assets/displays/krusha_head_{x + 1}_64.png",
-            texture_format=TextureFormat.RGBA5551,
-        )
-    )
-    file_dict.append(
-        File(
-            name=f"Krusha Head 32 {x + 1}",
-            pointer_table_index=TableNames.TexturesGeometry,
-            file_index=getBonusSkinOffset(ExtraTextures.KrushaFace321 + x),
-            source_file=f"assets/displays/krusha_head_{x + 1}_32.png",
-            texture_format=TextureFormat.RGBA32,
-        )
-    )
-
 kong_palettes = {
     0xE8C: [(32, 32), "block"],  # DK Base
     0xE8D: [(43, 32), "checkered"],  # DK Tie Hang
@@ -2187,16 +2166,6 @@
         "win_con_logo",
         "25y_mipped",
         "y25_small",
-        "krusha_head_1_64",
-        "krusha_head_2_64",
-        "krusha_head_3_64",
-        "krusha_head_4_64",
-        "krusha_head_5_64",
-        "krusha_head_1_32",
-        "krusha_head_2_32",
-        "krusha_head_3_32",
-        "krusha_head_4_32",
-        "krusha_head_5_32",
     ]
     for b in barrel_skins:
         displays.extend([f"barrel_{b}_0", f"barrel_{b}_1", f"dirt_reward_{b}"])

base-hack/Build/createComplexImages.py

@@ -379,16 +379,6 @@ def bump_saturation(image: Image, factor: float) -> Image:
 krusha_im = krusha_im.transpose(Image.Transpose.FLIP_TOP_BOTTOM)
 krusha_im.save(f"{disp_dir}krusha_head64.png")
 
-# Krusha Heads 1-5
-for x in range(5):
-    krusha_im = Image.open(f"{disp_dir}krusha_head_{x + 1}.png")
-    krusha_im = krusha_im.resize((64, 64), Image.Resampling.NEAREST)
-    krusha_im = krusha_im.transpose(Image.Transpose.FLIP_TOP_BOTTOM)
-    krusha_im.save(f"{disp_dir}krusha_head_{x + 1}_64.png")
-    krusha_im = Image.open(f"{disp_dir}krusha_head_{x + 1}.png")
-    krusha_im = krusha_im.resize((32, 32), Image.Resampling.NEAREST)
-    krusha_im.save(f"{disp_dir}krusha_head_{x + 1}_32.png")
-
 # Wrinkly
 wrinkly_im = Image.open(f"{hash_dir}wrinkly.png").resize((48, 48)).save(f"{disp_dir}wrinkly_sprite.png")
 

base-hack/assets/displays/krusha_head_1.png

@@ -320,26 +320,7 @@ typedef struct projectile_extra {
 } projectile_extra;
 
 void setKrushaAmmoColor(void) {
-    int currentPellet = CurrentActorPointer_0->actorType;
-    switch (currentPellet) {
-        case 48:
-            changeActorColor(0xC0, 0xFF, 0, 0xFF);
-            break;
-        case 36:
-            changeActorColor(0xFF, 0x40, 0x40, 0xFF);
-            break;
-        case 42:
-            changeActorColor(0x18, 0x18, 0xFF, 0xFF);
-            break;
-        case 43:
-            changeActorColor(0x80, 0, 0xFF, 0xFF);
-            break;
-        case 38:
-            changeActorColor(0, 0xFF, 0, 0xFF);
-            break;
-        default:
-            changeActorColor(0, 0xFF, 0, 0xFF);
-    }
+    changeActorColor(0, 0xFF, 0, 0xFF);
 }
 
 void OrangeGunCode(void) {

base-hack/assets/displays/krusha_head_2.png

@@ -2304,42 +2304,17 @@ def applyKongModelSwaps(settings: Settings) -> None:
             if value in (KongModels.krusha, KongModels.krool_cutscene, KongModels.krool_fight):
                 fixModelSmallKongCollision(index)
             if value == KongModels.krusha:
-                placeKrushaHead(settings, index)
+                placeKrushaHead(index)
                 if index == Kongs.donkey:
                     fixBaboonBlasts()
                 # Orange Switches
                 switch_faces = [0xB25, 0xB1E, 0xC81, 0xC80, 0xB24]
                 base_im = getImageFile(25, 0xC20, True, 32, 32, TextureFormat.RGBA5551)
                 orange_im = getImageFile(7, 0x136, False, 32, 32, TextureFormat.RGBA5551)
                 if settings.colorblind_mode == ColorblindMode.off:
-                    match index:
-                        case Kongs.donkey:
-                            color_r = 255
-                            color_g = 224
-                            color_b = 8
-                        case Kongs.diddy:
-                            color_r = 255
-                            color_g = 48
-                            color_b = 32
-                        case Kongs.lanky:
-                            color_r = 40
-                            color_g = 168
-                            color_b = 255
-                        case Kongs.tiny:
-                            color_r = 216
-                            color_g = 100
-                            color_b = 248
-                        case Kongs.chunky:
-                            color_r = 0
-                            color_g = 255
-                            color_b = 0
-                        case _:
-                            color_r = 100
-                            color_g = 255
-                            color_b = 60
-                    orange_im = maskImageWithColor(orange_im, (color_r, color_g, color_b))
+                    orange_im = maskImageWithColor(orange_im, (0, 150, 0))
                 else:
-                    orange_im = maskImageWithColor(orange_im, (0, 255, 0))
+                    orange_im = maskImageWithColor(orange_im, (0, 255, 0))  # Brighter green makes this more distinguishable for colorblindness
                 dim_length = int(32 * ORANGE_SCALING)
                 dim_offset = int((32 - dim_length) / 2)
                 orange_im = orange_im.resize((dim_length, dim_length))
@@ -2552,30 +2527,10 @@ def darkenDPad():
     ROM().writeBytes(px_data)
 
 
-def placeKrushaHead(settings: Settings, slot):
+def placeKrushaHead(slot):
     """Replace a kong's face with the Krusha face."""
-    if settings.colorblind_mode != ColorblindMode.off:
-        return
-
     kong_face_textures = [[0x27C, 0x27B], [0x279, 0x27A], [0x277, 0x278], [0x276, 0x275], [0x273, 0x274]]
     unc_face_textures = [[579, 586], [580, 587], [581, 588], [582, 589], [577, 578]]
-    krushaFace64 = getImageFile(TableNames.TexturesGeometry, getBonusSkinOffset(ExtraTextures.KrushaFace1 + slot), True, 64, 64, TextureFormat.RGBA5551)
-    krushaFace64Left = krushaFace64.crop([0, 0, 32, 64])
-    krushaFace64Right = krushaFace64.crop([32, 0, 64, 64])
-    krushaFace64
-    writeColorImageToROM(krushaFace64Left, 25, kong_face_textures[slot][0], 32, 64, False, TextureFormat.RGBA5551)
-    writeColorImageToROM(krushaFace64Right, 25, kong_face_textures[slot][1], 32, 64, False, TextureFormat.RGBA5551)
-    writeColorImageToROM(krushaFace64Left, 7, unc_face_textures[slot][0], 32, 64, False, TextureFormat.RGBA5551)
-    writeColorImageToROM(krushaFace64Right, 7, unc_face_textures[slot][1], 32, 64, False, TextureFormat.RGBA5551)
-
-    krushaFace32 = krushaFace64.resize((32, 32))
-    krushaFace32 = krushaFace32.transpose(Image.Transpose.FLIP_TOP_BOTTOM)
-    krushaFace32RBGA32 = getImageFile(TableNames.TexturesGeometry, getBonusSkinOffset(ExtraTextures.KrushaFace321 + slot), True, 64, 64, TextureFormat.RGBA32)
-    writeColorImageToROM(krushaFace32, 14, 190 + slot, 32, 32, False, TextureFormat.RGBA5551)
-    writeColorImageToROM(krushaFace32RBGA32, 14, 197 + slot, 32, 32, False, TextureFormat.RGBA32)
-
-    """kong_face_textures = [[0x27C, 0x27B], [0x279, 0x27A], [0x277, 0x278], [0x276, 0x275], [0x273, 0x274]]
-    unc_face_textures = [[579, 586], [580, 587], [581, 588], [582, 589], [577, 578]]
     ROM_COPY = LocalROM()
     ROM_COPY.seek(0x1FF6000)
     left = []
@@ -2632,7 +2587,7 @@ def placeKrushaHead(settings: Settings, slot):
     ROM_COPY.seek(rgba32_addr32)
     ROM_COPY.writeBytes(bytearray(data32_rgba32))
     ROM_COPY.seek(rgba16_addr32)
-    ROM_COPY.writeBytes(bytearray(data32))"""
+    ROM_COPY.writeBytes(bytearray(data32))
 
 
 def getValueFromByteArray(ba: bytearray, offset: int, size: int) -> int:
@@ -4142,7 +4097,6 @@ def showWinCondition(settings: Settings):
     "Enforcing the law of the Jungle",
     "Saving 20 frames",
     "Reporting bugs. Unlike some",
-    "Color-coding Krusha for convenience",
 )
 
 crown_heads = (