summaryrefslogtreecommitdiff
path: root/src/macros
diff options
context:
space:
mode:
authorElectroDeoxys <ElectroDeoxys@gmail.com>2021-09-27 12:25:56 +0100
committerElectroDeoxys <ElectroDeoxys@gmail.com>2021-09-27 12:25:56 +0100
commita53828331cf4c86f7d14e3b178eaa18817b514a3 (patch)
tree4ce731fcf42324466ba9899a3fe8343bfbeb9dda /src/macros
parent7825b5ef0f09a877142ea1eb221e895bb60a0253 (diff)
Split part of bank 7
Diffstat (limited to 'src/macros')
-rw-r--r--src/macros/intro_sequence.asm63
-rw-r--r--src/macros/opening_sequence.asm63
2 files changed, 63 insertions, 63 deletions
diff --git a/src/macros/intro_sequence.asm b/src/macros/intro_sequence.asm
new file mode 100644
index 0000000..8c92b26
--- /dev/null
+++ b/src/macros/intro_sequence.asm
@@ -0,0 +1,63 @@
+intro_seq_wait_orbs_animation: MACRO
+ dw IntroSequenceCmd_WaitOrbsAnimation
+ENDM
+
+; argument = frames to delay
+intro_seq_wait: MACRO
+ dw IntroSequenceCmd_Wait
+ db \1
+ENDM
+
+; argument = list of animations to set
+intro_seq_set_orbs_animations: MACRO
+ dw IntroSequenceCmd_SetOrbsAnimations
+ dw \1
+ENDM
+
+; argument = list of coordinates to set
+intro_seq_set_orbs_coordinates: MACRO
+ dw IntroSequenceCmd_SetOrbsCoordinates
+ dw \1
+ENDM
+
+intro_seq_play_title_screen_music: MACRO
+ dw IntroSequenceCmd_PlayTitleScreenMusic
+ENDM
+
+intro_seq_wait_sfx: MACRO
+ dw IntroSequenceCmd_WaitSFX
+ENDM
+
+; argument = SFX to play
+intro_seq_play_sfx: MACRO
+ dw IntroSequenceCmd_PlaySFX
+ db \1
+ENDM
+
+intro_seq_fade_in: MACRO
+ dw IntroSequenceCmd_FadeIn
+ENDM
+
+intro_seq_fade_out: MACRO
+ dw IntroSequenceCmd_FadeOut
+ENDM
+
+intro_seq_load_charizard_scene: MACRO
+ dw IntroSequenceCmd_LoadCharizardScene
+ENDM
+
+intro_seq_load_scyther_scene: MACRO
+ dw IntroSequenceCmd_LoadScytherScene
+ENDM
+
+intro_seq_load_aerodactyl_scene: MACRO
+ dw IntroSequenceCmd_LoadAerodactylScene
+ENDM
+
+intro_seq_load_title_screen_scene: MACRO
+ dw IntroSequenceCmd_LoadTitleScreenScene
+ENDM
+
+intro_seq_end: MACRO
+ intro_seq_wait $ff
+ENDM
diff --git a/src/macros/opening_sequence.asm b/src/macros/opening_sequence.asm
deleted file mode 100644
index b864c3c..0000000
--- a/src/macros/opening_sequence.asm
+++ /dev/null
@@ -1,63 +0,0 @@
-opening_seq_wait_orbs_animation: MACRO
- dw OpeningSequenceCmd_WaitOrbsAnimation
-ENDM
-
-; argument = frames to delay
-opening_seq_wait: MACRO
- dw OpeningSequenceCmd_Wait
- db \1
-ENDM
-
-; argument = list of animations to set
-opening_seq_set_orbs_animations: MACRO
- dw OpeningSequenceCmd_SetOrbsAnimations
- dw \1
-ENDM
-
-; argument = list of coordinates to set
-opening_seq_set_orbs_coordinates: MACRO
- dw OpeningSequenceCmd_SetOrbsCoordinates
- dw \1
-ENDM
-
-opening_seq_play_title_screen_music: MACRO
- dw OpeningSequenceCmd_PlayTitleScreenMusic
-ENDM
-
-opening_seq_wait_sfx: MACRO
- dw OpeningSequenceCmd_WaitSFX
-ENDM
-
-; argument = SFX to play
-opening_seq_play_sfx: MACRO
- dw OpeningSequenceCmd_PlaySFX
- db \1
-ENDM
-
-opening_seq_fade_in: MACRO
- dw OpeningSequenceCmd_FadeIn
-ENDM
-
-opening_seq_fade_out: MACRO
- dw OpeningSequenceCmd_FadeOut
-ENDM
-
-opening_seq_load_charizard_scene: MACRO
- dw OpeningSequenceCmd_LoadCharizardScene
-ENDM
-
-opening_seq_load_scyther_scene: MACRO
- dw OpeningSequenceCmd_LoadScytherScene
-ENDM
-
-opening_seq_load_aerodactyl_scene: MACRO
- dw OpeningSequenceCmd_LoadAerodactylScene
-ENDM
-
-opening_seq_load_title_screen_scene: MACRO
- dw OpeningSequenceCmd_LoadTitleScreenScene
-ENDM
-
-opening_seq_end: MACRO
- opening_seq_wait $ff
-ENDM