pokecrystal-board/home
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
..
audio.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
battle_vars.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
battle.asm Fix comment/style issues caused from w-izing. 2018-01-30 14:05:25 -05:00
copy2.asm Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style 2016-04-10 14:42:14 -04:00
copy.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
cry.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
decompress.asm Fix indentation in many places 2016-06-07 08:13:08 -04:00
delay.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
double_speed.asm Remove trailing newlines. 2015-06-23 12:24:51 -06:00
fade.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
farcall.asm Replace ‘jp [hl]’ with ‘jp hl’ 2017-06-09 22:01:10 +01:00
flag.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
game_time.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
handshake.asm Port homecall macro 2016-05-27 10:41:59 -04:00
hm_moves.asm IsHM is not used within home/names.asm; group it with the other HM routines+data 2017-12-22 22:56:21 -05:00
init.asm Fix wVirtualOAM labels, part 1. 2018-01-30 14:47:14 -05:00
interrupts.asm move rst.asm and interrupts.asm into home/ 2017-12-24 21:47:11 -05:00
item.asm callba/callab → farcall/callfar 2017-12-24 12:47:30 -05:00
joypad.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
lcd.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.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
math.asm callba/callab → farcall/callfar 2017-12-24 12:47:30 -05:00
menu.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
mobile.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
movement.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
names.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
palettes.asm use PAL_COLOR_SIZE 2018-01-26 21:25:49 -05:00
pokedex_flags.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
predef.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
random.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
rst.asm move rst.asm and interrupts.asm into home/ 2017-12-24 21:47:11 -05:00
rtc.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
serial.asm Resolve #471 (although link code still needs more cleanup, like its WRAM labels) 2018-01-19 14:49:43 -05:00
sine.asm Consistent sine wave code formatting 2018-01-09 16:39:36 -05:00
sram.asm Remove trailing newlines. 2015-06-23 12:24:51 -06:00
string.asm All functions in main.asm have non-generic names 2016-05-08 14:11:24 -04:00
text.asm Merge branch 'master' of https://github.com/pret/pokecrystal 2018-02-03 19:42:56 -05:00
tilemap.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
trainers.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
vblank.asm Fix wVirtualOAM labels, part 1. 2018-01-30 14:47:14 -05:00
video.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
window.asm Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00