mirror of https://github.com/pret/pokecrystal.git
5c28d05bb4
# 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 |
||
---|---|---|
.. | ||
attract.asm | ||
curse.asm | ||
endure.asm | ||
foresight.asm | ||
metronome.asm | ||
mirror_move.asm | ||
nightmare.asm | ||
perish_song.asm | ||
present.asm | ||
protect.asm | ||
rollout.asm | ||
sandstorm.asm | ||
spikes.asm | ||
thief.asm | ||
transform.asm |