74 files changed, 73 insertions, 67 deletions
diff --git a/Makefile b/Makefile
index 6cbc1e1df..824ededb8 100644
--- a/Makefile
+++ b/Makefile
@@ -140,8 +140,8 @@ gfx/pics/%/front.animated.tilemap: gfx/pics/%/front.2bpp gfx/pics/%/front.dimens
 
 ### Misc file-specific graphics rules
 
-gfx/shrink1.2bpp: rgbgfx += -h
-gfx/shrink2.2bpp: rgbgfx += -h
+gfx/shrink/shrink1.2bpp: rgbgfx += -h
+gfx/shrink/shrink2.2bpp: rgbgfx += -h
 
 gfx/trainers/%.2bpp: rgbgfx += -h
 gfx/trainers/%.pal: gfx/trainers/%.gbcpal
@@ -153,7 +153,9 @@ gfx/mail/0b9d86.1bpp: tools/gfx += --remove-whitespace
 gfx/mail/0b9dc6.1bpp: tools/gfx += --remove-whitespace
 gfx/mail/0b9cfe.1bpp: tools/gfx += --remove-whitespace
 
-gfx/pokedex/%.2bpp: tools/gfx += --trim-whitespace
+gfx/pokedex/pokedex.2bpp: tools/gfx += --trim-whitespace
+gfx/pokedex/sgb.2bpp: tools/gfx += --trim-whitespace
+gfx/pokedex/slowpoke.2bpp: tools/gfx += --trim-whitespace
 
 gfx/title/crystal.2bpp: tools/gfx += --interleave --png=$<
 gfx/title/old_fg.2bpp: tools/gfx += --interleave --png=$<
@@ -162,10 +164,8 @@ gfx/title/logo.2bpp: rgbgfx += -x 4
 gfx/trade/ball.2bpp: tools/gfx += --remove-whitespace
 gfx/trade/game_boy_n64.2bpp: tools/gfx += --trim-whitespace
 
-gfx/slots_2.2bpp: tools/gfx += --interleave --png=$<
-gfx/slots_3.2bpp: tools/gfx += --interleave --png=$< --remove-duplicates --keep-whitespace --remove-xflip
-gfx/slots_3a.2bpp: tools/gfx += --interleave --png=$<
-gfx/slots_3b.2bpp: tools/gfx += --interleave --png=$< --remove-duplicates --keep-whitespace --remove-xflip
+gfx/slots/slots_2.2bpp: tools/gfx += --interleave --png=$<
+gfx/slots/slots_3.2bpp: tools/gfx += --interleave --png=$< --remove-duplicates --keep-whitespace --remove-xflip
 
 gfx/fx/angels.2bpp: tools/gfx += --trim-whitespace
 gfx/fx/beam.2bpp: tools/gfx += --remove-xflip --remove-yflip --remove-whitespace
@@ -185,16 +185,20 @@ gfx/fx/rocks.2bpp: tools/gfx += --remove-whitespace
 gfx/fx/skyattack.2bpp: tools/gfx += --remove-whitespace
 gfx/fx/status.2bpp: tools/gfx += --remove-whitespace
 
-gfx/misc/chris.2bpp: rgbgfx += -h
-gfx/misc/chris_card.2bpp: rgbgfx += -h
-gfx/misc/kris.2bpp: rgbgfx += -h
-gfx/misc/kris_card.2bpp: rgbgfx += -h
-gfx/misc/kris_back.2bpp: rgbgfx += -h
-gfx/misc/dude.2bpp: rgbgfx += -h
+gfx/player/chris.2bpp: rgbgfx += -h
+gfx/player/chris_back.2bpp: rgbgfx += -h
+gfx/player/kris.2bpp: rgbgfx += -h
+gfx/player/kris_back.2bpp: rgbgfx += -h
+
+gfx/trainer_card/chris_card.2bpp: rgbgfx += -h
+gfx/trainer_card/kris_card.2bpp: rgbgfx += -h
+
+gfx/battle/dude.2bpp: rgbgfx += -h
+
 gfx/misc/unknown_egg.2bpp: rgbgfx += -h
-gfx/misc/player.2bpp: rgbgfx += -h
-gfx/misc/pokegear.2bpp: rgbgfx += -x2
-gfx/misc/pokegear_sprites.2bpp: tools/gfx += --trim-whitespace
+
+gfx/pokegear/pokegear.2bpp: rgbgfx += -x2
+gfx/pokegear/pokegear_sprites.2bpp: tools/gfx += --trim-whitespace
 
 gfx/unknown/0e0ea8.2bpp: tools/gfx += --remove-whitespace
 gfx/unknown/0f8f34.1bpp: tools/gfx += --trim-whitespace
