dump type gfx and misc gfx

54 files changed, 338 insertions, 68 deletions

diff --git a/asm/rom4.s b/asm/rom4.s
index 14fe79e77..1cf090b5a 100644
--- a/asm/rom4.s
+++ b/asm/rom4.s
@@ -58703,14 +58703,14 @@ _0806D7BA:
 	bx r1
 	.align 2, 0
 _0806D7C4: .4byte 0x00007fff
-_0806D7C8: .4byte gUnknown_08E71354
-_0806D7CC: .4byte gUnknown_08E71788
+_0806D7C8: .4byte gPartyMenuMisc_Gfx
+_0806D7CC: .4byte gPartyMenuMisc_Tilemap
 _0806D7D0: .4byte 0x06003800
-_0806D7D4: .4byte gUnknown_08E716A0
+_0806D7D4: .4byte gPartyMenuMisc_Pal
 _0806D7D8: .4byte gFontDefaultPalette
-_0806D7DC: .4byte gUnknown_08E71894
+_0806D7DC: .4byte gPartyMenuHpBar_Gfx
 _0806D7E0: .4byte 0x06006000
-_0806D7E4: .4byte gUnknown_08E71934
+_0806D7E4: .4byte gPartyMenuOrderText_Gfx
 _0806D7E8: .4byte 0x06006180
 _0806D7EC: .4byte gStatusGfx_Icons
 _0806D7F0: .4byte 0x06007180
diff --git a/asm/rom5.s b/asm/rom5.s
index f4a7d565a..544d15489 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -71736,7 +71736,7 @@ _0809E010:
 	movs r0, 0x1
 	b _0809E03C
 	.align 2, 0
-_0809E028: .4byte gUnknown_08E726E4
+_0809E028: .4byte gMoveTypes_Pal
 _0809E02C: .4byte 0x02018000
 _0809E030:
 	ldr r1, _0809E040
@@ -111900,7 +111900,7 @@ _080B19BC: .4byte 0x02019204
 _080B19C0: .4byte 0x02020004
 _080B19C4: .4byte 0x06010000
 _080B19C8: .4byte REG_BG0CNT
-_080B19CC: .4byte gUnknown_08E6978C
+_080B19CC: .4byte gContestApplauseMeterGfx
 	thumb_func_end sub_80B1928
 
 	thumb_func_start unref_sub_80B19D0
@@ -112814,14 +112814,14 @@ sub_80B208C: @ 80B208C
 	b _080B20BA
 	.align 2, 0
 _080B20B0: .4byte 0x02019260
-_080B20B4: .4byte gUnknown_08E69478
+_080B20B4: .4byte gContestNextTurnNumbersGfx
 _080B20B8:
 	ldr r0, _080B20C0
 _080B20BA:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_080B20C0: .4byte gUnknown_08E69578
+_080B20C0: .4byte gContestNextTurnRandomGfx
 	thumb_func_end sub_80B208C
 
 	thumb_func_start unref_sub_80B20C4
@@ -179287,7 +179287,7 @@ _080D2448: .4byte 0x030041b4
 _080D244C: .4byte REG_BG1HOFS
 _080D2450: .4byte 0x040000d4
 _080D2454: .4byte 0x85000400
-_080D2458: .4byte gUnknown_08E6E4C8
+_080D2458: .4byte gBattleAnimBackgroundTilemap_ScaryFaceContest
 _080D245C:
 	ldr r0, _080D2478
 	ldrb r0, [r0]
@@ -179303,7 +179303,7 @@ _080D246E:
 	b _080D2488
 	.align 2, 0
 _080D2478: .4byte 0x0202f7c9
-_080D247C: .4byte gUnknown_08E6E100
+_080D247C: .4byte gBattleAnimBackgroundTilemap_ScaryFacePlayer
 _080D2480:
 	ldr r0, _080D24CC
 	ldr r1, [sp, 0x4]
@@ -179341,9 +179341,9 @@ _080D24B6:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080D24CC: .4byte gUnknown_08E6E2E4
-_080D24D0: .4byte gScaryFaceGfx
-_080D24D4: .4byte gScaryFacePal
+_080D24CC: .4byte gBattleAnimBackgroundTilemap_ScaryFaceOpponent
+_080D24D0: .4byte gBattleAnimBackgroundImage_ScaryFace
+_080D24D4: .4byte gBattleAnimBackgroundPalette_ScaryFace
 _080D24D8: .4byte 0x03004b20
 _080D24DC: .4byte sub_80D24E0
 	thumb_func_end sub_80D23B4
