battle transition graphics

23 files changed, 220 insertions, 24 deletions

diff --git a/asm/rom5.s b/asm/rom5.s
index 8bc48d623..2af2d09fa 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -328530,7 +328530,7 @@ sub_811AC0C: @ 811AC0C
 	pop {r1}
 	bx r1
 	.align 2, 0
-_0811AC30: .4byte gUnknown_083FD750
+_0811AC30: .4byte gBattleTransitionFuncs
 	thumb_func_end sub_811AC0C
 
 	thumb_func_start sub_811AC34
@@ -328558,7 +328558,7 @@ _0811AC58:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_0811AC60: .4byte gUnknown_083FD750
+_0811AC60: .4byte gBattleTransitionFuncs
 	thumb_func_end sub_811AC34
 
 	thumb_func_start sub_811AC64
diff --git a/data/data2.s b/data/data2.s
index 451e2c5f9..9b4a73123 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -23016,29 +23016,33 @@ gCryMeterNeedleSpritePalettes:: @ 83FB79C
 @ 83FB7AC
 	.include "data/landmarks.s"
 
+	.align 2
 gUnknown_083FBB88:: @ 83FBB88
-	.incbin "baserom.gba", 0x003fbb88, 0x580
+	.incbin "graphics/battle_transitions/big_pokeball.4bpp"
 
+	.align 2
 gUnknown_083FC108:: @ 83FC108
-	.incbin "baserom.gba", 0x003fc108, 0x40
+	.incbin "graphics/battle_transitions/pokeball_trail.4bpp"
 
 	.align 2
 gSpriteImage_83FC148:: @ 83FC148
-	.incbin "graphics/unknown_sprites/83FC148.4bpp"
+	.incbin "graphics/battle_transitions/pokeball.4bpp"
 
+	.align 2
 gUnknown_083FC348:: @ 83FC348
-	.incbin "baserom.gba", 0x003fc348, 0x1e0
+	.incbin "graphics/battle_transitions/elite_four_bg.4bpp"
 
 	.align 2
 gSpriteImage_83FC528:: @ 83FC528
-	.incbin "graphics/unknown_sprites/83FC528.4bpp"
+	.incbin "graphics/battle_transitions/unused_brendan.4bpp"
 
 	.align 2
 gSpriteImage_83FCD28:: @ 83FCD28
-	.incbin "graphics/unknown_sprites/83FCD28.4bpp"
+	.incbin "graphics/battle_transitions/unused_lass.4bpp"
 
+	.align 2
 gUnknown_083FD528:: @ 83FD528
-	.incbin "baserom.gba", 0x003fd528, 0x1e0
+	.incbin "graphics/battle_transitions/shrinking_box.4bpp"
 
 	.align 2
 gUnknown_083FD708:: @ 83FD708
@@ -23065,7 +23069,7 @@ gUnknown_083FD70C:: @ 83FD70C
 	.4byte sub_811AC64
 
 	.align 2
-gUnknown_083FD750:: @ 83FD750
+gBattleTransitionFuncs:: @ 83FD750
 	.4byte sub_811ACB4
 	.4byte sub_811ADAC
 	.4byte sub_811AF44
@@ -23122,14 +23126,23 @@ gUnknown_083FD7D8:: @ 83FD7D8
 	.4byte sub_811B5FC
 	.4byte sub_811B688
 
+	.align 1
 gUnknown_083FD7E4:: @ 83FD7E4
-	.incbin "baserom.gba", 0x003fd7e4, 0x4
+	.2byte -16
+	.2byte 256
 
+	.align 1
 gUnknown_083FD7E8:: @ 83FD7E8
-	.incbin "baserom.gba", 0x003fd7e8, 0xa
+	.2byte 0
+	.2byte 32
+	.2byte 64
+	.2byte 18
+	.2byte 48
 
+	.align 1
 gUnknown_083FD7F2:: @ 83FD7F2
-	.incbin "baserom.gba", 0x003fd7f2, 0x6
+	.2byte 8
+	.2byte -8
 
 	.align 2
 gUnknown_083FD7F8:: @ 83FD7F8
@@ -23227,8 +23240,10 @@ gUnknown_083FD8F4:: @ 83FD8F4
 gUnknown_083FD93A:: @ 83FD93A
 	.incbin "baserom.gba", 0x003fd93a, 0xe
 
+	.align 2
 gUnknown_083FD948:: @ 83FD948
-	.incbin "baserom.gba", 0x003fd948, 0x8
+	.4byte sub_811D584
+	.4byte sub_811D5E0
 
 	.align 2
 gSpriteImageTable_83FD950:: @ 83FD950
@@ -23301,16 +23316,33 @@ gFieldEffectObjectPalette10:: @ 83FD9F8
 gFieldEffectObjectPaletteInfo10:: @ 83FDA18
 	obj_pal gFieldEffectObjectPalette10, 0x1009
 
+	.align 2
 Unknown_83FDA20:
-	.incbin "baserom.gba", 0x3FDA20, 0x20
+	.incbin "graphics/battle_transitions/sidney_bg.gbapal"
+
+	.align 2
 Unknown_83FDA40:
