Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge item description branch history (#5419)

Browse Source 
* 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 <eduardo602002@gmail.com>
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
This commit is contained in:
Bassoonian 2024-09-22 12:05:45 +02:00 committed by GitHub
parent 1ba0875654
commit 60e2c0f859
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/battle_scripts_1.s
View File

@ -4725,8 +4725,8 @@ BattleScript_ButItFailed::
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd goto BattleScript_MoveEnd
BattleScript_RestoreAttackerButItFailed: BattleScript_RestoreAttackerButItFailed:
restoreattacker restoreattacker
goto BattleScript_ButItFailed goto BattleScript_ButItFailed
BattleScript_NotAffected:: BattleScript_NotAffected::
pause B_WAIT_TIME_SHORT pause B_WAIT_TIME_SHORT