huderlem
|
69833181d9
|
Merge pull request #803 from tustin2121/tustin2121-patch-5
Document cave transition code.
|
2020-01-13 20:43:49 -06:00 |
|
Marcus Huderle
|
755ae0facc
|
Use empty braces for last null entry in sTransitionTypes array
|
2020-01-13 20:31:40 -06:00 |
|
Marcus Huderle
|
5a2d676e71
|
Merge remote-tracking branch 'upstream' into tustin2121-patch-5
|
2020-01-13 20:26:20 -06:00 |
|
GriffinR
|
22931846d6
|
Fix Colosseum name porymap issue
|
2020-01-13 20:20:48 -06:00 |
|
GriffinR
|
736f3bbbe0
|
Remove false positives from partial doc calcrom
|
2020-01-13 19:34:27 -06:00 |
|
huderlem
|
6d6c57f383
|
Merge pull request #953 from GriffinRichards/sync-script
Port some macro/script fixes from pokefirered
|
2020-01-13 19:33:47 -06:00 |
|
GriffinR
|
96720db083
|
Remove unnecessary removeitem arguments
|
2020-01-12 23:29:19 -05:00 |
|
GriffinR
|
c19289596d
|
Give/Take to Add/Remove for silent script macros
|
2020-01-12 23:24:52 -05:00 |
|
huderlem
|
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 |
|
GriffinR
|
43962fe141
|
Fix BuffeInGameTradeMonName typo
|
2020-01-12 19:45:04 -06:00 |
|
GriffinR
|
10220d3b76
|
Label TryRecordMixLinkup
|
2020-01-12 19:39:30 -06:00 |
|
GriffinR
|
e736c2d2fd
|
Document some easy chat specials
|
2020-01-12 19:39:30 -06:00 |
|
GriffinR
|
c27a4778ee
|
Standardize prebattle -> intro
|
2020-01-12 19:39:30 -06:00 |
|
GriffinR
|
6a470ddfda
|
Some script clean up, document secret base secrets show
|
2020-01-12 19:39:30 -06:00 |
|
GriffinR
|
e497fc64e3
|
if_undefeated macro to if_not_defeated
|
2020-01-12 20:20:02 -05:00 |
|
GriffinR
|
0284014e0e
|
Add missing save status use
|
2020-01-12 18:42:41 -06:00 |
|
GriffinR
|
58e64b9524
|
Clean up some of save.c
|
2020-01-12 18:42:41 -06:00 |
|
DizzyEggg
|
1141e733eb
|
Merge with master
|
2020-01-12 14:29:43 +01:00 |
|
GriffinR
|
f2e7b1507e
|
Port some macro/script fixes from pokefirered
|
2020-01-11 14:12:31 -05:00 |
|
PikalaxALT
|
de49445a79
|
Merge pull request #952 from PikalaxALT/real_match_8072308
Match sub_8072308
|
2020-01-10 17:39:18 -05:00 |
|
PikalaxALT
|
98b2ab9a77
|
Match sub_8072308
|
2020-01-10 16:38:47 -05:00 |
|
GriffinR
|
e5df61e362
|
Merge branch 'master' into doc-dome
|
2020-01-08 01:15:36 -05:00 |
|
GriffinR
|
017fa294b5
|
Add battle tent mon/trainer constants
|
2020-01-08 01:07:53 -05:00 |
|
GriffinR
|
fb5bea98ce
|
More battle_dome.c doc
|
2020-01-07 22:30:37 -05:00 |
|
Slawter666
|
8b1595ebc3
|
Pokédex search menu documentation
|
2020-01-06 15:18:58 -06:00 |
|
GriffinR
|
c85ca4b860
|
Standardize farfetchd spelling
|
2020-01-06 15:17:11 -06:00 |
|
GriffinR
|
379f7f5149
|
Add braces to trainer party moves
|
2020-01-06 15:16:49 -06:00 |
|
DizzyEggg
|
ed46cde304
|
Fix Persim Berry and cure attract battler assignment
|
2020-01-06 21:33:44 +01:00 |
|
DizzyEggg
|
952bdbd9f5
|
Steadfast string fix
|
2020-01-04 18:41:59 +01:00 |
|
DizzyEggg
|
cafb0c3b6a
|
Fix Surf taking 3 pp
|
2020-01-04 18:17:26 +01:00 |
|
GriffinR
|
bb692a03eb
|
Add frontier mon constants
|
2020-01-03 23:20:11 -05:00 |
|
DizzyEggg
|
fcf5870062
|
Fix wild mons in double battles not having item
|
2020-01-01 11:12:04 +01:00 |
|
DizzyEggg
|
d21449e19c
|
Fix Lava Plume animation in double battles
|
2020-01-01 10:57:27 +01:00 |
|
DizzyEggg
|
b69292248c
|
Add constants for special multi battles
|
2020-01-01 00:22:42 +01:00 |
|
DizzyEggg
|
39e3b0b740
|
Form changes layout and Stance Change Aegi
|
2019-12-31 19:11:53 +01:00 |
|
DizzyEggg
|
b15f0b3bb3
|
Comatose
|
2019-12-31 16:36:53 +01:00 |
|
DizzyEggg
|
7051f261d1
|
Fix Queenly Majesty
|
2019-12-31 13:33:54 +01:00 |
|
DizzyEggg
|
4c9ea32d19
|
Merge with master
|
2019-12-30 18:52:23 +01:00 |
|
DizzyEggg
|
770a57bec7
|
Fix some moves hitting the user
|
2019-12-30 13:14:20 +01:00 |
|
Marcus Huderle
|
ef751c8d1b
|
Fix formatting and remove unnecessary comments
|
2019-12-28 12:07:02 -06:00 |
|
huderlem
|
3b05398975
|
Merge pull request #945 from Fontbane/patch-5
Give rival and Maxie parties better names
|
2019-12-28 12:06:35 -06:00 |
|
GriffinR
|
3efc8199d4
|
More battle_dome.c documentation
|
2019-12-25 22:27:33 -08:00 |
|
Fontbane
|
31b4656324
|
Labels better
|
2019-12-25 22:39:06 -05:00 |
|
Fontbane
|
2e8c20d72f
|
Update trainers.h
|
2019-12-25 20:48:40 -05:00 |
|
huderlem
|
8d64bc9df8
|
Merge pull request #944 from GriffinRichards/doc-itemuse
Document item_use.c
|
2019-12-25 11:59:07 -06:00 |
|
huderlem
|
ee61726136
|
Merge pull request #936 from GriffinRichards/doc-tower
Document Battle Tower scripts
|
2019-12-25 11:39:20 -06:00 |
|
DizzyEggg
|
77842b0376
|
Contact moves for Aftermath and Bestow for Unburden
|
2019-12-25 12:19:09 +01:00 |
|
DizzyEggg
|
eb029d557b
|
Merge pull request #215 from LOuroboros/aftermath
Implemented Aftermath's effect
|
2019-12-25 12:04:09 +01:00 |
|
DizzyEggg
|
5e5767bb5c
|
Merge pull request #216 from ultima-soul/unburden
Implement Unburden
|
2019-12-25 12:01:25 +01:00 |
|
ultima-soul
|
332aa80a33
|
Resolve review comments and encapsulate Unburden check and set.
|
2019-12-23 09:25:26 -08:00 |
|