3 files changed, 6 insertions, 41 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc
index 62437ccb8..27a439725 100644
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -334,10 +334,10 @@
 	.byte 0x30
 	.endm
 
-	@ Plays the specified (fanfare_number) fanfare.
-	.macro playfanfare fanfare_number:req
+	@ Plays the fanfare specified by the song number. If the specified song is not a fanfare it will instead play the first song in sFanfares.
+	.macro playfanfare songNumber:req
 	.byte 0x31
-	.2byte \fanfare_number
+	.2byte \songNumber
 	.endm
 
 	@ Blocks script execution until all currently-playing fanfares finish.
@@ -1208,10 +1208,10 @@
 	.endm
 
 	@ Plays the specified (species) Pokemon's cry. You can use waitcry to block script execution until the sound finishes.
-	.macro playmoncry species:req, effect:req
+	.macro playmoncry species:req, mode:req
 	.byte 0xa1
 	.2byte \species
-	.2byte \effect
+	.2byte \mode
 	.endm
 
 	@ Changes the metatile at (x, y) on the current map.
diff --git a/asm/macros/music_voice.inc b/asm/macros/music_voice.inc
index 64dd38214..ff87c56d6 100644
--- a/asm/macros/music_voice.inc
+++ b/asm/macros/music_voice.inc
@@ -145,7 +145,7 @@
 	.byte 0xff, 0, 0xff, 0
 	.endm
 
-	.macro cry2 sample:req
+	.macro cry_reverse sample:req
 	.byte 0x30, 60, 0, 0
 	.4byte \sample
 	.byte 0xff, 0, 0xff, 0
diff --git a/asm/rom_header.inc b/asm/rom_header.inc
deleted file mode 100644
index 6730efae2..000000000
--- a/asm/rom_header.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-	.global RomHeaderNintendoLogo
-RomHeaderNintendoLogo:
-	.space 156
-
-RomHeaderGameTitle:
-	.space 12
-
-	.global RomHeaderGameCode
-RomHeaderGameCode:
-	.space 4
-
-RomHeaderMakerCode:
-	.space 2
-
-RomHeaderMagic:
-	.byte 0
-
-RomHeaderMainUnitCode:
-	.byte 0
-
-RomHeaderDeviceType:
-	.byte 0
-
-RomHeaderReserved1:
-	.space 7
-
-	.global RomHeaderSoftwareVersion
-RomHeaderSoftwareVersion:
-	.byte 0
-
-RomHeaderChecksum:
-	.byte 0
-
-RomHeaderReserved2:
-	.space 2