pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity
5c28d05bb4
pokecrystal-board/gfx
History
Remy Oukaour 5c28d05bb4 Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 
# Conflicts:
#	data/items/descriptions.asm
#	data/sprite_anims/framesets.asm
#	engine/crystal_colors.asm
#	engine/events/kurt.asm
#	engine/events/special.asm
#	engine/events/std_scripts.asm
#	engine/events_3.asm
#	engine/item_effects.asm
#	engine/namingscreen.asm
#	engine/scripting.asm
#	engine/stats_screen.asm
#	engine/trade_animation.asm
#	home/audio.asm
#	main.asm
#	maps/BattleTower1F.asm
#	maps/BattleTowerBattleRoom.asm
#	maps/BurnedTowerB1F.asm
#	maps/ElmsLab.asm
#	maps/GoldenrodDeptStore5F.asm
#	maps/GoldenrodUnderground.asm
#	maps/HallOfFame.asm
#	maps/MahoganyTown.asm
#	maps/ManiasHouse.asm
#	maps/MobileBattleRoom.asm
#	maps/MobileTradeRoomMobile.asm
#	maps/RadioTower2F.asm
#	maps/Route35NationalParkGate.asm
#	maps/Route36NationalParkGate.asm
#	maps/Route39Farmhouse.asm
#	tilesets/palette_maps.asm
2018-01-14 22:56:36 -05:00
..
battle Move data/palettes/ .pal files into gfx/ 2018-01-09 23:21:32 -05:00
battle_anims Move data/palettes/ .pal files into gfx/ 2018-01-09 23:21:32 -05:00
card_flip Move data/palettes/ .pal files into gfx/ 2018-01-09 23:21:32 -05:00
credits Move data/palettes/ .pal files into gfx/ 2018-01-09 23:21:32 -05: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 Local UI tiles don't belong in charmap 2018-01-11 22:49:45 -05:00
footprints Split all of the footprints 2017-12-24 14:40:48 +01:00
frames Fix gfx/frames 2017-06-24 16:28:50 -04:00
icons Move data/palettes/ .pal files into gfx/ 2018-01-09 23:21:32 -05:00
intro More gfx/**/*.pal files 2018-01-12 14:54:00 -05:00
mail Move data/palettes/ .pal files into gfx/ 2018-01-09 23:21:32 -05:00
mobile Local UI tiles don't belong in charmap 2018-01-11 22:49:45 -05:00
mystery_gift Add missing file 2018-01-12 16:47:42 -05:00
namingscreen Move some gfx/unknown/ files into meaningful directories 2017-12-09 23:37:08 -05:00
overworld More gfx/**/*.pal files 2018-01-12 14:54:00 -05: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 Separate more palettes into gfx/**/*.pal files 2018-01-12 14:41:42 -05:00
pokegear Comments explain colors 2018-01-12 15:26:06 -05:00
pokemon Egg palette works like other Pokémon 2018-01-12 15:06:25 -05:00
printer Move more unknown graphics into real subfolders 2017-12-15 17:50:45 -05:00
sgb Easier to find palette data 2018-01-12 03:07:48 -05:00
shrink Move some gfx/misc/ files into meaningful directories 2017-12-09 22:57:41 -05:00
slots Move data/palettes/ .pal files into gfx/ 2018-01-09 23:21:32 -05:00
splash Separate more palettes into gfx/**/*.pal files 2018-01-12 14:41:42 -05:00
sprites map_objects.pal is easier to find in gfx/overworld/ than gfx/sprites/ 2018-01-10 02:30:17 -05:00
stats Don't split stats gfx in three 2018-01-13 15:22:16 -05:00
tilesets Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
timeset Move some gfx/unknown/ files into meaningful directories 2017-12-09 23:37:08 -05:00
title Move data/palettes/ .pal files into gfx/ 2018-01-09 23:21:32 -05:00
trade Move data/palettes/ .pal files into gfx/ 2018-01-09 23:21:32 -05:00
trainer_card Move some gfx/misc/ files into meaningful directories 2017-12-09 22:57:41 -05:00
trainers Rename overworld sprite files, consistent with their constants 2017-12-11 00:17:39 -05:00
unknown Move data/palettes/ .pal files into gfx/ 2018-01-09 23:21:32 -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
fishing.asm Missed graphics 2018-01-11 23:51:43 -05:00
font.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -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
load_pics.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
mail.asm Name mail graphics 2017-12-26 20:02:00 -05:00
overworld_font.asm Local UI tiles don't belong in charmap 2018-01-11 22:49:45 -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
tilesets.asm gfx/*.asm files have INCBINs 2018-01-10 02:38:45 -05:00