pokecrystal-board/gfx
Rangi 335c2699f0 Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
#	constants/map_constants.asm
#	constants/wram_constants.asm
#	data/radio/oaks_pkmn_talk_routes.asm
#	data/radio/pnp_hidden_places.asm
#	engine/battle/core.asm
#	engine/breeding.asm
#	engine/phone/phone_scripts.asm
#	engine/radio.asm
#	maps/BattleTower1F.asm
#	maps/OlivineLighthouse2F.asm
#	maps/OlivineLighthouse6F.asm
#	maps/PokemonFanClub.asm
#	maps/RadioTower1F.asm
#	maps/RadioTower2F.asm
#	maps/Route30BerryHouse.asm
#	maps/Route34IlexForestGate.asm
#	maps/Route36NationalParkGate.asm
#	maps/RuinsOfAlphKabutoChamber.asm
#	maps/RuinsOfAlphResearchCenter.asm
#	maps/VermilionPort.asm
#	maps/VictoryRoad.asm
2018-02-25 20:39:54 -05:00
..
battle Move data/palettes/ .pal files into gfx/ 2018-01-09 23:21:32 -05:00
battle_anims Remove EXIF metadata from images 2018-02-08 19:38:14 +01:00
card_flip Remove EXIF metadata from images 2018-02-08 19:38:14 +01:00
credits Remove EXIF metadata from images 2018-02-08 19:38:14 +01:00
debug Move data/palettes/ .pal files into gfx/ 2018-01-09 23:21:32 -05:00
diploma Move data/palettes/ .pal files into gfx/ 2018-01-09 23:21:32 -05:00
dummy_game Move some gfx/unknown/ files into meaningful directories 2017-12-09 23:37:08 -05:00
emotes pngs in gfx/{debug,emotes,evo,font,intro} 2017-06-08 22:21:12 -04:00
evo Move some gfx/unknown/ files into meaningful directories 2017-12-09 23:37:08 -05:00
font unused_up_arrow.png 2018-01-18 23:53:20 -05:00
footprints Split all of the footprints 2017-12-24 14:40:48 +01:00
frames Remove EXIF metadata from images 2018-02-08 19:38:14 +01:00
icons Separate new_game graphics 2018-01-21 13:58:16 -05:00
intro Separate new_game graphics 2018-01-21 13:58:16 -05:00
mail Remove EXIF metadata from images 2018-02-08 19:38:14 +01:00
mobile Remove EXIF metadata from images 2018-02-08 19:38:14 +01:00
mystery_gift Add missing file 2018-01-12 16:47:42 -05:00
naming_screen Separate new_game graphics 2018-01-21 13:58:16 -05:00
new_game Separate new_game graphics 2018-01-21 13:58:16 -05:00
overworld Remove EXIF metadata from images 2018-02-08 19:38:14 +01:00
pack Move data/palettes/ .pal files into gfx/ 2018-01-09 23:21:32 -05:00
pc Separate more palettes into gfx/**/*.pal files 2018-01-12 14:41:42 -05:00
player Move some gfx/misc/ files into meaningful directories 2017-12-09 22:57:41 -05:00
pokedex questionmark is not a pokemon pic 2018-02-07 14:43:58 -05:00
pokegear Remove EXIF metadata from images 2018-02-08 19:38:14 +01:00
pokemon questionmark is not a pokemon pic 2018-02-07 14:43:58 -05:00
printer Move more unknown graphics into real subfolders 2017-12-15 17:50:45 -05:00
sgb PARTY_LENGTH; MON_NAME; sgb_border.bin 2018-01-20 12:25:55 -05:00
slots Remove EXIF metadata from images 2018-02-08 19:38:14 +01:00
splash Remove EXIF metadata from images 2018-02-08 19:38:14 +01:00
sprites map_objects.pal is easier to find in gfx/overworld/ than gfx/sprites/ 2018-01-10 02:30:17 -05:00
stats More .pal files 2018-01-18 11:37:05 -05:00
tilesets Make tileset palette maps easier to edit 2018-02-09 13:50:20 -05:00
title More SGB documentation 2018-01-18 00:16:03 -05:00
trade Remove EXIF metadata from images 2018-02-08 19:38:14 +01:00
trainer_card One leader per line 2018-01-19 00:02:58 -05:00
trainers Rename overworld sprite files, consistent with their constants 2017-12-11 00:17:39 -05:00
unknown More SGB documentation 2018-01-18 00:16:03 -05:00
unown_puzzle pngs in gfx/unown_puzzle 2017-06-22 23:53:57 -04:00
battle_anims.asm Use "battle_anims" and "sprite_anims" for clarity, not just "anims" 2017-12-26 18:45:04 -05:00
emotes.asm Move some misc/ files into meaningful directories 2017-12-15 12:53:33 -05:00
font.asm unused_up_arrow.png 2018-01-18 23:53:20 -05:00
footprints.asm Note about footprints in comments 2017-12-27 11:33:08 -05:00
icons.asm Move data/palettes/ .pal files into gfx/ 2018-01-09 23:21:32 -05:00
mail.asm Name mail graphics 2017-12-26 20:02:00 -05:00
pics.asm includes.asm → constants.asm 2018-01-09 00:36:15 -05:00
sprites.asm Move some more main.asm routines into individual files 2017-12-16 19:00:50 -05:00
tileset_palette_maps.asm Make tileset palette maps easier to edit 2018-02-09 13:50:20 -05:00
tilesets.asm Rename some tilesets (close #467) 2018-01-17 14:50:34 -05:00