Commit Graph

2215 Commits

Author SHA1 Message Date
Bryan Bishop
983ef29fd0 Merge pull request #221 from yenatch/more-objects
analyze the bytes
2013-12-28 23:56:34 -08:00
yenatch
a8cb73b654 bump pokemontools for sound macro changes 2013-12-28 20:33:46 -05:00
yenatch
e937d6f25c audio: note duration from 0-15 to 1-16 to match pokered 2013-12-28 20:32:05 -05:00
yenatch
36b8a0061e bump pokemontools again 2013-12-27 22:26:25 -05:00
yenatch
0f7a101dd9 reorganize .gitignore 2013-12-27 22:26:10 -05:00
yenatch
eb8a2b2cfb .gitignore: extras is a submodule 2013-12-27 22:23:35 -05:00
yenatch
e2b900a40a .gitignore: don't track compare.sh output 2013-12-27 22:22:38 -05:00
yenatch
4612670768 more npc trade cleanup 2013-12-27 22:20:24 -05:00
yenatch
58af27eaeb label overworld loop functions 2013-12-27 05:56:23 -05:00
yenatch
ace57ec827 npc trade text/comments 2013-12-27 05:55:40 -05:00
yenatch
4082d11ff3 clean up incbins in tileset animations 2013-12-26 03:21:29 -05:00
yenatch
8dd7cf7c20 fix whirlpool animation pointers 2013-12-26 03:17:46 -05:00
yenatch
bcfb356417 unused tileset animations 2013-12-26 03:13:25 -05:00
yenatch
502fe13e30 flower animation graphics 2013-12-26 02:48:00 -05:00
yenatch
c8c887fb1e water animation graphics 2013-12-26 02:41:06 -05:00
yenatch
70d5cf467a whirlpool animation graphics 2013-12-26 02:37:23 -05:00
yenatch
d8eed222b7 split out tileset animations 2013-12-26 02:09:58 -05:00
yenatch
c1096d08f6 null pointers in tileset animations 2013-12-26 02:04:03 -05:00
yenatch
623b126b25 bump pokemontools for minor changes 2013-12-25 07:00:23 -05:00
yenatch
e56aa096a3 preprocessor: rename macro class Wait to BattleAnimWait 2013-12-25 06:57:45 -05:00
yenatch
f2025afdb6 label and move related asm into items/item_effects.asm
oops
2013-12-25 01:42:41 -05:00
yenatch
f99e448a73 fix a mislabeled function in bank 3 2013-12-24 22:13:17 -05:00
yenatch
79917a7557 moon ball uses red's moon stone id 2013-12-24 21:09:41 -05:00
yenatch
fa1e93a870 evolution prerequisites and no more incbins in item effects 2013-12-24 20:49:14 -05:00
yenatch
2172461a60 fleemons are global 2013-12-24 17:19:50 -05:00
yenatch
0cd1d2071f item effect incbins 2013-12-24 17:11:52 -05:00
yenatch
5f0e279bfa Merge remote-tracking branch 'kanzure/master' into more-objects
Conflicts:
	main.asm
2013-12-23 05:21:12 -05:00
yenatch
609e2d0552 bump pokemontools for map editor fixes 2013-12-23 04:40:17 -05:00
yenatch
7b20626c7b more object struct constants 2013-12-23 04:39:26 -05:00
yenatch
48db6daef9 overworld object struct constants 2013-12-22 21:28:41 -05:00
yenatch
496502b3dc no more Public in joypad interface labels 2013-12-22 17:30:35 -05:00
yenatch
18124d0a5d split out poke seer special into event/poke_seer.asm 2013-12-22 17:19:54 -05:00
yenatch
4d1091f8d9 poke seer special 2013-12-22 17:17:33 -05:00
yenatch
a15bd15e2a split gbc-only screen into misc/gbc_only.asm 2013-12-22 06:00:34 -05:00
yenatch
799f945cf5 gbc-only screen 2013-12-22 05:53:48 -05:00
yenatch
6225fca386 more title screen comments 2013-12-22 04:36:03 -05:00
yenatch
091ebd8574 bump pokemontools for kicks
- storetext, text_jump, battle animation macros
- fixed preprocessor and makefile
- rgb macro reading in palettes
2013-12-21 05:38:51 -05:00
yenatch
c140af9e59 some mobile stat screen icons 2013-12-21 03:02:59 -05:00
yenatch
d9ad10771c move a palette map incbin into tilesets/palette_maps.asm 2013-12-21 00:56:04 -05:00
yenatch
4a40c26f6c Makefile: pokemontools variable 2013-12-21 00:46:31 -05:00
yenatch
6ef1028b31 Makefile: image handling
todo: queue targets
2013-12-21 00:40:29 -05:00
yenatch
1ef4b0e848 move blockdata into maps.asm 2013-12-20 21:21:43 -05:00
yenatch
d4074dd385 clean up some tileset sections
also found unused metatile/collision data for a 128-block tileset
2013-12-20 21:16:57 -05:00
yenatch
cabf0a5b87 build time is a lot faster now 2013-12-20 02:48:46 -05:00
yenatch
34d579d9f9 use pokemontools scan_includes.py
It might look the same as before, but this new name is much better! Well done!
2013-12-20 02:44:44 -05:00
yenatch
cad6f30f83 null pointers back in object gfx 2013-12-20 01:06:17 -05:00
yenatch
7265a1c557 NULL label 2013-12-20 01:06:01 -05:00
yenatch
046d85f37a finish off object gfx pointers and dont use BANK() for null pointers
fixes 2f5b9b96

definitely did this in the original commit...
2013-12-20 00:59:00 -05:00
yenatch
0d3308f68c use RGB macros for palettes instead of binary chunks 2013-12-20 00:29:31 -05:00
yenatch
585f756ecf don't diff .pal files as binary data 2013-12-20 00:28:14 -05:00