1 files changed, 77 insertions, 25 deletions
diff --git a/layout.link b/layout.link
index 87ab7e0e..40b00dee 100644
--- a/layout.link
+++ b/layout.link
@@ -44,20 +44,20 @@ ROMX $2
 ROMX $3
 	"bank3"
 ROMX $4
+	"bank4"
 	"NPC Sprites 1"
-	"Font Graphics"
 	"Battle Engine 1"
 ROMX $5
+	"bank5"
 	"NPC Sprites 2"
 	"Battle Engine 2"
 ROMX $6
 	"Maps 1"
-	"Play Time"
 	"Maps 2"
 	"Doors and Ledges"
 ROMX $7
 	"Maps 3"
-	"Pokémon Names"
+	"bank7"
 	"Maps 4"
 	"Hidden Objects 1"
 ROMX $8
@@ -79,12 +79,11 @@ ROMX $B
 	"Battle Engine 5"
 ROMX $C
 	"Pics 4"
-	"Battle Engine 6"
 ROMX $D
 	"Pics 5"
 	"Slot Machines"
 ROMX $E
-	"Battle Engine 7"
+	"Battle Engine 6"
 ROMX $F
 	"Battle Core"
 ROMX $10
@@ -93,28 +92,25 @@ ROMX $11
 	"Maps 5"
 	"Pokédex Rating"
 	"Maps 6"
-	"Hidden Objects Core"
+	"Dungeon Warps"
 ROMX $12
 	"Maps 7"
-	"Screen Effects"
 	"Maps 8"
 ROMX $13
 	"Pics 6"
 	"Maps 9"
-	"Predefs"
 ROMX $14
 	"Maps 10"
-	"Battle Engine 8"
 	"Hidden Objects 2"
 ROMX $15
 	"Maps 11"
-	"Battle Engine 9"
+	"Battle Engine 7"
 	"Maps 12"
 	"Diploma"
 	"Trainer Sight"
 ROMX $16
 	"Maps 13"
-	"Battle Engine 10"
+	"bank16"
 	"Maps 14"
 	"Saffron Guards"
 ROMX $17
@@ -130,7 +126,7 @@ ROMX $18
 ROMX $19
 	"Tilesets 1"
 ROMX $1A
-	"Battle Engine 11"
+	"Version Graphics"
 	"Tilesets 2"
 ROMX $1B
 	"Tilesets 3"
@@ -152,39 +148,95 @@ ROMX $1F
 	"Audio Engine 3"
 	"Music 3"
 ROMX $20
-	"Text 1"
+	"Sound Effect Headers 4"
+	"Music Headers 4"
+	"Sound Effects 4"
+	"Audio Engine 4"
+	"Music 4"
 ROMX $21
-	"Text 2"
+	"Pikachu Cries 1"
 ROMX $22
-	"Text 3"
+	"Pikachu Cries 2"
 ROMX $23
-	"Text 4"
+	"Pikachu Cries 3"
 ROMX $24
-	"Text 5"
+	"Pikachu Cries 4"
 ROMX $25
-	"Text 6"
+	"Pikachu Cries 5"
 ROMX $26
-	"Text 7"
+	"Text 1"
 ROMX $27
-	"Text 8"
+	"Text 2"
 ROMX $28
-	"Text 9"
+	"Text 3"
 ROMX $29
-	"Text 10"
+	"Text 4"
 ROMX $2A
-	"Text 11"
+	"Text 5"
 ROMX $2B
-	"Pokédex Text"
+	"Text 6"
 ROMX $2C
+	"Text 7"
+ROMX $2D
+	"Text 8"
+ROMX $2E
+	"Pokédex Text"
+ROMX $2f
 	"Move Names"
+	"BG Map Attributes (Debug)"
+	org $5000
+	"BG Map Attributes"
+ROMX $30
+	"bank30"
+ROMX $31
+	"Pikachu Cries 6"
+ROMX $32
+	"Pikachu Cries 7"
+ROMX $33
+	"Pikachu Cries 8"
+ROMX $34
+	"Pikachu Cries 9"
+ROMX $35
+	"Pikachu Cries 10"
+ROMX $36
+	"Pikachu Cries 11"
+ROMX $37
+	"Pikachu Cries 12"
+ROMX $38
+	"Pikachu Cries 13"
+ROMX $39
+	"Pikachu Graphics 1"
+ROMX $3A
+	"bank3A"
+; bank $3B is empty
+ROMX $3C
+	"Pikachu PCM"
+	"Tilesets 4"
+	"Try Pikachu Movement"
+	"Pikachu Graphics 2"
+	"Credits"
+	"Maps 22"
+	"Hidden Objects Core"
+ROMX $3D
+	"Battle Engine 8"
+	"Pics 7"
+	"Battle Engine 9"
+ROMX $3E
+	"Surfing Minigame"
+ROMX $3F
+	"Overworld Pikachu"
+	"NPC Sprites 3"
 WRAM0
 	"WRAM"
 	org $c100
 	"Sprite State Data"
+	org $c300
 	"OAM Buffer"
+WRAMX $1
+	"WRAM Bank 1"
 	org $dfff
 	"Stack"
-VRAM
+VRAM $0
 	"VRAM"
 SRAM $0
 	"Sprite Buffers"