From 60e2c0f859bebfbbf9d5f6cfcd79e6e899cac0dc Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Sun, 22 Sep 2024 12:05:45 +0200 Subject: [PATCH] Merge item description branch history (#5419) * Recreated ghoul's item_desc_header branch Fixed tabs vs spaces Fixing whitespace * Fixed item in header not showing on maximum flash level * Fixed item icon being affected by thunderstorms * Shops now set the obtained item flag. * Fixed build * fix seashore house * better soda pop fix, thx asparagus * fix item icon showing in battle pyramid * fix hiding item desc in battle pyramid --------- Co-authored-by: Eduardo Quezada D'Ottone Co-authored-by: ghoulslash --- data/battle_scripts_1.s | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index a7295d9b53..04784ccdac 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -4725,8 +4725,8 @@ BattleScript_ButItFailed:: waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_RestoreAttackerButItFailed: - restoreattacker - goto BattleScript_ButItFailed + restoreattacker + goto BattleScript_ButItFailed BattleScript_NotAffected:: pause B_WAIT_TIME_SHORT