-	.incbin "baserom.gba", 0x3FDA40, 0x20
+	.incbin "graphics/battle_transitions/phoebe_bg.gbapal"
+
+	.align 2
 Unknown_83FDA60:
-	.incbin "baserom.gba", 0x3FDA60, 0x20
+	.incbin "graphics/battle_transitions/glacia_bg.gbapal"
+
+	.align 2
 Unknown_83FDA80:
-	.incbin "baserom.gba", 0x3FDA80, 0x20
+	.incbin "graphics/battle_transitions/drake_bg.gbapal"
+
+	.align 2
 Unknown_83FDAA0:
-	.incbin "baserom.gba", 0x3FDAA0, 0x60
+	.incbin "graphics/battle_transitions/steven_bg.gbapal"
+
+	.align 2
+Unknown_83FDAC0:
+	.incbin "graphics/battle_transitions/brendan_bg.gbapal"
+
+	.align 2
+Unknown_83FDAE0:
+	.incbin "graphics/battle_transitions/may_bg.gbapal"
 
 	.align 2
 gUnknown_083FDB00:: @ 83FDB00
@@ -23320,14 +23352,26 @@ gUnknown_083FDB00:: @ 83FDB00
 	.4byte Unknown_83FDA80
 	.4byte Unknown_83FDAA0
 
+	.align 2
 gUnknown_083FDB14:: @ 83FDB14
-	.incbin "baserom.gba", 0x003fdb14, 0x30
+	.4byte Unknown_83FDAC0
+	.4byte Unknown_83FDAE0
+
+	.align 2
+UnusedTrainerPalette:
+	.incbin "graphics/battle_transitions/unused_trainer.gbapal"
 
+	.align 2
+gSpritePalette_UnusedTrainer:: @ 83FDB3C
+	obj_pal UnusedTrainerPalette, 0x100A
+
+	.align 2
 gUnknown_083FDB44:: @ 83FDB44
-	.incbin "baserom.gba", 0x003fdb44, 0x4b0
+	.incbin "graphics/battle_transitions/big_pokeball_map.bin"
 
+	.align 2
 gUnknown_083FDFF4:: @ 83FDFF4
-	.incbin "baserom.gba", 0x003fdff4, 0x500
+	.incbin "graphics/battle_transitions/elite_four_bg_map.bin"
 
 	.include "data/text/battle_strings.s"
 
diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s
index fa1db6e54..61d2f2a8a 100644
--- a/data/field_effect_scripts.s
+++ b/data/field_effect_scripts.s
@@ -45,7 +45,7 @@ gFieldEffectScriptPointers:: @ 81D9B34
 	.4byte gFieldEffectScript_HotSpringsWater
 	.4byte gFieldEffectScript_Unknown43
 	.4byte gFieldEffectScript_Unknown44
-	.4byte gFieldEffectScript_Unknown45
+	.4byte gFieldEffectScript_Pokeball
 	.4byte gFieldEffectScript_HeartIcon
 	.4byte gFieldEffectScript_Unknown47
 	.4byte gFieldEffectScript_Unknown48
@@ -246,7 +246,7 @@ gFieldEffectScript_Unknown44: @ 81D9D99
 	field_eff_callnative sub_80870B0
 	field_eff_end
 
-gFieldEffectScript_Unknown45: @ 81D9D9F
+gFieldEffectScript_Pokeball: @ 81D9D9F
 	field_eff_loadpal gFieldEffectObjectPaletteInfo10
 	field_eff_callnative sub_811B6B4
 	field_eff_end
