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
7a09fc9f75
GFX tile sizes in decimal
2018-01-14 19:43:35 -05:00
Remy Oukaour
17f34cb29c
Disambiguate some uses of wcf64/5/6
2018-01-11 15:36:11 -05:00
Remy Oukaour
94d6a32721
Use maskbits some more
2018-01-11 14:27:19 -05:00
xCrystal
b4e087167f
More unreferenced labels and unused text
2018-01-02 19:38:56 +01: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
35a3a19fda
Use "battle_anims" and "sprite_anims" for clarity, not just "anims"
2017-12-26 18:45:04 -05:00
Remy Oukaour
e34e68095d
Resolve #428 : Use HIGH(X) and LOW(X) instead of X / $100 and X % $100 or X >> 8 and X & $ff
2017-12-25 14:23:16 -05:00
Remy Oukaour
9973e43d5a
Fix issue #345 :
...
- GetMonFrontpic → GetEnemyMonFrontpic
- GetMonBackpic → GetBattleMonBackpic
- FrontpicPredef → GetAnimatedFrontpicPredef
- GetFrontpic → GetMonFrontpic
- GetBackpic → GetMonBackpic
- CutAndPasteMap → PadMapForHDMATransfer
2017-12-24 15:03:20 -05:00
Remy Oukaour
c66d195089
callba/callab → farcall/callfar
2017-12-24 12:47:30 -05:00
Remy Oukaour
94722aa8f0
Move predef/ files into engine/
...
Get rid of single-file engine/ subdirectories
Move tilesets/ palettes unrelated to individual tilesets into data/palettes/ (more from engine/colors.asm can be moved here too)
2017-12-15 12:31:18 -05:00
