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

..

battle_tower.asm

Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459)

2018-01-14 22:56:36 -05:00

get_trainer_class.asm

Organize mobile/battle_tower_*.asm data and code

2018-01-06 18:53:30 -05:00

load_trainer.asm

Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460)

2018-01-14 23:00:22 -05:00

rules.asm

Constant swap explains this Battle Tower bug

2018-01-10 02:55:44 -05:00

trainer_text.asm

CRYSTAL11 → _CRYSTAL11

2018-01-09 17:26:40 -05:00