Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,865 Commits 2 Branches 0 Tags 183 MiB
Commit Graph

175 Commits

Author SHA1 Message Date
Rangi 335c2699f0 Merge branch 'master' of https://github.com/pret/pokecrystal 
# Conflicts:
#	constants/map_constants.asm
#	constants/wram_constants.asm
#	data/radio/oaks_pkmn_talk_routes.asm
#	data/radio/pnp_hidden_places.asm
#	engine/battle/core.asm
#	engine/breeding.asm
#	engine/phone/phone_scripts.asm
#	engine/radio.asm
#	maps/BattleTower1F.asm
#	maps/OlivineLighthouse2F.asm
#	maps/OlivineLighthouse6F.asm
#	maps/PokemonFanClub.asm
#	maps/RadioTower1F.asm
#	maps/RadioTower2F.asm
#	maps/Route30BerryHouse.asm
#	maps/Route34IlexForestGate.asm
#	maps/Route36NationalParkGate.asm
#	maps/RuinsOfAlphKabutoChamber.asm
#	maps/RuinsOfAlphResearchCenter.asm
#	maps/VermilionPort.asm
#	maps/VictoryRoad.asm
 2018-02-25 20:39:54 -05:00
mid-kid 8ddffef8b8 Don't let the Makefile pick up .tilemap files 
We don't generate any tilemap file with rgbgfx yet, because they won't
match anyway. This should be re-added when we can do it properly.
 2018-02-08 19:38:14 +01:00
Rangi 6ff2cb20e6 map → map_id; map_def → map; map_data → map_attributes 2018-02-03 17:11:55 -05:00
Rangi 518dd46ca1 data/text/X_text.asm is redundant 2018-01-24 21:27:23 -05:00
Rangi f44b7ad5c3 Add data/text/ 2018-01-22 17:33:52 -05:00
Rangi 6ecf18aa52 Engine flag bit constants for wPokegearFlags 2018-01-22 12:03:18 -05:00
Rangi 2e0a9ea081 Rearrange Makefile by content 2018-01-22 11:36:39 -05:00
yenatch 7fba864883 Add back catch-all graphics rules. 
.pal -> .gbcpal has been omitted for now since there's no tool to convert it yet.
 2018-01-22 01:03:04 -05:00
