Clean up pre-linkerscript remnants.

7 files changed, 284 insertions, 173 deletions

diff --git a/audio.asm b/audio.asm
index ec41b356..ef474a59 100644
--- a/audio.asm
+++ b/audio.asm
@@ -2,31 +2,31 @@ INCLUDE "charmap.asm"
 INCLUDE "constants.asm"
 
 
-SECTION "Sound Effect Headers 1", ROMX
+SECTION "Sound Effect Headers 1", ROMX ; BANK $2
 INCLUDE "audio/headers/sfxheaders1.asm"
 
-SECTION "Sound Effect Headers 2", ROMX
+SECTION "Sound Effect Headers 2", ROMX ; BANK $8
 INCLUDE "audio/headers/sfxheaders2.asm"
 
-SECTION "Sound Effect Headers 3", ROMX
+SECTION "Sound Effect Headers 3", ROMX ; BANK $1f
 INCLUDE "audio/headers/sfxheaders3.asm"
 
-SECTION "Sound Effect Headers 4", ROMX
+SECTION "Sound Effect Headers 4", ROMX ; BANK $20
 INCLUDE "audio/headers/sfxheaders4.asm"
 
-SECTION "Music Headers 1", ROMX
+SECTION "Music Headers 1", ROMX ; BANK $2
 INCLUDE "audio/headers/musicheaders1.asm"
 
-SECTION "Music Headers 2", ROMX
+SECTION "Music Headers 2", ROMX ; BANK $8
 INCLUDE "audio/headers/musicheaders2.asm"
 
-SECTION "Music Headers 3", ROMX
+SECTION "Music Headers 3", ROMX ; BANK $1f
 INCLUDE "audio/headers/musicheaders3.asm"
 
-SECTION "Music Headers 4", ROMX
+SECTION "Music Headers 4", ROMX ; BANK $20
 INCLUDE "audio/headers/musicheaders4.asm"
 
-SECTION "Sound Effects 1", ROMX
+SECTION "Sound Effects 1", ROMX ; BANK $2
 
 INCLUDE "audio/sfx/snare1_1.asm"
 INCLUDE "audio/sfx/snare2_1.asm"
@@ -122,7 +122,7 @@ INCLUDE "audio/sfx/cry20_1.asm"
 INCLUDE "audio/sfx/cry21_1.asm"
 INCLUDE "audio/sfx/cry22_1.asm"
 
-SECTION "Sound Effects 2", ROMX
+SECTION "Sound Effects 2", ROMX ; BANK $8
 
 INCLUDE "audio/sfx/snare1_2.asm"
 INCLUDE "audio/sfx/snare2_2.asm"
@@ -143,7 +143,7 @@ INCLUDE "audio/sfx/triangle3_2.asm"
 INCLUDE "audio/sfx/muted_snare2_2.asm"
 INCLUDE "audio/sfx/muted_snare3_2.asm"
 INCLUDE "audio/sfx/muted_snare4_2.asm"
-;Audio2_WavePointers: INCLUDE "audio/wave_instruments.asm"
+; Audio2_WavePointers: INCLUDE "audio/wave_instruments.asm"
 INCLUDE "audio/sfx/press_ab_2.asm"
 INCLUDE "audio/sfx/start_menu_2.asm"
 INCLUDE "audio/sfx/tink_2.asm"
@@ -244,9 +244,9 @@ INCLUDE "audio/sfx/cry1f_2.asm"
 INCLUDE "audio/sfx/cry20_2.asm"
 INCLUDE "audio/sfx/cry21_2.asm"
 INCLUDE "audio/sfx/cry22_2.asm"
-;Audio2_WavePointers: INCLUDE "audio/wave_instruments.asm"
+; Audio2_WavePointers: INCLUDE "audio/wave_instruments.asm"
 
