Eduardo Quezada
|
82252251e7
|
Merge branch '_pret/master' into _RHH/pr/master/pretMerge20241220
|
2024-12-20 16:04:33 -03:00 |
|
Eduardo Quezada
|
3f98c78297
|
Added POKEMART_LIST_END to avoid users accidentally removing it (#1947)
|
2024-12-04 17:38:23 -05:00 |
|
Eduardo Quezada
|
341ce6fd95
|
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3
# Conflicts:
# .github/workflows/build.yml
# README.md
# gflib/sprite.c
# graphics/pokemon/banette/anim_front.png
# graphics/pokemon/banette/normal.pal
# graphics/pokemon/sentret/normal.pal
# graphics/pokemon/togetic/anim_front.png
# graphics/pokemon/togetic/normal.pal
# include/battle_script_commands.h
# include/data.h
# ld_script.txt
# src/battle_controller_player.c
# src/bike.c
# src/event_object_movement.c
|
2023-06-16 21:25:16 -04:00 |
|
Ariel A
|
e6d1cfae24
|
Merge branch 'master' into followers
|
2022-11-21 21:21:50 -05:00 |
|
Eduardo Quezada
|
e4a439aa46
|
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030
# Conflicts:
# src/data/bard_music/moves.h
# src/data/bard_music/pokemon.h
|
2022-10-30 12:30:38 -03:00 |
|
GriffinR
|
36551dff2f
|
Treat warp ids as strings to allow constants
|
2022-09-03 15:43:43 -04:00 |
|
Eduardo Quezada
|
f3bebcd12c
|
Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge
# Conflicts:
# include/battle_anim.h
# include/global.h
# include/pokemon.h
# src/battle_message.c
# src/battle_script_commands.c
# src/data/pokemon/base_stats.h
|
2022-07-22 22:57:02 -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 |
|
ultima-soul
|
4f2e3bf214
|
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-12-17 21:23:54 -08: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 |
|
ultima-soul
|
988320b89a
|
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-08-17 11:25:13 -07:00 |
|
GriffinR
|
06351bf63c
|
Remove address comments
|
2021-07-20 15:18:31 -04:00 |
|
ultima-soul
|
be7acc919a
|
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-04-03 21:53:29 -07:00 |
|
GriffinR
|
f602a9dcbf
|
Use bool for multichoice ignoreBPress
|
2021-03-31 00:35:56 -04:00 |
|
DizzyEggg
|
271219f962
|
Merge with master
|
2020-09-08 12:00:51 +02:00 |
|
DizzyEggg
|
35559d6b71
|
Merge with master
|
2020-08-27 10:58:31 +02:00 |
|
GriffinR
|
3014241179
|
Give songs meaningful english names
|
2020-08-20 19:06:14 -04:00 |
|
DizzyEggg
|
11c2207839
|
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion
|
2020-07-27 14:54:32 +02: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 |
|
DizzyEggg
|
f86282f423
|
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion
|
2020-04-29 08:47:51 +02: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 |
|
DizzyEggg
|
13c0c64d70
|
Merge with master
|
2020-02-23 12:41:36 +01:00 |
|
DizzyEggg
|
9a2888fdbf
|
Merge into master
|
2019-12-23 16:46:03 +01: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 |
|
DizzyEggg
|
6e06b08c94
|
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion
|
2019-11-29 20:55:23 +01: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 |
|
DizzyEggg
|
f3f9e47f96
|
Merge
|
2019-11-22 23:10:04 +01: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 |
|
DizzyEggg
|
1d10d44a4d
|
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion
|
2019-10-19 15:17:45 +02:00 |
|
GriffinR
|
c4deb4db96
|
Document field_poison
|
2019-10-06 20:04:30 -04:00 |
|
DizzyEggg
|
cb6bafcb7f
|
Merge with master
|
2019-10-06 14:40:12 +02: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 |
|
DizzyEggg
|
34aa9b9c56
|
Merge branch 'master' into item_expansion
|
2019-06-28 09:34:16 +02:00 |
|
garak
|
a43dcd26bd
|
finish labeling metatiles
|
2019-06-16 10:08:07 -05:00 |
|
DizzyEggg
|
896602db5b
|
Begin item expansion
|
2019-04-13 13:14:45 +02: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 |
|