Merge pull request #112 from ElectroDeoxys/master

Split bank 6 and some bank 7

3 files changed, 47 insertions, 47 deletions

diff --git a/src/data/sequences/credits_sequence.asm b/src/data/sequences/credits.asm
index cc7d267..cc7d267 100644
--- a/src/data/sequences/credits_sequence.asm
+++ b/src/data/sequences/credits.asm
diff --git a/src/data/sequences/intro.asm b/src/data/sequences/intro.asm
new file mode 100644
index 0000000..22aeea7
--- /dev/null
+++ b/src/data/sequences/intro.asm
@@ -0,0 +1,47 @@
+INCLUDE "macros/intro_sequence.asm"
+
+IntroSequence: ; 1d59d (7:559d)
+	intro_seq_load_charizard_scene
+	intro_seq_play_sfx SFX_58
+	intro_seq_set_orbs_coordinates IntroOrbCoordinates_CharizardScene
+	intro_seq_set_orbs_animations IntroOrbAnimations_CharizardScene
+	intro_seq_wait 44
+	intro_seq_fade_in
+	intro_seq_wait 44
+	intro_seq_fade_out
+	intro_seq_wait 30
+
+	intro_seq_load_scyther_scene
+	intro_seq_play_sfx SFX_58
+	intro_seq_set_orbs_coordinates IntroOrbCoordinates_ScytherScene
+	intro_seq_set_orbs_animations IntroOrbAnimations_ScytherScene
+	intro_seq_wait 44
+	intro_seq_fade_in
+	intro_seq_wait 44
+	intro_seq_fade_out
+	intro_seq_wait 30
+
+	intro_seq_load_aerodactyl_scene
+	intro_seq_play_sfx SFX_59
+	intro_seq_set_orbs_coordinates IntroOrbCoordinates_AerodactylScene
+	intro_seq_set_orbs_animations IntroOrbAnimations_AerodactylScene
+	intro_seq_wait 44
+	intro_seq_fade_in
+	intro_seq_wait 100
+	intro_seq_fade_out
+	intro_seq_wait 60
+
+	intro_seq_load_title_screen_scene
+	intro_seq_play_sfx SFX_5A
+	intro_seq_set_orbs_coordinates IntroOrbCoordinates_InitialTitleScreen
+	intro_seq_set_orbs_animations IntroOrbAnimations_InitialTitleScreen
+	intro_seq_wait_orbs_animation
+	intro_seq_fade_in
+	intro_seq_wait 16
+	intro_seq_play_sfx SFX_5B
+	intro_seq_set_orbs_coordinates IntroOrbCoordinates_InTitleScreen
+	intro_seq_set_orbs_animations IntroOrbAnimations_InTitleScreen
+	intro_seq_wait_sfx
+	intro_seq_play_title_screen_music
+	intro_seq_wait 60
+	intro_seq_end
diff --git a/src/data/sequences/opening_sequence.asm b/src/data/sequences/opening_sequence.asm
deleted file mode 100644
index a88bd4f..0000000
--- a/src/data/sequences/opening_sequence.asm
+++ /dev/null
@@ -1,47 +0,0 @@
-INCLUDE "macros/opening_sequence.asm"
-
-OpeningSequence: ; 1d59d (7:559d)
-	opening_seq_load_charizard_scene
-	opening_seq_play_sfx SFX_58
-	opening_seq_set_orbs_coordinates OpeningOrbCoordinates_CharizardScene
-	opening_seq_set_orbs_animations OpeningOrbAnimations_CharizardScene
-	opening_seq_wait 44
-	opening_seq_fade_in
-	opening_seq_wait 44
-	opening_seq_fade_out
-	opening_seq_wait 30
-
-	opening_seq_load_scyther_scene
-	opening_seq_play_sfx SFX_58
-	opening_seq_set_orbs_coordinates OpeningOrbCoordinates_ScytherScene
-	opening_seq_set_orbs_animations OpeningOrbAnimations_ScytherScene
-	opening_seq_wait 44
-	opening_seq_fade_in
-	opening_seq_wait 44
-	opening_seq_fade_out
-	opening_seq_wait 30
-
-	opening_seq_load_aerodactyl_scene
-	opening_seq_play_sfx SFX_59
-	opening_seq_set_orbs_coordinates OpeningOrbCoordinates_AerodactylScene
-	opening_seq_set_orbs_animations OpeningOrbAnimations_AerodactylScene
-	opening_seq_wait 44
-	opening_seq_fade_in
-	opening_seq_wait 100
-	opening_seq_fade_out
-	opening_seq_wait 60
-
-	opening_seq_load_title_screen_scene
-	opening_seq_play_sfx SFX_5A
-	opening_seq_set_orbs_coordinates OpeningOrbCoordinates_InitialTitleScreen
-	opening_seq_set_orbs_animations OpeningOrbAnimations_InitialTitleScreen
-	opening_seq_wait_orbs_animation
-	opening_seq_fade_in
-	opening_seq_wait 16
-	opening_seq_play_sfx SFX_5B
-	opening_seq_set_orbs_coordinates OpeningOrbCoordinates_InTitleScreen
-	opening_seq_set_orbs_animations OpeningOrbAnimations_InTitleScreen
-	opening_seq_wait_sfx
-	opening_seq_play_title_screen_music
-	opening_seq_wait 60
-	opening_seq_end