From 288ab216b012cac7619b12642baf3dcceaa6d9b8 Mon Sep 17 00:00:00 2001 From: Phlex Date: Wed, 20 Dec 2023 12:11:35 -0600 Subject: [PATCH] Remove twinmold improvement as it is half-baked. Will need to go back and do more work to make twinmold a bit easier to handle. --- code/mm.ld | 4 ++-- code/source/asm/patches.s | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/mm.ld b/code/mm.ld index 4a34a1e8..f7dea7ab 100644 --- a/code/mm.ld +++ b/code/mm.ld @@ -235,9 +235,9 @@ SECTIONS{ *(.patch_OverrideItemID) } - .patch_TwinmoldConsistentDamage 0x28E544 : { + /* .patch_TwinmoldConsistentDamage 0x28E544 : { *(.patch_TwinmoldConsistentDamage) - } + } */ .patch_FasterBlockMovement 0x2AC634 : { *(.patch_FasterBlockMovement) diff --git a/code/source/asm/patches.s b/code/source/asm/patches.s index 3fae008f..d5d4c804 100644 --- a/code/source/asm/patches.s +++ b/code/source/asm/patches.s @@ -279,10 +279,10 @@ patch_HandleOcarinaHooks: b hook_HandleOcarina @ Remove call from twinmold->life -= twinmold_min_damage. -.section .patch_TwinmoldConsistentDamage -.global patch_TwinmoldConsistentDamage -patch_TwinmoldConsistentDamage: - nop +@ .section .patch_TwinmoldConsistentDamage +@ .global patch_TwinmoldConsistentDamage +@ patch_TwinmoldConsistentDamage: +@ nop .section .patch_FasterBlockMovement .global patch_FasterBlockMovement