diff --git a/engine/battle_start.asm b/engine/battle_start.asm
index 627519daa..9097e74ed 100644
--- a/engine/battle_start.asm
+++ b/engine/battle_start.asm
@@ -141,7 +141,7 @@ ConvertTrainerBattlePokeballTilesTo2bpp: ; 8c2cf
 ; 8c2f4
 
 TrainerBattlePokeballTiles: ; 8c2f4
-INCBIN "gfx/overworld/trainer_battle_pokeball_tiles.2bpp"
+INCBIN "gfx/ow_fx/trainer_battle_pokeball_tiles.2bpp"
 
 
 FlashyTransitionToBattle: ; 8c314
diff --git a/engine/billspc.asm b/engine/billspc.asm
index 4d8bf1c48..85f01af37 100755
--- a/engine/billspc.asm
+++ b/engine/billspc.asm
@@ -2280,8 +2280,8 @@ BillsPC_InitGFX: ; e33e8 (38:73e8)
 	ret
 ; e3419 (38:7419)
 
-PCSelectLZ: INCBIN "gfx/pc.2bpp.lz"
-PCMailGFX:  INCBIN "gfx/pc_mail.2bpp"
+PCSelectLZ: INCBIN "gfx/pc/pc.2bpp.lz"
+PCMailGFX:  INCBIN "gfx/pc/pc_mail.2bpp"
 ; e34dd
 
 PCString_ChooseaPKMN: db "Choose a <PK><MN>.@"
diff --git a/engine/events_3.asm b/engine/events_3.asm
index b6aaea3b7..cff4eefb9 100755
--- a/engine/events_3.asm
+++ b/engine/events_3.asm
@@ -850,9 +850,9 @@ LoadFishingGFX: ; b84b3
 ; b84f2
 
 FishingGFX: ; b84f2
-INCBIN "gfx/overworld/chris_fish.2bpp"
+INCBIN "gfx/ow_fx/chris_fish.2bpp"
 ; b8582
 
 KrisFishingGFX: ; b8582
-INCBIN "gfx/overworld/kris_fish.2bpp"
+INCBIN "gfx/ow_fx/kris_fish.2bpp"
 ; b8612
diff --git a/engine/overworld.asm b/engine/overworld.asm
index 330dd3893..5bbd70a85 100755
--- a/engine/overworld.asm
+++ b/engine/overworld.asm
@@ -723,6 +723,7 @@ emote_header: MACRO
 ENDM
 
 EmotesPointers: ; 144d
+; entries correspond to EMOTE_* constants
 ; graphics address, length, starting tile
 	emote_header ShockEmote,     4, $78
 	emote_header QuestionEmote,  4, $78
@@ -733,9 +734,9 @@ EmotesPointers: ; 144d
 	emote_header SleepEmote,     4, $78
 	emote_header FishEmote,      4, $78
 	emote_header JumpShadowGFX,  1, $7c
-	emote_header FishingRodGFX2, 2, $7c
+	emote_header FishingRodGFX,  2, $7c
 	emote_header BoulderDustGFX, 2, $7e
-	emote_header FishingRodGFX4, 1, $7e
+	emote_header GrassRustleGFX, 1, $7e
 ; 14495
 
 
diff --git a/engine/pack.asm b/engine/pack.asm
index dad9a799d..e10b70e12 100644
--- a/engine/pack.asm
+++ b/engine/pack.asm
@@ -1716,6 +1716,6 @@ TextJump_YouCantUseItInABattle: ; 0x10b11
 ; 0x10b16
 
 PackMenuGFX:
-INCBIN "gfx/misc/pack_menu.2bpp"
+INCBIN "gfx/pack/pack_menu.2bpp"
 PackGFX:
-INCBIN "gfx/misc/pack.2bpp"
+INCBIN "gfx/pack/pack.2bpp"
diff --git a/engine/pokegear.asm b/engine/pokegear.asm
index 948589639..901053c9f 100755
--- a/engine/pokegear.asm
+++ b/engine/pokegear.asm
@@ -136,7 +136,7 @@ Pokegear_LoadGFX: ; 90c4e
 ; 90cb2
 
 FastShipGFX: ; 90cb2
-INCBIN "gfx/misc/fast_ship.2bpp"
+INCBIN "gfx/pokegear/fast_ship.2bpp"
 ; 90d32
 
 InitPokegearModeIndicatorArrow: ; 90d32 (24:4d32)
@@ -1407,7 +1407,7 @@ PokegearText_DeleteStoredNumber: ; 0x914d8
 ; 0x914dd
 
 PokegearSpritesGFX: ; 914dd
