pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity
5c28d05bb4
pokecrystal-board/engine/events
History
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
..
battle_tower Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
bug_contest Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
pokerus Prefix engine_flags wram addresses with w 2017-12-28 13:15:46 +01:00
basement_key.asm Move events/ to engine/events/ 2017-12-27 00:09:12 -05:00
buena_menu.asm Finish consistent Special function names 2018-01-02 17:47:58 +01:00
buena.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
card_key.asm Move events/ to engine/events/ 2017-12-27 00:09:12 -05:00
catch_tutorial_input.asm Move events/ to engine/events/ 2017-12-27 00:09:12 -05:00
catch_tutorial.asm Consistent predef function names 2018-01-02 18:49:25 +01:00
celebi.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
checkforhiddenitems.asm Break up engine/events_3.asm 2018-01-11 23:50:44 -05:00
daycare.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
dratini.asm Finish consistent Special function names 2018-01-02 17:47:58 +01:00
elevator.asm menu_coords macro for (x1, y1, x2, y2) order (see issue #440) 2018-01-13 16:38:14 -05:00
field_moves.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
fish.asm Use maskbits some more 2018-01-11 14:27:19 -05:00
forced_movement.asm Move events/ to engine/events/ 2017-12-27 00:09:12 -05:00
fruit_trees.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
halloffame.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
happiness_egg.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
heal_machine_anim.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -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/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
lucky_number.asm No more mobile EQUS ret (replace with Stubbed_ + ret) 2018-01-02 20:00:14 +01:00
magikarp.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
magnet_train.asm Disambiguate some uses of wcf64/5/6 2018-01-11 15:36:11 -05:00
map_name_sign.asm Break up engine/events_3.asm 2018-01-11 23:50:44 -05:00
misc_scripts_2.asm Use more constants in scripts 2018-01-12 02:27:42 -05:00
misc_scripts.asm Consolidate Special function names 2018-01-02 17:13:57 +01:00
mom_phone.asm Clean up Predef function names 2018-01-02 15:05:14 +01:00
mom.asm menu_coords macro for (x1, y1, x2, y2) order (see issue #440) 2018-01-13 16:38:14 -05:00
move_deleter.asm Consolidate Special function names 2018-01-02 17:13:57 +01:00
move_tutor.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
name_rater.asm Move events/ to engine/events/ 2017-12-27 00:09:12 -05:00
odd_egg.asm Move events/ to engine/events/ 2017-12-27 00:09:12 -05:00
overworld.asm No more mobile EQUS ret (replace with Stubbed_ + ret) 2018-01-02 20:00:14 +01:00
poisonstep_pals.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
poisonstep.asm Consistent predef function names 2018-01-02 18:49:25 +01:00
poke_seer.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
pokecenter_pc.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
pokepic.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
print_photo.asm Consolidate Special function names 2018-01-02 17:13:57 +01:00
print_unown_2.asm endm -> ENDM 2017-12-28 22:31:16 +01:00
print_unown.asm Consistent predef function names 2018-01-02 18:49:25 +01:00
prof_oaks_pc.asm Consolidate Special function names 2018-01-02 17:13:57 +01:00
sacred_ash.asm Consolidate Special function names 2018-01-02 17:13:57 +01:00
special.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
squirtbottle.asm Consistent predef function names 2018-01-02 18:49:25 +01:00
std_collision.asm Move events/ to engine/events/ 2017-12-27 00:09:12 -05:00
std_scripts.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
sweet_scent.asm Consistent predef function names 2018-01-02 18:49:25 +01:00
trainer_scripts.asm Move events/ to engine/events/ 2017-12-27 00:09:12 -05:00
treemons.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
unown_walls.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
whiteout.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00