Commit Graph

1909 Commits

Author SHA1 Message Date
yenatch
ad3293595d script commands if_greater_than and if_less_than were swapped 2013-09-26 18:40:20 -04:00
Bryan Bishop
7872b7e8b3 Merge pull request #208 from kanzure/bump-pokemontools
pokemontools v1.4.1-dev-f3fb1f24
2013-09-26 15:30:55 -07:00
Bryan Bishop
24fb13430d Merge branch 'master' into bump-pokemontools 2013-09-26 17:28:59 -05:00
Bryan Bishop
4b88052208 Merge pull request #205 from kanzure/attempt-pokemontools-bump
Bump pokemontools to v1.4.1
2013-09-26 15:27:52 -07:00
Bryan Bishop
2917a28242 fix a typo related to configuration 2013-09-26 17:26:00 -05:00
Bryan Bishop
7f0778a65a bump to latest pokemontools (master)
pokemontools v1.4.1-dev-f3fb1f24
2013-09-26 17:21:22 -05:00
Bryan Bishop
fc90df9895 bump pokemontools to v1.4.1
Note that gbz8disasm doesn't work at the moment.
2013-09-24 10:46:53 -05:00
Bryan Bishop
3dedf4c109 Merge pull request #204 from yenatch/master
Some uncommented code.
2013-09-24 08:38:12 -07:00
yenatch
73bd376cfd rename bit2 script commands to flag 2013-09-24 03:51:42 -04:00
yenatch
3134b26f7b rename bit1 script commands to event 2013-09-24 03:48:58 -04:00
yenatch
8da8dff7cf use a label in wildon/wildoff script command asm 2013-09-24 03:31:00 -04:00
yenatch
2afb247caa script commands wildon and wildoff got mixed up
this was a mistake in the original pksv spec and tauwasser's notes
2013-09-24 03:29:37 -04:00
yenatch
f6a5d7b2f2 split pokedex flag handling into home/pokedex_flags.asm 2013-09-18 21:54:31 -04:00
yenatch
f958ba0e6d recomment IsInArray 2013-09-18 21:48:04 -04:00
yenatch
c074231a07 move window asm into home/window.asm 2013-09-18 21:40:48 -04:00
yenatch
5a4e4bdb41 fix some farcalls in window asm 2013-09-18 21:39:14 -04:00
yenatch
5249fd9773 fix padding in .lz files for attack graphics 2013-09-18 21:31:40 -04:00
yenatch
663c523ac4 fix formatting in player pic asm 2013-09-18 21:10:25 -04:00
yenatch
48bab16ea4 move dratini special into event/dratini.asm 2013-09-18 21:04:16 -04:00
yenatch
7cef3b76de move mon icons into menu/mon_icons.asm 2013-09-18 20:58:32 -04:00
yenatch
1e56e3e9af more encounter functions 2013-09-18 20:50:42 -04:00
yenatch
ee47d6ed17 more mobile functions 2013-09-16 17:52:23 -04:00
yenatch
e770ae20b2 clean up a couple mobile function comments
nothing here is actually commented out
2013-09-16 17:42:19 -04:00
yenatch
237861b553 rename hall of fame labels 2013-09-16 17:42:11 -04:00
yenatch
9ae1cd6a1c split title screen functions into engine/title.asm 2013-09-15 18:59:53 -04:00
yenatch
0ce5c4fe93 split the mobile adapter library into lib/mobile/ 2013-09-15 18:58:37 -04:00
yenatch
013c6fc368 some time-dependent function 2013-09-15 18:17:02 -04:00
yenatch
3370a04d9e split color asm and data into engine/color.asm 2013-09-15 18:02:02 -04:00
yenatch
fe92089694 dump a couple palettes in predef/cgb.asm 2013-09-15 17:31:18 -04:00
yenatch
c3cab23cda dump a palette set at the end of bank 2 2013-09-15 17:29:53 -04:00
yenatch
dd473e565b incbin some 0s back 2013-09-15 17:24:56 -04:00
yenatch
c738318dc0 move part of an incbin into predef/cgb.asm 2013-09-15 17:08:10 -04:00
yenatch
ab91f49e3b remove some incbins in bank 2 2013-09-15 17:01:17 -04:00
yenatch
44fac4fd70 finish an old script pointer table 2013-09-12 05:37:53 -04:00
Bryan Bishop
d536990828 Merge pull request #203 from yenatch/globals
consolidate labels across objects into globals.asm
2013-09-11 18:05:41 -07:00
yenatch
81c5f251a6 add globals.asm to .gitignore 2013-09-11 20:54:26 -04:00
yenatch
d6b53879f4 include globals.asm in pokecrystal.asm 2013-09-11 20:28:31 -04:00
yenatch
7fba45f668 fix a typo in Makefile
we want to link more than one object!
2013-09-11 20:27:16 -04:00
yenatch
e2aa3d7ea5 consolidate labels across objects into globals.asm
this is required for objects to share labels
2013-09-11 20:26:09 -04:00
yenatch
eaa790318a bump extras to use globals.asm 2013-09-11 20:23:57 -04:00
yenatch
4aae680b69 move wram constants into constants.asm; make all labels use :s
any global constants will have to be separate from any one object

there might be a better way to fix this, like pulling constants in preprocessor.py
2013-09-11 19:28:18 -04:00
yenatch
38be374d0a check that a source file exists before scanning it for includes 2013-09-11 19:17:25 -04:00
Bryan Bishop
18656332b7 Merge pull request #202 from yenatch/rgbasm-objects
makefile: support multiple rgbasm objects
2013-09-10 22:47:24 -07:00
yenatch
e11a56a1f6 use a docstring instead of comments in scan_includes 2013-09-11 01:40:53 -04:00
yenatch
74f8d746db abstract make targets are now phony 2013-09-11 01:26:51 -04:00
yenatch
84ba0ffc31 rename lzs make target to gfx 2013-09-11 01:25:39 -04:00
yenatch
c195276073 rename make variables for graphics files 2013-09-11 01:24:20 -04:00
yenatch
6a21963799 scan source files for Makefile dependencies
preprocessing should work with multiple object files now
2013-09-11 01:23:01 -04:00
yenatch
e1c3fee926 change old .tx includes to .asm
these were forgotten about with the last preprocessor change.
this is required for object dependencies to be handled by make.
2013-09-11 01:16:33 -04:00
yenatch
4db0e3c186 rewrite Makefile to handle multiple rgbasm objects
for now, any new files to preprocess will trigger the targets for all objects.
this isn't a problem yet since there's still only one object.
2013-09-10 19:30:31 -04:00