-INCBIN "gfx/misc/pokegear_sprites.2bpp.lz"
+INCBIN "gfx/pokegear/pokegear_sprites.2bpp.lz"
 ; 9150d
 
 RadioTilemapRLE: ; 9150d
@@ -2970,11 +2970,11 @@ LoadTownMapGFX: ; 91ff2
 ; 91fff
 
 JohtoMap: ; 91fff
-INCBIN "gfx/misc/johto.bin"
+INCBIN "gfx/pokegear/johto.bin"
 ; 92168
 
 KantoMap: ; 92168
-INCBIN "gfx/misc/kanto.bin"
+INCBIN "gfx/pokegear/kanto.bin"
 ; 922d1
 
 PokedexNestIconGFX: ; 922d1
diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm
index c131e584f..e23b760cd 100755
--- a/engine/slot_machine.asm
+++ b/engine/slot_machine.asm
@@ -2211,17 +2211,17 @@ Reel3Tilemap: ; 9334b
 ; 9335d
 
 SlotsTilemap: ; 9335d
-INCBIN "gfx/slots.tilemap"
+INCBIN "gfx/slots/slots.tilemap"
 ; 9344d
 
 Slots1LZ: ; 9344d
-INCBIN "gfx/slots_1.2bpp.lz"
+INCBIN "gfx/slots/slots_1.2bpp.lz"
 ; 935cd
 
 Slots2LZ: ; 935cd
-INCBIN "gfx/slots_2.2bpp.lz"
+INCBIN "gfx/slots/slots_2.2bpp.lz"
 ; 9382d
 
 Slots3LZ: ; 9382d
-INCBIN "gfx/slots_3.2bpp.lz"
+INCBIN "gfx/slots/slots_3.2bpp.lz"
 ; 93a3d
diff --git a/engine/trainer_card.asm b/engine/trainer_card.asm
index 497d81ae6..499891fb0 100755
--- a/engine/trainer_card.asm
+++ b/engine/trainer_card.asm
@@ -606,11 +606,11 @@ TrainerCard_JohtoBadgesOAM: ; 254c9
 	db $1c | $80, $20, $24, $20 | $80
 ; 25523
 
-CardStatusGFX: INCBIN "gfx/misc/card_status.2bpp"
+CardStatusGFX: INCBIN "gfx/trainer_card/card_status.2bpp"
 
-LeaderGFX:  INCBIN "gfx/misc/leaders.2bpp"
-LeaderGFX2: INCBIN "gfx/misc/leaders.2bpp"
-BadgeGFX:   INCBIN "gfx/misc/badges.2bpp"
-BadgeGFX2:  INCBIN "gfx/misc/badges.2bpp"
+LeaderGFX:  INCBIN "gfx/trainer_card/leaders.2bpp"
+LeaderGFX2: INCBIN "gfx/trainer_card/leaders.2bpp"
+BadgeGFX:   INCBIN "gfx/trainer_card/badges.2bpp"
+BadgeGFX2:  INCBIN "gfx/trainer_card/badges.2bpp"
 
-CardRightCornerGFX: INCBIN "gfx/misc/card_right_corner.2bpp"
+CardRightCornerGFX: INCBIN "gfx/trainer_card/card_right_corner.2bpp"
diff --git a/event/field_moves.asm b/event/field_moves.asm
index 158f65598..2869f9be9 100755
--- a/event/field_moves.asm
+++ b/event/field_moves.asm
@@ -75,7 +75,7 @@ ShakeHeadbuttTree: ; 8c80a
 ; 8c893
 
 HeadbuttTreeGFX: ; 8c893
-INCBIN "gfx/overworld/headbutt_tree.2bpp"
+INCBIN "gfx/ow_fx/headbutt_tree.2bpp"
 ; 8c913
 
 HideHeadbuttTree: ; 8c913
@@ -152,11 +152,11 @@ OWCutAnimation: ; 8c940
 ; 8c98c
 
 CutTreeGFX: ; c898c
-INCBIN "gfx/misc/cut_tree.2bpp"
+INCBIN "gfx/ow_fx/cut_tree.2bpp"
 ; c89cc
 
 CutGrassGFX: ; 8c9cc
-INCBIN "gfx/misc/cut_grass.2bpp"
+INCBIN "gfx/ow_fx/cut_grass.2bpp"
 ; 8ca0c
 
 OWCutJumptable: ; 8ca0c
