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 |
|
Remy Oukaour
|
94d6a32721
|
Use maskbits some more
|
2018-01-11 14:27:19 -05:00 |
|
xCrystal
|
9a3088e50c
|
Clean up XXX comments for unused content
|
2018-01-02 13:26:18 +01:00 |
|
xCrystal
|
9457679af8
|
Prefix engine_flags wram addresses with w
|
2017-12-28 13:15:46 +01:00 |
|
Remy Oukaour
|
c66d195089
|
callba/callab → farcall/callfar
|
2017-12-24 12:47:30 -05:00 |
|
yenatch
|
74005945b7
|
Fix no newline at eof in engine/time.asm
|
2017-05-28 15:54:03 -04:00 |
|
pikalaxalt
|
ae36ef2c7f
|
Labeled every function in ROM0 that's referenced in the source
|
2016-05-10 12:31:49 -04:00 |
|
pikalaxalt
|
3713b71d9e
|
More splitting of main.asm; remove unneeded rept 2
|
2016-05-04 11:46:23 -04:00 |
|
pikalaxalt
|
bf73772a56
|
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 |
|
pikalaxalt
|
f2fa5349d5
|
More annotations of HP bar animations, including an oversight by GameFreak resulting in super-slow HP bars for Pokemon with over 48 HP
|
2016-03-08 19:54:06 -05:00 |
|
PikalaxALT
|
599e6e8d16
|
Battle animation annotations
|
2016-03-01 22:31:21 -05:00 |
|
PikalaxALT
|
3dcbe0ff55
|
Pokegear
|
2016-01-10 17:44:09 -05:00 |
|
PikalaxALT
|
80aba7fc13
|
maptrigger macro
|
2016-01-05 08:46:37 -05:00 |
|
PikalaxALT
|
ffbf2c0f5d
|
More animations including cutting grass
|
2015-12-01 15:35:28 -05:00 |
|
PikalaxALT
|
119d6b4119
|
About time I got to these functions
|
2015-10-24 10:39:52 -04:00 |
|
PikalaxALT
|
4fa6c6daa4
|
Split up bank 2; other relabelings
|
2015-10-16 13:35:43 -04:00 |
|
PikalaxALT
|
d42330ed8b
|
Annotation of PrintNum arguments in bc, and radio functions
|
2015-10-10 18:00:12 -04:00 |
|
PikalaxALT
|
2770cfc354
|
soft reset
|
2015-10-04 14:14:51 -04:00 |
|
PikalaxALT
|
726c4bc1d6
|
Moved time-related functions in bank 4 to engine/time.asm
|
2015-10-02 22:49:26 -04:00 |
|
yenatch
|
9f53825ce2
|
move common asm from engine/ to common/
engine/ was getting really bloated and common asm wasnt what it was made for
|
2013-09-07 23:38:19 -04:00 |
|
yenatch
|
6d29673a5f
|
move time-related asm from main.asm into engine/time.asm
|
2013-08-29 19:32:03 -04:00 |
|