From 8f8281fe6ed02d8235ab9f92fa6ae93f50a3bf8e Mon Sep 17 00:00:00 2001
From: yenatch <yenatch@gmail.com>
Date: Fri, 23 May 2014 15:34:35 -0700
Subject: Comment some more bank 0 functions.

---
 macros.asm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'macros.asm')

diff --git a/macros.asm b/macros.asm
index a0732705..795230b0 100644
--- a/macros.asm
+++ b/macros.asm
@@ -11,6 +11,18 @@ page   EQUS "db $49,"     ; Start a new Pokedex page.
 dex    EQUS "db $5f, $50" ; End a Pokedex entry.
 
 
+homecall: MACRO
+	ld a, [H_LOADEDROMBANK]
+	push af
+	ld a, BANK(\1)
+	ld [H_LOADEDROMBANK], a
+	ld [MBC3RomBank], a
+	call \1
+	pop af
+	ld [H_LOADEDROMBANK], a
+	ld [MBC3RomBank], a
+	ENDM
+
 callba: MACRO
 	ld b, BANK(\1)
 	ld hl, \1
-- 
cgit v1.3.1-sl0p


From ea05c44163f753b9f507535d8ee549a4d43a4410 Mon Sep 17 00:00:00 2001
From: yenatch <yenatch@gmail.com>
Date: Tue, 27 May 2014 11:09:08 -0700
Subject: Add macro TX_BCD for printing BCD numbers.

This fixes some more static wram addresses.
---
 macros.asm              |  6 ++++++
 text.asm                | 17 +++++++----------
 text/maps/daycare_1.asm |  2 +-
 wram.asm                |  1 +
 4 files changed, 15 insertions(+), 11 deletions(-)

(limited to 'macros.asm')

diff --git a/macros.asm b/macros.asm
index 795230b0..c8164803 100644
--- a/macros.asm
+++ b/macros.asm
@@ -131,6 +131,12 @@ TX_RAM: MACRO
 	dw \1
 	ENDM
 
+TX_BCD: MACRO
+	db $2
+	dw \1
+	db \2
+	ENDM
+
 ; Predef macro.
 PREDEF: MACRO
 	ld a, (\1 - PredefPointers) / 3
diff --git a/text.asm b/text.asm
index b89cfe42..0e93652b 100644
--- a/text.asm
+++ b/text.asm
@@ -992,13 +992,13 @@ _HiddenItemBagFullText:: ; 894e1 (22:54e1)
 _FoundHiddenCoinsText:: ; 8950b (22:550b)
 	text $52, " found"
 	line "@"
-	db $2, $a0, $ff, $c2 ; XXX $2
+	TX_BCD $ffa0, $c2
 	text " coins!@@"
 
 _FoundHiddenCoins2Text:: ; 89523 (22:5523)
 	text $52, " found"
 	line "@"
-	db $2, $a0, $ff, $c2 ; XXX $2 probably coins
+	TX_BCD $ffa0, $c2
 	text " coins!@@"
 
 _DroppedHiddenCoinsText:: ; 8953b (22:553b)
@@ -1091,8 +1091,7 @@ _EnemyMonFaintedText:: ; 0x896c7
 
 _MoneyForWinningText:: ; 896dd (22:56dd)
 	text $52, " got ¥@"
-	;XXX $2
-	db $2, $79, $d0, $c3
+	TX_BCD wd079, $c3
 	db $0
 	line "for winning!"
 	prompt
@@ -1549,12 +1548,10 @@ _SafariZoneAngryText:: ; 89d6a (22:5d6a)
 	prompt
 
 ; money related
-; XXX $2 BCD macro
-; $2, pointer, byte
 _PickUpPayDayMoneyText:: ; 89d80 (22:5d80)
 	text $52, " picked up"
 	line "¥@"
-	db $2, $e5, $cc, $c3
+	TX_BCD wcce5, $c3
 	text "!"
 	prompt
 
@@ -2468,7 +2465,7 @@ _PokemartTellBuyPriceText:: ; a2619 (28:6619)
 	text "?"
 	line "That will be"
 	cont "¥@"
-	db $2, $9f, $ff, $c3
+	TX_BCD $ff9f, $c3
 	text ". OK?"
 	done
 
@@ -2495,7 +2492,7 @@ _PokemonSellingGreetingText:: ; a2690 (28:6690)
 _PokemartTellSellPriceText:: ; a26ae (28:66ae)
 	text "I can pay you"
 	line "¥@"
-	db $2, $9f, $ff, $c3 ; XXX
+	TX_BCD $ff9f, $c3
 	text " for that."
 	done
 
@@ -2881,7 +2878,7 @@ _PlayedFluteHadEffectText:: ; a6928 (29:6928)
 _CoinCaseNumCoinsText:: ; a6940 (29:6940)
 	text "Coins"
 	line "@"
-	db $2, $a4, $d5, $c2 ; print BCD number
+	TX_BCD wPlayerCoins, $c2
 	text " "
 	prompt
 
diff --git a/text/maps/daycare_1.asm b/text/maps/daycare_1.asm
index 2c2314b2..a4182351 100644
--- a/text/maps/daycare_1.asm
+++ b/text/maps/daycare_1.asm
@@ -41,7 +41,7 @@ DayCareMText_8ac67:: ; 8ac67 (22:6c67)
 
 _DayCareMText_56428:: ; 8ac7d (22:6c7d)
 	text "You owe me ¥@"
-	db $2, $3f, $cd, $c2
+	TX_BCD wcd3f, $c2
 	db $0
 	line "for the return"
 	cont "of this #MON."
diff --git a/wram.asm b/wram.asm
index 40157540..16388d65 100755
--- a/wram.asm
+++ b/wram.asm
@@ -368,6 +368,7 @@ wTrainerSpriteOffset:: ; cd3d
 wTrainerEngageDistance:: ; cd3e
 	ds 1
 wTrainerFacingDirection:: ; cd3f
+wcd3f::
 	ds 1
 wTrainerScreenY:: ; cd40
 	ds 1
-- 
cgit v1.3.1-sl0p


From 619a4ea8a1e6f087d9ae00a3f209b3ef648b2e50 Mon Sep 17 00:00:00 2001
From: yenatch <yenatch@gmail.com>
Date: Tue, 27 May 2014 12:03:30 -0700
Subject: Use wOverworldMap in macros.

---
 macros.asm | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'macros.asm')

diff --git a/macros.asm b/macros.asm
index c8164803..2a7c8d47 100644
--- a/macros.asm
+++ b/macros.asm
@@ -45,7 +45,7 @@ Coord = $C3A0 + 20 * \2 + \1
 ;\2 = Rows above (Y-blocks)
 ;\3 = X movement (X-blocks)
 EVENT_DISP: MACRO
-	dw ($C6EF + (\1) + ((\1) + 6) * ((\2) >> 1) + ((\3) >> 1)) ; Ev.Disp
+	dw (wOverworldMap + 7 + (\1) + ((\1) + 6) * ((\2) >> 1) + ((\3) >> 1)) ; Ev.Disp
 	db \2,\3	;Y,X
 	ENDM
 
@@ -311,6 +311,7 @@ endchannel: MACRO
 	db $FF
 ENDM
 
+
 ;\1 (byte) = connected map id
 ;\2 (byte) = connected map width
 ;\3 (byte) = connected map height
@@ -321,12 +322,12 @@ ENDM
 NORTH_MAP_CONNECTION: MACRO
 	db \1 ; map id
 	dw \7 + (\2 * (\3 - 3)) + \5; "Connection Strip" location
-	dw $C6EB + \4 ; current map position
+	dw wOverworldMap + 3 + \4 ; current map position
 	db \6 ; width of connection strip
 	db \2 ; map width
 	db (\3 * 2) - 1 ; y alignment (y coordinate of player when entering map)
 	db (\4 - \5) * -2 ; x alignment (x coordinate of player when entering map)
-	dw $C6E9 + (\3 * (\2 + 6)) ; window (position of the upper left block after entering the map)
+	dw wOverworldMap + 1 + (\3 * (\2 + 6)) ; window (position of the upper left block after entering the map)
 ENDM
 
 ;\1 (byte)  = connected map id
@@ -340,12 +341,12 @@ ENDM
 SOUTH_MAP_CONNECTION: MACRO
 	db \1 ; map id
 	dw \6 + \4 ; "Conection Strip" location
-	dw $C6EB + (\8 + 3) * (\7 + 6) + \3 ; current map positoin
+	dw wOverworldMap + 3 + (\8 + 3) * (\7 + 6) + \3 ; current map positoin
 	db \5 ; width of connection strip
 	db \2 ; map width
 	db 0  ; y alignment (y coordinate of player when entering map)
 	db (\3 - \4) * -2 ; x alignment (x coordinate of player when entering map)
-	dw $C6EF + \2 ; window (position of the upper left block after entering the map)
+	dw wOverworldMap + 7 + \2 ; window (position of the upper left block after entering the map)
 ENDM
 
 ;\1 (byte)  = connected map id
@@ -358,12 +359,12 @@ ENDM
 EAST_MAP_CONNECTION: MACRO
 	db \1 ; map id
 	dw \6 + (\2 * \4) ; "Connection Strip" location
-	dw $C6E5 + (\7 + 6) * (\3 + 4) ; current map position
+	dw wOverworldMap - 3 + (\7 + 6) * (\3 + 4) ; current map position
 	db \5 ; height of connection strip
 	db \2 ; map width
 	db (\3 - \4) * -2 ; y alignment
 	db 0 ; x alignment
-	dw $C6EF + \2 ; window (position of the upper left block after entering the map)
+	dw wOverworldMap + 7 + \2 ; window (position of the upper left block after entering the map)
 ENDM
 
 ;\1 (byte)  = connected map id
@@ -376,10 +377,10 @@ ENDM
 WEST_MAP_CONNECTION: MACRO
 	db \1 ; map id
 	dw \6 + (\2 * \4) + \2 - 3 ; "Connection Strip" location
-	dw $C6E8 + (\7 + 6) * (\3 + 3) ; current map position
+	dw wOverworldMap + (\7 + 6) * (\3 + 3) ; current map position
 	db \5 ; height of connection strip
 	db \2 ; map width
 	db (\3 - \4) * -2 ; y alignment
 	db (\2 * 2) - 1 ; x alignment
-	dw $C6EE + (2 * \2) ; window (position of the upper left block after entring the map)
+	dw wOverworldMap + 6 + (2 * \2) ; window (position of the upper left block after entring the map)
 ENDM
-- 
cgit v1.3.1-sl0p


From 0c7ed80e8f0db0e0a908e372a1bcd11ab7c06e0b Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 9 Jun 2014 13:22:35 -0400
Subject: Improve music command names

---
 audio/engine_1.asm                      | 65 +++++++++++++++---------------
 audio/engine_2.asm                      | 65 +++++++++++++++---------------
 audio/engine_3.asm                      | 71 +++++++++++++++++----------------
 audio/music/bikeriding.asm              |  8 ++--
 audio/music/celadon.asm                 |  6 +--
 audio/music/cinnabar.asm                |  6 +--
 audio/music/cinnabarmansion.asm         |  6 +--
 audio/music/cities1.asm                 |  8 ++--
 audio/music/cities2.asm                 |  6 +--
 audio/music/credits.asm                 |  6 +--
 audio/music/defeatedgymleader.asm       |  8 ++--
 audio/music/defeatedtrainer.asm         | 12 +++---
 audio/music/defeatedwildmon.asm         |  8 ++--
 audio/music/dungeon1.asm                | 10 ++---
 audio/music/dungeon2.asm                |  6 +--
 audio/music/dungeon3.asm                | 24 +++++------
 audio/music/finalbattle.asm             |  6 +--
 audio/music/gamecorner.asm              |  6 +--
 audio/music/gym.asm                     |  6 +--
 audio/music/gymleaderbattle.asm         |  6 +--
 audio/music/halloffame.asm              |  6 +--
 audio/music/indigoplateau.asm           |  6 +--
 audio/music/introbattle.asm             |  6 +--
 audio/music/jigglypuffsong.asm          |  6 +--
 audio/music/lavender.asm                |  6 +--
 audio/music/meeteviltrainer.asm         |  6 +--
 audio/music/meetfemaletrainer.asm       |  6 +--
 audio/music/meetmaletrainer.asm         |  6 +--
 audio/music/meetprofoak.asm             |  6 +--
 audio/music/meetrival.asm               | 16 ++++----
 audio/music/museumguy.asm               |  6 +--
 audio/music/oakslab.asm                 |  6 +--
 audio/music/pallettown.asm              |  4 +-
 audio/music/pkmnhealed.asm              |  6 +--
 audio/music/pokecenter.asm              |  6 +--
 audio/music/pokemontower.asm            |  6 +--
 audio/music/routes1.asm                 |  6 +--
 audio/music/routes2.asm                 |  4 +-
 audio/music/routes3.asm                 |  6 +--
 audio/music/routes4.asm                 |  6 +--
 audio/music/safarizone.asm              |  6 +--
 audio/music/silphco.asm                 | 26 ++++++------
 audio/music/ssanne.asm                  |  6 +--
 audio/music/surfing.asm                 |  6 +--
 audio/music/titlescreen.asm             |  4 +-
 audio/music/trainerbattle.asm           |  6 +--
 audio/music/unusedsong.asm              | 10 ++---
 audio/music/vermilion.asm               |  6 +--
 audio/music/wildbattle.asm              |  6 +--
 audio/music/yellow/meetjessiejames.asm  |  4 +-
 audio/music/yellow/surfingpikachu.asm   |  4 +-
 audio/music/yellow/yellowintro.asm      |  4 +-
 audio/music/yellow/yellowunusedsong.asm |  4 +-
 audio/sfx/sfx_02_3a.asm                 |  6 +--
 audio/sfx/sfx_02_3b.asm                 |  6 +--
 audio/sfx/sfx_02_41.asm                 |  4 +-
 audio/sfx/sfx_02_42.asm                 |  6 +--
 audio/sfx/sfx_08_3a.asm                 |  6 +--
 audio/sfx/sfx_08_3b.asm                 |  6 +--
 audio/sfx/sfx_08_46.asm                 |  6 +--
 audio/sfx/sfx_08_pokeflute.asm          |  2 +-
 audio/sfx/sfx_08_unused2.asm            |  6 +--
 audio/sfx/sfx_1f_3a.asm                 |  6 +--
 audio/sfx/sfx_1f_3b.asm                 |  6 +--
 audio/sfx/sfx_1f_41.asm                 |  4 +-
 audio/sfx/sfx_1f_42.asm                 |  6 +--
 macros.asm                              | 12 +++---
 67 files changed, 321 insertions(+), 318 deletions(-)

(limited to 'macros.asm')

diff --git a/audio/engine_1.asm b/audio/engine_1.asm
index 774374f5..14733513 100644
--- a/audio/engine_1.asm
+++ b/audio/engine_1.asm
@@ -37,13 +37,14 @@ Func_9103:: ; 0x9103
 ; this routine checks flags for music effects currently applied
 ; to the channel and calls certain functions based on flags.
 ; known flags for wc02e:
+;	0: toggleperfectpitch has been used
 ;	1: call has been used
 ;	3: a toggle used only by this routine for vibrato
 ;	4: pitchbend flag
 ;	6: dutycycle flag
 Music2_ApplyMusicAffects: ; 0x9138
 	ld b, $0
-	ld hl, wc0b6 ; delay unitl next note
+	ld hl, wc0b6 ; delay until next note
 	add hl, bc
 	ld a, [hl]
 	cp $1 ; if the delay is 1, play next note
@@ -328,7 +329,7 @@ Music2_loopchannel: ; 0x92a9
 Music2_notetype: ; 0x92e4
 	and $f0
 	cp $d0 ; is this command a notetype?
-	jp nz, Music2_togglecall ; no
+	jp nz, Music2_toggleperfectpitch ; no
 	ld a, d ; yes
 	and $f
 	ld b, $0
@@ -369,16 +370,16 @@ Music2_notetype: ; 0x92e4
 .noiseChannel
 	jp Music2_endchannel
 
-Music2_togglecall: ; 0x9323
+Music2_toggleperfectpitch: ; 0x9323
 	ld a, d
-	cp $e8 ; is this command an togglecall?
+	cp $e8 ; is this command a toggleperfectpitch?
 	jr nz, Music2_vibrato ; no
 	ld b, $0 ; yes
 	ld hl, wc02e
 	add hl, bc
 	ld a, [hl]
 	xor $1
-	ld [hl], a ; flip bit 0 of wc02e (toggle returning from call)
+	ld [hl], a ; flip bit 0 of wc02e
 	jp Music2_endchannel
 
 Music2_vibrato: ; 0x9335
@@ -461,7 +462,7 @@ Music2_duty: ; 0x93a5
 
 Music2_tempo: ; 0x93ba
 	cp $ed ; is this command a tempo?
-	jr nz, Music2_unknownmusic0xee ; no
+	jr nz, Music2_stereopanning ; no
 	ld a, c ; yes
 	cp CH4
 	jr nc, .sfxChannel
@@ -488,11 +489,11 @@ Music2_tempo: ; 0x93ba
 .musicChannelDone
 	jp Music2_endchannel
 
-Music2_unknownmusic0xee: ; 0x93fa
-	cp $ee ; is this command an unknownmusic0xee?
+Music2_stereopanning: ; 0x93fa
+	cp $ee ; is this command a stereopanning?
 	jr nz, Music2_unknownmusic0xef ; no
 	call Music2_GetNextMusicByte ; yes
-	ld [wc004], a ; store first param
+	ld [wc004], a ; store panning
 	jp Music2_endchannel
 
 ; this appears to never be used
@@ -515,7 +516,7 @@ Music2_unknownmusic0xef ; 0x9407
 
 Music2_dutycycle: ; 0x9426
 	cp $fc ; is this command a dutycycle?
-	jr nz, Music2_stereopanning ; no
+	jr nz, Music2_volume ; no
 	call Music2_GetNextMusicByte ; yes
 	ld b, $0
 	ld hl, wc046
@@ -530,11 +531,11 @@ Music2_dutycycle: ; 0x9426
 	set 6, [hl] ; set dutycycle flag
 	jp Music2_endchannel
 
-Music2_stereopanning: ; 0x9444
-	cp $f0 ; is this command a stereopanning?
+Music2_volume: ; 0x9444
+	cp $f0 ; is this command a volume?
 	jr nz, Music2_executemusic ; no
 	call Music2_GetNextMusicByte ; yes
-	ld [$ff24], a ; store stereopanning
+	ld [$ff24], a ; store volume
 	jp Music2_endchannel
 
 Music2_executemusic: ; 0x9450
@@ -794,12 +795,12 @@ Music2_notepitch: ; 0x9568
 	ld b, $0
 	ld hl, wc02e
 	add hl, bc
-	bit 0, [hl]
-	jr z, .asm_95ef
-	inc e
-	jr nc, .asm_95ef
+	bit 0, [hl]   ; has toggleperfectpitch been used?
+	jr z, .skip2
+	inc e         ; if yes, increment the pitch by 1
+	jr nc, .skip2
 	inc d
-.asm_95ef
+.skip2
 	ld hl, wc066
 	add hl, bc
 	ld [hl], e
@@ -1254,7 +1255,7 @@ Func_9858: ; 0x9858
 	add hl, hl
 	ld d, h
 	ld e, l
-	ld hl, Unknown_9b2f
+	ld hl, Music2_Pitches
 	add hl, de
 	ld e, [hl]
 	inc hl
@@ -1665,18 +1666,18 @@ Unknown_9b27: ; 0x9b27
 	db $11, $22, $44, $88 ; channels 0-3
 	db $11, $22, $44, $88 ; channels 4-7
 
-Unknown_9b2f: ; 0x9b2f
-	dw $F82C
-	dw $F89D
-	dw $F907
-	dw $F96B
-	dw $F9CA
-	dw $FA23
-	dw $FA77
-	dw $FAC7
-	dw $FB12
-	dw $FB58
-	dw $FB9B
-	dw $FBDA
+Music2_Pitches: ; 0x9b2f
+	dw $F82C ; C_
+	dw $F89D ; C#
+	dw $F907 ; D_
+	dw $F96B ; D#
+	dw $F9CA ; E_
+	dw $FA23 ; F_
+	dw $FA77 ; F#
+	dw $FAC7 ; G_
+	dw $FB12 ; G#
+	dw $FB58 ; A_
+	dw $FB9B ; A#
+	dw $FBDA ; B_
 
 
diff --git a/audio/engine_2.asm b/audio/engine_2.asm
index 68a905c3..8052a393 100644
--- a/audio/engine_2.asm
+++ b/audio/engine_2.asm
@@ -37,13 +37,14 @@ Func_21879:: ; 21879 (8:5879)
 ; this routine checks flags for music effects currently applied
 ; to the channel and calls certain functions based on flags.
 ; known flags for wc02e:
+;	0: toggleperfectpitch has been used
 ;	1: call has been used
 ;	3: a toggle used only by this routine for vibrato
 ;	4: pitchbend flag
 ;	6: dutycycle flag
 Music8_ApplyMusicAffects: ; 218ae (8:58ae)
 	ld b, $0
-	ld hl, wc0b6 ; delay unitl next note
+	ld hl, wc0b6 ; delay until next note
 	add hl, bc
 	ld a, [hl]
 	cp $1 ; if the delay is 1, play next note
@@ -335,7 +336,7 @@ Music8_loopchannel: ; 21a2a (8:5a2a)
 Music8_notetype: ; 21a65 (8:5a65)
 	and $f0
 	cp $d0 ; is this command a notetype?
-	jp nz, Music8_togglecall ; no
+	jp nz, Music8_toggleperfectpitch ; no
 	ld a, d ; yes
 	and $f
 	ld b, $0
@@ -376,16 +377,16 @@ Music8_notetype: ; 21a65 (8:5a65)
 .noiseChannel
 	jp Music8_endchannel
 
-Music8_togglecall: ; 21aa4 (8:5aa4)
+Music8_toggleperfectpitch: ; 21aa4 (8:5aa4)
 	ld a, d
-	cp $e8 ; is this command an togglecall?
+	cp $e8 ; is this command a toggleperfectpitch?
 	jr nz, Music8_vibrato ; no
 	ld b, $0 ; yes
 	ld hl, wc02e
 	add hl, bc
 	ld a, [hl]
 	xor $1
-	ld [hl], a ; flip bit 0 of wc02e (toggle returning from call)
+	ld [hl], a ; flip bit 0 of wc02e
 	jp Music8_endchannel
 
 Music8_vibrato: ; 21ab6 (8:5ab6)
@@ -468,7 +469,7 @@ Music8_duty: ; 21b26 (8:5b26)
 
 Music8_tempo: ; 21b3b (8:5b3b)
 	cp $ed ; is this command a tempo?
-	jr nz, Music8_unknownmusic0xee ; no
+	jr nz, Music8_stereopanning ; no
 	ld a, c ; yes
 	cp CH4
 	jr nc, .sfxChannel
@@ -495,11 +496,11 @@ Music8_tempo: ; 21b3b (8:5b3b)
 .musicChannelDone
 	jp Music8_endchannel
 
-Music8_unknownmusic0xee: ; 21b7b (8:5b7b)
-	cp $ee ; is this command an unknownmusic0xee?
+Music8_stereopanning: ; 21b7b (8:5b7b)
+	cp $ee ; is this command a stereopanning?
 	jr nz, Music8_unknownmusic0xef ; no
 	call Music8_GetNextMusicByte ; yes
-	ld [wc004], a ; store first param
+	ld [wc004], a ; store panning
 	jp Music8_endchannel
 
 ; this appears to never be used
@@ -522,7 +523,7 @@ Music8_unknownmusic0xef: ; 21b88 (8:5b88)
 
 Music8_dutycycle: ; 21ba7 (8:5ba7)
 	cp $fc ; is this command a dutycycle?
-	jr nz, Music8_stereopanning ; no
+	jr nz, Music8_volume ; no
 	call Music8_GetNextMusicByte ; yes
 	ld b, $0
 	ld hl, wc046
@@ -537,11 +538,11 @@ Music8_dutycycle: ; 21ba7 (8:5ba7)
 	set 6, [hl] ; set dutycycle flag
 	jp Music8_endchannel
 
-Music8_stereopanning: ; 21bc5 (8:5bc5)
-	cp $f0 ; is this command a stereopanning?
+Music8_volume: ; 21bc5 (8:5bc5)
+	cp $f0 ; is this command a volume?
 	jr nz, Music8_executemusic ; no
 	call Music8_GetNextMusicByte ; yes
-	ld [$ff24], a
+	ld [$ff24], a ; store volume
 	jp Music8_endchannel
 
 Music8_executemusic: ; 21bd1 (8:5bd1)
@@ -801,12 +802,12 @@ Music8_notepitch: ; 21ce9 (8:5ce9)
 	ld b, $0
 	ld hl, wc02e
 	add hl, bc
-	bit 0, [hl]
-	jr z, .asm_21d70
-	inc e
-	jr nc, .asm_21d70
+	bit 0, [hl]   ; has toggleperfectpitch been used?
+	jr z, .skip2
+	inc e         ; if yes, increment the pitch by 1
+	jr nc, .skip2
 	inc d
-.asm_21d70
+.skip2
 	ld hl, wc066
 	add hl, bc
 	ld [hl], e
@@ -1305,7 +1306,7 @@ Func_22017: ; 22017 (8:6017)
 	add hl, hl
 	ld d, h
 	ld e, l
-	ld hl, Unknown_222ee
+	ld hl, Music8_Pitches
 	add hl, de
 	ld e, [hl]
 	inc hl
@@ -1716,18 +1717,18 @@ Unknown_222e6: ; 222e6 (8:62e6)
 	db $11, $22, $44, $88 ; channels 0-3
 	db $11, $22, $44, $88 ; channels 4-7
 
-Unknown_222ee: ; 222ee (8:62ee)
-	dw $F82C
-	dw $F89D
-	dw $F907
-	dw $F96B
-	dw $F9CA
-	dw $FA23
-	dw $FA77
-	dw $FAC7
-	dw $FB12
-	dw $FB58
-	dw $FB9B
-	dw $FBDA
+Music8_Pitches: ; 222ee (8:62ee)
+	dw $F82C ; C_
+	dw $F89D ; C#
+	dw $F907 ; D_
+	dw $F96B ; D#
+	dw $F9CA ; E_
+	dw $FA23 ; F_
+	dw $FA77 ; F#
+	dw $FAC7 ; G_
+	dw $FB12 ; G#
+	dw $FB58 ; A_
+	dw $FB9B ; A#
+	dw $FBDA ; B_
 
 
diff --git a/audio/engine_3.asm b/audio/engine_3.asm
index d215c56d..27b49860 100644
--- a/audio/engine_3.asm
+++ b/audio/engine_3.asm
@@ -26,7 +26,7 @@ Func_7d177:: ; 7d177 (1f:5177)
 	ld [$ff1a], a
 	jr .nextChannel
 .applyAffects
-	call Music1f_Music2_ApplyMusicAffects
+	call Music1f_ApplyMusicAffects
 .nextChannel
 	ld a, c
 	inc c ; inc channel number
@@ -37,17 +37,18 @@ Func_7d177:: ; 7d177 (1f:5177)
 ; this routine checks flags for music effects currently applied
 ; to the channel and calls certain functions based on flags.
 ; known flags for wc02e:
+;	0: toggleperfectpitch has been used
 ;	1: call has been used
 ;	3: a toggle used only by this routine for vibrato
 ;	4: pitchbend flag
 ;	6: dutycycle flag
-Music1f_Music2_ApplyMusicAffects: ; 7d1ac (1f:51ac)
+Music1f_ApplyMusicAffects: ; 7d1ac (1f:51ac)
 	ld b, $0
 	ld hl, wc0b6 ; delay until next note
 	add hl, bc
 	ld a, [hl]
 	cp $1 ; if delay is 1, play next note
-	jp z, Music1f_Music2_PlayNextNote
+	jp z, Music1f_PlayNextNote
 	dec a ; otherwise, decrease the delay timer
 	ld [hl], a
 	ld a, c
@@ -147,7 +148,7 @@ Music1f_Music2_ApplyMusicAffects: ; 7d1ac (1f:51ac)
 ; this routine executes all music commands that take up no time,
 ; like tempo changes, duty changes etc. and doesn't return
 ; until the first note is reached
-Music1f_Music2_PlayNextNote: ; 7d244 (1f:5244)
+Music1f_PlayNextNote: ; 7d244 (1f:5244)
 	ld hl, wc06e
 	add hl, bc
 	ld a, [hl]
@@ -328,7 +329,7 @@ Music1f_loopchannel: ; 7d31d (1f:531d)
 Music1f_notetype: ; 7d358 (1f:5358)
 	and $f0
 	cp $d0 ; is this command a notetype?
-	jp nz, Music1f_togglecall ; no
+	jp nz, Music1f_toggleperfectpitch ; no
 	ld a, d ; yes
 	and $f
 	ld b, $0
@@ -369,16 +370,16 @@ Music1f_notetype: ; 7d358 (1f:5358)
 .noiseChannel
 	jp Music1f_endchannel
 
-Music1f_togglecall: ; 7d397 (1f:5397)
+Music1f_toggleperfectpitch: ; 7d397 (1f:5397)
 	ld a, d
-	cp $e8 ; is this command an togglecall?
+	cp $e8 ; is this command a toggleperfectpitch?
 	jr nz, Music1f_vibrato ; no
 	ld b, $0 ; yes
 	ld hl, wc02e
 	add hl, bc
 	ld a, [hl]
 	xor $1
-	ld [hl], a ; flip bit 0 of wc02e (toggle returning from call)
+	ld [hl], a ; flip bit 0 of wc02e
 	jp Music1f_endchannel
 
 Music1f_vibrato: ; 7d3a9 (1f:53a9)
@@ -461,7 +462,7 @@ Music1f_duty: ; 7d419 (1f:5419)
 
 Music1f_tempo: ; 7d42e (1f:542e)
 	cp $ed ; is this command a tempo?
-	jr nz, Music1f_unknownmusic0xee ; no
+	jr nz, Music1f_stereopanning ; no
 	ld a, c ; yes
 	cp CH4
 	jr nc, .sfxChannel
@@ -488,11 +489,11 @@ Music1f_tempo: ; 7d42e (1f:542e)
 .musicChannelDone
 	jp Music1f_endchannel
 
-Music1f_unknownmusic0xee: ; 7d46e (1f:546e)
-	cp $ee ; is this command an unknownmusic0xee?
+Music1f_stereopanning: ; 7d46e (1f:546e)
+	cp $ee ; is this command a stereopanning?
 	jr nz, Music1f_unknownmusic0xef ; no
 	call Music1f_GetNextMusicByte ; yes
-	ld [wc004], a ; store first param
+	ld [wc004], a ; store panning
 	jp Music1f_endchannel
 
 ; this appears to never be used
@@ -515,7 +516,7 @@ Music1f_unknownmusic0xef: ; 7d47b (1f:547b)
 
 Music1f_dutycycle: ; 7d49a (1f:549a)
 	cp $fc ; is this command a dutycycle?
-	jr nz, Music1f_stereopanning ; no
+	jr nz, Music1f_volume ; no
 	call Music1f_GetNextMusicByte ; yes
 	ld b, $0
 	ld hl, wc046
@@ -530,11 +531,11 @@ Music1f_dutycycle: ; 7d49a (1f:549a)
 	set 6, [hl] ; set duty flag
 	jp Music1f_endchannel
 
-Music1f_stereopanning: ; 7d4b8 (1f:54b8)
-	cp $f0 ; is this command a stereopanning?
+Music1f_volume: ; 7d4b8 (1f:54b8)
+	cp $f0 ; is this command a volume?
 	jr nz, Music1f_executemusic ; no
 	call Music1f_GetNextMusicByte ; yes
-	ld [$ff24], a ; store stereopanning
+	ld [$ff24], a ; store volume
 	jp Music1f_endchannel
 
 Music1f_executemusic: ; 7d4c4 (1f:54c4)
@@ -794,12 +795,12 @@ Music1f_notepitch: ; 7d5dc (1f:55dc)
 	ld b, $0
 	ld hl, wc02e
 	add hl, bc
-	bit 0, [hl]
-	jr z, .asm_7d663
-	inc e
-	jr nc, .asm_7d663
+	bit 0, [hl]   ; has toggleperfectpitch been used?
+	jr z, .skip2
+	inc e         ; if yes, increment the pitch by 1
+	jr nc, .skip2
 	inc d
-.asm_7d663
+.skip2
 	ld hl, wc066
 	add hl, bc
 	ld [hl], e
@@ -1254,7 +1255,7 @@ Func_7d8cc: ; 7d8cc (1f:58cc)
 	add hl, hl
 	ld d, h
 	ld e, l
-	ld hl, Unknown_7dba3
+	ld hl, Music1f_Pitches
 	add hl, de
 	ld e, [hl]
 	inc hl
@@ -1665,18 +1666,18 @@ Unknown_7db9b: ; 7db9b (1f:5b9b)
 	db $11, $22, $44, $88 ; channels 0-3
 	db $11, $22, $44, $88 ; channels 4-7
 
-Unknown_7dba3: ; 7dba3 (1f:5ba3)
-	dw $F82C
-	dw $F89D
-	dw $F907
-	dw $F96B
-	dw $F9CA
-	dw $FA23
-	dw $FA77
-	dw $FAC7
-	dw $FB12
-	dw $FB58
-	dw $FB9B
-	dw $FBDA
+Music1f_Pitches: ; 7dba3 (1f:5ba3)
+	dw $F82C ; C_
+	dw $F89D ; C#
+	dw $F907 ; D_
+	dw $F96B ; D#
+	dw $F9CA ; E_
+	dw $FA23 ; F_
+	dw $FA77 ; F#
+	dw $FAC7 ; G_
+	dw $FB12 ; G#
+	dw $FB58 ; A_
+	dw $FB9B ; A#
+	dw $FBDA ; B_
 
 
diff --git a/audio/music/bikeriding.asm b/audio/music/bikeriding.asm
index 13776fe1..dded207e 100644
--- a/audio/music/bikeriding.asm
+++ b/audio/music/bikeriding.asm
@@ -1,6 +1,6 @@
 Music_BikeRiding_Ch1:: ; 7dbbb (1f:5bbb)
-	tempo 0, 144
-	stereopanning 119
+	tempo 144
+	volume 7, 7
 	duty 3
 	vibrato 8, 1, 4
 	notetype 12, 11, 5
@@ -47,7 +47,7 @@ Music_BikeRiding_branch_7dbc9::
 	note D_, 2
 	note E_, 2
 	note F_, 6
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 3
 	note E_, 2
 	note D_, 2
@@ -56,7 +56,7 @@ Music_BikeRiding_branch_7dbc9::
 	note F_, 2
 	note E_, 1
 	note F_, 1
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 5
 	note G_, 6
 	note G_, 6
diff --git a/audio/music/celadon.asm b/audio/music/celadon.asm
index a965bc80..e07d8fef 100644
--- a/audio/music/celadon.asm
+++ b/audio/music/celadon.asm
@@ -1,8 +1,8 @@
 Music_Celadon_Ch1:: ; b6c7 (2:76c7)
-	tempo 0, 144
-	stereopanning 119
+	tempo 144
+	volume 7, 7
 	duty 3
-	togglecall
+	toggleperfectpitch
 	notetype 12, 2, 15
 	rest 8
 	octave 3
diff --git a/audio/music/cinnabar.asm b/audio/music/cinnabar.asm
index db344c64..12048703 100644
--- a/audio/music/cinnabar.asm
+++ b/audio/music/cinnabar.asm
@@ -1,9 +1,9 @@
 Music_Cinnabar_Ch1:: ; b86d (2:786d)
-	tempo 0, 144
-	stereopanning 119
+	tempo 144
+	volume 7, 7
 	duty 3
 	vibrato 12, 3, 4
-	togglecall
+	toggleperfectpitch
 
 Music_Cinnabar_branch_b878::
 	notetype 12, 11, 5
diff --git a/audio/music/cinnabarmansion.asm b/audio/music/cinnabarmansion.asm
index 1560e89d..3a5ec6e3 100644
--- a/audio/music/cinnabarmansion.asm
+++ b/audio/music/cinnabarmansion.asm
@@ -1,6 +1,6 @@
 Music_CinnabarMansion_Ch1:: ; 7ed0f (1f:6d0f)
-	tempo 0, 144
-	stereopanning 119
+	tempo 144
+	volume 7, 7
 	vibrato 11, 2, 5
 	duty 2
 
@@ -40,7 +40,7 @@ Music_CinnabarMansion_branch_7ed19::
 
 Music_CinnabarMansion_Ch2:: ; 7ed40 (1f:6d40)
 	duty 2
-	togglecall
+	toggleperfectpitch
 	vibrato 10, 2, 4
 	notetype 12, 12, 2
 
diff --git a/audio/music/cities1.asm b/audio/music/cities1.asm
index f7b9cc81..03ac21e0 100644
--- a/audio/music/cities1.asm
+++ b/audio/music/cities1.asm
@@ -1,12 +1,12 @@
 Music_Cities1_branch_aa6f::
-	tempo 0, 232
+	tempo 232
 	loopchannel 0, Music_Cities1_branch_aa79
 
 Music_Cities1_Ch1:: ; aa76 (2:6a76)
-	tempo 0, 144
+	tempo 144
 
 Music_Cities1_branch_aa79::
-	stereopanning 119
+	volume 7, 7
 	vibrato 8, 2, 4
 	duty 3
 
@@ -403,7 +403,7 @@ Music_Cities1_branch_ac00::
 
 Music_Cities1_Ch3:: ; ac32 (2:6c32)
 	notetype 12, 1, 1
-	togglecall
+	toggleperfectpitch
 
 Music_Cities1_branch_ac35::
 	vibrato 0, 0, 0
diff --git a/audio/music/cities2.asm b/audio/music/cities2.asm
index 97eadde8..3f5f8c28 100644
--- a/audio/music/cities2.asm
+++ b/audio/music/cities2.asm
@@ -1,9 +1,9 @@
 Music_Cities2_Ch1:: ; b504 (2:7504)
-	tempo 0, 148
-	stereopanning 119
+	tempo 148
+	volume 7, 7
 	duty 3
 	vibrato 8, 3, 2
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 6
 	rest 8
 	octave 3
diff --git a/audio/music/credits.asm b/audio/music/credits.asm
index cdedef62..e057730d 100644
--- a/audio/music/credits.asm
+++ b/audio/music/credits.asm
@@ -1,9 +1,9 @@
 Music_Credits_Ch1:: ; 7fc1f (1f:7c1f)
-	tempo 0, 140
-	stereopanning 119
+	tempo 140
+	volume 7, 7
 	duty 3
 	vibrato 8, 3, 4
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 5
 	octave 4
 	note E_, 6
diff --git a/audio/music/defeatedgymleader.asm b/audio/music/defeatedgymleader.asm
index 0e24d904..b5bf18d9 100644
--- a/audio/music/defeatedgymleader.asm
+++ b/audio/music/defeatedgymleader.asm
@@ -1,10 +1,10 @@
 Music_DefeatedGymLeader_Ch1:: ; 23cad (8:7cad)
-	tempo 0, 112
-	stereopanning 119
+	tempo 112
+	volume 7, 7
 	duty 3
 	vibrato 18, 3, 1
-	togglecall
-	tempo 0, 112
+	toggleperfectpitch
+	tempo 112
 	notetype 12, 10, 6
 	octave 4
 	note D_, 6
diff --git a/audio/music/defeatedtrainer.asm b/audio/music/defeatedtrainer.asm
index 5585066a..0f7a91dc 100644
--- a/audio/music/defeatedtrainer.asm
+++ b/audio/music/defeatedtrainer.asm
@@ -1,13 +1,13 @@
 Music_DefeatedTrainer_Ch1:: ; 23a53 (8:7a53)
-	tempo 0, 224
-	stereopanning 119
+	tempo 224
+	volume 7, 7
 	duty 2
-	togglecall
-	tempo 0, 224
+	toggleperfectpitch
+	tempo 224
 	notetype 4, 10, 2
 	octave 4
 	note D_, 2
-	tempo 0, 224
+	tempo 224
 	notetype 4, 10, 2
 	note D_, 2
 	note D_, 2
@@ -19,7 +19,7 @@ Music_DefeatedTrainer_Ch1:: ; 23a53 (8:7a53)
 	notetype 4, 11, 3
 	note F#, 12
 	duty 1
-	tempo 0, 224
+	tempo 224
 
 Music_DefeatedTrainer_branch_23a76::
 	notetype 4, 6, 3
diff --git a/audio/music/defeatedwildmon.asm b/audio/music/defeatedwildmon.asm
index c56c6471..6340afd3 100644
--- a/audio/music/defeatedwildmon.asm
+++ b/audio/music/defeatedwildmon.asm
@@ -1,11 +1,11 @@
 Music_DefeatedWildMon_Ch1:: ; 23b74 (8:7b74)
-	tempo 0, 112
-	stereopanning 119
+	tempo 112
+	volume 7, 7
 	executemusic
 	duty 3
 	vibrato 6, 3, 4
-	togglecall
-	tempo 0, 112
+	toggleperfectpitch
+	tempo 112
 	notetype 12, 11, 7
 	octave 3
 	note B_, 1
diff --git a/audio/music/dungeon1.asm b/audio/music/dungeon1.asm
index c9bf6dba..bebb6091 100644
--- a/audio/music/dungeon1.asm
+++ b/audio/music/dungeon1.asm
@@ -1,15 +1,15 @@
 Music_Dungeon1_Ch1:: ; 7ded1 (1f:5ed1)
-	tempo 0, 144
-	stereopanning 119
+	tempo 144
+	volume 7, 7
 	duty 3
-	togglecall
+	toggleperfectpitch
 	vibrato 10, 1, 4
 	notetype 12, 4, 13
 	rest 8
-	unknownmusic0xee 237
+	stereopanning 237
 	octave 4
 	note F#, 8
-	unknownmusic0xee 255
+	stereopanning 255
 
 Music_Dungeon1_branch_7dee5::
 	notetype 12, 11, 2
diff --git a/audio/music/dungeon2.asm b/audio/music/dungeon2.asm
index 028d6785..98e39dcf 100644
--- a/audio/music/dungeon2.asm
+++ b/audio/music/dungeon2.asm
@@ -1,8 +1,8 @@
 Music_Dungeon2_Ch1:: ; 7e887 (1f:6887)
-	tempo 0, 144
-	stereopanning 119
+	tempo 144
+	volume 7, 7
 	duty 3
-	togglecall
+	toggleperfectpitch
 	vibrato 10, 1, 4
 
 Music_Dungeon2_branch_7e892::
diff --git a/audio/music/dungeon3.asm b/audio/music/dungeon3.asm
index dd4acc4c..8d13d5c7 100644
--- a/audio/music/dungeon3.asm
+++ b/audio/music/dungeon3.asm
@@ -1,8 +1,8 @@
 Music_Dungeon3_Ch1:: ; 7e9f1 (1f:69f1)
-	tempo 0, 160
-	stereopanning 119
+	tempo 160
+	volume 7, 7
 	duty 3
-	togglecall
+	toggleperfectpitch
 	vibrato 8, 1, 4
 
 Music_Dungeon3_branch_7e9fc::
@@ -243,7 +243,7 @@ Music_Dungeon3_branch_7eaf7::
 	endchannel
 
 Music_Dungeon3_branch_7eafc::
-	tempo 0, 168
+	tempo 168
 	octave 1
 	note A#, 1
 	note B_, 1
@@ -254,7 +254,7 @@ Music_Dungeon3_branch_7eafc::
 	note D#, 1
 	note E_, 1
 	note F_, 1
-	tempo 0, 176
+	tempo 176
 	octave 1
 	note A#, 1
 	note B_, 1
@@ -265,7 +265,7 @@ Music_Dungeon3_branch_7eafc::
 	note D#, 1
 	note E_, 1
 	note F_, 1
-	tempo 0, 184
+	tempo 184
 	octave 1
 	note A#, 1
 	note B_, 1
@@ -276,7 +276,7 @@ Music_Dungeon3_branch_7eafc::
 	note D#, 1
 	note E_, 1
 	note F_, 1
-	tempo 0, 192
+	tempo 192
 	octave 1
 	note A_, 1
 	note A#, 1
@@ -287,7 +287,7 @@ Music_Dungeon3_branch_7eafc::
 	note D_, 1
 	note D#, 1
 	note E_, 1
-	tempo 0, 200
+	tempo 200
 	octave 1
 	note G#, 1
 	note A_, 1
@@ -298,7 +298,7 @@ Music_Dungeon3_branch_7eafc::
 	note C#, 1
 	note D_, 1
 	note D#, 1
-	tempo 0, 208
+	tempo 208
 	octave 1
 	note G_, 1
 	note G#, 1
@@ -309,7 +309,7 @@ Music_Dungeon3_branch_7eafc::
 	note C_, 1
 	note C#, 1
 	note D_, 1
-	tempo 0, 216
+	tempo 216
 	octave 1
 	note F#, 1
 	note G_, 1
@@ -320,7 +320,7 @@ Music_Dungeon3_branch_7eafc::
 	octave 2
 	note C_, 1
 	note C#, 1
-	tempo 0, 224
+	tempo 224
 	octave 1
 	note F_, 1
 	note F#, 1
@@ -331,7 +331,7 @@ Music_Dungeon3_branch_7eafc::
 	note B_, 1
 	octave 2
 	note C_, 1
-	tempo 0, 160
+	tempo 160
 	endchannel
 
 
diff --git a/audio/music/finalbattle.asm b/audio/music/finalbattle.asm
index c0b7e144..80882db7 100644
--- a/audio/music/finalbattle.asm
+++ b/audio/music/finalbattle.asm
@@ -1,9 +1,9 @@
 Music_FinalBattle_Ch1:: ; 233a6 (8:73a6)
-	tempo 0, 112
-	stereopanning 119
+	tempo 112
+	volume 7, 7
 	duty 3
 	vibrato 6, 3, 4
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 2
 	octave 3
 	note F#, 1
diff --git a/audio/music/gamecorner.asm b/audio/music/gamecorner.asm
index ea89ff2f..33a49243 100644
--- a/audio/music/gamecorner.asm
+++ b/audio/music/gamecorner.asm
@@ -1,9 +1,9 @@
 Music_GameCorner_Ch1:: ; 7e20b (1f:620b)
-	tempo 0, 120
-	stereopanning 119
+	tempo 120
+	volume 7, 7
 	duty 3
 	vibrato 12, 3, 4
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 5
 	octave 3
 	note A_, 6
diff --git a/audio/music/gym.asm b/audio/music/gym.asm
index b846ca73..44cc0cb8 100644
--- a/audio/music/gym.asm
+++ b/audio/music/gym.asm
@@ -1,9 +1,9 @@
 Music_Gym_Ch1:: ; bcbb (2:7cbb)
-	tempo 0, 138
-	stereopanning 119
+	tempo 138
+	volume 7, 7
 	duty 3
 	vibrato 8, 2, 2
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 5
 	octave 3
 	note G_, 6
diff --git a/audio/music/gymleaderbattle.asm b/audio/music/gymleaderbattle.asm
index 97162408..edd73717 100644
--- a/audio/music/gymleaderbattle.asm
+++ b/audio/music/gymleaderbattle.asm
@@ -1,9 +1,9 @@
 Music_GymLeaderBattle_Ch1:: ; 22370 (8:6370)
-	tempo 0, 104
-	stereopanning 119
+	tempo 104
+	volume 7, 7
 	duty 3
 	vibrato 8, 3, 4
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 3
 	rest 6
 	octave 3
diff --git a/audio/music/halloffame.asm b/audio/music/halloffame.asm
index 2900cec7..e9df42e4 100644
--- a/audio/music/halloffame.asm
+++ b/audio/music/halloffame.asm
@@ -1,9 +1,9 @@
 Music_HallOfFame_Ch1:: ; 7fbaf (1f:7baf)
-	tempo 0, 112
-	stereopanning 119
+	tempo 112
+	volume 7, 7
 	duty 3
 	vibrato 12, 2, 2
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 3
 	rest 16
 	rest 16
diff --git a/audio/music/indigoplateau.asm b/audio/music/indigoplateau.asm
index e0ea6ff3..28f40cec 100644
--- a/audio/music/indigoplateau.asm
+++ b/audio/music/indigoplateau.asm
@@ -1,9 +1,9 @@
 Music_IndigoPlateau_Ch1:: ; a5f0 (2:65f0)
-	tempo 0, 132
-	stereopanning 119
+	tempo 132
+	volume 7, 7
 	duty 3
 	vibrato 6, 3, 4
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 2
 	octave 2
 	note A_, 8
diff --git a/audio/music/introbattle.asm b/audio/music/introbattle.asm
index 81730736..1297ddf4 100644
--- a/audio/music/introbattle.asm
+++ b/audio/music/introbattle.asm
@@ -1,9 +1,9 @@
 Music_IntroBattle_Ch1:: ; 7f844 (1f:7844)
-	tempo 0, 98
-	stereopanning 119
+	tempo 98
+	volume 7, 7
 	duty 3
 	vibrato 6, 3, 4
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 1
 	rest 8
 	octave 2
diff --git a/audio/music/jigglypuffsong.asm b/audio/music/jigglypuffsong.asm
index b3c6fb4b..216a3166 100644
--- a/audio/music/jigglypuffsong.asm
+++ b/audio/music/jigglypuffsong.asm
@@ -1,10 +1,10 @@
 Music_JigglypuffSong_Ch1:: ; 7fb7d (1f:7b7d)
-	tempo 0, 144
-	stereopanning 119
+	tempo 144
+	volume 7, 7
 	vibrato 8, 2, 4
 	duty 2
 	dutycycle 165
-	togglecall
+	toggleperfectpitch
 	notetype 13, 6, 7
 	octave 4
 	note E_, 8
diff --git a/audio/music/lavender.asm b/audio/music/lavender.asm
index 318da8a8..b506508a 100644
--- a/audio/music/lavender.asm
+++ b/audio/music/lavender.asm
@@ -1,8 +1,8 @@
 Music_Lavender_Ch1:: ; bb58 (2:7b58)
-	tempo 0, 152
-	stereopanning 119
+	tempo 152
+	volume 7, 7
 	duty 1
-	togglecall
+	toggleperfectpitch
 	vibrato 0, 8, 8
 	notetype 12, 8, 7
 	rest 16
diff --git a/audio/music/meeteviltrainer.asm b/audio/music/meeteviltrainer.asm
index 46385127..b8266fd7 100644
--- a/audio/music/meeteviltrainer.asm
+++ b/audio/music/meeteviltrainer.asm
@@ -1,8 +1,8 @@
 Music_MeetEvilTrainer_Ch1:: ; 7f69d (1f:769d)
-	tempo 0, 124
-	stereopanning 119
+	tempo 124
+	volume 7, 7
 	duty 2
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 1
 	rest 4
 	octave 3
diff --git a/audio/music/meetfemaletrainer.asm b/audio/music/meetfemaletrainer.asm
index 1b097f58..69130fb3 100644
--- a/audio/music/meetfemaletrainer.asm
+++ b/audio/music/meetfemaletrainer.asm
@@ -1,8 +1,8 @@
 Music_MeetFemaleTrainer_Ch1:: ; 7f6f9 (1f:76f9)
-	tempo 0, 124
-	stereopanning 119
+	tempo 124
+	volume 7, 7
 	duty 1
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 2
 	octave 3
 	note G#, 6
diff --git a/audio/music/meetmaletrainer.asm b/audio/music/meetmaletrainer.asm
index 3c56aca6..f3b19ab5 100644
--- a/audio/music/meetmaletrainer.asm
+++ b/audio/music/meetmaletrainer.asm
@@ -1,9 +1,9 @@
 Music_MeetMaleTrainer_Ch1:: ; 7f77b (1f:777b)
-	tempo 0, 112
-	stereopanning 119
+	tempo 112
+	volume 7, 7
 	duty 3
 	vibrato 20, 3, 3
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 4
 	octave 3
 	note C#, 1
diff --git a/audio/music/meetprofoak.asm b/audio/music/meetprofoak.asm
index 303dd2f7..35d4ccdb 100644
--- a/audio/music/meetprofoak.asm
+++ b/audio/music/meetprofoak.asm
@@ -1,8 +1,8 @@
 Music_MeetProfOak_Ch1:: ; af59 (2:6f59)
-	tempo 0, 112
-	stereopanning 119
+	tempo 112
+	volume 7, 7
 	duty 3
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 4
 	octave 3
 	note F#, 1
diff --git a/audio/music/meetrival.asm b/audio/music/meetrival.asm
index 1e45ba42..8d956626 100644
--- a/audio/music/meetrival.asm
+++ b/audio/music/meetrival.asm
@@ -1,15 +1,15 @@
 Music_MeetRival_branch_b119::
-	tempo 0, 100
+	tempo 100
 	loopchannel 0, Music_MeetRival_branch_b123
 
 Music_MeetRival_Ch1:: ; b120 (2:7120)
-	tempo 0, 112
+	tempo 112
 
 Music_MeetRival_branch_b123::
-	stereopanning 119
+	volume 7, 7
 	duty 3
 	vibrato 6, 3, 4
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 3
 	octave 4
 	note D_, 1
@@ -120,17 +120,17 @@ Music_MeetRival_branch_b140::
 	loopchannel 0, Music_MeetRival_branch_b140
 
 Music_MeetRival_branch_b19b::
-	tempo 0, 100
+	tempo 100
 	loopchannel 0, Music_MeetRival_branch_b1a5
 
 Music_MeetRival_branch_b1a2::
-	tempo 0, 112
+	tempo 112
 
 Music_MeetRival_branch_b1a5::
-	stereopanning 119
+	volume 7, 7
 	duty 3
 	vibrato 6, 3, 4
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 3
 	octave 3
 	note D_, 1
diff --git a/audio/music/museumguy.asm b/audio/music/museumguy.asm
index 0f3b266f..083222c0 100644
--- a/audio/music/museumguy.asm
+++ b/audio/music/museumguy.asm
@@ -1,8 +1,8 @@
 Music_MuseumGuy_Ch1:: ; adae (2:6dae)
-	tempo 0, 128
-	stereopanning 119
+	tempo 128
+	volume 7, 7
 	duty 2
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 1
 	octave 3
 	note B_, 2
diff --git a/audio/music/oakslab.asm b/audio/music/oakslab.asm
index f7302471..92ed2be4 100644
--- a/audio/music/oakslab.asm
+++ b/audio/music/oakslab.asm
@@ -1,9 +1,9 @@
 Music_OaksLab_Ch1:: ; 7eeb9 (1f:6eb9)
-	tempo 0, 140
-	stereopanning 119
+	tempo 140
+	volume 7, 7
 	duty 3
 	vibrato 16, 1, 2
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 3
 	octave 2
 	note B_, 1
diff --git a/audio/music/pallettown.asm b/audio/music/pallettown.asm
index 15162c3a..1a185d72 100644
--- a/audio/music/pallettown.asm
+++ b/audio/music/pallettown.asm
@@ -1,6 +1,6 @@
 Music_PalletTown_Ch1:: ; a7c5 (2:67c5)
-	tempo 0, 160
-	stereopanning 119
+	tempo 160
+	volume 7, 7
 	duty 2
 	notetype 12, 12, 3
 
diff --git a/audio/music/pkmnhealed.asm b/audio/music/pkmnhealed.asm
index 9a16b435..61e7fea8 100644
--- a/audio/music/pkmnhealed.asm
+++ b/audio/music/pkmnhealed.asm
@@ -1,8 +1,8 @@
 Music_PkmnHealed_Ch1:: ; 9ba3 (2:5ba3)
-	tempo 0, 144
-	stereopanning 119
+	tempo 144
+	volume 7, 7
 	duty 2
-	togglecall
+	toggleperfectpitch
 	notetype 12, 8, 1
 	rest 2
 	pitchbend 0, 75
diff --git a/audio/music/pokecenter.asm b/audio/music/pokecenter.asm
index 4e139b9a..5c74592e 100644
--- a/audio/music/pokecenter.asm
+++ b/audio/music/pokecenter.asm
@@ -1,9 +1,9 @@
 Music_Pokecenter_Ch1:: ; be56 (2:7e56)
-	tempo 0, 144
-	stereopanning 119
+	tempo 144
+	volume 7, 7
 	duty 3
 	vibrato 10, 2, 2
-	togglecall
+	toggleperfectpitch
 
 Music_Pokecenter_branch_be61::
 	notetype 12, 10, 3
diff --git a/audio/music/pokemontower.asm b/audio/music/pokemontower.asm
index 915c656d..68651f38 100644
--- a/audio/music/pokemontower.asm
+++ b/audio/music/pokemontower.asm
@@ -1,8 +1,8 @@
 Music_PokemonTower_Ch1:: ; 7f04a (1f:704a)
-	tempo 0, 152
-	stereopanning 119
+	tempo 152
+	volume 7, 7
 	duty 3
-	togglecall
+	toggleperfectpitch
 	vibrato 12, 2, 3
 	notetype 12, 8, 0
 	rest 4
diff --git a/audio/music/routes1.asm b/audio/music/routes1.asm
index a5c1b40d..bf425b5a 100644
--- a/audio/music/routes1.asm
+++ b/audio/music/routes1.asm
@@ -1,9 +1,9 @@
 Music_Routes1_Ch1:: ; 9bde (2:5bde)
-	tempo 0, 152
-	stereopanning 119
+	tempo 152
+	volume 7, 7
 	vibrato 4, 2, 3
 	duty 2
-	togglecall
+	toggleperfectpitch
 
 Music_Routes1_branch_9be9::
 	notetype 12, 10, 1
diff --git a/audio/music/routes2.asm b/audio/music/routes2.asm
index a1362569..732396c0 100644
--- a/audio/music/routes2.asm
+++ b/audio/music/routes2.asm
@@ -1,6 +1,6 @@
 Music_Routes2_Ch1:: ; 9db9 (2:5db9)
-	tempo 0, 152
-	stereopanning 119
+	tempo 152
+	volume 7, 7
 	vibrato 9, 2, 5
 	duty 1
 
diff --git a/audio/music/routes3.asm b/audio/music/routes3.asm
index 781d5c32..b8cd4b47 100644
--- a/audio/music/routes3.asm
+++ b/audio/music/routes3.asm
@@ -1,9 +1,9 @@
 Music_Routes3_Ch1:: ; 9fad (2:5fad)
-	tempo 0, 148
-	stereopanning 119
+	tempo 148
+	volume 7, 7
 	duty 3
 	vibrato 6, 3, 4
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 5
 	octave 3
 	note E_, 1
diff --git a/audio/music/routes4.asm b/audio/music/routes4.asm
index 3f0858be..b897e3d6 100644
--- a/audio/music/routes4.asm
+++ b/audio/music/routes4.asm
@@ -1,9 +1,9 @@
 Music_Routes4_Ch1:: ; a26a (2:626a)
-	tempo 0, 148
-	stereopanning 119
+	tempo 148
+	volume 7, 7
 	duty 3
 	vibrato 10, 3, 4
-	togglecall
+	toggleperfectpitch
 	notetype 12, 10, 2
 	octave 2
 	note G#, 4
diff --git a/audio/music/safarizone.asm b/audio/music/safarizone.asm
index 679ba0bd..69d97a49 100644
--- a/audio/music/safarizone.asm
+++ b/audio/music/safarizone.asm
@@ -1,8 +1,8 @@
 Music_SafariZone_Ch1:: ; bc2e (2:7c2e)
-	tempo 0, 132
-	stereopanning 119
+	tempo 132
+	volume 7, 7
 	vibrato 6, 3, 4
-	togglecall
+	toggleperfectpitch
 	duty 2
 	notetype 12, 9, 2
 	octave 3
diff --git a/audio/music/silphco.asm b/audio/music/silphco.asm
index b6c70ec7..2906ac4c 100644
--- a/audio/music/silphco.asm
+++ b/audio/music/silphco.asm
@@ -1,8 +1,8 @@
 Music_SilphCo_Ch1:: ; 7f243 (1f:7243)
-	tempo 0, 160
-	stereopanning 119
+	tempo 160
+	volume 7, 7
 	duty 3
-	togglecall
+	toggleperfectpitch
 	vibrato 8, 2, 2
 	notetype 6, 11, 3
 	octave 2
@@ -129,7 +129,7 @@ Music_SilphCo_branch_7f26d::
 	notetype 6, 11, 0
 	octave 3
 	note E_, 8
-	tempo 0, 124
+	tempo 124
 	notetype 6, 11, 3
 	octave 2
 	note B_, 2
@@ -320,29 +320,29 @@ Music_SilphCo_branch_7f26d::
 	note D_, 11
 	rest 4
 	rest 4
-	tempo 0, 128
+	tempo 128
 	rest 4
 	rest 4
-	tempo 0, 136
+	tempo 136
 	rest 4
 	rest 4
-	tempo 0, 144
+	tempo 144
 	rest 4
 	rest 4
-	tempo 0, 160
+	tempo 160
 	rest 4
 	rest 4
-	tempo 0, 192
+	tempo 192
 	rest 4
 	rest 4
-	tempo 1, 32
+	tempo 288
 	rest 4
 	rest 4
-	tempo 1, 160
+	tempo 416
 	rest 4
-	tempo 4, 0
+	tempo 1024
 	rest 4
-	tempo 0, 160
+	tempo 160
 	rest 4
 	notetype 6, 4, 3
 	octave 2
diff --git a/audio/music/ssanne.asm b/audio/music/ssanne.asm
index 675b67d1..f1f92ad9 100644
--- a/audio/music/ssanne.asm
+++ b/audio/music/ssanne.asm
@@ -1,9 +1,9 @@
 Music_SSAnne_Ch1:: ; b3a7 (2:73a7)
-	tempo 0, 128
-	stereopanning 119
+	tempo 128
+	volume 7, 7
 	duty 1
 	vibrato 8, 3, 4
-	togglecall
+	toggleperfectpitch
 
 Music_SSAnne_branch_b3b2::
 	notetype 12, 10, 4
diff --git a/audio/music/surfing.asm b/audio/music/surfing.asm
index c96e796a..a309a7ef 100644
--- a/audio/music/surfing.asm
+++ b/audio/music/surfing.asm
@@ -1,9 +1,9 @@
 Music_Surfing_Ch1:: ; 7fa19 (1f:7a19)
-	tempo 0, 160
-	stereopanning 119
+	tempo 160
+	volume 7, 7
 	duty 3
 	vibrato 12, 3, 4
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 5
 	rest 6
 	octave 2
diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm
index a3ab8031..e4c46df4 100644
--- a/audio/music/titlescreen.asm
+++ b/audio/music/titlescreen.asm
@@ -1,6 +1,6 @@
 Music_TitleScreen_Ch1:: ; 7e4c0 (1f:64c0)
-	tempo 0, 144
-	stereopanning 119
+	tempo 144
+	volume 7, 7
 	vibrato 9, 3, 4
 	duty 3
 	notetype 12, 12, 1
diff --git a/audio/music/trainerbattle.asm b/audio/music/trainerbattle.asm
index 2e4bcdaf..be5f12ce 100644
--- a/audio/music/trainerbattle.asm
+++ b/audio/music/trainerbattle.asm
@@ -1,9 +1,9 @@
 Music_TrainerBattle_Ch1:: ; 22919 (8:6919)
-	tempo 0, 112
-	stereopanning 119
+	tempo 112
+	volume 7, 7
 	duty 3
 	vibrato 6, 3, 4
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 2
 	rest 8
 	octave 3
diff --git a/audio/music/unusedsong.asm b/audio/music/unusedsong.asm
index ee73de3f..4e021fd8 100644
--- a/audio/music/unusedsong.asm
+++ b/audio/music/unusedsong.asm
@@ -1,6 +1,6 @@
 Music_UnusedSong_Ch1:: ; a913 (2:6913)
-	tempo 0, 144
-	stereopanning 119
+	tempo 144
+	volume 7, 7
 	vibrato 5, 1, 6
 
 Music_UnusedSong_branch_a91b::
@@ -183,9 +183,9 @@ Music_UnusedSong_branch_a91b::
 
 
 Music_UnusedSong_Ch2:: ; a9cf (2:69cf)
-	tempo 0, 144
-	stereopanning 119
-	togglecall
+	tempo 144
+	volume 7, 7
+	toggleperfectpitch
 	vibrato 6, 1, 5
 
 Music_UnusedSong_branch_a9d8::
diff --git a/audio/music/vermilion.asm b/audio/music/vermilion.asm
index 4d358528..eab17a08 100644
--- a/audio/music/vermilion.asm
+++ b/audio/music/vermilion.asm
@@ -1,9 +1,9 @@
 Music_Vermilion_Ch1:: ; b9eb (2:79eb)
-	tempo 0, 156
-	stereopanning 119
+	tempo 156
+	volume 7, 7
 	duty 3
 	vibrato 12, 3, 4
-	togglecall
+	toggleperfectpitch
 
 Music_Vermilion_branch_b9f6::
 	notetype 12, 11, 5
diff --git a/audio/music/wildbattle.asm b/audio/music/wildbattle.asm
index b2b80e6e..e94c6a07 100644
--- a/audio/music/wildbattle.asm
+++ b/audio/music/wildbattle.asm
@@ -1,9 +1,9 @@
 Music_WildBattle_Ch1:: ; 23099 (8:7099)
-	tempo 0, 104
-	stereopanning 119
+	tempo 104
+	volume 7, 7
 	duty 3
 	vibrato 6, 3, 4
-	togglecall
+	toggleperfectpitch
 	notetype 12, 11, 3
 	octave 4
 	note C_, 1
diff --git a/audio/music/yellow/meetjessiejames.asm b/audio/music/yellow/meetjessiejames.asm
index eeff798b..cd749f91 100644
--- a/audio/music/yellow/meetjessiejames.asm
+++ b/audio/music/yellow/meetjessiejames.asm
@@ -1,6 +1,6 @@
 Music_MeetJessieJames_Ch1: ; 8316d (20:716d)
-	tempo 0, 144
-	stereopanning 119
+	tempo 144
+	volume 7, 7
 	duty 3
 	vibrato 8, 1, 4
 	notetype 12, 11, 2
diff --git a/audio/music/yellow/surfingpikachu.asm b/audio/music/yellow/surfingpikachu.asm
index 46bec7c3..632da3c5 100644
--- a/audio/music/yellow/surfingpikachu.asm
+++ b/audio/music/yellow/surfingpikachu.asm
@@ -1,6 +1,6 @@
 Music_SurfingPikachu_Ch1: ; 82ce8 (20:6ce8)
-	tempo 0, 117
-	stereopanning 119
+	tempo 117
+	volume 7, 7
 	duty 3
 	vibrato 8, 1, 4
 	notetype 12, 11, 3
diff --git a/audio/music/yellow/yellowintro.asm b/audio/music/yellow/yellowintro.asm
index ee716901..a5e1ba24 100644
--- a/audio/music/yellow/yellowintro.asm
+++ b/audio/music/yellow/yellowintro.asm
@@ -1,6 +1,6 @@
 Music_YellowIntro_Ch1: ; 7f65c (1f:765c)
-	tempo 0, 116
-	stereopanning 119
+	tempo 116
+	volume 7, 7
 	duty 3
 	vibrato 8, 1, 4
 	notetype 12, 11, 2
diff --git a/audio/music/yellow/yellowunusedsong.asm b/audio/music/yellow/yellowunusedsong.asm
index 9c5c0aa6..0198c17e 100644
--- a/audio/music/yellow/yellowunusedsong.asm
+++ b/audio/music/yellow/yellowunusedsong.asm
@@ -1,6 +1,6 @@
 Music_YellowUnusedSong_Ch1: ; 82fbe (20:6fbe)
-	tempo 0, 140
-	stereopanning 119
+	tempo 140
+	volume 7, 7
 	duty 3
 	vibrato 8, 1, 4
 	notetype 8, 11, 2
diff --git a/audio/sfx/sfx_02_3a.asm b/audio/sfx/sfx_02_3a.asm
index 35808c35..5dc9a318 100644
--- a/audio/sfx/sfx_02_3a.asm
+++ b/audio/sfx/sfx_02_3a.asm
@@ -1,10 +1,10 @@
 SFX_02_3a_Ch1: ; ad77 (2:6d77)
 	executemusic
-	tempo 1, 0
-	stereopanning 119
+	tempo 256
+	volume 7, 7
 	vibrato 6, 2, 6
 	duty 2
-	togglecall
+	toggleperfectpitch
 	notetype 4, 11, 1
 	octave 3
 	note G#, 2
diff --git a/audio/sfx/sfx_02_3b.asm b/audio/sfx/sfx_02_3b.asm
index 538f2462..efe43b48 100644
--- a/audio/sfx/sfx_02_3b.asm
+++ b/audio/sfx/sfx_02_3b.asm
@@ -1,9 +1,9 @@
 SFX_02_3b_Ch1: ; b316 (2:7316)
 	executemusic
-	tempo 1, 0
-	stereopanning 119
+	tempo 256
+	volume 7, 7
 	duty 2
-	togglecall
+	toggleperfectpitch
 	notetype 5, 11, 4
 	octave 4
 	note D_, 4
diff --git a/audio/sfx/sfx_02_41.asm b/audio/sfx/sfx_02_41.asm
index 4ba0eb14..0a261b84 100644
--- a/audio/sfx/sfx_02_41.asm
+++ b/audio/sfx/sfx_02_41.asm
@@ -1,7 +1,7 @@
 SFX_02_41_Ch1: ; b2c8 (2:72c8)
 	executemusic
-	tempo 1, 0
-	stereopanning 119
+	tempo 256
+	volume 7, 7
 	duty 2
 	notetype 5, 11, 1
 	octave 3
diff --git a/audio/sfx/sfx_02_42.asm b/audio/sfx/sfx_02_42.asm
index e9112a02..c2f3f8a4 100644
--- a/audio/sfx/sfx_02_42.asm
+++ b/audio/sfx/sfx_02_42.asm
@@ -1,9 +1,9 @@
 SFX_02_42_Ch1: ; b362 (2:7362)
 	executemusic
-	tempo 1, 0
-	stereopanning 119
+	tempo 256
+	volume 7, 7
 	duty 2
-	togglecall
+	toggleperfectpitch
 	notetype 5, 10, 4
 	octave 3
 	note A#, 4
diff --git a/audio/sfx/sfx_08_3a.asm b/audio/sfx/sfx_08_3a.asm
index b7791942..a81d8775 100644
--- a/audio/sfx/sfx_08_3a.asm
+++ b/audio/sfx/sfx_08_3a.asm
@@ -1,9 +1,9 @@
 SFX_08_3a_Ch1: ; 2397d (8:797d)
 	executemusic
-	tempo 1, 0
-	stereopanning 119
+	tempo 256
+	volume 7, 7
 	duty 2
-	togglecall
+	toggleperfectpitch
 	notetype 6, 11, 4
 	octave 4
 	note F_, 4
diff --git a/audio/sfx/sfx_08_3b.asm b/audio/sfx/sfx_08_3b.asm
index cd123b01..a829a112 100644
--- a/audio/sfx/sfx_08_3b.asm
+++ b/audio/sfx/sfx_08_3b.asm
@@ -1,9 +1,9 @@
 SFX_08_3b_Ch1: ; 239c7 (8:79c7)
 	executemusic
-	tempo 1, 0
-	stereopanning 119
+	tempo 256
+	volume 7, 7
 	duty 2
-	togglecall
+	toggleperfectpitch
 	notetype 5, 11, 4
 	octave 4
 	note D_, 4
diff --git a/audio/sfx/sfx_08_46.asm b/audio/sfx/sfx_08_46.asm
index 5f2b9d33..33a5ab25 100644
--- a/audio/sfx/sfx_08_46.asm
+++ b/audio/sfx/sfx_08_46.asm
@@ -1,9 +1,9 @@
 SFX_08_46_Ch1: ; 23a13 (8:7a13)
 	executemusic
-	tempo 1, 0
-	stereopanning 119
+	tempo 256
+	volume 7, 7
 	duty 3
-	togglecall
+	toggleperfectpitch
 	notetype 6, 11, 2
 	octave 3
 	note E_, 2
diff --git a/audio/sfx/sfx_08_pokeflute.asm b/audio/sfx/sfx_08_pokeflute.asm
index 3160f87c..103e2d56 100755
--- a/audio/sfx/sfx_08_pokeflute.asm
+++ b/audio/sfx/sfx_08_pokeflute.asm
@@ -1,5 +1,5 @@
 SFX_08_PokeFlute_Ch1: ; 22322 (8:6322)
-	tempo 1, 0
+	tempo 256
 
 
 SFX_08_PokeFlute_Ch2: ; 22325 (8:6325)
diff --git a/audio/sfx/sfx_08_unused2.asm b/audio/sfx/sfx_08_unused2.asm
index be887476..c0e2ce76 100755
--- a/audio/sfx/sfx_08_unused2.asm
+++ b/audio/sfx/sfx_08_unused2.asm
@@ -1,10 +1,10 @@
 SFX_08_unused2_Ch1: ; 2232f (8:632f)
 	executemusic
-	tempo 1, 0
-	stereopanning 119
+	tempo 256
+	volume 7, 7
 	vibrato 6, 2, 6
 	duty 2
-	togglecall
+	toggleperfectpitch
 	notetype 6, 11, 1
 	octave 3
 	note G#, 2
diff --git a/audio/sfx/sfx_1f_3a.asm b/audio/sfx/sfx_1f_3a.asm
index 2f7f3045..45fcecca 100644
--- a/audio/sfx/sfx_1f_3a.asm
+++ b/audio/sfx/sfx_1f_3a.asm
@@ -1,10 +1,10 @@
 SFX_1f_3a_Ch1: ; 7e850 (1f:6850)
 	executemusic
-	tempo 1, 0
-	stereopanning 119
+	tempo 256
+	volume 7, 7
 	vibrato 6, 2, 6
 	duty 2
-	togglecall
+	toggleperfectpitch
 	notetype 4, 11, 1
 	octave 3
 	note G#, 2
diff --git a/audio/sfx/sfx_1f_3b.asm b/audio/sfx/sfx_1f_3b.asm
index a167d4cf..16507623 100644
--- a/audio/sfx/sfx_1f_3b.asm
+++ b/audio/sfx/sfx_1f_3b.asm
@@ -1,9 +1,9 @@
 SFX_1f_3b_Ch1: ; 7ee28 (1f:6e28)
 	executemusic
-	tempo 1, 0
-	stereopanning 119
+	tempo 256
+	volume 7, 7
 	duty 2
-	togglecall
+	toggleperfectpitch
 	notetype 5, 11, 4
 	octave 4
 	note D_, 4
diff --git a/audio/sfx/sfx_1f_41.asm b/audio/sfx/sfx_1f_41.asm
index 62153990..d5564ddd 100644
--- a/audio/sfx/sfx_1f_41.asm
+++ b/audio/sfx/sfx_1f_41.asm
@@ -1,7 +1,7 @@
 SFX_1f_41_Ch1: ; 7edda (1f:6dda)
 	executemusic
-	tempo 1, 0
-	stereopanning 119
+	tempo 256
+	volume 7, 7
 	duty 2
 	notetype 5, 11, 1
 	octave 3
diff --git a/audio/sfx/sfx_1f_42.asm b/audio/sfx/sfx_1f_42.asm
index c0805196..bf231d23 100644
--- a/audio/sfx/sfx_1f_42.asm
+++ b/audio/sfx/sfx_1f_42.asm
@@ -1,9 +1,9 @@
 SFX_1f_42_Ch1: ; 7ee74 (1f:6e74)
 	executemusic
-	tempo 1, 0
-	stereopanning 119
+	tempo 256
+	volume 7, 7
 	duty 2
-	togglecall
+	toggleperfectpitch
 	notetype 5, 10, 4
 	octave 3
 	note A#, 4
diff --git a/macros.asm b/macros.asm
index 2a7c8d47..b2eb15ab 100644
--- a/macros.asm
+++ b/macros.asm
@@ -247,7 +247,7 @@ octave: MACRO
 	db $E8 - \1
 ENDM
 
-togglecall: MACRO
+toggleperfectpitch: MACRO
 	db $E8
 ENDM
 
@@ -271,18 +271,18 @@ ENDM
 
 tempo: MACRO
 	db $ED
-	db \1
-	db \2
+	db \1 / $100
+	db \1 % $100
 ENDM
 
-unknownmusic0xee: MACRO
+stereopanning: MACRO
 	db $EE
 	db \1
 ENDM
 
-stereopanning: MACRO
+volume: MACRO
 	db $F0
-	db \1
+	db (\1 << 4) | \2
 ENDM
 
 executemusic: MACRO
-- 
cgit v1.3.1-sl0p


From b83acb03e50c4314e082e642bdb429346892d040 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Mon, 9 Jun 2014 16:58:02 -0400
Subject: Clean up white space

---
 audio/engine_1.asm                     |  4 ++--
 audio/engine_2.asm                     |  4 ++--
 audio/headers/musicheaders02.asm       |  2 +-
 audio/headers/musicheaders08.asm       |  2 +-
 constants/move_animation_constants.asm |  2 +-
 data/wildPokemon/mansion1.asm          |  8 ++++----
 data/wildPokemon/mansion2.asm          | 10 +++++-----
 data/wildPokemon/mansion3.asm          | 10 +++++-----
 data/wildPokemon/mansionb1.asm         | 10 +++++-----
 data/wildPokemon/mtmoon1.asm           |  2 +-
 data/wildPokemon/mtmoonb1.asm          |  2 +-
 data/wildPokemon/mtmoonb2.asm          |  2 +-
 data/wildPokemon/pokemontower1.asm     |  2 +-
 data/wildPokemon/pokemontower2.asm     |  2 +-
 data/wildPokemon/pokemontower3.asm     |  8 ++++----
 data/wildPokemon/pokemontower4.asm     |  8 ++++----
 data/wildPokemon/pokemontower5.asm     |  8 ++++----
 data/wildPokemon/pokemontower6.asm     |  8 ++++----
 data/wildPokemon/pokemontower7.asm     |  8 ++++----
 data/wildPokemon/powerplant.asm        |  8 ++++----
 data/wildPokemon/rocktunnel1.asm       |  8 ++++----
 data/wildPokemon/rocktunnel2.asm       |  6 +++---
 data/wildPokemon/route1.asm            |  2 +-
 data/wildPokemon/route10.asm           | 10 +++++-----
 data/wildPokemon/route11.asm           | 10 +++++-----
 data/wildPokemon/route12.asm           |  8 ++++----
 data/wildPokemon/route13.asm           |  6 +++---
 data/wildPokemon/route14.asm           |  8 ++++----
 data/wildPokemon/route15.asm           |  8 ++++----
 data/wildPokemon/route16.asm           |  6 +++---
 data/wildPokemon/route17.asm           |  6 +++---
 data/wildPokemon/route18.asm           |  6 +++---
 data/wildPokemon/route2.asm            |  4 ++--
 data/wildPokemon/route21.asm           |  6 +++---
 data/wildPokemon/route22.asm           |  2 +-
 data/wildPokemon/route23.asm           |  6 +++---
 data/wildPokemon/route24.asm           | 12 ++++++------
 data/wildPokemon/route25.asm           | 12 ++++++------
 data/wildPokemon/route3.asm            |  2 +-
 data/wildPokemon/route4.asm            |  8 ++++----
 data/wildPokemon/route5.asm            | 12 ++++++------
 data/wildPokemon/route6.asm            | 10 +++++-----
 data/wildPokemon/route7.asm            | 12 ++++++------
 data/wildPokemon/route8.asm            | 12 ++++++------
 data/wildPokemon/route9.asm            | 10 +++++-----
 data/wildPokemon/safarizone1.asm       |  8 ++++----
 data/wildPokemon/safarizone2.asm       |  6 +++---
 data/wildPokemon/safarizone3.asm       | 10 +++++-----
 data/wildPokemon/safarizonecenter.asm  | 10 +++++-----
 data/wildPokemon/seafoamisland1.asm    | 10 +++++-----
 data/wildPokemon/seafoamislandb1.asm   | 10 +++++-----
 data/wildPokemon/seafoamislandb2.asm   | 10 +++++-----
 data/wildPokemon/seafoamislandb3.asm   | 10 +++++-----
 data/wildPokemon/seafoamislandb4.asm   | 10 +++++-----
 data/wildPokemon/unknowndungeon1.asm   |  6 +++---
 data/wildPokemon/unknowndungeon2.asm   |  6 +++---
 data/wildPokemon/unknowndungeonb1.asm  |  6 +++---
 data/wildPokemon/victoryroad1.asm      |  4 ++--
 data/wildPokemon/victoryroad2.asm      |  6 +++---
 data/wildPokemon/victoryroad3.asm      |  6 +++---
 data/wildPokemon/viridianforest.asm    |  6 +++---
 data/wildPokemon/waterpokemon.asm      |  2 +-
 macros.asm                             |  4 ++--
 scripts/route22.asm                    |  2 +-
 scripts/route5gate.asm                 |  2 +-
 wram.asm                               |  2 +-
 66 files changed, 219 insertions(+), 219 deletions(-)

(limited to 'macros.asm')

diff --git a/audio/engine_1.asm b/audio/engine_1.asm
index 4177e14d..8343074a 100644
--- a/audio/engine_1.asm
+++ b/audio/engine_1.asm
@@ -31,7 +31,7 @@ Music2_UpdateMusic:: ; 0x9103
 	ld a, c
 	inc c ; inc channel number
 	cp CH7
-	jr nz, .loop 
+	jr nz, .loop
 	ret
 
 ; this routine checks flags for music effects currently applied
@@ -389,7 +389,7 @@ Music2_vibrato: ; 0x9335
 	ld b, $0
 	ld hl, wc04e
 	add hl, bc
-	ld [hl], a ; store delay 
+	ld [hl], a ; store delay
 	ld hl, wc06e
 	add hl, bc
 	ld [hl], a ; store delay
diff --git a/audio/engine_2.asm b/audio/engine_2.asm
index 037c8741..b4cb653b 100644
--- a/audio/engine_2.asm
+++ b/audio/engine_2.asm
@@ -396,10 +396,10 @@ Music8_vibrato: ; 21ab6 (8:5ab6)
 	ld b, $0
 	ld hl, wc04e
 	add hl, bc
-	ld [hl], a ; store delay 
+	ld [hl], a ; store delay
 	ld hl, wc06e
 	add hl, bc
-	ld [hl], a ; store delay 
+	ld [hl], a ; store delay
 	call Music8_GetNextMusicByte
 	ld d, a
 	and $f0
diff --git a/audio/headers/musicheaders02.asm b/audio/headers/musicheaders02.asm
index 3adb23c5..dd5b4b5b 100644
--- a/audio/headers/musicheaders02.asm
+++ b/audio/headers/musicheaders02.asm
@@ -182,5 +182,5 @@ Music_IndigoPlateau:: ; 82f1 (2:42f1)
 	dw Music_IndigoPlateau_Ch3
 	db CH3
 	dw Music_IndigoPlateau_Ch4
-	
+
 ; 0x82fd
\ No newline at end of file
diff --git a/audio/headers/musicheaders08.asm b/audio/headers/musicheaders08.asm
index fbc3f9ae..b4ef7375 100644
--- a/audio/headers/musicheaders08.asm
+++ b/audio/headers/musicheaders08.asm
@@ -53,5 +53,5 @@ Music_DefeatedGymLeader:: ; 202f4 (8:42f4)
 	dw Music_DefeatedGymLeader_Ch2
 	db CH2
 	dw Music_DefeatedGymLeader_Ch3
-	
+
 ; 202fd
\ No newline at end of file
diff --git a/constants/move_animation_constants.asm b/constants/move_animation_constants.asm
index 71051541..018c094b 100644
--- a/constants/move_animation_constants.asm
+++ b/constants/move_animation_constants.asm
@@ -1,4 +1,4 @@
-; subanimations 
+; subanimations
 
 
 ; special effects, prefaced with "SE" for "Special Effect"
diff --git a/data/wildPokemon/mansion1.asm b/data/wildPokemon/mansion1.asm
index 0a333398..82547896 100755
--- a/data/wildPokemon/mansion1.asm
+++ b/data/wildPokemon/mansion1.asm
@@ -1,4 +1,4 @@
-MansionMons1: 
+MansionMons1:
 	db $0A
 	IF _RED
 		db 32,KOFFING
@@ -12,7 +12,7 @@ MansionMons1:
 		db 37,WEEZING
 		db 39,MUK
 	ENDC
-	
+
 	IF _GREEN || _BLUE
 		db 32,GRIMER
 		db 30,GRIMER
@@ -25,7 +25,7 @@ MansionMons1:
 		db 37,MUK
 		db 39,WEEZING
 	ENDC
-	
+
 	IF _YELLOW
 		db 34,RATTATA
 		db 34,RATICATE
@@ -38,6 +38,6 @@ MansionMons1:
 		db 34,GROWLITHE
 		db 38,GROWLITHE
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/mansion2.asm b/data/wildPokemon/mansion2.asm
index 07ddc947..8ebbb414 100755
--- a/data/wildPokemon/mansion2.asm
+++ b/data/wildPokemon/mansion2.asm
@@ -1,4 +1,4 @@
-MansionMons2: 
+MansionMons2:
 	db $0A
 	IF _RED
 		db 32,GROWLITHE
@@ -12,7 +12,7 @@ MansionMons2:
 		db 39,WEEZING
 		db 37,MUK
 	ENDC
-	
+
 	IF _GREEN || !_JAPAN && _BLUE
 		db 32,VULPIX
 		db 34,GRIMER
@@ -25,7 +25,7 @@ MansionMons2:
 		db 39,MUK
 		db 37,WEEZING
 	ENDC
-	
+
 	IF _JAPAN && _BLUE
 		db 32,GROWLITHE
 		db 34,GRIMER
@@ -38,7 +38,7 @@ MansionMons2:
 		db 39,MUK
 		db 37,WEEZING
 	ENDC
-	
+
 	IF _YELLOW
 		db 37,RATTATA
 		db 37,RATICATE
@@ -51,6 +51,6 @@ MansionMons2:
 		db 35,MUK
 		db 38,MUK
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/mansion3.asm b/data/wildPokemon/mansion3.asm
index c0df4020..a1b126ac 100755
--- a/data/wildPokemon/mansion3.asm
+++ b/data/wildPokemon/mansion3.asm
@@ -1,4 +1,4 @@
-MansionMons3: 
+MansionMons3:
 	db $0A
 	IF _RED
 		db 31,KOFFING
@@ -12,7 +12,7 @@ MansionMons3:
 		db 36,PONYTA
 		db 42,MUK
 	ENDC
-	
+
 	IF _GREEN || !_JAPAN && _BLUE
 		db 31,GRIMER
 		db 33,VULPIX
@@ -25,7 +25,7 @@ MansionMons3:
 		db 36,PONYTA
 		db 42,WEEZING
 	ENDC
-	
+
 	IF _JAPAN && _BLUE
 		db 31,GRIMER
 		db 33,GROWLITHE
@@ -38,7 +38,7 @@ MansionMons3:
 		db 36,PONYTA
 		db 42,WEEZING
 	ENDC
-	
+
 	IF _YELLOW
 		db 40,RATTATA
 		db 40,RATICATE
@@ -51,6 +51,6 @@ MansionMons3:
 		db 38,MUK
 		db 41,MUK
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/mansionb1.asm b/data/wildPokemon/mansionb1.asm
index 9b90d211..23831eeb 100755
--- a/data/wildPokemon/mansionb1.asm
+++ b/data/wildPokemon/mansionb1.asm
@@ -1,4 +1,4 @@
-MansionMonsB1: 
+MansionMonsB1:
 	db $0A
 	IF _RED
 		db 33,KOFFING
@@ -12,7 +12,7 @@ MansionMonsB1:
 		db 42,WEEZING
 		db 42,MUK
 	ENDC
-	
+
 	IF _GREEN || !_JAPAN && _BLUE
 		db 33,GRIMER
 		db 31,GRIMER
@@ -25,7 +25,7 @@ MansionMonsB1:
 		db 38,MAGMAR
 		db 42,WEEZING
 	ENDC
-	
+
 	IF _JAPAN && _BLUE
 		db 33,GRIMER
 		db 31,GRIMER
@@ -38,7 +38,7 @@ MansionMonsB1:
 		db 38,MUK
 		db 42,WEEZING
 	ENDC
-	
+
 	IF _YELLOW
 		db 35,GRIMER
 		db 38,GRIMER
@@ -51,6 +51,6 @@ MansionMonsB1:
 		db 18,DITTO
 		db 12,DITTO
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/mtmoon1.asm b/data/wildPokemon/mtmoon1.asm
index 3f69ae3f..5ba1d030 100755
--- a/data/wildPokemon/mtmoon1.asm
+++ b/data/wildPokemon/mtmoon1.asm
@@ -1,4 +1,4 @@
-MoonMons1: 
+MoonMons1:
 	db $0A
 	IF !_YELLOW
 		db 8,ZUBAT
diff --git a/data/wildPokemon/mtmoonb1.asm b/data/wildPokemon/mtmoonb1.asm
index 30d9a4ce..0f3639c1 100755
--- a/data/wildPokemon/mtmoonb1.asm
+++ b/data/wildPokemon/mtmoonb1.asm
@@ -1,4 +1,4 @@
-MoonMonsB1: 
+MoonMonsB1:
 	db $0A
 	IF !_YELLOW
 		db 8,ZUBAT
diff --git a/data/wildPokemon/mtmoonb2.asm b/data/wildPokemon/mtmoonb2.asm
index 36266724..34966cd8 100755
--- a/data/wildPokemon/mtmoonb2.asm
+++ b/data/wildPokemon/mtmoonb2.asm
@@ -1,4 +1,4 @@
-MoonMonsB2: 
+MoonMonsB2:
 	db $0A
 	IF !_YELLOW
 		db 9,ZUBAT
diff --git a/data/wildPokemon/pokemontower1.asm b/data/wildPokemon/pokemontower1.asm
index bdf0abc1..4911c790 100755
--- a/data/wildPokemon/pokemontower1.asm
+++ b/data/wildPokemon/pokemontower1.asm
@@ -1,4 +1,4 @@
-TowerMons1: 
+TowerMons1:
 	db $00
 	db $00
 
diff --git a/data/wildPokemon/pokemontower2.asm b/data/wildPokemon/pokemontower2.asm
index 1d0eddaf..a849668d 100755
--- a/data/wildPokemon/pokemontower2.asm
+++ b/data/wildPokemon/pokemontower2.asm
@@ -1,4 +1,4 @@
-TowerMons2: 
+TowerMons2:
 	db $00
 	db $00
 
diff --git a/data/wildPokemon/pokemontower3.asm b/data/wildPokemon/pokemontower3.asm
index 7d1abf59..e2b39398 100755
--- a/data/wildPokemon/pokemontower3.asm
+++ b/data/wildPokemon/pokemontower3.asm
@@ -1,6 +1,6 @@
-TowerMons3: 
+TowerMons3:
 	db $0A
-	
+
 	IF !_YELLOW
 		db 20,GASTLY
 		db 21,GASTLY
@@ -13,7 +13,7 @@ TowerMons3:
 		db 22,CUBONE
 		db 25,HAUNTER
 	ENDC
-	
+
 	IF _YELLOW
 		db 20,GASTLY
 		db 21,GASTLY
@@ -26,6 +26,6 @@ TowerMons3:
 		db 20,HAUNTER
 		db 25,HAUNTER
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/pokemontower4.asm b/data/wildPokemon/pokemontower4.asm
index 462e5034..3f38af20 100755
--- a/data/wildPokemon/pokemontower4.asm
+++ b/data/wildPokemon/pokemontower4.asm
@@ -1,6 +1,6 @@
-TowerMons4: 
+TowerMons4:
 	db $0A
-	
+
 	IF !_YELLOW
 		db 20,GASTLY
 		db 21,GASTLY
@@ -13,7 +13,7 @@ TowerMons4:
 		db 22,CUBONE
 		db 24,GASTLY
 	ENDC
-	
+
 	IF _YELLOW
 		db 20,GASTLY
 		db 21,GASTLY
@@ -26,6 +26,6 @@ TowerMons4:
 		db 20,HAUNTER
 		db 25,HAUNTER
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/pokemontower5.asm b/data/wildPokemon/pokemontower5.asm
index 6976937a..97098448 100755
--- a/data/wildPokemon/pokemontower5.asm
+++ b/data/wildPokemon/pokemontower5.asm
@@ -1,6 +1,6 @@
-TowerMons5: 
+TowerMons5:
 	db $0A
-	
+
 	IF !_YELLOW
 		db 20,GASTLY
 		db 21,GASTLY
@@ -13,7 +13,7 @@ TowerMons5:
 		db 22,CUBONE
 		db 24,GASTLY
 	ENDC
-	
+
 	IF _YELLOW
 		db 22,GASTLY
 		db 23,GASTLY
@@ -26,6 +26,6 @@ TowerMons5:
 		db 22,HAUNTER
 		db 27,HAUNTER
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/pokemontower6.asm b/data/wildPokemon/pokemontower6.asm
index 4f2d9594..abd2969a 100755
--- a/data/wildPokemon/pokemontower6.asm
+++ b/data/wildPokemon/pokemontower6.asm
@@ -1,6 +1,6 @@
-TowerMons6: 
+TowerMons6:
 	db $0F
-	
+
 	IF !_YELLOW
 		db 21,GASTLY
 		db 22,GASTLY
@@ -13,7 +13,7 @@ TowerMons6:
 		db 24,CUBONE
 		db 28,HAUNTER
 	ENDC
-	
+
 	IF _YELLOW
 		db 22,GASTLY
 		db 23,GASTLY
@@ -26,6 +26,6 @@ TowerMons6:
 		db 22,HAUNTER
 		db 27,HAUNTER
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/pokemontower7.asm b/data/wildPokemon/pokemontower7.asm
index 6c9afbd4..2daf3a2d 100755
--- a/data/wildPokemon/pokemontower7.asm
+++ b/data/wildPokemon/pokemontower7.asm
@@ -1,6 +1,6 @@
-TowerMons7: 
+TowerMons7:
 	db $0F
-	
+
 	IF !_YELLOW
 		db 21,GASTLY
 		db 22,GASTLY
@@ -14,7 +14,7 @@ TowerMons7:
 		db 30,HAUNTER
 
 	ENDC
-	
+
 	IF _YELLOW
 		db 24,GASTLY
 		db 25,GASTLY
@@ -27,6 +27,6 @@ TowerMons7:
 		db 24,HAUNTER
 		db 29,HAUNTER
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/powerplant.asm b/data/wildPokemon/powerplant.asm
index 741232c3..a67ab2e9 100755
--- a/data/wildPokemon/powerplant.asm
+++ b/data/wildPokemon/powerplant.asm
@@ -1,7 +1,7 @@
-PowerPlantMons: 
+PowerPlantMons:
 	db $0A
 	IF !_YELLOW
-		
+	
 		db 21,VOLTORB
 		db 21,MAGNEMITE
 		db 20,PIKACHU
@@ -19,7 +19,7 @@ PowerPlantMons:
 			db 36,RAICHU
 		ENDC
 	ENDC
-	
+
 	IF _YELLOW
 		db 30,MAGNEMITE
 		db 35,MAGNEMITE
@@ -32,6 +32,6 @@ PowerPlantMons:
 		db 33,MUK
 		db 37,MUK
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/rocktunnel1.asm b/data/wildPokemon/rocktunnel1.asm
index 20416c5f..e8904043 100755
--- a/data/wildPokemon/rocktunnel1.asm
+++ b/data/wildPokemon/rocktunnel1.asm
@@ -1,6 +1,6 @@
-TunnelMonsB1: 
+TunnelMonsB1:
 	db $0F
-	
+
 	IF !_YELLOW
 		db 16,ZUBAT
 		db 17,ZUBAT
@@ -18,7 +18,7 @@ TunnelMonsB1:
 		db 13,ONIX
 		db 15,ONIX
 	ENDC
-	
+
 	IF _YELLOW
 		db 15,ZUBAT
 		db 16,GEODUDE
@@ -31,6 +31,6 @@ TunnelMonsB1:
 		db 19,MACHOP
 		db 21,MACHOP
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/rocktunnel2.asm b/data/wildPokemon/rocktunnel2.asm
index b1ca24fd..f158453e 100755
--- a/data/wildPokemon/rocktunnel2.asm
+++ b/data/wildPokemon/rocktunnel2.asm
@@ -1,4 +1,4 @@
-TunnelMonsB2: 
+TunnelMonsB2:
 	db $0F
 	IF !_YELLOW
 		db 16,ZUBAT
@@ -17,7 +17,7 @@ TunnelMonsB2:
 		db 13,ONIX
 		db 18,GEODUDE
 	ENDC
-	
+
 	IF _YELLOW
 		db 20,ZUBAT
 		db 17,GEODUDE
@@ -30,6 +30,6 @@ TunnelMonsB2:
 		db 18,ONIX
 		db 22,ONIX
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/route1.asm b/data/wildPokemon/route1.asm
index 94469880..bbad3c9e 100755
--- a/data/wildPokemon/route1.asm
+++ b/data/wildPokemon/route1.asm
@@ -1,4 +1,4 @@
-Route1Mons: 
+Route1Mons:
 	db $19
 	IF !_YELLOW
 		db 3,PIDGEY
diff --git a/data/wildPokemon/route10.asm b/data/wildPokemon/route10.asm
index 69651380..185e41fe 100755
--- a/data/wildPokemon/route10.asm
+++ b/data/wildPokemon/route10.asm
@@ -1,6 +1,6 @@
-Route10Mons: 
+Route10Mons:
 	db $0F
-	
+
 	IF _RED
 		db 16,VOLTORB
 		db 16,SPEAROW
@@ -13,7 +13,7 @@ Route10Mons:
 		db 13,EKANS
 		db 17,EKANS
 	ENDC
-	
+
 	IF !_RED
 		db 16,VOLTORB
 		db 16,SPEAROW
@@ -26,7 +26,7 @@ Route10Mons:
 		db 13,SANDSHREW
 		db 17,SANDSHREW
 	ENDC
-	
+
 	IF _YELLOW
 		db 16,MAGNEMITE
 		db 18,RATTATA
@@ -39,6 +39,6 @@ Route10Mons:
 		db 16,MACHOP
 		db 18,MACHOP
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/route11.asm b/data/wildPokemon/route11.asm
index afe72dd2..6f724e80 100755
--- a/data/wildPokemon/route11.asm
+++ b/data/wildPokemon/route11.asm
@@ -1,6 +1,6 @@
-Route11Mons: 
+Route11Mons:
 	db $0F
-	
+
 	IF _RED
 		db 14,EKANS
 		db 15,SPEAROW
@@ -13,7 +13,7 @@ Route11Mons:
 		db 11,DROWZEE
 		db 15,DROWZEE
 	ENDC
-	
+
 	IF _GREEN || _BLUE
 		db 14,SANDSHREW
 		db 15,SPEAROW
@@ -26,7 +26,7 @@ Route11Mons:
 		db 11,DROWZEE
 		db 15,DROWZEE
 	ENDC
-	
+
 	IF _YELLOW
 		db 16,PIDGEY
 		db 15,RATTATA
@@ -39,6 +39,6 @@ Route11Mons:
 		db 19,DROWZEE
 		db 17,RATICATE
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/route12.asm b/data/wildPokemon/route12.asm
index e16b407b..b15a2223 100755
--- a/data/wildPokemon/route12.asm
+++ b/data/wildPokemon/route12.asm
@@ -1,6 +1,6 @@
-Route12Mons: 
+Route12Mons:
 	db $0F
-	
+
 	IF _RED || (_JAPAN && _BLUE)
 		db 24,ODDISH
 		db 25,PIDGEY
@@ -14,7 +14,7 @@ Route12Mons:
 		db 30,GLOOM
 		db $00
 	ENDC
-	
+
 	IF _GREEN || (!_JAPAN && _BLUE)
 		db 24,BELLSPROUT
 		db 25,PIDGEY
@@ -28,7 +28,7 @@ Route12Mons:
 		db 30,WEEPINBELL
 		db $00
 	ENDC
-	
+
 	IF _YELLOW
 		db 25,ODDISH
 		db 25,BELLSPROUT
diff --git a/data/wildPokemon/route13.asm b/data/wildPokemon/route13.asm
index 96e53229..5293bf21 100755
--- a/data/wildPokemon/route13.asm
+++ b/data/wildPokemon/route13.asm
@@ -1,4 +1,4 @@
-Route13Mons: 
+Route13Mons:
 	IF _RED || (_JAPAN && _BLUE)
 		db $14
 		db 24,ODDISH
@@ -13,7 +13,7 @@ Route13Mons:
 		db 30,GLOOM
 		db $00
 	ENDC
-	
+
 	IF _GREEN || (!_JAPAN && _BLUE)
 		db $14
 		db 24,BELLSPROUT
@@ -28,7 +28,7 @@ Route13Mons:
 		db 30,WEEPINBELL
 		db $00
 	ENDC
-	
+
 	IF _YELLOW
 		db $0F
 		db 25,ODDISH
diff --git a/data/wildPokemon/route14.asm b/data/wildPokemon/route14.asm
index c3e0743b..76d9118f 100755
--- a/data/wildPokemon/route14.asm
+++ b/data/wildPokemon/route14.asm
@@ -1,4 +1,4 @@
-Route14Mons: 
+Route14Mons:
 	db $0F
 	IF _RED || (_JAPAN && _BLUE)
 		db 24,ODDISH
@@ -12,7 +12,7 @@ Route14Mons:
 		db 28,PIDGEOTTO
 		db 30,PIDGEOTTO
 	ENDC
-	
+
 	IF _GREEN || (!_JAPAN && _BLUE)
 		db 24,BELLSPROUT
 		db 26,PIDGEY
@@ -25,7 +25,7 @@ Route14Mons:
 		db 28,PIDGEOTTO
 		db 30,PIDGEOTTO
 	ENDC
-	
+
 	IF _YELLOW
 		db 26,ODDISH
 		db 26,BELLSPROUT
@@ -38,6 +38,6 @@ Route14Mons:
 		db 27,VENONAT
 		db 30,VENOMOTH
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/route15.asm b/data/wildPokemon/route15.asm
index a8215cd3..4a0d3fc3 100755
--- a/data/wildPokemon/route15.asm
+++ b/data/wildPokemon/route15.asm
@@ -1,4 +1,4 @@
-Route15Mons: 
+Route15Mons:
 	db $0F
 	IF _RED || (_JAPAN && _BLUE)
 		db 24,ODDISH
@@ -12,7 +12,7 @@ Route15Mons:
 		db 28,PIDGEOTTO
 		db 30,PIDGEOTTO
 	ENDC
-	
+
 	IF _GREEN || (!_JAPAN && _BLUE)
 		db 24,BELLSPROUT
 		db 26,DITTO
@@ -25,7 +25,7 @@ Route15Mons:
 		db 28,PIDGEOTTO
 		db 30,PIDGEOTTO
 	ENDC
-	
+
 	IF _YELLOW
 		db 26,ODDISH
 		db 26,BELLSPROUT
@@ -38,6 +38,6 @@ Route15Mons:
 		db 27,VENONAT
 		db 30,VENOMOTH
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/route16.asm b/data/wildPokemon/route16.asm
index 23aadb6c..34408164 100755
--- a/data/wildPokemon/route16.asm
+++ b/data/wildPokemon/route16.asm
@@ -1,4 +1,4 @@
-Route16Mons: 
+Route16Mons:
 	db $19
 	IF !_YELLOW
 		db 20,SPEAROW
@@ -12,7 +12,7 @@ Route16Mons:
 		db 23,RATICATE
 		db 25,RATICATE
 	ENDC
-	
+
 	IF _YELLOW
 		db 22,SPEAROW
 		db 22,DODUO
@@ -25,6 +25,6 @@ Route16Mons:
 		db 25,RATICATE
 		db 26,RATICATE
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/route17.asm b/data/wildPokemon/route17.asm
index 9cdb18b3..75882ec5 100755
--- a/data/wildPokemon/route17.asm
+++ b/data/wildPokemon/route17.asm
@@ -1,4 +1,4 @@
-Route17Mons: 
+Route17Mons:
 	db $19
 	IF !_YELLOW
 		db 20,SPEAROW
@@ -12,7 +12,7 @@ Route17Mons:
 		db 25,FEAROW
 		db 27,FEAROW
 	ENDC
-	
+
 	IF _YELLOW
 		db 26,DODUO
 		db 27,FEAROW
@@ -25,6 +25,6 @@ Route17Mons:
 		db 32,PONYTA
 		db 29,DODRIO
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/route18.asm b/data/wildPokemon/route18.asm
index 9d2b08cf..8820f045 100755
--- a/data/wildPokemon/route18.asm
+++ b/data/wildPokemon/route18.asm
@@ -1,4 +1,4 @@
-Route18Mons: 
+Route18Mons:
 	db $19
 	IF !_YELLOW
 		db 20,SPEAROW
@@ -12,7 +12,7 @@ Route18Mons:
 		db 27,FEAROW
 		db 29,FEAROW
 	ENDC
-	
+
 	IF _YELLOW
 		db 22,SPEAROW
 		db 22,DODUO
@@ -25,6 +25,6 @@ Route18Mons:
 		db 25,RATICATE
 		db 26,RATICATE
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/route2.asm b/data/wildPokemon/route2.asm
index e63f5028..57d7f87f 100755
--- a/data/wildPokemon/route2.asm
+++ b/data/wildPokemon/route2.asm
@@ -1,6 +1,6 @@
-Route2Mons: 
+Route2Mons:
 	db $19
-	
+
 	IF !_YELLOW
 		db 3,RATTATA
 		db 3,PIDGEY
diff --git a/data/wildPokemon/route21.asm b/data/wildPokemon/route21.asm
index 26a590da..a29753eb 100755
--- a/data/wildPokemon/route21.asm
+++ b/data/wildPokemon/route21.asm
@@ -1,4 +1,4 @@
-Route21Mons: 
+Route21Mons:
 	db $19
 	IF !_YELLOW
 		db 21,RATTATA
@@ -12,7 +12,7 @@ Route21Mons:
 		db 30,TANGELA
 		db 32,TANGELA
 	ENDC
-	
+
 	IF _YELLOW
 		db 15,PIDGEY
 		db 13,RATTATA
@@ -25,7 +25,7 @@ Route21Mons:
 		db 19,PIDGEOTTO
 		db 15,PIDGEOTTO
 	ENDC
-	
+
 	db $05
 	db 5,TENTACOOL
 	db 10,TENTACOOL
diff --git a/data/wildPokemon/route22.asm b/data/wildPokemon/route22.asm
index e78c02c9..36ff9a57 100755
--- a/data/wildPokemon/route22.asm
+++ b/data/wildPokemon/route22.asm
@@ -1,4 +1,4 @@
-Route22Mons: 
+Route22Mons:
 	db $19
 	IF _RED || (_JAPAN && _BLUE)
 		db 3,RATTATA
diff --git a/data/wildPokemon/route23.asm b/data/wildPokemon/route23.asm
index 3cd2ca9d..cfdd8eff 100755
--- a/data/wildPokemon/route23.asm
+++ b/data/wildPokemon/route23.asm
@@ -1,4 +1,4 @@
-Route23Mons: 
+Route23Mons:
 	db $0A
 	IF !_YELLOW
 		IF _RED
@@ -22,7 +22,7 @@ Route23Mons:
 		db 41,FEAROW
 		db 43,FEAROW
 	ENDC
-	
+
 	IF _YELLOW
 		db 41,NIDORINO
 		db 41,NIDORINA
@@ -35,6 +35,6 @@ Route23Mons:
 		db 41,PRIMEAPE
 		db 46,PRIMEAPE
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/route24.asm b/data/wildPokemon/route24.asm
index 28af9916..e4ff986a 100755
--- a/data/wildPokemon/route24.asm
+++ b/data/wildPokemon/route24.asm
@@ -1,6 +1,6 @@
-Route24Mons: 
+Route24Mons:
 	db $19
-	
+
 	IF _RED
 		db 7,WEEDLE
 		db 8,KAKUNA
@@ -13,7 +13,7 @@ Route24Mons:
 		db 8,ABRA
 		db 12,ABRA
 	ENDC
-	
+
 	IF _GREEN || !_JAPAN && _BLUE
 		db 7,CATERPIE
 		db 8,METAPOD
@@ -26,7 +26,7 @@ Route24Mons:
 		db 8,ABRA
 		db 12,ABRA
 	ENDC
-	
+
 	IF _JAPAN && _BLUE
 		db 7,CATERPIE
 		db 8,METAPOD
@@ -39,7 +39,7 @@ Route24Mons:
 		db 8,ABRA
 		db 12,ABRA
 	ENDC
-	
+
 	IF _YELLOW
 		db 12,ODDISH
 		db 12,BELLSPROUT
@@ -52,6 +52,6 @@ Route24Mons:
 		db 17,PIDGEY
 		db 17,PIDGEOTTO
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/route25.asm b/data/wildPokemon/route25.asm
index 1aac115f..3d225473 100755
--- a/data/wildPokemon/route25.asm
+++ b/data/wildPokemon/route25.asm
@@ -1,6 +1,6 @@
-Route25Mons: 
+Route25Mons:
 	db $0F
-	
+
 	IF _RED
 		db 8,WEEDLE
 		db 9,KAKUNA
@@ -13,7 +13,7 @@ Route25Mons:
 		db 7,METAPOD
 		db 8,CATERPIE
 	ENDC
-	
+
 	IF _GREEN || !_JAPAN && _BLUE
 		db 8,CATERPIE
 		db 9,METAPOD
@@ -26,7 +26,7 @@ Route25Mons:
 		db 7,KAKUNA
 		db 8,WEEDLE
 	ENDC
-	
+
 	IF _JAPAN && _BLUE
 		db 8,CATERPIE
 		db 9,METAPOD
@@ -39,7 +39,7 @@ Route25Mons:
 		db 7,KAKUNA
 		db 8,WEEDLE
 	ENDC
-	
+
 	IF _YELLOW
 		db 12,ODDISH
 	db 12,BELLSPROUT
@@ -52,6 +52,6 @@ Route25Mons:
 	db 17,PIDGEY
 	db 17,PIDGEOTTO
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/route3.asm b/data/wildPokemon/route3.asm
index 1b555138..21230f42 100755
--- a/data/wildPokemon/route3.asm
+++ b/data/wildPokemon/route3.asm
@@ -1,4 +1,4 @@
-Route3Mons: 
+Route3Mons:
 	db $14
 	IF !_YELLOW
 		db 6,PIDGEY
diff --git a/data/wildPokemon/route4.asm b/data/wildPokemon/route4.asm
index 22610dc6..f7eb80ee 100755
--- a/data/wildPokemon/route4.asm
+++ b/data/wildPokemon/route4.asm
@@ -1,6 +1,6 @@
-Route4Mons: 
+Route4Mons:
 	db $14
-	
+
 	IF _RED
 		db 10,RATTATA
 		db 10,SPEAROW
@@ -13,7 +13,7 @@ Route4Mons:
 		db 8,EKANS
 		db 12,EKANS
 	ENDC
-	
+
 	IF !_RED
 		db 10,RATTATA
 		db 10,SPEAROW
@@ -26,7 +26,7 @@ Route4Mons:
 		db 8,SANDSHREW
 		db 12,SANDSHREW
 	ENDC
-	
+
 	IF _YELLOW
 		db 8,SPEAROW
 		db 9,SPEAROW
diff --git a/data/wildPokemon/route5.asm b/data/wildPokemon/route5.asm
index c08b51a4..4b018cd6 100755
--- a/data/wildPokemon/route5.asm
+++ b/data/wildPokemon/route5.asm
@@ -1,6 +1,6 @@
-Route5Mons: 
+Route5Mons:
 	db $0F
-	
+
 	IF _RED
 		db 13,ODDISH
 		db 13,PIDGEY
@@ -13,7 +13,7 @@ Route5Mons:
 		db 14,MANKEY
 		db 16,MANKEY
 	ENDC
-	
+
 	IF _GREEN || !_JAPAN && _BLUE
 		db 13,BELLSPROUT
 		db 13,PIDGEY
@@ -26,7 +26,7 @@ Route5Mons:
 		db 14,MEOWTH
 		db 16,MEOWTH
 	ENDC
-	
+
 	IF _JAPAN && _BLUE
 		db 13,ODDISH
 		db 13,PIDGEY
@@ -39,7 +39,7 @@ Route5Mons:
 		db 14,MEOWTH
 		db 16,MEOWTH
 	ENDC
-	
+
 	IF _YELLOW
 		db 15,PIDGEY
 		db 14,RATTATA
@@ -52,6 +52,6 @@ Route5Mons:
 		db 5,JIGGLYPUFF
 		db 7,JIGGLYPUFF
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/route6.asm b/data/wildPokemon/route6.asm
index a2e0f4d0..253a5943 100755
--- a/data/wildPokemon/route6.asm
+++ b/data/wildPokemon/route6.asm
@@ -1,6 +1,6 @@
-Route6Mons: 
+Route6Mons:
 	db $0F
-	
+
 	IF _RED
 		db 13,ODDISH
 		db 13,PIDGEY
@@ -14,7 +14,7 @@ Route6Mons:
 		db 16,MANKEY
 		db $00
 	ENDC
-	
+
 	IF _GREEN || !_JAPAN && _BLUE
 		db 13,BELLSPROUT
 		db 13,PIDGEY
@@ -28,7 +28,7 @@ Route6Mons:
 		db 16,MEOWTH
 		db $00
 	ENDC
-	
+
 	IF _JAPAN && _BLUE
 		db 13,ODDISH
 		db 13,PIDGEY
@@ -42,7 +42,7 @@ Route6Mons:
 		db 16,MEOWTH
 		db $00
 	ENDC
-	
+
 	IF _YELLOW
 		db 15,PIDGEY
 		db 14,RATTATA
diff --git a/data/wildPokemon/route7.asm b/data/wildPokemon/route7.asm
index ecda56aa..42073d11 100755
--- a/data/wildPokemon/route7.asm
+++ b/data/wildPokemon/route7.asm
@@ -1,6 +1,6 @@
-Route7Mons: 
+Route7Mons:
 	db $0F
-	
+
 	IF _RED
 		db 19,PIDGEY
 		db 19,ODDISH
@@ -13,7 +13,7 @@ Route7Mons:
 		db 19,MANKEY
 		db 20,MANKEY
 	ENDC
-	
+
 	IF _GREEN || !_JAPAN && _BLUE
 		db 19,PIDGEY
 		db 19,BELLSPROUT
@@ -26,7 +26,7 @@ Route7Mons:
 		db 19,MEOWTH
 		db 20,MEOWTH
 	ENDC
-	
+
 	IF _JAPAN && _BLUE
 		db 19,PIDGEY
 		db 19,ODDISH
@@ -39,7 +39,7 @@ Route7Mons:
 		db 19,MEOWTH
 		db 20,MEOWTH
 	ENDC
-	
+
 	IF _YELLOW
 		db 20,PIDGEY
 		db 22,PIDGEY
@@ -52,6 +52,6 @@ Route7Mons:
 		db 24,JIGGLYPUFF
 		db 24,JIGGLYPUFF
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/route8.asm b/data/wildPokemon/route8.asm
index 97260649..59c3082d 100755
--- a/data/wildPokemon/route8.asm
+++ b/data/wildPokemon/route8.asm
@@ -1,6 +1,6 @@
-Route8Mons: 
+Route8Mons:
 	db $0F
-	
+
 	IF _RED
 		db 18,PIDGEY
 		db 18,MANKEY
@@ -13,7 +13,7 @@ Route8Mons:
 		db 15,GROWLITHE
 		db 18,GROWLITHE
 	ENDC
-	
+
 	IF _GREEN || !_JAPAN && _BLUE
 		db 18,PIDGEY
 		db 18,MEOWTH
@@ -26,7 +26,7 @@ Route8Mons:
 		db 15,VULPIX
 		db 18,VULPIX
 	ENDC
-	
+
 	IF _JAPAN && _BLUE
 		db 18,PIDGEY
 		db 18,MEOWTH
@@ -39,7 +39,7 @@ Route8Mons:
 		db 15,GROWLITHE
 		db 18,GROWLITHE
 	ENDC
-	
+
 	IF _YELLOW
 		db 20,PIDGEY
 		db 22,PIDGEY
@@ -52,6 +52,6 @@ Route8Mons:
 		db 20,KADABRA
 		db 27,KADABRA
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/route9.asm b/data/wildPokemon/route9.asm
index c7c65186..03523e4f 100755
--- a/data/wildPokemon/route9.asm
+++ b/data/wildPokemon/route9.asm
@@ -1,6 +1,6 @@
-Route9Mons: 
+Route9Mons:
 	db $0F
-	
+
 	IF _RED
 		db 16,RATTATA
 		db 16,SPEAROW
@@ -13,7 +13,7 @@ Route9Mons:
 		db 13,EKANS
 		db 17,EKANS
 	ENDC
-	
+
 	IF !_RED && !_YELLOW
 		db 16,RATTATA
 		db 16,SPEAROW
@@ -26,7 +26,7 @@ Route9Mons:
 		db 13,SANDSHREW
 		db 17,SANDSHREW
 	ENDC
-	
+
 	IF _YELLOW
 		db 16,NIDORAN_M
 		db 16,NIDORAN_F
@@ -39,6 +39,6 @@ Route9Mons:
 		db 20,RATICATE
 		db 19,FEAROW
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/safarizone1.asm b/data/wildPokemon/safarizone1.asm
index 1e2f463c..29e3f29b 100755
--- a/data/wildPokemon/safarizone1.asm
+++ b/data/wildPokemon/safarizone1.asm
@@ -1,4 +1,4 @@
-ZoneMons1: 
+ZoneMons1:
 	db $1E
 	IF _RED || (_JAPAN && _BLUE)
 		db 24,NIDORAN_M
@@ -17,7 +17,7 @@ ZoneMons1:
 		ENDC
 		db 28,SCYTHER
 	ENDC
-	
+
 	IF _GREEN || (!_JAPAN && _BLUE)
 		db 24,NIDORAN_F
 		db 26,DODUO
@@ -30,7 +30,7 @@ ZoneMons1:
 		db 25,KANGASKHAN
 		db 28,PINSIR
 	ENDC
-	
+
 	IF _YELLOW
 		db 21,NIDORAN_M
 		db 29,NIDORAN_F
@@ -43,6 +43,6 @@ ZoneMons1:
 		db 21,CHANSEY
 		db 15,SCYTHER
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/safarizone2.asm b/data/wildPokemon/safarizone2.asm
index ac35d4e4..2adb18ed 100755
--- a/data/wildPokemon/safarizone2.asm
+++ b/data/wildPokemon/safarizone2.asm
@@ -1,4 +1,4 @@
-ZoneMons2: 
+ZoneMons2:
 	db $1E
 	IF !_YELLOW
 		IF _RED || (_JAPAN && _BLUE)
@@ -32,7 +32,7 @@ ZoneMons2:
 			db 28,PINSIR
 		ENDC
 	ENDC
-	
+
 	IF _YELLOW
 		db 36,NIDORAN_M
 		db 14,NIDORAN_F
@@ -45,6 +45,6 @@ ZoneMons2:
 		db 25,SCYTHER
 		db 15,PINSIR
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/safarizone3.asm b/data/wildPokemon/safarizone3.asm
index 497efd24..436ab937 100755
--- a/data/wildPokemon/safarizone3.asm
+++ b/data/wildPokemon/safarizone3.asm
@@ -1,4 +1,4 @@
-ZoneMons3: 
+ZoneMons3:
 	db $1E
 	IF _RED
 		db 25,NIDORAN_M
@@ -12,7 +12,7 @@ ZoneMons3:
 		db 26,TAUROS
 		db 28,KANGASKHAN
 	ENDC
-	
+
 	IF _GREEN || (!_JAPAN && _BLUE)
 		db 25,NIDORAN_F
 		db 26,DODUO
@@ -25,7 +25,7 @@ ZoneMons3:
 		db 26,TAUROS
 		db 28,KANGASKHAN
 	ENDC
-	
+
 	IF _JAPAN && _BLUE
 		db 25,NIDORAN_M
 		db 26,DODUO
@@ -38,7 +38,7 @@ ZoneMons3:
 		db 26,PINSIR
 		db 28,LICKITUNG
 	ENDC
-	
+
 	IF _YELLOW
 		db 29,NIDORAN_M
 		db 21,NIDORAN_F
@@ -51,6 +51,6 @@ ZoneMons3:
 		db 25,PINSIR
 		db 27,TANGELA
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/safarizonecenter.asm b/data/wildPokemon/safarizonecenter.asm
index d8c74a76..35eb7fd4 100755
--- a/data/wildPokemon/safarizonecenter.asm
+++ b/data/wildPokemon/safarizonecenter.asm
@@ -1,4 +1,4 @@
-ZoneMonsCenter: 
+ZoneMonsCenter:
 	db $1E
 	IF _RED
 		db 22,NIDORAN_M
@@ -12,7 +12,7 @@ ZoneMonsCenter:
 		db 23,SCYTHER
 		db 23,CHANSEY
 	ENDC
-	
+
 	IF _GREEN || (!_JAPAN && _BLUE)
 		db 22,NIDORAN_F
 		db 25,RHYHORN
@@ -25,7 +25,7 @@ ZoneMonsCenter:
 		db 23,PINSIR
 		db 23,CHANSEY
 	ENDC
-	
+
 	IF _JAPAN && _BLUE
 		db 22,NIDORAN_M
 		db 25,RHYHORN
@@ -38,7 +38,7 @@ ZoneMonsCenter:
 		db 23,SCYTHER
 		db 23,CHANSEY
 	ENDC
-	
+
 	IF _YELLOW
 		db 14,NIDORAN_M
 		db 36,NIDORAN_F
@@ -51,6 +51,6 @@ ZoneMonsCenter:
 		db 22,TANGELA
 		db 7,CHANSEY
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/seafoamisland1.asm b/data/wildPokemon/seafoamisland1.asm
index 472af2e1..506dd98e 100755
--- a/data/wildPokemon/seafoamisland1.asm
+++ b/data/wildPokemon/seafoamisland1.asm
@@ -1,4 +1,4 @@
-IslandMons1: 
+IslandMons1:
 	db $0F
 	IF _RED
 		db 30,SEEL
@@ -12,7 +12,7 @@ IslandMons1:
 		db 28,SHELLDER
 		db 38,GOLDUCK
 	ENDC
-	
+
 	IF _GREEN || !_JAPAN && _BLUE
 		db 30,SEEL
 		db 30,PSYDUCK
@@ -25,7 +25,7 @@ IslandMons1:
 		db 28,STARYU
 		db 38,SLOWBRO
 	ENDC
-	
+
 	IF _JAPAN && _BLUE
 		db 30,SEEL
 		db 30,HORSEA
@@ -38,7 +38,7 @@ IslandMons1:
 		db 28,STARYU
 		db 38,SLOWBRO
 	ENDC
-	
+
 	IF _YELLOW
 		db 18,ZUBAT
 		db 25,KRABBY
@@ -51,6 +51,6 @@ IslandMons1:
 		db 27,GOLBAT
 		db 36,GOLBAT
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/seafoamislandb1.asm b/data/wildPokemon/seafoamislandb1.asm
index 9b49bc46..044753b4 100755
--- a/data/wildPokemon/seafoamislandb1.asm
+++ b/data/wildPokemon/seafoamislandb1.asm
@@ -1,4 +1,4 @@
-IslandMonsB1: 
+IslandMonsB1:
 	db $0A
 	IF _RED
 		db 30,STARYU
@@ -12,7 +12,7 @@ IslandMonsB1:
 		db 38,DEWGONG
 		db 37,SEADRA
 	ENDC
-	
+
 	IF _GREEN || !_JAPAN && _BLUE
 		db 30,SHELLDER
 		db 30,KRABBY
@@ -25,7 +25,7 @@ IslandMonsB1:
 		db 38,DEWGONG
 		db 37,KINGLER
 	ENDC
-	
+
 	IF _JAPAN && _BLUE
 		db 30,SHELLDER
 		db 30,KRABBY
@@ -38,7 +38,7 @@ IslandMonsB1:
 		db 38,DEWGONG
 		db 37,KINGLER
 	ENDC
-	
+
 	IF _YELLOW
 		db 27,ZUBAT
 		db 26,KRABBY
@@ -51,6 +51,6 @@ IslandMonsB1:
 		db 22,SEEL
 		db 26,SEEL
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/seafoamislandb2.asm b/data/wildPokemon/seafoamislandb2.asm
index 4cad1012..2b7a3ef8 100755
--- a/data/wildPokemon/seafoamislandb2.asm
+++ b/data/wildPokemon/seafoamislandb2.asm
@@ -1,4 +1,4 @@
-IslandMonsB2: 
+IslandMonsB2:
 	db $0A
 	IF _RED
 		db 30,SEEL
@@ -12,7 +12,7 @@ IslandMonsB2:
 		db 30,GOLBAT
 		db 37,SLOWBRO
 	ENDC
-	
+
 	IF _GREEN || !_JAPAN && _BLUE
 		db 30,SEEL
 		db 30,PSYDUCK
@@ -25,7 +25,7 @@ IslandMonsB2:
 		db 30,GOLBAT
 		db 37,GOLDUCK
 	ENDC
-	
+
 	IF _JAPAN && _BLUE
 		db 30,SEEL
 		db 30,HORSEA
@@ -38,7 +38,7 @@ IslandMonsB2:
 		db 30,GOLBAT
 		db 37,JYNX
 	ENDC
-	
+
 	IF _YELLOW
 		db 27,ZUBAT
 		db 27,KRABBY
@@ -51,6 +51,6 @@ IslandMonsB2:
 		db 31,SLOWPOKE
 		db 31,SLOWBRO
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/seafoamislandb3.asm b/data/wildPokemon/seafoamislandb3.asm
index 55d806a9..ac9769b4 100755
--- a/data/wildPokemon/seafoamislandb3.asm
+++ b/data/wildPokemon/seafoamislandb3.asm
@@ -1,4 +1,4 @@
-IslandMonsB3: 
+IslandMonsB3:
 	db $0A
 	IF _RED
 		db 31,SLOWPOKE
@@ -12,7 +12,7 @@ IslandMonsB3:
 		db 39,SEADRA
 		db 37,DEWGONG
 	ENDC
-	
+
 	IF _GREEN || !_JAPAN && _BLUE
 		db 31,PSYDUCK
 		db 31,SEEL
@@ -25,7 +25,7 @@ IslandMonsB3:
 		db 39,KINGLER
 		db 37,DEWGONG
 	ENDC
-	
+
 	IF _JAPAN && _BLUE
 		db 31,HORSEA
 		db 31,SEEL
@@ -38,7 +38,7 @@ IslandMonsB3:
 		db 39,KINGLER
 		db 37,DEWGONG
 	ENDC
-	
+
 	IF _YELLOW
 		db 27,GOLBAT
 		db 36,ZUBAT
@@ -63,6 +63,6 @@ IslandMonsB3:
 		db 30,STARYU
 		db 30,STARYU
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/seafoamislandb4.asm b/data/wildPokemon/seafoamislandb4.asm
index 9596ab5b..af5c7e02 100755
--- a/data/wildPokemon/seafoamislandb4.asm
+++ b/data/wildPokemon/seafoamislandb4.asm
@@ -1,4 +1,4 @@
-IslandMonsB4: 
+IslandMonsB4:
 	db $0A
 	IF _RED
 		db 31,HORSEA
@@ -12,7 +12,7 @@ IslandMonsB4:
 		db 39,SLOWBRO
 		db 32,GOLBAT
 	ENDC
-	
+
 	IF _GREEN || !_JAPAN && _BLUE
 		db 31,KRABBY
 		db 31,STARYU
@@ -25,7 +25,7 @@ IslandMonsB4:
 		db 39,GOLDUCK
 		db 32,GOLBAT
 	ENDC
-	
+
 	IF _JAPAN && _BLUE
 		db 31,KRABBY
 		db 31,STARYU
@@ -38,7 +38,7 @@ IslandMonsB4:
 		db 39,JYNX
 		db 32,GOLBAT
 	ENDC
-	
+
 	IF _YELLOW
 		db 36,GOLBAT
 		db 36,ZUBAT
@@ -63,6 +63,6 @@ IslandMonsB4:
 		db 30,STARYU
 		db 30,STARYU
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/unknowndungeon1.asm b/data/wildPokemon/unknowndungeon1.asm
index 2c23dcc8..4feb568c 100755
--- a/data/wildPokemon/unknowndungeon1.asm
+++ b/data/wildPokemon/unknowndungeon1.asm
@@ -1,4 +1,4 @@
-DungeonMons1: 
+DungeonMons1:
 	db $0A
 	IF !_YELLOW
 		db 46,GOLBAT
@@ -22,7 +22,7 @@ DungeonMons1:
 		db 53,RAICHU
 		db 53,DITTO
 	ENDC
-	
+
 	IF _YELLOW
 		db 50,GOLBAT
 		db 55,GOLBAT
@@ -35,6 +35,6 @@ DungeonMons1:
 		db 55,DITTO
 		db 60,DITTO
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/unknowndungeon2.asm b/data/wildPokemon/unknowndungeon2.asm
index c3971b86..a09c985c 100755
--- a/data/wildPokemon/unknowndungeon2.asm
+++ b/data/wildPokemon/unknowndungeon2.asm
@@ -1,4 +1,4 @@
-DungeonMons2: 
+DungeonMons2:
 	db $0F
 	IF !_YELLOW
 		db 51,DODRIO
@@ -17,7 +17,7 @@ DungeonMons2:
 		db 55,DITTO
 		db 60,DITTO
 	ENDC
-	
+
 	IF _YELLOW
 		db 52,GOLBAT
 		db 57,GOLBAT
@@ -30,6 +30,6 @@ DungeonMons2:
 		db 60,RHYDON
 		db 58,RHYDON
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/unknowndungeonb1.asm b/data/wildPokemon/unknowndungeonb1.asm
index 8a66d2a9..7ab1c964 100755
--- a/data/wildPokemon/unknowndungeonb1.asm
+++ b/data/wildPokemon/unknowndungeonb1.asm
@@ -1,4 +1,4 @@
-DungeonMonsB1: 
+DungeonMonsB1:
 	db $19
 	IF !_YELLOW
 		db 55,RHYDON
@@ -17,7 +17,7 @@ DungeonMonsB1:
 		db 63,DITTO
 		db 67,DITTO
 	ENDC
-	
+
 	IF _YELLOW
 		db 54,GOLBAT
 		db 59,GOLBAT
@@ -30,6 +30,6 @@ DungeonMonsB1:
 		db 55,LICKITUNG
 		db 50,LICKITUNG
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/victoryroad1.asm b/data/wildPokemon/victoryroad1.asm
index c39d1ff5..1ec65cf5 100755
--- a/data/wildPokemon/victoryroad1.asm
+++ b/data/wildPokemon/victoryroad1.asm
@@ -1,4 +1,4 @@
-PlateauMons1: 
+PlateauMons1:
 	db $0F
 	IF !_YELLOW
 		db 24,MACHOP
@@ -25,6 +25,6 @@ PlateauMons1:
 		db 41,GRAVELER
 		db 47,GRAVELER
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/victoryroad2.asm b/data/wildPokemon/victoryroad2.asm
index 1832b83b..87159e96 100755
--- a/data/wildPokemon/victoryroad2.asm
+++ b/data/wildPokemon/victoryroad2.asm
@@ -1,4 +1,4 @@
-PlateauMons2: 
+PlateauMons2:
 	db $0A
 	IF !_YELLOW
 		db 22,MACHOP
@@ -12,7 +12,7 @@ PlateauMons2:
 		db 40,MAROWAK
 		db 43,GRAVELER
 	ENDC
-	
+
 	IF _YELLOW
 		db 31,GEODUDE
 		db 36,GEODUDE
@@ -25,6 +25,6 @@ PlateauMons2:
 		db 39,MACHOKE
 		db 42,MACHOKE
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/victoryroad3.asm b/data/wildPokemon/victoryroad3.asm
index e2ebf0db..ae52eeb6 100755
--- a/data/wildPokemon/victoryroad3.asm
+++ b/data/wildPokemon/victoryroad3.asm
@@ -1,4 +1,4 @@
-PlateauMons3: 
+PlateauMons3:
 	db $0F
 	IF !_YELLOW
 		db 24,MACHOP
@@ -12,7 +12,7 @@ PlateauMons3:
 		db 42,MACHOKE
 		db 45,MACHOKE
 	ENDC
-	
+
 	IF _YELLOW
 		db 36,GEODUDE
 		db 44,GOLBAT
@@ -25,6 +25,6 @@ PlateauMons3:
 		db 47,GRAVELER
 		db 47,GRAVELER
 	ENDC
-	
+
 	db $00
 
diff --git a/data/wildPokemon/viridianforest.asm b/data/wildPokemon/viridianforest.asm
index e80ba681..2ca828eb 100755
--- a/data/wildPokemon/viridianforest.asm
+++ b/data/wildPokemon/viridianforest.asm
@@ -1,4 +1,4 @@
-ForestMons: ; 
+ForestMons:
 	IF !_YELLOW
 		db $08
 		IF _RED
@@ -21,11 +21,11 @@ ForestMons: ;
 			db 4,KAKUNA
 			db 3,WEEDLE
 		ENDC
-		
+	
 		db 3,PIKACHU
 		db 5,PIKACHU
 	ENDC
-	
+
 	IF _YELLOW
 		db $19
 		db 3,CATERPIE
diff --git a/data/wildPokemon/waterpokemon.asm b/data/wildPokemon/waterpokemon.asm
index b45a94d6..ef2d39ea 100755
--- a/data/wildPokemon/waterpokemon.asm
+++ b/data/wildPokemon/waterpokemon.asm
@@ -1,4 +1,4 @@
-WaterMons: ; 
+WaterMons:
 	db $00
 
 	db $05
diff --git a/macros.asm b/macros.asm
index b2eb15ab..5657044c 100644
--- a/macros.asm
+++ b/macros.asm
@@ -89,7 +89,7 @@ tileset: MACRO
 INDOOR  EQU 0
 CAVE    EQU 1
 OUTDOOR EQU 2
-	
+
 ; macro for two nibbles
 dn: MACRO
 	db (\1 << 4 | \2)
@@ -142,7 +142,7 @@ PREDEF: MACRO
 	ld a, (\1 - PredefPointers) / 3
 	call Predef
 	ENDM
-	
+
 PREDEF_JUMP: MACRO
 	ld a, (\1 - PredefPointers) / 3
 	jp Predef
diff --git a/scripts/route22.asm b/scripts/route22.asm
index fa225415..f9f38e79 100755
--- a/scripts/route22.asm
+++ b/scripts/route22.asm
@@ -72,7 +72,7 @@ Route22Script0: ; 50f00 (14:4f00)
 	jp nz, Route22Script_5104e
 	ret
 
-.Route22RivalBattleCoords 
+.Route22RivalBattleCoords
 	db $04, $1D
 	db $05, $1D
 	db $FF
diff --git a/scripts/route5gate.asm b/scripts/route5gate.asm
index 1c3bd3c7..d7abeff5 100755
--- a/scripts/route5gate.asm
+++ b/scripts/route5gate.asm
@@ -59,7 +59,7 @@ Route5GateScript1: ; 1df94 (7:5f94)
 	ld [wJoyIgnore], a
 	ld [W_ROUTE5GATECURSCRIPT], a
 	ret
-	
+
 Route5GateTextPointers: ; 1dfa4 (7:5fa4)
 	dw Route5GateText1
 	dw Route5GateText2
diff --git a/wram.asm b/wram.asm
index 16388d65..ad9bb491 100755
--- a/wram.asm
+++ b/wram.asm
@@ -102,7 +102,7 @@ wSpriteStateData2:: ; c200
 ; holds info for 16 sprites with $10 bytes each
 ; player sprite is always sprite 0
 ; C2x0: walk animation counter (counting from $10 backwards when moving)
-; C2x1: 
+; C2x1:
 ; C2x2: Y displacement (initialized at 8, supposed to keep moving sprites from moving too far, but bugged)
 ; C2x3: X displacement (initialized at 8, supposed to keep moving sprites from moving too far, but bugged)
 ; C2x4: Y position (in 2x2 tile grid steps, topmost 2x2 tile has value 4)
-- 
cgit v1.3.1-sl0p


From fee52c53a40f8e36dfccfbe73668bfc2858c2a95 Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Tue, 10 Jun 2014 11:42:56 -0400
Subject: Make each pitch/instrument its own macro

---
 audio/music/bikeriding.asm              |  740 ++++-----
 audio/music/celadon.asm                 |  624 ++++----
 audio/music/cinnabar.asm                |  410 ++---
 audio/music/cinnabarmansion.asm         |  164 +-
 audio/music/cities1.asm                 |  878 +++++------
 audio/music/cities2.asm                 |  608 ++++----
 audio/music/credits.asm                 | 1072 ++++++-------
 audio/music/defeatedgymleader.asm       |  828 +++++------
 audio/music/defeatedtrainer.asm         |  316 ++--
 audio/music/defeatedwildmon.asm         |  322 ++--
 audio/music/dungeon1.asm                |  674 ++++-----
 audio/music/dungeon2.asm                |  350 ++---
 audio/music/dungeon3.asm                |  848 +++++------
 audio/music/finalbattle.asm             | 1716 ++++++++++-----------
 audio/music/gamecorner.asm              |  680 ++++-----
 audio/music/gym.asm                     |  490 +++---
 audio/music/gymleaderbattle.asm         | 1630 ++++++++++----------
 audio/music/halloffame.asm              |  106 +-
 audio/music/indigoplateau.asm           |  326 ++--
 audio/music/introbattle.asm             |  404 ++---
 audio/music/jigglypuffsong.asm          |   42 +-
 audio/music/lavender.asm                |  242 +--
 audio/music/meeteviltrainer.asm         |   74 +-
 audio/music/meetfemaletrainer.asm       |  106 +-
 audio/music/meetmaletrainer.asm         |  168 +--
 audio/music/meetprofoak.asm             |  476 +++---
 audio/music/meetrival.asm               |  424 +++---
 audio/music/museumguy.asm               |  402 ++---
 audio/music/oakslab.asm                 |  404 ++---
 audio/music/pallettown.asm              |  452 +++---
 audio/music/pkmnhealed.asm              |   32 +-
 audio/music/pokecenter.asm              |  550 +++----
 audio/music/pokemontower.asm            |  458 +++---
 audio/music/routes1.asm                 |  510 +++----
 audio/music/routes2.asm                 |  534 +++----
 audio/music/routes3.asm                 |  740 ++++-----
 audio/music/routes4.asm                 |  960 ++++++------
 audio/music/safarizone.asm              |   72 +-
 audio/music/silphco.asm                 | 1098 +++++++-------
 audio/music/ssanne.asm                  |  504 +++----
 audio/music/surfing.asm                 |  500 +++----
 audio/music/titlescreen.asm             |  730 ++++-----
 audio/music/trainerbattle.asm           | 2482 +++++++++++++++----------------
 audio/music/unusedsong.asm              |  352 ++---
 audio/music/vermilion.asm               |  508 +++----
 audio/music/wildbattle.asm              | 1196 +++++++--------
 audio/music/yellow/meetjessiejames.asm  |  362 ++---
 audio/music/yellow/surfingpikachu.asm   |  826 +++++-----
 audio/music/yellow/yellowintro.asm      |  514 +++----
 audio/music/yellow/yellowunusedsong.asm |  506 +++----
 audio/sfx/sfx_02_3a.asm                 |   24 +-
 audio/sfx/sfx_02_3b.asm                 |   60 +-
 audio/sfx/sfx_02_41.asm                 |   66 +-
 audio/sfx/sfx_02_42.asm                 |   50 +-
 audio/sfx/sfx_02_5e.asm                 |   26 +-
 audio/sfx/sfx_08_3a.asm                 |   48 +-
 audio/sfx/sfx_08_3b.asm                 |   60 +-
 audio/sfx/sfx_08_46.asm                 |   60 +-
 audio/sfx/sfx_08_75.asm                 |   16 +-
 audio/sfx/sfx_08_pokeflute_ch3.asm      |   12 +-
 audio/sfx/sfx_08_unused2.asm            |   34 +-
 audio/sfx/sfx_1f_3a.asm                 |   24 +-
 audio/sfx/sfx_1f_3b.asm                 |   60 +-
 audio/sfx/sfx_1f_41.asm                 |   66 +-
 audio/sfx/sfx_1f_42.asm                 |   50 +-
 macros.asm                              |  181 ++-
 66 files changed, 15173 insertions(+), 15074 deletions(-)

(limited to 'macros.asm')

diff --git a/audio/music/bikeriding.asm b/audio/music/bikeriding.asm
index dded207e..662f2fc8 100644
--- a/audio/music/bikeriding.asm
+++ b/audio/music/bikeriding.asm
@@ -5,149 +5,149 @@ Music_BikeRiding_Ch1:: ; 7dbbb (1f:5bbb)
 	vibrato 8, 1, 4
 	notetype 12, 11, 5
 	octave 3
-	note G_, 2
+	G_ 2
 
 Music_BikeRiding_branch_7dbc9::
 	octave 4
-	note C_, 4
-	note D_, 4
-	note E_, 2
-	note C_, 2
-	note E_, 2
-	note G_, 2
-	note G_, 2
-	note F_, 2
-	note E_, 2
-	note F_, 4
-	note E_, 2
-	note D_, 2
-	note F_, 4
-	note D_, 4
+	C_ 4
+	D_ 4
+	E_ 2
+	C_ 2
+	E_ 2
+	G_ 2
+	G_ 2
+	F_ 2
+	E_ 2
+	F_ 4
+	E_ 2
+	D_ 2
+	F_ 4
+	D_ 4
 	octave 3
-	note B_, 2
-	octave 4
-	note F_, 4
-	note D_, 4
-	note E_, 2
-	note F_, 2
-	note G_, 2
-	note C_, 2
-	note E_, 2
-	note C_, 2
-	note D_, 2
-	note E_, 2
+	B_ 2
+	octave 4
+	F_ 4
+	D_ 4
+	E_ 2
+	F_ 2
+	G_ 2
+	C_ 2
+	E_ 2
+	C_ 2
+	D_ 2
+	E_ 2
 	notetype 12, 11, 6
-	note F_, 10
+	F_ 10
 	notetype 12, 10, 6
-	note F_, 2
-	note E_, 2
-	note F_, 2
-	note G_, 10
-	note E_, 2
-	note D_, 2
-	note E_, 2
-	note F_, 6
+	F_ 2
+	E_ 2
+	F_ 2
+	G_ 10
+	E_ 2
+	D_ 2
+	E_ 2
+	F_ 6
 	toggleperfectpitch
 	notetype 12, 11, 3
-	note E_, 2
-	note D_, 2
-	note D_, 1
-	note E_, 1
-	note F_, 2
-	note E_, 1
-	note F_, 1
+	E_ 2
+	D_ 2
+	D_ 1
+	E_ 1
+	F_ 2
+	E_ 1
+	F_ 1
 	toggleperfectpitch
 	notetype 12, 11, 5
-	note G_, 6
-	note G_, 6
-	note A_, 2
-	note F_, 2
-	note G_, 6
+	G_ 6
+	G_ 6
+	A_ 2
+	F_ 2
+	G_ 6
 	notetype 12, 11, 4
-	note G_, 2
-	note F_, 4
+	G_ 2
+	F_ 4
 	notetype 12, 10, 4
-	note E_, 2
-	note D_, 2
+	E_ 2
+	D_ 2
 	notetype 12, 9, 3
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note C_, 4
-	note C_, 2
+	C_ 4
+	C_ 2
 	octave 3
-	note B_, 2
-	note A_, 1
-	note B_, 1
-	note A_, 2
-	note B_, 2
-	octave 4
-	note C_, 2
-	note C_, 4
-	note C_, 2
+	B_ 2
+	A_ 1
+	B_ 1
+	A_ 2
+	B_ 2
+	octave 4
+	C_ 2
+	C_ 4
+	C_ 2
 	octave 3
-	note A_, 2
-	note B_, 2
-	note B_, 2
-	note A_, 2
+	A_ 2
+	B_ 2
+	B_ 2
+	A_ 2
 	octave 4
-	note C_, 4
+	C_ 4
 	octave 3
-	note A_, 2
-	note B_, 1
+	A_ 2
+	B_ 1
 	octave 4
-	note C_, 1
+	C_ 1
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note D_, 4
+	D_ 4
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C_, 4
+	C_ 4
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C_, 1
-	note D_, 1
+	C_ 1
+	D_ 1
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C_, 4
+	C_ 4
 	notetype 12, 3, 13
-	note C_, 4
+	C_ 4
 	notetype 12, 11, 4
-	note F_, 6
-	note G_, 4
-	note F_, 1
-	note G_, 1
-	note F_, 4
-	note E_, 6
-	note F_, 2
-	note E_, 2
-	note D_, 1
-	note E_, 1
-	note D_, 2
-	note C_, 2
+	F_ 6
+	G_ 4
+	F_ 1
+	G_ 1
+	F_ 4
+	E_ 6
+	F_ 2
+	E_ 2
+	D_ 1
+	E_ 1
+	D_ 2
+	C_ 2
 	notetype 12, 11, 5
 	octave 3
-	note A_, 4
+	A_ 4
 	octave 4
-	note D_, 4
+	D_ 4
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note E_, 4
-	note C_, 4
-	note F_, 4
-	note D_, 4
-	note F#, 4
+	E_ 4
+	C_ 4
+	F_ 4
+	D_ 4
+	F# 4
 	vibrato 10, 2, 6
 	notetype 12, 8, 0
-	note G_, 16
-	note G_, 4
+	G_ 16
+	G_ 4
 	notetype 12, 8, 7
-	note G_, 12
+	G_ 12
 	notetype 12, 11, 5
 	vibrato 8, 1, 4
 	loopchannel 0, Music_BikeRiding_branch_7dbc9
@@ -158,146 +158,146 @@ Music_BikeRiding_Ch2:: ; 7dc6c (1f:5c6c)
 	vibrato 6, 1, 5
 	notetype 12, 12, 3
 	octave 4
-	note C_, 2
+	C_ 2
 
 Music_BikeRiding_branch_7dc75::
-	note E_, 4
-	note F_, 4
-	note G_, 4
+	E_ 4
+	F_ 4
+	G_ 4
 	octave 5
-	note C_, 4
-	octave 4
-	note B_, 6
-	note A_, 1
-	note B_, 1
-	note A_, 10
-	note F_, 2
-	note G_, 2
-	note A_, 2
+	C_ 4
+	octave 4
+	B_ 6
+	A_ 1
+	B_ 1
+	A_ 10
+	F_ 2
+	G_ 2
+	A_ 2
 	octave 5
-	note D_, 2
-	note C_, 2
+	D_ 2
+	C_ 2
 	octave 4
-	note B_, 2
-	note A_, 1
-	note B_, 1
+	B_ 2
+	A_ 1
+	B_ 1
 	octave 5
-	note C_, 6
+	C_ 6
 	octave 4
-	note A_, 2
-	note G_, 4
+	A_ 2
+	G_ 4
 	duty 3
 	notetype 12, 8, 4
-	note A#, 6
+	A# 6
 	duty 2
 	notetype 12, 12, 5
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note B_, 2
+	B_ 2
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note A_, 10
+	A_ 10
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note B_, 2
+	B_ 2
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note G_, 10
+	G_ 10
 	notetype 12, 12, 3
 	octave 5
-	note C_, 4
-	note E_, 2
-	note D_, 2
-	note C_, 2
+	C_ 4
+	E_ 2
+	D_ 2
+	C_ 2
 	octave 4
-	note B_, 2
+	B_ 2
 	octave 5
-	note C_, 2
+	C_ 2
 	notetype 12, 11, 0
-	note D_, 4
+	D_ 4
 	notetype 12, 12, 7
-	note D_, 10
-	note D_, 1
-	note C_, 1
+	D_ 10
+	D_ 1
+	C_ 1
 	notetype 12, 11, 0
 	octave 4
-	note B_, 4
+	B_ 4
 	notetype 12, 12, 7
-	note B_, 12
+	B_ 12
 	notetype 12, 12, 4
-	note F_, 6
-	note F_, 2
-	note G_, 2
-	note F_, 2
-	note E_, 2
-	note D_, 2
-	note E_, 6
-	note E_, 2
-	note F_, 2
-	note E_, 2
-	note D_, 2
-	note C_, 2
-	note F_, 2
-	note E_, 2
-	note D_, 2
-	note F_, 2
-	note G_, 4
-	note A_, 2
-	note F_, 2
-	note E_, 2
-	note G_, 4
-	note F_, 2
-	note E_, 6
+	F_ 6
+	F_ 2
+	G_ 2
+	F_ 2
+	E_ 2
+	D_ 2
+	E_ 6
+	E_ 2
+	F_ 2
+	E_ 2
+	D_ 2
+	C_ 2
+	F_ 2
+	E_ 2
+	D_ 2
+	F_ 2
+	G_ 4
+	A_ 2
+	F_ 2
+	E_ 2
+	G_ 4
+	F_ 2
+	E_ 6
 	notetype 6, 12, 2
-	note F_, 1
-	note G_, 1
-	note A_, 1
-	note B_, 1
+	F_ 1
+	G_ 1
+	A_ 1
+	B_ 1
 	notetype 12, 12, 3
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note B_, 2
-	note A_, 2
+	B_ 2
+	A_ 2
 	octave 5
-	note C_, 2
-	octave 4
-	note B_, 4
-	note A_, 4
-	note G_, 2
-	note A#, 4
-	note A_, 2
-	note G_, 4
-	note F_, 2
-	note E_, 2
+	C_ 2
+	octave 4
+	B_ 4
+	A_ 4
+	G_ 2
+	A# 4
+	A_ 2
+	G_ 4
+	F_ 2
+	E_ 2
 	notetype 8, 12, 4
-	note A_, 4
-	note G_, 4
-	note F_, 4
-	note B_, 4
-	note A_, 4
-	note G_, 4
+	A_ 4
+	G_ 4
+	F_ 4
+	B_ 4
+	A_ 4
+	G_ 4
 	octave 5
-	note C_, 4
+	C_ 4
 	octave 4
-	note B_, 4
-	note A_, 4
+	B_ 4
+	A_ 4
 	octave 5
-	note D_, 4
-	note E_, 4
-	note C_, 4
+	D_ 4
+	E_ 4
+	C_ 4
 	notetype 12, 12, 7
-	note D_, 12
-	note C_, 4
+	D_ 12
+	C_ 4
 	notetype 12, 11, 0
 	octave 4
-	note B_, 4
+	B_ 4
 	notetype 12, 12, 7
-	note B_, 12
+	B_ 12
 	notetype 12, 12, 3
 	loopchannel 0, Music_BikeRiding_branch_7dc75
 
@@ -308,337 +308,337 @@ Music_BikeRiding_Ch3:: ; 7dd14 (1f:5d14)
 
 Music_BikeRiding_branch_7dd17::
 	octave 4
-	note C_, 1
+	C_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 3
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 4
-	note E_, 1
+	E_ 1
 	rest 1
-	note C_, 1
+	C_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note C_, 1
+	C_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note C_, 1
+	C_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
 	octave 3
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 4
-	note F_, 1
+	F_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note C_, 1
+	C_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note C_, 1
+	C_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note C_, 1
+	C_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
 	octave 3
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 4
-	note F_, 1
+	F_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note C_, 1
+	C_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note D_, 1
+	D_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note G_, 1
+	G_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
 	octave 3
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 4
-	note F_, 1
+	F_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note C_, 1
+	C_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
 	octave 3
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 4
-	note F_, 1
+	F_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note C_, 1
+	C_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note C_, 1
+	C_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note C_, 1
+	C_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C_, 1
+	C_ 1
 	rest 1
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C_, 1
+	C_ 1
 	rest 1
 	octave 4
-	note A_, 1
+	A_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 5
-	note C_, 1
+	C_ 1
 	rest 1
 	octave 4
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 5
-	note C_, 1
+	C_ 1
 	rest 1
 	octave 4
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 5
-	note C_, 1
+	C_ 1
 	rest 1
 	octave 4
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 5
-	note C_, 1
+	C_ 1
 	rest 1
 	octave 4
-	note G_, 1
+	G_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F_, 1
+	F_ 1
 	rest 1
 	loopchannel 0, Music_BikeRiding_branch_7dd17
 
@@ -671,35 +671,35 @@ Music_BikeRiding_branch_7de6a::
 
 Music_BikeRiding_branch_7dea7::
 	rest 2
-	dnote 2, triangle3
+	triangle3 2
 	rest 2
-	dnote 2, triangle3
+	triangle3 2
 	rest 2
-	dnote 2, triangle3
+	triangle3 2
 	rest 2
-	dnote 2, triangle3
+	triangle3 2
 	endchannel
 
 Music_BikeRiding_branch_7deb4::
 	rest 2
-	dnote 2, triangle3
+	triangle3 2
 	rest 2
-	dnote 2, triangle3
+	triangle3 2
 	rest 2
-	dnote 2, triangle3
-	dnote 2, triangle3
-	dnote 2, triangle3
+	triangle3 2
+	triangle3 2
+	triangle3 2
 	endchannel
 
 Music_BikeRiding_branch_7dec2::
 	rest 2
-	dnote 2, triangle3
+	triangle3 2
 	rest 2
-	dnote 2, triangle3
+	triangle3 2
 	rest 2
-	dnote 2, triangle3
+	triangle3 2
 	rest 2
-	dnote 1, triangle3
-	dnote 1, triangle3
+	triangle3 1
+	triangle3 1
 	endchannel
-; 0x7ded1
\ No newline at end of file
+; 0x7ded1
diff --git a/audio/music/celadon.asm b/audio/music/celadon.asm
index e07d8fef..77dc2ab8 100644
--- a/audio/music/celadon.asm
+++ b/audio/music/celadon.asm
@@ -6,104 +6,104 @@ Music_Celadon_Ch1:: ; b6c7 (2:76c7)
 	notetype 12, 2, 15
 	rest 8
 	octave 3
-	note D_, 8
+	D_ 8
 
 Music_Celadon_branch_b6d4::
 	duty 2
 	notetype 12, 11, 2
-	note G_, 4
-	note B_, 4
-	note G_, 2
-	note B_, 4
-	note G_, 2
-	note E_, 1
-	note E_, 1
-	note G_, 1
-	note E_, 1
-	note B_, 2
-	octave 4
-	note C_, 2
+	G_ 4
+	B_ 4
+	G_ 2
+	B_ 4
+	G_ 2
+	E_ 1
+	E_ 1
+	G_ 1
+	E_ 1
+	B_ 2
+	octave 4
+	C_ 2
 	octave 3
-	note A_, 8
-	note F#, 4
-	note A_, 4
-	note F#, 2
-	note A_, 6
-	note A_, 1
-	note B_, 1
-	octave 4
-	note C_, 1
+	A_ 8
+	F# 4
+	A_ 4
+	F# 2
+	A_ 6
+	A_ 1
+	B_ 1
+	octave 4
+	C_ 1
 	octave 3
-	note B_, 1
-	note A_, 2
-	note B_, 2
-	note G_, 4
+	B_ 1
+	A_ 2
+	B_ 2
+	G_ 4
 	octave 4
-	note G_, 4
+	G_ 4
 	octave 3
-	note G_, 4
-	note B_, 4
-	note G_, 2
-	note B_, 4
-	note G_, 2
-	note E_, 1
-	note F#, 1
-	note G_, 1
-	note A_, 1
-	note B_, 2
-	octave 4
-	note C_, 2
+	G_ 4
+	B_ 4
+	G_ 2
+	B_ 4
+	G_ 2
+	E_ 1
+	F# 1
+	G_ 1
+	A_ 1
+	B_ 2
+	octave 4
+	C_ 2
 	octave 3
-	note A_, 8
-	note A_, 2
-	note B_, 2
+	A_ 8
+	A_ 2
+	B_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
-	note G_, 2
-	note F#, 4
-	note D_, 1
-	note E_, 1
-	note F#, 1
-	note G_, 1
-	note A_, 8
+	B_ 2
+	A_ 2
+	G_ 2
+	F# 2
+	G_ 2
+	F# 4
+	D_ 1
+	E_ 1
+	F# 1
+	G_ 1
+	A_ 8
 	notetype 12, 9, 4
-	note B_, 8
-	note G_, 4
-	note D_, 4
-	note G_, 4
-	note A_, 2
+	B_ 8
+	G_ 4
+	D_ 4
+	G_ 4
+	A_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note B_, 8
-	note A_, 8
-	note F#, 4
-	note G_, 4
-	note A_, 4
-	note G_, 4
-	note F#, 4
-	note A_, 4
-	note B_, 8
-	note G_, 4
-	note D_, 4
-	note G_, 4
-	note A_, 2
-	octave 4
-	note C_, 2
+	B_ 8
+	A_ 8
+	F# 4
+	G_ 4
+	A_ 4
+	G_ 4
+	F# 4
+	A_ 4
+	B_ 8
+	G_ 4
+	D_ 4
+	G_ 4
+	A_ 2
+	octave 4
+	C_ 2
 	octave 3
-	note B_, 8
-	note A_, 8
-	note F#, 4
-	note G_, 4
-	note A_, 4
-	note G_, 4
-	note F#, 4
-	note A_, 4
+	B_ 8
+	A_ 8
+	F# 4
+	G_ 4
+	A_ 4
+	G_ 4
+	F# 4
+	A_ 4
 	loopchannel 0, Music_Celadon_branch_b6d4
 
 
@@ -111,118 +111,118 @@ Music_Celadon_Ch2:: ; b73a (2:773a)
 	duty 3
 	notetype 12, 12, 2
 	octave 4
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note E_, 1
-	note F#, 1
-	note E_, 1
-	note F#, 1
-	note G_, 1
+	D_ 1
+	C# 1
+	D_ 1
+	E_ 1
+	F# 1
+	E_ 1
+	F# 1
+	G_ 1
 	notetype 12, 10, 0
-	note A_, 8
+	A_ 8
 
 Music_Celadon_branch_b74a::
 	duty 2
 	notetype 12, 12, 2
 	octave 4
-	note B_, 4
-	note G_, 4
-	note B_, 2
-	note G_, 6
-	note B_, 1
-	note G_, 1
-	note A_, 1
-	note B_, 1
+	B_ 4
+	G_ 4
+	B_ 2
+	G_ 6
+	B_ 1
+	G_ 1
+	A_ 1
+	B_ 1
 	octave 5
-	note C_, 2
-	octave 4
-	note B_, 2
-	note A_, 8
-	note A_, 4
-	note F#, 4
-	note A_, 2
-	note F#, 6
-	note A_, 1
-	note G_, 1
-	note F#, 1
-	note G_, 1
-	note A_, 2
-	note B_, 2
-	note G_, 4
-	note B_, 4
-	note B_, 4
-	note G_, 4
-	note B_, 2
-	note G_, 4
+	C_ 2
+	octave 4
+	B_ 2
+	A_ 8
+	A_ 4
+	F# 4
+	A_ 2
+	F# 6
+	A_ 1
+	G_ 1
+	F# 1
+	G_ 1
+	A_ 2
+	B_ 2
+	G_ 4
+	B_ 4
+	B_ 4
+	G_ 4
+	B_ 2
+	G_ 4
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note B_, 1
-	note G_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	G_ 1
+	A_ 1
+	B_ 1
 	octave 5
-	note C_, 2
-	octave 4
-	note B_, 2
-	note A_, 8
-	note A_, 2
-	note G_, 2
-	note F#, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note D_, 2
-	note C#, 2
-	note D_, 8
+	C_ 2
+	octave 4
+	B_ 2
+	A_ 8
+	A_ 2
+	G_ 2
+	F# 2
+	G_ 2
+	F# 2
+	E_ 2
+	D_ 2
+	C# 2
+	D_ 8
 	octave 5
-	note D_, 8
+	D_ 8
 	notetype 12, 11, 4
 	octave 4
-	note D_, 8
-	note C_, 2
+	D_ 8
+	C_ 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note B_, 2
-	octave 4
-	note E_, 4
-	note F#, 4
-	note D_, 8
-	note C_, 8
+	B_ 2
+	A_ 2
+	B_ 2
+	octave 4
+	E_ 4
+	F# 4
+	D_ 8
+	C_ 8
 	octave 3
-	note A_, 2
-	note B_, 2
-	octave 4
-	note C_, 2
-	note D_, 2
-	note E_, 2
-	note C_, 2
-	note D_, 2
-	note E_, 2
-	note D_, 8
-	note D_, 8
-	note C_, 2
+	A_ 2
+	B_ 2
+	octave 4
+	C_ 2
+	D_ 2
+	E_ 2
+	C_ 2
+	D_ 2
+	E_ 2
+	D_ 8
+	D_ 8
+	C_ 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note B_, 2
-	octave 4
-	note E_, 4
-	note D_, 2
-	note E_, 2
-	note D_, 8
-	note C_, 8
-	note A_, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note F#, 2
-	note E_, 2
-	note D_, 2
-	note E_, 2
-	note D_, 8
+	B_ 2
+	A_ 2
+	B_ 2
+	octave 4
+	E_ 4
+	D_ 2
+	E_ 2
+	D_ 8
+	C_ 8
+	A_ 2
+	G_ 2
+	F# 2
+	E_ 2
+	F# 2
+	E_ 2
+	D_ 2
+	E_ 2
+	D_ 8
 	loopchannel 0, Music_Celadon_branch_b74a
 
 
@@ -230,183 +230,183 @@ Music_Celadon_Ch3:: ; b7b5 (2:77b5)
 	notetype 12, 1, 3
 	rest 8
 	octave 5
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note E_, 1
-	note F#, 1
-	note E_, 1
-	note F#, 1
-	note G_, 1
+	D_ 1
+	C# 1
+	D_ 1
+	E_ 1
+	F# 1
+	E_ 1
+	F# 1
+	G_ 1
 
 Music_Celadon_branch_b7c1::
 	octave 4
-	note D_, 2
-	note B_, 2
-	note D_, 2
-	note B_, 2
-	note D_, 2
-	note B_, 2
-	note D_, 2
-	note B_, 2
-	note D_, 2
-	note B_, 2
-	note D_, 2
-	note B_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note B_, 2
-	note D_, 2
-	note B_, 2
-	note D_, 2
-	note B_, 2
-	note D_, 2
-	note B_, 2
-	note D_, 2
-	note B_, 2
-	note D_, 2
-	note B_, 2
-	note D_, 2
-	note B_, 2
-	note D_, 2
-	note B_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note G_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note C#, 2
-	note D_, 2
+	D_ 2
+	B_ 2
+	D_ 2
+	B_ 2
+	D_ 2
+	B_ 2
+	D_ 2
+	B_ 2
+	D_ 2
+	B_ 2
+	D_ 2
+	B_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	B_ 2
+	D_ 2
+	B_ 2
+	D_ 2
+	B_ 2
+	D_ 2
+	B_ 2
+	D_ 2
+	B_ 2
+	D_ 2
+	B_ 2
+	D_ 2
+	B_ 2
+	D_ 2
+	B_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	G_ 2
+	A_ 2
+	G_ 2
+	F# 2
+	E_ 2
+	C# 2
+	D_ 2
 	rest 6
-	note F#, 2
+	F# 2
 	rest 4
-	note F#, 2
-	note G_, 2
+	F# 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
-	note B_, 2
-	note G_, 2
+	G_ 2
+	B_ 2
+	G_ 2
 	octave 5
-	note E_, 2
-	note D_, 2
-	note C_, 2
-	note D_, 2
+	E_ 2
+	D_ 2
+	C_ 2
+	D_ 2
 	octave 4
-	note B_, 2
-	note G_, 2
+	B_ 2
+	G_ 2
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note E_, 2
-	note D_, 2
-	note C_, 2
-	note D_, 2
+	E_ 2
+	D_ 2
+	C_ 2
+	D_ 2
 	octave 4
-	note B_, 2
-	note A_, 2
+	B_ 2
+	A_ 2
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
-	note B_, 2
-	note G_, 2
+	G_ 2
+	B_ 2
+	G_ 2
 	octave 5
-	note E_, 2
-	note D_, 2
-	note C_, 2
-	note D_, 2
+	E_ 2
+	D_ 2
+	C_ 2
+	D_ 2
 	octave 4
-	note B_, 2
-	note G_, 2
+	B_ 2
+	G_ 2
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
-	note C_, 2
-	octave 4
-	note B_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
+	D_ 2
+	C_ 2
+	octave 4
+	B_ 2
+	A_ 2
+	G_ 2
+	F# 2
+	E_ 2
 	loopchannel 0, Music_Celadon_branch_b7c1
-; 0xb86d
\ No newline at end of file
+; 0xb86d
diff --git a/audio/music/cinnabar.asm b/audio/music/cinnabar.asm
index 12048703..4fcbe842 100644
--- a/audio/music/cinnabar.asm
+++ b/audio/music/cinnabar.asm
@@ -9,79 +9,79 @@ Music_Cinnabar_branch_b878::
 	notetype 12, 11, 5
 	rest 4
 	octave 3
-	note D_, 4
-	note E_, 6
-	note C#, 2
+	D_ 4
+	E_ 6
+	C# 2
 	notetype 12, 11, 1
-	note D_, 4
+	D_ 4
 	notetype 12, 11, 5
-	note B_, 4
+	B_ 4
 	octave 4
-	note C_, 6
+	C_ 6
 	octave 3
-	note A_, 2
+	A_ 2
 	notetype 12, 11, 1
-	note B_, 4
+	B_ 4
 	notetype 12, 11, 5
-	note G_, 4
-	note F#, 4
-	note E_, 2
-	note F#, 2
+	G_ 4
+	F# 4
+	E_ 2
+	F# 2
 	notetype 12, 11, 1
-	note G_, 4
+	G_ 4
 	notetype 12, 11, 5
-	note G_, 4
-	note F#, 4
-	note E_, 4
-	note D_, 4
-	note E_, 4
-	note F#, 6
-	note A_, 2
+	G_ 4
+	F# 4
+	E_ 4
+	D_ 4
+	E_ 4
+	F# 6
+	A_ 2
 	notetype 12, 11, 1
-	note G_, 4
+	G_ 4
 	notetype 12, 11, 5
-	note B_, 4
+	B_ 4
 	octave 4
-	note C_, 6
+	C_ 6
 	octave 3
-	note A_, 2
-	note B_, 4
-	note G_, 4
-	note F#, 3
-	note E_, 1
-	note F#, 2
-	note A_, 2
+	A_ 2
+	B_ 4
+	G_ 4
+	F# 3
+	E_ 1
+	F# 2
+	A_ 2
 	notetype 12, 10, 2
-	note G_, 4
+	G_ 4
 	octave 4
-	note D_, 1
-	note E_, 1
-	note D_, 4
+	D_ 1
+	E_ 1
+	D_ 4
 	notetype 12, 7, 2
-	note D_, 1
-	note E_, 1
-	note D_, 4
+	D_ 1
+	E_ 1
+	D_ 4
 	notetype 12, 10, 7
 	octave 3
-	note B_, 6
-	note G_, 2
-	note E_, 8
+	B_ 6
+	G_ 2
+	E_ 8
 	octave 4
-	note C_, 6
+	C_ 6
 	octave 3
-	note A_, 2
-	note F#, 8
+	A_ 2
+	F# 8
 	octave 4
-	note F#, 6
-	note D_, 2
+	F# 6
+	D_ 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
-	note G_, 8
-	note F#, 4
-	note E_, 4
+	B_ 2
+	A_ 2
+	G_ 2
+	F# 2
+	G_ 8
+	F# 4
+	E_ 4
 	loopchannel 0, Music_Cinnabar_branch_b878
 
 
@@ -92,90 +92,90 @@ Music_Cinnabar_Ch2:: ; b8d4 (2:78d4)
 Music_Cinnabar_branch_b8d9::
 	notetype 12, 12, 7
 	octave 3
-	note G_, 6
-	note A_, 1
-	note B_, 1
+	G_ 6
+	A_ 1
+	B_ 1
 	octave 4
-	note C_, 6
-	note D_, 1
-	note E_, 1
+	C_ 6
+	D_ 1
+	E_ 1
 	notetype 12, 12, 1
-	note D_, 4
+	D_ 4
 	notetype 12, 12, 7
-	note G_, 4
-	note A_, 6
-	note G_, 1
-	note F#, 1
-	note E_, 4
-	note D_, 4
-	note C_, 3
+	G_ 4
+	A_ 6
+	G_ 1
+	F# 1
+	E_ 4
+	D_ 4
+	C_ 3
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C_, 2
-	note D_, 1
-	note E_, 1
+	C_ 2
+	D_ 1
+	E_ 1
 	notetype 12, 12, 1
-	note D_, 4
+	D_ 4
 	notetype 12, 12, 7
 	octave 3
-	note B_, 8
-	note A_, 4
-	note G_, 6
-	note A_, 1
-	note B_, 1
+	B_ 8
+	A_ 4
+	G_ 6
+	A_ 1
+	B_ 1
 	octave 4
-	note C_, 6
-	note D_, 1
-	note E_, 1
+	C_ 6
+	D_ 1
+	E_ 1
 	notetype 12, 12, 1
-	note D_, 4
+	D_ 4
 	notetype 12, 12, 7
-	note G_, 4
-	note A_, 6
-	note G_, 1
-	note F#, 1
-	note E_, 4
-	note D_, 4
-	note C_, 3
+	G_ 4
+	A_ 6
+	G_ 1
+	F# 1
+	E_ 4
+	D_ 4
+	C_ 3
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C_, 2
-	note D_, 1
-	note E_, 1
+	C_ 2
+	D_ 1
+	E_ 1
 	notetype 12, 12, 1
-	note D_, 4
+	D_ 4
 	notetype 12, 12, 7
 	octave 3
-	note A_, 4
-	note G_, 4
-	note F#, 4
+	A_ 4
+	G_ 4
+	F# 4
 	notetype 12, 11, 0
 	octave 4
-	note D_, 6
+	D_ 6
 	octave 3
-	note B_, 2
-	note G_, 8
+	B_ 2
+	G_ 8
 	octave 4
-	note E_, 6
-	note C_, 2
+	E_ 6
+	C_ 2
 	octave 3
-	note A_, 8
+	A_ 8
 	octave 4
-	note A_, 6
-	note F#, 2
-	note D_, 2
-	note C_, 2
+	A_ 6
+	F# 2
+	D_ 2
+	C_ 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note B_, 4
+	B_ 2
+	A_ 2
+	B_ 4
 	octave 4
-	note D_, 4
+	D_ 4
 	octave 3
-	note B_, 2
-	note A_, 6
+	B_ 2
+	A_ 6
 	loopchannel 0, Music_Cinnabar_branch_b8d9
 
 
@@ -184,172 +184,172 @@ Music_Cinnabar_Ch3:: ; b93d (2:793d)
 
 Music_Cinnabar_branch_b93f::
 	octave 4
-	note G_, 1
+	G_ 1
 	rest 3
-	note B_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 1
+	B_ 2
+	G_ 1
+	G_ 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 3
-	note B_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 1
+	B_ 2
+	G_ 1
+	G_ 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 3
-	note B_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 1
+	B_ 2
+	G_ 1
+	G_ 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 3
-	note B_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 1
+	B_ 2
+	G_ 1
+	G_ 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note A_, 1
+	A_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 3
-	note B_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 1
+	B_ 2
+	G_ 1
+	G_ 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 3
-	note B_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 1
+	B_ 2
+	G_ 1
+	G_ 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 3
-	note B_, 2
-	note G_, 1
-	note G_, 1
-	note A_, 1
+	B_ 2
+	G_ 1
+	G_ 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 3
-	note B_, 4
-	note A_, 1
+	B_ 4
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C_, 4
+	C_ 4
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 3
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note B_, 1
-	note B_, 1
-	note B_, 1
+	B_ 1
+	B_ 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 3
 	octave 5
-	note E_, 2
-	note C_, 1
-	note C_, 1
-	note C_, 1
+	E_ 2
+	C_ 1
+	C_ 1
+	C_ 1
 	rest 1
-	note C_, 1
+	C_ 1
 	rest 1
-	note E_, 2
-	note C_, 1
+	E_ 2
+	C_ 1
 	rest 1
 	octave 4
-	note A_, 1
+	A_ 1
 	rest 3
 	octave 5
-	note A_, 2
-	note F#, 1
-	note F#, 1
-	note D_, 1
+	A_ 2
+	F# 1
+	F# 1
+	D_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note D_, 2
-	note C_, 1
+	D_ 2
+	C_ 1
 	rest 1
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 3
 	octave 5
-	note D_, 2
-	note C_, 1
-	note C_, 1
+	D_ 2
+	C_ 1
+	C_ 1
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note A_, 2
+	A_ 2
 	octave 5
-	note C_, 1
+	C_ 1
 	rest 1
 	loopchannel 0, Music_Cinnabar_branch_b93f
-; 0xb9eb
\ No newline at end of file
+; 0xb9eb
diff --git a/audio/music/cinnabarmansion.asm b/audio/music/cinnabarmansion.asm
index 3a5ec6e3..690fb915 100644
--- a/audio/music/cinnabarmansion.asm
+++ b/audio/music/cinnabarmansion.asm
@@ -7,23 +7,23 @@ Music_CinnabarMansion_Ch1:: ; 7ed0f (1f:6d0f)
 Music_CinnabarMansion_branch_7ed19::
 	notetype 12, 6, 2
 	octave 5
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	octave 4
-	note B_, 1
-	note B_, 1
-	note C_, 1
+	B_ 1
+	B_ 1
+	C_ 1
 	rest 2
 	octave 5
-	note B_, 2
-	note E_, 2
+	B_ 2
+	E_ 2
 	octave 4
-	note C_, 2
-	note B_, 2
-	note E_, 2
-	note C_, 1
+	C_ 2
+	B_ 2
+	E_ 2
+	C_ 1
 	octave 5
-	note B_, 1
+	B_ 1
 	rest 2
 	loopchannel 14, Music_CinnabarMansion_branch_7ed19
 	notetype 12, 10, 5
@@ -31,10 +31,10 @@ Music_CinnabarMansion_branch_7ed19::
 	rest 16
 	rest 15
 	octave 4
-	note C_, 1
+	C_ 1
 	octave 5
-	note B_, 1
-	note B_, 2
+	B_ 1
+	B_ 2
 	loopchannel 0, Music_CinnabarMansion_branch_7ed19
 
 
@@ -56,42 +56,42 @@ Music_CinnabarMansion_branch_7ed50::
 	callchannel Music_CinnabarMansion_branch_7ed6c
 	loopchannel 3, Music_CinnabarMansion_branch_7ed50
 	octave 3
-	note E_, 4
-	note D#, 4
-	note B_, 4
-	note A#, 4
-	note G_, 4
-	note G#, 4
+	E_ 4
+	D# 4
+	B_ 4
+	A# 4
+	G_ 4
+	G# 4
 	rest 4
-	note A#, 4
-	note E_, 4
-	note D#, 4
-	note B_, 4
-	note A#, 4
-	note G_, 4
-	note G#, 4
-	note G_, 4
-	note D#, 4
+	A# 4
+	E_ 4
+	D# 4
+	B_ 4
+	A# 4
+	G_ 4
+	G# 4
+	G_ 4
+	D# 4
 	loopchannel 0, Music_CinnabarMansion_branch_7ed4e
 
 Music_CinnabarMansion_branch_7ed6c::
 	octave 3
-	note E_, 4
-	note D#, 4
-	note B_, 4
-	note A#, 4
-	note G_, 4
-	note G#, 4
-	note A_, 4
-	note A#, 4
-	note E_, 4
-	note D#, 4
-	note B_, 4
-	note A#, 4
-	note G_, 4
-	note G#, 4
+	E_ 4
+	D# 4
+	B_ 4
+	A# 4
+	G_ 4
+	G# 4
+	A_ 4
+	A# 4
+	E_ 4
+	D# 4
+	B_ 4
+	A# 4
+	G_ 4
+	G# 4
 	rest 4
-	note A#, 4
+	A# 4
 	endchannel
 
 
@@ -100,46 +100,46 @@ Music_CinnabarMansion_Ch3:: ; 7ed7e (1f:6d7e)
 
 Music_CinnabarMansion_branch_7ed80::
 	octave 2
-	note B_, 2
+	B_ 2
 	rest 2
 	octave 3
-	note E_, 2
+	E_ 2
 	rest 2
-	note E_, 2
+	E_ 2
 	rest 2
-	note E_, 2
+	E_ 2
 	rest 2
-	note E_, 2
+	E_ 2
 	rest 2
-	note E_, 2
+	E_ 2
 	rest 2
-	note E_, 2
+	E_ 2
 	rest 2
-	note E_, 2
+	E_ 2
 	rest 2
-	note C_, 2
+	C_ 2
 	rest 2
 	octave 3
-	note D#, 2
+	D# 2
 	rest 2
-	note D#, 2
+	D# 2
 	rest 2
-	note D#, 2
+	D# 2
 	rest 2
-	note D#, 2
+	D# 2
 	rest 2
-	note D#, 2
+	D# 2
 	rest 2
-	note D#, 2
+	D# 2
 	rest 2
-	note D#, 2
+	D# 2
 	rest 2
 	loopchannel 8, Music_CinnabarMansion_branch_7ed80
-	note E_, 16
-	note D#, 16
-	note G_, 16
-	note G#, 8
-	note D#, 8
+	E_ 16
+	D# 16
+	G_ 16
+	G# 8
+	D# 8
 	loopchannel 0, Music_CinnabarMansion_branch_7ed80
 
 
@@ -151,23 +151,23 @@ Music_CinnabarMansion_Ch4:: ; 7edb0 (1f:6db0)
 	rest 16
 
 Music_CinnabarMansion_branch_7edb5::
-	dnote 2, cymbal1
-	dnote 2, cymbal1
-	dnote 4, cymbal2
-	dnote 2, cymbal1
-	dnote 2, cymbal1
-	dnote 4, cymbal2
-	dnote 2, cymbal1
-	dnote 2, cymbal1
-	dnote 4, cymbal2
-	dnote 2, cymbal1
-	dnote 2, cymbal1
-	dnote 4, cymbal3
-	dnote 2, cymbal1
-	dnote 2, cymbal1
+	cymbal1 2
+	cymbal1 2
+	cymbal2 4
+	cymbal1 2
+	cymbal1 2
+	cymbal2 4
+	cymbal1 2
+	cymbal1 2
+	cymbal2 4
+	cymbal1 2
+	cymbal1 2
+	cymbal3 4
+	cymbal1 2
+	cymbal1 2
 	rest 2
 	rest 10
 	rest 8
-	dnote 8, cymbal3
+	cymbal3 8
 	loopchannel 0, Music_CinnabarMansion_branch_7edb5
-; 0x7edda
\ No newline at end of file
+; 0x7edda
diff --git a/audio/music/cities1.asm b/audio/music/cities1.asm
index 03ac21e0..82754e0e 100644
--- a/audio/music/cities1.asm
+++ b/audio/music/cities1.asm
@@ -13,258 +13,258 @@ Music_Cities1_branch_aa79::
 Music_Cities1_branch_aa80::
 	notetype 12, 12, 5
 	octave 3
-	note G#, 4
-	note F#, 4
-	note E_, 2
-	note E_, 2
-	note F#, 2
-	note D#, 2
-	note E_, 2
-	note E_, 2
-	note D#, 2
-	note C#, 4
-	note D#, 4
-	note E_, 2
-	note D#, 4
-	note C#, 2
-	note E_, 2
-	note E_, 4
+	G# 4
+	F# 4
+	E_ 2
+	E_ 2
+	F# 2
+	D# 2
+	E_ 2
+	E_ 2
+	D# 2
+	C# 4
+	D# 4
+	E_ 2
+	D# 4
+	C# 2
+	E_ 2
+	E_ 4
 	notetype 12, 10, 5
-	note C#, 4
+	C# 4
 	octave 2
-	note B_, 6
+	B_ 6
 	octave 3
-	note C#, 2
-	note C#, 4
+	C# 2
+	C# 4
 	octave 2
-	note B_, 4
+	B_ 4
 	notetype 12, 12, 5
 	callchannel Music_Cities1_branch_ab7d
 	octave 3
-	note D#, 6
-	note E_, 2
+	D# 6
+	E_ 2
 	octave 2
-	note B_, 4
+	B_ 4
 	notetype 12, 10, 5
 	octave 3
-	note C#, 2
+	C# 2
 	octave 2
-	note B_, 2
-	note A_, 4
-	note B_, 4
-	note B_, 2
+	B_ 2
+	A_ 4
+	B_ 4
+	B_ 2
 	octave 3
-	note C#, 2
-	note D#, 2
-	note E_, 2
-	note D#, 2
-	note C#, 2
-	note D#, 2
+	C# 2
+	D# 2
+	E_ 2
+	D# 2
+	C# 2
+	D# 2
 	notetype 12, 12, 5
-	note G#, 2
-	note E_, 2
-	note F#, 2
-	note E_, 2
-	note E_, 4
-	note F#, 2
-	note D#, 2
-	note E_, 4
-	note D#, 2
-	note C#, 4
-	note D#, 4
-	note E_, 2
-	note D#, 2
-	note C#, 2
-	note C#, 2
-	note E_, 2
-	note E_, 4
+	G# 2
+	E_ 2
+	F# 2
+	E_ 2
+	E_ 4
+	F# 2
+	D# 2
+	E_ 4
+	D# 2
+	C# 4
+	D# 4
+	E_ 2
+	D# 2
+	C# 2
+	C# 2
+	E_ 2
+	E_ 4
 	notetype 12, 10, 5
-	note C#, 2
+	C# 2
 	octave 2
-	note A_, 2
-	note B_, 6
+	A_ 2
+	B_ 6
 	octave 3
-	note C#, 2
-	note C#, 2
+	C# 2
+	C# 2
 	octave 2
-	note B_, 2
-	note B_, 4
+	B_ 2
+	B_ 4
 	notetype 12, 12, 5
 	callchannel Music_Cities1_branch_ab7d
 	octave 3
-	note D#, 4
-	note D#, 2
-	note E_, 2
+	D# 4
+	D# 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note C#, 2
-	note G#, 2
-	note E_, 4
+	C# 2
+	G# 2
+	E_ 4
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	notetype 12, 10, 5
-	note C#, 4
+	C# 4
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D#, 4
-	note C#, 2
-	note E_, 4
+	D# 4
+	C# 2
+	E_ 4
 	notetype 12, 11, 3
 	callchannel Music_Cities1_branch_ab8a
-	note A_, 2
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 4
-	note F#, 4
-	note G#, 2
-	note E_, 2
+	A_ 2
+	B_ 2
+	A_ 2
+	G# 2
+	A_ 4
+	F# 4
+	G# 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note E_, 4
-	note G#, 2
+	E_ 4
+	G# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note E_, 2
-	note E_, 2
-	note F#, 2
-	note E_, 2
-	note D#, 2
-	note E_, 2
-	note D#, 2
-	note C#, 2
+	E_ 2
+	E_ 2
+	F# 2
+	E_ 2
+	D# 2
+	E_ 2
+	D# 2
+	C# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
 
 Music_Cities1_branch_ab12::
-	note C#, 2
-	note D#, 2
-	note C#, 2
+	C# 2
+	D# 2
+	C# 2
 	octave 2
-	note B_, 4
-	note B_, 2
+	B_ 4
+	B_ 2
 	octave 3
-	note C#, 2
-	note D#, 2
+	C# 2
+	D# 2
 	loopchannel 2, Music_Cities1_branch_ab12
-	note E_, 2
+	E_ 2
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note E_, 4
+	E_ 4
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note C#, 2
-	note G#, 2
-	note G#, 2
+	C# 2
+	G# 2
+	G# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D#, 2
+	D# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
 	callchannel Music_Cities1_branch_ab8a
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 2
-	note F#, 2
-	note G#, 2
-	note E_, 2
+	A_ 2
+	E_ 2
+	A_ 2
+	B_ 2
+	A_ 2
+	G# 2
+	A_ 2
+	F# 2
+	G# 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note E_, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note D#, 2
-	note B_, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note F#, 2
-	note E_, 4
-	note G#, 2
-	note F#, 2
-	note D#, 2
+	E_ 2
+	C# 2
+	G# 2
+	C# 2
+	D# 2
+	B_ 2
+	E_ 2
+	G# 2
+	E_ 2
+	F# 2
+	E_ 4
+	G# 2
+	F# 2
+	D# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D#, 4
-	note F#, 2
-	note D#, 2
-	note D#, 2
-	note F#, 2
+	D# 4
+	F# 2
+	D# 2
+	D# 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D#, 2
+	D# 2
 	octave 2
-	note B_, 2
-	note B_, 2
+	B_ 2
+	B_ 2
 	octave 3
-	note D#, 2
+	D# 2
 	notetype 12, 11, 6
-	note F#, 8
-	note F#, 4
-	note D#, 4
-	note E_, 8
+	F# 8
+	F# 4
+	D# 4
+	E_ 8
 	notetype 12, 8, 4
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note E_, 2
-	note F#, 2
+	E_ 2
+	F# 2
 	loopchannel 0, Music_Cities1_branch_aa80
 
 Music_Cities1_branch_ab7d::
 	octave 3
-	note F#, 2
-	note D#, 4
-	note E_, 2
-	note D#, 4
-	note C#, 4
+	F# 2
+	D# 4
+	E_ 2
+	D# 4
+	C# 4
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note C#, 2
-	note D#, 2
-	note C#, 2
+	C# 2
+	D# 2
+	C# 2
 	endchannel
 
 Music_Cities1_branch_ab8a::
-	note A_, 2
-	note E_, 2
-	note C#, 2
-	note E_, 4
-	note A_, 2
-	note C#, 2
-	note E_, 2
+	A_ 2
+	E_ 2
+	C# 2
+	E_ 4
+	A_ 2
+	C# 2
+	E_ 2
 	endchannel
 
 
@@ -272,132 +272,132 @@ Music_Cities1_Ch2:: ; ab92 (2:6b92)
 	vibrato 5, 1, 5
 	callchannel Music_Cities1_branch_ac00
 	octave 4
-	note G#, 2
+	G# 2
 	notetype 12, 12, 4
-	note E_, 6
+	E_ 6
 	notetype 12, 12, 5
 	duty 3
 	octave 3
-	note C#, 4
-	note D#, 4
-	note E_, 6
-	note F#, 6
-	note G#, 4
+	C# 4
+	D# 4
+	E_ 6
+	F# 6
+	G# 4
 	callchannel Music_Cities1_branch_ac00
 	octave 4
-	note G#, 2
+	G# 2
 	notetype 12, 12, 4
-	note E_, 14
+	E_ 14
 	duty 3
 	octave 3
-	note E_, 6
-	note F#, 6
-	note G#, 4
+	E_ 6
+	F# 6
+	G# 4
 	notetype 12, 11, 7
 	duty 2
 	vibrato 8, 1, 7
 	octave 5
-	note C#, 12
+	C# 12
 	octave 4
-	note A_, 4
+	A_ 4
 	octave 5
-	note E_, 8
-	note F#, 2
-	note E_, 2
-	note D#, 2
-	note C#, 2
+	E_ 8
+	F# 2
+	E_ 2
+	D# 2
+	C# 2
 	octave 4
-	note B_, 12
-	note G#, 4
-	note B_, 16
-	note F#, 12
-	note G#, 2
-	note A_, 2
-	note B_, 4
-	note A_, 4
-	note G#, 4
-	note F#, 4
-	note G#, 12
-	note E_, 4
-	note B_, 16
+	B_ 12
+	G# 4
+	B_ 16
+	F# 12
+	G# 2
+	A_ 2
+	B_ 4
+	A_ 4
+	G# 4
+	F# 4
+	G# 12
+	E_ 4
+	B_ 16
 	octave 5
-	note C#, 12
-	note D#, 2
-	note E_, 2
-	note F#, 4
-	note E_, 4
-	note D#, 4
-	note C#, 4
+	C# 12
+	D# 2
+	E_ 2
+	F# 4
+	E_ 4
+	D# 4
+	C# 4
 	octave 4
-	note B_, 12
+	B_ 12
 	octave 5
-	note C#, 2
-	note D#, 2
-	note C#, 4
+	C# 2
+	D# 2
+	C# 4
 	octave 4
-	note B_, 4
-	note A_, 4
-	note G#, 4
-	note A_, 12
-	note B_, 2
+	B_ 4
+	A_ 4
+	G# 4
+	A_ 12
+	B_ 2
 	octave 5
-	note C_, 2
-	note C_, 4
+	C_ 2
+	C_ 4
 	octave 4
-	note B_, 4
-	note A_, 4
-	note F#, 4
+	B_ 4
+	A_ 4
+	F# 4
 	notetype 12, 11, 7
-	note A_, 8
+	A_ 8
 	octave 5
-	note C_, 8
+	C_ 8
 	octave 4
-	note B_, 14
+	B_ 14
 	notetype 12, 8, 4
-	note G#, 1
+	G# 1
 	notetype 12, 10, 4
-	note A_, 1
+	A_ 1
 	loopchannel 0, Music_Cities1_Ch2
 
 Music_Cities1_branch_ac00::
 	duty 2
 	notetype 12, 12, 3
 	octave 4
-	note B_, 4
-	note A_, 4
+	B_ 4
+	A_ 4
 	notetype 12, 12, 4
-	note G#, 10
+	G# 10
 	notetype 12, 12, 3
-	note G#, 2
-	note A_, 2
-	note B_, 4
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 2
+	G# 2
+	A_ 2
+	B_ 4
+	B_ 2
+	A_ 2
+	G# 2
+	A_ 2
 	notetype 12, 12, 4
-	note F#, 10
+	F# 10
 	notetype 12, 12, 5
 	duty 3
 	octave 3
-	note E_, 4
-	note D#, 8
-	note E_, 4
-	note F#, 4
+	E_ 4
+	D# 8
+	E_ 4
+	F# 4
 	notetype 12, 12, 3
 	duty 2
 	octave 4
-	note A_, 4
-	note G#, 4
+	A_ 4
+	G# 4
 	notetype 12, 12, 4
-	note F#, 10
+	F# 10
 	notetype 12, 12, 3
-	note F#, 2
-	note G#, 2
-	note A_, 4
-	note A_, 2
-	note G#, 2
-	note F#, 2
+	F# 2
+	G# 2
+	A_ 4
+	A_ 2
+	G# 2
+	F# 2
 	endchannel
 
 
@@ -411,171 +411,171 @@ Music_Cities1_branch_ac35::
 	callchannel Music_Cities1_branch_acc5
 	callchannel Music_Cities1_branch_acc5
 	callchannel Music_Cities1_branch_acce
-	note G#, 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
+	G# 2
+	E_ 2
+	F# 2
+	G# 2
 	rest 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
+	E_ 2
+	F# 2
+	G# 2
 	callchannel Music_Cities1_branch_acc5
-	note B_, 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
+	B_ 2
+	E_ 2
+	F# 2
+	G# 2
 	rest 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
+	E_ 2
+	F# 2
+	G# 2
 	callchannel Music_Cities1_branch_acc5
 	callchannel Music_Cities1_branch_acce
-	note G#, 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
+	G# 2
+	E_ 2
+	F# 2
+	G# 2
 	rest 2
-	note G#, 2
-	note E_, 2
-	note B_, 2
+	G# 2
+	E_ 2
+	B_ 2
 	rest 2
-	note E_, 2
-	note F#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
+	E_ 2
+	F# 2
+	E_ 2
+	G# 2
+	E_ 2
+	B_ 2
+	E_ 2
 	vibrato 8, 2, 5
-	note A_, 8
-	note E_, 8
-	note A_, 8
-	note F#, 8
-	note G#, 8
-	note E_, 8
-	note G#, 12
-	note E_, 4
-	note F#, 2
-	note F#, 2
-	note D#, 2
-	note E_, 4
-	note F#, 2
-	note D#, 2
-	note E_, 2
-	note F#, 2
-	note F#, 2
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
+	A_ 8
+	E_ 8
+	A_ 8
+	F# 8
+	G# 8
+	E_ 8
+	G# 12
+	E_ 4
+	F# 2
+	F# 2
+	D# 2
+	E_ 4
+	F# 2
+	D# 2
+	E_ 2
+	F# 2
+	F# 2
+	B_ 2
+	A_ 2
+	G# 2
+	A_ 2
+	G# 2
+	F# 2
+	G# 2
+	G# 2
+	E_ 2
+	G# 2
 	rest 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
+	E_ 2
+	F# 2
+	G# 2
 	rest 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note A_, 8
-	note E_, 8
-	note A_, 8
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note G#, 8
-	note E_, 8
-	note B_, 4
-	note E_, 4
-	note F#, 4
-	note G#, 4
+	E_ 2
+	F# 2
+	G# 2
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	A_ 8
+	E_ 8
+	A_ 8
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	G# 8
+	E_ 8
+	B_ 4
+	E_ 4
+	F# 4
+	G# 4
 	rest 2
-	note D#, 2
-	note E_, 2
-	note F#, 2
+	D# 2
+	E_ 2
+	F# 2
 	rest 2
-	note F#, 2
-	note B_, 2
-	note A_, 2
-	note A_, 4
-	note G#, 4
-	note F#, 2
-	note D#, 2
-	note A_, 2
-	note F#, 2
+	F# 2
+	B_ 2
+	A_ 2
+	A_ 4
+	G# 4
+	F# 2
+	D# 2
+	A_ 2
+	F# 2
 	rest 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
+	E_ 2
+	F# 2
+	G# 2
 	rest 2
-	note E_, 2
-	note F#, 1
-	note G#, 1
-	note E_, 1
-	note F#, 1
-	note G#, 4
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
+	E_ 2
+	F# 1
+	G# 1
+	E_ 1
+	F# 1
+	G# 4
+	B_ 2
+	A_ 2
+	G# 2
+	A_ 2
+	G# 2
+	F# 2
 	loopchannel 0, Music_Cities1_branch_ac35
 
 Music_Cities1_branch_acc5::
 	rest 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
+	E_ 2
+	F# 2
+	G# 2
 	rest 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
+	E_ 2
+	F# 2
+	G# 2
 	endchannel
 
 Music_Cities1_branch_acce::
-	note A_, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
+	A_ 2
+	F# 2
+	G# 2
+	A_ 2
 	rest 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
+	A_ 2
+	G# 2
+	F# 2
 	rest 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
+	F# 2
+	G# 2
+	A_ 2
 	rest 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note D#, 2
-	note D#, 2
-	note E_, 2
-	note F#, 2
+	A_ 2
+	G# 2
+	F# 2
+	D# 2
+	D# 2
+	E_ 2
+	F# 2
 	rest 2
-	note D#, 2
-	note E_, 2
-	note F#, 2
+	D# 2
+	E_ 2
+	F# 2
 	rest 2
-	note D#, 2
-	note E_, 2
-	note F#, 2
+	D# 2
+	E_ 2
+	F# 2
 	rest 2
-	note D#, 2
-	note E_, 2
-	note F#, 2
+	D# 2
+	E_ 2
+	F# 2
 	endchannel
 
 
@@ -591,68 +591,68 @@ Music_Cities1_branch_acf3::
 	callchannel Music_Cities1_branch_ad36
 	callchannel Music_Cities1_branch_ad5f
 	callchannel Music_Cities1_branch_ad52
-	dnote 6, triangle1
-	dnote 6, triangle1
-	dnote 4, triangle2
+	triangle1 6
+	triangle1 6
+	triangle2 4
 	callchannel Music_Cities1_branch_ad6e
 	callchannel Music_Cities1_branch_ad5f
 	callchannel Music_Cities1_branch_ad52
 	callchannel Music_Cities1_branch_ad6e
 	callchannel Music_Cities1_branch_ad52
-	dnote 6, triangle1
-	dnote 6, triangle1
-	dnote 2, triangle2
-	dnote 2, triangle1
-	dnote 6, triangle1
-	dnote 6, triangle1
-	dnote 4, triangle1
-	dnote 6, triangle1
-	dnote 6, snare6
-	dnote 4, snare6
+	triangle1 6
+	triangle1 6
+	triangle2 2
+	triangle1 2
+	triangle1 6
+	triangle1 6
+	triangle1 4
+	triangle1 6
+	snare6 6
+	snare6 4
 	loopchannel 0, Music_Cities1_Ch4
 
 Music_Cities1_branch_ad36::
-	dnote 6, snare6
-	dnote 6, snare6
-	dnote 4, snare6
-	dnote 6, snare6
-	dnote 6, snare6
-	dnote 2, snare6
-	dnote 2, snare6
+	snare6 6
+	snare6 6
+	snare6 4
+	snare6 6
+	snare6 6
+	snare6 2
+	snare6 2
 	endchannel
 
 Music_Cities1_branch_ad45::
-	dnote 6, snare6
-	dnote 6, snare6
-	dnote 4, snare6
-	dnote 6, snare6
-	dnote 6, snare6
-	dnote 4, snare6
+	snare6 6
+	snare6 6
+	snare6 4
+	snare6 6
+	snare6 6
+	snare6 4
 	endchannel
 
 Music_Cities1_branch_ad52::
-	dnote 6, triangle1
-	dnote 6, triangle1
-	dnote 4, triangle2
-	dnote 6, triangle1
-	dnote 6, triangle1
-	dnote 4, triangle2
+	triangle1 6
+	triangle1 6
+	triangle2 4
+	triangle1 6
+	triangle1 6
+	triangle2 4
 	endchannel
 
 Music_Cities1_branch_ad5f::
-	dnote 6, triangle1
-	dnote 6, triangle1
-	dnote 4, triangle2
-	dnote 6, triangle1
-	dnote 6, triangle1
-	dnote 2, triangle2
-	dnote 2, triangle1
+	triangle1 6
+	triangle1 6
+	triangle2 4
+	triangle1 6
+	triangle1 6
+	triangle2 2
+	triangle1 2
 	endchannel
 
 Music_Cities1_branch_ad6e::
-	dnote 6, triangle1
-	dnote 6, triangle1
-	dnote 2, triangle2
-	dnote 2, triangle2
+	triangle1 6
+	triangle1 6
+	triangle2 2
+	triangle2 2
 	endchannel
-; 0xad77
\ No newline at end of file
+; 0xad77
diff --git a/audio/music/cities2.asm b/audio/music/cities2.asm
index 3f5f8c28..34297e68 100644
--- a/audio/music/cities2.asm
+++ b/audio/music/cities2.asm
@@ -7,89 +7,89 @@ Music_Cities2_Ch1:: ; b504 (2:7504)
 	notetype 12, 11, 6
 	rest 8
 	octave 3
-	note E_, 2
-	note D#, 2
-	note C#, 2
-	note C_, 2
+	E_ 2
+	D# 2
+	C# 2
+	C_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	rest 14
 
 Music_Cities2_branch_b51a::
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note C#, 2
-	note D#, 1
-	note D_, 1
-	note C#, 4
+	C# 2
+	D# 1
+	D_ 1
+	C# 4
 	octave 3
-	note B_, 4
-	note G#, 8
-	note E_, 8
-	note A_, 4
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
-	note B_, 2
+	B_ 4
+	G# 8
+	E_ 8
+	A_ 4
+	G# 2
+	F# 2
+	G# 2
+	A_ 2
+	B_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	rest 16
-	note C#, 4
+	C# 4
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 1
-	note D#, 1
-	note C#, 4
+	C# 1
+	D# 1
+	C# 4
 	octave 3
-	note B_, 4
-	note E_, 1
-	note E_, 1
-	note E_, 1
-	note E_, 1
-	note E_, 1
+	B_ 4
+	E_ 1
+	E_ 1
+	E_ 1
+	E_ 1
+	E_ 1
 	rest 3
-	note G#, 8
-	note B_, 4
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
-	note B_, 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
+	G# 8
+	B_ 4
+	A_ 2
+	G# 2
+	F# 2
+	G# 2
+	A_ 2
+	B_ 2
+	E_ 2
+	F# 2
+	G# 2
 	rest 2
 	octave 4
-	note E_, 4
+	E_ 4
 	octave 3
-	note B_, 4
-	note F#, 2
-	note G#, 2
-	note A_, 2
+	B_ 4
+	F# 2
+	G# 2
+	A_ 2
 	rest 2
 	octave 4
-	note F#, 4
-	note D#, 4
+	F# 4
+	D# 4
 	octave 3
-	note E_, 2
+	E_ 2
 	rest 4
-	note F#, 2
+	F# 2
 	rest 4
-	note A_, 2
+	A_ 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 16
 	rest 16
 	rest 14
-	note E_, 16
-	note F#, 8
-	note G#, 4
-	note F#, 4
-	note E_, 2
+	E_ 16
+	F# 8
+	G# 4
+	F# 4
+	E_ 2
 	rest 14
 	loopchannel 0, Music_Cities2_branch_b51a
 
@@ -99,184 +99,184 @@ Music_Cities2_Ch2:: ; b569 (2:7569)
 	vibrato 8, 2, 3
 	notetype 12, 12, 2
 	octave 4
-	note E_, 2
-	note D#, 2
-	note C#, 2
+	E_ 2
+	D# 2
+	C# 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note B_, 2
+	B_ 2
+	A_ 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D#, 2
-	note E_, 6
+	C# 2
+	D# 2
+	E_ 6
 	notetype 12, 12, 2
 	duty 2
 	octave 4
-	note E_, 1
+	E_ 1
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C#, 2
-	note D#, 2
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note A_, 1
+	C# 2
+	D# 2
+	E_ 1
+	F# 1
+	G# 1
+	A_ 1
 
 Music_Cities2_branch_b58b::
 	notetype 12, 10, 6
-	note G#, 6
+	G# 6
 	notetype 12, 12, 2
-	note A_, 1
-	note G#, 1
+	A_ 1
+	G# 1
 	notetype 12, 12, 4
-	note F#, 14
+	F# 14
 	notetype 12, 12, 2
-	note E_, 1
+	E_ 1
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C#, 2
-	note D#, 2
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note A_, 1
+	C# 2
+	D# 2
+	E_ 1
+	F# 1
+	G# 1
+	A_ 1
 	notetype 12, 12, 4
-	note G#, 6
+	G# 6
 	notetype 12, 12, 2
-	note E_, 1
-	note G#, 1
+	E_ 1
+	G# 1
 	notetype 12, 12, 5
-	note B_, 14
+	B_ 14
 	notetype 12, 12, 2
-	note E_, 1
+	E_ 1
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C#, 2
-	note D#, 2
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note A_, 1
+	C# 2
+	D# 2
+	E_ 1
+	F# 1
+	G# 1
+	A_ 1
 	notetype 12, 10, 6
-	note G#, 6
+	G# 6
 	notetype 12, 12, 2
-	note A_, 1
-	note G#, 1
+	A_ 1
+	G# 1
 	notetype 12, 12, 4
-	note F#, 8
+	F# 8
 	notetype 12, 10, 1
 	duty 1
 	octave 3
-	note G#, 1
-	note G#, 1
-	note G#, 1
-	note G#, 1
-	note G#, 1
+	G# 1
+	G# 1
+	G# 1
+	G# 1
+	G# 1
 	rest 1
 	notetype 12, 12, 2
 	duty 2
 	octave 4
-	note E_, 1
+	E_ 1
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C#, 2
-	note D#, 2
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note A_, 1
+	C# 2
+	D# 2
+	E_ 1
+	F# 1
+	G# 1
+	A_ 1
 	notetype 12, 12, 4
-	note G#, 6
-	note E_, 1
-	note G#, 1
+	G# 6
+	E_ 1
+	G# 1
 	notetype 12, 12, 6
-	note B_, 8
+	B_ 8
 	notetype 12, 12, 2
-	note C#, 1
+	C# 1
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C#, 1
-	note D#, 1
-	note E_, 4
+	C# 1
+	D# 1
+	E_ 4
 	notetype 12, 12, 7
-	note G#, 4
-	note E_, 4
+	G# 4
+	E_ 4
 	notetype 12, 12, 2
-	note D#, 1
-	note C#, 1
-	note D#, 1
-	note E_, 1
-	note F#, 4
+	D# 1
+	C# 1
+	D# 1
+	E_ 1
+	F# 4
 	notetype 12, 12, 7
-	note B_, 4
-	note F#, 4
+	B_ 4
+	F# 4
 	notetype 12, 12, 2
-	note C#, 1
+	C# 1
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C#, 1
-	note D#, 1
-	note E_, 2
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note F#, 1
-	note G#, 2
-	note G#, 1
-	note A_, 1
-	note G#, 1
-	note A_, 1
-	note B_, 1
-	note F#, 1
-	note D#, 1
-	note C#, 1
+	C# 1
+	D# 1
+	E_ 2
+	E_ 1
+	D# 1
+	E_ 1
+	F# 1
+	G# 2
+	G# 1
+	A_ 1
+	G# 1
+	A_ 1
+	B_ 1
+	F# 1
+	D# 1
+	C# 1
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C#, 1
-	note D#, 1
-	note F#, 1
+	C# 1
+	D# 1
+	F# 1
 	notetype 12, 12, 2
-	note B_, 8
+	B_ 8
 	notetype 12, 11, 7
 	octave 3
-	note E_, 8
+	E_ 8
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note F#, 4
-	note G#, 4
-	note A_, 4
-	note B_, 8
-	note B_, 8
-	note G#, 4
+	F# 4
+	G# 4
+	A_ 4
+	B_ 8
+	B_ 8
+	G# 4
 	octave 4
-	note D#, 4
-	note C#, 4
-	note D#, 4
-	note E_, 2
-	note D#, 2
-	note C#, 2
-	note D#, 2
+	D# 4
+	C# 4
+	D# 4
+	E_ 2
+	D# 2
+	C# 2
+	D# 2
 	notetype 12, 12, 2
-	note E_, 6
-	note E_, 1
+	E_ 6
+	E_ 1
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C#, 2
-	note D#, 2
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note A_, 1
+	C# 2
+	D# 2
+	E_ 1
+	F# 1
+	G# 1
+	A_ 1
 	loopchannel 0, Music_Cities2_branch_b58b
 
 
@@ -284,134 +284,134 @@ Music_Cities2_Ch3:: ; b640 (2:7640)
 	notetype 12, 1, 1
 	rest 16
 	octave 4
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
 
 Music_Cities2_branch_b64c::
-	note F#, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note F#, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note F#, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note F#, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
+	F# 2
+	A_ 2
+	F# 2
+	A_ 2
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	F# 2
+	A_ 2
+	F# 2
+	A_ 2
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	F# 2
+	A_ 2
+	F# 2
+	A_ 2
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	F# 2
+	A_ 2
+	F# 2
+	A_ 2
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	G# 2
+	E_ 2
 	rest 2
-	note E_, 4
-	note G#, 4
-	note F#, 2
-	note A_, 2
-	note F#, 2
+	E_ 4
+	G# 4
+	F# 2
+	A_ 2
+	F# 2
 	rest 2
-	note F#, 4
-	note A_, 4
-	note C#, 2
+	F# 4
+	A_ 4
+	C# 2
 	rest 4
-	note E_, 2
+	E_ 2
 	rest 4
-	note G#, 2
-	note A_, 2
-	note B_, 2
+	G# 2
+	A_ 2
+	B_ 2
 	rest 8
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note F#, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note F#, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	F# 2
+	A_ 2
+	F# 2
+	A_ 2
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	F# 2
+	A_ 2
+	F# 2
+	A_ 2
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
 	loopchannel 0, Music_Cities2_branch_b64c
-; 0xb6c7
\ No newline at end of file
+; 0xb6c7
diff --git a/audio/music/credits.asm b/audio/music/credits.asm
index e057730d..4c3fa487 100644
--- a/audio/music/credits.asm
+++ b/audio/music/credits.asm
@@ -6,281 +6,281 @@ Music_Credits_Ch1:: ; 7fc1f (1f:7c1f)
 	toggleperfectpitch
 	notetype 12, 11, 5
 	octave 4
-	note E_, 6
+	E_ 6
 	octave 3
-	note A_, 1
+	A_ 1
 	octave 4
-	note E_, 1
-	note D_, 6
+	E_ 1
+	D_ 6
 	octave 3
-	note G_, 1
+	G_ 1
 	octave 4
-	note D_, 1
-	note C#, 6
+	D_ 1
+	C# 6
 	octave 3
-	note F#, 1
-	octave 4
-	note C#, 1
-	note D_, 4
-	note E_, 2
-	note C#, 1
-	note E_, 1
-	note C#, 1
+	F# 1
+	octave 4
+	C# 1
+	D_ 4
+	E_ 2
+	C# 1
+	E_ 1
+	C# 1
 	rest 1
 	octave 3
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note E_, 1
-	note E_, 1
-	note F#, 1
-	note G_, 1
+	E_ 1
+	E_ 1
+	F# 1
+	G_ 1
 	notetype 12, 11, 6
-	note A_, 4
-	note E_, 2
-	note A_, 2
-	note G_, 4
-	note A_, 2
-	note G_, 2
-	note B_, 4
-	note A_, 4
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note D_, 2
-	note C#, 6
-	note E_, 2
-	note A_, 4
-	note C#, 4
-	note E_, 4
-	note D_, 2
-	note C#, 2
-	note E_, 2
-	note F#, 2
-	note G_, 2
-	note F#, 2
-	note A_, 4
-	note E_, 2
-	note A_, 2
-	note G_, 4
-	note A_, 2
-	note G_, 2
-	note B_, 4
-	note A_, 4
-	note G_, 2
-	note A_, 2
-	note F#, 2
-	note D_, 2
-	note E_, 6
-	note C#, 2
-	note A_, 4
-	note C#, 4
-	note E_, 4
-	note D_, 2
-	note C#, 2
-	note E_, 2
-	note F#, 2
-	note G_, 2
-	note F#, 2
-	note G_, 4
-	note D_, 2
-	note G_, 2
-	note B_, 2
-	note A_, 2
-	note G_, 2
-	note A_, 2
-	note D_, 4
-	note E_, 2
-	note F#, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note D_, 2
-	note E_, 6
-	note A_, 2
-	note G_, 4
-	note F#, 4
-	note G_, 4
-	note F#, 4
-	note E_, 4
-	note D_, 4
-	note G_, 4
-	note D_, 2
-	note G_, 2
-	note B_, 2
-	octave 4
-	note C#, 2
+	A_ 4
+	E_ 2
+	A_ 2
+	G_ 4
+	A_ 2
+	G_ 2
+	B_ 4
+	A_ 4
+	G_ 2
+	F# 2
+	E_ 2
+	D_ 2
+	C# 6
+	E_ 2
+	A_ 4
+	C# 4
+	E_ 4
+	D_ 2
+	C# 2
+	E_ 2
+	F# 2
+	G_ 2
+	F# 2
+	A_ 4
+	E_ 2
+	A_ 2
+	G_ 4
+	A_ 2
+	G_ 2
+	B_ 4
+	A_ 4
+	G_ 2
+	A_ 2
+	F# 2
+	D_ 2
+	E_ 6
+	C# 2
+	A_ 4
+	C# 4
+	E_ 4
+	D_ 2
+	C# 2
+	E_ 2
+	F# 2
+	G_ 2
+	F# 2
+	G_ 4
+	D_ 2
+	G_ 2
+	B_ 2
+	A_ 2
+	G_ 2
+	A_ 2
+	D_ 4
+	E_ 2
+	F# 2
+	G_ 2
+	F# 2
+	E_ 2
+	D_ 2
+	E_ 6
+	A_ 2
+	G_ 4
+	F# 4
+	G_ 4
+	F# 4
+	E_ 4
+	D_ 4
+	G_ 4
+	D_ 2
+	G_ 2
+	B_ 2
+	octave 4
+	C# 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note D_, 4
-	note E_, 2
-	note F#, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note D_, 2
+	B_ 2
+	A_ 2
+	D_ 4
+	E_ 2
+	F# 2
+	G_ 2
+	F# 2
+	E_ 2
+	D_ 2
 	notetype 12, 11, 7
-	note E_, 6
-	note A_, 2
-	note G_, 4
-	note F#, 4
+	E_ 6
+	A_ 2
+	G_ 4
+	F# 4
 	notetype 12, 12, 7
-	note A_, 4
-	note B_, 4
+	A_ 4
+	B_ 4
 	octave 4
-	note C#, 4
-	note D_, 4
+	C# 4
+	D_ 4
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note F#, 2
-	note G_, 2
-	note A_, 2
+	B_ 2
+	A_ 2
+	G_ 2
+	F# 2
+	E_ 2
+	F# 2
+	G_ 2
+	A_ 2
 	notetype 12, 9, 0
-	note G_, 8
-	note F#, 8
-	note E_, 8
-	note D_, 8
+	G_ 8
+	F# 8
+	E_ 8
+	D_ 8
 	rest 16
 	rest 16
 	rest 8
 	notetype 12, 11, 6
-	note E_, 6
-	note D#, 1
-	note D_, 1
+	E_ 6
+	D# 1
+	D_ 1
 	notetype 12, 10, 0
-	note C#, 8
+	C# 8
 	notetype 12, 10, 7
-	note C#, 8
+	C# 8
 	rest 16
 	rest 16
 	rest 8
-	note E_, 6
-	note C#, 1
-	note E_, 1
+	E_ 6
+	C# 1
+	E_ 1
 	notetype 12, 10, 0
-	note A_, 8
+	A_ 8
 	notetype 12, 10, 7
-	note A_, 8
+	A_ 8
 	notetype 12, 11, 6
-	note G_, 6
-	note D_, 4
-	note G_, 2
-	note B_, 4
+	G_ 6
+	D_ 4
+	G_ 2
+	B_ 4
 	notetype 12, 11, 7
-	note G_, 8
-	note F#, 4
-	note G#, 4
+	G_ 8
+	F# 4
+	G# 4
 	notetype 12, 9, 0
-	note A_, 8
-	note F#, 8
-	note E_, 8
-	note C#, 8
+	A_ 8
+	F# 8
+	E_ 8
+	C# 8
 	notetype 12, 11, 7
-	note D_, 8
-	note C#, 8
+	D_ 8
+	C# 8
 	octave 2
-	note B_, 8
+	B_ 8
 	octave 3
-	note D_, 8
+	D_ 8
 	notetype 12, 9, 0
-	note E_, 8
-	note D_, 8
-	note F#, 8
-	note E_, 8
+	E_ 8
+	D_ 8
+	F# 8
+	E_ 8
 	notetype 12, 10, 0
-	note D_, 8
-	note E_, 8
-	note D_, 8
-	note C_, 8
-	note G_, 8
-	note F_, 8
-	note E_, 8
-	note D_, 8
+	D_ 8
+	E_ 8
+	D_ 8
+	C_ 8
+	G_ 8
+	F_ 8
+	E_ 8
+	D_ 8
 	notetype 12, 10, 0
-	note C#, 6
+	C# 6
 	notetype 12, 10, 7
-	note C#, 6
+	C# 6
 	notetype 12, 11, 7
-	note D_, 4
-	note E_, 8
-	note G_, 6
-	note F#, 1
-	note F_, 1
+	D_ 4
+	E_ 8
+	G_ 6
+	F# 1
+	F_ 1
 	notetype 12, 10, 0
-	note E_, 6
+	E_ 6
 	notetype 12, 10, 7
-	note E_, 6
+	E_ 6
 	notetype 12, 11, 7
-	note D_, 4
+	D_ 4
 	notetype 12, 10, 0
-	note C#, 8
+	C# 8
 	notetype 12, 10, 7
-	note C#, 8
+	C# 8
 	notetype 12, 11, 7
-	note E_, 6
-	note D_, 2
-	note G_, 4
-	note F#, 4
-	note E_, 4
-	note F#, 4
-	note E_, 4
-	note D_, 4
-	note E_, 4
-	note D_, 4
-	note C#, 4
-	note D_, 4
-	note C#, 4
-	note C#, 4
-	note E_, 4
-	note F#, 4
+	E_ 6
+	D_ 2
+	G_ 4
+	F# 4
+	E_ 4
+	F# 4
+	E_ 4
+	D_ 4
+	E_ 4
+	D_ 4
+	C# 4
+	D_ 4
+	C# 4
+	C# 4
+	E_ 4
+	F# 4
 	notetype 12, 10, 0
-	note E_, 6
+	E_ 6
 	notetype 12, 11, 7
-	note D_, 2
-	note G_, 4
-	note F#, 4
-	note E_, 4
-	note F#, 4
-	note A_, 4
-	note B_, 4
+	D_ 2
+	G_ 4
+	F# 4
+	E_ 4
+	F# 4
+	A_ 4
+	B_ 4
 	notetype 12, 10, 0
 	octave 4
-	note C#, 16
-	note C#, 8
+	C# 16
+	C# 8
 	notetype 12, 10, 7
-	note C#, 8
+	C# 8
 	notetype 12, 11, 5
 	octave 3
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 3
-	note A_, 1
-	note A_, 1
+	A_ 1
+	A_ 1
 	notetype 12, 11, 1
-	note A_, 8
+	A_ 8
 	endchannel
 
 
@@ -289,326 +289,326 @@ Music_Credits_Ch2:: ; 7fd5f (1f:7d5f)
 	vibrato 10, 2, 5
 	notetype 12, 12, 5
 	octave 4
-	note A_, 6
-	note E_, 1
-	note A_, 1
-	note G_, 6
-	note D_, 1
-	note G_, 1
+	A_ 6
+	E_ 1
+	A_ 1
+	G_ 6
+	D_ 1
+	G_ 1
 	notetype 12, 12, 7
-	note F#, 12
-	note G#, 2
-	note E_, 1
-	note G#, 1
+	F# 12
+	G# 2
+	E_ 1
+	G# 1
 	notetype 12, 12, 2
-	note A_, 2
+	A_ 2
 	notetype 12, 12, 1
 	octave 3
-	note A_, 4
-	note A_, 1
-	note A_, 1
-	note A_, 2
-	note A_, 2
-	note A_, 4
-	note A_, 2
-	note A_, 4
-	note A_, 1
-	note A_, 1
-	note A_, 2
-	note A_, 2
+	A_ 4
+	A_ 1
+	A_ 1
+	A_ 2
+	A_ 2
+	A_ 4
+	A_ 2
+	A_ 4
+	A_ 1
+	A_ 1
+	A_ 2
+	A_ 2
 	notetype 12, 12, 4
-	note A_, 1
-	note F#, 1
-	note A_, 1
-	note B_, 1
+	A_ 1
+	F# 1
+	A_ 1
+	B_ 1
 	notetype 12, 12, 7
 	octave 4
-	note C#, 6
-	note C#, 1
-	note D_, 1
-	note E_, 4
-	note C#, 4
-	note G_, 4
-	note F#, 4
-	note E_, 4
-	note D_, 4
-	note C#, 6
+	C# 6
+	C# 1
+	D_ 1
+	E_ 4
+	C# 4
+	G_ 4
+	F# 4
+	E_ 4
+	D_ 4
+	C# 6
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 8
+	E_ 8
 	octave 3
-	note A_, 6
-	note E_, 2
-	octave 4
-	note C#, 8
-	note C#, 6
-	note C#, 1
-	note D_, 1
-	note E_, 4
-	note C#, 4
-	note G_, 4
-	note F#, 4
-	note E_, 4
-	note D_, 4
-	note C#, 6
+	A_ 6
+	E_ 2
+	octave 4
+	C# 8
+	C# 6
+	C# 1
+	D_ 1
+	E_ 4
+	C# 4
+	G_ 4
+	F# 4
+	E_ 4
+	D_ 4
+	C# 6
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 8
+	E_ 8
 	octave 3
-	note A_, 6
-	note E_, 2
+	A_ 6
+	E_ 2
 	notetype 12, 11, 0
 	octave 4
-	note C#, 8
+	C# 8
 	notetype 12, 12, 7
-	note D_, 6
+	D_ 6
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note G_, 8
+	G_ 8
 	octave 3
-	note G_, 6
-	note D_, 2
-	note B_, 8
+	G_ 6
+	D_ 2
+	B_ 8
 	notetype 12, 11, 0
 	octave 4
-	note C#, 6
+	C# 6
 	notetype 12, 11, 7
-	note C#, 6
-	note D_, 4
+	C# 6
+	D_ 4
 	notetype 12, 10, 0
-	note E_, 8
+	E_ 8
 	notetype 12, 10, 7
-	note E_, 8
+	E_ 8
 	notetype 12, 12, 7
-	note D_, 6
+	D_ 6
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note G_, 8
+	G_ 8
 	octave 3
-	note G_, 6
-	note D_, 2
-	note B_, 8
+	G_ 6
+	D_ 2
+	B_ 8
 	notetype 12, 11, 0
 	octave 4
-	note E_, 7
+	E_ 7
 	notetype 12, 11, 7
-	note E_, 7
+	E_ 7
 	notetype 12, 12, 3
-	note E_, 1
-	note G#, 1
+	E_ 1
+	G# 1
 	notetype 12, 11, 0
-	note A_, 8
+	A_ 8
 	notetype 12, 11, 7
-	note A_, 8
+	A_ 8
 	notetype 12, 12, 6
-	note G_, 4
-	note F#, 4
-	note E_, 4
-	note D_, 4
+	G_ 4
+	F# 4
+	E_ 4
+	D_ 4
 	notetype 12, 10, 0
-	note C#, 8
+	C# 8
 	notetype 12, 10, 7
-	note C#, 8
+	C# 8
 	notetype 12, 9, 0
 	octave 3
-	note A_, 8
+	A_ 8
 	notetype 12, 9, 7
-	note A_, 8
+	A_ 8
 	notetype 12, 11, 0
-	note E_, 8
+	E_ 8
 	notetype 12, 11, 7
-	note E_, 8
+	E_ 8
 	notetype 12, 12, 7
-	note D_, 8
-	note G_, 6
-	note F#, 1
-	note F_, 1
-	note E_, 8
+	D_ 8
+	G_ 6
+	F# 1
+	F_ 1
+	E_ 8
 	notetype 12, 11, 7
-	note G_, 6
-	note F#, 1
-	note F_, 1
+	G_ 6
+	F# 1
+	F_ 1
 	notetype 12, 11, 0
-	note E_, 8
+	E_ 8
 	notetype 12, 11, 7
-	note E_, 8
+	E_ 8
 	notetype 12, 11, 0
-	note D_, 8
+	D_ 8
 	notetype 12, 11, 7
-	note D_, 8
+	D_ 8
 	notetype 12, 12, 7
 	octave 2
-	note B_, 8
+	B_ 8
 	octave 3
-	note F#, 6
-	note D_, 1
-	note F#, 1
-	note E_, 8
-	note B_, 6
-	note G_, 1
-	note B_, 1
+	F# 6
+	D_ 1
+	F# 1
+	E_ 8
+	B_ 6
+	G_ 1
+	B_ 1
 	notetype 12, 11, 0
 	octave 4
-	note C#, 8
+	C# 8
 	notetype 12, 11, 7
-	note C#, 8
+	C# 8
 	notetype 12, 11, 0
-	note D_, 8
+	D_ 8
 	notetype 12, 11, 7
-	note D_, 8
+	D_ 8
 	notetype 12, 12, 7
 	octave 3
-	note B_, 8
+	B_ 8
 	octave 4
-	note D_, 6
+	D_ 6
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note D_, 1
+	D_ 1
 	notetype 12, 11, 0
-	note C#, 6
+	C# 6
 	notetype 12, 11, 7
-	note C#, 6
+	C# 6
 	notetype 12, 12, 7
 	octave 3
-	note B_, 4
+	B_ 4
 	notetype 12, 11, 0
-	note A_, 8
+	A_ 8
 	notetype 12, 11, 7
-	note A_, 8
+	A_ 8
 	notetype 12, 11, 0
-	note F#, 6
+	F# 6
 	notetype 12, 11, 7
-	note F#, 6
+	F# 6
 	notetype 12, 12, 7
-	note G#, 4
-	note A_, 8
-	note F#, 8
+	G# 4
+	A_ 8
+	F# 8
 	notetype 12, 11, 0
-	note G#, 6
+	G# 6
 	notetype 12, 11, 7
-	note G#, 6
+	G# 6
 	notetype 12, 12, 7
-	note A_, 4
-	note B_, 8
-	note G#, 8
+	A_ 4
+	B_ 8
+	G# 8
 	notetype 12, 11, 0
-	note A_, 6
+	A_ 6
 	notetype 12, 11, 7
-	note A_, 6
+	A_ 6
 	notetype 12, 12, 7
-	note B_, 4
+	B_ 4
 	octave 4
-	note C_, 8
+	C_ 8
 	octave 3
-	note A_, 8
+	A_ 8
 	notetype 12, 11, 0
-	note B_, 6
+	B_ 6
 	notetype 12, 11, 7
-	note B_, 6
+	B_ 6
 	notetype 12, 12, 7
 	octave 4
-	note C_, 4
+	C_ 4
 	notetype 12, 11, 0
-	note D_, 8
+	D_ 8
 	octave 3
-	note B_, 8
+	B_ 8
 	notetype 12, 11, 0
 	octave 4
-	note C#, 16
-	note C#, 8
+	C# 16
+	C# 8
 	notetype 12, 11, 7
-	note C#, 8
+	C# 8
 	notetype 12, 11, 0
 	octave 3
-	note A_, 16
-	note A_, 8
+	A_ 16
+	A_ 8
 	notetype 12, 11, 7
-	note A_, 8
+	A_ 8
 	notetype 12, 12, 7
-	note G_, 6
-	note B_, 2
+	G_ 6
+	B_ 2
 	octave 4
-	note D_, 8
+	D_ 8
 	octave 3
-	note B_, 6
+	B_ 6
 	octave 4
-	note D_, 2
-	note G_, 6
-	note F#, 1
-	note F_, 1
-	note E_, 8
+	D_ 2
+	G_ 6
+	F# 1
+	F_ 1
+	E_ 8
 	octave 3
-	note G_, 6
-	note F#, 1
-	note F_, 1
-	note E_, 8
-	note C#, 4
-	note D_, 4
-	note G_, 6
-	note B_, 2
-	octave 4
-	note D_, 8
+	G_ 6
+	F# 1
+	F_ 1
+	E_ 8
+	C# 4
+	D_ 4
+	G_ 6
+	B_ 2
+	octave 4
+	D_ 8
 	octave 3
-	note B_, 6
+	B_ 6
 	octave 4
-	note D_, 2
-	note G_, 8
+	D_ 2
+	G_ 8
 	notetype 12, 11, 0
-	note A_, 16
+	A_ 16
 	notetype 12, 10, 0
-	note A_, 8
+	A_ 8
 	notetype 12, 10, 7
-	note A_, 8
+	A_ 8
 	notetype 12, 12, 1
-	note A_, 2
-	note A_, 4
-	note A_, 1
-	note A_, 1
+	A_ 2
+	A_ 4
+	A_ 1
+	A_ 1
 	notetype 12, 12, 1
-	note A_, 8
+	A_ 8
 	endchannel
 
 
 Music_Credits_Ch3:: ; 7fec2 (1f:7ec2)
 	notetype 12, 1, 0
 	octave 5
-	note C#, 6
+	C# 6
 	octave 4
-	note A_, 1
+	A_ 1
 	octave 5
-	note C#, 1
-	note D_, 6
+	C# 1
+	D_ 6
 	octave 4
-	note B_, 1
+	B_ 1
 	octave 5
-	note D_, 1
-	note F#, 6
-	note D_, 1
-	note F#, 1
-	note A_, 4
-	note G#, 2
-	note E_, 1
-	note G#, 1
-	note A_, 1
+	D_ 1
+	F# 6
+	D_ 1
+	F# 1
+	A_ 4
+	G# 2
+	E_ 1
+	G# 1
+	A_ 1
 	rest 15
 	rest 16
 	callchannel Music_Credits_branch_7ffa4
 	callchannel Music_Credits_branch_7ffae
 	callchannel Music_Credits_branch_7ffa4
 	octave 4
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note F#, 2
-	note G_, 2
-	note A_, 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	F# 2
+	G_ 2
+	A_ 2
 	callchannel Music_Credits_branch_7ffa4
 	callchannel Music_Credits_branch_7ffae
 	callchannel Music_Credits_branch_7ffa4
@@ -617,30 +617,30 @@ Music_Credits_Ch3:: ; 7fec2 (1f:7ec2)
 	callchannel Music_Credits_branch_7ffb8
 	callchannel Music_Credits_branch_7ffc1
 	octave 4
-	note A_, 2
+	A_ 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note A_, 2
+	A_ 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note A_, 2
+	A_ 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note B_, 2
-	note A_, 2
+	B_ 2
+	A_ 2
 	callchannel Music_Credits_branch_7ffb8
 	callchannel Music_Credits_branch_7ffb8
 	callchannel Music_Credits_branch_7ffc1
 	callchannel Music_Credits_branch_7ffc1
 	octave 4
-	note G_, 4
-	note A_, 4
-	note B_, 4
+	G_ 4
+	A_ 4
+	B_ 4
 	octave 5
-	note D_, 4
+	D_ 4
 	callchannel Music_Credits_branch_7ffa4
 	callchannel Music_Credits_branch_7ffa4
 	callchannel Music_Credits_branch_7ffa4
@@ -650,53 +650,53 @@ Music_Credits_Ch3:: ; 7fec2 (1f:7ec2)
 	callchannel Music_Credits_branch_7ffae
 	callchannel Music_Credits_branch_7ffae
 	callchannel Music_Credits_branch_7ffa4
-	note E_, 4
-	note A_, 2
-	note E_, 4
-	note A_, 2
-	note E_, 2
-	note A_, 2
+	E_ 4
+	A_ 2
+	E_ 4
+	A_ 2
+	E_ 2
+	A_ 2
 	callchannel Music_Credits_branch_7ffae
 	callchannel Music_Credits_branch_7ffae
 	callchannel Music_Credits_branch_7ffa4
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	G# 2
+	A_ 2
 	callchannel Music_Credits_branch_7ffd2
 	callchannel Music_Credits_branch_7ffd2
 	callchannel Music_Credits_branch_7ffdb
 	callchannel Music_Credits_branch_7ffdb
-	note F_, 2
-	note A_, 2
-	note F_, 2
-	note A_, 2
-	note F_, 2
-	note A_, 2
-	note F_, 2
-	note A_, 2
-	note F_, 2
-	note A_, 2
-	note G_, 2
-	note F_, 2
-	note E_, 2
-	note D_, 2
-	note E_, 2
-	note F_, 2
+	F_ 2
+	A_ 2
+	F_ 2
+	A_ 2
+	F_ 2
+	A_ 2
+	F_ 2
+	A_ 2
+	F_ 2
+	A_ 2
+	G_ 2
+	F_ 2
+	E_ 2
+	D_ 2
+	E_ 2
+	F_ 2
 	callchannel Music_Credits_branch_7ffb8
 	callchannel Music_Credits_branch_7ffb8
-	note E_, 4
-	note A_, 4
-	note E_, 4
-	note A_, 4
-	note E_, 4
-	note A_, 4
-	note E_, 4
-	note A_, 4
+	E_ 4
+	A_ 4
+	E_ 4
+	A_ 4
+	E_ 4
+	A_ 4
+	E_ 4
+	A_ 4
 	callchannel Music_Credits_branch_7ffa4
 	callchannel Music_Credits_branch_7ffa4
 	callchannel Music_Credits_branch_7ffe4
@@ -707,115 +707,115 @@ Music_Credits_Ch3:: ; 7fec2 (1f:7ec2)
 	callchannel Music_Credits_branch_7ffb8
 	callchannel Music_Credits_branch_7ffed
 	callchannel Music_Credits_branch_7ffed
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 3
-	note A_, 1
-	note A_, 1
-	note A_, 1
+	A_ 1
+	A_ 1
+	A_ 1
 	rest 7
 	endchannel
 
 Music_Credits_branch_7ffa4::
 	octave 4
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
 	endchannel
 
 Music_Credits_branch_7ffae::
 	octave 4
-	note D_, 2
-	note G_, 2
-	note D_, 2
-	note G_, 2
-	note D_, 2
-	note G_, 2
-	note D_, 2
-	note G_, 2
+	D_ 2
+	G_ 2
+	D_ 2
+	G_ 2
+	D_ 2
+	G_ 2
+	D_ 2
+	G_ 2
 	endchannel
 
 Music_Credits_branch_7ffb8::
-	note G_, 2
-	note B_, 2
-	note G_, 2
-	note B_, 2
-	note G_, 2
-	note B_, 2
-	note G_, 2
-	note B_, 2
+	G_ 2
+	B_ 2
+	G_ 2
+	B_ 2
+	G_ 2
+	B_ 2
+	G_ 2
+	B_ 2
 	endchannel
 
 Music_Credits_branch_7ffc1::
 	octave 4
-	note A_, 2
+	A_ 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note A_, 2
+	A_ 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note A_, 2
+	A_ 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note A_, 2
+	A_ 2
 	octave 5
-	note C#, 2
+	C# 2
 	endchannel
 
 Music_Credits_branch_7ffd2::
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
 	endchannel
 
 Music_Credits_branch_7ffdb::
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
 	endchannel
 
 Music_Credits_branch_7ffe4::
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
 	endchannel
 
 Music_Credits_branch_7ffed::
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 3
-	note A_, 1
-	note A_, 1
-	note A_, 1
+	A_ 1
+	A_ 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 3
 	endchannel
-; 0x7fffa
\ No newline at end of file
+; 0x7fffa
diff --git a/audio/music/defeatedgymleader.asm b/audio/music/defeatedgymleader.asm
index b5bf18d9..96c2b9fc 100644
--- a/audio/music/defeatedgymleader.asm
+++ b/audio/music/defeatedgymleader.asm
@@ -7,158 +7,158 @@ Music_DefeatedGymLeader_Ch1:: ; 23cad (8:7cad)
 	tempo 112
 	notetype 12, 10, 6
 	octave 4
-	note D_, 6
+	D_ 6
 	octave 3
-	note A_, 1
+	A_ 1
 	octave 4
-	note D_, 1
-	note F#, 6
-	note D_, 1
-	note F#, 1
+	D_ 1
+	F# 6
+	D_ 1
+	F# 1
 	notetype 12, 10, 0
-	note A_, 8
+	A_ 8
 	notetype 12, 10, 7
-	note A_, 8
+	A_ 8
 
 Music_DefeatedGymLeader_branch_23ccc::
 	notetype 12, 11, 2
 	octave 3
-	note A_, 2
-	note A_, 2
-	note F#, 4
-	note G_, 2
-	note G_, 2
-	note E_, 4
-	note D_, 2
-	note E_, 2
-	note D_, 2
-	note E_, 2
-	note D_, 4
-	note D_, 4
-	note A_, 2
-	note A_, 2
-	note F#, 4
-	note G_, 2
-	note G_, 2
-	note E_, 4
-	note D_, 2
-	note E_, 2
-	note D_, 2
-	note C#, 2
+	A_ 2
+	A_ 2
+	F# 4
+	G_ 2
+	G_ 2
+	E_ 4
+	D_ 2
+	E_ 2
+	D_ 2
+	E_ 2
+	D_ 4
+	D_ 4
+	A_ 2
+	A_ 2
+	F# 4
+	G_ 2
+	G_ 2
+	E_ 4
+	D_ 2
+	E_ 2
+	D_ 2
+	C# 2
 	notetype 12, 11, 1
 	octave 2
-	note B_, 8
+	B_ 8
 	notetype 12, 11, 2
 	octave 3
-	note A_, 2
-	note A_, 2
-	note F#, 4
-	note G_, 2
-	note G_, 2
-	note E_, 4
-	note D_, 2
-	note E_, 2
-	note D_, 2
-	note E_, 2
-	note D_, 4
-	note D_, 4
-	note A_, 2
-	note A_, 2
-	note F#, 4
-	note G_, 2
-	note G_, 2
-	note E_, 4
-	note D_, 2
-	note E_, 2
-	note D_, 2
-	note C#, 2
+	A_ 2
+	A_ 2
+	F# 4
+	G_ 2
+	G_ 2
+	E_ 4
+	D_ 2
+	E_ 2
+	D_ 2
+	E_ 2
+	D_ 4
+	D_ 4
+	A_ 2
+	A_ 2
+	F# 4
+	G_ 2
+	G_ 2
+	E_ 4
+	D_ 2
+	E_ 2
+	D_ 2
+	C# 2
 	notetype 12, 11, 1
 	octave 2
-	note B_, 8
+	B_ 8
 	notetype 12, 9, 7
 	octave 3
-	note D_, 6
+	D_ 6
 	octave 2
-	note A_, 1
+	A_ 1
 	octave 3
-	note D_, 1
-	note F#, 8
+	D_ 1
+	F# 8
 	notetype 12, 11, 0
-	note F#, 6
-	note E_, 1
-	note F#, 1
-	note A_, 8
+	F# 6
+	E_ 1
+	F# 1
+	A_ 8
 	notetype 12, 9, 7
-	note E_, 6
-	note C#, 1
-	note E_, 1
-	note G#, 8
+	E_ 6
+	C# 1
+	E_ 1
+	G# 8
 	notetype 12, 11, 0
-	note G#, 6
-	note E_, 1
-	note G#, 1
-	note B_, 8
+	G# 6
+	E_ 1
+	G# 1
+	B_ 8
 	notetype 12, 9, 7
-	note C#, 6
+	C# 6
 	octave 2
-	note A_, 1
+	A_ 1
 	octave 3
-	note C#, 1
-	note E_, 8
+	C# 1
+	E_ 8
 	notetype 12, 11, 0
-	note E_, 6
-	note C#, 1
-	note E_, 1
-	note E_, 4
-	note G_, 4
+	E_ 6
+	C# 1
+	E_ 1
+	E_ 4
+	G_ 4
 	notetype 12, 9, 0
-	note F#, 8
-	note E_, 8
-	note D_, 8
-	note C#, 8
+	F# 8
+	E_ 8
+	D_ 8
+	C# 8
 	notetype 12, 9, 7
-	note D_, 6
+	D_ 6
 	octave 2
-	note A_, 1
+	A_ 1
 	octave 3
-	note D_, 1
-	note F#, 8
+	D_ 1
+	F# 8
 	notetype 12, 11, 0
-	note F#, 6
-	note E_, 1
-	note F#, 1
-	note A_, 8
+	F# 6
+	E_ 1
+	F# 1
+	A_ 8
 	notetype 12, 9, 7
-	note E_, 6
-	note C#, 1
-	note E_, 1
-	note G#, 8
+	E_ 6
+	C# 1
+	E_ 1
+	G# 8
 	notetype 12, 11, 0
-	note G#, 6
-	note E_, 1
-	note G#, 1
-	note B_, 8
+	G# 6
+	E_ 1
+	G# 1
+	B_ 8
 	notetype 12, 9, 7
-	note C#, 6
+	C# 6
 	octave 2
-	note A_, 1
+	A_ 1
 	octave 3
-	note C#, 1
-	note E_, 8
+	C# 1
+	E_ 8
 	notetype 12, 11, 0
-	note E_, 6
-	note C#, 1
-	note E_, 1
-	note E_, 4
-	note G_, 4
+	E_ 6
+	C# 1
+	E_ 1
+	E_ 4
+	G_ 4
 	notetype 12, 9, 7
-	note F#, 6
-	note E_, 1
-	note F#, 1
-	note A_, 8
+	F# 6
+	E_ 1
+	F# 1
+	A_ 8
 	notetype 12, 10, 7
-	note G_, 8
-	note E_, 8
+	G_ 8
+	E_ 8
 	loopchannel 0, Music_DefeatedGymLeader_branch_23ccc
 
 
@@ -167,188 +167,188 @@ Music_DefeatedGymLeader_Ch2:: ; 23d6d (8:7d6d)
 	vibrato 24, 2, 4
 	notetype 12, 12, 4
 	octave 4
-	note A_, 6
-	note F#, 1
-	note A_, 1
+	A_ 6
+	F# 1
+	A_ 1
 	octave 5
-	note D_, 6
+	D_ 6
 	octave 4
-	note A_, 1
+	A_ 1
 	octave 5
-	note D_, 1
+	D_ 1
 	notetype 12, 11, 0
-	note F#, 8
+	F# 8
 	notetype 12, 11, 7
-	note F#, 8
+	F# 8
 
 Music_DefeatedGymLeader_branch_23d84::
 	notetype 12, 12, 2
 	octave 4
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note B_, 2
-	note A_, 4
-	note B_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
+	B_ 2
+	A_ 4
+	B_ 2
+	A_ 2
+	G_ 2
+	F# 2
 	notetype 12, 12, 4
-	note A_, 4
-	note A_, 4
+	A_ 4
+	A_ 4
 	notetype 12, 12, 2
 	octave 4
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note B_, 2
-	note A_, 4
-	note B_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
+	B_ 2
+	A_ 4
+	B_ 2
+	A_ 2
+	G_ 2
+	F# 2
 	notetype 12, 12, 1
-	note D_, 6
+	D_ 6
 	notetype 6, 12, 2
-	note G_, 1
-	note A_, 1
-	note B_, 1
+	G_ 1
+	A_ 1
+	B_ 1
 	octave 4
-	note C#, 1
+	C# 1
 	notetype 12, 12, 2
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note B_, 2
-	note A_, 4
-	note B_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
+	B_ 2
+	A_ 4
+	B_ 2
+	A_ 2
+	G_ 2
+	F# 2
 	notetype 12, 12, 4
-	note A_, 4
-	note A_, 3
+	A_ 4
+	A_ 3
 	notetype 6, 12, 2
-	note B_, 1
+	B_ 1
 	octave 4
-	note C#, 1
+	C# 1
 	notetype 12, 12, 2
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note B_, 2
-	note A_, 4
-	note B_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
+	B_ 2
+	A_ 4
+	B_ 2
+	A_ 2
+	G_ 2
+	F# 2
 	notetype 12, 12, 1
-	note D_, 8
+	D_ 8
 	notetype 12, 12, 7
-	note A_, 6
-	note F#, 1
-	note A_, 1
+	A_ 6
+	F# 1
+	A_ 1
 	notetype 12, 11, 0
 	octave 4
-	note D_, 8
+	D_ 8
 	notetype 12, 10, 0
-	note D_, 8
+	D_ 8
 	notetype 12, 9, 7
-	note D_, 8
+	D_ 8
 	notetype 12, 12, 7
 	octave 3
-	note B_, 6
-	note G#, 1
-	note B_, 1
+	B_ 6
+	G# 1
+	B_ 1
 	notetype 12, 8, 0
 	octave 4
-	note E_, 8
+	E_ 8
 	notetype 12, 10, 0
-	note E_, 8
+	E_ 8
 	notetype 12, 12, 7
-	note E_, 8
+	E_ 8
 	octave 3
-	note G_, 6
-	note E_, 1
-	note G_, 1
+	G_ 6
+	E_ 1
+	G_ 1
 	notetype 12, 6, 15
 	octave 4
-	note C#, 8
+	C# 8
 	notetype 12, 12, 7
-	note C#, 8
-	note F#, 4
-	note E_, 4
+	C# 8
+	F# 4
+	E_ 4
 	notetype 12, 11, 0
-	note D_, 14
+	D_ 14
 	octave 3
-	note B_, 2
+	B_ 2
 	notetype 12, 10, 0
-	note A_, 8
+	A_ 8
 	notetype 12, 11, 7
-	note A_, 8
+	A_ 8
 	notetype 12, 12, 7
-	note A_, 6
-	note F#, 1
-	note A_, 1
+	A_ 6
+	F# 1
+	A_ 1
 	notetype 12, 11, 0
 	octave 4
-	note D_, 8
+	D_ 8
 	notetype 12, 10, 0
-	note D_, 8
+	D_ 8
 	notetype 12, 9, 7
-	note D_, 8
+	D_ 8
 	notetype 12, 12, 7
 	octave 3
-	note B_, 6
-	note G#, 1
-	note B_, 1
+	B_ 6
+	G# 1
+	B_ 1
 	notetype 12, 4, 15
 	octave 4
-	note E_, 8
+	E_ 8
 	notetype 12, 11, 0
-	note E_, 8
+	E_ 8
 	notetype 12, 12, 7
-	note E_, 8
+	E_ 8
 	octave 3
-	note G_, 6
-	note E_, 1
-	note G_, 1
+	G_ 6
+	E_ 1
+	G_ 1
 	notetype 12, 11, 0
 	octave 4
-	note C#, 8
+	C# 8
 	notetype 12, 11, 7
-	note C#, 8
+	C# 8
 	octave 3
-	note A_, 4
+	A_ 4
 	octave 4
-	note C#, 4
+	C# 4
 	notetype 12, 11, 0
-	note D_, 14
-	note E_, 2
-	note D_, 12
+	D_ 14
+	E_ 2
+	D_ 12
 	notetype 12, 12, 2
 	octave 3
-	note G_, 1
-	note A_, 1
-	note B_, 1
+	G_ 1
+	A_ 1
+	B_ 1
 	octave 4
-	note C#, 1
+	C# 1
 	loopchannel 0, Music_DefeatedGymLeader_branch_23d84
 
 
@@ -356,253 +356,253 @@ Music_DefeatedGymLeader_Ch3:: ; 23e52 (8:7e52)
 	notetype 12, 1, 0
 	vibrato 16, 1, 2
 	octave 4
-	note F#, 6
-	note D_, 1
-	note F#, 1
-	note A_, 6
-	note F#, 1
-	note A_, 1
+	F# 6
+	D_ 1
+	F# 1
+	A_ 6
+	F# 1
+	A_ 1
 	octave 5
-	note D_, 6
+	D_ 6
 	octave 4
-	note A_, 1
+	A_ 1
 	octave 5
-	note D_, 1
-	note F#, 8
+	D_ 1
+	F# 8
 
 Music_DefeatedGymLeader_branch_23e65::
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 3
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note F#, 3
+	F# 3
 	rest 1
-	note F#, 3
+	F# 3
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 5
-	note D_, 1
+	D_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note G_, 3
+	G_ 3
 	rest 1
-	note D_, 3
+	D_ 3
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 7
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note D#, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note C#, 2
-	note A_, 2
-	note C#, 2
-	note A_, 2
-	note C#, 2
-	note A_, 2
-	note C#, 2
-	note A_, 2
-	note C#, 2
-	note A_, 2
-	note C#, 2
-	note A_, 2
-	note C#, 2
-	note A_, 2
-	note C#, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note C#, 2
-	note D_, 2
-	note E_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note D#, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note C#, 2
-	note A_, 2
-	note C#, 2
-	note A_, 2
-	note C#, 2
-	note A_, 2
-	note C#, 2
-	note A_, 2
-	note C#, 2
-	note A_, 2
-	note C#, 2
-	note A_, 2
-	note C#, 2
-	note A_, 2
-	note C#, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note G_, 2
-	note A_, 2
-	note G_, 2
-	note E_, 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	D# 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	C# 2
+	A_ 2
+	C# 2
+	A_ 2
+	C# 2
+	A_ 2
+	C# 2
+	A_ 2
+	C# 2
+	A_ 2
+	C# 2
+	A_ 2
+	C# 2
+	A_ 2
+	C# 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	C# 2
+	D_ 2
+	E_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	D# 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	C# 2
+	A_ 2
+	C# 2
+	A_ 2
+	C# 2
+	A_ 2
+	C# 2
+	A_ 2
+	C# 2
+	A_ 2
+	C# 2
+	A_ 2
+	C# 2
+	A_ 2
+	C# 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	G_ 2
+	A_ 2
+	G_ 2
+	E_ 2
 	loopchannel 0, Music_DefeatedGymLeader_branch_23e65
-; 0x23f52
\ No newline at end of file
+; 0x23f52
diff --git a/audio/music/defeatedtrainer.asm b/audio/music/defeatedtrainer.asm
index 0f7a91dc..624190f6 100644
--- a/audio/music/defeatedtrainer.asm
+++ b/audio/music/defeatedtrainer.asm
@@ -6,92 +6,92 @@ Music_DefeatedTrainer_Ch1:: ; 23a53 (8:7a53)
 	tempo 224
 	notetype 4, 10, 2
 	octave 4
-	note D_, 2
+	D_ 2
 	tempo 224
 	notetype 4, 10, 2
-	note D_, 2
-	note D_, 2
-	note D_, 2
+	D_ 2
+	D_ 2
+	D_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note D_, 2
+	D_ 2
 	notetype 4, 11, 3
-	note F#, 12
+	F# 12
 	duty 1
 	tempo 224
 
 Music_DefeatedTrainer_branch_23a76::
 	notetype 4, 6, 3
 	octave 3
-	note A_, 6
-	note F#, 3
-	note A_, 3
-	note B_, 6
-	note G#, 3
-	note B_, 3
+	A_ 6
+	F# 3
+	A_ 3
+	B_ 6
+	G# 3
+	B_ 3
 	octave 4
-	note C#, 3
+	C# 3
 	octave 3
-	note B_, 3
-	note A_, 3
-	note G_, 3
-	note A_, 3
-	note B_, 3
-	note A_, 3
-	note G_, 3
-	note A_, 6
-	note F#, 3
-	note A_, 3
-	note B_, 6
-	note G#, 3
-	note B_, 3
+	B_ 3
+	A_ 3
+	G_ 3
+	A_ 3
+	B_ 3
+	A_ 3
+	G_ 3
+	A_ 6
+	F# 3
+	A_ 3
+	B_ 6
+	G# 3
+	B_ 3
 	octave 4
-	note C#, 3
-	note D_, 3
-	note E_, 3
-	note F#, 3
-	note C#, 3
+	C# 3
+	D_ 3
+	E_ 3
+	F# 3
+	C# 3
 	octave 3
-	note B_, 3
-	note A_, 3
+	B_ 3
+	A_ 3
 	octave 4
-	note C#, 3
+	C# 3
 	octave 3
-	note A_, 6
-	note F#, 3
-	note A_, 3
-	note B_, 6
-	note G#, 3
-	note B_, 3
+	A_ 6
+	F# 3
+	A_ 3
+	B_ 6
+	G# 3
+	B_ 3
 	octave 4
-	note C_, 6
+	C_ 6
 	octave 3
-	note A_, 3
+	A_ 3
 	octave 4
-	note C_, 3
-	note D_, 3
+	C_ 3
+	D_ 3
 	octave 3
-	note B_, 3
+	B_ 3
 	octave 4
-	note D_, 6
-	note C#, 3
+	D_ 6
+	C# 3
 	octave 3
-	note B_, 3
-	note A_, 3
-	note G_, 3
-	note F#, 3
-	note G_, 3
-	note A_, 3
-	note B_, 3
-	note A_, 3
-	note G_, 3
-	note F#, 3
-	note E_, 3
-	note F#, 3
-	note G_, 3
-	note A_, 3
-	note B_, 3
+	B_ 3
+	A_ 3
+	G_ 3
+	F# 3
+	G_ 3
+	A_ 3
+	B_ 3
+	A_ 3
+	G_ 3
+	F# 3
+	E_ 3
+	F# 3
+	G_ 3
+	A_ 3
+	B_ 3
 	loopchannel 0, Music_DefeatedTrainer_branch_23a76
 
 
@@ -99,169 +99,169 @@ Music_DefeatedTrainer_Ch2:: ; 23ac1 (8:7ac1)
 	duty 2
 	notetype 4, 12, 3
 	octave 4
-	note A_, 2
+	A_ 2
 	notetype 4, 12, 3
-	note A_, 2
-	note A_, 2
-	note A_, 2
-	note B_, 2
+	A_ 2
+	A_ 2
+	A_ 2
+	B_ 2
 	octave 5
-	note C#, 2
+	C# 2
 	notetype 4, 12, 4
-	note D_, 12
+	D_ 12
 
 Music_DefeatedTrainer_branch_23ad2::
 	notetype 4, 8, 5
 	octave 4
-	note D_, 6
+	D_ 6
 	octave 3
-	note A_, 3
+	A_ 3
 	octave 4
-	note D_, 3
-	note E_, 6
+	D_ 3
+	E_ 6
 	octave 3
-	note B_, 3
+	B_ 3
 	octave 4
-	note E_, 3
-	note F#, 3
-	note G_, 3
-	note A_, 6
-	note E_, 3
-	note F#, 3
-	note G_, 6
-	note D_, 6
+	E_ 3
+	F# 3
+	G_ 3
+	A_ 6
+	E_ 3
+	F# 3
+	G_ 6
+	D_ 6
 	octave 3
-	note A_, 3
+	A_ 3
 	octave 4
-	note D_, 3
-	note E_, 6
+	D_ 3
+	E_ 6
 	octave 3
-	note B_, 3
+	B_ 3
 	octave 4
-	note E_, 3
-	note F#, 3
-	note G_, 3
-	note A_, 6
-	note F#, 3
-	note G_, 3
-	note A_, 6
-	note D_, 6
+	E_ 3
+	F# 3
+	G_ 3
+	A_ 6
+	F# 3
+	G_ 3
+	A_ 6
+	D_ 6
 	octave 3
-	note A_, 3
+	A_ 3
 	octave 4
-	note D_, 3
-	note E_, 6
+	D_ 3
+	E_ 6
 	octave 3
-	note B_, 3
+	B_ 3
 	octave 4
-	note E_, 3
-	note F_, 6
-	note C_, 3
-	note F_, 3
-	note G_, 3
-	note D_, 3
-	note G_, 6
+	E_ 3
+	F_ 6
+	C_ 3
+	F_ 3
+	G_ 3
+	D_ 3
+	G_ 6
 	notetype 4, 7, 0
-	note F#, 12
+	F# 12
 	notetype 4, 7, 7
-	note F#, 12
+	F# 12
 	notetype 4, 6, 0
-	note E_, 12
+	E_ 12
 	notetype 4, 6, 7
-	note E_, 12
+	E_ 12
 	loopchannel 0, Music_DefeatedTrainer_branch_23ad2
 
 
 Music_DefeatedTrainer_Ch3:: ; 23b15 (8:7b15)
 	notetype 4, 1, 0
 	octave 5
-	note D_, 2
+	D_ 2
 	notetype 4, 1, 0
-	note D_, 2
-	note D_, 2
+	D_ 2
+	D_ 2
 	octave 4
-	note B_, 2
-	note A_, 2
-	note G_, 2
-	note A_, 12
+	B_ 2
+	A_ 2
+	G_ 2
+	A_ 12
 	notetype 4, 2, 1
 
 Music_DefeatedTrainer_branch_23b24::
-	note F#, 3
+	F# 3
 	rest 3
-	note F#, 3
+	F# 3
 	rest 3
-	note G#, 3
+	G# 3
 	rest 3
-	note G#, 3
+	G# 3
 	rest 3
-	note A_, 3
+	A_ 3
 	rest 3
-	note A_, 3
+	A_ 3
 	rest 3
-	note B_, 3
+	B_ 3
 	rest 3
-	note B_, 3
+	B_ 3
 	rest 3
-	note F#, 3
+	F# 3
 	rest 3
-	note F#, 3
+	F# 3
 	rest 3
-	note G#, 3
+	G# 3
 	rest 3
-	note G#, 3
+	G# 3
 	rest 3
-	note A_, 3
+	A_ 3
 	rest 3
-	note A_, 3
+	A_ 3
 	rest 3
 	octave 5
-	note C#, 3
+	C# 3
 	rest 3
-	note C#, 3
+	C# 3
 	octave 4
-	note A_, 3
-	note F#, 3
+	A_ 3
+	F# 3
 	octave 5
-	note D_, 3
+	D_ 3
 	octave 4
-	note F#, 3
+	F# 3
 	rest 3
-	note G#, 3
+	G# 3
 	octave 5
-	note E_, 3
+	E_ 3
 	octave 4
-	note G#, 3
+	G# 3
 	rest 3
-	note A_, 3
+	A_ 3
 	octave 5
-	note F_, 3
+	F_ 3
 	octave 4
-	note A_, 3
+	A_ 3
 	rest 3
-	note B_, 3
+	B_ 3
 	octave 5
-	note G_, 3
+	G_ 3
 	octave 4
-	note B_, 3
-	note A#, 3
-	note A_, 3
+	B_ 3
+	A# 3
+	A_ 3
 	rest 3
-	note A_, 3
+	A_ 3
 	rest 3
-	note A_, 3
+	A_ 3
 	rest 3
-	note A_, 3
+	A_ 3
 	octave 5
-	note C_, 3
-	note C#, 3
+	C_ 3
+	C# 3
 	rest 3
-	note C#, 3
+	C# 3
 	rest 3
-	note C#, 3
+	C# 3
 	rest 3
-	note C#, 3
+	C# 3
 	octave 4
-	note A_, 3
+	A_ 3
 	loopchannel 0, Music_DefeatedTrainer_branch_23b24
-; 0x23b74
\ No newline at end of file
+; 0x23b74
diff --git a/audio/music/defeatedwildmon.asm b/audio/music/defeatedwildmon.asm
index 6340afd3..93b4d3ff 100644
--- a/audio/music/defeatedwildmon.asm
+++ b/audio/music/defeatedwildmon.asm
@@ -8,62 +8,62 @@ Music_DefeatedWildMon_Ch1:: ; 23b74 (8:7b74)
 	tempo 112
 	notetype 12, 11, 7
 	octave 3
-	note B_, 1
-	note A_, 1
-	note G#, 1
-	note F#, 1
-	note E_, 12
+	B_ 1
+	A_ 1
+	G# 1
+	F# 1
+	E_ 12
 
 Music_DefeatedWildMon_branch_23b8b::
 	notetype 12, 6, 2
-	note E_, 2
-	note F#, 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
-	note G#, 2
-	note G#, 4
-	note A_, 2
-	note A_, 2
-	note A_, 4
-	note G#, 2
-	note G#, 2
-	note G#, 4
-	note E_, 2
-	note F#, 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
-	note G#, 2
-	note G#, 4
-	note A_, 2
-	note A_, 2
-	note A_, 4
-	note G#, 8
-	note F_, 2
-	note G_, 2
-	note F_, 2
-	note G_, 2
-	note A_, 2
-	note A_, 2
-	note A_, 4
-	note A#, 2
-	note A#, 2
-	note A#, 4
-	note A_, 2
-	note A_, 2
-	note A_, 4
-	note F_, 2
-	note G_, 2
-	note F_, 2
-	note G_, 2
-	note A_, 2
-	note A_, 2
-	note A_, 4
-	note A#, 2
-	note A#, 2
-	note A#, 4
-	note A_, 8
+	E_ 2
+	F# 2
+	E_ 2
+	F# 2
+	G# 2
+	G# 2
+	G# 4
+	A_ 2
+	A_ 2
+	A_ 4
+	G# 2
+	G# 2
+	G# 4
+	E_ 2
+	F# 2
+	E_ 2
+	F# 2
+	G# 2
+	G# 2
+	G# 4
+	A_ 2
+	A_ 2
+	A_ 4
+	G# 8
+	F_ 2
+	G_ 2
+	F_ 2
+	G_ 2
+	A_ 2
+	A_ 2
+	A_ 4
+	A# 2
+	A# 2
+	A# 4
+	A_ 2
+	A_ 2
+	A_ 4
+	F_ 2
+	G_ 2
+	F_ 2
+	G_ 2
+	A_ 2
+	A_ 2
+	A_ 4
+	A# 2
+	A# 2
+	A# 4
+	A_ 8
 	loopchannel 0, Music_DefeatedWildMon_branch_23b8b
 
 
@@ -72,73 +72,73 @@ Music_DefeatedWildMon_Ch2:: ; 23bc1 (8:7bc1)
 	duty 2
 	notetype 12, 12, 3
 	octave 4
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note A_, 1
+	E_ 1
+	F# 1
+	G# 1
+	A_ 1
 	notetype 12, 12, 7
-	note B_, 12
+	B_ 12
 
 Music_DefeatedWildMon_branch_23bce::
 	notetype 12, 8, 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 2
-	note B_, 2
-	note B_, 2
-	note B_, 4
+	B_ 2
+	A_ 2
+	G# 2
+	A_ 2
+	B_ 2
+	B_ 2
+	B_ 4
 	octave 4
-	note C#, 2
-	note C#, 2
-	note C#, 4
+	C# 2
+	C# 2
+	C# 4
 	octave 3
-	note B_, 2
-	note B_, 2
-	note B_, 4
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 2
-	note B_, 2
-	note B_, 2
-	note B_, 4
+	B_ 2
+	B_ 2
+	B_ 4
+	B_ 2
+	A_ 2
+	G# 2
+	A_ 2
+	B_ 2
+	B_ 2
+	B_ 4
 	octave 4
-	note C#, 2
-	note C#, 2
-	note C#, 4
+	C# 2
+	C# 2
+	C# 4
 	octave 3
-	note B_, 8
+	B_ 8
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note A#, 2
-	note A_, 2
-	note A#, 2
+	A# 2
+	A_ 2
+	A# 2
 	octave 4
-	note C_, 2
-	note C_, 2
-	note C_, 4
-	note D_, 2
-	note D_, 2
-	note D_, 4
-	note C_, 2
-	note C_, 2
-	note C_, 4
-	note C_, 2
+	C_ 2
+	C_ 2
+	C_ 4
+	D_ 2
+	D_ 2
+	D_ 4
+	C_ 2
+	C_ 2
+	C_ 4
+	C_ 2
 	octave 3
-	note A#, 2
-	note A_, 2
-	note A#, 2
+	A# 2
+	A_ 2
+	A# 2
 	octave 4
-	note C_, 2
-	note C_, 2
-	note C_, 4
-	note D_, 2
-	note D_, 2
-	note D_, 4
-	note C_, 8
+	C_ 2
+	C_ 2
+	C_ 4
+	D_ 2
+	D_ 2
+	D_ 4
+	C_ 8
 	loopchannel 0, Music_DefeatedWildMon_branch_23bce
 
 
@@ -146,158 +146,158 @@ Music_DefeatedWildMon_Ch3:: ; 23c0e (8:7c0e)
 	executemusic
 	notetype 12, 2, 0
 	octave 5
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 6
-	note C#, 1
+	C# 1
 	rest 1
 	octave 5
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 6
-	note D#, 1
+	D# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 3
 
 Music_DefeatedWildMon_branch_23c21::
 	octave 4
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 5
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 4
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 5
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 4
-	note E_, 1
+	E_ 1
 	rest 3
 	octave 5
-	note E_, 1
+	E_ 1
 	rest 3
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 5
-	note F#, 1
+	F# 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 1
 	octave 5
-	note D#, 1
+	D# 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 5
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 4
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 5
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 4
-	note E_, 1
+	E_ 1
 	rest 3
 	octave 5
-	note E_, 1
+	E_ 1
 	rest 3
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 5
-	note F#, 1
+	F# 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 3
 	octave 5
-	note E_, 1
+	E_ 1
 	rest 3
 	octave 4
-	note D#, 4
+	D# 4
 	octave 4
-	note F_, 1
+	F_ 1
 	rest 1
 	octave 5
-	note F_, 1
+	F_ 1
 	rest 1
 	octave 4
-	note F_, 1
+	F_ 1
 	rest 1
 	octave 5
-	note F_, 1
+	F_ 1
 	rest 1
 	octave 4
-	note F_, 1
+	F_ 1
 	rest 3
 	octave 5
-	note F_, 1
+	F_ 1
 	rest 3
 	octave 4
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 5
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 4
-	note G_, 1
+	G_ 1
 	rest 3
-	note F_, 1
+	F_ 1
 	rest 1
 	octave 5
-	note F_, 1
+	F_ 1
 	rest 1
 	octave 4
-	note F_, 1
+	F_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
 	octave 5
-	note F_, 1
+	F_ 1
 	rest 1
 	octave 4
-	note F_, 1
+	F_ 1
 	rest 1
 	octave 5
-	note F_, 1
+	F_ 1
 	rest 1
 	octave 4
-	note F_, 1
+	F_ 1
 	rest 3
 	octave 5
-	note F_, 1
+	F_ 1
 	rest 3
 	octave 4
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 5
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 4
-	note G_, 1
+	G_ 1
 	rest 3
 	octave 5
-	note F_, 1
+	F_ 1
 	rest 3
 	octave 4
-	note D#, 4
+	D# 4
 	loopchannel 0, Music_DefeatedWildMon_branch_23c21
-; 0x23cad
\ No newline at end of file
+; 0x23cad
diff --git a/audio/music/dungeon1.asm b/audio/music/dungeon1.asm
index bebb6091..e73eb707 100644
--- a/audio/music/dungeon1.asm
+++ b/audio/music/dungeon1.asm
@@ -8,7 +8,7 @@ Music_Dungeon1_Ch1:: ; 7ded1 (1f:5ed1)
 	rest 8
 	stereopanning 237
 	octave 4
-	note F#, 8
+	F# 8
 	stereopanning 255
 
 Music_Dungeon1_branch_7dee5::
@@ -18,210 +18,210 @@ Music_Dungeon1_branch_7dee5::
 Music_Dungeon1_branch_7dee8::
 	callchannel Music_Dungeon1_branch_7dfaa
 	loopchannel 3, Music_Dungeon1_branch_7dee8
-	note E_, 1
-	note D#, 1
-	note B_, 1
-	note A#, 1
-	note G_, 1
-	note G#, 1
+	E_ 1
+	D# 1
+	B_ 1
+	A# 1
+	G_ 1
+	G# 1
 	rest 1
-	note A#, 1
-	note E_, 1
-	note D#, 1
-	note B_, 1
-	note A#, 1
-	note G_, 1
-	note G#, 1
-	note A_, 1
-	note A#, 1
+	A# 1
+	E_ 1
+	D# 1
+	B_ 1
+	A# 1
+	G_ 1
+	G# 1
+	A_ 1
+	A# 1
 
 Music_Dungeon1_branch_7deff::
 	callchannel Music_Dungeon1_branch_7dfaa
 	loopchannel 4, Music_Dungeon1_branch_7deff
 	callchannel Music_Dungeon1_branch_7dfd5
 	octave 3
-	note G_, 1
-	note F#, 1
-	note E_, 1
-	note G_, 1
+	G_ 1
+	F# 1
+	E_ 1
+	G_ 1
 	callchannel Music_Dungeon1_branch_7dfd5
 	octave 3
-	note A_, 1
-	note G_, 1
-	note E_, 1
-	note A_, 1
+	A_ 1
+	G_ 1
+	E_ 1
+	A_ 1
 	callchannel Music_Dungeon1_branch_7dfd5
 	octave 3
-	note B_, 1
-	note A_, 1
-	note G_, 1
-	note F#, 1
+	B_ 1
+	A_ 1
+	G_ 1
+	F# 1
 	notetype 12, 12, 3
-	note G_, 4
-	note F#, 4
-	note E_, 4
-	note D#, 4
+	G_ 4
+	F# 4
+	E_ 4
+	D# 4
 	notetype 12, 12, 2
 	callchannel Music_Dungeon1_branch_7dfc5
 	octave 3
-	note B_, 3
+	B_ 3
 	callchannel Music_Dungeon1_branch_7dfc5
-	note C_, 3
+	C_ 3
 	callchannel Music_Dungeon1_branch_7dfc5
-	note C#, 3
+	C# 3
 	notetype 12, 12, 3
 	octave 3
-	note G_, 4
-	note F#, 4
-	note E_, 4
-	note D#, 4
-	note E_, 4
-	note D#, 4
-	note C_, 4
+	G_ 4
+	F# 4
+	E_ 4
+	D# 4
+	E_ 4
+	D# 4
+	C_ 4
 	octave 2
-	note B_, 4
+	B_ 4
 	notetype 12, 12, 2
-	note B_, 1
-	note A#, 1
-	note G_, 1
-	note A#, 1
-	note B_, 1
-	note A#, 1
-	note G_, 1
-	note A#, 1
-	octave 3
-	note C_, 1
+	B_ 1
+	A# 1
+	G_ 1
+	A# 1
+	B_ 1
+	A# 1
+	G_ 1
+	A# 1
+	octave 3
+	C_ 1
 	octave 2
-	note B_, 1
-	note G#, 1
-	note B_, 1
+	B_ 1
+	G# 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note G#, 1
-	note B_, 1
+	B_ 1
+	G# 1
+	B_ 1
 	octave 3
-	note C#, 1
-	note C_, 1
+	C# 1
+	C_ 1
 	octave 2
-	note A_, 1
+	A_ 1
 	octave 3
-	note C_, 1
-	note C#, 1
-	note C_, 1
+	C_ 1
+	C# 1
+	C_ 1
 	octave 2
-	note A_, 1
+	A_ 1
 	octave 3
-	note C_, 1
-	note D_, 1
-	note C#, 1
+	C_ 1
+	D_ 1
+	C# 1
 	octave 2
-	note A#, 1
+	A# 1
 	octave 3
-	note C#, 1
-	note D_, 1
-	note C#, 1
+	C# 1
+	D_ 1
+	C# 1
 	octave 2
-	note A#, 1
+	A# 1
 	octave 3
-	note C#, 1
+	C# 1
 
 Music_Dungeon1_branch_7df6e::
 	rest 16
 	loopchannel 8, Music_Dungeon1_branch_7df6e
 	notetype 12, 12, 3
 	callchannel Music_Dungeon1_branch_7dfbb
-	note B_, 2
-	note G_, 2
+	B_ 2
+	G_ 2
 	octave 3
-	note C#, 4
+	C# 4
 	octave 2
-	note G_, 2
-	note A_, 4
-	note F#, 2
+	G_ 2
+	A_ 4
+	F# 2
 	callchannel Music_Dungeon1_branch_7dfbb
-	note A#, 2
-	note G_, 2
-	note B_, 4
-	note G_, 2
-	note F#, 2
-	note G_, 2
-	note D#, 2
+	A# 2
+	G_ 2
+	B_ 4
+	G_ 2
+	F# 2
+	G_ 2
+	D# 2
 	notetype 12, 12, 2
 	callchannel Music_Dungeon1_branch_7dfc5
 	octave 3
-	note B_, 3
+	B_ 3
 	callchannel Music_Dungeon1_branch_7dfc5
-	note C_, 3
+	C_ 3
 	callchannel Music_Dungeon1_branch_7dfc5
-	note C#, 3
+	C# 3
 	notetype 12, 12, 7
 	octave 3
-	note F#, 8
-	note D#, 8
+	F# 8
+	D# 8
 	notetype 12, 12, 2
 	callchannel Music_Dungeon1_branch_7dfaa
 	callchannel Music_Dungeon1_branch_7dfaa
 	loopchannel 0, Music_Dungeon1_branch_7dee5
 
 Music_Dungeon1_branch_7dfaa::
-	note E_, 1
-	note D#, 1
-	note B_, 1
-	note A#, 1
-	note G_, 1
-	note G#, 1
+	E_ 1
+	D# 1
+	B_ 1
+	A# 1
+	G_ 1
+	G# 1
 	rest 1
-	note A#, 1
-	note E_, 1
-	note D#, 1
-	note B_, 1
-	note A#, 1
-	note G_, 1
-	note G#, 1
+	A# 1
+	E_ 1
+	D# 1
+	B_ 1
+	A# 1
+	G_ 1
+	G# 1
 	rest 1
-	note A#, 1
+	A# 1
 	endchannel
 
 Music_Dungeon1_branch_7dfbb::
 	octave 2
-	note G_, 2
-	note A#, 4
-	note G_, 2
+	G_ 2
+	A# 4
+	G_ 2
 	octave 3
-	note C#, 4
+	C# 4
 	octave 2
-	note G_, 2
-	note A#, 2
+	G_ 2
+	A# 2
 	endchannel
 
 Music_Dungeon1_branch_7dfc5::
 	octave 3
-	note E_, 1
-	note E_, 1
-	note F_, 1
-	note E_, 1
-	note G_, 1
-	note E_, 1
-	note A_, 1
-	note E_, 1
-	note A#, 1
-	note E_, 1
-	note B_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
+	F_ 1
+	E_ 1
+	G_ 1
+	E_ 1
+	A_ 1
+	E_ 1
+	A# 1
+	E_ 1
+	B_ 1
+	E_ 1
 	octave 4
-	note C_, 1
+	C_ 1
 	endchannel
 
 Music_Dungeon1_branch_7dfd5::
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	rest 4
 	octave 1
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 1
 	endchannel
 
@@ -231,10 +231,10 @@ Music_Dungeon1_Ch2:: ; 7dfde (1f:5fde)
 	duty 3
 	notetype 12, 0, 15
 	octave 4
-	note G#, 8
+	G# 8
 	notetype 12, 4, 13
 	octave 5
-	note D_, 8
+	D_ 8
 
 Music_Dungeon1_branch_7dfeb::
 	notetype 12, 12, 2
@@ -243,23 +243,23 @@ Music_Dungeon1_branch_7dfed::
 	callchannel Music_Dungeon1_branch_7e097
 	loopchannel 3, Music_Dungeon1_branch_7dfed
 	octave 2
-	note E_, 1
-	note E_, 1
-	note B_, 1
+	E_ 1
+	E_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	rest 2
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note E_, 1
-	note E_, 1
-	note A_, 1
-	note G_, 1
-	note F_, 1
-	note F#, 1
-	note G_, 1
-	note D#, 1
+	B_ 1
+	E_ 1
+	E_ 1
+	A_ 1
+	G_ 1
+	F_ 1
+	F# 1
+	G_ 1
+	D# 1
 
 Music_Dungeon1_branch_7e006::
 	callchannel Music_Dungeon1_branch_7e097
@@ -267,52 +267,52 @@ Music_Dungeon1_branch_7e006::
 	rest 2
 	callchannel Music_Dungeon1_branch_7e0ab
 	octave 3
-	note C_, 4
+	C_ 4
 	callchannel Music_Dungeon1_branch_7e0ab
 	octave 3
-	note C#, 4
+	C# 4
 	callchannel Music_Dungeon1_branch_7e0ab
 	octave 3
-	note D#, 4
+	D# 4
 	notetype 12, 13, 3
 	octave 4
-	note E_, 4
-	note D#, 4
-	note C_, 4
+	E_ 4
+	D# 4
+	C_ 4
 	octave 3
-	note B_, 4
+	B_ 4
 	notetype 12, 13, 2
 	callchannel Music_Dungeon1_branch_7e0b5
 	octave 3
-	note F#, 4
+	F# 4
 	callchannel Music_Dungeon1_branch_7e0b5
 	octave 3
-	note G_, 4
+	G_ 4
 	callchannel Music_Dungeon1_branch_7e0b5
 	octave 3
-	note A#, 4
+	A# 4
 	notetype 12, 13, 3
 	octave 4
-	note E_, 4
-	note D#, 4
-	note C_, 4
+	E_ 4
+	D# 4
+	C_ 4
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note C_, 4
+	C_ 4
 	octave 3
-	note B_, 4
-	note G_, 4
-	note F#, 2
+	B_ 4
+	G_ 4
+	F# 2
 	notetype 12, 13, 6
-	note E_, 8
-	note F_, 8
-	note F#, 8
-	note G_, 8
+	E_ 8
+	F_ 8
+	F# 8
+	G_ 8
 	notetype 12, 13, 2
 	callchannel Music_Dungeon1_branch_7e0ba
 	rest 10
-	note E_, 1
+	E_ 1
 	rest 1
 	callchannel Music_Dungeon1_branch_7e0ba
 	rest 12
@@ -322,38 +322,38 @@ Music_Dungeon1_branch_7e006::
 	rest 14
 	notetype 12, 13, 3
 	callchannel Music_Dungeon1_branch_7e0cd
-	note D#, 4
+	D# 4
 	callchannel Music_Dungeon1_branch_7e0cd
-	note D#, 2
+	D# 2
 	rest 2
 	notetype 12, 13, 2
 	callchannel Music_Dungeon1_branch_7e0c0
 	rest 2
 	octave 3
-	note F#, 4
+	F# 4
 	octave 2
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note C_, 1
+	C_ 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note D_, 1
-	note C#, 1
+	D_ 1
+	C# 1
 	rest 2
 	octave 3
-	note G_, 4
+	G_ 4
 	callchannel Music_Dungeon1_branch_7e0c0
 	octave 3
-	note A#, 4
+	A# 4
 	notetype 12, 13, 6
-	note B_, 8
+	B_ 8
 	octave 4
-	note D#, 8
+	D# 8
 	notetype 12, 13, 2
 	callchannel Music_Dungeon1_branch_7e097
 	callchannel Music_Dungeon1_branch_7e097
@@ -361,83 +361,83 @@ Music_Dungeon1_branch_7e006::
 
 Music_Dungeon1_branch_7e097::
 	octave 2
-	note E_, 1
-	note E_, 1
-	note B_, 1
+	E_ 1
+	E_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	rest 2
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note E_, 1
-	note E_, 1
-	note B_, 1
+	B_ 1
+	E_ 1
+	E_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	rest 2
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
+	B_ 1
 	endchannel
 
 Music_Dungeon1_branch_7e0ab::
 	octave 2
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	rest 2
 	octave 1
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 3
 	endchannel
 
 Music_Dungeon1_branch_7e0b5::
 	octave 2
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	rest 10
 	endchannel
 
 Music_Dungeon1_branch_7e0ba::
 	octave 1
-	note E_, 1
-	note G_, 1
-	note E_, 1
-	note D#, 1
+	E_ 1
+	G_ 1
+	E_ 1
+	D# 1
 	endchannel
 
 Music_Dungeon1_branch_7e0c0::
 	octave 2
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	octave 4
-	note E_, 1
+	E_ 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note C#, 1
-	note C_, 1
+	C# 1
+	C_ 1
 	endchannel
 
 Music_Dungeon1_branch_7e0cd::
 	octave 3
-	note E_, 6
-	note G_, 6
-	note E_, 4
-	note A_, 6
+	E_ 6
+	G_ 6
+	E_ 4
+	A_ 6
 	octave 4
-	note C_, 6
-	octave 3
-	note B_, 4
-	note G_, 6
-	note A#, 6
-	note F#, 4
-	note E_, 6
-	note F#, 6
+	C_ 6
+	octave 3
+	B_ 4
+	G_ 6
+	A# 6
+	F# 4
+	E_ 6
+	F# 6
 	endchannel
 
 
@@ -446,49 +446,49 @@ Music_Dungeon1_Ch3:: ; 7e0dc (1f:60dc)
 	vibrato 8, 2, 6
 	rest 14
 	octave 4
-	note D_, 1
-	note D#, 1
+	D_ 1
+	D# 1
 
 Music_Dungeon1_branch_7e0e5::
 	callchannel Music_Dungeon1_branch_7e140
 	callchannel Music_Dungeon1_branch_7e140
 	octave 5
-	note E_, 2
+	E_ 2
 	rest 4
 	octave 3
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 4
-	note F#, 4
+	F# 4
 	callchannel Music_Dungeon1_branch_7e154
 	octave 4
-	note G_, 4
+	G_ 4
 	callchannel Music_Dungeon1_branch_7e154
 	octave 4
-	note A_, 4
-	note B_, 4
-	note A#, 4
-	note G_, 4
-	note F#, 4
+	A_ 4
+	B_ 4
+	A# 4
+	G_ 4
+	F# 4
 	rest 6
 	callchannel Music_Dungeon1_branch_7e177
-	note B_, 4
-	note A#, 4
-	note G_, 4
-	note F#, 4
-	note G_, 4
-	note F#, 4
-	note E_, 4
-	note D#, 4
+	B_ 4
+	A# 4
+	G_ 4
+	F# 4
+	G_ 4
+	F# 4
+	E_ 4
+	D# 4
 	callchannel Music_Dungeon1_branch_7e15e
 	rest 12
 	callchannel Music_Dungeon1_branch_7e15e
 	rest 12
 	callchannel Music_Dungeon1_branch_7e15e
 	rest 10
-	note E_, 1
+	E_ 1
 	rest 1
 	callchannel Music_Dungeon1_branch_7e15e
 	rest 12
@@ -496,128 +496,128 @@ Music_Dungeon1_branch_7e0e5::
 	rest 12
 	callchannel Music_Dungeon1_branch_7e15e
 	rest 10
-	note D_, 1
-	note D#, 1
+	D_ 1
+	D# 1
 	callchannel Music_Dungeon1_branch_7e164
 	callchannel Music_Dungeon1_branch_7e164
-	note E_, 2
+	E_ 2
 	rest 4
 	callchannel Music_Dungeon1_branch_7e177
-	note B_, 8
-	note F#, 6
-	note D_, 1
-	note D#, 1
+	B_ 8
+	F# 6
+	D_ 1
+	D# 1
 	rest 16
 	rest 16
 	loopchannel 0, Music_Dungeon1_branch_7e0e5
 
 Music_Dungeon1_branch_7e140::
 	octave 5
-	note E_, 4
-	note B_, 4
-	note A#, 4
+	E_ 4
+	B_ 4
+	A# 4
 	octave 6
-	note D_, 4
-	note C#, 4
+	D_ 4
+	C# 4
 	octave 5
-	note G#, 4
-	note G_, 4
-	note B_, 4
-	note A#, 4
-	note E_, 4
-	note D#, 4
-	note A_, 4
-	note G#, 4
-	note E_, 4
-	note F#, 4
-	note D#, 4
+	G# 4
+	G_ 4
+	B_ 4
+	A# 4
+	E_ 4
+	D# 4
+	A_ 4
+	G# 4
+	E_ 4
+	F# 4
+	D# 4
 	endchannel
 
 Music_Dungeon1_branch_7e154::
 	octave 6
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	rest 4
 	octave 3
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 1
 	endchannel
 
 Music_Dungeon1_branch_7e15e::
 	octave 3
-	note E_, 1
-	note G_, 1
-	note E_, 1
-	note D#, 1
+	E_ 1
+	G_ 1
+	E_ 1
+	D# 1
 	endchannel
 
 Music_Dungeon1_branch_7e164::
-	note E_, 4
-	note B_, 4
-	note A#, 4
+	E_ 4
+	B_ 4
+	A# 4
 	octave 4
-	note D_, 4
-	note C#, 4
-	octave 3
-	note G#, 4
-	note G_, 4
-	note B_, 4
-	note A#, 4
-	note E_, 4
-	note D#, 4
-	note A_, 4
-	note G#, 4
-	note E_, 4
-	note F#, 4
-	note D#, 4
+	D_ 4
+	C# 4
+	octave 3
+	G# 4
+	G_ 4
+	B_ 4
+	A# 4
+	E_ 4
+	D# 4
+	A_ 4
+	G# 4
+	E_ 4
+	F# 4
+	D# 4
 	endchannel
 
 Music_Dungeon1_branch_7e177::
 	octave 4
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 1
-	note F#, 4
+	F# 4
 	rest 6
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 1
-	note G_, 4
+	G_ 4
 	rest 6
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
-	note E_, 1
-	note A#, 4
+	E_ 1
+	E_ 1
+	A# 4
 	endchannel
 
 
 Music_Dungeon1_Ch4:: ; 7e18a (1f:618a)
 	dspeed 12
 	rest 14
-	dnote 1, cymbal1
-	dnote 1, cymbal1
+	cymbal1 1
+	cymbal1 1
 
 Music_Dungeon1_branch_7e190::
 	callchannel Music_Dungeon1_branch_7e1f1
 	loopchannel 3, Music_Dungeon1_branch_7e190
-	dnote 4, cymbal2
-	dnote 4, cymbal1
-	dnote 4, cymbal2
-	dnote 2, cymbal1
-	dnote 2, cymbal1
+	cymbal2 4
+	cymbal1 4
+	cymbal2 4
+	cymbal1 2
+	cymbal1 2
 
 Music_Dungeon1_branch_7e1a1::
 	callchannel Music_Dungeon1_branch_7e1f1
 	loopchannel 3, Music_Dungeon1_branch_7e1a1
-	dnote 4, cymbal2
-	dnote 4, cymbal1
-	dnote 4, cymbal2
-	dnote 4, cymbal2
+	cymbal2 4
+	cymbal1 4
+	cymbal2 4
+	cymbal2 4
 
 Music_Dungeon1_branch_7e1b0::
 	callchannel Music_Dungeon1_branch_7e1fa
@@ -628,12 +628,12 @@ Music_Dungeon1_branch_7e1ba::
 	callchannel Music_Dungeon1_branch_7e1fa
 	loopchannel 3, Music_Dungeon1_branch_7e1ba
 	callchannel Music_Dungeon1_branch_7e202
-	dnote 4, snare7
-	dnote 4, snare8
-	dnote 4, snare8
+	snare7 4
+	snare8 4
+	snare8 4
 	rest 2
-	dnote 2, snare7
-	dnote 4, cymbal2
+	snare7 2
+	cymbal2 4
 
 Music_Dungeon1_branch_7e1cf::
 	rest 16
@@ -643,34 +643,34 @@ Music_Dungeon1_branch_7e1cf::
 Music_Dungeon1_branch_7e1d5::
 	callchannel Music_Dungeon1_branch_7e1fa
 	loopchannel 3, Music_Dungeon1_branch_7e1d5
-	dnote 4, cymbal1
-	dnote 4, cymbal1
-	dnote 4, cymbal1
+	cymbal1 4
+	cymbal1 4
+	cymbal1 4
 	rest 2
-	dnote 1, cymbal1
-	dnote 1, cymbal1
+	cymbal1 1
+	cymbal1 1
 	callchannel Music_Dungeon1_branch_7e1f1
 	callchannel Music_Dungeon1_branch_7e1f1
 	loopchannel 0, Music_Dungeon1_branch_7e190
 
 Music_Dungeon1_branch_7e1f1::
-	dnote 4, cymbal2
-	dnote 4, cymbal1
-	dnote 4, cymbal2
-	dnote 4, cymbal1
+	cymbal2 4
+	cymbal1 4
+	cymbal2 4
+	cymbal1 4
 	endchannel
 
 Music_Dungeon1_branch_7e1fa::
-	dnote 1, cymbal1
-	dnote 1, cymbal1
+	cymbal1 1
+	cymbal1 1
 	rest 10
-	dnote 4, cymbal3
+	cymbal3 4
 	endchannel
 
 Music_Dungeon1_branch_7e202::
-	dnote 4, snare7
-	dnote 4, snare8
-	dnote 4, snare8
-	dnote 4, snare9
+	snare7 4
+	snare8 4
+	snare8 4
+	snare9 4
 	endchannel
-; 0x7e20b
\ No newline at end of file
+; 0x7e20b
diff --git a/audio/music/dungeon2.asm b/audio/music/dungeon2.asm
index 98e39dcf..e65de5be 100644
--- a/audio/music/dungeon2.asm
+++ b/audio/music/dungeon2.asm
@@ -8,57 +8,57 @@ Music_Dungeon2_Ch1:: ; 7e887 (1f:6887)
 Music_Dungeon2_branch_7e892::
 	notetype 12, 11, 2
 	octave 4
-	note E_, 4
-	note E_, 4
-	note E_, 4
-	note E_, 4
-	note A#, 4
-	note A#, 4
-	note A#, 4
-	note A#, 4
-	note E_, 4
-	note E_, 4
-	note E_, 4
-	note E_, 4
+	E_ 4
+	E_ 4
+	E_ 4
+	E_ 4
+	A# 4
+	A# 4
+	A# 4
+	A# 4
+	E_ 4
+	E_ 4
+	E_ 4
+	E_ 4
 	octave 5
-	note C#, 4
-	note C#, 4
-	note C#, 4
-	note C#, 4
+	C# 4
+	C# 4
+	C# 4
+	C# 4
 	octave 3
-	note E_, 4
-	note E_, 4
-	note E_, 4
-	note E_, 4
-	note A#, 4
-	note A#, 4
-	note A#, 4
-	note A#, 4
+	E_ 4
+	E_ 4
+	E_ 4
+	E_ 4
+	A# 4
+	A# 4
+	A# 4
+	A# 4
 	octave 2
-	note G_, 2
-	note A#, 4
-	note G_, 2
+	G_ 2
+	A# 4
+	G_ 2
 	octave 3
-	note C#, 4
+	C# 4
 	octave 2
-	note G_, 2
-	note A#, 2
-	note B_, 2
-	note G_, 2
+	G_ 2
+	A# 2
+	B_ 2
+	G_ 2
 	octave 3
-	note C#, 4
+	C# 4
 	octave 2
-	note G_, 2
-	note A_, 4
-	note F#, 2
+	G_ 2
+	A_ 4
+	F# 2
 	loopchannel 2, Music_Dungeon2_branch_7e892
 	notetype 12, 1, 15
 	octave 3
-	note E_, 16
-	note C_, 16
-	note D_, 16
+	E_ 16
+	C_ 16
+	D_ 16
 	octave 2
-	note A#, 16
+	A# 16
 	rest 16
 	rest 16
 	rest 16
@@ -77,77 +77,77 @@ Music_Dungeon2_branch_7e8db::
 	duty 3
 	notetype 12, 12, 2
 	octave 3
-	note E_, 4
-	note E_, 4
-	note E_, 4
-	note E_, 4
-	note C_, 4
-	note C_, 4
-	note C_, 4
-	note C_, 4
-	note E_, 4
-	note E_, 4
-	note E_, 4
-	note E_, 4
-	note C_, 4
-	note C_, 4
-	note C_, 4
-	note C_, 4
-	note B_, 4
-	note B_, 4
-	note B_, 4
-	note B_, 4
+	E_ 4
+	E_ 4
+	E_ 4
+	E_ 4
+	C_ 4
+	C_ 4
+	C_ 4
+	C_ 4
+	E_ 4
+	E_ 4
+	E_ 4
+	E_ 4
+	C_ 4
+	C_ 4
+	C_ 4
+	C_ 4
+	B_ 4
+	B_ 4
+	B_ 4
+	B_ 4
 	octave 4
-	note F#, 4
-	note F#, 4
-	note F#, 4
-	note F#, 4
-	note D_, 4
-	note D_, 4
-	note D_, 4
-	note D_, 4
-	note G_, 4
-	note G_, 4
-	note G_, 4
-	note F#, 4
+	F# 4
+	F# 4
+	F# 4
+	F# 4
+	D_ 4
+	D_ 4
+	D_ 4
+	D_ 4
+	G_ 4
+	G_ 4
+	G_ 4
+	F# 4
 	loopchannel 2, Music_Dungeon2_branch_7e8db
 	octave 3
-	note E_, 2
-	note G_, 2
-	note E_, 2
-	note D#, 2
-	note E_, 2
-	note E_, 2
+	E_ 2
+	G_ 2
+	E_ 2
+	D# 2
+	E_ 2
+	E_ 2
 	octave 5
-	note E_, 2
+	E_ 2
 	rest 2
-	note D#, 2
+	D# 2
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 2
-	note C#, 2
-	note C_, 2
+	C# 2
+	C_ 2
 	octave 4
-	note E_, 2
-	note G_, 2
+	E_ 2
+	G_ 2
 	octave 3
-	note A#, 2
-	note C#, 2
-	note A#, 2
-	note A_, 2
-	note A#, 2
-	note G_, 2
+	A# 2
+	C# 2
+	A# 2
+	A_ 2
+	A# 2
+	G_ 2
 	octave 5
-	note G_, 2
+	G_ 2
 	rest 2
-	note F#, 2
+	F# 2
 	rest 2
-	note F_, 2
+	F_ 2
 	rest 2
-	note E_, 2
-	note D#, 2
-	note D_, 2
-	note C#, 2
+	E_ 2
+	D# 2
+	D_ 2
+	C# 2
 	rest 16
 	rest 16
 	rest 16
@@ -155,10 +155,10 @@ Music_Dungeon2_branch_7e8db::
 	notetype 12, 12, 7
 	duty 1
 	octave 4
-	note E_, 16
-	note D_, 16
-	note C_, 16
-	note D_, 16
+	E_ 16
+	D_ 16
+	C_ 16
+	D_ 16
 	loopchannel 0, Music_Dungeon2_branch_7e8db
 
 
@@ -169,92 +169,92 @@ Music_Dungeon2_Ch3:: ; 7e93b (1f:693b)
 Music_Dungeon2_branch_7e940::
 	callchannel Music_Dungeon2_branch_7e9d1
 	loopchannel 16, Music_Dungeon2_branch_7e940
-	note E_, 4
+	E_ 4
 	rest 4
 	rest 4
-	note E_, 4
-	note C_, 4
+	E_ 4
+	C_ 4
 	rest 4
 	rest 4
-	note C_, 4
-	note D_, 4
+	C_ 4
+	D_ 4
 	rest 4
 	rest 4
-	note D_, 4
+	D_ 4
 	octave 3
-	note A#, 4
+	A# 4
 	rest 4
 	rest 4
-	note A#, 4
+	A# 4
 
 Music_Dungeon2_branch_7e958::
 	octave 5
-	note E_, 2
+	E_ 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 2
-	note A#, 2
+	A# 2
 	rest 2
 	octave 6
-	note D_, 2
+	D_ 2
 	rest 2
-	note C#, 2
+	C# 2
 	rest 2
 	octave 5
-	note G#, 2
+	G# 2
 	rest 2
-	note G_, 2
+	G_ 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 2
-	note A#, 2
+	A# 2
 	rest 2
-	note E_, 2
+	E_ 2
 	rest 2
-	note D#, 2
+	D# 2
 	rest 2
-	note A_, 2
+	A_ 2
 	rest 2
-	note G#, 2
+	G# 2
 	rest 2
-	note E_, 2
+	E_ 2
 	rest 2
-	note F#, 2
+	F# 2
 	rest 2
-	note D#, 2
+	D# 2
 	rest 2
 	loopchannel 3, Music_Dungeon2_branch_7e958
 	octave 4
-	note E_, 4
-	note B_, 4
-	note A#, 4
+	E_ 4
+	B_ 4
+	A# 4
 	octave 5
-	note D_, 4
-	note C#, 4
+	D_ 4
+	C# 4
 	octave 4
-	note G#, 4
-	note G_, 4
-	note B_, 4
-	note A#, 4
-	note E_, 4
-	note D#, 4
-	note A_, 4
-	note G#, 4
-	note E_, 4
-	note F#, 4
-	note D#, 4
+	G# 4
+	G_ 4
+	B_ 4
+	A# 4
+	E_ 4
+	D# 4
+	A_ 4
+	G# 4
+	E_ 4
+	F# 4
+	D# 4
 	octave 3
-	note E_, 16
-	note C_, 16
-	note D_, 16
+	E_ 16
+	C_ 16
+	D_ 16
 	octave 2
-	note A#, 16
+	A# 16
 	octave 3
-	note E_, 16
-	note F_, 16
-	note G_, 16
+	E_ 16
+	F_ 16
+	G_ 16
 	octave 3
-	note B_, 16
+	B_ 16
 	rest 16
 	rest 16
 	rest 16
@@ -269,36 +269,36 @@ Music_Dungeon2_branch_7e958::
 	callchannel Music_Dungeon2_branch_7e9d1
 	loopchannel 0, Music_Dungeon2_branch_7e940
 	octave 2
-	note G_, 2
-	note A#, 4
-	note G_, 2
+	G_ 2
+	A# 4
+	G_ 2
 	octave 3
-	note C#, 4
+	C# 4
 	octave 2
-	note G_, 2
-	note A_, 2
-	note A#, 2
-	note G_, 2
+	G_ 2
+	A_ 2
+	A# 2
+	G_ 2
 	octave 3
-	note C#, 4
+	C# 4
 	octave 2
-	note G_, 2
-	note A#, 2
-	note G_, 2
+	G_ 2
+	A# 2
+	G_ 2
 	rest 2
 	endchannel
 
 Music_Dungeon2_branch_7e9d1::
 	octave 4
-	note E_, 2
+	E_ 2
 	rest 4
 	octave 3
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 4
-	note F#, 4
+	F# 4
 	endchannel
 
 
@@ -306,13 +306,13 @@ Music_Dungeon2_Ch4:: ; 7e9dc (1f:69dc)
 	dspeed 12
 
 Music_Dungeon2_branch_7e9dd::
-	dnote 4, cymbal1
-	dnote 4, cymbal2
-	dnote 4, cymbal1
-	dnote 4, snare8
-	dnote 4, cymbal1
-	dnote 4, cymbal2
-	dnote 4, snare9
-	dnote 4, snare7
+	cymbal1 4
+	cymbal2 4
+	cymbal1 4
+	snare8 4
+	cymbal1 4
+	cymbal2 4
+	snare9 4
+	snare7 4
 	loopchannel 0, Music_Dungeon2_branch_7e9dd
-; 0x7e9f1
\ No newline at end of file
+; 0x7e9f1
diff --git a/audio/music/dungeon3.asm b/audio/music/dungeon3.asm
index 8d13d5c7..1bfdb682 100644
--- a/audio/music/dungeon3.asm
+++ b/audio/music/dungeon3.asm
@@ -12,17 +12,17 @@ Music_Dungeon3_branch_7e9fe::
 	callchannel Music_Dungeon3_branch_7eab2
 	loopchannel 3, Music_Dungeon3_branch_7e9fe
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D#, 2
-	note G_, 2
+	D# 2
+	G_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D#, 2
-	note G_, 2
-	note D#, 2
-	note E_, 2
+	D# 2
+	G_ 2
+	D# 2
+	E_ 2
 
 Music_Dungeon3_branch_7ea11::
 	callchannel Music_Dungeon3_branch_7eac1
@@ -32,32 +32,32 @@ Music_Dungeon3_branch_7ea18::
 	callchannel Music_Dungeon3_branch_7eab2
 	loopchannel 4, Music_Dungeon3_branch_7ea18
 	octave 4
-	note F_, 2
-	note F_, 2
+	F_ 2
+	F_ 2
 	rest 2
-	note F_, 2
-	note E_, 2
-	note E_, 2
-	note D#, 2
-	note D#, 2
+	F_ 2
+	E_ 2
+	E_ 2
+	D# 2
+	D# 2
 	rest 2
-	note D#, 2
-	note D_, 2
-	note D_, 2
+	D# 2
+	D_ 2
+	D_ 2
 	callchannel Music_Dungeon3_branch_7eafc
 	octave 4
-	note D_, 2
-	note D_, 2
+	D_ 2
+	D_ 2
 	rest 2
-	note D_, 2
-	note D#, 2
-	note D#, 2
-	note E_, 2
-	note E_, 2
+	D_ 2
+	D# 2
+	D# 2
+	E_ 2
+	E_ 2
 	rest 2
-	note E_, 2
-	note F_, 2
-	note F_, 2
+	E_ 2
+	F_ 2
+	F_ 2
 
 Music_Dungeon3_branch_7ea3c::
 	callchannel Music_Dungeon3_branch_7eace
@@ -67,270 +67,270 @@ Music_Dungeon3_branch_7ea43::
 	callchannel Music_Dungeon3_branch_7eadd
 	loopchannel 3, Music_Dungeon3_branch_7ea43
 	octave 3
-	note C#, 2
+	C# 2
 	octave 2
-	note A_, 2
-	note F_, 2
+	A_ 2
+	F_ 2
 	octave 3
-	note C#, 2
+	C# 2
 	octave 2
-	note A_, 2
-	note F_, 2
+	A_ 2
+	F_ 2
 	octave 3
-	note A_, 2
-	note F_, 2
+	A_ 2
+	F_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note A_, 2
-	note F_, 2
+	A_ 2
+	F_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note A_, 2
-	note F_, 2
-	note A_, 2
-	note F_, 2
+	A_ 2
+	F_ 2
+	A_ 2
+	F_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note A_, 2
-	note F_, 2
+	A_ 2
+	F_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note A_, 2
-	note F_, 2
+	A_ 2
+	F_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note A_, 2
-	note F_, 2
+	A_ 2
+	F_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note A_, 2
-	note F_, 2
+	A_ 2
+	F_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note A_, 2
-	note F_, 2
+	A_ 2
+	F_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note A_, 2
-	note F_, 2
-	note G#, 2
-	note E_, 2
+	A_ 2
+	F_ 2
+	G# 2
+	E_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note G#, 2
-	note E_, 2
+	G# 2
+	E_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	callchannel Music_Dungeon3_branch_7eaea
 	callchannel Music_Dungeon3_branch_7eaea
 	octave 3
-	note G#, 2
-	note E_, 2
+	G# 2
+	E_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note G#, 2
-	note E_, 2
+	G# 2
+	E_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note G#, 2
-	note E_, 2
+	G# 2
+	E_ 2
 	rest 16
 	rest 8
 	callchannel Music_Dungeon3_branch_7eaf7
 	callchannel Music_Dungeon3_branch_7eaf7
 	callchannel Music_Dungeon3_branch_7eaf7
 	callchannel Music_Dungeon3_branch_7eaf7
-	note D#, 2
+	D# 2
 	rest 16
 	rest 16
 	loopchannel 0, Music_Dungeon3_branch_7e9fc
 
 Music_Dungeon3_branch_7eab2::
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D#, 2
-	note G_, 2
+	D# 2
+	G_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D#, 2
-	note G_, 2
+	D# 2
+	G_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D#, 2
+	D# 2
 	endchannel
 
 Music_Dungeon3_branch_7eac1::
-	note E_, 2
-	note G#, 2
+	E_ 2
+	G# 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note E_, 2
-	note G#, 2
+	E_ 2
+	G# 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note E_, 2
-	note G#, 2
+	E_ 2
+	G# 2
 	endchannel
 
 Music_Dungeon3_branch_7eace::
 	octave 3
-	note D#, 2
+	D# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note G_, 2
-	note D#, 2
+	G_ 2
+	D# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note G_, 2
-	note D#, 2
+	G_ 2
+	D# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	endchannel
 
 Music_Dungeon3_branch_7eadd::
-	note A_, 2
-	note F_, 2
+	A_ 2
+	F_ 2
 	octave 3
-	note C#, 2
+	C# 2
 	octave 2
-	note A_, 2
-	note F_, 2
+	A_ 2
+	F_ 2
 	octave 3
-	note C#, 2
+	C# 2
 	octave 2
-	note A_, 2
-	note F_, 2
+	A_ 2
+	F_ 2
 	endchannel
 
 Music_Dungeon3_branch_7eaea::
 	octave 3
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note G#, 2
-	note E_, 2
+	G# 2
+	E_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	endchannel
 
 Music_Dungeon3_branch_7eaf7::
-	note D#, 2
-	note G_, 2
-	note D#, 2
-	note C#, 6
+	D# 2
+	G_ 2
+	D# 2
+	C# 6
 	endchannel
 
 Music_Dungeon3_branch_7eafc::
 	tempo 168
 	octave 1
-	note A#, 1
-	note B_, 1
+	A# 1
+	B_ 1
 	octave 2
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
+	C_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
 	tempo 176
 	octave 1
-	note A#, 1
-	note B_, 1
+	A# 1
+	B_ 1
 	octave 2
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
+	C_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
 	tempo 184
 	octave 1
-	note A#, 1
-	note B_, 1
+	A# 1
+	B_ 1
 	octave 2
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
+	C_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
 	tempo 192
 	octave 1
-	note A_, 1
-	note A#, 1
-	note B_, 1
+	A_ 1
+	A# 1
+	B_ 1
 	octave 2
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
+	C_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
 	tempo 200
 	octave 1
-	note G#, 1
-	note A_, 1
-	note A#, 1
-	note B_, 1
+	G# 1
+	A_ 1
+	A# 1
+	B_ 1
 	octave 2
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
+	C_ 1
+	C# 1
+	D_ 1
+	D# 1
 	tempo 208
 	octave 1
-	note G_, 1
-	note G#, 1
-	note A_, 1
-	note A#, 1
-	note B_, 1
+	G_ 1
+	G# 1
+	A_ 1
+	A# 1
+	B_ 1
 	octave 2
-	note C_, 1
-	note C#, 1
-	note D_, 1
+	C_ 1
+	C# 1
+	D_ 1
 	tempo 216
 	octave 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
-	note A_, 1
-	note A#, 1
-	note B_, 1
+	F# 1
+	G_ 1
+	G# 1
+	A_ 1
+	A# 1
+	B_ 1
 	octave 2
-	note C_, 1
-	note C#, 1
+	C_ 1
+	C# 1
 	tempo 224
 	octave 1
-	note F_, 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
-	note A_, 1
-	note A#, 1
-	note B_, 1
+	F_ 1
+	F# 1
+	G_ 1
+	G# 1
+	A_ 1
+	A# 1
+	B_ 1
 	octave 2
-	note C_, 1
+	C_ 1
 	tempo 160
 	endchannel
 
@@ -342,91 +342,91 @@ Music_Dungeon3_Ch2:: ; 7eb68 (1f:6b68)
 Music_Dungeon3_branch_7eb6d::
 	notetype 12, 13, 3
 	octave 4
-	note D#, 6
-	note C#, 6
+	D# 6
+	C# 6
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D#, 2
-	note G_, 2
-	note D#, 2
-	note C#, 6
+	C# 2
+	D# 2
+	G_ 2
+	D# 2
+	C# 6
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D#, 2
-	note G_, 2
-	note D#, 2
-	note C#, 6
+	C# 2
+	D# 2
+	G_ 2
+	D# 2
+	C# 6
 	octave 3
-	note B_, 2
-	note A#, 2
-	note B_, 6
+	B_ 2
+	A# 2
+	B_ 6
 	octave 4
-	note C#, 8
+	C# 8
 	rest 2
-	note G#, 6
-	note F#, 6
-	note E_, 2
-	note F#, 2
-	note G#, 2
+	G# 6
+	F# 6
+	E_ 2
+	F# 2
+	G# 2
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note G#, 2
-	note F#, 6
-	note E_, 2
-	note F#, 2
-	note G#, 2
+	G# 2
+	F# 6
+	E_ 2
+	F# 2
+	G# 2
 	octave 5
-	note C_, 2
-	octave 4
-	note G#, 2
-	note F#, 6
-	note E_, 2
-	note D#, 2
-	note E_, 6
-	note F#, 6
-	note E_, 4
-	note D#, 6
-	note C#, 6
-	octave 3
-	note B_, 2
-	octave 4
-	note C#, 2
-	note D#, 2
-	note G_, 2
-	note D#, 2
-	note C#, 6
-	octave 3
-	note B_, 2
-	octave 4
-	note C#, 2
-	note D#, 2
-	note G_, 2
-	note D#, 2
-	note C#, 6
-	octave 3
-	note B_, 2
-	note A#, 2
-	note B_, 6
-	octave 4
-	note C#, 8
+	C_ 2
+	octave 4
+	G# 2
+	F# 6
+	E_ 2
+	D# 2
+	E_ 6
+	F# 6
+	E_ 4
+	D# 6
+	C# 6
+	octave 3
+	B_ 2
+	octave 4
+	C# 2
+	D# 2
+	G_ 2
+	D# 2
+	C# 6
+	octave 3
+	B_ 2
+	octave 4
+	C# 2
+	D# 2
+	G_ 2
+	D# 2
+	C# 6
+	octave 3
+	B_ 2
+	A# 2
+	B_ 6
+	octave 4
+	C# 8
 	rest 2
-	note G#, 2
-	note G#, 2
+	G# 2
+	G# 2
 	rest 2
-	note G#, 2
-	note A_, 2
-	note A_, 2
-	note A#, 2
-	note A#, 2
+	G# 2
+	A_ 2
+	A_ 2
+	A# 2
+	A# 2
 	rest 2
-	note A#, 2
-	note B_, 2
-	note B_, 2
+	A# 2
+	B_ 2
+	B_ 2
 	rest 8
 	rest 8
 	rest 8
@@ -436,174 +436,174 @@ Music_Dungeon3_branch_7eb6d::
 	rest 8
 	rest 8
 	octave 4
-	note B_, 2
-	note B_, 2
+	B_ 2
+	B_ 2
 	rest 2
-	note B_, 2
-	note A#, 2
-	note A#, 2
-	note A_, 2
-	note A_, 2
+	B_ 2
+	A# 2
+	A# 2
+	A_ 2
+	A_ 2
 	rest 2
-	note A_, 2
-	note G#, 2
-	note G#, 2
-	note C#, 8
+	A_ 2
+	G# 2
+	G# 2
+	C# 8
 	rest 2
 	octave 3
-	note B_, 6
-	note A#, 2
-	note B_, 2
+	B_ 6
+	A# 2
+	B_ 2
 	octave 4
-	note D#, 2
-	note G_, 2
-	note D#, 2
-	note C#, 6
+	D# 2
+	G_ 2
+	D# 2
+	C# 6
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D#, 2
-	note G_, 2
-	note D#, 2
-	note C#, 6
+	C# 2
+	D# 2
+	G_ 2
+	D# 2
+	C# 6
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D#, 6
-	note G_, 6
+	C# 2
+	D# 6
+	G_ 6
 	octave 3
-	note G_, 8
+	G_ 8
 	rest 2
-	note F_, 6
-	note E_, 2
-	note F_, 2
-	note A_, 2
+	F_ 6
+	E_ 2
+	F_ 2
+	A_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note A_, 2
-	note G_, 6
-	note F_, 2
-	note G_, 2
-	note A_, 2
+	A_ 2
+	G_ 6
+	F_ 2
+	G_ 2
+	A_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note A_, 2
-	note G_, 6
-	note A_, 6
+	A_ 2
+	G_ 6
+	A_ 6
 	octave 4
-	note C#, 6
-	note G_, 8
+	C# 6
+	G_ 8
 	rest 2
-	note F_, 6
-	note E_, 2
-	note F_, 2
-	note A_, 2
+	F_ 6
+	E_ 2
+	F_ 2
+	A_ 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note A_, 2
-	note G_, 6
-	note A_, 2
+	A_ 2
+	G_ 6
+	A_ 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note A_, 2
-	note G_, 6
-	note A_, 6
+	A_ 2
+	G_ 6
+	A_ 6
 	octave 5
-	note C#, 6
+	C# 6
 	octave 4
-	note F#, 8
+	F# 8
 	rest 2
-	note E_, 6
-	note D#, 2
-	note E_, 2
-	note G#, 2
+	E_ 6
+	D# 2
+	E_ 2
+	G# 2
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note G#, 2
-	note F#, 6
-	note E_, 2
-	note F#, 2
-	note G#, 2
+	G# 2
+	F# 6
+	E_ 2
+	F# 2
+	G# 2
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note G#, 2
-	note F#, 6
-	note G#, 6
+	G# 2
+	F# 6
+	G# 6
 	octave 5
-	note C_, 6
-	octave 3
-	note D#, 2
-	note G_, 2
-	note D#, 2
-	note C#, 6
-	note D#, 2
-	note G_, 2
-	note D#, 2
-	note C#, 6
+	C_ 6
+	octave 3
+	D# 2
+	G_ 2
+	D# 2
+	C# 6
+	D# 2
+	G_ 2
+	D# 2
+	C# 6
 	octave 2
-	note E_, 2
-	note G#, 2
-	octave 3
-	note C_, 2
-	note E_, 2
-	note G#, 2
-	octave 4
-	note C_, 2
-	note E_, 2
-	note G#, 2
-	note C_, 2
-	note E_, 2
-	note G#, 2
-	note C_, 2
-	note E_, 2
-	note G#, 2
-	note C_, 2
-	note E_, 2
-	note G#, 2
-	note C_, 2
-	note E_, 2
-	note G#, 2
-	note C_, 2
-	note E_, 2
-	note G#, 2
-	note C_, 2
-	note D#, 2
+	E_ 2
+	G# 2
+	octave 3
+	C_ 2
+	E_ 2
+	G# 2
+	octave 4
+	C_ 2
+	E_ 2
+	G# 2
+	C_ 2
+	E_ 2
+	G# 2
+	C_ 2
+	E_ 2
+	G# 2
+	C_ 2
+	E_ 2
+	G# 2
+	C_ 2
+	E_ 2
+	G# 2
+	C_ 2
+	E_ 2
+	G# 2
+	C_ 2
+	D# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D#, 2
-	note G_, 2
+	D# 2
+	G_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D#, 2
-	note G_, 2
+	D# 2
+	G_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D#, 2
+	D# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D#, 2
-	note G_, 2
+	D# 2
+	G_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D#, 2
-	note G_, 2
+	D# 2
+	G_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D#, 2
+	D# 2
 	loopchannel 0, Music_Dungeon3_branch_7eb6d
 
 
@@ -623,66 +623,66 @@ Music_Dungeon3_Ch3:: ; 7ec7a (1f:6c7a)
 	rest 12
 	notetype 6, 1, 0
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
+	C_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
 	rest 2
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
+	C_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
 	rest 16
 	rest 16
 	rest 10
 	octave 5
-	note E_, 8
+	E_ 8
 	octave 4
-	note B_, 8
+	B_ 8
 	octave 5
-	note D#, 8
+	D# 8
 	octave 4
-	note A#, 8
+	A# 8
 	octave 5
-	note D_, 8
+	D_ 8
 	octave 4
-	note A_, 8
+	A_ 8
 	octave 5
-	note C#, 8
+	C# 8
 	octave 4
-	note G#, 8
+	G# 8
 	octave 5
-	note C_, 8
+	C_ 8
 	octave 4
-	note G_, 8
-	note B_, 8
-	note F#, 8
-	note A#, 8
-	note F_, 8
-	note A_, 8
-	note E_, 8
+	G_ 8
+	B_ 8
+	F# 8
+	A# 8
+	F_ 8
+	A_ 8
+	E_ 8
 	rest 16
 	rest 16
 	rest 8
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note C_, 1
+	F_ 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	C_ 1
 	rest 2
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note C_, 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	C_ 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 10
 	rest 16
 	notetype 12, 1, 0
@@ -754,4 +754,4 @@ Music_Dungeon3_Ch4:: ; 7ece4 (1f:6ce4)
 	rest 16
 	rest 10
 	endchannel
-; 0x7ed0f
\ No newline at end of file
+; 0x7ed0f
diff --git a/audio/music/finalbattle.asm b/audio/music/finalbattle.asm
index 80882db7..eabc06ec 100644
--- a/audio/music/finalbattle.asm
+++ b/audio/music/finalbattle.asm
@@ -6,378 +6,378 @@ Music_FinalBattle_Ch1:: ; 233a6 (8:73a6)
 	toggleperfectpitch
 	notetype 12, 11, 2
 	octave 3
-	note F#, 1
-	note F_, 1
-	note F#, 1
-	note G_, 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
-	note G_, 1
+	F# 1
+	F_ 1
+	F# 1
+	G_ 1
+	F# 1
+	G_ 1
+	G# 1
+	G_ 1
 	notetype 12, 10, 2
-	note G#, 1
-	note A_, 1
-	note G#, 1
-	note A_, 1
-	note A#, 1
-	note A_, 1
-	note A#, 1
-	note B_, 1
+	G# 1
+	A_ 1
+	G# 1
+	A_ 1
+	A# 1
+	A_ 1
+	A# 1
+	B_ 1
 	notetype 12, 9, 2
-	note A#, 1
-	note B_, 1
+	A# 1
+	B_ 1
 	octave 4
-	note C_, 1
+	C_ 1
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C_, 1
-	note C#, 1
-	note C_, 1
-	note C#, 1
+	C_ 1
+	C# 1
+	C_ 1
+	C# 1
 	notetype 12, 8, 2
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
+	D_ 1
+	C# 1
+	D_ 1
+	D# 1
+	D_ 1
+	D# 1
+	E_ 1
+	D# 1
 	notetype 12, 12, 1
 	octave 3
-	note E_, 1
-	note E_, 7
-	note F_, 1
-	note F_, 7
-	note G_, 1
-	note G_, 7
-	note F_, 1
-	note F_, 7
-	note E_, 1
-	note E_, 7
-	note F_, 1
-	note F_, 7
-	note G_, 1
-	note G_, 7
-	note G#, 1
-	note G#, 3
-	note D#, 4
+	E_ 1
+	E_ 7
+	F_ 1
+	F_ 7
+	G_ 1
+	G_ 7
+	F_ 1
+	F_ 7
+	E_ 1
+	E_ 7
+	F_ 1
+	F_ 7
+	G_ 1
+	G_ 7
+	G# 1
+	G# 3
+	D# 4
 	notetype 12, 12, 1
-	note E_, 1
-	note E_, 3
+	E_ 1
+	E_ 3
 	notetype 12, 11, 3
-	note E_, 4
+	E_ 4
 	notetype 12, 12, 1
-	note F_, 1
-	note F_, 3
+	F_ 1
+	F_ 3
 	notetype 12, 11, 3
-	note F_, 4
+	F_ 4
 	notetype 12, 12, 1
-	note G_, 1
-	note G_, 3
+	G_ 1
+	G_ 3
 	notetype 12, 11, 3
-	note G_, 4
+	G_ 4
 	notetype 12, 12, 1
-	note F_, 1
-	note F_, 3
+	F_ 1
+	F_ 3
 	notetype 12, 11, 3
-	note F_, 4
+	F_ 4
 	notetype 12, 12, 1
-	note E_, 1
-	note E_, 3
+	E_ 1
+	E_ 3
 	notetype 12, 11, 3
-	note E_, 4
+	E_ 4
 	notetype 12, 12, 1
-	note F_, 1
-	note F_, 3
+	F_ 1
+	F_ 3
 	notetype 12, 11, 3
-	note F_, 4
+	F_ 4
 	notetype 12, 12, 1
-	note G_, 1
-	note G_, 3
+	G_ 1
+	G_ 3
 	notetype 12, 11, 3
-	note G_, 4
+	G_ 4
 	notetype 12, 12, 1
-	note G#, 1
-	note G#, 3
+	G# 1
+	G# 3
 	notetype 12, 11, 7
-	note D#, 4
+	D# 4
 
 Music_FinalBattle_branch_23429::
 	notetype 12, 11, 7
 	octave 3
-	note E_, 4
-	note B_, 4
-	note D#, 4
-	note A#, 4
-	note D_, 4
-	note A_, 4
+	E_ 4
+	B_ 4
+	D# 4
+	A# 4
+	D_ 4
+	A_ 4
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note F#, 4
-	note F_, 4
-	note F#, 4
+	F# 4
+	F_ 4
+	F# 4
 	notetype 12, 11, 1
-	note F#, 2
-	note F_, 1
-	note F#, 1
-	note A_, 1
-	note F#, 2
-	note F#, 1
+	F# 2
+	F_ 1
+	F# 1
+	A_ 1
+	F# 2
+	F# 1
 	notetype 12, 11, 7
 	octave 2
-	note B_, 6
+	B_ 6
 	notetype 12, 10, 0
 	octave 3
-	note D_, 6
+	D_ 6
 	notetype 12, 11, 7
-	note F#, 4
-	note E_, 4
-	note B_, 4
-	note D#, 4
-	note A#, 4
-	note D_, 4
-	note A_, 4
+	F# 4
+	E_ 4
+	B_ 4
+	D# 4
+	A# 4
+	D_ 4
+	A_ 4
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note F#, 4
-	note F_, 4
-	note F#, 12
-	note A#, 4
+	F# 4
+	F_ 4
+	F# 12
+	A# 4
 	notetype 12, 5, 14
-	note B_, 12
+	B_ 12
 	notetype 12, 11, 2
-	note E_, 3
-	note E_, 3
-	note E_, 2
-	note E_, 1
-	note F#, 1
-	note E_, 1
-	note B_, 1
-	note F#, 1
-	note E_, 1
-	note F#, 1
-	note B_, 1
-	note F#, 1
-	note E_, 1
-	note F#, 1
-	note B_, 1
-	note F#, 1
-	note E_, 1
-	note F#, 1
-	note B_, 1
-	note F#, 1
+	E_ 3
+	E_ 3
+	E_ 2
+	E_ 1
+	F# 1
+	E_ 1
+	B_ 1
+	F# 1
+	E_ 1
+	F# 1
+	B_ 1
+	F# 1
+	E_ 1
+	F# 1
+	B_ 1
+	F# 1
+	E_ 1
+	F# 1
+	B_ 1
+	F# 1
 	notetype 12, 12, 2
-	note E_, 1
-	note F#, 1
-	note B_, 1
-	note F#, 1
+	E_ 1
+	F# 1
+	B_ 1
+	F# 1
 	notetype 12, 13, 2
-	note E_, 1
-	note F#, 1
-	note B_, 1
+	E_ 1
+	F# 1
+	B_ 1
 	notetype 12, 12, 1
-	note E_, 1
-	note E_, 7
-	note E_, 1
-	note E_, 7
-	note E_, 1
-	note E_, 7
-	note E_, 1
-	note E_, 7
-	note E_, 1
-	note E_, 3
+	E_ 1
+	E_ 7
+	E_ 1
+	E_ 7
+	E_ 1
+	E_ 7
+	E_ 1
+	E_ 7
+	E_ 1
+	E_ 3
 	notetype 12, 11, 5
-	note D_, 4
+	D_ 4
 	notetype 12, 12, 1
-	note E_, 1
-	note E_, 3
+	E_ 1
+	E_ 3
 	notetype 12, 11, 5
-	note F_, 4
+	F_ 4
 	notetype 12, 12, 1
-	note E_, 1
-	note E_, 3
+	E_ 1
+	E_ 3
 	notetype 12, 11, 5
-	note D_, 4
+	D_ 4
 	notetype 12, 12, 1
-	note E_, 1
+	E_ 1
 	notetype 12, 11, 7
-	note E_, 7
+	E_ 7
 	notetype 12, 12, 1
-	note E_, 2
-	note B_, 1
-	note A_, 1
-	note E_, 2
-	note B_, 1
-	note A_, 1
-	note E_, 2
-	note B_, 1
-	note A_, 1
-	note E_, 2
-	note B_, 1
-	note A_, 3
-	note E_, 1
-	note D_, 3
-	note E_, 1
-	note D_, 3
-	note E_, 1
-	note D_, 3
-	note E_, 1
-	note D_, 1
-	note F_, 2
-	octave 4
-	note C_, 1
+	E_ 2
+	B_ 1
+	A_ 1
+	E_ 2
+	B_ 1
+	A_ 1
+	E_ 2
+	B_ 1
+	A_ 1
+	E_ 2
+	B_ 1
+	A_ 3
+	E_ 1
+	D_ 3
+	E_ 1
+	D_ 3
+	E_ 1
+	D_ 3
+	E_ 1
+	D_ 1
+	F_ 2
+	octave 4
+	C_ 1
 	octave 3
-	note B_, 1
-	note F_, 2
+	B_ 1
+	F_ 2
 	octave 4
-	note C_, 1
+	C_ 1
 	octave 3
-	note B_, 1
-	note F_, 2
+	B_ 1
+	F_ 2
 	octave 4
-	note C_, 1
+	C_ 1
 	octave 3
-	note B_, 1
-	note F_, 2
+	B_ 1
+	F_ 2
 	octave 4
-	note C_, 1
+	C_ 1
 	octave 3
-	note B_, 3
-	note F_, 1
-	note E_, 3
-	note F_, 1
-	note E_, 3
-	note F_, 1
-	note E_, 3
-	note F_, 1
-	note E_, 1
-	note F#, 2
-	octave 4
-	note C#, 1
-	note C_, 1
+	B_ 3
+	F_ 1
+	E_ 3
+	F_ 1
+	E_ 3
+	F_ 1
+	E_ 3
+	F_ 1
+	E_ 1
+	F# 2
+	octave 4
+	C# 1
+	C_ 1
 	octave 3
-	note F#, 2
+	F# 2
 	octave 4
-	note C#, 1
-	note C_, 1
+	C# 1
+	C_ 1
 	octave 3
-	note F#, 2
+	F# 2
 	octave 4
-	note C#, 1
-	note C_, 1
+	C# 1
+	C_ 1
 	octave 3
-	note F#, 2
+	F# 2
 	octave 4
-	note C#, 1
-	note C_, 3
+	C# 1
+	C_ 3
 	octave 3
-	note F#, 1
-	note F_, 3
-	note F#, 1
-	note F_, 3
-	note F#, 1
-	note F_, 3
-	note F#, 1
-	note F_, 3
-	note F#, 1
-	note F_, 3
-	note F#, 1
-	note F_, 3
-	note F#, 1
-	note F_, 3
+	F# 1
+	F_ 3
+	F# 1
+	F_ 3
+	F# 1
+	F_ 3
+	F# 1
+	F_ 3
+	F# 1
+	F_ 3
+	F# 1
+	F_ 3
+	F# 1
+	F_ 3
 	notetype 12, 11, 7
 	octave 4
-	note C_, 2
+	C_ 2
 	notetype 12, 11, 0
-	note C#, 8
+	C# 8
 	notetype 12, 11, 7
-	note C#, 8
+	C# 8
 	notetype 12, 10, 0
 	octave 3
-	note F#, 8
-	note F#, 8
+	F# 8
+	F# 8
 	notetype 12, 11, 0
 	octave 3
-	note A_, 8
+	A_ 8
 	notetype 12, 11, 7
-	note A_, 8
-	note G_, 4
-	note B_, 12
+	A_ 8
+	G_ 4
+	B_ 12
 	notetype 12, 11, 0
-	note A_, 8
+	A_ 8
 	notetype 12, 11, 7
-	note A_, 8
+	A_ 8
 	notetype 12, 11, 0
-	note E_, 8
+	E_ 8
 	notetype 12, 11, 7
-	note E_, 8
+	E_ 8
 	notetype 12, 11, 0
-	note A#, 8
+	A# 8
 	notetype 12, 11, 7
-	note A#, 8
+	A# 8
 	octave 4
-	note F_, 8
+	F_ 8
 	octave 3
-	note A#, 8
+	A# 8
 	octave 4
-	note C#, 4
-	note E_, 12
+	C# 4
+	E_ 12
 	octave 3
-	note A_, 4
+	A_ 4
 	octave 4
-	note C#, 12
+	C# 12
 	notetype 12, 4, 0
 	callchannel Music_FinalBattle_branch_23710
 	callchannel Music_FinalBattle_branch_23710
 	notetype 12, 11, 7
 	octave 3
-	note E_, 4
-	note B_, 4
-	note D#, 4
-	note A#, 4
-	note D_, 4
-	note A_, 4
+	E_ 4
+	B_ 4
+	D# 4
+	A# 4
+	D_ 4
+	A_ 4
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note F#, 4
-	note F_, 4
-	note F#, 12
+	F# 4
+	F_ 4
+	F# 12
 	notetype 12, 11, 0
-	note A_, 8
-	note G_, 8
+	A_ 8
+	G_ 8
 	notetype 12, 11, 7
-	note E_, 4
-	note B_, 4
-	note D#, 4
-	note A#, 4
-	note D_, 4
-	note A_, 4
+	E_ 4
+	B_ 4
+	D# 4
+	A# 4
+	D_ 4
+	A_ 4
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note F#, 4
-	note F_, 4
-	note F#, 12
+	F# 4
+	F_ 4
+	F# 12
 	notetype 12, 11, 0
-	note A_, 8
+	A_ 8
 	notetype 12, 11, 7
 	octave 4
-	note C_, 8
+	C_ 8
 	notetype 12, 11, 0
 	octave 3
-	note B_, 8
+	B_ 8
 	notetype 12, 11, 7
-	note B_, 8
+	B_ 8
 	notetype 12, 11, 0
 	octave 4
-	note E_, 8
+	E_ 8
 	notetype 12, 11, 7
-	note E_, 8
+	E_ 8
 	loopchannel 0, Music_FinalBattle_branch_23429
 
 
@@ -386,84 +386,84 @@ Music_FinalBattle_Ch2:: ; 2356a (8:756a)
 	vibrato 8, 2, 5
 	notetype 12, 12, 2
 	octave 5
-	note C_, 1
+	C_ 1
 	octave 4
-	note G#, 1
-	note B_, 1
-	note F#, 1
-	note A_, 1
-	note E_, 1
-	note G_, 1
+	G# 1
+	B_ 1
+	F# 1
+	A_ 1
+	E_ 1
+	G_ 1
 	octave 5
-	note C_, 1
+	C_ 1
 	octave 4
-	note F_, 1
-	note C#, 1
-	note E_, 1
-	note C_, 1
-	note D#, 1
+	F_ 1
+	C# 1
+	E_ 1
+	C_ 1
+	D# 1
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note D_, 1
+	D_ 1
 	octave 5
-	note C_, 1
+	C_ 1
 	octave 4
-	note C_, 1
+	C_ 1
 	octave 3
-	note G#, 1
-	note B_, 1
-	note F#, 1
-	note A#, 1
-	note F_, 1
-	note A_, 1
-	octave 5
-	note C_, 1
+	G# 1
+	B_ 1
+	F# 1
+	A# 1
+	F_ 1
+	A_ 1
+	octave 5
+	C_ 1
 	octave 3
-	note G#, 1
-	note D#, 1
-	note G_, 1
-	note D_, 1
-	note F_, 1
-	note C#, 1
-	note E_, 1
-	octave 5
-	note C_, 1
+	G# 1
+	D# 1
+	G_ 1
+	D_ 1
+	F_ 1
+	C# 1
+	E_ 1
+	octave 5
+	C_ 1
 	notetype 12, 12, 1
 	octave 4
-	note E_, 1
-	note E_, 7
-	note E_, 1
-	note E_, 7
-	note E_, 1
-	note E_, 7
-	note E_, 1
-	note E_, 7
-	note E_, 1
-	note E_, 3
+	E_ 1
+	E_ 7
+	E_ 1
+	E_ 7
+	E_ 1
+	E_ 7
+	E_ 1
+	E_ 7
+	E_ 1
+	E_ 3
 	notetype 12, 12, 2
 	octave 5
-	note E_, 4
+	E_ 4
 	notetype 12, 12, 1
 	octave 4
-	note E_, 1
-	note E_, 3
+	E_ 1
+	E_ 3
 	notetype 12, 12, 2
 	octave 5
-	note E_, 4
+	E_ 4
 	notetype 12, 12, 1
 	octave 4
-	note E_, 1
-	note E_, 3
+	E_ 1
+	E_ 3
 	notetype 12, 12, 2
 	octave 5
-	note E_, 4
+	E_ 4
 	notetype 12, 12, 1
 	octave 4
-	note E_, 1
-	note E_, 3
+	E_ 1
+	E_ 3
 	notetype 12, 12, 2
-	note D#, 4
+	D# 4
 	callchannel Music_FinalBattle_branch_23704
 	callchannel Music_FinalBattle_branch_23704
 	callchannel Music_FinalBattle_branch_23704
@@ -473,873 +473,873 @@ Music_FinalBattle_Ch2:: ; 2356a (8:756a)
 	callchannel Music_FinalBattle_branch_23704
 	notetype 12, 12, 1
 	octave 4
-	note E_, 1
-	note E_, 3
+	E_ 1
+	E_ 3
 	notetype 12, 4, 10
 	octave 3
-	note G#, 4
+	G# 4
 
 Music_FinalBattle_branch_235e6::
 	notetype 12, 13, 7
 	octave 4
-	note E_, 8
-	note D#, 8
-	note D_, 8
+	E_ 8
+	D# 8
+	D_ 8
 	octave 3
-	note B_, 8
+	B_ 8
 	notetype 12, 13, 7
-	note A#, 4
-	note B_, 12
+	A# 4
+	B_ 12
 	notetype 12, 11, 1
-	note F_, 2
-	note F#, 3
-	note A_, 1
-	note B_, 1
-	note A_, 1
+	F_ 2
+	F# 3
+	A_ 1
+	B_ 1
+	A_ 1
 	octave 4
-	note C_, 1
+	C_ 1
 	octave 3
-	note B_, 2
-	note A_, 1
-	note B_, 1
-	note B_, 1
-	note A_, 1
-	note A#, 1
+	B_ 2
+	A_ 1
+	B_ 1
+	B_ 1
+	A_ 1
+	A# 1
 	notetype 12, 13, 7
 	octave 4
-	note E_, 8
-	note D#, 8
-	note D_, 8
+	E_ 8
+	D# 8
+	D_ 8
 	octave 3
-	note B_, 8
+	B_ 8
 	notetype 12, 13, 7
-	note A#, 4
-	note B_, 12
+	A# 4
+	B_ 12
 	octave 4
-	note D#, 4
-	note E_, 12
+	D# 4
+	E_ 12
 	notetype 12, 10, 0
 	octave 3
-	note B_, 8
+	B_ 8
 	octave 4
-	note D_, 8
-	note F_, 8
-	note D_, 8
+	D_ 8
+	F_ 8
+	D_ 8
 	notetype 12, 13, 1
-	note E_, 1
-	note E_, 3
+	E_ 1
+	E_ 3
 	notetype 12, 12, 4
 	octave 3
-	note D_, 4
+	D_ 4
 	notetype 12, 13, 1
 	octave 4
-	note E_, 1
-	note E_, 3
+	E_ 1
+	E_ 3
 	notetype 12, 12, 4
 	octave 3
-	note F_, 4
+	F_ 4
 	notetype 12, 13, 1
 	octave 4
-	note E_, 1
-	note E_, 3
+	E_ 1
+	E_ 3
 	notetype 12, 12, 4
 	octave 3
-	note D_, 4
+	D_ 4
 	notetype 12, 13, 1
 	octave 4
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	notetype 12, 12, 4
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note D_, 2
+	D_ 2
 	notetype 12, 12, 2
 	octave 4
-	note E_, 1
-	note E_, 1
-	note D_, 1
-	note E_, 1
-	note F_, 1
-	note E_, 1
-	note D_, 1
-	note F_, 1
-	note E_, 1
-	note E_, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note F#, 1
-	note E_, 1
-	note E_, 1
-	note F_, 1
-	note E_, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
+	D_ 1
+	E_ 1
+	F_ 1
+	E_ 1
+	D_ 1
+	F_ 1
+	E_ 1
+	E_ 1
+	F# 1
+	F_ 1
+	E_ 1
+	D# 1
+	E_ 1
+	F# 1
+	E_ 1
+	E_ 1
+	F_ 1
+	E_ 1
+	D_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	E_ 1
 	notetype 12, 12, 4
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note D_, 2
+	D_ 2
 	notetype 12, 13, 7
 	octave 4
-	note E_, 4
-	note F_, 2
-	note F#, 12
+	E_ 4
+	F_ 2
+	F# 12
 	notetype 12, 12, 2
 	octave 3
-	note B_, 2
-	note B_, 4
-	note B_, 2
-	note B_, 4
-	note B_, 2
+	B_ 2
+	B_ 4
+	B_ 2
+	B_ 4
+	B_ 2
 	notetype 12, 13, 7
 	octave 4
-	note F_, 4
-	note F#, 2
-	note G_, 12
+	F_ 4
+	F# 2
+	G_ 12
 	notetype 12, 12, 2
-	note C_, 2
-	note C_, 4
-	note C_, 2
-	note C_, 4
-	note C_, 2
+	C_ 2
+	C_ 4
+	C_ 2
+	C_ 4
+	C_ 2
 	notetype 12, 13, 7
-	note F#, 4
-	note G_, 2
-	note G#, 12
+	F# 4
+	G_ 2
+	G# 12
 	notetype 12, 8, 2
-	note C#, 2
-	note C#, 4
+	C# 2
+	C# 4
 	notetype 12, 10, 2
-	note C#, 2
-	note C#, 4
-	note C#, 4
+	C# 2
+	C# 4
+	C# 4
 	notetype 12, 13, 2
-	note C#, 2
-	note C#, 4
+	C# 2
+	C# 4
 	notetype 12, 15, 2
-	note C#, 2
-	note C#, 4
+	C# 2
+	C# 4
 	notetype 12, 12, 4
-	note E_, 1
-	note F_, 1
+	E_ 1
+	F_ 1
 	notetype 12, 12, 0
-	note F#, 12
+	F# 12
 	notetype 12, 12, 7
-	note F#, 4
+	F# 4
 	notetype 12, 1, 15
 	octave 3
-	note F#, 8
+	F# 8
 	notetype 12, 9, 0
-	note F#, 8
+	F# 8
 	notetype 12, 12, 7
 	octave 4
-	note C#, 4
+	C# 4
 	notetype 12, 12, 0
-	note D_, 12
-	note D_, 8
+	D_ 12
+	D_ 8
 	notetype 12, 12, 7
-	note D_, 8
+	D_ 8
 	notetype 12, 12, 0
-	note E_, 8
+	E_ 8
 	notetype 12, 12, 7
-	note E_, 8
+	E_ 8
 	notetype 12, 12, 0
 	octave 3
-	note A_, 8
+	A_ 8
 	notetype 12, 12, 7
-	note A_, 8
+	A_ 8
 	notetype 12, 12, 0
 	octave 4
-	note F_, 8
+	F_ 8
 	notetype 12, 12, 7
-	note F_, 8
+	F_ 8
 	octave 5
-	note C_, 8
+	C_ 8
 	octave 4
-	note A#, 8
+	A# 8
 	notetype 12, 12, 0
-	note A_, 16
-	note A_, 8
+	A_ 16
+	A_ 8
 	notetype 12, 12, 7
-	note A_, 8
+	A_ 8
 	notetype 12, 12, 5
 	callchannel Music_FinalBattle_branch_23710
 	notetype 12, 11, 1
 	callchannel Music_FinalBattle_branch_23710
 	notetype 12, 13, 7
 	octave 4
-	note E_, 8
-	note D#, 8
-	note D_, 8
+	E_ 8
+	D# 8
+	D_ 8
 	octave 3
-	note B_, 8
-	note A#, 4
-	note B_, 12
+	B_ 8
+	A# 4
+	B_ 12
 	notetype 12, 12, 7
 	octave 4
-	note D_, 8
+	D_ 8
 	notetype 12, 4, 12
-	note C_, 8
+	C_ 8
 	notetype 12, 13, 7
-	note E_, 8
-	note D#, 8
-	note D_, 8
+	E_ 8
+	D# 8
+	D_ 8
 	octave 3
-	note B_, 8
-	note A#, 4
-	note B_, 12
+	B_ 8
+	A# 4
+	B_ 12
 	notetype 12, 5, 13
 	octave 4
-	note D_, 8
+	D_ 8
 	notetype 12, 12, 0
-	note F_, 8
+	F_ 8
 	notetype 12, 12, 0
-	note E_, 8
+	E_ 8
 	notetype 12, 12, 7
-	note E_, 8
-	note A#, 4
-	note B_, 12
+	E_ 8
+	A# 4
+	B_ 12
 	loopchannel 0, Music_FinalBattle_branch_235e6
 
 Music_FinalBattle_branch_23704::
 	octave 4
-	note E_, 1
-	note E_, 1
-	note G_, 1
+	E_ 1
+	E_ 1
+	G_ 1
 	octave 5
-	note C_, 1
-	note E_, 1
-	note C_, 1
+	C_ 1
+	E_ 1
+	C_ 1
 	octave 4
-	note G_, 1
-	note F_, 1
+	G_ 1
+	F_ 1
 	endchannel
 
 Music_FinalBattle_branch_23710::
 	octave 4
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D_, 2
-	note C#, 2
-	note F#, 2
-	note D_, 2
+	C# 2
+	D_ 2
+	C# 2
+	F# 2
+	D_ 2
 	endchannel
 
 
 Music_FinalBattle_Ch3:: ; 2371c (8:771c)
 	notetype 12, 1, 1
 	octave 4
-	note E_, 4
+	E_ 4
 	octave 5
-	note E_, 4
+	E_ 4
 	octave 4
-	note F_, 4
+	F_ 4
 	octave 5
-	note D#, 4
+	D# 4
 	octave 4
-	note G_, 4
+	G_ 4
 	octave 5
-	note D_, 4
+	D_ 4
 	octave 4
-	note G#, 4
-	note B_, 4
-	note E_, 1
-	note E_, 1
+	G# 4
+	B_ 4
+	E_ 1
+	E_ 1
 	rest 6
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	rest 6
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	rest 6
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	rest 2
-	note D#, 4
-	note E_, 1
-	note E_, 1
+	D# 4
+	E_ 1
+	E_ 1
 	rest 2
-	note B_, 4
-	note E_, 1
-	note E_, 1
+	B_ 4
+	E_ 1
+	E_ 1
 	rest 2
 	octave 5
-	note C_, 4
+	C_ 4
 	octave 4
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	rest 2
 	octave 5
-	note D_, 4
+	D_ 4
 	octave 4
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	octave 5
-	note C_, 4
+	C_ 4
 	octave 4
-	note A#, 2
-	note E_, 1
-	note E_, 1
+	A# 2
+	E_ 1
+	E_ 1
 	rest 2
-	note B_, 4
-	note E_, 1
-	note E_, 1
+	B_ 4
+	E_ 1
+	E_ 1
 	rest 2
 	octave 5
-	note C_, 4
+	C_ 4
 	octave 4
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	rest 2
 	octave 5
-	note D_, 4
+	D_ 4
 	octave 4
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	octave 5
-	note C_, 4
-	note D_, 2
+	C_ 4
+	D_ 2
 	octave 4
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	rest 2
-	note B_, 4
-	note E_, 1
-	note E_, 1
+	B_ 4
+	E_ 1
+	E_ 1
 	rest 2
 	octave 5
-	note C_, 4
+	C_ 4
 	octave 4
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	rest 2
 	octave 5
-	note D_, 4
+	D_ 4
 	octave 4
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	rest 2
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note G_, 1
+	E_ 1
+	D# 1
+	E_ 1
+	G_ 1
 
 Music_FinalBattle_branch_2377d::
 	octave 4
-	note E_, 1
+	E_ 1
 	octave 3
-	note E_, 1
+	E_ 1
 	rest 2
 	octave 4
-	note F#, 4
-	note D#, 1
+	F# 4
+	D# 1
 	octave 3
-	note D#, 1
+	D# 1
 	rest 2
 	octave 4
-	note F_, 4
-	note D_, 1
+	F_ 4
+	D_ 1
 	octave 3
-	note D_, 1
+	D_ 1
 	rest 2
 	octave 4
-	note E_, 4
-	note F#, 1
+	E_ 4
+	F# 1
 	octave 3
-	note F#, 1
+	F# 1
 	rest 2
 	octave 4
-	note F#, 4
-	note F_, 4
+	F# 4
+	F_ 4
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
-	note E_, 1
+	F# 2
+	E_ 1
 	octave 3
-	note E_, 1
+	E_ 1
 	rest 2
 	octave 4
-	note F#, 4
-	note D#, 1
+	F# 4
+	D# 1
 	octave 3
-	note D#, 1
+	D# 1
 	rest 2
 	octave 4
-	note F_, 4
-	note D_, 1
+	F_ 4
+	D_ 1
 	octave 3
-	note D_, 1
+	D_ 1
 	rest 2
 	octave 4
-	note E_, 4
-	note F#, 1
+	E_ 4
+	F# 1
 	octave 3
-	note F#, 1
+	F# 1
 	rest 2
 	octave 4
-	note F#, 4
-	note F_, 4
+	F# 4
+	F_ 4
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
-	octave 4
-	note F#, 2
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note F#, 1
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 1
-	note E_, 1
+	B_ 2
+	octave 4
+	F# 2
+	E_ 1
+	D# 1
+	E_ 1
+	F# 1
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 1
+	E_ 1
 	rest 2
-	note D_, 4
-	note E_, 1
-	note E_, 1
+	D_ 4
+	E_ 1
+	E_ 1
 	rest 2
-	note F_, 4
-	note E_, 1
-	note E_, 1
+	F_ 4
+	E_ 1
+	E_ 1
 	rest 2
-	note D_, 4
-	note E_, 1
-	note E_, 1
+	D_ 4
+	E_ 1
+	E_ 1
 	octave 3
-	note B_, 6
+	B_ 6
 	octave 4
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
 	rest 2
-	note D_, 4
-	note E_, 1
-	note E_, 1
+	D_ 4
+	E_ 1
+	E_ 1
 	rest 2
-	note F_, 4
-	note E_, 1
-	note E_, 1
+	F_ 4
+	E_ 1
+	E_ 1
 	rest 2
-	note D_, 4
-	note E_, 1
-	note E_, 1
+	D_ 4
+	E_ 1
+	E_ 1
 	octave 3
-	note B_, 6
+	B_ 6
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note E_, 2
-	note B_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note B_, 2
+	E_ 2
+	B_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	B_ 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note B_, 2
-	note F_, 2
+	B_ 2
+	F_ 2
 	octave 5
-	note D#, 2
+	D# 2
 	octave 4
-	note F_, 2
+	F_ 2
 	octave 5
-	note D#, 2
+	D# 2
 	octave 4
-	note F_, 2
+	F_ 2
 	octave 5
-	note D#, 2
+	D# 2
 	octave 4
-	note F_, 2
+	F_ 2
 	octave 5
-	note D#, 2
+	D# 2
 	octave 4
-	note F_, 2
+	F_ 2
 	octave 5
-	note C_, 2
-	note C_, 2
+	C_ 2
+	C_ 2
 	octave 4
-	note F_, 2
+	F_ 2
 	octave 5
-	note C_, 2
-	note C_, 2
-	note D_, 2
-	note C_, 2
+	C_ 2
+	C_ 2
+	D_ 2
+	C_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note E_, 2
+	E_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note E_, 2
+	E_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note E_, 2
+	E_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note E_, 2
+	E_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note C#, 2
-	note C#, 2
+	C# 2
+	C# 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note C#, 2
-	note C#, 2
-	note E_, 2
-	note C#, 2
+	C# 2
+	C# 2
+	E_ 2
+	C# 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note C#, 2
-	note C#, 2
+	C# 2
+	C# 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note C#, 2
-	note C#, 2
-	note E_, 2
-	note C#, 2
+	C# 2
+	C# 2
+	E_ 2
+	C# 2
 	callchannel Music_FinalBattle_branch_2395b
 	callchannel Music_FinalBattle_branch_2395b
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
+	G_ 1
+	F# 1
+	G_ 1
+	G# 1
 	callchannel Music_FinalBattle_branch_2396c
 	callchannel Music_FinalBattle_branch_2396c
 	octave 4
-	note A#, 2
+	A# 2
 	octave 5
-	note F_, 2
+	F_ 2
 	octave 4
-	note A#, 2
+	A# 2
 	octave 5
-	note F_, 2
+	F_ 2
 	octave 4
-	note A#, 2
+	A# 2
 	octave 5
-	note F_, 2
+	F_ 2
 	octave 4
-	note A#, 2
+	A# 2
 	octave 5
-	note F_, 2
+	F_ 2
 	octave 4
-	note A#, 2
+	A# 2
 	octave 5
-	note F_, 2
-	note G_, 2
-	note F_, 2
-	note E_, 2
-	note D_, 2
-	note C#, 2
+	F_ 2
+	G_ 2
+	F_ 2
+	E_ 2
+	D_ 2
+	C# 2
 	octave 4
-	note A#, 2
-	note A_, 2
+	A# 2
+	A_ 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note A_, 2
+	A_ 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note A_, 2
+	A_ 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note A_, 2
+	A_ 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note A_, 2
+	A_ 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note A_, 2
+	A_ 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note A_, 2
+	A_ 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note A_, 2
-	note G#, 2
-	note G_, 2
+	A_ 2
+	G# 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note F_, 2
-	note F#, 2
-	note G_, 2
-	note F#, 2
-	note B_, 2
-	note F#, 2
-	note B_, 2
-	note F#, 2
-	note B_, 2
-	note F#, 2
-	note B_, 2
-	note F#, 2
-	note B_, 2
-	note F#, 2
-	note B_, 2
-	note F#, 2
-	note B_, 2
-	note F#, 2
-	note D#, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note F_, 2
-	note F#, 2
-	note G_, 2
-	note F#, 2
+	G_ 1
+	F# 1
+	G_ 1
+	G# 1
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	F_ 2
+	F# 2
+	G_ 2
+	F# 2
+	B_ 2
+	F# 2
+	B_ 2
+	F# 2
+	B_ 2
+	F# 2
+	B_ 2
+	F# 2
+	B_ 2
+	F# 2
+	B_ 2
+	F# 2
+	B_ 2
+	F# 2
+	D# 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	F_ 2
+	F# 2
+	G_ 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note F#, 2
-	note F_, 2
-	note E_, 2
-	note B_, 2
-	octave 5
-	note E_, 4
-	octave 4
-	note E_, 2
-	note B_, 2
-	octave 5
-	note D#, 4
-	octave 4
-	note E_, 2
-	note B_, 2
-	octave 5
-	note D_, 4
-	octave 4
-	note E_, 2
-	note A_, 2
-	note B_, 4
+	F# 2
+	F_ 2
+	E_ 2
+	B_ 2
+	octave 5
+	E_ 4
+	octave 4
+	E_ 2
+	B_ 2
+	octave 5
+	D# 4
+	octave 4
+	E_ 2
+	B_ 2
+	octave 5
+	D_ 4
+	octave 4
+	E_ 2
+	A_ 2
+	B_ 4
 	loopchannel 0, Music_FinalBattle_branch_2377d
 
 Music_FinalBattle_branch_2395b::
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note C#, 2
+	C# 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 5
-	note C#, 2
+	C# 2
 	endchannel
 
 Music_FinalBattle_branch_2396c::
 	octave 4
-	note A_, 2
+	A_ 2
 	octave 5
-	note E_, 2
+	E_ 2
 	octave 4
-	note A_, 2
+	A_ 2
 	octave 5
-	note E_, 2
+	E_ 2
 	octave 4
-	note A_, 2
+	A_ 2
 	octave 5
-	note E_, 2
+	E_ 2
 	octave 4
-	note A_, 2
+	A_ 2
 	octave 5
-	note E_, 2
+	E_ 2
 	endchannel
-; 0x2397d
\ No newline at end of file
+; 0x2397d
diff --git a/audio/music/gamecorner.asm b/audio/music/gamecorner.asm
index 33a49243..a80652e3 100644
--- a/audio/music/gamecorner.asm
+++ b/audio/music/gamecorner.asm
@@ -6,180 +6,180 @@ Music_GameCorner_Ch1:: ; 7e20b (1f:620b)
 	toggleperfectpitch
 	notetype 12, 11, 5
 	octave 3
-	note A_, 6
+	A_ 6
 	notetype 12, 11, 1
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note D#, 2
-	note C#, 2
-	note D#, 16
+	G# 2
+	F# 2
+	E_ 2
+	D# 2
+	C# 2
+	D# 16
 
 Music_GameCorner_branch_7e222::
 	notetype 12, 11, 5
 	octave 3
-	note C#, 4
+	C# 4
 	octave 2
-	note G#, 4
+	G# 4
 	octave 3
-	note E_, 4
+	E_ 4
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note A_, 2
-	note G#, 8
+	A_ 2
+	G# 8
 	notetype 12, 10, 7
-	note G#, 2
-	note A_, 2
-	note B_, 2
+	G# 2
+	A_ 2
+	B_ 2
 	notetype 12, 11, 5
-	note G#, 6
-	note E_, 2
-	note F#, 2
-	note E_, 2
-	note D#, 2
-	note E_, 2
+	G# 6
+	E_ 2
+	F# 2
+	E_ 2
+	D# 2
+	E_ 2
 	notetype 12, 10, 7
-	note F#, 8
-	note D#, 8
+	F# 8
+	D# 8
 	notetype 12, 11, 5
-	note D#, 4
+	D# 4
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note F#, 4
-	note D#, 4
-	note B_, 2
-	note A_, 8
+	F# 4
+	D# 4
+	B_ 2
+	A_ 8
 	notetype 12, 11, 7
 	octave 4
-	note E_, 2
-	note D#, 2
-	note E_, 2
-	note D#, 6
-	note C#, 2
-	octave 3
-	note D#, 2
-	note E_, 2
-	note F#, 2
-	note G_, 2
-	note G#, 2
+	E_ 2
+	D# 2
+	E_ 2
+	D# 6
+	C# 2
+	octave 3
+	D# 2
+	E_ 2
+	F# 2
+	G_ 2
+	G# 2
 	notetype 12, 9, 7
-	note G#, 1
-	note G_, 1
-	note G#, 1
-	note G_, 1
-	note G#, 2
+	G# 1
+	G_ 1
+	G# 1
+	G_ 1
+	G# 2
 	notetype 12, 11, 7
-	note F#, 8
+	F# 8
 	notetype 12, 11, 5
-	note C#, 4
+	C# 4
 	octave 2
-	note G#, 4
+	G# 4
 	octave 3
-	note E_, 4
+	E_ 4
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note A_, 2
-	note G#, 8
+	A_ 2
+	G# 8
 	notetype 12, 11, 7
-	note G#, 2
-	note A_, 2
-	note B_, 2
-	note G#, 6
-	note E_, 2
-	note F#, 2
-	note E_, 2
-	note D#, 2
-	note E_, 2
-	note F#, 8
+	G# 2
+	A_ 2
+	B_ 2
+	G# 6
+	E_ 2
+	F# 2
+	E_ 2
+	D# 2
+	E_ 2
+	F# 8
 	notetype 12, 9, 7
-	note D#, 4
-	note C#, 4
+	D# 4
+	C# 4
 	notetype 12, 11, 5
-	note D#, 4
+	D# 4
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note F#, 4
-	note D#, 4
-	note B_, 2
-	note A_, 8
+	F# 4
+	D# 4
+	B_ 2
+	A_ 8
 	notetype 12, 11, 7
-	note F#, 2
-	note G#, 2
-	note A_, 2
-	note B_, 4
-	note A_, 4
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
+	F# 2
+	G# 2
+	A_ 2
+	B_ 4
+	A_ 4
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
 	notetype 12, 12, 2
-	note E_, 4
+	E_ 4
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note E_, 2
-	note E_, 4
-	note E_, 4
+	E_ 2
+	E_ 4
+	E_ 4
 	notetype 12, 11, 7
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note C#, 2
-	note D_, 2
-	note D#, 10
+	C# 2
+	D_ 2
+	D# 10
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note C#, 2
-	note D#, 2
-	note E_, 8
+	C# 2
+	D# 2
+	E_ 8
 	notetype 12, 11, 5
 	octave 4
-	note D#, 4
+	D# 4
 	octave 3
-	note B_, 4
-	note F#, 4
-	note D#, 4
+	B_ 4
+	F# 4
+	D# 4
 	notetype 12, 11, 7
-	note E_, 3
-	note D#, 1
+	E_ 3
+	D# 1
 	notetype 12, 11, 2
-	note C#, 2
-	note D#, 2
-	note E_, 10
+	C# 2
+	D# 2
+	E_ 10
 	notetype 12, 11, 7
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note C#, 2
-	note D_, 2
-	note D#, 10
+	C# 2
+	D_ 2
+	D# 10
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note C#, 2
-	note D#, 2
-	note E_, 8
+	C# 2
+	D# 2
+	E_ 8
 	notetype 12, 11, 5
 	octave 4
-	note D#, 4
+	D# 4
 	octave 3
-	note B_, 4
-	note F#, 4
-	note A_, 4
+	B_ 4
+	F# 4
+	A_ 4
 	notetype 12, 11, 7
-	note G#, 2
-	note G#, 1
-	note G_, 1
-	note G#, 1
-	note G_, 1
-	note G#, 1
-	note G_, 1
-	note G#, 8
+	G# 2
+	G# 1
+	G_ 1
+	G# 1
+	G_ 1
+	G# 1
+	G_ 1
+	G# 8
 	loopchannel 0, Music_GameCorner_branch_7e222
 
 
@@ -188,186 +188,186 @@ Music_GameCorner_Ch2:: ; 7e2df (1f:62df)
 	vibrato 10, 2, 3
 	notetype 12, 12, 6
 	octave 4
-	note C#, 6
+	C# 6
 	notetype 12, 12, 1
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note F#, 2
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	F# 2
 	duty 3
-	note B_, 1
-	note A#, 1
-	note B_, 1
-	note A#, 1
-	note B_, 1
-	note A#, 1
-	note B_, 8
+	B_ 1
+	A# 1
+	B_ 1
+	A# 1
+	B_ 1
+	A# 1
+	B_ 8
 
 Music_GameCorner_branch_7e2fa::
 	duty 2
 	notetype 12, 12, 7
 	octave 3
-	note E_, 4
+	E_ 4
 	octave 2
-	note B_, 4
-	octave 3
-	note G#, 4
-	note E_, 4
-	octave 4
-	note C#, 2
-	octave 3
-	note B_, 14
-	octave 4
-	note E_, 6
-	note D#, 2
-	note C#, 2
-	octave 3
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 16
-	note F#, 4
-	note D#, 4
-	note A_, 4
-	note F#, 4
-	octave 4
-	note D#, 2
-	note C#, 14
-	note F#, 6
-	note E_, 2
-	note D#, 2
-	note C#, 2
-	octave 3
-	note B_, 2
-	note A#, 2
-	note B_, 16
-	note E_, 4
+	B_ 4
+	octave 3
+	G# 4
+	E_ 4
+	octave 4
+	C# 2
+	octave 3
+	B_ 14
+	octave 4
+	E_ 6
+	D# 2
+	C# 2
+	octave 3
+	B_ 2
+	A_ 2
+	G# 2
+	A_ 16
+	F# 4
+	D# 4
+	A_ 4
+	F# 4
+	octave 4
+	D# 2
+	C# 14
+	F# 6
+	E_ 2
+	D# 2
+	C# 2
+	octave 3
+	B_ 2
+	A# 2
+	B_ 16
+	E_ 4
 	octave 2
-	note B_, 4
-	octave 3
-	note G#, 4
-	note E_, 4
-	octave 4
-	note C#, 2
-	octave 3
-	note B_, 14
-	octave 4
-	note E_, 6
-	note D#, 2
-	note C#, 2
-	octave 3
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 16
-	note F#, 4
-	note D#, 4
-	note A_, 4
-	note F#, 4
-	octave 4
-	note D#, 2
-	note C#, 14
-	note F#, 6
-	note E_, 2
-	note D#, 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
+	B_ 4
+	octave 3
+	G# 4
+	E_ 4
+	octave 4
+	C# 2
+	octave 3
+	B_ 14
+	octave 4
+	E_ 6
+	D# 2
+	C# 2
+	octave 3
+	B_ 2
+	A_ 2
+	G# 2
+	A_ 16
+	F# 4
+	D# 4
+	A_ 4
+	F# 4
+	octave 4
+	D# 2
+	C# 14
+	F# 6
+	E_ 2
+	D# 2
+	E_ 2
+	F# 2
+	G# 2
 	notetype 12, 12, 1
-	note E_, 2
+	E_ 2
 	notetype 12, 10, 1
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note E_, 2
+	E_ 1
+	D# 1
+	E_ 1
+	D# 1
+	E_ 1
+	D# 1
+	E_ 2
 	notetype 12, 12, 7
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D_, 2
-	note D#, 10
+	C# 2
+	D_ 2
+	D# 10
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D#, 2
-	note E_, 10
+	C# 2
+	D# 2
+	E_ 10
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D#, 2
+	C# 2
+	D# 2
 	notetype 12, 12, 5
-	note F#, 4
-	note D#, 4
+	F# 4
+	D# 4
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note A_, 4
-	note G#, 3
-	note A_, 1
+	A_ 4
+	G# 3
+	A_ 1
 	notetype 12, 12, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
+	G# 2
+	F# 2
+	E_ 2
 	notetype 12, 12, 7
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D_, 2
-	note D#, 10
+	C# 2
+	D_ 2
+	D# 10
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D#, 2
-	note E_, 10
+	C# 2
+	D# 2
+	E_ 10
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D#, 2
-	note F#, 4
-	note D#, 4
-	note A_, 4
-	note F#, 4
-	note B_, 16
+	C# 2
+	D# 2
+	F# 4
+	D# 4
+	A_ 4
+	F# 4
+	B_ 16
 	loopchannel 0, Music_GameCorner_branch_7e2fa
 
 
 Music_GameCorner_Ch3:: ; 7e38b (1f:638b)
 	notetype 12, 1, 3
 	octave 5
-	note C#, 1
+	C# 1
 	rest 5
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 9
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note C#, 1
+	C# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
 
 Music_GameCorner_branch_7e3a5::
@@ -378,23 +378,23 @@ Music_GameCorner_branch_7e3a5::
 	callchannel Music_GameCorner_branch_7e46c
 	callchannel Music_GameCorner_branch_7e481
 	callchannel Music_GameCorner_branch_7e496
-	note D#, 1
+	D# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note A_, 1
+	A_ 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
 	callchannel Music_GameCorner_branch_7e418
 	callchannel Music_GameCorner_branch_7e42d
@@ -403,38 +403,38 @@ Music_GameCorner_branch_7e3a5::
 	callchannel Music_GameCorner_branch_7e46c
 	callchannel Music_GameCorner_branch_7e481
 	callchannel Music_GameCorner_branch_7e496
-	note E_, 1
+	E_ 1
 	rest 3
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 3
 	octave 4
-	note E_, 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 3
-	note B_, 1
+	B_ 1
 	rest 1
 	callchannel Music_GameCorner_branch_7e46c
 	callchannel Music_GameCorner_branch_7e418
 	callchannel Music_GameCorner_branch_7e4ab
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note G#, 1
+	G# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
 	callchannel Music_GameCorner_branch_7e46c
 	callchannel Music_GameCorner_branch_7e418
@@ -443,186 +443,186 @@ Music_GameCorner_branch_7e3a5::
 	loopchannel 0, Music_GameCorner_branch_7e3a5
 
 Music_GameCorner_branch_7e418::
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note G#, 1
+	G# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note G#, 1
+	G# 1
 	rest 1
 	endchannel
 
 Music_GameCorner_branch_7e42d::
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note G#, 1
+	G# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note C#, 1
+	C# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
 	endchannel
 
 Music_GameCorner_branch_7e442::
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 1
 	endchannel
 
 Music_GameCorner_branch_7e457::
-	note D#, 1
+	D# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note A_, 1
+	A_ 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note A_, 1
+	A_ 1
 	rest 1
 	endchannel
 
 Music_GameCorner_branch_7e46c::
-	note D#, 1
+	D# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	endchannel
 
 Music_GameCorner_branch_7e481::
-	note D#, 1
+	D# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note C#, 1
+	C# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
 	endchannel
 
 Music_GameCorner_branch_7e496::
-	note F#, 1
+	F# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 1
 	endchannel
 
 Music_GameCorner_branch_7e4ab::
-	note F#, 1
+	F# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note A_, 1
+	A_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note A_, 1
+	A_ 1
 	rest 1
 	endchannel
-; 0x7e4c0
\ No newline at end of file
+; 0x7e4c0
diff --git a/audio/music/gym.asm b/audio/music/gym.asm
index 44cc0cb8..b4cb2a8d 100644
--- a/audio/music/gym.asm
+++ b/audio/music/gym.asm
@@ -6,162 +6,162 @@ Music_Gym_Ch1:: ; bcbb (2:7cbb)
 	toggleperfectpitch
 	notetype 12, 11, 5
 	octave 3
-	note G_, 6
-	note C_, 1
-	note G_, 1
-	note F_, 6
+	G_ 6
+	C_ 1
+	G_ 1
+	F_ 6
 	octave 2
-	note A#, 1
+	A# 1
 	octave 3
-	note F_, 1
-	note E_, 6
+	F_ 1
+	E_ 6
 	octave 2
-	note A_, 1
+	A_ 1
 	octave 3
-	note E_, 1
-	note F_, 4
-	note G_, 4
+	E_ 1
+	F_ 4
+	G_ 4
 
 Music_Gym_branch_bcd8::
-	note E_, 4
-	note F_, 2
-	note G_, 2
-	note F_, 2
-	note E_, 2
-	note D_, 2
-	note C_, 2
+	E_ 4
+	F_ 2
+	G_ 2
+	F_ 2
+	E_ 2
+	D_ 2
+	C_ 2
 	notetype 12, 11, 1
-	note D_, 3
+	D_ 3
 	notetype 12, 11, 5
-	note E_, 1
-	note F_, 4
-	note E_, 2
-	note D_, 2
-	note E_, 2
-	note F_, 2
-	note E_, 4
-	note F_, 2
-	note G_, 2
-	note F_, 2
-	note E_, 2
-	note D_, 2
-	note C_, 2
-	note D_, 2
-	note D_, 1
-	note E_, 1
-	note F_, 4
-	note E_, 2
-	note D_, 2
-	note E_, 2
-	note F_, 2
+	E_ 1
+	F_ 4
+	E_ 2
+	D_ 2
+	E_ 2
+	F_ 2
+	E_ 4
+	F_ 2
+	G_ 2
+	F_ 2
+	E_ 2
+	D_ 2
+	C_ 2
+	D_ 2
+	D_ 1
+	E_ 1
+	F_ 4
+	E_ 2
+	D_ 2
+	E_ 2
+	F_ 2
 	octave 4
-	note C_, 4
+	C_ 4
 	octave 3
-	note A#, 2
+	A# 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note A#, 2
-	note A_, 2
-	note G_, 2
-	note F_, 2
+	A# 2
+	A_ 2
+	G_ 2
+	F_ 2
 	notetype 12, 11, 1
-	note A#, 3
+	A# 3
 	notetype 12, 11, 5
-	note F_, 1
-	note F_, 4
-	note E_, 2
-	note D_, 2
-	note E_, 2
-	note F_, 2
+	F_ 1
+	F_ 4
+	E_ 2
+	D_ 2
+	E_ 2
+	F_ 2
 	octave 4
-	note C_, 4
+	C_ 4
 	octave 3
-	note A#, 2
+	A# 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note A#, 2
-	note A_, 2
-	note G_, 2
-	note F_, 2
-	note D_, 2
-	note D_, 1
-	note E_, 1
-	note F_, 4
-	note A#, 2
-	note F_, 1
-	note A#, 1
+	A# 2
+	A_ 2
+	G_ 2
+	F_ 2
+	D_ 2
+	D_ 1
+	E_ 1
+	F_ 4
+	A# 2
+	F_ 1
+	A# 1
 	octave 4
-	note D_, 4
+	D_ 4
 	octave 3
-	note E_, 2
-	note C_, 2
-	note E_, 2
-	note G_, 2
-	note F_, 2
-	note E_, 2
-	note D_, 2
-	note E_, 2
-	note F_, 2
-	note D_, 2
-	note E_, 2
-	note C_, 2
-	note D_, 2
-	note E_, 2
-	note C_, 2
-	note D_, 2
-	note C_, 2
-	note C_, 1
-	note D_, 1
-	note E_, 4
-	note C_, 2
-	note E_, 2
-	note D_, 2
-	note C_, 2
-	note E_, 2
-	note C_, 1
-	note E_, 1
-	note F_, 4
-	note E_, 2
-	note D_, 2
-	note E_, 2
-	note F_, 2
-	note E_, 2
-	note C_, 2
-	note E_, 2
-	note G_, 2
-	note F_, 2
-	note E_, 2
-	note D_, 2
-	note E_, 2
-	note D_, 2
-	note F_, 2
-	note D_, 2
-	note E_, 2
-	note C_, 2
-	note D_, 2
-	note C_, 2
-	note D_, 2
-	note C_, 2
-	note C_, 1
-	note D_, 1
-	note E_, 4
-	note D_, 2
-	note E_, 2
-	note F_, 2
-	note F_, 2
-	note G_, 2
-	note E_, 1
-	note G_, 1
-	note A#, 2
+	E_ 2
+	C_ 2
+	E_ 2
+	G_ 2
+	F_ 2
+	E_ 2
+	D_ 2
+	E_ 2
+	F_ 2
+	D_ 2
+	E_ 2
+	C_ 2
+	D_ 2
+	E_ 2
+	C_ 2
+	D_ 2
+	C_ 2
+	C_ 1
+	D_ 1
+	E_ 4
+	C_ 2
+	E_ 2
+	D_ 2
+	C_ 2
+	E_ 2
+	C_ 1
+	E_ 1
+	F_ 4
+	E_ 2
+	D_ 2
+	E_ 2
+	F_ 2
+	E_ 2
+	C_ 2
+	E_ 2
+	G_ 2
+	F_ 2
+	E_ 2
+	D_ 2
+	E_ 2
+	D_ 2
+	F_ 2
+	D_ 2
+	E_ 2
+	C_ 2
+	D_ 2
+	C_ 2
+	D_ 2
+	C_ 2
+	C_ 1
+	D_ 1
+	E_ 4
+	D_ 2
+	E_ 2
+	F_ 2
+	F_ 2
+	G_ 2
+	E_ 1
+	G_ 1
+	A# 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note A#, 2
-	note A_, 2
-	note G_, 2
-	note A_, 2
+	A# 2
+	A_ 2
+	G_ 2
+	A_ 2
 	loopchannel 0, Music_Gym_branch_bcd8
 
 
@@ -170,121 +170,121 @@ Music_Gym_Ch2:: ; bd6b (2:7d6b)
 	vibrato 10, 2, 5
 	notetype 12, 12, 7
 	octave 4
-	note C_, 6
+	C_ 6
 	octave 3
-	note G_, 1
+	G_ 1
 	octave 4
-	note C_, 1
+	C_ 1
 	octave 3
-	note A#, 6
-	note F_, 1
-	note A#, 1
+	A# 6
+	F_ 1
+	A# 1
 	notetype 12, 10, 0
-	note A_, 12
+	A_ 12
 	notetype 12, 12, 7
-	note B_, 4
+	B_ 4
 
 Music_Gym_branch_bd82::
 	octave 4
-	note C_, 12
+	C_ 12
 	octave 3
-	note G_, 2
+	G_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	notetype 12, 12, 2
-	note D_, 3
+	D_ 3
 	octave 3
-	note A#, 1
+	A# 1
 	notetype 12, 12, 7
-	note A#, 12
+	A# 12
 	octave 4
-	note C_, 12
+	C_ 12
 	octave 3
-	note G_, 2
+	G_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	notetype 12, 12, 4
 	octave 3
-	note A#, 2
+	A# 2
 	notetype 12, 12, 7
-	note A#, 1
+	A# 1
 	octave 4
-	note C_, 1
-	note D_, 12
-	note E_, 12
-	note D_, 2
-	note E_, 2
+	C_ 1
+	D_ 12
+	E_ 12
+	D_ 2
+	E_ 2
 	notetype 12, 12, 2
-	note F_, 3
-	note D_, 1
+	F_ 3
+	D_ 1
 	notetype 12, 12, 7
-	note D_, 4
+	D_ 4
 	notetype 12, 12, 2
-	note A#, 3
-	note F_, 1
+	A# 3
+	F_ 1
 	notetype 12, 12, 7
-	note F_, 4
-	note E_, 12
-	note D_, 2
-	note E_, 2
-	note F_, 2
-	note D_, 1
-	note F_, 1
-	note A#, 12
+	F_ 4
+	E_ 12
+	D_ 2
+	E_ 2
+	F_ 2
+	D_ 1
+	F_ 1
+	A# 12
 	octave 3
-	note G_, 6
+	G_ 6
 	octave 4
-	note C_, 6
+	C_ 6
 	octave 3
-	note G_, 4
-	note A#, 4
-	note A_, 4
-	note G_, 4
-	note F_, 4
+	G_ 4
+	A# 4
+	A_ 4
+	G_ 4
+	F_ 4
 	notetype 12, 12, 3
-	note E_, 2
+	E_ 2
 	notetype 12, 12, 7
-	note E_, 1
-	note F_, 1
-	note G_, 6
-	note G_, 2
+	E_ 1
+	F_ 1
+	G_ 6
+	G_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note G_, 2
-	note A#, 4
-	note A_, 4
-	note G_, 4
-	note C_, 2
-	note D_, 2
-	note G_, 6
+	G_ 2
+	A# 4
+	A_ 4
+	G_ 4
+	C_ 2
+	D_ 2
+	G_ 6
 	octave 4
-	note C_, 6
+	C_ 6
 	octave 3
-	note G_, 4
-	note A#, 4
-	note A_, 4
-	note G_, 4
-	note F_, 4
+	G_ 4
+	A# 4
+	A_ 4
+	G_ 4
+	F_ 4
 	notetype 12, 12, 3
-	note E_, 2
+	E_ 2
 	notetype 12, 12, 7
-	note E_, 1
-	note F_, 1
-	note G_, 4
+	E_ 1
+	F_ 1
+	G_ 4
 	notetype 12, 12, 3
-	note G_, 2
+	G_ 2
 	notetype 12, 12, 7
-	note G_, 1
-	note A_, 1
-	note A#, 4
+	G_ 1
+	A_ 1
+	A# 4
 	notetype 12, 12, 4
 	octave 4
-	note C_, 2
+	C_ 2
 	notetype 12, 12, 7
-	note C_, 1
-	note D_, 1
-	note E_, 12
+	C_ 1
+	D_ 1
+	E_ 12
 	loopchannel 0, Music_Gym_branch_bd82
 
 
@@ -293,9 +293,9 @@ Music_Gym_Ch3:: ; bdfa (2:7dfa)
 	rest 16
 	rest 10
 	octave 4
-	note G_, 2
-	note F_, 2
-	note D_, 2
+	G_ 2
+	F_ 2
+	D_ 2
 
 Music_Gym_branch_be02::
 	callchannel Music_Gym_branch_be3b
@@ -313,46 +313,46 @@ Music_Gym_branch_be02::
 	callchannel Music_Gym_branch_be3b
 	callchannel Music_Gym_branch_be4d
 	callchannel Music_Gym_branch_be3b
-	note F_, 2
-	note A#, 2
-	note F_, 2
-	note A#, 2
-	note F_, 2
-	note A#, 2
-	note A_, 2
-	note F_, 2
+	F_ 2
+	A# 2
+	F_ 2
+	A# 2
+	F_ 2
+	A# 2
+	A_ 2
+	F_ 2
 	loopchannel 0, Music_Gym_branch_be02
 
 Music_Gym_branch_be3b::
-	note E_, 2
-	note G_, 2
-	note E_, 2
-	note G_, 2
-	note E_, 2
-	note G_, 2
-	note E_, 2
-	note G_, 2
+	E_ 2
+	G_ 2
+	E_ 2
+	G_ 2
+	E_ 2
+	G_ 2
+	E_ 2
+	G_ 2
 	endchannel
 
 Music_Gym_branch_be44::
-	note D_, 2
-	note F_, 2
-	note D_, 2
-	note F_, 2
-	note D_, 2
-	note F_, 2
-	note D_, 2
-	note F_, 2
+	D_ 2
+	F_ 2
+	D_ 2
+	F_ 2
+	D_ 2
+	F_ 2
+	D_ 2
+	F_ 2
 	endchannel
 
 Music_Gym_branch_be4d::
-	note F_, 2
-	note A#, 2
-	note F_, 2
-	note A#, 2
-	note F_, 2
-	note A#, 2
-	note F_, 2
-	note A#, 2
+	F_ 2
+	A# 2
+	F_ 2
+	A# 2
+	F_ 2
+	A# 2
+	F_ 2
+	A# 2
 	endchannel
-; 0xbe56
\ No newline at end of file
+; 0xbe56
diff --git a/audio/music/gymleaderbattle.asm b/audio/music/gymleaderbattle.asm
index edd73717..c4e7907e 100644
--- a/audio/music/gymleaderbattle.asm
+++ b/audio/music/gymleaderbattle.asm
@@ -7,543 +7,543 @@ Music_GymLeaderBattle_Ch1:: ; 22370 (8:6370)
 	notetype 12, 11, 3
 	rest 6
 	octave 3
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note C#, 1
-	note C_, 1
-	note C#, 1
-	note C_, 1
-	octave 2
-	note B_, 1
+	F# 1
+	F_ 1
+	E_ 1
+	F_ 1
+	E_ 1
+	D# 1
+	E_ 1
+	D# 1
+	D_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	C# 1
+	C_ 1
+	C# 1
+	C_ 1
+	octave 2
+	B_ 1
 	octave 1
-	note G#, 1
-	note A_, 1
-	note A#, 1
-	note A_, 1
-	note A#, 1
-	note B_, 1
-	note A#, 1
-	note B_, 1
-	octave 2
-	note F#, 1
+	G# 1
+	A_ 1
+	A# 1
+	A_ 1
+	A# 1
+	B_ 1
+	A# 1
+	B_ 1
+	octave 2
+	F# 1
 	rest 15
-	note F#, 1
+	F# 1
 	rest 9
-	note G_, 6
-	note F#, 1
+	G_ 6
+	F# 1
 	rest 15
-	note F#, 1
+	F# 1
 	rest 9
-	note F_, 6
-	note F#, 1
+	F_ 6
+	F# 1
 	rest 15
-	note F#, 1
+	F# 1
 	rest 9
-	note G_, 6
-	note F#, 1
+	G_ 6
+	F# 1
 	rest 15
-	note F#, 1
+	F# 1
 	rest 9
-	note A_, 6
+	A_ 6
 
 Music_GymLeaderBattle_branch_223b0::
-	note F#, 1
-	octave 3
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	octave 2
-	note E_, 1
-	note A_, 1
-	octave 3
-	note C#, 1
-	octave 2
-	note B_, 1
-	note A_, 1
-	octave 3
-	note C#, 1
-	octave 2
-	note B_, 1
-	note A_, 1
-	octave 3
-	note C#, 1
-	octave 2
-	note B_, 1
-	note A_, 1
-	octave 3
-	note C#, 1
-	octave 2
-	note B_, 1
-	note A_, 1
-	octave 3
-	note C#, 1
+	F# 1
+	octave 3
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
+	octave 2
+	E_ 1
+	A_ 1
+	octave 3
+	C# 1
+	octave 2
+	B_ 1
+	A_ 1
+	octave 3
+	C# 1
+	octave 2
+	B_ 1
+	A_ 1
+	octave 3
+	C# 1
+	octave 2
+	B_ 1
+	A_ 1
+	octave 3
+	C# 1
+	octave 2
+	B_ 1
+	A_ 1
+	octave 3
+	C# 1
 	octave 2
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	octave 3
-	note C#, 1
+	C# 1
 	octave 2
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	octave 3
-	note C#, 1
+	C# 1
 	octave 2
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	octave 3
-	note C#, 1
+	C# 1
 	octave 2
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	octave 3
-	note C#, 1
+	C# 1
 	octave 2
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	octave 3
-	note C#, 1
+	C# 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note F#, 1
+	B_ 1
+	A_ 1
+	F# 1
 	octave 3
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
-	note E_, 1
-	note C#, 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
+	E_ 1
+	C# 1
 	octave 2
-	note E_, 1
-	note A_, 1
+	E_ 1
+	A_ 1
 	octave 3
-	note C#, 1
+	C# 1
 	octave 2
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	octave 3
-	note C#, 1
+	C# 1
 	octave 2
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	octave 3
-	note C#, 1
+	C# 1
 	octave 2
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	octave 3
-	note C#, 1
+	C# 1
 	octave 2
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	octave 3
-	note C#, 1
+	C# 1
 	octave 2
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	octave 3
-	note C#, 1
+	C# 1
 	octave 2
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	octave 3
-	note C#, 1
+	C# 1
 	octave 2
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	octave 3
-	note C#, 1
+	C# 1
 	octave 2
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	octave 3
-	note C#, 1
+	C# 1
 	octave 2
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	octave 3
-	note C#, 1
+	C# 1
 	octave 2
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	rest 2
 	octave 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 2
-	note D_, 4
+	D_ 4
 	octave 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 2
-	note E_, 4
+	E_ 4
 	octave 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 2
-	note D_, 4
+	D_ 4
 	octave 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 2
-	note C#, 2
+	C# 2
 	octave 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 2
-	note D_, 4
+	D_ 4
 	octave 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 2
-	note E_, 4
+	E_ 4
 	octave 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 2
-	note D_, 4
+	D_ 4
 	octave 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 2
-	note C#, 2
+	C# 2
 	octave 1
-	note B_, 2
-	note A_, 2
+	B_ 2
+	A_ 2
 	octave 2
-	note C#, 2
+	C# 2
 	octave 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	rest 16
 	octave 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note B_, 1
+	B_ 1
+	A_ 1
+	B_ 1
 	octave 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	notetype 12, 11, 5
 	octave 3
-	note C#, 12
+	C# 12
 	notetype 12, 11, 3
 	octave 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	notetype 12, 11, 5
 	octave 3
-	note A_, 12
+	A_ 12
 	notetype 12, 11, 3
-	note D#, 4
-	note C#, 4
-	note D#, 4
-	note E_, 2
-	note F#, 4
-	octave 2
-	note B_, 2
-	octave 3
-	note C#, 2
-	note F#, 2
-	note B_, 2
-	note F#, 2
-	note D#, 2
-	note F#, 2
+	D# 4
+	C# 4
+	D# 4
+	E_ 2
+	F# 4
+	octave 2
+	B_ 2
+	octave 3
+	C# 2
+	F# 2
+	B_ 2
+	F# 2
+	D# 2
+	F# 2
 	octave 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	notetype 12, 11, 5
 	octave 3
-	note A_, 12
+	A_ 12
 	notetype 12, 11, 3
-	note C#, 1
-	octave 2
-	note B_, 1
-	octave 3
-	note C#, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note F#, 1
-	note A_, 1
-	note G#, 1
-	note F#, 1
-	note E_, 1
-	note F#, 1
-	note E_, 1
-	note D#, 1
-	note C#, 1
+	C# 1
+	octave 2
+	B_ 1
+	octave 3
+	C# 1
+	D# 1
+	E_ 1
+	D# 1
+	E_ 1
+	F# 1
+	A_ 1
+	G# 1
+	F# 1
+	E_ 1
+	F# 1
+	E_ 1
+	D# 1
+	C# 1
 	notetype 12, 11, 5
-	note D#, 4
-	note E_, 4
-	note C#, 2
-	note D#, 6
-	note F#, 4
-	note E_, 2
-	note D#, 4
-	note C#, 6
+	D# 4
+	E_ 4
+	C# 2
+	D# 6
+	F# 4
+	E_ 2
+	D# 4
+	C# 6
 	rest 16
 	rest 10
-	note E_, 6
-	note D#, 4
-	note E_, 4
-	note C#, 2
-	note D#, 6
-	note E_, 4
-	note D#, 2
-	note C#, 4
-	octave 2
-	note B_, 6
-	octave 3
-	note D#, 4
-	note E_, 4
-	note C#, 2
-	note D#, 6
-	note F#, 4
-	note A_, 2
-	note G#, 4
-	note E_, 6
+	E_ 6
+	D# 4
+	E_ 4
+	C# 2
+	D# 6
+	E_ 4
+	D# 2
+	C# 4
+	octave 2
+	B_ 6
+	octave 3
+	D# 4
+	E_ 4
+	C# 2
+	D# 6
+	F# 4
+	A_ 2
+	G# 4
+	E_ 6
 	loopchannel 0, Music_GymLeaderBattle_branch_223b0
 
 
@@ -552,299 +552,299 @@ Music_GymLeaderBattle_Ch2:: ; 225a1 (8:65a1)
 	vibrato 8, 2, 5
 	notetype 12, 12, 3
 	octave 4
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note C#, 1
-	note C_, 1
-	octave 3
-	note B_, 1
+	F_ 1
+	E_ 1
+	D# 1
+	E_ 1
+	D# 1
+	D_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	C# 1
+	C_ 1
+	octave 3
+	B_ 1
 	rest 5
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note C#, 1
-	note B_, 1
+	F# 1
+	F_ 1
+	E_ 1
+	F_ 1
+	E_ 1
+	D# 1
+	E_ 1
+	D# 1
+	D_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	C# 1
+	B_ 1
 	rest 15
-	note B_, 1
+	B_ 1
 	rest 9
 	octave 4
-	note C_, 6
+	C_ 6
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 15
-	note B_, 1
+	B_ 1
 	rest 9
-	note A#, 6
+	A# 6
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 15
-	note B_, 1
+	B_ 1
 	rest 9
 	octave 4
-	note C_, 6
+	C_ 6
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 15
-	note B_, 1
+	B_ 1
 	rest 9
 	octave 4
-	note C#, 6
+	C# 6
 
 Music_GymLeaderBattle_branch_225e0::
 	notetype 12, 12, 5
-	note D#, 4
-	note C#, 4
-	note D#, 4
-	note E_, 2
-	note F#, 4
-	note E_, 4
-	note D#, 2
-	note C#, 2
-	octave 3
-	note B_, 2
-	octave 4
-	note C#, 2
-	note D#, 2
+	D# 4
+	C# 4
+	D# 4
+	E_ 2
+	F# 4
+	E_ 4
+	D# 2
+	C# 2
+	octave 3
+	B_ 2
+	octave 4
+	C# 2
+	D# 2
 	notetype 12, 11, 7
 	duty 2
 	octave 3
-	note A_, 8
+	A_ 8
 	octave 4
-	note C#, 8
-	note E_, 8
-	note C#, 8
+	C# 8
+	E_ 8
+	C# 8
 	notetype 12, 12, 5
 	duty 3
-	note D#, 4
-	note C#, 4
-	note D#, 4
-	note E_, 2
-	note F#, 4
-	note E_, 4
-	note D#, 2
-	note C#, 2
-	octave 3
-	note B_, 2
-	octave 4
-	note C#, 2
-	note D#, 2
+	D# 4
+	C# 4
+	D# 4
+	E_ 2
+	F# 4
+	E_ 4
+	D# 2
+	C# 2
+	octave 3
+	B_ 2
+	octave 4
+	C# 2
+	D# 2
 	notetype 12, 11, 7
 	duty 2
-	note C#, 8
+	C# 8
 	octave 3
-	note B_, 8
-	note A_, 8
+	B_ 8
+	A_ 8
 	notetype 12, 12, 3
 	octave 4
-	note E_, 4
-	note E_, 2
-	note C#, 2
+	E_ 4
+	E_ 2
+	C# 2
 	notetype 12, 12, 5
 	duty 3
 	octave 1
-	note B_, 1
+	B_ 1
 	rest 3
 	octave 3
-	note D_, 1
-	note C#, 1
+	D_ 1
+	C# 1
 	octave 2
-	note B_, 1
+	B_ 1
 	octave 3
-	note D_, 1
+	D_ 1
 	rest 4
-	note E_, 1
-	note D_, 1
+	E_ 1
+	D_ 1
 	octave 2
-	note B_, 1
+	B_ 1
 	octave 3
-	note E_, 1
+	E_ 1
 	rest 4
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
 	rest 2
-	note E_, 1
-	note C#, 1
-	note E_, 1
+	E_ 1
+	C# 1
+	E_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note D_, 1
-	note C#, 1
+	D_ 1
+	C# 1
 	octave 2
-	note B_, 1
+	B_ 1
 	octave 3
-	note D_, 1
+	D_ 1
 	rest 4
-	note E_, 1
-	note D_, 1
+	E_ 1
+	D_ 1
 	octave 2
-	note B_, 1
+	B_ 1
 	octave 3
-	note E_, 1
+	E_ 1
 	rest 4
-	note F#, 1
-	note E_, 1
-	note C#, 1
-	note F#, 1
-	note E_, 1
+	F# 1
+	E_ 1
+	C# 1
+	F# 1
+	E_ 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	notetype 12, 11, 0
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note C_, 4
+	C_ 4
 	octave 3
-	note A_, 4
-	note B_, 4
+	A_ 4
+	B_ 4
 	octave 4
-	note C_, 4
+	C_ 4
 	octave 3
-	note A_, 4
-	note G_, 4
+	A_ 4
+	G_ 4
 	notetype 12, 11, 0
-	note F#, 8
+	F# 8
 	notetype 12, 11, 7
-	note F#, 8
+	F# 8
 	notetype 12, 12, 3
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note C_, 1
-	octave 2
-	note B_, 1
-	note A_, 1
-	note G_, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note G_, 1
-	note A_, 1
-	note B_, 1
+	C_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	C_ 1
+	octave 2
+	B_ 1
+	A_ 1
+	G_ 1
+	F# 1
+	F_ 1
+	E_ 1
+	F_ 1
+	F# 1
+	G_ 1
+	A_ 1
+	B_ 1
 	notetype 12, 11, 0
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note C_, 4
+	C_ 4
 	octave 3
-	note A_, 4
-	note B_, 4
+	A_ 4
+	B_ 4
 	octave 4
-	note C_, 4
+	C_ 4
 	octave 3
-	note A_, 4
+	A_ 4
 	octave 4
-	note C_, 4
+	C_ 4
 	notetype 12, 11, 0
 	octave 3
-	note B_, 16
+	B_ 16
 	notetype 12, 3, 15
 	octave 4
-	note F#, 16
+	F# 16
 	notetype 12, 12, 3
 	duty 3
 	octave 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	notetype 12, 12, 7
 	octave 3
-	note A_, 12
+	A_ 12
 	notetype 12, 12, 3
 	octave 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	notetype 12, 12, 7
 	octave 4
-	note C#, 12
+	C# 12
 	notetype 12, 11, 0
-	note D#, 16
+	D# 16
 	notetype 12, 11, 7
-	note D#, 16
+	D# 16
 	notetype 12, 12, 3
 	octave 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	notetype 12, 12, 7
 	octave 4
-	note C#, 12
+	C# 12
 	notetype 12, 12, 0
-	note A_, 8
-	note E_, 8
-	note B_, 16
+	A_ 8
+	E_ 8
+	B_ 16
 	notetype 12, 12, 7
-	note B_, 16
+	B_ 16
 	notetype 12, 12, 4
 	octave 3
-	note D#, 4
-	note E_, 4
-	note C#, 2
-	note D#, 6
-	note F#, 4
-	note A_, 2
-	note G#, 4
+	D# 4
+	E_ 4
+	C# 2
+	D# 6
+	F# 4
+	A_ 2
+	G# 4
 	rest 2
-	note B_, 1
+	B_ 1
 	octave 4
-	note D#, 1
-	note F#, 1
-	note A#, 1
+	D# 1
+	F# 1
+	A# 1
 	notetype 12, 12, 0
-	note B_, 16
-	note F#, 16
-	note A_, 16
+	B_ 16
+	F# 16
+	A_ 16
 	octave 5
-	note C#, 8
+	C# 8
 	rest 2
 	notetype 12, 12, 3
 	octave 4
-	note A_, 6
+	A_ 6
 	loopchannel 0, Music_GymLeaderBattle_branch_225e0
 
 
@@ -853,549 +853,549 @@ Music_GymLeaderBattle_Ch3:: ; 226ef (8:66ef)
 	notetype 12, 1, 3
 	rest 12
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C_, 1
-	note C#, 1
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note F_, 1
-	note F#, 1
+	C_ 1
+	C# 1
+	C_ 1
+	C# 1
+	D_ 1
+	C# 1
+	D_ 1
+	D# 1
+	D_ 1
+	D# 1
+	E_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	E_ 1
+	F_ 1
+	F# 1
+	F_ 1
+	F# 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note C_, 6
+	C_ 6
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F_, 6
+	F_ 6
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note C_, 6
+	C_ 6
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note C#, 6
+	C# 6
 	notetype 12, 1, 4
 
 Music_GymLeaderBattle_branch_227b1::
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note D_, 4
+	D_ 4
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note E_, 4
+	E_ 4
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note D_, 4
+	D_ 4
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note D_, 4
+	D_ 4
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note E_, 4
+	E_ 4
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note D_, 4
+	D_ 4
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note B_, 2
-	note A_, 2
+	B_ 2
+	A_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 13
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 13
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 13
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 13
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 13
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 13
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 13
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 13
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 4
-	note C#, 12
+	C# 12
 	octave 3
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 4
-	note E_, 12
-	note D#, 16
+	E_ 12
+	D# 16
 	octave 3
-	note B_, 16
-	note A_, 1
+	B_ 16
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 4
-	note E_, 12
-	note C#, 8
-	note E_, 8
+	E_ 12
+	C# 8
+	E_ 8
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note E_, 6
+	E_ 6
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note G_, 6
+	G_ 6
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C_, 6
+	C_ 6
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note F#, 2
+	F# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note G_, 6
+	G_ 6
 	loopchannel 0, Music_GymLeaderBattle_branch_227b1
-; 0x22919
\ No newline at end of file
+; 0x22919
diff --git a/audio/music/halloffame.asm b/audio/music/halloffame.asm
index e9df42e4..d2347aa6 100644
--- a/audio/music/halloffame.asm
+++ b/audio/music/halloffame.asm
@@ -10,19 +10,19 @@ Music_HallOfFame_Ch1:: ; 7fbaf (1f:7baf)
 	rest 16
 	rest 12
 	octave 3
-	note D_, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
+	D_ 1
+	E_ 1
+	F_ 1
+	F# 1
 
 Music_HallOfFame_branch_7fbc5::
 	notetype 12, 8, 0
 	octave 4
-	note C_, 16
-	note E_, 16
-	note F#, 16
+	C_ 16
+	E_ 16
+	F# 16
 	notetype 12, 6, 0
-	note F_, 16
+	F_ 16
 	loopchannel 3, Music_HallOfFame_branch_7fbc5
 	rest 16
 	rest 16
@@ -38,28 +38,28 @@ Music_HallOfFame_Ch2:: ; 7fbda (1f:7bda)
 Music_HallOfFame_branch_7fbdf::
 	notetype 12, 12, 4
 	octave 3
-	note G_, 2
-	note D_, 2
-	note G_, 2
-	note A_, 10
-	note G_, 2
-	note D_, 2
-	note G_, 2
+	G_ 2
+	D_ 2
+	G_ 2
+	A_ 10
+	G_ 2
+	D_ 2
+	G_ 2
 	octave 4
-	note C_, 4
+	C_ 4
 	octave 3
-	note B_, 4
-	note A_, 2
-	note G_, 2
-	note D_, 2
-	note G_, 2
-	note A_, 10
-	note F_, 2
-	note C_, 2
-	note F_, 2
-	note A#, 4
-	note A_, 4
-	note F_, 2
+	B_ 4
+	A_ 2
+	G_ 2
+	D_ 2
+	G_ 2
+	A_ 10
+	F_ 2
+	C_ 2
+	F_ 2
+	A# 4
+	A_ 4
+	F_ 2
 	loopchannel 0, Music_HallOfFame_branch_7fbdf
 
 
@@ -68,30 +68,30 @@ Music_HallOfFame_Ch3:: ; 7fbfc (1f:7bfc)
 
 Music_HallOfFame_branch_7fbfe::
 	octave 4
-	note D_, 2
-	note G_, 2
-	note D_, 2
-	note G_, 2
-	note D_, 2
-	note G_, 2
-	note D_, 2
-	note G_, 2
+	D_ 2
+	G_ 2
+	D_ 2
+	G_ 2
+	D_ 2
+	G_ 2
+	D_ 2
+	G_ 2
 	loopchannel 12, Music_HallOfFame_branch_7fbfe
-	note D_, 4
-	note G_, 4
-	note D_, 4
-	note G_, 4
-	note E_, 4
-	note G_, 4
-	note E_, 4
-	note G_, 4
-	note F#, 4
-	note A_, 4
-	note F#, 4
-	note A_, 4
-	note E_, 4
-	note G_, 4
-	note E_, 4
-	note G_, 4
+	D_ 4
+	G_ 4
+	D_ 4
+	G_ 4
+	E_ 4
+	G_ 4
+	E_ 4
+	G_ 4
+	F# 4
+	A_ 4
+	F# 4
+	A_ 4
+	E_ 4
+	G_ 4
+	E_ 4
+	G_ 4
 	loopchannel 0, Music_HallOfFame_Ch3
-; 0x7fc1f
\ No newline at end of file
+; 0x7fc1f
diff --git a/audio/music/indigoplateau.asm b/audio/music/indigoplateau.asm
index 28f40cec..32ce02c2 100644
--- a/audio/music/indigoplateau.asm
+++ b/audio/music/indigoplateau.asm
@@ -6,83 +6,83 @@ Music_IndigoPlateau_Ch1:: ; a5f0 (2:65f0)
 	toggleperfectpitch
 	notetype 12, 11, 2
 	octave 2
-	note A_, 8
-	note A_, 8
-	note A_, 8
-	note A_, 4
+	A_ 8
+	A_ 8
+	A_ 8
+	A_ 4
 	notetype 12, 10, 4
-	note A#, 4
+	A# 4
 
 Music_IndigoPlateau_branch_a605::
 	callchannel Music_IndigoPlateau_branch_a659
 	notetype 12, 11, 4
 	octave 3
-	note D_, 4
+	D_ 4
 	callchannel Music_IndigoPlateau_branch_a659
 	notetype 12, 11, 4
 	octave 3
-	note D#, 4
+	D# 4
 	callchannel Music_IndigoPlateau_branch_a659
 	notetype 12, 11, 4
 	octave 3
-	note D_, 4
+	D_ 4
 	callchannel Music_IndigoPlateau_branch_a659
 	notetype 12, 10, 0
 	octave 2
-	note A#, 4
+	A# 4
 	callchannel Music_IndigoPlateau_branch_a659
 	notetype 12, 11, 4
 	octave 3
-	note D_, 4
+	D_ 4
 	notetype 12, 13, 4
 	octave 3
-	note A_, 4
-	note A_, 4
-	note A_, 4
-	note A_, 4
-	note A_, 4
-	note A_, 4
-	note A_, 4
+	A_ 4
+	A_ 4
+	A_ 4
+	A_ 4
+	A_ 4
+	A_ 4
+	A_ 4
 	notetype 12, 11, 4
 	octave 3
-	note D#, 4
+	D# 4
 	notetype 12, 13, 4
 	octave 3
-	note A#, 4
-	note A#, 4
-	note A#, 4
-	note A#, 4
-	note A#, 4
-	note A#, 4
-	note A#, 4
+	A# 4
+	A# 4
+	A# 4
+	A# 4
+	A# 4
+	A# 4
+	A# 4
 	notetype 12, 11, 4
 	octave 3
-	note F_, 2
+	F_ 2
 	notetype 12, 11, 4
 	octave 3
-	note G_, 2
+	G_ 2
 	notetype 12, 11, 0
-	note A_, 8
+	A_ 8
 	octave 2
-	note A_, 8
+	A_ 8
 	notetype 12, 11, 7
 	octave 3
-	note F_, 8
+	F_ 8
 	notetype 12, 4, 14
 	octave 2
-	note A#, 8
+	A# 8
 	loopchannel 0, Music_IndigoPlateau_branch_a605
 
 Music_IndigoPlateau_branch_a659::
 	notetype 12, 11, 2
 	octave 2
-	note A_, 4
-	note A_, 4
-	note A_, 4
-	note A_, 4
-	note A_, 4
-	note A_, 4
-	note A_, 4
+	A_ 4
+	A_ 4
+	A_ 4
+	A_ 4
+	A_ 4
+	A_ 4
+	A_ 4
 	endchannel
 
 
@@ -91,154 +91,154 @@ Music_IndigoPlateau_Ch2:: ; a664 (2:6664)
 	vibrato 8, 2, 5
 	notetype 12, 12, 2
 	octave 3
-	note D_, 8
-	note D_, 8
-	note D_, 8
-	note D_, 4
+	D_ 8
+	D_ 8
+	D_ 8
+	D_ 4
 	notetype 12, 5, 10
-	note D#, 4
+	D# 4
 
 Music_IndigoPlateau_branch_a673::
 	callchannel Music_IndigoPlateau_branch_a6af
 	notetype 12, 12, 5
-	note A_, 4
+	A_ 4
 	callchannel Music_IndigoPlateau_branch_a6af
 	notetype 12, 12, 5
-	note A#, 4
+	A# 4
 	callchannel Music_IndigoPlateau_branch_a6af
 	notetype 12, 12, 5
-	note A_, 4
+	A_ 4
 	callchannel Music_IndigoPlateau_branch_a6af
 	notetype 12, 12, 7
-	note C#, 4
+	C# 4
 	callchannel Music_IndigoPlateau_branch_a6af
 	notetype 12, 12, 5
-	note A_, 4
+	A_ 4
 	callchannel Music_IndigoPlateau_branch_a6af
 	notetype 12, 12, 5
-	note A#, 4
+	A# 4
 	callchannel Music_IndigoPlateau_branch_a6af
 	notetype 12, 12, 5
 	octave 4
-	note C_, 2
+	C_ 2
 	notetype 12, 12, 7
 	octave 4
-	note C#, 2
-	note D_, 8
+	C# 2
+	D_ 8
 	octave 3
-	note D_, 8
+	D_ 8
 	octave 4
-	note C_, 8
+	C_ 8
 	notetype 12, 4, 13
 	octave 4
-	note D#, 8
+	D# 8
 	loopchannel 0, Music_IndigoPlateau_branch_a673
 
 Music_IndigoPlateau_branch_a6af::
 	notetype 12, 12, 2
 	octave 3
-	note D_, 4
-	note D_, 4
-	note D_, 4
-	note D_, 4
-	note D_, 4
-	note D_, 4
-	note D_, 4
+	D_ 4
+	D_ 4
+	D_ 4
+	D_ 4
+	D_ 4
+	D_ 4
+	D_ 4
 	endchannel
 
 
 Music_IndigoPlateau_Ch3:: ; a6ba (2:66ba)
 	notetype 12, 1, 0
 	octave 4
-	note D_, 2
+	D_ 2
 	rest 6
-	note D_, 2
+	D_ 2
 	rest 6
-	note D_, 2
+	D_ 2
 	rest 6
-	note D_, 2
+	D_ 2
 	rest 2
-	note D#, 4
+	D# 4
 
 Music_IndigoPlateau_branch_a6c6::
 	callchannel Music_IndigoPlateau_branch_a6fe
 	callchannel Music_IndigoPlateau_branch_a6fe
 	callchannel Music_IndigoPlateau_branch_a6fe
-	note D_, 2
+	D_ 2
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 2
-	note F#, 4
+	F# 4
 	callchannel Music_IndigoPlateau_branch_a6fe
 	callchannel Music_IndigoPlateau_branch_a6fe
-	note D_, 2
+	D_ 2
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 2
-	note A#, 1
+	A# 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
-	note A_, 8
-	note D_, 8
-	note A#, 8
-	note D#, 8
+	A_ 8
+	D_ 8
+	A# 8
+	D# 8
 	loopchannel 0, Music_IndigoPlateau_branch_a6c6
 
 Music_IndigoPlateau_branch_a6fe::
 	octave 4
-	note D_, 2
+	D_ 2
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 2
-	note D_, 2
+	D_ 2
 	rest 2
-	note A_, 4
+	A_ 4
 	endchannel
 
 
 Music_IndigoPlateau_Ch4:: ; a70f (2:670f)
 	dspeed 6
-	dnote 16, mutedsnare2
-	dnote 16, mutedsnare2
-	dnote 16, mutedsnare2
-	dnote 8, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
+	mutedsnare2 16
+	mutedsnare2 16
+	mutedsnare2 16
+	mutedsnare2 8
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
 
 Music_IndigoPlateau_branch_a728::
 	callchannel Music_IndigoPlateau_branch_a791
@@ -255,68 +255,68 @@ Music_IndigoPlateau_branch_a728::
 	callchannel Music_IndigoPlateau_branch_a7a8
 	callchannel Music_IndigoPlateau_branch_a77e
 	callchannel Music_IndigoPlateau_branch_a7a8
-	dnote 16, mutedsnare2
-	dnote 8, mutedsnare2
-	dnote 8, mutedsnare3
-	dnote 16, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare2
-	dnote 1, mutedsnare2
-	dnote 1, mutedsnare2
-	dnote 1, mutedsnare2
+	mutedsnare2 16
+	mutedsnare2 8
+	mutedsnare3 8
+	mutedsnare2 16
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 1
+	mutedsnare2 1
+	mutedsnare2 1
+	mutedsnare2 1
 	loopchannel 0, Music_IndigoPlateau_branch_a728
 
 Music_IndigoPlateau_branch_a77e::
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare3
-	dnote 4, mutedsnare4
-	dnote 4, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare3
-	dnote 4, mutedsnare4
-	dnote 2, mutedsnare4
-	dnote 2, mutedsnare3
+	mutedsnare2 4
+	mutedsnare3 4
+	mutedsnare4 4
+	mutedsnare3 4
+	mutedsnare2 4
+	mutedsnare3 4
+	mutedsnare4 4
+	mutedsnare4 2
+	mutedsnare3 2
 	endchannel
 
 Music_IndigoPlateau_branch_a791::
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare3
-	dnote 4, mutedsnare4
-	dnote 4, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare3
-	dnote 4, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
+	mutedsnare2 4
+	mutedsnare3 4
+	mutedsnare4 4
+	mutedsnare3 4
+	mutedsnare2 4
+	mutedsnare3 4
+	mutedsnare4 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
 	endchannel
 
 Music_IndigoPlateau_branch_a7a8::
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
+	mutedsnare2 4
+	mutedsnare3 4
+	mutedsnare2 4
+	mutedsnare3 4
+	mutedsnare2 4
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
 	endchannel
-; 0xa7c5
\ No newline at end of file
+; 0xa7c5
diff --git a/audio/music/introbattle.asm b/audio/music/introbattle.asm
index 1297ddf4..d3464680 100644
--- a/audio/music/introbattle.asm
+++ b/audio/music/introbattle.asm
@@ -7,86 +7,86 @@ Music_IntroBattle_Ch1:: ; 7f844 (1f:7844)
 	notetype 12, 11, 1
 	rest 8
 	octave 2
-	note A_, 2
-	note A_, 2
+	A_ 2
+	A_ 2
 	notetype 12, 11, 4
 	octave 3
-	note D_, 4
+	D_ 4
 	notetype 12, 11, 1
 	octave 2
-	note A_, 2
-	note A_, 2
+	A_ 2
+	A_ 2
 	notetype 12, 11, 4
 	octave 3
-	note D#, 4
+	D# 4
 	notetype 12, 11, 1
 	octave 2
-	note A_, 2
-	note A_, 2
+	A_ 2
+	A_ 2
 	notetype 12, 11, 4
 	octave 3
-	note D_, 4
+	D_ 4
 	notetype 12, 11, 1
 	octave 2
-	note A_, 2
-	note A_, 2
+	A_ 2
+	A_ 2
 	notetype 12, 10, 0
-	note A#, 4
+	A# 4
 	notetype 12, 11, 1
-	note A_, 2
-	note A_, 2
+	A_ 2
+	A_ 2
 	notetype 12, 11, 4
 	octave 3
-	note D_, 4
+	D_ 4
 	notetype 12, 11, 1
 	octave 2
-	note A_, 2
-	note A_, 2
+	A_ 2
+	A_ 2
 	notetype 12, 2, 9
 	octave 3
-	note G_, 4
+	G_ 4
 	notetype 12, 11, 0
-	note A_, 8
+	A_ 8
 	octave 2
-	note A_, 8
+	A_ 8
 	notetype 12, 11, 7
 	octave 3
-	note F_, 8
+	F_ 8
 	notetype 12, 4, 15
 	octave 2
-	note F_, 8
+	F_ 8
 	notetype 12, 11, 1
-	note A_, 2
-	note A_, 2
+	A_ 2
+	A_ 2
 	notetype 12, 11, 4
 	octave 3
-	note D_, 4
+	D_ 4
 	notetype 12, 11, 1
 	octave 2
-	note A_, 2
-	note A_, 2
+	A_ 2
+	A_ 2
 	notetype 12, 11, 4
 	octave 3
-	note D#, 4
+	D# 4
 	notetype 12, 11, 1
 	octave 2
-	note A_, 2
-	note A_, 2
+	A_ 2
+	A_ 2
 	notetype 12, 11, 4
 	octave 3
-	note F_, 4
+	F_ 4
 	notetype 12, 11, 1
 	octave 2
-	note A_, 2
-	note A_, 2
+	A_ 2
+	A_ 2
 	notetype 12, 11, 4
 	octave 3
-	note G_, 4
+	G_ 4
 	notetype 12, 11, 0
-	note F#, 16
+	F# 16
 	notetype 12, 11, 1
 	octave 4
-	note D_, 16
+	D_ 16
 	endchannel
 
 
@@ -96,72 +96,72 @@ Music_IntroBattle_Ch2:: ; 7f8bc (1f:78bc)
 	notetype 12, 12, 2
 	rest 8
 	octave 3
-	note D_, 2
-	note D_, 2
+	D_ 2
+	D_ 2
 	notetype 12, 12, 5
-	note A_, 4
+	A_ 4
 	notetype 12, 12, 2
-	note D_, 2
-	note D_, 2
+	D_ 2
+	D_ 2
 	notetype 12, 12, 5
-	note A#, 4
+	A# 4
 	notetype 12, 12, 2
-	note D_, 2
-	note D_, 2
+	D_ 2
+	D_ 2
 	notetype 12, 12, 5
-	note A_, 4
+	A_ 4
 	notetype 12, 12, 2
-	note D_, 2
-	note D_, 2
+	D_ 2
+	D_ 2
 	notetype 12, 11, 7
-	note C#, 4
+	C# 4
 	notetype 12, 12, 2
-	note D_, 2
-	note D_, 2
+	D_ 2
+	D_ 2
 	notetype 12, 12, 5
-	note A_, 4
+	A_ 4
 	notetype 12, 12, 2
 	octave 3
-	note D_, 2
-	note D_, 2
+	D_ 2
+	D_ 2
 	notetype 12, 12, 7
 	octave 4
-	note C#, 4
-	note D_, 8
+	C# 4
+	D_ 8
 	octave 3
-	note D_, 8
+	D_ 8
 	octave 4
-	note C_, 8
+	C_ 8
 	octave 3
-	note C_, 8
+	C_ 8
 	notetype 12, 12, 2
-	note D_, 2
-	note D_, 2
+	D_ 2
+	D_ 2
 	notetype 12, 12, 5
-	note A_, 4
+	A_ 4
 	notetype 12, 12, 2
-	note D_, 2
-	note D_, 2
+	D_ 2
+	D_ 2
 	notetype 12, 12, 5
-	note A#, 4
+	A# 4
 	notetype 12, 12, 2
-	note D_, 2
-	note D_, 2
+	D_ 2
+	D_ 2
 	notetype 12, 12, 5
 	octave 4
-	note C_, 4
+	C_ 4
 	notetype 12, 12, 2
 	octave 3
-	note D_, 2
-	note D_, 2
+	D_ 2
+	D_ 2
 	notetype 12, 12, 5
 	octave 4
-	note C#, 4
+	C# 4
 	notetype 12, 2, 15
-	note D_, 16
+	D_ 16
 	notetype 12, 12, 1
 	octave 5
-	note D_, 16
+	D_ 16
 	endchannel
 
 
@@ -169,162 +169,162 @@ Music_IntroBattle_Ch3:: ; 7f91d (1f:791d)
 	notetype 12, 1, 0
 	rest 8
 	octave 4
-	note D_, 1
+	D_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 4
-	note D_, 1
+	A_ 4
+	D_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 4
-	note D_, 1
+	A_ 4
+	D_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 4
-	note D_, 1
+	A_ 4
+	D_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F#, 4
-	note D_, 1
+	F# 4
+	D_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 4
-	note D_, 1
+	A_ 4
+	D_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A#, 4
-	note A_, 8
-	note D_, 8
-	note A#, 8
-	note D_, 8
-	note D_, 1
+	A# 4
+	A_ 8
+	D_ 8
+	A# 8
+	D_ 8
+	D_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 4
-	note D_, 1
+	A_ 4
+	D_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 4
-	note D_, 1
+	A_ 4
+	D_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A#, 4
-	note D_, 1
+	A# 4
+	D_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A#, 4
-	note A_, 16
-	note D_, 1
+	A# 4
+	A_ 16
+	D_ 1
 	rest 15
 	endchannel
 
 
 Music_IntroBattle_Ch4:: ; 7f95b (1f:795b)
 	dspeed 6
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare2
-	dnote 1, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 8, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 8, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 8, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 16, mutedsnare2
-	dnote 16, mutedsnare2
-	dnote 16, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare2
-	dnote 1, mutedsnare2
-	dnote 1, mutedsnare2
-	dnote 1, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 8, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 8, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 8, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 16, mutedsnare2
-	dnote 16, mutedsnare2
-	dnote 2, mutedsnare2
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 1
+	mutedsnare2 1
+	mutedsnare2 4
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 4
+	mutedsnare2 4
+	mutedsnare2 8
+	mutedsnare2 4
+	mutedsnare2 4
+	mutedsnare2 8
+	mutedsnare2 4
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 4
+	mutedsnare2 4
+	mutedsnare2 8
+	mutedsnare2 4
+	mutedsnare2 4
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 16
+	mutedsnare2 16
+	mutedsnare2 16
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 1
+	mutedsnare2 1
+	mutedsnare2 1
+	mutedsnare2 1
+	mutedsnare2 4
+	mutedsnare2 4
+	mutedsnare2 8
+	mutedsnare2 4
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 4
+	mutedsnare2 4
+	mutedsnare2 8
+	mutedsnare2 4
+	mutedsnare2 8
+	mutedsnare2 4
+	mutedsnare2 16
+	mutedsnare2 16
+	mutedsnare2 2
 	rest 16
 	rest 14
 	endchannel
-; 0x7fa19
\ No newline at end of file
+; 0x7fa19
diff --git a/audio/music/jigglypuffsong.asm b/audio/music/jigglypuffsong.asm
index 216a3166..8d676150 100644
--- a/audio/music/jigglypuffsong.asm
+++ b/audio/music/jigglypuffsong.asm
@@ -7,17 +7,17 @@ Music_JigglypuffSong_Ch1:: ; 7fb7d (1f:7b7d)
 	toggleperfectpitch
 	notetype 13, 6, 7
 	octave 4
-	note E_, 8
+	E_ 8
 	notetype 12, 6, 7
-	note B_, 2
-	note G#, 6
-	note F#, 8
-	note G#, 2
-	note A_, 6
-	note G#, 8
-	note F#, 4
-	note G#, 4
-	note E_, 10
+	B_ 2
+	G# 6
+	F# 8
+	G# 2
+	A_ 6
+	G# 8
+	F# 4
+	G# 4
+	E_ 10
 	endchannel
 
 
@@ -27,15 +27,15 @@ Music_JigglypuffSong_Ch2:: ; 7fb9a (1f:7b9a)
 	dutycycle 10
 	notetype 12, 10, 7
 	octave 4
-	note E_, 8
-	note B_, 2
-	note G#, 6
-	note F#, 8
-	note G#, 2
-	note A_, 6
-	note G#, 8
-	note F#, 4
-	note G#, 4
-	note E_, 10
+	E_ 8
+	B_ 2
+	G# 6
+	F# 8
+	G# 2
+	A_ 6
+	G# 8
+	F# 4
+	G# 4
+	E_ 10
 	endchannel
-; 0x7fbaf
\ No newline at end of file
+; 0x7fbaf
diff --git a/audio/music/lavender.asm b/audio/music/lavender.asm
index b506508a..b2d36593 100644
--- a/audio/music/lavender.asm
+++ b/audio/music/lavender.asm
@@ -13,48 +13,48 @@ Music_Lavender_Ch1:: ; bb58 (2:7b58)
 
 Music_Lavender_branch_bb6b::
 	octave 3
-	note G_, 8
-	note G_, 8
-	note E_, 8
-	note E_, 8
-	note G_, 4
-	note F#, 4
-	note E_, 4
-	note B_, 4
-	note C#, 8
-	note C#, 8
-	note G_, 8
-	note G_, 8
-	note F#, 8
-	note F#, 8
-	note B_, 4
-	note G_, 4
-	note F#, 4
-	note B_, 4
+	G_ 8
+	G_ 8
+	E_ 8
+	E_ 8
+	G_ 4
+	F# 4
+	E_ 4
+	B_ 4
+	C# 8
+	C# 8
+	G_ 8
+	G_ 8
+	F# 8
+	F# 8
+	B_ 4
+	G_ 4
+	F# 4
+	B_ 4
 	octave 4
-	note C_, 8
-	note C_, 8
+	C_ 8
+	C_ 8
 	octave 3
-	note G_, 8
-	note G_, 8
-	note E_, 8
-	note E_, 8
-	note G_, 4
-	note F#, 4
-	note E_, 4
-	note B_, 4
-	note C#, 8
-	note C#, 8
-	note G_, 8
-	note G_, 8
-	note F#, 8
-	note F#, 8
-	note B_, 4
-	note G_, 4
-	note F#, 4
-	note B_, 4
-	note C_, 8
-	note C_, 8
+	G_ 8
+	G_ 8
+	E_ 8
+	E_ 8
+	G_ 4
+	F# 4
+	E_ 4
+	B_ 4
+	C# 8
+	C# 8
+	G_ 8
+	G_ 8
+	F# 8
+	F# 8
+	B_ 4
+	G_ 4
+	F# 4
+	B_ 4
+	C_ 8
+	C_ 8
 	rest 16
 	rest 16
 	rest 16
@@ -69,10 +69,10 @@ Music_Lavender_Ch2:: ; bb9e (2:7b9e)
 
 Music_Lavender_branch_bba5::
 	octave 5
-	note C_, 4
-	note G_, 4
-	note B_, 4
-	note F#, 4
+	C_ 4
+	G_ 4
+	B_ 4
+	F# 4
 	loopchannel 0, Music_Lavender_branch_bba5
 
 
@@ -87,102 +87,102 @@ Music_Lavender_Ch3:: ; bbae (2:7bae)
 
 Music_Lavender_branch_bbb9::
 	octave 4
-	note E_, 16
-	note D_, 16
-	note C_, 16
-	note E_, 4
-	note C_, 4
+	E_ 16
+	D_ 16
+	C_ 16
+	E_ 4
+	C_ 4
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note E_, 4
-	note E_, 16
-	note D_, 16
-	note C_, 16
-	note E_, 4
-	note C_, 4
+	E_ 4
+	E_ 16
+	D_ 16
+	C_ 16
+	E_ 4
+	C_ 4
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note E_, 4
-	note E_, 16
-	note D_, 16
-	note C_, 16
-	note E_, 4
-	note C_, 4
+	E_ 4
+	E_ 16
+	D_ 16
+	C_ 16
+	E_ 4
+	C_ 4
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note E_, 4
+	E_ 4
 	notetype 12, 3, 5
 	octave 6
-	note B_, 4
-	note G_, 4
-	note F#, 4
-	note B_, 4
+	B_ 4
+	G_ 4
+	F# 4
+	B_ 4
 	notetype 12, 2, 5
-	note B_, 4
-	note G_, 4
-	note F#, 4
-	note B_, 4
+	B_ 4
+	G_ 4
+	F# 4
+	B_ 4
 	octave 7
-	note B_, 4
-	note G_, 4
-	note F#, 4
-	note B_, 4
+	B_ 4
+	G_ 4
+	F# 4
+	B_ 4
 	octave 4
-	note E_, 4
-	note G_, 4
-	note F#, 4
-	note B_, 4
-	note E_, 16
-	note D_, 16
-	note C_, 16
-	note E_, 4
-	note C_, 4
+	E_ 4
+	G_ 4
+	F# 4
+	B_ 4
+	E_ 16
+	D_ 16
+	C_ 16
+	E_ 4
+	C_ 4
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note E_, 4
-	note E_, 16
-	note D_, 16
-	note C_, 16
-	note E_, 4
-	note C_, 4
+	E_ 4
+	E_ 16
+	D_ 16
+	C_ 16
+	E_ 4
+	C_ 4
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note E_, 4
-	note E_, 16
-	note D_, 16
-	note C_, 16
-	note E_, 4
-	note C_, 4
+	E_ 4
+	E_ 16
+	D_ 16
+	C_ 16
+	E_ 4
+	C_ 4
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note E_, 4
+	E_ 4
 	notetype 12, 2, 5
 	octave 6
-	note B_, 4
-	note G_, 4
-	note F#, 4
-	note B_, 4
+	B_ 4
+	G_ 4
+	F# 4
+	B_ 4
 	octave 7
-	note B_, 4
-	note G_, 4
-	note F#, 4
-	note B_, 4
+	B_ 4
+	G_ 4
+	F# 4
+	B_ 4
 	octave 8
-	note B_, 4
-	note G_, 4
-	note F#, 4
-	note B_, 4
+	B_ 4
+	G_ 4
+	F# 4
+	B_ 4
 	octave 4
-	note E_, 4
-	note G_, 4
-	note F#, 4
-	note B_, 4
+	E_ 4
+	G_ 4
+	F# 4
+	B_ 4
 	loopchannel 0, Music_Lavender_branch_bbb9
 
 
@@ -194,7 +194,7 @@ Music_Lavender_Ch4:: ; bc21 (2:7c21)
 	rest 16
 
 Music_Lavender_branch_bc26::
-	dnote 8, triangle2
-	dnote 8, triangle2
+	triangle2 8
+	triangle2 8
 	loopchannel 0, Music_Lavender_branch_bc26
-; 0xbc2e
\ No newline at end of file
+; 0xbc2e
diff --git a/audio/music/meeteviltrainer.asm b/audio/music/meeteviltrainer.asm
index b8266fd7..af4245ba 100644
--- a/audio/music/meeteviltrainer.asm
+++ b/audio/music/meeteviltrainer.asm
@@ -6,18 +6,18 @@ Music_MeetEvilTrainer_Ch1:: ; 7f69d (1f:769d)
 	notetype 12, 11, 1
 	rest 4
 	octave 3
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	notetype 12, 4, 15
-	note D_, 4
+	D_ 4
 
 Music_MeetEvilTrainer_branch_7f6ae::
 	notetype 12, 10, 1
-	note D_, 4
-	note D_, 4
-	note D_, 4
+	D_ 4
+	D_ 4
+	D_ 4
 	notetype 12, 7, 0
-	note D_, 4
+	D_ 4
 	loopchannel 0, Music_MeetEvilTrainer_branch_7f6ae
 
 
@@ -25,37 +25,37 @@ Music_MeetEvilTrainer_Ch2:: ; 7f6ba (1f:76ba)
 	duty 1
 	notetype 12, 11, 6
 	octave 3
-	note B_, 2
-	note A#, 2
-	note B_, 8
+	B_ 2
+	A# 2
+	B_ 8
 
 Music_MeetEvilTrainer_branch_7f6c2::
 	notetype 12, 12, 2
 	octave 4
-	note D#, 2
-	note D_, 2
-	note C#, 2
-	note C_, 2
+	D# 2
+	D_ 2
+	C# 2
+	C_ 2
 	octave 3
-	note B_, 4
-	note B_, 4
-	note B_, 4
-	note B_, 4
-	note B_, 4
+	B_ 4
+	B_ 4
+	B_ 4
+	B_ 4
+	B_ 4
 	notetype 12, 4, 15
-	note A#, 4
+	A# 4
 	notetype 12, 12, 2
-	note G_, 2
-	note G#, 2
-	note A_, 2
-	note A#, 2
-	note B_, 4
-	note B_, 4
-	note B_, 4
-	note B_, 4
-	note B_, 4
+	G_ 2
+	G# 2
+	A_ 2
+	A# 2
+	B_ 4
+	B_ 4
+	B_ 4
+	B_ 4
+	B_ 4
 	notetype 12, 3, 15
-	note A#, 4
+	A# 4
 	notetype 12, 12, 2
 	loopchannel 0, Music_MeetEvilTrainer_branch_7f6c2
 
@@ -64,18 +64,18 @@ Music_MeetEvilTrainer_Ch3:: ; 7f6e6 (1f:76e6)
 	notetype 12, 1, 0
 	rest 8
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
 
 Music_MeetEvilTrainer_branch_7f6ee::
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 3
-	note A#, 4
+	A# 4
 	loopchannel 0, Music_MeetEvilTrainer_branch_7f6ee
-; 0x7f6f9
\ No newline at end of file
+; 0x7f6f9
diff --git a/audio/music/meetfemaletrainer.asm b/audio/music/meetfemaletrainer.asm
index 69130fb3..35c6ec16 100644
--- a/audio/music/meetfemaletrainer.asm
+++ b/audio/music/meetfemaletrainer.asm
@@ -5,24 +5,24 @@ Music_MeetFemaleTrainer_Ch1:: ; 7f6f9 (1f:76f9)
 	toggleperfectpitch
 	notetype 12, 11, 2
 	octave 3
-	note G#, 6
+	G# 6
 	octave 4
-	note E_, 2
-	note D#, 2
-	note C#, 2
-	note C_, 2
+	E_ 2
+	D# 2
+	C# 2
+	C_ 2
 	notetype 12, 8, 1
 
 Music_MeetFemaleTrainer_branch_7f70c::
 	octave 3
-	note E_, 4
+	E_ 4
 	loopchannel 12, Music_MeetFemaleTrainer_branch_7f70c
-	note E_, 4
+	E_ 4
 	octave 2
-	note B_, 4
-	note B_, 4
+	B_ 4
+	B_ 4
 	octave 3
-	note E_, 4
+	E_ 4
 	loopchannel 0, Music_MeetFemaleTrainer_branch_7f70c
 
 
@@ -30,44 +30,44 @@ Music_MeetFemaleTrainer_Ch2:: ; 7f71c (1f:771c)
 	duty 2
 	notetype 12, 12, 2
 	octave 3
-	note B_, 2
+	B_ 2
 	notetype 12, 12, 7
 	octave 4
-	note B_, 12
+	B_ 12
 
 Music_MeetFemaleTrainer_branch_7f726::
 	notetype 12, 12, 2
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note D#, 4
-	note E_, 4
-	note D#, 4
-	note C#, 2
-	note C_, 2
+	D# 4
+	E_ 4
+	D# 4
+	C# 2
+	C_ 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 2
-	note A#, 2
+	B_ 2
+	A_ 2
+	G# 2
+	A_ 2
+	A# 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note C#, 4
+	C# 4
 	octave 3
-	note B_, 4
-	note A_, 4
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note D#, 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
+	B_ 4
+	A_ 4
+	G# 2
+	F# 2
+	E_ 2
+	D# 2
+	E_ 2
+	F# 2
+	G# 2
+	A_ 2
 	loopchannel 0, Music_MeetFemaleTrainer_branch_7f726
 
 
@@ -75,45 +75,45 @@ Music_MeetFemaleTrainer_Ch3:: ; 7f74b (1f:774b)
 	notetype 12, 1, 0
 	rest 8
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 
 Music_MeetFemaleTrainer_branch_7f756::
 	callchannel Music_MeetFemaleTrainer_branch_7f770
-	note G#, 1
+	G# 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 3
-	note G#, 1
+	G# 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 3
 	callchannel Music_MeetFemaleTrainer_branch_7f770
-	note G#, 1
+	G# 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 3
-	note G#, 1
+	G# 1
 	rest 3
-	note B_, 1
+	B_ 1
 	rest 3
 	loopchannel 0, Music_MeetFemaleTrainer_branch_7f756
 
 Music_MeetFemaleTrainer_branch_7f770::
-	note G#, 1
+	G# 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 3
-	note G#, 1
+	G# 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
 	endchannel
-; 0x7f77b
\ No newline at end of file
+; 0x7f77b
diff --git a/audio/music/meetmaletrainer.asm b/audio/music/meetmaletrainer.asm
index f3b19ab5..8a937fc3 100644
--- a/audio/music/meetmaletrainer.asm
+++ b/audio/music/meetmaletrainer.asm
@@ -6,29 +6,29 @@ Music_MeetMaleTrainer_Ch1:: ; 7f77b (1f:777b)
 	toggleperfectpitch
 	notetype 12, 11, 4
 	octave 3
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 12
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 12
 	rest 16
 
 Music_MeetMaleTrainer_branch_7f78f::
 	octave 3
-	note B_, 4
-	note A_, 4
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note D#, 2
-	note F#, 4
-	note E_, 6
-	note F_, 2
-	note F#, 4
-	note G_, 8
-	octave 4
-	note D_, 8
-	note E_, 16
+	B_ 4
+	A_ 4
+	G# 2
+	F# 2
+	E_ 2
+	D# 2
+	F# 4
+	E_ 6
+	F_ 2
+	F# 4
+	G_ 8
+	octave 4
+	D_ 8
+	E_ 16
 	loopchannel 0, Music_MeetMaleTrainer_branch_7f78f
 
 
@@ -37,41 +37,41 @@ Music_MeetMaleTrainer_Ch2:: ; 7f7a2 (1f:77a2)
 	vibrato 24, 2, 2
 	notetype 12, 12, 4
 	octave 4
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
 	octave 3
-	note B_, 12
+	B_ 12
 	rest 2
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 9
 
 Music_MeetMaleTrainer_branch_7f7b5::
 	notetype 12, 12, 4
 	octave 4
-	note E_, 6
-	note D#, 6
-	note C#, 4
+	E_ 6
+	D# 6
+	C# 4
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
-	note B_, 2
-	octave 4
-	note C#, 2
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	G# 2
+	A_ 2
+	B_ 2
+	octave 4
+	C# 2
 	notetype 12, 12, 7
-	note F_, 16
+	F_ 16
 	notetype 12, 12, 5
 	octave 3
-	note F#, 8
+	F# 8
 	octave 4
-	note C#, 8
+	C# 8
 	loopchannel 0, Music_MeetMaleTrainer_branch_7f7b5
 
 
@@ -79,113 +79,113 @@ Music_MeetMaleTrainer_Ch3:: ; 7f7d2 (1f:77d2)
 	notetype 12, 1, 0
 	rest 6
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 3
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 3
-	note B_, 1
+	B_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
 
 Music_MeetMaleTrainer_branch_7f7ea::
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 5
-	note D_, 1
+	D_ 1
 	rest 1
 	octave 4
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 5
-	note D_, 1
+	D_ 1
 	rest 1
 	octave 4
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 5
-	note D_, 1
+	D_ 1
 	rest 1
 	octave 4
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 5
-	note D_, 1
+	D_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
 	loopchannel 0, Music_MeetMaleTrainer_branch_7f7ea
-; 0x7f844
\ No newline at end of file
+; 0x7f844
diff --git a/audio/music/meetprofoak.asm b/audio/music/meetprofoak.asm
index 35d4ccdb..e095557d 100644
--- a/audio/music/meetprofoak.asm
+++ b/audio/music/meetprofoak.asm
@@ -5,72 +5,72 @@ Music_MeetProfOak_Ch1:: ; af59 (2:6f59)
 	toggleperfectpitch
 	notetype 12, 11, 4
 	octave 3
-	note F#, 1
-	note B_, 1
+	F# 1
+	B_ 1
 	octave 4
-	note D#, 1
-	note E_, 1
-	note F#, 12
+	D# 1
+	E_ 1
+	F# 12
 	notetype 12, 10, 2
 	octave 3
-	note E_, 6
-	note B_, 10
-	note E_, 6
-	note B_, 10
-	note E_, 6
-	note D#, 4
-	note F#, 2
-	note F#, 4
-	note E_, 6
-	note D#, 4
-	note F#, 2
-	note F#, 4
-	note E_, 6
-	note B_, 10
-	note E_, 6
-	note B_, 10
-	note E_, 6
-	note D#, 4
-	note F#, 2
-	note F#, 4
-	note E_, 6
-	note D#, 4
-	note F#, 2
-	note F#, 4
+	E_ 6
+	B_ 10
+	E_ 6
+	B_ 10
+	E_ 6
+	D# 4
+	F# 2
+	F# 4
+	E_ 6
+	D# 4
+	F# 2
+	F# 4
+	E_ 6
+	B_ 10
+	E_ 6
+	B_ 10
+	E_ 6
+	D# 4
+	F# 2
+	F# 4
+	E_ 6
+	D# 4
+	F# 2
+	F# 4
 
 Music_MeetProfOak_branch_af85::
-	note F#, 6
-	note E_, 4
-	note A_, 2
-	note A_, 4
-	note F#, 6
-	note E_, 4
-	note A_, 2
-	note A_, 4
-	note F#, 6
-	note E_, 4
-	note G#, 2
-	note G#, 4
-	note F#, 6
-	note E_, 4
-	note G#, 2
-	note G#, 4
-	note E_, 6
-	note D#, 4
-	note F#, 2
-	note F#, 4
-	note E_, 6
-	note D#, 4
-	note F#, 2
-	note F#, 4
-	note F#, 6
-	note E_, 4
-	note G#, 2
-	note G#, 4
-	note F#, 6
-	note E_, 4
-	note G#, 2
-	note G#, 4
+	F# 6
+	E_ 4
+	A_ 2
+	A_ 4
+	F# 6
+	E_ 4
+	A_ 2
+	A_ 4
+	F# 6
+	E_ 4
+	G# 2
+	G# 4
+	F# 6
+	E_ 4
+	G# 2
+	G# 4
+	E_ 6
+	D# 4
+	F# 2
+	F# 4
+	E_ 6
+	D# 4
+	F# 2
+	F# 4
+	F# 6
+	E_ 4
+	G# 2
+	G# 4
+	F# 6
+	E_ 4
+	G# 2
+	G# 4
 	loopchannel 0, Music_MeetProfOak_branch_af85
 
 
@@ -79,132 +79,132 @@ Music_MeetProfOak_Ch2:: ; afa9 (2:6fa9)
 	duty 2
 	notetype 12, 12, 4
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note D#, 1
-	note F#, 1
-	note A#, 1
-	note B_, 12
+	D# 1
+	F# 1
+	A# 1
+	B_ 12
 	notetype 12, 11, 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D#, 2
-	note E_, 4
-	note D#, 2
-	note C#, 4
+	C# 2
+	D# 2
+	E_ 4
+	D# 2
+	C# 4
 	notetype 12, 6, 4
 	octave 4
-	note B_, 2
+	B_ 2
 	octave 5
-	note C#, 2
-	note D#, 2
-	note E_, 4
-	note D#, 2
-	note C#, 4
+	C# 2
+	D# 2
+	E_ 4
+	D# 2
+	C# 4
 	notetype 12, 11, 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 4
-	note B_, 2
-	note B_, 4
+	B_ 2
+	A_ 2
+	G# 2
+	A_ 4
+	B_ 2
+	B_ 4
 	notetype 12, 8, 1
 	octave 4
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 4
-	note B_, 2
-	note B_, 4
+	B_ 2
+	A_ 2
+	G# 2
+	A_ 4
+	B_ 2
+	B_ 4
 	notetype 12, 11, 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D#, 2
-	note E_, 4
-	note D#, 2
-	note C#, 4
+	C# 2
+	D# 2
+	E_ 4
+	D# 2
+	C# 4
 	notetype 12, 6, 4
 	octave 4
-	note B_, 2
+	B_ 2
 	octave 5
-	note C#, 2
-	note D#, 2
-	note E_, 4
-	note D#, 2
-	note C#, 4
+	C# 2
+	D# 2
+	E_ 4
+	D# 2
+	C# 4
 	notetype 12, 11, 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 4
-	note B_, 2
-	note B_, 4
+	B_ 2
+	A_ 2
+	G# 2
+	A_ 4
+	B_ 2
+	B_ 4
 	notetype 12, 8, 1
 	octave 4
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 4
-	note B_, 2
-	note B_, 4
+	B_ 2
+	A_ 2
+	G# 2
+	A_ 4
+	B_ 2
+	B_ 4
 	notetype 12, 11, 5
 
 Music_MeetProfOak_branch_b005::
 	octave 4
-	note C#, 6
+	C# 6
 	octave 3
-	note A_, 1
+	A_ 1
 	octave 4
-	note C#, 1
-	note E_, 6
-	note C#, 1
-	note E_, 1
-	note F#, 4
-	note E_, 4
-	note D#, 4
-	note C#, 4
+	C# 1
+	E_ 6
+	C# 1
+	E_ 1
+	F# 4
+	E_ 4
+	D# 4
+	C# 4
 	octave 3
-	note B_, 6
-	note G#, 1
-	note B_, 1
+	B_ 6
+	G# 1
+	B_ 1
 	octave 4
-	note E_, 8
+	E_ 8
 	notetype 12, 6, 5
 	octave 4
-	note B_, 6
-	note G#, 1
-	note B_, 1
+	B_ 6
+	G# 1
+	B_ 1
 	octave 5
-	note E_, 8
+	E_ 8
 	notetype 12, 11, 5
 	octave 3
-	note A_, 6
-	note F#, 1
-	note A_, 1
+	A_ 6
+	F# 1
+	A_ 1
 	octave 4
-	note D#, 8
-	note E_, 4
-	note D#, 4
-	note C#, 4
-	note C_, 4
+	D# 8
+	E_ 4
+	D# 4
+	C# 4
+	C_ 4
 	octave 3
-	note B_, 6
-	note G#, 1
-	note B_, 1
+	B_ 6
+	G# 1
+	B_ 1
 	octave 4
-	note E_, 6
+	E_ 6
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note E_, 1
+	E_ 1
 	notetype 12, 11, 7
-	note G#, 16
+	G# 16
 	loopchannel 0, Music_MeetProfOak_branch_b005
 
 
@@ -212,213 +212,213 @@ Music_MeetProfOak_Ch3:: ; b03d (2:703d)
 	notetype 12, 1, 2
 	rest 10
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 5
 	octave 5
-	note E_, 4
+	E_ 4
 	rest 6
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 5
 	octave 5
-	note E_, 4
+	E_ 4
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
 
 Music_MeetProfOak_branch_b0bc::
 	octave 4
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	loopchannel 2, Music_MeetProfOak_branch_b0bc
 
 Music_MeetProfOak_branch_b0d8::
 	octave 4
-	note G#, 1
+	G# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	loopchannel 2, Music_MeetProfOak_branch_b0d8
 
 Music_MeetProfOak_branch_b0ed::
-	note F#, 1
+	F# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	loopchannel 2, Music_MeetProfOak_branch_b0ed
 
 Music_MeetProfOak_branch_b101::
-	note G#, 1
+	G# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	loopchannel 2, Music_MeetProfOak_branch_b101
 	loopchannel 0, Music_MeetProfOak_branch_b0bc
-; 0xb119
\ No newline at end of file
+; 0xb119
diff --git a/audio/music/meetrival.asm b/audio/music/meetrival.asm
index 8d956626..fb138e61 100644
--- a/audio/music/meetrival.asm
+++ b/audio/music/meetrival.asm
@@ -12,111 +12,111 @@ Music_MeetRival_branch_b123::
 	toggleperfectpitch
 	notetype 12, 11, 3
 	octave 4
-	note D_, 1
-	note C#, 1
-	note C_, 1
+	D_ 1
+	C# 1
+	C_ 1
 	octave 3
-	note B_, 1
-	note A#, 2
-	note A_, 1
-	note G#, 1
-	note G_, 1
-	note F#, 1
-	note F_, 6
-	note D_, 1
+	B_ 1
+	A# 2
+	A_ 1
+	G# 1
+	G_ 1
+	F# 1
+	F_ 6
+	D_ 1
 	rest 3
-	note D_, 1
+	D_ 1
 	rest 5
-	note A_, 2
-	note G_, 2
-	note A_, 2
+	A_ 2
+	G_ 2
+	A_ 2
 
 Music_MeetRival_branch_b140::
-	note B_, 4
-	note A#, 2
-	note A_, 4
-	note G_, 2
+	B_ 4
+	A# 2
+	A_ 4
+	G_ 2
 	octave 4
-	note C_, 4
-	note D_, 2
+	C_ 4
+	D_ 2
 	rest 4
-	note D_, 4
-	note C#, 2
-	note C_, 2
+	D_ 4
+	C# 2
+	C_ 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C_, 4
-	note E_, 2
-	note D_, 4
-	note C_, 2
+	C_ 4
+	E_ 2
+	D_ 4
+	C_ 2
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note C_, 2
+	C_ 2
 	rest 4
-	note G_, 4
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note D_, 2
-	note F#, 2
+	G_ 4
+	G_ 2
+	F# 2
+	E_ 2
+	D_ 2
+	F# 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note D_, 2
-	note F#, 2
+	D_ 2
+	F# 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note D_, 2
+	D_ 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 4
-	note D_, 2
+	D_ 2
 	rest 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 4
-	note C_, 4
+	C_ 4
 	octave 3
-	note B_, 2
-	note A#, 2
-	note B_, 2
+	B_ 2
+	A# 2
+	B_ 2
 	octave 4
-	note C_, 2
-	note F_, 2
+	C_ 2
+	F_ 2
 	octave 3
-	note G_, 2
+	G_ 2
 	octave 4
-	note C_, 2
-	note F_, 2
-	note D#, 2
-	note C_, 2
+	C_ 2
+	F_ 2
+	D# 2
+	C_ 2
 	octave 3
-	note A#, 2
-	note G_, 2
+	A# 2
+	G_ 2
 	rest 4
-	note A#, 4
+	A# 4
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note A#, 2
+	A# 2
 	octave 4
-	note C_, 2
+	C_ 2
 	notetype 12, 11, 7
 	octave 3
-	note G_, 4
-	note D_, 2
-	note F_, 6
-	note F#, 4
-	note D_, 2
+	G_ 4
+	D_ 2
+	F_ 6
+	F# 4
+	D_ 2
 	rest 4
-	note D_, 4
+	D_ 4
 	notetype 12, 11, 3
-	note A_, 2
-	note G_, 2
-	note A_, 2
+	A_ 2
+	G_ 2
+	A_ 2
 	loopchannel 0, Music_MeetRival_branch_b140
 
 Music_MeetRival_branch_b19b::
@@ -133,13 +133,13 @@ Music_MeetRival_branch_b1a5::
 	toggleperfectpitch
 	notetype 12, 11, 3
 	octave 3
-	note D_, 1
+	D_ 1
 	rest 3
-	note D_, 1
+	D_ 1
 	rest 5
-	note A_, 2
-	note G_, 2
-	note A_, 2
+	A_ 2
+	G_ 2
+	A_ 2
 	loopchannel 0, Music_MeetRival_branch_b140
 
 
@@ -148,86 +148,86 @@ Music_MeetRival_Ch2:: ; b1bb (2:71bb)
 	vibrato 10, 2, 6
 	notetype 12, 12, 7
 	octave 4
-	note B_, 1
-	note A#, 1
-	note A_, 1
-	note G#, 1
-	note G_, 2
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note D_, 6
+	B_ 1
+	A# 1
+	A_ 1
+	G# 1
+	G_ 2
+	F# 1
+	F_ 1
+	E_ 1
+	D# 1
+	D_ 6
 	octave 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note D_, 1
+	D_ 1
 	rest 1
 	octave 4
-	note D_, 2
-	note F_, 2
-	note F#, 2
+	D_ 2
+	F_ 2
+	F# 2
 
 Music_MeetRival_branch_b1d8::
 	notetype 12, 12, 7
-	note G_, 4
-	note D_, 2
-	note F_, 6
-	note F#, 4
-	note G_, 2
+	G_ 4
+	D_ 2
+	F_ 6
+	F# 4
+	G_ 2
 	rest 4
-	note G_, 4
-	note G_, 2
-	note A#, 2
-	note B_, 2
+	G_ 4
+	G_ 2
+	A# 2
+	B_ 2
 	octave 5
-	note C_, 4
+	C_ 4
 	octave 4
-	note G_, 2
-	note A#, 6
-	note B_, 4
+	G_ 2
+	A# 6
+	B_ 4
 	octave 5
-	note C_, 2
+	C_ 2
 	rest 4
-	note C_, 4
-	note C_, 2
+	C_ 4
+	C_ 2
 	octave 4
-	note B_, 2
+	B_ 2
 	octave 5
-	note C_, 2
+	C_ 2
 	notetype 12, 11, 0
-	note D_, 16
+	D_ 16
 	notetype 12, 11, 5
-	note D_, 6
+	D_ 6
 	notetype 12, 12, 7
-	note F_, 4
-	note D_, 2
-	note C_, 2
-	note D_, 2
+	F_ 4
+	D_ 2
+	C_ 2
+	D_ 2
 	notetype 12, 11, 0
-	note C_, 8
+	C_ 8
 	notetype 12, 12, 7
-	note C_, 8
+	C_ 8
 	octave 4
-	note C_, 2
+	C_ 2
 	rest 4
-	note A#, 4
-	note G_, 2
-	note F_, 2
+	A# 4
+	G_ 2
+	F_ 2
 	notetype 12, 11, 0
-	note G_, 16
+	G_ 16
 	notetype 12, 11, 3
-	note G_, 2
+	G_ 2
 	octave 3
-	note G_, 2
+	G_ 2
 	rest 4
-	note G_, 4
+	G_ 4
 	octave 4
-	note D_, 2
-	note F_, 2
-	note F#, 2
+	D_ 2
+	F_ 2
+	F# 2
 	loopchannel 0, Music_MeetRival_branch_b1d8
 
 Music_MeetRival_branch_b21d::
@@ -235,163 +235,163 @@ Music_MeetRival_branch_b21d::
 	vibrato 10, 2, 6
 	notetype 12, 12, 7
 	octave 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note D_, 1
+	D_ 1
 	rest 1
 	octave 4
-	note D_, 2
-	note F_, 2
-	note F#, 2
+	D_ 2
+	F_ 2
+	F# 2
 	loopchannel 0, Music_MeetRival_branch_b1d8
 
 
 Music_MeetRival_Ch3:: ; b233 (2:7233)
 	notetype 12, 1, 4
 	octave 5
-	note D_, 2
+	D_ 2
 	rest 2
-	note C#, 2
+	C# 2
 	rest 2
-	note C_, 2
+	C_ 2
 	rest 2
 	octave 4
-	note B_, 2
+	B_ 2
 	rest 2
-	note G_, 1
+	G_ 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
 
 Music_MeetRival_branch_b24b::
-	note G_, 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	rest 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	rest 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	rest 4
 	octave 5
-	note D_, 4
+	D_ 4
 	octave 4
-	note G_, 2
-	note A#, 2
-	note B_, 2
-	note G_, 2
+	G_ 2
+	A# 2
+	B_ 2
+	G_ 2
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	rest 2
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	rest 2
-	note B_, 2
+	B_ 2
 	octave 5
-	note C_, 2
+	C_ 2
 	rest 4
-	note C_, 4
-	note C_, 2
+	C_ 4
+	C_ 2
 	octave 4
-	note B_, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
+	B_ 2
+	A_ 2
+	F# 2
+	A_ 2
 	rest 2
-	note F#, 2
-	note A_, 2
-	note F#, 2
+	F# 2
+	A_ 2
+	F# 2
 	rest 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
+	A_ 2
+	F# 2
+	A_ 2
 	rest 2
-	note F#, 2
-	note A_, 2
-	note F#, 2
+	F# 2
+	A_ 2
+	F# 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note A_, 2
-	note E_, 2
+	A_ 2
+	E_ 2
 	octave 5
-	note C_, 2
+	C_ 2
 	rest 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note E_, 2
-	note F_, 2
-	note G_, 2
-	note E_, 2
+	E_ 2
+	F_ 2
+	G_ 2
+	E_ 2
 	rest 4
-	note E_, 2
+	E_ 2
 	octave 5
-	note C_, 2
+	C_ 2
 	octave 4
-	note B_, 2
-	note A#, 2
-	note A_, 2
-	note G_, 2
-	note A#, 2
+	B_ 2
+	A# 2
+	A_ 2
+	G_ 2
+	A# 2
 	rest 2
-	note G_, 2
-	note A#, 2
-	note G_, 2
+	G_ 2
+	A# 2
+	G_ 2
 	rest 2
-	note A#, 2
-	note G_, 2
+	A# 2
+	G_ 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	rest 2
 	octave 5
-	note D_, 2
+	D_ 2
 	octave 4
-	note G_, 2
+	G_ 2
 	rest 2
 	octave 5
-	note D_, 2
+	D_ 2
 	loopchannel 0, Music_MeetRival_branch_b24b
 
 Music_MeetRival_branch_b2b5::
 	notetype 12, 1, 4
 	octave 4
-	note G_, 1
+	G_ 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
 	loopchannel 0, Music_MeetRival_branch_b24b
-; 0xb2c8
\ No newline at end of file
+; 0xb2c8
diff --git a/audio/music/museumguy.asm b/audio/music/museumguy.asm
index 083222c0..533ac343 100644
--- a/audio/music/museumguy.asm
+++ b/audio/music/museumguy.asm
@@ -5,52 +5,52 @@ Music_MuseumGuy_Ch1:: ; adae (2:6dae)
 	toggleperfectpitch
 	notetype 12, 11, 1
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note D#, 2
+	B_ 2
+	A_ 2
+	G# 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	D# 2
 	octave 2
-	note B_, 4
-	note B_, 1
+	B_ 4
+	B_ 1
 	octave 3
-	note D#, 1
-	note E_, 1
-	note G#, 1
-	note B_, 10
+	D# 1
+	E_ 1
+	G# 1
+	B_ 10
 	callchannel Music_MuseumGuy_branch_ade7
 	callchannel Music_MuseumGuy_branch_adec
 	callchannel Music_MuseumGuy_branch_ade7
-	note E_, 4
-	note E_, 4
-	note E_, 2
-	note E_, 6
+	E_ 4
+	E_ 4
+	E_ 2
+	E_ 6
 
 Music_MuseumGuy_branch_add6::
 	callchannel Music_MuseumGuy_branch_ade7
 	callchannel Music_MuseumGuy_branch_adec
 	callchannel Music_MuseumGuy_branch_ade7
-	note E_, 4
-	note E_, 4
-	note E_, 2
-	note E_, 6
+	E_ 4
+	E_ 4
+	E_ 2
+	E_ 6
 	loopchannel 0, Music_MuseumGuy_branch_add6
 
 Music_MuseumGuy_branch_ade7::
-	note E_, 2
-	note E_, 6
-	note F#, 2
-	note F#, 6
+	E_ 2
+	E_ 6
+	F# 2
+	F# 6
 	endchannel
 
 Music_MuseumGuy_branch_adec::
-	note E_, 2
-	note E_, 6
-	note D_, 2
-	note D_, 6
+	E_ 2
+	E_ 6
+	D_ 2
+	D_ 6
 	endchannel
 
 
@@ -58,110 +58,110 @@ Music_MuseumGuy_Ch2:: ; adf1 (2:6df1)
 	duty 2
 	notetype 12, 12, 1
 	octave 4
-	note E_, 2
-	note D_, 2
-	note C#, 2
-	note D_, 2
-	note C#, 2
+	E_ 2
+	D_ 2
+	C# 2
+	D_ 2
+	C# 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note E_, 4
-	note E_, 1
-	note G#, 1
-	note B_, 1
+	B_ 2
+	A_ 2
+	G# 2
+	E_ 4
+	E_ 1
+	G# 1
+	B_ 1
 	octave 4
-	note D#, 1
-	note E_, 8
+	D# 1
+	E_ 8
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note C#, 2
-	note E_, 4
-	note D_, 2
-	note F#, 2
-	note A_, 4
+	C# 2
+	E_ 4
+	D_ 2
+	F# 2
+	A_ 4
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note C#, 2
-	note E_, 4
-	note D_, 2
-	note C#, 2
+	C# 2
+	E_ 4
+	D_ 2
+	C# 2
 	octave 3
-	note B_, 4
-	note A_, 2
+	B_ 4
+	A_ 2
 	octave 4
-	note C#, 2
-	note E_, 4
-	note D_, 2
-	note F#, 2
-	note A_, 2
-	note A_, 2
-	note G#, 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
-	note A_, 2
-	note A_, 4
+	C# 2
+	E_ 4
+	D_ 2
+	F# 2
+	A_ 2
+	A_ 2
+	G# 2
+	E_ 2
+	F# 2
+	G# 2
+	A_ 2
+	A_ 2
+	A_ 4
 
 Music_MuseumGuy_branch_ae26::
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note C#, 2
-	note E_, 3
+	C# 2
+	E_ 3
 	notetype 12, 8, 1
-	note E_, 1
+	E_ 1
 	notetype 12, 12, 1
-	note D_, 2
-	note F#, 2
-	note A_, 3
+	D_ 2
+	F# 2
+	A_ 3
 	notetype 12, 9, 1
-	note A_, 1
+	A_ 1
 	notetype 12, 12, 1
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note C#, 2
-	note E_, 4
-	note D_, 1
-	note C#, 1
-	note C_, 1
+	C# 2
+	E_ 4
+	D_ 1
+	C# 1
+	C_ 1
 	octave 3
-	note B_, 1
-	note B_, 3
+	B_ 1
+	B_ 3
 	notetype 12, 10, 1
-	note G#, 1
+	G# 1
 	notetype 12, 12, 1
-	note A_, 2
+	A_ 2
 	octave 4
-	note C#, 2
-	note E_, 3
+	C# 2
+	E_ 3
 	notetype 12, 9, 1
-	note E_, 1
+	E_ 1
 	notetype 12, 12, 1
-	note D_, 2
-	note F#, 2
-	note A_, 3
+	D_ 2
+	F# 2
+	A_ 3
 	notetype 12, 8, 1
-	note A_, 1
+	A_ 1
 	notetype 12, 12, 1
-	note G#, 2
-	note E_, 1
+	G# 2
+	E_ 1
 	notetype 12, 8, 1
-	note E_, 1
+	E_ 1
 	notetype 12, 12, 1
-	note F#, 2
+	F# 2
 	notetype 12, 8, 1
-	note F#, 1
+	F# 1
 	notetype 12, 12, 1
-	note G#, 1
-	note A_, 2
-	note A_, 2
-	note A_, 4
+	G# 1
+	A_ 2
+	A_ 2
+	A_ 4
 	loopchannel 0, Music_MuseumGuy_branch_ae26
 
 
@@ -169,95 +169,95 @@ Music_MuseumGuy_Ch3:: ; ae6e (2:6e6e)
 	notetype 12, 1, 0
 	rest 16
 	octave 4
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 9
 	callchannel Music_MuseumGuy_branch_aeb8
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 5
-	note G#, 1
+	G# 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 5
 	callchannel Music_MuseumGuy_branch_aeb8
-	note B_, 1
+	B_ 1
 	rest 3
-	note G#, 1
+	G# 1
 	rest 3
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 3
 
 Music_MuseumGuy_branch_ae8e::
 	callchannel Music_MuseumGuy_branch_aec1
 	rest 3
 	octave 6
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 5
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 3
-	note B_, 1
+	B_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 3
 	callchannel Music_MuseumGuy_branch_aec1
 	rest 1
 	octave 6
-	note E_, 1
+	E_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
 	octave 5
-	note B_, 1
+	B_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 3
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 3
 	loopchannel 0, Music_MuseumGuy_branch_ae8e
 
 Music_MuseumGuy_branch_aeb8::
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 5
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 5
 	endchannel
 
 Music_MuseumGuy_branch_aec1::
 	octave 6
-	note C#, 1
+	C# 1
 	rest 1
 	octave 5
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 3
 	octave 6
-	note F#, 1
+	F# 1
 	rest 1
 	octave 5
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	endchannel
 
 
@@ -270,69 +270,69 @@ Music_MuseumGuy_Ch4:: ; aed1 (2:6ed1)
 	rest 16
 	rest 14
 	dspeed 6
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
 
 Music_MuseumGuy_branch_aee1::
-	dnote 4, mutedsnare2
-	dnote 6, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 6, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 4, mutedsnare2
-	dnote 6, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 6, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 2, mutedsnare2
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 2, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 6, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
+	mutedsnare2 4
+	mutedsnare2 6
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare2 4
+	mutedsnare2 2
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare2 6
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare2 4
+	mutedsnare2 6
+	mutedsnare2 2
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 6
+	mutedsnare2 2
+	mutedsnare2 4
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare2 2
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 2
+	mutedsnare2 4
+	mutedsnare2 4
+	mutedsnare2 2
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare2 4
+	mutedsnare2 2
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 6
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare2 4
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
 	loopchannel 0, Music_MuseumGuy_branch_aee1
-; 0xaf59
\ No newline at end of file
+; 0xaf59
diff --git a/audio/music/oakslab.asm b/audio/music/oakslab.asm
index 92ed2be4..51c6cbf6 100644
--- a/audio/music/oakslab.asm
+++ b/audio/music/oakslab.asm
@@ -6,66 +6,66 @@ Music_OaksLab_Ch1:: ; 7eeb9 (1f:6eb9)
 	toggleperfectpitch
 	notetype 12, 11, 3
 	octave 2
-	note B_, 1
+	B_ 1
 	octave 3
-	note C#, 1
-	note D_, 1
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note A_, 1
-	note B_, 1
+	C# 1
+	D_ 1
+	E_ 1
+	F# 1
+	G# 1
+	A_ 1
+	B_ 1
 
 Music_OaksLab_branch_7eed0::
 	octave 4
-	note C#, 4
+	C# 4
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note A_, 4
-	note G#, 2
-	note A_, 2
-	note B_, 1
+	A_ 4
+	G# 2
+	A_ 2
+	B_ 1
 	rest 3
-	note A_, 6
-	note G#, 1
-	note B_, 1
+	A_ 6
+	G# 1
+	B_ 1
 	octave 4
-	note C#, 4
+	C# 4
 	octave 3
-	note A_, 4
-	note G#, 2
-	note A_, 2
-	note F#, 4
-	note E_, 2
-	note F#, 2
-	note G#, 1
+	A_ 4
+	G# 2
+	A_ 2
+	F# 4
+	E_ 2
+	F# 2
+	G# 1
 	rest 3
-	note F#, 8
-	note E_, 4
-	note A_, 6
-	note E_, 1
-	note A_, 1
+	F# 8
+	E_ 4
+	A_ 6
+	E_ 1
+	A_ 1
 	octave 4
-	note D_, 8
-	note C#, 6
+	D_ 8
+	C# 6
 	octave 3
-	note A_, 1
+	A_ 1
 	octave 4
-	note C#, 1
-	note E_, 8
-	note D_, 4
-	note C#, 4
+	C# 1
+	E_ 8
+	D_ 4
+	C# 4
 	octave 3
-	note B_, 4
-	note A_, 4
-	note G#, 1
+	B_ 4
+	A_ 4
+	G# 1
 	rest 3
-	note E_, 4
-	note F#, 4
-	note G#, 4
+	E_ 4
+	F# 4
+	G# 4
 	loopchannel 0, Music_OaksLab_branch_7eed0
 
 
@@ -74,72 +74,72 @@ Music_OaksLab_Ch2:: ; 7ef05 (1f:6f05)
 	vibrato 10, 2, 5
 	notetype 12, 12, 4
 	octave 3
-	note G#, 1
-	note A_, 1
-	note B_, 1
+	G# 1
+	A_ 1
+	B_ 1
 	octave 4
-	note C#, 1
-	note D_, 1
-	note E_, 1
-	note F#, 1
-	note G#, 1
+	C# 1
+	D_ 1
+	E_ 1
+	F# 1
+	G# 1
 
 Music_OaksLab_branch_7ef16::
-	note A_, 6
-	note G#, 1
-	note F#, 1
-	note E_, 6
-	note D#, 1
-	note E_, 1
-	note F#, 1
+	A_ 6
+	G# 1
+	F# 1
+	E_ 6
+	D# 1
+	E_ 1
+	F# 1
 	rest 3
-	note E_, 8
-	note E_, 4
-	note F#, 6
-	note E_, 1
-	note D_, 1
-	note C#, 6
+	E_ 8
+	E_ 4
+	F# 6
+	E_ 1
+	D_ 1
+	C# 6
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C#, 1
-	note D_, 1
+	C# 1
+	D_ 1
 	rest 3
-	note C#, 8
-	note C#, 4
-	note D_, 6
+	C# 8
+	C# 4
+	D_ 6
 	octave 3
-	note A_, 1
+	A_ 1
 	octave 4
-	note D_, 1
-	note F#, 8
-	note E_, 6
-	note C#, 1
-	note E_, 1
-	note A_, 8
-	note G#, 4
-	note A_, 2
-	note G#, 2
-	note F#, 4
-	note G#, 2
-	note F#, 2
-	note E_, 1
+	D_ 1
+	F# 8
+	E_ 6
+	C# 1
+	E_ 1
+	A_ 8
+	G# 4
+	A_ 2
+	G# 2
+	F# 4
+	G# 2
+	F# 2
+	E_ 1
 	rest 1
 	octave 3
-	note G#, 1
+	G# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note C#, 1
+	C# 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
 	loopchannel 0, Music_OaksLab_branch_7ef16
 
@@ -148,247 +148,247 @@ Music_OaksLab_Ch3:: ; 7ef52 (1f:6f52)
 	notetype 12, 1, 1
 	rest 2
 	octave 4
-	note G#, 1
+	G# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
 
 Music_OaksLab_branch_7ef5c::
-	note C#, 1
+	C# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 3
-	note A_, 1
+	A_ 1
 	rest 3
-	note A_, 1
+	A_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 3
-	note A_, 1
+	A_ 1
 	rest 3
-	note A_, 1
+	A_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 3
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 3
-	note A_, 1
+	A_ 1
 	rest 3
-	note A_, 1
+	A_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note G#, 1
+	G# 1
 	rest 3
-	note G#, 1
+	G# 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 5
-	note G#, 1
+	G# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 3
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note G#, 1
+	G# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note G#, 1
+	G# 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 3
-	note G#, 1
+	G# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 3
 	loopchannel 0, Music_OaksLab_branch_7ef5c
-; 0x7f04a
\ No newline at end of file
+; 0x7f04a
diff --git a/audio/music/pallettown.asm b/audio/music/pallettown.asm
index 1a185d72..71be9eb1 100644
--- a/audio/music/pallettown.asm
+++ b/audio/music/pallettown.asm
@@ -6,144 +6,144 @@ Music_PalletTown_Ch1:: ; a7c5 (2:67c5)
 
 Music_PalletTown_branch_a7ce::
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note C_, 2
-	note D_, 4
-	note G_, 2
-	note D_, 2
-	note C_, 2
+	C_ 2
+	D_ 4
+	G_ 2
+	D_ 2
+	C_ 2
 	octave 3
-	note B_, 4
-	note G_, 2
+	B_ 4
+	G_ 2
 	octave 4
-	note D_, 4
-	note D_, 2
-	note C_, 2
+	D_ 4
+	D_ 2
+	C_ 2
 	octave 3
-	note B_, 2
+	B_ 2
 	rest 2
-	note B_, 2
+	B_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C_, 8
+	C_ 8
 	rest 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note A_, 2
-	note B_, 2
-	note G_, 2
-	note A_, 2
-	note F#, 2
-	note B_, 4
+	A_ 2
+	B_ 2
+	G_ 2
+	A_ 2
+	F# 2
+	B_ 4
 	octave 4
-	note C_, 2
-	note D_, 4
-	note G_, 2
-	note D_, 2
-	note C_, 2
+	C_ 2
+	D_ 4
+	G_ 2
+	D_ 2
+	C_ 2
 	octave 3
-	note B_, 4
-	note G_, 2
+	B_ 4
+	G_ 2
 	octave 4
-	note D_, 4
-	note D_, 2
-	note G_, 2
-	note F#, 2
-	note E_, 4
-	note D_, 2
-	note C_, 4
+	D_ 4
+	D_ 2
+	G_ 2
+	F# 2
+	E_ 4
+	D_ 2
+	C_ 4
 	octave 3
-	note A_, 2
-	note B_, 2
+	A_ 2
+	B_ 2
 	octave 4
-	note C_, 2
-	note D_, 2
-	note C_, 2
+	C_ 2
+	D_ 2
+	C_ 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G_, 4
-	note F#, 4
+	B_ 2
+	A_ 2
+	G_ 4
+	F# 4
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note G_, 2
-	note E_, 2
-	note G_, 2
+	G_ 2
+	E_ 2
+	G_ 2
 	octave 4
-	note D_, 2
+	D_ 2
 	octave 3
-	note A_, 2
-	note F#, 2
-	note A_, 2
+	A_ 2
+	F# 2
+	A_ 2
 	notetype 12, 11, 3
-	note B_, 2
-	note G_, 2
-	note D_, 2
-	note G_, 2
-	note B_, 2
-	note G_, 2
-	note D_, 2
-	note G_, 2
+	B_ 2
+	G_ 2
+	D_ 2
+	G_ 2
+	B_ 2
+	G_ 2
+	D_ 2
+	G_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note G_, 2
-	note E_, 2
-	note G_, 2
+	G_ 2
+	E_ 2
+	G_ 2
 	octave 4
-	note D_, 2
+	D_ 2
 	octave 3
-	note A_, 2
-	note F#, 2
-	note A_, 2
-	note B_, 2
-	note G_, 2
-	note D_, 2
-	note G_, 2
-	note B_, 2
-	note G_, 2
-	note D_, 2
-	note G_, 2
-	note A_, 2
-	note E_, 2
-	note C_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note C_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note C_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note C_, 2
-	note E_, 2
-	note F#, 2
-	note D_, 2
-	note C_, 2
-	note D_, 2
-	note G_, 2
-	note E_, 2
-	note C_, 2
-	note E_, 2
-	note G_, 2
-	note E_, 2
-	note C_, 2
-	note E_, 2
-	note F#, 2
-	note D_, 2
-	note C_, 2
-	note D_, 2
+	A_ 2
+	F# 2
+	A_ 2
+	B_ 2
+	G_ 2
+	D_ 2
+	G_ 2
+	B_ 2
+	G_ 2
+	D_ 2
+	G_ 2
+	A_ 2
+	E_ 2
+	C_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	C_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	C_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	C_ 2
+	E_ 2
+	F# 2
+	D_ 2
+	C_ 2
+	D_ 2
+	G_ 2
+	E_ 2
+	C_ 2
+	E_ 2
+	G_ 2
+	E_ 2
+	C_ 2
+	E_ 2
+	F# 2
+	D_ 2
+	C_ 2
+	D_ 2
 	loopchannel 0, Music_PalletTown_branch_a7ce
 	endchannel
 
@@ -154,110 +154,110 @@ Music_PalletTown_Ch2:: ; a85f (2:685f)
 Music_PalletTown_branch_a861::
 	notetype 12, 13, 3
 	octave 5
-	note D_, 2
+	D_ 2
 	notetype 12, 10, 3
-	note C_, 2
+	C_ 2
 	notetype 12, 13, 3
 	octave 4
-	note B_, 2
+	B_ 2
 	notetype 12, 11, 3
-	note A_, 2
+	A_ 2
 	notetype 12, 13, 3
 	octave 5
-	note G_, 2
+	G_ 2
 	notetype 12, 11, 3
-	note E_, 2
+	E_ 2
 	notetype 12, 13, 3
-	note F#, 2
-	note E_, 2
-	note D_, 6
+	F# 2
+	E_ 2
+	D_ 6
 	octave 4
-	note B_, 2
-	note G_, 2
-	note G_, 2
-	note A_, 2
-	note B_, 2
+	B_ 2
+	G_ 2
+	G_ 2
+	A_ 2
+	B_ 2
 	octave 5
-	note C_, 10
+	C_ 10
 	octave 4
-	note F#, 2
-	note G_, 2
-	note A_, 2
-	note B_, 6
+	F# 2
+	G_ 2
+	A_ 2
+	B_ 6
 	octave 5
-	note C_, 1
+	C_ 1
 	octave 4
-	note B_, 1
-	note A_, 8
+	B_ 1
+	A_ 8
 	octave 5
-	note D_, 2
+	D_ 2
 	notetype 12, 10, 3
-	note C_, 2
+	C_ 2
 	notetype 12, 13, 3
 	octave 4
-	note B_, 2
+	B_ 2
 	notetype 12, 11, 3
 	octave 5
-	note D_, 2
+	D_ 2
 	notetype 12, 13, 3
-	note G_, 2
+	G_ 2
 	notetype 12, 10, 3
-	note F#, 2
+	F# 2
 	notetype 12, 11, 3
-	note F#, 2
+	F# 2
 	notetype 12, 13, 3
-	note G_, 2
-	note E_, 6
-	note D_, 2
-	note D_, 8
-	note C_, 2
+	G_ 2
+	E_ 6
+	D_ 2
+	D_ 8
+	C_ 2
 	octave 4
-	note B_, 2
-	note A_, 2
-	note G_, 2
+	B_ 2
+	A_ 2
+	G_ 2
 	octave 5
-	note D_, 2
-	note C_, 2
+	D_ 2
+	C_ 2
 	octave 4
-	note B_, 2
-	note A_, 2
-	note G_, 10
-	note G_, 2
-	note A_, 2
-	note B_, 2
+	B_ 2
+	A_ 2
+	G_ 10
+	G_ 2
+	A_ 2
+	B_ 2
 	octave 5
-	note C_, 8
-	note D_, 6
-	note C_, 2
+	C_ 8
+	D_ 6
+	C_ 2
 	octave 4
-	note B_, 8
+	B_ 8
 	rest 2
-	note G_, 2
-	note A_, 2
-	note B_, 2
+	G_ 2
+	A_ 2
+	B_ 2
 	octave 5
-	note C_, 4
-	note C_, 4
-	note D_, 6
-	note C_, 1
-	note D_, 1
+	C_ 4
+	C_ 4
+	D_ 6
+	C_ 1
+	D_ 1
 	octave 4
-	note B_, 8
+	B_ 8
 	rest 2
-	note B_, 2
-	note A_, 2
-	note G_, 2
-	note A_, 8
-	note E_, 4
-	note B_, 4
-	note A_, 8
-	note G_, 4
-	note E_, 4
-	note F#, 8
-	note G_, 4
-	note B_, 4
-	note B_, 8
-	note A_, 8
+	B_ 2
+	A_ 2
+	G_ 2
+	A_ 8
+	E_ 4
+	B_ 4
+	A_ 8
+	G_ 4
+	E_ 4
+	F# 8
+	G_ 4
+	B_ 4
+	B_ 8
+	A_ 8
 	loopchannel 0, Music_PalletTown_branch_a861
 	endchannel
 
@@ -268,48 +268,48 @@ Music_PalletTown_Ch3:: ; a8de (2:68de)
 
 Music_PalletTown_branch_a8e3::
 	octave 4
-	note G_, 6
-	note E_, 6
-	note F#, 4
-	note G_, 6
-	note A_, 6
-	note G_, 4
-	note E_, 6
-	note F#, 6
-	note E_, 4
-	note G_, 6
-	note E_, 6
-	note D_, 4
-	note G_, 6
-	note E_, 6
-	note F#, 4
-	note G_, 6
-	note A_, 6
-	note G_, 4
-	note E_, 6
-	note F#, 6
-	note A_, 4
-	note G_, 6
-	note E_, 6
-	note D_, 4
-	note C_, 8
-	note D_, 8
-	note G_, 8
-	note E_, 4
-	note D_, 4
-	note C_, 8
-	note D_, 8
-	note G_, 8
-	note A_, 4
-	note G_, 4
-	note E_, 8
-	note A_, 8
-	note E_, 8
-	note G_, 8
-	note F#, 8
-	note E_, 8
-	note E_, 8
-	note F#, 8
+	G_ 6
+	E_ 6
+	F# 4
+	G_ 6
+	A_ 6
+	G_ 4
+	E_ 6
+	F# 6
+	E_ 4
+	G_ 6
+	E_ 6
+	D_ 4
+	G_ 6
+	E_ 6
+	F# 4
+	G_ 6
+	A_ 6
+	G_ 4
+	E_ 6
+	F# 6
+	A_ 4
+	G_ 6
+	E_ 6
+	D_ 4
+	C_ 8
+	D_ 8
+	G_ 8
+	E_ 4
+	D_ 4
+	C_ 8
+	D_ 8
+	G_ 8
+	A_ 4
+	G_ 4
+	E_ 8
+	A_ 8
+	E_ 8
+	G_ 8
+	F# 8
+	E_ 8
+	E_ 8
+	F# 8
 	loopchannel 0, Music_PalletTown_branch_a8e3
 	endchannel
-; 0xa913
\ No newline at end of file
+; 0xa913
diff --git a/audio/music/pkmnhealed.asm b/audio/music/pkmnhealed.asm
index 61e7fea8..24247326 100644
--- a/audio/music/pkmnhealed.asm
+++ b/audio/music/pkmnhealed.asm
@@ -6,16 +6,16 @@ Music_PkmnHealed_Ch1:: ; 9ba3 (2:5ba3)
 	notetype 12, 8, 1
 	rest 2
 	pitchbend 0, 75
-	note B_, 2
+	B_ 2
 	pitchbend 0, 84
-	note B_, 2
+	B_ 2
 	pitchbend 0, 68
-	note E_, 2
+	E_ 2
 	rest 4
 	pitchbend 0, 59
-	note E_, 4
+	E_ 4
 	pitchbend 0, 75
-	note B_, 4
+	B_ 4
 	endchannel
 
 
@@ -23,26 +23,26 @@ Music_PkmnHealed_Ch2:: ; 9bc4 (2:5bc4)
 	duty 2
 	notetype 12, 12, 3
 	octave 4
-	note B_, 4
-	note B_, 4
-	note B_, 2
-	note G#, 2
+	B_ 4
+	B_ 4
+	B_ 2
+	G# 2
 	notetype 12, 12, 4
 	octave 5
-	note E_, 8
+	E_ 8
 	endchannel
 
 
 Music_PkmnHealed_Ch3:: ; 9bd2 (2:5bd2)
 	notetype 12, 1, 0
 	octave 4
-	note E_, 2
+	E_ 2
 	rest 2
-	note E_, 2
+	E_ 2
 	rest 2
-	note E_, 2
-	note G#, 2
-	note E_, 6
+	E_ 2
+	G# 2
+	E_ 6
 	rest 2
 	endchannel
-; 0x9bde
\ No newline at end of file
+; 0x9bde
diff --git a/audio/music/pokecenter.asm b/audio/music/pokecenter.asm
index 5c74592e..de6e0873 100644
--- a/audio/music/pokecenter.asm
+++ b/audio/music/pokecenter.asm
@@ -8,144 +8,144 @@ Music_Pokecenter_Ch1:: ; be56 (2:7e56)
 Music_Pokecenter_branch_be61::
 	notetype 12, 10, 3
 	octave 3
-	note F#, 2
-	note F_, 2
-	note F#, 2
+	F# 2
+	F_ 2
+	F# 2
 	notetype 12, 11, 5
 	octave 4
-	note D_, 4
-	note C#, 2
+	D_ 4
+	C# 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note B_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note F#, 2
-	note G_, 2
-	note A_, 2
+	B_ 2
+	A_ 2
+	B_ 2
+	A_ 2
+	G_ 2
+	F# 2
+	E_ 2
+	F# 2
+	G_ 2
+	A_ 2
 	notetype 12, 10, 3
-	note A_, 2
-	note E_, 2
-	note A_, 2
+	A_ 2
+	E_ 2
+	A_ 2
 	notetype 12, 11, 5
 	octave 4
-	note C#, 4
+	C# 4
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
-	note A_, 2
-	note B_, 2
+	B_ 2
+	A_ 2
+	G_ 2
+	F# 2
+	A_ 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D_, 2
-	note C#, 2
+	C# 2
+	D_ 2
+	C# 2
 	octave 3
-	note B_, 2
-	note A_, 2
+	B_ 2
+	A_ 2
 	notetype 12, 10, 3
-	note F#, 2
-	note F_, 2
-	note F#, 2
+	F# 2
+	F_ 2
+	F# 2
 	notetype 12, 11, 5
 	octave 4
-	note D_, 4
-	note C#, 2
+	D_ 4
+	C# 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note B_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note F#, 2
-	note G_, 2
-	note A_, 2
+	B_ 2
+	A_ 2
+	B_ 2
+	A_ 2
+	G_ 2
+	F# 2
+	E_ 2
+	F# 2
+	G_ 2
+	A_ 2
 	notetype 12, 10, 3
-	note A_, 2
-	note E_, 2
-	note A_, 2
+	A_ 2
+	E_ 2
+	A_ 2
 	notetype 12, 11, 5
 	octave 4
-	note C#, 4
+	C# 4
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note D_, 2
-	note E_, 2
-	note F#, 2
-	note G_, 2
-	note A_, 2
-	note B_, 2
-	note F#, 2
-	note E_, 2
-	note D_, 4
-	note E_, 2
-	note F#, 2
-	note G_, 2
-	note A_, 2
-	note B_, 2
-	note A_, 2
-	note G_, 4
-	note E_, 2
-	note F#, 2
-	note G_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
-	note E_, 4
-	note C#, 2
-	note D_, 2
-	note E_, 2
-	note G_, 2
-	note F#, 2
-	note G_, 2
-	note A_, 2
-	note B_, 2
-	note A_, 8
+	B_ 2
+	A_ 2
+	G_ 2
+	F# 2
+	E_ 2
+	D_ 2
+	E_ 2
+	F# 2
+	G_ 2
+	A_ 2
+	B_ 2
+	F# 2
+	E_ 2
+	D_ 4
+	E_ 2
+	F# 2
+	G_ 2
+	A_ 2
+	B_ 2
+	A_ 2
+	G_ 4
+	E_ 2
+	F# 2
+	G_ 2
+	A_ 2
+	G_ 2
+	F# 2
+	E_ 4
+	C# 2
+	D_ 2
+	E_ 2
+	G_ 2
+	F# 2
+	G_ 2
+	A_ 2
+	B_ 2
+	A_ 8
 	octave 4
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	octave 3
-	note B_, 4
-	note A_, 2
-	note B_, 2
+	B_ 4
+	A_ 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D_, 2
-	note E_, 2
-	note D_, 2
-	note C#, 4
+	C# 2
+	D_ 2
+	E_ 2
+	D_ 2
+	C# 4
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D_, 2
-	note E_, 2
-	note C#, 2
+	C# 2
+	D_ 2
+	E_ 2
+	C# 2
 	octave 3
-	note B_, 2
-	note A_, 4
-	note G_, 2
-	note A_, 2
-	note B_, 2
-	note G_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note D_, 2
-	note E_, 2
-	note F#, 2
-	note G_, 2
+	B_ 2
+	A_ 4
+	G_ 2
+	A_ 2
+	B_ 2
+	G_ 2
+	A_ 2
+	G_ 2
+	F# 2
+	E_ 2
+	D_ 2
+	E_ 2
+	F# 2
+	G_ 2
 	loopchannel 0, Music_Pokecenter_branch_be61
 
 
@@ -157,94 +157,94 @@ Music_Pokecenter_branch_befc::
 	duty 3
 	notetype 12, 10, 5
 	octave 3
-	note A_, 4
-	note E_, 4
+	A_ 4
+	E_ 4
 	callchannel Music_Pokecenter_branch_bf60
-	note D_, 2
-	note F#, 6
+	D_ 2
+	F# 6
 	duty 3
 	notetype 12, 10, 5
 	octave 3
-	note A_, 4
-	note E_, 4
+	A_ 4
+	E_ 4
 	callchannel Music_Pokecenter_branch_bf4e
 	duty 3
 	notetype 12, 10, 5
 	octave 3
-	note A_, 4
-	note E_, 4
+	A_ 4
+	E_ 4
 	callchannel Music_Pokecenter_branch_bf60
-	note D_, 8
+	D_ 8
 	duty 3
 	notetype 12, 10, 5
 	octave 3
-	note D_, 4
-	note E_, 4
+	D_ 4
+	E_ 4
 	duty 2
 	notetype 12, 12, 6
 	octave 4
-	note F#, 8
-	note A_, 8
-	note G_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
-	note E_, 8
-	note C#, 8
-	note E_, 8
-	note F#, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note D_, 8
-	note F#, 8
-	note A_, 8
-	note G_, 2
-	note F#, 2
-	note G_, 2
-	note A_, 2
-	note B_, 8
-	note A_, 4
-	note G_, 2
-	note F#, 2
-	note G_, 8
-	note F#, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note D_, 8
+	F# 8
+	A_ 8
+	G_ 2
+	A_ 2
+	G_ 2
+	F# 2
+	E_ 8
+	C# 8
+	E_ 8
+	F# 2
+	G_ 2
+	F# 2
+	E_ 2
+	D_ 8
+	F# 8
+	A_ 8
+	G_ 2
+	F# 2
+	G_ 2
+	A_ 2
+	B_ 8
+	A_ 4
+	G_ 2
+	F# 2
+	G_ 8
+	F# 2
+	G_ 2
+	F# 2
+	E_ 2
+	D_ 8
 	loopchannel 0, Music_Pokecenter_branch_befc
 
 Music_Pokecenter_branch_bf4e::
 	duty 2
 	notetype 12, 12, 2
 	octave 4
-	note D_, 2
+	D_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note D_, 2
+	D_ 2
 	notetype 12, 12, 3
-	note A_, 4
-	note G_, 4
-	note F#, 2
-	note E_, 2
-	note C#, 6
+	A_ 4
+	G_ 4
+	F# 2
+	E_ 2
+	C# 6
 	endchannel
 
 Music_Pokecenter_branch_bf60::
 	duty 2
 	notetype 12, 12, 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	notetype 12, 12, 3
-	note F#, 4
-	note E_, 4
-	note C#, 2
+	F# 4
+	E_ 4
+	C# 2
 	endchannel
 
 
@@ -253,124 +253,124 @@ Music_Pokecenter_Ch3:: ; bf70 (2:7f70)
 
 Music_Pokecenter_branch_bf72::
 	octave 4
-	note D_, 2
-	note F#, 2
-	note D_, 2
-	note F#, 2
-	note D_, 2
-	note F#, 2
-	note G_, 2
-	note F#, 2
+	D_ 2
+	F# 2
+	D_ 2
+	F# 2
+	D_ 2
+	F# 2
+	G_ 2
+	F# 2
 	callchannel Music_Pokecenter_branch_bfd9
 	callchannel Music_Pokecenter_branch_bfe2
-	note F#, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
-	note G_, 2
-	note A_, 2
-	note D_, 2
-	note F#, 2
-	note D_, 2
-	note F#, 2
-	note D_, 2
-	note F#, 2
-	note G_, 2
-	note F#, 2
+	F# 2
+	A_ 2
+	F# 2
+	A_ 2
+	F# 2
+	A_ 2
+	G_ 2
+	A_ 2
+	D_ 2
+	F# 2
+	D_ 2
+	F# 2
+	D_ 2
+	F# 2
+	G_ 2
+	F# 2
 	callchannel Music_Pokecenter_branch_bfd9
 	callchannel Music_Pokecenter_branch_bfe2
-	note D_, 2
-	note F#, 2
-	note D_, 2
-	note F#, 2
-	note D_, 2
-	note B_, 2
-	note A_, 2
-	note G_, 2
+	D_ 2
+	F# 2
+	D_ 2
+	F# 2
+	D_ 2
+	B_ 2
+	A_ 2
+	G_ 2
 	callchannel Music_Pokecenter_branch_bfeb
-	note G_, 2
-	note B_, 2
-	note G_, 2
-	note B_, 2
-	note G_, 2
-	note B_, 2
-	note G_, 2
-	note B_, 2
-	note E_, 2
-	note G_, 2
-	note E_, 2
-	note G_, 2
-	note E_, 2
-	note G_, 2
-	note E_, 2
-	note G_, 2
-	note F#, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
-	note G#, 2
-	note A_, 2
+	G_ 2
+	B_ 2
+	G_ 2
+	B_ 2
+	G_ 2
+	B_ 2
+	G_ 2
+	B_ 2
+	E_ 2
+	G_ 2
+	E_ 2
+	G_ 2
+	E_ 2
+	G_ 2
+	E_ 2
+	G_ 2
+	F# 2
+	A_ 2
+	F# 2
+	A_ 2
+	F# 2
+	A_ 2
+	G# 2
+	A_ 2
 	callchannel Music_Pokecenter_branch_bfeb
-	note G_, 2
-	note B_, 2
-	note G_, 2
-	note B_, 2
-	note G_, 2
-	note B_, 2
-	note G_, 2
-	note B_, 2
-	note E_, 2
-	note G_, 2
-	note E_, 2
-	note G_, 2
-	note E_, 2
-	note G_, 2
-	note E_, 2
-	note G_, 2
-	note F#, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
-	note F#, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
+	G_ 2
+	B_ 2
+	G_ 2
+	B_ 2
+	G_ 2
+	B_ 2
+	G_ 2
+	B_ 2
+	E_ 2
+	G_ 2
+	E_ 2
+	G_ 2
+	E_ 2
+	G_ 2
+	E_ 2
+	G_ 2
+	F# 2
+	A_ 2
+	F# 2
+	A_ 2
+	F# 2
+	G_ 2
+	F# 2
+	E_ 2
 	loopchannel 0, Music_Pokecenter_branch_bf72
 
 Music_Pokecenter_branch_bfd9::
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
 	endchannel
 
 Music_Pokecenter_branch_bfe2::
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note G_, 2
-	note A_, 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	G_ 2
+	A_ 2
 	endchannel
 
 Music_Pokecenter_branch_bfeb::
-	note F#, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
+	F# 2
+	A_ 2
+	F# 2
+	A_ 2
+	F# 2
+	A_ 2
+	F# 2
+	A_ 2
 	endchannel
-; 0xbff4
\ No newline at end of file
+; 0xbff4
diff --git a/audio/music/pokemontower.asm b/audio/music/pokemontower.asm
index 68651f38..e04dcb30 100644
--- a/audio/music/pokemontower.asm
+++ b/audio/music/pokemontower.asm
@@ -7,136 +7,136 @@ Music_PokemonTower_Ch1:: ; 7f04a (1f:704a)
 	notetype 12, 8, 0
 	rest 4
 	octave 4
-	note B_, 12
+	B_ 12
 
 Music_PokemonTower_branch_7f05a::
 	notetype 12, 11, 4
 	octave 4
-	note G_, 1
+	G_ 1
 	rest 7
-	note G_, 1
+	G_ 1
 	rest 7
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 7
-	note B_, 1
+	B_ 1
 	rest 3
-	note B_, 1
+	B_ 1
 	rest 3
-	note B_, 1
+	B_ 1
 	rest 7
-	note B_, 1
+	B_ 1
 	rest 7
-	note B_, 1
+	B_ 1
 	rest 7
 	octave 4
-	note F#, 1
+	F# 1
 	rest 7
-	note C_, 1
+	C_ 1
 	octave 3
-	note B_, 1
-	note G_, 1
+	B_ 1
+	G_ 1
 	rest 5
-	note E_, 1
+	E_ 1
 	rest 7
-	note E_, 1
+	E_ 1
 	rest 7
-	note F#, 1
+	F# 1
 	rest 7
-	note E_, 1
+	E_ 1
 	rest 7
-	note G_, 1
+	G_ 1
 	rest 7
-	note G_, 1
+	G_ 1
 	rest 7
-	note F#, 1
+	F# 1
 	rest 7
-	note F#, 1
+	F# 1
 	rest 7
-	note G_, 1
+	G_ 1
 	rest 7
-	note E_, 1
+	E_ 1
 	rest 7
-	note D_, 1
+	D_ 1
 	rest 7
-	note E_, 1
+	E_ 1
 	rest 7
-	note G_, 1
+	G_ 1
 	rest 7
-	note G_, 1
+	G_ 1
 	rest 7
-	note F#, 1
+	F# 1
 	rest 7
-	note B_, 1
+	B_ 1
 	rest 7
-	note B_, 1
+	B_ 1
 	rest 7
 	octave 4
-	note C_, 1
+	C_ 1
 	rest 7
-	note C_, 1
+	C_ 1
 	rest 7
-	note C#, 1
+	C# 1
 	rest 7
-	note C#, 1
+	C# 1
 	rest 7
-	note C_, 1
+	C_ 1
 	rest 7
-	note C_, 1
+	C_ 1
 	rest 3
 	notetype 12, 8, 4
-	note C_, 1
+	C_ 1
 	rest 3
 	notetype 12, 11, 4
-	note D_, 1
+	D_ 1
 	rest 7
-	note D_, 1
+	D_ 1
 	rest 7
 	octave 3
-	note A_, 1
+	A_ 1
 	rest 7
-	note A_, 1
+	A_ 1
 	rest 7
 	notetype 12, 10, 7
-	note B_, 8
-	note B_, 8
+	B_ 8
+	B_ 8
 	octave 4
-	note C_, 8
-	note C_, 8
-	note C#, 8
-	note C#, 8
+	C_ 8
+	C_ 8
+	C# 8
+	C# 8
 	notetype 12, 10, 6
-	note D_, 16
+	D_ 16
 	rest 16
 	rest 16
 	rest 16
 	rest 16
 	notetype 12, 9, 2
-	note B_, 4
+	B_ 4
 	octave 5
-	note E_, 4
-	note D_, 4
-	note C_, 4
+	E_ 4
+	D_ 4
+	C_ 4
 	octave 4
-	note B_, 4
+	B_ 4
 	octave 5
-	note E_, 4
-	note D_, 4
-	note C_, 4
+	E_ 4
+	D_ 4
+	C_ 4
 	octave 4
-	note B_, 4
+	B_ 4
 	octave 5
-	note E_, 4
-	note D_, 4
-	note C_, 4
+	E_ 4
+	D_ 4
+	C_ 4
 	octave 4
-	note B_, 4
-	note G_, 4
-	note F#, 4
-	note E_, 4
+	B_ 4
+	G_ 4
+	F# 4
+	E_ 4
 	octave 5
-	note C_, 16
-	note C_, 16
+	C_ 16
+	C_ 16
 	loopchannel 0, Music_PokemonTower_branch_7f05a
 
 
@@ -145,150 +145,150 @@ Music_PokemonTower_Ch2:: ; 7f0e3 (1f:70e3)
 	duty 3
 	notetype 12, 10, 0
 	octave 5
-	note C_, 12
+	C_ 12
 	octave 4
-	note E_, 4
+	E_ 4
 
 Music_PokemonTower_branch_7f0ee::
 	notetype 12, 12, 1
 	octave 5
-	note C_, 8
+	C_ 8
 	octave 4
-	note B_, 4
+	B_ 4
 	notetype 12, 12, 4
-	note G_, 1
-	note F#, 1
-	note E_, 1
-	note D#, 1
+	G_ 1
+	F# 1
+	E_ 1
+	D# 1
 	notetype 12, 11, 0
-	note G_, 8
+	G_ 8
 	octave 5
-	note C_, 8
+	C_ 8
 	octave 4
-	note B_, 4
-	note G_, 4
-	note E_, 4
-	note G_, 4
+	B_ 4
+	G_ 4
+	E_ 4
+	G_ 4
 	octave 5
-	note C_, 8
+	C_ 8
 	notetype 12, 11, 7
-	note C_, 8
+	C_ 8
 	notetype 12, 12, 2
 	octave 4
-	note G_, 1
-	note F#, 1
-	note E_, 1
+	G_ 1
+	F# 1
+	E_ 1
 	rest 1
 	notetype 12, 9, 6
 	octave 3
-	note G_, 4
+	G_ 4
 	notetype 12, 12, 7
-	note G_, 4
-	note B_, 4
-	note G_, 4
-	note B_, 4
+	G_ 4
+	B_ 4
+	G_ 4
+	B_ 4
 	octave 4
-	note C_, 4
+	C_ 4
 	octave 3
-	note B_, 4
+	B_ 4
 	notetype 12, 11, 0
 	octave 4
-	note C_, 16
-	note E_, 8
+	C_ 16
+	E_ 8
 	notetype 12, 11, 7
-	note E_, 12
+	E_ 12
 	notetype 12, 12, 5
 	octave 5
-	note C_, 4
+	C_ 4
 	octave 4
-	note B_, 4
-	note G_, 4
-	note B_, 4
-	note G_, 4
-	note F#, 4
-	note E_, 4
+	B_ 4
+	G_ 4
+	B_ 4
+	G_ 4
+	F# 4
+	E_ 4
 	notetype 12, 11, 0
-	note F#, 12
-	note G_, 4
+	F# 12
+	G_ 4
 	notetype 12, 11, 0
-	note F#, 8
+	F# 8
 	notetype 12, 11, 7
-	note F#, 8
+	F# 8
 	notetype 12, 11, 0
-	note B_, 4
-	note G_, 4
-	note F#, 4
-	note E_, 4
-	note B_, 16
+	B_ 4
+	G_ 4
+	F# 4
+	E_ 4
+	B_ 16
 	notetype 12, 11, 0
 	octave 5
-	note C_, 4
+	C_ 4
 	octave 4
-	note G_, 4
-	note F#, 4
-	note E_, 4
+	G_ 4
+	F# 4
+	E_ 4
 	notetype 12, 9, 0
 	octave 5
-	note C_, 16
+	C_ 16
 	notetype 12, 11, 0
-	note D_, 4
+	D_ 4
 	octave 4
-	note A_, 4
-	note G#, 4
-	note F#, 4
+	A_ 4
+	G# 4
+	F# 4
 	notetype 12, 2, 15
 	octave 5
-	note D_, 16
+	D_ 16
 	notetype 12, 12, 0
-	note E_, 4
+	E_ 4
 	octave 4
-	note B_, 4
-	note A_, 4
-	note G_, 4
+	B_ 4
+	A_ 4
+	G_ 4
 	octave 5
-	note F_, 4
-	note C_, 4
+	F_ 4
+	C_ 4
 	octave 4
-	note A#, 4
-	note G#, 4
+	A# 4
+	G# 4
 	octave 5
-	note F#, 4
-	note D_, 4
-	note C_, 4
+	F# 4
+	D_ 4
+	C_ 4
 	octave 4
-	note A#, 4
-	note G#, 4
-	note F#, 4
-	note E_, 4
-	note D_, 4
+	A# 4
+	G# 4
+	F# 4
+	E_ 4
+	D_ 4
 	notetype 12, 11, 0
-	note C_, 8
+	C_ 8
 	notetype 12, 9, 0
-	note C_, 8
+	C_ 8
 	notetype 12, 8, 0
-	note C_, 8
+	C_ 8
 	notetype 12, 7, 0
-	note C_, 8
+	C_ 8
 	notetype 12, 6, 0
-	note C_, 8
+	C_ 8
 	notetype 12, 6, 7
-	note C_, 8
+	C_ 8
 	rest 16
 	notetype 12, 10, 0
 	octave 5
-	note G_, 16
+	G_ 16
 	octave 6
-	note C_, 16
+	C_ 16
 	octave 5
-	note B_, 8
-	note G_, 8
-	note E_, 8
-	note G_, 8
+	B_ 8
+	G_ 8
+	E_ 8
+	G_ 8
 	octave 6
-	note C_, 16
+	C_ 16
 	vibrato 0, 3, 4
 	notetype 12, 10, 7
-	note C_, 16
+	C_ 16
 	loopchannel 0, Music_PokemonTower_branch_7f0ee
 
 
@@ -297,163 +297,163 @@ Music_PokemonTower_Ch3:: ; 7f19a (1f:719a)
 	notetype 12, 1, 3
 	rest 8
 	octave 5
-	note G_, 8
+	G_ 8
 
 Music_PokemonTower_branch_7f1a2::
-	note E_, 1
+	E_ 1
 	rest 7
-	note E_, 1
+	E_ 1
 	rest 7
-	note E_, 1
+	E_ 1
 	rest 7
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
-	note D#, 1
-	note F#, 1
-	note D#, 1
-	note E_, 1
+	E_ 1
+	D# 1
+	F# 1
+	D# 1
+	E_ 1
 	rest 7
-	note G_, 1
+	G_ 1
 	rest 7
-	note E_, 1
+	E_ 1
 	rest 7
-	note B_, 1
+	B_ 1
 	rest 7
-	note E_, 1
-	note D#, 1
+	E_ 1
+	D# 1
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 5
-	note B_, 1
+	B_ 1
 	rest 7
-	note B_, 1
+	B_ 1
 	rest 7
-	note B_, 1
+	B_ 1
 	rest 7
 	octave 5
-	note C_, 1
+	C_ 1
 	rest 7
-	note C_, 1
+	C_ 1
 	rest 7
-	note C_, 1
+	C_ 1
 	rest 7
-	note C_, 1
+	C_ 1
 	rest 7
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 7
-	note B_, 1
+	B_ 1
 	rest 7
-	note B_, 1
+	B_ 1
 	rest 7
-	note B_, 1
+	B_ 1
 	rest 7
 	octave 5
-	note C_, 1
+	C_ 1
 	rest 7
-	note C_, 1
+	C_ 1
 	rest 7
-	note C_, 1
+	C_ 1
 	rest 7
-	note C_, 1
+	C_ 1
 	rest 7
-	note E_, 1
+	E_ 1
 	rest 7
-	note E_, 1
+	E_ 1
 	rest 7
-	note E_, 1
+	E_ 1
 	rest 7
-	note E_, 1
+	E_ 1
 	rest 7
-	note E_, 1
+	E_ 1
 	rest 7
-	note E_, 1
+	E_ 1
 	rest 7
-	note E_, 1
+	E_ 1
 	rest 7
-	note E_, 1
+	E_ 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 7
-	note F#, 1
+	F# 1
 	rest 7
-	note D_, 1
+	D_ 1
 	rest 7
-	note D_, 1
+	D_ 1
 	rest 3
-	note D_, 1
+	D_ 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 7
-	note E_, 1
+	E_ 1
 	rest 7
-	note F_, 1
+	F_ 1
 	rest 7
-	note F_, 1
+	F_ 1
 	rest 7
-	note F#, 1
+	F# 1
 	rest 7
-	note F#, 1
+	F# 1
 	rest 7
-	note G_, 1
+	G_ 1
 	rest 15
 	notetype 12, 1, 5
 	octave 4
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 15
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 7
 	notetype 12, 1, 3
 	octave 6
-	note E_, 1
+	E_ 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 15
-	note E_, 1
+	E_ 1
 	rest 15
-	note E_, 1
+	E_ 1
 	rest 15
-	note E_, 1
+	E_ 1
 	rest 15
-	note E_, 1
+	E_ 1
 	rest 15
-	note E_, 1
+	E_ 1
 	rest 7
 	octave 5
-	note E_, 1
+	E_ 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
 	loopchannel 0, Music_PokemonTower_branch_7f1a2
-; 0x7f243
\ No newline at end of file
+; 0x7f243
diff --git a/audio/music/routes1.asm b/audio/music/routes1.asm
index bf425b5a..9876b0ea 100644
--- a/audio/music/routes1.asm
+++ b/audio/music/routes1.asm
@@ -9,99 +9,99 @@ Music_Routes1_branch_9be9::
 	notetype 12, 10, 1
 	rest 4
 	octave 4
-	note D_, 2
-	note D_, 6
-	note D_, 2
-	note D_, 6
-	note D_, 2
-	note D_, 1
-	note C#, 1
+	D_ 2
+	D_ 6
+	D_ 2
+	D_ 6
+	D_ 2
+	D_ 1
+	C# 1
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C#, 1
+	C# 1
 	octave 3
-	note A_, 2
-	note A_, 2
-	note A_, 6
-	octave 4
-	note C#, 2
-	note C#, 6
-	note C#, 2
-	note C#, 4
+	A_ 2
+	A_ 2
+	A_ 6
+	octave 4
+	C# 2
+	C# 6
+	C# 2
+	C# 4
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 4
+	C# 4
 	octave 3
-	note A_, 2
-	note A_, 6
-	octave 4
-	note D_, 2
-	note D_, 6
-	note D_, 2
-	note D_, 6
-	note D_, 2
-	note D_, 1
-	note E_, 1
-	note D_, 1
-	note C#, 1
+	A_ 2
+	A_ 6
+	octave 4
+	D_ 2
+	D_ 6
+	D_ 2
+	D_ 6
+	D_ 2
+	D_ 1
+	E_ 1
+	D_ 1
+	C# 1
 	octave 3
-	note B_, 2
-	note A_, 2
-	note A_, 6
+	B_ 2
+	A_ 2
+	A_ 6
 	octave 4
-	note C#, 2
-	note C#, 6
+	C# 2
+	C# 6
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	notetype 12, 10, 2
 	octave 4
-	note G_, 4
-	note E_, 4
-	note F#, 2
+	G_ 4
+	E_ 4
+	F# 2
 	notetype 12, 10, 1
 	octave 3
-	note A_, 2
-	note A_, 6
-	note A_, 2
-	note F#, 2
-	note A_, 4
-	note B_, 2
-	octave 4
-	note C#, 2
+	A_ 2
+	A_ 6
+	A_ 2
+	F# 2
+	A_ 4
+	B_ 2
+	octave 4
+	C# 2
 	octave 3
-	note B_, 4
-	note A_, 2
-	note F#, 2
-	note A_, 4
-	note G_, 2
-	note E_, 2
-	note C#, 4
-	note A_, 2
-	octave 4
-	note D_, 2
+	B_ 4
+	A_ 2
+	F# 2
+	A_ 4
+	G_ 2
+	E_ 2
+	C# 4
+	A_ 2
+	octave 4
+	D_ 2
 	octave 3
-	note A_, 4
-	note B_, 2
-	note G_, 2
-	note B_, 4
-	octave 4
-	note D_, 2
-	note E_, 2
-	note C#, 2
-	note D_, 2
+	A_ 4
+	B_ 2
+	G_ 2
+	B_ 4
+	octave 4
+	D_ 2
+	E_ 2
+	C# 2
+	D_ 2
 	octave 3
-	note A_, 2
-	note A_, 2
+	A_ 2
+	A_ 2
 	loopchannel 0, Music_Routes1_branch_9be9
 	endchannel
 
@@ -119,117 +119,117 @@ Music_Routes1_branch_9c53::
 
 Music_Routes1_branch_9c65::
 	octave 4
-	note D_, 1
-	note E_, 1
-	note F#, 2
-	note F#, 2
-	note F#, 2
-	note D_, 1
-	note E_, 1
-	note F#, 2
-	note F#, 2
-	note F#, 2
-	note D_, 1
-	note E_, 1
-	note F#, 2
-	note F#, 2
-	note G_, 3
-	note F#, 1
-	note E_, 6
+	D_ 1
+	E_ 1
+	F# 2
+	F# 2
+	F# 2
+	D_ 1
+	E_ 1
+	F# 2
+	F# 2
+	F# 2
+	D_ 1
+	E_ 1
+	F# 2
+	F# 2
+	G_ 3
+	F# 1
+	E_ 6
 	endchannel
 
 Music_Routes1_branch_9c78::
-	note C#, 1
-	note D_, 1
-	note E_, 2
-	note E_, 2
-	note E_, 2
-	note C#, 1
-	note D_, 1
-	note E_, 2
-	note E_, 2
-	note E_, 2
-	note C#, 1
-	note D_, 1
-	note E_, 2
-	note E_, 2
-	note F#, 1
-	note E_, 1
-	note E_, 1
-	note F#, 1
-	note D_, 4
-	note F#, 2
+	C# 1
+	D_ 1
+	E_ 2
+	E_ 2
+	E_ 2
+	C# 1
+	D_ 1
+	E_ 2
+	E_ 2
+	E_ 2
+	C# 1
+	D_ 1
+	E_ 2
+	E_ 2
+	F# 1
+	E_ 1
+	E_ 1
+	F# 1
+	D_ 4
+	F# 2
 	endchannel
 
 Music_Routes1_branch_9c8d::
-	note C#, 1
-	note D_, 1
-	note E_, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note D_, 2
-	note C#, 2
+	C# 1
+	D_ 1
+	E_ 2
+	G_ 2
+	F# 2
+	E_ 2
+	D_ 2
+	C# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	notetype 12, 13, 2
-	note B_, 4
+	B_ 4
 	notetype 6, 13, 1
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C#, 1
+	C# 1
 	notetype 12, 13, 1
 	octave 3
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	octave 4
-	note C#, 1
-	note D_, 6
+	C# 1
+	D_ 6
 	notetype 12, 13, 2
-	note F#, 1
-	note G_, 1
-	note A_, 2
-	note A_, 2
-	note F#, 2
-	note D_, 2
+	F# 1
+	G_ 1
+	A_ 2
+	A_ 2
+	F# 2
+	D_ 2
 	octave 5
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	octave 4
-	note B_, 2
+	B_ 2
 	octave 5
-	note C#, 2
-	octave 4
-	note A_, 2
-	note F#, 2
-	note D_, 3
-	note F#, 1
-	note E_, 6
-	note F#, 1
-	note G_, 1
-	note A_, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
+	C# 2
+	octave 4
+	A_ 2
+	F# 2
+	D_ 3
+	F# 1
+	E_ 6
+	F# 1
+	G_ 1
+	A_ 2
+	A_ 2
+	F# 2
+	A_ 2
 	octave 5
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	octave 4
-	note B_, 3
-	note G_, 1
-	note A_, 2
+	B_ 3
+	G_ 1
+	A_ 2
 	octave 5
-	note D_, 2
-	note C#, 2
-	note E_, 2
-	note D_, 2
+	D_ 2
+	C# 2
+	E_ 2
+	D_ 2
 	notetype 12, 13, 1
 	octave 4
-	note D_, 2
-	note D_, 2
+	D_ 2
+	D_ 2
 	endchannel
 	endchannel
 
@@ -241,70 +241,70 @@ Music_Routes1_Ch3:: ; 9cd8 (2:5cd8)
 Music_Routes1_branch_9cdd::
 	rest 2
 	octave 4
-	note D_, 4
-	note C#, 4
+	D_ 4
+	C# 4
 	octave 3
-	note B_, 4
-	note A_, 4
+	B_ 4
+	A_ 4
 	octave 4
-	note D_, 4
+	D_ 4
 	octave 3
-	note A_, 4
-	note B_, 4
-	note A_, 4
+	A_ 4
+	B_ 4
+	A_ 4
 	octave 4
-	note C#, 4
+	C# 4
 	octave 3
-	note A_, 4
-	note B_, 4
+	A_ 4
+	B_ 4
 	octave 4
-	note C_, 4
-	note C#, 4
+	C_ 4
+	C# 4
 	octave 3
-	note A_, 4
+	A_ 4
 	octave 4
-	note D_, 4
+	D_ 4
 	octave 3
-	note A_, 4
+	A_ 4
 	octave 4
-	note D_, 4
-	note C#, 4
+	D_ 4
+	C# 4
 	octave 3
-	note B_, 4
-	note A_, 4
+	B_ 4
+	A_ 4
 	octave 4
-	note D_, 4
+	D_ 4
 	octave 3
-	note A_, 4
-	note B_, 4
-	note A_, 4
+	A_ 4
+	B_ 4
+	A_ 4
 	octave 4
-	note C#, 4
+	C# 4
 	octave 3
-	note B_, 4
-	note A_, 4
-	note B_, 4
+	B_ 4
+	A_ 4
+	B_ 4
 	octave 4
-	note C#, 4
+	C# 4
 	octave 3
-	note A_, 4
+	A_ 4
 	octave 4
-	note D_, 4
+	D_ 4
 	octave 3
-	note A_, 4
+	A_ 4
 	octave 4
-	note D_, 8
+	D_ 8
 	octave 3
-	note G_, 8
-	note A_, 8
+	G_ 8
+	A_ 8
 	octave 4
-	note C#, 8
-	note D_, 8
+	C# 8
+	D_ 8
 	octave 3
-	note G_, 8
-	note A_, 8
+	G_ 8
+	A_ 8
 	octave 4
-	note D_, 6
+	D_ 6
 	loopchannel 0, Music_Routes1_branch_9cdd
 	endchannel
 
@@ -312,94 +312,94 @@ Music_Routes1_branch_9cdd::
 Music_Routes1_Ch4:: ; 9d24 (2:5d24)
 	dspeed 12
 	rest 4
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
-	dnote 2, mutedsnare1
+	mutedsnare1 2
+	mutedsnare1 2
 	rest 4
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
-	dnote 2, mutedsnare1
-	dnote 2, mutedsnare1
-	dnote 2, mutedsnare1
+	mutedsnare1 2
+	mutedsnare1 2
+	mutedsnare1 2
+	mutedsnare1 2
 	rest 4
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
-	dnote 2, mutedsnare1
+	mutedsnare1 2
+	mutedsnare1 2
 	rest 4
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
-	dnote 2, mutedsnare1
-	dnote 2, mutedsnare1
+	mutedsnare1 2
+	mutedsnare1 2
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
-	dnote 2, mutedsnare1
+	mutedsnare1 2
+	mutedsnare1 2
 	rest 4
-	dnote 2, mutedsnare1
-	dnote 2, mutedsnare1
-	dnote 2, mutedsnare1
+	mutedsnare1 2
+	mutedsnare1 2
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
-	dnote 2, mutedsnare1
+	mutedsnare1 2
+	mutedsnare1 2
 	rest 4
-	dnote 2, mutedsnare1
-	dnote 2, mutedsnare1
-	dnote 2, mutedsnare1
+	mutedsnare1 2
+	mutedsnare1 2
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
-	dnote 2, mutedsnare1
+	mutedsnare1 2
+	mutedsnare1 2
 	rest 4
-	dnote 2, mutedsnare1
-	dnote 2, mutedsnare1
-	dnote 2, mutedsnare1
+	mutedsnare1 2
+	mutedsnare1 2
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
-	dnote 2, mutedsnare1
-	dnote 2, mutedsnare1
+	mutedsnare1 2
+	mutedsnare1 2
+	mutedsnare1 2
 	rest 2
-	dnote 2, mutedsnare1
-	dnote 2, mutedsnare1
+	mutedsnare1 2
+	mutedsnare1 2
 	loopchannel 0, Music_Routes1_Ch4
 	endchannel
-; 0x9db9
\ No newline at end of file
+; 0x9db9
diff --git a/audio/music/routes2.asm b/audio/music/routes2.asm
index 732396c0..9ba376ce 100644
--- a/audio/music/routes2.asm
+++ b/audio/music/routes2.asm
@@ -7,137 +7,137 @@ Music_Routes2_Ch1:: ; 9db9 (2:5db9)
 Music_Routes2_branch_9dc3::
 	notetype 12, 11, 2
 	octave 2
-	note B_, 4
-	octave 3
-	note G#, 6
-	note F#, 2
-	note E_, 2
-	note D#, 1
-	note F#, 1
-	note E_, 2
+	B_ 4
+	octave 3
+	G# 6
+	F# 2
+	E_ 2
+	D# 1
+	F# 1
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note E_, 2
-	note A_, 2
-	note G#, 4
-	note F#, 4
+	E_ 2
+	A_ 2
+	G# 4
+	F# 4
 	octave 2
-	note B_, 4
-	octave 3
-	note G#, 6
-	note F#, 2
-	note E_, 2
-	note D#, 1
-	note F#, 1
-	note B_, 2
+	B_ 4
+	octave 3
+	G# 6
+	F# 2
+	E_ 2
+	D# 1
+	F# 1
+	B_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note E_, 2
-	note A_, 2
-	note G#, 4
-	note B_, 4
+	E_ 2
+	A_ 2
+	G# 4
+	B_ 4
 	notetype 8, 11, 2
 	octave 4
-	note E_, 2
+	E_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
-	note E_, 2
+	E_ 2
+	E_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note E_, 2
-	note D#, 2
+	E_ 2
+	D# 2
 	octave 3
-	note G#, 2
+	G# 2
 	octave 4
-	note D#, 2
-	note D#, 2
+	D# 2
+	D# 2
 	octave 3
-	note G#, 2
+	G# 2
 	octave 4
-	note D#, 2
-	note C#, 2
+	D# 2
+	C# 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 4
-	note C#, 2
-	note C#, 2
+	C# 2
+	C# 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 4
-	note C#, 2
-	octave 3
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note B_, 2
-	note E_, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
-	note A_, 2
-	note F#, 2
-	note A_, 2
-	note G#, 2
-	note E_, 2
-	note B_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note A_, 2
-	note B_, 2
-	note A_, 2
+	C# 2
+	octave 3
+	B_ 2
+	E_ 2
+	B_ 2
+	B_ 2
+	E_ 2
+	G# 2
+	F# 2
+	G# 2
+	A_ 2
+	A_ 2
+	F# 2
+	A_ 2
+	F# 2
+	G# 2
+	A_ 2
+	A_ 2
+	F# 2
+	A_ 2
+	G# 2
+	E_ 2
+	B_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	A_ 2
+	B_ 2
+	A_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D_, 2
+	C# 2
+	D_ 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note D_, 2
-	note F#, 2
-	note E_, 2
-	note D#, 2
-	note E_, 2
+	D_ 2
+	F# 2
+	E_ 2
+	D# 2
+	E_ 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note E_, 2
-	note E_, 2
+	E_ 2
+	E_ 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note E_, 2
-	note E_, 2
+	E_ 2
+	E_ 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note E_, 2
-	note E_, 2
+	E_ 2
+	E_ 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note E_, 2
+	E_ 2
 	loopchannel 0, Music_Routes2_branch_9dc3
 	endchannel
 
@@ -149,68 +149,68 @@ Music_Routes2_Ch2:: ; 9e4f (2:5e4f)
 Music_Routes2_branch_9e54::
 	notetype 12, 13, 4
 	octave 4
-	note E_, 6
+	E_ 6
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note E_, 1
-	note F#, 6
-	note A_, 2
-	note G#, 3
-	note E_, 1
-	note F#, 8
-	octave 3
-	note D#, 4
+	E_ 1
+	F# 6
+	A_ 2
+	G# 3
+	E_ 1
+	F# 8
+	octave 3
+	D# 4
 	octave 4
-	note E_, 6
+	E_ 6
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note E_, 1
-	note F#, 6
-	note A_, 2
-	note G#, 3
-	note E_, 1
-	note B_, 8
-	octave 3
-	note G#, 4
+	E_ 1
+	F# 6
+	A_ 2
+	G# 3
+	E_ 1
+	B_ 8
+	octave 3
+	G# 4
 	octave 5
-	note C#, 6
+	C# 6
 	octave 4
-	note B_, 1
-	note A_, 1
-	note B_, 6
-	note A_, 1
-	note G#, 1
-	note A_, 6
-	note G#, 1
-	note F#, 1
-	note G#, 4
-	note F#, 2
-	note E_, 2
-	note D_, 2
-	note D_, 1
-	note E_, 1
-	note F#, 8
-	note A_, 4
-	note G#, 3
-	note F#, 1
-	note E_, 8
-	note F#, 2
-	note E_, 2
-	note D_, 2
-	note D_, 1
-	note E_, 1
-	note F#, 2
-	note F#, 1
-	note G#, 1
-	note A_, 4
+	B_ 1
+	A_ 1
+	B_ 6
+	A_ 1
+	G# 1
+	A_ 6
+	G# 1
+	F# 1
+	G# 4
+	F# 2
+	E_ 2
+	D_ 2
+	D_ 1
+	E_ 1
+	F# 8
+	A_ 4
+	G# 3
+	F# 1
+	E_ 8
+	F# 2
+	E_ 2
+	D_ 2
+	D_ 1
+	E_ 1
+	F# 2
+	F# 1
+	G# 1
+	A_ 4
 	octave 5
-	note C#, 4
+	C# 4
 	octave 4
-	note B_, 3
-	note A_, 1
-	note G#, 8
+	B_ 3
+	A_ 1
+	G# 8
 	rest 4
 	loopchannel 0, Music_Routes2_branch_9e54
 	endchannel
@@ -222,103 +222,103 @@ Music_Routes2_Ch3:: ; 9e9b (2:5e9b)
 Music_Routes2_branch_9e9e::
 	notetype 12, 1, 1
 	octave 3
-	note E_, 2
+	E_ 2
 	rest 2
 	octave 2
-	note B_, 6
+	B_ 6
 	octave 3
-	note D_, 1
-	note C#, 1
-	note D_, 2
-	note D#, 2
-	note E_, 2
+	D_ 1
+	C# 1
+	D_ 2
+	D# 2
+	E_ 2
 	rest 2
 	octave 2
-	note B_, 6
+	B_ 6
 	octave 3
-	note D_, 1
-	note C#, 1
+	D_ 1
+	C# 1
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note C#, 2
-	note E_, 2
+	C# 2
+	E_ 2
 	rest 2
 	octave 2
-	note B_, 6
+	B_ 6
 	octave 3
-	note D_, 1
-	note C#, 1
-	note D_, 2
-	note D#, 2
-	note E_, 2
+	D_ 1
+	C# 1
+	D_ 2
+	D# 2
+	E_ 2
 	rest 2
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note C#, 2
+	C# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D_, 2
-	note F#, 2
-	note E_, 2
+	D_ 2
+	F# 2
+	E_ 2
 	rest 2
 	octave 2
-	note A_, 2
+	A_ 2
 	rest 2
 	octave 3
-	note D#, 2
+	D# 2
 	rest 2
 	octave 2
-	note G#, 2
+	G# 2
 	rest 2
 	octave 3
-	note C#, 2
+	C# 2
 	rest 2
 	octave 2
-	note F#, 2
+	F# 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 2
-	note E_, 2
-	note G#, 2
-	note F#, 2
+	E_ 2
+	G# 2
+	F# 2
 	rest 2
-	note A_, 2
+	A_ 2
 	rest 2
-	note F#, 2
+	F# 2
 	rest 2
-	note A_, 2
+	A_ 2
 	rest 2
-	note G#, 2
+	G# 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 2
-	note G#, 2
+	G# 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 2
-	note F#, 2
+	F# 2
 	rest 2
-	note A_, 2
+	A_ 2
 	rest 2
 	octave 3
-	note C#, 2
+	C# 2
 	rest 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note C#, 2
+	C# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	rest 2
 	octave 3
-	note E_, 2
+	E_ 2
 	rest 2
-	note G#, 2
+	G# 2
 	rest 2
-	note E_, 2
+	E_ 2
 	rest 2
 	loopchannel 0, Music_Routes2_branch_9e9e
 	endchannel
@@ -326,101 +326,101 @@ Music_Routes2_branch_9e9e::
 
 Music_Routes2_Ch4:: ; 9f08 (2:5f08)
 	dspeed 12
-	dnote 2, snare3
+	snare3 2
 	rest 2
-	dnote 1, snare3
+	snare3 1
 	rest 5
-	dnote 1, snare3
-	dnote 1, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 1
+	snare3 1
+	snare3 2
+	snare3 2
+	snare3 2
 	rest 2
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 3, snare3
-	dnote 3, snare3
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 3
+	snare3 3
 	dspeed 12
-	dnote 1, snare3
+	snare3 1
 	rest 3
-	dnote 2, snare3
+	snare3 2
 	rest 2
-	dnote 2, snare3
+	snare3 2
 	rest 4
-	dnote 1, snare3
-	dnote 1, snare3
-	dnote 2, snare3
+	snare3 1
+	snare3 1
+	snare3 2
 	rest 2
-	dnote 2, snare3
+	snare3 2
 	rest 2
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 3, snare3
-	dnote 3, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 3, snare3
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 3
+	snare3 3
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 3
 	rest 3
 	dspeed 12
-	dnote 1, snare3
+	snare3 1
 	rest 5
-	dnote 1, snare3
-	dnote 1, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 1
+	snare3 1
+	snare3 2
+	snare3 2
+	snare3 2
 	rest 2
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 3, snare3
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 3
 	rest 3
 	dspeed 12
-	dnote 1, snare3
+	snare3 1
 	rest 3
-	dnote 2, snare3
+	snare3 2
 	rest 2
-	dnote 2, snare3
+	snare3 2
 	rest 4
-	dnote 1, snare3
-	dnote 1, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 1
+	snare3 1
+	snare3 2
+	snare3 2
+	snare3 2
 	rest 2
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 3, snare3
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 3
 	rest 3
-	dnote 3, snare3
-	dnote 3, snare3
-	dnote 3, snare3
+	snare3 3
+	snare3 3
+	snare3 3
 	rest 3
 	dspeed 12
-	dnote 1, snare3
+	snare3 1
 	rest 5
-	dnote 1, snare3
-	dnote 1, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 1
+	snare3 1
+	snare3 2
+	snare3 2
+	snare3 2
 	rest 2
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 3, snare3
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 3
 	rest 3
-	dnote 3, snare3
+	snare3 3
 	rest 3
 	loopchannel 0, Music_Routes2_Ch4
 	endchannel
-; 0x9fad
\ No newline at end of file
+; 0x9fad
diff --git a/audio/music/routes3.asm b/audio/music/routes3.asm
index b8cd4b47..e62ca9bd 100644
--- a/audio/music/routes3.asm
+++ b/audio/music/routes3.asm
@@ -6,74 +6,74 @@ Music_Routes3_Ch1:: ; 9fad (2:5fad)
 	toggleperfectpitch
 	notetype 12, 11, 5
 	octave 3
-	note E_, 1
-	note F#, 1
-	note G_, 6
-	note F_, 1
-	note G_, 1
-	note E_, 1
+	E_ 1
+	F# 1
+	G_ 6
+	F_ 1
+	G_ 1
+	E_ 1
 	rest 16
 	rest 15
 
 Music_Routes3_branch_9fc3::
 	notetype 12, 11, 5
-	note E_, 6
-	note D_, 1
-	note E_, 1
-	note C_, 4
-	note E_, 4
-	note C_, 6
-	note D_, 1
-	note E_, 1
-	note F_, 2
-	note G_, 2
-	note G_, 2
-	note A_, 2
+	E_ 6
+	D_ 1
+	E_ 1
+	C_ 4
+	E_ 4
+	C_ 6
+	D_ 1
+	E_ 1
+	F_ 2
+	G_ 2
+	G_ 2
+	A_ 2
 	notetype 12, 10, 7
-	note A#, 8
-	note F_, 8
-	note D_, 8
-	note F_, 8
+	A# 8
+	F_ 8
+	D_ 8
+	F_ 8
 	notetype 12, 11, 5
-	note E_, 6
-	note D_, 1
-	note E_, 1
-	note C_, 4
-	note E_, 4
-	note C_, 6
-	note D_, 1
-	note E_, 1
-	note F_, 2
-	note G_, 2
-	note G_, 2
-	note A_, 2
+	E_ 6
+	D_ 1
+	E_ 1
+	C_ 4
+	E_ 4
+	C_ 6
+	D_ 1
+	E_ 1
+	F_ 2
+	G_ 2
+	G_ 2
+	A_ 2
 	notetype 12, 10, 7
-	note A#, 8
-	note A#, 8
-	note D_, 8
-	note F_, 8
+	A# 8
+	A# 8
+	D_ 8
+	F_ 8
 	notetype 12, 11, 5
-	note E_, 4
-	note E_, 2
-	note F_, 2
-	note G_, 4
-	note F_, 2
-	note E_, 2
-	note B_, 2
+	E_ 4
+	E_ 2
+	F_ 2
+	G_ 4
+	F_ 2
+	E_ 2
+	B_ 2
 	octave 2
-	note G_, 4
+	G_ 4
 	octave 3
-	note B_, 8
-	note A_, 2
+	B_ 8
+	A_ 2
 	notetype 8, 12, 3
-	note A_, 4
-	note F_, 4
-	note A_, 4
+	A_ 4
+	F_ 4
+	A_ 4
 	notetype 8, 4, 15
-	note A_, 12
+	A_ 12
 	notetype 8, 9, 0
-	note F_, 12
-	note G_, 12
+	F_ 12
+	G_ 12
 	loopchannel 0, Music_Routes3_branch_9fc3
 
 
@@ -82,13 +82,13 @@ Music_Routes3_Ch2:: ; a009 (2:6009)
 	duty 2
 	notetype 12, 12, 7
 	octave 3
-	note G_, 1
-	note A#, 1
-	note B_, 6
-	note A_, 1
-	note B_, 1
+	G_ 1
+	A# 1
+	B_ 6
+	A_ 1
+	B_ 1
 	octave 4
-	note C_, 1
+	C_ 1
 	rest 15
 	rest 16
 
@@ -96,85 +96,85 @@ Music_Routes3_branch_a01a::
 	notetype 12, 12, 7
 	duty 2
 	octave 4
-	note C_, 6
+	C_ 6
 	octave 3
-	note G_, 1
+	G_ 1
 	octave 4
-	note C_, 1
-	note E_, 10
+	C_ 1
+	E_ 10
 	octave 3
-	note G_, 2
+	G_ 2
 	octave 4
-	note C_, 2
-	note G_, 2
-	note F_, 2
-	note E_, 2
-	note D_, 2
-	note C_, 2
-	note D_, 8
-	note F_, 8
+	C_ 2
+	G_ 2
+	F_ 2
+	E_ 2
+	D_ 2
+	C_ 2
+	D_ 8
+	F_ 8
 	notetype 12, 12, 5
 	duty 3
 	octave 3
-	note A#, 8
-	note A_, 8
+	A# 8
+	A_ 8
 	notetype 12, 12, 7
 	duty 2
 	octave 4
-	note C_, 6
+	C_ 6
 	octave 3
-	note G_, 1
+	G_ 1
 	octave 4
-	note C_, 1
-	note E_, 10
+	C_ 1
+	E_ 10
 	octave 3
-	note G_, 2
+	G_ 2
 	octave 4
-	note C_, 2
-	note G_, 2
-	note F_, 2
-	note E_, 2
-	note D_, 2
-	note C_, 2
-	note D_, 8
-	note F_, 8
+	C_ 2
+	G_ 2
+	F_ 2
+	E_ 2
+	D_ 2
+	C_ 2
+	D_ 8
+	F_ 8
 	notetype 12, 12, 5
 	duty 3
 	octave 3
-	note A#, 8
+	A# 8
 	octave 4
-	note D_, 6
+	D_ 6
 	notetype 12, 12, 7
 	duty 2
-	note C_, 1
-	note D_, 1
-	note E_, 2
-	note D_, 2
-	note E_, 2
-	note C_, 8
+	C_ 1
+	D_ 1
+	E_ 2
+	D_ 2
+	E_ 2
+	C_ 8
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note C_, 1
-	note D_, 2
+	C_ 1
+	D_ 2
 	octave 3
-	note G_, 4
+	G_ 4
 	octave 4
-	note G_, 8
-	note F_, 1
-	note E_, 1
+	G_ 8
+	F_ 1
+	E_ 1
 	notetype 8, 13, 3
-	note F_, 4
-	note E_, 4
+	F_ 4
+	E_ 4
 	notetype 8, 12, 4
-	note C_, 4
+	C_ 4
 	notetype 8, 12, 5
-	note C_, 12
+	C_ 12
 	notetype 12, 10, 0
 	duty 3
 	octave 3
-	note A_, 8
-	note B_, 8
+	A_ 8
+	B_ 8
 	loopchannel 0, Music_Routes3_branch_a01a
 
 
@@ -182,335 +182,335 @@ Music_Routes3_Ch3:: ; a07f (2:607f)
 	vibrato 4, 1, 0
 	notetype 6, 1, 2
 	octave 4
-	note G_, 2
-	note A#, 2
-	note B_, 8
-	note A_, 8
-	note G_, 2
+	G_ 2
+	A# 2
+	B_ 8
+	A_ 8
+	G_ 2
 	rest 2
-	note G_, 7
+	G_ 7
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note G_, 2
+	G_ 2
 	rest 2
-	note G_, 2
+	G_ 2
 	rest 2
-	note G_, 8
-	note G_, 2
+	G_ 8
+	G_ 2
 	rest 2
-	note G_, 7
+	G_ 7
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note G_, 2
+	G_ 2
 	rest 2
-	note G_, 2
+	G_ 2
 	rest 2
-	note G_, 8
+	G_ 8
 
 Music_Routes3_branch_a0a3::
 	notetype 12, 1, 2
-	note E_, 1
+	E_ 1
 	rest 1
-	note G_, 4
-	note E_, 1
-	note E_, 1
-	note E_, 1
+	G_ 4
+	E_ 1
+	E_ 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G_, 4
-	note E_, 1
+	G_ 4
+	E_ 1
 	rest 1
-	note G_, 4
-	note E_, 1
-	note E_, 1
-	note E_, 1
+	G_ 4
+	E_ 1
+	E_ 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G_, 2
-	note A_, 2
-	note F_, 1
+	G_ 2
+	A_ 2
+	F_ 1
 	rest 1
-	note A#, 4
-	note F_, 1
-	note F_, 1
-	note F_, 1
+	A# 4
+	F_ 1
+	F_ 1
+	F_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note A#, 4
-	note F_, 1
+	A# 4
+	F_ 1
 	rest 1
-	note A#, 4
-	note F_, 1
-	note F_, 1
-	note F_, 1
+	A# 4
+	F_ 1
+	F_ 1
+	F_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note A#, 2
-	note F_, 2
-	note E_, 1
+	A# 2
+	F_ 2
+	E_ 1
 	rest 1
-	note G_, 4
-	note E_, 1
-	note E_, 1
-	note E_, 1
+	G_ 4
+	E_ 1
+	E_ 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G_, 4
-	note E_, 1
+	G_ 4
+	E_ 1
 	rest 1
-	note G_, 4
-	note E_, 1
-	note E_, 1
-	note E_, 1
+	G_ 4
+	E_ 1
+	E_ 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G_, 2
-	note A_, 2
-	note F_, 1
+	G_ 2
+	A_ 2
+	F_ 1
 	rest 1
-	note A#, 4
-	note F_, 1
-	note F_, 1
-	note F_, 1
+	A# 4
+	F_ 1
+	F_ 1
+	F_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note A#, 4
-	note F_, 1
+	A# 4
+	F_ 1
 	rest 1
-	note A#, 4
-	note F_, 1
-	note F_, 1
-	note F_, 1
+	A# 4
+	F_ 1
+	F_ 1
+	F_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note A#, 2
-	note A_, 2
-	note G_, 1
+	A# 2
+	A_ 2
+	G_ 1
 	rest 1
 	octave 5
-	note C_, 4
+	C_ 4
 	octave 4
-	note G_, 1
-	note G_, 1
-	note G_, 1
+	G_ 1
+	G_ 1
+	G_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 5
-	note C_, 4
+	C_ 4
 	octave 4
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 5
-	note D_, 4
+	D_ 4
 	octave 4
-	note G_, 1
-	note G_, 1
-	note G_, 1
+	G_ 1
+	G_ 1
+	G_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 5
-	note D_, 4
+	D_ 4
 	octave 4
-	note F_, 1
+	F_ 1
 	rest 1
 	octave 5
-	note C_, 4
+	C_ 4
 	octave 4
-	note F_, 1
-	note F_, 1
-	note F_, 1
+	F_ 1
+	F_ 1
+	F_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
 	octave 5
-	note C_, 4
+	C_ 4
 	octave 4
-	note F_, 1
+	F_ 1
 	rest 1
-	note A_, 4
-	note F_, 1
-	note F_, 1
-	note F_, 1
+	A_ 4
+	F_ 1
+	F_ 1
+	F_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note A_, 4
+	A_ 4
 	loopchannel 0, Music_Routes3_branch_a0a3
 
 
 Music_Routes3_Ch4:: ; a131 (2:6131)
 	dspeed 6
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 8, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 12, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 12, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 8
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 12
+	mutedsnare2 2
+	mutedsnare3 2
+	mutedsnare2 4
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 12
+	mutedsnare2 2
+	mutedsnare3 2
+	mutedsnare2 4
+	mutedsnare3 4
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
 
 Music_Routes3_branch_a17a::
-	dnote 12, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 12, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 8, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 12, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 10, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 12, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare4
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 12, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 8, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 12, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 10, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 12, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 8, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 12, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 12, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 10, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 12, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 8, mutedsnare2
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare4
-	dnote 12, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 8, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 12, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
+	mutedsnare2 12
+	mutedsnare2 2
+	mutedsnare3 2
+	mutedsnare2 4
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 12
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare2 4
+	mutedsnare2 8
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 12
+	mutedsnare2 2
+	mutedsnare3 2
+	mutedsnare2 4
+	mutedsnare2 10
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare2 12
+	mutedsnare2 2
+	mutedsnare4 2
+	mutedsnare2 4
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 12
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare2 4
+	mutedsnare2 8
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 12
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare2 4
+	mutedsnare2 10
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare2 12
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare2 4
+	mutedsnare2 8
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 12
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare2 4
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 12
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare2 4
+	mutedsnare2 10
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare2 12
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare2 4
+	mutedsnare2 8
+	mutedsnare3 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare4 1
+	mutedsnare2 12
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare2 4
+	mutedsnare2 8
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 12
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare2 4
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
 	loopchannel 0, Music_Routes3_branch_a17a
-; 0xa26a
\ No newline at end of file
+; 0xa26a
diff --git a/audio/music/routes4.asm b/audio/music/routes4.asm
index b897e3d6..742244bc 100644
--- a/audio/music/routes4.asm
+++ b/audio/music/routes4.asm
@@ -6,135 +6,135 @@ Music_Routes4_Ch1:: ; a26a (2:626a)
 	toggleperfectpitch
 	notetype 12, 10, 2
 	octave 2
-	note G#, 4
-	note G#, 4
-	note G#, 4
+	G# 4
+	G# 4
+	G# 4
 	notetype 12, 7, 15
-	note G#, 4
+	G# 4
 	notetype 12, 10, 2
-	note G#, 4
-	note G#, 4
-	note G#, 4
+	G# 4
+	G# 4
+	G# 4
 	notetype 12, 11, 7
-	note B_, 1
+	B_ 1
 	octave 3
-	note E_, 1
-	note F#, 1
-	note B_, 1
+	E_ 1
+	F# 1
+	B_ 1
 
 Music_Routes4_branch_a28a::
 	notetype 12, 11, 7
-	note B_, 6
-	note E_, 2
-	note E_, 4
+	B_ 6
+	E_ 2
+	E_ 4
 	octave 4
-	note E_, 4
-	note D_, 4
-	note C#, 4
+	E_ 4
+	D_ 4
+	C# 4
 	octave 3
-	note B_, 4
-	note A_, 4
+	B_ 4
+	A_ 4
 	notetype 12, 11, 1
-	note G#, 3
+	G# 3
 	notetype 12, 11, 7
-	note E_, 1
-	note F#, 12
-	note E_, 8
-	note D#, 4
-	note F#, 4
-	note B_, 6
-	note E_, 2
-	note E_, 4
+	E_ 1
+	F# 12
+	E_ 8
+	D# 4
+	F# 4
+	B_ 6
+	E_ 2
+	E_ 4
 	octave 4
-	note E_, 4
-	note D_, 4
-	note C#, 4
+	E_ 4
+	D_ 4
+	C# 4
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note C#, 4
+	C# 4
 	notetype 12, 11, 1
-	note E_, 3
+	E_ 3
 	notetype 12, 11, 7
-	note D#, 1
-	note E_, 12
+	D# 1
+	E_ 12
 	octave 3
-	note B_, 3
-	note A_, 1
-	note G#, 8
+	B_ 3
+	A_ 1
+	G# 8
 	octave 4
-	note E_, 4
+	E_ 4
 	octave 3
-	note D_, 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
-	note B_, 2
+	D_ 2
+	E_ 2
+	F# 2
+	G# 2
+	A_ 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D_, 2
-	note D_, 2
+	C# 2
+	D_ 2
+	D_ 2
 	octave 3
-	note A_, 2
-	note F#, 2
-	note E_, 2
-	note D_, 2
-	note E_, 2
-	note F#, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
-	note B_, 2
+	A_ 2
+	F# 2
+	E_ 2
+	D_ 2
+	E_ 2
+	F# 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	F# 2
+	G# 2
+	A_ 2
+	B_ 2
 	octave 4
-	note D#, 2
-	note E_, 2
+	D# 2
+	E_ 2
 	octave 3
-	note B_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
-	note B_, 2
+	B_ 2
+	G# 2
+	F# 2
+	E_ 2
+	F# 2
+	G# 2
+	B_ 2
 	notetype 8, 11, 5
-	note A_, 4
-	note G#, 4
-	note F#, 4
+	A_ 4
+	G# 4
+	F# 4
 	octave 4
-	note E_, 4
-	note D#, 4
-	note C#, 4
-	note C#, 4
+	E_ 4
+	D# 4
+	C# 4
+	C# 4
 	octave 3
-	note B_, 4
-	note A_, 4
-	note B_, 4
+	B_ 4
+	A_ 4
+	B_ 4
 	octave 4
-	note C#, 4
-	note D#, 4
+	C# 4
+	D# 4
 	octave 3
-	note E_, 3
-	note F#, 3
-	note G#, 3
-	note A_, 3
-	note B_, 4
+	E_ 3
+	F# 3
+	G# 3
+	A_ 3
+	B_ 4
 	octave 4
-	note C#, 4
-	note D#, 4
-	note E_, 3
+	C# 4
+	D# 4
+	E_ 3
 	octave 3
-	note B_, 3
-	note G#, 3
-	note F#, 3
-	note E_, 3
-	note F#, 3
-	note G#, 3
-	note A_, 3
+	B_ 3
+	G# 3
+	F# 3
+	E_ 3
+	F# 3
+	G# 3
+	A_ 3
 	loopchannel 0, Music_Routes4_branch_a28a
 
 
@@ -143,365 +143,365 @@ Music_Routes4_Ch2:: ; a304 (2:6304)
 	duty 1
 	notetype 12, 9, 2
 	octave 3
-	note E_, 3
-	note F#, 1
+	E_ 3
+	F# 1
 	notetype 12, 9, 0
-	note E_, 12
+	E_ 12
 	notetype 12, 9, 2
 	octave 2
-	note B_, 3
+	B_ 3
 	octave 3
-	note C_, 1
+	C_ 1
 	notetype 12, 9, 0
 	octave 2
-	note B_, 8
+	B_ 8
 	duty 3
 	notetype 12, 12, 7
 	octave 3
-	note E_, 1
-	note F#, 1
-	note B_, 1
+	E_ 1
+	F# 1
+	B_ 1
 	octave 4
-	note D#, 1
+	D# 1
 
 Music_Routes4_branch_a325::
 	notetype 12, 12, 7
-	note E_, 6
+	E_ 6
 	octave 3
-	note B_, 2
-	note B_, 4
+	B_ 2
+	B_ 4
 	octave 4
-	note B_, 4
-	note A_, 4
-	note G#, 4
-	note F#, 4
-	note F#, 1
-	note A_, 1
-	note G#, 1
-	note F#, 1
+	B_ 4
+	A_ 4
+	G# 4
+	F# 4
+	F# 1
+	A_ 1
+	G# 1
+	F# 1
 	notetype 12, 12, 2
-	note G#, 3
-	note E_, 1
+	G# 3
+	E_ 1
 	notetype 12, 10, 0
 	octave 3
-	note B_, 12
+	B_ 12
 	duty 0
 	notetype 12, 12, 2
 	octave 2
-	note B_, 3
+	B_ 3
 	notetype 12, 12, 7
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 8
+	B_ 8
 	octave 3
-	note D#, 4
+	D# 4
 	duty 3
 	octave 4
-	note E_, 6
+	E_ 6
 	octave 3
-	note B_, 2
-	note B_, 4
+	B_ 2
+	B_ 4
 	octave 4
-	note B_, 4
-	note A_, 4
-	note G#, 4
-	note F#, 4
-	note A_, 1
+	B_ 4
+	A_ 4
+	G# 4
+	F# 4
+	A_ 1
 	octave 5
-	note C#, 1
+	C# 1
 	octave 4
-	note B_, 1
-	note A_, 1
+	B_ 1
+	A_ 1
 	notetype 12, 12, 2
-	note B_, 3
+	B_ 3
 	notetype 12, 12, 7
-	note A_, 1
+	A_ 1
 	notetype 12, 11, 0
-	note G#, 6
+	G# 6
 	notetype 12, 9, 0
-	note G#, 6
+	G# 6
 	notetype 12, 7, 0
-	note G#, 6
+	G# 6
 	notetype 12, 6, 15
-	note G#, 6
+	G# 6
 	notetype 12, 12, 7
-	note G#, 4
+	G# 4
 	notetype 8, 12, 3
-	note A_, 4
-	note G#, 4
-	note F#, 4
+	A_ 4
+	G# 4
+	F# 4
 	notetype 8, 9, 0
-	note F#, 6
+	F# 6
 	notetype 8, 7, 15
-	note F#, 6
+	F# 6
 	duty 0
 	notetype 8, 9, 0
 	octave 3
-	note F#, 4
-	note E_, 4
-	note F#, 4
-	note A_, 6
+	F# 4
+	E_ 4
+	F# 4
+	A_ 6
 	duty 3
 	notetype 8, 12, 7
 	octave 4
-	note F#, 6
-	note G#, 4
-	note F#, 4
+	F# 6
+	G# 4
+	F# 4
 	notetype 8, 12, 4
-	note E_, 4
+	E_ 4
 	notetype 8, 10, 0
-	note E_, 12
+	E_ 12
 	duty 0
 	notetype 8, 9, 0
 	octave 3
-	note E_, 4
-	note D#, 4
-	note E_, 4
-	note G#, 6
+	E_ 4
+	D# 4
+	E_ 4
+	G# 6
 	duty 3
 	notetype 8, 12, 7
 	octave 4
-	note E_, 6
-	note F#, 4
-	note D#, 4
+	E_ 6
+	F# 4
+	D# 4
 	octave 3
-	note B_, 4
+	B_ 4
 	notetype 8, 10, 0
 	octave 4
-	note B_, 16
+	B_ 16
 	notetype 8, 10, 7
-	note B_, 8
+	B_ 8
 	notetype 8, 11, 0
-	note A_, 6
+	A_ 6
 	notetype 8, 11, 7
-	note A_, 6
+	A_ 6
 	notetype 12, 10, 7
-	note G#, 1
-	note F#, 1
+	G# 1
+	F# 1
 	notetype 12, 11, 0
-	note E_, 12
+	E_ 12
 	notetype 12, 10, 0
-	note E_, 8
+	E_ 8
 	notetype 12, 10, 7
-	note E_, 10
+	E_ 10
 	loopchannel 0, Music_Routes4_branch_a325
 
 
 Music_Routes4_Ch3:: ; a3c4 (2:63c4)
 	notetype 12, 1, 0
 	octave 4
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 3
-	note D#, 1
+	D# 1
 	rest 3
 
 Music_Routes4_branch_a3d7::
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
-	note E_, 1
-	note E_, 1
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
+	E_ 1
+	E_ 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
-	note F#, 1
-	note F#, 1
-	note F#, 1
-	note F#, 1
+	F# 1
+	F# 1
+	F# 1
+	F# 1
+	F# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 3
-	note A_, 1
+	A_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 3
-	note G#, 1
-	note G#, 1
-	note G#, 1
-	note G#, 1
-	note G#, 1
+	G# 1
+	G# 1
+	G# 1
+	G# 1
+	G# 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 3
-	note G#, 1
+	G# 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 3
-	note G#, 1
-	note G#, 1
-	note G#, 1
-	note G#, 1
-	note G#, 1
+	G# 1
+	G# 1
+	G# 1
+	G# 1
+	G# 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 3
-	note G#, 1
+	G# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
-	note E_, 1
-	note E_, 1
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
+	E_ 1
+	E_ 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
-	note F#, 1
-	note F#, 1
-	note F#, 1
-	note F#, 1
+	F# 1
+	F# 1
+	F# 1
+	F# 1
+	F# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 3
-	note A_, 1
+	A_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 3
-	note B_, 1
-	note B_, 1
-	note B_, 1
-	note B_, 1
-	note B_, 1
+	B_ 1
+	B_ 1
+	B_ 1
+	B_ 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 3
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
-	note E_, 1
-	note E_, 1
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
+	E_ 1
+	E_ 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
-	note F#, 1
-	note F#, 1
-	note F#, 1
-	note F#, 1
+	F# 1
+	F# 1
+	F# 1
+	F# 1
+	F# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 3
-	note D_, 1
-	note D_, 1
-	note D_, 1
-	note D_, 1
-	note D_, 1
+	D_ 1
+	D_ 1
+	D_ 1
+	D_ 1
+	D_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 3
-	note D_, 1
+	D_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
-	note E_, 1
-	note E_, 1
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
+	E_ 1
+	E_ 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 3
-	note G#, 1
-	note G#, 1
-	note G#, 1
-	note G#, 1
-	note G#, 1
+	G# 1
+	G# 1
+	G# 1
+	G# 1
+	G# 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 3
-	note G#, 1
+	G# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
-	note F#, 1
-	note F#, 1
-	note F#, 1
-	note F#, 1
+	F# 1
+	F# 1
+	F# 1
+	F# 1
+	F# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 3
-	note B_, 1
-	note B_, 1
-	note B_, 1
-	note B_, 1
-	note B_, 1
+	B_ 1
+	B_ 1
+	B_ 1
+	B_ 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 3
-	note B_, 1
+	B_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 3
-	note G#, 1
-	note G#, 1
-	note G#, 1
-	note G#, 1
-	note G#, 1
+	G# 1
+	G# 1
+	G# 1
+	G# 1
+	G# 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 3
-	note G#, 1
+	G# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 3
-	note E_, 1
-	note E_, 1
-	note E_, 1
-	note E_, 1
-	note E_, 1
+	E_ 1
+	E_ 1
+	E_ 1
+	E_ 1
+	E_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 3
-	note D#, 1
+	D# 1
 	rest 1
 	loopchannel 0, Music_Routes4_branch_a3d7
 
@@ -510,173 +510,173 @@ Music_Routes4_Ch4:: ; a49d (2:649d)
 	dspeed 12
 	rest 16
 	rest 12
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
 
 Music_Routes4_branch_a4a8::
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare3
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 4, mutedsnare2
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare4
-	dnote 1, mutedsnare3
-	dnote 1, mutedsnare3
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
-	dnote 2, mutedsnare2
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 2
+	mutedsnare3 2
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 4
+	mutedsnare2 2
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 4
+	mutedsnare2 2
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 4
+	mutedsnare2 2
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 4
+	mutedsnare2 2
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare2 4
+	mutedsnare4 1
+	mutedsnare4 1
+	mutedsnare3 1
+	mutedsnare3 1
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare2 2
+	mutedsnare2 2
 	loopchannel 0, Music_Routes4_branch_a4a8
-; 0xa5f0
\ No newline at end of file
+; 0xa5f0
diff --git a/audio/music/safarizone.asm b/audio/music/safarizone.asm
index 69d97a49..3e0657fd 100644
--- a/audio/music/safarizone.asm
+++ b/audio/music/safarizone.asm
@@ -7,35 +7,35 @@ Music_SafariZone_Ch1:: ; bc2e (2:7c2e)
 	notetype 12, 9, 2
 	octave 3
 	pitchbend 0, 73
-	note C_, 1
+	C_ 1
 	pitchbend 0, 73
-	note G_, 1
+	G_ 1
 	pitchbend 0, 73
-	note C_, 1
+	C_ 1
 	pitchbend 0, 73
-	note G_, 1
+	G_ 1
 	rest 4
 	duty 3
 
 Music_SafariZone_branch_bc4f::
 	callchannel Music_SafariZone_branch_bc5f
 	notetype 12, 10, 4
-	note F#, 4
+	F# 4
 	callchannel Music_SafariZone_branch_bc5f
 	notetype 12, 10, 4
-	note F#, 4
+	F# 4
 	loopchannel 0, Music_SafariZone_branch_bc4f
 
 Music_SafariZone_branch_bc5f::
 	notetype 12, 10, 2
 	octave 3
-	note C_, 4
-	note G_, 4
-	note C_, 4
-	note G_, 4
-	note C_, 4
-	note G_, 4
-	note C_, 4
+	C_ 4
+	G_ 4
+	C_ 4
+	G_ 4
+	C_ 4
+	G_ 4
+	C_ 4
 	endchannel
 
 
@@ -44,32 +44,32 @@ Music_SafariZone_Ch2:: ; bc6a (2:7c6a)
 	vibrato 8, 2, 5
 	notetype 12, 10, 2
 	octave 4
-	note G_, 1
-	note D_, 1
-	note G_, 1
-	note D_, 1
+	G_ 1
+	D_ 1
+	G_ 1
+	D_ 1
 	rest 4
 	duty 3
 
 Music_SafariZone_branch_bc79::
 	callchannel Music_SafariZone_branch_bc89
 	notetype 12, 11, 5
-	note A_, 4
+	A_ 4
 	callchannel Music_SafariZone_branch_bc89
 	notetype 12, 11, 5
-	note B_, 4
+	B_ 4
 	loopchannel 0, Music_SafariZone_branch_bc79
 
 Music_SafariZone_branch_bc89::
 	notetype 12, 11, 2
 	octave 3
-	note G_, 4
-	note D_, 4
-	note G_, 4
-	note D_, 4
-	note G_, 4
-	note D_, 4
-	note G_, 4
+	G_ 4
+	D_ 4
+	G_ 4
+	D_ 4
+	G_ 4
+	D_ 4
+	G_ 4
 	endchannel
 
 
@@ -80,33 +80,33 @@ Music_SafariZone_Ch3:: ; bc94 (2:7c94)
 Music_SafariZone_branch_bc97::
 	callchannel Music_SafariZone_branch_bca5
 	octave 4
-	note A_, 4
+	A_ 4
 	callchannel Music_SafariZone_branch_bca5
 	octave 4
-	note B_, 4
+	B_ 4
 	loopchannel 0, Music_SafariZone_branch_bc97
 
 Music_SafariZone_branch_bca5::
 	octave 3
-	note A_, 2
+	A_ 2
 	rest 2
 	octave 4
-	note D_, 2
+	D_ 2
 	rest 2
 	octave 3
-	note A_, 2
+	A_ 2
 	rest 2
 	octave 4
-	note D_, 2
+	D_ 2
 	rest 2
 	octave 3
-	note A_, 2
+	A_ 2
 	rest 2
 	octave 4
-	note D_, 2
+	D_ 2
 	rest 2
 	octave 3
-	note A_, 2
+	A_ 2
 	rest 2
 	endchannel
-; 0xbcbb
\ No newline at end of file
+; 0xbcbb
diff --git a/audio/music/silphco.asm b/audio/music/silphco.asm
index 2906ac4c..c5cb1675 100644
--- a/audio/music/silphco.asm
+++ b/audio/music/silphco.asm
@@ -6,318 +6,318 @@ Music_SilphCo_Ch1:: ; 7f243 (1f:7243)
 	vibrato 8, 2, 2
 	notetype 6, 11, 3
 	octave 2
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note A#, 1
+	E_ 1
+	F# 1
+	G# 1
+	A# 1
 	octave 3
-	note C_, 1
+	C_ 1
 	notetype 6, 10, 0
-	note C_, 12
+	C_ 12
 	notetype 6, 11, 3
-	note C_, 2
+	C_ 2
 	octave 2
-	note B_, 1
-	note A#, 1
-	note G#, 1
-	note F#, 1
-	note E_, 1
-	note E_, 2
+	B_ 1
+	A# 1
+	G# 1
+	F# 1
+	E_ 1
+	E_ 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 2
 
 Music_SilphCo_branch_7f26d::
-	note G_, 2
+	G_ 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note A#, 2
+	A# 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 2
 	octave 3
-	note C_, 2
+	C_ 2
 	rest 2
-	note C_, 2
+	C_ 2
 	rest 6
-	note C_, 2
+	C_ 2
 	rest 6
-	note C_, 2
+	C_ 2
 	rest 6
-	note C_, 2
+	C_ 2
 	rest 6
 	octave 2
-	note A#, 2
+	A# 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 2
-	note G_, 2
+	G_ 2
 	rest 10
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note A_, 1
+	E_ 1
+	F# 1
+	G# 1
+	A_ 1
 	notetype 6, 10, 0
-	note B_, 12
+	B_ 12
 	notetype 6, 11, 3
-	note B_, 1
-	note A_, 1
-	note G_, 1
-	note F_, 1
-	note E_, 1
+	B_ 1
+	A_ 1
+	G_ 1
+	F_ 1
+	E_ 1
 	rest 11
-	note F_, 1
-	note G#, 1
-	note A#, 1
-	note B_, 1
+	F_ 1
+	G# 1
+	A# 1
+	B_ 1
 	notetype 6, 10, 0
 	octave 3
-	note C_, 12
+	C_ 12
 	notetype 6, 11, 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A_, 1
-	note G_, 1
-	note F_, 1
+	B_ 1
+	A_ 1
+	G_ 1
+	F_ 1
 	rest 11
-	note F#, 1
-	note B_, 1
+	F# 1
+	B_ 1
 	octave 3
-	note C_, 1
-	note C#, 1
+	C_ 1
+	C# 1
 	notetype 6, 10, 0
-	note D_, 12
+	D_ 12
 	notetype 6, 11, 3
-	note D_, 1
-	note C_, 1
+	D_ 1
+	C_ 1
 	octave 2
-	note A#, 1
-	note G_, 1
-	note F_, 1
+	A# 1
+	G_ 1
+	F_ 1
 	rest 11
-	note F_, 1
-	note G#, 1
-	note A#, 1
-	note B_, 1
+	F_ 1
+	G# 1
+	A# 1
+	B_ 1
 	notetype 6, 10, 0
 	octave 3
-	note C_, 12
+	C_ 12
 	notetype 6, 11, 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note G#, 1
-	note F_, 1
-	note E_, 1
+	B_ 1
+	G# 1
+	F_ 1
+	E_ 1
 	rest 7
 	notetype 6, 8, 0
-	note B_, 16
+	B_ 16
 	notetype 6, 11, 0
 	octave 3
-	note E_, 8
+	E_ 8
 	tempo 124
 	notetype 6, 11, 3
 	octave 2
-	note B_, 2
+	B_ 2
 	rest 10
-	note B_, 2
+	B_ 2
 	rest 10
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 16
 	rest 6
-	note A_, 2
+	A_ 2
 	rest 6
-	note B_, 2
-	note A#, 2
-	note B_, 2
+	B_ 2
+	A# 2
+	B_ 2
 	octave 3
-	note C_, 2
+	C_ 2
 	octave 2
-	note B_, 2
-	note A#, 2
-	note B_, 2
-	note A#, 2
-	note B_, 2
+	B_ 2
+	A# 2
+	B_ 2
+	A# 2
+	B_ 2
 	octave 3
-	note C_, 2
+	C_ 2
 	octave 2
-	note B_, 2
-	note A#, 2
-	note B_, 2
-	note A#, 2
-	note B_, 2
+	B_ 2
+	A# 2
+	B_ 2
+	A# 2
+	B_ 2
 	octave 3
-	note C_, 2
+	C_ 2
 	octave 2
-	note B_, 2
-	note A#, 2
-	note B_, 2
+	B_ 2
+	A# 2
+	B_ 2
 	octave 3
-	note C_, 2
+	C_ 2
 	octave 2
-	note B_, 2
-	note A#, 2
-	note B_, 2
+	B_ 2
+	A# 2
+	B_ 2
 	octave 3
-	note C_, 2
+	C_ 2
 	octave 2
-	note B_, 2
-	note A#, 2
-	note B_, 2
-	note A#, 2
-	note A_, 2
-	note A#, 2
-	note B_, 2
-	note A#, 2
+	B_ 2
+	A# 2
+	B_ 2
+	A# 2
+	A_ 2
+	A# 2
+	B_ 2
+	A# 2
 	callchannel Music_SilphCo_branch_7f3f0
 	callchannel Music_SilphCo_branch_7f3f0
 	callchannel Music_SilphCo_branch_7f3f0
 	rest 4
-	note C_, 2
+	C_ 2
 	rest 6
-	note C_, 2
+	C_ 2
 	rest 6
-	note C_, 2
+	C_ 2
 	rest 6
 	octave 2
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note A#, 2
+	A# 2
 	rest 6
-	note A_, 2
+	A_ 2
 	rest 6
-	note A_, 2
+	A_ 2
 	rest 6
-	note A_, 2
+	A_ 2
 	rest 6
-	note A_, 2
+	A_ 2
 	rest 6
-	note A_, 2
+	A_ 2
 	rest 6
-	note A_, 2
+	A_ 2
 	rest 6
-	note A#, 2
+	A# 2
 	rest 6
-	note A#, 2
+	A# 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
 	octave 3
-	note C_, 2
+	C_ 2
 	rest 6
-	note C_, 2
+	C_ 2
 	rest 6
 	octave 2
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
 	octave 3
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
 	octave 4
-	note C_, 2
+	C_ 2
 	rest 6
-	note C_, 2
+	C_ 2
 	rest 6
 	octave 2
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
 	octave 4
-	note E_, 2
+	E_ 2
 	rest 6
-	note E_, 2
+	E_ 2
 	rest 6
-	note D#, 2
+	D# 2
 	rest 6
-	note D#, 2
+	D# 2
 	rest 2
 	octave 2
-	note B_, 1
-	note A#, 1
-	note G#, 1
-	note F#, 1
-	note E_, 1
+	B_ 1
+	A# 1
+	G# 1
+	F# 1
+	E_ 1
 	notetype 6, 6, 0
-	note E_, 16
-	note E_, 11
+	E_ 16
+	E_ 11
 	notetype 6, 11, 3
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note A#, 1
+	E_ 1
+	F# 1
+	G# 1
+	A# 1
 	octave 3
-	note C_, 1
+	C_ 1
 	notetype 6, 3, 15
-	note C_, 16
+	C_ 16
 	notetype 6, 10, 0
-	note C_, 11
+	C_ 11
 	notetype 6, 9, 3
 	octave 2
-	note B_, 1
-	note A#, 1
-	note G#, 1
-	note F#, 1
-	note E_, 1
+	B_ 1
+	A# 1
+	G# 1
+	F# 1
+	E_ 1
 	notetype 6, 3, 15
-	note E_, 16
+	E_ 16
 	notetype 6, 9, 0
-	note E_, 11
+	E_ 11
 	notetype 6, 11, 3
-	note F_, 1
-	note G_, 1
-	note A#, 1
+	F_ 1
+	G_ 1
+	A# 1
 	octave 3
-	note C_, 1
-	note D_, 1
+	C_ 1
+	D_ 1
 	notetype 6, 3, 15
-	note D_, 16
+	D_ 16
 	notetype 6, 10, 7
-	note D_, 11
+	D_ 11
 	rest 4
 	rest 4
 	tempo 128
@@ -346,52 +346,52 @@ Music_SilphCo_branch_7f26d::
 	rest 4
 	notetype 6, 4, 3
 	octave 2
-	note B_, 2
+	B_ 2
 	rest 6
 	notetype 6, 6, 3
-	note B_, 2
+	B_ 2
 	rest 6
 	notetype 6, 8, 3
-	note B_, 2
+	B_ 2
 	rest 6
 	notetype 6, 5, 0
-	note B_, 8
+	B_ 8
 	notetype 6, 11, 3
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 2
 	loopchannel 0, Music_SilphCo_branch_7f26d
 
 Music_SilphCo_branch_7f3f0::
 	octave 2
-	note B_, 2
-	note A#, 2
-	note B_, 2
+	B_ 2
+	A# 2
+	B_ 2
 	octave 3
-	note C_, 2
+	C_ 2
 	octave 2
-	note B_, 2
-	note A#, 2
-	note B_, 2
+	B_ 2
+	A# 2
+	B_ 2
 	octave 3
-	note C_, 2
+	C_ 2
 	octave 2
-	note B_, 2
-	note A#, 2
-	note B_, 2
+	B_ 2
+	A# 2
+	B_ 2
 	octave 3
-	note C_, 2
+	C_ 2
 	octave 2
-	note B_, 2
-	note A#, 2
-	note B_, 2
+	B_ 2
+	A# 2
+	B_ 2
 	octave 3
-	note C_, 2
+	C_ 2
 	endchannel
 
 
@@ -400,382 +400,382 @@ Music_SilphCo_Ch2:: ; 7f409 (1f:7409)
 	duty 3
 	notetype 6, 12, 3
 	octave 3
-	note E_, 1
-	note F#, 1
-	note G#, 1
-	note A#, 1
+	E_ 1
+	F# 1
+	G# 1
+	A# 1
 	octave 4
-	note C_, 1
+	C_ 1
 	notetype 6, 11, 0
-	note C_, 12
+	C_ 12
 	notetype 6, 12, 3
-	note C_, 2
+	C_ 2
 	octave 3
-	note B_, 1
-	note A#, 1
-	note G#, 1
-	note F#, 1
-	note E_, 1
-	note E_, 2
+	B_ 1
+	A# 1
+	G# 1
+	F# 1
+	E_ 1
+	E_ 2
 	rest 2
 	octave 2
-	note G_, 2
+	G_ 2
 	rest 6
-	note F#, 2
+	F# 2
 	rest 6
-	note G_, 2
+	G_ 2
 	rest 6
-	note G#, 2
+	G# 2
 	rest 2
 
 Music_SilphCo_branch_7f42e::
-	note E_, 2
+	E_ 2
 	rest 2
-	note G_, 2
+	G_ 2
 	rest 6
-	note G_, 2
+	G_ 2
 	rest 6
-	note G_, 2
+	G_ 2
 	rest 6
-	note F#, 2
+	F# 2
 	rest 6
-	note G_, 2
+	G_ 2
 	rest 6
-	note G#, 2
+	G# 2
 	rest 2
-	note E_, 2
+	E_ 2
 	rest 2
-	note G#, 2
+	G# 2
 	rest 6
-	note G#, 2
+	G# 2
 	rest 6
-	note G#, 2
+	G# 2
 	rest 6
-	note G#, 2
+	G# 2
 	rest 6
-	note G#, 2
+	G# 2
 	rest 6
-	note G#, 2
+	G# 2
 	rest 2
 	notetype 6, 11, 7
 	duty 2
 	octave 4
-	note E_, 8
-	note D#, 8
-	note E_, 8
-	note F_, 8
-	note E_, 8
-	note D#, 8
-	note D_, 8
-	note D#, 8
-	note E_, 8
-	note F_, 8
-	note F#, 8
-	note G_, 8
-	note G#, 8
-	note D#, 8
-	note D_, 8
-	note D#, 8
+	E_ 8
+	D# 8
+	E_ 8
+	F_ 8
+	E_ 8
+	D# 8
+	D_ 8
+	D# 8
+	E_ 8
+	F_ 8
+	F# 8
+	G_ 8
+	G# 8
+	D# 8
+	D_ 8
+	D# 8
 	duty 3
 	notetype 6, 6, 15
-	note E_, 16
+	E_ 16
 	notetype 6, 12, 0
-	note B_, 16
+	B_ 16
 	notetype 6, 12, 4
 	octave 3
-	note E_, 4
-	note D#, 4
-	note E_, 4
-	note F_, 4
-	note E_, 4
-	note D#, 4
-	note D_, 4
-	note D#, 4
-	note E_, 4
-	note F_, 4
-	note F#, 4
-	note G_, 4
-	note G#, 4
-	note D#, 4
-	note D_, 4
-	note D#, 4
+	E_ 4
+	D# 4
+	E_ 4
+	F_ 4
+	E_ 4
+	D# 4
+	D_ 4
+	D# 4
+	E_ 4
+	F_ 4
+	F# 4
+	G_ 4
+	G# 4
+	D# 4
+	D_ 4
+	D# 4
 	notetype 6, 12, 2
 	duty 1
 	octave 4
-	note E_, 4
-	note D#, 4
-	note E_, 4
-	note F_, 4
-	note E_, 4
-	note D#, 4
-	note D_, 4
-	note D#, 4
-	note E_, 4
+	E_ 4
+	D# 4
+	E_ 4
+	F_ 4
+	E_ 4
+	D# 4
+	D_ 4
+	D# 4
+	E_ 4
 	notetype 6, 12, 4
 	duty 3
 	octave 3
-	note F_, 4
-	note F#, 4
-	note G_, 4
-	note G#, 4
-	note D#, 4
-	note D_, 4
-	note D#, 4
-	note E_, 4
-	note D#, 4
-	note E_, 4
+	F_ 4
+	F# 4
+	G_ 4
+	G# 4
+	D# 4
+	D_ 4
+	D# 4
+	E_ 4
+	D# 4
+	E_ 4
 	notetype 6, 12, 0
-	note F_, 8
+	F_ 8
 	notetype 6, 11, 7
-	note F_, 8
+	F_ 8
 	notetype 6, 8, 10
-	note F_, 4
+	F_ 4
 	notetype 6, 12, 4
 	duty 3
-	note F_, 4
-	note E_, 4
-	note F_, 4
+	F_ 4
+	E_ 4
+	F_ 4
 	notetype 6, 10, 0
-	note F#, 8
+	F# 8
 	notetype 6, 11, 0
-	note F#, 8
+	F# 8
 	notetype 6, 9, 9
-	note F#, 4
+	F# 4
 	notetype 6, 12, 4
-	note F#, 4
-	note F_, 4
-	note F#, 4
+	F# 4
+	F_ 4
+	F# 4
 	notetype 6, 9, 0
-	note G_, 12
+	G_ 12
 	notetype 6, 5, 9
-	note G_, 8
+	G_ 8
 	notetype 6, 12, 4
-	note G_, 4
-	note F#, 4
-	note G_, 4
-	note F#, 4
-	note F_, 4
-	note F#, 4
-	note F_, 4
-	note E_, 4
-	note F_, 4
-	note E_, 4
-	note D#, 4
-	note D_, 4
-	note C#, 4
-	note D_, 4
-	note D#, 4
-	note D_, 4
+	G_ 4
+	F# 4
+	G_ 4
+	F# 4
+	F_ 4
+	F# 4
+	F_ 4
+	E_ 4
+	F_ 4
+	E_ 4
+	D# 4
+	D_ 4
+	C# 4
+	D_ 4
+	D# 4
+	D_ 4
 	notetype 6, 12, 2
 	duty 1
-	note F_, 4
-	note F#, 4
-	note G_, 4
-	note G#, 4
-	note A_, 4
+	F_ 4
+	F# 4
+	G_ 4
+	G# 4
+	A_ 4
 	notetype 6, 11, 4
 	duty 3
-	note D#, 4
-	note D_, 4
-	note D#, 4
+	D# 4
+	D_ 4
+	D# 4
 	notetype 6, 12, 2
 	duty 1
-	note F_, 4
-	note F#, 4
-	note G_, 4
-	note G#, 4
-	note A#, 4
+	F_ 4
+	F# 4
+	G_ 4
+	G# 4
+	A# 4
 	notetype 6, 11, 4
 	duty 3
-	note D#, 4
-	note D_, 4
-	note D#, 4
+	D# 4
+	D_ 4
+	D# 4
 	notetype 6, 12, 2
 	duty 1
-	note F_, 4
-	note F#, 4
-	note G_, 4
-	note G#, 4
-	note B_, 4
+	F_ 4
+	F# 4
+	G_ 4
+	G# 4
+	B_ 4
 	notetype 6, 11, 4
 	duty 3
-	note D#, 4
-	note D_, 4
-	note D#, 4
+	D# 4
+	D_ 4
+	D# 4
 	notetype 6, 12, 2
 	duty 1
-	note F_, 4
-	note F#, 4
-	note G_, 4
-	note G#, 4
+	F_ 4
+	F# 4
+	G_ 4
+	G# 4
 	octave 4
-	note C_, 4
+	C_ 4
 	notetype 6, 11, 4
 	duty 3
 	octave 3
-	note D#, 4
-	note D_, 4
-	note D#, 4
+	D# 4
+	D_ 4
+	D# 4
 	rest 4
-	note G_, 2
+	G_ 2
 	rest 6
-	note G_, 2
+	G_ 2
 	rest 6
-	note G_, 2
+	G_ 2
 	rest 6
-	note G_, 2
+	G_ 2
 	rest 2
 	duty 0
 	octave 4
-	note E_, 2
+	E_ 2
 	rest 2
-	note G#, 2
+	G# 2
 	rest 6
-	note G#, 2
+	G# 2
 	rest 6
-	note G#, 2
+	G# 2
 	rest 6
-	note G#, 2
+	G# 2
 	rest 6
 	duty 3
 	octave 3
-	note G_, 2
+	G_ 2
 	rest 6
-	note G_, 2
+	G_ 2
 	rest 6
-	note G_, 2
+	G_ 2
 	rest 6
-	note G_, 2
+	G_ 2
 	rest 2
 	duty 0
 	octave 4
-	note E_, 2
+	E_ 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 2
 	duty 3
 	octave 3
-	note G_, 2
+	G_ 2
 	rest 2
-	note G_, 2
+	G_ 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 2
-	note G_, 2
+	G_ 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 2
-	note G_, 2
+	G_ 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 2
-	note G_, 2
+	G_ 2
 	rest 2
 	octave 4
-	note C_, 2
+	C_ 2
 	rest 2
 	octave 3
-	note G_, 2
+	G_ 2
 	rest 2
 	octave 4
-	note C_, 2
+	C_ 2
 	rest 2
 	octave 3
-	note G_, 2
+	G_ 2
 	rest 2
 	octave 4
-	note C_, 2
+	C_ 2
 	rest 2
 	octave 3
-	note G_, 2
+	G_ 2
 	rest 2
 	octave 4
-	note C_, 2
+	C_ 2
 	rest 2
 	octave 3
-	note G_, 2
+	G_ 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 2
-	note G_, 2
+	G_ 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 2
-	note G_, 2
+	G_ 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 2
-	note G_, 2
+	G_ 2
 	rest 2
-	note E_, 2
+	E_ 2
 	rest 2
-	note G_, 2
+	G_ 2
 	rest 2
 	octave 4
-	note C_, 2
+	C_ 2
 	rest 2
 	octave 3
-	note G_, 2
+	G_ 2
 	rest 2
-	note E_, 2
+	E_ 2
 	rest 2
-	note G_, 2
+	G_ 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 2
-	note G_, 2
+	G_ 2
 	rest 2
 	octave 4
-	note C_, 2
+	C_ 2
 	rest 2
 	octave 3
-	note G_, 2
+	G_ 2
 	rest 2
 	notetype 6, 8, 7
 	octave 5
-	note E_, 4
-	note D#, 4
-	note E_, 4
-	note F_, 4
-	note E_, 4
-	note D#, 4
-	note D_, 4
-	note D#, 4
-	note E_, 4
-	note F_, 4
-	note F#, 4
-	note G_, 4
-	note G#, 4
-	note D#, 4
-	note D_, 4
-	note D#, 4
+	E_ 4
+	D# 4
+	E_ 4
+	F_ 4
+	E_ 4
+	D# 4
+	D_ 4
+	D# 4
+	E_ 4
+	F_ 4
+	F# 4
+	G_ 4
+	G# 4
+	D# 4
+	D_ 4
+	D# 4
 	rest 4
 	notetype 6, 4, 3
 	octave 2
-	note G_, 2
+	G_ 2
 	rest 6
 	notetype 6, 6, 3
-	note F#, 2
+	F# 2
 	rest 6
 	notetype 6, 8, 3
-	note G_, 2
+	G_ 2
 	rest 6
 	notetype 6, 4, 15
-	note G#, 8
+	G# 8
 	notetype 6, 11, 4
-	note G_, 2
+	G_ 2
 	rest 6
-	note F#, 2
+	F# 2
 	rest 6
-	note G_, 2
+	G_ 2
 	rest 6
-	note G#, 2
+	G# 2
 	rest 2
 	loopchannel 0, Music_SilphCo_branch_7f42e
 
@@ -785,191 +785,191 @@ Music_SilphCo_Ch3:: ; 7f5be (1f:75be)
 	notetype 12, 1, 1
 	rest 12
 	octave 5
-	note E_, 4
-	note D#, 4
-	note E_, 4
-	note F_, 4
+	E_ 4
+	D# 4
+	E_ 4
+	F_ 4
 
 Music_SilphCo_branch_7f5c9::
-	note E_, 4
-	note D#, 4
-	note D_, 4
-	note D#, 4
-	note E_, 4
-	note F_, 4
-	note F#, 4
-	note G_, 4
-	note G#, 4
-	note D#, 4
-	note D_, 4
-	note D#, 4
-	note E_, 1
+	E_ 4
+	D# 4
+	D_ 4
+	D# 4
+	E_ 4
+	F_ 4
+	F# 4
+	G_ 4
+	G# 4
+	D# 4
+	D_ 4
+	D# 4
+	E_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note G#, 1
+	G# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 3
-	note G#, 1
+	G# 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note G#, 1
+	G# 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 3
-	note G#, 1
+	G# 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note G#, 1
+	G# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 1
 	octave 4
-	note E_, 1
+	E_ 1
 	rest 5
-	note F_, 1
+	F_ 1
 	rest 5
-	note F_, 1
+	F_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 11
-	note D#, 1
+	D# 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 5
-	note F_, 1
+	F_ 1
 	rest 5
-	note F_, 1
+	F_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 11
-	note D#, 1
+	D# 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 3
-	note F_, 1
+	F_ 1
 	rest 3
-	note F_, 1
+	F_ 1
 	rest 3
-	note F_, 1
+	F_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 3
-	note F_, 1
+	F_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 3
-	note F_, 1
+	F_ 1
 	rest 3
-	note E_, 1
+	E_ 1
 	rest 3
-	note D#, 1
+	D# 1
 	rest 3
-	note D_, 1
+	D_ 1
 	rest 1
-	note D_, 8
-	note F_, 8
-	note D_, 8
-	note F#, 8
-	note D_, 8
-	note G_, 8
-	note D_, 8
-	note A_, 8
-	note E_, 4
-	note D#, 4
-	note E_, 4
-	note F_, 4
+	D_ 8
+	F_ 8
+	D_ 8
+	F# 8
+	D_ 8
+	G_ 8
+	D_ 8
+	A_ 8
+	E_ 4
+	D# 4
+	E_ 4
+	F_ 4
 	octave 5
-	note E_, 2
-	note D#, 2
-	note E_, 2
-	note F_, 2
-	note E_, 2
-	note D#, 2
-	note D_, 2
-	note D#, 2
+	E_ 2
+	D# 2
+	E_ 2
+	F_ 2
+	E_ 2
+	D# 2
+	D_ 2
+	D# 2
 	octave 4
-	note E_, 4
-	note D#, 4
-	note E_, 4
-	note F_, 4
+	E_ 4
+	D# 4
+	E_ 4
+	F_ 4
 	octave 5
-	note E_, 2
-	note F_, 2
-	note F#, 2
-	note G_, 2
-	note G#, 2
-	note D#, 2
-	note D_, 2
-	note D#, 2
+	E_ 2
+	F_ 2
+	F# 2
+	G_ 2
+	G# 2
+	D# 2
+	D_ 2
+	D# 2
 	octave 6
-	note E_, 4
-	note D#, 4
-	note E_, 4
-	note F_, 4
-	note E_, 4
-	note D#, 4
-	note D_, 4
-	note D#, 4
-	note E_, 4
-	note F_, 4
-	note F#, 4
-	note G_, 4
-	note G#, 4
-	note D#, 4
-	note D_, 4
-	note D#, 4
+	E_ 4
+	D# 4
+	E_ 4
+	F_ 4
+	E_ 4
+	D# 4
+	D_ 4
+	D# 4
+	E_ 4
+	F_ 4
+	F# 4
+	G_ 4
+	G# 4
+	D# 4
+	D_ 4
+	D# 4
 	notetype 6, 1, 1
 	rest 4
 	rest 4
@@ -993,9 +993,9 @@ Music_SilphCo_branch_7f5c9::
 	rest 4
 	rest 4
 	octave 5
-	note E_, 4
-	note D#, 4
-	note E_, 4
-	note F_, 4
+	E_ 4
+	D# 4
+	E_ 4
+	F_ 4
 	loopchannel 0, Music_SilphCo_branch_7f5c9
-; 0x7f69d
\ No newline at end of file
+; 0x7f69d
diff --git a/audio/music/ssanne.asm b/audio/music/ssanne.asm
index f1f92ad9..db55e3b6 100644
--- a/audio/music/ssanne.asm
+++ b/audio/music/ssanne.asm
@@ -9,101 +9,101 @@ Music_SSAnne_branch_b3b2::
 	notetype 12, 10, 4
 	rest 12
 	octave 3
-	note E_, 2
-	note F#, 2
-	note E_, 4
-	note D_, 4
-	note C#, 2
-	note D_, 2
-	note E_, 2
+	E_ 2
+	F# 2
+	E_ 4
+	D_ 4
+	C# 2
+	D_ 2
+	E_ 2
 	rest 2
-	note E_, 4
-	note F#, 2
-	note D_, 2
-	note E_, 4
-	note F#, 4
-	note G#, 4
+	E_ 4
+	F# 2
+	D_ 2
+	E_ 4
+	F# 4
+	G# 4
 	rest 4
-	note E_, 4
-	note G#, 4
+	E_ 4
+	G# 4
 	rest 4
-	note C#, 2
-	note E_, 2
-	note F#, 4
-	note D_, 4
-	note E_, 4
-	note D_, 4
-	note C#, 2
-	note D_, 2
-	note E_, 2
+	C# 2
+	E_ 2
+	F# 4
+	D_ 4
+	E_ 4
+	D_ 4
+	C# 2
+	D_ 2
+	E_ 2
 	rest 2
-	note E_, 4
-	note F#, 2
-	note D_, 2
-	note E_, 4
-	note F#, 4
-	note G#, 4
-	note F#, 4
-	note E_, 4
-	note F#, 4
+	E_ 4
+	F# 2
+	D_ 2
+	E_ 4
+	F# 4
+	G# 4
+	F# 4
+	E_ 4
+	F# 4
 	rest 4
-	note C#, 2
-	note E_, 2
-	note F#, 4
-	note D_, 4
-	note E_, 4
-	note D_, 4
-	note C#, 2
-	note D_, 2
-	note E_, 2
+	C# 2
+	E_ 2
+	F# 4
+	D_ 4
+	E_ 4
+	D_ 4
+	C# 2
+	D_ 2
+	E_ 2
 	rest 2
-	note E_, 4
-	note F#, 2
-	note D_, 2
-	note E_, 4
-	note F#, 4
-	note G#, 4
-	note F#, 8
-	note G#, 4
-	note E_, 4
+	E_ 4
+	F# 2
+	D_ 2
+	E_ 4
+	F# 4
+	G# 4
+	F# 8
+	G# 4
+	E_ 4
 	rest 4
-	note E_, 4
-	note F#, 2
-	note E_, 2
-	note D_, 4
+	E_ 4
+	F# 2
+	E_ 2
+	D_ 4
 	rest 4
-	note D_, 4
-	note E_, 4
-	note C#, 4
+	D_ 4
+	E_ 4
+	C# 4
 	rest 4
-	note C#, 4
-	note D_, 2
-	note C#, 2
+	C# 4
+	D_ 2
+	C# 2
 	octave 2
-	note B_, 4
-	note E_, 4
-	note B_, 4
+	B_ 4
+	E_ 4
+	B_ 4
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 2
-	note B_, 2
-	note A_, 4
+	B_ 2
+	A_ 4
 	rest 4
-	note A_, 4
-	note B_, 2
-	note A_, 2
-	note G#, 4
+	A_ 4
+	B_ 2
+	A_ 2
+	G# 4
 	rest 4
-	note C#, 4
-	note G#, 4
-	note A_, 4
+	C# 4
+	G# 4
+	A_ 4
 	rest 4
-	note A_, 4
-	note B_, 4
-	note B_, 4
+	A_ 4
+	B_ 4
+	B_ 4
 	rest 4
 	octave 3
-	note D_, 8
+	D_ 8
 	loopchannel 0, Music_SSAnne_branch_b3b2
 
 
@@ -114,171 +114,171 @@ Music_SSAnne_Ch2:: ; b419 (2:7419)
 Music_SSAnne_branch_b41e::
 	notetype 12, 12, 5
 	octave 3
-	note A_, 2
-	note E_, 2
-	note A_, 4
-	note B_, 4
+	A_ 2
+	E_ 2
+	A_ 4
+	B_ 4
 	octave 4
-	note D_, 4
+	D_ 4
 	notetype 8, 12, 5
-	note C#, 2
-	note D_, 2
-	note C#, 2
+	C# 2
+	D_ 2
+	C# 2
 	octave 3
-	note B_, 3
-	note A_, 3
-	note B_, 6
-	note G#, 6
-	note A_, 3
-	note B_, 3
+	B_ 3
+	A_ 3
+	B_ 6
+	G# 6
+	A_ 3
+	B_ 3
 	octave 4
-	note C#, 6
-	note D_, 6
-	note C#, 3
+	C# 6
+	D_ 6
+	C# 3
 	octave 3
-	note B_, 3
+	B_ 3
 	octave 4
-	note E_, 6
-	note D_, 3
-	note C#, 3
+	E_ 6
+	D_ 3
+	C# 3
 	octave 3
-	note B_, 6
+	B_ 6
 	octave 4
-	note C#, 3
+	C# 3
 	octave 3
-	note B_, 3
-	note A_, 3
-	note E_, 3
-	note A_, 6
-	note B_, 6
+	B_ 3
+	A_ 3
+	E_ 3
+	A_ 6
+	B_ 6
 	octave 4
-	note D_, 6
-	note C#, 2
-	note D_, 2
-	note C#, 2
+	D_ 6
+	C# 2
+	D_ 2
+	C# 2
 	octave 3
-	note B_, 3
-	note A_, 3
-	note B_, 6
-	note G#, 6
-	note A_, 3
-	note B_, 3
+	B_ 3
+	A_ 3
+	B_ 6
+	G# 6
+	A_ 3
+	B_ 3
 	octave 4
-	note C#, 6
-	note D_, 6
-	note C#, 3
+	C# 6
+	D_ 6
+	C# 3
 	octave 3
-	note B_, 3
+	B_ 3
 	octave 4
-	note E_, 6
-	note D_, 3
-	note C#, 3
+	E_ 6
+	D_ 3
+	C# 3
 	octave 3
-	note B_, 12
-	note A_, 3
-	note E_, 3
-	note A_, 6
-	note B_, 6
+	B_ 12
+	A_ 3
+	E_ 3
+	A_ 6
+	B_ 6
 	octave 4
-	note D_, 6
-	note C#, 2
-	note D_, 2
-	note C#, 2
+	D_ 6
+	C# 2
+	D_ 2
+	C# 2
 	octave 3
-	note B_, 3
-	note A_, 3
-	note B_, 6
-	note G#, 6
-	note A_, 3
-	note B_, 3
+	B_ 3
+	A_ 3
+	B_ 6
+	G# 6
+	A_ 3
+	B_ 3
 	octave 4
-	note C#, 6
-	note D_, 6
-	note C#, 3
+	C# 6
+	D_ 6
+	C# 3
 	octave 3
-	note B_, 3
+	B_ 3
 	octave 4
-	note E_, 6
-	note D_, 3
-	note C#, 3
+	E_ 6
+	D_ 3
+	C# 3
 	octave 3
-	note B_, 12
+	B_ 12
 	rest 3
 	octave 4
-	note C#, 3
+	C# 3
 	octave 3
-	note B_, 3
+	B_ 3
 	octave 4
-	note C#, 3
-	note C#, 3
-	note D_, 3
-	note C#, 3
-	note D_, 3
-	note E_, 3
+	C# 3
+	C# 3
+	D_ 3
+	C# 3
+	D_ 3
+	E_ 3
 	octave 3
-	note B_, 3
-	note G#, 3
-	note F#, 3
-	note E_, 3
-	note F#, 3
-	note G#, 3
-	note B_, 3
+	B_ 3
+	G# 3
+	F# 3
+	E_ 3
+	F# 3
+	G# 3
+	B_ 3
 	rest 3
-	note A_, 3
-	note G#, 3
-	note A_, 3
-	note A_, 3
-	note B_, 3
-	note A_, 3
-	note B_, 3
+	A_ 3
+	G# 3
+	A_ 3
+	A_ 3
+	B_ 3
+	A_ 3
+	B_ 3
 	octave 4
-	note C#, 3
+	C# 3
 	octave 3
-	note G#, 3
-	note F#, 3
-	note E_, 3
-	note E_, 3
-	note F#, 3
-	note G#, 3
-	note B_, 3
+	G# 3
+	F# 3
+	E_ 3
+	E_ 3
+	F# 3
+	G# 3
+	B_ 3
 	rest 3
-	note F#, 3
-	note E_, 3
-	note F#, 3
-	note F#, 3
-	note G#, 3
-	note F#, 3
-	note G#, 3
-	note A_, 3
-	note E_, 3
-	note C#, 3
+	F# 3
+	E_ 3
+	F# 3
+	F# 3
+	G# 3
+	F# 3
+	G# 3
+	A_ 3
+	E_ 3
+	C# 3
 	octave 2
-	note B_, 3
-	note A_, 3
-	note B_, 3
+	B_ 3
+	A_ 3
+	B_ 3
 	octave 3
-	note C#, 3
-	note E_, 3
+	C# 3
+	E_ 3
 	rest 3
-	note F#, 3
-	note E_, 3
-	note F#, 3
-	note F#, 3
-	note G#, 3
-	note A_, 3
-	note B_, 3
+	F# 3
+	E_ 3
+	F# 3
+	F# 3
+	G# 3
+	A_ 3
+	B_ 3
 	octave 4
-	note C#, 3
-	note D_, 3
-	note C#, 3
+	C# 3
+	D_ 3
+	C# 3
 	octave 3
-	note B_, 3
+	B_ 3
 	octave 4
-	note E_, 3
-	note D_, 3
-	note C#, 3
+	E_ 3
+	D_ 3
+	C# 3
 	octave 3
-	note B_, 3
+	B_ 3
 	loopchannel 0, Music_SSAnne_branch_b41e
 
 
@@ -287,53 +287,53 @@ Music_SSAnne_Ch3:: ; b4cb (2:74cb)
 	rest 16
 	rest 12
 	octave 4
-	note B_, 2
-	note G#, 2
-	note A_, 8
-	note F#, 8
-	note G#, 4
+	B_ 2
+	G# 2
+	A_ 8
+	F# 8
+	G# 4
 	rest 4
-	note B_, 8
-	note A_, 8
-	note B_, 8
-	note A_, 8
-	note G#, 8
-	note A_, 8
-	note F#, 8
-	note G#, 8
-	note B_, 8
-	note A_, 4
-	note E_, 4
-	note B_, 4
-	note E_, 4
-	note A_, 4
-	note E_, 4
-	note G#, 4
-	note E_, 4
-	note A_, 4
-	note E_, 4
-	note F#, 4
-	note G_, 4
-	note G#, 4
-	note A_, 4
+	B_ 8
+	A_ 8
+	B_ 8
+	A_ 8
+	G# 8
+	A_ 8
+	F# 8
+	G# 8
+	B_ 8
+	A_ 4
+	E_ 4
+	B_ 4
+	E_ 4
+	A_ 4
+	E_ 4
+	G# 4
+	E_ 4
+	A_ 4
+	E_ 4
+	F# 4
+	G_ 4
+	G# 4
+	A_ 4
 	octave 5
-	note D_, 8
-	note C#, 8
-	note C#, 8
+	D_ 8
+	C# 8
+	C# 8
 	octave 4
-	note B_, 8
-	note B_, 8
-	note A_, 8
-	note A_, 8
-	note G#, 8
-	note G#, 8
-	note F#, 8
-	note F#, 8
-	note E_, 8
-	note E_, 8
-	note F#, 8
-	note F#, 8
-	note G#, 8
-	note B_, 8
+	B_ 8
+	B_ 8
+	A_ 8
+	A_ 8
+	G# 8
+	G# 8
+	F# 8
+	F# 8
+	E_ 8
+	E_ 8
+	F# 8
+	F# 8
+	G# 8
+	B_ 8
 	loopchannel 0, Music_SSAnne_Ch3
-; 0xb504
\ No newline at end of file
+; 0xb504
diff --git a/audio/music/surfing.asm b/audio/music/surfing.asm
index a309a7ef..2b829caf 100644
--- a/audio/music/surfing.asm
+++ b/audio/music/surfing.asm
@@ -7,112 +7,112 @@ Music_Surfing_Ch1:: ; 7fa19 (1f:7a19)
 	notetype 12, 11, 5
 	rest 6
 	octave 2
-	note A_, 2
-	note G#, 3
-	note F#, 1
-	note E_, 6
+	A_ 2
+	G# 3
+	F# 1
+	E_ 6
 	octave 3
-	note G#, 2
-	note F#, 2
-	note G#, 4
+	G# 2
+	F# 2
+	G# 4
 
 Music_Surfing_branch_7fa30::
 	notetype 12, 11, 2
-	note E_, 2
-	note E_, 4
-	note E_, 2
-	note E_, 4
-	note D_, 2
-	note D_, 4
-	note D_, 2
-	note D_, 4
-	note D_, 2
-	note D_, 4
+	E_ 2
+	E_ 4
+	E_ 2
+	E_ 4
+	D_ 2
+	D_ 4
+	D_ 2
+	D_ 4
+	D_ 2
+	D_ 4
 	notetype 12, 11, 1
-	note F#, 3
+	F# 3
 	notetype 12, 11, 2
-	note D_, 3
-	note E_, 2
-	note E_, 4
-	note E_, 2
-	note E_, 4
-	note A_, 2
-	note A_, 4
-	note G#, 2
-	note G#, 4
-	note F#, 2
-	note F#, 4
-	note E_, 2
-	note E_, 4
-	note G#, 2
-	note G#, 4
+	D_ 3
+	E_ 2
+	E_ 4
+	E_ 2
+	E_ 4
+	A_ 2
+	A_ 4
+	G# 2
+	G# 4
+	F# 2
+	F# 4
+	E_ 2
+	E_ 4
+	G# 2
+	G# 4
 	notetype 12, 11, 1
-	note F#, 3
+	F# 3
 	notetype 12, 11, 2
-	note G#, 1
+	G# 1
 	notetype 12, 11, 4
-	note A_, 2
-	note B_, 2
+	A_ 2
+	B_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	notetype 12, 11, 7
-	note C#, 6
+	C# 6
 	notetype 12, 11, 3
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
-	note B_, 2
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	F# 2
+	G# 2
+	A_ 2
+	G# 2
+	F# 2
+	G# 2
+	F# 2
+	E_ 2
+	G# 2
+	F# 2
+	G# 2
+	A_ 2
+	G# 2
+	F# 2
+	G# 2
+	A_ 2
+	B_ 2
 	octave 4
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
-	note G#, 2
-	note A_, 2
-	note E_, 2
-	note G#, 2
-	note B_, 2
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	F# 2
+	G# 2
+	A_ 2
+	G# 2
+	A_ 2
+	E_ 2
+	G# 2
+	B_ 2
 	octave 4
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 4
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 4
 	loopchannel 0, Music_Surfing_branch_7fa30
 
 
@@ -121,85 +121,85 @@ Music_Surfing_Ch2:: ; 7fa9c (1f:7a9c)
 	vibrato 16, 2, 5
 	notetype 12, 12, 6
 	octave 3
-	note A_, 2
-	note G#, 3
-	note F#, 1
-	note E_, 6
-	note G#, 6
+	A_ 2
+	G# 3
+	F# 1
+	E_ 6
+	G# 6
 	octave 4
-	note E_, 2
-	note D_, 2
+	E_ 2
+	D_ 2
 	octave 3
-	note B_, 2
+	B_ 2
 
 Music_Surfing_branch_7faae::
 	notetype 12, 12, 6
 	octave 4
-	note E_, 6
-	note C#, 5
-	note E_, 1
-	note D_, 6
+	E_ 6
+	C# 5
+	E_ 1
+	D_ 6
 	octave 3
-	note B_, 6
+	B_ 6
 	octave 4
-	note D_, 6
+	D_ 6
 	octave 3
-	note B_, 2
+	B_ 2
 	notetype 12, 12, 1
 	octave 4
-	note F#, 3
+	F# 3
 	notetype 12, 12, 6
-	note D_, 1
-	note E_, 6
-	note C#, 6
-	note E_, 6
-	note C#, 5
-	note E_, 1
-	note F#, 6
-	note D_, 6
-	note F#, 6
-	note E_, 2
+	D_ 1
+	E_ 6
+	C# 6
+	E_ 6
+	C# 5
+	E_ 1
+	F# 6
+	D_ 6
+	F# 6
+	E_ 2
 	notetype 12, 12, 1
-	note F#, 3
+	F# 3
 	notetype 12, 12, 6
-	note E_, 1
-	note A_, 6
-	note A_, 6
-	note B_, 2
-	note A_, 3
-	note D_, 1
-	note F#, 6
-	note E_, 2
-	note F#, 3
-	note E_, 1
-	note C#, 6
-	note D_, 2
-	note C#, 3
+	E_ 1
+	A_ 6
+	A_ 6
+	B_ 2
+	A_ 3
+	D_ 1
+	F# 6
+	E_ 2
+	F# 3
+	E_ 1
+	C# 6
+	D_ 2
+	C# 3
 	octave 3
-	note B_, 1
+	B_ 1
 	octave 4
-	note F#, 6
-	note E_, 2
-	note D#, 3
-	note E_, 1
-	note A_, 6
-	note B_, 2
-	note A_, 3
-	note D_, 1
-	note F#, 6
-	note E_, 2
-	note F#, 3
-	note G#, 1
-	note A_, 6
-	note G#, 2
-	note F#, 3
-	note E_, 1
-	note G#, 6
-	note A_, 2
-	note G#, 3
-	note A_, 1
+	F# 6
+	E_ 2
+	D# 3
+	E_ 1
+	A_ 6
+	B_ 2
+	A_ 3
+	D_ 1
+	F# 6
+	E_ 2
+	F# 3
+	G# 1
+	A_ 6
+	G# 2
+	F# 3
+	E_ 1
+	G# 6
+	A_ 2
+	G# 3
+	A_ 1
 	octave 5
-	note C#, 6
+	C# 6
 	loopchannel 0, Music_Surfing_branch_7faae
 
 
@@ -207,130 +207,130 @@ Music_Surfing_Ch3:: ; 7fafa (1f:7afa)
 	notetype 12, 1, 0
 	rest 12
 	octave 5
-	note E_, 6
+	E_ 6
 	octave 4
-	note E_, 2
-	note F#, 2
-	note G#, 2
+	E_ 2
+	F# 2
+	G# 2
 
 Music_Surfing_branch_7fb03::
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note A_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note A_, 2
+	A_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	A_ 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note G#, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note G#, 2
+	G# 2
+	G# 2
+	E_ 2
+	G# 2
+	G# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note G#, 2
-	note G#, 2
-	note E_, 2
-	note G#, 1
+	G# 2
+	G# 2
+	E_ 2
+	G# 1
 	rest 2
-	note E_, 1
-	note C#, 2
-	note A_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note A_, 2
-	note C#, 2
-	note A_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note A_, 2
+	E_ 1
+	C# 2
+	A_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	A_ 2
+	C# 2
+	A_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	A_ 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note G#, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note G#, 2
+	G# 2
+	G# 2
+	E_ 2
+	G# 2
+	G# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note G#, 2
-	note G#, 2
-	note E_, 2
-	note G#, 1
+	G# 2
+	G# 2
+	E_ 2
+	G# 1
 	rest 2
-	note E_, 1
-	note C#, 2
-	note A_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note A_, 2
-	note D_, 2
-	note F#, 2
-	note F#, 2
+	E_ 1
+	C# 2
+	A_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	A_ 2
+	D_ 2
+	F# 2
+	F# 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note F#, 2
-	note F#, 2
-	note E_, 2
-	note A_, 2
-	note A_, 2
-	note C#, 2
-	note A_, 2
-	note A_, 2
-	note E_, 2
-	note G#, 2
-	note G#, 2
+	F# 2
+	F# 2
+	E_ 2
+	A_ 2
+	A_ 2
+	C# 2
+	A_ 2
+	A_ 2
+	E_ 2
+	G# 2
+	G# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note G#, 2
-	note G#, 2
-	note E_, 2
-	note A_, 2
-	note A_, 2
+	G# 2
+	G# 2
+	E_ 2
+	A_ 2
+	A_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note A_, 2
-	note A_, 2
-	note D_, 2
-	note F#, 2
-	note F#, 2
+	A_ 2
+	A_ 2
+	D_ 2
+	F# 2
+	F# 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note F#, 2
-	note F#, 2
-	note E_, 2
-	note A_, 2
-	note A_, 2
-	note C#, 2
-	note A_, 2
-	note A_, 2
-	note E_, 2
-	note G#, 2
-	note G#, 2
+	F# 2
+	F# 2
+	E_ 2
+	A_ 2
+	A_ 2
+	C# 2
+	A_ 2
+	A_ 2
+	E_ 2
+	G# 2
+	G# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note G#, 2
-	note G#, 2
-	note E_, 2
-	note A_, 2
-	note A_, 2
-	note C#, 2
-	note D_, 2
-	note E_, 2
+	G# 2
+	G# 2
+	E_ 2
+	A_ 2
+	A_ 2
+	C# 2
+	D_ 2
+	E_ 2
 	loopchannel 0, Music_Surfing_branch_7fb03
-; 0x7fb7d
\ No newline at end of file
+; 0x7fb7d
diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm
index e4c46df4..359ff877 100644
--- a/audio/music/titlescreen.asm
+++ b/audio/music/titlescreen.asm
@@ -5,152 +5,152 @@ Music_TitleScreen_Ch1:: ; 7e4c0 (1f:64c0)
 	duty 3
 	notetype 12, 12, 1
 	octave 2
-	note E_, 1
-	note G_, 1
-	note B_, 1
+	E_ 1
+	G_ 1
+	B_ 1
 	octave 3
-	note D_, 1
+	D_ 1
 	octave 2
-	note G_, 4
-	note G_, 6
-	note G_, 1
-	note G_, 1
-	note G_, 4
-	note G_, 4
-	note G_, 4
+	G_ 4
+	G_ 6
+	G_ 1
+	G_ 1
+	G_ 4
+	G_ 4
+	G_ 4
 	notetype 8, 12, 1
-	note A_, 2
-	note A_, 2
-	note A_, 2
-	note A_, 2
-	note A_, 2
-	note F#, 2
+	A_ 2
+	A_ 2
+	A_ 2
+	A_ 2
+	A_ 2
+	F# 2
 
 Music_TitleScreen_branch_7e4e2::
 	callchannel Music_TitleScreen_branch_7e541
 	callchannel Music_TitleScreen_branch_7e54a
 	callchannel Music_TitleScreen_branch_7e541
 	octave 3
-	note C_, 8
+	C_ 8
 	notetype 8, 12, 6
-	note E_, 4
-	note E_, 4
-	note C_, 4
+	E_ 4
+	E_ 4
+	C_ 4
 	notetype 12, 12, 6
 	octave 2
-	note B_, 8
+	B_ 8
 	notetype 8, 14, 7
 	octave 3
-	note F_, 4
-	note E_, 4
-	note C_, 4
+	F_ 4
+	E_ 4
+	C_ 4
 	notetype 12, 14, 7
-	note D_, 10
+	D_ 10
 	notetype 12, 12, 6
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note C_, 2
-	note D_, 2
+	C_ 2
+	D_ 2
 	callchannel Music_TitleScreen_branch_7e541
 	callchannel Music_TitleScreen_branch_7e54a
 	callchannel Music_TitleScreen_branch_7e541
-	note C_, 6
-	note C_, 6
-	note E_, 4
-	note D_, 6
-	note F_, 2
-	note G_, 2
-	note D_, 4
-	note G_, 2
-	note G_, 6
-	note A_, 4
-	note F_, 2
-	note A_, 2
+	C_ 6
+	C_ 6
+	E_ 4
+	D_ 6
+	F_ 2
+	G_ 2
+	D_ 4
+	G_ 2
+	G_ 6
+	A_ 4
+	F_ 2
+	A_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note D_, 12
-	note E_, 4
-	note F_, 8
-	note G_, 4
-	note F_, 4
-	note E_, 12
-	note F_, 4
-	note G_, 8
+	D_ 12
+	E_ 4
+	F_ 8
+	G_ 4
+	F_ 4
+	E_ 12
+	F_ 4
+	G_ 8
 	notetype 12, 11, 6
 	octave 4
-	note C_, 4
-	note C#, 4
+	C_ 4
+	C# 4
 	callchannel Music_TitleScreen_branch_7e55c
 	notetype 8, 11, 4
 	octave 4
-	note C_, 4
-	note C_, 4
-	note C#, 4
+	C_ 4
+	C_ 4
+	C# 4
 	callchannel Music_TitleScreen_branch_7e55c
 	notetype 8, 11, 2
 	octave 3
-	note E_, 4
-	note E_, 4
-	note C#, 4
+	E_ 4
+	E_ 4
+	C# 4
 	loopchannel 0, Music_TitleScreen_branch_7e4e2
 
 Music_TitleScreen_branch_7e541::
 	notetype 12, 12, 6
 	octave 3
-	note D_, 6
+	D_ 6
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D_, 8
+	D_ 8
 	endchannel
 
 Music_TitleScreen_branch_7e54a::
-	note C_, 6
-	note F_, 6
-	note C_, 4
-	note D_, 8
+	C_ 6
+	F_ 6
+	C_ 4
+	D_ 8
 	notetype 12, 14, 7
-	note F_, 6
-	note E_, 1
-	note D#, 1
-	note D_, 8
+	F_ 6
+	E_ 1
+	D# 1
+	D_ 8
 	notetype 8, 12, 6
-	note C_, 4
+	C_ 4
 	octave 2
-	note B_, 4
+	B_ 4
 	octave 3
-	note C_, 4
+	C_ 4
 	endchannel
 
 Music_TitleScreen_branch_7e55c::
 	notetype 12, 12, 1
-	note D_, 1
+	D_ 1
 	rest 1
 	octave 2
-	note D_, 1
-	note D_, 1
-	note D_, 1
+	D_ 1
+	D_ 1
+	D_ 1
 	rest 1
-	note D_, 1
-	note D_, 1
-	note D_, 1
+	D_ 1
+	D_ 1
+	D_ 1
 	rest 1
-	note D_, 1
-	note D_, 1
-	note D_, 1
+	D_ 1
+	D_ 1
+	D_ 1
 	rest 1
-	note D_, 1
-	note D_, 1
-	note D_, 1
+	D_ 1
+	D_ 1
+	D_ 1
 	rest 1
-	note D_, 1
-	note D_, 1
-	note D_, 1
+	D_ 1
+	D_ 1
+	D_ 1
 	rest 1
-	note D_, 1
-	note D_, 1
+	D_ 1
+	D_ 1
 	endchannel
 
 
@@ -159,194 +159,194 @@ Music_TitleScreen_Ch2:: ; 7e578 (1f:6578)
 	duty 1
 	notetype 12, 14, 1
 	octave 2
-	note G_, 1
-	note B_, 1
+	G_ 1
+	B_ 1
 	octave 3
-	note D_, 1
-	note F#, 1
-	note G_, 4
-	note G_, 6
-	note G_, 1
-	note G_, 1
-	note G_, 4
-	note G_, 4
-	note G_, 4
+	D_ 1
+	F# 1
+	G_ 4
+	G_ 6
+	G_ 1
+	G_ 1
+	G_ 4
+	G_ 4
+	G_ 4
 	notetype 8, 14, 1
-	note F_, 2
-	note F_, 2
-	note F_, 2
-	note F_, 2
-	note F_, 2
-	note F#, 2
+	F_ 2
+	F_ 2
+	F_ 2
+	F_ 2
+	F_ 2
+	F# 2
 
 Music_TitleScreen_branch_7e594::
 	vibrato 16, 4, 6
 	callchannel Music_TitleScreen_branch_7e622
 	octave 2
-	note A_, 4
-	note F_, 4
+	A_ 4
+	F_ 4
 	callchannel Music_TitleScreen_branch_7e62c
 	octave 2
-	note A_, 8
-	note B_, 16
+	A_ 8
+	B_ 16
 	callchannel Music_TitleScreen_branch_7e622
 	octave 2
-	note A_, 6
-	note F_, 2
+	A_ 6
+	F_ 2
 	notetype 8, 14, 7
 	octave 4
-	note C_, 4
+	C_ 4
 	octave 3
-	note B_, 4
+	B_ 4
 	octave 4
-	note C_, 4
+	C_ 4
 	notetype 12, 14, 7
-	note D_, 8
+	D_ 8
 	notetype 12, 9, 5
 	octave 2
-	note D_, 6
-	note D_, 1
-	note F#, 1
-	note G_, 16
+	D_ 6
+	D_ 1
+	F# 1
+	G_ 16
 	callchannel Music_TitleScreen_branch_7e622
 	octave 2
-	note A_, 2
-	note F_, 6
+	A_ 2
+	F_ 6
 	callchannel Music_TitleScreen_branch_7e62c
 	octave 3
-	note C_, 2
+	C_ 2
 	octave 2
-	note A_, 6
-	note B_, 6
-	note G_, 2
-	note F_, 8
+	A_ 6
+	B_ 6
+	G_ 2
+	F_ 8
 	callchannel Music_TitleScreen_branch_7e622
 	notetype 8, 9, 5
 	octave 2
-	note G_, 4
-	note F_, 5
-	note A_, 3
+	G_ 4
+	F_ 5
+	A_ 3
 	notetype 8, 14, 6
 	octave 4
-	note F_, 4
-	note E_, 4
-	note F_, 4
+	F_ 4
+	E_ 4
+	F_ 4
 	notetype 12, 14, 7
-	note G_, 6
-	note A#, 2
-	note G_, 8
+	G_ 6
+	A# 2
+	G_ 8
 	vibrato 16, 2, 6
 	duty 3
 	notetype 12, 0, 11
-	note G_, 8
+	G_ 8
 	notetype 12, 14, 7
-	note A_, 8
+	A_ 8
 	duty 1
 	notetype 12, 14, 7
-	note A#, 6
-	note F_, 2
-	note F_, 8
+	A# 6
+	F_ 2
+	F_ 8
 	octave 3
-	note D_, 8
+	D_ 8
 	octave 4
-	note A#, 4
-	note B_, 4
+	A# 4
+	B_ 4
 	octave 5
-	note C_, 6
+	C_ 6
 	octave 4
-	note G_, 2
-	note G_, 8
+	G_ 2
+	G_ 8
 	octave 3
-	note E_, 8
+	E_ 8
 	notetype 12, 13, 7
 	octave 5
-	note C_, 4
-	note C#, 4
+	C_ 4
+	C# 4
 	callchannel Music_TitleScreen_branch_7e636
 	rest 3
-	note D_, 1
+	D_ 1
 	rest 3
-	note D_, 1
+	D_ 1
 	notetype 8, 14, 5
 	octave 5
-	note C_, 4
-	note C_, 4
-	note C#, 4
+	C_ 4
+	C_ 4
+	C# 4
 	callchannel Music_TitleScreen_branch_7e636
-	note D_, 1
+	D_ 1
 	rest 2
-	note D_, 1
+	D_ 1
 	rest 3
-	note D_, 1
+	D_ 1
 	notetype 8, 14, 3
 	octave 5
-	note C_, 4
-	note C_, 4
+	C_ 4
+	C_ 4
 	octave 4
-	note B_, 4
+	B_ 4
 	loopchannel 0, Music_TitleScreen_branch_7e594
 
 Music_TitleScreen_branch_7e622::
 	notetype 12, 14, 7
 	octave 3
-	note G_, 6
-	note B_, 2
+	G_ 6
+	B_ 2
 	octave 4
-	note D_, 8
+	D_ 8
 	notetype 12, 9, 5
 	endchannel
 
 Music_TitleScreen_branch_7e62c::
 	notetype 12, 14, 7
 	octave 4
-	note F_, 6
-	note E_, 1
-	note D#, 1
-	note D_, 8
+	F_ 6
+	E_ 1
+	D# 1
+	D_ 8
 	notetype 12, 9, 5
 	endchannel
 
 Music_TitleScreen_branch_7e636::
 	notetype 12, 14, 1
-	note D_, 1
+	D_ 1
 	rest 2
 	octave 4
-	note D_, 1
+	D_ 1
 	rest 3
-	note D_, 1
+	D_ 1
 	rest 3
-	note D_, 1
+	D_ 1
 	rest 3
-	note D_, 1
+	D_ 1
 	endchannel
 
 
 Music_TitleScreen_Ch3:: ; 7e643 (1f:6643)
 	notetype 12, 1, 0
 	octave 3
-	note G_, 1
+	G_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 5
-	note G_, 1
-	note G_, 1
-	note G_, 1
+	G_ 1
+	G_ 1
+	G_ 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
-	note G_, 1
+	G_ 1
 	rest 3
 	notetype 8, 1, 0
-	note F_, 2
-	note F_, 2
-	note F_, 2
-	note F_, 2
-	note F_, 2
-	note A_, 2
+	F_ 2
+	F_ 2
+	F_ 2
+	F_ 2
+	F_ 2
+	A_ 2
 
 Music_TitleScreen_branch_7e65e::
 	callchannel Music_TitleScreen_branch_7e6c9
@@ -359,102 +359,102 @@ Music_TitleScreen_branch_7e664::
 	callchannel Music_TitleScreen_branch_7e6d0
 	loopchannel 3, Music_TitleScreen_branch_7e664
 	callchannel Music_TitleScreen_branch_7e6c9
-	note G_, 6
-	note D_, 3
-	note A_, 6
-	note F_, 3
-	note A_, 3
-	note F_, 3
+	G_ 6
+	D_ 3
+	A_ 6
+	F_ 3
+	A_ 3
+	F_ 3
 	callchannel Music_TitleScreen_branch_7e6d7
-	note A#, 3
-	note F_, 3
+	A# 3
+	F_ 3
 	callchannel Music_TitleScreen_branch_7e6d7
-	note B_, 3
-	note G_, 3
+	B_ 3
+	G_ 3
 	callchannel Music_TitleScreen_branch_7e6dc
 	octave 4
-	note C_, 3
+	C_ 3
 	octave 3
-	note G_, 3
+	G_ 3
 	callchannel Music_TitleScreen_branch_7e6dc
 	octave 4
-	note C#, 3
+	C# 3
 	octave 3
-	note A_, 3
+	A_ 3
 	callchannel Music_TitleScreen_branch_7e6e5
 	octave 5
 	pitchbend 0, 66
-	note D_, 4
+	D_ 4
 	rest 4
 	octave 6
 	pitchbend 0, 50
-	note D_, 4
+	D_ 4
 	octave 5
 	pitchbend 0, 66
-	note D_, 4
+	D_ 4
 	rest 2
 	notetype 8, 1, 0
 	octave 4
-	note C_, 4
-	note C_, 4
-	note C#, 4
+	C_ 4
+	C_ 4
+	C# 4
 	callchannel Music_TitleScreen_branch_7e6e5
 	octave 6
 	pitchbend 0, 50
-	note D_, 4
+	D_ 4
 	rest 4
 	octave 5
 	pitchbend 0, 66
-	note D_, 4
+	D_ 4
 	rest 6
 	notetype 8, 1, 0
 	octave 4
-	note C_, 4
-	note C_, 4
+	C_ 4
+	C_ 4
 	octave 3
-	note B_, 4
+	B_ 4
 	loopchannel 0, Music_TitleScreen_branch_7e65e
 
 Music_TitleScreen_branch_7e6c9::
-	note G_, 6
-	note D_, 3
-	note G_, 6
-	note D_, 3
-	note G_, 3
-	note D_, 3
+	G_ 6
+	D_ 3
+	G_ 6
+	D_ 3
+	G_ 3
+	D_ 3
 	endchannel
 
 Music_TitleScreen_branch_7e6d0::
-	note F_, 6
-	note C_, 3
-	note F_, 6
-	note C_, 3
-	note F_, 3
-	note C_, 3
+	F_ 6
+	C_ 3
+	F_ 6
+	C_ 3
+	F_ 3
+	C_ 3
 	endchannel
 
 Music_TitleScreen_branch_7e6d7::
-	note A#, 6
-	note F_, 3
-	note A#, 6
-	note F_, 3
+	A# 6
+	F_ 3
+	A# 6
+	F_ 3
 	endchannel
 
 Music_TitleScreen_branch_7e6dc::
 	octave 4
-	note C_, 6
+	C_ 6
 	octave 3
-	note G_, 3
+	G_ 3
 	octave 4
-	note C_, 6
+	C_ 6
 	octave 3
-	note G_, 3
+	G_ 3
 	endchannel
 
 Music_TitleScreen_branch_7e6e5::
 	notetype 12, 1, 0
 	octave 4
-	note D_, 1
+	D_ 1
 	rest 5
 	endchannel
 
@@ -462,217 +462,217 @@ Music_TitleScreen_branch_7e6e5::
 Music_TitleScreen_Ch4:: ; 7e6eb (1f:66eb)
 	dspeed 6
 	rest 4
-	dnote 1, snare3
-	dnote 1, snare3
-	dnote 1, snare4
-	dnote 1, snare4
+	snare3 1
+	snare3 1
+	snare4 1
+	snare4 1
 	dspeed 12
-	dnote 1, snare2
+	snare2 1
 	rest 3
-	dnote 1, snare2
+	snare2 1
 	rest 5
-	dnote 1, snare2
-	dnote 1, snare2
-	dnote 1, snare2
+	snare2 1
+	snare2 1
+	snare2 1
 	rest 3
-	dnote 1, snare2
+	snare2 1
 	rest 3
-	dnote 1, snare2
+	snare2 1
 	rest 3
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare4
-	dnote 2, snare2
-	dnote 2, snare3
-	dnote 2, snare2
-	dnote 2, snare1
+	snare3 2
+	snare4 2
+	snare2 2
+	snare3 2
+	snare2 2
+	snare1 2
 
 Music_TitleScreen_branch_7e716::
 	dspeed 12
-	dnote 1, snare2
+	snare2 1
 	rest 3
-	dnote 1, snare2
+	snare2 1
 	rest 5
-	dnote 1, snare2
-	dnote 1, snare2
-	dnote 1, snare3
+	snare2 1
+	snare2 1
+	snare3 1
 	rest 3
 	callchannel Music_TitleScreen_branch_7e834
 	callchannel Music_TitleScreen_branch_7e834
-	dnote 1, snare2
+	snare2 1
 	rest 3
-	dnote 1, snare2
+	snare2 1
 	rest 5
-	dnote 1, snare2
-	dnote 1, snare2
-	dnote 1, snare3
+	snare2 1
+	snare2 1
+	snare3 1
 	rest 1
-	dnote 1, snare3
-	dnote 1, snare2
+	snare3 1
+	snare2 1
 	callchannel Music_TitleScreen_branch_7e842
-	dnote 1, snare2
+	snare2 1
 	rest 3
-	dnote 1, snare2
+	snare2 1
 	rest 5
-	dnote 1, snare2
-	dnote 1, snare3
-	dnote 1, snare2
+	snare2 1
+	snare3 1
+	snare2 1
 	rest 1
-	dnote 1, snare2
+	snare2 1
 	rest 1
 	callchannel Music_TitleScreen_branch_7e842
-	dnote 1, snare2
+	snare2 1
 	rest 3
-	dnote 1, snare2
+	snare2 1
 	rest 5
-	dnote 1, snare2
-	dnote 1, snare3
-	dnote 1, snare2
+	snare2 1
+	snare3 1
+	snare2 1
 	rest 1
 	dspeed 6
-	dnote 1, snare3
-	dnote 1, snare3
-	dnote 1, snare4
-	dnote 1, snare4
+	snare3 1
+	snare3 1
+	snare4 1
+	snare4 1
 	dspeed 12
 	callchannel Music_TitleScreen_branch_7e834
 	callchannel Music_TitleScreen_branch_7e842
-	dnote 1, snare2
+	snare2 1
 	rest 3
-	dnote 1, snare2
+	snare2 1
 	rest 5
-	dnote 1, snare2
-	dnote 1, snare3
-	dnote 1, snare2
+	snare2 1
+	snare3 1
+	snare2 1
 	rest 3
-	dnote 1, snare2
+	snare2 1
 	rest 3
-	dnote 1, snare2
+	snare2 1
 	rest 5
-	dnote 1, snare3
-	dnote 1, snare2
-	dnote 1, snare2
+	snare3 1
+	snare2 1
+	snare2 1
 	rest 1
-	dnote 1, snare3
-	dnote 1, snare2
+	snare3 1
+	snare2 1
 	callchannel Music_TitleScreen_branch_7e834
 	callchannel Music_TitleScreen_branch_7e842
-	dnote 1, snare2
+	snare2 1
 	rest 3
-	dnote 1, snare2
+	snare2 1
 	rest 5
-	dnote 1, snare3
-	dnote 1, snare2
-	dnote 1, snare2
+	snare3 1
+	snare2 1
+	snare2 1
 	rest 1
-	dnote 1, snare4
-	dnote 1, snare3
-	dnote 1, snare2
+	snare4 1
+	snare3 1
+	snare2 1
 	rest 3
-	dnote 1, snare3
+	snare3 1
 	rest 5
-	dnote 1, snare2
-	dnote 1, snare4
-	dnote 1, snare2
+	snare2 1
+	snare4 1
+	snare2 1
 	rest 1
 	dspeed 6
-	dnote 1, snare3
-	dnote 1, snare3
-	dnote 1, snare4
-	dnote 1, snare4
+	snare3 1
+	snare3 1
+	snare4 1
+	snare4 1
 	dspeed 12
-	dnote 1, snare1
+	snare1 1
 	rest 3
-	dnote 1, snare2
+	snare2 1
 	rest 5
-	dnote 1, snare3
-	dnote 1, snare2
-	dnote 1, snare1
+	snare3 1
+	snare2 1
+	snare1 1
 	rest 3
-	dnote 1, snare2
+	snare2 1
 	rest 3
-	dnote 1, snare3
+	snare3 1
 	rest 5
-	dnote 1, snare3
-	dnote 1, snare2
-	dnote 1, snare3
+	snare3 1
+	snare2 1
+	snare3 1
 	rest 3
-	dnote 1, snare2
+	snare2 1
 	rest 3
-	dnote 1, snare3
+	snare3 1
 	rest 5
-	dnote 1, snare2
-	dnote 1, snare3
-	dnote 1, snare4
+	snare2 1
+	snare3 1
+	snare4 1
 	rest 1
-	dnote 1, snare3
-	dnote 1, snare2
-	dnote 1, snare2
+	snare3 1
+	snare2 1
+	snare2 1
 	rest 3
-	dnote 1, snare3
+	snare3 1
 	rest 5
-	dnote 1, snare2
-	dnote 1, snare3
-	dnote 1, snare2
+	snare2 1
+	snare3 1
+	snare2 1
 	rest 3
-	dnote 1, snare5
+	snare5 1
 	rest 5
-	dnote 1, snare2
+	snare2 1
 	rest 3
-	dnote 1, snare3
-	dnote 1, snare2
-	dnote 1, snare1
+	snare3 1
+	snare2 1
+	snare1 1
 	rest 5
-	dnote 1, snare2
-	dnote 1, snare3
-	dnote 1, snare2
+	snare2 1
+	snare3 1
+	snare2 1
 	rest 1
-	dnote 1, snare1
+	snare1 1
 	rest 1
 	dspeed 8
-	dnote 4, snare2
-	dnote 4, snare3
-	dnote 4, snare1
+	snare2 4
+	snare3 4
+	snare1 4
 	dspeed 12
-	dnote 1, snare5
+	snare5 1
 	rest 5
-	dnote 1, snare2
+	snare2 1
 	rest 3
-	dnote 1, snare3
-	dnote 1, snare2
-	dnote 1, snare3
+	snare3 1
+	snare2 1
+	snare3 1
 	rest 5
-	dnote 1, snare2
-	dnote 1, snare3
-	dnote 1, snare1
+	snare2 1
+	snare3 1
+	snare1 1
 	rest 1
-	dnote 1, snare3
-	dnote 1, snare2
+	snare3 1
+	snare2 1
 	dspeed 8
-	dnote 4, snare2
-	dnote 4, snare3
-	dnote 4, snare2
+	snare2 4
+	snare3 4
+	snare2 4
 	loopchannel 0, Music_TitleScreen_branch_7e716
 
 Music_TitleScreen_branch_7e834::
-	dnote 1, snare2
+	snare2 1
 	rest 3
-	dnote 1, snare2
+	snare2 1
 	rest 5
-	dnote 1, snare2
-	dnote 1, snare3
-	dnote 1, snare2
+	snare2 1
+	snare3 1
+	snare2 1
 	rest 3
 	endchannel
 
 Music_TitleScreen_branch_7e842::
-	dnote 1, snare2
+	snare2 1
 	rest 3
-	dnote 1, snare2
+	snare2 1
 	rest 5
-	dnote 1, snare3
-	dnote 1, snare2
-	dnote 1, snare2
+	snare3 1
+	snare2 1
+	snare2 1
 	rest 3
 	endchannel
-; 0x7e850
\ No newline at end of file
+; 0x7e850
diff --git a/audio/music/trainerbattle.asm b/audio/music/trainerbattle.asm
index be5f12ce..52642fdc 100644
--- a/audio/music/trainerbattle.asm
+++ b/audio/music/trainerbattle.asm
@@ -7,645 +7,645 @@ Music_TrainerBattle_Ch1:: ; 22919 (8:6919)
 	notetype 12, 11, 2
 	rest 8
 	octave 3
-	note F_, 1
-	note E_, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note C#, 1
-	note C_, 1
-	note C#, 1
-	note C_, 1
-	octave 2
-	note B_, 1
-	octave 3
-	note C_, 1
-	octave 2
-	note B_, 1
-	note A#, 1
-	note B_, 1
-	note A#, 1
-	note A_, 1
-	note A#, 1
-	octave 3
-	note D_, 6
-	note E_, 6
-	note F_, 4
-	note D_, 2
-	note E_, 4
-	note F_, 6
-	note C_, 4
-	note D_, 6
-	note E_, 6
-	note F_, 4
-	note D_, 2
-	note E_, 4
-	note F_, 6
-	note C_, 2
-	note C#, 2
-	note D_, 6
-	note E_, 6
-	note F_, 4
-	note D_, 2
-	note E_, 4
-	note F_, 6
-	note C_, 4
-	note D_, 6
-	note E_, 6
-	note F_, 4
-	note D_, 2
-	note E_, 4
-	note F_, 6
-	note C_, 2
-	note C#, 2
+	F_ 1
+	E_ 1
+	F_ 1
+	E_ 1
+	D# 1
+	E_ 1
+	D# 1
+	D_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	C# 1
+	C_ 1
+	C# 1
+	C_ 1
+	octave 2
+	B_ 1
+	octave 3
+	C_ 1
+	octave 2
+	B_ 1
+	A# 1
+	B_ 1
+	A# 1
+	A_ 1
+	A# 1
+	octave 3
+	D_ 6
+	E_ 6
+	F_ 4
+	D_ 2
+	E_ 4
+	F_ 6
+	C_ 4
+	D_ 6
+	E_ 6
+	F_ 4
+	D_ 2
+	E_ 4
+	F_ 6
+	C_ 2
+	C# 2
+	D_ 6
+	E_ 6
+	F_ 4
+	D_ 2
+	E_ 4
+	F_ 6
+	C_ 4
+	D_ 6
+	E_ 6
+	F_ 4
+	D_ 2
+	E_ 4
+	F_ 6
+	C_ 2
+	C# 2
 
 Music_TrainerBattle_branch_22962::
 	notetype 12, 11, 5
-	note D_, 2
-	note E_, 4
-	note C#, 2
-	note D_, 4
-	octave 2
-	note B_, 4
-	note F#, 4
-	octave 3
-	note E_, 2
-	note D_, 4
-	note C#, 2
-	note D_, 2
-	note E_, 2
-	note F_, 8
+	D_ 2
+	E_ 4
+	C# 2
+	D_ 4
+	octave 2
+	B_ 4
+	F# 4
+	octave 3
+	E_ 2
+	D_ 4
+	C# 2
+	D_ 2
+	E_ 2
+	F_ 8
 	notetype 12, 11, 2
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C_, 1
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
-	note G_, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C_, 1
+	C_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	D# 1
+	D_ 1
+	C_ 1
+	C_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	F# 1
+	G_ 1
+	G# 1
+	G_ 1
+	F# 1
+	F_ 1
+	E_ 1
+	D# 1
+	D_ 1
+	C_ 1
 	notetype 12, 11, 5
-	note D_, 2
-	note E_, 4
-	note C#, 2
-	note D_, 4
+	D_ 2
+	E_ 4
+	C# 2
+	D_ 4
 	octave 2
-	note B_, 4
-	note F#, 4
+	B_ 4
+	F# 4
 	octave 3
-	note E_, 2
-	note D_, 4
-	note C#, 2
+	E_ 2
+	D_ 4
+	C# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note C#, 2
+	C# 2
 	notetype 12, 10, 7
-	note D_, 8
-	note C#, 8
+	D_ 8
+	C# 8
 	octave 2
-	note B_, 8
+	B_ 8
 	octave 3
-	note C#, 8
+	C# 8
 	notetype 12, 11, 5
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	octave 2
-	note B_, 2
-	note A_, 2
-	note G_, 2
+	B_ 2
+	A_ 2
+	G_ 2
 	rest 2
 	octave 3
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	octave 2
-	note B_, 2
-	note A_, 2
-	note G_, 2
+	B_ 2
+	A_ 2
+	G_ 2
 	rest 2
 	octave 3
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note C#, 2
-	note E_, 4
+	C# 2
+	E_ 4
 	octave 2
-	note G_, 1
-	note A_, 1
-	note B_, 1
+	G_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C#, 1
-	note D_, 4
+	C# 1
+	D_ 4
 	octave 2
-	note F#, 1
-	note G_, 1
-	note A_, 1
-	note B_, 1
+	F# 1
+	G_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C#, 4
+	C# 4
 	octave 2
-	note G_, 1
-	note A_, 1
-	note B_, 1
+	G_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note C#, 1
-	note D_, 4
+	C# 1
+	D_ 4
 	octave 2
-	note F#, 1
-	note G_, 1
-	note A_, 1
-	note B_, 1
+	F# 1
+	G_ 1
+	A_ 1
+	B_ 1
 	octave 3
-	note D_, 2
-	note C#, 2
+	D_ 2
+	C# 2
 	octave 2
-	note B_, 2
-	note A_, 2
-	note G_, 2
+	B_ 2
+	A_ 2
+	G_ 2
 	rest 2
 	octave 3
-	note D_, 2
-	note C#, 2
-	octave 2
-	note B_, 2
-	note A_, 2
-	note B_, 2
-	note G_, 2
-	octave 3
-	note D_, 2
-	note E_, 2
-	note F#, 2
-	note G_, 2
-	note A_, 2
-	note B_, 2
-	note A_, 2
-	note G_, 2
-	note A_, 2
+	D_ 2
+	C# 2
+	octave 2
+	B_ 2
+	A_ 2
+	B_ 2
+	G_ 2
+	octave 3
+	D_ 2
+	E_ 2
+	F# 2
+	G_ 2
+	A_ 2
+	B_ 2
+	A_ 2
+	G_ 2
+	A_ 2
 	rest 2
-	note A_, 2
-	note B_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
-	note G_, 2
-	note A_, 2
-	note E_, 2
-	note G_, 2
-	note F#, 2
-	octave 2
-	note B_, 1
-	octave 3
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
-	note A_, 1
-	note A#, 1
-	note B_, 1
+	A_ 2
+	B_ 2
+	A_ 2
+	G_ 2
+	F# 2
+	G_ 2
+	A_ 2
+	E_ 2
+	G_ 2
+	F# 2
+	octave 2
+	B_ 1
+	octave 3
+	C_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	F# 1
+	G_ 1
+	G# 1
+	A_ 1
+	A# 1
+	B_ 1
 	octave 4
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note C_, 1
-	octave 3
-	note B_, 1
-	note A#, 1
-	note A_, 1
-	note G#, 1
-	note G_, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note C_, 1
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
-	note A_, 1
-	note A#, 1
-	note B_, 1
+	C_ 1
+	C# 1
+	D_ 1
+	D# 1
+	D_ 1
+	C# 1
+	C_ 1
+	octave 3
+	B_ 1
+	A# 1
+	A_ 1
+	G# 1
+	G_ 1
+	F# 1
+	F_ 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	C_ 1
+	C_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	F# 1
+	G_ 1
+	G# 1
+	A_ 1
+	A# 1
+	B_ 1
 	octave 4
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note C_, 1
-	octave 3
-	note B_, 1
-	note A#, 1
-	note A_, 1
-	note G#, 1
-	note G_, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
-	note A_, 1
-	note A#, 1
-	note B_, 1
+	C_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	C_ 1
+	octave 3
+	B_ 1
+	A# 1
+	A_ 1
+	G# 1
+	G_ 1
+	F# 1
+	F_ 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	F# 1
+	G_ 1
+	G# 1
+	A_ 1
+	A# 1
+	B_ 1
 	octave 4
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note C_, 1
-	octave 3
-	note B_, 1
-	note A#, 1
-	note A_, 1
-	note G#, 1
-	note G_, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
-	note A_, 1
-	note A#, 1
-	note B_, 1
+	C_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	C_ 1
+	octave 3
+	B_ 1
+	A# 1
+	A_ 1
+	G# 1
+	G_ 1
+	F# 1
+	F_ 1
+	E_ 1
+	D# 1
+	D_ 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	F# 1
+	G_ 1
+	G# 1
+	A_ 1
+	A# 1
+	B_ 1
 	octave 4
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note C_, 1
-	octave 3
-	note B_, 1
-	note A#, 1
-	note B_, 1
+	C_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	F# 1
+	F_ 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	C_ 1
+	octave 3
+	B_ 1
+	A# 1
+	B_ 1
 	octave 4
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	octave 3
-	note A_, 4
+	C_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	octave 3
+	A_ 4
 	octave 4
-	note D_, 4
-	octave 3
-	note A_, 2
-	note D_, 1
-	note E_, 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
-	note A#, 1
-	note B_, 2
+	D_ 4
+	octave 3
+	A_ 2
+	D_ 1
+	E_ 1
+	F# 1
+	G_ 1
+	G# 1
+	A# 1
+	B_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note C_, 2
+	C_ 2
 	octave 3
-	note G_, 2
-	note B_, 2
-	note F_, 2
-	note G_, 2
-	note A_, 2
+	G_ 2
+	B_ 2
+	F_ 2
+	G_ 2
+	A_ 2
 	octave 4
-	note C_, 2
-	note D_, 2
+	C_ 2
+	D_ 2
 	rest 2
 	octave 3
-	note A_, 4
+	A_ 4
 	octave 4
-	note C_, 4
-	note D_, 2
+	C_ 4
+	D_ 2
 	octave 3
-	note F_, 1
-	note G_, 1
-	note A_, 1
-	note B_, 1
+	F_ 1
+	G_ 1
+	A_ 1
+	B_ 1
 	octave 4
-	note C_, 1
-	note D_, 1
-	note E_, 2
-	note F_, 2
-	note D_, 2
-	note F_, 2
-	note D_, 2
-	note F_, 2
-	note D_, 2
-	note F_, 2
-	note D_, 2
-	note F_, 2
-	note D_, 2
-	note F_, 2
-	note E_, 2
-	note F_, 2
-	note E_, 2
-	note F_, 2
-	note E_, 2
-	note F_, 2
-	note E_, 2
-	note F_, 2
-	note E_, 2
-	note F_, 2
-	note E_, 2
-	note F_, 2
-	note E_, 2
-	note F_, 2
-	note E_, 2
+	C_ 1
+	D_ 1
+	E_ 2
+	F_ 2
+	D_ 2
+	F_ 2
+	D_ 2
+	F_ 2
+	D_ 2
+	F_ 2
+	D_ 2
+	F_ 2
+	D_ 2
+	F_ 2
+	E_ 2
+	F_ 2
+	E_ 2
+	F_ 2
+	E_ 2
+	F_ 2
+	E_ 2
+	F_ 2
+	E_ 2
+	F_ 2
+	E_ 2
+	F_ 2
+	E_ 2
+	F_ 2
+	E_ 2
 	octave 3
-	note B_, 2
-	note C_, 2
+	B_ 2
+	C_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note C_, 2
+	E_ 2
+	C_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note C_, 2
+	E_ 2
+	C_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note C_, 2
+	E_ 2
+	C_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note C_, 2
+	E_ 2
+	C_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note C_, 2
-	note E_, 2
-	note D_, 2
+	C_ 2
+	E_ 2
+	D_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
-	note D_, 2
+	F_ 2
+	D_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
-	note D_, 2
+	F_ 2
+	D_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
-	note D_, 2
+	F_ 2
+	D_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
-	note D_, 2
+	F_ 2
+	D_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note D_, 2
-	note F_, 2
-	note C_, 2
+	D_ 2
+	F_ 2
+	C_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note C_, 2
+	E_ 2
+	C_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note C_, 2
+	E_ 2
+	C_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note C_, 2
+	E_ 2
+	C_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note C_, 2
+	E_ 2
+	C_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note C_, 2
-	note E_, 2
-	note D_, 2
+	C_ 2
+	E_ 2
+	D_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
-	note D_, 2
+	F_ 2
+	D_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
-	note D_, 2
+	F_ 2
+	D_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
-	note D_, 2
+	F_ 2
+	D_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
-	note D_, 2
+	F_ 2
+	D_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note D_, 2
-	note F_, 2
-	note D_, 16
-	note C_, 16
+	D_ 2
+	F_ 2
+	D_ 16
+	C_ 16
 	octave 2
-	note A#, 16
-	note G_, 12
+	A# 16
+	G_ 12
 	octave 3
-	note D_, 1
-	note E_, 1
-	note G_, 1
+	D_ 1
+	E_ 1
+	G_ 1
 	octave 4
-	note C_, 1
-	note D_, 8
-	note F_, 8
+	C_ 1
+	D_ 8
+	F_ 8
 	octave 3
-	note A#, 8
+	A# 8
 	octave 4
-	note C_, 8
-	note D_, 8
-	note E_, 8
-	note F_, 8
-	note G_, 8
-	note E_, 2
+	C_ 8
+	D_ 8
+	E_ 8
+	F_ 8
+	G_ 8
+	E_ 2
 	rest 4
-	note E_, 2
+	E_ 2
 	rest 4
-	note E_, 2
+	E_ 2
 	rest 2
-	note E_, 2
+	E_ 2
 	rest 4
-	note E_, 2
+	E_ 2
 	rest 4
-	note E_, 2
+	E_ 2
 	rest 2
-	note E_, 2
+	E_ 2
 	rest 4
-	note E_, 2
+	E_ 2
 	rest 4
-	note E_, 2
+	E_ 2
 	rest 2
-	note E_, 2
+	E_ 2
 	rest 4
-	note E_, 2
+	E_ 2
 	rest 4
-	note E_, 2
+	E_ 2
 	rest 2
 	octave 3
-	note C_, 2
-	note D_, 4
+	C_ 2
+	D_ 4
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note C#, 4
+	C# 4
 	rest 2
-	note C#, 1
-	note D_, 1
-	note E_, 1
+	C# 1
+	D_ 1
+	E_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
 	octave 2
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 3
-	note C#, 1
+	C# 1
 	rest 9
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	F_ 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
 	rest 5
-	note C#, 1
-	note D_, 1
-	note E_, 1
+	C# 1
+	D_ 1
+	E_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note D_, 2
-	note E_, 2
-	note F_, 2
-	note G_, 2
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
+	D_ 2
+	E_ 2
+	F_ 2
+	G_ 2
+	D# 1
+	E_ 1
+	F_ 1
+	F# 1
+	F# 1
+	F_ 1
+	E_ 1
+	D# 1
+	D_ 1
 	rest 9
-	note F#, 2
-	note E_, 4
-	note D#, 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
-	note E_, 8
-	note F#, 8
-	note G_, 8
+	F# 2
+	E_ 4
+	D# 2
+	E_ 2
+	F# 2
+	G# 2
+	E_ 8
+	F# 8
+	G_ 8
 	octave 4
-	note C_, 4
+	C_ 4
 	octave 3
-	note G_, 1
-	note G#, 1
-	note A_, 1
-	note A#, 1
+	G_ 1
+	G# 1
+	A_ 1
+	A# 1
 	loopchannel 0, Music_TrainerBattle_branch_22962
 
 
@@ -654,302 +654,302 @@ Music_TrainerBattle_Ch2:: ; 22bae (8:6bae)
 	vibrato 10, 2, 5
 	notetype 12, 12, 2
 	octave 4
-	note A_, 1
-	note G#, 1
-	note G_, 1
-	note F#, 1
-	note A_, 1
-	note F_, 1
-	note F#, 1
-	note F_, 1
-	note A_, 1
-	note E_, 1
-	note F_, 1
-	note E_, 1
-	note A_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note A_, 1
-	note D_, 1
-	note D#, 1
-	note D_, 1
-	note A_, 1
-	note C#, 1
-	note D_, 1
-	note C#, 1
-	note A_, 1
-	note C_, 1
-	note C#, 1
-	note C_, 1
-	note A_, 1
-	octave 3
-	note B_, 1
+	A_ 1
+	G# 1
+	G_ 1
+	F# 1
+	A_ 1
+	F_ 1
+	F# 1
+	F_ 1
+	A_ 1
+	E_ 1
+	F_ 1
+	E_ 1
+	A_ 1
+	D# 1
+	E_ 1
+	D# 1
+	A_ 1
+	D_ 1
+	D# 1
+	D_ 1
+	A_ 1
+	C# 1
+	D_ 1
+	C# 1
+	A_ 1
+	C_ 1
+	C# 1
+	C_ 1
+	A_ 1
+	octave 3
+	B_ 1
 	octave 4
-	note C_, 1
+	C_ 1
 	octave 3
-	note B_, 1
+	B_ 1
 	notetype 12, 14, 1
 	octave 4
-	note B_, 16
+	B_ 16
 	rest 16
 	notetype 12, 13, 1
-	note B_, 16
+	B_ 16
 	rest 12
-	note A_, 4
+	A_ 4
 	notetype 12, 12, 2
 	octave 3
-	note B_, 6
+	B_ 6
 	octave 4
-	note C#, 6
-	note D_, 4
+	C# 6
+	D_ 4
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 4
-	note D_, 6
-	note A_, 2
-	note A#, 2
-	note B_, 6
+	C# 4
+	D_ 6
+	A_ 2
+	A# 2
+	B_ 6
 	octave 5
-	note C#, 6
-	note D_, 4
+	C# 6
+	D_ 4
 	octave 4
-	note B_, 2
+	B_ 2
 	octave 5
-	note C#, 4
-	note D_, 6
+	C# 4
+	D_ 6
 	octave 4
-	note A_, 4
+	A_ 4
 
 Music_TrainerBattle_branch_22bfc::
 	notetype 12, 12, 7
 	octave 3
-	note B_, 6
-	note F#, 14
-	note B_, 4
-	note F#, 4
-	note B_, 4
+	B_ 6
+	F# 14
+	B_ 4
+	F# 4
+	B_ 4
 	notetype 12, 5, 0
 	octave 4
-	note C_, 8
+	C_ 8
 	notetype 12, 3, 0
-	note C_, 8
+	C_ 8
 	notetype 12, 4, 14
-	note C_, 8
+	C_ 8
 	notetype 12, 12, 7
-	note C_, 8
+	C_ 8
 	octave 3
-	note B_, 6
-	note F#, 14
-	note B_, 4
-	note F#, 4
-	note B_, 4
+	B_ 6
+	F# 14
+	B_ 4
+	F# 4
+	B_ 4
 	notetype 12, 9, 0
-	note A_, 8
+	A_ 8
 	notetype 12, 5, 0
-	note A_, 8
+	A_ 8
 	notetype 12, 4, 0
-	note A_, 8
+	A_ 8
 	notetype 12, 3, 0
-	note A_, 8
+	A_ 8
 	notetype 12, 12, 7
-	note G_, 16
+	G_ 16
 	octave 4
-	note D_, 8
+	D_ 8
 	octave 3
-	note G_, 8
+	G_ 8
 	notetype 12, 8, 0
-	note A_, 8
+	A_ 8
 	notetype 12, 5, 0
-	note A_, 8
+	A_ 8
 	notetype 12, 4, 0
-	note A_, 8
+	A_ 8
 	notetype 12, 6, 0
-	note A_, 8
+	A_ 8
 	notetype 12, 12, 7
-	note G_, 16
+	G_ 16
 	octave 4
-	note E_, 8
-	note F#, 8
-	note E_, 16
+	E_ 8
+	F# 8
+	E_ 16
 	notetype 12, 12, 5
-	note G_, 4
-	note A_, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note D_, 2
-	note E_, 2
+	G_ 4
+	A_ 2
+	G_ 2
+	F# 2
+	E_ 2
+	D_ 2
+	E_ 2
 	notetype 12, 11, 7
-	note F#, 8
+	F# 8
 	notetype 12, 5, 0
-	note F#, 8
+	F# 8
 	notetype 12, 6, 0
-	note F#, 8
+	F# 8
 	notetype 12, 7, 0
-	note F#, 8
+	F# 8
 	notetype 12, 10, 0
-	note G_, 8
+	G_ 8
 	notetype 12, 10, 7
-	note G_, 8
+	G_ 8
 	notetype 12, 11, 7
-	note G_, 4
+	G_ 4
 	notetype 12, 12, 5
-	note A_, 2
-	note G_, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note F#, 2
+	A_ 2
+	G_ 2
+	G_ 2
+	F# 2
+	E_ 2
+	F# 2
 	notetype 12, 10, 0
-	note G#, 8
+	G# 8
 	notetype 12, 7, 0
-	note G#, 8
+	G# 8
 	notetype 12, 8, 0
-	note G#, 8
+	G# 8
 	notetype 12, 6, 0
-	note G#, 8
+	G# 8
 	notetype 12, 10, 0
-	note A_, 16
+	A_ 16
 	notetype 12, 11, 0
 	octave 5
-	note C#, 8
-	note E_, 8
+	C# 8
+	E_ 8
 	notetype 12, 12, 0
-	note D_, 4
+	D_ 4
 	octave 4
-	note A_, 4
+	A_ 4
 	octave 5
-	note C_, 2
+	C_ 2
 	notetype 12, 12, 7
 	octave 4
-	note B_, 8
+	B_ 8
 	notetype 12, 6, 0
-	note B_, 8
+	B_ 8
 	notetype 12, 6, 9
-	note B_, 6
+	B_ 6
 	notetype 12, 9, 6
-	note B_, 6
+	B_ 6
 	rest 2
 	notetype 12, 12, 0
 	octave 5
-	note D_, 4
+	D_ 4
 	octave 4
-	note A_, 4
-	note A#, 2
+	A_ 4
+	A# 2
 	notetype 12, 11, 0
 	octave 5
-	note F_, 14
+	F_ 14
 	notetype 12, 6, 0
-	note G_, 16
+	G_ 16
 	notetype 12, 5, 0
-	note E_, 16
+	E_ 16
 	notetype 12, 4, 0
-	note E_, 16
+	E_ 16
 	notetype 12, 12, 7
 	octave 4
-	note C_, 6
+	C_ 6
 	octave 3
-	note A_, 14
+	A_ 14
 	octave 4
-	note C_, 4
+	C_ 4
 	octave 3
-	note A_, 4
+	A_ 4
 	octave 4
-	note C_, 4
+	C_ 4
 	octave 3
-	note A#, 6
+	A# 6
 	octave 4
-	note F_, 14
+	F_ 14
 	octave 3
-	note A#, 4
+	A# 4
 	octave 4
-	note F_, 4
-	note D_, 4
-	note C_, 6
+	F_ 4
+	D_ 4
+	C_ 6
 	octave 3
-	note A_, 14
+	A_ 14
 	octave 4
-	note C_, 4
-	note E_, 2
-	note D_, 2
-	note C_, 2
-	note E_, 2
-	note D_, 2
-	octave 3
-	note A#, 4
+	C_ 4
+	E_ 2
+	D_ 2
+	C_ 2
+	E_ 2
+	D_ 2
+	octave 3
+	A# 4
 	octave 4
-	note F_, 10
-	note G_, 6
-	note F_, 6
-	note D_, 4
+	F_ 10
+	G_ 6
+	F_ 6
+	D_ 4
 	notetype 12, 11, 0
-	note F_, 16
-	note E_, 16
-	note D_, 16
-	note E_, 16
+	F_ 16
+	E_ 16
+	D_ 16
+	E_ 16
 	notetype 12, 10, 0
 	octave 5
-	note F_, 16
-	note E_, 16
-	note G_, 16
-	note F_, 16
+	F_ 16
+	E_ 16
+	G_ 16
+	F_ 16
 	notetype 12, 13, 1
 	octave 3
-	note A#, 6
-	note A#, 6
-	note A#, 4
-	note A_, 6
-	note A_, 6
-	note A_, 4
+	A# 6
+	A# 6
+	A# 4
+	A_ 6
+	A_ 6
+	A_ 4
 	octave 4
-	note C_, 6
-	note C_, 6
-	note C_, 4
+	C_ 6
+	C_ 6
+	C_ 4
 	octave 3
-	note A#, 6
-	note A#, 6
-	note A_, 4
+	A# 6
+	A# 6
+	A_ 4
 	notetype 12, 12, 7
-	note A_, 4
-	note B_, 4
-	note G_, 2
-	note A_, 10
-	note B_, 2
+	A_ 4
+	B_ 4
+	G_ 2
+	A_ 10
+	B_ 2
 	octave 4
-	note C#, 2
-	note E_, 2
-	note D_, 2
-	note C#, 2
+	C# 2
+	E_ 2
+	D_ 2
+	C# 2
 	octave 3
-	note B_, 2
-	note A#, 16
+	B_ 2
+	A# 16
 	rest 2
-	note A#, 2
+	A# 2
 	octave 4
-	note C_, 2
-	note F_, 2
-	note E_, 2
-	note D_, 2
-	note C_, 2
-	octave 3
-	note A#, 2
-	note B_, 16
+	C_ 2
+	F_ 2
+	E_ 2
+	D_ 2
+	C_ 2
+	octave 3
+	A# 2
+	B_ 16
 	rest 2
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note D_, 2
+	C# 2
+	G_ 2
+	F# 2
+	E_ 2
+	D_ 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C_, 16
-	note E_, 8
-	note G_, 8
+	C_ 16
+	E_ 8
+	G_ 8
 	loopchannel 0, Music_TrainerBattle_branch_22bfc
 
 
@@ -957,902 +957,902 @@ Music_TrainerBattle_Ch3:: ; 22d10 (8:6d10)
 	vibrato 0, 2, 0
 	notetype 12, 1, 4
 	octave 3
-	note B_, 1
-	note A#, 1
-	note A_, 1
-	note G#, 1
-	note A_, 1
-	note G#, 1
-	note G_, 1
-	note F#, 1
-	note G_, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note C_, 1
-	note C#, 1
-	note C_, 1
+	B_ 1
+	A# 1
+	A_ 1
+	G# 1
+	A_ 1
+	G# 1
+	G_ 1
+	F# 1
+	G_ 1
+	F# 1
+	F_ 1
+	E_ 1
+	F_ 1
+	E_ 1
+	D# 1
+	D_ 1
+	D# 1
+	D_ 1
+	C# 1
+	C_ 1
+	C# 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A#, 1
-	note B_, 1
-	note A#, 1
-	note A_, 1
-	note G#, 1
-	note A_, 2
-	note A#, 2
-	note B_, 2
-	note B_, 2
+	B_ 1
+	A# 1
+	B_ 1
+	A# 1
+	A_ 1
+	G# 1
+	A_ 2
+	A# 2
+	B_ 2
+	B_ 2
 	octave 3
-	note D_, 2
-	note E_, 2
+	D_ 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F_, 2
-	note E_, 2
-	note D_, 2
+	F_ 2
+	E_ 2
+	D_ 2
 	octave 2
-	note B_, 2
-	note B_, 2
+	B_ 2
+	B_ 2
 	octave 3
-	note D_, 2
-	note E_, 2
+	D_ 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note C_, 2
+	C_ 2
 	octave 2
-	note B_, 2
-	note B_, 2
+	B_ 2
+	B_ 2
 	octave 3
-	note D_, 2
-	note E_, 2
+	D_ 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F_, 2
-	note E_, 2
-	note D_, 2
+	F_ 2
+	E_ 2
+	D_ 2
 	octave 2
-	note B_, 2
-	note B_, 2
+	B_ 2
+	B_ 2
 	octave 3
-	note D_, 2
-	note E_, 2
+	D_ 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note C_, 2
+	C_ 2
 	octave 2
-	note B_, 2
-	note B_, 2
+	B_ 2
+	B_ 2
 	octave 3
-	note D_, 2
-	note E_, 2
+	D_ 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F_, 2
-	note E_, 2
-	note D_, 2
+	F_ 2
+	E_ 2
+	D_ 2
 	octave 2
-	note B_, 2
-	note B_, 2
+	B_ 2
+	B_ 2
 	octave 3
-	note D_, 2
-	note E_, 2
+	D_ 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note C_, 2
+	C_ 2
 	octave 2
-	note B_, 2
-	note B_, 2
+	B_ 2
+	B_ 2
 	octave 3
-	note D_, 2
-	note E_, 2
+	D_ 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F_, 2
-	note E_, 2
-	note D_, 2
+	F_ 2
+	E_ 2
+	D_ 2
 	octave 2
-	note B_, 2
-	note B_, 2
+	B_ 2
+	B_ 2
 	octave 3
-	note D_, 2
-	note E_, 2
+	D_ 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note C_, 2
+	C_ 2
 
 Music_TrainerBattle_branch_22d9c::
 	octave 2
-	note A#, 1
-	note B_, 1
+	A# 1
+	B_ 1
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note A_, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note D_, 2
-	note C_, 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	A_ 2
+	G_ 2
+	F# 2
+	E_ 2
+	D_ 2
+	C_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note D_, 2
-	note C#, 2
-	note D_, 2
-	note C#, 2
+	E_ 2
+	D_ 2
+	C# 2
+	D_ 2
+	C# 2
 	octave 2
-	note A_, 2
-	note G#, 2
-	note G_, 2
+	A_ 2
+	G# 2
+	G_ 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 2
-	note G_, 2
+	G_ 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 2
-	note G_, 2
+	G_ 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 2
-	note G_, 2
+	G_ 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 2
-	note G_, 2
+	G_ 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 2
-	note G_, 2
+	G_ 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 2
-	note G_, 2
+	G_ 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 2
-	note G_, 2
-	note G#, 2
-	note A_, 2
+	G_ 2
+	G# 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note G_, 2
+	G_ 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 2
-	note G_, 2
+	G_ 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 2
-	note G_, 2
+	G_ 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 2
-	note G_, 2
+	G_ 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 2
-	note G_, 2
+	G_ 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 2
-	note G_, 2
+	G_ 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 2
-	note G_, 2
+	G_ 2
 	octave 3
-	note D_, 2
+	D_ 2
 	octave 2
-	note G_, 2
-	note G#, 2
-	note A_, 2
+	G_ 2
+	G# 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note D_, 2
-	note C#, 2
+	E_ 2
+	D_ 2
+	C# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
-	note D_, 2
-	note E_, 2
-	note F#, 2
-	note E_, 2
-	note D_, 2
-	note F#, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note D#, 2
-	note F_, 2
-	note G_, 2
-	note F_, 2
-	note D#, 2
-	note G_, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note G#, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note D_, 2
-	note A_, 2
-	note F_, 2
-	note G_, 2
-	note A_, 2
-	note G_, 2
-	note F_, 2
-	note E_, 2
-	note D_, 4
+	F# 2
+	D_ 2
+	E_ 2
+	F# 2
+	E_ 2
+	D_ 2
+	F# 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	D# 2
+	F_ 2
+	G_ 2
+	F_ 2
+	D# 2
+	G_ 2
+	C# 2
+	G# 2
+	C# 2
+	G# 2
+	C# 2
+	G# 2
+	C# 2
+	G# 2
+	C# 2
+	G# 2
+	E_ 2
+	F# 2
+	G# 2
+	F# 2
+	E_ 2
+	G# 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	D_ 2
+	A_ 2
+	F_ 2
+	G_ 2
+	A_ 2
+	G_ 2
+	F_ 2
+	E_ 2
+	D_ 4
 	octave 2
-	note A_, 4
+	A_ 4
 	octave 3
-	note C_, 2
-	note G_, 2
+	C_ 2
+	G_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note G_, 2
+	G_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note G_, 2
+	G_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note G_, 2
+	G_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note G_, 2
+	G_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note G_, 2
+	G_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note G_, 2
+	G_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note G_, 2
-	note D_, 4
+	G_ 2
+	D_ 4
 	octave 2
-	note A_, 4
-	note A#, 2
+	A_ 4
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 4
+	A# 4
 	octave 3
-	note F_, 4
+	F_ 4
 	octave 2
-	note A#, 4
+	A# 4
 	octave 3
-	note F_, 4
+	F_ 4
 	octave 2
-	note A#, 4
+	A# 4
 	octave 3
-	note E_, 4
+	E_ 4
 	octave 2
-	note A#, 4
+	A# 4
 	octave 3
-	note E_, 4
+	E_ 4
 	octave 2
-	note A#, 4
+	A# 4
 	octave 3
-	note D_, 4
+	D_ 4
 	octave 2
-	note A#, 4
+	A# 4
 	octave 3
-	note D_, 4
+	D_ 4
 	octave 2
-	note A#, 4
+	A# 4
 	octave 3
-	note E_, 4
+	E_ 4
 	octave 2
-	note A#, 4
+	A# 4
 	octave 3
-	note E_, 4
+	E_ 4
 	octave 2
-	note A#, 4
+	A# 4
 	octave 3
-	note F_, 4
+	F_ 4
 	octave 2
-	note A#, 4
+	A# 4
 	octave 3
-	note F_, 4
+	F_ 4
 	octave 2
-	note A#, 4
+	A# 4
 	octave 3
-	note E_, 4
+	E_ 4
 	octave 2
-	note A#, 4
+	A# 4
 	octave 3
-	note E_, 4
+	E_ 4
 	octave 2
-	note A#, 4
+	A# 4
 	octave 3
-	note D_, 4
+	D_ 4
 	octave 2
-	note A#, 4
+	A# 4
 	octave 3
-	note D_, 4
+	D_ 4
 	octave 2
-	note A#, 4
+	A# 4
 	octave 3
-	note E_, 4
+	E_ 4
 	octave 2
-	note A#, 4
+	A# 4
 	octave 3
-	note E_, 4
+	E_ 4
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note E_, 2
+	E_ 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note E_, 2
+	E_ 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note E_, 2
+	E_ 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note E_, 2
+	E_ 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note E_, 2
+	E_ 2
+	E_ 2
 	octave 2
-	note B_, 2
-	note A_, 2
+	B_ 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note E_, 2
+	E_ 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note E_, 2
+	E_ 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note E_, 2
+	E_ 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note E_, 2
+	E_ 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
-	note E_, 2
+	E_ 2
+	E_ 2
 	octave 2
-	note B_, 2
-	note A_, 2
+	B_ 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note E_, 2
+	E_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note F_, 2
+	F_ 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
+	F# 2
 	octave 2
-	note B_, 2
+	B_ 2
 	octave 3
-	note F#, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note F#, 2
-	note E_, 2
-	note F#, 2
-	note E_, 2
-	note D_, 2
-	note C_, 2
+	F# 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	F# 2
+	E_ 2
+	F# 2
+	E_ 2
+	D_ 2
+	C_ 2
 	loopchannel 0, Music_TrainerBattle_branch_22d9c
-; 0x23099
\ No newline at end of file
+; 0x23099
diff --git a/audio/music/unusedsong.asm b/audio/music/unusedsong.asm
index 4e021fd8..fb51fd15 100644
--- a/audio/music/unusedsong.asm
+++ b/audio/music/unusedsong.asm
@@ -6,177 +6,177 @@ Music_UnusedSong_Ch1:: ; a913 (2:6913)
 Music_UnusedSong_branch_a91b::
 	notetype 12, 1, 0
 	octave 6
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 5
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 6
-	note C#, 1
+	C# 1
 	rest 1
 	octave 5
-	note B_, 1
+	B_ 1
 	octave 6
-	note E_, 1
+	E_ 1
 	rest 4
-	note E_, 2
+	E_ 2
 	rest 2
-	note D#, 1
+	D# 1
 	rest 1
 	octave 5
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 6
-	note C#, 1
+	C# 1
 	rest 1
 	octave 5
-	note B_, 1
+	B_ 1
 	octave 6
-	note D#, 1
+	D# 1
 	rest 8
-	note C#, 1
+	C# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note C#, 1
+	C# 1
 	octave 5
-	note B_, 1
+	B_ 1
 	rest 2
 	octave 6
-	note C#, 1
+	C# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note C#, 1
+	C# 1
 	octave 5
-	note B_, 1
+	B_ 1
 	rest 2
 	octave 6
-	note D#, 4
-	note C#, 4
-	note D#, 1
-	note E_, 1
+	D# 4
+	C# 4
+	D# 1
+	E_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
 	octave 5
-	note B_, 2
+	B_ 2
 	rest 1
 	octave 6
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 5
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 6
-	note C#, 1
+	C# 1
 	rest 1
 	octave 5
-	note B_, 1
+	B_ 1
 	octave 6
-	note E_, 1
+	E_ 1
 	rest 8
-	note D#, 1
+	D# 1
 	rest 1
 	octave 5
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 6
-	note C#, 1
+	C# 1
 	rest 1
 	octave 5
-	note B_, 1
+	B_ 1
 	octave 6
-	note D#, 1
+	D# 1
 	rest 4
 	octave 5
-	note B_, 2
+	B_ 2
 	rest 2
 	octave 6
-	note C#, 1
+	C# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note C#, 1
+	C# 1
 	octave 5
-	note B_, 1
+	B_ 1
 	rest 2
 	octave 6
-	note C#, 1
+	C# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note E_, 1
-	note F#, 1
+	E_ 1
+	F# 1
 	rest 2
-	note F#, 4
-	note E_, 4
-	note F#, 1
-	note G#, 1
+	F# 4
+	E_ 4
+	F# 1
+	G# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note D#, 2
+	D# 2
 	rest 3
 	octave 5
-	note A_, 2
+	A_ 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 2
 	octave 6
-	note C#, 2
+	C# 2
 	rest 2
-	note E_, 2
-	note F#, 8
+	E_ 2
+	F# 8
 	rest 2
-	note E_, 2
-	note D#, 2
-	note C#, 2
+	E_ 2
+	D# 2
+	C# 2
 	rest 2
 	octave 5
-	note G#, 2
+	G# 2
 	rest 2
-	note A_, 2
+	A_ 2
 	rest 2
-	note B_, 2
+	B_ 2
 	rest 2
 	octave 6
-	note D#, 2
-	note E_, 8
+	D# 2
+	E_ 8
 	rest 2
-	note D#, 2
-	note C#, 2
-	note D#, 2
+	D# 2
+	C# 2
+	D# 2
 	octave 5
-	note A_, 2
-	note G#, 2
-	note A_, 2
-	note A#, 1
-	note B_, 1
+	A_ 2
+	G# 2
+	A_ 2
+	A# 1
+	B_ 1
 	rest 4
-	note F#, 2
+	F# 2
 	rest 2
-	note B_, 2
-	note A#, 2
-	note B_, 2
+	B_ 2
+	A# 2
+	B_ 2
 	octave 6
-	note C_, 1
-	note C#, 1
+	C_ 1
+	C# 1
 	rest 8
 	octave 5
-	note F#, 2
-	note F_, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
+	F# 2
+	F_ 2
+	F# 2
+	G# 2
+	A_ 2
 	octave 6
-	note E_, 2
-	note D#, 2
-	note C#, 2
+	E_ 2
+	D# 2
+	C# 2
 	octave 5
-	note B_, 2
+	B_ 2
 	rest 6
-	note B_, 2
+	B_ 2
 	rest 6
 	loopchannel 0, Music_UnusedSong_branch_a91b
 	endchannel
@@ -191,149 +191,149 @@ Music_UnusedSong_Ch2:: ; a9cf (2:69cf)
 Music_UnusedSong_branch_a9d8::
 	notetype 12, 1, 0
 	octave 6
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note A_, 1
-	note G#, 1
+	A_ 1
+	G# 1
 	rest 8
-	note D#, 1
+	D# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
-	note F#, 1
+	G# 1
+	F# 1
 	rest 4
 	octave 5
-	note B_, 2
+	B_ 2
 	rest 2
 	octave 6
-	note C#, 1
+	C# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note E_, 1
-	note F#, 1
+	E_ 1
+	F# 1
 	rest 2
-	note C#, 1
+	C# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note E_, 1
-	note F#, 1
+	E_ 1
+	F# 1
 	rest 2
-	note F#, 4
-	note E_, 4
-	note F#, 1
-	note G#, 1
+	F# 4
+	E_ 4
+	F# 1
+	G# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note D#, 2
+	D# 2
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note A_, 1
-	note G#, 1
+	A_ 1
+	G# 1
 	rest 4
-	note E_, 2
+	E_ 2
 	rest 2
-	note D#, 1
+	D# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
-	note F#, 1
+	G# 1
+	F# 1
 	rest 8
-	note C#, 1
+	C# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note E_, 1
-	note F#, 1
+	E_ 1
+	F# 1
 	rest 2
-	note C#, 1
+	C# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note E_, 1
-	note F#, 1
+	E_ 1
+	F# 1
 	rest 2
-	note F#, 4
-	note E_, 4
-	note F#, 1
-	note G#, 1
+	F# 4
+	E_ 4
+	F# 1
+	G# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 2
+	F# 2
 	rest 1
-	note C#, 2
+	C# 2
 	rest 2
-	note D#, 2
+	D# 2
 	rest 2
-	note E_, 2
+	E_ 2
 	rest 2
-	note G#, 2
+	G# 2
 	rest 2
-	note D#, 8
+	D# 8
 	rest 2
-	note E_, 2
-	note D#, 2
-	note C#, 2
+	E_ 2
+	D# 2
+	C# 2
 	octave 5
-	note B_, 2
+	B_ 2
 	rest 2
 	octave 6
-	note C#, 2
+	C# 2
 	rest 2
-	note D#, 2
+	D# 2
 	rest 2
-	note F#, 2
+	F# 2
 	rest 2
-	note C#, 8
+	C# 8
 	rest 2
-	note D#, 2
-	note C#, 2
+	D# 2
+	C# 2
 	octave 5
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note A_, 2
-	note G#, 1
-	note F#, 1
+	B_ 2
+	A_ 2
+	G# 2
+	A_ 2
+	G# 1
+	F# 1
 	rest 8
-	note B_, 2
-	note A#, 2
-	note B_, 2
-	note A_, 1
-	note G#, 1
+	B_ 2
+	A# 2
+	B_ 2
+	A_ 1
+	G# 1
 	rest 4
-	note G#, 2
-	rest 2
-	note F#, 2
-	note F_, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
-	note E_, 2
-	note C#, 2
-	note E_, 2
-	note F#, 2
+	G# 2
+	rest 2
+	F# 2
+	F_ 2
+	F# 2
+	G# 2
+	A_ 2
+	E_ 2
+	C# 2
+	E_ 2
+	F# 2
 	rest 6
-	note D#, 2
+	D# 2
 	rest 6
 	loopchannel 0, Music_UnusedSong_branch_a9d8
 	endchannel
-; 0xaa6f
\ No newline at end of file
+; 0xaa6f
diff --git a/audio/music/vermilion.asm b/audio/music/vermilion.asm
index eab17a08..5dfd5702 100644
--- a/audio/music/vermilion.asm
+++ b/audio/music/vermilion.asm
@@ -8,106 +8,106 @@ Music_Vermilion_Ch1:: ; b9eb (2:79eb)
 Music_Vermilion_branch_b9f6::
 	notetype 12, 11, 5
 	octave 3
-	note E_, 4
-	note C#, 1
-	note D_, 1
-	note E_, 2
-	note A_, 4
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note F#, 2
-	note A_, 4
-	note F#, 1
-	note G#, 1
-	note A_, 2
-	note E_, 4
-	note C#, 2
-	note E_, 2
-	note A_, 2
-	note G#, 2
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
-	note C#, 2
-	note D_, 2
-	note E_, 2
-	note F#, 2
-	note E_, 4
-	note C#, 1
-	note D_, 1
-	note E_, 2
-	note A_, 4
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note F#, 2
-	note A_, 4
-	note F#, 1
-	note G#, 1
-	note A_, 2
-	note E_, 4
-	note C#, 1
-	note D_, 1
-	note E_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note A_, 2
-	note G#, 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
-	note F#, 4
-	note E_, 4
-	note F#, 2
-	note G#, 2
-	note F#, 2
-	note A_, 2
-	note G#, 2
-	note B_, 2
-	note A_, 2
+	E_ 4
+	C# 1
+	D_ 1
+	E_ 2
+	A_ 4
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	F# 2
+	A_ 4
+	F# 1
+	G# 1
+	A_ 2
+	E_ 4
+	C# 2
+	E_ 2
+	A_ 2
+	G# 2
+	B_ 2
+	A_ 2
+	G# 2
+	E_ 2
+	F# 2
+	G# 2
+	C# 2
+	D_ 2
+	E_ 2
+	F# 2
+	E_ 4
+	C# 1
+	D_ 1
+	E_ 2
+	A_ 4
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	F# 2
+	A_ 4
+	F# 1
+	G# 1
+	A_ 2
+	E_ 4
+	C# 1
+	D_ 1
+	E_ 2
+	A_ 2
+	G# 2
+	F# 2
+	A_ 2
+	G# 2
+	E_ 2
+	F# 2
+	G# 2
+	F# 4
+	E_ 4
+	F# 2
+	G# 2
+	F# 2
+	A_ 2
+	G# 2
+	B_ 2
+	A_ 2
 	octave 4
-	note C#, 2
-	note D_, 2
-	note C#, 2
+	C# 2
+	D_ 2
+	C# 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G#, 1
-	note A_, 1
-	note B_, 2
+	B_ 2
+	A_ 2
+	G# 1
+	A_ 1
+	B_ 2
 	octave 4
-	note C#, 2
-	note E_, 2
+	C# 2
+	E_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note D_, 2
+	D_ 2
 	octave 3
-	note G#, 2
+	G# 2
 	octave 4
-	note C#, 2
+	C# 2
 	octave 3
-	note F#, 2
-	note B_, 2
-	note G#, 2
-	note A_, 2
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note F#, 2
-	note G#, 2
-	note B_, 2
+	F# 2
+	B_ 2
+	G# 2
+	A_ 2
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	F# 2
+	G# 2
+	B_ 2
 	loopchannel 0, Music_Vermilion_branch_b9f6
 
 
@@ -118,63 +118,63 @@ Music_Vermilion_Ch2:: ; ba61 (2:7a61)
 Music_Vermilion_branch_ba66::
 	notetype 12, 12, 7
 	octave 3
-	note A_, 8
+	A_ 8
 	octave 4
-	note D_, 4
-	note C#, 4
+	D_ 4
+	C# 4
 	octave 3
-	note B_, 6
-	note A_, 1
-	note B_, 1
+	B_ 6
+	A_ 1
+	B_ 1
 	octave 4
-	note C#, 8
+	C# 8
 	octave 3
-	note A_, 8
+	A_ 8
 	octave 4
-	note D_, 4
-	note C#, 4
+	D_ 4
+	C# 4
 	octave 3
-	note B_, 6
+	B_ 6
 	octave 4
-	note C#, 1
+	C# 1
 	octave 3
-	note B_, 1
-	note A_, 8
-	note A_, 8
+	B_ 1
+	A_ 8
+	A_ 8
 	octave 4
-	note D_, 4
-	note C#, 4
+	D_ 4
+	C# 4
 	octave 3
-	note B_, 6
-	note A_, 1
-	note B_, 1
+	B_ 6
+	A_ 1
+	B_ 1
 	octave 4
-	note C#, 8
+	C# 8
 	octave 3
-	note A_, 8
+	A_ 8
 	octave 4
-	note D_, 4
-	note C#, 4
+	D_ 4
+	C# 4
 	octave 3
-	note B_, 6
+	B_ 6
 	octave 4
-	note C#, 1
+	C# 1
 	octave 3
-	note B_, 1
-	note A_, 8
-	note B_, 4
+	B_ 1
+	A_ 8
+	B_ 4
 	octave 4
-	note C#, 4
-	note D_, 4
-	note E_, 4
-	note F#, 8
-	note B_, 8
-	note A_, 4
-	note G#, 4
-	note F#, 4
-	note E_, 4
-	note F#, 8
-	note E_, 8
+	C# 4
+	D_ 4
+	E_ 4
+	F# 8
+	B_ 8
+	A_ 4
+	G# 4
+	F# 4
+	E_ 4
+	F# 8
+	E_ 8
 	loopchannel 0, Music_Vermilion_branch_ba66
 
 
@@ -183,102 +183,102 @@ Music_Vermilion_Ch3:: ; baa6 (2:7aa6)
 
 Music_Vermilion_branch_baa8::
 	octave 4
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note F#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note F#, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note B_, 2
-	note E_, 2
-	note A_, 2
-	note E_, 2
-	note G#, 2
-	note E_, 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	A_ 2
+	G# 2
+	F# 2
+	G# 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	A_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	G# 2
+	E_ 2
+	F# 2
+	E_ 2
+	G# 2
+	E_ 2
+	G# 2
+	E_ 2
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	F# 2
+	E_ 2
+	G# 2
+	E_ 2
+	A_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	B_ 2
+	E_ 2
+	A_ 2
+	E_ 2
+	G# 2
+	E_ 2
 	loopchannel 0, Music_Vermilion_branch_baa8
 
 
@@ -287,19 +287,19 @@ Music_Vermilion_Ch4:: ; bb0d (2:7b0d)
 
 Music_Vermilion_branch_bb0e::
 	callchannel Music_Vermilion_branch_bb3f
-	dnote 2, triangle1
-	dnote 1, triangle1
-	dnote 1, triangle1
-	dnote 2, triangle1
-	dnote 1, triangle1
-	dnote 1, triangle1
-	dnote 2, triangle1
-	dnote 1, triangle1
-	dnote 1, triangle1
-	dnote 1, triangle1
-	dnote 1, triangle1
-	dnote 1, triangle1
-	dnote 1, triangle1
+	triangle1 2
+	triangle1 1
+	triangle1 1
+	triangle1 2
+	triangle1 1
+	triangle1 1
+	triangle1 2
+	triangle1 1
+	triangle1 1
+	triangle1 1
+	triangle1 1
+	triangle1 1
+	triangle1 1
 	loopchannel 4, Music_Vermilion_branch_bb0e
 	callchannel Music_Vermilion_branch_bb3f
 	callchannel Music_Vermilion_branch_bb3f
@@ -308,17 +308,17 @@ Music_Vermilion_branch_bb0e::
 	loopchannel 0, Music_Vermilion_branch_bb0e
 
 Music_Vermilion_branch_bb3f::
-	dnote 2, triangle1
-	dnote 1, triangle1
-	dnote 1, triangle1
-	dnote 2, triangle1
-	dnote 1, triangle1
-	dnote 1, triangle1
-	dnote 2, triangle1
-	dnote 1, triangle1
-	dnote 1, triangle1
-	dnote 2, triangle1
-	dnote 1, triangle1
-	dnote 1, triangle1
+	triangle1 2
+	triangle1 1
+	triangle1 1
+	triangle1 2
+	triangle1 1
+	triangle1 1
+	triangle1 2
+	triangle1 1
+	triangle1 1
+	triangle1 2
+	triangle1 1
+	triangle1 1
 	endchannel
-; 0xbb58
\ No newline at end of file
+; 0xbb58
diff --git a/audio/music/wildbattle.asm b/audio/music/wildbattle.asm
index e94c6a07..70ce7d3f 100644
--- a/audio/music/wildbattle.asm
+++ b/audio/music/wildbattle.asm
@@ -6,297 +6,297 @@ Music_WildBattle_Ch1:: ; 23099 (8:7099)
 	toggleperfectpitch
 	notetype 12, 11, 3
 	octave 4
-	note C_, 1
+	C_ 1
 	octave 3
-	note B_, 1
-	note A#, 1
-	note A_, 1
-	note A#, 1
-	note A_, 1
-	note G#, 1
-	note G_, 1
-	note G#, 1
-	note G_, 1
-	note F#, 1
-	note F_, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note C#, 1
-	note C_, 1
+	B_ 1
+	A# 1
+	A_ 1
+	A# 1
+	A_ 1
+	G# 1
+	G_ 1
+	G# 1
+	G_ 1
+	F# 1
+	F_ 1
+	F# 1
+	F_ 1
+	E_ 1
+	D# 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	C# 1
+	C_ 1
 	octave 2
-	note B_, 1
+	B_ 1
 	octave 3
-	note C_, 1
+	C_ 1
 	octave 2
-	note B_, 1
-	note A#, 1
-	note A_, 1
-	note A#, 1
-	note B_, 1
+	B_ 1
+	A# 1
+	A_ 1
+	A# 1
+	B_ 1
 	octave 3
-	note C_, 1
-	note C#, 1
+	C_ 1
+	C# 1
 	notetype 12, 11, 1
-	note G_, 6
-	note E_, 6
-	note D#, 12
-	note C#, 14
-	note E_, 6
-	note D#, 10
+	G_ 6
+	E_ 6
+	D# 12
+	C# 14
+	E_ 6
+	D# 10
 	notetype 12, 4, 15
-	note C#, 10
+	C# 10
 	notetype 12, 11, 1
-	note G_, 6
-	note E_, 6
-	note D#, 12
-	note C#, 14
-	note E_, 6
-	note D#, 10
-	note C#, 10
+	G_ 6
+	E_ 6
+	D# 12
+	C# 14
+	E_ 6
+	D# 10
+	C# 10
 
 Music_WildBattle_branch_230e0::
 	notetype 12, 11, 3
-	note C#, 1
-	note D_, 1
-	note C#, 1
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note C#, 1
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note C_, 1
+	C# 1
+	D_ 1
+	C# 1
+	C_ 1
+	C# 1
+	D_ 1
+	C# 1
+	C_ 1
+	C# 1
+	D_ 1
+	D# 1
+	D_ 1
+	C# 1
+	C_ 1
 	octave 2
-	note B_, 1
+	B_ 1
 	octave 3
-	note C_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
-	note A_, 1
-	note G#, 1
-	note G_, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note G_, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
-	note A_, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
-	note A_, 1
-	note G#, 1
-	note G_, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
-	note A_, 1
-	note G#, 1
-	note G_, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
-	note A_, 1
-	note G#, 1
-	note G_, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note D_, 1
-	note C#, 1
-	note D_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note G_, 1
-	note F#, 1
-	note F_, 1
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note F_, 1
-	note F#, 1
-	note G_, 1
-	note G#, 1
+	C_ 1
+	C# 1
+	D_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	F# 1
+	G_ 1
+	G# 1
+	A_ 1
+	G# 1
+	G_ 1
+	F# 1
+	F_ 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	F# 1
+	G_ 1
+	F# 1
+	F_ 1
+	E_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	F# 1
+	G_ 1
+	G# 1
+	A_ 1
+	D_ 1
+	D# 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	F# 1
+	F_ 1
+	E_ 1
+	D# 1
+	D_ 1
+	D# 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	F# 1
+	F_ 1
+	E_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	F# 1
+	G_ 1
+	G# 1
+	A_ 1
+	G# 1
+	G_ 1
+	F# 1
+	F_ 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	F# 1
+	G_ 1
+	G# 1
+	A_ 1
+	G# 1
+	G_ 1
+	F# 1
+	F_ 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	F# 1
+	G_ 1
+	G# 1
+	A_ 1
+	G# 1
+	G_ 1
+	F# 1
+	F_ 1
+	E_ 1
+	D# 1
+	D_ 1
+	C# 1
+	D_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	F# 1
+	G_ 1
+	F# 1
+	F_ 1
+	E_ 1
+	D# 1
+	E_ 1
+	F_ 1
+	F# 1
+	G_ 1
+	G# 1
 	notetype 12, 11, 5
-	note D_, 4
-	note C_, 4
-	note D_, 4
-	note F_, 4
-	note E_, 6
-	note D_, 6
-	note F_, 4
+	D_ 4
+	C_ 4
+	D_ 4
+	F_ 4
+	E_ 6
+	D_ 6
+	F_ 4
 	notetype 12, 11, 7
-	note A_, 16
-	note G_, 16
+	A_ 16
+	G_ 16
 	notetype 12, 11, 5
-	note D_, 4
-	note C_, 4
-	note D_, 4
-	note F_, 4
-	note G_, 6
-	note A_, 6
-	note B_, 4
+	D_ 4
+	C_ 4
+	D_ 4
+	F_ 4
+	G_ 6
+	A_ 6
+	B_ 4
 	notetype 12, 11, 7
 	octave 4
-	note C_, 16
+	C_ 16
 	notetype 12, 3, 15
-	note G_, 16
+	G_ 16
 	notetype 12, 11, 5
 	octave 3
-	note C_, 12
-	note C_, 2
+	C_ 12
+	C_ 2
 	rest 2
-	note D_, 2
-	note C_, 2
+	D_ 2
+	C_ 2
 	rest 12
-	note C#, 12
-	note C#, 2
+	C# 12
+	C# 2
 	rest 2
-	note F_, 2
+	F_ 2
 	notetype 12, 10, 3
-	note D#, 6
+	D# 6
 	notetype 12, 10, 7
-	note C#, 8
+	C# 8
 	loopchannel 0, Music_WildBattle_branch_230e0
 
 
@@ -305,160 +305,160 @@ Music_WildBattle_Ch2:: ; 231d8 (8:71d8)
 	vibrato 8, 2, 5
 	notetype 12, 12, 3
 	octave 4
-	note G_, 1
-	note F#, 1
-	note F_, 1
+	G_ 1
+	F# 1
+	F_ 1
 	octave 5
-	note G_, 1
+	G_ 1
 	octave 4
-	note G_, 1
-	note F#, 1
-	note F_, 1
+	G_ 1
+	F# 1
+	F_ 1
 	octave 5
-	note G_, 1
+	G_ 1
 	octave 4
-	note G_, 1
-	note F#, 1
-	note F_, 1
+	G_ 1
+	F# 1
+	F_ 1
 	octave 5
-	note G_, 1
+	G_ 1
 	octave 4
-	note G_, 1
-	note F#, 1
-	note F_, 1
+	G_ 1
+	F# 1
+	F_ 1
 	octave 5
-	note G_, 1
+	G_ 1
 	octave 4
-	note G_, 1
-	note F#, 1
-	note F_, 1
+	G_ 1
+	F# 1
+	F_ 1
 	octave 5
-	note G_, 1
+	G_ 1
 	octave 4
-	note G_, 1
-	note F#, 1
-	note F_, 1
+	G_ 1
+	F# 1
+	F_ 1
 	octave 5
-	note G_, 1
+	G_ 1
 	octave 4
-	note G_, 1
-	note F#, 1
-	note F_, 1
+	G_ 1
+	F# 1
+	F_ 1
 	octave 5
-	note G_, 1
+	G_ 1
 	octave 4
-	note G_, 1
-	note F#, 1
-	note F_, 1
+	G_ 1
+	F# 1
+	F_ 1
 	octave 5
-	note G_, 1
+	G_ 1
 	notetype 12, 12, 2
 	octave 4
-	note G_, 6
+	G_ 6
 	octave 3
-	note G_, 6
-	note G_, 12
-	note G_, 14
-	note G_, 6
-	note G_, 10
+	G_ 6
+	G_ 12
+	G_ 14
+	G_ 6
+	G_ 10
 	notetype 12, 9, 0
-	note F#, 10
+	F# 10
 	notetype 12, 12, 2
-	note G_, 6
-	note G_, 6
-	note G_, 12
-	note G_, 14
-	note G_, 6
-	note G_, 10
-	note G_, 10
+	G_ 6
+	G_ 6
+	G_ 12
+	G_ 14
+	G_ 6
+	G_ 10
+	G_ 10
 
 Music_WildBattle_branch_23225::
 	notetype 12, 12, 5
-	note G_, 6
-	note F#, 6
-	note E_, 4
-	note G_, 6
-	note A_, 6
-	note G_, 4
+	G_ 6
+	F# 6
+	E_ 4
+	G_ 6
+	A_ 6
+	G_ 4
 	octave 4
-	note G#, 12
-	note G_, 2
+	G# 12
+	G_ 2
 	rest 2
-	note G#, 2
-	note G_, 2
+	G# 2
+	G_ 2
 	rest 4
 	notetype 12, 11, 7
 	octave 5
-	note C#, 8
+	C# 8
 	notetype 12, 12, 5
 	octave 4
-	note C_, 6
+	C_ 6
 	octave 3
-	note A#, 6
-	note G#, 4
+	A# 6
+	G# 4
 	octave 4
-	note C#, 6
-	note C_, 6
+	C# 6
+	C_ 6
 	octave 3
-	note A#, 4
+	A# 4
 	octave 4
-	note F_, 6
-	note E_, 6
-	note D_, 4
+	F_ 6
+	E_ 6
+	D_ 4
 	notetype 12, 12, 7
 	octave 3
-	note A#, 4
+	A# 4
 	octave 4
-	note C_, 4
-	note D_, 4
-	note F_, 4
+	C_ 4
+	D_ 4
+	F_ 4
 	notetype 12, 12, 0
-	note G#, 16
+	G# 16
 	notetype 12, 11, 0
-	note G#, 16
+	G# 16
 	notetype 12, 4, 14
-	note G_, 16
+	G_ 16
 	notetype 12, 12, 7
-	note G_, 16
+	G_ 16
 	octave 3
-	note F_, 8
-	note A#, 8
+	F_ 8
+	A# 8
 	octave 4
-	note D_, 8
-	note F_, 8
+	D_ 8
+	F_ 8
 	notetype 12, 12, 0
-	note E_, 16
+	E_ 16
 	notetype 12, 12, 7
-	note E_, 16
+	E_ 16
 	octave 3
-	note F_, 8
-	note A#, 8
+	F_ 8
+	A# 8
 	octave 4
-	note D_, 8
-	note F_, 8
+	D_ 8
+	F_ 8
 	notetype 12, 12, 0
-	note G_, 16
+	G_ 16
 	notetype 12, 3, 15
 	octave 5
-	note C_, 16
+	C_ 16
 	notetype 12, 12, 5
 	octave 4
-	note E_, 12
-	note E_, 2
+	E_ 12
+	E_ 2
 	rest 2
-	note F_, 2
+	F_ 2
 	notetype 12, 12, 1
-	note E_, 4
+	E_ 4
 	notetype 12, 12, 5
 	rest 10
-	note F_, 12
-	note F_, 2
+	F_ 12
+	F_ 2
 	rest 2
-	note G#, 2
+	G# 2
 	notetype 12, 10, 3
-	note G_, 6
+	G_ 6
 	notetype 12, 12, 7
-	note F_, 8
+	F_ 8
 	loopchannel 0, Music_WildBattle_branch_23225
 
 
@@ -466,274 +466,274 @@ Music_WildBattle_Ch3:: ; 23290 (8:7290)
 	vibrato 0, 2, 0
 	notetype 12, 1, 1
 	octave 4
-	note C#, 1
+	C# 1
 	rest 1
-	note C#, 1
-	note C_, 1
-	note D_, 1
+	C# 1
+	C_ 1
+	D_ 1
 	rest 1
-	note D_, 1
-	note C_, 1
-	note D#, 1
+	D_ 1
+	C_ 1
+	D# 1
 	rest 1
-	note D#, 1
-	note C_, 1
-	note E_, 1
+	D# 1
+	C_ 1
+	E_ 1
 	rest 1
-	note E_, 1
-	note C_, 1
-	note F_, 1
+	E_ 1
+	C_ 1
+	F_ 1
 	rest 1
-	note F_, 1
-	note C_, 1
-	note F#, 1
+	F_ 1
+	C_ 1
+	F# 1
 	rest 1
-	note F#, 1
-	note C_, 1
-	note G_, 1
+	F# 1
+	C_ 1
+	G_ 1
 	rest 1
-	note G_, 1
-	note C_, 1
+	G_ 1
+	C_ 1
 	octave 3
-	note A#, 2
-	note B_, 2
+	A# 2
+	B_ 2
 
 Music_WildBattle_branch_232b5::
 	octave 4
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C#, 2
-	note G#, 2
-	note C#, 4
-	note G#, 2
-	note A#, 2
-	note G#, 2
-	note G_, 2
-	note C#, 2
-	note G#, 2
-	note C#, 4
-	note G#, 2
-	note A#, 2
-	note G#, 2
-	note F_, 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C# 2
+	G# 2
+	C# 4
+	G# 2
+	A# 2
+	G# 2
+	G_ 2
+	C# 2
+	G# 2
+	C# 4
+	G# 2
+	A# 2
+	G# 2
+	F_ 2
 	loopchannel 2, Music_WildBattle_branch_232b5
 
 Music_WildBattle_branch_232d8::
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note G#, 12
-	note G_, 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	G# 12
+	G_ 2
 	rest 2
-	note G#, 2
-	note G_, 2
+	G# 2
+	G_ 2
 	rest 4
-	note F_, 2
-	note E_, 2
-	note D_, 2
-	note C#, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
+	F_ 2
+	E_ 2
+	D_ 2
+	C# 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C# 2
+	G# 2
+	C# 2
+	G# 2
+	C# 2
+	G# 2
+	C# 2
+	G# 2
+	C# 2
+	G# 2
+	C# 2
+	G# 2
+	C# 2
+	G# 2
+	C# 2
+	G# 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
 	octave 3
-	note A#, 2
+	A# 2
 	octave 4
-	note F_, 2
+	F_ 2
 	octave 3
-	note A#, 2
+	A# 2
 	octave 4
-	note F_, 2
+	F_ 2
 	octave 3
-	note A#, 2
+	A# 2
 	octave 4
-	note F_, 2
+	F_ 2
 	octave 3
-	note A#, 2
+	A# 2
 	octave 4
-	note F_, 2
+	F_ 2
 	octave 3
-	note A#, 2
+	A# 2
 	octave 4
-	note F_, 2
+	F_ 2
 	octave 3
-	note A#, 2
+	A# 2
 	octave 4
-	note F_, 2
+	F_ 2
 	octave 3
-	note A#, 2
+	A# 2
 	octave 4
-	note F_, 2
+	F_ 2
 	octave 3
-	note A#, 2
+	A# 2
 	octave 4
-	note F_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note F_, 2
-	note C_, 2
-	note F_, 2
-	note C_, 2
-	note F_, 2
-	note C_, 2
-	note F_, 2
-	note C_, 2
-	note F_, 2
-	note C_, 2
-	note F_, 2
-	note C_, 2
-	note F_, 2
-	note C_, 2
-	note F_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C_, 2
-	note G_, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
-	note C#, 2
-	note G#, 2
+	F_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	F_ 2
+	C_ 2
+	F_ 2
+	C_ 2
+	F_ 2
+	C_ 2
+	F_ 2
+	C_ 2
+	F_ 2
+	C_ 2
+	F_ 2
+	C_ 2
+	F_ 2
+	C_ 2
+	F_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C_ 2
+	G_ 2
+	C# 2
+	G# 2
+	C# 2
+	G# 2
+	C# 2
+	G# 2
+	C# 2
+	G# 2
+	C# 2
+	G# 2
+	C# 2
+	G# 2
+	C# 2
+	G# 2
+	C# 2
+	G# 2
 	loopchannel 0, Music_WildBattle_branch_232d8
-; 0x233a6
\ No newline at end of file
+; 0x233a6
diff --git a/audio/music/yellow/meetjessiejames.asm b/audio/music/yellow/meetjessiejames.asm
index cd749f91..5ef52491 100644
--- a/audio/music/yellow/meetjessiejames.asm
+++ b/audio/music/yellow/meetjessiejames.asm
@@ -1,310 +1,310 @@
-Music_MeetJessieJames_Ch1: ; 8316d (20:716d)
+Music_MeetJessieJames_Ch1:: ; 8316d (20:716d)
 	tempo 144
 	volume 7, 7
 	duty 3
 	vibrato 8, 1, 4
 	notetype 12, 11, 2
 	octave 3
-	note G#, 1
-	note G_, 1
-	note F#, 2
-	note F_, 2
-	note E_, 2
-	note D#, 2
-	note D_, 2
-	note C#, 2
-	note C_, 2
+	G# 1
+	G_ 1
+	F# 2
+	F_ 2
+	E_ 2
+	D# 2
+	D_ 2
+	C# 2
+	C_ 2
 	notetype 12, 11, 6
-	note D#, 12
-	note C_, 4
+	D# 12
+	C_ 4
 
-Music_MeetJessieJames_branch_83187:
+Music_MeetJessieJames_branch_83187::
 	notetype 12, 11, 2
 	octave 4
-	note D_, 16
+	D_ 16
 	rest 12
 	notetype 12, 11, 4
 	octave 3
-	note A#, 4
+	A# 4
 	rest 16
 	rest 8
 	notetype 12, 11, 2
 	octave 2
-	note A_, 2
+	A_ 2
 	octave 3
-	note A#, 2
-	note A_, 4
-	note D_, 1
-	note D#, 1
-	note D#, 2
-	note D#, 2
-	note D_, 2
-	note D#, 2
-	note D_, 2
-	note D#, 2
-	note F_, 2
-	note D_, 1
-	note D#, 1
-	note D#, 2
-	note D#, 2
-	note D_, 2
+	A# 2
+	A_ 4
+	D_ 1
+	D# 1
+	D# 2
+	D# 2
+	D_ 2
+	D# 2
+	D_ 2
+	D# 2
+	F_ 2
+	D_ 1
+	D# 1
+	D# 2
+	D# 2
+	D_ 2
 	octave 2
-	note A#, 4
+	A# 4
 	notetype 12, 11, 4
 	octave 3
-	note B_, 4
+	B_ 4
 	notetype 12, 11, 2
-	note D_, 1
-	note D#, 1
-	note D#, 2
-	note D#, 2
-	note D_, 2
-	note D#, 2
-	note D_, 2
-	note D#, 2
-	note F_, 2
-	note D_, 1
-	note D#, 1
-	note D#, 2
-	note D#, 2
-	note D_, 2
+	D_ 1
+	D# 1
+	D# 2
+	D# 2
+	D_ 2
+	D# 2
+	D_ 2
+	D# 2
+	F_ 2
+	D_ 1
+	D# 1
+	D# 2
+	D# 2
+	D_ 2
 	octave 2
-	note A#, 2
+	A# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	notetype 12, 11, 4
-	note A#, 4
+	A# 4
 	loopchannel 0, Music_MeetJessieJames_branch_83187
 
 
-Music_MeetJessieJames_Ch2: ; 831c8 (20:71c8)
+Music_MeetJessieJames_Ch2:: ; 831c8 (20:71c8)
 	duty 3
 	vibrato 6, 1, 5
 	notetype 12, 12, 2
 	octave 4
-	note D_, 1
-	note C#, 1
-	note C_, 2
+	D_ 1
+	C# 1
+	C_ 2
 	octave 3
-	note B_, 2
-	note A#, 2
-	note A_, 2
-	note G#, 2
-	note G_, 2
-	note F#, 2
+	B_ 2
+	A# 2
+	A_ 2
+	G# 2
+	G_ 2
+	F# 2
 	notetype 12, 12, 7
-	note A_, 12
+	A_ 12
 	octave 4
-	note C#, 4
+	C# 4
 
-Music_MeetJessieJames_branch_831df:
+Music_MeetJessieJames_branch_831df::
 	notetype 12, 12, 2
 	octave 3
-	note C#, 1
-	note D_, 1
-	note D_, 2
-	note D_, 2
-	note C#, 2
-	note D_, 2
-	note C#, 2
-	note D_, 2
-	note E_, 2
-	note C#, 1
-	note D_, 1
-	note D_, 2
-	note D_, 2
-	note C#, 2
+	C# 1
+	D_ 1
+	D_ 2
+	D_ 2
+	C# 2
+	D_ 2
+	C# 2
+	D_ 2
+	E_ 2
+	C# 1
+	D_ 1
+	D_ 2
+	D_ 2
+	C# 2
 	octave 2
-	note A_, 4
+	A_ 4
 	notetype 12, 12, 5
 	octave 4
-	note C#, 4
+	C# 4
 	notetype 12, 12, 2
-	note D_, 1
+	D_ 1
 	octave 3
-	note D_, 1
-	note D_, 2
-	note D_, 2
-	note C#, 2
-	note D_, 2
-	note C#, 2
-	note D_, 2
-	note E_, 2
-	note C#, 1
-	note D_, 1
-	note D_, 2
-	note D_, 2
-	note C#, 2
+	D_ 1
+	D_ 2
+	D_ 2
+	C# 2
+	D_ 2
+	C# 2
+	D_ 2
+	E_ 2
+	C# 1
+	D_ 1
+	D_ 2
+	D_ 2
+	C# 2
 	notetype 12, 12, 6
 	octave 4
-	note D_, 8
+	D_ 8
 	notetype 12, 12, 2
-	note D#, 6
-	note F_, 4
-	note D#, 4
+	D# 6
+	F_ 4
+	D# 4
 	octave 3
-	note A#, 2
+	A# 2
 	octave 4
-	note D#, 6
-	note F_, 4
-	note D#, 2
+	D# 6
+	F_ 4
+	D# 2
 	notetype 12, 12, 5
-	note D_, 4
+	D_ 4
 	notetype 12, 12, 2
-	note D#, 6
-	note F_, 4
-	note D#, 4
+	D# 6
+	F_ 4
+	D# 4
 	octave 3
-	note A#, 2
+	A# 2
 	octave 4
-	note D#, 4
-	note F_, 4
+	D# 4
+	F_ 4
 	notetype 12, 12, 5
-	note D#, 8
+	D# 8
 	loopchannel 0, Music_MeetJessieJames_branch_831df
 
 
-Music_MeetJessieJames_Ch3: ; 8322a (20:722a)
+Music_MeetJessieJames_Ch3:: ; 8322a (20:722a)
 	notetype 12, 1, 0
 	rest 16
 	rest 8
 	octave 4
-	note D_, 2
+	D_ 2
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note C_, 2
-	note D#, 2
+	C_ 2
+	D# 2
 
-Music_MeetJessieJames_branch_83235:
-	note D_, 1
+Music_MeetJessieJames_branch_83235::
+	D_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A#, 2
-	note A_, 2
-	note D#, 2
-	note D_, 1
+	A# 2
+	A_ 2
+	D# 2
+	D_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
 	octave 3
-	note A_, 2
+	A_ 2
 	octave 4
-	note C_, 2
-	note D_, 2
-	note D#, 1
+	C_ 2
+	D_ 2
+	D# 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
 	octave 3
-	note A#, 1
+	A# 1
 	rest 1
 	octave 4
-	note C#, 1
+	C# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note A#, 1
+	A# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
 	octave 3
-	note A#, 1
+	A# 1
 	rest 1
 	octave 4
-	note C#, 1
+	C# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
 	loopchannel 0, Music_MeetJessieJames_branch_83235
 	endchannel
-; 0x832ba
\ No newline at end of file
+; 0x832ba
diff --git a/audio/music/yellow/surfingpikachu.asm b/audio/music/yellow/surfingpikachu.asm
index 632da3c5..1832bb03 100644
--- a/audio/music/yellow/surfingpikachu.asm
+++ b/audio/music/yellow/surfingpikachu.asm
@@ -1,691 +1,691 @@
-Music_SurfingPikachu_Ch1: ; 82ce8 (20:6ce8)
+Music_SurfingPikachu_Ch1:: ; 82ce8 (20:6ce8)
 	tempo 117
 	volume 7, 7
 	duty 3
 	vibrato 8, 1, 4
 	notetype 12, 11, 3
 	octave 3
-	note E_, 6
+	E_ 6
 	notetype 12, 11, 2
-	note F#, 2
+	F# 2
 	notetype 12, 11, 3
-	note E_, 6
+	E_ 6
 	notetype 12, 11, 2
-	note F#, 16
+	F# 16
 	rest 2
 	notetype 12, 11, 3
-	note E_, 6
+	E_ 6
 	notetype 12, 11, 2
-	note A_, 2
+	A_ 2
 	notetype 12, 11, 3
-	note E_, 6
+	E_ 6
 	notetype 12, 11, 2
-	note A_, 14
+	A_ 14
 	notetype 12, 11, 2
-	note D#, 2
-	note C#, 1
-	note D#, 1
+	D# 2
+	C# 1
+	D# 1
 	octave 2
-	note B_, 6
-	octave 3
-	note E_, 4
-	note E_, 4
-	note E_, 8
-	note G#, 4
-	note G#, 4
-	note G#, 2
+	B_ 6
+	octave 3
+	E_ 4
+	E_ 4
+	E_ 8
+	G# 4
+	G# 4
+	G# 2
 
-Music_SurfingPikachu_branch_82d1a:
+Music_SurfingPikachu_branch_82d1a::
 	notetype 12, 11, 3
 	octave 3
-	note G#, 4
-	note E_, 4
-	note F#, 4
-	note E_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note D#, 2
-	note E_, 2
-	note D#, 2
-	note C#, 6
-	note F#, 2
-	note A_, 8
+	G# 4
+	E_ 4
+	F# 4
+	E_ 2
+	A_ 2
+	G# 2
+	F# 2
+	G# 2
+	F# 2
+	E_ 2
+	D# 2
+	E_ 2
+	D# 2
+	C# 6
+	F# 2
+	A_ 8
 	octave 2
-	note B_, 6
-	octave 3
-	note E_, 2
-	note G#, 8
-	note G#, 4
-	note E_, 4
-	note F#, 4
-	note E_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note G#, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note G#, 2
-	note F#, 6
-	note E_, 2
-	note F#, 1
+	B_ 6
+	octave 3
+	E_ 2
+	G# 8
+	G# 4
+	E_ 4
+	F# 4
+	E_ 2
+	A_ 2
+	G# 2
+	F# 2
+	G# 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	G# 2
+	F# 6
+	E_ 2
+	F# 1
 	rest 3
-	note A_, 4
+	A_ 4
 	duty 0
 	notetype 12, 11, 2
-	note G#, 1
-	note F#, 1
-	note G#, 2
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note E_, 2
-	note D#, 2
-	note F#, 2
-	note F#, 2
-	note D#, 2
-	note F#, 2
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note B_, 1
-	note A#, 1
-	note B_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note G_, 2
-	note G#, 2
-	note A_, 2
-	octave 4
-	note C#, 2
-	note C_, 2
-	note C#, 3
-	octave 3
-	note F#, 1
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note A_, 2
-	note E_, 3
-	note E_, 1
-	note B_, 2
-	note A_, 2
-	note G#, 6
-	note E_, 1
-	note F_, 1
-	note F#, 2
-	note F#, 2
-	note D#, 2
-	note F#, 2
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note B_, 1
-	note A#, 1
-	note B_, 2
-	note G#, 2
-	note E_, 2
-	note G#, 2
-	note G_, 2
-	note G#, 2
-	note A_, 2
-	octave 4
-	note C#, 2
-	note C_, 2
-	note C#, 3
-	octave 3
-	note F#, 1
-	note A_, 2
-	note G#, 2
-	note A_, 2
-	octave 4
-	note D#, 2
-	note E_, 2
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note E_, 1
-	note D#, 1
-	note E_, 8
+	G# 1
+	F# 1
+	G# 2
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	E_ 2
+	D# 2
+	F# 2
+	F# 2
+	D# 2
+	F# 2
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	B_ 1
+	A# 1
+	B_ 2
+	G# 2
+	E_ 2
+	G# 2
+	G_ 2
+	G# 2
+	A_ 2
+	octave 4
+	C# 2
+	C_ 2
+	C# 3
+	octave 3
+	F# 1
+	A_ 2
+	G# 2
+	F# 2
+	A_ 2
+	E_ 3
+	E_ 1
+	B_ 2
+	A_ 2
+	G# 6
+	E_ 1
+	F_ 1
+	F# 2
+	F# 2
+	D# 2
+	F# 2
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
+	B_ 1
+	A# 1
+	B_ 2
+	G# 2
+	E_ 2
+	G# 2
+	G_ 2
+	G# 2
+	A_ 2
+	octave 4
+	C# 2
+	C_ 2
+	C# 3
+	octave 3
+	F# 1
+	A_ 2
+	G# 2
+	A_ 2
+	octave 4
+	D# 2
+	E_ 2
+	E_ 1
+	D# 1
+	E_ 1
+	D# 1
+	E_ 1
+	D# 1
+	E_ 8
 	duty 3
 	loopchannel 0, Music_SurfingPikachu_branch_82d1a
 
 
-Music_SurfingPikachu_Ch2: ; 82d9d (20:6d9d)
+Music_SurfingPikachu_Ch2:: ; 82d9d (20:6d9d)
 	duty 3
 	vibrato 6, 1, 5
 	notetype 12, 12, 4
 	octave 3
-	note B_, 6
+	B_ 6
 	notetype 12, 12, 2
 	octave 4
-	note E_, 2
+	E_ 2
 	notetype 12, 12, 4
 	octave 3
-	note B_, 6
+	B_ 6
 	notetype 12, 12, 2
 	octave 4
-	note E_, 2
+	E_ 2
 	notetype 12, 11, 2
 	octave 3
-	note B_, 2
+	B_ 2
 	octave 4
-	note C#, 2
-	note D#, 2
-	note C#, 2
+	C# 2
+	D# 2
+	C# 2
 	octave 3
-	note B_, 2
-	note A_, 2
-	note G#, 2
-	note F#, 2
+	B_ 2
+	A_ 2
+	G# 2
+	F# 2
 	notetype 12, 12, 4
 	octave 4
-	note C#, 6
+	C# 6
 	notetype 12, 12, 2
-	note F#, 2
+	F# 2
 	notetype 12, 12, 4
-	note C#, 6
+	C# 6
 	notetype 12, 12, 2
-	note F#, 2
+	F# 2
 	notetype 12, 11, 2
-	note C#, 2
-	note D#, 2
-	note E_, 2
-	note D#, 2
-	note C#, 2
-	octave 3
-	note B_, 2
-	note A_, 2
-	note G#, 2
+	C# 2
+	D# 2
+	E_ 2
+	D# 2
+	C# 2
+	octave 3
+	B_ 2
+	A_ 2
+	G# 2
 	notetype 12, 12, 2
-	note E_, 6
-	note B_, 4
-	note B_, 4
-	note B_, 8
-	note B_, 4
-	note B_, 4
-	note B_, 2
+	E_ 6
+	B_ 4
+	B_ 4
+	B_ 8
+	B_ 4
+	B_ 4
+	B_ 2
 
-Music_SurfingPikachu_branch_82de0:
+Music_SurfingPikachu_branch_82de0::
 	notetype 12, 12, 6
 	octave 4
-	note E_, 4
+	E_ 4
 	octave 3
-	note B_, 4
-	note A_, 4
+	B_ 4
+	A_ 4
 	octave 4
-	note C#, 4
+	C# 4
 	octave 3
-	note B_, 6
-	note A_, 2
-	note G#, 8
-	note F#, 6
-	note A_, 2
+	B_ 6
+	A_ 2
+	G# 8
+	F# 6
+	A_ 2
 	octave 4
-	note C#, 8
+	C# 8
 	octave 3
-	note E_, 6
-	note G#, 2
-	note B_, 8
+	E_ 6
+	G# 2
+	B_ 8
 	octave 4
-	note E_, 4
+	E_ 4
 	octave 3
-	note B_, 4
-	note A_, 4
+	B_ 4
+	A_ 4
 	octave 4
-	note C#, 4
+	C# 4
 	octave 3
-	note B_, 6
+	B_ 6
 	octave 4
-	note D#, 2
-	note E_, 8
-	note D#, 6
-	note C#, 2
-	note D#, 1
+	D# 2
+	E_ 8
+	D# 6
+	C# 2
+	D# 1
 	rest 3
-	note F#, 4
-	note E_, 10
+	F# 4
+	E_ 10
 	notetype 12, 12, 6
 	duty 2
-	note E_, 2
-	note D#, 2
-	note C#, 2
-	octave 3
-	note B_, 6
-	octave 4
-	note C#, 2
-	note D#, 4
-	octave 3
-	note B_, 4
-	octave 4
-	note E_, 6
-	note F#, 2
-	note G#, 8
-	note A_, 6
-	note G#, 2
-	note A_, 4
-	note F#, 4
-	note G#, 10
-	note E_, 2
-	note D#, 2
-	note C#, 2
-	octave 3
-	note B_, 6
-	octave 4
-	note C#, 2
-	note D#, 4
-	octave 3
-	note B_, 4
-	octave 4
-	note E_, 6
-	note F#, 2
-	note G#, 8
-	note A_, 4
-	note F#, 4
-	note D#, 4
+	E_ 2
+	D# 2
+	C# 2
+	octave 3
+	B_ 6
+	octave 4
+	C# 2
+	D# 4
+	octave 3
+	B_ 4
+	octave 4
+	E_ 6
+	F# 2
+	G# 8
+	A_ 6
+	G# 2
+	A_ 4
+	F# 4
+	G# 10
+	E_ 2
+	D# 2
+	C# 2
+	octave 3
+	B_ 6
+	octave 4
+	C# 2
+	D# 4
+	octave 3
+	B_ 4
+	octave 4
+	E_ 6
+	F# 2
+	G# 8
+	A_ 4
+	F# 4
+	D# 4
 	octave 5
-	note C#, 4
+	C# 4
 	octave 4
-	note B_, 8
+	B_ 8
 	notetype 12, 12, 2
 	octave 5
-	note E_, 4
+	E_ 4
 	notetype 12, 12, 6
 	duty 3
 	octave 3
-	note B_, 1
-	note A#, 1
-	note B_, 1
+	B_ 1
+	A# 1
+	B_ 1
 	octave 4
-	note C#, 1
+	C# 1
 	loopchannel 0, Music_SurfingPikachu_branch_82de0
 
 
-Music_SurfingPikachu_Ch3: ; 82e45 (20:6e45)
+Music_SurfingPikachu_Ch3:: ; 82e45 (20:6e45)
 	notetype 12, 1, 0
 	octave 4
-	note B_, 6
+	B_ 6
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note B_, 6
+	B_ 6
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note A_, 6
+	A_ 6
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note A_, 6
+	A_ 6
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note A_, 1
+	A_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note C#, 1
+	C# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
 
-Music_SurfingPikachu_branch_82ea0:
-	note E_, 1
+Music_SurfingPikachu_branch_82ea0::
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
 	octave 5
-	note C#, 1
-	note C_, 1
-	note C#, 1
+	C# 1
+	C_ 1
+	C# 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 5
-	note E_, 1
-	note D#, 1
-	note E_, 1
+	E_ 1
+	D# 1
+	E_ 1
 	rest 1
 	octave 4
-	note D#, 1
+	D# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note C#, 1
+	C# 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note G#, 1
+	G# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note G#, 1
+	G# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note B_, 1
-	note A#, 1
-	note B_, 1
+	B_ 1
+	A# 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note C#, 1
+	C# 1
 	rest 1
-	note D_, 1
+	D_ 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note G#, 1
+	G# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note G#, 1
+	G# 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note C#, 1
+	C# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
 	loopchannel 0, Music_SurfingPikachu_branch_82ea0
-; 0x82fbe
\ No newline at end of file
+; 0x82fbe
diff --git a/audio/music/yellow/yellowintro.asm b/audio/music/yellow/yellowintro.asm
index a5e1ba24..4d9cf938 100644
--- a/audio/music/yellow/yellowintro.asm
+++ b/audio/music/yellow/yellowintro.asm
@@ -1,485 +1,485 @@
-Music_YellowIntro_Ch1: ; 7f65c (1f:765c)
+Music_YellowIntro_Ch1:: ; 7f65c (1f:765c)
 	tempo 116
 	volume 7, 7
 	duty 3
 	vibrato 8, 1, 4
 	notetype 12, 11, 2
 	octave 3
-	note G#, 2
-	note B_, 4
-	note B_, 4
-	note B_, 4
-	note B_, 4
-	note B_, 4
-	note B_, 3
-	note A#, 1
-	note B_, 2
-	note B_, 10
+	G# 2
+	B_ 4
+	B_ 4
+	B_ 4
+	B_ 4
+	B_ 4
+	B_ 3
+	A# 1
+	B_ 2
+	B_ 10
 	notetype 12, 11, 6
 	octave 4
-	note C#, 1
-	note C_, 1
-	note C#, 10
+	C# 1
+	C_ 1
+	C# 10
 	octave 3
-	note G#, 1
-	note G_, 1
-	note G#, 4
-	note B_, 4
-	octave 4
-	note E_, 4
-	note F#, 8
-	note E_, 8
+	G# 1
+	G_ 1
+	G# 4
+	B_ 4
+	octave 4
+	E_ 4
+	F# 8
+	E_ 8
 	octave 3
-	note A_, 4
-	note B_, 4
+	A_ 4
+	B_ 4
 	octave 4
-	note C#, 4
+	C# 4
 	octave 3
-	note B_, 4
-	note G#, 6
+	B_ 4
+	G# 6
 	notetype 12, 11, 2
-	note B_, 2
+	B_ 2
 	notetype 12, 11, 6
-	note G#, 6
+	G# 6
 	notetype 12, 11, 2
-	note B_, 2
+	B_ 2
 	notetype 12, 11, 6
 	octave 4
-	note E_, 6
+	E_ 6
 	notetype 12, 11, 2
-	note G#, 2
+	G# 2
 	notetype 12, 11, 6
-	note E_, 6
+	E_ 6
 	notetype 12, 11, 2
-	note G#, 2
+	G# 2
 	notetype 12, 11, 6
 	octave 3
-	note A_, 4
-	note F#, 4
-	note A_, 4
-	note B_, 4
-	note F#, 4
-	note G#, 4
-	note A_, 2
-	note G#, 2
-	note F#, 2
-	note D#, 2
+	A_ 4
+	F# 4
+	A_ 4
+	B_ 4
+	F# 4
+	G# 4
+	A_ 2
+	G# 2
+	F# 2
+	D# 2
 	notetype 12, 11, 3
-	note B_, 2
-	octave 4
-	note E_, 4
-	note E_, 4
-	note E_, 4
-	note E_, 2
-	note C#, 2
-	note F#, 4
-	note F#, 3
-	note D#, 1
-	note F#, 2
-	note F#, 8
+	B_ 2
+	octave 4
+	E_ 4
+	E_ 4
+	E_ 4
+	E_ 2
+	C# 2
+	F# 4
+	F# 3
+	D# 1
+	F# 2
+	F# 8
 	notetype 12, 11, 6
-	note F#, 1
-	note F_, 1
-	note F#, 8
+	F# 1
+	F_ 1
+	F# 8
 	octave 3
-	note B_, 1
-	note A#, 1
-	note B_, 8
+	B_ 1
+	A# 1
+	B_ 8
 	octave 4
-	note F#, 1
-	note F_, 1
-	note F#, 2
+	F# 1
+	F_ 1
+	F# 2
 	notetype 12, 11, 3
-	note F#, 1
-	note E_, 1
-	note D#, 1
-	note C#, 1
+	F# 1
+	E_ 1
+	D# 1
+	C# 1
 	notetype 12, 11, 2
 	octave 3
-	note B_, 16
+	B_ 16
 	endchannel
 
 
-Music_YellowIntro_Ch2: ; 7f6d3 (1f:76d3)
+Music_YellowIntro_Ch2:: ; 7f6d3 (1f:76d3)
 	duty 2
 	vibrato 6, 1, 5
 	notetype 12, 12, 2
 	octave 3
-	note B_, 2
-	octave 4
-	note E_, 4
-	note E_, 4
-	note E_, 4
-	note E_, 4
-	note E_, 4
-	note E_, 3
-	note D#, 1
-	note E_, 2
-	note E_, 4
+	B_ 2
+	octave 4
+	E_ 4
+	E_ 4
+	E_ 4
+	E_ 4
+	E_ 4
+	E_ 3
+	D# 1
+	E_ 2
+	E_ 4
 	notetype 12, 12, 5
-	note G#, 1
-	note G_, 1
-	note G#, 10
+	G# 1
+	G_ 1
+	G# 10
 	octave 3
-	note B_, 1
-	note A#, 1
-	note B_, 6
+	B_ 1
+	A# 1
+	B_ 6
 	notetype 12, 12, 7
 	octave 4
-	note E_, 4
-	note G#, 4
-	note B_, 4
+	E_ 4
+	G# 4
+	B_ 4
 	octave 5
-	note C#, 16
+	C# 16
 	octave 4
-	note A_, 4
-	note G#, 4
-	note F#, 4
-	note E_, 4
+	A_ 4
+	G# 4
+	F# 4
+	E_ 4
 	octave 3
-	note B_, 6
+	B_ 6
 	notetype 12, 12, 2
 	octave 4
-	note E_, 2
+	E_ 2
 	notetype 12, 12, 7
 	octave 3
-	note B_, 6
+	B_ 6
 	notetype 12, 12, 2
 	octave 4
-	note E_, 2
+	E_ 2
 	notetype 12, 12, 7
-	note G#, 6
+	G# 6
 	notetype 12, 12, 2
-	note B_, 2
+	B_ 2
 	notetype 12, 12, 7
-	note G#, 6
+	G# 6
 	notetype 12, 12, 2
-	note B_, 2
+	B_ 2
 	notetype 12, 12, 7
-	note C#, 4
+	C# 4
 	octave 3
-	note A_, 4
-	octave 4
-	note C#, 4
-	note D#, 4
-	note E_, 2
-	note D#, 2
-	note C#, 2
-	note D#, 4
-	note D#, 2
-	note C#, 2
+	A_ 4
+	octave 4
+	C# 4
+	D# 4
+	E_ 2
+	D# 2
+	C# 2
+	D# 4
+	D# 2
+	C# 2
 	octave 3
-	note B_, 2
+	B_ 2
 	notetype 12, 12, 3
 	octave 4
-	note E_, 2
-	note G#, 4
-	note G#, 4
-	note G#, 4
-	note G#, 2
-	note F#, 2
-	note A_, 4
-	note A_, 3
-	note F#, 1
-	note A_, 2
-	note A_, 4
+	E_ 2
+	G# 4
+	G# 4
+	G# 4
+	G# 2
+	F# 2
+	A_ 4
+	A_ 3
+	F# 1
+	A_ 2
+	A_ 4
 	notetype 12, 12, 7
-	note B_, 1
-	note A#, 1
-	note B_, 8
-	note B_, 1
-	note A#, 1
-	note B_, 8
-	note B_, 1
-	note A#, 1
-	note B_, 6
+	B_ 1
+	A# 1
+	B_ 8
+	B_ 1
+	A# 1
+	B_ 8
+	B_ 1
+	A# 1
+	B_ 6
 	notetype 12, 12, 3
-	note B_, 1
-	note A_, 1
-	note G#, 1
-	note F#, 1
+	B_ 1
+	A_ 1
+	G# 1
+	F# 1
 	notetype 12, 12, 2
-	note E_, 16
+	E_ 16
 	endchannel
 
 
-Music_YellowIntro_Ch3: ; 7f749 (1f:7749)
+Music_YellowIntro_Ch3:: ; 7f749 (1f:7749)
 	notetype 12, 1, 0
 	octave 4
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note G#, 1
+	G# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note G#, 1
+	G# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note G#, 1
+	G# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 3
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 4
-	note C#, 1
+	C# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note F#, 1
+	F# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note C#, 1
+	C# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 5
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 4
-	note G#, 1
+	G# 1
 	rest 1
 	octave 5
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 5
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 4
-	note G#, 1
+	G# 1
 	rest 1
 	octave 5
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 4
-	note G#, 1
+	G# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 1
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note G#, 1
+	G# 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 4
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 5
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 4
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 4
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 5
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 4
-	note A_, 1
+	A_ 1
 	rest 1
 	octave 5
-	note F#, 1
+	F# 1
 	rest 1
 	octave 4
-	note F#, 1
+	F# 1
 	rest 1
 	octave 5
-	note C#, 1
+	C# 1
 	rest 3
-	note F#, 1
+	F# 1
 	rest 1
 	octave 4
-	note F#, 1
-	note G#, 1
-	note A_, 1
+	F# 1
+	G# 1
+	A_ 1
 	octave 5
-	note C#, 1
-	note E_, 1
+	C# 1
+	E_ 1
 	rest 15
 	endchannel
-; 0x7f860
\ No newline at end of file
+; 0x7f860
diff --git a/audio/music/yellow/yellowunusedsong.asm b/audio/music/yellow/yellowunusedsong.asm
index 0198c17e..e8c2a7ba 100644
--- a/audio/music/yellow/yellowunusedsong.asm
+++ b/audio/music/yellow/yellowunusedsong.asm
@@ -1,51 +1,51 @@
-Music_YellowUnusedSong_Ch1: ; 82fbe (20:6fbe)
+Music_YellowUnusedSong_Ch1:: ; 82fbe (20:6fbe)
 	tempo 140
 	volume 7, 7
 	duty 3
 	vibrato 8, 1, 4
 	notetype 8, 11, 2
 	octave 3
-	note A_, 6
-	note A_, 2
-	note A_, 2
-	note A_, 2
-	note A#, 6
-	note A#, 6
-	note G_, 6
-	note G_, 6
-	note A_, 6
-	note E_, 6
-	note A_, 6
-	note A_, 2
-	note A_, 2
-	note A_, 2
-	note A#, 6
-	note A#, 6
-	note A_, 6
-	note G_, 6
-	note A_, 12
+	A_ 6
+	A_ 2
+	A_ 2
+	A_ 2
+	A# 6
+	A# 6
+	G_ 6
+	G_ 6
+	A_ 6
+	E_ 6
+	A_ 6
+	A_ 2
+	A_ 2
+	A_ 2
+	A# 6
+	A# 6
+	A_ 6
+	G_ 6
+	A_ 12
 
-Music_YellowUnusedSong_branch_82fde:
-	note A_, 6
-	note A_, 2
-	note A_, 2
-	note A_, 2
-	note A#, 6
-	note A#, 6
-	note G_, 6
-	note G_, 6
-	note A_, 6
-	note E_, 6
-	note A_, 6
-	note A_, 2
-	note A_, 2
-	note A_, 2
-	note A#, 6
-	note A#, 6
-	note G_, 6
+Music_YellowUnusedSong_branch_82fde::
+	A_ 6
+	A_ 2
+	A_ 2
+	A_ 2
+	A# 6
+	A# 6
+	G_ 6
+	G_ 6
+	A_ 6
+	E_ 6
+	A_ 6
+	A_ 2
+	A_ 2
+	A_ 2
+	A# 6
+	A# 6
+	G_ 6
 	octave 4
-	note D#, 6
-	note D_, 12
+	D# 6
+	D_ 12
 	rest 16
 	rest 16
 	rest 16
@@ -53,275 +53,275 @@ Music_YellowUnusedSong_branch_82fde:
 	rest 16
 	rest 16
 	octave 3
-	note A_, 6
-	note A_, 2
-	note A_, 2
-	note A_, 2
-	note A#, 6
-	note A#, 6
-	note G_, 6
-	note G_, 6
-	note A_, 6
-	note E_, 6
-	note A_, 6
-	note A_, 2
-	note A_, 2
-	note A_, 2
-	note A#, 6
-	note A#, 6
-	note A_, 6
-	note G_, 6
-	note A_, 12
+	A_ 6
+	A_ 2
+	A_ 2
+	A_ 2
+	A# 6
+	A# 6
+	G_ 6
+	G_ 6
+	A_ 6
+	E_ 6
+	A_ 6
+	A_ 2
+	A_ 2
+	A_ 2
+	A# 6
+	A# 6
+	A_ 6
+	G_ 6
+	A_ 12
 	loopchannel 0, Music_YellowUnusedSong_branch_82fde
 
 
-Music_YellowUnusedSong_Ch2: ; 83010 (20:7010)
+Music_YellowUnusedSong_Ch2:: ; 83010 (20:7010)
 	duty 2
 	notetype 8, 12, 2
 	octave 4
-	note D_, 6
-	note D_, 2
-	note D_, 2
-	note D_, 2
-	note D#, 6
-	note D#, 6
-	note C_, 6
-	note C_, 6
-	note D_, 6
+	D_ 6
+	D_ 2
+	D_ 2
+	D_ 2
+	D# 6
+	D# 6
+	C_ 6
+	C_ 6
+	D_ 6
 	octave 3
-	note A_, 6
+	A_ 6
 	octave 4
-	note D_, 6
-	note D_, 2
-	note D_, 2
-	note D_, 2
-	note D#, 6
-	note D#, 6
-	note D_, 6
-	note A#, 6
-	note A_, 12
+	D_ 6
+	D_ 2
+	D_ 2
+	D_ 2
+	D# 6
+	D# 6
+	D_ 6
+	A# 6
+	A_ 12
 
-Music_YellowUnusedSong_branch_8302a:
-	note D_, 6
-	note D_, 2
-	note D_, 2
-	note D_, 2
-	note D#, 6
-	note D#, 6
-	note C_, 6
-	note C_, 6
-	note D_, 6
+Music_YellowUnusedSong_branch_8302a::
+	D_ 6
+	D_ 2
+	D_ 2
+	D_ 2
+	D# 6
+	D# 6
+	C_ 6
+	C_ 6
+	D_ 6
 	octave 3
-	note A_, 6
+	A_ 6
 	octave 4
-	note D_, 6
-	note D_, 2
-	note D_, 2
-	note D_, 2
-	note D#, 6
-	note D#, 6
-	note C_, 6
-	note G#, 6
-	note G_, 12
+	D_ 6
+	D_ 2
+	D_ 2
+	D_ 2
+	D# 6
+	D# 6
+	C_ 6
+	G# 6
+	G_ 12
 	notetype 8, 9, 0
 	octave 3
-	note D#, 16
-	note D#, 8
-	note D#, 16
-	note D#, 8
+	D# 16
+	D# 8
+	D# 16
+	D# 8
 	octave 2
-	note A#, 16
-	note A#, 8
+	A# 16
+	A# 8
 	octave 3
-	note D#, 12
-	note F_, 12
+	D# 12
+	F_ 12
 	notetype 8, 12, 2
 	octave 4
-	note D_, 6
-	note D_, 2
-	note D_, 2
-	note D_, 2
-	note D#, 6
-	note D#, 6
-	note C_, 6
-	note C_, 6
-	note D_, 6
+	D_ 6
+	D_ 2
+	D_ 2
+	D_ 2
+	D# 6
+	D# 6
+	C_ 6
+	C_ 6
+	D_ 6
 	octave 3
-	note A_, 6
+	A_ 6
 	octave 4
-	note D_, 6
-	note D_, 2
-	note D_, 2
-	note D_, 2
-	note D#, 6
-	note D#, 6
-	note D_, 6
-	note A#, 6
-	note A_, 12
+	D_ 6
+	D_ 2
+	D_ 2
+	D_ 2
+	D# 6
+	D# 6
+	D_ 6
+	A# 6
+	A_ 12
 	loopchannel 0, Music_YellowUnusedSong_branch_8302a
 
 
-Music_YellowUnusedSong_Ch3: ; 83068 (20:7068)
+Music_YellowUnusedSong_Ch3:: ; 83068 (20:7068)
 	notetype 12, 1, 0
 	vibrato 2, 1, 5
 	rest 16
 	rest 12
 	octave 4
-	note C_, 4
-	note D_, 8
-	note D#, 8
-	note G_, 8
-	note A#, 8
+	C_ 4
+	D_ 8
+	D# 8
+	G_ 8
+	A# 8
 
-Music_YellowUnusedSong_branch_83075:
-	note A_, 8
-	note A#, 8
-	note G_, 8
-	note A_, 4
-	note D_, 4
-	note A_, 8
-	note A#, 8
+Music_YellowUnusedSong_branch_83075::
+	A_ 8
+	A# 8
+	G_ 8
+	A_ 4
+	D_ 4
+	A_ 8
+	A# 8
 	octave 5
-	note C#, 8
-	note D_, 8
-	note D#, 16
-	note D#, 16
+	C# 8
+	D_ 8
+	D# 16
+	D# 16
 	octave 4
-	note A#, 16
+	A# 16
 	octave 5
-	note D#, 8
-	note F_, 8
+	D# 8
+	F_ 8
 	octave 4
-	note D_, 16
-	note D_, 16
+	D_ 16
+	D_ 16
 	octave 4
-	note D_, 8
-	note D#, 8
-	note G_, 8
-	note A#, 8
+	D_ 8
+	D# 8
+	G_ 8
+	A# 8
 	loopchannel 0, Music_YellowUnusedSong_branch_83075
 
 
-Music_YellowUnusedSong_Ch4: ; 83092 (20:7092)
+Music_YellowUnusedSong_Ch4:: ; 83092 (20:7092)
 	dspeed 12
-	dnote 4, snare3
+	snare3 4
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 2
+	snare3 2
+	snare3 2
 	dspeed 12
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
+	snare3 4
+	snare3 4
+	snare3 4
+	snare3 4
+	snare3 4
+	snare3 4
+	snare3 4
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 2
+	snare3 2
+	snare3 2
 	dspeed 12
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 4, snare3
-	dnote 4, snare3
+	snare3 4
+	snare3 4
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 4
+	snare3 4
 
-Music_YellowUnusedSong_branch_830c3:
-	dnote 4, snare3
+Music_YellowUnusedSong_branch_830c3::
+	snare3 4
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 2
+	snare3 2
+	snare3 2
 	dspeed 12
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
+	snare3 4
+	snare3 4
+	snare3 4
+	snare3 4
+	snare3 4
+	snare3 4
+	snare3 4
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 2
+	snare3 2
+	snare3 2
 	dspeed 12
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
+	snare3 4
+	snare3 4
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 4
+	snare3 4
+	snare3 4
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 2
+	snare3 2
+	snare3 2
 	dspeed 12
-	dnote 4, snare3
+	snare3 4
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 2
+	snare3 2
+	snare3 2
 	dspeed 12
-	dnote 4, snare3
+	snare3 4
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 2
 	dspeed 12
-	dnote 4, snare3
+	snare3 4
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 2
+	snare3 2
+	snare3 2
 	dspeed 12
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 4, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 4, snare3
+	snare3 4
+	snare3 4
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 4
+	snare3 2
+	snare3 2
+	snare3 4
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 2
+	snare3 2
+	snare3 2
 	dspeed 12
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 4, snare3
+	snare3 4
+	snare3 4
+	snare3 4
+	snare3 4
+	snare3 4
+	snare3 4
+	snare3 4
 	dspeed 8
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
+	snare3 2
+	snare3 2
+	snare3 2
 	dspeed 12
-	dnote 4, snare3
-	dnote 4, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 2, snare3
-	dnote 4, snare3
-	dnote 4, snare3
+	snare3 4
+	snare3 4
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 2
+	snare3 4
+	snare3 4
 	loopchannel 0, Music_YellowUnusedSong_branch_830c3
-; 0x8316d
\ No newline at end of file
+; 0x8316d
diff --git a/audio/sfx/sfx_02_3a.asm b/audio/sfx/sfx_02_3a.asm
index 5dc9a318..1844b2ab 100644
--- a/audio/sfx/sfx_02_3a.asm
+++ b/audio/sfx/sfx_02_3a.asm
@@ -7,12 +7,12 @@ SFX_02_3a_Ch1: ; ad77 (2:6d77)
 	toggleperfectpitch
 	notetype 4, 11, 1
 	octave 3
-	note G#, 2
-	note G#, 2
-	note G#, 2
+	G# 2
+	G# 2
+	G# 2
 	notetype 12, 11, 3
 	octave 4
-	note E_, 4
+	E_ 4
 	endchannel
 
 
@@ -22,11 +22,11 @@ SFX_02_3a_Ch2: ; ad8e (2:6d8e)
 	duty 2
 	notetype 4, 12, 1
 	octave 4
-	note E_, 2
-	note E_, 2
-	note E_, 2
+	E_ 2
+	E_ 2
+	E_ 2
 	notetype 12, 12, 3
-	note B_, 4
+	B_ 4
 	endchannel
 
 
@@ -34,15 +34,15 @@ SFX_02_3a_Ch3: ; ad9e (2:6d9e)
 	executemusic
 	notetype 4, 1, 0
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	notetype 12, 1, 0
 	octave 4
-	note B_, 2
+	B_ 2
 	rest 2
 	endchannel
 ; 0xadae
\ No newline at end of file
diff --git a/audio/sfx/sfx_02_3b.asm b/audio/sfx/sfx_02_3b.asm
index efe43b48..9c59d670 100644
--- a/audio/sfx/sfx_02_3b.asm
+++ b/audio/sfx/sfx_02_3b.asm
@@ -6,22 +6,22 @@ SFX_02_3b_Ch1: ; b316 (2:7316)
 	toggleperfectpitch
 	notetype 5, 11, 4
 	octave 4
-	note D_, 4
-	note C_, 4
+	D_ 4
+	C_ 4
 	octave 3
-	note A_, 8
+	A_ 8
 	notetype 5, 11, 2
 	octave 4
-	note D#, 2
-	note D#, 2
-	note D_, 2
-	note C_, 2
-	note C_, 2
+	D# 2
+	D# 2
+	D_ 2
+	C_ 2
+	C_ 2
 	octave 3
-	note A#, 2
+	A# 2
 	notetype 5, 11, 4
 	octave 4
-	note C_, 8
+	C_ 8
 	endchannel
 
 
@@ -31,18 +31,18 @@ SFX_02_3b_Ch2: ; b335 (2:7335)
 	duty 2
 	notetype 5, 12, 5
 	octave 4
-	note A_, 4
-	note F_, 4
-	note C_, 8
+	A_ 4
+	F_ 4
+	C_ 8
 	notetype 5, 12, 2
-	note A#, 2
-	note A#, 2
-	note A#, 2
-	note G_, 2
-	note G_, 2
-	note A#, 2
+	A# 2
+	A# 2
+	A# 2
+	G_ 2
+	G_ 2
+	A# 2
 	notetype 5, 12, 4
-	note A_, 8
+	A_ 8
 	endchannel
 
 
@@ -50,21 +50,21 @@ SFX_02_3b_Ch3: ; b34d (2:734d)
 	executemusic
 	notetype 5, 1, 0
 	octave 5
-	note F_, 4
-	note D#, 4
-	note C_, 8
-	note D#, 1
+	F_ 4
+	D# 4
+	C_ 8
+	D# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note A_, 8
+	A_ 8
 	endchannel
 ; 0xb362
\ No newline at end of file
diff --git a/audio/sfx/sfx_02_41.asm b/audio/sfx/sfx_02_41.asm
index 0a261b84..de5be1c7 100644
--- a/audio/sfx/sfx_02_41.asm
+++ b/audio/sfx/sfx_02_41.asm
@@ -5,19 +5,19 @@ SFX_02_41_Ch1: ; b2c8 (2:72c8)
 	duty 2
 	notetype 5, 11, 1
 	octave 3
-	note A_, 2
-	note A_, 2
-	note G_, 2
-	note G_, 2
-	note F_, 2
-	note E_, 2
-	note F_, 2
-	note A_, 2
+	A_ 2
+	A_ 2
+	G_ 2
+	G_ 2
+	F_ 2
+	E_ 2
+	F_ 2
+	A_ 2
 	octave 4
-	note C_, 4
-	note E_, 4
+	C_ 4
+	E_ 4
 	octave 3
-	note F_, 4
+	F_ 4
 	endchannel
 
 
@@ -26,21 +26,21 @@ SFX_02_41_Ch2: ; b2e1 (2:72e1)
 	duty 2
 	notetype 5, 12, 2
 	octave 5
-	note F_, 2
-	note E_, 1
+	F_ 2
+	E_ 1
 	rest 1
-	note D_, 2
-	note C_, 1
+	D_ 2
+	C_ 1
 	rest 1
 	octave 4
-	note A#, 2
+	A# 2
 	octave 5
-	note C_, 2
-	note D_, 2
-	note E_, 2
-	note F_, 4
-	note G_, 4
-	note F_, 4
+	C_ 2
+	D_ 2
+	E_ 2
+	F_ 4
+	G_ 4
+	F_ 4
 	endchannel
 
 
@@ -48,31 +48,31 @@ SFX_02_41_Ch3: ; b2f7 (2:72f7)
 	executemusic
 	notetype 5, 1, 0
 	octave 5
-	note C_, 1
+	C_ 1
 	rest 1
 	octave 4
-	note F_, 2
+	F_ 2
 	octave 5
-	note C_, 1
+	C_ 1
 	rest 1
 	octave 4
-	note A#, 1
+	A# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 5
-	note F_, 1
+	F_ 1
 	rest 3
-	note C_, 1
+	C_ 1
 	rest 3
 	octave 4
-	note F_, 2
+	F_ 2
 	rest 2
 	endchannel
 ; 0xb316
\ No newline at end of file
diff --git a/audio/sfx/sfx_02_42.asm b/audio/sfx/sfx_02_42.asm
index c2f3f8a4..5dfcb574 100644
--- a/audio/sfx/sfx_02_42.asm
+++ b/audio/sfx/sfx_02_42.asm
@@ -6,20 +6,20 @@ SFX_02_42_Ch1: ; b362 (2:7362)
 	toggleperfectpitch
 	notetype 5, 10, 4
 	octave 3
-	note A#, 4
+	A# 4
 	notetype 5, 11, 1
 	octave 4
-	note C_, 2
-	note C_, 1
-	note C_, 1
+	C_ 2
+	C_ 1
+	C_ 1
 	notetype 5, 10, 4
-	note D#, 4
+	D# 4
 	notetype 5, 11, 1
-	note F_, 2
-	note F_, 1
-	note F_, 1
+	F_ 2
+	F_ 1
+	F_ 1
 	notetype 5, 11, 4
-	note A#, 8
+	A# 8
 	endchannel
 
 
@@ -29,21 +29,21 @@ SFX_02_42_Ch2: ; b381 (2:7381)
 	duty 2
 	notetype 5, 13, 1
 	octave 4
-	note G_, 2
-	note G_, 1
-	note G_, 1
+	G_ 2
+	G_ 1
+	G_ 1
 	notetype 5, 12, 4
-	note D#, 4
+	D# 4
 	notetype 5, 13, 1
-	note G#, 2
-	note G#, 1
-	note G#, 1
-	note A#, 2
-	note A#, 1
-	note A#, 1
+	G# 2
+	G# 1
+	G# 1
+	A# 2
+	A# 1
+	A# 1
 	notetype 5, 12, 4
 	octave 5
-	note D#, 8
+	D# 8
 	endchannel
 
 
@@ -51,10 +51,10 @@ SFX_02_42_Ch3: ; b39d (2:739d)
 	executemusic
 	notetype 5, 1, 0
 	octave 4
-	note D#, 4
-	note G#, 4
-	note G_, 4
-	note F_, 4
-	note D#, 8
+	D# 4
+	G# 4
+	G_ 4
+	F_ 4
+	D# 8
 	endchannel
 ; 0xb3a7
\ No newline at end of file
diff --git a/audio/sfx/sfx_02_5e.asm b/audio/sfx/sfx_02_5e.asm
index ad47ebf0..ade4d200 100644
--- a/audio/sfx/sfx_02_5e.asm
+++ b/audio/sfx/sfx_02_5e.asm
@@ -2,21 +2,21 @@ SFX_02_5e_Ch1: ; 83ca (2:43ca)
 	vibrato 16, 1, 4
 	notetype 12, 1, 0
 	octave 5
-	note E_, 2
-	note F_, 2
-	note G_, 4
-	note A_, 2
-	note G_, 2
+	E_ 2
+	F_ 2
+	G_ 4
+	A_ 2
+	G_ 2
 	octave 6
-	note C_, 4
-	note C_, 2
-	note D_, 2
-	note C_, 2
+	C_ 4
+	C_ 2
+	D_ 2
+	C_ 2
 	octave 5
-	note G_, 2
-	note A_, 2
-	note F_, 2
-	note G_, 8
+	G_ 2
+	A_ 2
+	F_ 2
+	G_ 8
 	rest 12
 	endchannel
 ; 0x83e1
\ No newline at end of file
diff --git a/audio/sfx/sfx_08_3a.asm b/audio/sfx/sfx_08_3a.asm
index a81d8775..24cb206c 100644
--- a/audio/sfx/sfx_08_3a.asm
+++ b/audio/sfx/sfx_08_3a.asm
@@ -6,17 +6,17 @@ SFX_08_3a_Ch1: ; 2397d (8:797d)
 	toggleperfectpitch
 	notetype 6, 11, 4
 	octave 4
-	note F_, 4
+	F_ 4
 	notetype 4, 11, 2
-	note C_, 2
-	note F_, 2
-	note C_, 2
+	C_ 2
+	F_ 2
+	C_ 2
 	notetype 6, 11, 3
-	note D#, 2
-	note D#, 2
-	note E_, 2
+	D# 2
+	D# 2
+	E_ 2
 	notetype 6, 11, 4
-	note F_, 8
+	F_ 8
 	endchannel
 
 
@@ -26,17 +26,17 @@ SFX_08_3a_Ch2: ; 23998 (8:7998)
 	duty 2
 	notetype 6, 12, 4
 	octave 4
-	note A_, 4
+	A_ 4
 	notetype 4, 12, 2
-	note A_, 2
-	note A_, 2
-	note A_, 2
+	A_ 2
+	A_ 2
+	A_ 2
 	notetype 6, 12, 4
-	note A#, 2
-	note A#, 2
-	note A#, 2
+	A# 2
+	A# 2
+	A# 2
 	notetype 6, 12, 4
-	note A_, 8
+	A_ 8
 	endchannel
 
 
@@ -44,21 +44,21 @@ SFX_08_3a_Ch3: ; 239b0 (8:79b0)
 	executemusic
 	notetype 6, 1, 0
 	octave 5
-	note A_, 4
+	A_ 4
 	notetype 4, 1, 0
-	note F_, 1
+	F_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
 	notetype 6, 1, 0
-	note G_, 1
+	G_ 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note A_, 8
+	A_ 8
 	endchannel
 ; 0x239c7
\ No newline at end of file
diff --git a/audio/sfx/sfx_08_3b.asm b/audio/sfx/sfx_08_3b.asm
index a829a112..910cf9dc 100644
--- a/audio/sfx/sfx_08_3b.asm
+++ b/audio/sfx/sfx_08_3b.asm
@@ -6,22 +6,22 @@ SFX_08_3b_Ch1: ; 239c7 (8:79c7)
 	toggleperfectpitch
 	notetype 5, 11, 4
 	octave 4
-	note D_, 4
-	note C_, 4
+	D_ 4
+	C_ 4
 	octave 3
-	note A_, 8
+	A_ 8
 	notetype 5, 11, 2
 	octave 4
-	note D#, 2
-	note D#, 2
-	note D_, 2
-	note C_, 2
-	note C_, 2
+	D# 2
+	D# 2
+	D_ 2
+	C_ 2
+	C_ 2
 	octave 3
-	note A#, 2
+	A# 2
 	notetype 5, 11, 4
 	octave 4
-	note C_, 8
+	C_ 8
 	endchannel
 
 
@@ -31,18 +31,18 @@ SFX_08_3b_Ch2: ; 239e6 (8:79e6)
 	duty 2
 	notetype 5, 12, 5
 	octave 4
-	note A_, 4
-	note F_, 4
-	note C_, 8
+	A_ 4
+	F_ 4
+	C_ 8
 	notetype 5, 12, 2
-	note A#, 2
-	note A#, 2
-	note A#, 2
-	note G_, 2
-	note G_, 2
-	note A#, 2
+	A# 2
+	A# 2
+	A# 2
+	G_ 2
+	G_ 2
+	A# 2
 	notetype 5, 12, 4
-	note A_, 8
+	A_ 8
 	endchannel
 
 
@@ -50,21 +50,21 @@ SFX_08_3b_Ch3: ; 239fe (8:79fe)
 	executemusic
 	notetype 5, 1, 0
 	octave 5
-	note F_, 4
-	note D#, 4
-	note C_, 8
-	note D#, 1
+	F_ 4
+	D# 4
+	C_ 8
+	D# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note A_, 8
+	A_ 8
 	endchannel
 ; 0x23a13
\ No newline at end of file
diff --git a/audio/sfx/sfx_08_46.asm b/audio/sfx/sfx_08_46.asm
index 33a5ab25..b1d35eb1 100644
--- a/audio/sfx/sfx_08_46.asm
+++ b/audio/sfx/sfx_08_46.asm
@@ -6,19 +6,19 @@ SFX_08_46_Ch1: ; 23a13 (8:7a13)
 	toggleperfectpitch
 	notetype 6, 11, 2
 	octave 3
-	note E_, 2
-	note F#, 2
-	note G#, 2
-	note G#, 1
-	note G#, 1
-	note B_, 2
+	E_ 2
+	F# 2
+	G# 2
+	G# 1
+	G# 1
+	B_ 2
 	octave 4
-	note C#, 2
-	note D#, 2
-	note D#, 1
-	note D#, 1
+	C# 2
+	D# 2
+	D# 1
+	D# 1
 	notetype 6, 11, 5
-	note E_, 8
+	E_ 8
 	endchannel
 
 
@@ -27,20 +27,20 @@ SFX_08_46_Ch2: ; 23a2e (8:7a2e)
 	duty 2
 	notetype 6, 12, 2
 	octave 4
-	note G#, 2
-	note G#, 1
-	note G#, 1
-	note E_, 2
-	note E_, 1
-	note E_, 1
-	note B_, 2
-	note B_, 1
-	note B_, 1
-	note A_, 2
-	note A_, 1
-	note A_, 1
+	G# 2
+	G# 1
+	G# 1
+	E_ 2
+	E_ 1
+	E_ 1
+	B_ 2
+	B_ 1
+	B_ 1
+	A_ 2
+	A_ 1
+	A_ 1
 	notetype 6, 12, 5
-	note G#, 8
+	G# 8
 	endchannel
 
 
@@ -48,15 +48,15 @@ SFX_08_46_Ch3: ; 23a44 (8:7a44)
 	executemusic
 	notetype 6, 1, 0
 	octave 4
-	note B_, 2
+	B_ 2
 	rest 2
 	octave 5
-	note C#, 2
+	C# 2
 	rest 2
-	note D#, 2
+	D# 2
 	rest 2
-	note F#, 2
-	note G_, 2
-	note G#, 4
+	F# 2
+	G_ 2
+	G# 4
 	endchannel
 ; 0x23a53
\ No newline at end of file
diff --git a/audio/sfx/sfx_08_75.asm b/audio/sfx/sfx_08_75.asm
index 39990ae3..0a25cb45 100644
--- a/audio/sfx/sfx_08_75.asm
+++ b/audio/sfx/sfx_08_75.asm
@@ -4,12 +4,12 @@ SFX_08_75_Ch1: ; 208e0 (8:48e0)
 	duty 2
 	notetype 10, 8, 7
 	octave 5
-	note G#, 8
+	G# 8
 	octave 6
-	note F#, 4
-	note E_, 4
+	F# 4
+	E_ 4
 	octave 5
-	note G#, 8
+	G# 8
 	endchannel
 
 
@@ -19,12 +19,12 @@ SFX_08_75_Ch2: ; 208f0 (8:48f0)
 	duty 2
 	notetype 11, 6, 7
 	octave 5
-	note G#, 8
+	G# 8
 	notetype 10, 6, 7
 	octave 6
-	note F#, 4
-	note E_, 4
+	F# 4
+	E_ 4
 	octave 5
-	note G#, 8
+	G# 8
 	endchannel
 ; 0x20902
\ No newline at end of file
diff --git a/audio/sfx/sfx_08_pokeflute_ch3.asm b/audio/sfx/sfx_08_pokeflute_ch3.asm
index 28f1dfd7..cf3f32a7 100755
--- a/audio/sfx/sfx_08_pokeflute_ch3.asm
+++ b/audio/sfx/sfx_08_pokeflute_ch3.asm
@@ -3,12 +3,12 @@ SFX_08_PokeFlute_Ch3: ; 2049b (8:449b)
 	vibrato 16, 1, 4
 	notetype 8, 1, 0
 	octave 5
-	note E_, 3
-	note F_, 3
-	note G_, 7
-	note A_, 3
-	note G_, 3
+	E_ 3
+	F_ 3
+	G_ 7
+	A_ 3
+	G_ 3
 	octave 6
-	note C_, 13
+	C_ 13
 	endchannel
 ; 0x204aa
\ No newline at end of file
diff --git a/audio/sfx/sfx_08_unused2.asm b/audio/sfx/sfx_08_unused2.asm
index c0e2ce76..0bfe4dd3 100755
--- a/audio/sfx/sfx_08_unused2.asm
+++ b/audio/sfx/sfx_08_unused2.asm
@@ -7,13 +7,13 @@ SFX_08_unused2_Ch1: ; 2232f (8:632f)
 	toggleperfectpitch
 	notetype 6, 11, 1
 	octave 3
-	note G#, 2
-	note G#, 2
+	G# 2
+	G# 2
 	notetype 6, 11, 3
-	note G#, 2
-	note B_, 2
+	G# 2
+	B_ 2
 	octave 4
-	note E_, 8
+	E_ 8
 	endchannel
 
 
@@ -23,13 +23,13 @@ SFX_08_unused2_Ch2: ; 22347 (8:6347)
 	duty 2
 	notetype 6, 12, 1
 	octave 4
-	note E_, 2
-	note E_, 1
-	note E_, 1
+	E_ 2
+	E_ 1
+	E_ 1
 	notetype 6, 12, 3
-	note E_, 2
-	note G#, 2
-	note B_, 8
+	E_ 2
+	G# 2
+	B_ 8
 	endchannel
 
 
@@ -37,21 +37,21 @@ SFX_08_unused2_Ch3: ; 22359 (8:6359)
 	executemusic
 	notetype 6, 1, 0
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 1
 	notetype 3, 1, 0
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	notetype 6, 1, 0
-	note B_, 1
+	B_ 1
 	rest 1
 	octave 5
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 4
-	note B_, 4
+	B_ 4
 	rest 4
 	endchannel
 ; 0x22370
\ No newline at end of file
diff --git a/audio/sfx/sfx_1f_3a.asm b/audio/sfx/sfx_1f_3a.asm
index 45fcecca..1d92127e 100644
--- a/audio/sfx/sfx_1f_3a.asm
+++ b/audio/sfx/sfx_1f_3a.asm
@@ -7,12 +7,12 @@ SFX_1f_3a_Ch1: ; 7e850 (1f:6850)
 	toggleperfectpitch
 	notetype 4, 11, 1
 	octave 3
-	note G#, 2
-	note G#, 2
-	note G#, 2
+	G# 2
+	G# 2
+	G# 2
 	notetype 12, 11, 3
 	octave 4
-	note E_, 4
+	E_ 4
 	endchannel
 
 
@@ -22,11 +22,11 @@ SFX_1f_3a_Ch2: ; 7e867 (1f:6867)
 	duty 2
 	notetype 4, 12, 1
 	octave 4
-	note E_, 2
-	note E_, 2
-	note E_, 2
+	E_ 2
+	E_ 2
+	E_ 2
 	notetype 12, 12, 3
-	note B_, 4
+	B_ 4
 	endchannel
 
 
@@ -34,15 +34,15 @@ SFX_1f_3a_Ch3: ; 7e877 (1f:6877)
 	executemusic
 	notetype 4, 1, 0
 	octave 4
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
-	note B_, 1
+	B_ 1
 	rest 1
 	notetype 12, 1, 0
 	octave 4
-	note B_, 2
+	B_ 2
 	rest 2
 	endchannel
 ; 0x7e887
\ No newline at end of file
diff --git a/audio/sfx/sfx_1f_3b.asm b/audio/sfx/sfx_1f_3b.asm
index 16507623..3ce00c8a 100644
--- a/audio/sfx/sfx_1f_3b.asm
+++ b/audio/sfx/sfx_1f_3b.asm
@@ -6,22 +6,22 @@ SFX_1f_3b_Ch1: ; 7ee28 (1f:6e28)
 	toggleperfectpitch
 	notetype 5, 11, 4
 	octave 4
-	note D_, 4
-	note C_, 4
+	D_ 4
+	C_ 4
 	octave 3
-	note A_, 8
+	A_ 8
 	notetype 5, 11, 2
 	octave 4
-	note D#, 2
-	note D#, 2
-	note D_, 2
-	note C_, 2
-	note C_, 2
+	D# 2
+	D# 2
+	D_ 2
+	C_ 2
+	C_ 2
 	octave 3
-	note A#, 2
+	A# 2
 	notetype 5, 11, 4
 	octave 4
-	note C_, 8
+	C_ 8
 	endchannel
 
 
@@ -31,18 +31,18 @@ SFX_1f_3b_Ch2: ; 7ee47 (1f:6e47)
 	duty 2
 	notetype 5, 12, 5
 	octave 4
-	note A_, 4
-	note F_, 4
-	note C_, 8
+	A_ 4
+	F_ 4
+	C_ 8
 	notetype 5, 12, 2
-	note A#, 2
-	note A#, 2
-	note A#, 2
-	note G_, 2
-	note G_, 2
-	note A#, 2
+	A# 2
+	A# 2
+	A# 2
+	G_ 2
+	G_ 2
+	A# 2
 	notetype 5, 12, 4
-	note A_, 8
+	A_ 8
 	endchannel
 
 
@@ -50,21 +50,21 @@ SFX_1f_3b_Ch3: ; 7ee5f (1f:6e5f)
 	executemusic
 	notetype 5, 1, 0
 	octave 5
-	note F_, 4
-	note D#, 4
-	note C_, 8
-	note D#, 1
+	F_ 4
+	D# 4
+	C_ 8
+	D# 1
 	rest 1
-	note D#, 1
+	D# 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note A_, 8
+	A_ 8
 	endchannel
 ; 0x7ee74
\ No newline at end of file
diff --git a/audio/sfx/sfx_1f_41.asm b/audio/sfx/sfx_1f_41.asm
index d5564ddd..6f854c74 100644
--- a/audio/sfx/sfx_1f_41.asm
+++ b/audio/sfx/sfx_1f_41.asm
@@ -5,19 +5,19 @@ SFX_1f_41_Ch1: ; 7edda (1f:6dda)
 	duty 2
 	notetype 5, 11, 1
 	octave 3
-	note A_, 2
-	note A_, 2
-	note G_, 2
-	note G_, 2
-	note F_, 2
-	note E_, 2
-	note F_, 2
-	note A_, 2
+	A_ 2
+	A_ 2
+	G_ 2
+	G_ 2
+	F_ 2
+	E_ 2
+	F_ 2
+	A_ 2
 	octave 4
-	note C_, 4
-	note E_, 4
+	C_ 4
+	E_ 4
 	octave 3
-	note F_, 4
+	F_ 4
 	endchannel
 
 
@@ -26,21 +26,21 @@ SFX_1f_41_Ch2: ; 7edf3 (1f:6df3)
 	duty 2
 	notetype 5, 12, 2
 	octave 5
-	note F_, 2
-	note E_, 1
+	F_ 2
+	E_ 1
 	rest 1
-	note D_, 2
-	note C_, 1
+	D_ 2
+	C_ 1
 	rest 1
 	octave 4
-	note A#, 2
+	A# 2
 	octave 5
-	note C_, 2
-	note D_, 2
-	note E_, 2
-	note F_, 4
-	note G_, 4
-	note F_, 4
+	C_ 2
+	D_ 2
+	E_ 2
+	F_ 4
+	G_ 4
+	F_ 4
 	endchannel
 
 
@@ -48,31 +48,31 @@ SFX_1f_41_Ch3: ; 7ee09 (1f:6e09)
 	executemusic
 	notetype 5, 1, 0
 	octave 5
-	note C_, 1
+	C_ 1
 	rest 1
 	octave 4
-	note F_, 2
+	F_ 2
 	octave 5
-	note C_, 1
+	C_ 1
 	rest 1
 	octave 4
-	note A#, 1
+	A# 1
 	rest 1
-	note A_, 1
+	A_ 1
 	rest 1
-	note G_, 1
+	G_ 1
 	rest 1
-	note F_, 1
+	F_ 1
 	rest 1
-	note E_, 1
+	E_ 1
 	rest 1
 	octave 5
-	note F_, 1
+	F_ 1
 	rest 3
-	note C_, 1
+	C_ 1
 	rest 3
 	octave 4
-	note F_, 2
+	F_ 2
 	rest 2
 	endchannel
 ; 0x7ee28
\ No newline at end of file
diff --git a/audio/sfx/sfx_1f_42.asm b/audio/sfx/sfx_1f_42.asm
index bf231d23..6c8c388a 100644
--- a/audio/sfx/sfx_1f_42.asm
+++ b/audio/sfx/sfx_1f_42.asm
@@ -6,20 +6,20 @@ SFX_1f_42_Ch1: ; 7ee74 (1f:6e74)
 	toggleperfectpitch
 	notetype 5, 10, 4
 	octave 3
-	note A#, 4
+	A# 4
 	notetype 5, 11, 1
 	octave 4
-	note C_, 2
-	note C_, 1
-	note C_, 1
+	C_ 2
+	C_ 1
+	C_ 1
 	notetype 5, 10, 4
-	note D#, 4
+	D# 4
 	notetype 5, 11, 1
-	note F_, 2
-	note F_, 1
-	note F_, 1
+	F_ 2
+	F_ 1
+	F_ 1
 	notetype 5, 11, 4
-	note A#, 8
+	A# 8
 	endchannel
 
 
@@ -29,21 +29,21 @@ SFX_1f_42_Ch2: ; 7ee93 (1f:6e93)
 	duty 2
 	notetype 5, 13, 1
 	octave 4
-	note G_, 2
-	note G_, 1
-	note G_, 1
+	G_ 2
+	G_ 1
+	G_ 1
 	notetype 5, 12, 4
-	note D#, 4
+	D# 4
 	notetype 5, 13, 1
-	note G#, 2
-	note G#, 1
-	note G#, 1
-	note A#, 2
-	note A#, 1
-	note A#, 1
+	G# 2
+	G# 1
+	G# 1
+	A# 2
+	A# 1
+	A# 1
 	notetype 5, 12, 4
 	octave 5
-	note D#, 8
+	D# 8
 	endchannel
 
 
@@ -51,10 +51,10 @@ SFX_1f_42_Ch3: ; 7eeaf (1f:6eaf)
 	executemusic
 	notetype 5, 1, 0
 	octave 4
-	note D#, 4
-	note G#, 4
-	note G_, 4
-	note F_, 4
-	note D#, 8
+	D# 4
+	G# 4
+	G_ 4
+	F_ 4
+	D# 8
 	endchannel
 ; 0x7eeb9
\ No newline at end of file
diff --git a/macros.asm b/macros.asm
index 5657044c..2c0d3dfb 100644
--- a/macros.asm
+++ b/macros.asm
@@ -164,41 +164,6 @@ CH5		EQU 5
 CH6		EQU 6
 CH7		EQU 7
 
-;Note Pitch
-C_		EQU $0
-C#		EQU $1
-D_		EQU $2
-D#		EQU $3
-E_		EQU $4
-F_		EQU $5
-F#		EQU $6
-G_		EQU $7
-G#		EQU $8
-A_		EQU $9
-A#		EQU $A
-B_		EQU $B
-
-;drum instruments
-snare1		EQU $01
-snare2		EQU $02
-snare3		EQU $03
-snare4		EQU $04
-snare5		EQU $05
-triangle1	EQU $06
-triangle2	EQU $07
-snare6		EQU $08
-snare7		EQU $09
-snare8		EQU $0a
-snare9		EQU $0b
-cymbal1		EQU $0c
-cymbal2		EQU $0d
-cymbal3		EQU $0e
-mutedsnare1	EQU $0f
-triangle3	EQU $10
-mutedsnare2	EQU $11
-mutedsnare3	EQU $12
-mutedsnare4	EQU $13
-
 unknownsfx0x10: MACRO
 	db $10
 	db \1
@@ -217,15 +182,149 @@ unknownnoise0x20: MACRO
 	db \3
 ENDM
 
-;format: note pitch, length (in 16ths)
-note: MACRO
-	db (\1 << 4) | (\2 - 1)
+;format: pitch length (in 16ths)
+C_: MACRO
+	db $00 | (\1 - 1)
+ENDM
+
+C#: MACRO
+	db $10 | (\1 - 1)
+ENDM
+
+D_: MACRO
+	db $20 | (\1 - 1)
+ENDM
+
+D#: MACRO
+	db $30 | (\1 - 1)
+ENDM
+
+E_: MACRO
+	db $40 | (\1 - 1)
+ENDM
+
+F_: MACRO
+	db $50 | (\1 - 1)
+ENDM
+
+F#: MACRO
+	db $60 | (\1 - 1)
+ENDM
+
+G_: MACRO
+	db $70 | (\1 - 1)
+ENDM
+
+G#: MACRO
+	db $80 | (\1 - 1)
+ENDM
+
+A_: MACRO
+	db $90 | (\1 - 1)
+ENDM
+
+A#: MACRO
+	db $A0 | (\1 - 1)
 ENDM
 
-;format: dnote length (in 16ths), instrument
-dnote: MACRO
+B_: MACRO
 	db $B0 | (\1 - 1)
-	db \2
+ENDM
+
+;format: instrument length (in 16ths)
+snare1: MACRO
+	db $B0 | (\1 - 1)
+	db $01
+ENDM
+
+snare2: MACRO
+	db $B0 | (\1 - 1)
+	db $02
+ENDM
+
+snare3: MACRO
+	db $B0 | (\1 - 1)
+	db $03
+ENDM
+
+snare4: MACRO
+	db $B0 | (\1 - 1)
+	db $04
+ENDM
+
+snare5: MACRO
+	db $B0 | (\1 - 1)
+	db $05
+ENDM
+
+triangle1: MACRO
+	db $B0 | (\1 - 1)
+	db $06
+ENDM
+
+triangle2: MACRO
+	db $B0 | (\1 - 1)
+	db $07
+ENDM
+
+snare6: MACRO
+	db $B0 | (\1 - 1)
+	db $08
+ENDM
+
+snare7: MACRO
+	db $B0 | (\1 - 1)
+	db $09
+ENDM
+
+snare8: MACRO
+	db $B0 | (\1 - 1)
+	db $0A
+ENDM
+
+snare9: MACRO
+	db $B0 | (\1 - 1)
+	db $0B
+ENDM
+
+cymbal1: MACRO
+	db $B0 | (\1 - 1)
+	db $0C
+ENDM
+
+cymbal2: MACRO
+	db $B0 | (\1 - 1)
+	db $0D
+ENDM
+
+cymbal3: MACRO
+	db $B0 | (\1 - 1)
+	db $0E
+ENDM
+
+mutedsnare1: MACRO
+	db $B0 | (\1 - 1)
+	db $0F
+ENDM
+
+triangle3: MACRO
+	db $B0 | (\1 - 1)
+	db $10
+ENDM
+
+mutedsnare2: MACRO
+	db $B0 | (\1 - 1)
+	db $11
+ENDM
+
+mutedsnare3: MACRO
+	db $B0 | (\1 - 1)
+	db $12
+ENDM
+
+mutedsnare4: MACRO
+	db $B0 | (\1 - 1)
+	db $13
 ENDM
 
 ;format: rest length (in 16ths)
-- 
cgit v1.3.1-sl0p


From d10108a066c102bf2d167ac656d79308e41f304e Mon Sep 17 00:00:00 2001
From: yenatch <yenatch@gmail.com>
Date: Mon, 16 Jun 2014 13:25:46 -0700
Subject: Use macros to define predefs.

---
 engine/battle/4.asm             |   2 +-
 engine/battle/core.asm          |   2 +-
 engine/hp_bar.asm               |   1 +
 engine/menu/status_screen.asm   |   2 +-
 engine/overworld/pokecenter.asm |   2 +-
 engine/predefs.asm              | 193 ++++++++++++++++++++--------------------
 home/init.asm                   |   6 +-
 macros.asm                      |  18 +++-
 main.asm                        |   8 +-
 scripts/redshouse1f.asm         |   2 +-
 10 files changed, 123 insertions(+), 113 deletions(-)

(limited to 'macros.asm')

diff --git a/engine/battle/4.asm b/engine/battle/4.asm
index 6e2bad34..11772a15 100755
--- a/engine/battle/4.asm
+++ b/engine/battle/4.asm
@@ -15,7 +15,7 @@ Func_128ea: ; 128ea (4:68ea)
 	inc b
 	ret
 
-Func_128ef: ; 128ef (4:68ef)
+DrawHP: ; 128ef (4:68ef)
 	call GetPredefRegisters
 	ld a, $1
 	jr asm_128fb
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 21ee9d0d..a1a69a4f 100755
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -6661,7 +6661,7 @@ Func_3eed3: ; 3eed3 (f:6ed3)
 PlayMoveAnimation: ; 3ef07 (f:6f07)
 	ld [W_ANIMATIONID],a
 	call Delay3
-	PREDEF_JUMP MoveAnimationPredef ; predef 8
+	predef_jump MoveAnimation
 
 InitBattle: ; 3ef12 (f:6f12)
 	ld a, [W_CUROPPONENT] ; wd059
diff --git a/engine/hp_bar.asm b/engine/hp_bar.asm
index de0c4e41..9ff9e3cf 100755
--- a/engine/hp_bar.asm
+++ b/engine/hp_bar.asm
@@ -46,6 +46,7 @@ GetHPBarLength: ; f9df (3:79df)
 
 ; predef $48
 UpdateHPBar: ; fa1d (3:7a1d)
+UpdateHPBar2:
 	push hl
 	ld hl, wHPBarOldHP
 	ld a, [hli]
diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm
index 2d33e79f..3bacd306 100755
--- a/engine/menu/status_screen.asm
+++ b/engine/menu/status_screen.asm
@@ -59,7 +59,7 @@ StatusScreen: ; 12953 (4:6953)
 	call PlaceString ; "TYPE1/"
 	FuncCoord 11,3
 	ld hl, Coord
-	PREDEF DrawHPBarPredef ; predef $5f
+	predef DrawHP ; predef $5f
 	ld hl, wcf25
 	call GetHealthBarColor
 	ld b, $3
diff --git a/engine/overworld/pokecenter.asm b/engine/overworld/pokecenter.asm
index 2dedc437..3c640d8e 100755
--- a/engine/overworld/pokecenter.asm
+++ b/engine/overworld/pokecenter.asm
@@ -21,7 +21,7 @@ DisplayPokemonCenterDialogue_: ; 6fe6 (1:6fe6)
 	ld a, $18
 	ld [wSpriteStateData1 + $12], a ; make the nurse turn to face the machine
 	call Delay3
-	PREDEF HealPartyPredef
+	predef HealParty
 	callba AnimateHealingMachine ; do the healing machine animation
 	xor a
 	ld [wMusicHeaderPointer], a
diff --git a/engine/predefs.asm b/engine/predefs.asm
index 7081df53..53022bc4 100755
--- a/engine/predefs.asm
+++ b/engine/predefs.asm
@@ -52,105 +52,102 @@ GetPredefPointer:
 PredefPointers: ; 4fe79 (13:7e79)
 ; these are pointers to ASM routines.
 ; they appear to be used in overworld map scripts.
-	dbw BANK(Func_3cd60),Func_3cd60
-	dbw BANK(Func_3f0c6),Func_3f0c6
-	dbw BANK(Func_3f073),Func_3f073
-	dbw BANK(ScaleSpriteByTwo), ScaleSpriteByTwo
-	dbw BANK(LoadMonBackPic), LoadMonBackPic
-	dbw BANK(Func_79aba),Func_79aba
-	dbw BANK(Func_f132),Func_f132
-HealPartyPredef: ; 4fe8e (13:7e8e)
-	dbw BANK(HealParty),HealParty
-MoveAnimationPredef: ; 4fe91 (13:7e91)
-	dbw BANK(MoveAnimation),MoveAnimation; 08 play move animation
-	dbw BANK(DivideBCDPredef),DivideBCDPredef
-	dbw BANK(DivideBCDPredef),DivideBCDPredef
-	dbw BANK(AddBCDPredef), AddBCDPredef
-	dbw BANK(SubBCDPredef), SubBCDPredef
-	dbw BANK(DivideBCDPredef),DivideBCDPredef
-	dbw BANK(DivideBCDPredef),DivideBCDPredef
-	dbw BANK(InitPlayerData), InitPlayerData
-	dbw BANK(FlagActionPredef),FlagActionPredef
-	dbw BANK(HideObject), HideObject
-	dbw BANK(IsObjectHidden), IsObjectHidden
-	dbw BANK(Func_c69c),Func_c69c
-	dbw BANK(AnyPartyAlive), AnyPartyAlive
-	dbw BANK(ShowObject), ShowObject
-	dbw BANK(ShowObject), ShowObject
-	dbw BANK(Func_ee9e),Func_ee9e
-	dbw BANK(InitPlayerData), InitPlayerData
-	dbw BANK(Func_c754),Func_c754
-	dbw BANK(Func_3af5b),Func_3af5b
-	dbw BANK(LearnMove),LearnMove
-	dbw BANK(IsItemInBag_),IsItemInBag_ ; 1C, used in Pokémon Tower
+	add_predef Func_3cd60
+	add_predef Func_3f0c6
+	add_predef Func_3f073
+	add_predef ScaleSpriteByTwo
+	add_predef LoadMonBackPic
+	add_predef Func_79aba
+	add_predef Func_f132
+	add_predef HealParty
+	add_predef MoveAnimation; 08 play move animation
+	add_predef DivideBCDPredef
+	add_predef DivideBCDPredef2
+	add_predef AddBCDPredef
+	add_predef SubBCDPredef
+	add_predef DivideBCDPredef3
+	add_predef DivideBCDPredef4
+	add_predef InitPlayerData
+	add_predef FlagActionPredef
+	add_predef HideObject
+	add_predef IsObjectHidden
+	add_predef Func_c69c
+	add_predef AnyPartyAlive
+	add_predef ShowObject
+	add_predef ShowObject2
+	add_predef Func_ee9e
+	add_predef InitPlayerData2
+	add_predef Func_c754
+	add_predef Func_3af5b
+	add_predef LearnMove
+	add_predef IsItemInBag_ ; 1C, used in Pokémon Tower
 	dbw $03,Func_3eb5 ; for these two, the bank number is actually 0
 	dbw $03,GiveItem
-	dbw BANK(Func_480eb),Func_480eb
-	dbw BANK(Func_f8ba),Func_f8ba
-	dbw BANK(Func_480ff),Func_480ff
-	dbw BANK(Func_f929),Func_f929
-	dbw BANK(Func_f9a0),Func_f9a0
-	dbw BANK(Func_48125),Func_48125
-	dbw BANK(UpdateHPBar),UpdateHPBar
-	dbw BANK(HPBarLength), HPBarLength
-	dbw BANK(Func_5ab0),Func_5ab0
-	dbw BANK(Func_3ed02),Func_3ed02
-	dbw BANK(ShowPokedexMenu), ShowPokedexMenu
-	dbw BANK(Func_3ad1c),Func_3ad1c
-	dbw BANK(SaveSAVtoSRAM0),SaveSAVtoSRAM0
-	dbw BANK(InitOpponent),InitOpponent
-	dbw BANK(Func_5a5f),Func_5a5f
-	dbw BANK(DrawBadges), DrawBadges
-	dbw BANK(Func_410f3),Func_410f3
-	dbw BANK(BattleTransition),BattleTransition
-	dbw BANK(Func_79dda),Func_79dda
-	dbw BANK(PlayIntro),PlayIntro
-	dbw BANK(Func_79869),Func_79869
-	dbw BANK(FlashScreen), FlashScreen
-	dbw BANK(Func_c586),Func_c586
-	dbw BANK(StatusScreen),StatusScreen ; 37 0x12953
-	dbw BANK(StatusScreen2),StatusScreen2 ; 38
-	dbw BANK(Func_410e2),Func_410e2
-	dbw BANK(TrainerEngage), TrainerEngage
-	dbw BANK(IndexToPokedex),IndexToPokedex
-	dbw BANK(Predef3B),Predef3B; 3B display pic?
-	dbw BANK(UsedCut),UsedCut
-	dbw BANK(ShowPokedexData),ShowPokedexData
-	dbw BANK(WriteMonMoves),WriteMonMoves
-	dbw BANK(SaveSAV),SaveSAV
-	dbw BANK(LoadSGB), LoadSGB
-	dbw BANK(Func_f113),Func_f113
-	dbw BANK(SetPartyMonTypes),SetPartyMonTypes
-	dbw BANK(CanLearnTM), CanLearnTM
-	dbw BANK(TMToMove),TMToMove
-	dbw BANK(Func_71ddf),Func_71ddf
-	dbw BANK(StarterDex), StarterDex ; 46
-	dbw BANK(_AddPartyMon), _AddPartyMon
-	dbw BANK(UpdateHPBar),UpdateHPBar
-	dbw BANK(Func_3cdec),Func_3cdec
-	dbw BANK(LoadTownMap_Nest),LoadTownMap_Nest
-	dbw BANK(Func_27d6b),Func_27d6b
-	dbw BANK(EmotionBubble), EmotionBubble; 4C player exclamation
-	dbw BANK(Func_5aaf),Func_5aaf; return immediately
-	dbw BANK(AskName), AskName
-	dbw BANK(PewterGuys),PewterGuys
-	dbw BANK(SaveSAVtoSRAM2),SaveSAVtoSRAM2
-	dbw BANK(LoadSAVCheckSum2),LoadSAVCheckSum2
-	dbw BANK(LoadSAV),LoadSAV
-	dbw BANK(SaveSAVtoSRAM1),SaveSAVtoSRAM1
-	dbw BANK(Predef54),Predef54 ; 54 initiate trade
-	dbw BANK(HallOfFamePC), HallOfFamePC
-	dbw BANK(DisplayDexRating),DisplayDexRating
+	add_predef Func_480eb
+	add_predef Func_f8ba
+	add_predef Func_480ff
+	add_predef Func_f929
+	add_predef Func_f9a0
+	add_predef Func_48125
+	add_predef UpdateHPBar
+	add_predef HPBarLength
+	add_predef Func_5ab0
+	add_predef Func_3ed02
+	add_predef ShowPokedexMenu
+	add_predef Func_3ad1c
+	add_predef SaveSAVtoSRAM0
+	add_predef InitOpponent
+	add_predef Func_5a5f
+	add_predef DrawBadges
+	add_predef Func_410f3
+	add_predef BattleTransition
+	add_predef Func_79dda
+	add_predef PlayIntro
+	add_predef Func_79869
+	add_predef FlashScreen
+	add_predef Func_c586
+	add_predef StatusScreen
+	add_predef StatusScreen2
+	add_predef Func_410e2
+	add_predef TrainerEngage
+	add_predef IndexToPokedex
+	add_predef Predef3B; 3B display pic?
+	add_predef UsedCut
+	add_predef ShowPokedexData
+	add_predef WriteMonMoves
+	add_predef SaveSAV
+	add_predef LoadSGB
+	add_predef Func_f113
+	add_predef SetPartyMonTypes
+	add_predef CanLearnTM
+	add_predef TMToMove
+	add_predef Func_71ddf
+	add_predef StarterDex ; 46
+	add_predef _AddPartyMon
+	add_predef UpdateHPBar2
+	add_predef Func_3cdec
+	add_predef LoadTownMap_Nest
+	add_predef Func_27d6b
+	add_predef EmotionBubble; 4C player exclamation
+	add_predef Func_5aaf; return immediately
+	add_predef AskName
+	add_predef PewterGuys
+	add_predef SaveSAVtoSRAM2
+	add_predef LoadSAVCheckSum2
+	add_predef LoadSAV
+	add_predef SaveSAVtoSRAM1
+	add_predef Predef54 ; 54 initiate trade
+	add_predef HallOfFamePC
+	add_predef DisplayDexRating
 	dbw $1E, _LeaveMapAnim ; wrong bank
 	dbw $1E, Func_70510 ; wrong bank
-	dbw BANK(Func_c5be),Func_c5be
-	dbw BANK(Func_c60b),Func_c60b
-	dbw BANK(PrintStrengthTxt), PrintStrengthTxt
-	dbw BANK(PickupItem),PickupItem
-	dbw BANK(Func_27d98),Func_27d98
-	dbw BANK(LoadMovePPs),LoadMovePPs
-DrawHPBarPredef: ; 4ff96 (13:7f96)
-	dbw BANK(Func_128ef),Func_128ef ; 5F draw HP bar
-	dbw BANK(Func_128f6),Func_128f6
-	dbw BANK(Func_1c9c6),Func_1c9c6
-	dbw BANK(OaksAideScript),OaksAideScript
+	add_predef Func_c5be
+	add_predef Func_c60b
+	add_predef PrintStrengthTxt
+	add_predef PickupItem
+	add_predef Func_27d98
+	add_predef LoadMovePPs
+	add_predef DrawHP ; 5F
+	add_predef Func_128f6
+	add_predef Func_1c9c6
+	add_predef OaksAideScript
diff --git a/home/init.asm b/home/init.asm
index 1518218e..b79b19d9 100644
--- a/home/init.asm
+++ b/home/init.asm
@@ -95,8 +95,7 @@ rLCDC_DEFAULT EQU %11100011
 
 	ei
 
-	ld a, $40 ; PREDEF_SGB_BORDER
-	call Predef
+	predef LoadSGB
 
 	ld a, BANK(SFX_1f_67)
 	ld [wc0ef], a
@@ -108,8 +107,7 @@ rLCDC_DEFAULT EQU %11100011
 	dec a
 	ld [wcfcb], a
 
-	ld a, $32 ; PREDEF_INTRO
-	call Predef
+	predef PlayIntro
 
 	call DisableLCD
 	call ClearVram
diff --git a/macros.asm b/macros.asm
index 2c0d3dfb..a99a80ea 100644
--- a/macros.asm
+++ b/macros.asm
@@ -138,13 +138,23 @@ TX_BCD: MACRO
 	ENDM
 
 ; Predef macro.
-PREDEF: MACRO
-	ld a, (\1 - PredefPointers) / 3
+add_predef: MACRO
+\1Predef::
+	db BANK(\1)
+	dw \1
+	ENDM
+
+predef_id: MACRO
+	ld a, (\1Predef - PredefPointers) / 3
+	ENDM
+
+predef: MACRO
+	predef_id \1
 	call Predef
 	ENDM
 
-PREDEF_JUMP: MACRO
-	ld a, (\1 - PredefPointers) / 3
+predef_jump: MACRO
+	predef_id \1
 	jp Predef
 	ENDM
 
diff --git a/main.asm b/main.asm
index ef17ad63..324f6a11 100755
--- a/main.asm
+++ b/main.asm
@@ -494,8 +494,7 @@ TestBattle:
 	ld a, RHYDON
 	ld [W_CUROPPONENT], a
 
-	ld a, $2c ; PREDEF_BATTLE
-	call Predef
+	predef InitOpponent
 
 	; When the battle ends,
 	; do it all again.
@@ -3259,6 +3258,7 @@ IsObjectHidden: ; f1a6 (3:71a6)
 ; adds missable object (items, leg. pokemon, etc.) to the map
 ; [wcc4d]: index of the missable object to be added (global index)
 ShowObject: ; f1c8 (3:71c8)
+ShowObject2:
 	ld hl, W_MISSABLEOBJECTFLAGS
 	ld a, [wcc4d]
 	ld c, a
@@ -4136,6 +4136,9 @@ HealParty:
 
 
 DivideBCDPredef::
+DivideBCDPredef2::
+DivideBCDPredef3::
+DivideBCDPredef4::
 	call GetPredefRegisters
 
 DivideBCD::
@@ -4347,6 +4350,7 @@ SubBCD::
 
 
 InitPlayerData:
+InitPlayerData2:
 
 	call Random
 	ld a, [hRandomSub]
diff --git a/scripts/redshouse1f.asm b/scripts/redshouse1f.asm
index 4bab98fe..0e3e331b 100755
--- a/scripts/redshouse1f.asm
+++ b/scripts/redshouse1f.asm
@@ -27,7 +27,7 @@ MomHealPokemon: ; 4818a (12:418a)
 	call PrintText
 	call GBFadeOut2
 	call ReloadMapData
-	PREDEF HealPartyPredef
+	predef HealParty
 	ld a, MUSIC_PKMN_HEALED
 	ld [wc0ee], a
 	call PlaySound ; play sound?
-- 
cgit v1.3.1-sl0p


From bd533aa79bbe1998fd2b699bd7205da2de4fe55c Mon Sep 17 00:00:00 2001
From: "U-Fish-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Wed, 25 Jun 2014 16:58:27 -0400
Subject: Use *Coord instead of FuncCoord Using 'Coord =' doesn't like using
 wTileMap So use hlCoord, deCoord, bcCoord, aCoord, Coorda, or dwCoord to
 avoid static addresses

---
 engine/HoF_room_pc.asm                 |  18 +--
 engine/battle/1.asm                    |   6 +-
 engine/battle/1c.asm                   | 114 +++++++------------
 engine/battle/4_2.asm                  |  15 +--
 engine/battle/animations.asm           |  33 ++----
 engine/battle/core.asm                 | 201 +++++++++++----------------------
 engine/battle/d.asm                    |  12 +-
 engine/battle/e.asm                    |  12 +-
 engine/battle/e_2.asm                  |   6 +-
 engine/cable_club.asm                  |   6 +-
 engine/clear_save.asm                  |   3 +-
 engine/evolution.asm                   |   6 +-
 engine/hall_of_fame.asm                |  48 +++-----
 engine/hidden_object_functions17.asm   |   3 +-
 engine/hidden_object_functions3.asm    |   3 +-
 engine/intro.asm                       |   9 +-
 engine/items/items.asm                 |   9 +-
 engine/learn_move.asm                  |  12 +-
 engine/menu/bills_pc.asm               |  48 +++-----
 engine/menu/diploma.asm                |   3 +-
 engine/menu/league_pc.asm              |  12 +-
 engine/menu/main_menu.asm              |  78 +++++--------
 engine/menu/naming_screen.asm          |  30 ++---
 engine/menu/party_menu.asm             |   3 +-
 engine/menu/players_pc.asm             |   3 +-
 engine/menu/pokedex.asm                |  99 ++++++----------
 engine/menu/prize_menu.asm             |  45 +++-----
 engine/menu/start_sub_menus.asm        |  48 +++-----
 engine/menu/status_screen.asm          |  93 +++++----------
 engine/menu/vending_machine.asm        |   9 +-
 engine/oak_speech.asm                  |  12 +-
 engine/oak_speech2.asm                 |  12 +-
 engine/overworld/cinnabar_lab.asm      |   3 +-
 engine/overworld/doors.asm             |   3 +-
 engine/overworld/ledges.asm            |   3 +-
 engine/overworld/movement.asm          |   3 +-
 engine/overworld/player_animations.asm |   3 +-
 engine/overworld/pokemart.asm          |   6 +-
 engine/save.asm                        |  27 ++---
 engine/titlescreen.asm                 |  18 +--
 engine/town_map.asm                    |  36 ++----
 engine/trade.asm                       |  45 +++-----
 engine/trade2.asm                      |  30 ++---
 home.asm                               |  53 +++------
 home/overworld.asm                     |  21 ++--
 home/text.asm                          |  60 ++++------
 home/vcopy.asm                         |   9 +-
 macros.asm                             |  34 +++++-
 main.asm                               |  93 +++++----------
 scripts/bikeshop.asm                   |   6 +-
 scripts/celadongamecorner.asm          |  24 ++--
 scripts/celadonmartroof.asm            |   3 +-
 scripts/vermiliondock.asm              |   3 +-
 53 files changed, 519 insertions(+), 975 deletions(-)

(limited to 'macros.asm')

diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm
index 0ebb3b61..16a3c3f9 100755
--- a/engine/HoF_room_pc.asm
+++ b/engine/HoF_room_pc.asm
@@ -16,8 +16,7 @@ HallOfFamePC: ; 7405c (1d:405c)
 	call FillMemory
 	ld hl, wTileMap
 	call Func_7417b
-	FuncCoord 0, 14
-	ld hl, Coord
+	hlCoord 0, 14
 	call Func_7417b
 	ld a, $c0
 	ld [rBGP], a ; $ff47
@@ -62,8 +61,7 @@ DisplayCreditsMon: ; 740cb (1d:40cb)
 	ld a,[hl]
 	ld [wcf91],a
 	ld [wd0b5],a
-	FuncCoord 8, 6
-	ld hl,Coord
+	hlCoord 8, 6
 	call GetMonHeader
 	call LoadFrontSpriteByMonIndex
 	ld hl,vBGMap0 + $c
@@ -153,8 +151,7 @@ Func_7417b: ; 7417b (1d:417b)
 	jp FillMemory
 
 FillMiddleOfScreenWithWhite: ; 74183 (1d:4183)
-	FuncCoord 0, 4
-	ld hl, Coord
+	hlCoord 0, 4
 	ld bc, $c8 ; 10 rows of 20 tiles each
 	ld a, $7f ; blank white tile
 	jp FillMemory
@@ -164,8 +161,7 @@ Credits: ; 7418e (1d:418e)
 	push de
 .asm_74192
 	pop de
-	FuncCoord 9, 6
-	ld hl, Coord
+	hlCoord 9, 6
 	push hl
 	call FillMiddleOfScreenWithWhite
 	pop hl
@@ -241,12 +237,10 @@ Credits: ; 7418e (1d:418e)
 	ld hl, vChars2 + $600
 	ld bc, (BANK(TheEndGfx) << 8) + $0a
 	call CopyVideoData
-	FuncCoord 4, 8
-	ld hl, Coord
+	hlCoord 4, 8
 	ld de, TheEndTextString
 	call PlaceString
-	FuncCoord 4, 9
-	ld hl, Coord
+	hlCoord 4, 9
 	inc de
 	call PlaceString
 	jp Func_740ba
diff --git a/engine/battle/1.asm b/engine/battle/1.asm
index 7e744dba..04546313 100755
--- a/engine/battle/1.asm
+++ b/engine/battle/1.asm
@@ -67,12 +67,10 @@ Func_7861: ; 7861 (1:7861)
 .asm_789c
 	ld a, [H_WHOSETURN] ; $fff3
 	and a
-	FuncCoord 10, 9
-	ld hl, Coord
+	hlCoord 10, 9
 	ld a, $1
 	jr z, .asm_78aa
-	FuncCoord 2, 2
-	ld hl, Coord
+	hlCoord 2, 2
 	xor a
 .asm_78aa
 	ld [wListMenuID], a ; wListMenuID
diff --git a/engine/battle/1c.asm b/engine/battle/1c.asm
index 5523ba7d..b3b24007 100755
--- a/engine/battle/1c.asm
+++ b/engine/battle/1c.asm
@@ -2,8 +2,7 @@ Func_708ca: ; 708ca (1c:48ca)
 	ld a, $e4
 	ld [rOBP1], a ; $ff49
 	call Func_7092a
-	FuncCoord 12, 0
-	ld hl, Coord
+	hlCoord 12, 0
 	ld bc, $707
 	call ClearScreenArea
 	call Delay3
@@ -287,8 +286,7 @@ BattleTransition_Spiral: ; 70a72 (1c:4a72)
 	call BattleTransition_InwardSpiral
 	jr .done
 .outwardSpiral
-	FuncCoord 10, 10
-	ld hl, Coord
+	hlCoord 10, 10
 	ld a, $3
 	ld [wd09f], a
 	ld a, l
@@ -457,28 +455,20 @@ BattleTransition_Shrink: ; 70b7f (1c:4b7f)
 	push bc
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a
-	FuncCoord 0, 7
-	ld hl, Coord
-	FuncCoord 0, 8
-	ld de, Coord
+	hlCoord 0, 7
+	deCoord 0, 8
 	ld bc, $ffd8
 	call BattleTransition_CopyTiles1
-	FuncCoord 0, 10
-	ld hl, Coord
-	FuncCoord 0, 9
-	ld de, Coord
+	hlCoord 0, 10
+	deCoord 0, 9
 	ld bc, $28
 	call BattleTransition_CopyTiles1
-	FuncCoord 8, 0
-	ld hl, Coord
-	FuncCoord 9, 0
-	ld de, Coord
+	hlCoord 8, 0
+	deCoord 9, 0
 	ld bc, $fffe
 	call BattleTransition_CopyTiles2
-	FuncCoord 11, 0
-	ld hl, Coord
-	FuncCoord 10, 0
-	ld de, Coord
+	hlCoord 11, 0
+	deCoord 10, 0
 	ld bc, $2
 	call BattleTransition_CopyTiles2
 	ld a, $1
@@ -499,25 +489,19 @@ BattleTransition_Split: ; 70bca (1c:4bca)
 	ld [H_AUTOBGTRANSFERENABLED], a
 .loop
 	push bc
-	FuncCoord 0, 16
-	ld hl, Coord
-	FuncCoord 0, 17
-	ld de, Coord
+	hlCoord 0, 16
+	deCoord 0, 17
 	ld bc, $ffd8
 	call BattleTransition_CopyTiles1
-	FuncCoord 0, 1
-	ld hl, Coord
+	hlCoord 0, 1
 	ld de, wTileMap
 	ld bc, $28
 	call BattleTransition_CopyTiles1
-	FuncCoord 18, 0
-	ld hl, Coord
-	FuncCoord 19, 0
-	ld de, Coord
+	hlCoord 18, 0
+	deCoord 19, 0
 	ld bc, $fffe
 	call BattleTransition_CopyTiles2
-	FuncCoord 1, 0
-	ld hl, Coord
+	hlCoord 1, 0
 	ld de, wTileMap
 	ld bc, $2
 	call BattleTransition_CopyTiles2
@@ -615,8 +599,7 @@ BattleTransition_CopyTiles2: ; 70c3f (1c:4c3f)
 BattleTransition_VerticalStripes: ; 70c7e (1c:4c7e)
 	ld c, $12
 	ld hl, wTileMap
-	FuncCoord 1, 17
-	ld de, Coord
+	deCoord 1, 17
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a
 .loop
@@ -655,8 +638,7 @@ BattleTransition_VerticalStripes_: ; 70caa (1c:4caa)
 BattleTransition_HorizontalStripes: ; 70cb4 (1c:4cb4)
 	ld c, $14
 	ld hl, wTileMap
-	FuncCoord 19, 1
-	ld de, Coord
+	deCoord 19, 1
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a
 .loop
@@ -777,104 +759,84 @@ BattleTransition_Circle_Sub2: ; 70d50 (1c:4d50)
 BattleTransition_HalfCircle1: ; 70d61 (1c:4d61)
 	db $01
 	dw BattleTransition_CircleData1
-	FuncCoord 18, 6
-	dw Coord
+	dwCoord 18, 6
 
 	db $01
 	dw BattleTransition_CircleData2
-	FuncCoord 19, 3
-	dw Coord
+	dwCoord 19, 3
 
 	db $01
 	dw BattleTransition_CircleData3
-	FuncCoord 18, 0
-	dw Coord
+	dwCoord 18, 0
 
 	db $01
 	dw BattleTransition_CircleData4
-	FuncCoord 14, 0
-	dw Coord
+	dwCoord 14, 0
 
 	db $01
 	dw BattleTransition_CircleData5
-	FuncCoord 10, 0
-	dw Coord
+	dwCoord 10, 0
 
 	db $00
 	dw BattleTransition_CircleData5
-	FuncCoord 9, 0
-	dw Coord
+	dwCoord 9, 0
 
 	db $00
 	dw BattleTransition_CircleData4
-	FuncCoord 5, 0
-	dw Coord
+	dwCoord 5, 0
 
 	db $00
 	dw BattleTransition_CircleData3
-	FuncCoord 1, 0
-	dw Coord
+	dwCoord 1, 0
 
 	db $00
 	dw BattleTransition_CircleData2
-	FuncCoord 0, 3
-	dw Coord
+	dwCoord 0, 3
 
 	db $00
 	dw BattleTransition_CircleData1
-	FuncCoord 1, 6
-	dw Coord
+	dwCoord 1, 6
 
 BattleTransition_HalfCircle2: ; 70d93 (1c:4d93)
 	db $00
 	dw BattleTransition_CircleData1
-	FuncCoord 1, 11
-	dw Coord
+	dwCoord 1, 11
 
 	db $00
 	dw BattleTransition_CircleData2
-	FuncCoord 0, 14
-	dw Coord
+	dwCoord 0, 14
 
 	db $00
 	dw BattleTransition_CircleData3
-	FuncCoord 1, 17
-	dw Coord
+	dwCoord 1, 17
 
 	db $00
 	dw BattleTransition_CircleData4
-	FuncCoord 5, 17
-	dw Coord
+	dwCoord 5, 17
 
 	db $00
 	dw BattleTransition_CircleData5
-	FuncCoord 9, 17
-	dw Coord
+	dwCoord 9, 17
 
 	db $01
 	dw BattleTransition_CircleData5
-	FuncCoord 10, 17
-	dw Coord
+	dwCoord 10, 17
 
 	db $01
 	dw BattleTransition_CircleData4
-	FuncCoord 14, 17
-	dw Coord
+	dwCoord 14, 17
 
 	db $01
 	dw BattleTransition_CircleData3
-	FuncCoord 18, 17
-	dw Coord
+	dwCoord 18, 17
 
 	db $01
 	dw BattleTransition_CircleData2
-	FuncCoord 19, 14
-	dw Coord
+	dwCoord 19, 14
 
 	db $01
 	dw BattleTransition_CircleData1
-	FuncCoord 18, 11
-	dw Coord
+	dwCoord 18, 11
 
 BattleTransition_Circle_Sub3: ; 70dc5 (1c:4dc5)
 	push hl
diff --git a/engine/battle/4_2.asm b/engine/battle/4_2.asm
index db9d076f..c5c62796 100755
--- a/engine/battle/4_2.asm
+++ b/engine/battle/4_2.asm
@@ -18,8 +18,7 @@ Func_137aa: ; 137aa (4:77aa)
 	jr z, .asm_137de
 	ld de, DrawText
 .asm_137de
-	FuncCoord 6, 8
-	ld hl, Coord
+	hlCoord 6, 8
 	call PlaceString
 	ld c, $c8
 	call DelayFrames
@@ -110,8 +109,7 @@ Func_13870: ; 13870 (4:7870)
 	jr z, .asm_13905
 	ld [wd0db], a
 .asm_1389e
-	FuncCoord 9, 9
-	ld hl, Coord
+	hlCoord 9, 9
 	ld c, [hl]
 	ld a, [W_GRASSTILE]
 	cp c
@@ -145,8 +143,7 @@ Func_13870: ; 13870 (4:7870)
 .asm_138d7
 	ld c, [hl]
 	ld hl, W_GRASSMONS ; wd888
-	FuncCoord 8, 9
-	ld a, [Coord]
+	aCoord 8, 9
 	cp $14
 	jr nz, .asm_138e5
 	ld hl, W_WATERMONS ; wd8a5 (aliases: wEnemyMon1HP)
@@ -250,14 +247,12 @@ RecoilEffect_: ; 1392c (4:792c)
 	ld [hli], a
 	ld [hl], a
 .asm_13982
-	FuncCoord 10, 9
-	ld hl, Coord
+	hlCoord 10, 9
 	ld a, [H_WHOSETURN] ; $fff3
 	and a
 	ld a, $1
 	jr z, .asm_13990
-	FuncCoord 2, 2
-	ld hl, Coord
+	hlCoord 2, 2
 	xor a
 .asm_13990
 	ld [wListMenuID], a ; wListMenuID
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm
index 8fad427a..cc598de4 100755
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -754,8 +754,7 @@ DoBallTossSpecialEffects: ; 78f3e (1e:4f3e)
 	cp a,1
 	ret nz
 .moveGhostMarowakLeft
-	FuncCoord 17,0
-	ld hl,Coord
+	hlCoord 17, 0
 	ld de,20
 	ld bc,$0707 ; 7 rows and 7 columns
 .loop
@@ -854,8 +853,7 @@ DoExplodeSpecialEffects: ; 79009 (1e:5009)
 	cp a,1 ; is it the end of the subanimation?
 	jr nz,FlashScreenEveryFourFrameBlocks
 ; if it's the end of the subanimation, make the attacking pokemon disappear
-	FuncCoord 1, 5
-	ld hl,Coord
+	hlCoord 1, 5
 	jp AnimationHideMonPic ; make pokemon disappear
 
 ; flashes the screen when subanimation counter is 1 modulo 4
@@ -1561,11 +1559,9 @@ AnimationMoveMonHorizontally: ; 793f9 (1e:53f9)
 	call AnimationHideMonPic
 	ld a, [H_WHOSETURN] ; $fff3
 	and a
-	FuncCoord 2, 5
-	ld hl, Coord
+	hlCoord 2, 5
 	jr z, .asm_79407
-	FuncCoord 11, 0
-	ld hl, Coord
+	hlCoord 11, 0
 .asm_79407
 	xor a
 	push hl
@@ -1676,16 +1672,12 @@ AnimationSquishMonPic: ; 794a1 (1e:54a1)
 	ld a, [H_WHOSETURN] ; $fff3
 	and a
 	jr z, .asm_794b1
-	FuncCoord 16, 0
-	ld hl, Coord
-	FuncCoord 14, 0
-	ld de, Coord
+	hlCoord 16, 0
+	deCoord 14, 0
 	jr .asm_794b7
 .asm_794b1
-	FuncCoord 5, 5
-	ld hl, Coord
-	FuncCoord 3, 5
-	ld de, Coord
+	hlCoord 5, 5
+	deCoord 3, 5
 .asm_794b7
 	push de
 	xor a
@@ -1889,12 +1881,10 @@ Func_795f8: ; 795f8 (1e:55f8)
 	ld a, [H_WHOSETURN] ; $fff3
 	and a
 	jr z, .asm_79602
-	FuncCoord 12, 0
-	ld hl, Coord
+	hlCoord 12, 0
 	jr .asm_79605
 .asm_79602
-	FuncCoord 0, 5
-	ld hl, Coord
+	hlCoord 0, 5
 .asm_79605
 	ld d, $8
 .asm_79607
@@ -2128,8 +2118,7 @@ Func_79793: ; 79793 (1e:5793)
 	xor a
 	ld [W_SPRITEFLIPPED], a
 	call GetMonHeader
-	FuncCoord 12, 0
-	ld hl, Coord
+	hlCoord 12, 0
 	call LoadFrontSpriteByMonIndex
 	jr .asm_797d3
 .asm_797b0
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 4f382df7..b3495a29 100755
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -96,8 +96,7 @@ Func_3c04c: ; 3c04c (f:404c)
 	ld a, $1
 	ld [wd125], a
 	call DisplayTextBoxID
-	FuncCoord 1, 5
-	ld hl, Coord
+	hlCoord 1, 5
 	ld bc, $307
 	call ClearScreenArea
 	call DisableLCD
@@ -171,8 +170,7 @@ Func_3c04c: ; 3c04c (f:404c)
 	ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
 	ld a, $31
 	ld [$ffe1], a
-	FuncCoord 1, 5
-	ld hl, Coord
+	hlCoord 1, 5
 	predef Func_3f0c6
 	xor a
 	ld [$ffb0], a
@@ -309,8 +307,7 @@ Func_3c1ad: ; 3c1ad (f:41ad)
 	ld [wcf91], a
 	ld [wBattleMonSpecies2], a
 	call LoadScreenTilesFromBuffer1
-	FuncCoord 1, 5
-	ld hl, Coord
+	hlCoord 1, 5
 	ld a, $9
 	call Func_3c8df
 	call SaveScreenTilesToBuffer1
@@ -736,14 +733,12 @@ HandlePoisonBurnLeechSeed_IncreaseEnemyHP: ; 3c4a3 (f:44a3)
 	ret
 
 UpdateCurMonHPBar: ; 3c4f6 (f:44f6)
-	FuncCoord 10, 9
-	ld hl, Coord    ; tile pointer to player HP bar
+	hlCoord 10, 9    ; tile pointer to player HP bar
 	ld a, [H_WHOSETURN] ; $fff3
 	and a
 	ld a, $1
 	jr z, .playersTurn
-	FuncCoord 2, 2
-	ld hl, Coord    ; tile pointer to enemy HP bar
+	hlCoord 2, 2    ; tile pointer to enemy HP bar
 	xor a
 .playersTurn
 	push bc
@@ -828,10 +823,8 @@ FaintEnemyPokemon ; 0x3c567
 	ld hl, wccf1
 	ld [hli], a
 	ld [hl], a
-	FuncCoord 12, 5
-	ld hl, Coord
-	FuncCoord 12, 6
-	ld de, Coord
+	hlCoord 12, 5
+	deCoord 12, 6
 	call Func_3c893
 	ld hl, wTileMap
 	ld bc, $40b
@@ -1063,14 +1056,11 @@ Func_3c741: ; 3c741 (f:4741)
 	ld [hl], a
 	ld [wBattleMonStatus], a ; wBattleMonStatus
 	call ReadPlayerMonCurHPAndStatus
-	FuncCoord 9, 7
-	ld hl, Coord
+	hlCoord 9, 7
 	ld bc, $50b
 	call ClearScreenArea
-	FuncCoord 1, 10
-	ld hl, Coord
-	FuncCoord 1, 11
-	ld de, Coord
+	hlCoord 1, 10
+	deCoord 1, 11
 	call Func_3c893
 	ld a, $1
 	ld [wcf0b], a
@@ -1096,8 +1086,7 @@ Func_3c79b: ; 3c79b (f:479b)
 	ld hl, UseNextMonText
 	call PrintText
 .asm_3c7ad
-	FuncCoord 13, 9
-	ld hl, Coord
+	hlCoord 13, 9
 	ld bc, $a0e
 	ld a, $14
 	ld [wd125], a
@@ -1333,8 +1322,7 @@ Func_3c92a: ; 3c92a (f:492a)
 	ld [wAICount],a
 	ld hl,W_PLAYERBATTSTATUS1
 	res 5,[hl]
-	FuncCoord 18, 0
-	ld hl,Coord
+	hlCoord 18, 0
 	ld a,8
 	call Func_3c8df
 	call Func_3ee94
@@ -1404,8 +1392,7 @@ Func_3c92a: ; 3c92a (f:492a)
 	jr nz,.next4
 	ld hl, TrainerAboutToUseText
 	call PrintText
-	FuncCoord 0, 7
-	ld hl,Coord
+	hlCoord 0, 7
 	ld bc,$0801
 	ld a,$14
 	ld [wd125],a
@@ -1456,8 +1443,7 @@ Func_3c92a: ; 3c92a (f:492a)
 	call LoadMonFrontSprite
 	ld a,$CF
 	ld [$FFE1],a
-	FuncCoord 15, 6
-	ld hl,Coord
+	hlCoord 15, 6
 	predef Func_3f073
 	ld a,[wEnemyMonSpecies2]
 	call PlayCry
@@ -1777,8 +1763,7 @@ Func_3cca4: ; 3cca4 (f:4ca4)
 	ld [H_WHOSETURN], a ; $fff3
 	ld a, POOF_ANIM
 	call PlayMoveAnimation
-	FuncCoord 4, 11
-	ld hl, Coord
+	hlCoord 4, 11
 	predef Func_3f073
 	ld a, [wcf91]
 	call PlayCry
@@ -1786,12 +1771,10 @@ Func_3cca4: ; 3cca4 (f:4ca4)
 	jp SaveScreenTilesToBuffer1
 
 Func_3ccfa: ; 3ccfa (f:4cfa)
-	FuncCoord 1, 5
-	ld hl, Coord
+	hlCoord 1, 5
 	ld bc, $707
 	call ClearScreenArea
-	FuncCoord 3, 7
-	ld hl, Coord
+	hlCoord 3, 7
 	ld bc, $505
 	xor a
 	ld [wcd6c], a
@@ -1800,8 +1783,7 @@ Func_3ccfa: ; 3ccfa (f:4cfa)
 	ld c, $4
 	call DelayFrames
 	call Func_3cd3a
-	FuncCoord 4, 9
-	ld hl, Coord
+	hlCoord 4, 9
 	ld bc, $303
 	ld a, $1
 	ld [wcd6c], a
@@ -1811,12 +1793,10 @@ Func_3ccfa: ; 3ccfa (f:4cfa)
 	call Delay3
 	call Func_3cd3a
 	ld a, $4c
-	FuncCoord 5, 11
-	ld [Coord], a
+	Coorda 5, 11
 
 Func_3cd3a: ; 3cd3a (f:4d3a)
-	FuncCoord 1, 5
-	ld hl, Coord
+	hlCoord 1, 5
 	ld bc, $707
 	jp ClearScreenArea
 
@@ -1839,17 +1819,14 @@ Func_3cd5a: ; 3cd5a (f:4d5a)
 Func_3cd60: ; 3cd60 (f:4d60)
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
-	FuncCoord 9, 7
-	ld hl, Coord
+	hlCoord 9, 7
 	ld bc, $50b
 	call ClearScreenArea
 	callab PlacePlayerHUDTiles
-	FuncCoord 18, 9
-	ld hl, Coord
+	hlCoord 18, 9
 	ld [hl], $73
 	ld de, wBattleMonNick
-	FuncCoord 10, 7
-	ld hl, Coord
+	hlCoord 10, 7
 	call Func_3ce9c
 	call PlaceString
 	ld hl, wBattleMonSpecies
@@ -1860,8 +1837,7 @@ Func_3cd60: ; 3cd60 (f:4d60)
 	ld de, wcfb9
 	ld bc, $b
 	call CopyData
-	FuncCoord 14, 8
-	ld hl, Coord
+	hlCoord 14, 8
 	push hl
 	inc hl
 	ld de, wcf9c
@@ -1872,8 +1848,7 @@ Func_3cd60: ; 3cd60 (f:4d60)
 .asm_3cdae
 	ld a, [wcf98]
 	ld [wcf91], a
-	FuncCoord 10, 9
-	ld hl, Coord
+	hlCoord 10, 9
 	predef DrawHP 
 	ld a, $1
 	ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
@@ -1910,12 +1885,10 @@ Func_3cdec: ; 3cdec (f:4dec)
 	call ClearScreenArea
 	callab PlaceEnemyHUDTiles
 	ld de, wEnemyMonNick
-	FuncCoord 1, 0
-	ld hl, Coord
+	hlCoord 1, 0
 	call Func_3ce9c
 	call PlaceString
-	FuncCoord 4, 1
-	ld hl, Coord
+	hlCoord 4, 1
 	push hl
 	inc hl
 	ld de, wEnemyMonStatus ; wcfe9
@@ -1984,8 +1957,7 @@ Func_3cdec: ; 3cdec (f:4dec)
 Func_3ce7f: ; 3ce7f (f:4e7f)
 	xor a
 	ld [wListMenuID], a ; wListMenuID
-	FuncCoord 2, 2
-	ld hl, Coord
+	hlCoord 2, 2
 	call DrawHPBar
 	ld a, $1
 	ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
@@ -2055,14 +2027,12 @@ InitBattleMenu: ; 3ceb3 (f:4eb3)
 	ld bc, $b
 	call CopyData
 	; the following simulates the keystrokes by drawing menus on screen
-	FuncCoord 9, 14
-	ld hl, Coord
+	hlCoord 9, 14
 	ld [hl], "▶"
 	ld c, $50
 	call DelayFrames
 	ld [hl], $7f
-	FuncCoord 9, 16
-	ld hl, Coord
+	hlCoord 9, 16
 	ld [hl], "▶"
 	ld c, $32
 	call DelayFrames
@@ -2087,19 +2057,14 @@ RegularBattleMenu: ; 3cf1a (f:4f1a)
 	cp $2
 	ld a, " "
 	jr z, .safaribattle
-	FuncCoord 15, 14
-	ld [Coord], a
-	FuncCoord 15, 16
-	ld [Coord], a
+	Coorda 15, 14
+	Coorda 15, 16
 	ld b, $9
 	jr .notsafari
 .safaribattle
-	FuncCoord 13, 14
-	ld [Coord], a
-	FuncCoord 13, 16
-	ld [Coord], a
-	FuncCoord 7, 14
-	ld hl, Coord
+	Coorda 13, 14
+	Coorda 13, 16
+	hlCoord 7, 14
 	ld de, W_NUMSAFARIBALLS ; W_NUMSAFARIBALLS
 	ld bc, $102
 	call PrintNumber
@@ -2124,19 +2089,14 @@ RegularBattleMenu: ; 3cf1a (f:4f1a)
 	cp $2
 	ld a, " "
 	jr z, .safarirightcolumn
-	FuncCoord 9, 14
-	ld [Coord], a
-	FuncCoord 9, 16
-	ld [Coord], a
+	Coorda 9, 14
+	Coorda 9, 16
 	ld b, $f
 	jr .notsafarirightcolumn
 .safarirightcolumn
-	FuncCoord 1, 14
-	ld [Coord], a
-	FuncCoord 1, 16
-	ld [Coord], a
-	FuncCoord 7, 14
-	ld hl, Coord
+	Coorda 1, 14
+	Coorda 1, 16
+	hlCoord 7, 14
 	ld de, W_NUMSAFARIBALLS ; W_NUMSAFARIBALLS
 	ld bc, $102
 	call PrintNumber
@@ -2328,8 +2288,7 @@ asm_3d0f0: ; 3d0f0 (f:50f0)
 	jp InitBattleMenu
 
 Func_3d105: ; 3d105 (f:5105)
-	FuncCoord 11, 11
-	ld hl, Coord
+	hlCoord 11, 11
 	ld bc, $81
 	ld a, $7f
 	call FillMemory
@@ -2484,21 +2443,17 @@ MoveSelectionMenu: ; 3d219 (f:5219)
 	ret z
 	ld hl, wBattleMonMoves
 	call .loadmoves
-	FuncCoord 4, 12
-	ld hl, Coord
+	hlCoord 4, 12
 	ld b, $4
 	ld c, $e
 	di
 	call TextBoxBorder
-	FuncCoord 4, 12
-	ld hl, Coord
+	hlCoord 4, 12
 	ld [hl], $7a
-	FuncCoord 10, 12
-	ld hl, Coord
+	hlCoord 10, 12
 	ld [hl], $7e
 	ei
-	FuncCoord 6, 13
-	ld hl, Coord
+	hlCoord 6, 13
 	call .writemoves
 	ld b, $5
 	ld a, $c
@@ -2506,13 +2461,11 @@ MoveSelectionMenu: ; 3d219 (f:5219)
 .mimicmenu
 	ld hl, wEnemyMonMoves
 	call .loadmoves
-	FuncCoord 0, 7
-	ld hl, Coord
+	hlCoord 0, 7
 	ld b, $4
 	ld c, $e
 	call TextBoxBorder
-	FuncCoord 2, 8
-	ld hl, Coord
+	hlCoord 2, 8
 	call .writemoves
 	ld b, $1
 	ld a, $7
@@ -2523,13 +2476,11 @@ MoveSelectionMenu: ; 3d219 (f:5219)
 	ld bc, $2c
 	call AddNTimes
 	call .loadmoves
-	FuncCoord 4, 7
-	ld hl, Coord
+	hlCoord 4, 7
 	ld b, $4
 	ld c, $e
 	call TextBoxBorder
-	FuncCoord 6, 8
-	ld hl, Coord
+	hlCoord 6, 8
 	call .writemoves
 	ld b, $5
 	ld a, $7
@@ -2584,8 +2535,7 @@ Func_3d2fe: ; 3d2fe (f:52fe)
 	jr z, .battleselect
 	dec a
 	jr nz, .select
-	FuncCoord 1, 14
-	ld hl, Coord
+	hlCoord 1, 14
 	ld de, WhichTechniqueString ; $53b8
 	call PlaceString
 	jr .select
@@ -2597,8 +2547,7 @@ Func_3d2fe: ; 3d2fe (f:52fe)
 	ld a, [wcc35]
 	and a
 	jr z, .select
-	FuncCoord 5, 13
-	ld hl, Coord
+	hlCoord 5, 13
 	dec a
 	ld bc, $14
 	call AddNTimes
@@ -2834,8 +2783,7 @@ asm_3d4ad: ; 3d4ad (f:54ad)
 Func_3d4b6: ; 3d4b6 (f:54b6)
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
-	FuncCoord 0, 8
-	ld hl, Coord
+	hlCoord 0, 8
 	ld b, $3
 	ld c, $9
 	call TextBoxBorder
@@ -2848,8 +2796,7 @@ Func_3d4b6: ; 3d4b6 (f:54b6)
 	ld a, [wCurrentMenuItem] ; wCurrentMenuItem
 	cp b
 	jr nz, .asm_3d4df
-	FuncCoord 1, 10
-	ld hl, Coord
+	hlCoord 1, 10
 	ld de, DisabledText
 	call PlaceString
 	jr .asm_3d54e
@@ -2879,29 +2826,23 @@ Func_3d4b6: ; 3d4b6 (f:54b6)
 	ld a, [hl]
 	and $3f
 	ld [wcd6d], a
-	FuncCoord 1, 9
-	ld hl, Coord
+	hlCoord 1, 9
 	ld de, TypeText
 	call PlaceString
-	FuncCoord 7, 11
-	ld hl, Coord
+	hlCoord 7, 11
 	ld [hl], "/"
-	FuncCoord 5, 9
-	ld hl, Coord
+	hlCoord 5, 9
 	ld [hl], "/"
-	FuncCoord 5, 11
-	ld hl, Coord
+	hlCoord 5, 11
 	ld de, wcd6d
 	ld bc, $102
 	call PrintNumber
-	FuncCoord 8, 11
-	ld hl, Coord
+	hlCoord 8, 11
 	ld de, wd11e
 	ld bc, $102
 	call PrintNumber
 	call GetCurrentMove
-	FuncCoord 2, 10
-	ld hl, Coord
+	hlCoord 2, 10
 	predef Func_27d98
 .asm_3d54e
 	ld a, $1
@@ -4773,8 +4714,7 @@ ApplyDamageToEnemyPokemon: ; 3e142 (f:6142)
 	ld [wHPBarNewHP+1],a
 	ld a,[hl]
 	ld [wHPBarNewHP],a
-	FuncCoord 2, 2
-	ld hl,Coord
+	hlCoord 2, 2
 	xor a
 	ld [wListMenuID],a
 	predef UpdateHPBar2 ; animate the HP bar shortening
@@ -4892,8 +4832,7 @@ ApplyDamageToPlayerPokemon: ; 3e200 (f:6200)
 	ld [wHPBarMaxHP+1],a
 	ld a,[hl]
 	ld [wHPBarMaxHP],a
-	FuncCoord 10, 9
-	ld hl,Coord
+	hlCoord 10, 9
 	ld a,$01
 	ld [wListMenuID],a
 	predef UpdateHPBar2 ; animate the HP bar shortening
@@ -6274,8 +6213,7 @@ Func_3ec92: ; 3ec92 (f:6c92)
 	ld [$0], a
 	ld a, $31
 	ld [$ffe1], a
-	FuncCoord 1, 5
-	ld hl, Coord
+	hlCoord 1, 5
 	predef_jump Func_3f0c6
 
 Func_3ed02: ; 3ed02 (f:6d02)
@@ -6676,8 +6614,7 @@ asm_3ef3d: ; 3ef3d (f:6f3d)
 	ld [$ffe1], a
 	dec a
 	ld [wAICount], a ; wccdf
-	FuncCoord 12, 0
-	ld hl, Coord
+	hlCoord 12, 0
 	predef Func_3f0c6
 	ld a, $ff
 	ld [wEnemyMonPartyPos], a
@@ -6731,8 +6668,7 @@ InitWildBattle: ; 3ef8b (f:6f8b)
 	xor a
 	ld [W_TRAINERCLASS], a ; wd031
 	ld [$ffe1], a
-	FuncCoord 12, 0
-	ld hl, Coord
+	hlCoord 12, 0
 	predef Func_3f0c6
 
 Func_3efeb: ; 3efeb (f:6feb)
@@ -6753,12 +6689,10 @@ Func_3efeb: ; 3efeb (f:6feb)
 	ld a, $9c
 	ld [$ffbd], a
 	call LoadScreenTilesFromBuffer1
-	FuncCoord 9, 7
-	ld hl, Coord
+	hlCoord 9, 7
 	ld bc, $50a
 	call ClearScreenArea
-	FuncCoord 1, 0
-	ld hl, Coord
+	hlCoord 1, 0
 	ld bc, $40a
 	call ClearScreenArea
 	call ClearSprites
@@ -6900,8 +6834,7 @@ LoadMonBackPic:
 ; been loaded with GetMonHeader.
 	ld a, [wBattleMonSpecies2]
 	ld [wcf91], a
-	FuncCoord 1, 5
-	ld hl, Coord
+	hlCoord 1, 5
 	ld b, $7
 	ld c, $8
 	call ClearScreenArea
diff --git a/engine/battle/d.asm b/engine/battle/d.asm
index 5a1010b8..d23c9114 100755
--- a/engine/battle/d.asm
+++ b/engine/battle/d.asm
@@ -1,20 +1,16 @@
 Func_372d6: ; 372d6 (d:72d6)
 	call LoadTextBoxTilePatterns
-	FuncCoord 3, 4
-	ld hl, Coord
+	hlCoord 3, 4
 	ld b, $7
 	ld c, $c
 	call TextBoxBorder
-	FuncCoord 4, 5
-	ld hl, Coord
+	hlCoord 4, 5
 	ld de, wPlayerName ; wd158
 	call PlaceString
-	FuncCoord 4, 10
-	ld hl, Coord
+	hlCoord 4, 10
 	ld de, W_GRASSRATE ; W_GRASSRATE
 	call PlaceString
-	FuncCoord 9, 8
-	ld hl, Coord
+	hlCoord 9, 8
 	ld a, $69
 	ld [hli], a
 	ld [hl], $6a
diff --git a/engine/battle/e.asm b/engine/battle/e.asm
index 3e9f3685..8b0476ca 100755
--- a/engine/battle/e.asm
+++ b/engine/battle/e.asm
@@ -67,8 +67,7 @@ _ScrollTrainerPicAfterBattle: ; 396d3 (e:56d3)
 	ld b, $1
 	call GoPAL_SET
 	callab _LoadTrainerPic
-	FuncCoord 19, 0
-	ld hl, Coord
+	hlCoord 19, 0
 	ld c, $0
 .asm_396e9
 	inc c
@@ -1173,8 +1172,7 @@ AIRecoverHP: ; 3a6da (e:66da)
 
 Func_3a718: ; 3a718 (e:6718)
 	call AIPrintItemUse_
-	FuncCoord 2, 2
-	ld hl,Coord
+	hlCoord 2, 2
 	xor a
 	ld [wListMenuID],a
 	predef UpdateHPBar2
@@ -1489,8 +1487,7 @@ PlacePlayerHUDTiles: ; 3a902 (e:6902)
 	ld de, wTrainerFacingDirection
 	ld bc, $3
 	call CopyData
-	FuncCoord 18, 10
-	ld hl, Coord
+	hlCoord 18, 10
 	ld de, rIE ; $ffff
 	jr PlaceHUDTiles
 
@@ -1505,8 +1502,7 @@ PlaceEnemyHUDTiles: ; 3a919 (e:6919)
 	ld de, wTrainerFacingDirection
 	ld bc, $3
 	call CopyData
-	FuncCoord 1, 2
-	ld hl, Coord
+	hlCoord 1, 2
 	ld de, $1
 	jr PlaceHUDTiles
 
diff --git a/engine/battle/e_2.asm b/engine/battle/e_2.asm
index f6d65301..665807fe 100755
--- a/engine/battle/e_2.asm
+++ b/engine/battle/e_2.asm
@@ -85,12 +85,10 @@ HealEffect_: ; 3b9ec (e:79ec)
 	call BankswitchEtoF
 	ld a, [H_WHOSETURN] ; $fff3
 	and a
-	FuncCoord 10, 9
-	ld hl, Coord
+	hlCoord 10, 9
 	ld a, $1
 	jr z, .asm_3ba83
-	FuncCoord 2, 2
-	ld hl, Coord
+	hlCoord 2, 2
 	xor a
 .asm_3ba83
 	ld [wListMenuID], a ; wListMenuID
diff --git a/engine/cable_club.asm b/engine/cable_club.asm
index 75d8bd00..fc049ceb 100755
--- a/engine/cable_club.asm
+++ b/engine/cable_club.asm
@@ -6,13 +6,11 @@ Func_5317: ; 5317 (1:5317)
 	call LoadFontTilePatterns
 	call LoadHpBarAndStatusTilePatterns
 	call LoadTrainerInfoTextBoxTiles
-	FuncCoord 3, 8
-	ld hl, Coord
+	hlCoord 3, 8
 	ld b, $2
 	ld c, $c
 	call Func_5ab3
-	FuncCoord 4, 10
-	ld hl, Coord
+	hlCoord 4, 10
 	ld de, PleaseWaitString ; $550f
 	call PlaceString
 	ld hl, W_NUMHITS ; wd074
diff --git a/engine/clear_save.asm b/engine/clear_save.asm
index 3a296e2e..5ef0d475 100755
--- a/engine/clear_save.asm
+++ b/engine/clear_save.asm
@@ -5,8 +5,7 @@ Func_1c98a: ; 1c98a (7:498a)
 	call LoadTextBoxTilePatterns
 	ld hl, ClearSaveDataText
 	call PrintText
-	FuncCoord 14, 7
-	ld hl, Coord
+	hlCoord 14, 7
 	ld bc, $80f
 	ld a, $7
 	ld [wd12c], a
diff --git a/engine/evolution.asm b/engine/evolution.asm
index 8e511182..07ccdbda 100755
--- a/engine/evolution.asm
+++ b/engine/evolution.asm
@@ -99,8 +99,7 @@ Func_7beb4: ; 7beb4 (1e:7eb4)
 
 Func_7beb9: ; 7beb9 (1e:7eb9)
 	call GetMonHeader
-	FuncCoord 7, 2
-	ld hl, Coord
+	hlCoord 7, 2
 	jp LoadFlippedFrontSpriteByMonIndex
 asm_7bec2: ; 7bec2 (1e:7ec2)
 	ld a, $31
@@ -117,8 +116,7 @@ Func_7bed6: ; 7bed6 (1e:7ed6)
 	push bc
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
-	FuncCoord 7, 2
-	ld hl, Coord
+	hlCoord 7, 2
 	ld bc, $707
 	ld de, $d
 .asm_7bee3
diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm
index caadce13..f4384b91 100755
--- a/engine/hall_of_fame.asm
+++ b/engine/hall_of_fame.asm
@@ -57,13 +57,11 @@ AnimateHallOfFame: ; 701a0 (1c:41a0)
 	call Func_702e1
 	ld c, $50
 	call DelayFrames
-	FuncCoord 2, 13
-	ld hl, Coord
+	hlCoord 2, 13
 	ld b, $3
 	ld c, $e
 	call TextBoxBorder
-	FuncCoord 4, 15
-	ld hl, Coord
+	hlCoord 4, 15
 	ld de, HallOfFameText
 	call PlaceString
 	ld c, 180
@@ -113,8 +111,7 @@ Func_70278: ; 70278 (1c:4278)
 	call Func_7033e
 	jr .asm_702ab
 .asm_7029d
-	FuncCoord 12, 5
-	ld hl, Coord
+	hlCoord 12, 5
 	call GetMonHeader
 	call LoadFrontSpriteByMonIndex
 	predef LoadMonBackPic
@@ -157,27 +154,22 @@ Func_702e1: ; 702e1 (1c:42e1)
 	jp Func_70404
 
 Func_702f0: ; 702f0 (1c:42f0)
-	FuncCoord 0, 2
-	ld hl, Coord
+	hlCoord 0, 2
 	ld b, $9
 	ld c, $a
 	call TextBoxBorder
-	FuncCoord 2, 6
-	ld hl, Coord
+	hlCoord 2, 6
 	ld de, HoFMonInfoText
 	call PlaceString
-	FuncCoord 1, 4
-	ld hl, Coord
+	hlCoord 1, 4
 	ld de, wcd6d
 	call PlaceString
 	ld a, [wTrainerFacingDirection]
-	FuncCoord 8, 7
-	ld hl, Coord
+	hlCoord 8, 7
 	call PrintLevelCommon
 	ld a, [wWhichTrade] ; wWhichTrade
 	ld [wd0b5], a
-	FuncCoord 3, 9
-	ld hl, Coord
+	hlCoord 3, 9
 	predef Func_27d6b
 	ld a, [wWhichTrade] ; wWhichTrade
 	jp PlayCry
@@ -207,34 +199,28 @@ Func_7033e: ; 7033e (1c:433e)
 
 Func_7036d: ; 7036d (1c:436d)
 	ld b, $0
-	FuncCoord 12, 5
-	ld hl, Coord
+	hlCoord 12, 5
 	predef_jump Func_79dda
 
 Func_70377: ; 70377 (1c:4377)
 	ld hl, wd747
 	set 3, [hl]
 	predef DisplayDexRating
-	FuncCoord 0, 4
-	ld hl, Coord
+	hlCoord 0, 4
 	ld b, $6
 	ld c, $a
 	call TextBoxBorder
-	FuncCoord 5, 0
-	ld hl, Coord
+	hlCoord 5, 0
 	ld b, $2
 	ld c, $9
 	call TextBoxBorder
-	FuncCoord 7, 2
-	ld hl, Coord
+	hlCoord 7, 2
 	ld de, wPlayerName ; wd158
 	call PlaceString
-	FuncCoord 1, 6
-	ld hl, Coord
+	hlCoord 1, 6
 	ld de, HoFPlayTimeText
 	call PlaceString
-	FuncCoord 5, 7
-	ld hl, Coord
+	hlCoord 5, 7
 	ld de, W_PLAYTIMEHOURS + 1
 	ld bc, $103
 	call PrintNumber
@@ -243,12 +229,10 @@ Func_70377: ; 70377 (1c:4377)
 	ld de, W_PLAYTIMEMINUTES + 1
 	ld bc, $8102
 	call PrintNumber
-	FuncCoord 1, 9
-	ld hl, Coord
+	hlCoord 1, 9
 	ld de, HoFMoneyText
 	call PlaceString
-	FuncCoord 4, 10
-	ld hl, Coord
+	hlCoord 4, 10
 	ld de, wPlayerMoney ; wPlayerMoney
 	ld c, $a3
 	call PrintBCDNumber
diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm
index d2408a5b..f0126b65 100755
--- a/engine/hidden_object_functions17.asm
+++ b/engine/hidden_object_functions17.asm
@@ -77,8 +77,7 @@ DisplayMonFrontSpriteInBox: ; 5dbd9 (17:5bd9)
 	call LoadMonFrontSprite
 	ld a, $80
 	ld [$ffe1], a
-	FuncCoord 10, 11
-	ld hl, Coord
+	hlCoord 10, 11
 	predef Func_3f073
 	call WaitForTextScrollButtonPress
 	call LoadScreenTilesFromBuffer1
diff --git a/engine/hidden_object_functions3.asm b/engine/hidden_object_functions3.asm
index a71ef667..e613df2e 100755
--- a/engine/hidden_object_functions3.asm
+++ b/engine/hidden_object_functions3.asm
@@ -5,8 +5,7 @@ PrintBookshelfText: ; fb50 (3:7b50)
 	jr nz, .asm_fb7f
 	ld a, [W_CURMAPTILESET] ; W_CURMAPTILESET
 	ld b, a
-	FuncCoord 8, 7
-	ld a, [Coord]
+	aCoord 8, 7
 	ld c, a
 	ld hl, BookshelfTileIDs ; $7b8b
 .asm_fb62
diff --git a/engine/intro.asm b/engine/intro.asm
index 2b8c2dbf..801324a5 100755
--- a/engine/intro.asm
+++ b/engine/intro.asm
@@ -204,8 +204,7 @@ Func_417f0: ; 417f0 (10:57f0)
 	jr asm_417fe
 
 Func_417f8: ; 417f8 (10:57f8)
-	FuncCoord 0, 4
-	ld hl, Coord
+	hlCoord 0, 4
 	ld bc, $c8
 asm_417fe: ; 417fe (10:57fe)
 	ld [hl], $0
@@ -259,8 +258,7 @@ Func_4180e: ; 4180e (10:580e)
 	ret
 
 Func_4183f: ; 4183f (10:583f)
-	FuncCoord 13, 7
-	ld hl, Coord
+	hlCoord 13, 7
 
 Func_41842: ; 41842 (10:5842)
 	ld c, $0
@@ -335,8 +333,7 @@ Func_418e9: ; 418e9 (10:58e9)
 	ld hl, wTileMap
 	ld c, $50
 	call Func_41807
-	FuncCoord 0, 14
-	ld hl, Coord
+	hlCoord 0, 14
 	ld c, $50
 	call Func_41807
 	ld hl, vBGMap1
diff --git a/engine/items/items.asm b/engine/items/items.asm
index fbb2ec8f..830f0dfc 100755
--- a/engine/items/items.asm
+++ b/engine/items/items.asm
@@ -913,8 +913,7 @@ ItemUseMedicine: ; dabb (3:5abb)
 	sbc b
 	ld [hl],a
 	ld [wHPBarNewHP+1],a
-	FuncCoord 4, 1
-	ld hl,Coord
+	hlCoord 4, 1
 	ld a,[wWhichPokemon]
 	ld bc,2 * 20
 	call AddNTimes ; calculate coordinates of HP bar of pokemon that used Softboiled
@@ -2096,8 +2095,7 @@ ItemUseTMHM: ; e479 (3:6479)
 	call PrintText
 	ld hl,TeachMachineMoveText
 	call PrintText
-	FuncCoord 14,7
-	ld hl,Coord
+	hlCoord 14, 7
 	ld bc,$080f
 	ld a,$14
 	ld [wd125],a
@@ -2488,8 +2486,7 @@ TossItem_: ; e6f1 (3:66f1)
 	call CopyStringToCF4B ; copy name to wcf4b
 	ld hl,IsItOKToTossItemText
 	call PrintText
-	FuncCoord 14,7
-	ld hl,Coord
+	hlCoord 14, 7
 	ld bc,$080f
 	ld a,$14
 	ld [wd125],a
diff --git a/engine/learn_move.asm b/engine/learn_move.asm
index 0561abcd..bbfb41a3 100755
--- a/engine/learn_move.asm
+++ b/engine/learn_move.asm
@@ -76,8 +76,7 @@ DontAbandonLearning: ; 6e5b (1:6e5b)
 AbandonLearning: ; 6eda (1:6eda)
 	ld hl, AbandonLearningText
 	call PrintText
-	FuncCoord 14, 7
-	ld hl, Coord
+	hlCoord 14, 7
 	ld bc, $80f
 	ld a, $14
 	ld [wd125], a
@@ -100,8 +99,7 @@ TryingToLearn: ; 6f07 (1:6f07)
 	push hl
 	ld hl, TryingToLearnText
 	call PrintText
-	FuncCoord 14, 7
-	ld hl, Coord
+	hlCoord 14, 7
 	ld bc, $80f
 	ld a, $14
 	ld [wd125], a
@@ -122,13 +120,11 @@ TryingToLearn: ; 6f07 (1:6f07)
 	push hl
 	ld hl, WhichMoveToForgetText
 	call PrintText
-	FuncCoord 4, 7
-	ld hl, Coord
+	hlCoord 4, 7
 	ld b, $4
 	ld c, $e
 	call TextBoxBorder
-	FuncCoord 6, 8
-	ld hl, Coord
+	hlCoord 6, 8
 	ld de, wd0e1
 	ld a, [$fff6]
 	set 2, a
diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm
index 2640bada..3edaadd8 100644
--- a/engine/menu/bills_pc.asm
+++ b/engine/menu/bills_pc.asm
@@ -32,18 +32,15 @@ Func_213c8:: ; 213c8 (8:53c8)
 	ld a, [wd7f1]
 	bit 0, a
 	jr nz, .asm_21414
-	FuncCoord 2, 2
-	ld hl, Coord
+	hlCoord 2, 2
 	ld de, SomeonesPCText ; $548b
 	jr .asm_2141a
 .asm_21414
-	FuncCoord 2, 2
-	ld hl, Coord
+	hlCoord 2, 2
 	ld de, BillsPCText ; $5497
 .asm_2141a
 	call PlaceString
-	FuncCoord 2, 4
-	ld hl, Coord
+	hlCoord 2, 4
 	ld de, wPlayerName ; wd158
 	call PlaceString
 	ld l, c
@@ -53,8 +50,7 @@ Func_213c8:: ; 213c8 (8:53c8)
 	ld a, [wd74b]
 	bit 5, a
 	jr z, .asm_21462
-	FuncCoord 2, 6
-	ld hl, Coord
+	hlCoord 2, 6
 	ld de, OaksPCText ; $54a5
 	call PlaceString
 	ld a, [wd5a2]
@@ -62,24 +58,20 @@ Func_213c8:: ; 213c8 (8:53c8)
 	jr z, .asm_2145a
 	ld a, $4
 	ld [wMaxMenuItem], a ; wMaxMenuItem
-	FuncCoord 2, 8
-	ld hl, Coord
+	hlCoord 2, 8
 	ld de, PKMNLeaguePCText ; $54b2
 	call PlaceString
-	FuncCoord 2, 10
-	ld hl, Coord
+	hlCoord 2, 10
 	ld de, LogOffPCText ; $54ba
 	jr .asm_2146d
 .asm_2145a
-	FuncCoord 2, 8
-	ld hl, Coord
+	hlCoord 2, 8
 	ld de, LogOffPCText ; $54ba
 	jr .asm_2146d
 .asm_21462
 	ld a, $2
 	ld [wMaxMenuItem], a ; wMaxMenuItem
-	FuncCoord 2, 6
-	ld hl, Coord
+	hlCoord 2, 6
 	ld de, LogOffPCText ; $54ba
 .asm_2146d
 	call PlaceString
@@ -146,8 +138,7 @@ BillsPCMenu:
 	ld b, $a
 	ld c, $c
 	call TextBoxBorder
-	FuncCoord 2, 2
-	ld hl, Coord
+	hlCoord 2, 2
 	ld de, BillsPCMenuText ; $56e1
 	call PlaceString
 	ld hl, wTopMenuItemY ; wTopMenuItemY
@@ -170,8 +161,7 @@ BillsPCMenu:
 	ld [wPlayerMonNumber], a ; wPlayerMonNumber
 	ld hl, WhatText
 	call PrintText
-	FuncCoord 9, 14
-	ld hl, Coord
+	hlCoord 9, 14
 	ld b, $2
 	ld c, $9
 	call TextBoxBorder
@@ -180,18 +170,15 @@ BillsPCMenu:
 	cp $9
 	jr c, .asm_2154f
 	sub $9
-	FuncCoord 17, 16
-	ld hl, Coord
+	hlCoord 17, 16
 	ld [hl], $f7
 	add $f6
 	jr .asm_21551
 .asm_2154f
 	add $f7
 .asm_21551
-	FuncCoord 18, 16
-	ld [Coord], a
-	FuncCoord 10, 16
-	ld hl, Coord
+	Coorda 18, 16
+	hlCoord 10, 16
 	ld de, BoxNoPCText ; $5713
 	call PlaceString
 	ld a, $1
@@ -405,8 +392,7 @@ HMMoveArray: ; 21745 (8:5745)
 	db $ff
 
 Func_2174b: ; 2174b (8:574b)
-	FuncCoord 9, 10
-	ld hl, Coord
+	hlCoord 9, 10
 	ld b, $6
 	ld c, $9
 	call TextBoxBorder
@@ -416,11 +402,9 @@ Func_2174b: ; 2174b (8:574b)
 	jr nz, .asm_21761
 	ld de, WithdrawPCText ; $57d3
 .asm_21761
-	FuncCoord 11, 12
-	ld hl, Coord
+	hlCoord 11, 12
 	call PlaceString
-	FuncCoord 11, 14
-	ld hl, Coord
+	hlCoord 11, 14
 	ld de, StatsCancelPCText ; $57dc
 	call PlaceString
 	ld hl, wTopMenuItemY ; wTopMenuItemY
diff --git a/engine/menu/diploma.asm b/engine/menu/diploma.asm
index 3bf185fd..023c6177 100755
--- a/engine/menu/diploma.asm
+++ b/engine/menu/diploma.asm
@@ -33,8 +33,7 @@ DisplayDiploma: ; 566e2 (15:66e2)
 	pop bc
 	dec c
 	jr nz, .asm_56715 ; 0x56725 $ee
-	FuncCoord 10, 4
-	ld hl, Coord
+	hlCoord 10, 4
 	ld de, wPlayerName
 	call PlaceString
 	callba Func_44dd
diff --git a/engine/menu/league_pc.asm b/engine/menu/league_pc.asm
index 46f63420..4833e57d 100755
--- a/engine/menu/league_pc.asm
+++ b/engine/menu/league_pc.asm
@@ -93,22 +93,18 @@ Func_76610: ; 76610 (1d:6610)
 	ld b, $0B
 	ld c, 0
 	call GoPAL_SET
-	FuncCoord 12, 5
-	ld hl, Coord
+	hlCoord 12, 5
 	call GetMonHeader
 	call LoadFrontSpriteByMonIndex
 	call GBPalNormal
-	FuncCoord 0, 13
-	ld hl, Coord
+	hlCoord 0, 13
 	ld b, 2
 	ld c, $12
 	call TextBoxBorder
-	FuncCoord 1, 15
-	ld hl, Coord
+	hlCoord 1, 15
 	ld de, HallOfFameNoText
 	call PlaceString
-	FuncCoord 16, 15
-	ld hl, Coord
+	hlCoord 16, 15
 	ld de, wcd42
 	ld bc, $0103
 	call PrintNumber
diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm
index 06c85096..4044da43 100755
--- a/engine/menu/main_menu.asm
+++ b/engine/menu/main_menu.asm
@@ -33,24 +33,20 @@ MainMenu: ; 5af2 (1:5af2)
 	ld a,[wd088]
 	cp a,1
 	jr z,.next1
-	FuncCoord 0,0
-	ld hl,Coord
+	hlCoord 0, 0
 	ld b,6
 	ld c,13
 	call TextBoxBorder
-	FuncCoord 2,2
-	ld hl,Coord
+	hlCoord 2, 2
 	ld de,ContinueText
 	call PlaceString
 	jr .next2
 .next1
-	FuncCoord 0,0
-	ld hl,Coord
+	hlCoord 0, 0
 	ld b,4
 	ld c,13
 	call TextBoxBorder
-	FuncCoord 2,2
-	ld hl,Coord
+	hlCoord 2, 2
 	ld de,NewGameText
 	call PlaceString
 .next2
@@ -142,14 +138,12 @@ LinkMenu: ; 5c0a (1:5c0a)
 	call SaveScreenTilesToBuffer1
 	ld hl, WhereWouldYouLikeText
 	call PrintText
-	FuncCoord 5, 5
-	ld hl, Coord
+	hlCoord 5, 5
 	ld b, $6
 	ld c, $d
 	call TextBoxBorder
 	call UpdateSprites
-	FuncCoord 7, 7
-	ld hl, Coord
+	hlCoord 7, 7
 	ld de, TradeCenterText
 	call PlaceString
 	xor a
@@ -238,14 +232,11 @@ LinkMenu: ; 5c0a (1:5c0a)
 	ld c, d
 .asm_5ccc
 	ld a, b
-	FuncCoord 6, 7
-	ld [Coord], a
+	Coorda 6, 7
 	ld a, c
-	FuncCoord 6, 9
-	ld [Coord], a
+	Coorda 6, 9
 	ld a, d
-	FuncCoord 6, 11
-	ld [Coord], a
+	Coorda 6, 11
 	ld c, $28
 	call DelayFrames
 	call LoadScreenTilesFromBuffer1
@@ -343,27 +334,21 @@ TradeCenterText: ; 5d97 (1:5d97)
 ContinueGame: ; 5db5 (1:5db5)
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
-	FuncCoord 4, 7
-	ld hl, Coord
+	hlCoord 4, 7
 	ld b, $8
 	ld c, $e
 	call TextBoxBorder
-	FuncCoord 5, 9
-	ld hl, Coord
+	hlCoord 5, 9
 	ld de, SaveScreenInfoText
 	call PlaceString
-	FuncCoord 12, 9
-	ld hl, Coord
+	hlCoord 12, 9
 	ld de, wPlayerName ; wd158
 	call PlaceString
-	FuncCoord 17, 11
-	ld hl, Coord
+	hlCoord 17, 11
 	call Func_5e2f
-	FuncCoord 16, 13
-	ld hl, Coord
+	hlCoord 16, 13
 	call Func_5e42
-	FuncCoord 13, 15
-	ld hl, Coord
+	hlCoord 13, 15
 	call Func_5e55
 	ld a, $1
 	ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
@@ -433,35 +418,28 @@ SaveScreenInfoText: ; 5e6a (1:5e6a)
 	next "TIME@"
 
 DisplayOptionMenu: ; 5e8a (1:5e8a)
-	FuncCoord 0,0
-	ld hl,Coord
+	hlCoord 0, 0
 	ld b,3
 	ld c,18
 	call TextBoxBorder
-	FuncCoord 0,5
-	ld hl,Coord
+	hlCoord 0, 5
 	ld b,3
 	ld c,18
 	call TextBoxBorder
-	FuncCoord 0,10
-	ld hl,Coord
+	hlCoord 0, 10
 	ld b,3
 	ld c,18
 	call TextBoxBorder
-	FuncCoord 1,1
-	ld hl,Coord
+	hlCoord 1, 1
 	ld de,TextSpeedOptionText
 	call PlaceString
-	FuncCoord 1,6
-	ld hl,Coord
+	hlCoord 1, 6
 	ld de,BattleAnimationOptionText
 	call PlaceString
-	FuncCoord 1,11
-	ld hl,Coord
+	hlCoord 1, 11
 	ld de,BattleStyleOptionText
 	call PlaceString
-	FuncCoord 2,16
-	ld hl,Coord
+	hlCoord 2, 16
 	ld de,OptionMenuCancelText
 	call PlaceString
 	xor a
@@ -655,8 +633,7 @@ SetCursorPositionsFromOptions: ; 604c (1:604c)
 	dec hl
 	ld a,[hl]
 	ld [wWhichTrade],a ; text speed cursor X coordinate
-	FuncCoord 0,3
-	ld hl,Coord
+	hlCoord 0, 3
 	call .placeUnfilledRightArrow
 	sla c
 	ld a,1 ; On
@@ -664,8 +641,7 @@ SetCursorPositionsFromOptions: ; 604c (1:604c)
 	ld a,10 ; Off
 .storeBattleAnimationCursorX
 	ld [wTrainerEngageDistance],a ; battle animation cursor X coordinate
-	FuncCoord 0,8
-	ld hl,Coord
+	hlCoord 0, 8
 	call .placeUnfilledRightArrow
 	sla c
 	ld a,1
@@ -673,12 +649,10 @@ SetCursorPositionsFromOptions: ; 604c (1:604c)
 	ld a,10
 .storeBattleStyleCursorX
 	ld [wTrainerFacingDirection],a ; battle style cursor X coordinate
-	FuncCoord 0,13
-	ld hl,Coord
+	hlCoord 0, 13
 	call .placeUnfilledRightArrow
 ; cursor in front of Cancel
-	FuncCoord 0,16
-	ld hl,Coord
+	hlCoord 0, 16
 	ld a,1
 .placeUnfilledRightArrow
 	ld e,a
diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm
index e065d98d..17aa96e6 100755
--- a/engine/menu/naming_screen.asm
+++ b/engine/menu/naming_screen.asm
@@ -13,8 +13,7 @@ AskName: ; 64eb (1:64eb)
 	call GetMonName
 	ld hl, DoYouWantToNicknameText
 	call PrintText
-	FuncCoord 14, 7
-	ld hl, Coord
+	hlCoord 14, 7
 	ld bc, $80f
 	ld a, $14
 	ld [wd125], a
@@ -94,8 +93,7 @@ DisplayNamingScreen: ; 6596 (1:6596)
 	call LoadHpBarAndStatusTilePatterns
 	call LoadEDTile
 	callba Func_7176c
-	FuncCoord 0, 4
-	ld hl, Coord
+	hlCoord 0, 4
 	ld b, $9
 	ld c, $12
 	call TextBoxBorder
@@ -341,8 +339,7 @@ PrintAlphabet: ; 676f (1:676f)
 	jr nz, .asm_677e
 	ld de, UpperCaseAlphabet ; $67d6
 .asm_677e
-	FuncCoord 2, 5
-	ld hl, Coord
+	hlCoord 2, 5
 	ld bc, $509
 .asm_6784
 	push bc
@@ -373,16 +370,13 @@ Func_680e: ; 680e (1:680e)
 	call CalcStringLength
 	ld a, c
 	ld [wHPBarMaxHP], a
-	FuncCoord 10, 2
-	ld hl, Coord
+	hlCoord 10, 2
 	ld bc, $10a
 	call ClearScreenArea
-	FuncCoord 10, 2
-	ld hl, Coord
+	hlCoord 10, 2
 	ld de, wcf4b
 	call PlaceString
-	FuncCoord 10, 3
-	ld hl, Coord
+	hlCoord 10, 3
 	ld a, [wd07d]
 	cp $2
 	jr nc, .asm_6835
@@ -419,8 +413,7 @@ Func_680e: ; 680e (1:680e)
 .asm_6867
 	ld c, a
 	ld b, $0
-	FuncCoord 10, 3
-	ld hl, Coord
+	hlCoord 10, 3
 	add hl, bc
 	ld [hl], $77
 	ret
@@ -468,8 +461,7 @@ CalcStringLength: ; 68eb (1:68eb)
 	jr .asm_68f0
 
 PrintNamingText: ; 68f8 (1:68f8)
-	FuncCoord 0, 1
-	ld hl, Coord
+	hlCoord 0, 1
 	ld a, [wd07d]
 	ld de, YourTextString ; $693f
 	and a
@@ -484,14 +476,12 @@ PrintNamingText: ; 68f8 (1:68f8)
 	pop af
 	ld [wd11e], a
 	call GetMonName
-	FuncCoord 4, 1
-	ld hl, Coord
+	hlCoord 4, 1
 	call PlaceString
 	ld hl, $1
 	add hl, bc
 	ld [hl], $c9
-	FuncCoord 1, 3
-	ld hl, Coord
+	hlCoord 1, 3
 	ld de, NicknameTextString ; $6953
 	jr .placeString
 .notNickname
diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm
index d0a74c11..4e47361b 100755
--- a/engine/menu/party_menu.asm
+++ b/engine/menu/party_menu.asm
@@ -30,8 +30,7 @@ RedrawPartyMenu_: ; 12ce3 (4:6ce3)
 	jp z,.printMessage
 	call ErasePartyMenuCursors
 	callba SendBlkPacket_PartyMenu ; loads some data to wcf2e
-	FuncCoord 3,0
-	ld hl,Coord
+	hlCoord 3, 0
 	ld de,wPartySpecies
 	xor a
 	ld c,a
diff --git a/engine/menu/players_pc.asm b/engine/menu/players_pc.asm
index f29ef258..4ff1b16f 100755
--- a/engine/menu/players_pc.asm
+++ b/engine/menu/players_pc.asm
@@ -26,8 +26,7 @@ Func_790c: ; 790c (1:790c)
 	ld c, $e
 	call TextBoxBorder
 	call UpdateSprites
-	FuncCoord 2, 2
-	ld hl, Coord
+	hlCoord 2, 2
 	ld de, PlayersPCMenuEntries ; $7af5
 	call PlaceString
 	ld hl, wTopMenuItemY ; wTopMenuItemY
diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm
index 4d3f5aaa..63e440f8 100755
--- a/engine/menu/pokedex.asm
+++ b/engine/menu/pokedex.asm
@@ -118,8 +118,7 @@ HandlePokedexSideMenu: ; 4006d (10:406d)
 	pop af
 	ld [wCurrentMenuItem],a
 	push bc
-	FuncCoord 0,3
-	ld hl,Coord
+	hlCoord 0, 3
 	ld de,20
 	ld bc,$7f0d ; 13 blank tiles
 	call DrawTileLine ; cover up the menu cursor in the pokemon list
@@ -127,8 +126,7 @@ HandlePokedexSideMenu: ; 4006d (10:406d)
 	ret
 .buttonBPressed
 	push bc
-	FuncCoord 15,10
-	ld hl,Coord
+	hlCoord 15, 10
 	ld de,20
 	ld bc,$7f07 ; 7 blank tiles
 	call DrawTileLine ; cover up the menu cursor in the side menu
@@ -155,53 +153,43 @@ HandlePokedexListMenu: ; 40111 (10:4111)
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED],a
 ; draw the horizontal line separating the seen and owned amounts from the menu
-	FuncCoord 15,8
-	ld hl,Coord
+	hlCoord 15, 8
 	ld a,$7a ; horizontal line tile
 	ld [hli],a
 	ld [hli],a
 	ld [hli],a
 	ld [hli],a
 	ld [hli],a
-	FuncCoord 14,0
-	ld hl,Coord
+	hlCoord 14, 0
 	ld [hl],$71 ; vertical line tile
-	FuncCoord 14,1
-	ld hl,Coord
+	hlCoord 14, 1
 	call DrawPokedexVerticalLine
-	FuncCoord 14,9
-	ld hl,Coord
+	hlCoord 14, 9
 	call DrawPokedexVerticalLine
 	ld hl,wPokedexSeen
 	ld b,wPokedexSeenEnd - wPokedexSeen
 	call CountSetBits
 	ld de,wd11e
-	FuncCoord 16,3
-	ld hl,Coord
+	hlCoord 16, 3
 	ld bc,$0103
 	call PrintNumber ; print number of seen pokemon
 	ld hl,wPokedexOwned
 	ld b,wPokedexOwnedEnd - wPokedexOwned
 	call CountSetBits
 	ld de,wd11e
-	FuncCoord 16,6
-	ld hl,Coord
+	hlCoord 16, 6
 	ld bc,$0103
 	call PrintNumber ; print number of owned pokemon
-	FuncCoord 16,2
-	ld hl,Coord
+	hlCoord 16, 2
 	ld de,PokedexSeenText
 	call PlaceString
-	FuncCoord 16,5
-	ld hl,Coord
+	hlCoord 16, 5
 	ld de,PokedexOwnText
 	call PlaceString
-	FuncCoord 1,1
-	ld hl,Coord
+	hlCoord 1, 1
 	ld de,PokedexContentsText
 	call PlaceString
-	FuncCoord 16,10
-	ld hl,Coord
+	hlCoord 16, 10
 	ld de,PokedexMenuItemsText
 	call PlaceString
 ; find the highest pokedex number among the pokemon the player has seen
@@ -223,12 +211,10 @@ HandlePokedexListMenu: ; 40111 (10:4111)
 .loop
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED],a
-	FuncCoord 4,2
-	ld hl,Coord
+	hlCoord 4, 2
 	ld bc,$0e0a
 	call ClearScreenArea
-	FuncCoord 1,3
-	ld hl,Coord
+	hlCoord 1, 3
 	ld a,[wListScrollOffset]
 	ld [wd11e],a
 	ld d,7
@@ -422,47 +408,36 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2)
 	push af
 	xor a
 	ld [$ffd7],a
-	FuncCoord 0,0
-	ld hl,Coord
+	hlCoord 0, 0
 	ld de,1
 	ld bc,$6414
 	call DrawTileLine ; draw top border
-	FuncCoord 0,17
-	ld hl,Coord
+	hlCoord 0, 17
 	ld b,$6f
 	call DrawTileLine ; draw bottom border
-	FuncCoord 0,1
-	ld hl,Coord
+	hlCoord 0, 1
 	ld de,20
 	ld bc,$6610
 	call DrawTileLine ; draw left border
-	FuncCoord 19,1
-	ld hl,Coord
+	hlCoord 19, 1
 	ld b,$67
 	call DrawTileLine ; draw right border
-	FuncCoord 0,0
 	ld a,$63 ; upper left corner tile
-	ld [Coord],a
-	FuncCoord 19,0
+	Coorda 0, 0
 	ld a,$65 ; upper right corner tile
-	ld [Coord],a
-	FuncCoord 0,17
+	Coorda 19, 0
 	ld a,$6c ; lower left corner tile
-	ld [Coord],a
-	FuncCoord 19,17
+	Coorda 0, 17
 	ld a,$6e ; lower right corner tile
-	ld [Coord],a
-	FuncCoord 0,9
-	ld hl,Coord
+	Coorda 19, 17
+	hlCoord 0, 9
 	ld de,PokedexDataDividerLine
 	call PlaceString ; draw horizontal divider line
-	FuncCoord 9,6
-	ld hl,Coord
+	hlCoord 9, 6
 	ld de,HeightWeightText
 	call PlaceString
 	call GetMonName
-	FuncCoord 9,2
-	ld hl,Coord
+	hlCoord 9, 2
 	call PlaceString
 	ld hl,PokedexEntryPointers
 	ld a,[wd11e]
@@ -474,8 +449,7 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2)
 	ld a,[hli]
 	ld e,a
 	ld d,[hl] ; de = address of pokedex entry
-	FuncCoord 9,4
-	ld hl,Coord
+	hlCoord 9, 4
 	call PlaceString ; print species name
 	ld h,b
 	ld l,c
@@ -483,8 +457,7 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2)
 	ld a,[wd11e]
 	push af
 	call IndexToPokedex
-	FuncCoord 2,8
-	ld hl,Coord
+	hlCoord 2, 8
 	ld a, "№"
 	ld [hli],a
 	ld a,$f2
@@ -506,8 +479,7 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2)
 	call Delay3
 	call GBPalNormal
 	call GetMonHeader ; load pokemon picture location
-	FuncCoord 1,1
-	ld hl,Coord
+	hlCoord 1, 1
 	call LoadFlippedFrontSpriteByMonIndex ; draw pokemon picture
 	ld a,[wcf91]
 	call PlayCry ; play pokemon cry
@@ -520,16 +492,14 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2)
 	jp z,.waitForButtonPress ; if the pokemon has not been owned, don't print the height, weight, or description
 	inc de ; de = address of feet (height)
 	ld a,[de] ; reads feet, but a is overwritten without being used
-	FuncCoord 12,6
-	ld hl,Coord
+	hlCoord 12, 6
 	ld bc,$0102
 	call PrintNumber ; print feet (height)
 	ld a,$60 ; feet symbol tile (one tick)
 	ld [hl],a
 	inc de
 	inc de ; de = address of inches (height)
-	FuncCoord 15,6
-	ld hl,Coord
+	hlCoord 15, 6
 	ld bc,$8102
 	call PrintNumber ; print inches (height)
 	ld a,$61 ; inches symbol tile (two ticks)
@@ -550,13 +520,11 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2)
 	dec de
 	ld a,[de] ; a = lower byte of weight
 	ld [hl],a ; store lower byte of weight in [$ff8c]
-	FuncCoord 11,8
 	ld de,$ff8b
-	ld hl,Coord
+	hlCoord 11, 8
 	ld bc,$0205 ; no leading zeroes, right-aligned, 2 bytes, 5 digits
 	call PrintNumber ; print weight
-	FuncCoord 14,8
-	ld hl,Coord
+	hlCoord 14, 8
 	ld a,[$ff8c]
 	sub a,10
 	ld a,[$ff8b]
@@ -574,8 +542,7 @@ ShowPokedexDataInternal: ; 402e2 (10:42e2)
 	ld [$ff8b],a ; restore original value of [$ff8b]
 	pop hl
 	inc hl ; hl = address of pokedex description text
-	FuncCoord 1,11
-	ld bc,Coord
+	bcCoord 1, 11
 	ld a,2
 	ld [$fff4],a
 	call TextCommandProcessor ; print pokedex description text
diff --git a/engine/menu/prize_menu.asm b/engine/menu/prize_menu.asm
index 63bdedee..141b9beb 100755
--- a/engine/menu/prize_menu.asm
+++ b/engine/menu/prize_menu.asm
@@ -22,8 +22,7 @@ CeladonPrizeMenu: ; 5271b (14:671b)
 	ld a,$01
 	ld [wTopMenuItemX],a
 	call PrintPrizePrice ; 687A
-	FuncCoord 0,2
-	ld hl,Coord
+	hlCoord 0, 2
 	ld b,$08
 	ld c,$10
 	call TextBoxBorder
@@ -94,50 +93,42 @@ GetPrizeMenuId: ; 5278e (14:678e)
 	ld a,[W_PRIZE1]
 	ld [wd11e],a
 	call GetItemName
-	FuncCoord 2,4
-	ld hl,Coord
+	hlCoord 2, 4
 	call PlaceString
 	ld a,[W_PRIZE2]
 	ld [wd11e],a
 	call GetItemName
-	FuncCoord 2,6
-	ld hl,Coord
+	hlCoord 2, 6
 	call PlaceString
 	ld a,[W_PRIZE3]
 	ld [wd11e],a
 	call GetItemName
-	FuncCoord 2,8
-	ld hl,Coord
+	hlCoord 2, 8
 	call PlaceString
 	jr .putNoThanksText
 .putMonName ; 14:67EC
 	ld a,[W_PRIZE1]
 	ld [wd11e],a
 	call GetMonName
-	FuncCoord 2,4
-	ld hl,Coord
+	hlCoord 2, 4
 	call PlaceString
 	ld a,[W_PRIZE2]
 	ld [wd11e],a
 	call GetMonName
-	FuncCoord 2,6
-	ld hl,Coord
+	hlCoord 2, 6
 	call PlaceString
 	ld a,[W_PRIZE3]
 	ld [wd11e],a
 	call GetMonName
-	FuncCoord 2,8
-	ld hl,Coord
+	hlCoord 2, 8
 	call PlaceString
 .putNoThanksText ; 14:6819
-	FuncCoord 2,10
-	ld hl,Coord
+	hlCoord 2, 10
 	ld de,NoThanksText
 	call PlaceString
 ; put prices on the right side of the textbox
 	ld de,wd141
-	FuncCoord 13,5
-	ld hl,Coord
+	hlCoord 13, 5
 ; reg. c:
 ; [low nybble] number of bytes
 ; [bit 765 = %100] space-padding (not zero-padding)
@@ -146,35 +137,29 @@ GetPrizeMenuId: ; 5278e (14:678e)
 ; used by text-command $02)
 	call PrintBCDNumber ; Print_BCD
 	ld de,wd143
-	FuncCoord 13,7
-	ld hl,Coord
+	hlCoord 13, 7
 	ld c,(%1 << 7 | 2)
 	call PrintBCDNumber
 	ld de,wd145
-	FuncCoord 13,9
-	ld hl,Coord
+	hlCoord 13, 9
 	ld c,(1 << 7 | 2)
 	jp PrintBCDNumber
 
 INCLUDE "data/prizes.asm"
 
 PrintPrizePrice: ; 5287a (14:687a)
-	FuncCoord 11,0
-	ld hl,Coord
+	hlCoord 11, 0
 	ld b,$01
 	ld c,$07
 	call TextBoxBorder
 	call UpdateSprites      ; XXX save OAM?
-	FuncCoord 12,0
-	ld hl,Coord
+	hlCoord 12, 0
 	ld de,.CoinText
 	call PlaceString
-	FuncCoord 13,1
-	ld hl,Coord
+	hlCoord 13, 1
 	ld de,.SixSpacesText
 	call PlaceString
-	FuncCoord 13,1
-	ld hl,Coord
+	hlCoord 13, 1
 	ld de,wPlayerCoins
 	ld c,%10000010
 	call PrintBCDNumber
diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm
index bb23321b..7c6fe4d6 100755
--- a/engine/menu/start_sub_menus.asm
+++ b/engine/menu/start_sub_menus.asm
@@ -285,8 +285,7 @@ StartMenu_Pokemon: ; 130a9 (4:70a9)
 
 ; writes a blank tile to all possible menu cursor positions on the party menu
 ErasePartyMenuCursors: ; 132ed (4:72ed)
-	FuncCoord 0,1
-	ld hl,Coord
+	hlCoord 0, 1
 	ld bc,2 * 20 ; menu cursor positions are 2 rows apart
 	ld a,6 ; 6 menu cursor positions
 .loop
@@ -331,14 +330,10 @@ StartMenu_Item: ; 13302 (4:7302)
 .choseItem
 ; erase menu cursor (blank each tile in front of an item name)
 	ld a," "
-	FuncCoord 5,4
-	ld [Coord],a
-	FuncCoord 5,6
-	ld [Coord],a
-	FuncCoord 5,8
-	ld [Coord],a
-	FuncCoord 5,10
-	ld [Coord],a
+	Coorda 5, 4
+	Coorda 5, 6
+	Coorda 5, 8
+	Coorda 5, 10
 	call PlaceUnfilledArrowMenuCursor
 	xor a
 	ld [wcc35],a
@@ -531,12 +526,10 @@ DrawTrainerInfo: ; 1349a (4:749a)
 	ld bc,(BANK(RedPicFront) << 8) | $01
 	predef Predef3B
 	call DisableLCD
-	FuncCoord 0,2
-	ld hl,Coord
+	hlCoord 0, 2
 	ld a," "
 	call TrainerInfo_DrawVerticalLine
-	FuncCoord 1,2
-	ld hl,Coord
+	hlCoord 1, 2
 	call TrainerInfo_DrawVerticalLine
 	ld hl,vChars2 + $70
 	ld de,vChars2
@@ -579,8 +572,7 @@ DrawTrainerInfo: ; 1349a (4:749a)
 	dec a
 	ld [hli],a
 	ld [hl],1
-	FuncCoord 0,0
-	ld hl,Coord
+	hlCoord 0, 0
 	call TrainerInfo_DrawTextBox
 	ld hl,wWhichTrade
 	ld a,16 + 1
@@ -588,35 +580,27 @@ DrawTrainerInfo: ; 1349a (4:749a)
 	dec a
 	ld [hli],a
 	ld [hl],3
-	FuncCoord 1,10
-	ld hl,Coord
+	hlCoord 1, 10
 	call TrainerInfo_DrawTextBox
-	FuncCoord 0,10
-	ld hl,Coord
+	hlCoord 0, 10
 	ld a,$d7
 	call TrainerInfo_DrawVerticalLine
-	FuncCoord 19,10
-	ld hl,Coord
+	hlCoord 19, 10
 	call TrainerInfo_DrawVerticalLine
-	FuncCoord 6,9
-	ld hl,Coord
+	hlCoord 6, 9
 	ld de,TrainerInfo_BadgesText
 	call PlaceString
-	FuncCoord 2,2
-	ld hl,Coord
+	hlCoord 2, 2
 	ld de,TrainerInfo_NameMoneyTimeText
 	call PlaceString
-	FuncCoord 7,2
-	ld hl,Coord
+	hlCoord 7, 2
 	ld de,wPlayerName
 	call PlaceString
-	FuncCoord 8,4
-	ld hl,Coord
+	hlCoord 8, 4
 	ld de,wPlayerMoney
 	ld c,$e3
 	call PrintBCDNumber
-	FuncCoord 9,6
-	ld hl,Coord
+	hlCoord 9, 6
 	ld de,W_PLAYTIMEHOURS + 1 ; hours
 	ld bc,$4103
 	call PrintNumber
diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm
index 3b830244..65b06e9d 100755
--- a/engine/menu/status_screen.asm
+++ b/engine/menu/status_screen.asm
@@ -40,8 +40,7 @@ StatusScreen: ; 12953 (4:6953)
 	push af
 	xor a
 	ld [$ffd7], a
-	FuncCoord 19,1
-	ld hl, Coord
+	hlCoord 19, 1
 	ld bc, $060a
 	call DrawLineBox ; Draws the box around name, HP and status
 	ld de, $fffa
@@ -49,66 +48,54 @@ StatusScreen: ; 12953 (4:6953)
 	ld [hl], $f2 ; . after No ("." is a different one)
 	dec hl
 	ld [hl], "№"
-	FuncCoord 19,9
-	ld hl, Coord
+	hlCoord 19, 9
 	ld bc, $0806
 	call DrawLineBox ; Draws the box around types, ID No. and OT
-	FuncCoord 10,9
-	ld hl, Coord
+	hlCoord 10, 9
 	ld de, Type1Text
 	call PlaceString ; "TYPE1/"
-	FuncCoord 11,3
-	ld hl, Coord
+	hlCoord 11, 3
 	predef DrawHP ; predef $5f
 	ld hl, wcf25
 	call GetHealthBarColor
 	ld b, $3
 	call GoPAL_SET ; SGB palette
-	FuncCoord 16,6
-	ld hl, Coord
+	hlCoord 16, 6
 	ld de, wcf9c
 	call PrintStatusCondition
 	jr nz, .StatusWritten ; 0x129fc $9
-	FuncCoord 16,6
-	ld hl, Coord
+	hlCoord 16, 6
 	ld de, OKText
 	call PlaceString ; "OK"
 .StatusWritten
-	FuncCoord 9,6
-	ld hl, Coord
+	hlCoord 9, 6
 	ld de, StatusText
 	call PlaceString ; "STATUS/"
-	FuncCoord 14,2
-	ld hl, Coord
+	hlCoord 14, 2
 	call PrintLevel ; Pokémon level
 	ld a, [W_MONHDEXNUM]
 	ld [wd11e], a
 	ld [wd0b5], a
 	predef IndexToPokedex
-	FuncCoord 3,7
-	ld hl, Coord
+	hlCoord 3, 7
 	ld de, wd11e
 	ld bc, $8103 ; Zero-padded, 3
 	call PrintNumber ; Pokémon no.
-	FuncCoord 11,10
-	ld hl, Coord
+	hlCoord 11, 10
 	predef Func_27d6b ; Prints the type (?)
 	ld hl, NamePointers2 ; $6a9d
 	call .unk_12a7e
 	ld d, h
 	ld e, l
-	FuncCoord 9,1
-	ld hl, Coord
+	hlCoord 9, 1
 	call PlaceString ; Pokémon name
 	ld hl, OTPointers ; $6a95
 	call .unk_12a7e
 	ld d, h
 	ld e, l
-	FuncCoord 12,16
-	ld hl, Coord
+	hlCoord 12, 16
 	call PlaceString ; OT
-	FuncCoord 12,14
-	ld hl, Coord
+	hlCoord 12, 14
 	ld de, wcfa4
 	ld bc, $8205 ; 5
 	call PrintNumber ; ID Number
@@ -116,8 +103,7 @@ StatusScreen: ; 12953 (4:6953)
 	call PrintStatsBox
 	call Delay3
 	call GBPalNormal
-	FuncCoord 1, 0
-	ld hl, Coord
+	hlCoord 1, 0
 	call LoadFlippedFrontSpriteByMonIndex ; draw Pokémon picture
 	ld a, [wcf91]
 	call PlayCry ; play Pokémon cry
@@ -195,23 +181,19 @@ PrintStatsBox: ; 12ae4 (4:6ae4)
 	ld a, d
 	and a ; a is 0 from the status screen
 	jr nz, .DifferentBox ; 0x12ae6 $12
-	FuncCoord 0,8
-	ld hl, Coord
+	hlCoord 0, 8
 	ld b, $8
 	ld c, $8
 	call TextBoxBorder ; Draws the box
-	FuncCoord 1,9 ; Start printing stats from here
-	ld hl, Coord
+	hlCoord 1, 9 ; Start printing stats from here
 	ld bc, $0019 ; Number offset
 	jr .PrintStats ; 0x12af8 $10
 .DifferentBox
-	FuncCoord 9,2
-	ld hl, Coord
+	hlCoord 9, 2
 	ld b, $8
 	ld c, $9
 	call TextBoxBorder
-	FuncCoord 11, 3
-	ld hl, Coord
+	hlCoord 11, 3
 	ld bc, $0018
 .PrintStats
 	push bc
@@ -258,20 +240,16 @@ StatusScreen2: ; 12b57 (4:6b57)
 	ld bc, $0004
 	call CopyData
 	callab Func_39b87
-	FuncCoord 9,2
-	ld hl, Coord
+	hlCoord 9, 2
 	ld bc, $050a
 	call ClearScreenArea ; Clear under name
-	FuncCoord 19, 3
-	ld hl, Coord
+	hlCoord 19, 3
 	ld [hl], $78
-	FuncCoord 0,8
-	ld hl, Coord
+	hlCoord 0, 8
 	ld b, $8
 	ld c, $12
 	call TextBoxBorder ; Draw move container
-	FuncCoord 2,9
-	ld hl, Coord
+	hlCoord 2, 9
 	ld de, wd0e1
 	call PlaceString ; Print moves
 	ld a, [wcd6c]
@@ -280,8 +258,7 @@ StatusScreen2: ; 12b57 (4:6b57)
 	ld a, $4
 	sub c
 	ld b, a ; Number of moves ?
-	FuncCoord 11,10
-	ld hl, Coord
+	hlCoord 11, 10
 	ld de, $0028
 	ld a, $72
 	call Func_12ccb ; Print "PP"
@@ -293,8 +270,7 @@ StatusScreen2: ; 12b57 (4:6b57)
 	call Func_12ccb ; Fill the rest with --
 .InitPP ; 12bbb
 	ld hl, wcfa0
-	FuncCoord 14,10
-	ld de, Coord
+	deCoord 14, 10
 	ld b, $0
 .PrintPP ; 12bc3
 	ld a, [hli]
@@ -344,8 +320,7 @@ StatusScreen2: ; 12b57 (4:6b57)
 	cp $4
 	jr nz, .PrintPP ; 0x12c0f $b2
 .PPDone
-	FuncCoord 9,3
-	ld hl, Coord
+	hlCoord 9, 3
 	ld de, EXPPointsText
 	call PlaceString
 	ld a, [wcfb9] ; level
@@ -355,8 +330,7 @@ StatusScreen2: ; 12b57 (4:6b57)
 	inc a
 	ld [wcfb9], a ; Increase temporarily if not 100
 .Level100
-	FuncCoord 14,6
-	ld hl, Coord
+	hlCoord 14, 6
 	ld [hl], $70 ; 1-tile "to"
 	inc hl
 	inc hl
@@ -364,27 +338,22 @@ StatusScreen2: ; 12b57 (4:6b57)
 	pop af
 	ld [wcfb9], a
 	ld de, wcfa6
-	FuncCoord 12,4
-	ld hl, Coord
+	hlCoord 12, 4
 	ld bc, $0307
 	call PrintNumber ; exp
 	call .asm_12c86
 	ld de, wcfa6
-	FuncCoord 7,6
-	ld hl, Coord
+	hlCoord 7, 6
 	ld bc, $0307
 	call PrintNumber
-	FuncCoord 9,0
-	ld hl, Coord
+	hlCoord 9, 0
 	call Func_12cc3
-	FuncCoord 9,1
-	ld hl, Coord
+	hlCoord 9, 1
 	call Func_12cc3
 	ld a, [W_MONHDEXNUM]
 	ld [wd11e], a
 	call GetMonName
-	FuncCoord 9,1
-	ld hl, Coord
+	hlCoord 9, 1
 	call PlaceString
 	ld a, $1
 	ld [$ffba], a
diff --git a/engine/menu/vending_machine.asm b/engine/menu/vending_machine.asm
index 73dece40..c2968e2f 100755
--- a/engine/menu/vending_machine.asm
+++ b/engine/menu/vending_machine.asm
@@ -17,18 +17,15 @@ VendingMachineMenu: ; 74ee0 (1d:4ee0)
 	ld [wTopMenuItemX], a ; wTopMenuItemX
 	ld hl, wd730
 	set 6, [hl]
-	FuncCoord 0, 3
-	ld hl, Coord
+	hlCoord 0, 3
 	ld b, $8
 	ld c, $c
 	call TextBoxBorder
 	call UpdateSprites
-	FuncCoord 2, 5
-	ld hl, Coord
+	hlCoord 2, 5
 	ld de, DrinkText
 	call PlaceString
-	FuncCoord 9, 6
-	ld hl, Coord
+	hlCoord 9, 6
 	ld de, DrinkPriceText
 	call PlaceString
 	ld hl, wd730
diff --git a/engine/oak_speech.asm b/engine/oak_speech.asm
index 314c34df..767b8b5a 100755
--- a/engine/oak_speech.asm
+++ b/engine/oak_speech.asm
@@ -68,8 +68,7 @@ OakSpeech: ; 6115 (1:6115)
 	ld [wd0b5],a    ; pic displayed is stored at this location
 	ld [wcf91],a
 	call GetMonHeader      ; this is also related to the pic
-	FuncCoord 6, 4
-	ld hl,Coord     ; position on tilemap the pic is displayed
+	hlCoord 6, 4     ; position on tilemap the pic is displayed
 	call LoadFlippedFrontSpriteByMonIndex      ; displays pic?
 	call MovePicLeft
 	ld hl,OakSpeechText2
@@ -143,8 +142,7 @@ Func_61bc: ; 61bc (1:61bc)
 	ld [$2000],a
 	ld c,$14
 	call DelayFrames
-	FuncCoord 6, 5
-	ld hl,Coord
+	hlCoord 6, 5
 	ld b,7
 	ld c,7
 	call ClearScreenArea
@@ -225,11 +223,9 @@ IntroPredef3B: ; 62a4 (1:62a4)
 	pop bc
 	ld a,c
 	and a
-	FuncCoord 15, 1
-	ld hl,Coord
+	hlCoord 15, 1
 	jr nz,.next
-	FuncCoord 6, 4
-	ld hl,Coord
+	hlCoord 6, 4
 .next
 	xor a
 	ld [$FFE1],a
diff --git a/engine/oak_speech2.asm b/engine/oak_speech2.asm
index 380ff7bf..9d994047 100755
--- a/engine/oak_speech2.asm
+++ b/engine/oak_speech2.asm
@@ -76,15 +76,13 @@ Func_69ec: ; 69ec (1:69ec)
 	ld bc, $b
 	call CopyData
 	call Delay3
-	FuncCoord 12, 4
-	ld hl, Coord
+	hlCoord 12, 4
 	ld de, $67d
 	ld a, $ff
 	jr asm_6a19
 
 Func_6a12: ; 6a12 (1:6a12)
-	FuncCoord 5, 4
-	ld hl, Coord
+	hlCoord 5, 4
 	ld de, $67d
 	xor a
 asm_6a19: ; 6a19 (1:6a19)
@@ -161,13 +159,11 @@ DisplayIntroNameTextBox: ; 6a6c (1:6a6c)
 	ld b, $a
 	ld c, $9
 	call TextBoxBorder
-	FuncCoord 3, 0
-	ld hl, Coord
+	hlCoord 3, 0
 	ld de, .namestring ; $6aa3
 	call PlaceString
 	pop de
-	FuncCoord 2, 2
-	ld hl, Coord
+	hlCoord 2, 2
 	call PlaceString
 	call UpdateSprites
 	xor a
diff --git a/engine/overworld/cinnabar_lab.asm b/engine/overworld/cinnabar_lab.asm
index bb202333..eefa2176 100755
--- a/engine/overworld/cinnabar_lab.asm
+++ b/engine/overworld/cinnabar_lab.asm
@@ -101,8 +101,7 @@ Func_610c2: ; 610c2 (18:50c2)
 	push hl
 	ld [wd11e], a
 	call GetItemName
-	FuncCoord 2, 2
-	ld hl, Coord
+	hlCoord 2, 2
 	ld a, [$ffdb]
 	ld bc, $28
 	call AddNTimes
diff --git a/engine/overworld/doors.asm b/engine/overworld/doors.asm
index 6337f511..42ebb174 100755
--- a/engine/overworld/doors.asm
+++ b/engine/overworld/doors.asm
@@ -10,8 +10,7 @@ HandleDoors: ; 1a609 (6:6609)
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	FuncCoord 8, 9
-	ld a, [Coord]
+	aCoord 8, 9
 	ld b, a
 .asm_1a621
 	ld a, [hli]
diff --git a/engine/overworld/ledges.asm b/engine/overworld/ledges.asm
index b64a1174..43df82e2 100755
--- a/engine/overworld/ledges.asm
+++ b/engine/overworld/ledges.asm
@@ -8,8 +8,7 @@ HandleLedges: ; 1a672 (6:6672)
 	predef Func_c586
 	ld a, [wSpriteStateData1 + 9]
 	ld b, a
-	FuncCoord 8, 9
-	ld a, [Coord]
+	aCoord 8, 9
 	ld c, a
 	ld a, [wcfc6]
 	ld d, a
diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm
index f8dd5fc4..f08a20cb 100644
--- a/engine/overworld/movement.asm
+++ b/engine/overworld/movement.asm
@@ -8,8 +8,7 @@ UpdatePlayerSprite: ; 4e31 (1:4e31)
 	ld [wSpriteStateData2], a
 	jr .asm_4e4a
 .asm_4e41
-	FuncCoord 8, 9
-	ld a, [Coord]
+	aCoord 8, 9
 	ld [$ff93], a
 	cp $60
 	jr c, .asm_4e50
diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm
index ee4c999d..a0d8175f 100755
--- a/engine/overworld/player_animations.asm
+++ b/engine/overworld/player_animations.asm
@@ -349,8 +349,7 @@ Func_70787: ; 70787 (1c:4787)
 	jr z, .asm_707a4
 	cp c
 	jr nz, .asm_7079e
-	FuncCoord 8, 9
-	ld a, [Coord]
+	aCoord 8, 9
 	cp [hl]
 	jr z, .asm_707a2
 .asm_7079e
diff --git a/engine/overworld/pokemart.asm b/engine/overworld/pokemart.asm
index adae76de..3b06bd2c 100755
--- a/engine/overworld/pokemart.asm
+++ b/engine/overworld/pokemart.asm
@@ -77,8 +77,7 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20)
 	ld hl,PokemartTellSellPriceText
 	ld bc,$0e01
 	call PrintText
-	FuncCoord 14,7
-	ld hl,Coord
+	hlCoord 14, 7
 	ld bc,$080f
 	ld a,$14
 	ld [wd125],a
@@ -149,8 +148,7 @@ DisplayPokemartDialogue_: ; 6c20 (1:6c20)
 	call CopyStringToCF4B ; copy name to wcf4b
 	ld hl,PokemartTellBuyPriceText
 	call PrintText
-	FuncCoord 14,7
-	ld hl,Coord
+	hlCoord 14, 7
 	ld bc,$080f
 	ld a,$14
 	ld [wd125],a
diff --git a/engine/save.asm b/engine/save.asm
index 1b8f1467..fcfbd133 100755
--- a/engine/save.asm
+++ b/engine/save.asm
@@ -151,12 +151,10 @@ SaveSAV: ;$770a
 	ret nz
 .save        ;$772d
 	call SaveSAVtoSRAM      ;$7848
-	FuncCoord 1,13
-	ld hl,Coord
+	hlCoord 1, 13
 	ld bc,$0412
 	call ClearScreenArea ; clear area 4x12 starting at 13,1
-	FuncCoord 1,14
-	ld hl,Coord
+	hlCoord 1, 14
 	ld de,NowSavingString
 	call PlaceString
 	ld c,$78
@@ -174,8 +172,7 @@ NowSavingString:
 
 SaveSAVConfirm: ; 73768 (1c:7768)
 	call PrintText
-	FuncCoord 0, 7
-	ld hl,Coord
+	hlCoord 0, 7
 	ld bc,$0801     ;arrow's coordinates |b = Y|c = X|
 	ld a,$14        ;one line shifting ($28 = 2 lines)
 	ld [wd125],a
@@ -435,16 +432,14 @@ Func_7393f: ; 7393f (1c:793f)
 	call TextBoxBorder
 	ld hl, ChooseABoxText
 	call PrintText
-	FuncCoord 11, 0
-	ld hl, Coord
+	hlCoord 11, 0
 	ld b, $c
 	ld c, $7
 	call TextBoxBorder
 	ld hl, $fff6
 	set 2, [hl]
 	ld de, BoxNames ; $79d9
-	FuncCoord 13, 1
-	ld hl, Coord
+	hlCoord 13, 1
 	call PlaceString
 	ld hl, $fff6
 	res 2, [hl]
@@ -453,23 +448,19 @@ Func_7393f: ; 7393f (1c:793f)
 	cp $9
 	jr c, .asm_739a6
 	sub $9
-	FuncCoord 8, 2
-	ld hl, Coord
+	hlCoord 8, 2
 	ld [hl], $f7
 	add $f6
 	jr .asm_739a8
 .asm_739a6
 	add $f7
 .asm_739a8
-	FuncCoord 9, 2
-	ld [Coord], a
-	FuncCoord 1, 2
-	ld hl, Coord
+	Coorda 9, 2
+	hlCoord 1, 2
 	ld de, BoxNoText
 	call PlaceString
 	call Func_73a84
-	FuncCoord 18, 1
-	ld hl, Coord
+	hlCoord 18, 1
 	ld de, wWhichTrade ; wWhichTrade
 	ld bc, $14
 	ld a, $c
diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm
index 9698da56..10c5fad4 100755
--- a/engine/titlescreen.asm
+++ b/engine/titlescreen.asm
@@ -68,8 +68,7 @@ ENDC
 	ld a, BANK(Version_GFX)
 	call FarCopyDataDouble
 	call Func_4519
-	FuncCoord 2, 1
-	ld hl, Coord
+	hlCoord 2, 1
 	ld a, $80
 	ld de, $14
 	ld c, $6
@@ -85,8 +84,7 @@ ENDC
 	add hl, de
 	dec c
 	jr nz, .asm_434d
-	FuncCoord 2, 7
-	ld hl, Coord
+	hlCoord 2, 7
 	ld a, $31
 	ld b, $10
 .asm_4361
@@ -98,8 +96,7 @@ ENDC
 	ld hl, wOAMBuffer + $28
 	ld a, $74
 	ld [hl], a
-	FuncCoord 2, 17
-	ld hl, Coord
+	hlCoord 2, 17
 	ld de, .titlescreenTilemap ; $437f
 	ld b, $10
 .asm_4377
@@ -346,8 +343,7 @@ Func_4519: ; 4519 (1:4519)
 Func_4524: ; 4524 (1:4524)
 	ld [wcf91], a
 	ld [wd0b5], a
-	FuncCoord 5, 10
-	ld hl, Coord
+	hlCoord 5, 10
 	call GetMonHeader
 	jp LoadFrontSpriteByMonIndex
 
@@ -366,8 +362,7 @@ LoadCopyrightTiles: ; 4541 (1:4541)
 	ld hl, vChars2 + $600
 	ld bc, (BANK(NintendoCopyrightLogoGraphics) << 8) + $1c
 	call CopyVideoData
-	FuncCoord 2, 7
-	ld hl, Coord
+	hlCoord 2, 7
 	ld de, CopyrightTextString ; $4556
 	jp PlaceString
 
@@ -381,8 +376,7 @@ INCLUDE "data/title_mons.asm"
 
 ; prints version text (red, blue)
 PrintGameVersionOnTitleScreen: ; 4598 (1:4598)
-	FuncCoord 7, 8
-	ld hl, Coord
+	hlCoord 7, 8
 	ld de, VersionOnTitleScreenText
 	jp PlaceString
 
diff --git a/engine/town_map.asm b/engine/town_map.asm
index ea2d3171..2cd37284 100755
--- a/engine/town_map.asm
+++ b/engine/town_map.asm
@@ -11,8 +11,7 @@ DisplayTownMap: ; 70e3e (1c:4e3e)
 	push af
 	ld b, $0
 	call Func_711c4
-	FuncCoord 1, 0
-	ld hl, Coord
+	hlCoord 1, 0
 	ld de, wcd6d
 	call PlaceString
 	ld hl, wOAMBuffer
@@ -57,8 +56,7 @@ Func_70e92: ; 70e92 (1c:4e92)
 	inc de
 	cp $50
 	jr nz, .asm_70eac
-	FuncCoord 1, 0
-	ld hl, Coord
+	hlCoord 1, 0
 	ld de, wcd6d
 	call PlaceString
 	ld hl, wOAMBuffer + $10
@@ -120,8 +118,7 @@ LoadTownMap_Nest: ; 70f60 (1c:4f60)
 	push hl
 	call Func_711ef
 	call GetMonName
-	FuncCoord 1, 0
-	ld hl, Coord
+	hlCoord 1, 0
 	call PlaceString
 	ld h, b
 	ld l, c
@@ -163,33 +160,28 @@ LoadTownMap_Fly: ; 70f90 (1c:4f90)
 	ld b, $0
 	call Func_711c4
 	ld hl, wTrainerEngageDistance
-	FuncCoord 18, 0
-	ld de, Coord
+	deCoord 18, 0
 
 .townMapFlyLoop
 	ld a, $7f
 	ld [de], a
 	push hl
 	push hl
-	FuncCoord 3, 0
-	ld hl, Coord
+	hlCoord 3, 0
 	ld bc, $10f
 	call ClearScreenArea
 	pop hl
 	ld a, [hl]
 	ld b, $4
 	call Func_711c4
-	FuncCoord 3, 0
-	ld hl, Coord
+	hlCoord 3, 0
 	ld de, wcd6d
 	call PlaceString
 	ld c, $f
 	call DelayFrames
-	FuncCoord 18, 0
-	ld hl, Coord
+	hlCoord 18, 0
 	ld [hl], $ed
-	FuncCoord 19, 0
-	ld hl, Coord
+	hlCoord 19, 0
 	ld [hl], $ee
 	pop hl
 .asm_71004
@@ -228,8 +220,7 @@ LoadTownMap_Fly: ; 70f90 (1c:4f90)
 	ld [hl], a
 	ret
 .asm_71042
-	FuncCoord 18, 0
-	ld de, Coord
+	deCoord 18, 0
 	inc hl
 	ld a, [hl]
 	cp $ff
@@ -241,8 +232,7 @@ LoadTownMap_Fly: ; 70f90 (1c:4f90)
 	ld hl, wTrainerEngageDistance
 	jp .townMapFlyLoop
 .asm_71058
-	FuncCoord 19, 0
-	ld de, Coord
+	deCoord 19, 0
 	dec hl
 	ld a, [hl]
 	cp $ff
@@ -402,13 +392,11 @@ Func_711ef: ; 711ef (1c:51ef)
 	ld a, l
 	and a
 	jr nz, .asm_71236
-	FuncCoord 1, 7
-	ld hl, Coord
+	hlCoord 1, 7
 	ld b, $2
 	ld c, $f
 	call TextBoxBorder
-	FuncCoord 2, 9
-	ld hl, Coord
+	hlCoord 2, 9
 	ld de, AreaUnknownText
 	call PlaceString
 	jr .asm_7123e
diff --git a/engine/trade.asm b/engine/trade.asm
index 3da1760f..54abdab6 100755
--- a/engine/trade.asm
+++ b/engine/trade.asm
@@ -181,8 +181,7 @@ Func_41245: ; 41245 (10:5245)
 	ld [$ffae], a
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
-	FuncCoord 4, 0
-	ld hl, Coord
+	hlCoord 4, 0
 	ld b, $6
 	ld c, $a
 	call TextBoxBorder
@@ -227,8 +226,7 @@ Func_41298: ; 41298 (10:5298)
 	call DelayFrame
 	ld a, $8b
 	ld [rLCDC], a ; $ff40
-	FuncCoord 6, 2
-	ld hl, Coord
+	hlCoord 6, 2
 	ld b, $7
 	call Func_41842
 	call Func_41186
@@ -300,8 +298,7 @@ Func_41336: ; 41336 (10:5336)
 	ld a, $ac
 	call Func_41676
 	call Func_415c8
-	FuncCoord 4, 10
-	ld hl, Coord
+	hlCoord 4, 10
 	ld b, $6
 	ld c, $a
 	call TextBoxBorder
@@ -318,8 +315,7 @@ Func_41336: ; 41336 (10:5336)
 	ld a, [wTrainerEngageDistance]
 	call PlayCry
 	call Func_41181
-	FuncCoord 4, 10
-	ld hl, Coord
+	hlCoord 4, 10
 	ld bc, $80c
 	call ClearScreenArea
 	jp PrintTradeTakeCareText
@@ -406,8 +402,7 @@ Func_41411: ; 41411 (10:5411)
 
 Func_4142d: ; 4142d (10:542d)
 	call Func_41196
-	FuncCoord 11, 4
-	ld hl, Coord
+	hlCoord 11, 4
 	ld a, $5d
 	ld [hli], a
 	ld a, $5e
@@ -416,25 +411,21 @@ Func_4142d: ; 4142d (10:542d)
 	ld [hli], a
 	dec c
 	jr nz, .asm_4143a
-	FuncCoord 5, 3
-	ld hl, Coord
+	hlCoord 5, 3
 	ld b, $6
 	call Func_41842
-	FuncCoord 4, 12
-	ld hl, Coord
+	hlCoord 4, 12
 	ld b, $2
 	ld c, $7
 	call TextBoxBorder
-	FuncCoord 5, 14
-	ld hl, Coord
+	hlCoord 5, 14
 	ld de, wPlayerName ; wd158
 	call PlaceString
 	jp DelayFrame
 
 Func_4145c: ; 4145c (10:545c)
 	call Func_41196
-	FuncCoord 0, 4
-	ld hl, Coord
+	hlCoord 0, 4
 	ld a, $5e
 	ld c, $e
 .asm_41466
@@ -458,25 +449,21 @@ Func_4145c: ; 4145c (10:545c)
 	ld [hld], a
 	ld a, $5d
 	ld [hl], a
-	FuncCoord 7, 8
-	ld hl, Coord
+	hlCoord 7, 8
 	ld b, $6
 	call Func_41842
-	FuncCoord 6, 0
-	ld hl, Coord
+	hlCoord 6, 0
 	ld b, $2
 	ld c, $7
 	call TextBoxBorder
-	FuncCoord 7, 2
-	ld hl, Coord
+	hlCoord 7, 2
 	ld de, W_GRASSRATE ; W_GRASSRATE
 	call PlaceString
 	jp DelayFrame
 
 Func_4149f: ; 4149f (10:549f)
 	call Func_41196
-	FuncCoord 0, 4
-	ld hl, Coord
+	hlCoord 0, 4
 	ld a, $5e
 	ld c, $14
 .asm_414a9
@@ -487,8 +474,7 @@ Func_4149f: ; 4149f (10:549f)
 
 Func_414ae: ; 414ae (10:54ae)
 	push hl
-	FuncCoord 0, 4
-	ld hl, Coord
+	hlCoord 0, 4
 	call ScheduleRowRedrawHelper
 	pop hl
 	ld a, h
@@ -655,8 +641,7 @@ Func_415a4: ; 415a4 (10:55a4)
 	xor $1
 	ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
 	call GetMonHeader
-	FuncCoord 7, 2
-	ld hl, Coord
+	hlCoord 7, 2
 	call LoadFlippedFrontSpriteByMonIndex
 	ld c, $a
 	jp DelayFrames
diff --git a/engine/trade2.asm b/engine/trade2.asm
index 496ce24b..b13a18b6 100755
--- a/engine/trade2.asm
+++ b/engine/trade2.asm
@@ -1,53 +1,43 @@
 Func_42769: ; 42769 (10:6769)
-	FuncCoord 5,0
-	ld hl,Coord
+	hlCoord 5, 0
 	ld de,OTString67E5
 	call PlaceString
 	ld a,[wWhichTrade]
 	ld [wd11e],a
 	predef IndexToPokedex
-	FuncCoord 9, 0
-	ld hl,Coord
+	hlCoord 9, 0
 	ld de,wd11e
 	ld bc,$8103
 	call PrintNumber
-	FuncCoord 5,2
-	ld hl,Coord
+	hlCoord 5, 2
 	ld de,wcf4b
 	call PlaceString
-	FuncCoord 8,4
-	ld hl,Coord
+	hlCoord 8, 4
 	ld de,wTrainerScreenX
 	call PlaceString
-	FuncCoord 8, 6
-	ld hl,Coord
+	hlCoord 8, 6
 	ld de,wcd4c
 	ld bc,$8205
 	jp PrintNumber
 
 Func_427a7: ; 427a7 (10:67a7)
-	FuncCoord 5,10
-	ld hl,Coord
+	hlCoord 5, 10
 	ld de,OTString67E5
 	call PlaceString
 	ld a,[wTrainerEngageDistance]
 	ld [wd11e],a
 	predef IndexToPokedex
-	FuncCoord 9, 10
-	ld hl,Coord
+	hlCoord 9, 10
 	ld de,wd11e
 	ld bc,$8103
 	call PrintNumber
-	FuncCoord 5,12
-	ld hl,Coord
+	hlCoord 5, 12
 	ld de,wcd6d
 	call PlaceString
-	FuncCoord 8,14
-	ld hl,Coord
+	hlCoord 8, 14
 	ld de,wcd4e
 	call PlaceString
-	FuncCoord 8, 16
-	ld hl,Coord
+	hlCoord 8, 16
 	ld de,wcd59
 	ld bc,$8205
 	jp PrintNumber
diff --git a/home.asm b/home.asm
index e9dc60c3..dc0b0889 100644
--- a/home.asm
+++ b/home.asm
@@ -1937,8 +1937,7 @@ DisplayListMenuID:: ; 2be6 (0:2be6)
 	ld [wd125],a
 	call DisplayTextBoxID ; draw the menu text box
 	call UpdateSprites ; move sprites
-	FuncCoord 4,2 ; coordinates of upper left corner of menu text box
-	ld hl,Coord
+	hlCoord 4, 2 ; coordinates of upper left corner of menu text box
 	ld de,$090e ; height and width of menu text box
 	ld a,[wListMenuID]
 	and a ; is it a PC pokemon list?
@@ -1974,13 +1973,12 @@ DisplayListMenuIDLoop:: ; 2c53 (0:2c53)
 	jr z,.notOldManBattle
 .oldManBattle
 	ld a,"▶"
-	FuncCoord 5,4
-	ld [Coord],a ; place menu cursor in front of first menu entry
+	Coorda 5, 4 ; place menu cursor in front of first menu entry
 	ld c,80
 	call DelayFrames
 	xor a
 	ld [wCurrentMenuItem],a
-	ld hl,Coord
+	hlCoord 5, 4
 	ld a,l
 	ld [wMenuCursorLocation],a
 	ld a,h
@@ -2099,27 +2097,23 @@ DisplayListMenuIDLoop:: ; 2c53 (0:2c53)
 
 DisplayChooseQuantityMenu:: ; 2d57 (0:2d57)
 ; text box dimensions/coordinates for just quantity
-	FuncCoord 15,9
-	ld hl,Coord
+	hlCoord 15, 9
 	ld b,1 ; height
 	ld c,3 ; width
 	ld a,[wListMenuID]
 	cp a,PRICEDITEMLISTMENU
 	jr nz,.drawTextBox
 ; text box dimensions/coordinates for quantity and price
-	FuncCoord 7,9
-	ld hl,Coord
+	hlCoord 7, 9
 	ld b,1  ; height
 	ld c,11 ; width
 .drawTextBox
 	call TextBoxBorder
-	FuncCoord 16,10
-	ld hl,Coord
+	hlCoord 16, 10
 	ld a,[wListMenuID]
 	cp a,PRICEDITEMLISTMENU
 	jr nz,.printInitialQuantity
-	FuncCoord 8,10
-	ld hl,Coord
+	hlCoord 8, 10
 .printInitialQuantity
 	ld de,InitialQuantityText
 	call PlaceString
@@ -2159,8 +2153,7 @@ DisplayChooseQuantityMenu:: ; 2d57 (0:2d57)
 	ld a,[wcf97] ; max quantity
 	ld [hl],a
 .handleNewQuantity
-	FuncCoord 17,10
-	ld hl,Coord
+	hlCoord 17, 10
 	ld a,[wListMenuID]
 	cp a,PRICEDITEMLISTMENU
 	jr nz,.printQuantity
@@ -2199,15 +2192,13 @@ DisplayChooseQuantityMenu:: ; 2d57 (0:2d57)
 	ld a,[$ffa4]
 	ld [$ffa1],a
 .skipHalvingPrice
-	FuncCoord 12,10
-	ld hl,Coord
+	hlCoord 12, 10
 	ld de,SpacesBetweenQuantityAndPriceText
 	call PlaceString
 	ld de,$ff9f ; total price
 	ld c,$a3
 	call PrintBCDNumber
-	FuncCoord 9,10
-	ld hl,Coord
+	hlCoord 9, 10
 .printQuantity
 	ld de,wcf96 ; current quantity
 	ld bc,$8102 ; print leading zeroes, 1 byte, 2 digits
@@ -2246,8 +2237,7 @@ ExitListMenu:: ; 2e3b (0:2e3b)
 	ret
 
 PrintListMenuEntries:: ; 2e5a (0:2e5a)
-	FuncCoord 5, 3
-	ld hl,Coord
+	hlCoord 5, 3
 	ld b,$09
 	ld c,$0e
 	call ClearScreenArea
@@ -2272,8 +2262,7 @@ PrintListMenuEntries:: ; 2e5a (0:2e5a)
 	jr nc,.noCarry
 	inc d
 .noCarry
-	FuncCoord 6,4 ; coordinates of first list entry name
-	ld hl,Coord
+	hlCoord 6, 4 ; coordinates of first list entry name
 	ld b,4 ; print 4 names
 .loop
 	ld a,b
@@ -3539,8 +3528,7 @@ Func_35f4:: ; 35f4 (0:35f4)
 InitYesNoTextBoxParameters:: ; 35ff (0:35ff)
 	xor a
 	ld [wd12c], a
-	FuncCoord 14, 7
-	ld hl, Coord
+	hlCoord 14, 7
 	ld bc, $80f
 	ret
 
@@ -3548,8 +3536,7 @@ YesNoChoicePokeCenter:: ; 360a (0:360a)
 	call SaveScreenTilesToBuffer1
 	ld a, $6
 	ld [wd12c], a
-	FuncCoord 11, 6
-	ld hl, Coord
+	hlCoord 11, 6
 	ld bc, $80c
 	jr DisplayYesNoChoice
 
@@ -3557,8 +3544,7 @@ Func_361a:: ; 361a (0:361a)
 	call SaveScreenTilesToBuffer1
 	ld a, $3
 	ld [wd12c], a
-	FuncCoord 12, 7
-	ld hl, Coord
+	hlCoord 12, 7
 	ld bc, $080d
 DisplayYesNoChoice:: ; 3628 (0:3628)
 	ld a, $14
@@ -3995,8 +3981,7 @@ WaitForTextScrollButtonPress:: ; 3865 (0:3865)
 	jr z, .asm_387c
 	call Func_716c6
 .asm_387c
-	FuncCoord 18, 16
-	ld hl, Coord
+	hlCoord 18, 16
 	call HandleDownArrowBlinkTiming
 	pop hl
 	call JoypadLowSensitivity
@@ -4472,8 +4457,7 @@ HandleMenuInputPokemonSelection:: ; 3ac2 (0:3ac2)
 	and a ; was a key pressed?
 	jr nz,.keyPressed
 	push hl
-	FuncCoord 18,11 ; coordinates of blinking down arrow in some menus
-	ld hl,Coord
+	hlCoord 18, 11 ; coordinates of blinking down arrow in some menus
 	call HandleDownArrowBlinkTiming ; blink down arrow (if any)
 	pop hl
 	ld a,[wMenuJoypadPollCount]
@@ -4734,8 +4718,7 @@ PrintText:: ; 3c49 (0:3c49)
 	call Delay3
 	pop hl
 Func_3c59:: ; 3c59 (0:3c59)
-	FuncCoord 1,14
-	ld bc,Coord
+	bcCoord 1, 14
 	jp TextCommandProcessor
 
 ; converts a big-endian binary number into decimal and prints it
diff --git a/home/overworld.asm b/home/overworld.asm
index 872d63ee..cf36aba8 100644
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -105,8 +105,7 @@ OverworldLoopLessDelay::
 	jr nz,.checkForOpponent
 	bit 0,a
 	jr nz,.checkForOpponent
-	FuncCoord 8, 9
-	ld a,[Coord]
+	aCoord 8, 9
 	ld [wcf0e],a
 	call DisplayTextID ; display either the start menu or the NPC/sign text
 	ld a,[wcc47]
@@ -670,8 +669,7 @@ CheckMapConnections:: ; 07ba (0:07ba)
 
 ; function to play a sound when changing maps
 PlayMapChangeSound:: ; 08c9 (0:08c9)
-	FuncCoord 8, 8
-	ld a,[Coord] ; upper left tile of the 4x4 square the player's sprite is standing on
+	aCoord 8, 8 ; upper left tile of the 4x4 square the player's sprite is standing on
 	cp a,$0b ; door tile in tileset 0
 	jr nz,.didNotGoThroughDoor
 	ld a,(SFX_02_57 - SFX_Headers_02) / 3
@@ -1279,8 +1277,7 @@ CheckForJumpingAndTilePairCollisions:: ; 0c2a (0:0c2a)
 ; if not jumping
 
 Func_c44:: ; 0c44 (0:0c44)
-	FuncCoord 8, 9
-	ld a,[Coord] ; tile the player is on
+	aCoord 8, 9 ; tile the player is on
 	ld [wcf0e],a
 
 CheckForTilePairCollisions:: ; 0c4a (0:0c4a)
@@ -1694,8 +1691,7 @@ MoveTileBlockMapPointerNorth:: ; 0e85 (0:0e85)
 ; the portion of the map that was newly exposed due to the player's movement
 
 ScheduleNorthRowRedraw:: ; 0e91 (0:0e91)
-	FuncCoord 0, 0
-	ld hl,Coord
+	hlCoord 0, 0
 	call ScheduleRowRedrawHelper
 	ld a,[wd526]
 	ld [H_SCREENEDGEREDRAWADDR],a
@@ -1717,8 +1713,7 @@ ScheduleRowRedrawHelper:: ; 0ea6 (0:0ea6)
 	ret
 
 ScheduleSouthRowRedraw:: ; 0eb2 (0:0eb2)
-	FuncCoord 0,16
-	ld hl,Coord
+	hlCoord 0, 16
 	call ScheduleRowRedrawHelper
 	ld a,[wd526]
 	ld l,a
@@ -1737,8 +1732,7 @@ ScheduleSouthRowRedraw:: ; 0eb2 (0:0eb2)
 	ret
 
 ScheduleEastColumnRedraw:: ; 0ed3 (0:0ed3)
-	FuncCoord 18,0
-	ld hl,Coord
+	hlCoord 18, 0
 	call ScheduleColumnRedrawHelper
 	ld a,[wd526]
 	ld c,a
@@ -1776,8 +1770,7 @@ ScheduleColumnRedrawHelper:: ; 0ef2 (0:0ef2)
 	ret
 
 ScheduleWestColumnRedraw:: ; 0f08 (0:0f08)
-	FuncCoord 0,0
-	ld hl,Coord
+	hlCoord 0, 0
 	call ScheduleColumnRedrawHelper
 	ld a,[wd526]
 	ld [H_SCREENEDGEREDRAWADDR],a
diff --git a/home/text.asm b/home/text.asm
index 46c17b07..abcac9fd 100644
--- a/home/text.asm
+++ b/home/text.asm
@@ -76,8 +76,7 @@ PlaceNextChar:: ; 1956 (0:1956)
 	cp $4F
 	jr nz,.next3
 	pop hl
-	FuncCoord 1, 16
-	ld hl,Coord
+	hlCoord 1, 16
 	push hl
 	jp Next19E8
 
@@ -270,14 +269,12 @@ Char58:: ; 1a95 (0:1a95)
 	cp 4
 	jp z,Next1AA2
 	ld a,$EE
-	FuncCoord 18, 16
-	ld [Coord],a
+	Coorda 18, 16
 Next1AA2:: ; 1aa2 (0:1aa2)
 	call ProtectedDelay3
 	call ManualTextScroll
 	ld a,$7F
-	FuncCoord 18, 16
-	ld [Coord],a
+	Coorda 18, 16
 Char57:: ; 1aad (0:1aad)
 	pop hl
 	ld de,Char58Text
@@ -290,67 +287,56 @@ Char58Text:: ; 1ab3 (0:1ab3)
 Char51:: ; 1ab4 (0:1ab4)
 	push de
 	ld a,$EE
-	FuncCoord 18, 16
-	ld [Coord],a
+	Coorda 18, 16
 	call ProtectedDelay3
 	call ManualTextScroll
-	FuncCoord 1, 13
-	ld hl,Coord
+	hlCoord 1, 13
 	ld bc,$0412
 	call ClearScreenArea
 	ld c,$14
 	call DelayFrames
 	pop de
-	FuncCoord 1, 14
-	ld hl,Coord
+	hlCoord 1, 14
 	jp Next19E8
 
 Char49:: ; 1ad5 (0:1ad5)
 	push de
 	ld a,$EE
-	FuncCoord 18, 16
-	ld [Coord],a
+	Coorda 18, 16
 	call ProtectedDelay3
 	call ManualTextScroll
-	FuncCoord 1, 10
-	ld hl,Coord
+	hlCoord 1, 10
 	ld bc,$0712
 	call ClearScreenArea
 	ld c,$14
 	call DelayFrames
 	pop de
 	pop hl
-	FuncCoord 1, 11
-	ld hl,Coord
+	hlCoord 1, 11
 	push hl
 	jp Next19E8
 
 Char4B:: ; 1af8 (0:1af8)
 	ld a,$EE
-	FuncCoord 18, 16
-	ld [Coord],a
+	Coorda 18, 16
 	call ProtectedDelay3
 	push de
 	call ManualTextScroll
 	pop de
 	ld a,$7F
-	FuncCoord 18, 16
-	ld [Coord],a
+	Coorda 18, 16
 	;fall through
 Char4C:: ; 1b0a (0:1b0a)
 	push de
 	call Next1B18
 	call Next1B18
-	FuncCoord 1, 16
-	ld hl,Coord
+	hlCoord 1, 16
 	pop de
 	jp Next19E8
 
 Next1B18:: ; 1b18 (0:1b18)
-	FuncCoord 0, 14
-	ld hl,Coord
-	FuncCoord 0, 13
-	ld de,Coord
+	hlCoord 0, 14
+	deCoord 0, 13
 	ld b,$3C
 .next
 	ld a,[hli]
@@ -358,8 +344,7 @@ Next1B18:: ; 1b18 (0:1b18)
 	inc de
 	dec b
 	jr nz,.next
-	FuncCoord 1, 16
-	ld hl,Coord
+	hlCoord 1, 16
 	ld a,$7F
 	ld b,$12
 .next2
@@ -514,8 +499,7 @@ TextCommand03:: ; 1bb7 (0:1bb7)
 ; (no arguments)
 TextCommand05:: ; 1bc5 (0:1bc5)
 	pop hl
-	FuncCoord 1, 16
-	ld bc,Coord ; address of second line of dialogue text box
+	bcCoord 1, 16 ; address of second line of dialogue text box
 	jp NextTextCommand
 
 ; blink arrow and wait for A or B to be pressed
@@ -526,14 +510,12 @@ TextCommand06:: ; 1bcc (0:1bcc)
 	cp a,$04
 	jp z,TextCommand0D
 	ld a,$ee ; down arrow
-	FuncCoord 18, 16
-	ld [Coord],a ; place down arrow in lower right corner of dialogue text box
+	Coorda 18, 16 ; place down arrow in lower right corner of dialogue text box
 	push bc
 	call ManualTextScroll ; blink arrow and wait for A or B to be pressed
 	pop bc
 	ld a," "
-	FuncCoord 18, 16
-	ld [Coord],a ; overwrite down arrow with blank space
+	Coorda 18, 16 ; overwrite down arrow with blank space
 	pop hl
 	jp NextTextCommand
 
@@ -542,13 +524,11 @@ TextCommand06:: ; 1bcc (0:1bcc)
 ; (no arguments)
 TextCommand07:: ; 1be7 (0:1be7)
 	ld a," "
-	FuncCoord 18, 16
-	ld [Coord],a ; place blank space in lower right corner of dialogue text box
+	Coorda 18, 16 ; place blank space in lower right corner of dialogue text box
 	call Next1B18 ; scroll up text
 	call Next1B18
 	pop hl
-	FuncCoord 1, 16
-	ld bc,Coord ; address of second line of dialogue text box
+	bcCoord 1, 16 ; address of second line of dialogue text box
 	jp NextTextCommand
 
 ; execute asm inline
diff --git a/home/vcopy.asm b/home/vcopy.asm
index 71487cf1..81fcb991 100644
--- a/home/vcopy.asm
+++ b/home/vcopy.asm
@@ -130,8 +130,7 @@ AutoBgMapTransfer:: ; 1d57 (0:1d57)
 	dec a
 	jr z,.transferMiddleThird
 .transferBottomThird
-	FuncCoord 0,12
-	ld hl,Coord
+	hlCoord 0, 12
 	ld sp,hl
 	ld a,[H_AUTOBGTRANSFERDEST + 1]
 	ld h,a
@@ -142,8 +141,7 @@ AutoBgMapTransfer:: ; 1d57 (0:1d57)
 	xor a ; TRANSFERTOP
 	jr .doTransfer
 .transferTopThird
-	FuncCoord 0,0
-	ld hl,Coord
+	hlCoord 0, 0
 	ld sp,hl
 	ld a,[H_AUTOBGTRANSFERDEST + 1]
 	ld h,a
@@ -152,8 +150,7 @@ AutoBgMapTransfer:: ; 1d57 (0:1d57)
 	ld a,TRANSFERMIDDLE
 	jr .doTransfer
 .transferMiddleThird
-	FuncCoord 0,6
-	ld hl,Coord
+	hlCoord 0, 6
 	ld sp,hl
 	ld a,[H_AUTOBGTRANSFERDEST + 1]
 	ld h,a
diff --git a/macros.asm b/macros.asm
index a99a80ea..8244c8c9 100644
--- a/macros.asm
+++ b/macros.asm
@@ -37,8 +37,38 @@ callab: MACRO
 
 ;\1 = X
 ;\2 = Y
-FuncCoord: MACRO
-Coord = $C3A0 + 20 * \2 + \1
+hlCoord: MACRO
+	ld hl, wTileMap + 20 * \2 + \1
+	ENDM
+
+;\1 = X
+;\2 = Y
+deCoord: MACRO
+	ld de, wTileMap + 20 * \2 + \1
+	ENDM
+
+;\1 = X
+;\2 = Y
+bcCoord: MACRO
+	ld bc, wTileMap + 20 * \2 + \1
+	ENDM
+
+;\1 = X
+;\2 = Y
+aCoord: MACRO
+	ld a, [wTileMap + 20 * \2 + \1]
+	ENDM
+
+;\1 = X
+;\2 = Y
+Coorda: MACRO
+	ld [wTileMap + 20 * \2 + \1], a
+	ENDM
+
+;\1 = X
+;\2 = Y
+dwCoord: MACRO
+	dw wTileMap + 20 * \2 + \1
 	ENDM
 
 ;\1 = Map Width
diff --git a/main.asm b/main.asm
index df42f937..32a3db2c 100755
--- a/main.asm
+++ b/main.asm
@@ -158,8 +158,7 @@ INCLUDE "engine/overworld/oam.asm"
 INCLUDE "engine/oam_dma.asm"
 
 PrintWaitingText:
-	FuncCoord 3, 10
-	ld hl, Coord
+	hlCoord 3, 10
 	ld b, $1
 	ld c, $b
 	ld a, [W_ISINBATTLE]
@@ -170,8 +169,7 @@ PrintWaitingText:
 .asm_4c17
 	call Func_5ab3
 .asm_4c1a
-	FuncCoord 4, 11
-	ld hl, Coord
+	hlCoord 4, 11
 	ld de, WaitingText
 	call PlaceString
 	ld c, 50
@@ -920,21 +918,18 @@ DisplayTextIDInit: ; 7096 (1:7096)
 	ld a,[wd74b]
 	bit 5,a ; does the player have the pokedex?
 ; start menu with pokedex
-	FuncCoord 10, 0
-	ld hl,Coord
+	hlCoord 10, 0
 	ld b,$0e
 	ld c,$08
 	jr nz,.drawTextBoxBorder
 ; start menu without pokedex
-	FuncCoord 10, 0
-	ld hl,Coord
+	hlCoord 10, 0
 	ld b,$0c
 	ld c,$08
 	jr .drawTextBoxBorder
 ; if text ID is not 0 (i.e. not the start menu) then do a standard dialogue text box
 .notStartMenu
-	FuncCoord 0, 12
-	ld hl,Coord
+	hlCoord 0, 12
 	ld b,$04
 	ld c,$12
 .drawTextBoxBorder
@@ -992,14 +987,12 @@ DrawStartMenu: ; 710b (1:710b)
 	ld a,[wd74b]
 	bit 5,a ; does the player have the pokedex?
 ; menu with pokedex
-	FuncCoord 10, 0
-	ld hl,Coord
+	hlCoord 10, 0
 	ld b,$0e
 	ld c,$08
 	jr nz,.drawTextBoxBorder
 ; shorter menu if the player doesn't have the pokedex
-	FuncCoord 10, 0
-	ld hl,Coord
+	hlCoord 10, 0
 	ld b,$0c
 	ld c,$08
 .drawTextBoxBorder
@@ -1017,8 +1010,7 @@ DrawStartMenu: ; 710b (1:710b)
 	ld [wcc37],a
 	ld hl,wd730
 	set 6,[hl] ; no pauses between printing each letter
-	FuncCoord 12, 2
-	ld hl,Coord
+	hlCoord 12, 2
 	ld a,[wd74b]
 	bit 5,a ; does the player have the pokedex?
 ; case for not having pokdex
@@ -1360,13 +1352,11 @@ Func_74ba: ; 74ba (1:74ba)
 	ld a, $f
 	ld [wd125], a
 	call DisplayTextBoxID
-	FuncCoord 13, 1
-	ld hl, Coord
+	hlCoord 13, 1
 	ld b, $1
 	ld c, $6
 	call ClearScreenArea
-	FuncCoord 12, 1
-	ld hl, Coord
+	hlCoord 12, 1
 	ld de, wPlayerMoney ; wPlayerMoney
 	ld c, $a3
 	call PrintBCDNumber
@@ -1637,22 +1627,19 @@ Func_76e1: ; 76e1 (1:36e1)
 	ld a, [wTrainerScreenX]
 	and a
 	jr nz, .asm_770f
-	FuncCoord 11, 11
-	ld hl, Coord
+	hlCoord 11, 11
 	ld b, $5
 	ld c, $7
 	call TextBoxBorder
 	call UpdateSprites
 	ld a, $c
 	ld [$fff7], a
-	FuncCoord 13, 12
-	ld hl, Coord
+	hlCoord 13, 12
 	ld de, PokemonMenuEntries ; $77c2
 	jp PlaceString
 .asm_770f
 	push af
-	FuncCoord 0, 11
-	ld hl, Coord
+	hlCoord 0, 11
 	ld a, [wcd42]
 	dec a
 	ld e, a
@@ -1675,8 +1662,7 @@ Func_76e1: ; 76e1 (1:36e1)
 	inc b
 	call TextBoxBorder
 	call UpdateSprites
-	FuncCoord 0, 12
-	ld hl, Coord
+	hlCoord 0, 12
 	ld a, [wcd42]
 	inc a
 	ld e, a
@@ -1723,8 +1709,7 @@ Func_76e1: ; 76e1 (1:36e1)
 	pop hl
 	ld a, [wcd42]
 	ld [$fff7], a
-	FuncCoord 0, 12
-	ld hl, Coord
+	hlCoord 0, 12
 	ld a, [wcd42]
 	inc a
 	ld e, a
@@ -2191,8 +2176,7 @@ Func_c49d: ; c49d (3:449d)
 	ld h, [hl]
 	ld l, a
 	ld de, $1
-	FuncCoord 8, 9
-	ld a, [Coord]
+	aCoord 8, 9
 	call IsInArray
 	jr nc, .asm_c4c8
 	ld hl, wd736
@@ -2215,29 +2199,24 @@ PrintSafariZoneSteps: ; c52f (3:452f)
 	ld b, $3
 	ld c, $7
 	call TextBoxBorder
-	FuncCoord 1, 1
-	ld hl, Coord
+	hlCoord 1, 1
 	ld de, wSafariSteps ; wd70d
 	ld bc, $203
 	call PrintNumber
-	FuncCoord 4, 1
-	ld hl, Coord
+	hlCoord 4, 1
 	ld de, SafariSteps ; $4579
 	call PlaceString
-	FuncCoord 1, 3
-	ld hl, Coord
+	hlCoord 1, 3
 	ld de, SafariBallText
 	call PlaceString
 	ld a, [W_NUMSAFARIBALLS] ; W_NUMSAFARIBALLS
 	cp $a
 	jr nc, .asm_c56d
-	FuncCoord 5, 3
-	ld hl, Coord
+	hlCoord 5, 3
 	ld a, $7f
 	ld [hl], a
 .asm_c56d
-	FuncCoord 6, 3
-	ld hl, Coord
+	hlCoord 6, 3
 	ld de, W_NUMSAFARIBALLS ; W_NUMSAFARIBALLS
 	ld bc, $102
 	jp PrintNumber
@@ -2259,29 +2238,25 @@ Func_c589: ; c589 (3:4589)
 	ld a, [wSpriteStateData1 + 9]
 	and a
 	jr nz, .asm_c59d
-	FuncCoord 8, 11
-	ld a, [Coord]
+	aCoord 8, 11
 	inc d
 	jr .asm_c5b9
 .asm_c59d
 	cp $4
 	jr nz, .asm_c5a7
-	FuncCoord 8, 7
-	ld a, [Coord]
+	aCoord 8, 7
 	dec d
 	jr .asm_c5b9
 .asm_c5a7
 	cp $8
 	jr nz, .asm_c5b1
-	FuncCoord 6, 9
-	ld a, [Coord]
+	aCoord 6, 9
 	dec e
 	jr .asm_c5b9
 .asm_c5b1
 	cp $c
 	jr nz, .asm_c5b9
-	FuncCoord 10, 9
-	ld a, [Coord]
+	aCoord 10, 9
 	inc e
 .asm_c5b9
 	ld c, a
@@ -2300,8 +2275,7 @@ Func_c5be: ; c5be (3:45be)
 	jr nz, .asm_c5d8
 	ld hl, $ffdb
 	set 0, [hl]
-	FuncCoord 8, 13
-	ld a, [Coord]
+	aCoord 8, 13
 	inc d
 	jr .asm_c603
 .asm_c5d8
@@ -2309,8 +2283,7 @@ Func_c5be: ; c5be (3:45be)
 	jr nz, .asm_c5e7
 	ld hl, $ffdb
 	set 1, [hl]
-	FuncCoord 8, 5
-	ld a, [Coord]
+	aCoord 8, 5
 	dec d
 	jr .asm_c603
 .asm_c5e7
@@ -2318,8 +2291,7 @@ Func_c5be: ; c5be (3:45be)
 	jr nz, .asm_c5f6
 	ld hl, $ffdb
 	set 2, [hl]
-	FuncCoord 4, 9
-	ld a, [Coord]
+	aCoord 4, 9
 	dec e
 	jr .asm_c603
 .asm_c5f6
@@ -2327,8 +2299,7 @@ Func_c5be: ; c5be (3:45be)
 	jr nz, .asm_c603
 	ld hl, $ffdb
 	set 3, [hl]
-	FuncCoord 12, 9
-	ld a, [Coord]
+	aCoord 12, 9
 	inc e
 .asm_c603
 	ld c, a
@@ -2919,13 +2890,11 @@ DrawBadges: ; ea03 (3:6a03)
 	ld [hli], a
 	ld [hl], $60 ; First name
 
-	FuncCoord 2, 11
-	ld hl, Coord
+	hlCoord 2, 11
 	ld de, wcd49
 	call .DrawBadgeRow
 
-	FuncCoord 2, 14
-	ld hl, Coord
+	hlCoord 2, 14
 	ld de, wcd49 + 4
 ;	call .DrawBadgeRow
 ;	ret
diff --git a/scripts/bikeshop.asm b/scripts/bikeshop.asm
index c30829e9..4bd26a7e 100755
--- a/scripts/bikeshop.asm
+++ b/scripts/bikeshop.asm
@@ -56,12 +56,10 @@ BikeShopText1: ; 1d745 (7:5745)
 	ld c, $f
 	call TextBoxBorder
 	call UpdateSprites
-	FuncCoord 2, 2
-	ld hl, Coord
+	hlCoord 2, 2
 	ld de, BikeShopMenuText
 	call PlaceString
-	FuncCoord 8, 3
-	ld hl, Coord
+	hlCoord 8, 3
 	ld de, BikeShopMenuPrice
 	call PlaceString
 	ld hl, BikeShopText_1d815
diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm
index 2d638044..9746f54e 100755
--- a/scripts/celadongamecorner.asm
+++ b/scripts/celadongamecorner.asm
@@ -467,40 +467,32 @@ CeladonGameCornerText_48f19: ; 48f19 (12:4f19)
 CeladonGameCornerScript_48f1e: ; 48f1e (12:4f1e)
 	ld hl, wd730
 	set 6, [hl]
-	FuncCoord 11, 0
-	ld hl, Coord
+	hlCoord 11, 0
 	ld b, $5
 	ld c, $7
 	call TextBoxBorder
 	call UpdateSprites
-	FuncCoord 12, 1
-	ld hl, Coord
+	hlCoord 12, 1
 	ld b, $4
 	ld c, $7
 	call ClearScreenArea
-	FuncCoord 12, 2
-	ld hl, Coord
+	hlCoord 12, 2
 	ld de, GameCornerMoneyText
 	call PlaceString
-	FuncCoord 12, 3
-	ld hl, Coord
+	hlCoord 12, 3
 	ld de, GameCornerBlankText1
 	call PlaceString
-	FuncCoord 12, 3
-	ld hl, Coord
+	hlCoord 12, 3
 	ld de, wPlayerMoney
 	ld c, $a3
 	call PrintBCDNumber
-	FuncCoord 12, 4
-	ld hl, Coord
+	hlCoord 12, 4
 	ld de, GameCornerCoinText
 	call PlaceString
-	FuncCoord 12, 5
-	ld hl, Coord
+	hlCoord 12, 5
 	ld de, GameCornerBlankText2
 	call PlaceString
-	FuncCoord 15, 5
-	ld hl, Coord
+	hlCoord 15, 5
 	ld de, wPlayerCoins
 	ld c, $82
 	call PrintBCDNumber
diff --git a/scripts/celadonmartroof.asm b/scripts/celadonmartroof.asm
index 02f2959d..37025525 100755
--- a/scripts/celadonmartroof.asm
+++ b/scripts/celadonmartroof.asm
@@ -200,8 +200,7 @@ CeladonMartRoofScript_48532: ; 48532 (12:4532)
 	push hl
 	ld [wd11e], a
 	call GetItemName
-	FuncCoord 2, 2
-	ld hl, Coord
+	hlCoord 2, 2
 	ld a, [$ffdb]
 	ld bc, $28
 	call AddNTimes
diff --git a/scripts/vermiliondock.asm b/scripts/vermiliondock.asm
index 215bf467..03dc4377 100755
--- a/scripts/vermiliondock.asm
+++ b/scripts/vermiliondock.asm
@@ -53,8 +53,7 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b)
 	call DelayFrames
 	ld b, $9c
 	call CopyScreenTileBufferToVRAM
-	FuncCoord 0, 10
-	ld hl, Coord
+	hlCoord 0, 10
 	ld bc, $0078
 	ld a, $14
 	call FillMemory
-- 
cgit v1.3.1-sl0p