@@ -182092,9 +182092,9 @@ _080D39CE:
 	b _080D3A0E
 	.align 2, 0
 _080D39F0: .4byte gUnknown_08E70F0C
-_080D39F4: .4byte gUnknown_08E6F620
+_080D39F4: .4byte gBattleAnimBackgroundImage_Surf
 _080D39F8: .4byte 0x03004b00
-_080D39FC: .4byte gUnknown_08E70940
+_080D39FC: .4byte gBattleAnimBackgroundPalette_Surf
 _080D3A00:
 	ldr r0, _080D3A78
 	mov r1, sp
@@ -191440,7 +191440,7 @@ _080D81C0: .4byte 0x040000d4
 _080D81C4: .4byte 0x85000400
 _080D81C8: .4byte gWeatherFog1Tiles
 _080D81CC: .4byte 0x80000400
-_080D81D0: .4byte gUnknown_08E6DE48
+_080D81D0: .4byte gWeatherFog1Tilemap
 _080D81D4: .4byte gUnknown_083970E8
 _080D81D8: .4byte 0x03004b20
 _080D81DC: .4byte sub_80D81E0
@@ -191834,7 +191834,7 @@ _080D84F8: .4byte 0x040000d4
 _080D84FC: .4byte 0x85000400
 _080D8500: .4byte gWeatherFog1Tiles
 _080D8504: .4byte 0x80000400
-_080D8508: .4byte gUnknown_08E6DE48
+_080D8508: .4byte gWeatherFog1Tilemap
 _080D850C: .4byte gUnknown_083970E8
 _080D8510: .4byte 0x03004b20
 _080D8514: .4byte 0x0000ffff
diff --git a/data/data2.s b/data/data2.s
index 15eee397c..4d1123f7a 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -1606,7 +1606,7 @@ gSpriteTemplate_81FAF0C:: @ 81FAF0C
 
 	.align 2
 gUnknown_081FAF24:: @ 81FAF24
-	obj_tiles gUnknown_08E6A728, 128, 0xD759
+	obj_tiles gEnemyMonShadow_Gfx, 128, 0xD759
 
 	.align 2
 gOamData_81FAF2C:: @ 81FAF2C
@@ -2220,8 +2220,8 @@ gSubspriteTables_820A6EC:: @ 820A6EC
 
 	.align 2
 gUnknown_0820A754:: @ 820A754
-	obj_tiles gUnknown_08E6A758, 512, 0xd70c
-	obj_tiles gUnknown_08E6A758, 512, 0xd70d
+	obj_tiles gBattleGfx_BallStatus, 512, 0xd70c
+	obj_tiles gBattleGfx_BallStatus, 512, 0xd70d
 
 	.align 2
 gUnknown_0820A764:: @ 820A764
@@ -12978,7 +12978,7 @@ gSpriteAnimTable_83C115C:: @ 83C115C
 
 	.align 2
 gUnknown_083C11B8:: @ 83C11B8
-	obj_tiles gUnknown_08E71D10, 5888, 0x7532
+	obj_tiles gMoveTypes_Gfx, 5888, 0x7532
 
 	.align 2
 gSpriteTemplate_83C11C0:: @ 83C11C0
diff --git a/data/graphics.s b/data/graphics.s
index 2882de62e..73bee4057 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -998,7 +998,7 @@ gBattleAnimSpriteSheet_115:: @ 8D11B74
 
 	.align 2
 gUnknown_08D1212C::
-	.incbin "graphics/interface/battle_window.gbapal"
+	.incbin "graphics/battle_interface/window.gbapal"
 
 	.align 2
 gUnknown_08D1214C::
@@ -1691,23 +1691,23 @@ gBattleAnimSpritePalette_186:: @ 8D1F508
 
 	.align 2
 gBattleWindowLargeGfx::
-	.incbin "graphics/interface/battle_window.4bpp.lz"
+	.incbin "graphics/battle_interface/window.4bpp.lz"
 
 	.align 2
 gBattleWindowSmallGfx::
-	.incbin "graphics/interface/battle_window2.4bpp.lz"
+	.incbin "graphics/battle_interface/window2.4bpp.lz"
 
 	.align 2
 gBattleWindowSmall2Gfx::
-	.incbin "graphics/interface/battle_window3.4bpp.lz"
+	.incbin "graphics/battle_interface/window3.4bpp.lz"
 
 	.align 2
 gBattleWindowSmall3Gfx::
