pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00
Code Issues Packages Projects Releases Wiki Activity
pokecrystal-board/engine/events
History
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
..
battle_tower
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-25 20:39:54 -05:00
bug_contest
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-03 19:42:56 -05:00
pokerus
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-03 19:42:56 -05:00
basement_key.asm
Prefix wram labels with w, part 2.
2018-01-23 17:39:09 -05:00
buena_menu.asm
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-03 19:42:56 -05:00
buena.asm
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-03 19:42:56 -05:00
card_key.asm
Prefix wram labels with w, part 2.
2018-01-23 17:39:09 -05:00
catch_tutorial_input.asm
Move events/ to engine/events/
2017-12-27 00:09:12 -05:00
catch_tutorial.asm
Prefix wram labels with w, part 2.
2018-01-23 17:39:09 -05:00
celebi.asm
Macro factors out sine code, just like sine data, since it's used 5 times
2018-02-03 21:11:55 -05:00
checkforhiddenitems.asm
Prefix wram labels with w, part 2.
2018-01-23 17:39:09 -05:00
daycare.asm
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-25 20:39:54 -05:00
dratini.asm
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-03 19:42:56 -05:00
elevator.asm
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-03 19:42:56 -05:00
field_moves.asm
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-03 19:42:56 -05:00
fish.asm
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-03 19:42:56 -05:00
forced_movement.asm
Script commands don't have underscores
2018-02-02 21:09:17 -05:00
fruit_trees.asm
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-03 19:42:56 -05:00
halloffame.asm
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-03 19:42:56 -05:00
happiness_egg.asm
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-03 19:42:56 -05:00
heal_machine_anim.asm
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-03 19:42:56 -05:00
itemfinder.asm
Consistent predef function names
2018-01-02 18:49:25 +01:00
kurt_selectquantity_interpretjoypad.asm
Move events/ to engine/events/
2017-12-27 00:09:12 -05:00
kurt.asm
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-03 19:42:56 -05:00
loadfishinggfx.asm
More engine flag constants
2018-01-22 14:34:55 -05:00
lucky_number.asm
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-03 19:42:56 -05:00
magikarp.asm
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-03 19:42:56 -05:00
magnet_train.asm
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-03 19:42:56 -05:00
map_name_sign.asm
Sync code with wiki
2018-02-04 13:16:40 -05:00
misc_scripts_2.asm
Prefix wram labels with w, part 2.
2018-01-23 17:39:09 -05:00
misc_scripts.asm
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-03 19:42:56 -05:00
mom_phone.asm
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-03 19:42:56 -05:00
mom.asm
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-03 19:42:56 -05:00
move_deleter.asm
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-03 19:42:56 -05:00
move_tutor.asm
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-03 19:42:56 -05:00
name_rater.asm
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-03 19:42:56 -05:00
npc_trade.asm
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-25 20:39:54 -05:00
odd_egg.asm
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-03 19:42:56 -05:00
overworld.asm
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-03 19:42:56 -05:00
poisonstep_pals.asm
Prefix wram labels with w, part 2.
2018-01-23 17:39:09 -05:00
poisonstep.asm
Pkmn -> Mon
2018-02-22 17:39:06 +01:00
poke_seer.asm
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-03 19:42:56 -05:00
pokecenter_pc.asm
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-03 19:42:56 -05:00
pokepic.asm
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-03 19:42:56 -05:00
print_photo.asm
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-03 19:42:56 -05:00
print_unown_2.asm
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-03 19:42:56 -05:00
print_unown.asm
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-03 19:42:56 -05:00
prof_oaks_pc.asm
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-03 19:42:56 -05:00
sacred_ash.asm
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-03 19:42:56 -05:00
specials_2.asm
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-25 20:39:54 -05:00
specials.asm
* Remove rept 4 (fa3192e)
2018-02-25 19:23:01 -05:00
squirtbottle.asm
Prefix wram labels with w, part 2.
2018-01-23 17:39:09 -05:00
std_collision.asm
Move event data to data/events/
2018-01-25 22:19:24 -05:00
std_scripts.asm
* loadmenuheader -> loadmenu (ead103d)
2018-02-25 20:05:37 -05:00
sweet_scent.asm
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-03 19:42:56 -05:00
trainer_scripts.asm
Prefix wram labels with w, part 2.
2018-01-23 17:39:09 -05:00
treemons.asm
Prefix wram labels with w, part 2.
2018-01-23 17:39:09 -05:00
unown_walls.asm
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-03 19:42:56 -05:00
whiteout.asm
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-02-03 19:42:56 -05:00