Names for more SECTIONs

4 files changed, 76 insertions, 117 deletions

diff --git a/layout.link b/layout.link
index d56a7886..5ea3558f 100644
--- a/layout.link
+++ b/layout.link
@@ -33,41 +33,33 @@ ROM0
 	"Header"
 	org $150
 	"Home"
-
 ROMX $1
 	"bank1"
-
 ROMX $2
 	"Sound Effect Headers 1"
 	"Music Headers 1"
 	"Sound Effects 1"
 	"Audio Engine 1"
 	"Music 1"
-
 ROMX $3
 	"bank3"
-
 ROMX $4
 	"NPC Sprites 1"
-	"Graphics (BANK 4)"
-	"Battle (BANK 4)"
-
+	"Font Graphics"
+	"Battle Engine 1"
 ROMX $5
 	"NPC Sprites 2"
-	"Battle (BANK 5)"
-
+	"Battle Engine 2"
 ROMX $6
 	"Maps 1"
-	"bank6_1"
+	"Play Time"
 	"Maps 2"
-	"bank6_2"
-
+	"Doors and Ledges"
 ROMX $7
 	"Maps 3"
-	"bank7_1"
+	"Pokémon Names"
 	"Maps 4"
-	"bank7_2"
-
+	"Hidden Objects 1"
 ROMX $8
 	"Sound Effect Headers 2"
 	"Music Headers 2"
@@ -76,172 +68,131 @@ ROMX $8
 	"Bill's PC"
 	"Audio Engine 2"
 	"Music 2"
-
 ROMX $9
 	"Pics 1"
-	"Battle (BANK 9)"
-
+	"Battle Engine 3"
 ROMX $A
 	"Pics 2"
-	"Battle (BANK A)"
-
+	"Battle Engine 4"
 ROMX $B
 	"Pics 3"
-	"Battle (BANK B)"
-
+	"Battle Engine 5"
 ROMX $C
 	"Pics 4"
-	"Battle (BANK C)"
-
+	"Battle Engine 6"
 ROMX $D
 	"Pics 5"
-	"Battle (BANK D)"
-
+	"Slot Machines"
 ROMX $E
-	"bankE"
-
+	"Battle Engine 7"
 ROMX $F
-	"bankF"
-
+	"Battle Core"
 ROMX $10
 	"bank10"
-
 ROMX $11
 	"Maps 5"
-	"bank11_1"
+	"Pokédex Rating"
 	"Maps 6"
-	"bank11_2"
-
+	"Hidden Objects Core"
 ROMX $12
 	"Maps 7"
-	"bank12"
+	"Screen Effects"
 	"Maps 8"
-
 ROMX $13
 	"Pics 6"
 	"Maps 9"
-	"bank13"
-
+	"Predefs"
 ROMX $14
 	"Maps 10"
-	"bank14"
-
+	"Battle Engine 8"
+	"Hidden Objects 2"
 ROMX $15
 	"Maps 11"
-	"bank15_1"
+	"Battle Engine 9"
 	"Maps 12"
-	"bank15_2"
-
+	"Diploma"
+	"Trainer Sight"
 ROMX $16
 	"Maps 13"
-	"bank16_1"
+	"Battle Engine 10"
 	"Maps 14"
-	"bank16_2"
-
+	"Saffron Guards"
 ROMX $17
 	"Maps 15"
-	"bank17_1"
+	"Starter Dex"
 	"Maps 16"
-	"bank17_2"
-
+	"Hidden Objects 3"
 ROMX $18
 	"Maps 17"
-	"bank18_1"
+	"Cinnabar Lab Fossils"
 	"Maps 18"
-	"bank18_2"
-
+	"Hidden Objects 4"
 ROMX $19
 	"Tilesets 1"
-
 ROMX $1A
-	"bank1A"
+	"Battle Engine 11"
 	"Tilesets 2"
-
 ROMX $1B
 	"Tilesets 3"
-
 ROMX $1C
 	"bank1C"
