Browse Source

remove old images, move some stuff to the new image system

SBird1337 7 years ago
parent
commit
6e9202fd16

BIN
assets/mug/mug_00.png View File


BIN
assets/mug/mug_01.png View File


BIN
assets/mug/mug_02.png View File


BIN
assets/mug/mug_03.png View File


BIN
assets/mug/mug_04.png View File


BIN
assets/mug/mug_05.png View File


BIN
assets/mug/mug_06.png View File


BIN
assets/mug/mug_07.png View File


BIN
assets/mug/mug_08.png View File


BIN
assets/mug/mug_09.PNG View File


+ 0
- 2
gfx_build/boot/.gitignore View File

@@ -1,2 +0,0 @@
1
-*
2
-!.gitignore

+ 0
- 2
gfx_build/char/.gitignore View File

@@ -1,2 +0,0 @@
1
-*
2
-!.gitignore

+ 0
- 2
gfx_build/title_screen/.gitignore View File

@@ -1,2 +0,0 @@
1
-*
2
-!.gitignore

+ 1
- 2
makefile View File

@@ -62,9 +62,8 @@ C_OBJ       := $(C_SRC:%.c=$(BLDPATH)/%.o)
62 62
 DATA_OBJ    := $(DATA_SRC:%.s=$(BLDPATH)/%.o)
63 63
 ALL_OBJ     := $(C_OBJ) $(ASM_OBJ) $(DATA_OBJ) $(GEN_OBJ) $(STRING_OBJ)
64 64
 
65
-
66
-.PRECIOUS: $(STRING_SRC)
67 65
 $(STRINGDIR)/%.s: $(STRINGDIR)/%.txt
66
+	@echo -e "\e[93mGenerating strings $<\e[0m"
68 67
 	$(STRAGB) -o $@ -i $< -t string/table.tbl -e 0xFF
69 68
 
70 69
 $(BLDPATH)/%.o: %.c $(ASSETS)

+ 1
- 1
sots-private

@@ -1 +1 @@
1
-Subproject commit d188b0be724b2c158633aadc18c1e05e09d79583
1
+Subproject commit f8e34a8638508270743c4b0eedebaa3456b66f46

+ 1
- 75
sprites.makefile View File

@@ -12,42 +12,6 @@ ASSET_ROOT = sots-private/assets
12 12
 
13 13
 SPRITES_BINARY = object/pkmn_sprites.o
14 14
 