-	.incbin "graphics/interface/battle_window4.4bpp.lz"
+	.incbin "graphics/battle_interface/window4.4bpp.lz"
 
 	.align 2
-gBattleWindowLarge2Gfx:: @ 8d1fc94
-	.incbin "graphics/interface/battle_window5.4bpp.lz"
+gBattleWindowLarge2Gfx::
+	.incbin "graphics/battle_interface/window5.4bpp.lz"
 
 	.align 2
 	.incbin "graphics/unused/shadow.4bpp.lz"
@@ -1976,11 +1976,11 @@ gBattleAnimSpritePalette_215:: @ 8D24D58
 	.incbin "graphics/battle_anims/sprites/215.gbapal.lz"
 
 	.align 2
-gScaryFacePal:: @ 8D24D7C
+gBattleAnimBackgroundPalette_ScaryFace:: @ 8D24D7C
 	.incbin "graphics/battle_anims/backgrounds/scary_face.gbapal.lz"
 
 	.align 2
-gScaryFaceGfx:: @ 8D24DA4
+gBattleAnimBackgroundImage_ScaryFace:: @ 8D24DA4
 	.incbin "graphics/battle_anims/backgrounds/scary_face.4bpp.lz"
 
 	.align 2
@@ -2830,12 +2830,12 @@ gContestNextTurnGfx::
 	.incbin "graphics/contest/nextturn.4bpp.lz"
 
 	.align 2
-gUnknown_08E69478:: @ 8E69478
-	.incbin "baserom.gba", 0x00e69478, 0x100
+gContestNextTurnNumbersGfx:: @ 8E69478
+	.incbin "graphics/contest/nextturn_numbers.4bpp"
 
 	.align 2
-gUnknown_08E69578:: @ 8E69578
-	.incbin "baserom.gba", 0x00e69578, 0x40
+gContestNextTurnRandomGfx:: @ 8E69578
+	.incbin "graphics/contest/nextturn_random.4bpp"
 
 	.align 2
 gBattleAnimSpriteSheet_264:: @ 8E695B8
@@ -2859,10 +2859,11 @@ gBattleAnimSpritePalette_068:: @ 8E69628
 
 	.align 2
 gContestApplauseGfx::
-	.incbin "graphics/misc/applause.4bpp.lz"
+	.incbin "graphics/contest/applause.4bpp.lz"
 
-gUnknown_08E6978C:: @ 8E6978C
-	.incbin "baserom.gba", 0x00e6978c, 0x80
+	.align 2
+gContestApplauseMeterGfx:: @ 8E6978C
+	.incbin "graphics/contest/applause_meter.4bpp"
 
 	.align 2
 gContestPal::
@@ -2929,12 +2930,12 @@ gUnknown_08E6A704:: @ 8E6A704
 	.incbin "baserom.gba", 0xE6A704, 0x24 @ LZ, uncomp. size = 0x20
 
 	.align 2
-gUnknown_08E6A728:: @ 8E6A728
-	.incbin "baserom.gba", 0xE6A728, 0x2E @ LZ, uncomp. size = 0x80
+gEnemyMonShadow_Gfx:: @ 8E6A728
+	.incbin "graphics/battle_interface/enemy_mon_shadow.4bpp.lz"
 
 	.align 2
-gUnknown_08E6A758:: @ 8E6A758
-	.incbin "baserom.gba", 0xE6A758, 0x81 @ LZ, uncomp. size = 0x200
+gBattleGfx_BallStatus:: @ 8E6A758
+	.incbin "graphics/battle_interface/bar.4bpp.lz"
 
 	.align 2
 gMonIcon_Egg:: @ 8E6A7DC
@@ -2996,8 +2997,8 @@ gBattleAnimSpriteSheet_277:: @ 8E6DA54
 	.incbin "graphics/battle_anims/sprites/277.4bpp.lz"
 
 	.align 2
-gUnknown_08E6DE48:: @ 8E6DE48
-	.incbin "baserom.gba", 0xE6DE48, 0x176 @ LZ, uncomp. size = 0x800
+gWeatherFog1Tilemap:: @ 8E6DE48
+	.incbin "graphics/weather/fog1.bin.lz"
 
 	.align 2
 gBattleAnimSpritePalette_283:: @ 8E6DFC0
@@ -3008,16 +3009,16 @@ gBattleAnimSpriteSheet_283:: @ 8E6DFDC
 	.incbin "graphics/battle_anims/sprites/283.4bpp.lz"
 
 	.align 2
