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
5c28d05bb4
pokecrystal-board/engine
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 Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
battle_anims Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
events Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
phone Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
routines Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
billspc.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
billspctop.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
breeding.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
buy_sell_toss.asm menu_coords macro for (x1, y1, x2, y2) order (see issue #440) 2018-01-13 16:38:14 -05:00
card_flip.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
caught_data.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
cgb_layouts.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
clock_reset.asm More unreferenced labels and unused text 2018-01-02 19:38:56 +01:00
color.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
credits.asm GFX tile sizes in decimal 2018-01-14 19:43:35 -05:00
crystal_colors.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
crystal_intro.asm GFX tile sizes in decimal 2018-01-14 19:43:35 -05:00
debug.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
decorations.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
delete_save_change_clock.asm menu_coords macro for (x1, y1, x2, y2) order (see issue #440) 2018-01-13 16:38:14 -05:00
diploma.asm Lowercase v for VRAM addresses 2017-12-28 13:32:33 +01:00
dma_transfer.asm Clean up XXX comments for unused content 2018-01-02 13:26:18 +01:00
dummy_game.asm Clean up changes in 3c6c80f 2017-12-29 19:22:33 +01:00
engine_flags.asm Keep table labels in the same files as their contents. 2017-12-11 22:44:25 -05:00
european_mail.asm Move more contiguous related code blocks from main.asm to engine/ and events/ 2017-12-15 20:10:54 -05:00
events_2.asm More unreferenced labels and unused text 2018-01-02 19:38:56 +01:00
events.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
evolution_animation.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
evolve.asm Predef_FlagAction -> Predef_SmallFarFlagAction 2018-01-07 11:53:20 +01:00
experience.asm MAX_LEVEL = 255 should still compile 2017-12-25 15:46:24 -05:00
gbc_only.asm Lowercase v for VRAM addresses 2017-12-28 13:32:33 +01:00
health.asm Consistent predef function names 2018-01-02 18:49:25 +01:00
init_gender.asm menu_coords macro for (x1, y1, x2, y2) order (see issue #440) 2018-01-13 16:38:14 -05:00
init_hof_credits.asm Rename Pals labels in WRAM bank 5 2018-01-01 20:09:53 +01:00
init_map.asm Lowercase v for VRAM addresses 2017-12-28 13:32:33 +01:00
intro_menu.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
item_effects.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
items.asm Document design flaws 2017-12-28 11:28:23 -05:00
landmarks.asm Use maskbits some more 2018-01-11 14:27:19 -05:00
learn.asm Consistent predef function names 2018-01-02 18:49:25 +01:00
link_2.asm Consistent predef function names 2018-01-02 18:49:25 +01:00
link_trade.asm Consistent predef function names 2018-01-02 18:49:25 +01:00
link.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
mail_2.asm Clean up XXX comments for unused content 2018-01-02 13:26:18 +01:00
mail.asm menu_coords macro for (x1, y1, x2, y2) order (see issue #440) 2018-01-13 16:38:14 -05:00
main_menu.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
map_object_action.asm Renaming: (fix #412) 2017-12-24 14:33:17 -05:00
map_objects_2.asm Move more contiguous related code blocks from main.asm to engine/ and events/ 2017-12-15 20:10:54 -05:00
map_objects.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
map_palettes.asm Move more contiguous related code blocks from main.asm to engine/ and events/ 2017-12-15 20:10:54 -05:00
map_setup.asm Consistent predef function names 2018-01-02 18:49:25 +01:00
mapgroup_roofs.asm gfx/*.asm files have INCBINs 2018-01-10 02:38:45 -05:00
mart.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
math.asm Renaming sections, further dissolving main.asm 2015-11-28 15:13:40 -05:00
menu_2.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
menu.asm More unreferenced labels cleanup 2018-01-02 16:04:21 +01:00
mon_icons.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
mon_menu.asm menu_coords macro for (x1, y1, x2, y2) order (see issue #440) 2018-01-13 16:38:14 -05:00
mon_stats.asm Consistent predef function names 2018-01-02 18:49:25 +01:00
money.asm Remove all code from main.asm (some labeled INCBINs, like out-of-context graphics, are still present) 2017-12-24 19:35:35 -05:00
move_mon_wo_mail.asm callba/callab → farcall/callfar 2017-12-24 12:47:30 -05:00
move_mon.asm Predef_FlagAction -> Predef_SmallFarFlagAction 2018-01-07 11:53:20 +01:00
movement.asm Consistently name unknown fields in macros/wram as Fieldxx 2017-12-29 16:19:51 +01:00
mystery_gift_2.asm Use maskbits some more 2018-01-11 14:27:19 -05:00
mystery_gift.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
namingscreen.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
npc_movement.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
npctrade.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
options_menu.asm Keep table labels in the same files as their contents. 2017-12-11 22:44:25 -05:00
overworld.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
pack.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
party_menu.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
pic_animation.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
player_gfx.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
player_movement.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
player_object.asm Use maskbits some more 2018-01-11 14:27:19 -05:00
player_step.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
pokedex_2.asm Use maskbits some more 2018-01-11 14:27:19 -05:00
pokedex_3.asm GFX tile sizes in decimal 2018-01-14 19:43:35 -05:00
pokedex.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
pokegear.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
predef.asm Predef_FlagAction -> Predef_SmallFarFlagAction 2018-01-07 11:53:20 +01:00
print_party.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
printer_serial.asm Clean up .Jumptable: spaces 2017-12-29 13:52:42 +01:00
printer.asm Consistent predef function names 2018-01-02 18:49:25 +01:00
printnum.asm Clean up XXX comments for unused content 2018-01-02 13:26:18 +01:00
radio.asm Use maskbits some more 2018-01-11 14:27:19 -05:00
rtc.asm More unreferenced labels cleanup 2018-01-02 16:04:21 +01:00
save.asm Clean up XXX comments for unused content 2018-01-02 13:26:18 +01:00
scripting.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
scrolling_menu.asm More unreferenced labels cleanup 2018-01-02 16:04:21 +01:00
search2.asm More splitting of main.asm; remove unneeded rept 2 2016-05-04 11:46:23 -04:00
search.asm Finish consistent Special function names 2018-01-02 17:47:58 +01:00
select_menu.asm callba/callab → farcall/callfar 2017-12-24 12:47:30 -05:00
sgb_layouts.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
slot_machine.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
spawn_points.asm Remove all code from main.asm (some labeled INCBINs, like out-of-context graphics, are still present) 2017-12-24 19:35:35 -05:00
specials.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
sprite_anims.asm Better names 2018-01-03 01:27:12 -05:00
sprites.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
start_menu.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
stats_screen.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
switch_items.asm More splitting of main.asm; remove unneeded rept 2 2016-05-04 11:46:23 -04:00
tempmon.asm Consistent predef function names 2018-01-02 18:49:25 +01:00
tile_events.asm Define constants for collision types 2017-12-12 16:15:58 -05:00
tileset_anims.asm Split tilesets/ into gfx/tilesets and data/tilesets/ 2018-01-09 23:53:58 -05:00
tileset_palettes.asm Separate more palettes into gfx/**/*.pal files 2018-01-12 14:41:42 -05:00
time_capsule_2.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
time_capsule.asm More relevant data file locations 2018-01-03 02:23:54 -05:00
time.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
timeofdaypals.asm Consistent predef function names 2018-01-02 18:49:25 +01:00
timeset.asm Local UI tiles don't belong in charmap 2018-01-11 22:49:45 -05:00
title.asm Break up engine/events_3.asm 2018-01-11 23:50:44 -05:00
tmhm2.asm No more mobile EQUS ret (replace with Stubbed_ + ret) 2018-01-02 20:00:14 +01:00
tmhm.asm Predef_FlagAction -> Predef_SmallFarFlagAction 2018-01-07 11:53:20 +01:00
trade_animation.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
trainer_card.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
types.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
unown_dex.asm Remove all code from main.asm (some labeled INCBINs, like out-of-context graphics, are still present) 2017-12-24 19:35:35 -05:00
unown_puzzle.asm Use constants and data for Unown chamber events 2018-01-11 00:25:14 -05:00
unused_title.asm Resolve #461 2018-01-10 13:47:57 -05:00
variables.asm Event script–related constants go in constants/script_constants.asm 2018-01-11 02:35:46 -05:00
warp_connection.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00
wildmons.asm Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459) 2018-01-14 22:56:36 -05:00