remove BANK[] and bank constants from ROMX sections

7 files changed, 97 insertions, 134 deletions

diff --git a/audio.asm b/audio.asm
index c1d5b970..07c5d7fd 100644
--- a/audio.asm
+++ b/audio.asm
@@ -1,58 +1,32 @@
 INCLUDE "charmap.asm"
-
-AUDIO_1 EQU $2
-AUDIO_2 EQU $8
-AUDIO_3 EQU $1f
-AUDIO_4 EQU $20
-
-PCM_1  EQU $21
-PCM_2  EQU $22
-PCM_3  EQU $23
-PCM_4  EQU $24
-PCM_5  EQU $25
-PCM_6  EQU $31
-PCM_7  EQU $32
-PCM_8  EQU $33
-PCM_9  EQU $34
-PCM_10 EQU $35
-PCM_11 EQU $36
-PCM_12 EQU $37
-PCM_13 EQU $38
-GLOBAL AUDIO_1, AUDIO_2, AUDIO_3, AUDIO_4
-GLOBAL PCM_1, PCM_2, PCM_3, PCM_4, PCM_5, PCM_6, PCM_7
-GLOBAL PCM_8, PCM_9, PCM_10, PCM_11, PCM_12, PCM_13
-
-
-
-
 INCLUDE "constants.asm"
 
 
-SECTION "Sound Effect Headers 1", ROMX, BANK[AUDIO_1]
+SECTION "Sound Effect Headers 1", ROMX
 INCLUDE "audio/headers/sfxheaders1.asm"
 
-SECTION "Sound Effect Headers 2", ROMX, BANK[AUDIO_2]
+SECTION "Sound Effect Headers 2", ROMX
 INCLUDE "audio/headers/sfxheaders2.asm"
 
-SECTION "Sound Effect Headers 3", ROMX, BANK[AUDIO_3]
+SECTION "Sound Effect Headers 3", ROMX
 INCLUDE "audio/headers/sfxheaders3.asm"
 
-SECTION "Sound Effect Headers 4", ROMX, BANK[AUDIO_4]
+SECTION "Sound Effect Headers 4", ROMX
 INCLUDE "audio/headers/sfxheaders4.asm"
 
-SECTION "Music Headers 1", ROMX, BANK[AUDIO_1]
+SECTION "Music Headers 1", ROMX
 INCLUDE "audio/headers/musicheaders1.asm"
 
-SECTION "Music Headers 2", ROMX, BANK[AUDIO_2]
+SECTION "Music Headers 2", ROMX
 INCLUDE "audio/headers/musicheaders2.asm"
 
-SECTION "Music Headers 3", ROMX, BANK[AUDIO_3]
+SECTION "Music Headers 3", ROMX
 INCLUDE "audio/headers/musicheaders3.asm"
 
-SECTION "Music Headers 4", ROMX, BANK[AUDIO_4]
+SECTION "Music Headers 4", ROMX
 INCLUDE "audio/headers/musicheaders4.asm"
 
-SECTION "Sound Effects 1", ROMX, BANK[AUDIO_1]
+SECTION "Sound Effects 1", ROMX
 
 INCLUDE "audio/sfx/snare1_1.asm"
 INCLUDE "audio/sfx/snare2_1.asm"
@@ -148,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, BANK[AUDIO_2]
+SECTION "Sound Effects 2", ROMX
 
 INCLUDE "audio/sfx/snare1_2.asm"
 INCLUDE "audio/sfx/snare2_2.asm"
@@ -272,7 +246,7 @@ INCLUDE "audio/sfx/cry21_2.asm"
 INCLUDE "audio/sfx/cry22_2.asm"
 ;Audio2_WavePointers: INCLUDE "audio/wave_instruments.asm"
 
-SECTION "Sound Effects 3", ROMX, BANK[AUDIO_3]
+SECTION "Sound Effects 3", ROMX
 
 INCLUDE "audio/sfx/snare1_3.asm"
 INCLUDE "audio/sfx/snare2_3.asm"
