From aa4b143833e00c61bb4b9ef51672038e50c3044a Mon Sep 17 00:00:00 2001 From: PhlexPlexico Date: Wed, 17 Jul 2024 20:13:21 -0600 Subject: [PATCH] Remove Trt check for clearing swamp. The flag is reset on song of time. (#87) --- 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 caa162a..637f59f 100644 --- a/code/mm.ld +++ b/code/mm.ld @@ -638,9 +638,9 @@ SECTIONS{ *(.patch_HandleOcarinaHooks) } - .patch_RemoveWoodfallClearConditionFromBoatHouse 0x6737E8 : { + /* .patch_RemoveWoodfallClearConditionFromBoatHouse 0x6737E8 : { *(.patch_RemoveWoodfallClearConditionFromBoatHouse) - } + } */ . = 0x61CD8C; /* Addr already 4 byte aligned! */ diff --git a/code/source/asm/patches.s b/code/source/asm/patches.s index eb0e9f6..c80d2cc 100644 --- a/code/source/asm/patches.s +++ b/code/source/asm/patches.s @@ -289,10 +289,10 @@ RemoveJimWhenExitingHideout_patch: @ and should always evaluate to false. @ https://github.com/zeldaret/mm/blob/6541532abb5c03088ad67748bbb23965c654127e/src/overlays/actors/ovl_En_Dnh/z_en_dnh.c#L21 @ https://github.com/zeldaret/mm/blob/main/include/z64msgevent.h#L354 -.section .patch_RemoveWoodfallClearConditionFromBoatHouse -.global patch_RemoveWoodfallClearConditionFromBoatHouse -patch_RemoveWoodfallClearConditionFromBoatHouse: - .byte 0x0C +@ .section .patch_RemoveWoodfallClearConditionFromBoatHouse +@ .global patch_RemoveWoodfallClearConditionFromBoatHouse +@ patch_RemoveWoodfallClearConditionFromBoatHouse: +@ .byte 0x0C .section .patch_loader .global loader_patch