130 files changed, 132 insertions, 127 deletions

diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm
index 1a716f51b..787e130f4 100644
--- a/constants/sprite_constants.asm
+++ b/constants/sprite_constants.asm
@@ -1,5 +1,5 @@
 ; sprite ids
-; SpriteHeaders indexes (see gfx/overworld/sprite_headers.asm)
+; SpriteHeaders indexes (see gfx/sprite_headers.asm)
 	const_def
 	const SPRITE_NONE ; 00
 	const SPRITE_CHRIS ; 01
@@ -166,7 +166,7 @@ SPRITE_VARS EQU const_value
 	const SPRITE_COPYCAT ; fb
 	const SPRITE_JANINE_IMPERSONATOR ; fc
 
-; sprite_header struct members (see gfx/overworld/sprite_headers.asm)
+; sprite_header struct members (see gfx/sprite_headers.asm)
 	const_def
 	const SPRITEHEADER_ADDR_LO
 	const SPRITEHEADER_ADDR_HI
diff --git a/engine/battle_start.asm b/engine/battle_start.asm
index 962948386..b16bbbd67 100644
--- a/engine/battle_start.asm
+++ b/engine/battle_start.asm
@@ -141,7 +141,7 @@ ConvertTrainerBattlePokeballTilesTo2bpp: ; 8c2cf
 ; 8c2f4
 
 TrainerBattlePokeballTiles: ; 8c2f4
-INCBIN "gfx/ow_fx/trainer_battle_pokeball_tiles.2bpp"
+INCBIN "gfx/overworld/trainer_battle_pokeball_tiles.2bpp"
 
 
 FlashyTransitionToBattle: ; 8c314
diff --git a/engine/color.asm b/engine/color.asm
index 6e99e9cb7..8690d7f1c 100644
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -1877,7 +1877,7 @@ Palettes_a8ca:
 
 INCLUDE "gfx/pics/palette_pointers.asm"
 
-INCLUDE "gfx/trainers/palette_pointers.asm"
+INCLUDE "gfx/trainer_palettes.asm"
 
 LoadMapPals:
 	callba LoadSpecialMapPalette
diff --git a/engine/events_3.asm b/engine/events_3.asm
index cff4eefb9..b6aaea3b7 100755
--- a/engine/events_3.asm
+++ b/engine/events_3.asm
@@ -850,9 +850,9 @@ LoadFishingGFX: ; b84b3
 ; b84f2
 
 FishingGFX: ; b84f2
-INCBIN "gfx/ow_fx/chris_fish.2bpp"
+INCBIN "gfx/overworld/chris_fish.2bpp"
 ; b8582
 
 KrisFishingGFX: ; b8582
-INCBIN "gfx/ow_fx/kris_fish.2bpp"
+INCBIN "gfx/overworld/kris_fish.2bpp"
 ; b8612
diff --git a/engine/healmachineanim.asm b/engine/healmachineanim.asm
index bea580dcd..4f543c0b3 100755
--- a/engine/healmachineanim.asm
+++ b/engine/healmachineanim.asm
@@ -137,7 +137,7 @@ HealMachineAnim: ; 12324
 ; 123fc
 
 .HealMachineGFX: ; 123fc
-INCBIN "gfx/ow_fx/heal_machine.2bpp"
+INCBIN "gfx/overworld/heal_machine.2bpp"
 ; 1241c
 
 .HOF_OAM: ; 1241c
diff --git a/engine/overworld.asm b/engine/overworld.asm
index 1a49b1bfc..3ed029800 100755
--- a/engine/overworld.asm
+++ b/engine/overworld.asm
@@ -1477,5 +1477,5 @@ Group20Sprites: ; 1472b
 
 
 SpriteHeaders: ; 14736
-INCLUDE "gfx/overworld/sprite_headers.asm"
+INCLUDE "gfx/sprite_headers.asm"
 ; 1499a
diff --git a/event/field_moves.asm b/event/field_moves.asm
index 2869f9be9..4c4b8cfc1 100755
--- a/event/field_moves.asm
+++ b/event/field_moves.asm
@@ -75,7 +75,7 @@ ShakeHeadbuttTree: ; 8c80a
 ; 8c893
 
 HeadbuttTreeGFX: ; 8c893
-INCBIN "gfx/ow_fx/headbutt_tree.2bpp"
+INCBIN "gfx/overworld/headbutt_tree.2bpp"
 ; 8c913
 
 HideHeadbuttTree: ; 8c913
@@ -152,11 +152,11 @@ OWCutAnimation: ; 8c940
 ; 8c98c
 
 CutTreeGFX: ; c898c
-INCBIN "gfx/ow_fx/cut_tree.2bpp"
+INCBIN "gfx/overworld/cut_tree.2bpp"
 ; c89cc
 
 CutGrassGFX: ; 8c9cc
-INCBIN "gfx/ow_fx/cut_grass.2bpp"
+INCBIN "gfx/overworld/cut_grass.2bpp"
 ; 8ca0c
 
 OWCutJumptable: ; 8ca0c