-SECTION "Sound Effects 3", ROMX
+SECTION "Sound Effects 3", ROMX ; BANK $1f
 
 INCLUDE "audio/sfx/snare1_3.asm"
 INCLUDE "audio/sfx/snare2_3.asm"
@@ -267,7 +267,7 @@ INCLUDE "audio/sfx/triangle3_3.asm"
 INCLUDE "audio/sfx/muted_snare2_3.asm"
 INCLUDE "audio/sfx/muted_snare3_3.asm"
 INCLUDE "audio/sfx/muted_snare4_3.asm"
-;Audio3_WavePointers: INCLUDE "audio/wave_instruments.asm"
+; Audio3_WavePointers: INCLUDE "audio/wave_instruments.asm"
 INCLUDE "audio/sfx/start_menu_3.asm"
 INCLUDE "audio/sfx/cut_3.asm"
 INCLUDE "audio/sfx/go_inside_3.asm"
@@ -350,7 +350,7 @@ INCLUDE "audio/sfx/cry20_3.asm"
 INCLUDE "audio/sfx/cry21_3.asm"
 INCLUDE "audio/sfx/cry22_3.asm"
 
-SECTION "Sound Effects 4", ROMX
+SECTION "Sound Effects 4", ROMX ; BANK $20
 
 INCLUDE "audio/sfx/snare1_4.asm"
 INCLUDE "audio/sfx/snare2_4.asm"
@@ -426,7 +426,7 @@ INCLUDE "audio/sfx/unknown_80e91.asm"
 INCLUDE "audio/sfx/get_item2_4.asm"
 
 
-SECTION "Audio Engine 1", ROMX
+SECTION "Audio Engine 1", ROMX ; BANK $2
 
 AudioEngine1::
 
@@ -521,7 +521,7 @@ Music_Cities1AlternateTempo::
 	ld de, Music_Cities1_branch_aa6f
 	jp Audio1_OverwriteChannelPointer
 
-SECTION "Audio Engine 2", ROMX
+SECTION "Audio Engine 2", ROMX ; BANK $8
 
 AudioEngine2::
 
@@ -606,7 +606,7 @@ INCLUDE "engine/menu/bills_pc.asm"
 INCLUDE "audio/engine_2.asm"
 
 
-SECTION "Audio Engine 3", ROMX
+SECTION "Audio Engine 3", ROMX ; BANK $1f
 
 AudioEngine3::
 
@@ -648,7 +648,7 @@ OwnedMonValues:
 INCLUDE "audio/engine_3.asm"
 
 
-SECTION "Audio Engine 4", ROMX
+SECTION "Audio Engine 4", ROMX ; BANK $20
 
 SurfingPikachu1Graphics1::  INCBIN "gfx/surfing_pikachu_1a.2bpp"
 SurfingPikachu1Graphics2::  INCBIN "gfx/surfing_pikachu_1b.2bpp"
@@ -657,7 +657,7 @@ SurfingPikachu1Graphics3::  INCBIN "gfx/surfing_pikachu_1c.t5.2bpp"
 INCLUDE "audio/engine_4.asm"
 
 
-SECTION "Music 1", ROMX
+SECTION "Music 1", ROMX ; BANK $2
 
 Audio1_WavePointers: INCLUDE "audio/wave_instruments.asm"
 
@@ -688,7 +688,7 @@ INCLUDE "audio/music/gym.asm"
 INCLUDE "audio/music/pokecenter.asm"
 
 
-SECTION "Music 2", ROMX
+SECTION "Music 2", ROMX ; BANK $8
 
 INCLUDE "audio/sfx/unused2_2.asm"
 INCLUDE "audio/music/gymleaderbattle.asm"
@@ -703,7 +703,7 @@ INCLUDE "audio/music/defeatedwildmon.asm"
 INCLUDE "audio/music/defeatedgymleader.asm"
 
 
-SECTION "Music 3", ROMX
+SECTION "Music 3", ROMX ; BANK $1f
 
 INCLUDE "audio/music/bikeriding.asm"
 INCLUDE "audio/music/dungeon1.asm"