diff --git a/gfx/misc/dude.2bpp.lz.d13fb490 b/gfx/battle/dude.2bpp.lz.d13fb490
index b8e96a09f..b8e96a09f 100644
--- a/gfx/misc/dude.2bpp.lz.d13fb490
+++ b/gfx/battle/dude.2bpp.lz.d13fb490
diff --git a/gfx/misc/dude.png b/gfx/battle/dude.png
index 9a74a90d6..9a74a90d6 100644
--- a/gfx/misc/dude.png
+++ b/gfx/battle/dude.png
diff --git a/gfx/font.asm b/gfx/font.asm
index 578085ddf..b61fc1e23 100755
--- a/gfx/font.asm
+++ b/gfx/font.asm
@@ -1,11 +1,11 @@
 FontExtra:
-INCBIN "gfx/misc/font_extra.2bpp"
+INCBIN "gfx/font/font_extra.2bpp"
 
 Font:
-INCBIN "gfx/misc/font.1bpp"
+INCBIN "gfx/font/font.1bpp"
 
 FontBattleExtra:
-INCBIN "gfx/misc/font_battle_extra.2bpp"
+INCBIN "gfx/font/font_battle_extra.2bpp"
 
 Frames: ; f8800
 INCBIN "gfx/frames/1.1bpp"
@@ -47,7 +47,7 @@ INCBIN "gfx/battle/expbar.2bpp"
 ; f8ba0
 
 TownMapGFX: ; f8ba0
-INCBIN "gfx/misc/town_map.2bpp.lz"
+INCBIN "gfx/pokegear/town_map.2bpp.lz"
 ; f8ea4
 
 WeekdayKanjiGFX: ; unused kanji
@@ -79,7 +79,7 @@ INCBIN "gfx/unknown/0f9424.2bpp"
 ; f9434
 
 Footprints: ; f9434
-INCBIN "gfx/misc/footprints.1bpp"
+INCBIN "gfx/pokedex/footprints.1bpp"
 ; fb434
 
 ; This and the following two functions are unreferenced.
