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

..

flower

pngs in gfx/tilesets

2017-06-21 00:28:48 -04:00

forest-tree

pngs in gfx/tilesets

2017-06-21 00:28:48 -04:00

fountain

pngs in gfx/tilesets

2017-06-21 00:28:48 -04:00

lava

lava in gym_1 > fountain in unused safari zone

2018-01-03 02:16:25 -05:00

roofs

pngs in gfx/tilesets

2017-06-21 00:28:48 -04:00

sprout-pillar

pngs in gfx/tilesets

2017-06-21 00:28:48 -04:00

water

Move some gfx/misc/ files into meaningful directories

2017-12-09 22:57:41 -05:00

whirlpool

pngs in gfx/tilesets

2017-06-21 00:28:48 -04:00

aerodactyl_word_room_palette_map.asm

Split tilesets/ into gfx/tilesets and data/tilesets/

2018-01-09 23:53:58 -05:00

aerodactyl_word_room.2bpp.lz.8b42470b

Rename tilesets, consistent with constant names

2017-12-10 23:56:10 -05:00

aerodactyl_word_room.png

Tileset images are 128px wide

2018-01-03 02:02:15 -05:00

battle_tower_outside_palette_map.asm

Split tilesets/ into gfx/tilesets and data/tilesets/

2018-01-09 23:53:58 -05:00

battle_tower_outside.2bpp.lz.391603fb

Rename tilesets, consistent with constant names

2017-12-10 23:56:10 -05:00

battle_tower_outside.png

Tileset images are 128px wide

2018-01-03 02:02:15 -05:00

battle_tower_palette_map.asm

Split tilesets/ into gfx/tilesets and data/tilesets/

2018-01-09 23:53:58 -05:00

battle_tower.2bpp.lz.467b6a2d

Rename tilesets, consistent with constant names

2017-12-10 23:56:10 -05:00

battle_tower.pal

Move data/palettes/ .pal files into gfx/

2018-01-09 23:21:32 -05:00

battle_tower.png

Tileset images are 128px wide

2018-01-03 02:02:15 -05:00

beta_word_room_palette_map.asm

Split tilesets/ into gfx/tilesets and data/tilesets/

2018-01-09 23:53:58 -05:00

beta_word_room.2bpp.lz.8b42470b

Rename tilesets, consistent with constant names

2017-12-10 23:56:10 -05:00

beta_word_room.png

Tileset images are 128px wide

2018-01-03 02:02:15 -05:00

bg_tiles.pal

Newline

2018-01-10 00:18:06 -05:00

cave_palette_map.asm

Split tilesets/ into gfx/tilesets and data/tilesets/

2018-01-09 23:53:58 -05:00

cave.2bpp.lz.3437812a

Rename tilesets, consistent with constant names

2017-12-10 23:56:10 -05:00

cave.png

Tileset images are 128px wide

2018-01-03 02:02:15 -05:00

celadon_mansion_1.pal

Separate more palettes into gfx/**/*.pal files

2018-01-12 14:41:42 -05:00

celadon_mansion_2.pal

Separate more palettes into gfx/**/*.pal files

2018-01-12 14:41:42 -05:00

celadon_mansion_palette_map.asm

Split tilesets/ into gfx/tilesets and data/tilesets/

2018-01-09 23:53:58 -05:00

celadon_mansion.2bpp.lz.63b414d4

Rename tilesets, consistent with constant names

2017-12-10 23:56:10 -05:00

celadon_mansion.png

Tileset images are 128px wide

2018-01-03 02:02:15 -05:00

game_corner_palette_map.asm

Split tilesets/ into gfx/tilesets and data/tilesets/

2018-01-09 23:53:58 -05:00

game_corner.2bpp.lz.71d29a2f

Rename tilesets, consistent with constant names

2017-12-10 23:56:10 -05:00

game_corner.png

Tileset images are 128px wide

2018-01-03 02:02:15 -05:00

