DizzyEggg
|
842e379a7b
|
Merge branch 'master' into battle_engine_v2
|
2019-02-23 22:50:46 +01:00 |
|
Diegoisawesome
|
924cbe9ee4
|
Merge pull request #560 from Phlosioneer/regi-documentation
Document the regi* code more
|
2019-02-18 13:23:19 -06:00 |
|
Phlosioneer
|
486cf449b8
|
Make flag names more consistent
|
2019-02-18 14:17:02 -05:00 |
|
Phlosioneer
|
fcb541189d
|
Rename some flags, and use map ID macros
|
2019-02-18 02:02:20 -05:00 |
|
Marcus Huderle
|
19b76bffda
|
Use strings for map json trainer_type and trainer_sight_or_berry_tree_id fields
|
2019-02-16 16:56:41 -06:00 |
|
garak
|
0b1bb9e4e9
|
use strings for map json coord_event var_value
|
2019-02-16 16:14:43 -06:00 |
|
Phlosioneer
|
e90e3458cb
|
Document the regi* code more
Fixed some confusing naming, named some unknown symbols, and fixed the
names of some flags.
|
2019-02-15 18:24:55 -05:00 |
|
Diegoisawesome
|
dfb896356c
|
Merge branch 'master' of github.com:pret/pokeemerald
|
2019-02-12 00:40:42 -06:00 |
|
Diegoisawesome
|
449fb25f23
|
Clear up misnamed time-based flags and functions
|
2019-02-12 00:40:34 -06:00 |
|
DizzyEggg
|
b5d0253890
|
Merge with master
|
2019-02-10 18:17:33 +01:00 |
|
Marcus Huderle
|
6f1d2b870c
|
Give proper names to dynamic map layouts
|
2019-02-09 09:57:30 -06:00 |
|
DizzyEggg
|
aa33a61e58
|
Merge branch 'master' into battle_engine_v2
|
2019-02-07 21:17:30 +01:00 |
|
Marcus Huderle
|
3a88ab831d
|
Document more battle pyramid
|
2019-02-07 11:51:03 -06:00 |
|
Marcus Huderle
|
a1ad1bad3a
|
Document a bunch of battle pyramid
|
2019-02-06 21:14:28 -06:00 |
|
Marcus Huderle
|
d4125fef9b
|
Cleanup and add game version flag to mapjson tool
|
2019-02-04 17:28:45 -06:00 |
|
Marcus Huderle
|
29d6221935
|
Convert map data to JSON
|
2019-01-31 15:51:20 -06:00 |
|
Marcus Huderle
|
5c1667b41a
|
Define layout constants
|
2019-01-29 16:55:25 -06:00 |
|
DizzyEggg
|
7bc4a3b3f7
|
Merge with master
|
2019-01-29 22:12:53 +01:00 |
|
Marcus Huderle
|
14641e916e
|
Cleanup Rustboro City House layout label
|
2019-01-29 14:36:02 -06:00 |
|
Marcus Huderle
|
bd667102fa
|
Fix PetaburgCity map scripts label
|
2019-01-29 14:36:02 -06:00 |
|
Marcus Huderle
|
e43f341799
|
Cleanup link contest map scripts
|
2019-01-29 14:36:02 -06:00 |
|
Marcus Huderle
|
d2d44a97b8
|
Cleanup link contest map events
|
2019-01-29 14:36:02 -06:00 |
|
Marcus Huderle
|
36a1825bbe
|
Document trainer approach funcs, and use movement type constants in scripts
|
2019-01-29 14:36:02 -06:00 |
|
DizzyEggg
|
736826e863
|
New feature - battle 2 vs 1 opponent
|
2019-01-27 20:54:34 +01:00 |
|
DizzyEggg
|
897592a8d4
|
Merge branch 'master' into battle_engine_v2
|
2019-01-27 10:58:57 +01:00 |
|
DizzyEggg
|
524db6068e
|
Merge branch 'master' into trainer_card
|
2019-01-22 21:59:32 +01:00 |
|
Diegoisawesome
|
900f294011
|
Add var const prefix for some missed var numbers
|
2019-01-21 22:34:01 -06:00 |
|
DizzyEggg
|
576d1b3474
|
Document and match somne trainer card
|
2019-01-19 23:04:33 +01:00 |
|
DizzyEggg
|
2c3210f4d1
|
merge with master
|
2019-01-18 22:30:34 +01:00 |
|
DizzyEggg
|
c0bc01d301
|
Move some vars to C
|
2019-01-13 13:15:23 +01:00 |
|
DizzyEggg
|
4827776a3c
|
Merge with master
|
2019-01-05 10:14:20 +01:00 |
|
Tetrable
|
50aa222aff
|
Corrected typos
|
2019-01-03 01:54:55 +00:00 |
|
Tetrable
|
a3ebca4d81
|
Fix merge conflicts
|
2019-01-02 21:25:14 +00:00 |
|
Tetrable
|
1e3da62d24
|
Finish off labelling flags
|
2019-01-02 21:12:43 +00:00 |
|
Diegoisawesome
|
d004ce065c
|
Merge branch 'master' of github.com:pret/pokeemerald into trade
|
2018-12-31 02:30:30 -06:00 |
|
Diegoisawesome
|
2fb9f490fb
|
Almost done with trade
|
2018-12-29 12:46:15 -06:00 |
|
Melody
|
dc6c0ed17e
|
add event object var references
|
2018-12-29 11:56:53 -06:00 |
|
Marcus Huderle
|
67636b7c64
|
Document deoxys rock
|
2018-12-29 11:36:54 -06:00 |
|
DizzyEggg
|
27b1d74dad
|
Merge branch 'master' into battle_engine_v2
|
2018-12-29 15:11:54 +01:00 |
|
Melody
|
6d556f8cf7
|
improve checkplayergender calls
clean up constant definitions
make tweaks from review
|
2018-12-28 08:22:21 -06:00 |
|
Marcus Huderle
|
a1ea3b5e39
|
Use map_header_flags macro (#483)
|
2018-12-26 12:20:15 -06:00 |
|
DizzyEggg
|
517573eb4b
|
Update with master
|
2018-12-26 17:46:51 +01:00 |
|
Marcus Huderle
|
dcbc8db6a3
|
Document mirage_tower.c. (Combine fldeff_groundshake.c and fossil_specials.c)
|
2018-12-25 11:46:35 -06:00 |
|
Melody
|
c7971ecb20
|
improve event script object calls
|
2018-12-25 11:20:33 -06:00 |
|
Diegoisawesome
|
c2ca57e8ac
|
Merge pull request #477 from melthelesbian/object_script_commands
use player constant in obj script commands
|
2018-12-24 16:09:42 -06:00 |
|
Melody
|
38293d4293
|
use player constant in obj script commands
|
2018-12-24 16:31:24 -05:00 |
|
Melody
|
1e87810414
|
document setweather calls
|
2018-12-24 16:23:58 -05:00 |
|
DizzyEggg
|
6fa5f33519
|
Merge branch 'master' into battle_engine_v2
|
2018-12-24 09:07:18 +01:00 |
|
DizzyEggg
|
e54dd6a02b
|
Merge with master
|
2018-12-22 13:53:07 +01:00 |
|
Melody
|
55005f1588
|
improve call_if macros
|
2018-12-21 21:32:45 -05:00 |
|