diff --git a/gfx/ow_fx/boulder_dust.png b/gfx/overworld/boulder_dust.png
index 9acb11c1b..9acb11c1b 100644
--- a/gfx/ow_fx/boulder_dust.png
+++ b/gfx/overworld/boulder_dust.png
diff --git a/gfx/ow_fx/chris_fish.png b/gfx/overworld/chris_fish.png
index ea0730151..ea0730151 100644
--- a/gfx/ow_fx/chris_fish.png
+++ b/gfx/overworld/chris_fish.png
diff --git a/gfx/ow_fx/cut_grass.png b/gfx/overworld/cut_grass.png
index b10e0cf8c..b10e0cf8c 100644
--- a/gfx/ow_fx/cut_grass.png
+++ b/gfx/overworld/cut_grass.png
diff --git a/gfx/ow_fx/cut_tree.png b/gfx/overworld/cut_tree.png
index c1f1bc97d..c1f1bc97d 100644
--- a/gfx/ow_fx/cut_tree.png
+++ b/gfx/overworld/cut_tree.png
diff --git a/gfx/ow_fx/fishing_rod.png b/gfx/overworld/fishing_rod.png
index 32d277269..32d277269 100644
--- a/gfx/ow_fx/fishing_rod.png
+++ b/gfx/overworld/fishing_rod.png
diff --git a/gfx/ow_fx/grass_rustle.png b/gfx/overworld/grass_rustle.png
index 0b2d73e2c..0b2d73e2c 100644
--- a/gfx/ow_fx/grass_rustle.png
+++ b/gfx/overworld/grass_rustle.png
diff --git a/gfx/ow_fx/headbutt_tree.png b/gfx/overworld/headbutt_tree.png
index 4cbb595f7..4cbb595f7 100644
--- a/gfx/ow_fx/headbutt_tree.png
+++ b/gfx/overworld/headbutt_tree.png
diff --git a/gfx/ow_fx/heal_machine.png b/gfx/overworld/heal_machine.png
index dbf513487..dbf513487 100644
--- a/gfx/ow_fx/heal_machine.png
+++ b/gfx/overworld/heal_machine.png
diff --git a/gfx/ow_fx/kris_fish.png b/gfx/overworld/kris_fish.png
index a47b89042..a47b89042 100644
--- a/gfx/ow_fx/kris_fish.png
+++ b/gfx/overworld/kris_fish.png
diff --git a/gfx/ow_fx/shadow.png b/gfx/overworld/shadow.png
index ba3dab5be..ba3dab5be 100644
--- a/gfx/ow_fx/shadow.png
+++ b/gfx/overworld/shadow.png
diff --git a/gfx/overworld/sprites_1.asm b/gfx/overworld/sprites_1.asm
deleted file mode 100644
index 640ac6ccc..000000000
--- a/gfx/overworld/sprites_1.asm
+++ /dev/null
@@ -1,44 +0,0 @@
-ChrisSpriteGFX:        INCBIN "gfx/overworld/000.2bpp" ; c0000
-ChrisBikeSpriteGFX:    INCBIN "gfx/overworld/001.2bpp" ; c0180
-GameboyKidSpriteGFX:   INCBIN "gfx/overworld/002.2bpp" ; c0300
-SilverSpriteGFX:       INCBIN "gfx/overworld/003.2bpp" ; c03c0
-OakSpriteGFX:          INCBIN "gfx/overworld/004.2bpp" ; c0540
-RedSpriteGFX:          INCBIN "gfx/overworld/005.2bpp" ; c06c0
-BlueSpriteGFX:         INCBIN "gfx/overworld/006.2bpp" ; c0840
-BillSpriteGFX:         INCBIN "gfx/overworld/007.2bpp" ; c09c0
-ElderSpriteGFX:        INCBIN "gfx/overworld/008.2bpp" ; c0b40
-JanineSpriteGFX:       INCBIN "gfx/overworld/009.2bpp" ; c0cc0
-KurtSpriteGFX:         INCBIN "gfx/overworld/010.2bpp" ; c0e40
-MomSpriteGFX:          INCBIN "gfx/overworld/011.2bpp" ; c0fc0
-BlaineSpriteGFX:       INCBIN "gfx/overworld/012.2bpp" ; c1140
-RedsMomSpriteGFX:      INCBIN "gfx/overworld/013.2bpp" ; c12c0
-DaisySpriteGFX:        INCBIN "gfx/overworld/014.2bpp" ; c1440
-ElmSpriteGFX:          INCBIN "gfx/overworld/015.2bpp" ; c15c0
-WillSpriteGFX:         INCBIN "gfx/overworld/016.2bpp" ; c1740
-FalknerSpriteGFX:      INCBIN "gfx/overworld/017.2bpp" ; c1800
-WhitneySpriteGFX:      INCBIN "gfx/overworld/018.2bpp" ; c1980
-BugsySpriteGFX:        INCBIN "gfx/overworld/019.2bpp" ; c1b00
-MortySpriteGFX:        INCBIN "gfx/overworld/020.2bpp" ; c1c80
-ChuckSpriteGFX:        INCBIN "gfx/overworld/021.2bpp" ; c1e00
-JasmineSpriteGFX:      INCBIN "gfx/overworld/022.2bpp" ; c1f80
-PryceSpriteGFX:        INCBIN "gfx/overworld/023.2bpp" ; c2100
-ClairSpriteGFX:        INCBIN "gfx/overworld/024.2bpp" ; c2280
-BrockSpriteGFX:        INCBIN "gfx/overworld/025.2bpp" ; c2400
-KarenSpriteGFX:        INCBIN "gfx/overworld/026.2bpp" ; c2580
-BrunoSpriteGFX:        INCBIN "gfx/overworld/027.2bpp" ; c2640
-MistySpriteGFX:        INCBIN "gfx/overworld/028.2bpp" ; c27c0
-LanceSpriteGFX:        INCBIN "gfx/overworld/029.2bpp" ; c2940
-SurgeSpriteGFX:        INCBIN "gfx/overworld/030.2bpp" ; c2ac0
-ErikaSpriteGFX:        INCBIN "gfx/overworld/031.2bpp" ; c2c40
-KogaSpriteGFX:         INCBIN "gfx/overworld/032.2bpp" ; c2dc0
-SabrinaSpriteGFX:      INCBIN "gfx/overworld/033.2bpp" ; c2f40
-CooltrainerMSpriteGFX: INCBIN "gfx/overworld/034.2bpp" ; c30c0
-CooltrainerFSpriteGFX: INCBIN "gfx/overworld/035.2bpp" ; c3240
-BugCatcherSpriteGFX:   INCBIN "gfx/overworld/036.2bpp" ; c33c0
-TwinSpriteGFX:         INCBIN "gfx/overworld/037.2bpp" ; c3540
-YoungsterSpriteGFX:    INCBIN "gfx/overworld/038.2bpp" ; c36c0
-LassSpriteGFX:         INCBIN "gfx/overworld/039.2bpp" ; c3840
-TeacherSpriteGFX:      INCBIN "gfx/overworld/040.2bpp" ; c39c0
-BuenaSpriteGFX:        INCBIN "gfx/overworld/041.2bpp" ; c3b40
-SuperNerdSpriteGFX:    INCBIN "gfx/overworld/042.2bpp" ; c3cc0
-RockerSpriteGFX:       INCBIN "gfx/overworld/043.2bpp" ; c3e40
diff --git a/gfx/overworld/sprites_2.asm b/gfx/overworld/sprites_2.asm
deleted file mode 100644
index 20060d0c1..000000000
--- a/gfx/overworld/sprites_2.asm
+++ /dev/null
@@ -1,58 +0,0 @@
-PokefanMSpriteGFX:            INCBIN "gfx/overworld/044.2bpp" ; c4000
-PokefanFSpriteGFX:            INCBIN "gfx/overworld/045.2bpp" ; c4180
-GrampsSpriteGFX:              INCBIN "gfx/overworld/046.2bpp" ; c4300
-GrannySpriteGFX:              INCBIN "gfx/overworld/047.2bpp" ; c4480
-SwimmerGuySpriteGFX:          INCBIN "gfx/overworld/048.2bpp" ; c4600
-SwimmerGirlSpriteGFX:         INCBIN "gfx/overworld/049.2bpp" ; c4780
-BigSnorlaxSpriteGFX:          INCBIN "gfx/overworld/050.2bpp" ; c4900
-SurfingPikachuSpriteGFX:      INCBIN "gfx/overworld/051.2bpp" ; c4980
-RocketSpriteGFX:              INCBIN "gfx/overworld/052.2bpp" ; c4b00
-RocketGirlSpriteGFX:          INCBIN "gfx/overworld/053.2bpp" ; c4c80
-NurseSpriteGFX:               INCBIN "gfx/overworld/054.2bpp" ; c4e00
-LinkReceptionistSpriteGFX:    INCBIN "gfx/overworld/055.2bpp" ; c4ec0
-ClerkSpriteGFX:               INCBIN "gfx/overworld/056.2bpp" ; c5040
-FisherSpriteGFX:              INCBIN "gfx/overworld/057.2bpp" ; c51c0
-FishingGuruSpriteGFX:         INCBIN "gfx/overworld/058.2bpp" ; c5340
-ScientistSpriteGFX:           INCBIN "gfx/overworld/059.2bpp" ; c54c0
-KimonoGirlSpriteGFX:          INCBIN "gfx/overworld/060.2bpp" ; c5640
-SageSpriteGFX:                INCBIN "gfx/overworld/061.2bpp" ; c57c0
-UnusedGuySpriteGFX:           INCBIN "gfx/overworld/062.2bpp" ; c5940
-GentlemanSpriteGFX:           INCBIN "gfx/overworld/063.2bpp" ; c5ac0
-BlackBeltSpriteGFX:           INCBIN "gfx/overworld/064.2bpp" ; c5c40
-ReceptionistSpriteGFX:        INCBIN "gfx/overworld/065.2bpp" ; c5dc0
-OfficerSpriteGFX:             INCBIN "gfx/overworld/066.2bpp" ; c5f40
-CalSpriteGFX:                 INCBIN "gfx/overworld/067.2bpp" ; c60c0
-SlowpokeSpriteGFX:            INCBIN "gfx/overworld/068.2bpp" ; c6240
-CaptainSpriteGFX:             INCBIN "gfx/overworld/069.2bpp" ; c6280
-BigLaprasSpriteGFX:           INCBIN "gfx/overworld/070.2bpp" ; c6400
-GymGuySpriteGFX:              INCBIN "gfx/overworld/071.2bpp" ; c6480
-SailorSpriteGFX:              INCBIN "gfx/overworld/072.2bpp" ; c6600
-BikerSpriteGFX:               INCBIN "gfx/overworld/073.2bpp" ; c6780
-PharmacistSpriteGFX:          INCBIN "gfx/overworld/074.2bpp" ; c6900
-MonsterSpriteGFX:             INCBIN "gfx/overworld/075.2bpp" ; c6a80
-FairySpriteGFX:               INCBIN "gfx/overworld/076.2bpp" ; c6c00
-BirdSpriteGFX:                INCBIN "gfx/overworld/077.2bpp" ; c6d80
-DragonSpriteGFX:              INCBIN "gfx/overworld/078.2bpp" ; c6f00
-BigOnixSpriteGFX:             INCBIN "gfx/overworld/079.2bpp" ; c7080
-N64SpriteGFX:                 INCBIN "gfx/overworld/080.2bpp" ; c7140
-SudowoodoSpriteGFX:           INCBIN "gfx/overworld/081.2bpp" ; c7180
-SurfSpriteGFX:                INCBIN "gfx/overworld/082.2bpp" ; c7200
-PokeBallSpriteGFX:            INCBIN "gfx/overworld/083.2bpp" ; c7380
-PokedexSpriteGFX:             INCBIN "gfx/overworld/084.2bpp" ; c7500
-PaperSpriteGFX:               INCBIN "gfx/overworld/085.2bpp" ; c7680
-VirtualBoySpriteGFX:          INCBIN "gfx/overworld/086.2bpp" ; c7800
-OldLinkReceptionistSpriteGFX: INCBIN "gfx/overworld/087.2bpp" ; c7840
-RockSpriteGFX:                INCBIN "gfx/overworld/088.2bpp" ; c7880
-BoulderSpriteGFX:             INCBIN "gfx/overworld/089.2bpp" ; c78c0
-SnesSpriteGFX:                INCBIN "gfx/overworld/090.2bpp" ; c7900
-FamicomSpriteGFX:             INCBIN "gfx/overworld/091.2bpp" ; c7940
-FruitTreeSpriteGFX:           INCBIN "gfx/overworld/092.2bpp" ; c7980
-GoldTrophySpriteGFX:          INCBIN "gfx/overworld/093.2bpp" ; c79c0
-SilverTrophySpriteGFX:        INCBIN "gfx/overworld/094.2bpp" ; c7a00
-KrisSpriteGFX:                INCBIN "gfx/overworld/095.2bpp" ; c7a40
-KrisBikeSpriteGFX:            INCBIN "gfx/overworld/096.2bpp" ; c7bc0
-KurtOutsideSpriteGFX:         INCBIN "gfx/overworld/097.2bpp" ; c7d40
-SuicuneSpriteGFX:             INCBIN "gfx/overworld/098.2bpp" ; c7e00
-EnteiSpriteGFX:               INCBIN "gfx/overworld/099.2bpp" ; c7e40
-RaikouSpriteGFX:              INCBIN "gfx/overworld/100.2bpp" ; c7e80
-StandingYoungsterSpriteGFX:   INCBIN "gfx/overworld/101.2bpp" ; c7ec0
diff --git a/gfx/ow_fx/trainer_battle_pokeball_tiles.png b/gfx/overworld/trainer_battle_pokeball_tiles.png
index a4655d26e..a4655d26e 100644
--- a/gfx/ow_fx/trainer_battle_pokeball_tiles.png
+++ b/gfx/overworld/trainer_battle_pokeball_tiles.png
diff --git a/gfx/pics.asm b/gfx/pics.asm
index c48106e3c..7e0aebb5c 100644
--- a/gfx/pics.asm
+++ b/gfx/pics.asm
@@ -1,18 +1,21 @@
 INCLUDE "includes.asm"
 
 
