Commit Graph

3203 Commits

Author SHA1 Message Date
yenatch
7aef598414 Merge pull request #338 from PikalaxALT/master
Battle anims, HP Bar anim
2016-04-18 08:01:12 -04:00
pikalaxalt
5d94fb22ed Add missing wind.2bpp.lz 2016-04-18 07:56:15 -04:00
pikalaxalt
b11a8be88c Merge branch 'master' of https://github.com/pret/pokecrystal 2016-04-10 20:42:14 -04:00
yenatch
c5fb2c947f Bump extras again to fix last bump. 2016-04-10 19:24:35 -04:00
yenatch
05cffac744 Add a custom scan_includes.py. 2016-04-10 19:19:58 -04:00
yenatch
d257188282 Bump extras to fix gfx.py. 2016-04-10 19:15:08 -04:00
pikalaxalt
0bcd725e6a Finish renaming battle anim gfx pointers and files 2016-04-10 17:16:08 -04:00
pikalaxalt
73c7ea2b43 Local labels starting with underscores have colons depending on whether the first alphanumeric character is capitalized or not 2016-04-10 15:11:37 -04:00
pikalaxalt
6be4cd4da9 Local labels starting with lowercase letters are no longer decorated with a trailing colon 2016-04-10 15:01:49 -04:00
pikalaxalt
bf73772a56 Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style 2016-04-10 14:42:14 -04:00
pikalaxalt
46ead9b849 Alan's script pointers are now local references; movement_tree_shake for sudowoodo on route 36 2016-04-10 13:47:24 -04:00
pikalaxalt
552febffe8 Merge branch 'master' of https://github.com/pret/pokecrystal 2016-04-10 13:39:55 -04:00
IIMarckus
0a2b14309a More labels cleanup in map scripts. 2016-04-07 04:13:59 -06:00
IIMarckus
88328f18b6 Improve some map script labels. 2016-04-06 23:00:08 -06:00
IIMarckus
7fefefcf12 Remove duplicate blockdata. 2016-04-06 23:00:05 -06:00
pikalaxalt
a8fe0c13d4 Make town map pals more intuitive in source 2016-04-02 09:28:46 -04:00
pikalaxalt
93e12d2003 Split up banks 1-3 of main.asm 2016-03-27 12:47:28 -04:00
pikalaxalt
2650bcffad Merge branch 'master' of https://github.com/pret/pokecrystal 2016-03-25 11:32:21 -04:00
yenatch
63eb59c6ed Fix a typo in AzaleaGym. 2016-03-25 11:12:15 -04:00
dannye
e4aff99f4e Fix filename case inconsistency
when the filename uses different case than the include,
rgbds mistakenly thinks that file is intermediate
2016-03-24 11:38:49 -05:00
dannye
8d1551ec9d Revert 85d30fa079 2016-03-24 11:27:02 -05:00
yenatch
85d30fa079 Fix make deleting files that aren't actually intermediate.
make was deciding that a couple .blk files were actually intermediate.
Still don't know what is causing that issue. This is a temporary fix
that will probably be forgotten about and become a permanent one.
2016-03-21 08:04:00 -04:00
pikalaxalt
707020f9be Merge branch 'master' of https://github.com/pret/pokecrystal 2016-03-19 19:46:39 -04:00
yenatch
9ce74b3d2c Fix the include for engine/fish.asm. 2016-03-18 23:44:20 -04:00
yenatch
d2a3e4a6a4 Split fish code out of data/. 2016-03-16 18:11:26 -04:00
yenatch
a2b891964f Use fish group constants in map headers. 2016-03-16 18:08:18 -04:00
yenatch
5b27af071c Add fish group constants. 2016-03-16 18:05:28 -04:00
yenatch
a1f7189e25 Add a link to the irc in INSTALL.md. 2016-03-16 17:59:24 -04:00
yenatch
1f784700b9 Fix the symfile.
gnu make redefines $* to mean % in spite of posix.
2016-03-16 17:54:20 -04:00
pikalaxalt
5b9ba5d921 Fix comment on HP bar bug 2016-03-08 20:02:30 -05:00
pikalaxalt
08e6009e61 Merge branch 'master' of https://github.com/pret/pokecrystal 2016-03-08 19:54:13 -05:00
pikalaxalt
f2fa5349d5 More annotations of HP bar animations, including an oversight by GameFreak resulting in super-slow HP bars for Pokemon with over 48 HP 2016-03-08 19:54:06 -05:00
yenatch
2270052319 Make diacritic labels less confusing in PlaceString. 2016-03-04 13:21:14 -05:00
yenatch
016c2baae2 Use the dakuten characters. 2016-03-03 00:07:17 -05:00
yenatch
3810cefaa2 Suppress deletion of .1bpp files. 2016-03-03 00:06:09 -05:00
yenatch
13f5590abe Trim some whitespace in the makefile. 2016-03-01 23:39:01 -05:00
yenatch
370f84227b Suppress deletion of intermediate .2bpp files. 2016-03-01 23:38:36 -05:00
PikalaxALT
f31da089bb Merge branch 'master' of https://github.com/pret/pokecrystal 2016-03-01 22:31:28 -05:00
PikalaxALT
599e6e8d16 Battle animation annotations 2016-03-01 22:31:21 -05:00
yenatch
0be6e6c910 Remove useless lines in the makefile.
The previous rules were composed this way but only because target-specific variables weren't used. As they are now, they actually do nothing.
2016-03-01 21:13:38 -05:00
yenatch
e11ef2b8d5 Only generate dependencies for a target when it's invoked.
This means dependencies for unrelated targets aren't generated if you aren't building them. This makes "make clean" and building individual targets fast again.
2016-03-01 21:01:34 -05:00
yenatch
782cbc14d6 Only use suffixes needed for intermediate rules.
This is technically a hack, since keeping the .asm suffix was causing nonexistent rules to be evaluated as per the next commit. On the other hand, this is the intended purpose of .SUFFIXES.
2016-03-01 20:58:00 -05:00
yenatch
21a9fac5d0 Decompress images in one step instead of having to invoke 'unlz'. 2016-02-17 18:08:11 -05:00
yenatch
f6fc07d1c9 Assume pokemon pics are 7x7 if not in base stats. 2016-02-17 17:13:03 -05:00
yenatch
dd77706524 Bump extras; pypng is now part of extras. 2016-02-17 16:44:27 -05:00
yenatch
73a660bf2a Remove "make pngs". 2016-02-17 16:22:05 -05:00
yenatch
2ae8f65b42 Try to fix pic dimensions. 2016-02-17 16:18:58 -05:00
yenatch
776dd61823 hRemainder 2016-02-15 18:57:49 -05:00
yenatch
bd11b60477 Use EGG_LEVEL for the Poke Seer. 2016-02-11 22:53:00 -05:00
yenatch
8e1167a1e5 Merge branch 'fix-makefile' 2016-02-10 00:32:58 -05:00