Merge branch 'master' into fix-eventobj

This commit is contained in:
GriffinR
2020-01-12 22:42:43 -05:00
committed by GitHub
127 changed files with 15606 additions and 21934 deletions
+2 -1
View File
@@ -351,7 +351,8 @@ PetalburgCity_EventScript_LeadPlayerToGym3:: @ 81DC5FF
waitmovement 0
return
PetalburgCity_Movement_1DC611:: @ 81DC611
@ Unused
PetalburgCity_Movement_Delay48:: @ 81DC611
delay_16
delay_16
delay_16