diff --git a/gfx/misc/font.png b/gfx/font/font.png
index 7119c0691..7119c0691 100644
--- a/gfx/misc/font.png
+++ b/gfx/font/font.png
diff --git a/gfx/misc/font_battle_extra.png b/gfx/font/font_battle_extra.png
index 15e25a40c..15e25a40c 100644
--- a/gfx/misc/font_battle_extra.png
+++ b/gfx/font/font_battle_extra.png
diff --git a/gfx/misc/font_extra.png b/gfx/font/font_extra.png
index 7ca840c3a..7ca840c3a 100644
--- a/gfx/misc/font_extra.png
+++ b/gfx/font/font_extra.png
diff --git a/gfx/misc/font_inversed.png b/gfx/font/font_inversed.png
index 519339f39..519339f39 100644
--- a/gfx/misc/font_inversed.png
+++ b/gfx/font/font_inversed.png
diff --git a/gfx/misc/unown_font.png b/gfx/font/unown_font.png
index 5ac70b807..5ac70b807 100644
--- a/gfx/misc/unown_font.png
+++ b/gfx/font/unown_font.png
diff --git a/gfx/misc/boulderdust.png b/gfx/ow_fx/boulder_dust.png
index 9acb11c1b..9acb11c1b 100644
--- a/gfx/misc/boulderdust.png
+++ b/gfx/ow_fx/boulder_dust.png
diff --git a/gfx/overworld/chris_fish.png b/gfx/ow_fx/chris_fish.png
index ea0730151..ea0730151 100644
--- a/gfx/overworld/chris_fish.png
+++ b/gfx/ow_fx/chris_fish.png
diff --git a/gfx/misc/cut_grass.png b/gfx/ow_fx/cut_grass.png
index b10e0cf8c..b10e0cf8c 100644
--- a/gfx/misc/cut_grass.png
+++ b/gfx/ow_fx/cut_grass.png
diff --git a/gfx/misc/cut_tree.png b/gfx/ow_fx/cut_tree.png
index c1f1bc97d..c1f1bc97d 100644
--- a/gfx/misc/cut_tree.png
+++ b/gfx/ow_fx/cut_tree.png
diff --git a/gfx/misc/fishing2.png b/gfx/ow_fx/fishing_rod.png
index 32d277269..32d277269 100644
--- a/gfx/misc/fishing2.png
+++ b/gfx/ow_fx/fishing_rod.png
diff --git a/gfx/misc/fishing4.png b/gfx/ow_fx/grass_rustle.png
index 0b2d73e2c..0b2d73e2c 100644
--- a/gfx/misc/fishing4.png
+++ b/gfx/ow_fx/grass_rustle.png
diff --git a/gfx/overworld/headbutt_tree.png b/gfx/ow_fx/headbutt_tree.png
index 4cbb595f7..4cbb595f7 100644
--- a/gfx/overworld/headbutt_tree.png
+++ b/gfx/ow_fx/headbutt_tree.png
diff --git a/gfx/overworld/kris_fish.png b/gfx/ow_fx/kris_fish.png
index a47b89042..a47b89042 100644
--- a/gfx/overworld/kris_fish.png
+++ b/gfx/ow_fx/kris_fish.png
diff --git a/gfx/misc/shadow.png b/gfx/ow_fx/shadow.png
index ba3dab5be..ba3dab5be 100644
--- a/gfx/misc/shadow.png
+++ b/gfx/ow_fx/shadow.png
diff --git a/gfx/overworld/trainer_battle_pokeball_tiles.png b/gfx/ow_fx/trainer_battle_pokeball_tiles.png
index a4655d26e..a4655d26e 100644
--- a/gfx/overworld/trainer_battle_pokeball_tiles.png
+++ b/gfx/ow_fx/trainer_battle_pokeball_tiles.png
diff --git a/gfx/misc/pack.png b/gfx/pack/pack.png
index b85fc0990..b85fc0990 100644
--- a/gfx/misc/pack.png
+++ b/gfx/pack/pack.png
diff --git a/gfx/misc/pack_f.png b/gfx/pack/pack_f.png
index fbe120bd1..fbe120bd1 100644
--- a/gfx/misc/pack_f.png
+++ b/gfx/pack/pack_f.png
diff --git a/gfx/misc/pack_menu.png b/gfx/pack/pack_menu.png
index 52e2bcdd5..52e2bcdd5 100644
--- a/gfx/misc/pack_menu.png
+++ b/gfx/pack/pack_menu.png
diff --git a/gfx/pc.2bpp.lz.2201c1aa b/gfx/pc/pc.2bpp.lz.2201c1aa
index 996cfadc9..996cfadc9 100644
--- a/gfx/pc.2bpp.lz.2201c1aa
+++ b/gfx/pc/pc.2bpp.lz.2201c1aa
diff --git a/gfx/pc.png b/gfx/pc/pc.png
index ce8fed73b..ce8fed73b 100644
--- a/gfx/pc.png
+++ b/gfx/pc/pc.png
diff --git a/gfx/pc_mail.png b/gfx/pc/pc_mail.png
index fd4b2892f..fd4b2892f 100644
--- a/gfx/pc_mail.png
+++ b/gfx/pc/pc_mail.png
diff --git a/gfx/misc/chris.png b/gfx/player/chris.png
index 19869944e..19869944e 100644
--- a/gfx/misc/chris.png
+++ b/gfx/player/chris.png
diff --git a/gfx/misc/player.2bpp.lz.0312ddce b/gfx/player/chris_back.2bpp.lz.0312ddce
index aec84bbab..aec84bbab 100644
--- a/gfx/misc/player.2bpp.lz.0312ddce
+++ b/gfx/player/chris_back.2bpp.lz.0312ddce
diff --git a/gfx/misc/player.png b/gfx/player/chris_back.png
index 7bf3c50db..7bf3c50db 100644
--- a/gfx/misc/player.png
+++ b/gfx/player/chris_back.png
diff --git a/gfx/misc/kris.png b/gfx/player/kris.png
index 7a855e676..7a855e676 100644
--- a/gfx/misc/kris.png
+++ b/gfx/player/kris.png
diff --git a/gfx/misc/kris_back.png b/gfx/player/kris_back.png
index eb0c1e941..eb0c1e941 100644
--- a/gfx/misc/kris_back.png
+++ b/gfx/player/kris_back.png
diff --git a/gfx/misc/footprints.png b/gfx/pokedex/footprints.png
index b1e350436..b1e350436 100644
--- a/gfx/misc/footprints.png
+++ b/gfx/pokedex/footprints.png
diff --git a/gfx/pokegear/dexmap_nest_icon.2bpp b/gfx/pokegear/dexmap_nest_icon.2bpp
new file mode 100644
index 000000000..48a4938e6
--- /dev/null
+++ b/gfx/pokegear/dexmap_nest_icon.2bpp
@@ -0,0 +1 @@
+BBff��������ZZ$$
+\ No newline at end of file
diff --git a/gfx/misc/fast_ship.png b/gfx/pokegear/fast_ship.png
index e92f00f55..e92f00f55 100644
--- a/gfx/misc/fast_ship.png
+++ b/gfx/pokegear/fast_ship.png
diff --git a/gfx/pokegear/flymap_label_border.1bpp b/gfx/pokegear/flymap_label_border.1bpp
new file mode 100644
index 000000000..671aab1d7
--- /dev/null
+++ b/gfx/pokegear/flymap_label_border.1bpp
diff --git a/gfx/misc/johto.bin b/gfx/pokegear/johto.bin
index faa5efe70..faa5efe70 100644
--- a/gfx/misc/johto.bin
+++ b/gfx/pokegear/johto.bin
diff --git a/gfx/misc/kanto.bin b/gfx/pokegear/kanto.bin
index 8a08cd826..8a08cd826 100644
--- a/gfx/misc/kanto.bin
+++ b/gfx/pokegear/kanto.bin
diff --git a/gfx/misc/pokegear.2bpp.lz.42315ab4 b/gfx/pokegear/pokegear.2bpp.lz.42315ab4
index df312a51b..df312a51b 100644
--- a/gfx/misc/pokegear.2bpp.lz.42315ab4
+++ b/gfx/pokegear/pokegear.2bpp.lz.42315ab4
diff --git a/gfx/misc/pokegear.png b/gfx/pokegear/pokegear.png
index 78774a260..78774a260 100644
--- a/gfx/misc/pokegear.png
+++ b/gfx/pokegear/pokegear.png
diff --git a/gfx/misc/pokegear_sprites.2bpp.lz.7a3cc91f b/gfx/pokegear/pokegear_sprites.2bpp.lz.7a3cc91f
index b5af62d28..b5af62d28 100644
--- a/gfx/misc/pokegear_sprites.2bpp.lz.7a3cc91f
+++ b/gfx/pokegear/pokegear_sprites.2bpp.lz.7a3cc91f
diff --git a/gfx/misc/pokegear_sprites.png b/gfx/pokegear/pokegear_sprites.png
index 746d4b486..746d4b486 100644
--- a/gfx/misc/pokegear_sprites.png
+++ b/gfx/pokegear/pokegear_sprites.png
diff --git a/gfx/misc/town_map.2bpp.lz.c0587c86 b/gfx/pokegear/town_map.2bpp.lz.c0587c86
index c807a372f..c807a372f 100644
--- a/gfx/misc/town_map.2bpp.lz.c0587c86
+++ b/gfx/pokegear/town_map.2bpp.lz.c0587c86
diff --git a/gfx/misc/town_map.png b/gfx/pokegear/town_map.png
index 6e7af59d0..6e7af59d0 100644
--- a/gfx/misc/town_map.png
+++ b/gfx/pokegear/town_map.png
diff --git a/gfx/shrink1.2bpp.lz.d4443930 b/gfx/shrink/shrink1.2bpp.lz.d4443930
index 284bee8c2..284bee8c2 100644
--- a/gfx/shrink1.2bpp.lz.d4443930
+++ b/gfx/shrink/shrink1.2bpp.lz.d4443930
diff --git a/gfx/shrink1.png b/gfx/shrink/shrink1.png
index 6cf5b8077..6cf5b8077 100644
--- a/gfx/shrink1.png
+++ b/gfx/shrink/shrink1.png
diff --git a/gfx/shrink2.2bpp.lz.3f58480a b/gfx/shrink/shrink2.2bpp.lz.3f58480a
index df14d5ed4..df14d5ed4 100644
--- a/gfx/shrink2.2bpp.lz.3f58480a
+++ b/gfx/shrink/shrink2.2bpp.lz.3f58480a
diff --git a/gfx/shrink2.png b/gfx/shrink/shrink2.png
index 276b4e7c7..276b4e7c7 100644
--- a/gfx/shrink2.png
+++ b/gfx/shrink/shrink2.png
diff --git a/gfx/slots.tilemap b/gfx/slots/slots.tilemap
index 5e920ed54..5e920ed54 100644
--- a/gfx/slots.tilemap
+++ b/gfx/slots/slots.tilemap
diff --git a/gfx/slots_1.2bpp.lz.b22ddc13 b/gfx/slots/slots_1.2bpp.lz.b22ddc13
index 90d3ce139..90d3ce139 100644
--- a/gfx/slots_1.2bpp.lz.b22ddc13
+++ b/gfx/slots/slots_1.2bpp.lz.b22ddc13
diff --git a/gfx/slots_1.png b/gfx/slots/slots_1.png
index a10340844..a10340844 100644
--- a/gfx/slots_1.png
+++ b/gfx/slots/slots_1.png
diff --git a/gfx/slots_2.2bpp.lz.b28f76e3 b/gfx/slots/slots_2.2bpp.lz.b28f76e3
index 638c68055..638c68055 100644
--- a/gfx/slots_2.2bpp.lz.b28f76e3
+++ b/gfx/slots/slots_2.2bpp.lz.b28f76e3
diff --git a/gfx/slots_2.png b/gfx/slots/slots_2.png
index aa1292ccb..aa1292ccb 100644
--- a/gfx/slots_2.png
+++ b/gfx/slots/slots_2.png
diff --git a/gfx/slots_3.2bpp.lz.70c2984c b/gfx/slots/slots_3.2bpp.lz.70c2984c
index 858b6e464..858b6e464 100644
--- a/gfx/slots_3.2bpp.lz.70c2984c
+++ b/gfx/slots/slots_3.2bpp.lz.70c2984c
diff --git a/gfx/slots_3.png b/gfx/slots/slots_3.png
index 456e9b6bf..456e9b6bf 100755..100644
--- a/gfx/slots_3.png
+++ b/gfx/slots/slots_3.png
diff --git a/gfx/misc/copyright.png b/gfx/splash/copyright.png
index 023bb93dd..023bb93dd 100644
--- a/gfx/misc/copyright.png
+++ b/gfx/splash/copyright.png
diff --git a/gfx/tilesets/water.png b/gfx/tilesets/water/water.png
index 0aa2640c9..0aa2640c9 100644
--- a/gfx/tilesets/water.png
+++ b/gfx/tilesets/water/water.png
diff --git a/gfx/misc/badges.png b/gfx/trainer_card/badges.png
index 4e5820da8..4e5820da8 100644
--- a/gfx/misc/badges.png
+++ b/gfx/trainer_card/badges.png
diff --git a/gfx/misc/card_right_corner.png b/gfx/trainer_card/card_right_corner.png
index fa9aea024..fa9aea024 100644
--- a/gfx/misc/card_right_corner.png
+++ b/gfx/trainer_card/card_right_corner.png
diff --git a/gfx/misc/card_status.png b/gfx/trainer_card/card_status.png
index b33bb2029..b33bb2029 100644
--- a/gfx/misc/card_status.png
+++ b/gfx/trainer_card/card_status.png
diff --git a/gfx/misc/chris_card.png b/gfx/trainer_card/chris_card.png
index 977981d41..977981d41 100644
--- a/gfx/misc/chris_card.png
+++ b/gfx/trainer_card/chris_card.png
diff --git a/gfx/misc/kris_card.png b/gfx/trainer_card/kris_card.png
index 2ffa11159..2ffa11159 100644
--- a/gfx/misc/kris_card.png
+++ b/gfx/trainer_card/kris_card.png
diff --git a/gfx/misc/leaders.png b/gfx/trainer_card/leaders.png
index 6e7eb0f8d..6e7eb0f8d 100644
--- a/gfx/misc/leaders.png
+++ b/gfx/trainer_card/leaders.png
diff --git a/gfx/misc/trainer_card.png b/gfx/trainer_card/trainer_card.png
index 88ce35bca..88ce35bca 100644
--- a/gfx/misc/trainer_card.png
+++ b/gfx/trainer_card/trainer_card.png
diff --git a/main.asm b/main.asm
index 40bfa7cbe..c50cef618 100644
--- a/main.asm
+++ b/main.asm
@@ -1178,10 +1178,10 @@ INCLUDE "engine/wildmons.asm"
 INCLUDE "battle/link_result.asm"
 
 ChrisBackpic: ; 2ba1a
