Bryan Bishop
5e70ac56ea
remove ItemFragment from preprocessor
...
It's not required.
see #178
2013-08-30 18:36:14 -05:00
Bryan Bishop
69adf48a54
remove "skippable_macros" from preprocessor
...
The preprocessor no longer has the concept of skippable_macros and now
always skips any line that starts with "db" or "dw" because neither of
these should be treated as macros.
fixes #178
2013-08-30 18:27:03 -05:00
yenatch
f4572ecd4d
use more egg constants in main
2013-08-30 19:14:04 -04:00
yenatch
4983c46a26
use callab/callba macros for known FarCalls
2013-08-30 18:57:31 -04:00
Bryan Bishop
8fe7f4c3a5
HACK: re-instate the ItemFragment macro hack
...
This is to fix the preprocessor temporarily. Maybe ItemFragment can be
removed completely.
2013-08-30 17:23:43 -05:00
yenatch
7cc320e835
Coins in main.asm
2013-08-30 17:50:46 -04:00
yenatch
674229228f
Coins wram label
2013-08-30 17:48:59 -04:00
yenatch
d2ff1d7aaa
Merge remote-tracking branch 'kanzure/master'
2013-08-30 16:41:35 -04:00
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
9152664ca5
Merge pull request #177 from yenatch/split-main
...
split out a bunch of bank 0 from main.asm
2013-08-30 13:06:57 -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
724215ea75
bump extras to 4c56a6c5
...
Not sure why I am doing this.
2013-08-29 12:17:43 -05: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
c32cc3dcb8
move main preprocessor into pokemontools
...
Only pokecrystal-specific preprocessor stuff lives in preprocessor.py
now. The other stuff lives in pokemontools.
2013-08-28 22:48:44 -05: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