Commit Graph

1677 Commits

Author SHA1 Message Date
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
yenatch
018cf26767 move gbhw.asm and hram.asm to constants.asm
they're constants, so they have no business in pokecrystal.asm
2013-09-10 02:17:48 -04:00
yenatch
3e9e7663ec preprocess everything
it makes more sense this way
2013-09-10 02:05:33 -04:00
yenatch
23b7a4eace Merge branch 'master' into rgbasm-objects 2013-09-10 01:20:54 -04:00
Bryan Bishop
5f6ecb8d1e Merge pull request #201 from kanzure/fix-submodule-version
bump submodule again
2013-09-09 22:14:23 -07:00
Bryan Bishop
c8d24e7685 bump submodule again 2013-09-10 00:13:34 -05:00
yenatch
3f9f5953e4 Merge branch 'master' into rgbasm-objects 2013-09-10 00:57:02 -04:00
Bryan Bishop
3ac5d20c75 Merge pull request #200 from kanzure/update-refactored-preprocessor
Update preprocessor to use a class.

Bump the submodule.
2013-09-09 21:49:25 -07:00
yenatch
6e6514c2c9 no need to use python if baserom.gbc doesn't exist
this part is only reached if baserom.gbc doesn't exist,
so it's pointless to check if it does
2013-09-10 00:09:43 -04:00
yenatch
2b38b9ba21 suppress .tx handling in Makefile
there are too many .tx files for the commands to be meaningful

better to just look at the makefile to see what's going on
2013-09-09 23:47:44 -04:00
Bryan Bishop
0d6efda9bb Merge pull request #198 from yenatch/split-predefs-specials-stds
decouple home/ from engine/
2013-09-09 19:51:29 -07:00
yenatch
84a9b3907b rename common/ to home/ 2013-09-09 22:44:48 -04:00
yenatch
6439706943 split spikes effect into effects/spikes.asm 2013-09-09 22:02:26 -04:00
yenatch
91e89a29a2 comment spikes move effect 2013-09-09 22:01:24 -04:00
yenatch
b437aaf329 add a note to endure.asm
this is easier than combining protect and endure
2013-09-09 21:53:21 -04:00
yenatch
40010e2514 split protect and endure effects into battle/effects/ 2013-09-09 21:51:41 -04:00
yenatch
aaf77957bf comment protect and endure move effects 2013-09-09 21:50:34 -04:00
yenatch
d07cd79443 consecutive protect/endure count in battle 2013-09-09 21:23:42 -04:00
yenatch
110477cd9e split curse effect into battle/effects/curse.asm 2013-09-09 18:43:22 -04:00
yenatch
d3fa77253a Merge pull request #4 from kanzure/fix-split-predefs-specials-stds
Fix split predefs specials stds
2013-09-09 14:14:33 -07:00
Bryan Bishop
33d7ef72fe Merge branch 'yenatch/split-predefs-specials-stds' into fix-split-predefs-specials-stds
https://github.com/kanzure/pokecrystal/pull/198
2013-09-09 16:00:05 -05:00
Bryan Bishop
3a2dbb5289 Merge branch 'yenatch/split-predefs-specials-stds' into fix-split-predefs-specials-stds
https://github.com/kanzure/pokecrystal/pull/198
2013-09-09 15:59:08 -05:00
Bryan Bishop
37e1aa4e8e Merge branch 'yenatch/split-predefs-specials-stds' into fix-split-predefs-specials-stds
https://github.com/kanzure/pokecrystal/pull/198
2013-09-09 15:56:49 -05:00
Bryan Bishop
35324ae43f Merge branch 'yenatch/split-predefs-specials-stds' into fix-split-predefs-specials-stds
https://github.com/kanzure/pokecrystal/pull/198
2013-09-09 15:55:43 -05:00
yenatch
608d0d86e4 move name rater asm into event/name_rater.asm 2013-09-09 16:09:34 -04:00
yenatch
0fc0c0bebc name rater special 2013-09-09 15:47:32 -04:00
yenatch
429417da74 name a couple specials 2013-09-09 15:39:43 -04:00
yenatch
cc41f68c34 split sgb-to-cgb asm into predef/cgb.asm 2013-09-09 15:34:09 -04:00
yenatch
dab74d719e cgb replacements for sgb layouts 2013-09-09 15:12:30 -04:00
yenatch
e33423374b split sgb stuff into predef/sgb.asm 2013-09-09 14:33:04 -04:00
yenatch
de8e7ca422 sgb layout predef 2013-09-09 14:17:03 -04:00
yenatch
a6c7200782 CheckCGB 2013-09-09 12:56:13 -04:00
yenatch
5bbcedb886 typo in CheckContestMon 2013-09-09 12:49:26 -04:00