-
 ROMX $1D
 	"Maps 19"
-	"bank1D_1"
+	"Itemfinder 1"
 	"Maps 20"
-	"bank1D_2"
+	"Vending Machine"
 	"Maps 21"
-	"bank1D_3"
-
+	"Itemfinder 2"
 ROMX $1E
 	"bank1E"
-
 ROMX $1F
 	"Sound Effect Headers 3"
 	"Music Headers 3"
 	"Sound Effects 3"
 	"Audio Engine 3"
 	"Music 3"
-
 ROMX $20
 	"Text 1"
-
 ROMX $21
 	"Text 2"
-
 ROMX $22
 	"Text 3"
-
 ROMX $23
 	"Text 4"
-
 ROMX $24
 	"Text 5"
-
 ROMX $25
 	"Text 6"
-
 ROMX $26
 	"Text 7"
-
 ROMX $27
 	"Text 8"
-
 ROMX $28
 	"Text 9"
-
 ROMX $29
 	"Text 10"
-
 ROMX $2A
 	"Text 11"
-
 ROMX $2B
-	"Pokedex Text"
-
+	"Pokédex Text"
 ROMX $2C
 	"Move Names"
-
 WRAM0
-	"WRAM Bank 0"
+	"WRAM"
 	org $c100
 	"Sprite State Data"
 	"OAM Buffer"
 	org $dfff
 	"Stack"
-
 VRAM
 	"VRAM"
-
 SRAM $0
 	"Sprite Buffers"
-
 SRAM $1
 	"Save Data"
-
 SRAM $2
 	"Saved Boxes 1"
-
 SRAM $3
 	"Saved Boxes 2"
-
 HRAM
 	"HRAM"
diff --git a/main.asm b/main.asm
index b325a343..7738cd2f 100755
--- a/main.asm
+++ b/main.asm
@@ -78,12 +78,12 @@ INCLUDE "engine/events/hidden_objects/town_map.asm"
 INCLUDE "engine/events/hidden_objects/pokemon_stuff.asm"
 
 
-SECTION "Graphics (BANK 4)", ROMX
+SECTION "Font Graphics", ROMX
 
 INCLUDE "gfx/font.asm"
 
 
-SECTION "Battle (BANK 4)", ROMX
+SECTION "Battle Engine 1", ROMX
 
 INCLUDE "engine/overworld/is_player_just_outside_map.asm"
 INCLUDE "engine/pokemon/status_screen.asm"
@@ -101,7 +101,7 @@ INCLUDE "engine/battle/get_trainer_name.asm"
 INCLUDE "engine/math/random.asm"
 
 
-SECTION "Battle (BANK 5)", ROMX
+SECTION "Battle Engine 2", ROMX
 
 INCLUDE "engine/gfx/load_pokedex_tiles.asm"
 INCLUDE "engine/overworld/map_sprites.asm"
@@ -111,26 +111,26 @@ INCLUDE "engine/battle/move_effects/substitute.asm"
 INCLUDE "engine/menus/pc.asm"
 
 
-SECTION "bank6_1", ROMX
+SECTION "Play Time", ROMX
 
 INCLUDE "engine/play_time.asm"
 
 
-SECTION "bank6_2", ROMX
+SECTION "Doors and Ledges", ROMX
 
 INCLUDE "engine/overworld/auto_movement.asm"
 INCLUDE "engine/overworld/doors.asm"
 INCLUDE "engine/overworld/ledges.asm"
 
 
-SECTION "bank7_1", ROMX
+SECTION "Pokémon Names", ROMX
 
 INCLUDE "data/pokemon/names.asm"
 INCLUDE "engine/movie/oak_speech/clear_save.asm"
 INCLUDE "engine/events/elevator.asm"
 
 
-SECTION "bank7_2", ROMX
+SECTION "Hidden Objects 1", ROMX
 
 INCLUDE "engine/menus/oaks_pc.asm"
 INCLUDE "engine/events/hidden_objects/new_bike.asm"