gate_palette_map.asm

Split tilesets/ into gfx/tilesets and data/tilesets/

2018-01-09 23:53:58 -05:00

gate.2bpp.lz.f5a55006

Rename tilesets, consistent with constant names

2017-12-10 23:56:10 -05:00

gate.png

Tileset images are 128px wide

2018-01-03 02:02:15 -05:00

gym_1_palette_map.asm

Split tilesets/ into gfx/tilesets and data/tilesets/

2018-01-09 23:53:58 -05:00

gym_1.2bpp.lz.c1f2ed8f

Rename tilesets, consistent with constant names

2017-12-10 23:56:10 -05:00

gym_1.png

Tileset images are 128px wide

2018-01-03 02:02:15 -05:00

ho_oh_word_room_palette_map.asm

Split tilesets/ into gfx/tilesets and data/tilesets/

2018-01-09 23:53:58 -05:00

ho_oh_word_room.2bpp.lz.8b42470b

Rename tilesets, consistent with constant names

2017-12-10 23:56:10 -05:00

ho_oh_word_room.png

Tileset images are 128px wide

2018-01-03 02:02:15 -05:00

house_1_palette_map.asm

Split tilesets/ into gfx/tilesets and data/tilesets/

2018-01-09 23:53:58 -05:00

house_1.2bpp.lz.c848ef13

Rename tilesets, consistent with constant names

2017-12-10 23:56:10 -05:00

house_1.pal

Move data/palettes/ .pal files into gfx/

2018-01-09 23:21:32 -05:00

house_1.png

Tileset images are 128px wide

2018-01-03 02:02:15 -05:00

ice_path_palette_map.asm

Split tilesets/ into gfx/tilesets and data/tilesets/

2018-01-09 23:53:58 -05:00

ice_path.2bpp.lz.e23bc89f

Rename tilesets, consistent with constant names

2017-12-10 23:56:10 -05:00

ice_path.pal

Move data/palettes/ .pal files into gfx/

2018-01-09 23:21:32 -05:00

ice_path.png

Tileset images are 128px wide

2018-01-03 02:02:15 -05:00

ilex_forest_palette_map.asm

Split tilesets/ into gfx/tilesets and data/tilesets/

2018-01-09 23:53:58 -05:00

ilex_forest.2bpp.lz.6b0ac896

Rename tilesets, consistent with constant names

2017-12-10 23:56:10 -05:00

ilex_forest.png

Tileset images are 128px wide

2018-01-03 02:02:15 -05:00

johto_1_palette_map.asm

Split tilesets/ into gfx/tilesets and data/tilesets/

2018-01-09 23:53:58 -05:00

johto_1.2bpp.lz.0c7e555a

Rename tilesets, consistent with constant names

2017-12-10 23:56:10 -05:00

johto_1.png

Tileset images are 128px wide

2018-01-03 02:02:15 -05:00

johto_2_palette_map.asm

Split tilesets/ into gfx/tilesets and data/tilesets/

2018-01-09 23:53:58 -05:00

johto_2.2bpp.lz.391603fb

Rename tilesets, consistent with constant names

2017-12-10 23:56:10 -05:00

johto_2.png

Tileset images are 128px wide

2018-01-03 02:02:15 -05:00

kabuto_word_room_palette_map.asm

Split tilesets/ into gfx/tilesets and data/tilesets/

2018-01-09 23:53:58 -05:00

kabuto_word_room.2bpp.lz.8b42470b

Rename tilesets, consistent with constant names

2017-12-10 23:56:10 -05:00

kabuto_word_room.png

Tileset images are 128px wide

2018-01-03 02:02:15 -05:00

kanto_palette_map.asm

Split tilesets/ into gfx/tilesets and data/tilesets/

2018-01-09 23:53:58 -05:00

kanto.2bpp.lz.a29f5d51

Rename tilesets, consistent with constant names

