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
|
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
|
eb3102200f
|
More Battle Tower map script constants, fewer raw hex values
|
2018-01-14 19:26:55 -05:00 |
|
Remy Oukaour
|
177341425c
|
Use charmap frame characters
|
2018-01-11 21:14:35 -05:00 |
|
Remy Oukaour
|
28d5169a11
|
maskbits <count> +- 1
|
2018-01-10 14:03:11 -05:00 |
|
Remy Oukaour
|
bc79f17b9d
|
More maskbits
|
2018-01-10 13:59:07 -05:00 |
|
Remy Oukaour
|
16eb97ae9c
|
Constant swap explains this Battle Tower bug
|
2018-01-10 02:55:44 -05:00 |
|
Remy Oukaour
|
cc0fd6e12c
|
CRYSTAL11 → _CRYSTAL11
|
2018-01-09 17:26:40 -05:00 |
|
Remy Oukaour
|
ce50d1b2cb
|
Clearer Battle Tower code
|
2018-01-09 16:55:11 -05:00 |
|
Remy Oukaour
|
bdd3a55333
|
Organize mobile/battle_tower_*.asm data and code
|
2018-01-06 18:53:30 -05:00 |
|