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
GriffinR
5515e328b2
Clean up lock/unlock anim movement
2022-08-12 21:18:10 -04:00
TheXaman
2fa812df26
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into rhh_master_merge
2022-04-13 20:51:35 +02:00
GriffinR
0a0157b62c
Name unknown_16.png
2022-03-14 15:54:47 -04:00
GriffinR
b1d61b9227
Merge pull request #1641 from GriffinRichards/subsprite-arr-count
...
Use ARRAY_COUNT for obj event subsprite tables
2022-03-03 23:08:52 -05:00
GriffinR
f78f46a1e2
Use ARRAY_COUNT for obj event subsprite tables
2022-03-03 14:54:05 -05:00
GriffinR
5d58cdd297
Fix bunny hoppy typo
2022-02-28 13:34:39 -05: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 ac2bcece75349262ebc3
2021-12-10 09:41:54 -08:00
ultima-soul
ac2bcece75
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync
2021-12-09 14:16:05 -08:00
ultima-soul
349262ebc3
Merge remote-tracking branch 'rhh/item_expansion' into item_expansion_sync
2021-12-03 17:31:02 -08:00
ultima-soul
d408b56549
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-12-01 20:18:57 -08:00
LOuroboros
2e67153982
Renamed the Enigma Berries' constants
2021-12-01 22:16:38 -03:00
cbt6
c59c7b0518
Use enums for jump distances
2021-11-28 12:01:29 +08:00
ultima-soul
a8f9a54787
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-11-21 10:41:32 -08:00
Eduardo Quezada D'Ottone
70609ac742
Fixed Jacoba Berry Tree not using its own palette
2021-11-14 00:41:00 -03:00
cbt6
0fe3881961
Rename WalkInPlaceFastest to WalkInPlaceFaster
2021-11-05 01:54:34 +08:00
GriffinR
afb9ff3a40
Document files with a few remaining symbols
2021-11-02 18:06:06 -04:00
cbt6
510ccbdf4c
Move definition of constants for movement speed
2021-11-03 02:56:23 +08:00
cbt6
4cedd2d551
Rename WalkFastest functions to WalkFaster
2021-11-03 01:50:53 +08:00
cbt6
a2c2d7e230
Label indexes for movement speeds
2021-11-03 01:50:47 +08:00
cbt6
9a1764f83e
Label some animation index numbers
2021-10-30 01:37:49 +08: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
GriffinR
42d2fefe02
Merge branch 'master' into tag-none
2021-09-24 10:17:34 -04:00
GriffinR
f8f7617946
Add TAG_NONE
2021-09-14 13:14:14 -04:00
LOuroboros
554210c5e3
Removed trailing spaces in the most relevant files
...
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include *.s --include *.inc --include *.txt * | xargs sed -i 's/\s\+$//g'
Credits to Grant Murphy from Stack Overflow.
2021-08-24 19:59:32 -03:00
GriffinR
28a8fe191a
Document item menu
2021-08-10 22:13:02 -04:00
ultima-soul
75a9fdbafa
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-04-28 20:50:59 -07:00
GriffinR
d717a635c8
event_object_movement cleanup
2021-04-06 17:55:29 -04:00
GriffinR
756fad0e61
Document some event object movement
2021-04-06 14:34:36 -04:00
GriffinR
802d2b2f0f
Label Kyogre/Groudon anims
2021-04-06 03:46:19 -04:00
GriffinR
00c3044c96
Clarify Groudon/Kyogre/Rayquaza gfx names
2021-04-06 02:38:15 -04:00
GriffinR
806abe2999
Document some objev anims, make objevgfx info static
2021-04-05 19:52:35 -04:00
ultima-soul
7abfe7469a
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-03-23 18:41:53 -07:00
SphericalIce
70ff6c3b84
Rename 'hidden' Trainers/obj events to 'buried'
2021-02-14 19:25:23 +00:00
GriffinR
92bd6400b7
Fix up berry sparkle
2021-01-26 05:40:34 -05:00
ExpoSeed
208e0abe04
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
2020-12-31 18:44:43 -06:00
GriffinR
513c7c5f45
Clarify Kecleon objects
2020-11-23 14:42:47 -05:00
GriffinR
bf65c1fb25
Name object event pals/tags
2020-11-23 14:24:48 -05:00
DizzyEggg
35559d6b71
Merge with master
2020-08-27 10:58:31 +02:00
GriffinR
1ce929157f
Clean up field effect doc
2020-07-02 05:05:13 -04:00
GriffinR
4ea6992172
Continue documenting overworld/field effects
2020-06-29 01:26:29 -04:00
GriffinR
18d57a3802
Document some overworld and field effects
2020-06-23 15:48:53 -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
09b39527ff
Generalize oamtable names
2020-04-28 19:59:08 -05:00
ultima-soul
1b048c0ecf
Fix grass and Pokemon Center monitor palette issues. ( #296 )
2020-02-29 09:22:37 +01:00
DizzyEggg
13c0c64d70
Merge with master
2020-02-23 12:41:36 +01:00
Marcus Huderle
49421a41b2
Move field effects data and graphics into own directory, and cleanup naming for object events
2020-02-12 17:32:51 -06:00
