Start reorganizing pokeyellow

4 files changed, 270 insertions, 272 deletions

diff --git a/data/sprite_anims/intro_frames.asm b/data/sprite_anims/intro_frames.asm
new file mode 100644
index 00000000..bed2aa6f
--- /dev/null
+++ b/data/sprite_anims/intro_frames.asm
@@ -0,0 +1,70 @@
+YellowIntro_AnimatedObjectFramesData:
+	dw Unkn_fa100
+	dw Unkn_fa103
+	dw Unkn_fa10a
+	dw Unkn_fa111
+	dw Unkn_fa118
+	dw Unkn_fa11b
+	dw Unkn_fa11e
+	dw Unkn_fa121
+	dw Unkn_fa124
+	dw Unkn_fa127
+	dw Unkn_fa138
+
+Unkn_fa100:
+	frame $00, 32
+	endanim
+
+Unkn_fa103:
+	frame $01, 4
+	frame $02, 4
+	frame $03, 4
+	dorestart
+
+Unkn_fa10a:
+	frame $04, 4
+	frame $05, 4
+	frame $06, 4
+	dorestart
+
+Unkn_fa111:
+	frame $07, 4
+	frame $08, 4
+	frame $09, 4
+	dorestart
+
+Unkn_fa118:
+	frame $0a, 32
+	endanim
+
+Unkn_fa11b:
+	frame $0b, 32
+	endanim
+
+Unkn_fa11e:
+	frame $0c, 32
+	endanim
+
+Unkn_fa121:
+	frame $0d, 32
+	endanim
+
+Unkn_fa124:
+	frame $0e, 32
+	endanim
+
+Unkn_fa127:
+	frame $0f, 31
+	frame $11, 2
+	frame $0f, 2
+	frame $11, 2
+	frame $0f, 31
+	frame $11, 2
+	frame $0f, 23
+	frame $10, 32
+	endanim
+
+Unkn_fa138:
+	frame $12, 4
+	frame $13, 4
+	dorestart
diff --git a/data/animated_objects_3e_2.asm b/data/sprite_anims/intro_oam.asm
index 4e9f5b3c..f966d082 100755..100644
--- a/data/animated_objects_3e_2.asm
+++ b/data/sprite_anims/intro_oam.asm
@@ -1,74 +1,3 @@
-YellowIntro_AnimatedObjectFramesData:
-	dw Unkn_fa100
-	dw Unkn_fa103
-	dw Unkn_fa10a
-	dw Unkn_fa111
-	dw Unkn_fa118
-	dw Unkn_fa11b
-	dw Unkn_fa11e
-	dw Unkn_fa121
-	dw Unkn_fa124
-	dw Unkn_fa127
-	dw Unkn_fa138
-
-Unkn_fa100:
-	frame $00, 32
-	endanim
-
-Unkn_fa103:
-	frame $01, 4
-	frame $02, 4
-	frame $03, 4
-	dorestart
-
-Unkn_fa10a:
-	frame $04, 4
-	frame $05, 4
-	frame $06, 4
-	dorestart
-
-Unkn_fa111:
-	frame $07, 4
-	frame $08, 4
-	frame $09, 4
-	dorestart
-
-Unkn_fa118:
-	frame $0a, 32
-	endanim
-
-Unkn_fa11b:
-	frame $0b, 32
-	endanim
-
-Unkn_fa11e:
-	frame $0c, 32
-	endanim
-
-Unkn_fa121:
-	frame $0d, 32
-	endanim
-
-Unkn_fa124:
-	frame $0e, 32
-	endanim
-
-Unkn_fa127:
-	frame $0f, 31
-	frame $11, 2
-	frame $0f, 2
-	frame $11, 2
-	frame $0f, 31
-	frame $11, 2
-	frame $0f, 23
-	frame $10, 32
-	endanim
-
-Unkn_fa138:
-	frame $12, 4
-	frame $13, 4
-	dorestart
-
 YellowIntro_AnimatedObjectOAMData:
 	dbw $00, Unkn_fa179
 	dbw $96, Unkn_fa17e
