Commit Graph

9 Commits

Author SHA1 Message Date
Remy Oukaour
e69544b61f More Unicode 2018-01-19 02:30:19 -05:00
Remy Oukaour
8048082114 Remove Predef_ prefix from routines listed in PredefPointers 2018-01-16 14:39:28 -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
0197e6f23c Don't split stats gfx in three 2018-01-13 15:22:16 -05:00
Remy Oukaour
163f3e0c3f Local UI tiles don't belong in charmap
Separate 1bpp font tiles from gfx/mobile/phone_tiles.png
2018-01-11 22:49:45 -05:00
xCrystal
d7970f749a Consistent predef function names 2018-01-02 18:49:25 +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
ebf3bfb6b2 Move some misc/ files into meaningful directories 2017-12-15 12:53:33 -05:00