diff --git a/graphics/battle_transitions/big_pokeball.png b/graphics/battle_transitions/big_pokeball.png
new file mode 100644
index 000000000..21b227441
--- /dev/null
+++ b/graphics/battle_transitions/big_pokeball.png
diff --git a/graphics/battle_transitions/big_pokeball_map.bin b/graphics/battle_transitions/big_pokeball_map.bin
new file mode 100644
index 000000000..691e16ef7
--- /dev/null
+++ b/graphics/battle_transitions/big_pokeball_map.bin
diff --git a/graphics/battle_transitions/brendan_bg.pal b/graphics/battle_transitions/brendan_bg.pal
new file mode 100644
index 000000000..e43b0f74c
--- /dev/null
+++ b/graphics/battle_transitions/brendan_bg.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 180 213
+123 197 230
+139 213 246
+156 230 255
+172 246 255
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/battle_transitions/drake_bg.pal b/graphics/battle_transitions/drake_bg.pal
new file mode 100644
index 000000000..6717a90bd
--- /dev/null
+++ b/graphics/battle_transitions/drake_bg.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 49 49
+115 115 115
+148 148 148
+180 180 180
+213 213 213
+0 0 131
+16 16 148
+32 32 164
+49 49 180
+65 65 197
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/battle_transitions/elite_four_bg.png b/graphics/battle_transitions/elite_four_bg.png
new file mode 100644
index 000000000..1d327cdaf
--- /dev/null
+++ b/graphics/battle_transitions/elite_four_bg.png
diff --git a/graphics/battle_transitions/elite_four_bg_map.bin b/graphics/battle_transitions/elite_four_bg_map.bin
new file mode 100644
index 000000000..4f170b470
--- /dev/null
+++ b/graphics/battle_transitions/elite_four_bg_map.bin
diff --git a/graphics/battle_transitions/glacia_bg.pal b/graphics/battle_transitions/glacia_bg.pal
new file mode 100644
index 000000000..4aac79fec
--- /dev/null
+++ b/graphics/battle_transitions/glacia_bg.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 49 49
+115 115 115
+148 148 148
+180 180 180
+213 213 213
+255 82 172
+255 98 189
+255 115 205
+255 131 222
+255 148 238
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/battle_transitions/may_bg.pal b/graphics/battle_transitions/may_bg.pal
new file mode 100644
index 000000000..8ebd38309
--- /dev/null
+++ b/graphics/battle_transitions/may_bg.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+230 123 139
+246 139 156
+255 156 172
+255 172 189
+255 189 205
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/battle_transitions/phoebe_bg.pal b/graphics/battle_transitions/phoebe_bg.pal
new file mode 100644
index 000000000..b55e6a6cd
--- /dev/null
+++ b/graphics/battle_transitions/phoebe_bg.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 49 49
+115 115 115
+148 148 148
+180 180 180
+213 213 213
+8 213 8
+32 238 32
+49 246 49
+74 255 74
+123 255 123
+230 123 139
+246 139 156
+255 156 172
+255 172 189
+255 189 205
+230 123 139
diff --git a/graphics/battle_transitions/pokeball.png b/graphics/battle_transitions/pokeball.png
new file mode 100644
index 000000000..3802a915b
--- /dev/null
+++ b/graphics/battle_transitions/pokeball.png
diff --git a/graphics/battle_transitions/pokeball_trail.png b/graphics/battle_transitions/pokeball_trail.png
new file mode 100644
index 000000000..ff2a75ee4
--- /dev/null
+++ b/graphics/battle_transitions/pokeball_trail.png
diff --git a/graphics/battle_transitions/shrinking_box.png b/graphics/battle_transitions/shrinking_box.png
new file mode 100644
index 000000000..cde6f2107
--- /dev/null
+++ b/graphics/battle_transitions/shrinking_box.png
diff --git a/graphics/battle_transitions/sidney_bg.pal b/graphics/battle_transitions/sidney_bg.pal
new file mode 100644
index 000000000..1f30ed062
--- /dev/null
+++ b/graphics/battle_transitions/sidney_bg.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 49 49
+115 115 115
+148 148 148
+180 180 180
+213 213 213
+189 0 189
+205 16 205
+222 32 222
+238 49 238
+255 65 255
+106 180 213
+123 197 230
+139 213 246
+156 230 255
+172 246 255
+255 255 255
diff --git a/graphics/battle_transitions/steven_bg.pal b/graphics/battle_transitions/steven_bg.pal
new file mode 100644
index 000000000..30da9c5f9
--- /dev/null
+++ b/graphics/battle_transitions/steven_bg.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+172 49 49
+115 115 115
+148 148 148
+180 180 180
+213 213 213
+197 197 65
+213 213 82
+230 230 98
+246 246 115
+255 255 131
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/battle_transitions/unused_brendan.png b/graphics/battle_transitions/unused_brendan.png
new file mode 100644
index 000000000..926ba0ff7
--- /dev/null
+++ b/graphics/battle_transitions/unused_brendan.png
diff --git a/graphics/battle_transitions/unused_lass.png b/graphics/battle_transitions/unused_lass.png
new file mode 100644
index 000000000..378fa3c19
--- /dev/null
+++ b/graphics/battle_transitions/unused_lass.png
diff --git a/graphics/battle_transitions/unused_trainer.pal b/graphics/battle_transitions/unused_trainer.pal
new file mode 100644
index 000000000..ad94d728a
--- /dev/null
+++ b/graphics/battle_transitions/unused_trainer.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+255 222 205
+222 164 148
+205 131 115
+123 90 82
+57 74 123
+41 57 98
+24 41 82
+16 32 57
+222 230 238
+255 197 90
+189 156 90
+255 98 90
+197 65 65
+255 255 255
+0 0 0
diff --git a/graphics/unknown_sprites/83FC148.png b/graphics/unknown_sprites/83FC148.png
deleted file mode 100644
index 162b35f8b..000000000
--- a/graphics/unknown_sprites/83FC148.png
+++ /dev/null
diff --git a/graphics/unknown_sprites/83FC528.png b/graphics/unknown_sprites/83FC528.png
deleted file mode 100644
index c8756ec16..000000000
--- a/graphics/unknown_sprites/83FC528.png
+++ /dev/null
diff --git a/graphics/unknown_sprites/83FCD28.png b/graphics/unknown_sprites/83FCD28.png
deleted file mode 100644
index ce3e2aae9..000000000
--- a/graphics/unknown_sprites/83FCD28.png
+++ /dev/null