@@ -376,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, BANK[AUDIO_4]
+SECTION "Sound Effects 4", ROMX
 
 INCLUDE "audio/sfx/snare1_4.asm"
 INCLUDE "audio/sfx/snare2_4.asm"
@@ -451,7 +425,10 @@ INCLUDE "audio/sfx/unknown_80e5a.asm"
 INCLUDE "audio/sfx/unknown_80e91.asm"
 INCLUDE "audio/sfx/get_item2_4.asm"
 
-SECTION "Audio Engine 1", ROMX, BANK[AUDIO_1]
+
+SECTION "Audio Engine 1", ROMX
+
+AudioEngine1::
 
 PlayBattleMusic::
 	xor a
@@ -544,7 +521,9 @@ Music_Cities1AlternateTempo::
 	ld de, Music_Cities1_branch_aa6f
 	jp Audio1_OverwriteChannelPointer
 
-SECTION "Audio Engine 2", ROMX, BANK[AUDIO_2]
+SECTION "Audio Engine 2", ROMX
+
+AudioEngine2::
 
 Music_DoLowHealthAlarm::
 	ld a, [wLowHealthAlarm]
@@ -626,7 +605,10 @@ INCLUDE "engine/menu/bills_pc.asm"
 
 INCLUDE "audio/engine_2.asm"
 
-SECTION "Audio Engine 3", ROMX, BANK[AUDIO_3]
+
+SECTION "Audio Engine 3", ROMX
+
+AudioEngine3::
 
 PlayPokedexRatingSfx::
 	ld a, [$ffdc]
@@ -663,10 +645,10 @@ PokedexRatingSfxPointers:
 OwnedMonValues:
 	db 10, 40, 60, 90, 120, 150, $ff
 
-
 INCLUDE "audio/engine_3.asm"
 
-SECTION "Audio Engine 4", ROMX, BANK[AUDIO_4]
+
+SECTION "Audio Engine 4", ROMX
 
 SurfingPikachu1Graphics1::  INCBIN "gfx/surfing_pikachu_1a.2bpp"
 SurfingPikachu1Graphics2::  INCBIN "gfx/surfing_pikachu_1b.2bpp"
@@ -674,7 +656,8 @@ SurfingPikachu1Graphics3::  INCBIN "gfx/surfing_pikachu_1c.t5.2bpp"
 
 INCLUDE "audio/engine_4.asm"
 
-SECTION "Music 1", ROMX, BANK[AUDIO_1]
+
+SECTION "Music 1", ROMX
 
 Audio1_WavePointers: INCLUDE "audio/wave_instruments.asm"
 
@@ -705,7 +688,7 @@ INCLUDE "audio/music/gym.asm"
 INCLUDE "audio/music/pokecenter.asm"
 
 
-SECTION "Music 2", ROMX, BANK[AUDIO_2]
+SECTION "Music 2", ROMX
 
 INCLUDE "audio/sfx/unused2_2.asm"
 INCLUDE "audio/music/gymleaderbattle.asm"
@@ -720,7 +703,7 @@ INCLUDE "audio/music/defeatedwildmon.asm"
 INCLUDE "audio/music/defeatedgymleader.asm"
 
 
-SECTION "Music 3", ROMX, BANK[AUDIO_3]
+SECTION "Music 3", ROMX
 
 INCLUDE "audio/music/bikeriding.asm"
 INCLUDE "audio/music/dungeon1.asm"
@@ -746,7 +729,8 @@ INCLUDE "audio/music/halloffame.asm"
 INCLUDE "audio/music/credits.asm"
 INCLUDE "audio/music/yellowintro.asm"
 
-SECTION "Music 4", ROMX, BANK[AUDIO_4]
+
+SECTION "Music 4", ROMX
 
 INCLUDE "audio/music/surfingpikachu.asm"
 INCLUDE "audio/music/yellowunusedsong.asm"
diff --git a/audio/engine_1.asm b/audio/engine_1.asm
index 4faf06cf..bb780975 100644
--- a/audio/engine_1.asm
+++ b/audio/engine_1.asm
@@ -1053,7 +1053,7 @@ Audio1_IsCry:
 
 Audio1_96c3:
 	ld a, [wAudioROMBank]
