dionmoustos/Pokemon-Firered
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #569 from GriffinRichards/sync-numtiles

Browse Source 
Sync num_tiles flags, document tm_case
This commit is contained in:
GriffinR authored and GitHub committed 2022-11-17 19:18:37 -05:00
2 parents c8562b05ab 21220c9427
commit 783e8e72cf
41 files changed
+1358 -1110
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

graphics/item_pc/unk_8E85458.bin → graphics/item_pc/bg.bin
View File
File renamed without changes.
graphics/item_pc/unk_8E85408.pal → graphics/item_pc/bg.pal
View File
File renamed without changes.
graphics/item_pc/bg.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 807 B

graphics/item_pc/unk_8E85090.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 746 B

graphics/ss_anne/smoke.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 315 B

graphics/ss_anne/unk_8479838.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 188 B

graphics/ss_anne/unk_8479A38.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 271 B

graphics/ss_anne/wake.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 244 B

graphics/teachy_tv/tiles.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

graphics/tm_case/unk_8E84D90.png → graphics/tm_case/disc.png
View File
File renamed without changes.
graphics/tm_case/unk_8E84F20.pal → graphics/tm_case/disc_types_1.pal
View File
File renamed without changes.
graphics/tm_case/unk_8E85068.pal → graphics/tm_case/disc_types_2.pal
View File
File renamed without changes.
graphics/tm_case/unk_8E99118.png → graphics/tm_case/hm.png
View File
File renamed without changes.
graphics/tm_case/unk_8E84A24.bin → graphics/tm_case/menu.bin
View File
File renamed without changes.
graphics/tm_case/unk_8E84D20.pal → graphics/tm_case/menu_female.pal
View File
File renamed without changes.
graphics/tm_case/unk_8E84CB0.pal → graphics/tm_case/menu_male.pal
View File
File renamed without changes.
graphics/tm_case/unk_8E84B70.bin → graphics/tm_case/tm_case.bin
View File
File renamed without changes.
graphics/tm_case/tm_case.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1012 B

graphics/tm_case/unk_8E845D8.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 951 B

