Bryan Bishop
473bd192d9
better read_line performance in preprocessor
...
Jump out of read_line early if the line is an empty string or a newline.
2013-08-31 11:57:01 -05:00
Bryan Bishop
7eaf5bf726
reset stdout in prequeue.py near end
...
Other output shouldn't be dumped into items/item_attributes.tx by
default.
2013-08-31 11:07:49 -05:00
Bryan Bishop
70be18427b
don't call load_pokecrystal_macros 2000 times
...
Also, don't call make_macro_table 2000 times by only calling it once and
passing the result.
2013-08-31 11:04:27 -05:00
Bryan Bishop
ca0981eb36
Merge pull request #183 from kanzure/preprocessor-macro-function
...
Function to make the preprocessor "macros" list.
2013-08-31 08:27:21 -07:00
Bryan Bishop
a429bce189
Merge branch 'master' into preprocessor-macro-function
2013-08-31 10:22:35 -05:00
Bryan Bishop
e91fb8ac14
Merge pull request #182 from kanzure/preprocessor-asserts
...
Use PreprocessorException instead of AssertionError in preprocessor
2013-08-31 08:17:51 -07:00
Bryan Bishop
ba67d3ba46
Merge branch 'master' into preprocessor-asserts
2013-08-31 10:17:25 -05:00
Bryan Bishop
5815edf382
refactor preprocessor macros into a function
...
Remove the "macros" global and instead use a function to construct a
list of macros.
2013-08-31 10:13:17 -05:00
Bryan Bishop
5118fb7578
Merge pull request #181 from kanzure/remove-globals-from-preprocessor
...
Remove globals from preprocessor.
2013-08-31 08:11:08 -07:00
Bryan Bishop
63c2dc2f1f
docstring for prequeue.py
2013-08-31 10:03:37 -05:00
Bryan Bishop
ebb591a7ec
make a MacroException more verbose in preprocessor
2013-08-31 09:56:24 -05:00
Bryan Bishop
93514b1862
convert a macro_translator assert in preprocessor
...
AssertionError -> PreprocessorException
2013-08-31 09:54:03 -05:00
Bryan Bishop
95f7270141
raise MacroException instead of Exception
...
A more specific exception means that error handling can actually work in
the future.
2013-08-31 09:51:31 -05:00
Bryan Bishop
2c22d9220c
fix "raise Exception" formatting in preprocessor
2013-08-31 09:50:17 -05:00
Bryan Bishop
ecedde1993
replace an assert in macro_translator
...
Use a MacroException instead of an AssertionError.
2013-08-31 09:46:11 -05:00
Bryan Bishop
1ce2bccd37
generic preprocessor-specific exception classes
...
These are basic python Exception subclasses that can be used to throw
more specific errors and exceptions from within the preprocessor.
AssertionError is not a good idea.
2013-08-31 09:45:12 -05:00
Bryan Bishop
998fa0b198
remove the do_macro_sanity_check global
2013-08-31 09:37:55 -05:00
Bryan Bishop
0f28e96e4d
remove the show_original_lines global
2013-08-31 09:37:02 -05:00
Bryan Bishop
a6237d6825
remove an Exception from preprocessor
...
It wasn't meant to be left in there anyway.
2013-08-31 09:29:54 -05:00
Bryan Bishop
97ef590f9e
Merge pull request #180 from yenatch/master
...
label renaming
2013-08-31 07:20:25 -07:00
yenatch
2acccc3ea5
rename FarBattleTextBox to StdBattleTextBox
...
that's it for bad Far usage
2013-08-31 03:54:02 -04:00
Bryan Bishop
73905420f8
Merge pull request #179 from kanzure/remove-preprocessor-skippable-macros
...
Remove preprocessor skippable macros
2013-08-30 20:22:58 -07:00
yenatch
b333b18dbd
Function2f79 is PickUpItem
2013-08-30 23:07:08 -04:00
yenatch
c402a16def
undo overcommenting in BattleRandom
...
these comments made sense before hram and rst constants were established
2013-08-30 23:03:15 -04:00
yenatch
c9d3881a2f
rename RNG to Random
...
also fix 'Far' naming scheme for BattleRandom
this was a long time coming
2013-08-30 22:59:40 -04:00
yenatch
70ecde3f78
StartTitleScreen -> TitleScreen
...
also undo "far" naming scheme
2013-08-30 22:47:20 -04:00
yenatch
523abc2d0e
formatting in oak speech
2013-08-30 22:46:28 -04:00
yenatch
21248effe4
NUM_POKEMON in main.asm
2013-08-30 22:25:50 -04:00
yenatch
5342f8d630
NUM_POKEMON constant
...
before we were just using CELEBI, but there's no way that's gonna pan out
2013-08-30 22:07:56 -04:00
yenatch
17f25691db
Function378b is IsAPokemon
2013-08-30 20:53:42 -04:00
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
