Rangi
|
cad029f936
|
Label more map scripts
|
2018-03-01 13:18:51 -05:00 |
|
Rangi
|
335c2699f0
|
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# constants/map_constants.asm
# constants/wram_constants.asm
# data/radio/oaks_pkmn_talk_routes.asm
# data/radio/pnp_hidden_places.asm
# engine/battle/core.asm
# engine/breeding.asm
# engine/phone/phone_scripts.asm
# engine/radio.asm
# maps/BattleTower1F.asm
# maps/OlivineLighthouse2F.asm
# maps/OlivineLighthouse6F.asm
# maps/PokemonFanClub.asm
# maps/RadioTower1F.asm
# maps/RadioTower2F.asm
# maps/Route30BerryHouse.asm
# maps/Route34IlexForestGate.asm
# maps/Route36NationalParkGate.asm
# maps/RuinsOfAlphKabutoChamber.asm
# maps/RuinsOfAlphResearchCenter.asm
# maps/VermilionPort.asm
# maps/VictoryRoad.asm
|
2018-02-25 20:39:54 -05:00 |
|
Rangi
|
f964d04a87
|
* loadmenuheader -> loadmenu (ead103d )
* objectface -> turnobject (c834bda )
|
2018-02-25 20:05:37 -05:00 |
|
surskitty
|
c959f7a2ea
|
Labelling, once again.
|
2018-02-03 22:37:08 -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
|
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
|
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 |
|
Rangi
|
8f2878c37e
|
trainers put the class and id first: trainer YOUNGSTER, JOEY1, ...
|
2018-01-23 13:08:48 -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
|
b28e71271d
|
Consistent stonetable cmdqueues
|
2018-01-13 01:03:42 -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
|
2f0973f3e0
|
Clean up some hex values in map scripts
|
2018-01-09 18:45:25 -05: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
|
3ed016f9e0
|
Auto-label more map scripts
|
2017-12-17 20:17:30 -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 |
|
Remy Oukaour
|
66527d861f
|
"Trainer*AfterBattleText" labels
|
2017-12-10 15:44:41 -05:00 |
|
Remy Oukaour
|
512863989f
|
Document constants with comments, actual names, and more thorough usage
|
2017-12-09 02:15:46 -05:00 |
|
surskitty
|
15015e4877
|
Making all Rocket Grunts call the constant.
|
2017-11-27 00:38:15 -05:00 |
|
pikalaxalt
|
1fa6aecbfc
|
Unify directional movement macros
|
2016-05-14 13:46:14 -04:00 |
|
pikalaxalt
|
3108c9fa6a
|
Unify step_sleep macro
|
2016-05-14 12:28:00 -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 |
|
IIMarckus
|
0a2b14309a
|
More labels cleanup in map scripts.
|
2016-04-07 04:13:59 -06:00 |
|
PikalaxALT
|
ce019e6347
|
Map callback constants
|
2016-01-06 07:44:50 -05:00 |
|
PikalaxALT
|
80aba7fc13
|
maptrigger macro
|
2016-01-05 08:46:37 -05: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
|
3980d2d736
|
.TriggerX labels are now consistently 0-based
|
2015-12-10 22:28:46 -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
|
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
|
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 |
|