Rangi
|
e2c15b0b92
|
* BillPhoneGeneriText -> BillPhoneGenericText
* data/phone/text/trainers1.asm -> data/phone/text/trainers.asm
* ,ROM -> , ROM0
|
2018-02-26 22:29:09 -05: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
|
aa8db1632c
|
Remove checkmorn/checkday/checknite macros
|
2018-02-02 21:20:13 -05:00 |
|
Rangi
|
68d855c213
|
Script commands don't have underscores
|
2018-02-02 21:09:17 -05:00 |
|
surskitty
|
8ea924ecd6
|
Converting what I can to locals.
|
2018-02-02 10:52:05 -05:00 |
|
Rangi
|
d719d318e8
|
Remove Special_ prefix from special routines (close #478)
|
2018-01-24 11:17:05 -05:00 |
|
Rangi
|
505a6595bc
|
EVENT_TEMPORARY_UNTIL_MAP_RELOAD_[1-8] (close issue #481)
|
2018-01-24 10:46:49 -05:00 |
|
Rangi
|
efe6981a0d
|
Add daily+weekly bit flags (close issue #429)
|
2018-01-22 15:59:24 -05:00 |
|
Rangi
|
125d51b3b2
|
More engine bit flag constants
|
2018-01-22 13:57:44 -05:00 |
|
Remy Oukaour
|
5c28d05bb4
|
Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459)
# Conflicts:
# data/items/descriptions.asm
# data/sprite_anims/framesets.asm
# engine/crystal_colors.asm
# engine/events/kurt.asm
# engine/events/special.asm
# engine/events/std_scripts.asm
# engine/events_3.asm
# engine/item_effects.asm
# engine/namingscreen.asm
# engine/scripting.asm
# engine/stats_screen.asm
# engine/trade_animation.asm
# home/audio.asm
# main.asm
# maps/BattleTower1F.asm
# maps/BattleTowerBattleRoom.asm
# maps/BurnedTowerB1F.asm
# maps/ElmsLab.asm
# maps/GoldenrodDeptStore5F.asm
# maps/GoldenrodUnderground.asm
# maps/HallOfFame.asm
# maps/MahoganyTown.asm
# maps/ManiasHouse.asm
# maps/MobileBattleRoom.asm
# maps/MobileTradeRoomMobile.asm
# maps/RadioTower2F.asm
# maps/Route35NationalParkGate.asm
# maps/Route36NationalParkGate.asm
# maps/Route39Farmhouse.asm
# tilesets/palette_maps.asm
|
2018-01-14 22:56:36 -05:00 |
|
Remy Oukaour
|
d83aefb30a
|
Use more constants in scripts
|
2018-01-12 02:27:42 -05:00 |
|
xCrystal
|
f1ea15bbfe
|
Consolidate Special function names
|
2018-01-02 17:13:57 +01:00 |
|
surskitty
|
c883ab4d34
|
Reorganising phone stuff.
|
2017-12-15 23:06:53 -05:00 |
|