Commit Graph

547 Commits

Author SHA1 Message Date
Bryan Bishop
9155ace6fd make vba emulator wait until text is done drawing
Also, this fixes some bugs related to how button presses are handled.

original-commit-id: 6c5ccae8078fd753314b5c63ba7c4a4b9e2ae402
2013-06-16 11:34:30 -05:00
yenatch
9d4e21cabe gfx: return mass-decompress command
still reqd by make pngs

original-commit-id: bbed370d84e1721fc78c008bc5122776703f0f41
2013-06-13 17:26:50 -04:00
yenatch
a6477032f3 Merge branch 'master' of github.com:kanzure/pokecrystal
original-commit-id: 2b2d3e5e6827e8a596eb64254b990c665caee138
2013-06-13 16:11:30 -04:00
Bryan Bishop
fad3edee77 Merge remote-tracking branch 'yenatch/master'
Also merge pull request #145.

original-commit-id: 4eebcf0ae2fc411916cdd44b4ca3ffdb1b6cca7b
2013-06-12 22:44:45 -05:00
Bryan Bishop
a26573cd85 Revert "make gfx.py png take only a path"
This reverts commit 915c6358490494b87c81a464492944f80ee86384.

original-commit-id: 358b5b074b45e4a484799fde4e18bc2cb4fec78b
2013-06-12 22:44:35 -05:00
yenatch
5c26634f81 Merge branch 'master' of github.com:kanzure/pokecrystal
Conflicts:
	extras/gfx.py

original-commit-id: a923bf768ae2307d2ed2bc289c98e07a8de77084
2013-06-12 23:31:21 -04:00
yenatch
3cadc09cc0 expand shortened palettes
rather than keep up inconsistent palette formats, just incbin a portion of each

original-commit-id: 6ba758aa53bbf14e2c152fd88f786a501f6bb029
2013-06-12 21:40:37 -04:00
yenatch
7ccbbcced8 gfx: workable command line functions
original-commit-id: 5803db714c348574e09e428b79aa2c66531e74f5
2013-06-12 21:40:32 -04:00
yenatch
1db2941c7d gfx: palette checking in to_png
original-commit-id: b06c96e4d2d9e365544f8abba9392752178a8fcd
2013-06-12 14:38:38 -04:00
yenatch
dc268dfbc6 fix palette functions and output palettes in 2bpp conversion
original-commit-id: 5d204ce5692c06f9b48bbad0fe1e42107bdf5231
2013-06-12 14:29:39 -04:00
yenatch
53af4e21e9 gfx: handling for <4-color pngs when converting to 2bpp
without a .pal file as reference, palettes are sorted by luminance.
pokemon crystal reads palettes exactly 4 colors in length.
if an image used fewer than 4 colors, invalid palettes were produced.

instead, dummy colors are inserted to pad out the palette.

original-commit-id: 5cf1754b08aa6903f01b839c917169e6dc8c260f
2013-06-12 14:29:35 -04:00
Bryan Bishop
84ca20850d make gfx.py png take only a path
original-commit-id: 915c6358490494b87c81a464492944f80ee86384
2013-05-29 19:44:08 -05:00
Kat Harrison
19f3a9e31b Include overworld sprites
Created /extras/overworldripper.py and used it to extract overworld sprites and convert them to png files.

original-commit-id: e08e7cf7b22bc8d29011dc864a895293157ceecd
2013-05-27 23:07:34 -04:00
yenatch
85aad5c408 gbz80disasm: rgbds uses brackets for ld hl, sp+x
original-commit-id: 399925fff577cf11a77193d997d2bf19ee72aa04
2013-05-21 16:43:54 -04:00
Bryan Bishop
c56a6e1eab Merge pull request #138 from yenatch/master
automated png compression + gfx fixes + no more windows