-	cp AUDIO_2
+	cp BANK(AudioEngine2)
 	jr nz, .asm_96dc
 	ld a, [wChannelSoundIDs + CH7]
 	ld b, a
diff --git a/audio/pikachu_cries.asm b/audio/pikachu_cries.asm
index 9648b740..ce3184dc 100644
--- a/audio/pikachu_cries.asm
+++ b/audio/pikachu_cries.asm
@@ -5,7 +5,7 @@ pcm: MACRO
 .End:
 ENDM
 
-SECTION "Pikachu Cries 1", ROMX, BANK[PCM_1]
+SECTION "Pikachu Cries 1", ROMX
 
 PikachuCry1::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_1.pcm"
@@ -25,7 +25,7 @@ PikachuCry4::
 	db $e0 ; unused
 
 
-SECTION "Pikachu Cries 2", ROMX, BANK[PCM_2]
+SECTION "Pikachu Cries 2", ROMX
 
 PikachuCry5::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_5.pcm"
@@ -40,7 +40,7 @@ PikachuCry7::
 	db $ff ; unused
 
 
-SECTION "Pikachu Cries 3", ROMX, BANK[PCM_3]
+SECTION "Pikachu Cries 3", ROMX
 
 PikachuCry8::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_8.pcm"
@@ -55,7 +55,7 @@ PikachuCry10::
 	db $ff ; unused
 
 
-SECTION "Pikachu Cries 4", ROMX, BANK[PCM_4]
+SECTION "Pikachu Cries 4", ROMX
 
 PikachuCry11::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_11.pcm"
@@ -70,7 +70,7 @@ PikachuCry13::
 	db $f0 ; unused
 
 
-SECTION "Pikachu Cries 5", ROMX, BANK[PCM_5]
+SECTION "Pikachu Cries 5", ROMX
 
 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, BANK[PCM_6]
+SECTION "Pikachu Cries 6", ROMX
 
 PikachuCry16::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_16.pcm"
@@ -95,7 +95,7 @@ PikachuCry22::
 	db $7e ; unused
 
 
-SECTION "Pikachu Cries 7", ROMX, BANK[PCM_7]
+SECTION "Pikachu Cries 7", ROMX
 
 PikachuCry20::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_20.pcm"
@@ -106,7 +106,7 @@ PikachuCry21::
 	db $ff ; unused
 
 
-SECTION "Pikachu Cries 8", ROMX, BANK[PCM_8]
+SECTION "Pikachu Cries 8", ROMX
 
 PikachuCry19::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_19.pcm"
@@ -119,7 +119,7 @@ PikachuCry24::
 PikachuCry26::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_26.pcm"
 
-SECTION "Pikachu Cries 9", ROMX, BANK[PCM_9]
+SECTION "Pikachu Cries 9", ROMX
 
 PikachuCry17::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_17.pcm"
@@ -134,7 +134,7 @@ PikachuCry25::
 	db $03 ; unused
 
 
-SECTION "Pikachu Cries 10", ROMX, BANK[PCM_10]
+SECTION "Pikachu Cries 10", ROMX
 
 PikachuCry27::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_27.pcm"
@@ -155,7 +155,7 @@ PikachuCry30::
 PikachuCry31::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_31.pcm"
 
-SECTION "Pikachu Cries 11", ROMX, BANK[PCM_11]
+SECTION "Pikachu Cries 11", ROMX
 
 PikachuCry32::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_32.pcm"
@@ -174,7 +174,7 @@ PikachuCry41::
 	db $9b ; unused
 
 
-SECTION "Pikachu Cries 12", ROMX, BANK[PCM_12]
+SECTION "Pikachu Cries 12", ROMX
 
 PikachuCry35::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_35.pcm"
@@ -189,7 +189,7 @@ PikachuCry39::
 	db $0f ; unused
 
 