@@ -730,7 +730,7 @@ INCLUDE "audio/music/credits.asm"
 INCLUDE "audio/music/yellowintro.asm"
 
 
-SECTION "Music 4", ROMX
+SECTION "Music 4", ROMX ; BANK $20
 
 INCLUDE "audio/music/surfingpikachu.asm"
 INCLUDE "audio/music/yellowunusedsong.asm"
@@ -738,6 +738,6 @@ INCLUDE "audio/music/meetjessiejames.asm"
 
 INCBIN "audio/unknown_832b9.bin"
 
-
+; cries are in a different banks
 INCLUDE "audio/pikachu_cries.asm"
 
diff --git a/audio/pikachu_cries.asm b/audio/pikachu_cries.asm
index ce3184dc..a09425b3 100644
--- a/audio/pikachu_cries.asm
+++ b/audio/pikachu_cries.asm
@@ -5,7 +5,7 @@ pcm: MACRO
 .End:
 ENDM
 
-SECTION "Pikachu Cries 1", ROMX
+SECTION "Pikachu Cries 1", ROMX ; BANK $21
 
 PikachuCry1::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_1.pcm"
@@ -25,7 +25,7 @@ PikachuCry4::
 	db $e0 ; unused
 
 
-SECTION "Pikachu Cries 2", ROMX
+SECTION "Pikachu Cries 2", ROMX ; BANK $22
 
 PikachuCry5::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_5.pcm"
@@ -40,7 +40,7 @@ PikachuCry7::
 	db $ff ; unused
 
 
-SECTION "Pikachu Cries 3", ROMX
+SECTION "Pikachu Cries 3", ROMX ; BANK $23
 
 PikachuCry8::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_8.pcm"
@@ -55,7 +55,7 @@ PikachuCry10::
 	db $ff ; unused
 
 
-SECTION "Pikachu Cries 4", ROMX
+SECTION "Pikachu Cries 4", ROMX ; BANK $24
 
 PikachuCry11::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_11.pcm"
@@ -70,7 +70,7 @@ PikachuCry13::
 	db $f0 ; unused
 
 
-SECTION "Pikachu Cries 5", ROMX
+SECTION "Pikachu Cries 5", ROMX ; BANK $25
 
 PikachuCry14::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_14.pcm"
@@ -80,7 +80,7 @@ PikachuCry15::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_15.pcm"
 	db $77 ; unused
 
-SECTION "Pikachu Cries 6", ROMX
+SECTION "Pikachu Cries 6", ROMX ; BANK $31
 
 PikachuCry16::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_16.pcm"
@@ -95,7 +95,7 @@ PikachuCry22::
 	db $7e ; unused
 
 
-SECTION "Pikachu Cries 7", ROMX
+SECTION "Pikachu Cries 7", ROMX ; BANK $32
 
 PikachuCry20::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_20.pcm"
@@ -106,7 +106,7 @@ PikachuCry21::
 	db $ff ; unused
 
 
-SECTION "Pikachu Cries 8", ROMX
+SECTION "Pikachu Cries 8", ROMX ; BANK $33
 
 PikachuCry19::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_19.pcm"
@@ -118,8 +118,9 @@ PikachuCry24::
 
 PikachuCry26::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_26.pcm"
+	db $00 ; unused
 
-SECTION "Pikachu Cries 9", ROMX
+SECTION "Pikachu Cries 9", ROMX ; BANK $34
 
 PikachuCry17::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_17.pcm"
@@ -134,7 +135,7 @@ PikachuCry25::
 	db $03 ; unused
 
 
-SECTION "Pikachu Cries 10", ROMX
+SECTION "Pikachu Cries 10", ROMX ; BANK $35
 
 PikachuCry27::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_27.pcm"
@@ -154,8 +155,9 @@ PikachuCry30::
 
 PikachuCry31::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_31.pcm"