-; Unown pic pointers are assumed to start at the same address in a different bank.
-
 SECTION "Pic Pointers", ROMX
+
 PicPointers:: INCLUDE "gfx/pics/pic_pointers.asm"
 
+
 SECTION "Unown Pic Pointers", ROMX
+
+; Unown pic pointers are assumed to start at the same address as PicPointers,
+; but in a different bank.
 UnownPicPointers:: INCLUDE "gfx/pics/unown_pic_pointers.asm"
 
 
 SECTION "Trainer Pic Pointers", ROMX
-TrainerPicPointers:: INCLUDE "gfx/pics/trainer_pic_pointers.asm"
 
+TrainerPicPointers:: INCLUDE "gfx/trainer_pic_pointers.asm"
 
 
 SECTION "Pics 1", ROMX
diff --git a/gfx/overworld/sprite_headers.asm b/gfx/sprite_headers.asm
index 095d7594b..095d7594b 100644
--- a/gfx/overworld/sprite_headers.asm
+++ b/gfx/sprite_headers.asm
diff --git a/gfx/sprites.asm b/gfx/sprites.asm
new file mode 100644
index 000000000..f7740d6a6
--- /dev/null
+++ b/gfx/sprites.asm
@@ -0,0 +1,108 @@
+SECTION "Sprites 1", ROMX
+
+ChrisSpriteGFX:               INCBIN "gfx/sprites/chris.2bpp" ; c0000
+ChrisBikeSpriteGFX:           INCBIN "gfx/sprites/chris_bike.2bpp" ; c0180
+GameboyKidSpriteGFX:          INCBIN "gfx/sprites/gameboy_kid.2bpp" ; c0300
+SilverSpriteGFX:              INCBIN "gfx/sprites/silver.2bpp" ; c03c0
+OakSpriteGFX:                 INCBIN "gfx/sprites/oak.2bpp" ; c0540
+RedSpriteGFX:                 INCBIN "gfx/sprites/red.2bpp" ; c06c0
+BlueSpriteGFX:                INCBIN "gfx/sprites/blue.2bpp" ; c0840
+BillSpriteGFX:                INCBIN "gfx/sprites/bill.2bpp" ; c09c0
+ElderSpriteGFX:               INCBIN "gfx/sprites/elder.2bpp" ; c0b40
+JanineSpriteGFX:              INCBIN "gfx/sprites/janine.2bpp" ; c0cc0
+KurtSpriteGFX:                INCBIN "gfx/sprites/kurt.2bpp" ; c0e40
+MomSpriteGFX:                 INCBIN "gfx/sprites/mom.2bpp" ; c0fc0
+BlaineSpriteGFX:              INCBIN "gfx/sprites/blaine.2bpp" ; c1140
+RedsMomSpriteGFX:             INCBIN "gfx/sprites/reds_mom.2bpp" ; c12c0
+DaisySpriteGFX:               INCBIN "gfx/sprites/daisy.2bpp" ; c1440
+ElmSpriteGFX:                 INCBIN "gfx/sprites/elm.2bpp" ; c15c0
+WillSpriteGFX:                INCBIN "gfx/sprites/will.2bpp" ; c1740
+FalknerSpriteGFX:             INCBIN "gfx/sprites/falkner.2bpp" ; c1800
+WhitneySpriteGFX:             INCBIN "gfx/sprites/whitney.2bpp" ; c1980
+BugsySpriteGFX:               INCBIN "gfx/sprites/bugsy.2bpp" ; c1b00
+MortySpriteGFX:               INCBIN "gfx/sprites/morty.2bpp" ; c1c80
+ChuckSpriteGFX:               INCBIN "gfx/sprites/chuck.2bpp" ; c1e00
+JasmineSpriteGFX:             INCBIN "gfx/sprites/jasmine.2bpp" ; c1f80
+PryceSpriteGFX:               INCBIN "gfx/sprites/pryce.2bpp" ; c2100
+ClairSpriteGFX:               INCBIN "gfx/sprites/clair.2bpp" ; c2280
+BrockSpriteGFX:               INCBIN "gfx/sprites/brock.2bpp" ; c2400
+KarenSpriteGFX:               INCBIN "gfx/sprites/karen.2bpp" ; c2580
+BrunoSpriteGFX:               INCBIN "gfx/sprites/bruno.2bpp" ; c2640
+MistySpriteGFX:               INCBIN "gfx/sprites/misty.2bpp" ; c27c0
+LanceSpriteGFX:               INCBIN "gfx/sprites/lance.2bpp" ; c2940
+SurgeSpriteGFX:               INCBIN "gfx/sprites/surge.2bpp" ; c2ac0
+ErikaSpriteGFX:               INCBIN "gfx/sprites/erika.2bpp" ; c2c40
+KogaSpriteGFX:                INCBIN "gfx/sprites/koga.2bpp" ; c2dc0
+SabrinaSpriteGFX:             INCBIN "gfx/sprites/sabrina.2bpp" ; c2f40
+CooltrainerMSpriteGFX:        INCBIN "gfx/sprites/cooltrainer_m.2bpp" ; c30c0
+CooltrainerFSpriteGFX:        INCBIN "gfx/sprites/cooltrainer_f.2bpp" ; c3240
+BugCatcherSpriteGFX:          INCBIN "gfx/sprites/bug_catcher.2bpp" ; c33c0
+TwinSpriteGFX:                INCBIN "gfx/sprites/twin.2bpp" ; c3540
+YoungsterSpriteGFX:           INCBIN "gfx/sprites/youngster.2bpp" ; c36c0
+LassSpriteGFX:                INCBIN "gfx/sprites/lass.2bpp" ; c3840
+TeacherSpriteGFX:             INCBIN "gfx/sprites/teacher.2bpp" ; c39c0
+BuenaSpriteGFX:               INCBIN "gfx/sprites/buena.2bpp" ; c3b40
+SuperNerdSpriteGFX:           INCBIN "gfx/sprites/super_nerd.2bpp" ; c3cc0
+RockerSpriteGFX:              INCBIN "gfx/sprites/rocker.2bpp" ; c3e40
+
+
+SECTION "Sprites 2", ROMX
+
+PokefanMSpriteGFX:            INCBIN "gfx/sprites/pokefan_m.2bpp" ; c4000
+PokefanFSpriteGFX:            INCBIN "gfx/sprites/pokefan_f.2bpp" ; c4180
+GrampsSpriteGFX:              INCBIN "gfx/sprites/gramps.2bpp" ; c4300
+GrannySpriteGFX:              INCBIN "gfx/sprites/granny.2bpp" ; c4480
+SwimmerGuySpriteGFX:          INCBIN "gfx/sprites/swimmer_guy.2bpp" ; c4600
+SwimmerGirlSpriteGFX:         INCBIN "gfx/sprites/swimmer_girl.2bpp" ; c4780
+BigSnorlaxSpriteGFX:          INCBIN "gfx/sprites/big_snorlax.2bpp" ; c4900
+SurfingPikachuSpriteGFX:      INCBIN "gfx/sprites/surfing_pikachu.2bpp" ; c4980
+RocketSpriteGFX:              INCBIN "gfx/sprites/rocket.2bpp" ; c4b00
+RocketGirlSpriteGFX:          INCBIN "gfx/sprites/rocket_girl.2bpp" ; c4c80
+NurseSpriteGFX:               INCBIN "gfx/sprites/nurse.2bpp" ; c4e00
+LinkReceptionistSpriteGFX:    INCBIN "gfx/sprites/link_receptionist.2bpp" ; c4ec0
+ClerkSpriteGFX:               INCBIN "gfx/sprites/clerk.2bpp" ; c5040
+FisherSpriteGFX:              INCBIN "gfx/sprites/fisher.2bpp" ; c51c0
+FishingGuruSpriteGFX:         INCBIN "gfx/sprites/fishing_guru.2bpp" ; c5340
+ScientistSpriteGFX:           INCBIN "gfx/sprites/scientist.2bpp" ; c54c0
+KimonoGirlSpriteGFX:          INCBIN "gfx/sprites/kimono_girl.2bpp" ; c5640
+SageSpriteGFX:                INCBIN "gfx/sprites/sage.2bpp" ; c57c0
+UnusedGuySpriteGFX:           INCBIN "gfx/sprites/unused_guy.2bpp" ; c5940
+GentlemanSpriteGFX:           INCBIN "gfx/sprites/gentleman.2bpp" ; c5ac0
+BlackBeltSpriteGFX:           INCBIN "gfx/sprites/black_belt.2bpp" ; c5c40
+ReceptionistSpriteGFX:        INCBIN "gfx/sprites/receptionist.2bpp" ; c5dc0
+OfficerSpriteGFX:             INCBIN "gfx/sprites/officer.2bpp" ; c5f40
+CalSpriteGFX:                 INCBIN "gfx/sprites/cal.2bpp" ; c60c0
+SlowpokeSpriteGFX:            INCBIN "gfx/sprites/slowpoke.2bpp" ; c6240
+CaptainSpriteGFX:             INCBIN "gfx/sprites/captain.2bpp" ; c6280
+BigLaprasSpriteGFX:           INCBIN "gfx/sprites/big_lapras.2bpp" ; c6400
+GymGuySpriteGFX:              INCBIN "gfx/sprites/gym_guy.2bpp" ; c6480
+SailorSpriteGFX:              INCBIN "gfx/sprites/sailor.2bpp" ; c6600
+BikerSpriteGFX:               INCBIN "gfx/sprites/biker.2bpp" ; c6780
+PharmacistSpriteGFX:          INCBIN "gfx/sprites/pharmacist.2bpp" ; c6900
+MonsterSpriteGFX:             INCBIN "gfx/sprites/monster.2bpp" ; c6a80
+FairySpriteGFX:               INCBIN "gfx/sprites/fairy.2bpp" ; c6c00
+BirdSpriteGFX:                INCBIN "gfx/sprites/bird.2bpp" ; c6d80
+DragonSpriteGFX:              INCBIN "gfx/sprites/dragon.2bpp" ; c6f00
+BigOnixSpriteGFX:             INCBIN "gfx/sprites/big_onix.2bpp" ; c7080
+N64SpriteGFX:                 INCBIN "gfx/sprites/n64.2bpp" ; c7140
+SudowoodoSpriteGFX:           INCBIN "gfx/sprites/sudowoodo.2bpp" ; c7180
+SurfSpriteGFX:                INCBIN "gfx/sprites/surf.2bpp" ; c7200
+PokeBallSpriteGFX:            INCBIN "gfx/sprites/poke_ball.2bpp" ; c7380
+PokedexSpriteGFX:             INCBIN "gfx/sprites/pokedex.2bpp" ; c7500
+PaperSpriteGFX:               INCBIN "gfx/sprites/paper.2bpp" ; c7680
+VirtualBoySpriteGFX:          INCBIN "gfx/sprites/virtual_boy.2bpp" ; c7800
+OldLinkReceptionistSpriteGFX: INCBIN "gfx/sprites/old_link_receptionist.2bpp" ; c7840
+RockSpriteGFX:                INCBIN "gfx/sprites/rock.2bpp" ; c7880
+BoulderSpriteGFX:             INCBIN "gfx/sprites/boulder.2bpp" ; c78c0
+SnesSpriteGFX:                INCBIN "gfx/sprites/snes.2bpp" ; c7900
+FamicomSpriteGFX:             INCBIN "gfx/sprites/famicom.2bpp" ; c7940
+FruitTreeSpriteGFX:           INCBIN "gfx/sprites/fruit_tree.2bpp" ; c7980
+GoldTrophySpriteGFX:          INCBIN "gfx/sprites/gold_trophy.2bpp" ; c79c0
+SilverTrophySpriteGFX:        INCBIN "gfx/sprites/silver_trophy.2bpp" ; c7a00
+KrisSpriteGFX:                INCBIN "gfx/sprites/kris.2bpp" ; c7a40
+KrisBikeSpriteGFX:            INCBIN "gfx/sprites/kris_bike.2bpp" ; c7bc0
+KurtOutsideSpriteGFX:         INCBIN "gfx/sprites/kurt_outside.2bpp" ; c7d40
+SuicuneSpriteGFX:             INCBIN "gfx/sprites/suicune.2bpp" ; c7e00
+EnteiSpriteGFX:               INCBIN "gfx/sprites/entei.2bpp" ; c7e40
+RaikouSpriteGFX:              INCBIN "gfx/sprites/raikou.2bpp" ; c7e80
+StandingYoungsterSpriteGFX:   INCBIN "gfx/sprites/standing_youngster.2bpp" ; c7ec0
diff --git a/gfx/overworld/070.png b/gfx/sprites/big_lapras.png
index 45f27649e..45f27649e 100644
--- a/gfx/overworld/070.png
+++ b/gfx/sprites/big_lapras.png
diff --git a/gfx/overworld/079.png b/gfx/sprites/big_onix.png
index 7996be17e..7996be17e 100644
--- a/gfx/overworld/079.png
+++ b/gfx/sprites/big_onix.png
diff --git a/gfx/overworld/050.png b/gfx/sprites/big_snorlax.png
index f53f71105..f53f71105 100644
--- a/gfx/overworld/050.png
+++ b/gfx/sprites/big_snorlax.png
diff --git a/gfx/overworld/073.png b/gfx/sprites/biker.png
index 5d056cf42..5d056cf42 100644
--- a/gfx/overworld/073.png
+++ b/gfx/sprites/biker.png
diff --git a/gfx/overworld/007.png b/gfx/sprites/bill.png
index d72bb7ba1..d72bb7ba1 100644
--- a/gfx/overworld/007.png
+++ b/gfx/sprites/bill.png
diff --git a/gfx/overworld/077.png b/gfx/sprites/bird.png
index 9e2009940..9e2009940 100644
--- a/gfx/overworld/077.png
+++ b/gfx/sprites/bird.png
diff --git a/gfx/overworld/064.png b/gfx/sprites/black_belt.png
index 9aec228c5..9aec228c5 100644
--- a/gfx/overworld/064.png
+++ b/gfx/sprites/black_belt.png
diff --git a/gfx/overworld/012.png b/gfx/sprites/blaine.png
index 6ce1f3092..6ce1f3092 100644
--- a/gfx/overworld/012.png
+++ b/gfx/sprites/blaine.png
diff --git a/gfx/overworld/006.png b/gfx/sprites/blue.png
index 17fc2fdc6..17fc2fdc6 100644
--- a/gfx/overworld/006.png
+++ b/gfx/sprites/blue.png
diff --git a/gfx/overworld/089.png b/gfx/sprites/boulder.png
index 9b408e021..9b408e021 100644
--- a/gfx/overworld/089.png
+++ b/gfx/sprites/boulder.png
diff --git a/gfx/overworld/025.png b/gfx/sprites/brock.png
index f9f8ec431..f9f8ec431 100644
--- a/gfx/overworld/025.png
+++ b/gfx/sprites/brock.png
diff --git a/gfx/overworld/027.png b/gfx/sprites/bruno.png
index 5f77217ef..5f77217ef 100644
--- a/gfx/overworld/027.png
+++ b/gfx/sprites/bruno.png
diff --git a/gfx/overworld/041.png b/gfx/sprites/buena.png
index af5a7e7e7..af5a7e7e7 100644
--- a/gfx/overworld/041.png
+++ b/gfx/sprites/buena.png
diff --git a/gfx/overworld/036.png b/gfx/sprites/bug_catcher.png
index e1306b6a0..e1306b6a0 100644
--- a/gfx/overworld/036.png
+++ b/gfx/sprites/bug_catcher.png
diff --git a/gfx/overworld/019.png b/gfx/sprites/bugsy.png
index b528045b5..b528045b5 100644
--- a/gfx/overworld/019.png
+++ b/gfx/sprites/bugsy.png
diff --git a/gfx/overworld/067.png b/gfx/sprites/cal.png
index 9dfe77ff4..9dfe77ff4 100644
--- a/gfx/overworld/067.png
+++ b/gfx/sprites/cal.png
diff --git a/gfx/overworld/069.png b/gfx/sprites/captain.png
index 7408cbbbc..7408cbbbc 100644
--- a/gfx/overworld/069.png
+++ b/gfx/sprites/captain.png
diff --git a/gfx/overworld/000.png b/gfx/sprites/chris.png
index 1050bb02c..1050bb02c 100644
--- a/gfx/overworld/000.png
+++ b/gfx/sprites/chris.png
diff --git a/gfx/overworld/001.png b/gfx/sprites/chris_bike.png
index 0d18d11a6..0d18d11a6 100644
--- a/gfx/overworld/001.png
+++ b/gfx/sprites/chris_bike.png
diff --git a/gfx/overworld/021.png b/gfx/sprites/chuck.png
index 54300be2d..54300be2d 100644
--- a/gfx/overworld/021.png
+++ b/gfx/sprites/chuck.png
diff --git a/gfx/overworld/024.png b/gfx/sprites/clair.png
index c4e721b75..c4e721b75 100644
--- a/gfx/overworld/024.png
+++ b/gfx/sprites/clair.png
diff --git a/gfx/overworld/056.png b/gfx/sprites/clerk.png
index 77a5fb914..77a5fb914 100644
--- a/gfx/overworld/056.png
+++ b/gfx/sprites/clerk.png
diff --git a/gfx/overworld/035.png b/gfx/sprites/cooltrainer_f.png
index 53bf81b13..53bf81b13 100644
--- a/gfx/overworld/035.png
+++ b/gfx/sprites/cooltrainer_f.png
diff --git a/gfx/overworld/034.png b/gfx/sprites/cooltrainer_m.png
index ffd94f410..ffd94f410 100644
--- a/gfx/overworld/034.png
+++ b/gfx/sprites/cooltrainer_m.png
diff --git a/gfx/overworld/014.png b/gfx/sprites/daisy.png
index 84f330f1d..84f330f1d 100644
--- a/gfx/overworld/014.png
+++ b/gfx/sprites/daisy.png
diff --git a/gfx/overworld/078.png b/gfx/sprites/dragon.png
index 3b6c621b8..3b6c621b8 100644
--- a/gfx/overworld/078.png
+++ b/gfx/sprites/dragon.png
diff --git a/gfx/overworld/008.png b/gfx/sprites/elder.png
index 90b499f16..90b499f16 100644
--- a/gfx/overworld/008.png
+++ b/gfx/sprites/elder.png
diff --git a/gfx/overworld/015.png b/gfx/sprites/elm.png
index ed1439b69..ed1439b69 100644
--- a/gfx/overworld/015.png
+++ b/gfx/sprites/elm.png
diff --git a/gfx/overworld/099.png b/gfx/sprites/entei.png
index 1ff4fd63c..1ff4fd63c 100644
--- a/gfx/overworld/099.png
+++ b/gfx/sprites/entei.png
diff --git a/gfx/overworld/031.png b/gfx/sprites/erika.png
index 22c157d82..22c157d82 100644
--- a/gfx/overworld/031.png
+++ b/gfx/sprites/erika.png
diff --git a/gfx/overworld/076.png b/gfx/sprites/fairy.png
index 06fe00768..06fe00768 100644
--- a/gfx/overworld/076.png
+++ b/gfx/sprites/fairy.png
diff --git a/gfx/overworld/017.png b/gfx/sprites/falkner.png
index a9bc75dbd..a9bc75dbd 100644
--- a/gfx/overworld/017.png
+++ b/gfx/sprites/falkner.png
diff --git a/gfx/overworld/091.png b/gfx/sprites/famicom.png
index 15ff22d0a..15ff22d0a 100644
--- a/gfx/overworld/091.png
+++ b/gfx/sprites/famicom.png
diff --git a/gfx/overworld/057.png b/gfx/sprites/fisher.png
index a84a2e371..a84a2e371 100644
--- a/gfx/overworld/057.png
+++ b/gfx/sprites/fisher.png
diff --git a/gfx/overworld/058.png b/gfx/sprites/fishing_guru.png
index 748444f8e..748444f8e 100644
--- a/gfx/overworld/058.png
+++ b/gfx/sprites/fishing_guru.png
diff --git a/gfx/overworld/092.png b/gfx/sprites/fruit_tree.png
index b27633907..b27633907 100644
--- a/gfx/overworld/092.png
+++ b/gfx/sprites/fruit_tree.png
diff --git a/gfx/overworld/002.png b/gfx/sprites/gameboy_kid.png
index 0ca4acef9..0ca4acef9 100644
--- a/gfx/overworld/002.png
+++ b/gfx/sprites/gameboy_kid.png
diff --git a/gfx/overworld/063.png b/gfx/sprites/gentleman.png
index 38a6125d2..38a6125d2 100644
--- a/gfx/overworld/063.png
+++ b/gfx/sprites/gentleman.png
diff --git a/gfx/overworld/093.png b/gfx/sprites/gold_trophy.png
index cc12f9f34..cc12f9f34 100644
--- a/gfx/overworld/093.png
+++ b/gfx/sprites/gold_trophy.png
diff --git a/gfx/overworld/046.png b/gfx/sprites/gramps.png
index abe61a31d..abe61a31d 100644
--- a/gfx/overworld/046.png
+++ b/gfx/sprites/gramps.png
diff --git a/gfx/overworld/047.png b/gfx/sprites/granny.png
index 763b2a2b1..763b2a2b1 100644
--- a/gfx/overworld/047.png
+++ b/gfx/sprites/granny.png
diff --git a/gfx/overworld/071.png b/gfx/sprites/gym_guy.png
index a1f74da03..a1f74da03 100644
--- a/gfx/overworld/071.png
+++ b/gfx/sprites/gym_guy.png
diff --git a/gfx/overworld/009.png b/gfx/sprites/janine.png
index b49f8e573..b49f8e573 100644
--- a/gfx/overworld/009.png
+++ b/gfx/sprites/janine.png
diff --git a/gfx/overworld/022.png b/gfx/sprites/jasmine.png
index 0d8be19ec..0d8be19ec 100644
--- a/gfx/overworld/022.png
+++ b/gfx/sprites/jasmine.png
diff --git a/gfx/overworld/026.png b/gfx/sprites/karen.png
index 8b95fb3fc..8b95fb3fc 100644
--- a/gfx/overworld/026.png
+++ b/gfx/sprites/karen.png
diff --git a/gfx/overworld/060.png b/gfx/sprites/kimono_girl.png
index 0ea041f5b..0ea041f5b 100644
--- a/gfx/overworld/060.png
+++ b/gfx/sprites/kimono_girl.png
diff --git a/gfx/overworld/032.png b/gfx/sprites/koga.png
index 8afd066bd..8afd066bd 100644
--- a/gfx/overworld/032.png
+++ b/gfx/sprites/koga.png
diff --git a/gfx/overworld/095.png b/gfx/sprites/kris.png
index d4339470e..d4339470e 100644
--- a/gfx/overworld/095.png
+++ b/gfx/sprites/kris.png
diff --git a/gfx/overworld/096.png b/gfx/sprites/kris_bike.png
index 161ce5722..161ce5722 100644
--- a/gfx/overworld/096.png
+++ b/gfx/sprites/kris_bike.png
diff --git a/gfx/overworld/010.png b/gfx/sprites/kurt.png
index bd7fc20ea..bd7fc20ea 100644
--- a/gfx/overworld/010.png
+++ b/gfx/sprites/kurt.png
diff --git a/gfx/overworld/097.png b/gfx/sprites/kurt_outside.png
index 69e46b84c..69e46b84c 100644
--- a/gfx/overworld/097.png
+++ b/gfx/sprites/kurt_outside.png
diff --git a/gfx/overworld/029.png b/gfx/sprites/lance.png
index 5a2372dfa..5a2372dfa 100644
--- a/gfx/overworld/029.png
+++ b/gfx/sprites/lance.png
diff --git a/gfx/overworld/039.png b/gfx/sprites/lass.png
index 762108ad5..762108ad5 100644
--- a/gfx/overworld/039.png
+++ b/gfx/sprites/lass.png
diff --git a/gfx/overworld/055.png b/gfx/sprites/link_receptionist.png
index b6c98bbef..b6c98bbef 100644
--- a/gfx/overworld/055.png
+++ b/gfx/sprites/link_receptionist.png
diff --git a/gfx/overworld/028.png b/gfx/sprites/misty.png
index 8b9857a85..8b9857a85 100644
--- a/gfx/overworld/028.png
+++ b/gfx/sprites/misty.png
diff --git a/gfx/overworld/011.png b/gfx/sprites/mom.png
index 36010c92d..36010c92d 100644
--- a/gfx/overworld/011.png
+++ b/gfx/sprites/mom.png
diff --git a/gfx/overworld/075.png b/gfx/sprites/monster.png
index 80d615b2e..80d615b2e 100644
--- a/gfx/overworld/075.png
+++ b/gfx/sprites/monster.png
diff --git a/gfx/overworld/020.png b/gfx/sprites/morty.png
index dcee550e0..dcee550e0 100644
--- a/gfx/overworld/020.png
+++ b/gfx/sprites/morty.png
diff --git a/gfx/overworld/080.png b/gfx/sprites/n64.png
index 6d2bdc8d7..6d2bdc8d7 100644
--- a/gfx/overworld/080.png
+++ b/gfx/sprites/n64.png
diff --git a/gfx/overworld/054.png b/gfx/sprites/nurse.png
index 4cd71fcfc..4cd71fcfc 100644
--- a/gfx/overworld/054.png
+++ b/gfx/sprites/nurse.png
diff --git a/gfx/overworld/004.png b/gfx/sprites/oak.png
index 7a76574d0..7a76574d0 100644
--- a/gfx/overworld/004.png
+++ b/gfx/sprites/oak.png
diff --git a/gfx/overworld/066.png b/gfx/sprites/officer.png
index f62252038..f62252038 100644
--- a/gfx/overworld/066.png
+++ b/gfx/sprites/officer.png
diff --git a/gfx/overworld/087.png b/gfx/sprites/old_link_receptionist.png
index fad0eedd8..fad0eedd8 100644
--- a/gfx/overworld/087.png
+++ b/gfx/sprites/old_link_receptionist.png
diff --git a/gfx/overworld/085.png b/gfx/sprites/paper.png
index da171b3b2..da171b3b2 100644
--- a/gfx/overworld/085.png
+++ b/gfx/sprites/paper.png
diff --git a/gfx/overworld/074.png b/gfx/sprites/pharmacist.png
index ed0fa1d28..ed0fa1d28 100644
--- a/gfx/overworld/074.png
+++ b/gfx/sprites/pharmacist.png
diff --git a/gfx/overworld/083.png b/gfx/sprites/poke_ball.png
index b12bf897c..b12bf897c 100644
--- a/gfx/overworld/083.png
+++ b/gfx/sprites/poke_ball.png
diff --git a/gfx/overworld/084.png b/gfx/sprites/pokedex.png
index 63846bfad..63846bfad 100644
--- a/gfx/overworld/084.png
+++ b/gfx/sprites/pokedex.png
diff --git a/gfx/overworld/045.png b/gfx/sprites/pokefan_f.png
index aa1fbc06f..aa1fbc06f 100644
--- a/gfx/overworld/045.png
+++ b/gfx/sprites/pokefan_f.png
diff --git a/gfx/overworld/044.png b/gfx/sprites/pokefan_m.png
index fea7979d3..fea7979d3 100644
--- a/gfx/overworld/044.png
+++ b/gfx/sprites/pokefan_m.png
diff --git a/gfx/overworld/023.png b/gfx/sprites/pryce.png
index 69f152a3c..69f152a3c 100644
--- a/gfx/overworld/023.png
+++ b/gfx/sprites/pryce.png
diff --git a/gfx/overworld/100.png b/gfx/sprites/raikou.png
index 4a5f1f186..4a5f1f186 100644
--- a/gfx/overworld/100.png
+++ b/gfx/sprites/raikou.png
diff --git a/gfx/overworld/065.png b/gfx/sprites/receptionist.png
index 0d102b04a..0d102b04a 100644
--- a/gfx/overworld/065.png
+++ b/gfx/sprites/receptionist.png
diff --git a/gfx/overworld/005.png b/gfx/sprites/red.png
index 018b676f5..018b676f5 100644
--- a/gfx/overworld/005.png
+++ b/gfx/sprites/red.png
diff --git a/gfx/overworld/013.png b/gfx/sprites/reds_mom.png
index 5644764c0..5644764c0 100644
--- a/gfx/overworld/013.png
+++ b/gfx/sprites/reds_mom.png
diff --git a/gfx/overworld/088.png b/gfx/sprites/rock.png
index 5a614d7bb..5a614d7bb 100644
--- a/gfx/overworld/088.png
+++ b/gfx/sprites/rock.png
diff --git a/gfx/overworld/043.png b/gfx/sprites/rocker.png
index 50ac2089e..50ac2089e 100644
--- a/gfx/overworld/043.png
+++ b/gfx/sprites/rocker.png
diff --git a/gfx/overworld/052.png b/gfx/sprites/rocket.png
index 43a71bd6e..43a71bd6e 100644
--- a/gfx/overworld/052.png
+++ b/gfx/sprites/rocket.png
diff --git a/gfx/overworld/053.png b/gfx/sprites/rocket_girl.png
index b8714ba6f..b8714ba6f 100644
--- a/gfx/overworld/053.png
+++ b/gfx/sprites/rocket_girl.png
diff --git a/gfx/overworld/033.png b/gfx/sprites/sabrina.png
index ef29e27d5..ef29e27d5 100644
--- a/gfx/overworld/033.png
+++ b/gfx/sprites/sabrina.png
diff --git a/gfx/overworld/061.png b/gfx/sprites/sage.png
index 802230467..802230467 100644
--- a/gfx/overworld/061.png
+++ b/gfx/sprites/sage.png
diff --git a/gfx/overworld/072.png b/gfx/sprites/sailor.png
index b4d3b5f2a..b4d3b5f2a 100644
--- a/gfx/overworld/072.png
+++ b/gfx/sprites/sailor.png
diff --git a/gfx/overworld/059.png b/gfx/sprites/scientist.png
index 39c44291e..39c44291e 100644
--- a/gfx/overworld/059.png
+++ b/gfx/sprites/scientist.png
diff --git a/gfx/overworld/003.png b/gfx/sprites/silver.png
index 7d82d400c..7d82d400c 100644
--- a/gfx/overworld/003.png
+++ b/gfx/sprites/silver.png
diff --git a/gfx/overworld/094.png b/gfx/sprites/silver_trophy.png
index 458cda431..458cda431 100644
--- a/gfx/overworld/094.png
+++ b/gfx/sprites/silver_trophy.png
diff --git a/gfx/overworld/068.png b/gfx/sprites/slowpoke.png
index d651ad3e6..d651ad3e6 100644
--- a/gfx/overworld/068.png
+++ b/gfx/sprites/slowpoke.png
diff --git a/gfx/overworld/090.png b/gfx/sprites/snes.png
index 4eaae4591..4eaae4591 100644
--- a/gfx/overworld/090.png
+++ b/gfx/sprites/snes.png
diff --git a/gfx/overworld/101.png b/gfx/sprites/standing_youngster.png
index 61a8b79c6..61a8b79c6 100644
--- a/gfx/overworld/101.png
+++ b/gfx/sprites/standing_youngster.png
diff --git a/gfx/overworld/081.png b/gfx/sprites/sudowoodo.png
index 9354f928b..9354f928b 100644
--- a/gfx/overworld/081.png
+++ b/gfx/sprites/sudowoodo.png
diff --git a/gfx/overworld/098.png b/gfx/sprites/suicune.png
index c3aef5c6c..c3aef5c6c 100644
--- a/gfx/overworld/098.png
+++ b/gfx/sprites/suicune.png
diff --git a/gfx/overworld/042.png b/gfx/sprites/super_nerd.png
index 6866c7b30..6866c7b30 100644
--- a/gfx/overworld/042.png
+++ b/gfx/sprites/super_nerd.png
diff --git a/gfx/overworld/082.png b/gfx/sprites/surf.png
index d124616b0..d124616b0 100644
--- a/gfx/overworld/082.png
+++ b/gfx/sprites/surf.png
diff --git a/gfx/overworld/051.png b/gfx/sprites/surfing_pikachu.png
index e6a3d7d03..e6a3d7d03 100644
--- a/gfx/overworld/051.png
+++ b/gfx/sprites/surfing_pikachu.png
diff --git a/gfx/overworld/030.png b/gfx/sprites/surge.png
index ae165c7ab..ae165c7ab 100644
--- a/gfx/overworld/030.png
+++ b/gfx/sprites/surge.png
diff --git a/gfx/overworld/049.png b/gfx/sprites/swimmer_girl.png
index eed753ab2..eed753ab2 100644
--- a/gfx/overworld/049.png
+++ b/gfx/sprites/swimmer_girl.png
diff --git a/gfx/overworld/048.png b/gfx/sprites/swimmer_guy.png
index 4c1818b2b..4c1818b2b 100644
--- a/gfx/overworld/048.png
+++ b/gfx/sprites/swimmer_guy.png
diff --git a/gfx/overworld/040.png b/gfx/sprites/teacher.png
index 2107159e9..2107159e9 100644
--- a/gfx/overworld/040.png
+++ b/gfx/sprites/teacher.png
diff --git a/gfx/overworld/037.png b/gfx/sprites/twin.png
index caa9f43af..caa9f43af 100644
--- a/gfx/overworld/037.png
+++ b/gfx/sprites/twin.png
diff --git a/gfx/overworld/062.png b/gfx/sprites/unused_guy.png
index d979b9a6e..d979b9a6e 100644
--- a/gfx/overworld/062.png
+++ b/gfx/sprites/unused_guy.png
diff --git a/gfx/overworld/086.png b/gfx/sprites/virtual_boy.png
index dba7dc130..dba7dc130 100644
--- a/gfx/overworld/086.png
+++ b/gfx/sprites/virtual_boy.png
diff --git a/gfx/overworld/018.png b/gfx/sprites/whitney.png
index ff8b28b98..ff8b28b98 100644
--- a/gfx/overworld/018.png
+++ b/gfx/sprites/whitney.png
diff --git a/gfx/overworld/016.png b/gfx/sprites/will.png
index 5229bb404..5229bb404 100644
--- a/gfx/overworld/016.png
+++ b/gfx/sprites/will.png
diff --git a/gfx/overworld/038.png b/gfx/sprites/youngster.png
index 5c0d33939..5c0d33939 100644
--- a/gfx/overworld/038.png
+++ b/gfx/sprites/youngster.png
diff --git a/gfx/trainers/palette_pointers.asm b/gfx/trainer_palettes.asm
index 6dbf13983..6dbf13983 100644
--- a/gfx/trainers/palette_pointers.asm
+++ b/gfx/trainer_palettes.asm
diff --git a/gfx/pics/trainer_pic_pointers.asm b/gfx/trainer_pic_pointers.asm
index 4c1db41d5..4c1db41d5 100644
--- a/gfx/pics/trainer_pic_pointers.asm
+++ b/gfx/trainer_pic_pointers.asm
diff --git a/main.asm b/main.asm
index 525fa26b9..a3161f7a6 100644
--- a/main.asm
+++ b/main.asm
@@ -5062,13 +5062,9 @@ StartBattleWithMapTrainerScript: ; 0xbe68a
 AlreadyBeatenTrainerScript:
 	scripttalkafter
 
