Commit Graph

80 Commits

Author SHA1 Message Date
Rangi
e4d82e92d0 Rename prioritysjump to sdefer 2021-06-08 20:35:04 -04:00
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
mid-kid
e3e0bcd653 #641 fixes and additions. (#646)
Name a lot of text labels according to our conventions
2019-10-20 18:24:17 -04:00
Rangi
745339014c "object_const_def" instead of "const_def 2" 2019-04-21 17:42:25 -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
0680bf99d3 Label more map scripts 2018-02-28 17:47:31 -05:00
Rangi
5a6e43e72a Label more map scripts 2018-02-28 16:50:43 -05:00
Rangi
f964d04a87 * loadmenuheader -> loadmenu (ead103d)
* objectface -> turnobject (c834bda)
2018-02-25 20:05:37 -05:00
Rangi
c834bdadf2 spriteface → objectface, consistent with the other script commands 2018-02-02 21:50:43 -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
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
08891da822 const_def N 2018-01-31 11:38:45 -05:00
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
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
pikalaxalt
1fa6aecbfc Unify directional movement macros 2016-05-14 13:46:14 -04: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
2bd45ca574 Move effects; no more reloadmapmusic, returnafterbattle 2015-12-26 19:22:27 -05:00
PikalaxALT
a5a8364c35 opentext and breeding 2015-12-09 18:25:44 -05:00
PikalaxALT
7f68db68ad underground switches, town map 2015-12-09 11:39:35 -05:00
PikalaxALT
92a8c491c3 Break up engine/sprites.asm; address yenatch's comments 2015-12-01 21:54:11 -05:00
PikalaxALT
0d944f5915 Person event constants for each map 2015-11-27 00:22:14 -05:00
PikalaxALT
c7985e1f3c Battle Tower scripts and text labels 2015-11-26 21:05:32 -05:00
PikalaxALT
01792e00d2 Rename several script commands 2015-11-25 10:16:29 -05:00
PikalaxALT
812976cee6 bgcoord 2015-11-20 11:47:52 -05:00
PikalaxALT
0b8fe4bac3 More specials; bank 12 mobile 2015-11-16 22:29:54 -05:00
PikalaxALT
36470537e0 Globally introduce PERSONTYPE constants 2015-11-15 15:07:20 -05:00
PikalaxALT
2ffcb4b490 More splits; map setup labels 2015-11-11 23:38:57 -05:00
PikalaxALT
10beeb3c06 Battle Tower 2015-11-03 15:22:04 -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