mirror of https://github.com/pret/pokecrystal.git
32ed487a47
# 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 |
||
---|---|---|
.. | ||
audio_constants.asm | ||
battle_anim_constants.asm | ||
battle_constants.asm | ||
battle_tower_constants.asm | ||
collision_constants.asm | ||
credits_constants.asm | ||
cry_constants.asm | ||
deco_constants.asm | ||
engine_flags.asm | ||
event_flags.asm | ||
gfx_constants.asm | ||
hardware_constants.asm | ||
icon_constants.asm | ||
input_constants.asm | ||
item_constants.asm | ||
item_data_constants.asm | ||
landmark_constants.asm | ||
map_constants.asm | ||
map_data_constants.asm | ||
map_object_constants.asm | ||
map_setup_constants.asm | ||
menu_constants.asm | ||
misc_constants.asm | ||
mobile_constants.asm | ||
move_constants.asm | ||
move_effect_constants.asm | ||
music_constants.asm | ||
npc_trade_constants.asm | ||
phone_constants.asm | ||
pokemon_constants.asm | ||
pokemon_data_constants.asm | ||
printer_constants.asm | ||
radio_constants.asm | ||
scene_constants.asm | ||
scgb_constants.asm | ||
script_constants.asm | ||
serial_constants.asm | ||
sfx_constants.asm | ||
sprite_anim_constants.asm | ||
sprite_constants.asm | ||
sprite_data_constants.asm | ||
std_constants.asm | ||
text_constants.asm | ||
tileset_constants.asm | ||
trainer_constants.asm | ||
trainer_data_constants.asm | ||
type_constants.asm | ||
wram_constants.asm |