-gUnknown_08E6E100:: @ 8E6E100
-	.incbin "baserom.gba", 0xE6E100, 0x1E4 @ LZ, uncomp. size = 0x800
+gBattleAnimBackgroundTilemap_ScaryFacePlayer:: @ 8E6E100
+	.incbin "graphics/battle_anims/backgrounds/scary_face_player.bin.lz"
 
 	.align 2
-gUnknown_08E6E2E4:: @ 8E6E2E4
-	.incbin "baserom.gba", 0xE6E2E4, 0x1E4 @ LZ, uncomp. size = 0x800
+gBattleAnimBackgroundTilemap_ScaryFaceOpponent:: @ 8E6E2E4
+	.incbin "graphics/battle_anims/backgrounds/scary_face_opponent.bin.lz"
 
 	.align 2
-gUnknown_08E6E4C8:: @ 8E6E4C8
-	.incbin "baserom.gba", 0xE6E4C8, 0x1E2 @ LZ, uncomp. size = 0x800
+gBattleAnimBackgroundTilemap_ScaryFaceContest:: @ 8E6E4C8
+	.incbin "graphics/battle_anims/backgrounds/scary_face_contest.bin.lz"
 
 	.align 2
 gBattleAnimSpriteSheet_263:: @ 8E6E6AC
@@ -3096,12 +3097,12 @@ gBattleAnimSpritePalette_285:: @ 8E6F5F8
 	.incbin "graphics/battle_anims/sprites/285.gbapal.lz"
 
 	.align 2
-gUnknown_08E6F620:: @ 8E6F620
-	.incbin "baserom.gba", 0xE6F620, 0x131D @ LZ, uncomp. size = 0x2000
+gBattleAnimBackgroundImage_Surf:: @ 8E6F620
+	.incbin "graphics/battle_anims/backgrounds/water.4bpp.lz"
 
 	.align 2
-gUnknown_08E70940:: @ 8E70940
-	.incbin "baserom.gba", 0xE70940, 0x25 @ LZ, uncomp. size = 0x20
+gBattleAnimBackgroundPalette_Surf:: @ 8E70940
+	.incbin "graphics/battle_anims/backgrounds/water.gbapal.lz"
 
 	.align 2
 gUnknown_08E70968:: @ 8E70968
@@ -3128,32 +3129,32 @@ gBattleAnimSpritePalette_188:: @ 8E7133C
 	.incbin "graphics/battle_anims/sprites/188.gbapal.lz"
 
 	.align 2
-gUnknown_08E71354:: @ 8E71354
-	.incbin "baserom.gba", 0xE71354, 0x34C @ LZ, uncomp. size = 0xE80
+gPartyMenuMisc_Gfx:: @ 8E71354
+	.incbin "graphics/interface/party_menu_misc.4bpp.lz"
 
 	.align 2
-gUnknown_08E716A0:: @ 8E716A0
-	.incbin "baserom.gba", 0xE716A0, 0xE7 @ LZ, uncomp. size = 0x160
+gPartyMenuMisc_Pal:: @ 8E716A0
+	.incbin "graphics/interface/party_menu_misc.gbapal.lz"
 
 	.align 2
-gUnknown_08E71788:: @ 8E71788
-	.incbin "baserom.gba", 0xE71788, 0x10B @ LZ, uncomp. size = 0x800
+gPartyMenuMisc_Tilemap:: @ 8E71788
+	.incbin "graphics/interface/party_menu_misc.bin.lz"
 
 	.align 2
-gUnknown_08E71894:: @ 8E71894
-	.incbin "baserom.gba", 0xE71894, 0x9D @ LZ, uncomp. size = 0x180
+gPartyMenuHpBar_Gfx:: @ 8E71894
+	.incbin "graphics/interface/party_menu_hpbar.4bpp.lz"
 
 	.align 2
-gUnknown_08E71934:: @ 8E71934
-	.incbin "baserom.gba", 0xE71934, 0x3D9 @ LZ, uncomp. size = 0x1000
+gPartyMenuOrderText_Gfx:: @ 8E71934
+	.incbin "graphics/interface/party_menu_ordertext.4bpp.lz"
 
 	.align 2
-gUnknown_08E71D10:: @ 8E71D10
-	.incbin "baserom.gba", 0xE71D10, 0x9D1 @ LZ, uncomp. size = 0x1700
+gMoveTypes_Gfx:: @ 8E71D10
+	.incbin "graphics/types/move_types.4bpp.lz"
 
 	.align 2
