diff options
| author | Daniel Harding <33dannye@gmail.com> | 2021-10-10 17:08:01 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-10 17:08:01 -0500 |
| commit | 7d5761dcd9c0ecca427bd568e91ae137b04ed54e (patch) | |
| tree | 2130f26a5bc8005f3df30976f17f0683e6f18113 /src/macros | |
| parent | 40d32ea4e266fa2e87f344d50ba854d53b02fba3 (diff) | |
| parent | be47e02cd7c844944665108b5c921b1eae27ad7b (diff) | |
Merge pull request #112 from ElectroDeoxys/master
Split bank 6 and some bank 7
Diffstat (limited to 'src/macros')
| -rw-r--r-- | src/macros/intro_sequence.asm | 63 | ||||
| -rw-r--r-- | src/macros/opening_sequence.asm | 63 |
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 |