Zimmermann Gyula
772abe6e7d
Implement GSC berry/apricorn tree functionality. ( #7777 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-11-14 20:28:55 +01:00
Hedara
1916703e5a
Merge commit '685a8a911878f54463845c9f2ebbf11bd04ff4ee' into merrp-merge
...
Conflicts:
include/battle_script_commands.h
include/constants/event_objects.h
include/event_object_movement.h
include/field_effect.h
include/field_effect_helpers.h
include/sprite.h
src/battle_controller_player.c
src/event_object_movement.c
src/pokeball.c
2025-06-25 17:49:19 +02:00
Ariel A
685a8a9118
Merge remote-tracking branch 'upstream/master' into followers
2025-06-24 20:39:12 -04:00
AlexOn1ine
b90fdd1b3c
Master to upcoming merge
2025-05-26 10:41:11 +02:00
Hedara
2b92ba315a
Merge commit '59d315734d8c5f5b3b2f16f3299355aa99f5f483' into pret-merge
...
Conflicts:
include/battle_anim.h
include/battle_controllers.h
include/battle_gfx_sfx_util.h
include/battle_interface.h
include/battle_main.h
include/battle_script_commands.h
include/battle_util.h
include/easy_chat.h
include/event_object_movement.h
include/field_effect.h
include/field_effect_helpers.h
include/field_player_avatar.h
include/intro.h
include/item_use.h
include/metatile_behavior.h
include/move_relearner.h
include/pokedex.h
include/pokemon.h
include/pokemon_icon.h
include/roamer.h
include/script_pokemon_util.h
include/sprite.h
include/text.h
include/wild_encounter.h
src/battle_controllers.c
2025-05-24 20:38:21 +02:00
Bassoonian
59d315734d
Update header files to match source files ( #2143 )
2025-05-19 09:18:04 +01:00
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
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
Eduardo Quezada
2428af66cd
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-02-20 19:17:59 -03:00
Eduardo Quezada
9c4fbbf274
Merge branch '_RHH/master' into _RHH/upcoming
2025-02-13 13:06:32 -03:00
Hedara
7426a98dc5
Merge remote-tracking branch 'merrp/followers-expanded-id' into merrp-merge
2025-02-12 13:34:28 +01:00
Ariel A
c8fb56d73b
Merge branch 'followers' into followers-expanded-id
2025-02-10 00:24:50 -05:00
Ariel A
ef05bbf394
Merge remote-tracking branch 'upstream/master' into followers
2025-02-10 00:11:38 -05:00
Eduardo Quezada
e29e1c6ca7
Merge branch '_RHH/master' into _RHH/upcoming
2025-02-07 15:33:26 -03:00
hedara90
f9d1fdcf4c
Follower Object Event refactor ( #6129 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-06 21:12:42 +01:00
Eduardo Quezada
00241cf569
Merge remote-tracking branch '_merrp_origin/lighting-expanded-id' into _RHH/pr/upcoming/lighting-expansion-v2
...
# Conflicts:
# README.md
# asm/macros/event.inc
# data/scripts/pkmn_center_nurse.inc
# include/constants/event_objects.h
# include/constants/field_weather.h
# include/overworld.h
# include/palette.h
# include/sprite.h
# src/battle_controller_player.c
# src/data/object_events/object_event_graphics.h
# src/event_object_movement.c
# src/field_effect_helpers.c
# src/field_weather.c
# src/overworld.c
# src/palette.c
# src/scrcmd.c
# src/sprite.c
2025-01-26 12:08:10 -03:00
Ariel A
bc034aaf73
Merge branch 'followers-expanded-id' into lighting-expanded-id
2025-01-25 21:42:02 -05:00
Eduardo Quezada
a756bb501c
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-01-19 22:31:33 -03:00
Eduardo Quezada
cd1482bbaa
Expanded Pokémon Follower transformation functionality ( #5048 )
2025-01-18 23:19:06 +01:00
Eduardo Quezada
89f90e1f69
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-01-03 13:58:10 -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
hedara90
bcfdf41078
Follower female fix ( #5475 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-10-22 12:38:06 -03:00
Ariel A
0f706ac9e0
Merge branch 'followers' into followers-expanded-id
2024-10-21 00:05:26 -04:00
Ariel A
4056804575
feat: improved follower handling during scripted movements
2024-10-20 23:55:05 -04:00
ghoulslash
cf78462fab
merge w upcoming
2024-10-15 21:24:47 -04:00
ghoulslash
2e52e3331f
merge w upcoming
2024-10-04 12:56:21 -04:00
Eduardo Quezada
d1056f887b
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2024-09-30 15:52:49 -03:00
psf
58aa1e0034
Merge branch 'upcoming' into scriptCommands
2024-09-30 06:57:54 -07:00
ghoulslash
be3ee1ba85
merge w upcoming
2024-09-29 13:33:20 -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
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
Ariel A
42d9f24c84
feat: added OW_MON_WANDER_WALK config option
2024-09-01 17:17:24 -04:00
Greenphx9
ad969c968c
Merge branch 'lighting' of https://github.com/aarant/pokeemerald into lighting-expansion-v2
2024-08-25 17:54:28 +10:00
pkmnsnfrn
811b5d286e
Added getobjectposition
2024-08-10 21:17:50 -07:00
ghoulslash
b8dea3c7ec
sideways stairs, try to integrate with follower code
2024-06-19 10:50:59 -04:00
ghoulslash
45da91e773
Merge branch 'master' of https://github.com/pret/pokeemerald into sideways_stairs
2024-06-19 10:25:50 -04:00
ghoulslash
cb1696384c
merge in original dexnav code with some rhh specific tweaks
2024-06-16 10:39:28 -04:00
ghoulslash
652cb007ce
merge w pret master, add USE_DEXNAV_SEARCH_LEVELS flag
2024-06-16 09:45:38 -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
Eduardo Quezada
2fe18c22f9
Style fixes
2024-05-21 18:57:09 -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
Ariel A
991b104d52
Merge branch 'followers-expanded-id' into lighting-expanded-id
2024-05-17 21:45:44 -04:00
Ariel A
05bf03975a
Merge branch 'followers' into lighting
2024-05-17 21:40:20 -04:00
Ariel A
d3849f2fc6
Merge branch 'followers' into followers-expanded-id
2024-05-17 20:46:24 -04:00
Ariel A
6856bcf610
refactor: code review for expansion
2024-05-17 20:45:32 -04:00
Eduardo Quezada
3d9c7732f6
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# include/event_object_movement.h
# src/data.c
# src/data/graphics/pokemon.h
# src/data/pokemon/species_info/gen_4_families.h
2024-04-20 13:23:14 -04:00
Eduardo Quezada
3d181e5c70
Merge remote-tracking branch '_pret/master' into _RHH/pr/master/pret_sync20240324
...
# Conflicts:
# src/battle_anim_fight.c
2024-03-24 13:52:18 -03:00