-SECTION "Pikachu Cries 13", ROMX, BANK[PCM_13]
+SECTION "Pikachu Cries 13", ROMX
 
 PikachuCry37::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_37.pcm"
diff --git a/main.asm b/main.asm
index c4d927d5..9f705ace 100755
--- a/main.asm
+++ b/main.asm
@@ -1,21 +1,10 @@
 INCLUDE "charmap.asm"
 INCLUDE "constants.asm"
 
-NPC_SPRITES_1 EQU $4
-NPC_SPRITES_2 EQU $5
-
-GFX EQU $4
-
-PICS_1 EQU $9
-PICS_2 EQU $A
-PICS_3 EQU $B
-PICS_4 EQU $C
-PICS_5 EQU $D
-
 INCLUDE "home.asm"
 
 
-SECTION "bank01",ROMX,BANK[$01]
+SECTION "bank01", ROMX
 
 INCLUDE "data/facing.asm"
 
@@ -67,7 +56,7 @@ INCLUDE "engine/remove_pokemon.asm"
 INCLUDE "engine/display_pokedex.asm"
 
 
-SECTION "bank03",ROMX,BANK[$03]
+SECTION "bank03", ROMX
 
 INCLUDE "engine/joypad.asm"
 
@@ -109,7 +98,7 @@ INCLUDE "engine/hp_bar.asm"
 INCLUDE "engine/hidden_object_functions3.asm"
 
 
-SECTION "Graphics", ROMX, BANK[GFX]
+SECTION "Graphics", ROMX
 
 PokemonLogoJapanGraphics:       INCBIN "gfx/pokemon_logo_japan.2bpp"
 FontGraphics:                   INCBIN "gfx/font.1bpp"
@@ -145,7 +134,7 @@ INCLUDE "engine/menu/start_sub_menus.asm"
 INCLUDE "engine/items/tms.asm"
 
 
-SECTION "NPC Sprites 1", ROMX, BANK[NPC_SPRITES_1]
+SECTION "NPC Sprites 1", ROMX
 
 OakAideSprite:         INCBIN "gfx/sprites/oak_aide.2bpp"
 RockerSprite:          INCBIN "gfx/sprites/rocker.2bpp"
@@ -183,7 +172,7 @@ INCLUDE "engine/battle/moveEffects/conversion_effect.asm"
 INCLUDE "engine/battle/moveEffects/haze_effect.asm"
 
 
-SECTION "NPC Sprites 2", ROMX, BANK[NPC_SPRITES_2]
+SECTION "NPC Sprites 2", ROMX
 
 INCLUDE "engine/load_pokedex_tiles.asm"
 INCLUDE "engine/overworld/map_sprites.asm"
@@ -233,7 +222,7 @@ INCLUDE "engine/battle/moveEffects/substitute_effect.asm"
 INCLUDE "engine/menu/pc.asm"
 
 
-SECTION "bank06",ROMX,BANK[$06]
+SECTION "bank06", ROMX
 
 INCLUDE "data/mapHeaders/celadoncity.asm"
 INCLUDE "data/mapObjects/celadoncity.asm"
@@ -306,7 +295,7 @@ INCLUDE "engine/overworld/doors.asm"
 INCLUDE "engine/overworld/ledges.asm"
 
 
-SECTION "bank07",ROMX,BANK[$07]
+SECTION "bank07", ROMX
 
 INCLUDE "data/mapHeaders/cinnabarisland.asm"
 INCLUDE "data/mapObjects/cinnabarisland.asm"
@@ -479,7 +468,7 @@ INCLUDE "engine/menu/oaks_pc.asm"
 INCLUDE "engine/hidden_object_functions7.asm"
 
 
-SECTION "Pics 1", ROMX, BANK[PICS_1]
+SECTION "Pics 1", ROMX
 
 RhydonPicFront:      INCBIN "pic/ymon/rhydon.pic"
 RhydonPicBack:       INCBIN "pic/monback/rhydonb.pic"
@@ -546,7 +535,7 @@ INCLUDE "engine/battle/print_type.asm"
 INCLUDE "engine/battle/save_trainer_name.asm"
 
 
