Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity
pokecrystal/home
History
Remy Oukaour 14c8cf5b48 Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452) 
# Conflicts:
#	data/player_names.asm
#	engine/battle/menu.asm
#	engine/billspc.asm
#	engine/billspctop.asm
#	engine/buy_sell_toss.asm
#	engine/decorations.asm
#	engine/delete_save_change_clock.asm
#	engine/events/buena.asm
#	engine/events/elevator.asm
#	engine/events/kurt.asm
#	engine/events/mom.asm
#	engine/events/move_tutor.asm
#	engine/events/pokecenter_pc.asm
#	engine/events/pokepic.asm
#	engine/events/std_scripts.asm
#	engine/events/unown_walls.asm
#	engine/init_gender.asm
#	engine/intro_menu.asm
#	engine/mail.asm
#	engine/main_menu.asm
#	engine/mart.asm
#	engine/menu_2.asm
#	engine/mon_menu.asm
#	engine/pack.asm
#	engine/slot_machine.asm
#	engine/start_menu.asm
#	home/menu.asm
#	maps/CeladonDeptStore6F.asm
#	maps/CeladonGameCornerPrizeRoom.asm
#	maps/DragonShrine.asm
#	maps/EarlsPokemonAcademy.asm
#	maps/GoldenrodCity.asm
#	maps/GoldenrodDeptStore6F.asm
#	maps/GoldenrodGameCorner.asm
#	maps/GoldenrodPokeComCenter2FMobile.asm
#	mobile/mobile_12.asm
#	mobile/mobile_12_2.asm
#	mobile/mobile_22.asm
#	mobile/mobile_22_2.asm
#	mobile/mobile_40.asm
#	mobile/mobile_45.asm
#	mobile/mobile_45_sprite_engine.asm
#	mobile/mobile_46.asm
#	mobile/mobile_5c.asm
#	mobile/mobile_5f.asm
#	mobile/mobile_menu.asm
 		2018-01-14 23:43:51 -05:00
..
audio.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
battle.asm Consistent predef function names 2018-01-02 18:49:25 +01:00
copy.asm LY_BLANK and rLCDC constants 2017-12-29 18:53:21 +01: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
cry.asm Rename: emote_headers, sprite_headers, cry_headers, gfx_headers, tileset_headers 2017-12-26 12:50:32 -05:00
decompress.asm Fix indentation in many places 2016-06-07 08:13:08 -04:00
delay.asm Remove trailing newlines. 2015-06-23 12:24:51 -06:00
double_speed.asm Remove trailing newlines. 2015-06-23 12:24:51 -06:00
fade.asm Clean up XXX comments for unused content 2018-01-02 13:26:18 +01:00
farcall.asm Replace ‘jp [hl]’ with ‘jp hl’ 2017-06-09 22:01:10 +01:00
flag.asm Prefix engine_flags wram addresses with w 2017-12-28 13:15:46 +01:00
game_time.asm Use BANK for hardcoded WRAM banks (except where bankswitches appear unnecessary). 2018-01-03 19:12:45 -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 Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460) 2018-01-14 23:00:22 -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 lda_coord and ldcoord_a exist for this 2017-12-29 17:07:21 -05:00
lcd.asm More unreferenced labels cleanup 2018-01-02 16:04:21 +01:00
map.asm Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460) 2018-01-14 23:00:22 -05:00
map_objects.asm Clean up XXX comments for unused content 2018-01-02 13:26:18 +01:00
math.asm callba/callab → farcall/callfar 2017-12-24 12:47:30 -05:00
menu.asm Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452) 2018-01-14 23:43:51 -05:00
mobile.asm More unreferenced labels cleanup 2018-01-02 16:04:21 +01:00
movement.asm Resolve #428: Use `HIGH(X)` and `LOW(X)` instead of `X / $100` and `X % $100` or `X >> 8` and `X & $ff` 2017-12-25 14:23:16 -05:00
names.asm Replace hardcoded bank with BANK function. 2018-01-03 02:19:38 -05:00
palettes.asm Consistent predef function names 2018-01-02 18:49:25 +01:00
pokedex_flags.asm Predef_FlagAction -> Predef_SmallFarFlagAction 2018-01-07 11:53:20 +01:00
predef.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
random.asm Remove trailing newlines. 2015-06-23 12:24:51 -06:00
rst.asm move rst.asm and interrupts.asm into home/ 2017-12-24 21:47:11 -05:00
rtc.asm Consistent predef function names 2018-01-02 18:49:25 +01:00
serial.asm Clean up XXX comments for unused content 2018-01-02 13:26:18 +01: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/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
tilemap.asm callba/callab → farcall/callfar 2017-12-24 12:47:30 -05:00
time.asm maskbits <count> +- 1 2018-01-10 14:03:11 -05:00
trainers.asm More unreferenced labels cleanup 2018-01-02 16:04:21 +01:00
vblank.asm Serve2bppRequest@VBlank → Serve2bppRequest_VBlank 2018-01-03 15:28:13 -05:00
video.asm Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460) 2018-01-14 23:00:22 -05:00
window.asm Clean up XXX comments for unused content 2018-01-02 13:26:18 +01:00