Commit Graph

2420 Commits

Author SHA1 Message Date
yenatch d6f7dc3206 Fix the Nurse std comments. 2015-06-26 23:17:10 -07:00
yenatch 0f57aefdf2 Merge branch 'tilesets' into master
Conflicts:
	tilesets/tileset_headers.asm
2015-06-26 11:00:39 -07:00
yenatch 07b9c4b030 Fix the make pngs target. 2015-06-26 10:47:13 -07:00
yenatch bf500883fc Fix a typo in the unused title screen labels. 2015-06-26 10:46:52 -07:00
yenatch 5a61c9cdd0 Use a macro for tileset headers. 2015-06-26 10:46:28 -07:00
yenatch f9805056bb Make files for most of the special tileset palettes. 2015-06-26 10:45:24 -07:00
IIMarckus 89073da581 Label flypoint callbacks. 2015-06-25 23:30:16 -06:00
IIMarckus ded477e69e Delete unused file. 2015-06-25 22:35:06 -06:00
IIMarckus e57e1ba63b Improve some signpost labels. 2015-06-25 22:01:08 -06:00
IIMarckus bd022e179e Clean up labels for gym statues. 2015-06-24 21:51:36 -06:00
IIMarckus f16d60e3f9 Update some event flags. 2015-06-24 21:20:04 -06:00
IIMarckus fdfbeb7e5f More std enums. 2015-06-24 19:26:24 -06:00
IIMarckus 5d48bc96fd More std_scripts enums. 2015-06-23 15:02:58 -06:00
IIMarckus 17a47bf54b Forgot to add file containing std constants. 2015-06-23 14:42:00 -06:00
IIMarckus 1027a3a157 Clean up labels. 2015-06-23 14:29:06 -06:00
IIMarckus 7ac6aa2d22 Begin enumerating std_scripts constants. 2015-06-23 14:21:54 -06:00
IIMarckus 205000fa9a Better labels in Charcoal Kiln. 2015-06-23 13:59:07 -06:00
IIMarckus 0ba261a3fd Introduce checkmorn/checkday/checknite to replace checktime. 2015-06-23 12:28:48 -06:00
IIMarckus 4d532beee6 Remove trailing newlines. 2015-06-23 12:24:51 -06:00
yenatch 5ae298f533 Organized the primary tileset palettes.
Crystal's tileset-specific palettes are disconnected from these.
2015-06-23 10:46:51 -07:00
IIMarckus 47938939fe Give Buena's phone scripts more appropriate filenames. 2015-06-23 11:43:32 -06:00
IIMarckus 91e474b19f Improve labels for some stuff in Kris's house. 2015-06-23 11:34:13 -06:00
IIMarckus 2bf3a322ba Labels for "sent some to mom" text. 2015-06-11 10:57:45 -06:00
Bryan Bishop 3ea4ebff80 Merge pull request #291 from kanzure/mention-python-version
Mention python2.7 requirement
2015-06-09 15:22:42 -05:00
Bryan Bishop fa844049c1 mention python2.7 requirement
fixes #255
2015-06-09 10:44:24 -05:00
Scott Norton f3b407e04e Fix macro changemap
Syntax is now `changemap MapBlockDataBank, MapBlockDataPointer`
2015-06-08 23:52:51 -04:00
Scott Norton 739bac75b7 Updated text pointer in line 5746. 2015-06-07 21:14:20 -04:00
yenatch fc8bf4b9e9 Merge branch 'gfx-tweaks' 2015-05-18 02:23:17 -07:00
yenatch 93a589795f Merge remote-tracking branch 'kanzure/master' 2015-05-18 02:21:14 -07:00
yenatch d4817060de Enumerate the item constants. 2015-05-18 02:20:42 -07:00
yenatch b47c4bc6fd Use more constants in the event scripting engine. 2015-05-18 02:16:11 -07:00
IIMarckus 7563a990aa w-prefix the new PokegearFlags variable. 2015-05-18 03:15:45 -06:00
IIMarckus bd894f6fb0 Fix a static address. 2015-05-18 02:07:28 -06:00
IIMarckus 32864d2db6 Give wd957 a more descriptive name. 2015-05-14 22:42:29 -06:00
IIMarckus 21a7300f68 Label some radio stuff. 2015-05-14 22:39:52 -06:00
yenatch 82317a7a23 Preemptively get rid of graphics queues while they're still not used.
Nip this in the bud, so it doesn't turn out like pokered. When the time comes, use make -j16 for faster builds.
2015-04-13 22:34:41 -07:00
yenatch d4863f3fa5 Enumerate the event script command macros.
This is ugly, but much better than static values.
2015-04-13 22:28:28 -07:00
yenatch 11b02eb09b Merge remote-tracking branch 'kanzure/master' 2015-04-13 21:42:29 -07:00
yenatch ee98f7b489 Enumerate the move effect command macros. 2015-04-13 21:41:32 -07:00
yenatch e7a3ba0592 Add a macro for enumeration.
"enum" is like "const" but uses variables instead. This might not be desired.

It has been moved to the top of macros.asm so that included macros can be enumerated.
2015-04-13 21:41:32 -07:00
yenatch 50734c961c Use labels for pic animation setup macros. 2015-04-13 21:41:28 -07:00
IIMarckus d54725c28e Comment alternate Time Capsule item mappings. 2015-03-29 21:29:48 -06:00
Bryan Bishop 64331ffe10 Merge pull request #283 from yenatch/master
no more baserom
2015-03-12 14:19:51 -05:00
yenatch b5f55a5f6f bump extras so the build actually works without baserom.gbc
also fixed some problems with gfx.py:
- choking on filenames in graphics conversion
- faulty 'repeat' method in the compressor
2015-03-12 12:03:52 -07:00
yenatch a09903a2a4 make compare 2015-03-11 22:37:36 -07:00
yenatch 074184c31c builds both 1.0 and 1.1 2015-03-11 22:35:47 -07:00
yenatch 967977b7af baserom.gbc is no longer required to build 2015-03-11 22:25:54 -07:00
yenatch 75ba97a039 no more incbins 2015-03-11 22:23:30 -07:00
yenatch 411335983e Unused palette maps? 2015-03-11 21:21:03 -07:00
yenatch be975a3e80 Get rid of baserom incbins in misc/.
Battle Tower text was hiding here.
2015-03-11 21:16:02 -07:00