-SECTION "Pics 2", ROMX, BANK[PICS_2]
+SECTION "Pics 2", ROMX
 
 GrowlithePicFront:   INCBIN "pic/ymon/growlithe.pic"
 GrowlithePicBack:    INCBIN "pic/monback/growlitheb.pic"
@@ -617,7 +606,7 @@ INCLUDE "engine/predefsA.asm"
 INCLUDE "engine/battle/moveEffects/leech_seed_effect.asm"
 
 
-SECTION "Pics 3", ROMX, BANK[PICS_3]
+SECTION "Pics 3", ROMX
 
 ArticunoPicFront:    INCBIN "pic/ymon/articuno.pic"
 ArticunoPicBack:     INCBIN "pic/monback/articunob.pic"
@@ -704,7 +693,7 @@ INCLUDE "engine/battle/scale_sprites.asm"
 INCLUDE "engine/game_corner_slots2.asm"
 
 
-SECTION "Pics 4", ROMX, BANK[PICS_4]
+SECTION "Pics 4", ROMX
 
 DodrioPicFront:       INCBIN "pic/ymon/dodrio.pic"
 DodrioPicBack:        INCBIN "pic/monback/dodriob.pic"
@@ -766,7 +755,7 @@ StarmiePicFront:      INCBIN "pic/ymon/starmie.pic"
 StarmiePicBack:       INCBIN "pic/monback/starmieb.pic"
 
 
-SECTION "Pics 5", ROMX, BANK[PICS_5]
+SECTION "Pics 5", ROMX
 
 BulbasaurPicFront:    INCBIN "pic/ymon/bulbasaur.pic"
 BulbasaurPicBack:     INCBIN "pic/monback/bulbasaurb.pic"
@@ -828,7 +817,7 @@ INCLUDE "engine/slot_machine.asm"
 INCLUDE "engine/game_corner_slots.asm"
 
 
-SECTION "bank0E",ROMX,BANK[$0E]
+SECTION "bank0E", ROMX
 
 INCLUDE "data/moves.asm"
 BaseStats: INCLUDE "data/base_stats.asm"
@@ -848,12 +837,12 @@ TradingAnimationGraphics2End:
 INCLUDE "engine/evos_moves.asm"
 
 
-SECTION "bank0F",ROMX,BANK[$0F]
+SECTION "bank0F", ROMX
 
 INCLUDE "engine/battle/core.asm"
 
 
-SECTION "bank10",ROMX,BANK[$10]
+SECTION "bank10", ROMX
 
 INCLUDE "engine/menu/pokedex.asm"
 INCLUDE "engine/overworld/emotion_bubbles.asm"
@@ -863,7 +852,7 @@ INCLUDE "engine/trade2.asm"
 INCLUDE "engine/menu/options.asm"
 
 
-SECTION "bank11",ROMX,BANK[$11]
+SECTION "bank11", ROMX
 
 INCLUDE "data/mapHeaders/lavendertown.asm"
 INCLUDE "data/mapObjects/lavendertown.asm"
@@ -1011,7 +1000,7 @@ SeafoamIslands5Blocks: INCBIN "maps/seafoamislands5.blk"
 INCLUDE "engine/overworld/dungeon_warps.asm"
 
 
-SECTION "bank12",ROMX,BANK[$12]
+SECTION "bank12", ROMX
 
 INCLUDE "data/mapHeaders/route7.asm"
 INCLUDE "data/mapObjects/route7.asm"
@@ -1185,7 +1174,7 @@ INCLUDE "data/mapObjects/safarizonesecrethouse.asm"
 SafariZoneSecretHouseBlocks: INCBIN "maps/safarizonesecrethouse.blk"
 
 
-SECTION "bank13",ROMX,BANK[$13]
+SECTION "bank13", ROMX
 
 TrainerPics:
 YoungsterPic:     INCBIN "pic/trainer/youngster.pic"
@@ -1247,7 +1236,7 @@ INCLUDE "data/mapObjects/colosseum.asm"
 ColosseumBlocks: INCBIN "maps/colosseum.blk"
 
 