-gUnknown_08E726E4:: @ 8E726E4
-	.incbin "baserom.gba", 0xE726E4, 0x67 @ LZ, uncomp. size = 0x60
+gMoveTypes_Pal:: @ 8E726E4
+	.incbin "graphics/types/move_types.gbapal.lz"
 
 	.align 2
 gMenuSummaryGfx:: @ 8E7274C
@@ -3971,6 +3972,7 @@ gUnknown_08E964B8:: @ 8E964B8
 gUnknown_08E966B8:: @ 8E966B8
 	.incbin "baserom.gba", 0x00e966b8, 0x20
 
+	.align 2
 gMonIconPalettes:: @ 8E966D8
 	.incbin "graphics/pokemon_icon_palettes/0.gbapal"
 	.incbin "graphics/pokemon_icon_palettes/1.gbapal"
diff --git a/graphics/battle_anims/backgrounds/scary_face_contest.bin b/graphics/battle_anims/backgrounds/scary_face_contest.bin
new file mode 100755
index 000000000..e2d1e3a99
--- /dev/null
+++ b/graphics/battle_anims/backgrounds/scary_face_contest.bin
diff --git a/graphics/battle_anims/backgrounds/scary_face_opponent.bin b/graphics/battle_anims/backgrounds/scary_face_opponent.bin
new file mode 100755
index 000000000..dfaaf5f2f
--- /dev/null
+++ b/graphics/battle_anims/backgrounds/scary_face_opponent.bin
diff --git a/graphics/battle_anims/backgrounds/scary_face_player.bin b/graphics/battle_anims/backgrounds/scary_face_player.bin
new file mode 100755
index 000000000..690305126
--- /dev/null
+++ b/graphics/battle_anims/backgrounds/scary_face_player.bin
diff --git a/graphics/battle_anims/backgrounds/water.pal b/graphics/battle_anims/backgrounds/water.pal
new file mode 100755
index 000000000..ee7a7b6e2
--- /dev/null
+++ b/graphics/battle_anims/backgrounds/water.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 148 139
+98 90 255
+115 106 255
+139 131 255
+164 156 255
+180 180 255
+205 205 255
+230 230 255
+255 255 255
+98 90 255
+115 106 255
+197 197 255
+238 238 255
+255 255 255
+0 0 0
+0 0 0
diff --git a/graphics/battle_anims/backgrounds/water.png b/graphics/battle_anims/backgrounds/water.png
new file mode 100755
index 000000000..7740f99f8
--- /dev/null
+++ b/graphics/battle_anims/backgrounds/water.png
diff --git a/graphics/battle_interface/bar.png b/graphics/battle_interface/bar.png
new file mode 100755
index 000000000..b947a7803
--- /dev/null
+++ b/graphics/battle_interface/bar.png
diff --git a/graphics/battle_interface/enemy_mon_shadow.png b/graphics/battle_interface/enemy_mon_shadow.png
new file mode 100755
index 000000000..3db333a92
--- /dev/null
+++ b/graphics/battle_interface/enemy_mon_shadow.png
diff --git a/graphics/interface/battle_window.pal b/graphics/battle_interface/window.pal
index bc8e8f2bc..bc8e8f2bc 100755
--- a/graphics/interface/battle_window.pal
+++ b/graphics/battle_interface/window.pal
diff --git a/graphics/interface/battle_window.png b/graphics/battle_interface/window.png
index 2117967ec..2117967ec 100755
--- a/graphics/interface/battle_window.png
+++ b/graphics/battle_interface/window.png
diff --git a/graphics/interface/battle_window2.png b/graphics/battle_interface/window2.png
index ac084b2e5..ac084b2e5 100755
--- a/graphics/interface/battle_window2.png
+++ b/graphics/battle_interface/window2.png
diff --git a/graphics/interface/battle_window3.png b/graphics/battle_interface/window3.png
index f45e2f714..f45e2f714 100755
--- a/graphics/interface/battle_window3.png
+++ b/graphics/battle_interface/window3.png
diff --git a/graphics/interface/battle_window4.png b/graphics/battle_interface/window4.png
index a366186cf..a366186cf 100755
--- a/graphics/interface/battle_window4.png
+++ b/graphics/battle_interface/window4.png
diff --git a/graphics/interface/battle_window5.png b/graphics/battle_interface/window5.png
index e48f380a4..e48f380a4 100755
--- a/graphics/interface/battle_window5.png
+++ b/graphics/battle_interface/window5.png
diff --git a/graphics/misc/applause.png b/graphics/contest/applause.png
index 32b1748a0..32b1748a0 100755
--- a/graphics/misc/applause.png
+++ b/graphics/contest/applause.png
diff --git a/graphics/contest/applause_meter.png b/graphics/contest/applause_meter.png
new file mode 100755
index 000000000..8a4fce8c0
--- /dev/null
+++ b/graphics/contest/applause_meter.png
diff --git a/graphics/contest/nextturn_numbers.png b/graphics/contest/nextturn_numbers.png
new file mode 100755
index 000000000..4386f822d
--- /dev/null
+++ b/graphics/contest/nextturn_numbers.png
diff --git a/graphics/contest/nextturn_random.png b/graphics/contest/nextturn_random.png
new file mode 100755
index 000000000..b92003823
--- /dev/null
+++ b/graphics/contest/nextturn_random.png
diff --git a/graphics/interface/party_menu_hpbar.png b/graphics/interface/party_menu_hpbar.png
new file mode 100755
index 000000000..5860ada9b
--- /dev/null
+++ b/graphics/interface/party_menu_hpbar.png
diff --git a/graphics/interface/party_menu_misc.bin b/graphics/interface/party_menu_misc.bin
new file mode 100755
index 000000000..3b3bcc57a
--- /dev/null
+++ b/graphics/interface/party_menu_misc.bin
diff --git a/graphics/interface/party_menu_misc.pal b/graphics/interface/party_menu_misc.pal
new file mode 100755
index 000000000..4bc706a6b
--- /dev/null
+++ b/graphics/interface/party_menu_misc.pal
@@ -0,0 +1,179 @@
+JASC-PAL
+0100
+176
+123 156 115
+255 255 255
+106 106 106
+0 0 0
+65 205 255
+0 139 189
+49 189 238
+255 156 148
+189 90 82
+222 123 115
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+123 156 115
+32 16 24
+139 32 24
+82 24 49
+74 123 98
+65 98 57
+82 65 74
+32 16 24
+0 0 0
+0 0 0
+255 255 255
+123 156 115
+0 0 0
+0 0 0
+0 0 0
+98 49 164
+123 156 115
+255 115 49
+139 32 24
+82 24 49
+74 123 98
+65 98 57
+82 65 74
+32 16 24
+0 0 0
+0 0 0
+255 255 255
+123 156 115
+0 0 0
+0 0 0
+0 0 0
+164 115 246
+123 156 115
+65 49 57
+189 189 189
+255 255 255
+131 180 172
+57 164 172
+49 139 139
+65 49 57
+115 139 123
+131 180 172
+57 164 172
+49 139 139
+82 106 90
+255 180 123
+246 148 115
+222 106 90
+123 156 115
+65 49 57
+189 189 189
+255 255 255
+205 205 106
+197 189 41
+156 156 32
+65 49 57
+255 123 57
+205 205 106
+197 189 41
+156 156 32
+82 106 90
+74 65 90
+115 255 172
+90 213 131
+123 156 115
+65 49 57
+189 189 189
+255 255 255
+205 156 156
+189 123 123
+148 106 106
+65 49 57
+255 123 57
+205 156 156
+189 123 123
+148 106 106
+82 106 90
+74 65 90
+255 230 57
+205 172 8
+123 156 115
+255 115 49
+189 189 189
+255 255 255
+164 238 131
+115 213 65
+123 156 98
+238 115 49
+0 0 0
+255 131 65
+255 131 65
+255 131 65
+82 106 90
+74 65 90
+255 90 57
+172 65 74
+123 156 115
+255 115 49
+189 189 189
+255 255 255
+172 230 246
+123 213 222
+74 164 164
+238 115 49
+0 0 0
+255 131 65
+255 131 65
+255 131 65
+74 65 90
+255 90 57
+57 57 57
+172 238 148
+123 156 115
+255 115 49
+189 189 189
+255 255 255
+246 246 148
+246 238 65
+213 213 32
+238 115 49
+0 0 0
+255 131 65
+255 131 65
+255 131 65
+74 65 90
+255 90 57
+57 57 57
+172 238 148
+123 156 115
+255 115 49
+189 189 189
+255 255 255
+255 213 222
+255 180 189
+213 148 139
+238 115 49
+0 0 0
+255 131 65
+255 131 65
+255 131 65
+74 65 90
+255 90 57
+57 57 57
+172 238 148
+123 156 115
+255 255 156
+189 189 189
+255 255 255
+164 238 131
+115 213 65
+123 156 98
+255 255 0
+0 0 0
+255 255 189
+255 255 230
+255 255 230
+74 65 90
+255 90 57
+57 57 57
+172 238 148
diff --git a/graphics/interface/party_menu_misc.png b/graphics/interface/party_menu_misc.png
new file mode 100755
index 000000000..6ca98493b
--- /dev/null
+++ b/graphics/interface/party_menu_misc.png
diff --git a/graphics/interface/party_menu_ordertext.png b/graphics/interface/party_menu_ordertext.png
new file mode 100755
index 000000000..003af36d0
--- /dev/null
+++ b/graphics/interface/party_menu_ordertext.png
diff --git a/graphics/types/contest_type_beauty.png b/graphics/types/contest_type_beauty.png
new file mode 100755
index 000000000..b52fe3ca4
--- /dev/null
+++ b/graphics/types/contest_type_beauty.png
diff --git a/graphics/types/contest_type_cool.png b/graphics/types/contest_type_cool.png
new file mode 100755
index 000000000..813e91f80
--- /dev/null
+++ b/graphics/types/contest_type_cool.png
diff --git a/graphics/types/contest_type_cute.png b/graphics/types/contest_type_cute.png
new file mode 100755
index 000000000..ece852a9d
--- /dev/null
+++ b/graphics/types/contest_type_cute.png
diff --git a/graphics/types/contest_type_smart.png b/graphics/types/contest_type_smart.png
new file mode 100755
index 000000000..8e0d903f1
--- /dev/null
+++ b/graphics/types/contest_type_smart.png
diff --git a/graphics/types/contest_type_tough.png b/graphics/types/contest_type_tough.png
new file mode 100755
index 000000000..a76e9cba4
--- /dev/null
+++ b/graphics/types/contest_type_tough.png
diff --git a/graphics/types/move_types_1.pal b/graphics/types/move_types_1.pal
new file mode 100755
index 000000000..951aa69cb
--- /dev/null
+++ b/graphics/types/move_types_1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 213 49
+246 131 49
+197 49 41
+230 197 106
+189 164 57
+139 106 49
+255 255 123
+172 172 123
+222 222 197
+115 90 74
+74 65 57
+189 189 213
+0 0 0
+131 123 115
+255 255 255
diff --git a/graphics/types/move_types_2.pal b/graphics/types/move_types_2.pal
new file mode 100755
index 000000000..08dcea47c
--- /dev/null
+++ b/graphics/types/move_types_2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+205 197 255
+172 148 246
+115 90 156
+106 148 246
+156 222 222
+213 255 238
+74 57 82
+255 90 139
+255 197 180
+148 98 98
+164 65 164
+222 131 189
+148 148 164
+131 123 115
+255 255 255
diff --git a/graphics/types/move_types_3.pal b/graphics/types/move_types_3.pal
new file mode 100755
index 000000000..4db37235b
--- /dev/null
+++ b/graphics/types/move_types_3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+197 255 98
+123 205 82
+90 131 65
+115 57 255
+74 57 148
+189 164 255
+172 189 32
+222 230 49
+123 148 16
+106 164 148
+115 205 180
+32 106 98
+0 0 0
+131 123 115
+255 255 255
diff --git a/graphics/types/type_bug.png b/graphics/types/type_bug.png
new file mode 100755
index 000000000..c11629b21
--- /dev/null
+++ b/graphics/types/type_bug.png
diff --git a/graphics/types/type_dark.png b/graphics/types/type_dark.png
new file mode 100755
index 000000000..3380297da
--- /dev/null
+++ b/graphics/types/type_dark.png
diff --git a/graphics/types/type_dragon.png b/graphics/types/type_dragon.png
new file mode 100755
index 000000000..908073260
--- /dev/null
+++ b/graphics/types/type_dragon.png
diff --git a/graphics/types/type_electric.png b/graphics/types/type_electric.png
new file mode 100755
index 000000000..84db710b6
--- /dev/null
+++ b/graphics/types/type_electric.png
diff --git a/graphics/types/type_fight.png b/graphics/types/type_fight.png
new file mode 100755
index 000000000..6431c9bba
--- /dev/null
+++ b/graphics/types/type_fight.png
diff --git a/graphics/types/type_fire.png b/graphics/types/type_fire.png
new file mode 100755
index 000000000..f6db950c8
--- /dev/null
+++ b/graphics/types/type_fire.png
diff --git a/graphics/types/type_flying.png b/graphics/types/type_flying.png
new file mode 100755
index 000000000..144d0010b
--- /dev/null
+++ b/graphics/types/type_flying.png
diff --git a/graphics/types/type_ghost.png b/graphics/types/type_ghost.png
new file mode 100755
index 000000000..5820fe93a
--- /dev/null
+++ b/graphics/types/type_ghost.png
diff --git a/graphics/types/type_grass.png b/graphics/types/type_grass.png
new file mode 100755
index 000000000..6d3e870ca
--- /dev/null
+++ b/graphics/types/type_grass.png
diff --git a/graphics/types/type_ground.png b/graphics/types/type_ground.png
new file mode 100755
index 000000000..2872b1367
--- /dev/null
+++ b/graphics/types/type_ground.png
diff --git a/graphics/types/type_ice.png b/graphics/types/type_ice.png
new file mode 100755
index 000000000..a611d1f4a
--- /dev/null
+++ b/graphics/types/type_ice.png
diff --git a/graphics/types/type_mystery.png b/graphics/types/type_mystery.png
new file mode 100755
index 000000000..a2ea01d55
--- /dev/null
+++ b/graphics/types/type_mystery.png
diff --git a/graphics/types/type_normal.png b/graphics/types/type_normal.png
new file mode 100755
index 000000000..608a1f9c9
--- /dev/null
+++ b/graphics/types/type_normal.png
diff --git a/graphics/types/type_poison.png b/graphics/types/type_poison.png
new file mode 100755
index 000000000..2fab1ad53
--- /dev/null
+++ b/graphics/types/type_poison.png
diff --git a/graphics/types/type_psychic.png b/graphics/types/type_psychic.png
new file mode 100755
index 000000000..98f70406e
--- /dev/null
+++ b/graphics/types/type_psychic.png
diff --git a/graphics/types/type_rock.png b/graphics/types/type_rock.png
new file mode 100755
index 000000000..e95b2a8ef
--- /dev/null
+++ b/graphics/types/type_rock.png
diff --git a/graphics/types/type_steel.png b/graphics/types/type_steel.png
new file mode 100755
index 000000000..b952031fd
--- /dev/null
+++ b/graphics/types/type_steel.png
diff --git a/graphics/types/type_water.png b/graphics/types/type_water.png
new file mode 100755
index 000000000..19ae3ebe3
--- /dev/null
+++ b/graphics/types/type_water.png
diff --git a/graphics/weather/fog1.bin b/graphics/weather/fog1.bin
new file mode 100755
index 000000000..1f9d53f95
--- /dev/null
+++ b/graphics/weather/fog1.bin
diff --git a/misc.mk b/misc.mk
index 41b997dc8..8e33f80d5 100755
--- a/misc.mk
+++ b/misc.mk
@@ -13,6 +13,10 @@ PICFRAMEGFXDIR := graphics/picture_frame
 CONTESTGFXDIR := graphics/contest
 MASKSGFXDIR := graphics/battle_anims/masks
 BATTRANSGFXDIR := graphics/battle_transitions
