Moved old mon graphics to its own folder so it's easier for the script to run

front_palette.py

@@ -66,4 +66,4 @@ def apply_front_palettes(ow_dir, project_root=''):
 
 
 if __name__ == '__main__':
-    apply_front_palettes('overworld')
+    apply_front_palettes('graphics/object_events/pics/pokemon')

spritesheet_rules.mk

@@ -406,67 +406,67 @@ $(OBJEVENTGFXDIR)/people/youngster.4bpp: %.4bpp: %.png
 
 
 
-$(OBJEVENTGFXDIR)/pokemon/azumarill_old.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon_old/azumarill.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(OBJEVENTGFXDIR)/pokemon/azurill_old.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon_old/azurill.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(OBJEVENTGFXDIR)/pokemon/deoxys_old.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon_old/deoxys.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(OBJEVENTGFXDIR)/pokemon/dusclops_old.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon_old/dusclops.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(OBJEVENTGFXDIR)/pokemon/enemy_zigzagoon.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon_old/enemy_zigzagoon.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(OBJEVENTGFXDIR)/pokemon/groudon_old.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon_old/groudon.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(OBJEVENTGFXDIR)/pokemon/ho_oh_old.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon_old/ho_oh.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(OBJEVENTGFXDIR)/pokemon/kecleon_old.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon_old/kecleon.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(OBJEVENTGFXDIR)/pokemon/kirlia_old.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon_old/kirlia.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(OBJEVENTGFXDIR)/pokemon/kyogre_old.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon_old/kyogre.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(OBJEVENTGFXDIR)/pokemon/latias_latios.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon_old/latias_latios.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(OBJEVENTGFXDIR)/pokemon/lugia_old.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon_old/lugia.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(OBJEVENTGFXDIR)/pokemon/mew_old.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon_old/mew.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(OBJEVENTGFXDIR)/pokemon/pikachu_old.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon_old/pikachu.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(OBJEVENTGFXDIR)/pokemon/poochyena_old.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon_old/poochyena.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(OBJEVENTGFXDIR)/pokemon/rayquaza_cutscene.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon_old/rayquaza_cutscene.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 8 -mheight 8
 
-$(OBJEVENTGFXDIR)/pokemon/skitty_old.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon_old/skitty.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(OBJEVENTGFXDIR)/pokemon/sudowoodo_tree.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon_old/sudowoodo_tree.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
-$(OBJEVENTGFXDIR)/pokemon/vigoroth_mover.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon_old/vigoroth_mover.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
-$(OBJEVENTGFXDIR)/pokemon/wingull_old.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon_old/wingull.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
-$(OBJEVENTGFXDIR)/pokemon/zigzagoon_old.4bpp: %.4bpp: %.png
+$(OBJEVENTGFXDIR)/pokemon_old/zigzagoon.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
 $(OBJEVENTGFXDIR)/misc/animated_ball.4bpp: %.4bpp: %.png

src/data/object_events/object_event_graphics.h