+	db $00 ; unused
 
-SECTION "Pikachu Cries 11", ROMX
+SECTION "Pikachu Cries 11", ROMX ; BANK $36
 
 PikachuCry32::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_32.pcm"
@@ -174,7 +176,7 @@ PikachuCry41::
 	db $9b ; unused
 
 
-SECTION "Pikachu Cries 12", ROMX
+SECTION "Pikachu Cries 12", ROMX ; BANK $37
 
 PikachuCry35::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_35.pcm"
@@ -189,7 +191,7 @@ PikachuCry39::
 	db $0f ; unused
 
 
-SECTION "Pikachu Cries 13", ROMX
+SECTION "Pikachu Cries 13", ROMX ; BANK $38
 
 PikachuCry37::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_37.pcm"
diff --git a/home.asm b/home.asm
index 8901a0d9..5ad11ffe 100644
--- a/home.asm
+++ b/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
 	jp LCDC
-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.
diff --git a/main.asm b/main.asm
index 9f705ace..2b72e85b 100755
--- a/main.asm
+++ b/main.asm
@@ -98,7 +98,7 @@ INCLUDE "engine/hp_bar.asm"
 INCLUDE "engine/hidden_object_functions3.asm"
 
 
-SECTION "Graphics", ROMX
+SECTION "Graphics", ROMX ; BANK $04
 
 PokemonLogoJapanGraphics:       INCBIN "gfx/pokemon_logo_japan.2bpp"
 FontGraphics:                   INCBIN "gfx/font.1bpp"
@@ -134,7 +134,7 @@ INCLUDE "engine/menu/start_sub_menus.asm"
 INCLUDE "engine/items/tms.asm"
 
 
-SECTION "NPC Sprites 1", ROMX
+SECTION "NPC Sprites 1", ROMX ; BANK $04
 
 OakAideSprite:         INCBIN "gfx/sprites/oak_aide.2bpp"
 RockerSprite:          INCBIN "gfx/sprites/rocker.2bpp"
@@ -172,7 +172,7 @@ INCLUDE "engine/battle/moveEffects/conversion_effect.asm"
 INCLUDE "engine/battle/moveEffects/haze_effect.asm"
 
 
-SECTION "NPC Sprites 2", ROMX
+SECTION "NPC Sprites 2", ROMX ; BANK $05
 
 INCLUDE "engine/load_pokedex_tiles.asm"
 INCLUDE "engine/overworld/map_sprites.asm"
@@ -468,7 +468,7 @@ INCLUDE "engine/menu/oaks_pc.asm"
 INCLUDE "engine/hidden_object_functions7.asm"
 
 
-SECTION "Pics 1", ROMX
+SECTION "Pics 1", ROMX ; BANK $09
 
 RhydonPicFront:      INCBIN "pic/ymon/rhydon.pic"
 RhydonPicBack:       INCBIN "pic/monback/rhydonb.pic"
@@ -535,7 +535,7 @@ INCLUDE "engine/battle/print_type.asm"
 INCLUDE "engine/battle/save_trainer_name.asm"
 
 
-SECTION "Pics 2", ROMX
+SECTION "Pics 2", ROMX ; BANK $0A
 
 GrowlithePicFront:   INCBIN "pic/ymon/growlithe.pic"
 GrowlithePicBack:    INCBIN "pic/monback/growlitheb.pic"
@@ -606,7 +606,7 @@ INCLUDE "engine/predefsA.asm"
 INCLUDE "engine/battle/moveEffects/leech_seed_effect.asm"
 
 
-SECTION "Pics 3", ROMX
+SECTION "Pics 3", ROMX ; BANK $0B
 
 ArticunoPicFront:    INCBIN "pic/ymon/articuno.pic"
 ArticunoPicBack:     INCBIN "pic/monback/articunob.pic"
