summaryrefslogtreecommitdiff
path: root/audio.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 /audio.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 'audio.asm')
-rw-r--r--audio.asm5
1 files changed, 2 insertions, 3 deletions
diff --git a/audio.asm b/audio.asm
index a77f6f0c..60d00e8a 100644
--- a/audio.asm
+++ b/audio.asm
@@ -1,4 +1,3 @@
-INCLUDE "globals.asm"
AUDIO_1 EQU $2
AUDIO_2 EQU $8
@@ -463,7 +462,7 @@ Music_Cities1AlternateTempo:: ; 0x9b81
SECTION "Audio Engine 2", ROMX, BANK[AUDIO_2]
-Func_2136e: ; 2136e (8:536e)
+Func_2136e:: ; 2136e (8:536e)
ld a, [$d083]
cp $ff
jr z, .asm_2139b
@@ -528,7 +527,7 @@ INCLUDE "menu/pc.asm"
INCLUDE "audio/engine_2.asm"
-Music_PokeFluteInBattle: ; 22306 (8:6306)
+Music_PokeFluteInBattle:: ; 22306 (8:6306)
ld a, (SFX_08_46 - $4000) / 3 ; PokeFlute outside of battle
call PlaySoundWaitForCurrent
ld hl, $c00e