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
|
459d5d3164
|
default_names.asm → player_names.asm
|
2018-01-09 00:45:03 -05:00 |
|
xCrystal
|
d7970f749a
|
Consistent predef function names
|
2018-01-02 18:49:25 +01:00 |
|
xCrystal
|
9a3088e50c
|
Clean up XXX comments for unused content
|
2018-01-02 13:26:18 +01:00 |
|
xCrystal
|
333524f0be
|
Lowercase v for VRAM addresses
|
2017-12-28 13:32:33 +01:00 |
|
xCrystal
|
9457679af8
|
Prefix engine_flags wram addresses with w
|
2017-12-28 13:15:46 +01:00 |
|
Remy Oukaour
|
dae16acd6f
|
event/ → events/, and move some appropriate engine/ files there
|
2017-12-26 21:55:57 -05:00 |
|
Remy Oukaour
|
1038ebca5e
|
Move more contiguous related code blocks from main.asm to engine/ and events/
|
2017-12-15 20:10:54 -05:00 |