diff --git a/data/sprite_anims/surfing_pikachu_frames.asm b/data/sprite_anims/surfing_pikachu_frames.asm
new file mode 100755
index 00000000..cf3463a3
--- /dev/null
+++ b/data/sprite_anims/surfing_pikachu_frames.asm
@@ -0,0 +1,200 @@
+SurfingPikachuFrames:
+	dw Unkn_f943d ; 00
+	dw Unkn_f9440 ; 01
+	dw Unkn_f9445 ; 02
+	dw Unkn_f944a ; 03
+	dw Unkn_f944f ; 04
+	dw Unkn_f9454 ; 05
+	dw Unkn_f9459 ; 06
+	dw Unkn_f945e ; 07
+	dw Unkn_f9463 ; 08
+	dw Unkn_f9468 ; 09
+	dw Unkn_f946d ; 0a
+	dw Unkn_f9472 ; 0b
+	dw Unkn_f9477 ; 0c
+	dw Unkn_f947c ; 0d
+	dw Unkn_f9481 ; 0e
+	dw Unkn_f9486 ; 0f
+	dw Unkn_f948b ; 10
+	dw Unkn_f9494 ; 11
+	dw Unkn_f9499 ; 12
+	dw Unkn_f949e ; 13
+	dw Unkn_f94fb ; 14
+	dw Unkn_f94a1 ; 15
+	dw Unkn_f94b0 ; 16
+	dw Unkn_f94bf ; 17
+	dw Unkn_f94ce ; 18
+	dw Unkn_f94dd ; 19
+	dw Unkn_f94ec ; 1a
+	dw Unkn_f94fe ; 1b
+
+Unkn_f943d:
+	frame $00, 32
+	endanim
+
+Unkn_f9440:
+	frame $01, 8
+	frame $02, 8
+	dorestart
+
+Unkn_f9445:
+	frame $03, 8
+	frame $04, 8
+	dorestart
+
+Unkn_f944a:
+	frame $05, 8
+	frame $06, 8
+	dorestart
+
+Unkn_f944f:
+	frame $07, 8
+	frame $08, 8
+	dorestart
+
+Unkn_f9454:
+	frame $09, 8
+	frame $0a, 8
+	dorestart
+
+Unkn_f9459:
+	frame $0b, 8
+	frame $0c, 8
+	dorestart
+
+Unkn_f945e:
+	frame $0d, 8
+	frame $0e, 8
+	dorestart
+
+Unkn_f9463:
+	frame $01, 8, OAM_HFLIP, OAM_VFLIP
+	frame $02, 8, OAM_HFLIP, OAM_VFLIP
+	dorestart
+
+Unkn_f9468:
+	frame $03, 8, OAM_HFLIP, OAM_VFLIP
+	frame $04, 8, OAM_HFLIP, OAM_VFLIP
+	dorestart
+
+Unkn_f946d:
+	frame $05, 8, OAM_HFLIP, OAM_VFLIP
+	frame $06, 8, OAM_HFLIP, OAM_VFLIP
+	dorestart
+
+Unkn_f9472:
+	frame $07, 8, OAM_HFLIP, OAM_VFLIP
+	frame $08, 8, OAM_HFLIP, OAM_VFLIP
+	dorestart
+
+Unkn_f9477:
+	frame $09, 8, OAM_HFLIP, OAM_VFLIP
+	frame $0a, 8, OAM_HFLIP, OAM_VFLIP
+	dorestart
+
+Unkn_f947c:
+	frame $0b, 8, OAM_HFLIP, OAM_VFLIP
+	frame $0c, 8, OAM_HFLIP, OAM_VFLIP
+	dorestart
+
+Unkn_f9481:
+	frame $0d, 8, OAM_HFLIP, OAM_VFLIP
+	frame $0e, 8, OAM_HFLIP, OAM_VFLIP
+	dorestart
+
+Unkn_f9486:
+	frame $11, 7
+	frame $12, 7
+	dorestart
+
+Unkn_f948b:
+	frame $13, 2
+	frame $14, 2
+	dorepeat 8
+	frame $15, 2
+	endanim
+
+Unkn_f9494:
+	frame $16, 32
+	frame $16, 32
+	delanim
+
+Unkn_f9499:
+	frame $17, 32
+	frame $17, 32
+	delanim
+
+Unkn_f949e:
+	frame $18, 32
+	endanim
+
+Unkn_f94a1:
+	frame $1a, 4
+	dorepeat 1
+	frame $1a, 3
+	dorepeat 1
+	frame $1a, 2
+	dorepeat 1
+	frame $1a, 1
+	delanim
+
+Unkn_f94b0:
+	frame $1b, 4
+	dorepeat 1
+	frame $1b, 3
+	dorepeat 1
+	frame $1b, 2
+	dorepeat 1
+	frame $1b, 1
+	delanim
+
+Unkn_f94bf:
+	frame $1c, 4
+	dorepeat 1
+	frame $1c, 3
+	dorepeat 1
+	frame $1c, 2
+	dorepeat 1
+	frame $1c, 1
+	delanim
+
+Unkn_f94ce:
+	frame $1d, 4
+	dorepeat 1
+	frame $1d, 3
+	dorepeat 1
+	frame $1d, 2
+	dorepeat 1
+	frame $1d, 1
+	delanim
+
+Unkn_f94dd:
+	frame $1e, 4
+	dorepeat 1
+	frame $1e, 3
+	dorepeat 1
+	frame $1e, 2
+	dorepeat 1
+	frame $1e, 1
+	delanim
+
+Unkn_f94ec:
+	frame $1f, 4
+	dorepeat 1
+	frame $1f, 3
+	dorepeat 1
+	frame $1f, 2
+	dorepeat 1
+	frame $1f, 1
+	delanim
+
+Unkn_f94fb:
+	frame $19, 1
+	delanim
+
+Unkn_f94fe:
+	frame $20, 7
+	frame $21, 7
+	frame $22, 7
+	frame $23, 7
+	dorestart
diff --git a/data/animated_objects_3e_1.asm b/data/sprite_anims/surfing_pikachu_oam.asm
index 07b17ce5..d3aa441f 100755..100644
--- a/data/animated_objects_3e_1.asm
+++ b/data/sprite_anims/surfing_pikachu_oam.asm
@@ -1,204 +1,3 @@
-SurfingPikachuFrames:
-	dw Unkn_f943d ; 00
-	dw Unkn_f9440 ; 01
-	dw Unkn_f9445 ; 02
-	dw Unkn_f944a ; 03
-	dw Unkn_f944f ; 04
-	dw Unkn_f9454 ; 05
-	dw Unkn_f9459 ; 06
-	dw Unkn_f945e ; 07
-	dw Unkn_f9463 ; 08
-	dw Unkn_f9468 ; 09
-	dw Unkn_f946d ; 0a
-	dw Unkn_f9472 ; 0b
-	dw Unkn_f9477 ; 0c
-	dw Unkn_f947c ; 0d
-	dw Unkn_f9481 ; 0e
-	dw Unkn_f9486 ; 0f
-	dw Unkn_f948b ; 10
-	dw Unkn_f9494 ; 11
-	dw Unkn_f9499 ; 12
-	dw Unkn_f949e ; 13
-	dw Unkn_f94fb ; 14
-	dw Unkn_f94a1 ; 15
-	dw Unkn_f94b0 ; 16
-	dw Unkn_f94bf ; 17
-	dw Unkn_f94ce ; 18
-	dw Unkn_f94dd ; 19
-	dw Unkn_f94ec ; 1a
-	dw Unkn_f94fe ; 1b
-
-Unkn_f943d:
-	frame $00, 32
-	endanim
-
-Unkn_f9440:
-	frame $01, 8
-	frame $02, 8
-	dorestart
-
-Unkn_f9445:
-	frame $03, 8
-	frame $04, 8
-	dorestart
-
-Unkn_f944a:
-	frame $05, 8
-	frame $06, 8
-	dorestart
-
-Unkn_f944f:
-	frame $07, 8
-	frame $08, 8
-	dorestart
-
-Unkn_f9454:
-	frame $09, 8
-	frame $0a, 8
-	dorestart
-
-Unkn_f9459:
-	frame $0b, 8
-	frame $0c, 8
-	dorestart
-
-Unkn_f945e:
-	frame $0d, 8
-	frame $0e, 8
-	dorestart
-
-Unkn_f9463:
-	frame $01, 8, OAM_HFLIP, OAM_VFLIP
-	frame $02, 8, OAM_HFLIP, OAM_VFLIP
-	dorestart
-
-Unkn_f9468:
-	frame $03, 8, OAM_HFLIP, OAM_VFLIP
-	frame $04, 8, OAM_HFLIP, OAM_VFLIP
-	dorestart
-
-Unkn_f946d:
-	frame $05, 8, OAM_HFLIP, OAM_VFLIP
-	frame $06, 8, OAM_HFLIP, OAM_VFLIP
-	dorestart
-
-Unkn_f9472:
-	frame $07, 8, OAM_HFLIP, OAM_VFLIP
-	frame $08, 8, OAM_HFLIP, OAM_VFLIP
-	dorestart
-
-Unkn_f9477:
-	frame $09, 8, OAM_HFLIP, OAM_VFLIP
-	frame $0a, 8, OAM_HFLIP, OAM_VFLIP
-	dorestart
-
-Unkn_f947c:
-	frame $0b, 8, OAM_HFLIP, OAM_VFLIP
-	frame $0c, 8, OAM_HFLIP, OAM_VFLIP
-	dorestart
-
-Unkn_f9481:
-	frame $0d, 8, OAM_HFLIP, OAM_VFLIP
-	frame $0e, 8, OAM_HFLIP, OAM_VFLIP
-	dorestart
-
-Unkn_f9486:
-	frame $11, 7
-	frame $12, 7
-	dorestart
-
-Unkn_f948b:
-	frame $13, 2
-	frame $14, 2
-	dorepeat 8
-	frame $15, 2
-	endanim
-
-Unkn_f9494:
-	frame $16, 32
-	frame $16, 32
-	delanim
-
-Unkn_f9499:
-	frame $17, 32
-	frame $17, 32
-	delanim
-
-Unkn_f949e:
-	frame $18, 32
-	endanim
-
-Unkn_f94a1:
-	frame $1a, 4
-	dorepeat 1
-	frame $1a, 3
-	dorepeat 1
-	frame $1a, 2
-	dorepeat 1
-	frame $1a, 1
-	delanim
-
-Unkn_f94b0:
-	frame $1b, 4
-	dorepeat 1
-	frame $1b, 3
-	dorepeat 1
-	frame $1b, 2
-	dorepeat 1
-	frame $1b, 1
-	delanim
-
-Unkn_f94bf:
-	frame $1c, 4
-	dorepeat 1
-	frame $1c, 3
-	dorepeat 1
-	frame $1c, 2
-	dorepeat 1
-	frame $1c, 1
-	delanim
-
-Unkn_f94ce:
-	frame $1d, 4
-	dorepeat 1
-	frame $1d, 3
-	dorepeat 1
-	frame $1d, 2
-	dorepeat 1
-	frame $1d, 1
-	delanim
-
-Unkn_f94dd:
-	frame $1e, 4
-	dorepeat 1
-	frame $1e, 3
-	dorepeat 1
-	frame $1e, 2
-	dorepeat 1
-	frame $1e, 1
-	delanim
-
-Unkn_f94ec:
-	frame $1f, 4
-	dorepeat 1
-	frame $1f, 3
-	dorepeat 1
-	frame $1f, 2
-	dorepeat 1
-	frame $1f, 1
-	delanim
-
-Unkn_f94fb:
-	frame $19, 1
-	delanim
-
-Unkn_f94fe:
-	frame $20, 7
-	frame $21, 7
-	frame $22, 7
-	frame $23, 7
-	dorestart
-
 SurfingPikachuOAMData:
 	dbw $00, .Frame0
 	dbw $00, .Frame1