Rangi
|
67d1364c7a
|
Fix triple newlines left over from removing address comments
|
2018-06-24 23:22:50 -04:00 |
|
mid-kid
|
acdb302035
|
Fix rest of the givepokeitem/checkpokeitem references
|
2018-05-06 13:48:04 +02: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 |
|
Rangi
|
f964d04a87
|
* loadmenuheader -> loadmenu (ead103d)
* objectface -> turnobject (c834bda)
|
2018-02-25 20:05:37 -05:00 |
|
Rangi
|
f258ff8a41
|
oops
|
2018-02-02 22:28:29 -05:00 |
|
Rangi
|
07fddb1803
|
Legacy support macros
|
2018-02-02 22:24:50 -05:00 |