summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-10-25Merge commit '8b8de40' into merge-mrwintyenatch
Conflicts: main.asm
2013-10-25Merge commit '650dc98b' into merge-mrwintyenatch
Conflicts: main.asm
2013-10-25Merge commit '754325b2' into merge-mrwintyenatch
Conflicts: main.asm
2013-10-25Merge commit 'e1cce1c' into merge-mrwintyenatch
Conflicts: main.asm
2013-10-25Merge commit 'a0ba53e' into merge-mrwintyenatch
2013-10-25Merge commit 'aae33da9' into merge-mrwintyenatch
2013-10-25Merge commit '91b822c' into merge-mrwintyenatch
2013-10-25Merge commit '789469c' into merge-mrwintyenatch
Conflicts: main.asm
2013-10-25Merge commit '963fe48' into merge-mrwintyenatch
2013-10-25Merge commit '546c17ad' into merge-mrwintyenatch
Conflicts: engine/scripting.asm main.asm
2013-10-25Merge commit '4ac6783' into merge-mrwintyenatch
2013-10-25Merge commit 'ec77075a' into merge-mrwintyenatch
Conflicts: main.asm
2013-10-11roofs for each map groupyenatch
2013-10-10game freak logoyenatch
2013-10-10use the IntroLogoGFX label in existing asmyenatch
2013-10-08fix padding in compressed intro graphicsyenatch
2013-10-08stop hardcoding the return bank for _LoadMusicByteyenatch
2013-10-08fix LoadMusicByte naming schemeyenatch
2013-10-08rename 'LoadMusic' to '_PlayMusic'yenatch
2013-10-08rename 'StartMusic' to 'PlayMusic'yenatch
2013-10-08rename 'LoadSFX' to '_PlaySFX'yenatch
2013-10-08rename 'StartSFX' to 'PlaySFX'yenatch
2013-10-08rename 'PlaySFX' to 'PlayStereoSFX'yenatch
2013-10-08ContestMonsyenatch
2013-10-05* added index comments to pointer listsMr Wint
* added map header wram addresses * analyzed some assembly
2013-10-02* fixed call and jump labels in home bankMr Wint
* added some more assembly
2013-10-02* make jumps and calls use labelsMr Wint
2013-10-02* last callab/callba macrosMr Wint
2013-10-02* even more callab/callba macrosMr Wint
2013-10-02* more callab/callba macrosMr Wint
2013-10-02* applied callab/callba macros where possibleMr Wint
* corrected some mislabeled jump addresses
2013-10-01* extracted and added a bunch of assemblyMr Wint
2013-09-30Merge pull request #209 from yenatch/script-commandsBryan Bishop
use updated script commands from pokemontools
2013-10-01bump extras to use updated script commandsyenatch
2013-10-01fix parsing errors for displaylocationyenatch
2013-10-01fix parameter comments for updated script commandsyenatch
2013-10-01script command unknown0xa8 is waityenatch
2013-10-01move effect command 'wait' is now 'movedelay'yenatch
2013-10-01missed some bit2 script commandsyenatch
2013-10-01Merge branch 'master' into script-commandsyenatch
2013-09-26script commands if_greater_than and if_less_than were swappedyenatch
2013-09-26Merge pull request #208 from kanzure/bump-pokemontoolsBryan Bishop
pokemontools v1.4.1-dev-f3fb1f24
2013-09-26Merge branch 'master' into bump-pokemontoolsBryan Bishop
2013-09-26Merge pull request #205 from kanzure/attempt-pokemontools-bumpBryan Bishop
Bump pokemontools to v1.4.1
2013-09-26fix a typo related to configurationBryan Bishop
2013-09-26bump to latest pokemontools (master)Bryan Bishop
pokemontools v1.4.1-dev-f3fb1f24
2013-09-24bump pokemontools to v1.4.1Bryan Bishop
Note that gbz8disasm doesn't work at the moment.
2013-09-24Merge pull request #204 from yenatch/masterBryan Bishop
Some uncommented code.
2013-09-24rename bit2 script commands to flagyenatch
2013-09-24rename bit1 script commands to eventyenatch