Merge master into sync-script

This commit is contained in:
GriffinR
2020-01-12 15:39:21 -05:00
84 changed files with 16393 additions and 35195 deletions
+2 -2
View File
@@ -48,11 +48,11 @@ EventScript_1716A5:: @ 81716A5
EventScript_1716BE:: @ 81716BE
msgbox gUnknown_81A2CC3
special SelectMoveTutorMon
special Special_SelectMoveTutorMon
waitstate
compare VAR_0x8004, 6
goto_if_ge EventScript_17179E
special IsSelectedMonEgg
special Special_IsSelectedMonEgg
compare VAR_RESULT, 1
goto_if_eq EventScript_171790
compare VAR_0x8005, 0