Commit Graph

589 Commits

Author SHA1 Message Date
Bryan Bishop
bc3502dc1f fix path handling in wram.py
Otherwise pokecrystal doesn't compile anymore. This is because of how
wram.asm, hram.asm and other files are parsed.
2013-08-03 12:23:59 -05:00
Bryan Bishop
21113e1852 fix the *.json rule in .gitignore 2013-08-03 12:23:08 -05:00
Bryan Bishop
ea42b05085 remove sgm/sav cruft from .gitignore 2013-08-03 12:22:31 -05:00
Bryan Bishop
dcd10de877 update png.py .gitignore reference 2013-08-03 12:20:56 -05:00
Bryan Bishop
21763b8315 use .gitignore from pokecrystal
This is the .gitignore from commit 1c3ebf95 in the pokecrystal.git
repository.
2013-08-03 12:18:26 -05:00
Bryan Bishop
4172c0c812 Merge pull request #157 from yenatch/overworld
overworld loop and movement

original-commit-id: bb8990dc3cb19787e08c29409cfc674e2478fbc9
2013-07-12 19:16:49 -07:00
Bryan Bishop
1bb9b7757c Merge pull request #158 from yenatch/gbz80disasm-more-data
gbz80disasm bugfixes

original-commit-id: 226729d1750bc6ee0c45d96e3f6b7dcf0844a609
2013-07-11 09:01:02 -07:00
yenatch
83e47ef0fa crystal: add more movements
original-commit-id: e7a7fcc92446134d47bbfb0b308c4decc2a2adf8
2013-07-10 19:17:03 -04:00
yenatch
9cbd1b0175 chars: ▷
original-commit-id: d3872d1aa94a2ae6294f7cce3584f4d0aaa16fcb
2013-07-10 19:17:02 -04:00
yenatch
f2717519a8 wram.py: allow space definitions using constants
original-commit-id: 6765083c1cb39a93f2b0fb60a7c203725360492d
2013-07-10 19:12:48 -04:00
yenatch
101c57b58d labels: hex is case-insensitive
original-commit-id: 341e11cccb33a8ed459cd9a6c41cf1189c6a4550
2013-07-10 19:12:48 -04:00
yenatch
936c80e75e use wram from outside extras
original-commit-id: ba5cd8bbb8b96a080e9a6fe1b1525cd5381fdb24
2013-07-10 19:12:48 -04:00
yenatch
5ee3ead5fa crystal: wram label finding
original-commit-id: daf3930984690e8ce44b375dda35a9d725c0c1d2
2013-06-28 21:49:50 -04:00
yenatch
3c2125a7fc crystal: 2pt script commands are for wram
original-commit-id: 17b5e86311e5dae4609818d6e1d63d23bc6815fa
2013-06-28 21:35:44 -04:00
yenatch
42cdc63dff crystal: PointerLabelToScriptPointer bank is not reversed
original-commit-id: 622d6b86f71f29f6a03df7cef7e825ee84260ea9
2013-06-28 21:17:35 -04:00
yenatch
8ae5e00188 gbz80disasm: don't read data where there is none
original-commit-id: fee0f0d6a4ab194f8aa1ecc1a886cbca22052c6b
2013-06-28 16:06:39 -04:00
yenatch
dbaaef11fb gbz80disasm: only track rom addresses for data
original-commit-id: 3a1f843e783a7a654ccd7e72f5e3fa4a40ea4009
2013-06-28 00:10:38 -04:00
yenatch
117c433dc2 gbz80disasm: use existing labels as addresses
original-commit-id: fe4b13e304decc48af0918fce281ed588f867a72
2013-06-27 22:28:53 -04:00
Bryan Bishop
642fb1c7a2 Merge branch 'github/master' into master.
Conflicts:
	extras/gbz80disasm.py

Comments.

original-commit-id: ff11134023e1a3df28edbf5c8f1638ec369d919a
2013-06-25 23:54:39 -05:00
Bryan Bishop
4c28c1d6f3 remove extra whitespace in extras/vba.py
original-commit-id: 28268df40e91e48637862a4428b01d5abae2ff0f
2013-06-25 23:23:46 -05:00
Bryan Bishop
a293f66667 remove extra whitespace in extras/gfx.py
original-commit-id: aade38c733d0060be623525e50d2b24e718c7bee
2013-06-25 23:01:52 -05:00
Bryan Bishop
c2c7cd3818 fix function formatting in extras/gfx.py
original-commit-id: cc1add094f3cbbbb281d892828ffd1dd6f29f7af
2013-06-25 23:01:00 -05:00
Bryan Bishop
c805f6ac35 Merge pull request #153 from yenatch/gbz80disasm-data
data detection in gbz80disasm

