Remy Oukaour
|
bf074f3598
|
map_header → map_def; map_header_2 → map_data
|
2018-01-16 23:25:00 -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
|
d83aefb30a
|
Use more constants in scripts
|
2018-01-12 02:27:42 -05:00 |
|
Remy Oukaour
|
2f0973f3e0
|
Clean up some hex values in map scripts
|
2018-01-09 18:45:25 -05:00 |
|
xCrystal
|
b4a49351c1
|
Finish consistent Special function names
|
2018-01-02 17:47:58 +01:00 |
|
xCrystal
|
f1ea15bbfe
|
Consolidate Special function names
|
2018-01-02 17:13:57 +01:00 |
|
Remy Oukaour
|
84e22eb578
|
Consistent (x, y) coordinate formatting in map scripts
|
2017-12-28 14:31:25 -05:00 |
|
Remy Oukaour
|
c05b7f41dd
|
Renaming: (fix #412)
- MapTriggers / maptrigger → SceneScripts / scene_script
- XYTriggers / xy_trigger → CoordEvents / coord_event
- Signposts / signpost → BGEvents / bg_event
- PersonEvents / person_event → ObjectEvents / object_event
|
2017-12-24 14:33:17 -05:00 |
|
Remy Oukaour
|
a551e345df
|
PokeCenter → Pokecenter (consistent with the POKECENTER map constants)
|
2017-12-10 22:34:42 -05:00 |