original-commit-id: fdc1609f2a658b26599a9191bfbe99095248b6fc
2013-05-18 01:49:03 -07:00
yenatch
829fa1d626 gfx: safer alternating-byte detection in compression
original-commit-id: e3565bd7007b194b04ceecaf1909fff65062211f
2013-05-18 04:46:52 -04:00
yenatch
e4cf93bff1 gfx: fix a typo
original-commit-id: 77e365d49ffc6caa5364b405a263e4a43938def1
2013-05-18 04:46:52 -04:00
yenatch
b4d2e0eb00 gfx: lz to png from command line
original-commit-id: 604cafc27859700e45f4c54237b54f3c584cf458
2013-05-18 04:46:52 -04:00
yenatch
cbdf84afda gfx.py: remove trailing tabs
original-commit-id: a1b9fdc9c92279bef7383e8c8278934ca2889de8
2013-05-18 04:46:51 -04:00
yenatch
b19194349e gfx.py: get rid of argparse
original-commit-id: abaed2145fbf982a4873e186e964ce0435fb3ce0
2013-05-18 04:46:47 -04:00
Bryan Bishop
8288eb8d31 load labels only once in gbz80disasm
original-commit-id: f10019710f70f855beaa67c1170337e28cc7a57f
2013-05-17 15:58:47 -05:00
yenatch
0cf529cd7d fix data-handling errors in gfx.py
original-commit-id: 3a0e80932ec11494407ea5a3aa7724007b71502b
2013-05-17 01:59:23 -04:00
yenatch
98379e786f gbz80disasm: include comments on unresolved backward relative jumps
original-commit-id: 5521aa5ce0ad5249ff0d369dd33b4f63cd804b73
2013-05-15 14:57:04 -04:00
yenatch
1a3cfd3dda gbz80disasm: don't look for outstanding labels that are behind the origin
original-commit-id: b38e2874095266d45df984be778d9fe68832aaac
2013-05-15 14:40:20 -04:00
yenatch
7368155075 gbz80disasm: don't include comments on relative jumps
original-commit-id: a6fee3622a9705d060cbe467bd32e425a1ff2bc4
2013-05-15 14:39:43 -04:00
yenatch
c4f10ac672 gbz80disasm: reti is an ender
original-commit-id: 81e42e41da5a664aa528ad4f9284119456b15817
2013-05-15 14:39:43 -04:00
yenatch
13c2378a80 gbz80disasm: space out blocks of asm
original-commit-id: 3cf6603b455530fa0c17e946118484a0126e2bf9
2013-05-15 14:39:42 -04:00
yenatch
66b9c8877d gbz80disasm: clean up $ff00+x handling
original-commit-id: 82d723840b14fc6b55c00f107a453bc0b0d80772
2013-05-15 14:39:19 -04:00
yenatch
eef1b7af74 gbz80disasm: read labels from wram/gbhw/hram
original-commit-id: 1bdcac1fe11746b67f17285d2f04e3b9c52772d1
2013-05-14 21:01:46 -04:00
yenatch
5c9b3914e0 wram: find() instead of split()
original-commit-id: 0fc866caa5664f6e9755138423c1f4caaeed1b78
2013-05-14 20:25:43 -04:00
yenatch
01169cfce8 gbz80disasm: bank 1 was being read as bank 0
original-commit-id: aed0202999656cf4cafd26c52bd98d9fcf5e63d4
2013-05-14 18:18:07 -04:00
yenatch
2eede61247 wram.py: bss and constant parsing
original-commit-id: aecce03834844f6c876d903a781443d65dbc11cb
2013-05-14 18:11:19 -04:00
yenatch
fc0906d42e transition gbz80disasm to use a bytearray instead of RomStr
original-commit-id: 5b95c5aad7d840a09727d3d56626ba624cddbbf3
2013-05-14 14:38:57 -04:00
yenatch
b9b764fc65 remove redundant code from find_label in gbz80disasm
original-commit-id: 313e853e391e69f9bca875fa37f431c84fb32cbe
2013-05-14 13:56:34 -04:00
yenatch
e2d3d6b409 fix bank-checking for labels in gbz80disasm
bank 1 is not fixed like bank 0

original-commit-id: b9bd11e34def340afdc7befc29fcca15e3bf71cb
2013-05-14 13:46:38 -04:00
Bryan Bishop
d054a66594 Merge pull request #132 from yenatch/master
map groups + gfx.py fix

original-commit-id: 35d77a29885ccdbcde4350f59c93b6afe010b5f3
2013-05-12 07:53:46 -07:00
yenatch
e5d28d058e there is no os.touch
original-commit-id: 05ceafe614def25e599f839bd86d03292fdbc5b0
2013-05-12 10:22:24 -04:00
Bryan Bishop
ebc6a54f1e Merge pull request #130 from Sanky/master
Menu stuff, battle text split & extras.

original-commit-id: cf4ec47b153f59ec377bef48fb5ea442638c6421
2013-05-12 06:21:45 -07:00
yenatch
b954746344 touch graphic files during decmp so make doesnt try to replace them
original-commit-id: a85077eb4f8a153cbe8fd00f59943b715536045e
2013-05-11 13:39:40 -04:00
yenatch
e6c3ea6086 portraitm_ail -> portraitmail
original-commit-id: 827f80ca05026bb130e58e1a522313cab7b228ce
2013-05-07 23:28:24 -04:00
Sanky
fc09356a8a add extras/parse_consecutive_strings.py
original-commit-id: aeaaade74cb5ff4d4884a4846ffe9a2103d50960
2013-05-08 01:22:28 +02:00
Sanky
bf45a2bdf2 make gbz80disasm understand bank:offset syntax
original-commit-id: d01369178b0ced3b299903b1cdf0084bdf067c43
2013-05-08 01:21:55 +02:00
Bryan Bishop
4f3bb35e56 Merge pull request #126 from yenatch/master
map scripts + ai + disabled line ending correction

original-commit-id: 2a44711fa7b96868048f39418a6095ea7013608d
2013-05-06 22:15:41 -07:00
yenatch
ffdf82fa45 downward triangle character 0xee
original-commit-id: 2acb46f6b58156ee3380a6203070ef2096db4b84
2013-05-01 23:18:38 -04:00
yenatch
f8dd005ee7 Fix PointerLabelToScriptPointer class
used the current address instead of the parsed address

original-commit-id: 9fc8d527f727dedfb8dd718cfea9e29d7b26775d
2013-04-30 20:29:15 -04:00
Bryan Bishop
7953d20fd5 Merge yenatch/master.
original-commit-id: 0e47273378b1f7f010e4d3e6dbab2a14dcc781ce
2013-04-27 17:29:29 -05:00
yenatch
9114f86aa3 damagecalc is actually damagestats; itemmultiplier is actually damagecalc
original-commit-id: 494f4c13fe2a45d0569bde2fc06e1bdf3fbfc857
2013-04-20 02:55:50 -04:00
yenatch
8fbba79bdf make chars consistent with preprocessor
original-commit-id: e21fc0fad19a4411c613d9caadfe13bc6f438d34
2013-03-29 21:50:24 -04:00
yenatch
ee31193dfc dump move effects
original-commit-id: dc81d0cfcfa92ecfab99984ee674d0fe3e6c19cf
2013-03-29 18:54:42 -04:00
Bryan Bishop
fbd4277bc8 fix docstring formatting everywhere
original-commit-id: 4332a25bd5f6f80975f762d126e92064c756f7d4
2013-03-21 15:15:42 -05:00