Bivurnum
47723c34e5
Follower NPCs (follow-me) ( #6500 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-04-27 14:56:18 +02:00
Hedara
301ef288f5
Review comments
2025-04-11 11:37:36 +02:00
Hedara
b075163c57
Cleanup and config options
2025-04-10 21:17:20 +02:00
Hedara
08a2ad2c98
Merge branch 'upcoming' into merrps-dns
2025-04-09 10:01:51 +02:00
Deokishisu
eaf7549854
Replace Incorrect Slow Stairs Movement with Correct One ( #6275 )
2025-03-16 14:51:36 -07:00
hedara90
40dd3a7688
Fix compile errors with OW_BATTLE_ONLY_FORMS set to FALSE ( #6400 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-03-10 17:11:25 +01:00
Eduardo Quezada
2428af66cd
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-02-20 19:17:59 -03:00
Eduardo Quezada
ff098bc520
Reverted compound literal OW mon pic tables ( #6216 )
2025-02-19 19:17:59 +01:00
Eduardo Quezada
26daf15ce0
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-01-24 18:29:28 -03:00
Eduardo Quezada
4825e523ce
Moved mon pic tables to gSpeciesInfo + macro cleanup ( #5597 )
2025-01-20 07:52:29 -08:00
Eduardo Quezada
937b3106b4
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-01-17 19:33:48 -03:00
Eduardo Quezada
b00b2a9ded
Fixed the rest of the conditions
2025-01-17 18:11:25 -03:00
Eduardo Quezada
4233f0e277
Test permission fix
2025-01-17 18:07:56 -03:00
moostoet
3b19f6972b
Rename Furfrou Species tags to match Pokemon Showdown exports ( #6041 )
2025-01-17 14:39:52 -03:00
Eduardo Quezada
89f90e1f69
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-01-03 13:58:10 -03:00
ghoulslash
d8ea4fa1ec
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh/dexnav
2025-01-02 08:28:21 -05:00
Eduardo Quezada
dbc3cc28b8
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2024-12-21 09:31:23 -03:00
Eduardo Quezada
9a0b5756ca
Fix "PlantCloak" references ( #5821 )
2024-12-20 22:25:18 +01:00
Eduardo Quezada
458bd5ad4d
Review changes pt 1
2024-12-05 07:56:49 -03:00
Eduardo Quezada
d151e00c70
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2024-12-04 19:15:48 -03:00
ghoulslash
b488ff9b53
merge w upcoming
2024-11-03 07:11:40 -05:00
Eduardo Quezada
dfa3690d74
Added config to disable gender differences ( #5595 )
2024-10-29 15:38:26 +01:00
Eduardo Quezada
e8b8ca19a9
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-28 12:13:55 -03:00
Eduardo Quezada
3442b09852
Renamed folders and symbols to match species defines ( #5581 )
2024-10-27 20:15:11 +01:00
hedara90
c6ccc29c93
Fixed 64px uncompressed followers ( #5601 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-10-27 11:24:40 -03:00
Eduardo Quezada
1d9557811b
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2024-10-08 15:58:17 -03:00
ghoulslash
2e52e3331f
merge w upcoming
2024-10-04 12:56:21 -04:00
kittenchilly
19009c6d21
Add support for overworld sprite gender differences + add all the sprites ( #5394 )
2024-10-04 17:56:21 +02:00
Eduardo Quezada
d1056f887b
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2024-09-30 15:52:49 -03:00
ghoulslash
be3ee1ba85
merge w upcoming
2024-09-29 13:33:20 -04:00
ghoulslash
b7246a018c
merge w upcoming
2024-09-22 09:13:25 -04:00
Bassoonian
0b429a8649
Merrp merge (September 9th) ( #5359 )
2024-09-15 13:21:39 +02:00
hedara90
9633cefd11
Custom anim table follower macro & Farfetch'd example ( #5309 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-09-13 10:30:01 -03:00
Liamjd14
5d8c61d813
Pokemon follower changes for issue #5135 ( #5336 )
2024-09-12 18:55:30 +02:00
Eduardo Quezada
fc1212b060
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2024-09-11 08:09:09 -03:00
Eduardo Quezada
002c770f07
Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/master/merrpMerge
2024-09-09 13:52:34 -03:00
Liamjd14
e9c0784dc0
Gen 9 Follower pokemon sprites ( #5304 )
...
* Gen 9 Follower Sprites
2024-09-05 22:31:14 +02:00
Ariel A
42d9f24c84
feat: added OW_MON_WANDER_WALK config option
2024-09-01 17:17:24 -04:00
Eduardo Quezada
396a390114
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2024-08-29 19:58:17 -04:00
Cafei
213c097dc0
Paldean Wooper and Clodsire followers ( #5277 )
2024-08-28 11:47:08 +02:00
Greenphx9
ad969c968c
Merge branch 'lighting' of https://github.com/aarant/pokeemerald into lighting-expansion-v2
2024-08-25 17:54:28 +10:00
Eduardo Quezada
18980b20a3
Remove trailing whitespace (master) ( #5174 )
2024-08-14 19:48:20 -07:00
Hedara
a9492f5b1c
Fixed Xerneas
2024-08-06 16:52:42 +02:00
ghoulslash
0cffe4a96a
syntax fixes, turn slow movement on rock stairs default off, remove petalburg layout change
2024-07-08 14:08:15 -04:00
ghoulslash
b8dea3c7ec
sideways stairs, try to integrate with follower code
2024-06-19 10:50:59 -04:00
ghoulslash
cb1696384c
merge in original dexnav code with some rhh specific tweaks
2024-06-16 10:39:28 -04:00
Eduardo Quezada
88028c0c37
Split Pokémon Object Events from Following Pokémon functionality ( #4761 )
...
* Split Pokémon Object Events from Following Pokémon functionality
* Renamed follower pngs and palettes
* Define renames
* Reorder configs
* Renaming: SpeciesInfo fields, macros and palettes.
2024-06-13 22:46:27 +02:00
Bassoonian
03cc0ae6b3
Add option to hide substitute followers ( #4765 )
...
* Add option to hide substitute followers
* Update event_object_movement.c
2024-06-12 13:53:01 -04:00
Eduardo Quezada
3202625ca5
Restored Gen 4-8 followers
...
This reverts commit 24913f53392f6f1353d59a3975f1dfd5db9f2d00.
# Conflicts:
# src/data/pokemon/species_info/gen_4_families.h
# src/data/pokemon/species_info/gen_5_families.h
# src/data/pokemon/species_info/gen_8_families.h
2024-06-02 10:31:01 -04:00
Eduardo Quezada
569749f9c2
Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# Makefile
# gflib/sprite.h
# graphics/object_events/pics/pokemon/wailord.png
# include/constants/event_objects.h
# include/random.h
# src/data/object_events/object_event_graphics.h
# src/data/object_events/object_event_graphics_info.h
# src/data/object_events/object_event_graphics_info_pointers.h
# src/event_object_movement.c
# src/random.c
# src/scrcmd.c
2024-05-18 10:12:17 -04:00