more misc gfx work and dump pokedex menu gfx

19 files changed, 318 insertions, 60 deletions

diff --git a/asm/rom5.s b/asm/rom5.s
index feb8c8ef7..56b7f4ee4 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -37871,7 +37871,7 @@ _0808D400: .4byte 0x0202ffb4
 _0808D404: .4byte 0x0000064a
 _0808D408: .4byte REG_BG2VOFS
 _0808D40C: .4byte 0x0000062d
-_0808D410: .4byte gUnknown_08E86758
+_0808D410: .4byte gPokedexMenu_Gfx
 _0808D414: .4byte gUnknown_08E96738
 _0808D418: .4byte 0x06006800
 _0808D41C: .4byte gUnknown_08E9C6DC
@@ -38137,7 +38137,7 @@ _0808D66E:
 	bl LoadPalette
 	b _0808D686
 	.align 2, 0
-_0808D678: .4byte gUnknown_08E87AF6
+_0808D678: .4byte gPokedexMenu_Pal + 0x2
 _0808D67C:
 	ldr r0, _0808D68C
 	movs r1, 0x1
@@ -41844,7 +41844,7 @@ _0808F38C:
 	adds r1, r3
 	b _0808F682
 	.align 2, 0
-_0808F3B8: .4byte gUnknown_08E86758
+_0808F3B8: .4byte gPokedexMenu_Gfx
 _0808F3BC: .4byte gUnknown_08E96BD4
 _0808F3C0: .4byte 0x06007800
 _0808F3C4: .4byte 0x0202ffbc
@@ -42742,7 +42742,7 @@ _0808FB28:
 	adds r1, r3
 	b _0808FDA0
 	.align 2, 0
-_0808FB44: .4byte gUnknown_08E86758
+_0808FB44: .4byte gPokedexMenu_Gfx
 _0808FB48: .4byte gUnknown_0839F8A0
 _0808FB4C: .4byte 0x06007000
 _0808FB50: .4byte 0x03001770
@@ -43422,7 +43422,7 @@ _08090120:
 	adds r1, r2
 	b _08090368
 	.align 2, 0
-_0809013C: .4byte gUnknown_08E86758
+_0809013C: .4byte gPokedexMenu_Gfx
 _08090140: .4byte gUnknown_0839F988
 _08090144: .4byte 0x06007000
 _08090148: .4byte 0x03001770
@@ -44278,13 +44278,13 @@ _08090800:
 	strh r0, [r4, 0x8]
 	b _08090A26
 	.align 2, 0
-_08090840: .4byte gUnknown_08E86758
+_08090840: .4byte gPokedexMenu_Gfx
 _08090844: .4byte 0x06004000
 _08090848: .4byte gUnknown_08E96BD4
 _0809084C: .4byte 0x06007800
 _08090850: .4byte 0x0000027f
 _08090854: .4byte 0x03004b20
-_08090858: .4byte gUnknown_08E87AF6
+_08090858: .4byte gPokedexMenu_Pal + 0x2
 _0809085C:
 	ldr r4, _0809088C
 	adds r0, r4, 0
@@ -44637,7 +44637,7 @@ _08090B44:
 	b _08090B7A
 	.align 2, 0
 _08090B68: .4byte 0x03004b20
-_08090B6C: .4byte gUnknown_08E87AF6
+_08090B6C: .4byte gPokedexMenu_Pal + 0x2
 _08090B70:
 	ldr r0, _08090B88
 	movs r1, 0x51
@@ -44651,7 +44651,7 @@ _08090B7A:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08090B88: .4byte gUnknown_08E87B56
+_08090B88: .4byte gPokedexMenu2_Pal + 0x2
 	thumb_func_end sub_8090A3C
 
 	thumb_func_start sub_8090B8C
@@ -47220,10 +47220,10 @@ _08091F10:
 _08091F1C: .4byte 0x0202f388
 _08091F20: .4byte 0x0202ffb4
 _08091F24: .4byte 0x0000064a
