46b00b11d4
match all the functions
2020-01-16 08:14:27 -06:00
c2be2e8c69
sync documentation from firered
2020-01-16 08:14:27 -06:00
8a5f292618
document symbols
2020-01-16 08:14:27 -06:00
ea8b1011d3
Merge master into fix-eventobj
2020-01-15 16:11:20 -05:00
5fff2f2234
Use SHINY_ODDS macro where intended
...
The 3 locations where SHINY_ODDS was added generate mon sprites for
display in the dex, at game start and on starter choice.
The arguments are intended for otId but in this case they are set to the
same value as SHINY_ODDS to prevent the pictures created from using the
shiny palette.
2020-01-15 08:10:20 -06:00
69833181d9
Merge pull request #803 from tustin2121/tustin2121-patch-5
...
Document cave transition code.
2020-01-13 20:43:49 -06:00
755ae0facc
Use empty braces for last null entry in sTransitionTypes array
2020-01-13 20:31:40 -06:00
5a2d676e71
Merge remote-tracking branch 'upstream' into tustin2121-patch-5
2020-01-13 20:26:20 -06:00
22931846d6
Fix Colosseum name porymap issue
2020-01-13 20:20:48 -06:00
e92cc7752b
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
736f3bbbe0
Remove false positives from partial doc calcrom
2020-01-13 19:34:27 -06:00
6d6c57f383
Merge pull request #953 from GriffinRichards/sync-script
...
Port some macro/script fixes from pokefirered
2020-01-13 19:33:47 -06:00
96720db083
Remove unnecessary removeitem arguments
2020-01-12 23:29:19 -05:00
c19289596d
Give/Take to Add/Remove for silent script macros
2020-01-12 23:24:52 -05:00
655910a16f
Merge branch 'master' into fix-eventobj
2020-01-12 22:42:43 -05:00
fa5816915d
Merge pull request #949 from GriffinRichards/doc-dome
...
Document Battle Dome and add facility party constants
2020-01-12 20:10:03 -06:00
43962fe141
Fix BuffeInGameTradeMonName typo
2020-01-12 19:45:04 -06:00
10220d3b76
Label TryRecordMixLinkup
2020-01-12 19:39:30 -06:00
e736c2d2fd
Document some easy chat specials
2020-01-12 19:39:30 -06:00
c27a4778ee
Standardize prebattle -> intro
2020-01-12 19:39:30 -06:00
6a470ddfda
Some script clean up, document secret base secrets show
2020-01-12 19:39:30 -06:00
e497fc64e3
if_undefeated macro to if_not_defeated
2020-01-12 20:20:02 -05:00
0284014e0e
Add missing save status use
2020-01-12 18:42:41 -06:00
58e64b9524
Clean up some of save.c
2020-01-12 18:42:41 -06:00
f2e7b1507e
Port some macro/script fixes from pokefirered
2020-01-11 14:12:31 -05:00
de49445a79
Merge pull request #952 from PikalaxALT/real_match_8072308
...
Match sub_8072308
2020-01-10 17:39:18 -05:00
98b2ab9a77
Match sub_8072308
2020-01-10 16:38:47 -05:00
635267ce32
Merge branch 'master' into fix-eventobj
2020-01-08 05:51:49 -05:00
ef67f2d33b
Merge master into ObjEvent rename and prune accidental inclusions
2020-01-08 05:43:06 -05:00
e5df61e362
Merge branch 'master' into doc-dome
2020-01-08 01:15:36 -05:00
017fa294b5
Add battle tent mon/trainer constants
2020-01-08 01:07:53 -05:00
fb5bea98ce
More battle_dome.c doc
2020-01-07 22:30:37 -05:00
8b1595ebc3
Pokédex search menu documentation
2020-01-06 15:18:58 -06:00
c85ca4b860
Standardize farfetchd spelling
2020-01-06 15:17:11 -06:00
379f7f5149
Add braces to trainer party moves
2020-01-06 15:16:49 -06:00
bb692a03eb
Add frontier mon constants
2020-01-03 23:20:11 -05:00
ef751c8d1b
Fix formatting and remove unnecessary comments
2019-12-28 12:07:02 -06:00
3b05398975
Merge pull request #945 from Fontbane/patch-5
...
Give rival and Maxie parties better names
2019-12-28 12:06:35 -06:00
3efc8199d4
More battle_dome.c documentation
2019-12-25 22:27:33 -08:00
31b4656324
Labels better
2019-12-25 22:39:06 -05:00
2e8c20d72f
Update trainers.h
2019-12-25 20:48:40 -05:00
8d64bc9df8
Merge pull request #944 from GriffinRichards/doc-itemuse
...
Document item_use.c
2019-12-25 11:59:07 -06:00
ee61726136
Merge pull request #936 from GriffinRichards/doc-tower
...
Document Battle Tower scripts
2019-12-25 11:39:20 -06:00
b80fa767ab
Give rivals and Maxie battles better names
...
Name describes where the battle is and for rivals, which starter the player chose.
2019-12-23 10:42:06 -05:00
749965d56b
Document item_use.c
2019-12-21 21:39:30 -05:00
68cdd7b1cb
Merge master into ObjEvent rename
2019-12-21 05:19:27 -05:00
026e1108b2
Merge pull request #935 from GriffinRichards/doc-warp
...
Document some warp/field screen effect
2019-12-20 23:44:56 -08:00
d42ea06dc5
Merge pull request #939 from GriffinRichards/fix-compare
...
Use constants in compare macro
2019-12-20 23:40:12 -08:00
e4e3d439dc
Merge pull request #941 from GriffinRichards/fix-lastresult
...
Remove references to LASTRESULT
2019-12-20 23:38:56 -08:00
4e10133545
Merge pull request #940 from Kurausukun/master
...
update instrument sample names
2019-12-20 23:38:30 -08:00
jiangzhengwenjz