+TYPESGFXDIR := graphics/types
+
+types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark
+contest_types := cool beauty cute smart tough
 
 $(MENUGFXDIR)/menu.gbapal: $(MENUGFXDIR)/menu_0.gbapal $(MENUGFXDIR)/menu_1.gbapal
 	@cat $(MENUGFXDIR)/menu_0.gbapal $(MENUGFXDIR)/menu_1.gbapal >$@
@@ -202,3 +206,12 @@ $(MASKSGFXDIR)/unknown_D2EDFC.4bpp: $(MASKSGFXDIR)/unknown_D2EDFC.png
 	
 $(BATTRANSGFXDIR)/vs_frame.4bpp: $(BATTRANSGFXDIR)/vs_frame.png
 	$(GFX) $< $@ -num_tiles 16
+
+$(MENUGFXDIR)/party_menu_misc.4bpp: $(MENUGFXDIR)/party_menu_misc.png
+	$(GFX) $< $@ -num_tiles 116
+
+$(TYPESGFXDIR)/move_types.4bpp: $(types:%=$(TYPESGFXDIR)/%.4bpp) $(contest_types:%=$(TYPESGFXDIR)/contest_%.4bpp)
+	@cat $^ >$@
+
+$(TYPESGFXDIR)/move_types.gbapal: $(TYPESGFXDIR)/move_types_1.gbapal $(TYPESGFXDIR)/move_types_2.gbapal $(TYPESGFXDIR)/move_types_3.gbapal
+	@cat $(TYPESGFXDIR)/move_types_1.gbapal $(TYPESGFXDIR)/move_types_2.gbapal $(TYPESGFXDIR)/move_types_3.gbapal >$@