-INCBIN "gfx/misc/player.2bpp.lz"
+INCBIN "gfx/player/chris_back.2bpp.lz"
 
 DudeBackpic: ; 2bbaa
-INCBIN "gfx/misc/dude.2bpp.lz"
+INCBIN "gfx/battle/dude.2bpp.lz"
 
 SECTION "bankB", ROMX
 
@@ -1969,7 +1969,7 @@ PackFGFXPointers: ; 48e93
 	dw PackFGFX + (15 tiles) * 2
 
 PackFGFX: ; 48e9b
-INCBIN "gfx/misc/pack_f.2bpp"
+INCBIN "gfx/pack/pack_f.2bpp"
 
 Special_MoveTutor: ; 4925b
 	call FadeToMenu
@@ -2487,10 +2487,10 @@ endr
 	ret
 
 Shrink1Pic: ; 4d249
-INCBIN "gfx/shrink1.2bpp.lz"
+INCBIN "gfx/shrink/shrink1.2bpp.lz"
 
 Shrink2Pic: ; 4d2d9
-INCBIN "gfx/shrink2.2bpp.lz"
+INCBIN "gfx/shrink/shrink2.2bpp.lz"
 
 LinkMonStatsScreen: ; 4d319
 	ld a, [wMenuCursorY]
