Remy Oukaour 5c28d05bb4 Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) ... # 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		2018-01-14 22:56:36 -05:00
..
checknickerrors.asm	Remove all code from main.asm (some labeled INCBINs, like out-of-context graphics, are still present)	2017-12-24 19:35:35 -05:00
checksave.asm	Remove all code from main.asm (some labeled INCBINs, like out-of-context graphics, are still present)	2017-12-24 19:35:35 -05:00
checktime.asm	Remove all code from main.asm (some labeled INCBINs, like out-of-context graphics, are still present)	2017-12-24 19:35:35 -05:00
correcterrorsinplayerparty.asm	Consistent predef function names	2018-01-02 18:49:25 +01:00
drawkrispackgfx.asm	Use maskbits some more	2018-01-11 14:27:19 -05:00
emptyallsrambanks.asm	Remove all code from main.asm (some labeled INCBINs, like out-of-context graphics, are still present)	2017-12-24 19:35:35 -05:00
flagpredef.asm	Predef_FlagAction -> Predef_SmallFarFlagAction	2018-01-07 11:53:20 +01:00
getbreedmonlevelgrowth.asm	Remove all code from main.asm (some labeled INCBINs, like out-of-context graphics, are still present)	2017-12-24 19:35:35 -05:00
getsquareroot.asm	LY_BLANK and rLCDC constants	2017-12-29 18:53:21 +01:00
initlist.asm	Remove all code from main.asm (some labeled INCBINs, like out-of-context graphics, are still present)	2017-12-24 19:35:35 -05:00
knowsmove.asm	Remove all code from main.asm (some labeled INCBINs, like out-of-context graphics, are still present)	2017-12-24 19:35:35 -05:00
leveluphappinessmod.asm	Remove all code from main.asm (some labeled INCBINs, like out-of-context graphics, are still present)	2017-12-24 19:35:35 -05:00
loadmappart.asm	Remove all code from main.asm (some labeled INCBINs, like out-of-context graphics, are still present)	2017-12-24 19:35:35 -05:00
loadpushoam.asm	Resolve #461	2018-01-10 13:47:57 -05:00
newpokedexentry.asm	Consistent predef function names	2018-01-02 18:49:25 +01:00
phonering_copytilemapatonce.asm	LY_BLANK and rLCDC constants	2017-12-29 18:53:21 +01:00
placegraphic.asm	Consistent predef function names	2018-01-02 18:49:25 +01:00
placewaitingtext.asm	Consistent predef function names	2018-01-02 18:49:25 +01:00
playslowcry.asm	Consolidate Special function names	2018-01-02 17:13:57 +01:00
printhoursmins.asm	Clean up XXX comments for unused content	2018-01-02 13:26:18 +01:00
printitemdescription.asm	Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459)	2018-01-14 22:56:36 -05:00
savemenu_copytilemapatonce.asm	Lowercase v for VRAM addresses	2017-12-28 13:32:33 +01:00
sine.asm	Consistent sine wave code formatting	2018-01-09 16:39:36 -05:00
switchpartymons.asm	Resolve #461	2018-01-10 13:47:57 -05:00
townmap_convertlinebreakcharacters.asm	Remove all code from main.asm (some labeled INCBINs, like out-of-context graphics, are still present)	2017-12-24 19:35:35 -05:00
trademonfrontpic.asm	Consistent predef function names	2018-01-02 18:49:25 +01:00
updateitemdescription.asm	Remove all code from main.asm (some labeled INCBINs, like out-of-context graphics, are still present)	2017-12-24 19:35:35 -05:00