@@ -693,7 +693,7 @@ INCLUDE "engine/battle/scale_sprites.asm"
 INCLUDE "engine/game_corner_slots2.asm"
 
 
-SECTION "Pics 4", ROMX
+SECTION "Pics 4", ROMX ; BANK $0C
 
 DodrioPicFront:       INCBIN "pic/ymon/dodrio.pic"
 DodrioPicBack:        INCBIN "pic/monback/dodriob.pic"
@@ -755,7 +755,7 @@ StarmiePicFront:      INCBIN "pic/ymon/starmie.pic"
 StarmiePicBack:       INCBIN "pic/monback/starmieb.pic"
 
 
-SECTION "Pics 5", ROMX
+SECTION "Pics 5", ROMX ; BANK $0D
 
 BulbasaurPicFront:    INCBIN "pic/ymon/bulbasaur.pic"
 BulbasaurPicBack:     INCBIN "pic/monback/bulbasaurb.pic"
@@ -2119,6 +2119,8 @@ INCLUDE "engine/unknown_ea3ea.asm"
 
 INCLUDE "engine/overworld/npc_movement_2.asm"
 
+; bank $3b is empty
+
 SECTION "bank3C", ROMX
 
 INCLUDE "engine/bank3c.asm"
diff --git a/pokeyellow.link b/pokeyellow.link
index 0cef28cd..ea309bd9 100644
--- a/pokeyellow.link
+++ b/pokeyellow.link
@@ -1,237 +1,345 @@
 ROM0
-  ORG $61
-  "Home"
-  ORG $150
-  "Main"
+	org $0000
+	"rst 00"
+
+	org $0008
+	"rst 08"
+
+	org $0010
+	"rst 10"
+
+	org $0018
+	"rst 18"
+
+	org $0020
+	"rst 20"
+
+	org $0028
+	"rst 28"
+
+	org $0030
+	"rst 30"
+	
+	org $0038
+	"rst 38"
+	
+	org $0040
+	"vblank"
+	
+	org $0048
+	"hblank"
+	
+	org $0050
+	"timer"
+	
+	org $0058
+	"serial"
+	
+	org $0060
+	"joypad"
+	; $0061
+	"Home"
+
+	org $100
+	"Entry"
+	; $0104
+	"Header"
+
+	org $150
+	"Main"
 
 ROMX $1
-  "bank01"
+	org $4000
+	"bank01"
 
 ROMX $2
-  "Sound Effect Headers 1" ; AUDIO_1
-  "Music Headers 1"
-  "Sound Effects 1"
-  "Audio Engine 1"
-  "Music 1"
+	org $4000
+	"Sound Effect Headers 1" ; AUDIO_1
+	"Music Headers 1"
+	"Sound Effects 1"
+	"Audio Engine 1"
+	"Music 1"
 
 ROMX $3
-  "bank03"
+	org $4000
+	"bank03"
 
 ROMX $4
-  "Graphics"
-  "NPC Sprites 1"
+	org $4000
+	"Graphics"
+	"NPC Sprites 1"
 
 ROMX $5
-  "NPC Sprites 2"
+	org $4000
+	"NPC Sprites 2"
 
 ROMX $6
-  "bank06"
+	org $4000
+	"bank06"
 
 ROMX $7
-  "bank07"
+	org $4000
+	"bank07"
 
 ROMX $8
-  "Sound Effect Headers 2" ; AUDIO_2
-  "Music Headers 2"
-  "Sound Effects 2"
-  "Audio Engine 2"
-  "Music 2"
+	org $4000
+	"Sound Effect Headers 2" ; AUDIO_2
+	"Music Headers 2"
+	"Sound Effects 2"
+	"Audio Engine 2"
+	"Music 2"
 
 ROMX $9
-  "Pics 1"
+	org $4000
+	"Pics 1"
 
 ROMX $A
-  "Pics 2"
+	org $4000
+	"Pics 2"
 
 ROMX $B