2017-12-10 23:56:10 -05:00

kanto.png

Tileset images are 128px wide

2018-01-03 02:02:15 -05:00

kurts_house_palette_map.asm

Split tilesets/ into gfx/tilesets and data/tilesets/

2018-01-09 23:53:58 -05:00

kurts_house.2bpp.lz.dd51d079

Rename tilesets, consistent with constant names

2017-12-10 23:56:10 -05:00

kurts_house.png

Tileset images are 128px wide

2018-01-03 02:02:15 -05:00

lab_palette_map.asm

Split tilesets/ into gfx/tilesets and data/tilesets/

2018-01-09 23:53:58 -05:00

lab.2bpp.lz.b8d0f547

Rename tilesets, consistent with constant names

2017-12-10 23:56:10 -05:00

lab.png

Tileset images are 128px wide

2018-01-03 02:02:15 -05:00

lighthouse_palette_map.asm

Split tilesets/ into gfx/tilesets and data/tilesets/

2018-01-09 23:53:58 -05:00

lighthouse.2bpp.lz.0c1544c1

Rename tilesets, consistent with constant names

2017-12-10 23:56:10 -05:00

lighthouse.png

Tileset images are 128px wide

2018-01-03 02:02:15 -05:00

mart_palette_map.asm

Split tilesets/ into gfx/tilesets and data/tilesets/

2018-01-09 23:53:58 -05:00

mart.2bpp.lz.e2e94f92

Rename tilesets, consistent with constant names

2017-12-10 23:56:10 -05:00

mart.png

Tileset images are 128px wide

2018-01-03 02:02:15 -05:00

olivine_gym_palette_map.asm

Split tilesets/ into gfx/tilesets and data/tilesets/

2018-01-09 23:53:58 -05:00

olivine_gym.2bpp.lz.93800351

Rename tilesets, consistent with constant names

2017-12-10 23:56:10 -05:00

olivine_gym.png

Tileset images are 128px wide

2018-01-03 02:02:15 -05:00

omanyte_word_room_palette_map.asm

Split tilesets/ into gfx/tilesets and data/tilesets/

2018-01-09 23:53:58 -05:00

omanyte_word_room.2bpp.lz.8b42470b

Rename tilesets, consistent with constant names

2017-12-10 23:56:10 -05:00

omanyte_word_room.png

Tileset images are 128px wide

2018-01-03 02:02:15 -05:00

palette_maps.asm

Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459)

2018-01-14 22:56:36 -05:00

park_palette_map.asm

Split tilesets/ into gfx/tilesets and data/tilesets/

2018-01-09 23:53:58 -05:00

park.2bpp.lz.7fcb81d6

Rename tilesets, consistent with constant names

2017-12-10 23:56:10 -05:00

park.png

Tileset images are 128px wide

2018-01-03 02:02:15 -05:00

players_house_2f_palette_map.asm

Split tilesets/ into gfx/tilesets and data/tilesets/

2018-01-09 23:53:58 -05:00

players_house_2f.2bpp.lz.35e51007

Rename tilesets, consistent with constant names

2017-12-10 23:56:10 -05:00

players_house_2f.png

Tileset images are 128px wide

2018-01-03 02:02:15 -05:00

players_house_palette_map.asm

Split tilesets/ into gfx/tilesets and data/tilesets/

2018-01-09 23:53:58 -05:00

players_house.2bpp.lz.252cbd8f

Rename tilesets, consistent with constant names

2017-12-10 23:56:10 -05:00

players_house.png

Tileset images are 128px wide

2018-01-03 02:02:15 -05:00

pokecenter_palette_map.asm

Split tilesets/ into gfx/tilesets and data/tilesets/

2018-01-09 23:53:58 -05:00

pokecenter.2bpp.lz.e1c4014c

Rename tilesets, consistent with constant names

2017-12-10 23:56:10 -05:00

pokecenter.png

Tileset images are 128px wide

