Leahnaya/pokecrystal
1
0
Fork 0
mirror of https://github.com/pret/pokecrystal.git synced 2026-05-09 21:50:55 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
32ed487a47
pokecrystal/engine
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
..
battle Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
battle_anims Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
events Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
phone Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
pokedex Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
routines Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
billspc.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
billspctop.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
breeding.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
buy_sell_toss.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
card_flip.asm Fix wVirtualOAM labels, part 2. 2018-01-30 14:52:46 -05:00
caught_data.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
cgb_layouts.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
clock_reset.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
color.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
credits.asm Fix comment/style issues caused from w-izing. 2018-01-30 14:05:25 -05:00
crystal_intro.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
crystal_layouts.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
debug.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
decorations.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
delete_save_change_clock.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
diploma.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
dma_transfer.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
dummy_game.asm Japanese characters in Japanese text (e.g. "ォ" not "," for $f4) 2018-01-19 21:49:16 -05:00
engine_flags.asm Keep table labels in the same files as their contents. 2017-12-11 22:44:25 -05:00
european_mail.asm Move more contiguous related code blocks from main.asm to engine/ and events/ 2017-12-15 20:10:54 -05:00
events_2.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
events.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
evolution_animation.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
evolve.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
experience.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
gbc_only.asm wGBCOnlyDecompressBuffer 2018-01-21 20:10:38 -05:00
health.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
init_gender.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
init_hof_credits.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
init_map.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
intro_menu.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
item_effects.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
items.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
landmarks.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
learn.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
link_2.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
link_trade.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
link.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
load_font.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
load_pics.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
mail_2.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
mail.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
main_menu.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
map_object_action.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
map_objects_2.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
map_objects.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
map_palettes.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
map_setup.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
mapgroup_roofs.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
mart.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
math.asm Renaming sections, further dissolving main.asm 2015-11-28 15:13:40 -05:00
menu_2.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
menu.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
mon_icons.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
mon_menu.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
mon_stats.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
money.asm Prefix wram labels with w, part 1. 2018-01-23 16:45:34 -05:00
move_mon_wo_mail.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
move_mon.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
movement.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
mystery_gift_2.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
mystery_gift.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
naming_screen.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
npc_movement.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
options_menu.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
overworld.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
pack.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
party_menu.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
pic_animation.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
player_gfx.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
player_movement.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
player_object.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
player_step.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
pokegear.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
predef.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
print_party.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
printer_serial.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
printer.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
printnum.asm Clean up XXX comments for unused content 2018-01-02 13:26:18 +01:00
radio.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
rtc.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
save.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
scripting.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
scrolling_menu.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
search.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
search2.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
select_menu.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
sgb_layouts.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
slot_machine.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
spawn_points.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
specials.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
sprite_anims.asm wiggle → wobble 2018-01-19 00:16:08 -05:00
sprites.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
start_menu.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
stats_screen.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
switch_items.asm MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440) 2018-01-23 16:08:43 -05:00
tempmon.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
tile_events.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
tileset_anims.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
tileset_palettes.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
time_capsule_2.asm Add data/text/ 2018-01-22 17:33:52 -05:00
time_capsule.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
time.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
timeofdaypals.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
timeset.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
title.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
tmhm.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
tmhm2.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
trade_animation.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
trainer_card.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
types.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
unown_puzzle.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
unused_title.asm Fix wVirtualOAM labels, part 2. 2018-01-30 14:52:46 -05:00
variables.asm Fix comment/style issues caused from w-izing. 2018-01-30 14:05:25 -05:00
warp_connection.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
wildmons.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00