Commit Graph

47 Commits

Author SHA1 Message Date
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
xCrystal
b4e087167f More unreferenced labels and unused text 2018-01-02 19:38:56 +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
17058aaec2 Auto-label more map scripts 2017-12-17 20:56:35 -05:00
Remy Oukaour
b4261d27d8 Use new palette constants 2017-12-10 20:50:08 -05:00
Remy Oukaour
66527d861f "Trainer*AfterBattleText" labels 2017-12-10 15:44:41 -05: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
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
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
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
3cadc7b012 give/takeitem *, 1: the 1 is optional 2015-11-04 20:20:14 -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
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
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
60cd04b023 Trainer data structure and field move functions
Trainer data in map scripts is now a macro-defined structure.

Field move functions in main.asm are now nearly completely annotated, with local references.

Trailing white space deleted.
2015-07-18 23:45:39 -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
63cc4daae2 prefix wram varables with w. 2015-07-10 14:04:00 -06:00
IIMarckus
86c13acf84 Add more event flags and fight counters for phone scripts. 2015-07-10 04:31:08 -06:00
IIMarckus
718c2260e9 Use constants for overworld phone script flags. 2015-07-10 02:36:57 -06:00
IIMarckus
2c98c694e3 Fill out trainer event flags. 2015-07-10 02:20:21 -06:00
IIMarckus
6f3b2d6de8 Add constants for checkcodes.
From PikalaxALT.
2015-07-09 20:23:23 -06:00
IIMarckus
f16d60e3f9 Update some event flags. 2015-06-24 21:20:04 -06:00
IIMarckus
fdfbeb7e5f More std enums. 2015-06-24 19:26:24 -06:00
IIMarckus
4d532beee6 Remove trailing newlines. 2015-06-23 12:24:51 -06:00
yenatch
b097617f9f Blind wram in maps. 2015-02-10 15:43:34 -08:00
yenatch
8583cc4724 Stop using the preprocessor. 2015-01-20 00:01:23 -08:00
yenatch
e703b5ef48 Text macros in maps/.
Looks fine at a glance.
2014-03-06 00:29:44 -05:00
yenatch
73bd376cfd rename bit2 script commands to flag 2013-09-24 03:51:42 -04:00
yenatch
3134b26f7b rename bit1 script commands to event 2013-09-24 03:48:58 -04:00
yenatch
1323008f6f first round of event flag constants in map events
this is a little over half.. 610 to go
2013-09-05 05:19:35 -04:00
yenatch
4ac88d6cdc sprite constants in map events 2013-07-12 17:06:11 -04:00
yenatch
48dbfc6333 Split map scripts, text, events from main.asm
The commit we deserve
2013-02-17 01:59:06 -05:00