Merge remote-tracking branch 'Bird/dump_pokenav.s'
This commit is contained in:
@@ -15,7 +15,7 @@ TYPESGFXDIR := graphics/types
|
||||
RAYQUAZAGFXDIR := graphics/rayquaza_scene
|
||||
ROULETTEGFXDIR := graphics/roulette
|
||||
SLOTMACHINEGFXDIR := graphics/slot_machine
|
||||
PKNAVGFXDIR := graphics/pokenav/
|
||||
PKNAVGFXDIR := graphics/pokenav
|
||||
PKNAVOPTIONSGFXDIR := graphics/pokenav/options
|
||||
PSSGFXDIR := graphics/pokemon_storage
|
||||
|
||||
@@ -23,33 +23,33 @@ types := normal fight flying poison ground rock bug ghost steel mystery fire wat
|
||||
contest_types := cool beauty cute smart tough
|
||||
|
||||
$(MONSTILLFRONTGFXDIR)/castform_still_front_pic.4bpp: $(MONSTILLFRONTGFXDIR)/castform_normal_form_still_front_pic.4bpp \
|
||||
$(MONSTILLFRONTGFXDIR)/castform_sunny_form_still_front_pic.4bpp \
|
||||
$(MONSTILLFRONTGFXDIR)/castform_rainy_form_still_front_pic.4bpp \
|
||||
$(MONSTILLFRONTGFXDIR)/castform_snowy_form_still_front_pic.4bpp
|
||||
$(MONSTILLFRONTGFXDIR)/castform_sunny_form_still_front_pic.4bpp \
|
||||
$(MONSTILLFRONTGFXDIR)/castform_rainy_form_still_front_pic.4bpp \
|
||||
$(MONSTILLFRONTGFXDIR)/castform_snowy_form_still_front_pic.4bpp
|
||||
@cat $^ >$@
|
||||
|
||||
$(MONBACKGFXDIR)/castform_back_pic.4bpp: $(MONBACKGFXDIR)/castform_normal_form_back_pic.4bpp \
|
||||
$(MONBACKGFXDIR)/castform_sunny_form_back_pic.4bpp \
|
||||
$(MONBACKGFXDIR)/castform_rainy_form_back_pic.4bpp \
|
||||
$(MONBACKGFXDIR)/castform_snowy_form_back_pic.4bpp
|
||||
$(MONBACKGFXDIR)/castform_sunny_form_back_pic.4bpp \
|
||||
$(MONBACKGFXDIR)/castform_rainy_form_back_pic.4bpp \
|
||||
$(MONBACKGFXDIR)/castform_snowy_form_back_pic.4bpp
|
||||
@cat $^ >$@
|
||||
|
||||
$(MONFRONTGFXDIR)/castform_front_pic.4bpp: $(MONFRONTGFXDIR)/castform_normal_form_front_pic.4bpp \
|
||||
$(MONFRONTGFXDIR)/castform_sunny_form_front_pic.4bpp \
|
||||
$(MONFRONTGFXDIR)/castform_rainy_form_front_pic.4bpp \
|
||||
$(MONFRONTGFXDIR)/castform_snowy_form_front_pic.4bpp
|
||||
$(MONFRONTGFXDIR)/castform_sunny_form_front_pic.4bpp \
|
||||
$(MONFRONTGFXDIR)/castform_rainy_form_front_pic.4bpp \
|
||||
$(MONFRONTGFXDIR)/castform_snowy_form_front_pic.4bpp
|
||||
@cat $^ >$@
|
||||
|
||||
$(MONPALDIR)/castform_palette.gbapal: $(MONPALDIR)/castform_normal_form_palette.gbapal \
|
||||
$(MONPALDIR)/castform_sunny_form_palette.gbapal \
|
||||
$(MONPALDIR)/castform_rainy_form_palette.gbapal \
|
||||
$(MONPALDIR)/castform_snowy_form_palette.gbapal
|
||||
$(MONPALDIR)/castform_sunny_form_palette.gbapal \
|
||||
$(MONPALDIR)/castform_rainy_form_palette.gbapal \
|
||||
$(MONPALDIR)/castform_snowy_form_palette.gbapal
|
||||
@cat $^ >$@
|
||||
|
||||
$(MONPALDIR)/castform_shiny_palette.gbapal: $(MONPALDIR)/castform_normal_form_shiny_palette.gbapal \
|
||||
$(MONPALDIR)/castform_sunny_form_shiny_palette.gbapal \
|
||||
$(MONPALDIR)/castform_rainy_form_shiny_palette.gbapal \
|
||||
$(MONPALDIR)/castform_snowy_form_shiny_palette.gbapal
|
||||
$(MONPALDIR)/castform_sunny_form_shiny_palette.gbapal \
|
||||
$(MONPALDIR)/castform_rainy_form_shiny_palette.gbapal \
|
||||
$(MONPALDIR)/castform_snowy_form_shiny_palette.gbapal
|
||||
@cat $^ >$@
|
||||
|
||||
$(TILESETGFXDIR)/secondary/petalburg/tiles.4bpp: %.4bpp: %.png
|
||||
@@ -300,7 +300,7 @@ graphics/title_screen/pokemon_logo.gbapal: %.gbapal: %.pal
|
||||
|
||||
graphics/intro/copyright.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -num_tiles 39
|
||||
|
||||
|
||||
graphics/interface/pkmnjump_bg.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -num_tiles 63
|
||||
|
||||
@@ -311,44 +311,44 @@ graphics/misc/japanese_hof.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -num_tiles 29
|
||||
|
||||
$(MENUGFXDIR)/menu.gbapal: $(MENUGFXDIR)/menu_0.gbapal \
|
||||
$(MENUGFXDIR)/menu_1.gbapal
|
||||
$(MENUGFXDIR)/menu_1.gbapal
|
||||
@cat $^ >$@
|
||||
|
||||
$(BTLANMSPRGFXDIR)/010.4bpp: $(BTLANMSPRGFXDIR)/010_0.4bpp \
|
||||
$(BTLANMSPRGFXDIR)/010_1.4bpp \
|
||||
$(BTLANMSPRGFXDIR)/010_2.4bpp \
|
||||
$(BTLANMSPRGFXDIR)/010_3.4bpp
|
||||
$(BTLANMSPRGFXDIR)/010_1.4bpp \
|
||||
$(BTLANMSPRGFXDIR)/010_2.4bpp \
|
||||
$(BTLANMSPRGFXDIR)/010_3.4bpp
|
||||
@cat $^ >$@
|
||||
|
||||
$(UNUSEDGFXDIR)/obi_palpak1.gbapal: $(UNUSEDGFXDIR)/old_pal1.gbapal \
|
||||
$(UNUSEDGFXDIR)/old_pal2.gbapal \
|
||||
$(UNUSEDGFXDIR)/old_pal3.gbapal
|
||||
$(UNUSEDGFXDIR)/old_pal2.gbapal \
|
||||
$(UNUSEDGFXDIR)/old_pal3.gbapal
|
||||
@cat $^ >$@
|
||||
|
||||
$(UNUSEDGFXDIR)/obi_palpak3.gbapal: $(UNUSEDGFXDIR)/old_pal5.gbapal \
|
||||
$(UNUSEDGFXDIR)/old_pal6.gbapal \
|
||||
$(UNUSEDGFXDIR)/old_pal7.gbapal
|
||||
$(UNUSEDGFXDIR)/old_pal6.gbapal \
|
||||
$(UNUSEDGFXDIR)/old_pal7.gbapal
|
||||
@cat $^ >$@
|
||||
|
||||
$(UNUSEDGFXDIR)/obi1.4bpp: $(UNUSEDGFXDIR)/old_bulbasaur.4bpp \
|
||||
$(UNUSEDGFXDIR)/old_charizard.4bpp
|
||||
$(UNUSEDGFXDIR)/old_charizard.4bpp
|
||||
@cat $^ >$@
|
||||
|
||||
$(UNUSEDGFXDIR)/obi2.4bpp: $(UNUSEDGFXDIR)/old_bulbasaur2.4bpp \
|
||||
$(UNUSEDGFXDIR)/old_battle_interface_1.4bpp \
|
||||
$(UNUSEDGFXDIR)/old_battle_interface_2.4bpp \
|
||||
$(UNUSEDGFXDIR)/old_battle_interface_3.4bpp
|
||||
$(UNUSEDGFXDIR)/old_battle_interface_1.4bpp \
|
||||
$(UNUSEDGFXDIR)/old_battle_interface_2.4bpp \
|
||||
$(UNUSEDGFXDIR)/old_battle_interface_3.4bpp
|
||||
@cat $^ >$@
|
||||
|
||||
$(MENUGFXDIR)/hp_numbers.4bpp: $(MENUGFXDIR)/hpbar_anim.4bpp \
|
||||
$(MENUGFXDIR)/numbers1.4bpp \
|
||||
$(MENUGFXDIR)/numbers2.4bpp
|
||||
$(MENUGFXDIR)/numbers1.4bpp \
|
||||
$(MENUGFXDIR)/numbers2.4bpp
|
||||
@cat $^ >$@
|
||||
|
||||
$(UNUSEDGFXDIR)/redyellowgreen_frame.bin: $(UNUSEDGFXDIR)/red_frame.bin \
|
||||
$(UNUSEDGFXDIR)/yellow_frame.bin \
|
||||
$(UNUSEDGFXDIR)/green_frame.bin \
|
||||
$(UNUSEDGFXDIR)/blank_frame.bin
|
||||
$(UNUSEDGFXDIR)/yellow_frame.bin \
|
||||
$(UNUSEDGFXDIR)/green_frame.bin \
|
||||
$(UNUSEDGFXDIR)/blank_frame.bin
|
||||
@cat $^ >$@
|
||||
|
||||
$(UNUSEDGFXDIR)/color_frames.4bpp: %.4bpp: %.png
|
||||
@@ -358,38 +358,38 @@ $(BATINTGFXDIR)/unused_window2bar.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -num_tiles 5
|
||||
|
||||
$(UNUSEDGFXDIR)/old_contest.4bpp: $(UNUSEDGFXDIR)/old_contest_frame_1.4bpp \
|
||||
$(UNUSEDGFXDIR)/old_contest_floor.4bpp \
|
||||
$(UNUSEDGFXDIR)/old_contest_frame_2.4bpp \
|
||||
$(UNUSEDGFXDIR)/old_contest_symbols.4bpp \
|
||||
$(UNUSEDGFXDIR)/old_contest_meter.4bpp \
|
||||
$(UNUSEDGFXDIR)/old_contest_classes.4bpp \
|
||||
$(UNUSEDGFXDIR)/old_contest_numbers.4bpp
|
||||
$(UNUSEDGFXDIR)/old_contest_floor.4bpp \
|
||||
$(UNUSEDGFXDIR)/old_contest_frame_2.4bpp \
|
||||
$(UNUSEDGFXDIR)/old_contest_symbols.4bpp \
|
||||
$(UNUSEDGFXDIR)/old_contest_meter.4bpp \
|
||||
$(UNUSEDGFXDIR)/old_contest_classes.4bpp \
|
||||
$(UNUSEDGFXDIR)/old_contest_numbers.4bpp
|
||||
@cat $^ >$@
|
||||
|
||||
$(UNUSEDGFXDIR)/old_contest_2.4bpp: $(UNUSEDGFXDIR)/old_contest_2_1.4bpp \
|
||||
$(UNUSEDGFXDIR)/old_contest_2_2.4bpp
|
||||
$(UNUSEDGFXDIR)/old_contest_2_2.4bpp
|
||||
@cat $^ >$@
|
||||
|
||||
$(UNKNOWNGFXDIR)/unknown_C19470.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -num_tiles 36
|
||||
|
||||
$(BTLANMSPRGFXDIR)/141.4bpp: $(BTLANMSPRGFXDIR)/141_0.4bpp \
|
||||
$(BTLANMSPRGFXDIR)/141_1.4bpp \
|
||||
$(BTLANMSPRGFXDIR)/141_2.4bpp \
|
||||
$(BTLANMSPRGFXDIR)/141_3.4bpp \
|
||||
$(BTLANMSPRGFXDIR)/141_4.4bpp
|
||||
$(BTLANMSPRGFXDIR)/141_1.4bpp \
|
||||
$(BTLANMSPRGFXDIR)/141_2.4bpp \
|
||||
$(BTLANMSPRGFXDIR)/141_3.4bpp \
|
||||
$(BTLANMSPRGFXDIR)/141_4.4bpp
|
||||
@cat $^ >$@
|
||||
|
||||
$(BTLANMSPRGFXDIR)/074.4bpp: $(BTLANMSPRGFXDIR)/074_0.4bpp \
|
||||
$(BTLANMSPRGFXDIR)/074_1.4bpp
|
||||
$(BTLANMSPRGFXDIR)/074_1.4bpp
|
||||
@cat $^ >$@
|
||||
|
||||
$(BTLANMSPRGFXDIR)/159.4bpp: $(BTLANMSPRGFXDIR)/159_0.4bpp \
|
||||
$(BTLANMSPRGFXDIR)/159_1.4bpp
|
||||
$(BTLANMSPRGFXDIR)/159_1.4bpp
|
||||
@cat $^ >$@
|
||||
|
||||
$(BTLANMSPRGFXDIR)/001.4bpp: $(BTLANMSPRGFXDIR)/001_0.4bpp \
|
||||
$(BTLANMSPRGFXDIR)/001_1.4bpp
|
||||
$(BTLANMSPRGFXDIR)/001_1.4bpp
|
||||
@cat $^ >$@
|
||||
|
||||
$(MASKSGFXDIR)/unknown_C2EA50.4bpp: %.4bpp: %.png
|
||||
@@ -405,8 +405,8 @@ $(TYPESGFXDIR)/move_types.4bpp: $(types:%=$(TYPESGFXDIR)/%.4bpp) $(contest_types
|
||||
@cat $^ >$@
|
||||
|
||||
$(TYPESGFXDIR)/move_types.gbapal: $(TYPESGFXDIR)/move_types_1.gbapal \
|
||||
$(TYPESGFXDIR)/move_types_2.gbapal \
|
||||
$(TYPESGFXDIR)/move_types_3.gbapal
|
||||
$(TYPESGFXDIR)/move_types_2.gbapal \
|
||||
$(TYPESGFXDIR)/move_types_3.gbapal
|
||||
@cat $^ >$@
|
||||
|
||||
$(MENUGFXDIR)/bag_screen.4bpp: %.4bpp: %.png
|
||||
@@ -435,13 +435,13 @@ graphics/picture_frame/frame5.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -num_tiles 86
|
||||
|
||||
$(ROULETTEGFXDIR)/roulette_tilt.4bpp: $(ROULETTEGFXDIR)/shroomish.4bpp \
|
||||
$(ROULETTEGFXDIR)/tailow.4bpp
|
||||
$(ROULETTEGFXDIR)/tailow.4bpp
|
||||
@cat $^ >$@
|
||||
|
||||
$(ROULETTEGFXDIR)/poke_icons2.4bpp: $(ROULETTEGFXDIR)/wynaut.4bpp \
|
||||
$(ROULETTEGFXDIR)/azurill.4bpp \
|
||||
$(ROULETTEGFXDIR)/skitty.4bpp \
|
||||
$(ROULETTEGFXDIR)/makuhita.4bpp
|
||||
$(ROULETTEGFXDIR)/azurill.4bpp \
|
||||
$(ROULETTEGFXDIR)/skitty.4bpp \
|
||||
$(ROULETTEGFXDIR)/makuhita.4bpp
|
||||
@cat $^ >$@
|
||||
|
||||
$(BATTRANSGFXDIR)/85BBC14.4bpp: %.4bpp: %.png
|
||||
@@ -451,43 +451,25 @@ $(BATTRANSGFXDIR)/rayquaza.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -num_tiles 938
|
||||
|
||||
$(BATTRANSGFXDIR)/frontier_square_1.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \
|
||||
$(BATTRANSGFXDIR)/frontier_squares_1.4bpp
|
||||
$(BATTRANSGFXDIR)/frontier_squares_1.4bpp
|
||||
@cat $^ >$@
|
||||
|
||||
$(BATTRANSGFXDIR)/frontier_square_2.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \
|
||||
$(BATTRANSGFXDIR)/frontier_squares_2.4bpp
|
||||
$(BATTRANSGFXDIR)/frontier_squares_2.4bpp
|
||||
@cat $^ >$@
|
||||
|
||||
$(BATTRANSGFXDIR)/frontier_square_3.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \
|
||||
$(BATTRANSGFXDIR)/frontier_squares_3.4bpp
|
||||
$(BATTRANSGFXDIR)/frontier_squares_3.4bpp
|
||||
@cat $^ >$@
|
||||
|
||||
$(BATTRANSGFXDIR)/frontier_square_4.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \
|
||||
$(BATTRANSGFXDIR)/frontier_squares_4.4bpp
|
||||
$(BATTRANSGFXDIR)/frontier_squares_4.4bpp
|
||||
@cat $^ >$@
|
||||
|
||||
$(SLOTMACHINEGFXDIR)/reel_time_gfx.4bpp: $(SLOTMACHINEGFXDIR)/reel_time_pikachu.4bpp \
|
||||
$(SLOTMACHINEGFXDIR)/reel_time_machine.4bpp
|
||||
@cat $^ >$@
|
||||
|
||||
$(PKNAVOPTIONSGFXDIR)/options.4bpp: $(PKNAVOPTIONSGFXDIR)/hoenn_map.4bpp \
|
||||
$(PKNAVOPTIONSGFXDIR)/condition.4bpp \
|
||||
$(PKNAVOPTIONSGFXDIR)/match_call.4bpp \
|
||||
$(PKNAVOPTIONSGFXDIR)/ribbons.4bpp \
|
||||
$(PKNAVOPTIONSGFXDIR)/switch_off.4bpp \
|
||||
$(PKNAVOPTIONSGFXDIR)/party.4bpp \
|
||||
$(PKNAVOPTIONSGFXDIR)/search.4bpp \
|
||||
$(PKNAVOPTIONSGFXDIR)/cool.4bpp \
|
||||
$(PKNAVOPTIONSGFXDIR)/beauty.4bpp \
|
||||
$(PKNAVOPTIONSGFXDIR)/cute.4bpp \
|
||||
$(PKNAVOPTIONSGFXDIR)/smart.4bpp \
|
||||
$(PKNAVOPTIONSGFXDIR)/tough.4bpp \
|
||||
$(PKNAVOPTIONSGFXDIR)/cancel.4bpp
|
||||
@cat $^ >$@
|
||||
|
||||
$(PKNAVGFXDIR)/header.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -num_tiles 53
|
||||
|
||||
$(UNUSEDGFXDIR)/intro_birch_beauty.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -num_tiles 374
|
||||
|
||||
@@ -646,3 +628,27 @@ $(PSSGFXDIR)/ludicolo.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/ludico
|
||||
|
||||
$(PSSGFXDIR)/whiscash.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/whiscash_bg.4bpp
|
||||
@cat $^ >$@
|
||||
|
||||
$(PKNAVOPTIONSGFXDIR)/options.4bpp: $(PKNAVOPTIONSGFXDIR)/hoenn_map.4bpp \
|
||||
$(PKNAVOPTIONSGFXDIR)/condition.4bpp \
|
||||
$(PKNAVOPTIONSGFXDIR)/match_call.4bpp \
|
||||
$(PKNAVOPTIONSGFXDIR)/ribbons.4bpp \
|
||||
$(PKNAVOPTIONSGFXDIR)/switch_off.4bpp \
|
||||
$(PKNAVOPTIONSGFXDIR)/party.4bpp \
|
||||
$(PKNAVOPTIONSGFXDIR)/search.4bpp \
|
||||
$(PKNAVOPTIONSGFXDIR)/cool.4bpp \
|
||||
$(PKNAVOPTIONSGFXDIR)/beauty.4bpp \
|
||||
$(PKNAVOPTIONSGFXDIR)/cute.4bpp \
|
||||
$(PKNAVOPTIONSGFXDIR)/smart.4bpp \
|
||||
$(PKNAVOPTIONSGFXDIR)/tough.4bpp \
|
||||
$(PKNAVOPTIONSGFXDIR)/cancel.4bpp
|
||||
@cat $^ >$@
|
||||
|
||||
$(PKNAVGFXDIR)/header.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -num_tiles 53
|
||||
|
||||
$(PKNAVGFXDIR)/outline.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -num_tiles 53
|
||||
|
||||
$(PKNAVGFXDIR)/ui_matchcall.4bpp: %.4bpp: %.png
|
||||
$(GFX) $< $@ -num_tiles 13
|
||||
|
||||
Reference in New Issue
Block a user