@@ -156,13 +156,13 @@ const u32 gObjectEventPic_Steven[] = INCBIN_U32("graphics/object_events/pics/peo
 const u32 gObjectEventPic_Wally[] = INCBIN_U32("graphics/object_events/pics/people/wally.4bpp");
 const u32 gObjectEventPic_RubySapphireLittleBoy[] = INCBIN_U32("graphics/object_events/pics/people/rs_little_boy.4bpp");
 const u32 gObjectEventPic_HotSpringsOldWoman[] = INCBIN_U32("graphics/object_events/pics/people/hot_springs_old_woman.4bpp");
-const u32 gObjectEventPic_LatiasLatios[] = INCBIN_U32("graphics/object_events/pics/pokemon/latias_latios.4bpp");
+const u32 gObjectEventPic_LatiasLatios[] = INCBIN_U32("graphics/object_events/pics/pokemon_old/latias_latios.4bpp");
 const u32 gObjectEventPic_GameboyKid[] = INCBIN_U32("graphics/object_events/pics/people/gameboy_kid.4bpp");
 const u32 gObjectEventPic_ContestJudge[] = INCBIN_U32("graphics/object_events/pics/people/contest_judge.4bpp");
 const u32 gObjectEventPic_Archie[] = INCBIN_U32("graphics/object_events/pics/people/team_aqua/archie.4bpp");
 const u32 gObjectEventPic_Maxie[] = INCBIN_U32("graphics/object_events/pics/people/team_magma/maxie.4bpp");
-const u32 gObjectEventPic_Regi[] = INCBIN_U32("graphics/object_events/pics/pokemon/regi.4bpp");
-const u32 gObjectEventPic_RayquazaStill[] = INCBIN_U32("graphics/object_events/pics/pokemon/rayquaza_still.4bpp");
+const u32 gObjectEventPic_Regi[] = INCBIN_U32("graphics/object_events/pics/pokemon_old/regi.4bpp");
+const u32 gObjectEventPic_RayquazaStill[] = INCBIN_U32("graphics/object_events/pics/pokemon_old/rayquaza_still.4bpp");
 const u32 gObjectEventPic_TuberMSwimming[] = INCBIN_U32("graphics/object_events/pics/people/tuber_m_swimming.4bpp");
 const u32 gObjectEventPic_Mom[] = INCBIN_U32("graphics/object_events/pics/people/mom.4bpp");
 const u16 gObjectEventPal_Kyogre[] = INCBIN_U16("graphics/object_events/palettes/kyogre.gbapal");
@@ -231,7 +231,7 @@ const u32 gObjectEventPic_Truck[] = INCBIN_U32("graphics/object_events/pics/misc
 const u16 gObjectEventPal_Truck[] = INCBIN_U16("graphics/object_events/palettes/truck.gbapal");
 const u16 gObjectEventPal_Vigoroth[] = INCBIN_U16("graphics/object_events/palettes/vigoroth.gbapal");
 const u32 gObjectEventPic_BirchsBag[] = INCBIN_U32("graphics/object_events/pics/misc/birchs_bag.4bpp");
-const u32 gObjectEventPic_EnemyZigzagoon[] = INCBIN_U32("graphics/object_events/pics/pokemon/enemy_zigzagoon.4bpp");
+const u32 gObjectEventPic_EnemyZigzagoon[] = INCBIN_U32("graphics/object_events/pics/pokemon_old/enemy_zigzagoon.4bpp");
 const u16 gObjectEventPal_EnemyZigzagoon[] = INCBIN_U16("graphics/object_events/palettes/enemy_zigzagoon.gbapal");
 const u16 gObjectEventPal_Poochyena[] = INCBIN_U16("graphics/object_events/palettes/poochyena.gbapal");
 const u32 gObjectEventPic_CableCar[] = INCBIN_U32("graphics/object_events/pics/misc/cable_car.4bpp");
@@ -780,26 +780,26 @@ const u32 gObjectEventPic_Rayquaza[] = INCBIN_COMP("graphics/object_events/pics/
 const u32 gObjectEventPic_Jirachi[] = INCBIN_COMP("graphics/object_events/pics/pokemon/jirachi.4bpp");
 const u32 gObjectEventPic_Deoxys[] = INCBIN_COMP("graphics/object_events/pics/pokemon/deoxys.4bpp");
 
-const u32 gObjectEventPic_DeoxysOld[] = INCBIN_COMP("graphics/object_events/pics/pokemon/deoxys_old.4bpp");
-const u32 gObjectEventPic_MewOld[] = INCBIN_COMP("graphics/object_events/pics/pokemon/mew_old.4bpp");
-const u32 gObjectEventPic_DusclopsOld[] = INCBIN_COMP("graphics/object_events/pics/pokemon/dusclops_old.4bpp");
-const u32 gObjectEventPic_KirliaOld[] = INCBIN_COMP("graphics/object_events/pics/pokemon/kirlia_old.4bpp");
-const u32 gObjectEventPic_AzurillOld[] = INCBIN_COMP("graphics/object_events/pics/pokemon/azurill_old.4bpp");
-const u32 gObjectEventPic_KecleonOld[] = INCBIN_COMP("graphics/object_events/pics/pokemon/kecleon_old.4bpp");
-const u32 gObjectEventPic_WingullOld[] = INCBIN_COMP("graphics/object_events/pics/pokemon/wingull_old.4bpp");
-const u32 gObjectEventPic_AzumarillOld[] = INCBIN_COMP("graphics/object_events/pics/pokemon/azumarill_old.4bpp");
-const u32 gObjectEventPic_PikachuOld[] = INCBIN_COMP("graphics/object_events/pics/pokemon/pikachu_old.4bpp");
-const u32 gObjectEventPic_ZigzagoonOld[] = INCBIN_COMP("graphics/object_events/pics/pokemon/zigzagoon_old.4bpp");
-const u32 gObjectEventPic_SkittyOld[] = INCBIN_COMP("graphics/object_events/pics/pokemon/skitty_old.4bpp");
-const u32 gObjectEventPic_PoochyenaOld[] = INCBIN_COMP("graphics/object_events/pics/pokemon/poochyena_old.4bpp");
-const u32 gObjectEventPic_LugiaOld[] = INCBIN_COMP("graphics/object_events/pics/pokemon/lugia_old.4bpp");
-const u32 gObjectEventPic_HoOhOld[] = INCBIN_COMP("graphics/object_events/pics/pokemon/ho_oh_old.4bpp");
-const u32 gObjectEventPic_GroudonOld[] = INCBIN_COMP("graphics/object_events/pics/pokemon/groudon_old.4bpp");
-const u32 gObjectEventPic_KyogreOld[] = INCBIN_COMP("graphics/object_events/pics/pokemon/kyogre_old.4bpp");
+const u32 gObjectEventPic_DeoxysOld[] = INCBIN_COMP("graphics/object_events/pics/pokemon_old/deoxys.4bpp");
+const u32 gObjectEventPic_MewOld[] = INCBIN_COMP("graphics/object_events/pics/pokemon_old/mew.4bpp");
+const u32 gObjectEventPic_DusclopsOld[] = INCBIN_COMP("graphics/object_events/pics/pokemon_old/dusclops.4bpp");
+const u32 gObjectEventPic_KirliaOld[] = INCBIN_COMP("graphics/object_events/pics/pokemon_old/kirlia.4bpp");
+const u32 gObjectEventPic_AzurillOld[] = INCBIN_COMP("graphics/object_events/pics/pokemon_old/azurill.4bpp");
+const u32 gObjectEventPic_KecleonOld[] = INCBIN_COMP("graphics/object_events/pics/pokemon_old/kecleon.4bpp");
+const u32 gObjectEventPic_WingullOld[] = INCBIN_COMP("graphics/object_events/pics/pokemon_old/wingull.4bpp");
+const u32 gObjectEventPic_AzumarillOld[] = INCBIN_COMP("graphics/object_events/pics/pokemon_old/azumarill.4bpp");
+const u32 gObjectEventPic_PikachuOld[] = INCBIN_COMP("graphics/object_events/pics/pokemon_old/pikachu.4bpp");
+const u32 gObjectEventPic_ZigzagoonOld[] = INCBIN_COMP("graphics/object_events/pics/pokemon_old/zigzagoon.4bpp");
+const u32 gObjectEventPic_SkittyOld[] = INCBIN_COMP("graphics/object_events/pics/pokemon_old/skitty.4bpp");
+const u32 gObjectEventPic_PoochyenaOld[] = INCBIN_COMP("graphics/object_events/pics/pokemon_old/poochyena.4bpp");
+const u32 gObjectEventPic_LugiaOld[] = INCBIN_COMP("graphics/object_events/pics/pokemon_old/lugia.4bpp");
+const u32 gObjectEventPic_HoOhOld[] = INCBIN_COMP("graphics/object_events/pics/pokemon_old/ho_oh.4bpp");
+const u32 gObjectEventPic_GroudonOld[] = INCBIN_COMP("graphics/object_events/pics/pokemon_old/groudon.4bpp");
+const u32 gObjectEventPic_KyogreOld[] = INCBIN_COMP("graphics/object_events/pics/pokemon_old/kyogre.4bpp");
 
-const u32 gObjectEventPic_VigorothMover[] = INCBIN_COMP("graphics/object_events/pics/pokemon/vigoroth_mover.4bpp");
-const u32 gObjectEventPic_SudowoodoTree[] = INCBIN_COMP("graphics/object_events/pics/pokemon/sudowoodo_tree.4bpp");
-const u32 gObjectEventPic_RayquazaCutscene[] = INCBIN_COMP("graphics/object_events/pics/pokemon/rayquaza_cutscene.4bpp");
+const u32 gObjectEventPic_VigorothMover[] = INCBIN_COMP("graphics/object_events/pics/pokemon_old/vigoroth_mover.4bpp");
+const u32 gObjectEventPic_SudowoodoTree[] = INCBIN_COMP("graphics/object_events/pics/pokemon_old/sudowoodo_tree.4bpp");
+const u32 gObjectEventPic_RayquazaCutscene[] = INCBIN_COMP("graphics/object_events/pics/pokemon_old/rayquaza_cutscene.4bpp");
 
 const u16 gObjectEventPal_HoOh[] = INCBIN_U16("graphics/object_events/palettes/ho_oh.gbapal");
 const u16 gObjectEventPal_Lugia[] = INCBIN_U16("graphics/object_events/palettes/lugia.gbapal");