-_08091F28: .4byte gUnknown_08E87DB0
+_08091F28: .4byte gPokedexMenuSearch_Gfx
 _08091F2C: .4byte gUnknown_08E96D2C
 _08091F30: .4byte 0x06007800
-_08091F34: .4byte gUnknown_08E882D8 + 0x2
+_08091F34: .4byte gPokedexMenuSearch_Pal + 0x2
 _08091F38: .4byte 0x06007a80
 _08091F3C: .4byte 0x06007b00
 _08091F40: .4byte 0x06007ac0
@@ -123913,7 +123913,7 @@ sub_80B7568: @ 80B7568
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080B759C: .4byte gUnknown_08E85998
+_080B759C: .4byte gNamingScreenMenu_Gfx
 _080B75A0: .4byte 0x0202e9d4
 _080B75A4: .4byte 0x040000d4
 _080B75A8: .4byte 0x80000400
@@ -345641,8 +345641,8 @@ _08123464: .4byte gUnknown_08401978
 _08123468: .4byte gUnknown_08401AFC
 _0812346C: .4byte gUnknown_08401CD4
 _08123470: .4byte 0x000009d8
-_08123474: .4byte gUnknown_08E7EB9C
-_08123478: .4byte gUnknown_08E7EC3C
+_08123474: .4byte gCableCarBG_Pal
+_08123478: .4byte gCableCarBG_Gfx
 _0812347C: .4byte 0x03001770
 _08123480: .4byte 0x0000043c
 _08123484:
@@ -417285,7 +417285,7 @@ _081462FC:
 	bl LZDecompressVram
 	b _081463CA
 	.align 2, 0
-_08146308: .4byte gUnknown_08E783FC
+_08146308: .4byte gBerryCheck_Gfx
 _0814630C:
 	ldr r0, _0814631C
 	ldr r1, _08146320
@@ -417364,7 +417364,7 @@ _081463A4:
 	adds r1, r2
 	b _081463D0
 	.align 2, 0
-_081463B8: .4byte gUnknown_08E7883C
+_081463B8: .4byte gBerryCheck_Pal
 _081463BC: .4byte 0x02000000
 _081463C0: .4byte 0x0001ffff
 _081463C4:
diff --git a/data/data2.s b/data/data2.s
index 6a7ff7668..88a7b26e4 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -11831,12 +11831,12 @@ gSpriteTemplate_83A05B4:: @ 83A05B4
 
 	.align 2
 gUnknown_083A05CC:: @ 83A05CC
-	obj_tiles gUnknown_08E874C8, 0x1F00, 0x1000
+	obj_tiles gPokedexMenu2_Gfx, 0x1F00, 0x1000
 	null_obj_tiles
 
 	.align 2
 gUnknown_083A05DC:: @ 83A05DC
-	obj_pal gUnknown_08E87AF4, 0x1000
+	obj_pal gPokedexMenu_Pal, 0x1000
 	null_obj_pal
 
 gUnknown_083A05EC:: @ 83A05EC
@@ -13615,11 +13615,11 @@ gSpriteTemplate_83C1E04:: @ 83C1E04
 
 	.align 2
 gUnknown_083C1F74:: @ 83C1F74
-	obj_tiles gUnknown_08E78BB4, 2048, 0x2710
+	obj_tiles gBerryCheckCircle_Gfx, 2048, 0x2710
 
 	.align 2
 gUnknown_083C1F7C:: @ 83C1F7C
-	obj_pal gUnknown_08E7883C, 0x2710
+	obj_pal gBerryCheck_Pal, 0x2710
 
 	.align 2
 gOamData_83C1F84:: @ 83C1F84
@@ -25559,14 +25559,14 @@ gUnknown_08401CD4:: @ 8401CD4
 
 	.align 2
 gUnknown_08401CF8:: @ 8401CF8
