51 Commits

Author SHA1 Message Date
Rangi
0680bf99d3 Label more map scripts 2018-02-28 17:47:31 -05:00
Rangi
f964d04a87 * loadmenuheader -> loadmenu (ead103d)
* objectface -> turnobject (c834bda)
2018-02-25 20:05:37 -05:00
Rangi
32ed487a47 Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
#	audio/engine.asm
#	constants/gfx_constants.asm
#	constants/map_data_constants.asm
#	constants/pokemon_data_constants.asm
#	constants/sprite_constants.asm
#	constants/wram_constants.asm
#	data/maps/data.asm
#	engine/battle/ai/scoring.asm
#	engine/battle/core.asm
#	engine/battle/effect_commands.asm
#	engine/battle/misc.asm
#	engine/battle_anims/getpokeballwobble.asm
#	engine/breeding.asm
#	engine/buy_sell_toss.asm
#	engine/decorations.asm
#	engine/events/battle_tower/battle_tower.asm
#	engine/events/battle_tower/rules.asm
#	engine/events/buena.asm
#	engine/events/bug_contest/contest_2.asm
#	engine/events/daycare.asm
#	engine/events/dratini.asm
#	engine/events/halloffame.asm
#	engine/events/happiness_egg.asm
#	engine/events/kurt.asm
#	engine/events/lucky_number.asm
#	engine/events/magnet_train.asm
#	engine/events/overworld.asm
#	engine/events/pokerus/pokerus.asm
#	engine/events/print_unown.asm
#	engine/events/print_unown_2.asm
#	engine/events/unown_walls.asm
#	engine/item_effects.asm
#	engine/link.asm
#	engine/mon_menu.asm
#	engine/player_object.asm
#	engine/routines/playslowcry.asm
#	engine/scripting.asm
#	engine/search.asm
#	engine/search2.asm
#	engine/specials.asm
#	engine/start_menu.asm
#	engine/timeset.asm
#	home/battle_vars.asm
#	home/map.asm
#	maps/GoldenrodUndergroundSwitchRoomEntrances.asm
#	maps/IlexForest.asm
#	maps/KrissHouse2F.asm
#	maps/Route39Barn.asm
#	mobile/mobile_12_2.asm
#	mobile/mobile_40.asm
#	mobile/mobile_5f.asm
#	wram.asm
2018-02-03 19:42:56 -05:00
Rangi
c834bdadf2 spriteface → objectface, consistent with the other script commands 2018-02-02 21:50:43 -05:00
Rangi
68d855c213 Script commands don't have underscores 2018-02-02 21:09:17 -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
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
luckytyphlosion
a1951cefc0 Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
Remy Oukaour
bf074f3598 map_header → map_def; map_header_2 → map_data 2018-01-16 23:25:00 -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
b4261d27d8 Use new palette constants 2017-12-10 20:50:08 -05:00
IIMarckus
0a2b14309a More labels cleanup in map scripts. 2016-04-07 04:13:59 -06:00
PikalaxALT
a5a8364c35 opentext and breeding 2015-12-09 18:25:44 -05:00
PikalaxALT
0eb0c40ba7 buttonsound 2015-11-29 22:29:45 -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