Remy Oukaour dfcca93b45 Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460) ...

# Conflicts:
#	engine/battle/core.asm
#	engine/save.asm

2018-01-14 23:00:22 -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

Use BANK for hardcoded SRAM banks (except for vestigial refs to JP's banks 4-7)

2018-01-08 17:13:37 -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