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
32ed487a47
pokecrystal-board/data/trainers
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 Remove redundant data/ filename prefixes 2017-12-27 01:29:15 -05:00
class_names.asm Remove redundant data/ filename prefixes 2017-12-27 01:29:15 -05:00
dvs.asm Remove redundant data/ filename prefixes 2017-12-27 01:29:15 -05:00
encounter_music.asm Indent with tabs 2018-01-09 15:20:21 -05:00
gendered_trainers.asm wUnlockedUnowns engine flag constants 2018-01-22 13:00:35 -05:00
genders.asm Missing comment 2018-01-18 22:38:20 -05:00
leaders.asm Move battle engine data into data/ 2018-01-09 15:12:49 -05:00
palettes.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
parties.asm No need for ==== lines 2018-01-31 10:36:27 -05:00
party_pointers.asm More comments 2018-01-09 15:39:48 -05:00
pic_pointers.asm More comments 2018-01-09 15:39:48 -05:00
sprites.asm Organize mobile/battle_tower_*.asm data and code 2018-01-06 18:53:30 -05:00