pokecrystal-board/data
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
..
battle Badge type boosts make sense in data/types/ 2018-01-28 01:17:32 -05:00
battle_anims Label more ANIM_OBJ_* constants 2018-01-12 13:47:04 -05:00
battle_tower More Unicode 2018-01-19 02:30:19 -05:00
decorations EVENT_TEMPORARY_UNTIL_MAP_RELOAD_[1-8] (close issue #481) 2018-01-24 10:46:49 -05:00
events More comments and macros 2018-02-01 15:19:27 -05:00
items Move event data to data/events/ 2018-01-25 22:19:24 -05:00
maps Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
mobile Odds and ends in bank 45 (and more ascii incbins). 2015-02-06 00:19:36 -08:00
moves Clarify TM/HM move/enum correspondence 2018-01-28 01:20:49 -05:00
phone Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
pokemon Official egg group names 2018-01-31 12:03:43 -05:00
radio map → map_id; map_def → map; map_data → map_attributes 2018-02-03 17:11:55 -05:00
sprite_anims wiggle → wobble 2018-01-19 00:16:08 -05:00
sprites SPRITEMOVEDATA_LAPRAS → SPRITEMOVEDATA_SWIM_WANDER 2018-01-30 22:42:41 -05:00
text Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
tilesets Fix off-by-one error 2018-01-26 20:57:55 -05:00
trainers Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
types Badge type boosts make sense in data/types/ 2018-01-28 01:17:32 -05:00
wild map → map_id; map_def → map; map_data → map_attributes 2018-02-03 17:11:55 -05:00
collision_permissions.asm Define constants for collision types 2017-12-12 16:15:58 -05:00
credits_script.asm Copy pokered's organization some more, with further constant and data files 2017-12-15 17:22:52 -05:00
credits_strings.asm Japanese characters in Japanese text (e.g. "ォ" not "," for $f4) 2018-01-19 21:49:16 -05:00
default_options.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
engine_flags.asm Correct engine flag constants 2018-01-31 10:55:35 -05:00
growth_rates.asm Official egg group names 2018-01-31 12:03:43 -05:00
icon_pointers.asm Use "battle_anims" and "sprite_anims" for clarity, not just "anims" 2017-12-26 18:45:04 -05:00
mon_menu.asm const_def N 2018-01-31 11:38:45 -05:00
party_menu_qualities.asm Move party menu qualities to data/ 2018-01-11 02:54:07 -05:00
player_names.asm MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440) 2018-01-23 16:08:43 -05:00
predef_pointers.asm Remove Predef_ prefix from routines listed in PredefPointers 2018-01-16 14:39:28 -05:00
sgb_ctrl_packets.asm Remove trailing whitespace 2018-01-18 21:48:52 -05:00
special_pointers.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
text_buffers.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
tilesets.asm Rename some tilesets (close #467) 2018-01-17 14:50:34 -05:00
unused_53d84.asm Add data/text/ 2018-01-22 17:33:52 -05:00