-SECTION "bank30", ROMX
 
-INCLUDE "gfx/overworld/sprites_1.asm"
+INCLUDE "gfx/sprites.asm"
 
-SECTION "bank31", ROMX
-
-INCLUDE "gfx/overworld/sprites_2.asm"
 
 SECTION "bank32", ROMX
 
diff --git a/misc/gfx_41.asm b/misc/gfx_41.asm
index 8f128a7bd..f627c85ff 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/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"
+JumpShadowGFX:  INCBIN "gfx/overworld/shadow.2bpp"
+FishingRodGFX:  INCBIN "gfx/overworld/fishing_rod.2bpp"
+BoulderDustGFX: INCBIN "gfx/overworld/boulder_dust.2bpp"
+GrassRustleGFX: INCBIN "gfx/overworld/grass_rustle.2bpp"
diff --git a/pokecrystal.link b/pokecrystal.link
index 9bd693e0f..555a61123 100644
--- a/pokecrystal.link
+++ b/pokecrystal.link
@@ -129,9 +129,9 @@ ROMX $2e
 ROMX $2f
 	"bank2F"
 ROMX $30
-	"bank30"
+	"Sprites 1"
 ROMX $31
-	"bank31"
+	"Sprites 2"
 ROMX $32
 	"bank32"
 ROMX $33