15
-PNG_TITLE_BG := $(ASSET_ROOT)/misc/title/title_tileset_background.png
16
-PNG_TITLE_AEON := $(ASSET_ROOT)/misc/title/title_tileset_latias_latios_deoxys.png
17
-PNG_TITLE_LOGO := $(ASSET_ROOT)/misc/title/title_tileset_logo_name.png
18
-PNG_TITLE_START := $(ASSET_ROOT)/misc/title/title_tileset_press_start.png
19
-PNG_TITLE_CLOUD := $(ASSET_ROOT)/misc/title/title_sprite_sky.png
20
-
21
-PNG_HERO := $(ASSET_ROOT)/misc/char/hero_backsprite.png
22
-PNG_HEROINE := $(ASSET_ROOT)/misc/char/heroine_backsprite.png
23
-PNG_HERO_B := $(ASSET_ROOT)/misc/char/hero_bag.png
24
-PNG_HEROINE_B := $(ASSET_ROOT)/misc/char/heroine_bag.png
25
-
26
-S_HERO := $(GFX_BUILD_DIR)/char/hero_backsprite.S
27
-S_HEROINE := $(GFX_BUILD_DIR)/char/heroine_backsprite.S
28
-S_HERO_B := $(GFX_BUILD_DIR)/char/hero_bag.S
29
-S_HEROINE_B := $(GFX_BUILD_DIR)/char/heroine_bag.S
30
-
31
-O_HERO := $(GFX_BUILD_DIR)/char/hero_backsprite.o
32
-O_HEROINE := $(GFX_BUILD_DIR)/char/heroine_backsprite.o
33
-O_HERO_B := $(GFX_BUILD_DIR)/char/hero_bag.o
34
-O_HEROINE_B := $(GFX_BUILD_DIR)/char/heroine_bag.o
35
-
36
-S_TITLE_BG := $(GFX_BUILD_DIR)/title_screen/title_tileset_background.S
37
-S_TITLE_AEON := $(GFX_BUILD_DIR)/title_screen/title_tileset_latias_latios_deoxys.S
38
-S_TITLE_LOGO := $(GFX_BUILD_DIR)/title_screen/title_tileset_logo_name.S
39
-S_TITLE_START := $(GFX_BUILD_DIR)/title_screen/title_tileset_press_start.S
40
-S_TITLE_CLOUD := $(GFX_BUILD_DIR)/title_screen/title_sprite_sky.S
41
-
42
-O_TITLE_BG := $(GFX_BUILD_DIR)/title_screen/title_tileset_background.o
43
-O_TITLE_AEON := $(GFX_BUILD_DIR)/title_screen/title_tileset_latias_latios_deoxys.o
44
-O_TITLE_LOGO := $(GFX_BUILD_DIR)/title_screen/title_tileset_logo_name.o
45
-O_TITLE_START := $(GFX_BUILD_DIR)/title_screen/title_tileset_press_start.o
46
-O_TITLE_CLOUD := $(GFX_BUILD_DIR)/title_screen/title_sprite_sky.o
47
-
48
-TITLE_OBJ := $(O_TITLE_BG) $(O_TITLE_AEON) $(O_TITLE_LOGO) $(O_TITLE_START) $(O_TITLE_CLOUD)
49
-HERO_OBJ := $(O_HERO) $(O_HEROINE) $(O_HERO_B) $(O_HEROINE_B)
50
-
51 15
 ITEM_PNG = $(sort $(wildcard $(ASSET_ROOT)/item_icons/*.png))
52 16
 ITEM_OBJ = $(addprefix $(GFX_BUILD_DIR)/item/,$(notdir $(ITEM_PNG:.png=.o)))
53 17
 
@@ -84,53 +48,15 @@ clean:
84 48
 	rm -f $(GFX_BUILD_DIR)/sprites/back_sprites/*
85 49
 	rm -f $(GFX_BUILD_DIR)/overworlds/*
86 50
 	rm -f $(GFX_BUILD_DIR)/item/*
87
-	rm -f $(GFX_BUILD_DIR)/char/*
88 51
 	rm -f $(GFX_BUILD_DIR)/title_screen/*
89 52
 	rm -f $(GFX_BUILD_DIR)/trainer_sprites/*
90 53
 
91 54
 
92
-$(SPRITES_BINARY): $(NORMAL_PAL_OBJ) $(HERO_OBJ) $(SHINY_PAL_OBJ) $(SPRITE_FRONT_OBJ) $(SPRITE_BACK_OBJ) $(NORMAL_CASTFORM_PAL_OBJ) $(SHINY_CASTFORM_PAL_OBJ) $(CASTFORM_FRONT_OBJ) $(CASTFORM_BACK_OBJ) $(OW_OBJ) $(TS_OBJ) $(ITEM_OBJ) $(TITLE_OBJ)
55
+$(SPRITES_BINARY): $(NORMAL_PAL_OBJ) $(SHINY_PAL_OBJ) $(SPRITE_FRONT_OBJ) $(SPRITE_BACK_OBJ) $(NORMAL_CASTFORM_PAL_OBJ) $(SHINY_CASTFORM_PAL_OBJ) $(CASTFORM_FRONT_OBJ) $(CASTFORM_BACK_OBJ) $(OW_OBJ) $(TS_OBJ) $(ITEM_OBJ)
93 56
 	@echo -e "\e[1;32mLinking $@\e[0m"
94 57
 	@echo "INPUT($^)" > $(TMP_LD)
95 58
 	$(LD) -r -o $@ -T $(TMP_LD)
96 59
 
97
-# Characters
98
-$(GFX_BUILD_DIR)/char/%.o: $(GFX_BUILD_DIR)/char/%.S
99
-	$(AS) -o $@ $<
100
-
101
-$(S_HERO): $(PNG_HERO)
102
-	$(GRIT) $< -fts -fh! -gt -gB4 -gz! -p -pzl -m! -pu16 -o $@
103
-
104
-$(S_HERO_B): $(PNG_HERO_B)
105
-	$(GRIT) $< -fts -fh! -gt -gB4 -gzl -p -pzl -m! -pu16 -o $@
106
-
107
-$(S_HEROINE): $(PNG_HEROINE)
108
-	$(GRIT) $< -fts -fh! -gt -gB4 -gz! -p -pzl -m! -pu16 -o $@
109
-
110
-$(S_HEROINE_B): $(PNG_HEROINE_B)
111
-	$(GRIT) $< -fts -fh! -gt -gB4 -gzl -p -pzl -m! -pu16 -o $@
112
-
113
-# Special titlescreen targets
114
-$(GFX_BUILD_DIR)/title_screen/%.o: $(GFX_BUILD_DIR)/title_screen/%.S
115
-	$(AS) -o $@ $<
116
-
117
-$(S_TITLE_BG): $(PNG_TITLE_BG)
118
-	$(GRIT) $< -fts -fh! -gt -gB4 -gzl -p! -pz! -m -mzl -mp 4 -mRtf -pu16 -o $@
119
-
120
-$(S_TITLE_AEON): $(PNG_TITLE_AEON)
121
-	$(GRIT) $< -fts -fh! -gt -gB4 -gzl -p! -pz! -m -mzl -mp 2 -mRtf -pu16 -o $@
122
-
123
-$(S_TITLE_LOGO): $(PNG_TITLE_LOGO)
124
-	$(GRIT) $< -fts -fh! -gt -gB8 -gzl -p! -pz! -m -mzl -mRtf -pu16 -o $@
125
-
126
-$(S_TITLE_START): $(PNG_TITLE_START)
127
-	$(GRIT) $< -fts -fh! -gt -gB4 -gzl -p! -pz! -m -mzl -mp 3 -mRtf -pu16 -o $@
128
-
129
-$(S_TITLE_CLOUD): $(PNG_TITLE_CLOUD)
130
-	$(GRIT) $< -fts -fh! -gt -gB4 -gzl -p -pz! -m! -pu16 -o $@
131
-
132
-
133
-
134 60
 # Item Targets
135 61
 $(GFX_BUILD_DIR)/item/%.o: $(GFX_BUILD_DIR)/item/%.s
136 62
 	@echo -e "\e[32mAssembling $<\e[0m"