Commit Graph

4004 Commits

Author SHA1 Message Date
Rangi
c7032617aa Remove address comment 2018-06-24 21:28:26 -04:00
Rangi
e2fb7acac0 Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
#	engine/items/mart.asm
2018-06-24 21:23:51 -04:00
yenatch
3648546232
Merge pull request #532 from mid-kid/master
Remove even more address comments
2018-06-24 20:22:13 -04:00
mid-kid
5efce10789 Remove even more address comments
That should be all of them this time
2018-06-25 02:10:37 +02:00
yenatch
0cbe04da44
Merge pull request #531 from mid-kid/master
Remove all address comments
2018-06-24 19:54:03 -04:00
Rangi
1a888f2200 NUM_GRASSMON * 2 2018-06-24 13:00:55 -04:00
Rangi
ee48c7a3ed NUM_WATERMON 2018-06-24 12:32:56 -04:00
Rangi
d84aabf3c1 WATER_WILDDATA_LENGTH 2018-06-24 12:30:33 -04:00
Rangi
5a58f90ec6 FISHGROUP_DATA_LENGTH 2018-06-24 11:46:55 -04:00
mid-kid
1d9a68dbdd Remove all address comments 2018-06-24 16:13:22 +02:00
Rangi
5cbff21a0d Unreferenced_53d84 → Unreferenced_MonPicBanks from pokegold-spaceworld 2018-06-24 01:13:59 -04:00
Rangi
ff4cfffe14 wMartItemBCDEnd is unused 2018-06-23 23:27:43 -04:00
Rangi
a4bf94e1d7 wCurMartEnd - wCurMart = 16 2018-06-23 23:15:13 -04:00
Rangi
f6ef095284 Add STANDARDMART_* jumptable index constants 2018-06-23 22:35:46 -04:00
Rangi
e36a505906 Separate Mart constants from item data constants 2018-06-23 22:24:46 -04:00
Rangi
5c7d04ac84 Use direct tile IDs, not charmap entries, since they don't correspond correctly (e.g. "┌" is not the top-right corner) 2018-06-23 21:12:37 -04:00
yenatch
131875d3e3
Merge pull request #528 from Rangi42/master
Silence -Wimplicit-fallthrough
2018-06-21 23:28:10 -04:00
Rangi
462bae31d9 Silence -Wimplicit-fallthrough 2018-06-20 22:14:50 -04:00
yenatch
0fbc8362b6
Merge pull request #526 from atasro2/master
reword
2018-06-20 19:25:39 -04:00
yenatch
c3be6ea684
Merge pull request #525 from Rangi42/master
Note which labels are only needed for locating banks (relevant to issue #485)
2018-06-17 12:11:39 -04:00
MCboy
5c662be182
fixed a typo
being the grammar nazi i am i noticed a grammar error so i forked pokecrystal to fix it ;)
2018-06-14 00:34:24 +04:30
Rangi
fbe82a7fe0 Note which labels are only needed for locating banks (relevant to issue #485) 2018-06-12 23:29:15 -04:00
yenatch
6130fc5cd6
Merge pull request #521 from mid-kid/master
Fix md5.c for Windows
2018-06-07 11:09:30 -04:00
yenatch
610bac37ac
Merge pull request #518 from Rangi42/master
[RTM] Specify DVs individually
2018-06-07 11:07:37 -04:00
mid-kid
ef5e4e43c7 Fix md5.c for Windows
Solves #520
2018-06-07 13:37:11 +02:00
Rangi
9ac2583b20 Use dn 2018-06-06 18:49:16 -04:00
Rangi
09d1ac8725 Specify DVs individually 2018-06-06 11:45:19 -04:00
yenatch
06e169d01c
Merge pull request #516 from Ben10do/remove-gnu-sed-extensions
Don’t use GNU extensions when calling sed
2018-06-05 23:24:23 -04:00
yenatch
e58688c09b sort_symfile: don't need to use sort -o with a temp file 2018-06-05 07:22:25 -04:00
yenatch
1baea408e2 sort_symfile: don't overwrite the symfile with an intermediate file 2018-06-05 07:15:16 -04:00
yenatch
dbf05e48eb
Merge pull request #517 from mid-kid/master
Some fixes all around
2018-06-05 07:04:54 -04:00
yenatch
c61d6a3a5a Fix other unused shiny check label 2018-06-05 06:58:25 -04:00
mid-kid
6f4e968b70 Fix DangetSoundHigh -> DangerSoundHigh 2018-06-05 10:13:09 +02:00
yenatch
5c0e5fa7ca Fix unused shiny check comments. 2018-06-04 23:36:27 -04:00
mid-kid
aecb33f104 Alignment 2018-06-04 18:32:57 +02:00
mid-kid
38ede6d7f0 Clean up PlayDanger 2018-06-04 14:34:35 +02:00
mid-kid
e8f847b537 Use structure constants for channel_struct 2018-06-04 11:35:27 +02:00
mid-kid
5e9c785b3f Merge branch 'master' of https://github.com/pret/pokecrystal 2018-06-04 11:05:53 +02:00
yenatch
d596a0c83b
Merge pull request #514 from Rangi42/master
[Ready to merge] Named constants for sprite movement data bit flags + other minor fixes
2018-06-04 00:47:16 -04:00
Rangi
c7bb2d15cf Create empty sections for the remaining FixPicBank array entries 2018-06-03 23:25:21 -04:00
Rangi
7cd5bcbae4 Change FixPicBank bank array 2018-06-03 23:18:31 -04:00
Ben10do
2dd2ec97f1
Don’t use GNU extensions when calling sed
Apparently, GNU sed has a few extensions that aren’t supported by the version of BSD sed that currently comes with Macs.

This would cause sort_symfile.sh to fail on macOS, causing the build to appear to fail at the last minute.

Admittedly, I’m not very familiar with sed, but this seems to do the trick on both macOS and Ubuntu.

- The input file must be last in the arguments list.
- The -i option, allowing the same file for input and output, doesn’t appear to be supported. Instead, I’m writing the output to a temporary file, and replacing the original file with that temporary file.
- Apparently ‘\w’ isn’t supported, so I’m simply using ‘.’ instead, as it appears to match “0_ROM0@” etc. just as well.
2018-06-03 16:24:23 +01:00
mid-kid
17087489c6 Miscellaneous fixes in the use of _command constants. 2018-06-01 09:04:36 +02:00
mid-kid
761edc7db3 Merge branch 'master' of https://github.com/pret/pokecrystal 2018-06-01 09:02:24 +02:00
Rangi
4df72a8474 SGB palette roles discovered from Spaceworld beta G/S 2018-06-01 02:11:44 -04:00
Rangi
a71b7a92b7 Same pic bank solution as pokecrystal 2018-05-29 19:14:04 -04:00
Rangi
3927bcdb9d Function6ec1 → CanObjectMoveInDirection 2018-05-24 12:36:35 -04:00
Rangi
a91aa18dae Use constants more 2018-05-23 22:13:46 -04:00
Rangi
1840af8b4f Identify more sprite move data flag bits 2018-05-23 22:01:21 -04:00
Rangi
85f7328bf8 Identify USE_OBP1_F 2018-05-23 20:44:32 -04:00