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
|
417937cffc
|
Resolve #461
|
2018-01-10 13:47:57 -05:00 |
|
Adelaide Walter
|
94f32db7bc
|
Document hardcoded SRAM addresses.
|
2018-01-08 22:48:58 -05:00 |
|
Adelaide Walter
|
d6f20ae746
|
Use BANK for hardcoded SRAM banks (except for vestigial refs to JP's banks 4-7)
|
2018-01-08 17:13:37 -05:00 |
|
xCrystal
|
2c789b64b1
|
Predef_FlagAction -> Predef_SmallFarFlagAction
|
2018-01-07 11:53:20 +01:00 |
|
xCrystal
|
e9e8bf6eb1
|
Predef_Flag -> Predef_FlagAction
|
2018-01-05 11:05:01 +01:00 |
|
Remy Oukaour
|
4f01dff6c2
|
Use OAM flags in dsprite data
|
2018-01-02 17:26:23 -05:00 |
|
xCrystal
|
aa9a0a900d
|
No more mobile EQUS ret (replace with Stubbed_ + ret)
|
2018-01-02 20:00:14 +01:00 |
|
xCrystal
|
d7970f749a
|
Consistent predef function names
|
2018-01-02 18:49:25 +01:00 |
|
xCrystal
|
6f0b81504d
|
More unreferenced labels cleanup
|
2018-01-02 16:04:21 +01:00 |
|
xCrystal
|
2a7ba6685a
|
Clean up changes in 3c6c80f
|
2017-12-29 19:22:33 +01:00 |
|
xCrystal
|
3c6c80f1b2
|
LY_BLANK and rLCDC constants
|
2017-12-29 18:53:21 +01:00 |
|
xCrystal
|
333524f0be
|
Lowercase v for VRAM addresses
|
2017-12-28 13:32:33 +01:00 |
|
Remy Oukaour
|
e3e64fdf59
|
Move more decoration data to data/
|
2017-12-27 11:56:03 -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
|
c66d195089
|
callba/callab → farcall/callfar
|
2017-12-24 12:47:30 -05:00 |
|
Remy Oukaour
|
e44640b008
|
Move more main.asm code into individual files
|
2017-12-15 21:22:26 -05:00 |
|