Skip to content

Commit

Permalink
Merge item description branch history (#5419)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>
Co-authored-by: ghoulslash <[email protected]>
  • Loading branch information
3 people authored Sep 22, 2024
1 parent 1ba0875 commit 60e2c0f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions data/battle_scripts_1.s
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 60e2c0f

Please sign in to comment.