-SECTION "bank14",ROMX,BANK[$14]
+SECTION "bank14", ROMX
 
 INCLUDE "data/mapHeaders/route22.asm"
 INCLUDE "data/mapObjects/route22.asm"
@@ -1321,7 +1310,7 @@ INCLUDE "engine/menu/prize_menu.asm"
 INCLUDE "engine/hidden_object_functions14.asm"
 
 
-SECTION "bank15",ROMX,BANK[$15]
+SECTION "bank15", ROMX
 
 INCLUDE "data/mapHeaders/route2.asm"
 INCLUDE "data/mapObjects/route2.asm"
@@ -1412,7 +1401,7 @@ INCLUDE "engine/menu/diploma_1.asm"
 INCLUDE "engine/overworld/trainers.asm"
 
 
-SECTION "bank16",ROMX,BANK[$16]
+SECTION "bank16", ROMX
 
 INCLUDE "data/mapHeaders/route6.asm"
 INCLUDE "data/mapObjects/route6.asm"
@@ -1496,7 +1485,7 @@ HallofFameRoomBlocks: INCBIN "maps/halloffameroom.blk"
 INCLUDE "engine/overworld/saffron_guards.asm"
 
 
-SECTION "bank17",ROMX,BANK[$17]
+SECTION "bank17", ROMX
 
 CeruleanMartBlocks:
 VermilionMartBlocks:
@@ -1648,7 +1637,7 @@ INCLUDE "engine/predefs17_2.asm"
 INCLUDE "engine/hidden_object_functions17.asm"
 
 
-SECTION "bank18",ROMX,BANK[$18]
+SECTION "bank18", ROMX
 
 ViridianForestBlocks: INCBIN "maps/viridianforest.blk"
 UndergroundPathNSBlocks: INCBIN "maps/undergroundpathns.blk"
@@ -1766,7 +1755,7 @@ SilphCo11Blocks: INCBIN "maps/silphco11.blk"
 INCLUDE "engine/hidden_object_functions18.asm"
 
 
-SECTION "bank19",ROMX,BANK[$19]
+SECTION "bank19", ROMX
 
 Overworld_GFX:     INCBIN "gfx/tilesets/overworld.2bpp"
 Overworld_Block:   INCBIN "gfx/blocksets/overworld.bst"
@@ -1786,7 +1775,7 @@ Plateau_GFX:       INCBIN "gfx/tilesets/plateau.t10.2bpp"
 Plateau_Block:     INCBIN "gfx/blocksets/plateau.bst"
 
 
-SECTION "bank1A",ROMX,BANK[$1A]
+SECTION "bank1A", ROMX
 
 INCBIN "gfx/blueversion.1bpp" ; unused
 
@@ -1810,7 +1799,7 @@ Facility_GFX:      INCBIN "gfx/tilesets/facility.2bpp"
 Facility_Block:    INCBIN "gfx/blocksets/facility.bst"
 
 
-SECTION "bank1B",ROMX,BANK[$1B]
+SECTION "bank1B", ROMX
 
 Cemetery_GFX:      INCBIN "gfx/tilesets/cemetery.t4.2bpp"
 Cemetery_Block:    INCBIN "gfx/blocksets/cemetery.bst"
@@ -1828,7 +1817,7 @@ Underground_GFX:   INCBIN "gfx/tilesets/underground.t7.2bpp"
 Underground_Block: INCBIN "gfx/blocksets/underground.bst"
 
 
-SECTION "bank1C",ROMX,BANK[$1C]
+SECTION "bank1C", ROMX
 
 INCLUDE "engine/gamefreak.asm"
 INCLUDE "engine/hall_of_fame.asm"
@@ -1843,7 +1832,7 @@ INCLUDE "engine/palettes.asm"
 INCLUDE "engine/save.asm"
 
 
-SECTION "bank1D",ROMX,BANK[$1D]
+SECTION "bank1D", ROMX
 
 CopycatsHouse1FBlocks: INCBIN "maps/copycatshouse1f.blk"
 PewterMartBlocks:
