summaryrefslogtreecommitdiff
path: root/src/macros
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2021-06-11 18:45:36 -0500
committerdannye <33dannye@gmail.com>2021-06-11 18:45:36 -0500
commita39a68356236af3850310a64233c3a16edbb92bf (patch)
tree79c96aa5efa7361496bd43f6a7ca4b2fe0f3e09e /src/macros
parent3e36b5fd9d1aa5a5fbe9132bae98b127b82541aa (diff)
Normalize line endings
Diffstat (limited to 'src/macros')
-rw-r--r--src/macros/credits_sequence.asm198
-rw-r--r--src/macros/opening_sequence.asm126
2 files changed, 162 insertions, 162 deletions
diff --git a/src/macros/credits_sequence.asm b/src/macros/credits_sequence.asm
index defe92e..571460b 100644
--- a/src/macros/credits_sequence.asm
+++ b/src/macros/credits_sequence.asm
@@ -1,99 +1,99 @@
-credits_seq_disable_lcd: MACRO
- dw CreditsSequenceCmd_DisableLCD
-ENDM
-
-; x coordinate
-; y coordinate
-; OVERWORLD_* constant
-credits_seq_load_ow_map: MACRO
- dw CreditsSequenceCmd_LoadOWMap
- db \1, \2, \3
-ENDM
-
-credits_seq_init_volcano_sprite: MACRO
- dw CreditsSequenceCmd_InitVolcanoSprite
-ENDM
-
-credits_seq_init_overlay: MACRO
- dw CreditsSequenceCmd_InitOverlay
- db \1, \2, \3, \4
-ENDM
-
-credits_seq_transform_overlay: MACRO
- dw CreditsSequenceCmd_TransformOverlay
- db \1, \2, \3, \4
-ENDM
-
-; x coordinate
-; y coordinate
-; text ID
-credits_seq_print_text_box: MACRO
- dw CreditsSequenceCmd_PrintTextBox
- db \1, \2
- tx \3
-ENDM
-
-; x coordinate
-; y coordinate
-; text ID
-credits_seq_print_text: MACRO
- dw CreditsSequenceCmd_PrintText
- db \1, \2
- tx \3
-ENDM
-
-credits_seq_fade_in: MACRO
- dw CreditsSequenceCmd_FadeIn
-ENDM
-
-credits_seq_fade_out: MACRO
- dw CreditsSequenceCmd_FadeOut
-ENDM
-
-; frames to wait
-credits_seq_wait: MACRO
- dw CreditsSequenceCmd_Wait
- db \1
-ENDM
-
-; x coordinate
-; y coordinate
-; direction
-; NPC ID
-credits_seq_load_npc: MACRO
- dw CreditsSequenceCmd_LoadNPC
- db \1, \2, \3, \4
-ENDM
-
-; y offset
-; heigh
-credits_seq_draw_rectangle: MACRO
- dw CreditsSequenceCmd_DrawRectangle
- db \1, \2
-ENDM
-
-; x coordinate
-; y coordinate
-; scene ID
-credits_seq_load_scene: MACRO
- dw CreditsSequenceCmd_LoadScene
- db \1, \2, \3
-ENDM
-
-; x coordinate
-; y coordinate
-; booster scene ID
-credits_seq_load_booster: MACRO
- dw CreditsSequenceCmd_LoadBooster
- db \1, \2, \3
-ENDM
-
-; index of beaten Club Master
-credits_seq_load_club_map: MACRO
- dw CreditsSequenceCmd_LoadClubMap
- db \1
-ENDM
-
-credits_seq_end: MACRO
- credits_seq_wait $ff
-ENDM
+credits_seq_disable_lcd: MACRO
+ dw CreditsSequenceCmd_DisableLCD
+ENDM
+
+; x coordinate
+; y coordinate
+; OVERWORLD_* constant
+credits_seq_load_ow_map: MACRO
+ dw CreditsSequenceCmd_LoadOWMap
+ db \1, \2, \3
+ENDM
+
+credits_seq_init_volcano_sprite: MACRO
+ dw CreditsSequenceCmd_InitVolcanoSprite
+ENDM
+
+credits_seq_init_overlay: MACRO
+ dw CreditsSequenceCmd_InitOverlay
+ db \1, \2, \3, \4
+ENDM
+
+credits_seq_transform_overlay: MACRO
+ dw CreditsSequenceCmd_TransformOverlay
+ db \1, \2, \3, \4
+ENDM
+
+; x coordinate
+; y coordinate
+; text ID
+credits_seq_print_text_box: MACRO
+ dw CreditsSequenceCmd_PrintTextBox
+ db \1, \2
+ tx \3
+ENDM
+
+; x coordinate
+; y coordinate
+; text ID
+credits_seq_print_text: MACRO
+ dw CreditsSequenceCmd_PrintText
+ db \1, \2
+ tx \3
+ENDM
+
+credits_seq_fade_in: MACRO
+ dw CreditsSequenceCmd_FadeIn
+ENDM
+
+credits_seq_fade_out: MACRO
+ dw CreditsSequenceCmd_FadeOut
+ENDM
+
+; frames to wait
+credits_seq_wait: MACRO
+ dw CreditsSequenceCmd_Wait
+ db \1
+ENDM
+
+; x coordinate
+; y coordinate
+; direction
+; NPC ID
+credits_seq_load_npc: MACRO
+ dw CreditsSequenceCmd_LoadNPC
+ db \1, \2, \3, \4
+ENDM
+
+; y offset
+; heigh
+credits_seq_draw_rectangle: MACRO
+ dw CreditsSequenceCmd_DrawRectangle
+ db \1, \2
+ENDM
+
+; x coordinate
+; y coordinate
+; scene ID
+credits_seq_load_scene: MACRO
+ dw CreditsSequenceCmd_LoadScene
+ db \1, \2, \3
+ENDM
+
+; x coordinate
+; y coordinate
+; booster scene ID
+credits_seq_load_booster: MACRO
+ dw CreditsSequenceCmd_LoadBooster
+ db \1, \2, \3
+ENDM
+
+; index of beaten Club Master
+credits_seq_load_club_map: MACRO
+ dw CreditsSequenceCmd_LoadClubMap
+ db \1
+ENDM
+
+credits_seq_end: MACRO
+ credits_seq_wait $ff
+ENDM
diff --git a/src/macros/opening_sequence.asm b/src/macros/opening_sequence.asm
index a19fc6d..b864c3c 100644
--- a/src/macros/opening_sequence.asm
+++ b/src/macros/opening_sequence.asm
@@ -1,63 +1,63 @@
-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
+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