DizzyEggg
|
3c938d1809
|
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion
|
2020-02-23 12:42:21 +01:00 |
|
DizzyEggg
|
26e109d788
|
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion
|
2020-01-18 15:06:43 +01:00 |
|
GriffinR
|
e92cc7752b
|
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
|
2020-01-13 20:41:57 -05: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
|
c19289596d
|
Give/Take to Add/Remove for silent script macros
|
2020-01-12 23:24:52 -05:00 |
|
GriffinR
|
655910a16f
|
Merge branch 'master' into fix-eventobj
|
2020-01-12 22:42:43 -05:00 |
|
GriffinR
|
e497fc64e3
|
if_undefeated macro to if_not_defeated
|
2020-01-12 20:20:02 -05:00 |
|
GriffinR
|
f2e7b1507e
|
Port some macro/script fixes from pokefirered
|
2020-01-11 14:12:31 -05:00 |
|
GriffinR
|
ef67f2d33b
|
Merge master into ObjEvent rename and prune accidental inclusions
|
2020-01-08 05:43:06 -05:00 |
|
GriffinR
|
e5df61e362
|
Merge branch 'master' into doc-dome
|
2020-01-08 01:15:36 -05:00 |
|
GriffinR
|
fb5bea98ce
|
More battle_dome.c doc
|
2020-01-07 22:30:37 -05:00 |
|
DizzyEggg
|
cd4c3b38b5
|
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion
|
2019-12-30 13:53:59 +01:00 |
|
GriffinR
|
3efc8199d4
|
More battle_dome.c documentation
|
2019-12-25 22:27:33 -08:00 |
|
huderlem
|
ee61726136
|
Merge pull request #936 from GriffinRichards/doc-tower
Document Battle Tower scripts
|
2019-12-25 11:39:20 -06:00 |
|
DizzyEggg
|
a4a4132d26
|
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion
|
2019-12-23 16:41:44 +01:00 |
|
GriffinR
|
68cdd7b1cb
|
Merge master into ObjEvent rename
|
2019-12-21 05:19:27 -05:00 |
|
Diegoisawesome
|
026e1108b2
|
Merge pull request #935 from GriffinRichards/doc-warp
Document some warp/field screen effect
|
2019-12-20 23:44:56 -08:00 |
|
Diegoisawesome
|
d42ea06dc5
|
Merge pull request #939 from GriffinRichards/fix-compare
Use constants in compare macro
|
2019-12-20 23:40:12 -08:00 |
|
GriffinR
|
324a81ed5d
|
Reword yesnobox comment
|
2019-12-20 18:53:58 -05:00 |
|
GriffinR
|
63c8cf97d1
|
Document Battle Dome scripts and some battle_dome.c
|
2019-12-20 16:53:33 -05:00 |
|
GriffinR
|
7628019952
|
Remove references to LASTRESULT
|
2019-12-20 08:51:58 -05:00 |
|
GriffinR
|
9e08cfe55f
|
Remove uses of compare_var_to
|
2019-12-18 19:22:39 -05:00 |
|
GriffinR
|
d137a1a0c1
|
Use constants in compare macro
|
2019-12-18 19:12:09 -05:00 |
|
GriffinR
|
949509aade
|
Merge branch 'master' into fix-eventobj
|
2019-12-18 13:16:38 -05:00 |
|
GriffinR
|
23f952b34e
|
Merge master into doc-tower
|
2019-12-17 21:17:46 -05:00 |
|
GriffinR
|
ddfa0c6298
|
Document Battle Tower scripts
|
2019-12-17 20:56:13 -05:00 |
|
GriffinR
|
d1cf9006fb
|
Document some warp/field screen effect
|
2019-12-17 05:23:07 -05:00 |
|
GriffinR
|
96ec5e1b84
|
Use fadescreen constants
|
2019-12-15 11:42:50 -05:00 |
|
GriffinR
|
82f55f2381
|
Merge master into ObjEvent rename
|
2019-12-15 02:00:00 -05:00 |
|
GriffinR
|
6967caefb2
|
Split finditem_std from giveitem_std
|
2019-12-14 08:41:46 -06:00 |
|
GriffinR
|
75b0c9d7a9
|
Document Battle Pyramid scripts
|
2019-12-14 08:38:26 -06:00 |
|
GriffinR
|
aa72c0ada3
|
Document Battle Factory scripts
|
2019-12-14 08:32:32 -06:00 |
|
GriffinR
|
6556b556dd
|
Merge branch 'master' into fix-eventobj
|
2019-12-11 01:09:06 -05:00 |
|
GriffinR
|
49f1a90534
|
Document Battle Pike scripts
|
2019-12-10 19:31:27 -06:00 |
|
DizzyEggg
|
2a6e4e0a2a
|
Merge with master
|
2019-12-09 08:29:10 +01:00 |
|
GriffinR
|
c51e0f3bae
|
Merge branch 'master' into fix-eventobj
|
2019-12-06 02:34:54 -05:00 |
|
GriffinR
|
49c6ae1ac6
|
Add some macro comments
|
2019-12-05 21:11:17 -06:00 |
|
GriffinR
|
467a103bcc
|
Set up Battle Tent macros
|
2019-12-05 21:11:17 -06:00 |
|
GriffinR
|
fdae25eab2
|
Set up Battle Pyramid macros
|
2019-12-05 21:11:17 -06:00 |
|
GriffinR
|
9fcfbdbef5
|
Set up Battle Factory macros
|
2019-12-05 21:11:17 -06:00 |
|
GriffinR
|
41c1c9ca8a
|
Set up Battle Pike macros
|
2019-12-05 21:11:17 -06:00 |
|
GriffinR
|
9b3d1cfab6
|
Set up Battle Dome and Tower macros
|
2019-12-05 21:11:17 -06:00 |
|
GriffinR
|
be17c1602d
|
Set up remaining facility script doc, use Palace macros
|
2019-12-05 21:11:17 -06:00 |
|
DizzyEggg
|
7ff3f32a95
|
Merge
|
2019-11-29 21:05:44 +01:00 |
|
GriffinR
|
cb90f22c5e
|
Merge master into ObjEvent rename
|
2019-11-27 12:51:10 -05:00 |
|
GriffinR
|
70d1f54ab9
|
Remove TODO comment for battle arena macros
|
2019-11-26 18:47:48 -06:00 |
|
GriffinR
|
8d870d94c9
|
Document Battle Arena scripts
|
2019-11-26 18:47:48 -06:00 |
|
GriffinR
|
f559fa3fe2
|
Merge master into ObjEvent rename
|
2019-11-25 20:00:04 -05:00 |
|
GriffinR
|
cc81b5032b
|
Split frontier macros and comment frontier_util.inc
|
2019-11-25 18:37:48 -06:00 |
|
GriffinR
|
63ee15fc28
|
Document Frontier Util
|
2019-11-25 18:37:48 -06:00 |
|