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/home
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
..
audio.asm
Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459)
2018-01-14 22:56:36 -05:00
battle.asm
Consistent predef function names
2018-01-02 18:49:25 +01:00
copy2.asm
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 14:42:14 -04:00
copy.asm
LY_BLANK and rLCDC constants
2017-12-29 18:53:21 +01:00
cry.asm
Rename: emote_headers, sprite_headers, cry_headers, gfx_headers, tileset_headers
2017-12-26 12:50:32 -05:00
decompress.asm
Fix indentation in many places
2016-06-07 08:13:08 -04:00
delay.asm
Remove trailing newlines.
2015-06-23 12:24:51 -06:00
double_speed.asm
Remove trailing newlines.
2015-06-23 12:24:51 -06:00
fade.asm
Clean up XXX comments for unused content
2018-01-02 13:26:18 +01:00
farcall.asm
Replace ‘jp [hl]’ with ‘jp hl’
2017-06-09 22:01:10 +01:00
flag.asm
Prefix engine_flags wram addresses with w
2017-12-28 13:15:46 +01:00
game_time.asm
Prefix engine_flags wram addresses with w
2017-12-28 13:15:46 +01:00
handshake.asm
Port homecall macro
2016-05-27 10:41:59 -04:00
hm_moves.asm
IsHM is not used within home/names.asm; group it with the other HM routines+data
2017-12-22 22:56:21 -05:00
init.asm
Consistent predef function names
2018-01-02 18:49:25 +01:00
interrupts.asm
move rst.asm and interrupts.asm into home/
2017-12-24 21:47:11 -05:00
item.asm
callba/callab → farcall/callfar
2017-12-24 12:47:30 -05:00
joypad.asm
lda_coord and ldcoord_a exist for this
2017-12-29 17:07:21 -05:00
lcd.asm
More unreferenced labels cleanup
2018-01-02 16:04:21 +01:00
map_objects.asm
Clean up XXX comments for unused content
2018-01-02 13:26:18 +01:00
map.asm
Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459)
2018-01-14 22:56:36 -05:00
math.asm
callba/callab → farcall/callfar
2017-12-24 12:47:30 -05:00
menu.asm
Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459)
2018-01-14 22:56:36 -05:00
mobile.asm
More unreferenced labels cleanup
2018-01-02 16:04:21 +01:00
movement.asm
Resolve #428: Use HIGH(X) and LOW(X) instead of X / $100 and X % $100 or X >> 8 and X & $ff
2017-12-25 14:23:16 -05:00
names.asm
callba/callab → farcall/callfar
2017-12-24 12:47:30 -05:00
palettes.asm
Consistent predef function names
2018-01-02 18:49:25 +01:00
pokedex_flags.asm
Predef_FlagAction -> Predef_SmallFarFlagAction
2018-01-07 11:53:20 +01:00
predef.asm
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 14:42:14 -04:00
random.asm
Remove trailing newlines.
2015-06-23 12:24:51 -06:00
rst.asm
move rst.asm and interrupts.asm into home/
2017-12-24 21:47:11 -05:00
rtc.asm
callba/callab → farcall/callfar
2017-12-24 12:47:30 -05:00
serial.asm
Clean up XXX comments for unused content
2018-01-02 13:26:18 +01:00
sine.asm
Consistent sine wave code formatting
2018-01-09 16:39:36 -05:00
sram.asm
Remove trailing newlines.
2015-06-23 12:24:51 -06:00
string.asm
All functions in main.asm have non-generic names
2016-05-08 14:11:24 -04:00
text.asm
Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459)
2018-01-14 22:56:36 -05:00
tilemap.asm
callba/callab → farcall/callfar
2017-12-24 12:47:30 -05:00
time.asm
maskbits <count> +- 1
2018-01-10 14:03:11 -05:00
trainers.asm
More unreferenced labels cleanup
2018-01-02 16:04:21 +01:00
vblank.asm
Serve2bppRequest@VBlank → Serve2bppRequest_VBlank
2018-01-03 15:28:13 -05:00
video.asm
Serve2bppRequest@VBlank → Serve2bppRequest_VBlank
2018-01-03 15:28:13 -05:00
window.asm
Clean up XXX comments for unused content
2018-01-02 13:26:18 +01:00