summaryrefslogtreecommitdiff
path: root/music/defeatedtrainer.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2014-01-27 16:22:41 -0500
committeryenatch <yenatch@gmail.com>2014-01-27 16:24:13 -0500
commit1b9ee46af9f8baac0d266a54130115a719788377 (patch)
tree8ac61c0752dc74da0677cb26fe4db6362db5b2b7 /music/defeatedtrainer.asm
parent6bde08504fdc336b1d458bab0bed4ef649cae25a (diff)
Get rid of globals.asm. Use ::s to export labels between objects.
globals.asm was a hack that: - gave rgbasm an extra 100k lines to read - increased reliance on the python preprocessor - made the makefile a mess - gave object creation an extra step - wasn't even necessary This speeds up build time by at least a third.
Diffstat (limited to 'music/defeatedtrainer.asm')
-rw-r--r--music/defeatedtrainer.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/music/defeatedtrainer.asm b/music/defeatedtrainer.asm
index 5872b290..5585066a 100644
--- a/music/defeatedtrainer.asm
+++ b/music/defeatedtrainer.asm
@@ -1,4 +1,4 @@
-Music_DefeatedTrainer_Ch1: ; 23a53 (8:7a53)
+Music_DefeatedTrainer_Ch1:: ; 23a53 (8:7a53)
tempo 0, 224
stereopanning 119
duty 2
@@ -21,7 +21,7 @@ Music_DefeatedTrainer_Ch1: ; 23a53 (8:7a53)
duty 1
tempo 0, 224
-Music_DefeatedTrainer_branch_23a76:
+Music_DefeatedTrainer_branch_23a76::
notetype 4, 6, 3
octave 3
note A_, 6
@@ -95,7 +95,7 @@ Music_DefeatedTrainer_branch_23a76:
loopchannel 0, Music_DefeatedTrainer_branch_23a76
-Music_DefeatedTrainer_Ch2: ; 23ac1 (8:7ac1)
+Music_DefeatedTrainer_Ch2:: ; 23ac1 (8:7ac1)
duty 2
notetype 4, 12, 3
octave 4
@@ -110,7 +110,7 @@ Music_DefeatedTrainer_Ch2: ; 23ac1 (8:7ac1)
notetype 4, 12, 4
note D_, 12
-Music_DefeatedTrainer_branch_23ad2:
+Music_DefeatedTrainer_branch_23ad2::
notetype 4, 8, 5
octave 4
note D_, 6
@@ -172,7 +172,7 @@ Music_DefeatedTrainer_branch_23ad2:
loopchannel 0, Music_DefeatedTrainer_branch_23ad2
-Music_DefeatedTrainer_Ch3: ; 23b15 (8:7b15)
+Music_DefeatedTrainer_Ch3:: ; 23b15 (8:7b15)
notetype 4, 1, 0
octave 5
note D_, 2
@@ -186,7 +186,7 @@ Music_DefeatedTrainer_Ch3: ; 23b15 (8:7b15)
note A_, 12
notetype 4, 2, 1
-Music_DefeatedTrainer_branch_23b24:
+Music_DefeatedTrainer_branch_23b24::
note F#, 3
rest 3
note F#, 3