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
|
7a09fc9f75
|
GFX tile sizes in decimal
|
2018-01-14 19:43:35 -05:00 |
|
Remy Oukaour
|
960783cdf4
|
Label more ANIM_OBJ_* constants
|
2018-01-12 13:47:04 -05:00 |
|
Remy Oukaour
|
94d6a32721
|
Use maskbits some more
|
2018-01-11 14:27:19 -05:00 |
|
Remy Oukaour
|
417937cffc
|
Resolve #461
|
2018-01-10 13:47:57 -05:00 |
|
Remy Oukaour
|
11556196ba
|
Consistent sine wave code formatting
|
2018-01-09 16:39:36 -05:00 |
|
Adelaide Walter
|
6c5cd7a963
|
Simplify comments per Rangi's rec.
|
2018-01-08 23:07:46 -05:00 |
|
Adelaide Walter
|
ce985a09a7
|
Document switches to BANK(sScratch) via xor a
|
2018-01-04 16:51:50 -05:00 |
|
Adelaide Walter
|
9d0ba6bfd3
|
Use BANK for hardcoded WRAM banks (except where bankswitches appear unnecessary).
|
2018-01-03 19:12:45 -05:00 |
|
Adelaide Walter
|
0caea0f820
|
Use BANK for all hardcoded banks with BANK in comments.
|
2018-01-02 16:46:40 -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
|
37369d1ae0
|
Rename Pals labels in WRAM bank 5
|
2018-01-01 20:09:53 +01:00 |
|
xCrystal
|
6e12a51503
|
Use more palette(s) constants
|
2018-01-01 20:09:53 +01:00 |
|
xCrystal
|
ee5bf71640
|
Consistently name unknown fields in macros/wram as Fieldxx
|
2017-12-29 16:19:51 +01:00 |
|
xCrystal
|
def3b60493
|
Clean up .Jumptable: spaces
|
2017-12-29 13:52:42 +01:00 |
|
xCrystal
|
50fc9c3389
|
endm -> ENDM
|
2017-12-28 22:31:16 +01:00 |
|
xCrystal
|
333524f0be
|
Lowercase v for VRAM addresses
|
2017-12-28 13:32:33 +01:00 |
|
Remy Oukaour
|
9bc680bd6d
|
Battle animation data is like sprite animation data
|
2017-12-26 19:27:56 -05:00 |
|
Remy Oukaour
|
35a3a19fda
|
Use "battle_anims" and "sprite_anims" for clarity, not just "anims"
|
2017-12-26 18:45:04 -05:00 |
|