Commit Graph

3977 Commits

Author SHA1 Message Date
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
Rangi 50ea6d6e22 WALKS_ON_WATER → SWIMMING 2018-05-23 19:10:15 -04:00
Rangi c85b32ed80 More sprite movement data flag constants 2018-05-23 19:06:04 -04:00
Rangi c5d18de8ff Use known sprite movement data flag constants 2018-05-23 13:15:07 -04:00
Rangi 32b92ca51c Start improving sprite movement engine (to do: identify bit flags)
Introduce maskbits N[, S]: optionally shift the bitmask
2018-05-23 12:48:14 -04:00
Rangi 4e776d4fa6 Use constants 2018-05-23 11:14:15 -04:00
Rangi d2880d1981 Factor out GetHPPals and SetHPPals from home.asm
The remaining code in home.asm is almost all "generic", unrelated to Pokémon-specific game logic, so leaving it as-is might be neater than little home/*.asm files for each routine.
2018-05-23 11:08:23 -04:00
Rangi ad5337863d Use SPRITE_VARS 2018-05-23 00:05:07 -04:00
Rangi 5c064746f6 Gme → Game 2018-05-21 21:54:56 -04:00
Rangi 846e3e65de adc a, 0 → adc 0; fix comments 2018-05-20 17:55:27 -04:00
Rangi 9afacc7842 Use REGISTERED_* constants
128px wide pack_menu.png matches BGB VRAM viewer, and rows+cols match hex tile IDs (e.g. $24 = row 3 col 5)
2018-05-20 17:50:53 -04:00
Rangi 03570a514e Correct comment 2018-05-19 13:16:18 -04:00
Rangi ae50b1148a 1 << FRZ == $20 2018-05-19 13:11:50 -04:00
Rangi d5fff8aa96 Constants for PC menu indexes
'db  ' -> 'db '
2018-05-18 22:18:00 -04:00
Rangi e1fabcfbff Fix comments 2018-05-18 19:36:22 -04:00
mid-kid 8d10a987a3 Change sfx and cry branch labels to local labels
They're local anyway, and this makes them look more like loops.
2018-05-13 01:42:26 +02:00
yenatch 53bcd8f46c
Merge pull request #512 from pret/warnings
fix lb/ln and "left shift of negative value" warning
2018-05-11 00:45:12 -04:00
yenatch 9b0ca7b8c2
Merge pull request #510 from Rangi42/master
Use explicit HELD_NONE and NO_LIMITS, not 0s; also fix #511
2018-05-11 00:45:00 -04:00
yenatch 6e91c3a293 Revert "Fix #511: eliminate "Left shift of negative value" warnings"
This reverts commit aa51dbc612.
2018-05-11 00:42:44 -04:00
Rangi e01a86fe84 Fix doc links 2018-05-09 12:10:50 -04:00
Rangi 8acc8d6e30 Merge branch 'master' of https://github.com/pret/pokecrystal 2018-05-06 22:45:07 -04:00
yenatch 59c4d824e6
Merge pull request #509 from mid-kid/master
A fix-various-little-things PR
2018-05-06 22:27:22 -04:00
yenatch 47379235f8 fix lb/ln and "left shift of negative value" warning
fixes #511
2018-05-06 21:35:55 -04:00
Rangi aa51dbc612 Fix #511: eliminate "Left shift of negative value" warnings 2018-05-06 21:27:47 -04:00
Rangi e5d4f741ee Keep macros near relevant data 2018-05-06 15:56:42 -04:00
Rangi 1c92cb8b48 'rept' is not indented 2018-05-06 12:16:57 -04:00
mid-kid acdb302035 Fix rest of the givepokeitem/checkpokeitem references 2018-05-06 13:48:04 +02:00
Rangi d31ba05aeb Combine bit flags with | not + 2018-05-05 19:27:10 -04:00