@@ -147,19 +147,19 @@ SECTION "Bill's PC", ROMX
 INCLUDE "engine/pokemon/bills_pc.asm"
 
 
-SECTION "Battle (BANK 9)", ROMX
+SECTION "Battle Engine 3", ROMX
 
 INCLUDE "engine/battle/print_type.asm"
 INCLUDE "engine/battle/save_trainer_name.asm"
 INCLUDE "engine/battle/move_effects/focus_energy.asm"
 
 
-SECTION "Battle (BANK A)", ROMX
+SECTION "Battle Engine 4", ROMX
 
 INCLUDE "engine/battle/move_effects/leech_seed.asm"
 
 
-SECTION "Battle (BANK B)", ROMX
+SECTION "Battle Engine 5", ROMX
 
 INCLUDE "engine/battle/display_effectiveness.asm"
 INCLUDE "gfx/trainer_card.asm"
@@ -169,13 +169,13 @@ INCLUDE "engine/battle/move_effects/pay_day.asm"
 INCLUDE "engine/slots/game_corner_slots2.asm"
 
 
-SECTION "Battle (BANK C)", ROMX
+SECTION "Battle Engine 6", ROMX
 
 INCLUDE "engine/battle/move_effects/mist.asm"
 INCLUDE "engine/battle/move_effects/one_hit_ko.asm"
 
 
-SECTION "Battle (BANK D)", ROMX
+SECTION "Slot Machines", ROMX
 
 INCLUDE "engine/movie/title2.asm"
 INCLUDE "engine/battle/link_battle_versus_text.asm"
@@ -185,7 +185,7 @@ INCLUDE "engine/math/multiply_divide.asm"
 INCLUDE "engine/slots/game_corner_slots.asm"
 
 
-SECTION "bankE", ROMX
+SECTION "Battle Engine 7", ROMX
 
 INCLUDE "data/moves/moves.asm"
 INCLUDE "data/pokemon/base_stats.asm"
@@ -201,7 +201,7 @@ INCLUDE "engine/battle/move_effects/transform.asm"
 INCLUDE "engine/battle/move_effects/reflect_light_screen.asm"
 
 
-SECTION "bankF", ROMX
+SECTION "Battle Core", ROMX
 
 INCLUDE "engine/battle/core.asm"
 INCLUDE "engine/battle/effects.asm"
@@ -215,31 +215,35 @@ INCLUDE "engine/movie/intro.asm"
 INCLUDE "engine/movie/trade2.asm"
 
 
-SECTION "bank11_1", ROMX
+SECTION "Pokédex Rating", ROMX
 
 INCLUDE "engine/events/pokedex_rating.asm"
 
 
-SECTION "bank11_2", ROMX
+SECTION "Hidden Objects Core", ROMX
 
 INCLUDE "engine/overworld/hidden_objects.asm"
 
 
-SECTION "bank12", ROMX
+SECTION "Screen Effects", ROMX
 
 INCLUDE "engine/gfx/screen_effects.asm"
 
 
-SECTION "bank13", ROMX
+SECTION "Predefs", ROMX
 
 INCLUDE "engine/events/give_pokemon.asm"
 INCLUDE "engine/predefs.asm"
 
 
-SECTION "bank14", ROMX
+SECTION "Battle Engine 8", ROMX
 
 INCLUDE "engine/battle/init_battle_variables.asm"
 INCLUDE "engine/battle/move_effects/paralyze.asm"
+
+
+SECTION "Hidden Objects 2", ROMX
+
 INCLUDE "engine/events/card_key.asm"
 INCLUDE "engine/events/prize_menu.asm"
 INCLUDE "engine/events/hidden_objects/school_notebooks.asm"
@@ -247,35 +251,39 @@ INCLUDE "engine/events/hidden_objects/fighting_dojo.asm"
 INCLUDE "engine/events/hidden_objects/indigo_plateau_hq.asm"
 
 
