Commit Graph

1023 Commits

Author SHA1 Message Date
Bryan Bishop
2063814b75 Merge pull request #109 from yenatch/master
png export fixes
2013-02-12 00:57:34 -08:00
yenatch
7f7f461240 Export any detected palettes to png by default
Checks for any palette using the same name as the 2bpp file.
2013-02-12 03:40:41 -05:00
yenatch
ad0578fda0 Fix png export orientation
A quirk of the Decompressed class dissociated the orientation from
the output attribute.

The makefile no longer suppresses output since it's still relevant.
2013-02-12 03:31:35 -05:00
Bryan Bishop
b62d644d93 Merge pull request #108 from yenatch/master
png->lz and palettes
2013-02-11 17:40:54 -08:00
yenatch
8b8f7200a9 Clean up the makefile a bit
Simplifies/explains png import
2013-02-11 17:59:54 -05:00
yenatch
0b8c5ef75b Finish off make target for png generation
Now any existing lz files are converted to 2bpp, and all 2bpp files
are converted to png.
2013-02-11 17:59:43 -05:00
yenatch
39171b916d Fix compressed graphics and filestructure
-No more /lz folders.

-Fixed some lz files that didn't have terminators
  An extraction error caused some lz files in gfx/misc/ to lack
  terminators. These slipped through the cracks since they were
  surrounded by incbins calculated from the filesize, and the
  original decompression was done from the baserom, where
  terminators were intact.

  There might be more offending lz files.
2013-02-11 16:59:06 -05:00
yenatch
2a429da419 Remove unnecessary 2bpp files
These can be generated using gfx.py and are non-essential to compile.
This reduces the size of the repository significantly.
2013-02-11 04:24:01 -05:00
yenatch
98d8914b62 better dimension handling in 2bpp->png 2013-02-11 04:13:36 -05:00
yenatch
d1172e1fb6 Add build target to mass-generate pngs from 2bpp files 2013-02-11 04:13:36 -05:00
yenatch
ee347bff48 Dump cry headers 2013-02-11 04:13:31 -05:00
yenatch
80600f9291 Infrastructure to dump pngs for 2bpp graphics 2013-02-11 04:12:59 -05:00
yenatch
e7762890aa Don't try to convert empty 2bpp files
Also, make non-square images 1 tile wide
Minor path fixes and cleanup
2013-02-09 06:26:09 -05:00
yenatch
0b05325e07 Allow png->lz compression in the build process
To enable, append '${IMGFILES}' to line 22:
pokecrystal.o: pokecrystal.asm constants.asm wram.asm ${TEXTFILES} ${IMGFILES}

Also append '${LZFILES}' to line 48:
	rm -f main.tx pokecrystal.o pokecrystal.gbc ${TEXTFILES} ${LZFILES}
2013-02-09 05:23:39 -05:00
yenatch
087e2556f2 Move compressed trainer pics into the main folder 2013-02-09 05:08:56 -05:00
yenatch
76b284c8f0 Dump and include trainer palettes 2013-02-09 04:54:18 -05:00
yenatch
70280c0c3f Add some command-line interfaces for use w/ makefile
Extras:
-function to dump trainer pals
-fix testing leftover in a compression function
-keep load_rom() from getting in the way (relative address breaks extras)
2013-02-09 04:36:36 -05:00
Bryan Bishop
706361ea5f use pypng as a dependency 2013-02-07 20:39:25 -06:00
Bryan Bishop
3252348929 Merge pull request #107 from yenatch/master
2bpp to png and png to 2bpp
2013-02-07 18:37:54 -08:00
yenatch
90af5b2a5e dump and incbin monster palettes 2013-02-07 21:19:38 -05:00
Bryan Bishop
2dbfe1598a add swap~ files to .gitignore 2013-02-07 20:11:09 -06:00
yenatch
da205909c0 implement png import/export
palette export works fine, but palette import is disabled for now
2013-02-07 21:03:19 -05:00
Bryan Bishop
dd2e702aef Merge pull request #106 from yenatch/master
Update gfx.py with things.
2013-02-07 02:00:59 -08:00
yenatch
4d44c2c0e6 Condense pic dimensions table 2013-02-06 02:09:57 -05:00
Bryan Bishop
08e4590c98 Merge pull request #105 from yenatch/master
Move some things out of main.asm.
2013-02-05 17:56:17 -08:00
yenatch
f2e5173e51 Create individual pokedex entry files 2013-02-05 19:29:20 -05:00
yenatch
034609e725 Split pic pointers into files 2013-02-05 18:28:45 -05:00
yenatch
e1b1f88645 Rename pokedex entry files 2013-02-05 18:13:19 -05:00
yenatch
31a907d7c7 Move music/ into audio/ 2013-02-05 18:08:20 -05:00
yenatch
ff5bd60966 Clean up and condense music includes 2013-02-05 18:00:32 -05:00
yenatch
9acf56102a Split audio engine and pointers into files
Creates folder audio/
2013-02-05 16:48:46 -05:00
yenatch
8902050000 Move VBlank function to a file 2013-02-05 15:40:25 -05:00
yenatch
a058572fd5 Consistent SECTION spacing 2013-02-05 04:25:04 -05:00
yenatch
75ab33b311 Saner file distribution
Moved files from data/ into new folders:
-battle/
-stats/
-trainers/
2013-02-05 03:56:27 -05:00
yenatch
c811b20b65 Move BitTable2 to a file
Currently, rgbasm's maximum macro parameter length is sixteen chars.
A couple wram labels were changed to accomodate this for now.
2013-02-05 03:16:46 -05:00
yenatch
710b7ddd7f Fix box name addresses 2013-02-05 01:20:51 -05:00
yenatch
4d84813798 Split Pokemon names off into a file 2013-02-05 00:42:07 -05:00
yenatch
40b477b442 Split base stats off into a file 2013-02-05 00:39:22 -05:00
yenatch
70fd04dc24 Split pokedex entries off into files 2013-02-05 00:35:16 -05:00
yenatch
45a06d040c Split evos/attacks off into files 2013-02-04 23:59:01 -05:00
yenatch
8d0a9d3e86 Split move list off into a file 2013-02-04 23:26:38 -05:00
yenatch
51afe79d00 Split pokedex orders off into files 2013-02-04 23:26:08 -05:00
yenatch
8137219353 Reformat trainer group data 2013-02-04 21:58:16 -05:00
yenatch
b064312024 Add NONE constant 2013-02-04 21:10:34 -05:00
yenatch
d2d7571e98 Split trainers off into files
The base label has been renamed from TrainerGroupHeader to Group.

Trainer formatting still needs to be fixed.
2013-02-04 20:20:10 -05:00
yenatch
28b56c51bb Split type matchup off into a file
This sets precedent for including constants in context.
2013-02-04 16:22:10 -05:00
yenatch
0935908367 Split wild encounters off into files 2013-02-04 15:47:44 -05:00
yenatch
4108c9eb79 Split egg moves off into files 2013-02-04 15:25:04 -05:00
Bryan Bishop
b6683269b0 Merge pull request #104 from yenatch/master
Even more icons.
2013-02-04 10:00:43 -08:00
yenatch
1e5bcb5268 Some more icon asm 2013-02-04 04:33:53 -05:00