Merge commit '650dc98b' into merge-mrwint
Merge commit '754325b2' into merge-mrwint
Merge commit 'e1cce1c' into merge-mrwint
Merge commit 'a0ba53e' into merge-mrwint
Merge commit 'aae33da9' into merge-mrwint
Merge commit '91b822c' into merge-mrwint
Merge commit '789469c' into merge-mrwint
Merge commit '963fe48' into merge-mrwint
Merge commit '546c17ad' into merge-mrwint
Merge commit '4ac6783' into merge-mrwint
Merge commit 'ec77075a' into merge-mrwint
use the IntroLogoGFX label in existing asm
fix padding in compressed intro graphics
stop hardcoding the return bank for _LoadMusicByte
rename 'LoadMusic' to '_PlayMusic'
rename 'StartMusic' to 'PlayMusic'
rename 'PlaySFX' to 'PlayStereoSFX'
* added index comments to pointer lists
* fixed call and jump labels in home bank
* make jumps and calls use labels
* even more callab/callba macros
* applied callab/callba macros where possible
* extracted and added a bunch of assembly
Merge pull request #209 from yenatch/script-commands
bump extras to use updated script commands
fix parsing errors for displaylocation
fix parameter comments for updated script commands
script command unknown0xa8 is wait
move effect command 'wait' is now 'movedelay'
missed some bit2 script commands
Merge branch 'master' into script-commands
script commands if_greater_than and if_less_than were swapped
Merge pull request #208 from kanzure/bump-pokemontools
Merge branch 'master' into bump-pokemontools
bump to latest pokemontools (master)
Merge pull request #205 from kanzure/attempt-pokemontools-bump
fix a typo related to configuration
bump pokemontools to v1.4.1
Merge pull request #204 from yenatch/master
rename bit2 script commands to flag
rename bit1 script commands to event
use a label in wildon/wildoff script command asm
script commands wildon and wildoff got mixed up
split pokedex flag handling into home/pokedex_flags.asm
move window asm into home/window.asm
fix padding in .lz files for attack graphics
fix formatting in player pic asm
move dratini special into event/dratini.asm
move mon icons into menu/mon_icons.asm
clean up a couple mobile function comments
split title screen functions into engine/title.asm
split the mobile adapter library into lib/mobile/
split color asm and data into engine/color.asm
dump a couple palettes in predef/cgb.asm
dump a palette set at the end of bank 2
move part of an incbin into predef/cgb.asm
finish an old script pointer table
Merge pull request #203 from yenatch/globals
include globals.asm in pokecrystal.asm
consolidate labels across objects into globals.asm
move wram constants into constants.asm; make all labels use :s
check that a source file exists before scanning it for includes
Merge pull request #202 from yenatch/rgbasm-objects
use a docstring instead of comments in scan_includes
abstract make targets are now phony
rename make variables for graphics files
scan source files for Makefile dependencies
rewrite Makefile to handle multiple rgbasm objects
move gbhw.asm and hram.asm to constants.asm
Merge branch 'master' into rgbasm-objects
Merge branch 'master' into rgbasm-objects
no need to use python if baserom.gbc doesn't exist
suppress .tx handling in Makefile
Merge pull request #201 from kanzure/fix-submodule-version
Merge pull request #200 from kanzure/update-refactored-preprocessor
Merge pull request #198 from yenatch/split-predefs-specials-stds
split spikes effect into effects/spikes.asm