-	obj_tiles gUnknown_08E80614, 0x800, 1
-	obj_tiles gUnknown_08E80914, 0x40, 2
-	obj_tiles gUnknown_08E80944, 0x80, 3
+	obj_tiles gCableCar_Gfx, 0x800, 1
+	obj_tiles gCableCarDoor_Gfx, 0x40, 2
+	obj_tiles gCableCarCord_Gfx, 0x80, 3
 	.space 8
 
 	.align 2
 gUnknown_08401D18:: @ 8401D18
-	obj_pal Palette_08E7EC1C, 1
+	obj_pal gCableCar_Pal, 1
 	.space 8
 
 	.align 2
diff --git a/data/graphics.s b/data/graphics.s
index ea3b654aa..7c9e16275 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -3326,12 +3326,12 @@ gUnknown_08E782FC:: @ 8E782FC
 	.incbin "baserom.gba", 0xE782FC, 0x100 @ LZ, uncomp. size = 0x800
 
 	.align 2
-gUnknown_08E783FC:: @ 8E783FC
-	.incbin "baserom.gba", 0xE783FC, 0x43E @ LZ, uncomp. size = 0xC00
+gBerryCheck_Gfx:: @ 8E783FC
+	.incbin "graphics/interface/check_berry.4bpp.lz"
 
 	.align 2
-gUnknown_08E7883C:: @ 8E7883C
-	.incbin "graphics/battle_transitions/vs.gbapal.lz"
+gBerryCheck_Pal:: @ 8E7883C
+	.incbin "graphics/interface/check_berry.gbapal.lz"
 
 	.align 2
 gUnknown_08E788E4:: @ 8E788E4
@@ -3342,8 +3342,8 @@ gUnknown_08E78A84:: @ 8E78A84
 	.incbin "baserom.gba", 0xE78A84, 0x12D @ LZ, uncomp. size = 0x800
 
 	.align 2
-gUnknown_08E78BB4:: @ 8E78BB4
-	.incbin "baserom.gba", 0xE78BB4, 0x14C @ LZ, uncomp. size = 0x800
+gBerryCheckCircle_Gfx:: @ 8E78BB4
+	.incbin "graphics/interface/check_berry_circle.4bpp.lz"
 
 @ 8E78D00
 	.include "data/graphics/berries/graphics.s"
@@ -3372,27 +3372,29 @@ gBattleAnimSpritePalette_271:: @ 8E7EB24
 gBattleAnimSpriteSheet_271:: @ 8E7EB3C
 	.incbin "graphics/battle_anims/sprites/271.4bpp.lz"
 
-gUnknown_08E7EB9C:: @ 8E7EB9C
-	.incbin "baserom.gba", 0xe7eb9c, 0x80
+	.align 2
+gCableCarBG_Pal:: @ 8E7EB9C
+	.incbin "graphics/misc/cable_car_bg.gbapal"
 
-Palette_08E7EC1C:: @ 8E7EC1C
-	.incbin "baserom.gba", 0xe7ec1c, 0x20
+	.align 2
+gCableCar_Pal:: @ 8E7EC1C
+	.incbin "graphics/misc/cable_car.gbapal"
 
 	.align 2
-gUnknown_08E7EC3C:: @ 8E7EC3C
-	.incbin "baserom.gba", 0xE7EC3C, 0x19D6 @ LZ, uncomp. size = 0x4000
+gCableCarBG_Gfx:: @ 8E7EC3C
+	.incbin "graphics/misc/cable_car_bg.4bpp.lz"
 
 	.align 2
-gUnknown_08E80614:: @ 8E80614
-	.incbin "baserom.gba", 0xE80614, 0x2FF @ LZ, uncomp. size = 0x800
+gCableCar_Gfx:: @ 8E80614
+	.incbin "graphics/misc/cable_car.4bpp.lz"
 
 	.align 2
-gUnknown_08E80914:: @ 8E80914
-	.incbin "baserom.gba", 0xE80914, 0x30 @ LZ, uncomp. size = 0x40
+gCableCarDoor_Gfx:: @ 8E80914
+	.incbin "graphics/misc/cable_car_door.4bpp.lz"
 
 	.align 2