-SECTION "bank15_1", ROMX
+SECTION "Battle Engine 9", ROMX
 
 INCLUDE "engine/battle/experience.asm"
 
 
-SECTION "bank15_2", ROMX
+SECTION "Diploma", ROMX
 
 INCLUDE "engine/events/diploma.asm"
+
+
+SECTION "Trainer Sight", ROMX
+
 INCLUDE "engine/overworld/trainer_sight.asm"
 
 
-SECTION "bank16_1", ROMX
+SECTION "Battle Engine 10", ROMX
 
 INCLUDE "engine/battle/common_text.asm"
 INCLUDE "engine/pokemon/experience.asm"
 INCLUDE "engine/events/oaks_aide.asm"
 
 
-SECTION "bank16_2", ROMX
+SECTION "Saffron Guards", ROMX
 
 INCLUDE "engine/events/saffron_guards.asm"
 
 
-SECTION "bank17_1", ROMX
+SECTION "Starter Dex", ROMX
 
 INCLUDE "engine/events/starter_dex.asm"
 
 
-SECTION "bank17_2", ROMX
+SECTION "Hidden Objects 3", ROMX
 
 INCLUDE "engine/pokemon/set_types.asm"
 INCLUDE "engine/events/hidden_objects/reds_room.asm"
@@ -285,12 +293,12 @@ INCLUDE "engine/events/hidden_objects/school_blackboard.asm"
 INCLUDE "engine/events/hidden_objects/vermilion_gym_trash.asm"
 
 
-SECTION "bank18_1", ROMX
+SECTION "Cinnabar Lab Fossils", ROMX
 
 INCLUDE "engine/events/cinnabar_lab.asm"
 
 
-SECTION "bank18_2", ROMX
+SECTION "Hidden Objects 4", ROMX
 
 INCLUDE "engine/events/hidden_objects/gym_statues.asm"
 INCLUDE "engine/events/hidden_objects/bench_guys.asm"
@@ -298,7 +306,7 @@ INCLUDE "engine/events/hidden_objects/blues_room.asm"
 INCLUDE "engine/events/hidden_objects/pokecenter_pc.asm"
 
 
-SECTION "bank1A", ROMX
+SECTION "Battle Engine 11", ROMX
 
 INCLUDE "engine/battle/decrement_pp.asm"
 INCLUDE "gfx/version.asm"
@@ -319,19 +327,19 @@ INCLUDE "engine/gfx/palettes.asm"
 INCLUDE "engine/menus/save.asm"
 
 
-SECTION "bank1D_1", ROMX
+SECTION "Itemfinder 1", ROMX
 
 INCLUDE "engine/movie/credits.asm"
 INCLUDE "engine/pokemon/status_ailments.asm"
 INCLUDE "engine/items/itemfinder.asm"
 
 
-SECTION "bank1D_2", ROMX
+SECTION "Vending Machine", ROMX
 
 INCLUDE "engine/events/vending_machine.asm"
 
 
-SECTION "bank1D_3", ROMX
+SECTION "Itemfinder 2", ROMX
 
 INCLUDE "engine/menus/league_pc.asm"
 INCLUDE "engine/events/hidden_items.asm"
diff --git a/text.asm b/text.asm
index d15f258a..be17bfc6 100644
--- a/text.asm
+++ b/text.asm
@@ -270,7 +270,7 @@ SECTION "Text 11", ROMX
 INCLUDE "data/text/text_7.asm"
 
 
-SECTION "Pokedex Text", ROMX
+SECTION "Pokédex Text", ROMX
 
 INCLUDE "data/pokemon/dex_text.asm"
 
diff --git a/wram.asm b/wram.asm
index 04718234..db5b7476 100755
--- a/wram.asm
+++ b/wram.asm
@@ -6,7 +6,7 @@ INCLUDE "macros/wram.asm"
 INCLUDE "vram.asm"
 
 
-SECTION "WRAM Bank 0", WRAM0
+SECTION "WRAM", WRAM0
 
 wUnusedC000::
 	ds 1