Added new content, attempt to fix sleep crash

2016-11-01 19:13:47 -05:00 · 2016-11-01 19:13:47 -05:00 · 4039e371e3
parent 48887fbf17
commit 4039e371e3
179 changed files with 3114 additions and 3 deletions
--- a/2.5DHero/2.5DHero/2.5DHero.vbproj
+++ b/2.5DHero/2.5DHero/2.5DHero.vbproj
--- a/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb
+++ b/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb
@ -995,7 +995,7 @@
                        Exit Sub
                    End If
                Else
-                    If (own AndAlso BattleScreen.FieldEffects.OwnLastMove.ID = 214) OrElse (Not own AndAlso BattleScreen.FieldEffects.OppLastMove.ID = 214) Then
+                    If (own AndAlso BattleScreen.FieldEffects.OwnLastMove IsNot Nothing AndAlso BattleScreen.FieldEffects.OwnLastMove.ID = 214) OrElse (Not own AndAlso BattleScreen.FieldEffects.OppLastMove IsNot Nothing AndAlso BattleScreen.FieldEffects.OppLastMove.ID = 214) Then
                        If own Then
                            BattleScreen.FieldEffects.OwnLastMove = moveUsed
                        Else
--- a/2.5DHero/2.5DHero/Scripts/chrono/egg.dat
+++ b/2.5DHero/2.5DHero/Scripts/chrono/egg.dat
--- a/2.5DHero/2.5DHero/Scripts/chrono/grieve.dat
+++ b/2.5DHero/2.5DHero/Scripts/chrono/grieve.dat
--- a/2.5DHero/2.5DHero/Scripts/chrono/memorial.dat
+++ b/2.5DHero/2.5DHero/Scripts/chrono/memorial.dat
--- a/2.5DHero/2.5DHero/Scripts/chrono/raisenpcs.dat
+++ b/2.5DHero/2.5DHero/Scripts/chrono/raisenpcs.dat
--- a/2.5DHero/2.5DHero/Scripts/chrono/selloscave.dat
+++ b/2.5DHero/2.5DHero/Scripts/chrono/selloscave.dat
--- a/2.5DHero/2.5DHero/Scripts/chrono/selphy.dat
+++ b/2.5DHero/2.5DHero/Scripts/chrono/selphy.dat
--- a/2.5DHero/2.5DHero/Scripts/dragonsden/clairtmget.dat
+++ b/2.5DHero/2.5DHero/Scripts/dragonsden/clairtmget.dat
--- a/2.5DHero/2.5DHero/Scripts/kin/incompletepath.dat
+++ b/2.5DHero/2.5DHero/Scripts/kin/incompletepath.dat
--- a/2.5DHero/2.5DHero/Scripts/rival/rival_dragonsden/scene.dat
+++ b/2.5DHero/2.5DHero/Scripts/rival/rival_dragonsden/scene.dat
--- a/2.5DHero/2.5DHero/Scripts/rival/rival_fortune.dat
+++ b/2.5DHero/2.5DHero/Scripts/rival/rival_fortune.dat
--- a/2.5DHero/2.5DHero/Scripts/rival/rival_league.dat
+++ b/2.5DHero/2.5DHero/Scripts/rival/rival_league.dat
--- a/2.5DHero/2.5DHero/Scripts/rival/rival_mtmoon/north.dat
+++ b/2.5DHero/2.5DHero/Scripts/rival/rival_mtmoon/north.dat
--- a/2.5DHero/2.5DHero/Scripts/rival/rival_mtmoon/south.dat
+++ b/2.5DHero/2.5DHero/Scripts/rival/rival_mtmoon/south.dat
--- a/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/001.dat
+++ b/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/001.dat
--- a/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/001.trainer
+++ b/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/001.trainer
--- a/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/002.dat
+++ b/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/002.dat
--- a/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/002.trainer
+++ b/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/002.trainer
--- a/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/003.dat
+++ b/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/003.dat
--- a/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/003.trainer
+++ b/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/003.trainer
--- a/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/004.dat
+++ b/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/004.dat
--- a/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/004.trainer
+++ b/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/004.trainer
--- a/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/005.dat
+++ b/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/005.dat
--- a/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/005.trainer
+++ b/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/005.trainer
--- a/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/006.dat
+++ b/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/006.dat
--- a/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/006.trainer
+++ b/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/006.trainer
--- a/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/007.dat
+++ b/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/007.dat
--- a/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/007.trainer
+++ b/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/007.trainer
--- a/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/008.dat
+++ b/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/008.dat
--- a/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/008.trainer
+++ b/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/008.trainer
--- a/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/009.dat
+++ b/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/009.dat
--- a/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/009.trainer
+++ b/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/009.trainer
--- a/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/010.dat
+++ b/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/010.dat
--- a/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/010.trainer
+++ b/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/010.trainer
--- a/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/selphy.trainer
+++ b/2.5DHero/2.5DHero/Scripts/trainer/chrono/north/selphy.trainer
--- a/2.5DHero/2.5DHero/Scripts/trainer/chrono/south/001.dat
+++ b/2.5DHero/2.5DHero/Scripts/trainer/chrono/south/001.dat
--- a/2.5DHero/2.5DHero/Scripts/trainer/chrono/south/001.trainer
+++ b/2.5DHero/2.5DHero/Scripts/trainer/chrono/south/001.trainer
--- a/2.5DHero/2.5DHero/Scripts/trainer/chrono/south/002.dat
+++ b/2.5DHero/2.5DHero/Scripts/trainer/chrono/south/002.dat
--- a/2.5DHero/2.5DHero/Scripts/trainer/chrono/south/002.trainer
+++ b/2.5DHero/2.5DHero/Scripts/trainer/chrono/south/002.trainer
--- a/2.5DHero/2.5DHero/Scripts/trainer/chrono/south/003.dat
+++ b/2.5DHero/2.5DHero/Scripts/trainer/chrono/south/003.dat
--- a/2.5DHero/2.5DHero/Scripts/trainer/chrono/south/003.trainer
+++ b/2.5DHero/2.5DHero/Scripts/trainer/chrono/south/003.trainer
--- a/2.5DHero/2.5DHero/Scripts/trainer/league/false/bruno.trainer
+++ b/2.5DHero/2.5DHero/Scripts/trainer/league/false/bruno.trainer
--- a/2.5DHero/2.5DHero/Scripts/trainer/league/false/karen.trainer
+++ b/2.5DHero/2.5DHero/Scripts/trainer/league/false/karen.trainer
--- a/2.5DHero/2.5DHero/Scripts/trainer/league/false/koga.trainer
+++ b/2.5DHero/2.5DHero/Scripts/trainer/league/false/koga.trainer
--- a/2.5DHero/2.5DHero/Scripts/trainer/league/false/lance.trainer
+++ b/2.5DHero/2.5DHero/Scripts/trainer/league/false/lance.trainer
--- a/2.5DHero/2.5DHero/Scripts/trainer/league/false/will.trainer
+++ b/2.5DHero/2.5DHero/Scripts/trainer/league/false/will.trainer
--- a/2.5DHero/2.5DHero/Scripts/trainer/league/true/bruno.trainer
+++ b/2.5DHero/2.5DHero/Scripts/trainer/league/true/bruno.trainer
--- a/2.5DHero/2.5DHero/Scripts/trainer/league/true/karen.trainer
+++ b/2.5DHero/2.5DHero/Scripts/trainer/league/true/karen.trainer
--- a/2.5DHero/2.5DHero/Scripts/trainer/league/true/koga.trainer
+++ b/2.5DHero/2.5DHero/Scripts/trainer/league/true/koga.trainer
--- a/2.5DHero/2.5DHero/Scripts/trainer/league/true/lance.trainer
+++ b/2.5DHero/2.5DHero/Scripts/trainer/league/true/lance.trainer
--- a/2.5DHero/2.5DHero/Scripts/trainer/league/true/will.trainer
+++ b/2.5DHero/2.5DHero/Scripts/trainer/league/true/will.trainer
--- a/2.5DHero/2.5DHero/Scripts/trainer/rival/rival_5_fire.trainer
+++ b/2.5DHero/2.5DHero/Scripts/trainer/rival/rival_5_fire.trainer
--- a/2.5DHero/2.5DHero/Scripts/trainer/rival/rival_5_grass.trainer
+++ b/2.5DHero/2.5DHero/Scripts/trainer/rival/rival_5_grass.trainer
--- a/2.5DHero/2.5DHero/Scripts/trainer/rival/rival_5_water.trainer
+++ b/2.5DHero/2.5DHero/Scripts/trainer/rival/rival_5_water.trainer
--- a/2.5DHero/2.5DHero/Scripts/trainer/rival/rival_6_fire.trainer
+++ b/2.5DHero/2.5DHero/Scripts/trainer/rival/rival_6_fire.trainer
--- a/2.5DHero/2.5DHero/Scripts/trainer/rival/rival_6_grass.trainer
+++ b/2.5DHero/2.5DHero/Scripts/trainer/rival/rival_6_grass.trainer
--- a/2.5DHero/2.5DHero/Scripts/trainer/rival/rival_6_water.trainer
+++ b/2.5DHero/2.5DHero/Scripts/trainer/rival/rival_6_water.trainer
--- a/2.5DHero/2.5DHero/Scripts/underwatercave/manaphy.dat
+++ b/2.5DHero/2.5DHero/Scripts/underwatercave/manaphy.dat
--- a/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/Clipboard
+++ b/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/Clipboard
--- a/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/hiderock1.dat
+++ b/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/hiderock1.dat
--- a/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/hiderock2.dat
+++ b/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/hiderock2.dat
--- a/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/hiderock3.dat
+++ b/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/hiderock3.dat
--- a/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/hiderock4.dat
+++ b/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/hiderock4.dat
--- a/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/hiderock5.dat
+++ b/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/hiderock5.dat
--- a/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/hiderock6.dat
+++ b/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/hiderock6.dat
--- a/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/hiderock7.dat
+++ b/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/hiderock7.dat
--- a/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/hiderock8.dat
+++ b/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/hiderock8.dat
--- a/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/hiderock9.dat
+++ b/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/hiderock9.dat
--- a/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/puzzlerocks.dat
+++ b/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/puzzlerocks.dat
--- a/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/rockdrop1.dat
+++ b/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/rockdrop1.dat
--- a/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/rockdrop2.dat
+++ b/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/rockdrop2.dat
--- a/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/rockdrop3.dat
+++ b/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/rockdrop3.dat
--- a/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/rockdrop4.dat
+++ b/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/rockdrop4.dat
--- a/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/rockdrop5.dat
+++ b/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/rockdrop5.dat
--- a/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/rockdrop6.dat
+++ b/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/rockdrop6.dat
--- a/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/rockdrop7.dat
+++ b/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/rockdrop7.dat
--- a/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/rockdrop8.dat
+++ b/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/rockdrop8.dat
--- a/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/rockdrop9.dat
+++ b/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/rockdrop9.dat
--- a/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/unhiderock1.dat
+++ b/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/unhiderock1.dat
--- a/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/unhiderock23.dat
+++ b/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/unhiderock23.dat
--- a/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/unhiderock5.dat
+++ b/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/unhiderock5.dat
--- a/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/unhiderock6.dat
+++ b/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/unhiderock6.dat
--- a/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/unhiderock7.dat
+++ b/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/unhiderock7.dat
--- a/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/unhiderock8.dat
+++ b/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/unhiderock8.dat
--- a/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/unhiderock9.dat
+++ b/2.5DHero/2.5DHero/Scripts/underwatercave/rocks/unhiderock9.dat
--- a/2.5DHero/2.5DHero/Scripts/underwatercave/underwatertreasure/110-1.dat
+++ b/2.5DHero/2.5DHero/Scripts/underwatercave/underwatertreasure/110-1.dat
--- a/2.5DHero/2.5DHero/Scripts/underwatercave/underwatertreasure/110-2.dat
+++ b/2.5DHero/2.5DHero/Scripts/underwatercave/underwatertreasure/110-2.dat
--- a/2.5DHero/2.5DHero/Scripts/underwatercave/underwatertreasure/111.dat
+++ b/2.5DHero/2.5DHero/Scripts/underwatercave/underwatertreasure/111.dat
--- a/2.5DHero/2.5DHero/Scripts/underwatercave/underwatertreasure/190-1.dat
+++ b/2.5DHero/2.5DHero/Scripts/underwatercave/underwatertreasure/190-1.dat
--- a/2.5DHero/2.5DHero/Scripts/underwatercave/underwatertreasure/190-2.dat
+++ b/2.5DHero/2.5DHero/Scripts/underwatercave/underwatertreasure/190-2.dat
--- a/2.5DHero/2.5DHero/Scripts/underwatercave/underwatertreasure/190-3.dat
+++ b/2.5DHero/2.5DHero/Scripts/underwatercave/underwatertreasure/190-3.dat
--- a/2.5DHero/2.5DHero/Scripts/underwatercave/underwatertreasure/main.dat
+++ b/2.5DHero/2.5DHero/Scripts/underwatercave/underwatertreasure/main.dat
--- a/2.5DHero/2.5DHero/Scripts/vermilion/dockhand3.dat
+++ b/2.5DHero/2.5DHero/Scripts/vermilion/dockhand3.dat
--- a/2.5DHero/2.5DHero/maps/battle/chrono/labyrinth.dat
+++ b/2.5DHero/2.5DHero/maps/battle/chrono/labyrinth.dat
--- a/2.5DHero/2.5DHero/maps/battle/chrono/resort.dat
+++ b/2.5DHero/2.5DHero/maps/battle/chrono/resort.dat
--- a/2.5DHero/2.5DHero/maps/battle/lostcave/1.dat
+++ b/2.5DHero/2.5DHero/maps/battle/lostcave/1.dat
--- a/2.5DHero/2.5DHero/maps/battle/lostcave/2.dat
+++ b/2.5DHero/2.5DHero/maps/battle/lostcave/2.dat
--- a/2.5DHero/2.5DHero/maps/battle/lostcave/3.dat
+++ b/2.5DHero/2.5DHero/maps/battle/lostcave/3.dat
--- a/2.5DHero/2.5DHero/maps/battle/lostcave/4.dat
+++ b/2.5DHero/2.5DHero/maps/battle/lostcave/4.dat
--- a/Show More
+++ b/Show More