2018-01-03 02:02:15 -05:00

pokecom_center_palette_map.asm

Split tilesets/ into gfx/tilesets and data/tilesets/

2018-01-09 23:53:58 -05:00

pokecom_center.2bpp.lz.febbc4ec

Rename tilesets, consistent with constant names

2017-12-10 23:56:10 -05:00

pokecom_center.pal

Move data/palettes/ .pal files into gfx/

2018-01-09 23:21:32 -05:00

pokecom_center.png

Tileset images are 128px wide

2018-01-03 02:02:15 -05:00

port_palette_map.asm

Split tilesets/ into gfx/tilesets and data/tilesets/

2018-01-09 23:53:58 -05:00

port.2bpp.lz.56b1a405

Rename tilesets, consistent with constant names

2017-12-10 23:56:10 -05:00

port.png

Tileset images are 128px wide

2018-01-03 02:02:15 -05:00

power_plant_palette_map.asm

Split tilesets/ into gfx/tilesets and data/tilesets/

2018-01-09 23:53:58 -05:00

power_plant.2bpp.lz.454cfd8b

Rename tilesets, consistent with constant names

2017-12-10 23:56:10 -05:00

power_plant.png

Tileset images are 128px wide

2018-01-03 02:02:15 -05:00

radio_tower_palette_map.asm

Split tilesets/ into gfx/tilesets and data/tilesets/

2018-01-09 23:53:58 -05:00

radio_tower.2bpp.lz.27cdd9ad

Rename tilesets, consistent with constant names

2017-12-10 23:56:10 -05:00

radio_tower.pal

Move data/palettes/ .pal files into gfx/

2018-01-09 23:21:32 -05:00

radio_tower.png

Tileset images are 128px wide

2018-01-03 02:02:15 -05:00

roofs.pal

Easier to find palette data

2018-01-12 03:07:48 -05:00

ruins_of_alph_palette_map.asm

Split tilesets/ into gfx/tilesets and data/tilesets/

2018-01-09 23:53:58 -05:00

ruins_of_alph.2bpp.lz.8b42470b

Rename tilesets, consistent with constant names

2017-12-10 23:56:10 -05:00

ruins_of_alph.png

Tileset images are 128px wide

2018-01-03 02:02:15 -05:00

sprout_tower_palette_map.asm

Split tilesets/ into gfx/tilesets and data/tilesets/

2018-01-09 23:53:58 -05:00

sprout_tower.2bpp.lz.bc56789c

Rename tilesets, consistent with constant names

2017-12-10 23:56:10 -05:00

sprout_tower.png

Tileset images are 128px wide

2018-01-03 02:02:15 -05:00

train_station_palette_map.asm

Split tilesets/ into gfx/tilesets and data/tilesets/

2018-01-09 23:53:58 -05:00

train_station.2bpp.lz.1600ca86

Rename tilesets, consistent with constant names

2017-12-10 23:56:10 -05:00

train_station.png

Tileset images are 128px wide

2018-01-03 02:02:15 -05:00

underground_palette_map.asm

Split tilesets/ into gfx/tilesets and data/tilesets/

2018-01-09 23:53:58 -05:00

underground.2bpp.lz.cace291c

Rename tilesets, consistent with constant names

2017-12-10 23:56:10 -05:00

underground.png

Tileset images are 128px wide

2018-01-03 02:02:15 -05:00

unused_museum_palette_map.asm

Split tilesets/ into gfx/tilesets and data/tilesets/

2018-01-09 23:53:58 -05:00

whirl_islands_palette_map.asm

Split tilesets/ into gfx/tilesets and data/tilesets/

2018-01-09 23:53:58 -05:00

whirl_islands.2bpp.lz.25b9c4b6

Rename tilesets, consistent with constant names

2017-12-10 23:56:10 -05:00

whirl_islands.png

Tileset images are 128px wide

2018-01-03 02:02:15 -05:00