Merge branch 'master' into document-eventscripts

This commit is contained in:
GriffinR
2019-09-22 12:18:48 -04:00
committed by GitHub
94 changed files with 2841 additions and 2662 deletions
+2 -2
View File
@@ -78,7 +78,7 @@ RustboroCity_EventScript_1E07AC:: @ 81E07AC
RustboroCity_EventScript_1E07BD:: @ 81E07BD
setflag FLAG_ADDED_MATCH_CALL_TO_POKENAV
special sp106_CreateStartMenu
special ScriptMenu_CreateStartMenuForPokenavTutorial
waitstate
switch VAR_RESULT
case 0, RustboroCity_EventScript_1E07AC
@@ -88,7 +88,7 @@ RustboroCity_EventScript_1E07BD:: @ 81E07BD
case 5, RustboroCity_EventScript_1E07AC
case 6, RustboroCity_EventScript_1E07AC
case 7, RustboroCity_EventScript_1E07AC
case 127, RustboroCity_EventScript_1E07AC
case MULTI_B_PRESSED, RustboroCity_EventScript_1E07AC
special sub_81C72A4
waitstate
delay 20