pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity
911c1320a2
pokecrystal-board/engine/events
History
Remy Oukaour 14c8cf5b48 Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452) 
# Conflicts:
#	data/player_names.asm
#	engine/battle/menu.asm
#	engine/billspc.asm
#	engine/billspctop.asm
#	engine/buy_sell_toss.asm
#	engine/decorations.asm
#	engine/delete_save_change_clock.asm
#	engine/events/buena.asm
#	engine/events/elevator.asm
#	engine/events/kurt.asm
#	engine/events/mom.asm
#	engine/events/move_tutor.asm
#	engine/events/pokecenter_pc.asm
#	engine/events/pokepic.asm
#	engine/events/std_scripts.asm
#	engine/events/unown_walls.asm
#	engine/init_gender.asm
#	engine/intro_menu.asm
#	engine/mail.asm
#	engine/main_menu.asm
#	engine/mart.asm
#	engine/menu_2.asm
#	engine/mon_menu.asm
#	engine/pack.asm
#	engine/slot_machine.asm
#	engine/start_menu.asm
#	home/menu.asm
#	maps/CeladonDeptStore6F.asm
#	maps/CeladonGameCornerPrizeRoom.asm
#	maps/DragonShrine.asm
#	maps/EarlsPokemonAcademy.asm
#	maps/GoldenrodCity.asm
#	maps/GoldenrodDeptStore6F.asm
#	maps/GoldenrodGameCorner.asm
#	maps/GoldenrodPokeComCenter2FMobile.asm
#	mobile/mobile_12.asm
#	mobile/mobile_12_2.asm
#	mobile/mobile_22.asm
#	mobile/mobile_22_2.asm
#	mobile/mobile_40.asm
#	mobile/mobile_45.asm
#	mobile/mobile_45_sprite_engine.asm
#	mobile/mobile_46.asm
#	mobile/mobile_5c.asm
#	mobile/mobile_5f.asm
#	mobile/mobile_menu.asm
2018-01-14 23:43:51 -05:00
..
battle_tower Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460) 2018-01-14 23:00:22 -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/mid-kid/pokecrystal (resolve PR #452) 2018-01-14 23:43:51 -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 Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452) 2018-01-14 23:43:51 -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 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460) 2018-01-14 23:00:22 -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/mid-kid/pokecrystal (resolve PR #452) 2018-01-14 23:43:51 -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 Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460) 2018-01-14 23:00:22 -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 Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452) 2018-01-14 23:43:51 -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/mid-kid/pokecrystal (resolve PR #452) 2018-01-14 23:43:51 -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 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460) 2018-01-14 23:00:22 -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/mid-kid/pokecrystal (resolve PR #452) 2018-01-14 23:43:51 -05:00
pokepic.asm Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452) 2018-01-14 23:43:51 -05:00
print_photo.asm Consolidate Special function names 2018-01-02 17:13:57 +01:00
print_unown_2.asm Simplify comments per Rangi's rec. 2018-01-08 23:07:46 -05:00
print_unown.asm Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460) 2018-01-14 23:00:22 -05: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/mid-kid/pokecrystal (resolve PR #452) 2018-01-14 23:43:51 -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