Rangi
72cdcb621c
Merge branch 'master' of https://github.com/pret/pokecrystal
...
# Conflicts:
# maps/Route25.asm
# maps/Route27.asm
# maps/Route35.asm
# maps/Route39.asm
# maps/Route42.asm
# maps/Route43.asm
# maps/Route43MahoganyGate.asm
# maps/Route45.asm
# maps/Route5CleanseTagHouse.asm
# maps/Route6SaffronGate.asm
# maps/Route7SaffronGate.asm
# maps/ViridianCity.asm
2018-01-30 22:01:20 -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
surskitty
8874ec7252
Completing labels for Route 35.
2018-01-23 23:49:50 -05:00
Rangi
8f2878c37e
trainers put the class and id first: trainer YOUNGSTER, JOEY1, ...
2018-01-23 13:08:48 -05:00
surskitty
fbc6fe4722
Merge branch 'master' of github.com:pret/pokecrystal
2018-01-23 00:02:56 -05:00
Remy Oukaour
bf074f3598
map_header → map_def; map_header_2 → map_data
2018-01-16 23:25:00 -05:00
surskitty
d588033748
Route 35 local labels
2018-01-15 23:30:39 -05:00
Remy Oukaour
d83aefb30a
Use more constants in scripts
2018-01-12 02:27:42 -05:00
Remy Oukaour
84e22eb578
Consistent (x, y) coordinate formatting in map scripts
2017-12-28 14:31:25 -05:00
Remy Oukaour
2a565f747c
Fix #432 : Bird_keeper → BirdKeeper, Bug_catcher → BugCatcher
2017-12-26 20:42:12 -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
IIMarckus
88328f18b6
Improve some map script labels.
2016-04-06 23:00:08 -06:00
PikalaxALT
2bd45ca574
Move effects; no more reloadmapmusic, returnafterbattle
2015-12-26 19:22:27 -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
92a8c491c3
Break up engine/sprites.asm; address yenatch's comments
2015-12-01 21:54:11 -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
6d47be8d8c
Fruit tree constants, more mail engine
2015-11-18 10:42:42 -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
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
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
63cc4daae2
prefix wram varables with w.
2015-07-10 14:04:00 -06:00
IIMarckus
07a12b37b6
Add more event flags.
2015-07-10 06:08:03 -06:00
IIMarckus
86c13acf84
Add more event flags and fight counters for phone scripts.
2015-07-10 04:31:08 -06:00
IIMarckus
d1fbc077a7
Label fight counters for phone call rematches.
2015-07-10 03:37:34 -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
