From 8c15c5b6d73b20440a19f5657c7f9f50ddd5fea9 Mon Sep 17 00:00:00 2001 From: sneed Date: Wed, 18 May 2022 20:47:14 +0300 Subject: [PATCH 1/3] fix castform sprite --- .../castform/{ => normal}/anim_front.png | Bin .../pokemon/castform/{ => normal}/back.png | Bin .../pokemon/castform/{ => normal}/front.png | Bin .../pokemon/castform/{ => normal}/normal.pal | 0 .../pokemon/castform/{ => normal}/shiny.pal | 0 graphics_file_rules.mk | 30 ++++++++++++++++++ 6 files changed, 30 insertions(+) rename graphics/pokemon/castform/{ => normal}/anim_front.png (100%) rename graphics/pokemon/castform/{ => normal}/back.png (100%) rename graphics/pokemon/castform/{ => normal}/front.png (100%) rename graphics/pokemon/castform/{ => normal}/normal.pal (100%) rename graphics/pokemon/castform/{ => normal}/shiny.pal (100%) diff --git a/graphics/pokemon/castform/anim_front.png b/graphics/pokemon/castform/normal/anim_front.png similarity index 100% rename from graphics/pokemon/castform/anim_front.png rename to graphics/pokemon/castform/normal/anim_front.png diff --git a/graphics/pokemon/castform/back.png b/graphics/pokemon/castform/normal/back.png similarity index 100% rename from graphics/pokemon/castform/back.png rename to graphics/pokemon/castform/normal/back.png diff --git a/graphics/pokemon/castform/front.png b/graphics/pokemon/castform/normal/front.png similarity index 100% rename from graphics/pokemon/castform/front.png rename to graphics/pokemon/castform/normal/front.png diff --git a/graphics/pokemon/castform/normal.pal b/graphics/pokemon/castform/normal/normal.pal similarity index 100% rename from graphics/pokemon/castform/normal.pal rename to graphics/pokemon/castform/normal/normal.pal diff --git a/graphics/pokemon/castform/shiny.pal b/graphics/pokemon/castform/normal/shiny.pal similarity index 100% rename from graphics/pokemon/castform/shiny.pal rename to graphics/pokemon/castform/normal/shiny.pal diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index db9a5b1fe6..97dac5b636 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -25,7 +25,37 @@ STARTERGFXDIR := graphics/starter_choose types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark fairy contest_types := cool beauty cute smart tough +### Castform ### +$(CASTFORMGFXDIR)/front.4bpp: $(CASTFORMGFXDIR)/normal/front.4bpp \ + $(CASTFORMGFXDIR)/sunny/front.4bpp \ + $(CASTFORMGFXDIR)/rainy/front.4bpp \ + $(CASTFORMGFXDIR)/snowy/front.4bpp + @cat $^ >$@ + +$(CASTFORMGFXDIR)/back.4bpp: $(CASTFORMGFXDIR)/back_normal.4bpp \ + $(CASTFORMGFXDIR)/sunny/back.4bpp \ + $(CASTFORMGFXDIR)/rainy/back.4bpp \ + $(CASTFORMGFXDIR)/snowy/back.4bpp + @cat $^ >$@ + +$(CASTFORMGFXDIR)/anim_front.4bpp: $(CASTFORMGFXDIR)/normal/anim_front.4bpp \ + $(CASTFORMGFXDIR)/sunny/anim_front.4bpp \ + $(CASTFORMGFXDIR)/rainy/anim_front.4bpp \ + $(CASTFORMGFXDIR)/snowy/anim_front.4bpp + @cat $^ >$@ + +$(CASTFORMGFXDIR)/normal.gbapal: $(CASTFORMGFXDIR)/normal/normal.gbapal \ + $(CASTFORMGFXDIR)/sunny/normal.4bpp \ + $(CASTFORMGFXDIR)/rainy/normal.4bpp \ + $(CASTFORMGFXDIR)/snowy/normal.4bpp + @cat $^ >$@ + +$(CASTFORMGFXDIR)/shiny.gbapal: $(CASTFORMGFXDIR)/normal/shiny.gbapal \ + $(CASTFORMGFXDIR)/sunny/shiny.4bpp \ + $(CASTFORMGFXDIR)/rainy/shiny.4bpp \ + $(CASTFORMGFXDIR)/snowy/shiny.4bpp + @cat $^ >$@ ### Tilesets ### From 49abca345d9d6baf8670c0c31fb525e2a0de26a7 Mon Sep 17 00:00:00 2001 From: sneed Date: Wed, 18 May 2022 21:11:39 +0300 Subject: [PATCH 2/3] back_normal.4bpp to normal/back.4bpp --- graphics_file_rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 97dac5b636..8784d0b694 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -33,7 +33,7 @@ $(CASTFORMGFXDIR)/front.4bpp: $(CASTFORMGFXDIR)/normal/front.4bpp \ $(CASTFORMGFXDIR)/snowy/front.4bpp @cat $^ >$@ -$(CASTFORMGFXDIR)/back.4bpp: $(CASTFORMGFXDIR)/back_normal.4bpp \ +$(CASTFORMGFXDIR)/back.4bpp: $(CASTFORMGFXDIR)/normal/back.4bpp \ $(CASTFORMGFXDIR)/sunny/back.4bpp \ $(CASTFORMGFXDIR)/rainy/back.4bpp \ $(CASTFORMGFXDIR)/snowy/back.4bpp From 5a4c165beaa5b5511065a611e008f4f76f475a35 Mon Sep 17 00:00:00 2001 From: sneed Date: Wed, 18 May 2022 21:27:47 +0300 Subject: [PATCH 3/3] fix 4bpp instead of gbapal --- graphics_file_rules.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 8784d0b694..f46db21abc 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -46,15 +46,15 @@ $(CASTFORMGFXDIR)/anim_front.4bpp: $(CASTFORMGFXDIR)/normal/anim_front.4bpp \ @cat $^ >$@ $(CASTFORMGFXDIR)/normal.gbapal: $(CASTFORMGFXDIR)/normal/normal.gbapal \ - $(CASTFORMGFXDIR)/sunny/normal.4bpp \ - $(CASTFORMGFXDIR)/rainy/normal.4bpp \ - $(CASTFORMGFXDIR)/snowy/normal.4bpp + $(CASTFORMGFXDIR)/sunny/normal.gbapal \ + $(CASTFORMGFXDIR)/rainy/normal.gbapal \ + $(CASTFORMGFXDIR)/snowy/normal.gbapal @cat $^ >$@ $(CASTFORMGFXDIR)/shiny.gbapal: $(CASTFORMGFXDIR)/normal/shiny.gbapal \ - $(CASTFORMGFXDIR)/sunny/shiny.4bpp \ - $(CASTFORMGFXDIR)/rainy/shiny.4bpp \ - $(CASTFORMGFXDIR)/snowy/shiny.4bpp + $(CASTFORMGFXDIR)/sunny/shiny.gbapal \ + $(CASTFORMGFXDIR)/rainy/shiny.gbapal \ + $(CASTFORMGFXDIR)/snowy/shiny.gbapal @cat $^ >$@ ### Tilesets ###