ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2561 from AsparagusEduardo/RHH/pr/fix/repels

Browse Source 
Fixed reusable repels/lures function forcefully using items while menu config is on
This commit is contained in:
ghoulslash 2023-01-04 09:15:30 -05:00 committed by GitHub
commit 6ea9a34036
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/scripts/repel.inc
View File

@ -19,6 +19,7 @@ EventScript_RepelUseAnother:
lock lock
msgbox Text_UseAnotherRepel, MSGBOX_YESNO msgbox Text_UseAnotherRepel, MSGBOX_YESNO
.if I_REPEL_LURE_MENU == TRUE .if I_REPEL_LURE_MENU == TRUE
goto_if_eq VAR_RESULT, NO, EventScript_RepelWoreOff_End
callnative TryDrawRepelMenu callnative TryDrawRepelMenu
goto_if_eq VAR_RESULT, FALSE, EventScript_RepelWoreOff_Chose goto_if_eq VAR_RESULT, FALSE, EventScript_RepelWoreOff_Chose
waitstate waitstate
@ -68,6 +69,7 @@ EventScript_LureUseAnother:
lock lock
msgbox Text_UseAnotherLure, MSGBOX_YESNO msgbox Text_UseAnotherLure, MSGBOX_YESNO
.if I_REPEL_LURE_MENU == TRUE .if I_REPEL_LURE_MENU == TRUE
goto_if_eq VAR_RESULT, NO, EventScript_LureWoreOff_End
callnative TryDrawLureMenu callnative TryDrawLureMenu
goto_if_eq VAR_RESULT, FALSE, EventScript_LureWoreOff_Chose goto_if_eq VAR_RESULT, FALSE, EventScript_LureWoreOff_Chose
waitstate waitstate