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 |
|