original-commit-id: fbf561cfa52ca3c8b0b9f157482e0b33052248ef
2013-06-25 20:32:52 -07:00
yenatch
2d1212ecf1 gbz80disasm: just use lowercase labels
original-commit-id: 2896cb93d48f6b4fb759c37753db7095d4e69ffd
2013-06-25 04:04:19 -04:00
yenatch
99b42da150 gbz80disasm: fix data handling
get the scalpel out of there

original-commit-id: 91f7c123f4a54beddf8c9de0f8a10195ad3d7667
2013-06-25 03:57:49 -04:00
yenatch
fa0ee277df gbz80disasm: local/global address conversion + fix find_label
original-commit-id: 6630406043cda9e4ab36f8477c62025249b647d6
2013-06-25 03:55:38 -04:00
yenatch
b7978e23d2 gbz80disasm: detect data tables referenced in asm
original-commit-id: 7804dedce469cd40efbc140b80d84733ec853338
2013-06-25 03:43:58 -04:00
yenatch
57cb48ee11 gbz80disasm: data detection
the is_data flag never did anything. now it does

encountering the end of a branch with outstanding labels will read anything between said labels as data

original-commit-id: e199aaa8fd73d932e81ef339f4f826cf95a700b9
2013-06-25 03:24:38 -04:00
Kat Harrison
b18fcdc531 fixed another indent in gfx.py
original-commit-id: 72fbe86c7aee557282322666c1c3a25fbe964b0b
2013-06-23 16:06:46 -04:00
cogitokat
ad1aeeec53 fixed indents
original-commit-id: 95369248f4400ea01b2f11216286c71bc515fe69
2013-06-23 16:48:51 -03:00
cogitokat
88313fd5af convert indents to 4 spaces in gfx.py
indents were previously 8 spaces

original-commit-id: 0b5885e1a96e9242fc31d9fdbfaf9c7c6097dd19
2013-06-23 16:47:35 -03:00
cogitokat
faedca9729 more docstring/indent fixes in gfx.py
original-commit-id: a60bf1690146cfd052f028334c652618b752a39c
2013-06-23 15:07:39 -03:00
cogitokat
06e1841a7a more gfx.py docstring changes
original-commit-id: 3ee5295ee3ff5868b346246e56cadf0b5b47a043
2013-06-23 13:15:23 -04:00
cogitokat
96c43c7e01 Change bad indents in extras/gfx.py
original-commit-id: 60b52a8cf0ab9714419796a981b85992930f3d31
2013-06-23 14:12:03 -03:00
Kat Harrison
5efb29460e Edit some docstrings in /extras.
original-commit-id: 1120eaaaf54afe16600c7b5f665edcbc621fde0f
2013-06-23 12:43:16 -04:00
Kat Harrison
ea9a775bab Made edits to docstrings in extras/vba.py
Added to vba intructions and reformatted docstrings to include a summary
line. (Docstring summaries should be max 72 characters.)

original-commit-id: 897d8b744c8f456e74ced1e9f19452d07165ef25
2013-06-23 00:45:45 -04:00
Kat Harrison
22d82ec920 update instructions in extras/vba.py
fixes #151 fixes #150

original-commit-id: d67d63df31f641b786d34bfb687524c37dd72e12
2013-06-23 00:41:38 -04:00
Bryan Bishop
2d5e2dcb19 Merge pull request #147 from yenatch/master
gbz80disasm/sym fixes + odds and ends

original-commit-id: ac773a9dc1499f7070dc98236c66de6309885210
2013-06-17 16:56:00 -07:00
Bryan Bishop
76b71fda33 programmatic speedrun of pokecrystal (vba)
original-commit-id: fe01fb510ff87310de1ecbce73f74d1a390d557c
2013-06-16 17:17:37 -05:00
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
1578452ebc symfile: fix address handling
original-commit-id: a4235e11bfe379f410f07aaab3b8a887a5d917ed
2013-06-16 11:20:12 -04:00
yenatch
b4ff3d3098 gbz80disasm: fix labels outside of banks 0 and 1
original-commit-id: dfb241619203a2b1b9eb389055cbe0ff31baa7a0
2013-06-15 14:11:50 -04:00
yenatch
a8986d8c16 gbz80disasm: only use gbhw/hram constants >= 0xff00
original-commit-id: 2f21ff4ef5f4b26801463db720be32f55cfaf7d4
2013-06-14 02:19:35 -04: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