-gUnknown_08E80944:: @ 8E80944
-	.incbin "baserom.gba", 0xE80944, 0x28 @ LZ, uncomp. size = 0x80
+gCableCarCord_Gfx:: @ 8E80944
+	.incbin "graphics/misc/cable_car_cord.4bpp.lz"
 
 	.align 2
 gUnknown_08E8096C:: @ 8E8096C
@@ -3616,10 +3618,11 @@ gNamingScreenLowerTextTiles:: @ 8E85778
 gNamingScreenUpperTextTiles:: @ 8E857D8
 	.incbin "graphics/naming_screen/upper_text.4bpp"
 
-	.incbin "baserom.gba", 0x00e85838, 0x160
+	.space 352
 
-gUnknown_08E85998:: @ 8E85998
-	.incbin "baserom.gba", 0x00e85998, 0x800
+	.align 2
+gNamingScreenMenu_Gfx:: @ 8E85998
+	.incbin "graphics/naming_screen/menu.4bpp"
 
 	.align 2
 gNamingScreenPalettes:: @ 8E86198
@@ -3634,22 +3637,20 @@ gUnknown_08E86258:: @ 8E86258
 	.incbin "baserom.gba", 0x00e86258, 0x500
 
 	.align 2
-gUnknown_08E86758:: @ 8E86758
-	.incbin "baserom.gba", 0xE86758, 0xD6E @ LZ, uncomp. size = 0x3000
+gPokedexMenu_Gfx:: @ 8E86758
+	.incbin "graphics/pokedex/menu.4bpp.lz"
 
 	.align 2
-gUnknown_08E874C8::
-	.incbin "baserom.gba", 0xE874C8, 0x62C @ LZ, uncomp. size = 0x1F00
+gPokedexMenu2_Gfx:: @ E874C8
+	.incbin "graphics/pokedex/menu2.4bpp.lz"
 
 	.align 2
-gUnknown_08E87AF4::
-	.incbin "baserom.gba", 0x00e87af4, 0x2
-
-gUnknown_08E87AF6:: @ 8E87AF6
-	.incbin "baserom.gba", 0x00e87af6, 0x60
+gPokedexMenu_Pal:: @ E87AF4
+	.incbin "graphics/pokedex/menu1.gbapal"
 
-gUnknown_08E87B56:: @ 8E87B56
-	.incbin "baserom.gba", 0x00e87b56, 0x5e
+	.align 2
+gPokedexMenu2_Pal:: @ E87B54
+	.incbin "graphics/pokedex/menu2.gbapal"
 
 	.align 2
 gAreaUnknownTiles:: @ 8E87BB4
@@ -3660,12 +3661,12 @@ gAreaUnknownPalette:: @ 8E87D90
 	.incbin "graphics/pokedex/area_unknown.gbapal"
 
 	.align 2
-gUnknown_08E87DB0:: @ 8E87DB0
-	.incbin "baserom.gba", 0xE87DB0, 0x528 @ LZ, uncomp. size = 0x1000
+gPokedexMenuSearch_Gfx:: @ 8E87DB0
+	.incbin "graphics/pokedex/menu_search.4bpp.lz"
 
 	.align 2
-gUnknown_08E882D8:: @ 8E882D8
-	.incbin "baserom.gba", 0x00e882d8, 0x80
+gPokedexMenuSearch_Pal:: @ 8E882D8
+	.incbin "graphics/pokedex/menu3.gbapal"
 
 	.align 2
 gUnknown_08E88358:: @ 8E88358
@@ -3679,9 +3680,11 @@ gUnknown_08E884CC:: @ 8E884CC
 gUnknown_08E88A28:: @ 8E88A28
 	.incbin "baserom.gba", 0x00e88a28, 0x20
 
+	.align 2
 gUnknown_08E88A48:: @ 8E88A48
 	.incbin "baserom.gba", 0xe88a48, 0x20
 
+	.align 2
 Palette_E88A68:: @ 8E88A68
 	.incbin "baserom.gba", 0xe88a68, 0x20
 