-  "Pics 3"
+	org $4000
+	"Pics 3"
 
 ROMX $C
-  "Pics 4"
+	org $4000
+	"Pics 4"
 
 ROMX $D
-  "Pics 5"
+	org $4000
+	"Pics 5"
 
 ROMX $E
-  "bank0E"
+	org $4000
+	"bank0E"
 
 ROMX $F
-  "bank0F"
+	org $4000
+	"bank0F"
 
 ROMX $10
-  "bank10"
+	org $4000
+	"bank10"
 
 ROMX $11
-  "bank11"
+	org $4000
+	"bank11"
 
 ROMX $12
-  "bank12"
+	org $4000
+	"bank12"
 
 ROMX $13
-  "bank13"
+	org $4000
+	"bank13"
 
 ROMX $14
-  "bank14"
+	org $4000
+	"bank14"
 
 ROMX $15
-  "bank15"
+	org $4000
+	"bank15"
 
 ROMX $16
-  "bank16"
+	org $4000
+	"bank16"
 
 ROMX $17
-  "bank17"
+	org $4000
+	"bank17"
 
 ROMX $18
-  "bank18"
+	org $4000
+	"bank18"
 
 ROMX $19
-  "bank19"
+	org $4000
+	"bank19"
 
 ROMX $1A
-  "bank1A"
+	org $4000
+	"bank1A"
 
 ROMX $1B
-  "bank1B"
+	org $4000
+	"bank1B"
 
 ROMX $1C
-  "bank1C"
+	org $4000
+	"bank1C"
 
 ROMX $1D
-  "bank1D"
+	org $4000
+	"bank1D"
 
 ROMX $1E
-  "bank1E"
+	org $4000
+	"bank1E"
 
 ROMX $1F
-  "Sound Effect Headers 3" ; AUDIO_3
-  "Music Headers 3"
-  "Sound Effects 3"
-  "Audio Engine 3"
-  "Music 3"
+	org $4000
+	"Sound Effect Headers 3" ; AUDIO_3
+	"Music Headers 3"
+	"Sound Effects 3"
+	"Audio Engine 3"
+	"Music 3"
 
 ROMX $20
-  "Sound Effect Headers 4" ; AUDIO_4
-  "Music Headers 4"
-  "Sound Effects 4"
-  "Audio Engine 4"
-  "Music 4"
+	org $4000
+	"Sound Effect Headers 4" ; AUDIO_4
+	"Music Headers 4"
+	"Sound Effects 4"
+	"Audio Engine 4"
+	"Music 4"
 
 ROMX $21
-  "Pikachu Cries 1"
+	org $4000
+	"Pikachu Cries 1"
 
 ROMX $22
-  "Pikachu Cries 2"
+	org $4000
+	"Pikachu Cries 2"
 
 ROMX $23
-  "Pikachu Cries 3"
+	org $4000
+	"Pikachu Cries 3"
 
 ROMX $24
-  "Pikachu Cries 4"
+	org $4000
+	"Pikachu Cries 4"
 
 ROMX $25
-  "Pikachu Cries 5"
+	org $4000
+	"Pikachu Cries 5"
 
 ROMX $26
-  "Text 1"
+	org $4000
+	"Text 1"
 
 ROMX $27
-  "Text 2"
+	org $4000
+	"Text 2"
 
 ROMX $28
-  "Text 3"
+	org $4000
+	"Text 3"
 
 ROMX $29
-  "Text 4"
+	org $4000
+	"Text 4"
 
 ROMX $2A
-  "Text 5"
+	org $4000
+	"Text 5"
 
 ROMX $2B
-  "Text 6"
+	org $4000
+	"Text 6"
 
 ROMX $2C
-  "Text 7"
+	org $4000
+	"Text 7"
 
 ROMX $2D
-  "Text 8"
+	org $4000
+	"Text 8"
 
 ROMX $2E