@@ -1969,7 +1958,7 @@ INCLUDE "engine/overworld/elevator.asm"
 INCLUDE "engine/overworld/hidden_items.asm"
 
 
-SECTION "bank1E",ROMX,BANK[$1E]
+SECTION "bank1E", ROMX
 
 INCLUDE "engine/battle/animations.asm"
 
@@ -1985,18 +1974,18 @@ RedFishingRodTiles:   INCBIN "gfx/red_fishingrod_tiles.2bpp"
 INCLUDE "data/animations.asm"
 
 
-SECTION "bank2f",ROMX[$5000],BANK[$2F]
+SECTION "bank2f", ROMX
 
 INCLUDE "engine/bg_map_attributes.asm"
 
 
-SECTION "bank30",ROMX,BANK[$30]
+SECTION "bank30", ROMX
 
 ; This whole bank is garbage data.
 INCBIN "engine/bank30.bin"
 
 
-SECTION "bank39",ROMX,BANK[$39]
+SECTION "bank39", ROMX
 
 Pic_e4000:
 INCBIN "gfx/pikachu/unknown_e4000.pic"
@@ -2114,7 +2103,7 @@ GFX_e7d13:
 INCBIN "gfx/pikachu/unknown_e7d13.2bpp"
 
 
-SECTION "bank3A",ROMX,BANK[$3A]
+SECTION "bank3A", ROMX
 
 INCLUDE "text/monster_names.asm"
 
@@ -2130,21 +2119,21 @@ INCLUDE "engine/unknown_ea3ea.asm"
 
 INCLUDE "engine/overworld/npc_movement_2.asm"
 
-SECTION "bank3C",ROMX,BANK[$3C]
+SECTION "bank3C", ROMX
 
 INCLUDE "engine/bank3c.asm"
 
 
-SECTION "bank3D",ROMX,BANK[$3D]
+SECTION "bank3D", ROMX
 
 INCLUDE "engine/bank3d.asm"
 
 
-SECTION "bank3E",ROMX,BANK[$3E]
+SECTION "bank3E", ROMX
 
 INCLUDE "engine/bank3e.asm"
 
 
-SECTION "bank3F",ROMX,BANK[$3F]
+SECTION "bank3F", ROMX
 
 INCLUDE "engine/bank3f.asm"
diff --git a/pokeyellow.link b/pokeyellow.link
index 05c9b9bd..0cef28cd 100644
--- a/pokeyellow.link
+++ b/pokeyellow.link
@@ -111,7 +111,7 @@ ROMX $1F
   "Music 3"
 
 ROMX $20
-  "Sound Effect Headers 4" ; AUDIO_3
+  "Sound Effect Headers 4" ; AUDIO_4
   "Music Headers 4"
   "Sound Effects 4"
   "Audio Engine 4"
@@ -161,7 +161,8 @@ ROMX $2E
 
 ROMX $2f
   "Move Names"
-;  "bank2f"
+  ORG $5000
+  "bank2f"
 
 ROMX $30
   "bank30"
diff --git a/scripts/ssanne7.asm b/scripts/ssanne7.asm
index 06789cd5..1f53d1be 100755
--- a/scripts/ssanne7.asm
+++ b/scripts/ssanne7.asm
@@ -45,11 +45,11 @@ SSAnne7RubText:
 	TX_FAR _SSAnne7RubText
 	TX_ASM
 	ld a, [wAudioROMBank]
-	cp AUDIO_3
+	cp BANK(AudioEngine3)
 	ld [wAudioSavedROMBank], a
 	jr nz, .asm_61908
 	call StopAllMusic
-	ld a, Bank(Music_PkmnHealed)
+	ld a, BANK(Music_PkmnHealed)
 	ld [wAudioROMBank], a
 .asm_61908
 	ld a, MUSIC_PKMN_HEALED
