Commit Graph

1461 Commits

Author SHA1 Message Date
yenatch
0b36af8da5 Merge pull request #3 from kanzure/proposed-yenatch-master
Proposed merge of kanzure/master into yenatch/master
2013-08-30 13:33:09 -07:00
Bryan Bishop
d2333a90c9 Merge branch 'kanzure/master' into yenatch/master 2013-08-30 14:16:50 -05:00
Bryan Bishop
3e5b09b941 Merge pull request #176 from yenatch/interrupts
finally give labels to interrupts
2013-08-30 11:54:08 -07:00
Bryan Bishop
a5f226246e Merge pull request #175 from yenatch/rename-bittables
toss the useless "bittable" convention for event and engine flags
2013-08-30 11:43:23 -07:00
Bryan Bishop
9ce504f528 Merge pull request #174 from yenatch/boxmons
boxmons and related structs
2013-08-30 11:35:49 -07:00
yenatch
b86d0da040 less arbitrary wram clearing in game init 2013-08-30 14:21:26 -04:00
yenatch
3aabca9baa remove a section def in the middle of the player struct 2013-08-30 14:20:01 -04:00
yenatch
79bcda11ad PCItems and game init formatting 2013-08-30 04:57:32 -04:00
yenatch
320142fdda PCItems in wram 2013-08-30 00:07:51 -04:00
yenatch
2f169fd2f9 clean up bank 7e includes 2013-08-29 23:27:57 -04:00
yenatch
fd74b4d379 move battle tower mon handling asm into battle_tower.asm 2013-08-29 23:27:17 -04:00
yenatch
7201ea8f0a move GiveOddEgg into odd_eggs.asm 2013-08-29 23:26:01 -04:00
yenatch
c4a764ce10 use more bank 0 labels in engine/scripting.asm 2013-08-29 23:20:09 -04:00
yenatch
55cd892026 fix/add some missing function labels in bank 0 2013-08-29 23:19:21 -04:00
yenatch
fb28d24bd7 condense repeated asm with rept macros 2013-08-29 21:42:28 -04:00
yenatch
579ab13507 proper labeling of common function GetSpritePalette 2013-08-29 21:20:45 -04:00
yenatch
64a6af4052 condense some repetitive asm with rept macros 2013-08-29 21:20:37 -04:00
yenatch
cc98fab33e move VBlank interrupt label from main.asm to engine/vblank.asm 2013-08-29 19:40:33 -04:00
yenatch
2c16bc7ab9 move copy asm from main.asm to engine/copy.asm 2013-08-29 19:39:21 -04:00
yenatch
04da88a285 move palette asm from main.asm to engine/palettes.asm 2013-08-29 19:37:35 -04:00
yenatch
6d29673a5f move time-related asm from main.asm into engine/time.asm 2013-08-29 19:32:03 -04:00
yenatch
6467755568 move serial asm from main.asm into engine/serial.asm 2013-08-29 19:11:39 -04:00
yenatch
2341bb148a move more joypad code from main.asm into engine/joypad.asm 2013-08-29 19:10:06 -04:00
yenatch
dd11c22b31 more joypad function cleanup 2013-08-29 19:08:25 -04:00
yenatch
0a829301ae reformat some joypad functions 2013-08-29 18:59:05 -04:00
yenatch
906496e107 split lcd functions out of main.asm 2013-08-29 18:52:26 -04:00
yenatch
2b5b6f3e3a split fading functions out of main.asm 2013-08-29 18:50:59 -04:00
yenatch
37a841797e secret ruins of alph water stone room asm 2013-08-29 16:03:32 -04:00
yenatch
ae1d50c026 warp sound effects in field moves 2013-08-29 15:24:37 -04:00
yenatch
a167620109 more field move scripts and some map header references 2013-08-29 14:49:07 -04:00
Bryan Bishop
9da5768b34 fix baserom.gbc check in Makefile 2013-08-29 11:56:20 -05:00
Bryan Bishop
61dd634698 Merge pull request #169 from kanzure/fail-fast-without-baserom
Fail fast when the baserom.gbc file doesn't exist.
2013-08-29 09:51:32 -07:00
yenatch
1a5f9426c8 get rid of a trailing incbin at the end of bank 21 2013-08-29 03:21:51 -04:00
yenatch
99760c2cc9 more hlcoords in bank 1 2013-08-29 03:04:23 -04:00
yenatch
9d1a6fe5bb more field move scripts 2013-08-29 02:53:04 -04:00
yenatch
a4b69a123f more text_jumps in known functions 2013-08-29 02:23:29 -04:00
yenatch
eff81fb080 fix Stack's address ($c100 -> $c0ff)
using negative ds
2013-08-29 02:10:32 -04:00
Bryan Bishop
4f685791c1 Merge pull request #171 from kanzure/remove-imports-from-preprocessor
Two more unused imports from preprocessor
2013-08-28 18:33:33 -07:00
Bryan Bishop
3fb03e9981 two more unused imports from preprocessor 2013-08-28 20:31:17 -05:00
Bryan Bishop
52c3daca54 Merge pull request #170 from kanzure/fix-up-preprocessor
Remove some globals from preprocessor.
2013-08-28 17:54:02 -07:00
Bryan Bishop
e4d3ea7256 don't use globals in the preprocessor
Macros are now passed around as lists and dicts.
2013-08-28 17:53:26 -05:00
Bryan Bishop
16bfc01124 use generic skippable macros in preprocessor
This removes TextEndingCommand from the preprocessor. Instead, there is
a generic concept of a skippable type of macro like "db".

This adds SkippableMacro to the preprocessor.
2013-08-28 17:18:29 -05:00
Bryan Bishop
b602cc9bd6 don't directly reference two macro classes
Ideally the macro classes will be removed from the preprocessor core
soon, there's no reason they should be infecting these functions.
2013-08-28 16:48:29 -05:00
Bryan Bishop
d46d1901c2 Merge branch 'remove-another-moneybyteparam-special-case' into master 2013-08-28 16:34:06 -05:00
Bryan Bishop
6d612c8828 remove MoneyByteParam from preprocessor
It didn't belong in there. All of the references were removed.
2013-08-28 16:33:27 -05:00
Bryan Bishop
a4782d9b5a Merge branch 'master' into remove-another-moneybyteparam-special-case 2013-08-28 16:32:15 -05:00
Bryan Bishop
0236b59360 remove another MoneyByteParam special case
This updates the preprocessor to just look for a from_asm method on the
class for the parameter it's processing. If there's a from_asm method,
then it uses it to spit out the right asm.
2013-08-28 16:30:47 -05:00
Bryan Bishop
53d208ce4c fail fast when the baserom.gbc file doesn't exist
One day this will not be required. But until then, waiting one or more
seconds for the build to fail just to learn that you forgot baserom.gbc
is really silly.

This makes failure almost instantaneous compared to before, which would
take between one and ten seconds depending on system performance.

fixes #167
2013-08-28 16:22:50 -05:00
Bryan Bishop
16f6619ac8 Merge pull request #168 from kanzure/remove-preprocessor-special-case
Remove a special case for MoneyByteParam.
2013-08-28 14:15:58 -07:00
Bryan Bishop
00b36922d2 remove a special case for MoneyByteParam
The preprocessor should ideally have no special cases for macros at all
in the first place. But it does. This one doesn't seem to be necessary.
2013-08-28 16:14:23 -05:00