Eduardo Quezada
|
afcc1178b2
|
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
# Conflicts:
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# include/battle_controllers.h
# include/battle_script_commands.h
# include/battle_util.h
# include/constants/battle_script_commands.h
# include/constants/global.h
# include/decompress.h
# src/battle_anim_effects_1.c
# src/battle_anim_normal.c
# src/battle_anim_poison.c
# src/battle_anim_water.c
# src/battle_arena.c
# src/battle_controller_link_opponent.c
# src/battle_controller_link_partner.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_controller_recorded_opponent.c
# src/battle_controller_recorded_player.c
# src/battle_controller_safari.c
# src/battle_controller_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/berry.c
# src/data/trainers.h
# src/decompress.c
# src/field_effect.c
# src/hall_of_fame.c
# src/overworld.c
# src/pokeball.c
# src/pokemon.c
# src/pokemon_icon.c
# src/pokemon_storage_system.c
# src/scrcmd.c
|
2022-08-22 20:30:45 -04:00 |
|
Eduardo Quezada
|
01558ff8f3
|
Struct pointers star standarizing
|
2022-07-29 11:15:33 -04:00 |
|
Eduardo Quezada
|
7b3401ee27
|
Standarized use of star in pointer types
|
2022-07-29 10:17:58 -04:00 |
|
Eduardo Quezada
|
a37d8b1346
|
Documented boolean uses
|
2022-07-25 14:59:14 -04:00 |
|
SubzeroEclipse
|
58c4829a3c
|
Missed a few ones
|
2022-02-18 22:25:35 +01:00 |
|
SubzeroEclipse
|
c9004c6cc4
|
Decapped Gen 3 Berries (names and descriptions)
|
2022-02-14 14:49:13 +01:00 |
|
SubzeroEclipse
|
888ab0b96e
|
Decapped berries' names
|
2022-02-03 13:56:19 +01:00 |
|
ultima-soul
|
356cf96654
|
Match berry data to new berry order, correct Gen 4+ berry data, and add back Enigma Berry e-Reader data entries.
|
2021-12-15 19:33:35 -08:00 |
|
ultima-soul
|
26f29a04fd
|
Revert "Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync"
This reverts commit ac2bcece75, reversing
changes made to 349262ebc3.
|
2021-12-10 09:41:54 -08:00 |
|
LOuroboros
|
2e67153982
|
Renamed the Enigma Berries' constants
|
2021-12-01 22:16:38 -03:00 |
|
ultima-soul
|
c74e19c062
|
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_id_revamp
|
2021-11-09 20:58:19 -08:00 |
|
BuffelSaft
|
1429170d16
|
Fix long descriptions
Just noticed some of these didn't fit in the box.
|
2021-10-26 16:45:49 +13:00 |
|
BuffelSaft
|
adcf563ba1
|
Add missing berry data
Certain gen 4+ berries were missing graphics and berry data. Adding this data allows them to be viewed and planted.
|
2021-10-26 14:42:06 +13:00 |
|
ultima-soul
|
53e900a643
|
Rearranged rest of item ids except for Key Items.
|
2021-07-02 22:43:50 -07:00 |
|
ultima-soul
|
4a81102a46
|
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
|
2021-04-02 13:57:19 -07:00 |
|
ultima-soul
|
7abfe7469a
|
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
|
2021-03-23 18:41:53 -07:00 |
|
GriffinR
|
22e2c0a47c
|
Document Berry Crush
|
2021-03-18 15:18:23 -04:00 |
|
GriffinR
|
0851c34bac
|
Add berry tree id constants
|
2021-02-05 15:25:12 -05:00 |
|
GriffinR
|
92bd6400b7
|
Fix up berry sparkle
|
2021-01-26 05:40:34 -05:00 |
|
Eduardo Quezada D'Ottone
|
8d86169283
|
Merge remote-tracking branch 'pret/master' into IE-pretSync
|
2020-11-07 14:54:52 -03:00 |
|
aaaaaa123456789
|
7dc95a0103
|
Undo PokeCodec's PRs
This commit undoes most of PokeCodec's PRs after the debate in chat. Some
harmless or completely superseded PRs have been left alone, as there is not
much benefit in attempting to undo them.
Reverts #1104, #1108, #1115, #1118, #1119, #1124, #1126, #1127, #1132, #1136,
#1137, #1139, #1140, #1144, #1148, #1149, #1150, #1153, #1155, #1177, #1179,
#1180, #1181, #1182 and #1183.
|
2020-09-13 06:30:55 -03:00 |
|
DizzyEggg
|
35559d6b71
|
Merge with master
|
2020-08-27 10:58:31 +02:00 |
|
PokeCodec
|
c5aa91741b
|
Change signedness and add casts to avoid implicit conversion warnings
|
2020-07-24 22:18:57 -04:00 |
|
DizzyEggg
|
e03fea84d0
|
Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion
|
2020-07-11 12:46:41 +02:00 |
|
GriffinR
|
f53e2491bf
|
Document union_room_player_avatar.c
|
2020-06-01 10:23:12 -04:00 |
|
hondew
|
84f012fc6e
|
Update external links
|
2020-05-02 13:59:28 -04:00 |
|
hondew
|
048d1ffbdb
|
Clarify stages
|
2020-05-02 13:38:25 -04:00 |
|
hondew
|
49184cd799
|
Document berry yield
fix wording
|
2020-05-02 11:51:49 -04:00 |
|
DizzyEggg
|
13c0c64d70
|
Merge with master
|
2020-02-23 12:41:36 +01:00 |
|
GriffinR
|
4c52cf9ed1
|
Fix event constant file names
|
2019-11-21 14:03:35 -05: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 |
|
DizzyEggg
|
cb6bafcb7f
|
Merge with master
|
2019-10-06 14:40:12 +02:00 |
|
GriffinR
|
06af24bce5
|
Use misc ScrCmd constants
|
2019-09-16 19:44:47 -05:00 |
|
DizzyEggg
|
f97125fc63
|
Fill most of what new berries data
|
2019-04-15 11:50:31 +02:00 |
|
DizzyEggg
|
dc764698c9
|
Use implicilt berry indexes in arrays
|
2019-04-14 10:15:18 -05:00 |
|
Phlosioneer
|
3ceb1667c9
|
Reduce externs
|
2019-03-01 22:32:50 -05:00 |
|
Marcus Huderle
|
b6ee970e7a
|
Minor berry.c cleanup
|
2018-12-31 16:53:38 -06:00 |
|
Melody
|
2615ece23b
|
Use normal apostrophes like adults
|
2018-12-07 10:41:08 -05:00 |
|
DizzyEggg
|
c7ca38ccf3
|
Match DecompressGlyphTile
|
2018-11-21 21:58:35 +01:00 |
|
Slawter666
|
15117a8d09
|
Remove redundancy in berry.c
|
2018-11-06 23:15:57 +00:00 |
|
Slawter666
|
3d8874d919
|
Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise
|
2018-10-21 00:20:09 +01:00 |
|
Slawter666
|
b7b1d609d0
|
More synchronisation
|
2018-10-17 13:52:26 +01:00 |
|
Diegoisawesome
|
e75f0b4f80
|
Port/decompile field_control_avatar
|
2018-10-16 21:47:08 -05:00 |
|
DizzyEggg
|
e28ce3be78
|
Fix the strings length issue
|
2018-09-01 22:03:21 +02:00 |
|
Marcus Huderle
|
4d13e3394a
|
Bring all movement function names up-to-date with pokeruby
|
2018-06-13 17:51:26 -05:00 |
|
Marcus Huderle
|
aa9a45c16f
|
Rebrand 'map object' and 'field object' to 'event object'
|
2018-06-11 19:11:48 -05:00 |
|
Marcus Huderle
|
4018acfae1
|
Update event object struct members
|
2018-06-11 09:19:17 -05:00 |
|
DizzyEggg
|
9f97646724
|
make item compile
|
2018-04-29 15:34:14 +02:00 |
|
camthesaxman
|
19fbf024ff
|
fix merge conflicts
|
2017-12-05 12:42:30 -06:00 |
|