Remy Oukaour a8eb44b6e3 Separate new_game graphics 2018-01-21 13:58:16 -05:00
Remy Oukaour ddec0ee305 More Japanese characters 2018-01-19 20:48:33 -05:00
Remy Oukaour fdb81d0a04 One leader per line 2018-01-19 00:02:58 -05:00
Remy Oukaour 94bbfe2f0c Move map-related "metadata" files into data/maps/ 2018-01-16 19:56:21 -05:00
Remy Oukaour 4d611738c8 Merge branch 'sort-symfile' of https://github.com/yenatch/pokecrystal 2018-01-14 23:47:36 -05:00
Remy Oukaour be4510659a Mystery Gift graphics match 2018-01-12 15:30:46 -05:00
Remy Oukaour 68e5a703cb Resize SGB graphics 2018-01-11 02:10:06 -05:00
Remy Oukaour efd91fe3db Avoid catch-all Makefile rules 2018-01-09 23:00:56 -05:00
Remy Oukaour cc0fd6e12c CRYSTAL11 → _CRYSTAL11 2018-01-09 17:26:40 -05:00
Remy Oukaour 05e5eaf12f Eliminate version.asm (resolves #464) 2018-01-09 00:51:53 -05:00
Remy Oukaour 31edd7f803 Move text/ into data/ 2018-01-09 00:23:48 -05:00
Remy Oukaour 41feb29680 Make some graphics easier to edit 2018-01-02 19:33:27 -05:00
yenatch f185cc9b77 sort the symfile by symbol type 2018-01-01 22:40:35 -05:00
Remy Oukaour 8259136911 Name mail graphics 2017-12-26 20:02:00 -05:00
Remy Oukaour 35a3a19fda Use "battle_anims" and "sprite_anims" for clarity, not just "anims" 2017-12-26 18:45:04 -05:00
Remy Oukaour b5417fafec Split battle/ into data/ and engine/ components 2017-12-26 17:47:05 -05:00
Remy Oukaour 24f0e7d045 Rename: emote_headers, sprite_headers, cry_headers, gfx_headers, tileset_headers 2017-12-26 12:50:32 -05:00
Remy Oukaour 25a3960646 Move some more main.asm routines into individual files 2017-12-16 19:00:50 -05:00
Remy Oukaour 2cf5cc1dc7 Move more unknown graphics into real subfolders 2017-12-15 17:50:45 -05:00
Remy Oukaour dc76bf804f Move all misc/ and unknown/ files to meaningful directories 2017-12-15 13:21:47 -05:00
Remy Oukaour 6ab1d028bb Split items/ and trainers/ into their data/ and engine/ components 
Move some data into a pokemon/ subdirectory
 2017-12-14 23:00:54 -05:00
Remy Oukaour 2d644f5077 Name some gfx/unknown/ files 2017-12-11 18:04:23 -05:00
Remy Oukaour e6f6a75330 Move the rest of gfx/misc/ into specific directories 2017-12-11 17:51:04 -05:00
Remy Oukaour 32ea595c47 Move some gfx/unknown/ files into meaningful directories 2017-12-09 23:37:08 -05:00
Remy Oukaour 31901f73b0 Move some gfx/misc/ files into meaningful directories 2017-12-09 22:57:41 -05:00
yenatch 346a6f8dcb fix make 3.81 
the shell newline capture doesnt work in 3.81, so that's gone
 2017-12-03 21:58:27 -05:00
yenatch ea8aaeb8e3 fix cryptic 'no rule' error when a prerequisite is missing 
at the cost of scan_includes running before the rules are actually evaluated
 2017-12-03 20:46:11 -05:00
yenatch 021afb6831 rgbds variables in the makefile 
this is for my own convenience but anyone using both rgbds 2 and 3 may find it useful
 2017-10-22 02:12:13 -04:00
yenatch 1439887b49 rename pokecrystal.ld -> pokecrystal.link 2017-10-22 02:06:43 -04:00
yenatch aa19af3822 Rebuild on changes to pokecrystal.ld 2017-09-24 03:30:47 -04:00
yenatch 01caa369ec Merge pull request #379 from yenatch/tools 
Refactor scan_includes and add warnings for tools
 2017-09-24 01:25:03 -04:00
yenatch 17448c51a5 Merge pull request #389 from yenatch/rgbds-3 
rgbds 0.3.3
 2017-09-24 01:23:34 -04:00
PikalaxALT 63bc19e33d Make repository compatible with RGBDS 0.3.3 (breaks support for earlier versions of RGBDS) 2017-09-24 01:15:05 -04:00
yenatch 59a27d5907 tools/gfx: Replace --width with --png 2017-09-24 01:07:02 -04:00
PikalaxALT 0e470bc785 Fix section linking 
Create linker script and float all sections
 2017-09-23 23:04:10 -04:00
surskitty 7cd4ca1207 Updating Makefile for the unused GB + N64 image. 2017-09-10 00:30:52 -04:00
yenatch 7ba068d45b Makefile formatting 2017-08-20 12:42:54 -04:00
yenatch 3064e84c5f Use $(filter) to check targets 2017-08-20 12:37:23 -04:00
yenatch 8e87d5abc4 Use $(MAKE) 2017-06-29 18:34:29 -04:00
yenatch 5dfe27125b Merge branch 'master' into tools-makefile-integration 2017-06-24 20:42:25 -04:00
yenatch f03b898250 Add a md5 tool to avoid md5sum dependency. 
md5sum is missing in macOS and (presumably) BSD.

An alternative would have been to use sha1sum instead, but it's probably
a good idea to have as few dependencies as possible, so this doesn't
happen again.

fixes #364
 2017-06-24 18:42:28 -04:00
yenatch f12e42ab6d Use SHA1 to compare roms 2017-06-24 18:32:54 -04:00