Commit Graph

55 Commits

Author SHA1 Message Date
obskyr 5a8a294140 Merge branch 'master' of https://github.com/2Tie/pokegold-spaceworld into master
Long overdue!
2018-07-03 03:29:47 +02:00
obskyr 0f034bfbc1 Touch up scan_includes for versatility
Along with a label fix...?
2018-06-18 20:24:52 +02:00
obskyr 3ac4eb121f Merge pull request #23 from obskyr/build-nicely
Fix makefile dependencies and make_shim.py
2018-06-18 18:24:19 +02:00
obskyr d6f9ff5cf7 Fix and use make_shim.py 2018-06-18 18:18:46 +02:00
obskyr 0cd5e3d610 Calculate dependencies more reliably
Until now, dependencies weren't correct on first run or if you'd added includes since last compile.
2018-06-18 15:45:28 +02:00
Tauwasser c0b094e17a tools/disasm_coverage.py: fix off-by-one error smarter to fix edge case in RB 0x00
Signed-off-by: Tauwasser <tauwasser@tauwasser.eu>
2018-06-17 11:35:47 +02:00
Tauwasser 9ce9e92697 tools/disasm_coverage: fix off-by-one error and skip zero-sized sections
Signed-off-by: Tauwasser <Tauwasser@tauwasser.eu>
2018-06-17 11:06:02 +02:00
Tauwasser 5957f7c2c7 tools/disasm_coverage.py: remove useless logging option
Signed-off-by: Tauwasser <Tauwasser@tauwasser.eu>
2018-06-17 11:05:48 +02:00
Tauwasser 0e7de2c6ce tools/disasm_coverage: add mode that reads the baserom and marks fillers at ends of banks as included in coverage
Signed-off-by: Tauwasser <Tauwasser@tauwasser.eu>
2018-06-17 11:05:09 +02:00
2Tie a9149c6cc3 work on talk_to_npc done, naming of some overworld logic and wram values. 2018-06-16 18:27:10 -06:00
PikalaxALT 8f9ee9325f More functions putatively related to the map and overworld 2018-06-11 11:25:14 -04:00
PikalaxALT 66f68b5b44 (Temporarily) print end of last section cluster when there is a gap in coverage 2018-06-05 09:49:37 -04:00
PikalaxALT d2be017d14 Fix bug in map2link.py 2018-06-05 09:16:55 -04:00
PikalaxALT 4a28a9d7da Minor tweak to map2link.py 2018-06-04 15:08:04 -04:00
PikalaxALT 1ed3930722 Merge branch 'master' into clean_shim 2018-06-04 12:36:50 -04:00
PikalaxALT c4b81f0916 Clean up linkerscript and add it as a Makefile target 2018-06-04 12:18:37 -04:00
PikalaxALT cf061ed929 Create linkerscript and add Python 3.6 script for linkerscript generation 2018-06-04 11:27:51 -04:00
ISSOtm 027728b3c4 Fix empty line handling 2018-06-04 17:03:50 +02:00
PikalaxALT ec992a2654 Even more informative error messages from make_shim 2018-06-04 10:16:15 -04:00
PikalaxALT 51e7c4a5cb Make make_shim a little more user-friendly 2018-06-04 10:01:28 -04:00
Tauwasser 40c8b5f0a3 tools/gfx: add option to trim trailing tiles of solid color
This helps when the last tile is completely white and the shape of the
png has additional tiles. In that case, the last tile is cut as well.

Signed-off-by: Tauwasser <Tauwasser@tauwasser.eu>
2018-06-03 22:16:21 +02:00
Tauwasser b50c850650 tools/make_shim: fix use of getline
Replace with fgets, which should be safe even if it
reads an internal NUL char, as all other functions will
just cut the string off in that case.

