Merge pull request #953 from GriffinRichards/sync-script

Port some macro/script fixes from pokefirered
This commit is contained in:
huderlem
2020-01-13 19:33:47 -06:00
committed by GitHub
117 changed files with 604 additions and 637 deletions
+2 -2
View File
@@ -120,7 +120,7 @@ SootopolisCity_Gym_1F_EventScript_JuanDefeated:: @ 8224F82
end
SootopolisCity_Gym_1F_EventScript_GiveWaterPulse:: @ 8224FD4
giveitem_std ITEM_TM03
giveitem ITEM_TM03
compare VAR_RESULT, 0
goto_if_eq Common_EventScript_BagIsFull
msgbox SootopolisCity_Gym_1F_Text_ExplainWaterPulse, MSGBOX_DEFAULT
@@ -128,7 +128,7 @@ SootopolisCity_Gym_1F_EventScript_GiveWaterPulse:: @ 8224FD4
return
SootopolisCity_Gym_1F_EventScript_GiveWaterPulse2:: @ 8224FF7
giveitem_std ITEM_TM03
giveitem ITEM_TM03
compare VAR_RESULT, 0
goto_if_eq Common_EventScript_ShowBagIsFull
msgbox SootopolisCity_Gym_1F_Text_ExplainWaterPulse, MSGBOX_DEFAULT