dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into clone-union

Browse Source
This commit is contained in:
GriffinR
2022-08-17 15:41:50 -04:00
committed by GitHub
parent 2b93687ade 56f8b1a47c
commit ab56ac41a1
322 changed files with 12564 additions and 12748 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/SaffronCity_Gym/scripts.inc
+2 -3
View File
@@ -21,9 +21,8 @@ SaffronCity_Gym_EventScript_DefeatedSabrina::
SaffronCity_Gym_EventScript_GiveTM04::
msgbox SaffronCity_Gym_Text_ExplainMarshBadgeTakeThis
checkitemspace ITEM_TM04, 1
compare VAR_RESULT, FALSE
goto_if_eq SaffronCity_Gym_EventScript_NoRoomForTM04
checkitemspace ITEM_TM04
goto_if_eq VAR_RESULT, FALSE, SaffronCity_Gym_EventScript_NoRoomForTM04
giveitem_msg SaffronCity_Gym_Text_ReceivedTM04FromSabrina, ITEM_TM04
setflag FLAG_GOT_TM04_FROM_SABRINA
msgbox SaffronCity_Gym_Text_SabrinaPostBattle