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
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
Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452)
2018-01-14 23:43:51 -05:00
battle_anims
Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460)
2018-01-14 23:00:22 -05:00
events
Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452)
2018-01-14 23:43:51 -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 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460)
2018-01-14 23:00:22 -05:00
billspc.asm
Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452)
2018-01-14 23:43:51 -05:00
billspctop.asm
Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452)
2018-01-14 23:43:51 -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
Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452)
2018-01-14 23:43:51 -05:00
card_flip.asm
Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460)
2018-01-14 23:00:22 -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 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460)
2018-01-14 23:00:22 -05:00
credits.asm
Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460)
2018-01-14 23:00:22 -05:00
crystal_colors.asm
Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460)
2018-01-14 23:00:22 -05:00
crystal_intro.asm
Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460)
2018-01-14 23:00:22 -05:00
debug.asm
Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460)
2018-01-14 23:00:22 -05:00
decorations.asm
Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452)
2018-01-14 23:43:51 -05:00
delete_save_change_clock.asm
Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452)
2018-01-14 23:43:51 -05:00
diploma.asm
Lowercase v for VRAM addresses
2017-12-28 13:32:33 +01:00
dma_transfer.asm
Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460)
2018-01-14 23:00:22 -05:00
dummy_game.asm
Consolidate Special function names
2018-01-02 17:13:57 +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
Clarify the purpose of writing 0 to rSVBK.
2018-01-03 20:47:44 -05:00
health.asm
Consistent predef function names
2018-01-02 18:49:25 +01:00
init_gender.asm
Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452)
2018-01-14 23:43:51 -05:00
init_hof_credits.asm
Use BANK for hardcoded WRAM banks (except where bankswitches appear unnecessary).
2018-01-03 19:12:45 -05:00
init_map.asm
Use BANK for hardcoded WRAM banks (except where bankswitches appear unnecessary).
2018-01-03 19:12:45 -05:00
intro_menu.asm
Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452)
2018-01-14 23:43:51 -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 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460)
2018-01-14 23:00:22 -05:00
mail_2.asm
Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460)
2018-01-14 23:00:22 -05:00
mail.asm
Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452)
2018-01-14 23:43:51 -05:00
main_menu.asm
Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452)
2018-01-14 23:43:51 -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/mid-kid/pokecrystal (resolve PR #452)
2018-01-14 23:43:51 -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/mid-kid/pokecrystal (resolve PR #452)
2018-01-14 23:43:51 -05:00
menu.asm
Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452)
2018-01-14 23:43:51 -05: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
Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452)
2018-01-14 23:43:51 -05:00
mon_stats.asm
Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460)
2018-01-14 23:00:22 -05: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 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460)
2018-01-14 23:00:22 -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/mid-kid/pokecrystal (resolve PR #452)
2018-01-14 23:43:51 -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 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460)
2018-01-14 23:00:22 -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 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460)
2018-01-14 23:00:22 -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
Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460)
2018-01-14 23:00:22 -05:00
save.asm
Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460)
2018-01-14 23:00:22 -05: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/mid-kid/pokecrystal (resolve PR #452)
2018-01-14 23:43:51 -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/mid-kid/pokecrystal (resolve PR #452)
2018-01-14 23:43:51 -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
Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460)
2018-01-14 23:00:22 -05:00
timeset.asm
Local UI tiles don't belong in charmap
2018-01-11 22:49:45 -05:00
title.asm
Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460)
2018-01-14 23:00:22 -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
Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460)
2018-01-14 23:00:22 -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