Commit Graph

9 Commits

Author SHA1 Message Date
Remy Oukaour dfcca93b45 Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460)
# Conflicts:
#	engine/battle/core.asm
#	engine/save.asm
2018-01-14 23:00:22 -05:00
Remy Oukaour 960783cdf4 Label more ANIM_OBJ_* constants 2018-01-12 13:47:04 -05:00
Adelaide Walter 9d0ba6bfd3 Use BANK for hardcoded WRAM banks (except where bankswitches appear unnecessary). 2018-01-03 19:12:45 -05:00
xCrystal 37369d1ae0 Rename Pals labels in WRAM bank 5 2018-01-01 20:09:53 +01:00
xCrystal 6e12a51503 Use more palette(s) constants 2018-01-01 20:09:53 +01:00
xCrystal ee5bf71640 Consistently name unknown fields in macros/wram as Fieldxx 2017-12-29 16:19:51 +01:00
xCrystal def3b60493 Clean up .Jumptable: spaces 2017-12-29 13:52:42 +01:00
xCrystal 50fc9c3389 endm -> ENDM 2017-12-28 22:31:16 +01:00
Remy Oukaour 35a3a19fda Use "battle_anims" and "sprite_anims" for clarity, not just "anims" 2017-12-26 18:45:04 -05:00