diff --git a/graphics/battle_transitions/vs.pal b/graphics/interface/check_berry.pal
index f4f6cb4e3..f4f6cb4e3 100755
--- a/graphics/battle_transitions/vs.pal
+++ b/graphics/interface/check_berry.pal
diff --git a/graphics/interface/check_berry.png b/graphics/interface/check_berry.png
new file mode 100755
index 000000000..8a4ea695a
--- /dev/null
+++ b/graphics/interface/check_berry.png
diff --git a/graphics/interface/check_berry_circle.png b/graphics/interface/check_berry_circle.png
new file mode 100755
index 000000000..38f2ae26b
--- /dev/null
+++ b/graphics/interface/check_berry_circle.png
diff --git a/graphics/misc/cable_car.pal b/graphics/misc/cable_car.pal
new file mode 100755
index 000000000..64985f6da
--- /dev/null
+++ b/graphics/misc/cable_car.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+164 222 222
+98 139 139
+139 180 180
+131 131 139
+98 98 123
+65 74 106
+41 49 90
+139 205 246
+98 172 238
+255 255 148
+238 213 82
+213 172 16
+180 106 0
+139 65 0
diff --git a/graphics/misc/cable_car.png b/graphics/misc/cable_car.png
new file mode 100755
index 000000000..67f581fb9
--- /dev/null
+++ b/graphics/misc/cable_car.png
diff --git a/graphics/misc/cable_car_bg.pal b/graphics/misc/cable_car_bg.pal
new file mode 100755
index 000000000..d543b4cce
--- /dev/null
+++ b/graphics/misc/cable_car_bg.pal
@@ -0,0 +1,67 @@
+JASC-PAL
+0100
+64
+0 0 0
+230 106 189
+230 106 189
+230 106 189
+230 106 189
+230 106 189
+230 106 189
+255 230 139
+238 205 123
+222 189 115
+205 172 106
+189 156 98
+180 139 90
+230 106 189
+230 106 189
+230 106 189
+0 0 0
+189 255 148
+156 222 98
+131 197 74
+106 164 49
+82 115 24
+57 82 0
+230 106 189
+230 106 189
+230 106 189
+230 106 189
+230 106 189
+230 106 189
+230 106 189
+230 106 189
+230 106 189
+0 0 0
+213 238 255
+189 230 255
+164 222 255
+139 213 255
+115 205 255
+98 205 255
+197 205 222
+189 189 197
+180 164 164
+156 131 131
+131 90 90
+123 65 65
+230 106 189
+230 106 189
+230 106 189
+0 0 0
+197 205 246
+172 189 238
+156 172 238
+131 156 230
+115 139 230
+98 123 230
+65 74 106
+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/misc/cable_car_bg.png b/graphics/misc/cable_car_bg.png
new file mode 100755
index 000000000..f268ea990
--- /dev/null
+++ b/graphics/misc/cable_car_bg.png
diff --git a/graphics/misc/cable_car_cord.png b/graphics/misc/cable_car_cord.png
new file mode 100755
index 000000000..b8176d3ca
--- /dev/null
+++ b/graphics/misc/cable_car_cord.png
diff --git a/graphics/misc/cable_car_door.png b/graphics/misc/cable_car_door.png
new file mode 100755
index 000000000..a61b3f504
--- /dev/null
+++ b/graphics/misc/cable_car_door.png
diff --git a/graphics/naming_screen/menu.png b/graphics/naming_screen/menu.png
new file mode 100755
index 000000000..aae121e3e
--- /dev/null
+++ b/graphics/naming_screen/menu.png
diff --git a/graphics/pokedex/menu.png b/graphics/pokedex/menu.png
new file mode 100755
index 000000000..dd8ab63a7
--- /dev/null
+++ b/graphics/pokedex/menu.png
diff --git a/graphics/pokedex/menu1.pal b/graphics/pokedex/menu1.pal
new file mode 100755
index 000000000..9850d59b0
--- /dev/null
+++ b/graphics/pokedex/menu1.pal
@@ -0,0 +1,51 @@
+JASC-PAL
+0100
+48
+123 131 0
+255 255 255
+222 222 222
+189 189 189
+164 164 164
+98 98 115
+41 57 65
+41 57 106
+0 0 41
+255 255 255
+255 197 90
+255 32 32
+49 82 213
+16 41 172
+189 156 90
+0 0 0
+123 131 0
+255 255 255
+197 32 32
+189 189 189
+164 164 164
+98 98 115
+41 57 65
+41 57 106
+0 0 41
+255 255 255
+255 197 90
+255 32 32
+49 82 213
+16 41 172
+189 156 90
+0 0 0
+123 131 0
+255 255 255
+197 32 32
+189 189 189
+164 164 164
+98 98 115
+41 57 65
+41 57 106
+0 0 41
+255 255 255
+255 197 90
+255 32 32
+156 230 0
+123 172 0
+189 156 90
+0 0 0
diff --git a/graphics/pokedex/menu2.pal b/graphics/pokedex/menu2.pal
new file mode 100755
index 000000000..da71fe5ba
--- /dev/null
+++ b/graphics/pokedex/menu2.pal
@@ -0,0 +1,51 @@
+JASC-PAL
+0100
+48
+123 131 0
+255 255 255
+255 131 255
+255 74 189
+255 16 123
+98 98 115
+41 57 65
+41 57 106
+0 0 41
+255 255 255
+255 197 90
+255 32 32
+49 82 213
+16 41 172
+189 156 90
+0 0 0
+123 131 0
+255 255 255
+197 32 32
+189 189 189
+164 164 164
+98 98 115
+41 57 65
+41 57 106
+0 0 41
+255 255 255
+255 197 90
+189 0 0
+90 164 0
+57 106 0
+189 156 90
+0 0 0
+123 131 0
+255 255 255
+197 32 32
+189 189 189
+164 164 164
+98 98 115
+41 57 65
+41 57 106
+0 0 41
+255 255 255
+255 197 90
+255 32 32
+156 230 0
+123 172 0
+189 156 90
+0 0 0
diff --git a/graphics/pokedex/menu2.png b/graphics/pokedex/menu2.png
new file mode 100755
index 000000000..27de53df0
--- /dev/null
+++ b/graphics/pokedex/menu2.png
diff --git a/graphics/pokedex/menu3.pal b/graphics/pokedex/menu3.pal
new file mode 100755
index 000000000..101b62b41
--- /dev/null
+++ b/graphics/pokedex/menu3.pal
@@ -0,0 +1,67 @@
+JASC-PAL
+0100
+64
+123 131 0
+0 0 0
+0 0 0
+255 255 255
+255 255 255
+98 98 115
+57 57 57
+123 115 74
+156 230 0
+57 115 0
+255 32 32
+131 32 32
+172 156 139
+82 82 57
+255 32 32
+0 0 0
+123 131 0
+0 0 0
+0 0 0
+255 255 255
+255 255 255
+98 98 115
+57 57 57
+123 115 74
+41 115 0
+32 49 32
+139 0 0
+16 0 0
+172 156 139
+82 82 57
+0 0 0
+0 0 0
+123 131 0
+0 0 0
+0 0 0
+172 172 172
+172 172 172
+98 98 115
+57 57 57
+123 115 74
+32 49 32
+32 32 32
+74 32 32
+32 32 32
+172 156 139
+82 82 57
+255 32 32
+0 0 0
+123 131 0
+0 0 0
+0 0 0
+172 172 172
+172 172 172
+98 98 115
+57 57 57
+123 115 74
+32 49 32
+32 32 32
+74 32 32
+32 32 32
+172 156 139
+82 82 57
+0 0 0
+0 0 0
diff --git a/graphics/pokedex/menu_search.png b/graphics/pokedex/menu_search.png
new file mode 100755
index 000000000..d1c4ae466
--- /dev/null
+++ b/graphics/pokedex/menu_search.png