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
@@ -72,8 +72,7 @@ RustboroCity_DevonCorp_3F_EventScript_MeetPresident:: @ 821246E
releaseall
end
@ Unused
RustboroCity_DevonCorp_3F_Movement_21252F: @ 821252F
RustboroCity_DevonCorp_3F_Movement_Unused: @ 821252F
walk_up
walk_up
walk_up