-  "Pokedex Text"
+	org $4000
+	"Pokedex Text"
 
 ROMX $2f
-  "Move Names"
-  ORG $5000
-  "bank2f"
+	org $4000
+	"Move Names"
+	org $5000
+	"bank2f"
 
 ROMX $30
-  "bank30"
+	org $4000
+	"bank30"
 
 ROMX $31
-  "Pikachu Cries 6"
+	org $4000
+	"Pikachu Cries 6"
 
 ROMX $32
-  "Pikachu Cries 7"
+	org $4000
+	"Pikachu Cries 7"
 
 ROMX $33
-  "Pikachu Cries 8"
+	org $4000
+	"Pikachu Cries 8"
 
 ROMX $34
-  "Pikachu Cries 9"
+	org $4000
+	"Pikachu Cries 9"
 
 ROMX $35
-  "Pikachu Cries 10"
+	org $4000
+	"Pikachu Cries 10"
 
 ROMX $36
-  "Pikachu Cries 11"
+	org $4000
+	"Pikachu Cries 11"
 
 ROMX $37
-  "Pikachu Cries 12"
+	org $4000
+	"Pikachu Cries 12"
 
 ROMX $38
-  "Pikachu Cries 13"
+	org $4000
+	"Pikachu Cries 13"
 
 ROMX $39
-  "bank39"
+	org $4000
+	"bank39"
 
 ROMX $3A
-  "bank3A"
+	org $4000
+	"bank3A"
 
-; ROMX $3B
-;   "bank3B"
+; bank $3b is empty
 
 ROMX $3C
-  "bank3C"
+	org $4000
+	"bank3C"
 
 ROMX $3D
-  "bank3D"
+	org $4000
+	"bank3D"
 
 ROMX $3E
-  "bank3E"
+	org $4000
+	"bank3E"
 
 ROMX $3F
-  "bank3F"
+	org $4000
+	"bank3F"
 
 WRAM0
-  "WRAM Bank 0"
+	org $c000
+	"WRAM Bank 0"
+	org $c100
+	"Sprite State Data"
+	org $c300
+	"OAM Buffer"
 
 WRAMX 1
-  "WRAM Bank 1"
-;  ORG $df00
-;  "Stack"
-
-; WRAMX 5
-;   "WRAMBank5"
+	org $d000
+	"WRAM Bank 1"
+	org $dfff
+	"Stack"
 
 SRAM 0
-  "Sprite Buffers"
+	"Sprite Buffers"
 
 SRAM 1
-  "Save Data"
+	"Save Data"
 
 SRAM 2
-  "Saved Boxes 1"
+	"Saved Boxes 1"
 
 SRAM 3
-  "Saved Boxes 2"
+	"Saved Boxes 2"
 
diff --git a/text.asm b/text.asm
index acc42187..277dbab8 100644
--- a/text.asm
+++ b/text.asm
@@ -5,7 +5,7 @@ INCLUDE "macros.asm"
 INCLUDE "hram.asm"
 
 
-SECTION "Text 1", ROMX
+SECTION "Text 1", ROMX ; BANK $26
 
 _CardKeySuccessText1::
 	text "Bingo!@@"
@@ -188,7 +188,7 @@ INCLUDE "text/maps/silph_co_9f.asm"
 INCLUDE "text/maps/silph_co_10f.asm"
 
 
-SECTION "Text 2", ROMX
+SECTION "Text 2", ROMX ; BANK $27
 
 INCLUDE "text/maps/silph_co_11f.asm"
 INCLUDE "text/maps/mansion_2f.asm"
@@ -1518,7 +1518,7 @@ _HookedMonAttackedText::
 	prompt
 
 
-SECTION "Text 3", ROMX
+SECTION "Text 3", ROMX ; BANK $28
 
 _EnemyAppearedText::
 	TX_RAM wEnemyMonNick
