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
|
2ab60fa8a4
|
menu_coords macro for (x1, y1, x2, y2) order (see issue #440)
|
2018-01-13 16:38:14 -05:00 |
|
xCrystal
|
b4a49351c1
|
Finish consistent Special function names
|
2018-01-02 17:47:58 +01:00 |
|
xCrystal
|
333524f0be
|
Lowercase v for VRAM addresses
|
2017-12-28 13:32:33 +01:00 |
|
Remy Oukaour
|
c66d195089
|
callba/callab → farcall/callfar
|
2017-12-24 12:47:30 -05:00 |
|
Remy Oukaour
|
d6dccb7df5
|
Use NAME_LENGTH_JAPANESE more
|
2017-12-21 11:56:33 -05:00 |
|
Remy Oukaour
|
ebf3bfb6b2
|
Move some misc/ files into meaningful directories
|
2017-12-15 12:53:33 -05:00 |
|