Rangi
|
dcb24bc724
|
Use def_* macros for automatic map event counts
Resolves #742
|
2020-07-24 09:57:16 -04:00 |
|
Rangi
|
ef452ccbc7
|
return → endcallback, reloadandreturn → reloadend
|
2020-07-17 08:37:03 -04:00 |
|
Rangi
|
f5c9958aea
|
Rename some call/jump script commands to avoid confusion with jr/jp asm instructions
Fixes #580
|
2019-03-10 16:39:31 -04:00 |
|
Rangi
|
e002b536af
|
Rename more script commands for consistency and predictability
Fixes #540
|
2019-03-10 16:00:19 -04:00 |
|
Rangi
|
5a6e43e72a
|
Label more map scripts
|
2018-02-28 16:50:43 -05:00 |
|
Rangi
|
43b5f90457
|
Replace "Map<MapName>Signpost<#>Script" labels
|
2018-02-27 19:33:38 -05:00 |
|
Rangi
|
335c2699f0
|
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# constants/map_constants.asm
# constants/wram_constants.asm
# data/radio/oaks_pkmn_talk_routes.asm
# data/radio/pnp_hidden_places.asm
# engine/battle/core.asm
# engine/breeding.asm
# engine/phone/phone_scripts.asm
# engine/radio.asm
# maps/BattleTower1F.asm
# maps/OlivineLighthouse2F.asm
# maps/OlivineLighthouse6F.asm
# maps/PokemonFanClub.asm
# maps/RadioTower1F.asm
# maps/RadioTower2F.asm
# maps/Route30BerryHouse.asm
# maps/Route34IlexForestGate.asm
# maps/Route36NationalParkGate.asm
# maps/RuinsOfAlphKabutoChamber.asm
# maps/RuinsOfAlphResearchCenter.asm
# maps/VermilionPort.asm
# maps/VictoryRoad.asm
|
2018-02-25 20:39:54 -05:00 |
|
surskitty
|
507a8f3535
|
Ruins of Alph partial labels
|
2018-02-02 11:57:11 -05:00 |
|
Rangi
|
48f4f2366e
|
Align map event coordinate columns
|
2018-02-01 22:22:07 -05:00 |
|
Rangi
|
3088a77a21
|
warp_event x, y, map, warp_id
|
2018-02-01 21:54:00 -05:00 |
|
Rangi
|
b2970e75f4
|
SCENE_DEFAULT=0 and SCENE_FINISHED=1 (generic constants for a common scene pattern)
|
2018-02-01 15:06:06 -05:00 |
|
Rangi
|
fcfe77bc3d
|
Meaningful scene constant names
(Two common patterns: 0=default event and 1=nothing; and 0=nothing and 1=some event)
|
2018-02-01 13:03:21 -05:00 |
|
Rangi
|
a17623d96b
|
Add scene ID constants (TODO: meaningful names)
|
2018-01-31 23:16:51 -05:00 |
|
Rangi
|
65480605e9
|
Remove unreferenced map script heading labels
|
2018-01-30 14:15:47 -05:00 |
|
Rangi
|
477adc72af
|
grep -rl warp_def . | xargs sed -i s/warp_def/warp_event/g
|
2018-01-28 13:20:04 -05:00 |
|
Rangi
|
d719d318e8
|
Remove Special_ prefix from special routines (close #478)
|
2018-01-24 11:17:05 -05:00 |
|
Rangi
|
7cef012335
|
wUnlockedUnowns engine flag constants
Use local labels for "End"ings
|
2018-01-22 13:00:35 -05:00 |
|
Remy Oukaour
|
c70e8eec49
|
Comment on changeblock ids
|
2018-01-17 13:23:43 -05:00 |
|
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
|
eb3102200f
|
More Battle Tower map script constants, fewer raw hex values
|
2018-01-14 19:26:55 -05:00 |
|
Remy Oukaour
|
5a3822fe86
|
Introduce callback, hiddenitem, conditional_event, and cmdqueue macros for map scripts
|
2018-01-13 00:47:38 -05:00 |
|
Remy Oukaour
|
d83aefb30a
|
Use more constants in scripts
|
2018-01-12 02:27:42 -05:00 |
|
Remy Oukaour
|
cc8dac5a22
|
Use constants and data for Unown chamber events
|
2018-01-11 00:25:14 -05:00 |
|
Remy Oukaour
|
2f0973f3e0
|
Clean up some hex values in map scripts
|
2018-01-09 18:45:25 -05:00 |
|
xCrystal
|
b4e087167f
|
More unreferenced labels and unused text
|
2018-01-02 19:38:56 +01:00 |
|
xCrystal
|
b4a49351c1
|
Finish consistent Special function names
|
2018-01-02 17:47:58 +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
|
62f5913943
|
All map triggers use the maptrigger macro, not dw
.MapTriggers and .MapCallbacks lists are formatted consistently with .Warps, .XYTriggers, .Signposts, and .PersonEvents
|
2017-12-10 17:53:21 -05:00 |
|
Remy Oukaour
|
699495bfcb
|
Consistent capitalization for map names, matching their constants
|
2017-12-10 13:37:15 -05:00 |
|