169 Commits

Author SHA1 Message Date
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
ghoulslash
384bdaee18 merge w pret 2021-11-28 19:09:43 -05: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
ghoulslash
782c16209d Merge branch 'master' of https://github.com/pret/pokeemerald into sideways_stairs 2021-10-26 13:24:33 -04: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
Ariel Antonitis
b2f901058e Changed 64x64 follower sprites to 32x32 ones, by LarryTurbo.
Sprite resource: 
https://www.deviantart.com/larryturbo/art/Resized-OWs-for-Gen-1-4-mons-larger-than-32x32-878575906
2021-09-23 23:30:46 -04:00
GriffinR
f8f7617946 Add TAG_NONE 2021-09-14 13:14:14 -04:00
Ariel Antonitis
8a3b04e837 Merge branch 'master' into romhack 2021-09-02 01:03:13 -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
ghoulslash
5b47bfacf2 Merge branch 'master' of https://github.com/pret/pokeemerald into sideways_stairs 2021-08-18 20:22:26 -06:00
GriffinR
28a8fe191a Document item menu 2021-08-10 22:13:02 -04:00
Ariel Antonitis
783149bd3f Fixed bug where moving truck had a shadow. 2021-07-20 19:38:32 -04:00
ghoulslash
cedd2967d8 merge w pret 2021-05-20 11:28:26 -06:00
ultima-soul
75a9fdbafa Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-04-28 20:50:59 -07:00
Ariel Antonitis
a36d6c3c2c Renamed OAM tables to match master.
Fixed renamed functions, etc.
2021-04-18 23:10:40 -04:00
Ariel Antonitis
221569a710 Merge branch 'master' into romhack 2021-04-18 22:17:53 -04:00
Ariel Antonitis
875c4edd50 Added some conditional messages.
Added emote graphics.
2021-04-18 21:00:27 -04: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
Evan
d3d29d7cb5 cherry pick 0cccbfd0ba608287d5f2b642ea613d9674cd919d 2021-04-01 20:12:43 -06:00
Evan
228b76e136 finish conditional slow stairs movement, clean up code a bit 2021-04-01 20:10:41 -06:00
Evan
31e9f97d52 cherry pick 4eb7fcc261934c0f9f10985761cd3e7b7abf0dab 2021-04-01 20:10:21 -06:00
ultima-soul
7abfe7469a Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-03-23 18:41:53 -07:00
Ariel Antonitis
3a0795d862 Followers disappear properly when using Surf.
Removed leftover palette 31.
2021-03-10 20:48:20 -05:00
Ariel Antonitis
d45335f1dc Fixed graphics & naming inconsistencies with master branch. 2021-03-03 03:28:03 -05:00
Ariel Antonitis
42d5fe07fa Start of implementation for time of day filter. 2021-03-03 02:05:21 -05:00
Ariel Antonitis
418cab092c Fixed old graphics info collisions. 2021-03-03 02:00:22 -05:00
Ariel Antonitis
04ce1eaf83 Added Mr. Mime & Farfetch'd. Fixed transparency issues. 2021-03-03 01:48:45 -05:00
Ariel Antonitis
bd01b80c1d Added Castform. 2021-03-03 01:47:37 -05:00
Ariel Antonitis
c9834ba967 Changed tracks behavior for airborne followers. 2021-03-03 01:47:31 -05:00
Ariel Antonitis
693246f711 Added Unown OW forms. 2021-03-03 01:47:20 -05:00
Ariel Antonitis
6969f3d6f7 Added Nidoran M & Nidoran F sprites. 2021-03-03 01:47:09 -05:00
Ariel Antonitis
6692cd992f Added all 386 follower sprites.
Allow NPC pokemon objects via a custom script header.
2021-03-03 01:46:43 -05:00
Ariel Antonitis
b7a027dab6 Fixed follower behavior on ice. 2021-03-03 01:37:48 -05:00
Ariel Antonitis
b6eed75fd8 Moved pokemon graphics lookup into table. 2021-03-03 01:35:43 -05:00
Ariel Antonitis
be60824263 Add Banette event object. 2021-03-03 01:33:26 -05:00
Ariel Antonitis
1fa2bc0df1 Fixed follower not disappearing when surfing. 2021-03-03 01:33:13 -05:00