Signed-off-by: Tauwasser <Tauwasser@tauwasser.eu>
2018-06-03 22:14:23 +02:00
pfero 25853364c8 Update tools/sort_symfile.sh and clean up Makefile
Fixed compare being ran before the correctedheader rom was built.
Made `mostlyclean` clean up all the .d files it knows about and include
the correct .d files.
2018-06-03 20:46:15 +02:00
PikalaxALT 344904e2e0 Merge branch 'master' into build_more_roms 2018-06-03 11:05:31 -04:00
PikalaxALT 634df27635 Merge branch 'master' into build_more_roms 2018-06-03 11:04:06 -04:00
ISSOtm 3a7ac51071 Make coverage script work on Python 2 again
I tested using both my Python 2 and Python 3, it worked for both.
Worked for me previously because Py3 is my default, not 2 :p
2018-06-03 16:57:02 +02:00
PikalaxALT 898c863bd4 Suspend support for Silver and non-debug ROMs 2018-06-03 10:54:49 -04:00
pfero f482d7fe1b Tell the user to get baserom.gb if it doesn't exist. 2018-06-03 16:08:32 +02:00
PikalaxALT 3a09446488 Merge branch 'master' into build_more_roms 2018-06-02 23:12:38 -04:00
PikalaxALT 8787aac995 Merge branch 'master' into build_more_roms 2018-06-02 22:57:52 -04:00
ISSOtm bbdc4926b3 Merge branch 'master' of https://github.com/pret/pokegold-spaceworld 2018-06-03 04:52:18 +02:00
ISSOtm 65f85a7bd0 Enforce reading map file as utf-8
Avoids systems using `ascii` as default to choke on stuff like `Pokémon`
2018-06-03 04:50:11 +02:00
PikalaxALT 04883f4bf9 Merge branch 'master' into build_more_roms 2018-06-02 21:26:20 -04:00
PikalaxALT 956d010d59 Make the repository build all four ROMs 2018-06-02 20:16:37 -04:00
Tauwasser 2de7726551 tools/dump_text: fix labeling bug
Labely would be relative to start of bank, not
absolute wrt memory location (0x4000 for RB > 0)

Signed-off-by: Tauwasser <Tauwasser@tauwasser.eu>
2018-06-02 22:47:58 +02:00
Tauwasser b59e980b32 tools: rework dump_text and read_charmap to dump control codes
read_charmap was redone using a regular expression as comments and computations
would lead to unexpected results.
dump_names used read_charmap.get_project_dir, so copy it over to not break
stuff.
dump_text now uses a different but similar syntax and has its old dumb mode as
well as control code mode and will by default now respect text end condes
unless --endless option is specified

Signed-off-by: Tauwasser <Tauwasser@tauwasser.eu>
2018-06-02 16:51:55 +02:00
Rangi 51a4e04768 Parse charmap.asm for dump_text.py and dump_names.py 2018-06-01 11:10:12 -04:00
Rangi 17c9b0eb55 Use fullwidth digits 2018-06-01 10:46:40 -04:00
Rangi 1f764d96c4 Declare landmark names (pointer table structure unknown) 2018-06-01 00:30:48 -04:00
Rangi 3f86bca093 Alternate bank colors green and red in coverage.png 2018-05-31 23:53:32 -04:00
Tauwasser ebe6e63449 tools/disasm_coverage: fix counting error and remove debug print statement
Code wrongly assumed if end - beg + 1 < bpp then y_beg == y_end && x_beg == x_end, but
that's obviously not always the case.

Signed-off-by: Tauwasser <Tauwasser@tauwasser.eu>
2018-06-01 02:00:33 +02:00
Rangi a7e358cd7e Keep pokemon data in data/pokemon
Don't print "Here" a lot
'make mostlyclean' needs to remove .d files in case a file was renamed
2018-05-31 19:47:03 -04:00
Tauwasser bd9e0d92c0 Makefile: add coverage target and necessary python scripts
Signed-off-by: Tauwasser <Tauwasser@tauwasser.eu>
2018-06-01 01:40:07 +02:00
Rangi 89dfeeb4ee Add gfx.py with necessary poketools subset 2018-05-31 14:00:55 -04:00
pfero 96049270e0 Remove scan_includes.c 2018-05-31 02:59:50 +02:00
pfero cd9191b074 Clean up Makefile
This makefile can now figure graphics dependencies on its own, creates
dependency files for each compilation unit and compiles everything
separately.

This is a proposal. Please try it out, read the Makefile to see if you
get what I'm trying to do, and propose any improvements you want.
2018-05-30 22:53:59 +02:00
Rangi 0b20a75753 Dump item and move names 2018-05-30 16:35:43 -04:00
dannye 6ef9138b8a Add more graphics
add tools/gfx.c for trimming whitespace from pngs
2018-05-30 04:18:51 -05:00
Tauwasser 9f0ef97707 tools: add pkmncompress from pokered f75049fe
Add *.pic rule to Makefile to create compressed pictures.

Signed-off-by: Tauwasser <Tauwasser@tauwasser.eu>
2018-05-29 22:15:33 +02:00
Rangi 9cbdbd9fd4 Put back JP chars deleted along with English ones 2018-05-29 11:16:53 -04:00