Ariel A
|
685a8a9118
|
Merge remote-tracking branch 'upstream/master' into followers
|
2025-06-24 20:39:12 -04:00 |
|
GriffinR
|
929bc8b990
|
Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6
|
2025-05-14 11:50:11 -04:00 |
|
Ariel A
|
ef05bbf394
|
Merge remote-tracking branch 'upstream/master' into followers
|
2025-02-10 00:11:38 -05:00 |
|
Eduardo Quezada
|
3f98c78297
|
Added POKEMART_LIST_END to avoid users accidentally removing it (#1947)
|
2024-12-04 17:38:23 -05:00 |
|
GriffinR
|
f61c0099b9
|
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
|
2024-10-12 23:34:02 -04:00 |
|
GriffinR
|
bf17d54b52
|
Finish adding local IDs to map.json files
|
2024-10-12 23:32:28 -04:00 |
|
Eduardo Quezada
|
ebbcb7d025
|
Whitespace, documentation and style
|
2024-01-22 19:12:52 -03:00 |
|
Ariel A
|
e6d1cfae24
|
Merge branch 'master' into followers
|
2022-11-21 21:21:50 -05:00 |
|
GriffinR
|
36551dff2f
|
Treat warp ids as strings to allow constants
|
2022-09-03 15:43:43 -04:00 |
|
Ariel A
|
9beee311c4
|
Merge branch 'master' into romhack
|
2022-07-17 15:13:15 -04:00 |
|
GriffinR
|
62f3f144ab
|
Clean up some trainer hill
|
2022-03-31 12:54:07 -04:00 |
|
Ariel A
|
c29516bc2f
|
Fixed bug with follower update after the party was healed. Credit: Jaizu
|
2021-12-22 22:14:28 -05:00 |
|
GriffinR
|
e66ea0cb99
|
Reformat compare + goto_if/call_if to single statements
|
2021-11-18 23:06:51 -05:00 |
|
GriffinR
|
61aa9c3ba9
|
More updating event macro comments
|
2021-11-16 17:46:34 -05:00 |
|
GriffinR
|
06351bf63c
|
Remove address comments
|
2021-07-20 15:18:31 -04:00 |
|
GriffinR
|
f602a9dcbf
|
Use bool for multichoice ignoreBPress
|
2021-03-31 00:35:56 -04:00 |
|
GriffinR
|
3014241179
|
Give songs meaningful english names
|
2020-08-20 19:06:14 -04:00 |
|
GriffinR
|
af09e73d67
|
Merge branch 'master' into doc-overworld
|
2020-07-18 20:24:09 -04:00 |
|
GriffinR
|
4ea6992172
|
Continue documenting overworld/field effects
|
2020-06-29 01:26:29 -04:00 |
|
GriffinR
|
fac6288156
|
Add local object event ids for referenced objects
|
2020-06-22 17:18:58 -04:00 |
|
GriffinR
|
e5757a3def
|
Use trainer type constants
|
2020-04-28 19:59:08 -05:00 |
|
GriffinR
|
b1d26e10a8
|
Sync map header property names with pokefirered
|
2020-04-28 19:59:08 -05:00 |
|
GriffinR
|
949509aade
|
Merge branch 'master' into fix-eventobj
|
2019-12-18 13:16:38 -05:00 |
|
GriffinR
|
96ec5e1b84
|
Use fadescreen constants
|
2019-12-15 11:42:50 -05:00 |
|
GriffinR
|
f559fa3fe2
|
Merge master into ObjEvent rename
|
2019-11-25 20:00:04 -05:00 |
|
GriffinR
|
08a8dc46e3
|
Use macros for Trainer Hill
|
2019-11-25 18:37:48 -06:00 |
|
GriffinR
|
82cb741d8b
|
Standardize EVENT_OBJECT to OBJECT_EVENT
|
2019-11-20 23:12:51 -05:00 |
|
GriffinR
|
ec3e86f1d2
|
Standardize Event Object to Object Event
|
2019-11-20 22:55:44 -05:00 |
|
GriffinR
|
3bbdee61b8
|
Clean up Trainer Hill doc
|
2019-11-16 13:02:35 -06:00 |
|
GriffinR
|
5e01871f8b
|
Document Trainer Hill
|
2019-11-16 13:02:35 -06:00 |
|
GriffinR
|
c4deb4db96
|
Document field_poison
|
2019-10-06 20:04:30 -04:00 |
|
GriffinR
|
a180d2af49
|
Merge branch 'master' into document-eventscripts
|
2019-09-22 12:18:48 -04:00 |
|
GriffinR
|
de0084ef7a
|
Document multichoice ids
|
2019-09-19 00:56:51 -04:00 |
|
GriffinR
|
ecf2097abb
|
initial event_scripts documentation
|
2019-08-14 23:38:42 -04:00 |
|
garak
|
a43dcd26bd
|
finish labeling metatiles
|
2019-06-16 10:08:07 -05:00 |
|
Fontbane
|
9e74409bb2
|
Fix labels, label more scripts
|
2019-04-04 19:34:35 -05:00 |
|
Phlosioneer
|
782979f1fc
|
Finish documenting trainer hill
Trainer hill isn't anywhere close to done, but I figured out enough
to name the VAR. That's all this PR should do.
|
2019-02-27 22:16:01 -05:00 |
|
Phlosioneer
|
66f0616a2d
|
I guess I'm documenting Trainer Hill now
|
2019-02-27 21:31:05 -05:00 |
|
Phlosioneer
|
e77e7844ea
|
Name several vars, document some related events
|
2019-02-27 20:25:09 -05:00 |
|
Phlosioneer
|
8816aa527d
|
Update map script files
|
2019-02-25 08:01:22 -06:00 |
|
Phlosioneer
|
4582fd1545
|
Name a ton of commonly used event scripts
|
2019-02-24 10:10:18 -06: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 |
|
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
|
c0bc01d301
|
Move some vars to C
|
2019-01-13 13:15:23 +01:00 |
|
Marcus Huderle
|
a1ea3b5e39
|
Use map_header_flags macro (#483)
|
2018-12-26 12:20:15 -06:00 |
|
Melody
|
38293d4293
|
use player constant in obj script commands
|
2018-12-24 16:31:24 -05:00 |
|
Melody
|
55005f1588
|
improve call_if macros
|
2018-12-21 21:32:45 -05:00 |
|
Melody
|
ac2e4adf2d
|
improve goto_if macros
|
2018-12-21 20:28:24 -05:00 |
|