Clean up pre-linkerscript remnants.

audio.asm

@@ -1,34 +1,30 @@
 
-AUDIO_1 EQU $2
-AUDIO_2 EQU $8
-AUDIO_3 EQU $1f
-
 INCLUDE "constants.asm"
 
 
-SECTION "Sound Effect Headers 1", ROMX, BANK[AUDIO_1]
+SECTION "Sound Effect Headers 1", ROMX ; BANK $02
 INCLUDE "audio/headers/sfxheaders1.asm"
 
-SECTION "Sound Effect Headers 2", ROMX, BANK[AUDIO_2]
+SECTION "Sound Effect Headers 2", ROMX ; BANK $08
 INCLUDE "audio/headers/sfxheaders2.asm"
 
-SECTION "Sound Effect Headers 3", ROMX, BANK[AUDIO_3]
+SECTION "Sound Effect Headers 3", ROMX ; BANK $1f
 INCLUDE "audio/headers/sfxheaders3.asm"
 
 
 
-SECTION "Music Headers 1", ROMX, BANK[AUDIO_1]
+SECTION "Music Headers 1", ROMX ; BANK $02
 INCLUDE "audio/headers/musicheaders1.asm"
 
-SECTION "Music Headers 2", ROMX, BANK[AUDIO_2]
+SECTION "Music Headers 2", ROMX ; BANK $08
 INCLUDE "audio/headers/musicheaders2.asm"
 
-SECTION "Music Headers 3", ROMX, BANK[AUDIO_3]
+SECTION "Music Headers 3", ROMX ; BANK $1f
 INCLUDE "audio/headers/musicheaders3.asm"
 
 
 
-SECTION "Sound Effects 1", ROMX, BANK[AUDIO_1]
+SECTION "Sound Effects 1", ROMX ; BANK $02
 
 INCLUDE "audio/sfx/snare1_1.asm"
 INCLUDE "audio/sfx/snare2_1.asm"
@@ -127,7 +123,7 @@ INCLUDE "audio/sfx/cry21_1.asm"
 INCLUDE "audio/sfx/cry22_1.asm"
 
 
-SECTION "Sound Effects 2", ROMX, BANK[AUDIO_2]
+SECTION "Sound Effects 2", ROMX ; BANK $08
 
 INCLUDE "audio/sfx/snare1_2.asm"
 INCLUDE "audio/sfx/snare2_2.asm"
@@ -252,7 +248,7 @@ INCLUDE "audio/sfx/cry21_2.asm"
 INCLUDE "audio/sfx/cry22_2.asm"
 
 
-SECTION "Sound Effects 3", ROMX, BANK[AUDIO_3]
+SECTION "Sound Effects 3", ROMX ; BANK $1f
 
 INCLUDE "audio/sfx/snare1_3.asm"
 INCLUDE "audio/sfx/snare2_3.asm"
@@ -360,7 +356,7 @@ INCLUDE "audio/sfx/cry22_3.asm"
 
 
 
-SECTION "Audio Engine 1", ROMX, BANK[AUDIO_1]
+SECTION "Audio Engine 1", ROMX ; BANK $02
 
 PlayBattleMusic::
  xor a
@@ -453,7 +449,7 @@ Music_Cities1AlternateTempo::
  jp Audio1_OverwriteChannelPointer
 
 
-SECTION "Audio Engine 2", ROMX, BANK[AUDIO_2]
+SECTION "Audio Engine 2", ROMX ; BANK $08
 
 Music_DoLowHealthAlarm::
  ld a, [wLowHealthAlarm]
@@ -557,7 +553,7 @@ Audio2_OverwriteChannelPointer:
  ret
 
 
-SECTION "Audio Engine 3", ROMX, BANK[AUDIO_3]
+SECTION "Audio Engine 3", ROMX ; BANK $1f
 
 PlayPokedexRatingSfx::
  ld a, [$ffdc]
@@ -601,7 +597,7 @@ INCLUDE "audio/engine_3.asm"
 
 
 
-SECTION "Music 1", ROMX, BANK[AUDIO_1]
+SECTION "Music 1", ROMX ; BANK $02
 
 INCLUDE "audio/music/pkmnhealed.asm"
 INCLUDE "audio/music/routes1.asm"
@@ -630,7 +626,7 @@ INCLUDE "audio/music/gym.asm"
 INCLUDE "audio/music/pokecenter.asm"
 
 
-SECTION "Music 2", ROMX, BANK[AUDIO_2]
+SECTION "Music 2", ROMX ; BANK $08
 
 INCLUDE "audio/sfx/pokeflute_ch4_ch5.asm"
 INCLUDE "audio/sfx/unused2_2.asm"
@@ -646,7 +642,7 @@ INCLUDE "audio/music/defeatedwildmon.asm"
 INCLUDE "audio/music/defeatedgymleader.asm"
 
 
-SECTION "Music 3", ROMX, BANK[AUDIO_3]
+SECTION "Music 3", ROMX ; BANK $1f
 
 INCLUDE "audio/music/bikeriding.asm"
 INCLUDE "audio/music/dungeon1.asm"

engine/intro.asm

@@ -440,7 +440,9 @@ IntroNidorinoAnimation7:
 GameFreakIntro:
  INCBIN "gfx/gamefreak_intro.2bpp"
  INCBIN "gfx/gamefreak_logo.2bpp"
- ds $10 ; blank tile
+ rept 16
+ db $00 ; blank tile
+ endr
 GameFreakIntroEnd:
 
 FightIntroBackMon:

home.asm

@@ -1,32 +1,32 @@
 
 ; The rst vectors are unused.
-SECTION "rst 00", ROM0 [$00]
+SECTION "rst 00", ROM0
  rst $38
-SECTION "rst 08", ROM0 [$08]
+SECTION "rst 08", ROM0
  rst $38
-SECTION "rst 10", ROM0 [$10]
+SECTION "rst 10", ROM0
  rst $38
-SECTION "rst 18", ROM0 [$18]
+SECTION "rst 18", ROM0
  rst $38
-SECTION "rst 20", ROM0 [$20]
+SECTION "rst 20", ROM0
  rst $38
-SECTION "rst 28", ROM0 [$28]
+SECTION "rst 28", ROM0
  rst $38
-SECTION "rst 30", ROM0 [$30]
+SECTION "rst 30", ROM0
  rst $38
-SECTION "rst 38", ROM0 [$38]
+SECTION "rst 38", ROM0
  rst $38
 
 ; Hardware interrupts
-SECTION "vblank", ROM0 [$40]
+SECTION "vblank", ROM0
  jp VBlank
-SECTION "hblank", ROM0 [$48]
+SECTION "hblank", ROM0
  rst $38
-SECTION "timer", ROM0 [$50]
+SECTION "timer", ROM0
  jp Timer
-SECTION "serial", ROM0 [$58]
+SECTION "serial", ROM0
  jp Serial
-SECTION "joypad", ROM0 [$60]
+SECTION "joypad", ROM0
  reti
 
 
@@ -84,13 +84,13 @@ INCLUDE "home/copy.asm"
 
 
 
-SECTION "Entry", ROM0 [$100]
+SECTION "Entry", ROM0
 
  nop
  jp Start
 
 
-SECTION "Header", ROM0 [$104]
+SECTION "Header", ROM0
 
  ; The header is generated by rgbfix.
  ; The space here is allocated to prevent code from being overwritten.