GriffinR
60a9dc6a0e
Fix map script names
2019-10-13 15:40:15 -04:00
GriffinR
bb23128b77
Merge conflict resolves into review changes
2019-10-13 15:33:19 -04:00
GriffinR
144c5888a1
Fix map script names
2019-10-13 15:29:53 -04:00
GriffinR
a081124a20
Merge branch 'master' into doc-inc
2019-10-13 15:26:44 -04:00
Marcus Huderle
e47b3efdfe
Unify showmonpic and hidemonpic script command names with their function names
2019-10-12 18:58:54 -05:00
Marcus Huderle
8df4982b3f
Merge remote-tracking branch 'upstream/master' into document-trade
2019-10-12 15:39:17 -05:00
GriffinR
4e2be7ff5e
Review changes for #835
2019-10-12 15:14:57 -05:00
GriffinR
1b7607bd91
Document cable_club.inc
2019-10-12 15:14:57 -05:00
GriffinR
70d1d8956e
Document elite_four.inc and the E4 map scripts
2019-10-08 02:25:31 -04:00
GriffinR
2368f57669
Merge branch 'master' into doc-inc
2019-10-07 17:37:35 -04:00
GriffinR
d8f5e73bb7
Merge branch 'master' into doc-inc
2019-10-07 17:37:04 -04:00
GriffinR
bcf74df27f
Use B_OUTCOME constants for GetBattleOutcome
2019-10-07 16:36:47 -05:00
GriffinR
7ba11b7a1b
Use VAR_FACING constants
2019-10-07 16:36:02 -05:00
GriffinR
628301d6d5
Document unusual_weather.inc
2019-10-07 11:29:14 -04:00
GriffinR
0df304d629
Document roulette.inc
2019-10-07 02:00:16 -04:00
GriffinR
81ee8f07ef
Document pc.inc and prof_birch.inc
2019-10-07 01:13:34 -04:00
GriffinR
c4deb4db96
Document field_poison
2019-10-06 20:04:30 -04:00
GriffinR
f179ab95c0
Document move tutors
2019-10-06 17:30:17 -04:00
GriffinR
02070eaf73
Document kecleon
2019-10-06 16:06:34 -04:00
GriffinR
748a1dbdd4
Document cave hole
2019-10-06 14:16:37 -04:00
GriffinR
d914c1d659
Document common movements
2019-10-06 13:55:30 -04:00
GriffinR
c3c8fb40cf
Move trade data, some trade.c clean up documentation
2019-10-03 01:16:22 -04:00
GriffinR
9aed405851
Document a few field specials
2019-09-30 01:42:52 -04:00
GriffinR
1491b1855b
Merge branch 'master' into document-eventscripts
2019-09-26 15:03:22 -04:00
GriffinR
801ca37f04
Document day_care.inc and related
2019-09-25 18:46:25 -05:00
GriffinR
a180d2af49
Merge branch 'master' into document-eventscripts
2019-09-22 12:18:48 -04:00
GriffinR
9fb24bbbce
Remainder of script_menu documentation
2019-09-19 18:31:09 -04:00
GriffinR
275695c189
Document more script_menu, lilycove harbor
2019-09-19 17:27:34 -04:00
GriffinR
de0084ef7a
Document multichoice ids
2019-09-19 00:56:51 -04:00
GriffinR
b596322ca2
Initial script_menu documentation
2019-09-18 18:57:25 -04:00
GriffinR
58b8d7c297
Merge branch 'master' into document-eventscripts
2019-09-17 18:01:20 -04:00
GriffinR
6ab192e739
Review changes for #807
2019-09-17 16:50:17 -05:00
GriffinR
6ab49da811
Clean up field_specials documentation
2019-09-17 16:50:17 -05:00
GriffinR
3dbd375779
Some frontier field_specials documentation
2019-09-17 16:50:17 -05:00
GriffinR
aac9658a8e
Document some field_specials data
2019-09-17 16:50:17 -05:00
GriffinR
945d3d3a27
Merge branch 'master' into document-eventscripts
2019-09-17 00:10:23 -04:00
GriffinR
06af24bce5
Use misc ScrCmd constants
2019-09-16 19:44:47 -05:00
GriffinR
826fc3154e
condense secret base mapscript labels
2019-09-06 13:01:45 -04:00
GriffinR
cb82d868af
fix secret base jsons
2019-09-06 02:49:26 -04:00
GriffinR
9fbcd552de
document remainder of secret_base scripts, delete unneeded scripts.incs
2019-09-06 02:12:00 -04:00
GriffinR
1d703e786b
move some data out of event_scripts, use game stat constants
2019-09-05 14:56:34 -04:00
GriffinR
6b04ea0727
Merge branch 'master' into document-eventscripts
2019-09-03 22:22:14 -04:00
DizzyEggg
6a3b74c59c
Use item constant in pretty petal flower shop
2019-08-30 09:48:59 +02:00
GriffinR
a46f7952f9
Use DIR constants for createvobject
...
Also uses event object ids in LinkContestRoom1
2019-08-21 17:11:06 -05:00
GriffinR
23979c4d7d
initial documentation commit
2019-08-21 17:06:55 -05:00
Tustin2121
18dee14170
Review fixes
2019-08-17 23:26:46 -04:00
Tustin2121
d63a8ba817
Replaced createvobject numbers with EVENT_OBJ_GTX defines
...
Doing this allows someone to renumber the event object graphics and still have working contests.
2019-08-17 13:38:13 -04:00
Tustin2121
1069adae46
Renaming unknown link room ids to be the same as name
...
This descrepency was causing a lot of annoyance when using porymap, because porymap generated the ids in map_groups.h from the name, and mapjson was generating map_groups.h from the id in the json files. So just name them the same already like every other map in the repo.
2019-08-17 13:26:57 -04:00
Tustin2121
f4d4424618
Folded nops into hidemoneybox and updatemoneybox
...
The nops are essential to the hidemoneybox and updatemoneybox commands when using vanilla versions of those commands. Even though they're not actually used parameters in the command implementation, they are still consumed, which means if someone were to get rid of the nops (as I did in TriHard) it causes the commands to consume bytecode that are not theirs, resulting in undefined behavior usually leading to softlocks. Folding the extra bytes into the macros means there's no chance of the extra bytes getting losts in scripts.
2019-08-17 13:25:36 -04:00
Tustin2121
6508469259
Rename movobjectoffscreen to copyobjectxytoperm
...
Renaming the command to something that makes more sense as to what the command actually does. The command copies the current xy of the instantiated object back to its template, so that the object remains in the same place if the player walks away and despawns the object, and then comes back. "moveobjectoffscreen" implies that it might be taking the object and moving it physically to an off-screen location somehow.
2019-08-17 13:18:56 -04:00