Rename overworld sprite files, consistent with their constants

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

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

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

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

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

engine/overworld.asm

@@ -1477,5 +1477,5 @@ Group20Sprites: ; 1472b
 
 
 SpriteHeaders: ; 14736
-INCLUDE "gfx/overworld/sprite_headers.asm"
+INCLUDE "gfx/sprite_headers.asm"
 ; 1499a

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

gfx/overworld/sprites_1.asm

@@ -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

gfx/overworld/sprites_2.asm

@@ -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