Commit Graph

66 Commits

Author SHA1 Message Date
Rangi 50a78c0876 Forgot the person→object rename 2018-01-31 11:08:47 -05:00
Rangi a2607623d3 Comment the person constants sections, like the others 2018-01-31 11:04:17 -05:00
Rangi cb733954c6 SPRITEMOVEDATA_ITEM_TREE → SPRITEMOVEDATA_STILL (it's used for other things like Azalea's Slowpokes, not just items and trees) 2018-01-30 22:12:53 -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
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 2f0973f3e0 Clean up some hex values in map scripts 2018-01-09 18:45:25 -05: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 047c8e4bc0 xy_trigger handles $0 padding, so map scripts are simpler 2017-12-12 14:11:23 -05:00
Remy Oukaour b4261d27d8 Use new palette constants 2017-12-10 20:50:08 -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
surskitty 151174300f Labelling triggers pointlessly. 2017-10-26 01:51:13 -04:00
pikalaxalt 1fa6aecbfc Unify directional movement macros 2016-05-14 13:46:14 -04:00
pikalaxalt bf73772a56 Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style 2016-04-10 14:42:14 -04:00
pikalaxalt 552febffe8 Merge branch 'master' of https://github.com/pret/pokecrystal 2016-04-10 13:39:55 -04:00
IIMarckus 0a2b14309a More labels cleanup in map scripts. 2016-04-07 04:13:59 -06:00
PikalaxALT 599e6e8d16 Battle animation annotations 2016-03-01 22:31:21 -05:00
PikalaxALT ce019e6347 Map callback constants 2016-01-06 07:44:50 -05:00
PikalaxALT bb2aba7da1 No more ItemFragment 2015-12-15 10:55:56 -05:00
PikalaxALT a5a8364c35 opentext and breeding 2015-12-09 18:25:44 -05:00
PikalaxALT 0c4bf512d0 itemfragment 2015-12-09 11:57:08 -05:00
PikalaxALT 0d944f5915 Person event constants for each map 2015-11-27 00:22:14 -05:00
PikalaxALT 01792e00d2 Rename several script commands 2015-11-25 10:16:29 -05:00
PikalaxALT 36470537e0 Globally introduce PERSONTYPE constants 2015-11-15 15:07:20 -05:00
PikalaxALT ae2970d73b Sprite movement function labels 2015-11-06 16:42:38 -05:00
PikalaxALT 72af3337fd No more NONE 2015-11-02 14:37:02 -05:00
PikalaxALT fda1f7c01a SPRITEMOVEDATA 2015-10-31 21:05:02 -04:00
PikalaxALT ed29db5841 No more -bash000; engine/movement.asm, SPRITEMOVEFN 2015-10-29 23:32:11 -04:00
PikalaxALT 119d6b4119 About time I got to these functions 2015-10-24 10:39:52 -04:00
PikalaxALT 97cc513f54 Plus 4 on person events; feeble attempt to annotate color functions 2015-10-21 10:43:42 -04:00
PikalaxALT aa27080e29 Split fourth-to-last byte of person_event into nybble arguments 2015-07-31 15:16:53 -04:00
PikalaxALT 895e14cd05 Reworked person_event arguments 2015-07-29 18:22:23 -04:00
PikalaxALT 594253eb30 Merge yenatch:map-objects 2015-07-25 20:18:59 -04:00
PikalaxALT 432df825d4 Replaced GROUP_, MAP_ references with the map macro
Updated macros that rely on the GROUP_, MAP_ constants to use the map macro

Added GROUP_NONE and MAP_NONE for the sake of compatibility with this new scheme

Added new macro elevfloor to simplify the definition of elevators under this new scheme
2015-07-23 12:59:19 -04:00
yenatch ec10d9dd6f Add constants for common map object ids. 2015-07-21 23:49:18 -07:00
PikalaxALT 5631bdc0d7 Added labels to different parts of the map script and event headers 2015-07-21 00:02:21 -04:00
PikalaxALT 94129b6b45 Finished the decoration attributes table
Interpretation of the Decoration Attributes table is complete.

Other changes include some more event flag and function naming, as well as a minor tweak to the person_events of every map.
2015-07-19 04:58:31 -04:00
PikalaxALT e674869018 Updated signpost items and person_event flags 2015-07-18 16:00:53 -04:00
PikalaxALT 894955f9d9 Special script annotation, trainer constant enumeration, person-event structure update 2015-07-16 18:10:10 -04:00
PikalaxALT 249bad9551 Replace EVENT_ALWAYS_THERE with -1 2015-07-13 00:18:01 -04:00
PikalaxALT d282fe4799 Event and engine constant enumeration; replace static flag numbers with their constant names 2015-07-12 02:00:17 -04:00
IIMarckus 07a12b37b6 Add more event flags. 2015-07-10 06:08:03 -06:00