Commit Graph

195 Commits

Author SHA1 Message Date
Rangi ef48ae98b5 Separate tilesets.o goes with pics.o and sprites.o 2019-11-23 20:43:33 -05:00
Rangi 3633e0e541 Correct question_mark.2bpp hash and rgbgfx flags 2019-11-03 14:52:18 -05:00
mid-kid 7b47aeaf79 Redump slots_1.png with 16 as width. 2019-06-09 00:17:05 +02:00
mid-kid 649c8d38da Get rid of _CRYSTAL
Having this here is completely redundant and useless, and doesn't even
work since it should use `if DEF(_CRYSTAL)` instead.
2019-05-25 17:59:50 +02:00
IIMarckus 9f7d30439e Build Australian Crystal. 2019-04-14 13:22:45 -06:00
Rangi cae3af3e3a Keep the most relevant data at the top of the Makefile (the built filenames) 2018-12-31 18:08:37 -05:00
Melody 97e04cfa33 finish renaming RGBDS_DIR to RGBDS 2018-12-25 15:52:36 -05:00
Melody 2471f1ea71 rename RGBDS_DIR to RGBDS 2018-12-25 15:45:03 -05:00
Melody 7e4b956978 allow setting RGBDS_DIR 2018-12-25 15:13:57 -05:00
Melody 4eb935eb5a allow setting RGBASM in environment vars 2018-12-25 14:48:44 -05:00
luckytyphlosion 4ab1ee8920 Add make tidy and remove bitmask.asm and frames.asm in make clean 2018-09-23 13:44:23 -04:00
luckytyphlosion d6c44f0ca4 Remove *.pal from gitignore, remove more build objects with make clean. 2018-09-20 11:17:05 -04:00
Rangi 741d22907e Empty rules are unnecessary (error messages are fine without them) 2018-09-08 12:33:52 -04:00
Rangi 075a3bcad0 Consistently use "rgbgfx += -h" 2018-09-01 20:30:42 -04:00
Rangi cac641a5ed normal.gbcpal → front.gbcpal
Eliminate redundant Makefile rules
Keep Makefile's Pokemon-specific hack rules next to the misc file-specific graphics rules
2018-09-01 20:18:55 -04:00
Rangi 36b21b39d8 Fix #537: Palettes generated from PNGs use .gbcpal directly.
This avoids overwriting a .pal file from a .png with the same name.
It also prevents people from trying to edit generated .pal files.
2018-08-31 21:39:17 -04:00
Rangi eb1e3636bb Use labels instead of constants for HRAM
Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 14:28:22 -04:00
aaaaaa123456789 5a55d629e1 Update lzcomp to the latest version and fix Makefiles accordingly 2018-08-04 23:43:59 -03:00
mid-kid 0d9241889f Organize the engine/ directory, take 3
Renamed `title` to `movies`.
Moved some functions from `engine/routines/` to their fitting
directories, and cleaned up the base `engine/` directory.
Moved `engine/pokemon/tmhm.asm` back to `engine/items/`.

Made a new subdirectory:
* engine/tilesets: Contains all map-related graphics routines.
2018-03-25 16:18:33 +02:00
mid-kid baa0dc5a96 Organize the engine/ directory
This is an informed attempt at reorganizing the engine/ directory by
creating categorized subdirectories, in order to make it easier to
navigate and find things.

The directories created are as follows:
* engine/game: Contains all "minigames", things like the unown puzzle
and slot machine.
* engine/gfx: Contains all handling of graphics. From loading palettes
to playing animations.
* engine/link: Contains all multiplayer functionality.
* engine/menu: Contains all generic/misc. menus and menu code.
Other, more specialized menus are in their own subdirectories (pokedex,
pokegear, party menu, etc).
* engine/overworld: Contains all handling of the overworld. From loading
and connecting maps to wild encounters and the scripting engine.
* engine/pokegear: In the same vein as engine/pokedex, except it could
use some more splitting up.
* engine/pokemon: Contains everything related to manipulating pokemon
data. From the pokemon storage system to evolution and mail.
* engine/printer: Contains everything related to printing things as well
as the printer communication.
* engine/title: Contains intro sequences, title screens and credits.
2018-03-13 13:21:40 +01:00
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