@@ -4857,13 +4857,13 @@ GetCardPic: ; 8833e
 	ret
 
 ChrisCardPic: ; 88365
-INCBIN "gfx/misc/chris_card.2bpp"
+INCBIN "gfx/trainer_card/chris_card.2bpp"
 
 KrisCardPic: ; 88595
-INCBIN "gfx/misc/kris_card.2bpp"
+INCBIN "gfx/trainer_card/kris_card.2bpp"
 
 CardGFX: ; 887c5
-INCBIN "gfx/misc/trainer_card.2bpp"
+INCBIN "gfx/trainer_card/trainer_card.2bpp"
 
 GetPlayerBackpic: ; 88825
 	ld a, [PlayerGender]
@@ -4943,10 +4943,10 @@ DrawIntroPlayerPic: ; 88874
 	ret
 
 ChrisPic: ; 888a9
-INCBIN "gfx/misc/chris.2bpp"
+INCBIN "gfx/player/chris.2bpp"
 
 KrisPic: ; 88bb9
-INCBIN "gfx/misc/kris.2bpp"
+INCBIN "gfx/player/kris.2bpp"
 
 GetKrisBackpic: ; 88ec9
 ; Kris's backpic is uncompressed.
@@ -4957,7 +4957,7 @@ GetKrisBackpic: ; 88ec9
 	ret
 
 KrisBackpic: ; 88ed6
