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
73ea7c6326
pokecrystal-board/data/maps
History
Rangi 32ed487a47 Merge branch 'master' of https://github.com/pret/pokecrystal 
# Conflicts:
#	audio/engine.asm
#	constants/gfx_constants.asm
#	constants/map_data_constants.asm
#	constants/pokemon_data_constants.asm
#	constants/sprite_constants.asm
#	constants/wram_constants.asm
#	data/maps/data.asm
#	engine/battle/ai/scoring.asm
#	engine/battle/core.asm
#	engine/battle/effect_commands.asm
#	engine/battle/misc.asm
#	engine/battle_anims/getpokeballwobble.asm
#	engine/breeding.asm
#	engine/buy_sell_toss.asm
#	engine/decorations.asm
#	engine/events/battle_tower/battle_tower.asm
#	engine/events/battle_tower/rules.asm
#	engine/events/buena.asm
#	engine/events/bug_contest/contest_2.asm
#	engine/events/daycare.asm
#	engine/events/dratini.asm
#	engine/events/halloffame.asm
#	engine/events/happiness_egg.asm
#	engine/events/kurt.asm
#	engine/events/lucky_number.asm
#	engine/events/magnet_train.asm
#	engine/events/overworld.asm
#	engine/events/pokerus/pokerus.asm
#	engine/events/print_unown.asm
#	engine/events/print_unown_2.asm
#	engine/events/unown_walls.asm
#	engine/item_effects.asm
#	engine/link.asm
#	engine/mon_menu.asm
#	engine/player_object.asm
#	engine/routines/playslowcry.asm
#	engine/scripting.asm
#	engine/search.asm
#	engine/search2.asm
#	engine/specials.asm
#	engine/start_menu.asm
#	engine/timeset.asm
#	home/battle_vars.asm
#	home/map.asm
#	maps/GoldenrodUndergroundSwitchRoomEntrances.asm
#	maps/IlexForest.asm
#	maps/KrissHouse2F.asm
#	maps/Route39Barn.asm
#	mobile/mobile_12_2.asm
#	mobile/mobile_40.asm
#	mobile/mobile_5f.asm
#	wram.asm
2018-02-03 19:42:56 -05:00
..
attributes.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
blocks.asm MobileTradeRoom matches MobileBattleRoom 2018-01-31 23:21:15 -05:00
environment_colors.asm Follow the X_constants/X_data_constants convention 2017-12-25 23:45:54 -05:00
flypoints.asm wUnlockedUnowns engine flag constants 2018-01-22 13:00:35 -05:00
landmarks.asm Split items/ and trainers/ into their data/ and engine/ components 2017-12-14 23:00:54 -05:00
map_data.asm map → map_id; map_def → map; map_data → map_attributes 2018-02-03 17:11:55 -05:00
maps.asm map → map_id; map_def → map; map_data → map_attributes 2018-02-03 17:11:55 -05:00
outdoor_sprites.asm Split tilesets/ into gfx/tilesets and data/tilesets/ 2018-01-09 23:53:58 -05:00
roofs.asm Split tilesets/ into gfx/tilesets and data/tilesets/ 2018-01-09 23:53:58 -05:00
scenes.asm map → map_id; map_def → map; map_data → map_attributes 2018-02-03 17:11:55 -05:00
scripts.asm MobileTradeRoom matches MobileBattleRoom 2018-01-31 23:21:15 -05:00
setup_scripts.asm map → map_id; map_def → map; map_data → map_attributes 2018-02-03 17:11:55 -05:00
sgb_roof_pal_inds.asm Only graphics data goes in gfx/ 2018-01-18 11:16:24 -05:00
spawn_points.asm map → map_id; map_def → map; map_data → map_attributes 2018-02-03 17:11:55 -05:00