diff --git a/text.asm b/text.asm
index 024a2880..acc42187 100644
--- a/text.asm
+++ b/text.asm
@@ -1,22 +1,11 @@
 INCLUDE "charmap.asm"
 INCLUDE "constants/text_constants.asm"
-TEXT_1  EQU $26
-TEXT_2  EQU TEXT_1 + 1
-TEXT_3  EQU TEXT_2 + 1
-TEXT_4  EQU TEXT_3 + 1
-TEXT_5  EQU TEXT_4 + 1
-TEXT_6  EQU TEXT_5 + 1
-TEXT_7  EQU TEXT_6 + 1
-TEXT_8  EQU TEXT_7 + 1
-
-POKEDEX_TEXT EQU TEXT_8 + 1
-MOVE_NAMES   EQU POKEDEX_TEXT + 1
 
 INCLUDE "macros.asm"
 INCLUDE "hram.asm"
 
 
-SECTION "Text 1", ROMX, BANK[TEXT_1]
+SECTION "Text 1", ROMX
 
 _CardKeySuccessText1::
 	text "Bingo!@@"
@@ -199,7 +188,7 @@ INCLUDE "text/maps/silph_co_9f.asm"
 INCLUDE "text/maps/silph_co_10f.asm"
 
 
-SECTION "Text 2", ROMX, BANK[TEXT_2]
+SECTION "Text 2", ROMX
 
 INCLUDE "text/maps/silph_co_11f.asm"
 INCLUDE "text/maps/mansion_2f.asm"
@@ -1529,7 +1518,7 @@ _HookedMonAttackedText::
 	prompt
 
 
-SECTION "Text 3", ROMX, BANK[TEXT_3]
+SECTION "Text 3", ROMX
 
 _EnemyAppearedText::
 	TX_RAM wEnemyMonNick
@@ -2141,7 +2130,7 @@ INCLUDE "text/maps/route_8.asm"
 INCLUDE "text/maps/route_9_1.asm"
 
 
-SECTION "Text 4", ROMX, BANK[TEXT_4]
+SECTION "Text 4", ROMX
 
 INCLUDE "text/maps/route_9_2.asm"
 INCLUDE "text/maps/route_10.asm"
@@ -2218,7 +2207,7 @@ _StoppedEvolvingText::
 	prompt
 
 
-SECTION "Text 5", ROMX, BANK[TEXT_5]
+SECTION "Text 5", ROMX
 
 _IsEvolvingText::
 	text "What? @"
@@ -2518,7 +2507,7 @@ INCLUDE "text/maps/cerulean_mart.asm"
 INCLUDE "text/maps/cerulean_badge_house_1.asm"
 
 
-SECTION "Text 6", ROMX, BANK[TEXT_6]
+SECTION "Text 6", ROMX
 
 INCLUDE "text/maps/cerulean_badge_house_2.asm"
 INCLUDE "text/maps/lavender_pokecenter.asm"
@@ -2567,7 +2556,7 @@ INCLUDE "text/maps/celadon_gym.asm"
 INCLUDE "text/maps/celadon_game_corner_1.asm"
 
 
-SECTION "Text 7", ROMX, BANK[TEXT_7]
+SECTION "Text 7", ROMX
 
 INCLUDE "text/maps/celadon_game_corner_2.asm"
 INCLUDE "text/maps/celadon_dept_store_5f.asm"
@@ -2817,7 +2806,7 @@ _CableClubNPCPleaseApplyHereHaveToSaveText::
 	done
 
 
-SECTION "Text 8", ROMX, BANK[TEXT_8]
+SECTION "Text 8", ROMX
 
 _CableClubNPCPleaseWaitText::
 	text "Please wait.@@"
@@ -3383,11 +3372,11 @@ _UsedCutText::
 	prompt
 
 
-SECTION "Pokedex Text", ROMX, BANK[POKEDEX_TEXT]
+SECTION "Pokedex Text", ROMX
 
 INCLUDE "text/pokedex.asm"
 
 
-SECTION "Move Names", ROMX, BANK[MOVE_NAMES]
+SECTION "Move Names", ROMX
 
 INCLUDE "text/move_names.asm"