@@ -2130,7 +2130,7 @@ INCLUDE "text/maps/route_8.asm"
 INCLUDE "text/maps/route_9_1.asm"
 
 
-SECTION "Text 4", ROMX
+SECTION "Text 4", ROMX ; BANK $29
 
 INCLUDE "text/maps/route_9_2.asm"
 INCLUDE "text/maps/route_10.asm"
@@ -2207,7 +2207,7 @@ _StoppedEvolvingText::
 	prompt
 
 
-SECTION "Text 5", ROMX
+SECTION "Text 5", ROMX ; BANK $2a
 
 _IsEvolvingText::
 	text "What? @"
@@ -2507,7 +2507,7 @@ INCLUDE "text/maps/cerulean_mart.asm"
 INCLUDE "text/maps/cerulean_badge_house_1.asm"
 
 
-SECTION "Text 6", ROMX
+SECTION "Text 6", ROMX ; BANK $2b
 
 INCLUDE "text/maps/cerulean_badge_house_2.asm"
 INCLUDE "text/maps/lavender_pokecenter.asm"
@@ -2556,7 +2556,7 @@ INCLUDE "text/maps/celadon_gym.asm"
 INCLUDE "text/maps/celadon_game_corner_1.asm"
 
 
-SECTION "Text 7", ROMX
+SECTION "Text 7", ROMX ; BANK $2c
 
 INCLUDE "text/maps/celadon_game_corner_2.asm"
 INCLUDE "text/maps/celadon_dept_store_5f.asm"
@@ -2806,7 +2806,7 @@ _CableClubNPCPleaseApplyHereHaveToSaveText::
 	done
 
 
-SECTION "Text 8", ROMX
+SECTION "Text 8", ROMX ; BANK $2d
 
 _CableClubNPCPleaseWaitText::
 	text "Please wait.@@"
@@ -3372,11 +3372,11 @@ _UsedCutText::
 	prompt
 
 
-SECTION "Pokedex Text", ROMX
+SECTION "Pokedex Text", ROMX ; BANK $2e
 
 INCLUDE "text/pokedex.asm"
 
 
-SECTION "Move Names", ROMX
+SECTION "Move Names", ROMX ; BANK $2f
 
 INCLUDE "text/move_names.asm"
diff --git a/wram.asm b/wram.asm
index c542d042..344b28f4 100755
--- a/wram.asm
+++ b/wram.asm
@@ -205,7 +205,7 @@ wc0f3:: ds 1
 wc0f4:: ds 1
 wc0f5:: ds 11
 
-SECTION "Sprite State Data", WRAM0[$c100]
+SECTION "Sprite State Data", WRAM0
 
 wSpriteDataStart::
 
@@ -317,7 +317,7 @@ wSpritePikachuStateData2::  spritestatedata2 wSpritePikachuStateData2
 wSpriteDataEnd::
 
 
-SECTION "OAM Buffer", WRAM0[$c300]
+SECTION "OAM Buffer", WRAM0
 
 wOAMBuffer:: ; c300
 ; buffer for OAM data. Copied to OAM by DMA
@@ -1863,7 +1863,7 @@ wEnemyMonDefense::   dw
 wEnemyMonSpeed::     dw
 wEnemyMonSpecial::   dw
 wEnemyMonPP::        ds 3 ; NUM_MOVES - 1
-SECTION "WRAM Bank 1", WRAMX, BANK[1]
+SECTION "WRAM Bank 1", WRAMX
                      ds 1 ; NUM_MOVES - 3
 
 wEnemyMonBaseStats:: ds 5
@@ -3586,8 +3586,7 @@ wLastOBP1:: ds 1 ; def3
 wdef5:: ds 1 ; def4
 wBGPPalsBuffer:: ds NUM_ACTIVE_PALS * PAL_SIZE ; def5
 
-SECTION "Stack", WRAMX[$df15], BANK[1]
-	ds $ea
+SECTION "Stack", WRAMX
 wStack:: ; dfff