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
2025-04-09 05:44:44 -07:00 · 2018-02-25 20:39:54 -05:00
parent 10173f2a62 f44f306cfd
commit 335c2699f0
98 changed files with 1274 additions and 1227 deletions
--- a/gfx/battle_anims/beam.png
+++ b/gfx/battle_anims/beam.png
--- a/gfx/battle_anims/lightning.png
+++ b/gfx/battle_anims/lightning.png
--- a/gfx/battle_anims/misc.png
+++ b/gfx/battle_anims/misc.png
--- a/gfx/battle_anims/noise.png
+++ b/gfx/battle_anims/noise.png
--- a/gfx/battle_anims/objects.png
+++ b/gfx/battle_anims/objects.png
--- a/gfx/battle_anims/pokeball.png
+++ b/gfx/battle_anims/pokeball.png
--- a/gfx/battle_anims/rocks.png
+++ b/gfx/battle_anims/rocks.png
--- a/gfx/battle_anims/sand.png
+++ b/gfx/battle_anims/sand.png
--- a/gfx/card_flip/card_flip_2.png
+++ b/gfx/card_flip/card_flip_2.png
--- a/gfx/credits/pichu.png
+++ b/gfx/credits/pichu.png
--- a/gfx/credits/theend.png
+++ b/gfx/credits/theend.png
--- a/gfx/frames/space.png
+++ b/gfx/frames/space.png
--- a/gfx/mail/cloud.png
+++ b/gfx/mail/cloud.png
--- a/gfx/mail/dragonite.png
+++ b/gfx/mail/dragonite.png
--- a/gfx/mail/flower_mail_border.png
+++ b/gfx/mail/flower_mail_border.png
--- a/gfx/mail/large_note.png
+++ b/gfx/mail/large_note.png
--- a/gfx/mail/litebluemail_border.png
+++ b/gfx/mail/litebluemail_border.png
--- a/gfx/mail/morph_mail_corner.png
+++ b/gfx/mail/morph_mail_corner.png
--- a/gfx/mail/surf_mail_border.png
+++ b/gfx/mail/surf_mail_border.png
--- a/gfx/mobile/electro_ball_nonmatching.png
+++ b/gfx/mobile/electro_ball_nonmatching.png
--- a/Show More
+++ b/Show More