-INCBIN "gfx/misc/kris_back.2bpp"
+INCBIN "gfx/player/kris_back.2bpp"
 
 String_89116:
 	db "-----@"
@@ -5310,7 +5310,7 @@ INCLUDE "gfx/pics/kanto_frames.asm"
 
 SECTION "bank36", ROMX
 
-FontInversed: INCBIN "gfx/misc/font_inversed.1bpp"
+FontInversed: INCBIN "gfx/font/font_inversed.1bpp"
 
 SECTION "Pic Animations 3", ROMX
 
@@ -5452,7 +5452,7 @@ INCLUDE "engine/billspc.asm"
 SECTION "bank39", ROMX
 
 CopyrightGFX:: ; e4000
-INCBIN "gfx/misc/copyright.2bpp"
+INCBIN "gfx/splash/copyright.2bpp"
 
 INCLUDE "engine/options_menu.asm"
 INCLUDE "engine/crystal_intro.asm"
@@ -5595,7 +5595,7 @@ INCLUDE "engine/landmarks.asm"
 SECTION "bank77", ROMX
 
 UnownFont: ; 1dc000
-INCBIN "gfx/misc/unown_font.2bpp"
+INCBIN "gfx/font/unown_font.2bpp"
 
 INCLUDE "misc/printer_77.asm"
 
@@ -5908,7 +5908,7 @@ TownMap_ConvertLineBreakCharacters: ; 1de2c5
 	ret
 
 PokegearGFX: ; 1de2e4
-INCBIN "gfx/misc/pokegear.2bpp.lz"
+INCBIN "gfx/pokegear/pokegear.2bpp.lz"
 
 IsMailEuropean: ; 1de5c8
 ; return 1 if French
diff --git a/misc/gfx_41.asm b/misc/gfx_41.asm
index 952742ec1..8f128a7bd 100755
--- a/misc/gfx_41.asm
+++ b/misc/gfx_41.asm
@@ -632,7 +632,7 @@ HeartEmote:     INCBIN "gfx/emotes/heart.2bpp"
 BoltEmote:      INCBIN "gfx/emotes/bolt.2bpp"
 SleepEmote:     INCBIN "gfx/emotes/sleep.2bpp"
 FishEmote:      INCBIN "gfx/emotes/fish.2bpp"
-JumpShadowGFX:  INCBIN "gfx/misc/shadow.2bpp"
-FishingRodGFX2: INCBIN "gfx/misc/fishing2.2bpp"
-BoulderDustGFX: INCBIN "gfx/misc/boulderdust.2bpp"
-FishingRodGFX4: INCBIN "gfx/misc/fishing4.2bpp"
+JumpShadowGFX:  INCBIN "gfx/ow_fx/shadow.2bpp"
+FishingRodGFX:  INCBIN "gfx/ow_fx/fishing_rod.2bpp"
+BoulderDustGFX: INCBIN "gfx/ow_fx/boulder_dust.2bpp"
+GrassRustleGFX: INCBIN "gfx/ow_fx/grass_rustle.2bpp"
diff --git a/tilesets/animations.asm b/tilesets/animations.asm
index 76b3c65f8..124c84b58 100644
--- a/tilesets/animations.asm
+++ b/tilesets/animations.asm
@@ -492,7 +492,7 @@ AnimateWaterTile: ; fc402
 ; fc41c
 
 WaterTileFrames: ; fc41c
-	INCBIN "gfx/tilesets/water.2bpp"
+	INCBIN "gfx/tilesets/water/water.2bpp"
 ; fc45c