Moved .*bpp & .gbapal

Icedude907 · Nov 15, 2023 · 9f3df6b · 9f3df6b
1 parent 687696c
commit 9f3df6b
Show file tree

Hide file tree

Showing 115 changed files with 8,383 additions and 8,166 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,17 +8,8 @@
 *.sa1
 *.ss[0-9]
 *.sg1
-*.1bpp
-*.4bpp
-*.8bpp
-*.gbapal
 *.lz
 *.rl
-*.latfont
-*.hwjpnfont
-*.fwjpnfont
-sound/**/*.bin
-sound/songs/midi/*.s
 tools/agbcc
 *.map
 *.bat

diff --git a/Makefile b/Makefile
@@ -239,7 +239,7 @@ clean-d:
 
 clean-assets:
 	rm -rf $(BUILD_ASSETS_DIR)
-	find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.rl' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec rm {} +
+	find . \( -iname '*.lz' -o -iname '*.rl' \) -exec rm {} +
 
 clean-old:
 	rm -f $(MID_SUBDIR)/*.s

diff --git a/gflib/text.c b/gflib/text.c
@@ -68,10 +68,10 @@ static const u8 sFontHalfRowOffsets[] =
     0x00, 0x01, 0x02, 0x00, 0x03, 0x04, 0x05, 0x03, 0x06, 0x07, 0x08, 0x06, 0x00, 0x01, 0x02, 0x00
 };
 
-static const u8 sDownArrowTiles[] = INCBIN_U8("graphics/fonts/down_arrow.4bpp");
-static const u8 sDarkDownArrowTiles[] = INCBIN_U8("graphics/fonts/down_arrow_alt.4bpp");
-static const u8 sUnusedFRLGBlankedDownArrow[] = INCBIN_U8("graphics/fonts/unused_frlg_blanked_down_arrow.4bpp");
-static const u8 sUnusedFRLGDownArrow[] = INCBIN_U8("graphics/fonts/unused_frlg_down_arrow.4bpp");
+static const u8 sDownArrowTiles[] = INCBIN_U8("build/assets/graphics/fonts/down_arrow.4bpp");
+static const u8 sDarkDownArrowTiles[] = INCBIN_U8("build/assets/graphics/fonts/down_arrow_alt.4bpp");
+static const u8 sUnusedFRLGBlankedDownArrow[] = INCBIN_U8("build/assets/graphics/fonts/unused_frlg_blanked_down_arrow.4bpp");
+static const u8 sUnusedFRLGDownArrow[] = INCBIN_U8("build/assets/graphics/fonts/unused_frlg_down_arrow.4bpp");
 static const u8 sDownArrowYCoords[] = { 0, 1, 2, 1 };
 static const u8 sWindowVerticalScrollSpeeds[] = {
     [OPTIONS_TEXT_SPEED_SLOW] = 1,
@@ -114,7 +114,7 @@ struct
     [CHAR_DPAD_NONE]      = { 0x22,  8, 12 }
 };
 
-static const u8 sKeypadIconTiles[] = INCBIN_U8("graphics/fonts/keypad_icons.4bpp");
+static const u8 sKeypadIconTiles[] = INCBIN_U8("build/assets/graphics/fonts/keypad_icons.4bpp");
 
 static const struct FontInfo sFontInfos[] =
 {
@@ -234,7 +234,7 @@ static const u8 sMenuCursorDimensions[][2] =
     [FONT_BOLD]         = {}
 };
 
-static const u16 sFontBoldJapaneseGlyphs[] = INCBIN_U16("graphics/fonts/bold.hwjpnfont");
+static const u16 sFontBoldJapaneseGlyphs[] = INCBIN_U16("build/assets/graphics/fonts/bold.hwjpnfont");
 
 static void SetFontsPointer(const struct FontInfo *fonts)
 {

diff --git a/graphics.mk b/graphics.mk
@@ -4,20 +4,20 @@
 %.pal: ;
 %.aif: ;
 
-%.1bpp: %.png
+$(BUILD_ASSETS_DIR)/%.1bpp: %.png
 	@mkdir -p $(@D)
 	$(GFX) $< $@
-%.4bpp: %.png
+$(BUILD_ASSETS_DIR)/%.4bpp: %.png
 	@mkdir -p $(@D)
 	$(GFX) $< $@
-%.8bpp: %.png
+$(BUILD_ASSETS_DIR)/%.8bpp: %.png
 	@mkdir -p $(@D)
 	$(GFX) $< $@
-%.gbapal: %.pal
+$(BUILD_ASSETS_DIR)/%.gbapal: %.pal
 	@mkdir -p $(@D)
 	$(GFX) $< $@
 # Derives the palette from the image in the absence of a .pal file
-%.gbapal: %.png
+$(BUILD_ASSETS_DIR)/%.gbapal: %.png
 	@mkdir -p $(@D)
 	$(GFX) $< $@
 

diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
@@ -27,25 +27,25 @@ contest_types := cool beauty cute smart tough
 castform_types := normal sunny rainy snowy
 
 # Output folders
-TILESET_OUTDIR      := $(TILESETGFXDIR)
-BATINT_OUTDIR       := $(BATINTGFXDIR)
-BATTRANS_OUTDIR     := $(BATTRANSGFXDIR)
-BTLANMSPR_OUTDIR    := $(BTLANMSPRGFXDIR)
-CASTFORM_OUTDIR     := $(CASTFORMGFXDIR)
-FONT_OUTDIR         := $(FONTGFXDIR)
-JPCONTEST_OUTDIR    := $(JPCONTESTGFXDIR)
-MISC_OUTDIR         := $(MISCGFXDIR)
-NAMING_OUTDIR       := $(NAMINGGFXDIR)
-PKNAV_OUTDIR        := $(PKNAVGFXDIR)
-PKNAVOPTIONS_OUTDIR := $(PKNAVOPTIONSGFXDIR)
-POKEDEX_OUTDIR      := $(POKEDEXGFXDIR)
-RAYQUAZA_OUTDIR     := $(RAYQUAZAGFXDIR)
-ROULETTE_OUTDIR     := $(ROULETTEGFXDIR)
-SLOTMACHINE_OUTDIR  := $(SLOTMACHINEGFXDIR)
-SPINDA_OUTDIR       := $(SPINDAGFXDIR)
-TYPES_OUTDIR        := $(TYPESGFXDIR)
-UNUSED_OUTDIR       := $(UNUSEDGFXDIR)
-WALLPAPER_OUTDIR    := $(WALLPAPERGFXDIR)
+TILESET_OUTDIR      := $(BUILD_ASSETS_DIR)/$(TILESETGFXDIR)
+BATINT_OUTDIR       := $(BUILD_ASSETS_DIR)/$(BATINTGFXDIR)
+BATTRANS_OUTDIR     := $(BUILD_ASSETS_DIR)/$(BATTRANSGFXDIR)
+BTLANMSPR_OUTDIR    := $(BUILD_ASSETS_DIR)/$(BTLANMSPRGFXDIR)
+CASTFORM_OUTDIR     := $(BUILD_ASSETS_DIR)/$(CASTFORMGFXDIR)
+FONT_OUTDIR         := $(BUILD_ASSETS_DIR)/$(FONTGFXDIR)
+JPCONTEST_OUTDIR    := $(BUILD_ASSETS_DIR)/$(JPCONTESTGFXDIR)
+MISC_OUTDIR         := $(BUILD_ASSETS_DIR)/$(MISCGFXDIR)
+NAMING_OUTDIR       := $(BUILD_ASSETS_DIR)/$(NAMINGGFXDIR)
+PKNAV_OUTDIR        := $(BUILD_ASSETS_DIR)/$(PKNAVGFXDIR)
+PKNAVOPTIONS_OUTDIR := $(BUILD_ASSETS_DIR)/$(PKNAVOPTIONSGFXDIR)
+POKEDEX_OUTDIR      := $(BUILD_ASSETS_DIR)/$(POKEDEXGFXDIR)
+RAYQUAZA_OUTDIR     := $(BUILD_ASSETS_DIR)/$(RAYQUAZAGFXDIR)
+ROULETTE_OUTDIR     := $(BUILD_ASSETS_DIR)/$(ROULETTEGFXDIR)
+SLOTMACHINE_OUTDIR  := $(BUILD_ASSETS_DIR)/$(SLOTMACHINEGFXDIR)
+SPINDA_OUTDIR       := $(BUILD_ASSETS_DIR)/$(SPINDAGFXDIR)
+TYPES_OUTDIR        := $(BUILD_ASSETS_DIR)/$(TYPESGFXDIR)
+UNUSED_OUTDIR       := $(BUILD_ASSETS_DIR)/$(UNUSEDGFXDIR)
+WALLPAPER_OUTDIR    := $(BUILD_ASSETS_DIR)/$(WALLPAPERGFXDIR)
 
 # TODO: A nicer way to create the directory tree
 SPECIAL_OUTDIRS := $(CASTFORM_OUTDIR) $(patsubst %,$(CASTFORM_OUTDIR)/%,$(castform_types)) 
@@ -530,7 +530,7 @@ $(UNUSED_OUTDIR)/obi2.4bpp: $(UNUSED_OUTDIR)/old_bulbasaur2.4bpp \
                            $(UNUSED_OUTDIR)/old_battle_interface_3.4bpp
 	cat $^ >$@
 
-$(UNUSED_OUTDIR)/color_frames.4bpp: %.4bpp: %.png
+$(UNUSED_OUTDIR)/color_frames.4bpp: $(UNUSEDGFXDIR)/color_frames.png
 	$(GFX) $< $@ -num_tiles 353 -Wnum_tiles
 
 unused_frames := red_frame yellow_frame green_frame blank_frame
@@ -620,87 +620,87 @@ $(WALLPAPER_OUTDIR)/friends_frame2.4bpp: $(WALLPAPERGFXDIR)/friends_frame2.png
 	$(GFX) $< $@ -num_tiles 57 -Wnum_tiles
 
 #### Compound wallpapers
-$(WALLPAPER_OUTDIR)/%/tiles.4bpp: $(WALLPAPER_OUTDIR)/%/frame.4bpp $(WALLPAPER_OUTDIR)/%/bg.4bpp
-	@mkdir -p $(@D)
-	cat $^ >$@
-
-$(WALLPAPERGFXDIR)/zigzagoon/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame1.4bpp $(WALLPAPERGFXDIR)/zigzagoon/bg.4bpp
+$(WALLPAPER_OUTDIR)/zigzagoon/tiles.4bpp: $(WALLPAPER_OUTDIR)/friends_frame1.4bpp $(WALLPAPER_OUTDIR)/zigzagoon/bg.4bpp
 	@cat $^ >$@
 
-$(WALLPAPERGFXDIR)/screen/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame1.4bpp $(WALLPAPERGFXDIR)/screen/bg.4bpp
+$(WALLPAPER_OUTDIR)/screen/tiles.4bpp: $(WALLPAPER_OUTDIR)/friends_frame1.4bpp $(WALLPAPER_OUTDIR)/screen/bg.4bpp
 	@cat $^ >$@
 
-$(WALLPAPERGFXDIR)/horizontal/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame1.4bpp $(WALLPAPERGFXDIR)/horizontal/bg.4bpp
+$(WALLPAPER_OUTDIR)/horizontal/tiles.4bpp: $(WALLPAPER_OUTDIR)/friends_frame1.4bpp $(WALLPAPER_OUTDIR)/horizontal/bg.4bpp
 	@cat $^ >$@
 
-$(WALLPAPERGFXDIR)/diagonal/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame1.4bpp $(WALLPAPERGFXDIR)/diagonal/bg.4bpp
+$(WALLPAPER_OUTDIR)/diagonal/tiles.4bpp: $(WALLPAPER_OUTDIR)/friends_frame1.4bpp $(WALLPAPER_OUTDIR)/diagonal/bg.4bpp
 	@cat $^ >$@
 
-$(WALLPAPERGFXDIR)/block/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame1.4bpp $(WALLPAPERGFXDIR)/block/bg.4bpp
+$(WALLPAPER_OUTDIR)/block/tiles.4bpp: $(WALLPAPER_OUTDIR)/friends_frame1.4bpp $(WALLPAPER_OUTDIR)/block/bg.4bpp
 	@cat $^ >$@
 
-$(WALLPAPERGFXDIR)/ribbon/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame1.4bpp $(WALLPAPERGFXDIR)/ribbon/bg.4bpp
+$(WALLPAPER_OUTDIR)/ribbon/tiles.4bpp: $(WALLPAPER_OUTDIR)/friends_frame1.4bpp $(WALLPAPER_OUTDIR)/ribbon/bg.4bpp
 	@cat $^ >$@
 
-$(WALLPAPERGFXDIR)/pokecenter2/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame1.4bpp $(WALLPAPERGFXDIR)/pokecenter2/bg.4bpp
+$(WALLPAPER_OUTDIR)/pokecenter2/tiles.4bpp: $(WALLPAPER_OUTDIR)/friends_frame1.4bpp $(WALLPAPER_OUTDIR)/pokecenter2/bg.4bpp
 	@cat $^ >$@
 
-$(WALLPAPERGFXDIR)/frame/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame1.4bpp $(WALLPAPERGFXDIR)/frame/bg.4bpp
+$(WALLPAPER_OUTDIR)/frame/tiles.4bpp: $(WALLPAPER_OUTDIR)/friends_frame1.4bpp $(WALLPAPER_OUTDIR)/frame/bg.4bpp
 	@cat $^ >$@
 
-$(WALLPAPERGFXDIR)/blank/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame1.4bpp $(WALLPAPERGFXDIR)/blank/bg.4bpp
+$(WALLPAPER_OUTDIR)/blank/tiles.4bpp: $(WALLPAPER_OUTDIR)/friends_frame1.4bpp $(WALLPAPER_OUTDIR)/blank/bg.4bpp
 	@cat $^ >$@
 
-$(WALLPAPERGFXDIR)/circles/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame1.4bpp $(WALLPAPERGFXDIR)/circles/bg.4bpp
+$(WALLPAPER_OUTDIR)/circles/tiles.4bpp: $(WALLPAPER_OUTDIR)/friends_frame1.4bpp $(WALLPAPER_OUTDIR)/circles/bg.4bpp
 	@cat $^ >$@
 
-$(WALLPAPERGFXDIR)/azumarill/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame2.4bpp $(WALLPAPERGFXDIR)/azumarill/bg.4bpp
+$(WALLPAPER_OUTDIR)/azumarill/tiles.4bpp: $(WALLPAPER_OUTDIR)/friends_frame2.4bpp $(WALLPAPER_OUTDIR)/azumarill/bg.4bpp
 	@cat $^ >$@
 
-$(WALLPAPERGFXDIR)/pikachu/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame2.4bpp $(WALLPAPERGFXDIR)/pikachu/bg.4bpp
+$(WALLPAPER_OUTDIR)/pikachu/tiles.4bpp: $(WALLPAPER_OUTDIR)/friends_frame2.4bpp $(WALLPAPER_OUTDIR)/pikachu/bg.4bpp
 	@cat $^ >$@
 
-$(WALLPAPERGFXDIR)/legendary/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame2.4bpp $(WALLPAPERGFXDIR)/legendary/bg.4bpp
+$(WALLPAPER_OUTDIR)/legendary/tiles.4bpp: $(WALLPAPER_OUTDIR)/friends_frame2.4bpp $(WALLPAPER_OUTDIR)/legendary/bg.4bpp
 	@cat $^ >$@
 
-$(WALLPAPERGFXDIR)/dusclops/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame2.4bpp $(WALLPAPERGFXDIR)/dusclops/bg.4bpp
+$(WALLPAPER_OUTDIR)/dusclops/tiles.4bpp: $(WALLPAPER_OUTDIR)/friends_frame2.4bpp $(WALLPAPER_OUTDIR)/dusclops/bg.4bpp
 	@cat $^ >$@
 
-$(WALLPAPERGFXDIR)/ludicolo/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame2.4bpp $(WALLPAPERGFXDIR)/ludicolo/bg.4bpp
+$(WALLPAPER_OUTDIR)/ludicolo/tiles.4bpp: $(WALLPAPER_OUTDIR)/friends_frame2.4bpp $(WALLPAPER_OUTDIR)/ludicolo/bg.4bpp
 	@cat $^ >$@
 
-$(WALLPAPERGFXDIR)/whiscash/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame2.4bpp $(WALLPAPERGFXDIR)/whiscash/bg.4bpp
+$(WALLPAPER_OUTDIR)/whiscash/tiles.4bpp: $(WALLPAPER_OUTDIR)/friends_frame2.4bpp $(WALLPAPER_OUTDIR)/whiscash/bg.4bpp
 	@cat $^ >$@
 
+$(WALLPAPER_OUTDIR)/%/tiles.4bpp: $(WALLPAPER_OUTDIR)/%/frame.4bpp $(WALLPAPER_OUTDIR)/%/bg.4bpp
+	@mkdir -p $(@D)
+	cat $^ >$@
+
 ### Miscellaneous ###
-graphics/interface/outline_cursor.4bpp: graphics/interface/outline_cursor.png
+$(BUILD_ASSETS_DIR)/graphics/interface/outline_cursor.4bpp: graphics/interface/outline_cursor.png
 	mkdir -p $(@D)
 	$(GFX) $< $@ -num_tiles 8 -Wnum_tiles
 
-graphics/battle_anims/masks/unused_level_up.4bpp: graphics/battle_anims/masks/unused_level_up.png
+$(BUILD_ASSETS_DIR)/graphics/battle_anims/masks/unused_level_up.4bpp: graphics/battle_anims/masks/unused_level_up.png
 	mkdir -p $(@D)
 	$(GFX) $< $@ -num_tiles 14 -Wnum_tiles
 
-graphics/party_menu/bg.4bpp: graphics/party_menu/bg.png
+$(BUILD_ASSETS_DIR)/graphics/party_menu/bg.4bpp: graphics/party_menu/bg.png
 	mkdir -p $(@D)
 	$(GFX) $< $@ -num_tiles 62 -Wnum_tiles
 
-graphics/title_screen/pokemon_logo.gbapal: graphics/title_screen/pokemon_logo.pal
+$(BUILD_ASSETS_DIR)/graphics/title_screen/pokemon_logo.gbapal: graphics/title_screen/pokemon_logo.pal
 	mkdir -p $(@D)
 	$(GFX) $< $@ -num_colors 224
 
-graphics/pokemon_jump/bg.4bpp: graphics/pokemon_jump/bg.png
+$(BUILD_ASSETS_DIR)/graphics/pokemon_jump/bg.4bpp: graphics/pokemon_jump/bg.png
 	mkdir -p $(@D)
 	$(GFX) $< $@ -num_tiles 63 -Wnum_tiles
 
-graphics/bag/menu.4bpp: graphics/bag/menu.png
+$(BUILD_ASSETS_DIR)/graphics/bag/menu.4bpp: graphics/bag/menu.png
 	mkdir -p $(@D)
 	$(GFX) $< $@ -num_tiles 53 -Wnum_tiles
 
-graphics/picture_frame/lobby.4bpp: graphics/picture_frame/lobby.png
+$(BUILD_ASSETS_DIR)/graphics/picture_frame/lobby.4bpp: graphics/picture_frame/lobby.png
 	mkdir -p $(@D)
 	$(GFX) $< $@ -num_tiles 86 -Wnum_tiles
 
-graphics/birch_speech/unused_beauty.4bpp: graphics/birch_speech/unused_beauty.png
+$(BUILD_ASSETS_DIR)/graphics/birch_speech/unused_beauty.4bpp: graphics/birch_speech/unused_beauty.png
 	mkdir -p $(@D)
 	$(GFX) $< $@ -num_tiles 822 -Wnum_tiles