graphics_file_rules.mk
+125 -125
View File
@@ -100,13 +100,13 @@ graphics/title_screen/pokemon_logo.gbapal: %.gbapal: %.pal
$(GFX) $< $@ -num_colors 224
graphics/pokemon_jump/bg.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 63
$(GFX) $< $@ -num_tiles 63 -Wnum_tiles
$(MISCGFXDIR)/japanese_hof.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 29
$(GFX) $< $@ -num_tiles 29 -Wnum_tiles
$(MISCGFXDIR)/markings2.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 25
$(GFX) $< $@ -num_tiles 25 -Wnum_tiles
$(INTERFACEGFXDIR)/menu.gbapal: $(INTERFACEGFXDIR)/menu_0.gbapal \
$(INTERFACEGFXDIR)/menu_1.gbapal
@@ -150,13 +150,13 @@ $(UNUSEDGFXDIR)/redyellowgreen_frame.bin: $(UNUSEDGFXDIR)/red_frame.bin \
@cat $^ >$@
$(UNUSEDGFXDIR)/color_frames.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 353
$(GFX) $< $@ -num_tiles 353 -Wnum_tiles
$(BATINTGFXDIR)/unused_window2bar.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 5
$(GFX) $< $@ -num_tiles 5 -Wnum_tiles
$(BATINTGFXDIR)/level_up_banner.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 36
$(GFX) $< $@ -num_tiles 36 -Wnum_tiles
$(BATINTGFXDIR)/textbox.gbapal: $(BATINTGFXDIR)/textbox1.gbapal $(BATINTGFXDIR)/textbox2.gbapal
cat $^ > $@
@@ -175,7 +175,7 @@ $(UNUSEDGFXDIR)/old_contest_2.4bpp: $(UNUSEDGFXDIR)/old_contest_2_1.4bpp \
@cat $^ >$@
$(UNKNOWNGFXDIR)/unknown_D196E4.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 36
$(GFX) $< $@ -num_tiles 36 -Wnum_tiles
$(BTLANMSPRGFXDIR)/ice_crystals.4bpp: $(BTLANMSPRGFXDIR)/ice_crystals_0.4bpp \
$(BTLANMSPRGFXDIR)/ice_crystals_1.4bpp \
@@ -197,13 +197,13 @@ $(BTLANMSPRGFXDIR)/spark.4bpp: $(BTLANMSPRGFXDIR)/spark_0.4bpp \
@cat $^ >$@
$(MASKSGFXDIR)/unknown_D2EC24.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 14
$(GFX) $< $@ -num_tiles 14 -Wnum_tiles
$(BATTRANSGFXDIR)/vs_frame.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 16
$(GFX) $< $@ -num_tiles 16 -Wnum_tiles
$(INTERFACEGFXDIR)/party_menu_misc.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 62
$(GFX) $< $@ -num_tiles 62 -Wnum_tiles
$(TYPESGFXDIR)/move_types.4bpp: $(types:%=$(TYPESGFXDIR)/%.4bpp) $(contest_types:%=$(TYPESGFXDIR)/contest_%.4bpp)
@cat $^ >$@
@@ -214,29 +214,29 @@ $(TYPESGFXDIR)/move_types.gbapal: $(TYPESGFXDIR)/move_types_1.gbapal \
@cat $^ >$@
$(INTERFACEGFXDIR)/bag_screen.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 53
$(GFX) $< $@ -num_tiles 53 -Wnum_tiles
$(RAYQUAZAGFXDIR)/rayquaza.8bpp: %.8bpp: %.png
$(GFX) $< $@ -num_tiles 227
$(GFX) $< $@ -num_tiles 227 -Wnum_tiles
$(RAYQUAZAGFXDIR)/overcast.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 313
$(GFX) $< $@ -num_tiles 313 -Wnum_tiles
$(RAYQUAZAGFXDIR)/rayquaza_fly1.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 124
$(GFX) $< $@ -num_tiles 124 -Wnum_tiles
$(RAYQUAZAGFXDIR)/rayquaza_tail_fix.4bpp: $(RAYQUAZAGFXDIR)/rayquaza_tail.4bpp
cp $< $@
head -c 12 /dev/zero >> $@
$(RAYQUAZAGFXDIR)/chase_streaks.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 19
$(GFX) $< $@ -num_tiles 19 -Wnum_tiles
$(RAYQUAZAGFXDIR)/rayquaza_chase.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 155
$(GFX) $< $@ -num_tiles 155 -Wnum_tiles
graphics/picture_frame/frame5.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 86
$(GFX) $< $@ -num_tiles 86 -Wnum_tiles
$(ROULETTEGFXDIR)/roulette_tilt.4bpp: $(ROULETTEGFXDIR)/shroomish.4bpp \
$(ROULETTEGFXDIR)/tailow.4bpp
@@ -249,10 +249,10 @@ $(ROULETTEGFXDIR)/poke_icons2.4bpp: $(ROULETTEGFXDIR)/wynaut.4bpp \
@cat $^ >$@
$(BATTRANSGFXDIR)/85BBC14.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 53
$(GFX) $< $@ -num_tiles 53 -Wnum_tiles
$(BATTRANSGFXDIR)/rayquaza.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 938
$(GFX) $< $@ -num_tiles 938 -Wnum_tiles
$(BATTRANSGFXDIR)/frontier_square_1.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \
$(BATTRANSGFXDIR)/frontier_squares_1.4bpp
@@ -275,16 +275,16 @@ $(SLOTMACHINEGFXDIR)/reel_time_gfx.4bpp: $(SLOTMACHINEGFXDIR)/reel_time_pikachu.
@cat $^ >$@
$(UNUSEDGFXDIR)/intro_birch_beauty.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 822
$(GFX) $< $@ -num_tiles 822 -Wnum_tiles
$(PSSGFXDIR)/forest_frame.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 55
$(GFX) $< $@ -num_tiles 55 -Wnum_tiles
$(PSSGFXDIR)/forest.4bpp: $(PSSGFXDIR)/forest_frame.4bpp $(PSSGFXDIR)/forest_bg.4bpp
@cat $^ >$@
$(PSSGFXDIR)/city_frame.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 52
$(GFX) $< $@ -num_tiles 52 -Wnum_tiles
$(PSSGFXDIR)/city.4bpp: $(PSSGFXDIR)/city_frame.4bpp $(PSSGFXDIR)/city_bg.4bpp
@cat $^ >$@
@@ -293,97 +293,97 @@ $(PSSGFXDIR)/desert.4bpp: $(PSSGFXDIR)/desert_frame.4bpp $(PSSGFXDIR)/desert_bg.
@cat $^ >$@
$(PSSGFXDIR)/savanna_frame.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 45
$(GFX) $< $@ -num_tiles 45 -Wnum_tiles
$(PSSGFXDIR)/savanna_bg.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 23
$(GFX) $< $@ -num_tiles 23 -Wnum_tiles
$(PSSGFXDIR)/savanna.4bpp: $(PSSGFXDIR)/savanna_frame.4bpp $(PSSGFXDIR)/savanna_bg.4bpp
@cat $^ >$@
$(PSSGFXDIR)/crag_frame.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 49
$(GFX) $< $@ -num_tiles 49 -Wnum_tiles
$(PSSGFXDIR)/crag.4bpp: $(PSSGFXDIR)/crag_frame.4bpp $(PSSGFXDIR)/crag_bg.4bpp
@cat $^ >$@
$(PSSGFXDIR)/volcano_frame.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 56
$(GFX) $< $@ -num_tiles 56 -Wnum_tiles
$(PSSGFXDIR)/volcano.4bpp: $(PSSGFXDIR)/volcano_frame.4bpp $(PSSGFXDIR)/volcano_bg.4bpp
@cat $^ >$@
$(PSSGFXDIR)/snow_frame.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 57
$(GFX) $< $@ -num_tiles 57 -Wnum_tiles
$(PSSGFXDIR)/snow.4bpp: $(PSSGFXDIR)/snow_frame.4bpp $(PSSGFXDIR)/snow_bg.4bpp
@cat $^ >$@
$(PSSGFXDIR)/cave_frame.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 55
$(GFX) $< $@ -num_tiles 55 -Wnum_tiles
$(PSSGFXDIR)/cave.4bpp: $(PSSGFXDIR)/cave_frame.4bpp $(PSSGFXDIR)/cave_bg.4bpp
@cat $^ >$@
$(PSSGFXDIR)/beach_frame.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 46
$(GFX) $< $@ -num_tiles 46 -Wnum_tiles
$(PSSGFXDIR)/beach_bg.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 23
$(GFX) $< $@ -num_tiles 23 -Wnum_tiles
$(PSSGFXDIR)/beach.4bpp: $(PSSGFXDIR)/beach_frame.4bpp $(PSSGFXDIR)/beach_bg.4bpp
@cat $^ >$@
$(PSSGFXDIR)/seafloor_frame.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 54
$(GFX) $< $@ -num_tiles 54 -Wnum_tiles
$(PSSGFXDIR)/seafloor.4bpp: $(PSSGFXDIR)/seafloor_frame.4bpp $(PSSGFXDIR)/seafloor_bg.4bpp
@cat $^ >$@
$(PSSGFXDIR)/river_frame.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 51
$(GFX) $< $@ -num_tiles 51 -Wnum_tiles
$(PSSGFXDIR)/river_bg.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 11
$(GFX) $< $@ -num_tiles 11 -Wnum_tiles
$(PSSGFXDIR)/river.4bpp: $(PSSGFXDIR)/river_frame.4bpp $(PSSGFXDIR)/river_bg.4bpp
@cat $^ >$@
$(PSSGFXDIR)/sky_frame.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 45
$(GFX) $< $@ -num_tiles 45 -Wnum_tiles
$(PSSGFXDIR)/sky.4bpp: $(PSSGFXDIR)/sky_frame.4bpp $(PSSGFXDIR)/sky_bg.4bpp
@cat $^ >$@
$(PSSGFXDIR)/polkadot_frame.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 54
$(GFX) $< $@ -num_tiles 54 -Wnum_tiles
$(PSSGFXDIR)/polkadot.4bpp: $(PSSGFXDIR)/polkadot_frame.4bpp $(PSSGFXDIR)/polkadot_bg.4bpp
@cat $^ >$@
$(PSSGFXDIR)/pokecenter_frame.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 35
$(GFX) $< $@ -num_tiles 35 -Wnum_tiles
$(PSSGFXDIR)/pokecenter.4bpp: $(PSSGFXDIR)/pokecenter_frame.4bpp $(PSSGFXDIR)/pokecenter_bg.4bpp
@cat $^ >$@
$(PSSGFXDIR)/machine_frame.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 33
$(GFX) $< $@ -num_tiles 33 -Wnum_tiles
$(PSSGFXDIR)/machine.4bpp: $(PSSGFXDIR)/machine_frame.4bpp $(PSSGFXDIR)/machine_bg.4bpp
@cat $^ >$@
$(PSSGFXDIR)/plain_frame.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 18
$(GFX) $< $@ -num_tiles 18 -Wnum_tiles
$(PSSGFXDIR)/plain.4bpp: $(PSSGFXDIR)/plain_frame.4bpp $(PSSGFXDIR)/plain_bg.4bpp
@cat $^ >$@
$(PSSGFXDIR)/friends_frame1.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 57
$(GFX) $< $@ -num_tiles 57 -Wnum_tiles
$(PSSGFXDIR)/friends_frame2.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 57
$(GFX) $< $@ -num_tiles 57 -Wnum_tiles
$(PSSGFXDIR)/zigzagoon.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/zigzagoon_bg.4bpp
@cat $^ >$@
@@ -449,70 +449,70 @@ $(FIELDEFFECTSGFXDIR)/pics/tree_disguise.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(INTERFACEGFXDIR)/selector_outline.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 8
$(GFX) $< $@ -num_tiles 8 -Wnum_tiles
$(BATTRANSGFXDIR)/frontier_transition.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 43
$(GFX) $< $@ -num_tiles 43 -Wnum_tiles
graphics/tm_case/unk_8E845D8.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 91
graphics/tm_case/tm_case.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 91 -Wnum_tiles
$(PKNAVGFXDIR)/header.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 53
$(GFX) $< $@ -num_tiles 53 -Wnum_tiles
$(PKNAVGFXDIR)/outline.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 53
$(GFX) $< $@ -num_tiles 53 -Wnum_tiles
$(PKNAVGFXDIR)/ui_matchcall.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 13
$(GFX) $< $@ -num_tiles 13 -Wnum_tiles
$(INTERFACEGFXDIR)/region_map.8bpp: %.8bpp: %.png
$(GFX) $< $@ -num_tiles 232
$(GFX) $< $@ -num_tiles 232 -Wnum_tiles
$(INTERFACEGFXDIR)/region_map_affine.8bpp: %.8bpp: %.png
$(GFX) $< $@ -num_tiles 233
$(GFX) $< $@ -num_tiles 233 -Wnum_tiles
$(MISCGFXDIR)/birch_help.4bpp: $(MISCGFXDIR)/birch_bag.4bpp $(MISCGFXDIR)/birch_grass.4bpp
@cat $^ >$@
$(FAMECHECKERGFXDIR)/spinning_pokeball.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 15
$(GFX) $< $@ -num_tiles 15 -Wnum_tiles
$(FAMECHECKERGFXDIR)/bg.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 165
$(GFX) $< $@ -num_tiles 165 -Wnum_tiles
graphics/seagallop/water.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 41
$(GFX) $< $@ -num_tiles 41 -Wnum_tiles
graphics/link/321start.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 4 -mheight 4
$(TEXTWINDOWGFXDIR)/signpost.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 19
$(GFX) $< $@ -num_tiles 19 -Wnum_tiles
$(SLOTMACHINEGFXDIR)/unk_8466620.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 66
$(GFX) $< $@ -num_tiles 66 -Wnum_tiles
$(SLOTMACHINEGFXDIR)/unk_84659d0.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 138
$(GFX) $< $@ -num_tiles 138 -Wnum_tiles
$(TEACHYTVGFXDIR)/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 233
$(GFX) $< $@ -num_tiles 233 -Wnum_tiles
$(SSANNEGFXDIR)/unk_8479A38.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 17
$(SSANNEGFXDIR)/smoke.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 17 -Wnum_tiles
$(ITEMPCGFXDIR)/unk_8E85090.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 82
$(ITEMPCGFXDIR)/bg.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 82 -Wnum_tiles
$(TITLESCREENGFXDIR)/firered/box_art_mon.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 135
$(GFX) $< $@ -num_tiles 135 -Wnum_tiles
$(TITLESCREENGFXDIR)/leafgreen/box_art_mon.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 123
$(GFX) $< $@ -num_tiles 123 -Wnum_tiles
$(CREDITSGFXDIR)/unk_8EAE548.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 77
$(GFX) $< $@ -num_tiles 77 -Wnum_tiles
POKEDEXAREAMARKERSDATADIR := graphics/pokedex/area_markers
@@ -535,188 +535,188 @@ graphics/misc/emoticons.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 2
$(ITEMMENUGFXDIR)/bag_tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 55
$(GFX) $< $@ -num_tiles 55 -Wnum_tiles
$(INTROGFXDIR)/scene_1/grass.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 397
$(GFX) $< $@ -num_tiles 397 -Wnum_tiles
$(INTROGFXDIR)/scene_2/plants.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 17
$(GFX) $< $@ -num_tiles 17 -Wnum_tiles
$(INTROGFXDIR)/scene_2/nidorino_close.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 170
$(GFX) $< $@ -num_tiles 170 -Wnum_tiles
$(INTROGFXDIR)/scene_2/gengar_close.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 114
$(GFX) $< $@ -num_tiles 114 -Wnum_tiles
$(INTROGFXDIR)/scene_3/gengar_anim.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 348
$(GFX) $< $@ -num_tiles 348 -Wnum_tiles
$(BATTLETERRAINGFXDIR)/building/terrain.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 77
$(GFX) $< $@ -num_tiles 77 -Wnum_tiles
$(BATTLETERRAINGFXDIR)/cave/anim.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 106
$(GFX) $< $@ -num_tiles 106 -Wnum_tiles
$(BATTLETERRAINGFXDIR)/cave/terrain.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 84
$(GFX) $< $@ -num_tiles 84 -Wnum_tiles
$(BATTLETERRAINGFXDIR)/grass/terrain.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 98
$(GFX) $< $@ -num_tiles 98 -Wnum_tiles
$(BATTLETERRAINGFXDIR)/indoor/terrain.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 77
$(GFX) $< $@ -num_tiles 77 -Wnum_tiles
$(BATTLETERRAINGFXDIR)/longgrass/anim.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 133
$(GFX) $< $@ -num_tiles 133 -Wnum_tiles
$(BATTLETERRAINGFXDIR)/longgrass/terrain.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 98
$(GFX) $< $@ -num_tiles 98 -Wnum_tiles
$(BATTLETERRAINGFXDIR)/mountain/anim.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 47
$(GFX) $< $@ -num_tiles 47 -Wnum_tiles
$(BATTLETERRAINGFXDIR)/pond/anim.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 36
$(GFX) $< $@ -num_tiles 36 -Wnum_tiles
$(BATTLETERRAINGFXDIR)/pond/terrain.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 75
$(GFX) $< $@ -num_tiles 75 -Wnum_tiles
$(BATTLETERRAINGFXDIR)/sand/terrain.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 83
$(GFX) $< $@ -num_tiles 83 -Wnum_tiles
$(BATTLETERRAINGFXDIR)/underwater/anim.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 26
$(GFX) $< $@ -num_tiles 26 -Wnum_tiles
$(BATTLETERRAINGFXDIR)/underwater/terrain.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 85
$(GFX) $< $@ -num_tiles 85 -Wnum_tiles
$(BATTLETERRAINGFXDIR)/water/terrain.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 81
$(GFX) $< $@ -num_tiles 81 -Wnum_tiles
$(BERRYPOUCHGFXDIR)/background.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 52
$(GFX) $< $@ -num_tiles 52 -Wnum_tiles
$(HALLOFFAMEGFXDIR)/hall_of_fame.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 29
$(GFX) $< $@ -num_tiles 29 -Wnum_tiles
$(TILESETGFXDIR)/primary/general/anim/water_current_landwatersedge/7.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 47
$(GFX) $< $@ -num_tiles 47 -Wnum_tiles
$(MAPPREVIEWGFXDIR)/altering_cave/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 391
$(GFX) $< $@ -num_tiles 391 -Wnum_tiles
$(MAPPREVIEWGFXDIR)/berry_forest/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 395
$(GFX) $< $@ -num_tiles 395 -Wnum_tiles
$(MAPPREVIEWGFXDIR)/digletts_cave/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 398
$(GFX) $< $@ -num_tiles 398 -Wnum_tiles
$(MAPPREVIEWGFXDIR)/dotted_hole/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 317
$(GFX) $< $@ -num_tiles 317 -Wnum_tiles
$(MAPPREVIEWGFXDIR)/icefall_cave/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 399
$(GFX) $< $@ -num_tiles 399 -Wnum_tiles
$(MAPPREVIEWGFXDIR)/lost_cave/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 404
$(GFX) $< $@ -num_tiles 404 -Wnum_tiles
$(MAPPREVIEWGFXDIR)/monean_chamber/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 326
$(GFX) $< $@ -num_tiles 326 -Wnum_tiles
$(MAPPREVIEWGFXDIR)/mt_ember/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 355
$(GFX) $< $@ -num_tiles 355 -Wnum_tiles
$(MAPPREVIEWGFXDIR)/mt_moon/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 364
$(GFX) $< $@ -num_tiles 364 -Wnum_tiles
$(MAPPREVIEWGFXDIR)/pokemon_mansion/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 388
$(GFX) $< $@ -num_tiles 388 -Wnum_tiles
$(MAPPREVIEWGFXDIR)/pokemon_tower/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 290
$(GFX) $< $@ -num_tiles 290 -Wnum_tiles
$(MAPPREVIEWGFXDIR)/power_plant/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 368
$(GFX) $< $@ -num_tiles 368 -Wnum_tiles
$(MAPPREVIEWGFXDIR)/rock_tunnel/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 407
$(GFX) $< $@ -num_tiles 407 -Wnum_tiles
$(MAPPREVIEWGFXDIR)/rocket_hideout/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 194
$(GFX) $< $@ -num_tiles 194 -Wnum_tiles
$(MAPPREVIEWGFXDIR)/rocket_warehouse/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 234
$(GFX) $< $@ -num_tiles 234 -Wnum_tiles
$(MAPPREVIEWGFXDIR)/safari_zone/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 330
$(GFX) $< $@ -num_tiles 330 -Wnum_tiles
$(MAPPREVIEWGFXDIR)/seafoam_islands/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 408
$(GFX) $< $@ -num_tiles 408 -Wnum_tiles
$(MAPPREVIEWGFXDIR)/silph_co/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 355
$(GFX) $< $@ -num_tiles 355 -Wnum_tiles
$(MAPPREVIEWGFXDIR)/victory_road/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 375
$(GFX) $< $@ -num_tiles 375 -Wnum_tiles
$(MAPPREVIEWGFXDIR)/viridian_forest/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 389
$(GFX) $< $@ -num_tiles 389 -Wnum_tiles
$(NAMINGGFXDIR)/cursor.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 5
$(GFX) $< $@ -num_tiles 5 -Wnum_tiles
$(NAMINGGFXDIR)/cursor_squished.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 5
$(GFX) $< $@ -num_tiles 5 -Wnum_tiles
$(NAMINGGFXDIR)/cursor_filled.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 5
$(GFX) $< $@ -num_tiles 5 -Wnum_tiles
$(WALLPAPERGFXDIR)/beach/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 60
$(GFX) $< $@ -num_tiles 60 -Wnum_tiles
$(WALLPAPERGFXDIR)/cave/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 61
$(GFX) $< $@ -num_tiles 61 -Wnum_tiles
$(WALLPAPERGFXDIR)/city/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 40
$(GFX) $< $@ -num_tiles 40 -Wnum_tiles
$(WALLPAPERGFXDIR)/crag/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 54
$(GFX) $< $@ -num_tiles 54 -Wnum_tiles
$(WALLPAPERGFXDIR)/desert/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 52
$(GFX) $< $@ -num_tiles 52 -Wnum_tiles
$(WALLPAPERGFXDIR)/forest/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 53
$(GFX) $< $@ -num_tiles 53 -Wnum_tiles
$(WALLPAPERGFXDIR)/pokecenter/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 57
$(GFX) $< $@ -num_tiles 57 -Wnum_tiles
$(WALLPAPERGFXDIR)/river/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 63
$(GFX) $< $@ -num_tiles 63 -Wnum_tiles
$(WALLPAPERGFXDIR)/savanna/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 45
$(GFX) $< $@ -num_tiles 45 -Wnum_tiles
$(WALLPAPERGFXDIR)/seafloor/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 53
$(GFX) $< $@ -num_tiles 53 -Wnum_tiles
$(WALLPAPERGFXDIR)/simple/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 25
$(GFX) $< $@ -num_tiles 25 -Wnum_tiles
$(WALLPAPERGFXDIR)/sky/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 52
$(GFX) $< $@ -num_tiles 52 -Wnum_tiles
$(WALLPAPERGFXDIR)/snow/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 51
$(GFX) $< $@ -num_tiles 51 -Wnum_tiles
$(WALLPAPERGFXDIR)/stars/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 37
$(GFX) $< $@ -num_tiles 37 -Wnum_tiles
$(WALLPAPERGFXDIR)/tiles/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 31
$(GFX) $< $@ -num_tiles 31 -Wnum_tiles
$(WALLPAPERGFXDIR)/volcano/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 57
$(GFX) $< $@ -num_tiles 57 -Wnum_tiles
include/graphics.h
+10 -9
View File
@@ -2866,15 +2866,16 @@ extern const u16 gFameCheckerBg3Tilemap[0x400];
extern const u16 gFameCheckerBg2Tilemap[0x400];
// tm_case
extern const u32 gUnknown_8E845D8[];
extern const u32 gUnknown_8E84A24[];
extern const u32 gUnknown_8E84B70[];
extern const u32 gUnknown_8E84CB0[];
extern const u32 gUnknown_8E84D20[];
extern const u32 gTMCase_TMSpriteGfx[];
extern const u32 gUnknown_8E84F20[];
extern const u32 gUnknown_8E85068[];
extern const u8 gUnknown_8E99118[];
extern const u32 gTMCase_Gfx[];
extern const u32 gTMCaseMenu_Tilemap[];
extern const u32 gTMCase_Tilemap[];
extern const u32 gTMCaseMenu_Male_Pal[];
extern const u32 gTMCaseMenu_Female_Pal[];
extern const u32 gTMCaseDisc_Gfx[];
extern const u32 gTMCaseDiscTypes1_Pal[];
extern const u32 gTMCaseDiscTypes2_Pal[];
extern const u8 gTMCaseHM_Gfx[];
extern const u16 gStandardMenuPalette[];
// egg_hatch
include/item.h
+3 -3
View File
@@ -14,7 +14,7 @@ struct Item
u8 holdEffectParam;
const u8 *description;
u8 importance;
u8 exitsBagOnUse;
u8 registrability;
u8 pocket;
u8 type; // unused for balls
ItemUseFunc fieldUseFunc;
@@ -69,7 +69,7 @@ ItemUseFunc ItemId_GetFieldFunc(u16 itemId);
u8 ItemId_GetBattleUsage(u16 itemId);
ItemUseFunc ItemId_GetBattleFunc(u16 itemId);
u8 ItemId_GetSecondaryId(u16 itemId);
u16 itemid_get_market_price(u16 itemId);
u16 ItemId_GetPrice(u16 itemId);
void ClearBag(void);
void ClearPCItemSlots(void);
void TrySetObtainedItemQuestLogEvent(u16 itemId);
@@ -79,7 +79,7 @@ void SortPocketAndPlaceHMsFirst(struct BagPocket * pocket);
u16 BagGetItemIdByPocketPosition(u8 pocketId, u16 itemId);
u16 BagGetQuantityByPocketPosition(u8 pocketId, u16 itemId);
u16 BagGetQuantityByItemId(u16 item);
bool8 itemid_is_unique(u16 itemId);
u8 ItemId_GetImportance(u16 itemId);
void BagPocketCompaction(struct ItemSlot * slots, u8 capacity);
u16 GetPcItemQuantity(u16 *);
void SetBagPocketsPointers(void);
include/strings.h
+2 -2
View File
@@ -103,8 +103,8 @@ extern const u8 gText_ItemCantBeHeld[];
extern const u8 gText_TMCase[];
extern const u8 gText_Close[];
extern const u8 gText_TMCaseWillBePutAway[];
extern const u8 gText_FontSize0[];
extern const u8 gText_FontSize2[];
extern const u8 gText_Font0[];
extern const u8 gText_Font2[];
extern const u8 gText_OhNoICantBuyThat[];
extern const u8 gText_HowManyWouldYouLikeToSell[];
extern const u8 gText_ICanPayThisMuch_WouldThatBeOkay[];
include/tm_case.h
+13 -9
View File
@@ -1,17 +1,21 @@
#ifndef GUARD_TM_CASE_H
#define GUARD_TM_CASE_H
enum TmCaseType
{
TMCASE_FROMFIELD,
TMCASE_FROMPARTYGIVE,
TMCASE_FROMMARTSELL,
TMCASE_FROMPOKEMONSTORAGEPC,
TMCASE_FROMBATTLE,
TMCASE_NA
// Values for 'type' argument to InitTMCase
enum {
TMCASE_FIELD,
TMCASE_GIVE_PARTY,
TMCASE_SELL,
TMCASE_GIVE_PC,
TMCASE_POKEDUDE,
TMCASE_REOPENING,
};
void InitTMCase(u8 a0, void (* a1)(void), u8 a2);
// Alternative value for 'allowSelectClose' argument to InitTMCase.
// Indicates that the previous value should be preserved
#define TMCASE_KEEP_PREV 0xFF
void InitTMCase(u8 type, void (* exitCallback)(void), bool8 allowSelectClose);
void ResetTMCaseCursorPos(void);
void Pokedude_InitTMCase(void);
src/berry_pouch.c
+8 -8
View File
@@ -684,13 +684,13 @@ static void SetUpListMenuTemplate(void)
static void GetBerryNameAndIndexForMenu(u8 * dest, u16 itemId)
{
StringCopy(gStringVar4, gText_FontSize0);
StringCopy(gStringVar4, gText_Font0);
StringAppend(gStringVar4, gText_NumberClear01);
ConvertIntToDecimalStringN(gStringVar1, itemId - FIRST_BERRY_INDEX + 1, STR_CONV_MODE_LEADING_ZEROS, 2);
StringAppend(gStringVar4, gStringVar1);
CopyItemName(itemId, gStringVar1);
StringAppend(gStringVar4, sText_Space);
StringAppend(gStringVar4, gText_FontSize2);
StringAppend(gStringVar4, gText_Font2);
StringAppend(gStringVar4, gStringVar1);
StringCopy(dest, gStringVar4);
}
@@ -1265,7 +1265,7 @@ static void Task_ContextMenu_FromPokemonPC(u8 taskId)
static void Task_ContextMenu_Sell(u8 taskId)
{
s16 * data = gTasks[taskId].data;
if (itemid_get_market_price(gSpecialVar_ItemId) == 0)
if (ItemId_GetPrice(gSpecialVar_ItemId) == 0)
{
CopyItemName(gSpecialVar_ItemId, gStringVar1);
StringExpandPlaceholders(gStringVar4, gText_OhNoICantBuyThat);
@@ -1293,7 +1293,7 @@ static void Task_ContextMenu_Sell(u8 taskId)
static void Task_AskSellMultiple(u8 taskId)
{
s16 * data = gTasks[taskId].data;
ConvertIntToDecimalStringN(gStringVar3, itemid_get_market_price(BagGetItemIdByPocketPosition(POCKET_BERRY_POUCH, data[1])) / 2 * data[8], STR_CONV_MODE_LEFT_ALIGN, 6);
ConvertIntToDecimalStringN(gStringVar3, ItemId_GetPrice(BagGetItemIdByPocketPosition(POCKET_BERRY_POUCH, data[1])) / 2 * data[8], STR_CONV_MODE_LEFT_ALIGN, 6);
StringExpandPlaceholders(gStringVar4, gText_ICanPayThisMuch_WouldThatBeOkay);
DisplayItemMessageInBerryPouch(taskId, GetDialogBoxFontId(), gStringVar4, Task_SellMultiple_CreateYesNoMenu);
}
@@ -1323,7 +1323,7 @@ static void Task_Sell_PrintSelectMultipleUI(u8 taskId)
ConvertIntToDecimalStringN(gStringVar1, 1, STR_CONV_MODE_LEADING_ZEROS, 2);
StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1);
BerryPouchPrint(windowId, FONT_0, gStringVar4, 4, 10, 1, 0, 0xFF, 1);
SellMultiple_UpdateSellPriceDisplay(itemid_get_market_price(BagGetItemIdByPocketPosition(POCKET_BERRY_POUCH, data[1])) / 2 * data[8]);
SellMultiple_UpdateSellPriceDisplay(ItemId_GetPrice(BagGetItemIdByPocketPosition(POCKET_BERRY_POUCH, data[1])) / 2 * data[8]);
PrintMoneyInWin2();
CreateScrollIndicatorArrows_SellQuantity();
gTasks[taskId].func = Task_Sell_SelectMultiple;
@@ -1340,7 +1340,7 @@ static void Task_Sell_SelectMultiple(u8 taskId)
if (AdjustQuantityAccordingToDPadInput(&data[8], data[2]) == TRUE)
{
PrintxQuantityOnWindow(1, data[8], 2);
SellMultiple_UpdateSellPriceDisplay(itemid_get_market_price(BagGetItemIdByPocketPosition(POCKET_BERRY_POUCH, data[1])) / 2 * data[8]);
SellMultiple_UpdateSellPriceDisplay(ItemId_GetPrice(BagGetItemIdByPocketPosition(POCKET_BERRY_POUCH, data[1])) / 2 * data[8]);
}
else if (JOY_NEW(A_BUTTON))
{
@@ -1373,7 +1373,7 @@ static void Task_SellYes(u8 taskId)
PutWindowTilemap(0);
ScheduleBgCopyTilemapToVram(0);
CopyItemName(gSpecialVar_ItemId, gStringVar1);
ConvertIntToDecimalStringN(gStringVar3, itemid_get_market_price(BagGetItemIdByPocketPosition(POCKET_BERRY_POUCH, data[1])) / 2 * data[8], STR_CONV_MODE_LEFT_ALIGN, 6);
ConvertIntToDecimalStringN(gStringVar3, ItemId_GetPrice(BagGetItemIdByPocketPosition(POCKET_BERRY_POUCH, data[1])) / 2 * data[8], STR_CONV_MODE_LEFT_ALIGN, 6);
StringExpandPlaceholders(gStringVar4, gText_TurnedOverItemsWorthYen);
DisplayItemMessageInBerryPouch(taskId, FONT_2, gStringVar4, Task_SellBerries_PlaySfxAndRemoveBerries);
}
@@ -1383,7 +1383,7 @@ static void Task_SellBerries_PlaySfxAndRemoveBerries(u8 taskId)
s16 * data = gTasks[taskId].data;
PlaySE(SE_SHOP);
RemoveBagItem(gSpecialVar_ItemId, data[8]);
AddMoney(&gSaveBlock1Ptr->money, itemid_get_market_price(gSpecialVar_ItemId) / 2 * data[8]);
AddMoney(&gSaveBlock1Ptr->money, ItemId_GetPrice(gSpecialVar_ItemId) / 2 * data[8]);
RecordItemPurchase(gSpecialVar_ItemId, data[8], 2);
DestroyListMenuTask(data[0], &sStaticCnt.listMenuScrollOffset, &sStaticCnt.listMenuSelectedRow);
SortAndCountBerries();
src/data/items.json
+375 -375
View File
File diff suppressed because it is too large. Load diff
src/data/items.json.txt
+1 -1
View File
@@ -20,7 +20,7 @@ const struct Item gItems[] = {
.description = gItemDescription_{{ item.itemId }},
## endif
.importance = {{ item.importance }},
.exitsBagOnUse = {{ item.exitsBagOnUse }},
.registrability = {{ item.registrability }},
.pocket = {{ item.pocket }},
.type = {{ item.type }},
.fieldUseFunc = {{ item.fieldUseFunc }},
src/graphics.c
+12 -12
View File
@@ -1100,18 +1100,18 @@ const u32 gBag_Pal[] = INCBIN_U32("graphics/interface/bag.gbapal.lz");
const u32 gSwapLine_Gfx[] = INCBIN_U32("graphics/interface/bag_swap.4bpp.lz");
const u32 gSwapLine_Pal[] = INCBIN_U32("graphics/interface/bag_swap.gbapal.lz");
const u32 gUnknown_8E845D8[] = INCBIN_U32("graphics/tm_case/unk_8E845D8.4bpp.lz");
const u32 gUnknown_8E84A24[] = INCBIN_U32("graphics/tm_case/unk_8E84A24.bin.lz");
const u32 gUnknown_8E84B70[] = INCBIN_U32("graphics/tm_case/unk_8E84B70.bin.lz");
const u32 gUnknown_8E84CB0[] = INCBIN_U32("graphics/tm_case/unk_8E84CB0.gbapal.lz");
const u32 gUnknown_8E84D20[] = INCBIN_U32("graphics/tm_case/unk_8E84D20.gbapal.lz");
const u32 gTMCase_TMSpriteGfx[] = INCBIN_U32("graphics/tm_case/unk_8E84D90.4bpp.lz");
const u32 gUnknown_8E84F20[] = INCBIN_U32("graphics/tm_case/unk_8E84F20.gbapal.lz");
const u32 gUnknown_8E85068[] = INCBIN_U32("graphics/tm_case/unk_8E85068.gbapal.lz");
const u32 gTMCase_Gfx[] = INCBIN_U32("graphics/tm_case/tm_case.4bpp.lz");
const u32 gTMCaseMenu_Tilemap[] = INCBIN_U32("graphics/tm_case/menu.bin.lz");
const u32 gTMCase_Tilemap[] = INCBIN_U32("graphics/tm_case/tm_case.bin.lz");
const u32 gTMCaseMenu_Male_Pal[] = INCBIN_U32("graphics/tm_case/menu_male.gbapal.lz");
const u32 gTMCaseMenu_Female_Pal[] = INCBIN_U32("graphics/tm_case/menu_female.gbapal.lz");
const u32 gTMCaseDisc_Gfx[] = INCBIN_U32("graphics/tm_case/disc.4bpp.lz");
const u32 gTMCaseDiscTypes1_Pal[] = INCBIN_U32("graphics/tm_case/disc_types_1.gbapal.lz");
const u32 gTMCaseDiscTypes2_Pal[] = INCBIN_U32("graphics/tm_case/disc_types_2.gbapal.lz");
const u8 gItemPcTiles[] = INCBIN_U8("graphics/item_pc/unk_8E85090.4bpp.lz");
const u32 gItemPcBgPals[] = INCBIN_U32("graphics/item_pc/unk_8E85408.gbapal.lz");
const u8 gItemPcTilemap[] = INCBIN_U8("graphics/item_pc/unk_8E85458.bin.lz");
const u8 gItemPcTiles[] = INCBIN_U8("graphics/item_pc/bg.4bpp.lz");
const u32 gItemPcBgPals[] = INCBIN_U32("graphics/item_pc/bg.gbapal.lz");
const u8 gItemPcTilemap[] = INCBIN_U8("graphics/item_pc/bg.bin.lz");
const u32 gBerryPouchSpriteTiles[] = INCBIN_U32("graphics/berry_pouch/berry_pouch.4bpp.lz");
const u8 gBerryPouchBgGfx[] = INCBIN_U8("graphics/berry_pouch/background.4bpp.lz");
@@ -1189,7 +1189,7 @@ const u32 gNamingScreenPageSwapButton_Gfx[] = INCBIN_U32("graphics/naming_screen
const u32 gNamingScreenInputArrow_Gfx[] = INCBIN_U32("graphics/naming_screen/input_arrow.4bpp");
const u32 gNamingScreenUnderscore_Gfx[] = INCBIN_U32("graphics/naming_screen/underscore.4bpp");
const u8 gUnknown_8E99118[] = INCBIN_U8("graphics/tm_case/unk_8E99118.4bpp");
const u8 gTMCaseHM_Gfx[] = INCBIN_U8("graphics/tm_case/hm.4bpp");
const u16 gKantoTrainerCard_Pal[] = INCBIN_U16("graphics/trainer_card/0star.gbapal");
const u32 gKantoTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/card.4bpp.lz");
src/item.c
+7 -5
View File
@@ -621,12 +621,13 @@ const u8 * ItemId_GetName(u16 itemId)
return gItems[SanitizeItemId(itemId)].name;
}
u16 itemid_get_number(u16 itemId)
// Unused
u16 ItemId_GetId(u16 itemId)
{
return gItems[SanitizeItemId(itemId)].itemId;
}
u16 itemid_get_market_price(u16 itemId)
u16 ItemId_GetPrice(u16 itemId)
{
return gItems[SanitizeItemId(itemId)].price;
}
@@ -646,14 +647,15 @@ const u8 * ItemId_GetDescription(u16 itemId)
return gItems[SanitizeItemId(itemId)].description;
}
bool8 itemid_is_unique(u16 itemId)
u8 ItemId_GetImportance(u16 itemId)
{
return gItems[SanitizeItemId(itemId)].importance;
}
u8 itemid_get_x19(u16 itemId)
// Unused
u8 ItemId_GetRegistrability(u16 itemId)
{
return gItems[SanitizeItemId(itemId)].exitsBagOnUse;
return gItems[SanitizeItemId(itemId)].registrability;
}
u8 ItemId_GetPocket(u16 itemId)
src/item_menu.c
+13 -13
View File
@@ -714,7 +714,7 @@ static void BagListMenuItemPrintFunc(u8 windowId, u32 itemId, u8 y)
{
bagItemId = BagGetItemIdByPocketPosition(gBagMenuState.pocket + 1, itemId);
bagItemQuantity = BagGetQuantityByPocketPosition(gBagMenuState.pocket + 1, itemId);
if (gBagMenuState.pocket != POCKET_KEY_ITEMS - 1 && !itemid_is_unique(bagItemId))
if (gBagMenuState.pocket != POCKET_KEY_ITEMS - 1 && ItemId_GetImportance(bagItemId) == 0)
{
ConvertIntToDecimalStringN(gStringVar1, bagItemQuantity, STR_CONV_MODE_RIGHT_ALIGN, 3);
StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1);
@@ -1611,7 +1611,7 @@ static void Task_ItemMenuAction_Give(u8 taskId)
CopyWindowToVram(0, COPYWIN_MAP);
if (!CanWriteMailHere(itemId))
DisplayItemMessageInBag(taskId, FONT_2, gText_CantWriteMailHere, Task_WaitAButtonAndCloseContextMenu);
else if (!itemid_is_unique(itemId))
else if (ItemId_GetImportance(itemId) == 0)
{
if (CalculatePlayerPartyCount() == 0)
{
@@ -1717,7 +1717,7 @@ static void Task_ItemContext_FieldGive(u8 taskId)
ItemMenu_SetExitCallback(GoToBerryPouch_Give);
ItemMenu_StartFadeToExitCallback(taskId);
}
else if (gBagMenuState.pocket != POCKET_KEY_ITEMS - 1 && !itemid_is_unique(itemId))
else if (gBagMenuState.pocket != POCKET_KEY_ITEMS - 1 && ItemId_GetImportance(itemId) == 0)
{
Bag_BeginCloseWin0Animation();
gTasks[taskId].func = ItemMenu_StartFadeToExitCallback;
@@ -1730,7 +1730,7 @@ static void Task_ItemContext_FieldGive(u8 taskId)
static void GoToTMCase_Give(void)
{
InitTMCase(TMCASE_FROMPARTYGIVE, ReturnToBagMenuFromSubmenu_Give, FALSE);
InitTMCase(TMCASE_GIVE_PARTY, ReturnToBagMenuFromSubmenu_Give, FALSE);
}
static void GoToBerryPouch_Give(void)
@@ -1761,7 +1761,7 @@ static void Task_ItemContext_PcBoxGive(u8 taskId)
ItemMenu_SetExitCallback(GoToBerryPouch_PCBox);
ItemMenu_StartFadeToExitCallback(taskId);
}
else if (gBagMenuState.pocket != POCKET_KEY_ITEMS - 1 && !itemid_is_unique(itemId))
else if (gBagMenuState.pocket != POCKET_KEY_ITEMS - 1 && ItemId_GetImportance(itemId) == 0)
{
Bag_BeginCloseWin0Animation();
gTasks[taskId].func = ItemMenu_StartFadeToExitCallback;
@@ -1774,7 +1774,7 @@ static void Task_ItemContext_PcBoxGive(u8 taskId)
static void GoToTMCase_PCBox(void)
{
InitTMCase(TMCASE_FROMPOKEMONSTORAGEPC, ReturnToBagMenuFromSubmenu_PCBox, FALSE);
InitTMCase(TMCASE_GIVE_PC, ReturnToBagMenuFromSubmenu_PCBox, FALSE);
}
static void GoToBerryPouch_PCBox(void)
@@ -1800,7 +1800,7 @@ static void Task_ItemContext_Sell(u8 taskId)
ItemMenu_SetExitCallback(GoToBerryPouch_Sell);
ItemMenu_StartFadeToExitCallback(taskId);
}
else if (itemid_get_market_price(gSpecialVar_ItemId) == 0)
else if (ItemId_GetPrice(gSpecialVar_ItemId) == 0)
{
CopyItemName(gSpecialVar_ItemId, gStringVar1);
StringExpandPlaceholders(gStringVar4, gText_OhNoICantBuyThat);
@@ -1827,7 +1827,7 @@ static void Task_ItemContext_Sell(u8 taskId)
static void GoToTMCase_Sell(void)
{
InitTMCase(TMCASE_FROMMARTSELL, ReturnToBagMenuFromSubmenu_Sell, FALSE);
InitTMCase(TMCASE_SELL, ReturnToBagMenuFromSubmenu_Sell, FALSE);
}
static void GoToBerryPouch_Sell(void)
@@ -1843,7 +1843,7 @@ static void ReturnToBagMenuFromSubmenu_Sell(void)
static void Task_PrintSaleConfirmationText(u8 taskId)
{
s16 *data = gTasks[taskId].data;
ConvertIntToDecimalStringN(gStringVar3, itemid_get_market_price(BagGetItemIdByPocketPosition(gBagMenuState.pocket + 1, data[1])) / 2 * data[8], STR_CONV_MODE_LEFT_ALIGN, 6);
ConvertIntToDecimalStringN(gStringVar3, ItemId_GetPrice(BagGetItemIdByPocketPosition(gBagMenuState.pocket + 1, data[1])) / 2 * data[8], STR_CONV_MODE_LEFT_ALIGN, 6);
StringExpandPlaceholders(gStringVar4, gText_ICanPayThisMuch_WouldThatBeOkay);
DisplayItemMessageInBag(taskId, GetDialogBoxFontId(), gStringVar4, Task_ShowSellYesNoMenu);
}
@@ -1873,7 +1873,7 @@ static void Task_InitSaleQuantitySelectInterface(u8 taskId)
ConvertIntToDecimalStringN(gStringVar1, 1, STR_CONV_MODE_LEADING_ZEROS, 2);
StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1);
BagPrintTextOnWindow(r4, FONT_0, gStringVar4, 4, 10, 1, 0, 0xFF, 1);
UpdateSalePriceDisplay(itemid_get_market_price(BagGetItemIdByPocketPosition(gBagMenuState.pocket + 1, data[1])) / 2 * data[8]);
UpdateSalePriceDisplay(ItemId_GetPrice(BagGetItemIdByPocketPosition(gBagMenuState.pocket + 1, data[1])) / 2 * data[8]);
BagPrintMoneyAmount();
CreatePocketScrollArrowPair_SellQuantity();
gTasks[taskId].func = Task_SelectQuantityToSell;
@@ -1890,7 +1890,7 @@ static void Task_SelectQuantityToSell(u8 taskId)
if (AdjustQuantityAccordingToDPadInput(&data[8], data[2]) == TRUE)
{
UpdateQuantityToTossOrDeposit(data[8], 2);
UpdateSalePriceDisplay(itemid_get_market_price(BagGetItemIdByPocketPosition(gBagMenuState.pocket + 1, data[1])) / 2 * data[8]);
UpdateSalePriceDisplay(ItemId_GetPrice(BagGetItemIdByPocketPosition(gBagMenuState.pocket + 1, data[1])) / 2 * data[8]);
}
else if (JOY_NEW(A_BUTTON))
{
@@ -1923,7 +1923,7 @@ static void Task_SellItem_Yes(u8 taskId)
PutWindowTilemap(0);
ScheduleBgCopyTilemapToVram(0);
CopyItemName(gSpecialVar_ItemId, gStringVar1);
ConvertIntToDecimalStringN(gStringVar3, itemid_get_market_price(BagGetItemIdByPocketPosition(gBagMenuState.pocket + 1, data[1])) / 2 * data[8], STR_CONV_MODE_LEFT_ALIGN, 6);
ConvertIntToDecimalStringN(gStringVar3, ItemId_GetPrice(BagGetItemIdByPocketPosition(gBagMenuState.pocket + 1, data[1])) / 2 * data[8], STR_CONV_MODE_LEFT_ALIGN, 6);
StringExpandPlaceholders(gStringVar4, gText_TurnedOverItemsWorthYen);
DisplayItemMessageInBag(taskId, FONT_2, gStringVar4, Task_FinalizeSaleToShop);
}
@@ -1933,7 +1933,7 @@ static void Task_FinalizeSaleToShop(u8 taskId)
s16 *data = gTasks[taskId].data;
PlaySE(SE_SHOP);
RemoveBagItem(gSpecialVar_ItemId, data[8]);
AddMoney(&gSaveBlock1Ptr->money, itemid_get_market_price(gSpecialVar_ItemId) / 2 * data[8]);
AddMoney(&gSaveBlock1Ptr->money, ItemId_GetPrice(gSpecialVar_ItemId) / 2 * data[8]);
RecordItemPurchase(gSpecialVar_ItemId, data[8], 2);
DestroyListMenuTask(data[0], &gBagMenuState.cursorPos[gBagMenuState.pocket], &gBagMenuState.itemsAbove[gBagMenuState.pocket]);
Pocket_CalculateNItemsAndMaxShowed(gBagMenuState.pocket);
src/item_use.c
+2 -2
View File
@@ -459,7 +459,7 @@ void FieldUseFunc_TmCase(u8 taskId)
static void InitTMCaseFromBag(void)
{
InitTMCase(0, CB2_BagMenuFromStartMenu, 0);
InitTMCase(TMCASE_FIELD, CB2_BagMenuFromStartMenu, FALSE);
}
static void Task_InitTMCaseFromField(u8 taskId)
@@ -468,7 +468,7 @@ static void Task_InitTMCaseFromField(u8 taskId)
{
CleanupOverworldWindowsAndTilemaps();
SetFieldCallback2ForItemUse();
InitTMCase(0, CB2_ReturnToField, 1);
InitTMCase(TMCASE_FIELD, CB2_ReturnToField, TRUE);
DestroyTask(taskId);
}
}
src/party_menu.c
+1 -1
View File
@@ -4258,7 +4258,7 @@ static void CB2_ReturnToBagMenu(void)
static void CB2_ReturnToTMCaseMenu(void)
{
InitTMCase(TMCASE_NA, NULL, 0xFF);
InitTMCase(TMCASE_REOPENING, NULL, TMCASE_KEEP_PREV);
}
static void CB2_ReturnToBerryPouchMenu(void)
src/shop.c
+5 -5
View File
@@ -614,7 +614,7 @@ static void BuyMenuPrintPriceInList(u8 windowId, u32 item, u8 y)
if (item != INDEX_CANCEL)
{
ConvertIntToDecimalStringN(gStringVar1, itemid_get_market_price(item), 0, 4);
ConvertIntToDecimalStringN(gStringVar1, ItemId_GetPrice(item), 0, 4);
x = 4 - StringLength(gStringVar1);
loc = gStringVar4;
while (x-- != 0)
@@ -902,7 +902,7 @@ static void Task_BuyMenu(u8 taskId)
BuyMenuRemoveScrollIndicatorArrows();
BuyMenuPrintCursor(tListTaskId, 2);
RecolorItemDescriptionBox(1);
gShopData.itemPrice = itemid_get_market_price(itemId);
gShopData.itemPrice = ItemId_GetPrice(itemId);
if (!IsEnoughMoney(&gSaveBlock1Ptr->money, gShopData.itemPrice))
{
BuyMenuDisplayMessage(taskId, gText_YouDontHaveMoney, BuyMenuReturnToItemList);
@@ -931,7 +931,7 @@ static void Task_BuyHowManyDialogueInit(u8 taskId)
BuyMenuQuantityBoxNormalBorder(3, 0);
BuyMenuPrintItemQuantityAndPrice(taskId);
ScheduleBgCopyTilemapToVram(0);
maxQuantity = GetMoney(&gSaveBlock1Ptr->money) / itemid_get_market_price(tItemId);
maxQuantity = GetMoney(&gSaveBlock1Ptr->money) / ItemId_GetPrice(tItemId);
if (maxQuantity > 99)
gShopData.maxQuantity = 99;
else
@@ -949,7 +949,7 @@ static void Task_BuyHowManyDialogueHandleInput(u8 taskId)
if (AdjustQuantityAccordingToDPadInput(&tItemCount, gShopData.maxQuantity) == TRUE)
{
gShopData.itemPrice = itemid_get_market_price(tItemId) * tItemCount;
gShopData.itemPrice = ItemId_GetPrice(tItemId) * tItemCount;
BuyMenuPrintItemQuantityAndPrice(taskId);
}
else
@@ -1102,7 +1102,7 @@ void RecordItemPurchase(u16 item, u16 quantity, u8 a2)
if (history->unk0 < 999999)
{
history->unk0 += (itemid_get_market_price(item) >> (a2 - 1)) * quantity;
history->unk0 += (ItemId_GetPrice(item) >> (a2 - 1)) * quantity;
if (history->unk0 > 999999)
history->unk0 = 999999;
}
src/ss_anne.c
+2 -2
View File
@@ -18,8 +18,8 @@ static void WakeSpriteCallback(struct Sprite *sprite);
static void CreateSmokeSprite(void);
static void SmokeSpriteCallback(struct Sprite *sprite);
static const u16 sWakeTiles[] = INCBIN_U16("graphics/ss_anne/unk_8479838.4bpp");
static const u16 sSmokeTiles[] = INCBIN_U16("graphics/ss_anne/unk_8479A38.4bpp");
static const u16 sWakeTiles[] = INCBIN_U16("graphics/ss_anne/wake.4bpp");
static const u16 sSmokeTiles[] = INCBIN_U16("graphics/ss_anne/smoke.4bpp");
static const struct SpriteSheet sSpriteSheets[] = {
{(const void *)sWakeTiles, sizeof(sWakeTiles), SPRITE_TAG_WAKE},
src/strings.c
+2 -2
View File
@@ -207,8 +207,8 @@ const u8 gText_PokeFluteAwakenedMon[] = _("The POKé FLUTE awakened sleeping\nPO
const u8 gText_TMCase[] = _("TM CASE");
const u8 gText_Close[] = _("CLOSE");
const u8 gText_TMCaseWillBePutAway[] = _("The TM CASE will be\nput away.");
const u8 gText_FontSize0[] = _("{FONT_0}");
const u8 gText_FontSize2[] = _("{FONT_2}");
const u8 gText_Font0[] = _("{FONT_0}");
const u8 gText_Font2[] = _("{FONT_2}");
const u8 gText_EmptySpace[] = _(" ");
const u8 gText_BerryPouch[] = _("BERRY POUCH");
const u8 gText_TheBerryPouchWillBePutAway[] = _("The BERRY POUCH will be\nput away.");
src/tm_case.c
+667 -461
View File
File diff suppressed because it is too large. Load diff
tileset_rules.mk
+67 -67
View File
@@ -1,202 +1,202 @@
TILESETGFXDIR := data/tilesets
$(TILESETGFXDIR)/primary/building/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 640
$(GFX) $< $@ -num_tiles 640 -Wnum_tiles
$(TILESETGFXDIR)/primary/general/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 640
$(GFX) $< $@ -num_tiles 640 -Wnum_tiles
$(TILESETGFXDIR)/secondary/pallet_town/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 76
$(GFX) $< $@ -num_tiles 76 -Wnum_tiles
$(TILESETGFXDIR)/secondary/lavender_town/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 256
$(GFX) $< $@ -num_tiles 256 -Wnum_tiles
$(TILESETGFXDIR)/secondary/cinnabar_island/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 128
$(GFX) $< $@ -num_tiles 128 -Wnum_tiles
$(TILESETGFXDIR)/secondary/pokemon_center/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 376
$(GFX) $< $@ -num_tiles 376 -Wnum_tiles
$(TILESETGFXDIR)/secondary/cable_club/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 632
$(GFX) $< $@ -num_tiles 632 -Wnum_tiles
$(TILESETGFXDIR)/secondary/fuchsia_gym/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 92
$(GFX) $< $@ -num_tiles 92 -Wnum_tiles
$(TILESETGFXDIR)/secondary/pewter_gym/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 207
$(GFX) $< $@ -num_tiles 207 -Wnum_tiles
$(TILESETGFXDIR)/secondary/saffron_gym/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 82
$(GFX) $< $@ -num_tiles 82 -Wnum_tiles
$(TILESETGFXDIR)/secondary/viridian_forest/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 101
$(GFX) $< $@ -num_tiles 101 -Wnum_tiles
$(TILESETGFXDIR)/secondary/seafoam_islands/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 318
$(GFX) $< $@ -num_tiles 318 -Wnum_tiles
$(TILESETGFXDIR)/secondary/generic_building_2/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 152
$(GFX) $< $@ -num_tiles 152 -Wnum_tiles
$(TILESETGFXDIR)/secondary/underground_path/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 50
$(GFX) $< $@ -num_tiles 50 -Wnum_tiles
$(TILESETGFXDIR)/secondary/restaurant_hotel/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 76
$(GFX) $< $@ -num_tiles 76 -Wnum_tiles
$(TILESETGFXDIR)/secondary/burgled_house/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 172
$(GFX) $< $@ -num_tiles 172 -Wnum_tiles
$(TILESETGFXDIR)/secondary/berry_forest/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 101
$(GFX) $< $@ -num_tiles 101 -Wnum_tiles
$(TILESETGFXDIR)/secondary/sevii_islands_45/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 374
$(GFX) $< $@ -num_tiles 374 -Wnum_tiles
$(TILESETGFXDIR)/secondary/pokemon_league/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 340
$(GFX) $< $@ -num_tiles 340 -Wnum_tiles
$(TILESETGFXDIR)/secondary/viridian_city/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 112
$(GFX) $< $@ -num_tiles 112 -Wnum_tiles
$(TILESETGFXDIR)/secondary/vermilion_city/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 140
$(GFX) $< $@ -num_tiles 140 -Wnum_tiles
$(TILESETGFXDIR)/secondary/indigo_plateau/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 247
$(GFX) $< $@ -num_tiles 247 -Wnum_tiles
$(TILESETGFXDIR)/secondary/cave/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 256
$(GFX) $< $@ -num_tiles 256 -Wnum_tiles
$(TILESETGFXDIR)/secondary/bike_shop/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 60
$(GFX) $< $@ -num_tiles 60 -Wnum_tiles
$(TILESETGFXDIR)/secondary/viridian_gym/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 90
$(GFX) $< $@ -num_tiles 90 -Wnum_tiles
$(TILESETGFXDIR)/secondary/cerulean_gym/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 119
$(GFX) $< $@ -num_tiles 119 -Wnum_tiles
$(TILESETGFXDIR)/secondary/cinnabar_gym/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 146
$(GFX) $< $@ -num_tiles 146 -Wnum_tiles
$(TILESETGFXDIR)/secondary/unused_gatehouse_1/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 144
$(GFX) $< $@ -num_tiles 144 -Wnum_tiles
$(TILESETGFXDIR)/secondary/unused_gatehouse_2/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 144
$(GFX) $< $@ -num_tiles 144 -Wnum_tiles
$(TILESETGFXDIR)/secondary/power_plant/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 80
$(GFX) $< $@ -num_tiles 80 -Wnum_tiles
$(TILESETGFXDIR)/secondary/pokemon_tower/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 128
$(GFX) $< $@ -num_tiles 128 -Wnum_tiles
$(TILESETGFXDIR)/secondary/school/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 50
$(GFX) $< $@ -num_tiles 50 -Wnum_tiles
$(TILESETGFXDIR)/secondary/dummy_3/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 2
$(GFX) $< $@ -num_tiles 2 -Wnum_tiles
$(TILESETGFXDIR)/secondary/navel_rock/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 282
$(GFX) $< $@ -num_tiles 282 -Wnum_tiles
$(TILESETGFXDIR)/secondary/sevii_islands_67/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 374
$(GFX) $< $@ -num_tiles 374 -Wnum_tiles
$(TILESETGFXDIR)/secondary/hall_of_fame/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 208
$(GFX) $< $@ -num_tiles 208 -Wnum_tiles
$(TILESETGFXDIR)/secondary/pewter_city/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 280
$(GFX) $< $@ -num_tiles 280 -Wnum_tiles
$(TILESETGFXDIR)/secondary/celadon_city/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 244
$(GFX) $< $@ -num_tiles 244 -Wnum_tiles
$(TILESETGFXDIR)/secondary/saffron_city/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 262
$(GFX) $< $@ -num_tiles 262 -Wnum_tiles
$(TILESETGFXDIR)/secondary/dummy_1/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 2
$(GFX) $< $@ -num_tiles 2 -Wnum_tiles
$(TILESETGFXDIR)/secondary/generic_building_1/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 63
$(GFX) $< $@ -num_tiles 63 -Wnum_tiles
$(TILESETGFXDIR)/secondary/hoenn_building/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 383
$(GFX) $< $@ -num_tiles 383 -Wnum_tiles
$(TILESETGFXDIR)/secondary/vermilion_gym/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 247
$(GFX) $< $@ -num_tiles 247 -Wnum_tiles
$(TILESETGFXDIR)/secondary/ss_anne/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 245
$(GFX) $< $@ -num_tiles 245 -Wnum_tiles
$(TILESETGFXDIR)/secondary/rock_tunnel/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 256
$(GFX) $< $@ -num_tiles 256 -Wnum_tiles
$(TILESETGFXDIR)/secondary/cerulean_cave/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 246
$(GFX) $< $@ -num_tiles 246 -Wnum_tiles
$(TILESETGFXDIR)/secondary/sea_cottage/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 68
$(GFX) $< $@ -num_tiles 68 -Wnum_tiles
$(TILESETGFXDIR)/secondary/safari_zone_building/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 90
$(GFX) $< $@ -num_tiles 90 -Wnum_tiles
$(TILESETGFXDIR)/secondary/fan_club_daycare/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 85
$(GFX) $< $@ -num_tiles 85 -Wnum_tiles
$(TILESETGFXDIR)/secondary/dummy_4/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 2
$(GFX) $< $@ -num_tiles 2 -Wnum_tiles
$(TILESETGFXDIR)/secondary/tanoby_ruins/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 74
$(GFX) $< $@ -num_tiles 74 -Wnum_tiles
$(TILESETGFXDIR)/secondary/trainer_tower/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 343
$(GFX) $< $@ -num_tiles 343 -Wnum_tiles
$(TILESETGFXDIR)/secondary/cerulean_city/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 158
$(GFX) $< $@ -num_tiles 158 -Wnum_tiles
$(TILESETGFXDIR)/secondary/fuchsia_city/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 191
$(GFX) $< $@ -num_tiles 191 -Wnum_tiles
$(TILESETGFXDIR)/secondary/mart/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 36
$(GFX) $< $@ -num_tiles 36 -Wnum_tiles
$(TILESETGFXDIR)/secondary/museum/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 137
$(GFX) $< $@ -num_tiles 137 -Wnum_tiles
$(TILESETGFXDIR)/secondary/lab/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 102
$(GFX) $< $@ -num_tiles 102 -Wnum_tiles
$(TILESETGFXDIR)/secondary/game_corner/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 171
$(GFX) $< $@ -num_tiles 171 -Wnum_tiles
$(TILESETGFXDIR)/secondary/celadon_gym/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 103
$(GFX) $< $@ -num_tiles 103 -Wnum_tiles
$(TILESETGFXDIR)/secondary/dummy_2/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 2
$(GFX) $< $@ -num_tiles 2 -Wnum_tiles
$(TILESETGFXDIR)/secondary/digletts_cave/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 248
$(GFX) $< $@ -num_tiles 248 -Wnum_tiles
$(TILESETGFXDIR)/secondary/department_store/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 201
$(GFX) $< $@ -num_tiles 201 -Wnum_tiles
$(TILESETGFXDIR)/secondary/pokemon_mansion/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 350
$(GFX) $< $@ -num_tiles 350 -Wnum_tiles
$(TILESETGFXDIR)/secondary/condominiums/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 384
$(GFX) $< $@ -num_tiles 384 -Wnum_tiles
$(TILESETGFXDIR)/secondary/mt_ember/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 288
$(GFX) $< $@ -num_tiles 288 -Wnum_tiles
$(TILESETGFXDIR)/secondary/sevii_islands_123/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 374
$(GFX) $< $@ -num_tiles 374 -Wnum_tiles
$(TILESETGFXDIR)/secondary/island_harbor/tiles.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 165
$(GFX) $< $@ -num_tiles 165 -Wnum_tiles
tools/gbagfx/gfx.c
+26 -6
View File
@@ -397,7 +397,7 @@ void ReadImage(char *path, int tilesWidth, int bitDepth, int metatileWidth, int
free(buffer);
}
void WriteImage(char *path, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors)
void WriteImage(char *path, enum NumTilesMode numTilesMode, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors)
{
int tileSize = bitDepth * 8;
@@ -424,7 +424,8 @@ void WriteImage(char *path, int numTiles, int bitDepth, int metatileWidth, int m
FATAL_ERROR("The specified number of tiles (%d) is greater than the maximum possible value (%d).\n", numTiles, maxNumTiles);
int bufferSize = numTiles * tileSize;
unsigned char *buffer = malloc(bufferSize);
int maxBufferSize = maxNumTiles * tileSize;
unsigned char *buffer = malloc(maxBufferSize);
if (buffer == NULL)
FATAL_ERROR("Failed to allocate memory for pixels.\n");
@@ -433,17 +434,36 @@ void WriteImage(char *path, int numTiles, int bitDepth, int metatileWidth, int m
switch (bitDepth) {
case 1:
ConvertToTiles1Bpp(image->pixels, buffer, numTiles, metatilesWide, metatileWidth, metatileHeight, invertColors);
ConvertToTiles1Bpp(image->pixels, buffer, maxNumTiles, metatilesWide, metatileWidth, metatileHeight, invertColors);
break;
case 4:
ConvertToTiles4Bpp(image->pixels, buffer, numTiles, metatilesWide, metatileWidth, metatileHeight, invertColors);
ConvertToTiles4Bpp(image->pixels, buffer, maxNumTiles, metatilesWide, metatileWidth, metatileHeight, invertColors);
break;
case 8:
ConvertToTiles8Bpp(image->pixels, buffer, numTiles, metatilesWide, metatileWidth, metatileHeight, invertColors);
ConvertToTiles8Bpp(image->pixels, buffer, maxNumTiles, metatilesWide, metatileWidth, metatileHeight, invertColors);
break;
}
WriteWholeFile(path, buffer, bufferSize);
bool zeroPadded = true;
for (int i = bufferSize; i < maxBufferSize && zeroPadded; i++) {
if (buffer[i] != 0)
{
switch (numTilesMode)
{
case NUM_TILES_IGNORE:
break;
case NUM_TILES_WARN:
fprintf(stderr, "Ignoring -num_tiles %d because tile %d contains non-transparent pixels.\n", numTiles, 1 + i / tileSize);
zeroPadded = false;
break;
case NUM_TILES_ERROR:
FATAL_ERROR("Tile %d contains non-transparent pixels.\n", 1 + i / tileSize);
break;
}
}
}
WriteWholeFile(path, buffer, zeroPadded ? bufferSize : maxBufferSize);
free(buffer);
}
tools/gbagfx/gfx.h
+7 -1
View File
@@ -44,8 +44,14 @@ struct Image {
bool isAffine;
};
enum NumTilesMode {
NUM_TILES_IGNORE,
NUM_TILES_WARN,
NUM_TILES_ERROR,
};
void ReadImage(char *path, int tilesWidth, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors);
void WriteImage(char *path, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors);
void WriteImage(char *path, enum NumTilesMode numTilesMode, int numTiles, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors);
void FreeImage(struct Image *image);
void ReadGbaPalette(char *path, struct Palette *palette);
void WriteGbaPalette(char *path, struct Palette *palette);
tools/gbagfx/main.c
+8 -1
View File
@@ -77,7 +77,7 @@ void ConvertPngToGba(char *inputPath, char *outputPath, struct PngToGbaOptions *
ReadPng(inputPath, &image);
WriteImage(outputPath, options->numTiles, options->bitDepth, options->metatileWidth, options->metatileHeight, &image, !image.hasPalette);
WriteImage(outputPath, options->numTilesMode, options->numTiles, options->bitDepth, options->metatileWidth, options->metatileHeight, &image, !image.hasPalette);
FreeImage(&image);
}
@@ -179,6 +179,7 @@ void HandlePngToGbaCommand(char *inputPath, char *outputPath, int argc, char **a
char *outputFileExtension = GetFileExtensionAfterDot(outputPath);
int bitDepth = outputFileExtension[0] - '0';
struct PngToGbaOptions options;
options.numTilesMode = NUM_TILES_IGNORE;
options.numTiles = 0;
options.bitDepth = bitDepth;
options.metatileWidth = 1;
@@ -203,6 +204,12 @@ void HandlePngToGbaCommand(char *inputPath, char *outputPath, int argc, char **a
if (options.numTiles < 1)
FATAL_ERROR("Number of tiles must be positive.\n");
}
else if (strcmp(option, "-Wnum_tiles") == 0) {
options.numTilesMode = NUM_TILES_WARN;
}
else if (strcmp(option, "-Werror=num_tiles") == 0) {
options.numTilesMode = NUM_TILES_ERROR;
}
else if (strcmp(option, "-mwidth") == 0)
{
if (i + 1 >= argc)
tools/gbagfx/options.h
+2
View File
@@ -4,6 +4,7 @@
#define OPTIONS_H
#include <stdbool.h>
#include "gfx.h"
struct GbaToPngOptions {
char *paletteFilePath;
@@ -18,6 +19,7 @@ struct GbaToPngOptions {
struct PngToGbaOptions {
int numTiles;
enum NumTilesMode numTilesMode;
int bitDepth;
int metatileWidth;
int metatileHeight;